Skip to content

Commit 7de5010

Browse files
committed
Disable RuntimeListing until refactoring to eliminate unwanted dependencies
1 parent cdefc7d commit 7de5010

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

ydb/library/yql/providers/s3/provider/ya.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ PEERDIR(
4545
ydb/library/yql/providers/dq/common
4646
ydb/library/yql/providers/dq/expr_nodes
4747
ydb/library/yql/providers/result/expr_nodes
48-
ydb/library/yql/providers/s3/actors
48+
# ydb/library/yql/providers/s3/actors -- temporary off
4949
ydb/library/yql/providers/s3/common
5050
ydb/library/yql/providers/s3/expr_nodes
5151
ydb/library/yql/providers/s3/object_listers

ydb/library/yql/providers/s3/provider/yql_s3_dq_integration.cpp

+8-5
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#include <ydb/library/yql/providers/common/schema/expr/yql_expr_schema.h>
77
#include <ydb/library/yql/providers/dq/common/yql_dq_settings.h>
88
#include <ydb/library/yql/providers/dq/expr_nodes/dqs_expr_nodes.h>
9-
#include <ydb/library/yql/providers/s3/actors/yql_s3_read_actor.h>
10-
#include <ydb/library/yql/providers/s3/actors/yql_s3_source_factory.h>
9+
// #include <ydb/library/yql/providers/s3/actors/yql_s3_read_actor.h> // temporary off until refactoring in next PR
10+
// #include <ydb/library/yql/providers/s3/actors/yql_s3_source_factory.h> // temporary off until refactoring in next PR
1111
#include <ydb/library/yql/providers/s3/expr_nodes/yql_s3_expr_nodes.h>
1212
#include <ydb/library/yql/providers/s3/proto/range.pb.h>
1313
#include <ydb/library/yql/providers/s3/proto/sink.pb.h>
@@ -104,9 +104,10 @@ class TS3DqIntegration: public TDqIntegrationBase {
104104
YQL_CLOG(TRACE, ProviderS3) << "limited max partitions to " << maxPartitions;
105105
}
106106

107+
#if 0 // temporary off until refactoring in next PR
107108
auto useRuntimeListing = State_->Configuration->UseRuntimeListing.Get().GetOrElse(false);
108109
if (useRuntimeListing) {
109-
size_t partitionCount = hasDirectories ? maxPartitions : Min(parts.size(), maxPartitions);
110+
size_t partitionCount = v ? maxPartitions : Min(parts.size(), maxPartitions);
110111
partitions.reserve(partitionCount);
111112
for (size_t i = 0; i < partitionCount; ++i) {
112113
NS3::TRange range;
@@ -119,7 +120,9 @@ class TS3DqIntegration: public TDqIntegrationBase {
119120
}
120121
return 0;
121122
}
122-
123+
#else
124+
Y_UNUSED(hasDirectories);
125+
#endif
123126
if (maxPartitions && parts.size() > maxPartitions) {
124127
if (const auto extraParts = parts.size() - maxPartitions; extraParts > maxPartitions) {
125128
const auto partsPerTask = (parts.size() - 1ULL) / maxPartitions + 1ULL;
@@ -405,7 +408,7 @@ class TS3DqIntegration: public TDqIntegrationBase {
405408
srcDesc.MutableSettings()->insert({"addPathIndex", "true"});
406409
}
407410

408-
#if defined(_linux_) || defined(_darwin_)
411+
#if 0 // defined(_linux_) || defined(_darwin_) // temporary off until refactoring in next PR
409412

410413
auto useRuntimeListing = State_->Configuration->UseRuntimeListing.Get().GetOrElse(false);
411414
srcDesc.SetUseRuntimeListing(useRuntimeListing);

0 commit comments

Comments
 (0)