Removed S3 MaxReadSizePerQuery config (#11936)

ydb-platform · Nov 25, 2024 · a458b35 · a458b35
1 parent 7e8cb6b
commit a458b35
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 12 deletions.
diff --git a/ydb/library/benchmarks/runner/runner/test-gateways.conf b/ydb/library/benchmarks/runner/runner/test-gateways.conf
@@ -120,7 +120,6 @@ S3 {
         Name: "yq-tpc-local"
         Url: "file://./tpc/"
     }
-    MaxReadSizePerQuery: 900000000000
 }
 
 HttpGateway {

diff --git a/ydb/library/yql/providers/s3/provider/yql_s3_logical_opt.cpp b/ydb/library/yql/providers/s3/provider/yql_s3_logical_opt.cpp
@@ -429,12 +429,6 @@ class TS3LogicalOptProposalTransformer : public TOptimizeTransformerBase {
             return TStatus::Error;
         }
 
-        const auto maxSize = State_->Configuration->MaxReadSizePerQuery;
-        if (totalSize > maxSize) {
-            ctx.AddError(TIssue(ctx.GetPosition(input->Pos()), TStringBuilder() << "Too large objects to read: " << totalSize << ", but limit is " << maxSize));
-            return TStatus::Error;
-        }
-
         if (count > 0) {
             YQL_CLOG(INFO, ProviderS3) << "Will read from S3 " << count << " files with total size " << totalSize << " bytes";
         }

diff --git a/ydb/library/yql/providers/s3/provider/yql_s3_settings.cpp b/ydb/library/yql/providers/s3/provider/yql_s3_settings.cpp
@@ -60,8 +60,6 @@ void TS3Configuration::Init(const TS3GatewayConfig& config, TIntrusivePtr<TTypeA
         config.HasMinDesiredDirectoriesOfFilesPerQuery()
             ? config.GetMinDesiredDirectoriesOfFilesPerQuery()
             : 100;
-    MaxReadSizePerQuery =
-        config.HasMaxReadSizePerQuery() ? config.GetMaxReadSizePerQuery() : 4_GB;
     MaxInflightListsPerQuery =
         config.HasMaxInflightListsPerQuery() ? config.GetMaxInflightListsPerQuery() : 1;
     ListingCallbackThreadCount = config.HasListingCallbackThreadCount()

diff --git a/ydb/library/yql/providers/s3/provider/yql_s3_settings.h b/ydb/library/yql/providers/s3/provider/yql_s3_settings.h
@@ -59,7 +59,6 @@ struct TS3Configuration : public TS3Settings, public NCommon::TSettingDispatcher
     ui64 MaxDiscoveryFilesPerQuery = 0;
     ui64 MaxDirectoriesAndFilesPerQuery = 0;
     ui64 MinDesiredDirectoriesOfFilesPerQuery = 0;
-    ui64 MaxReadSizePerQuery = 0;
     ui64 MaxInflightListsPerQuery = 0;
     ui64 ListingCallbackThreadCount = 0;
     ui64 ListingCallbackPerThreadQueueSize = 0;

diff --git a/ydb/library/yql/tools/dqrun/examples/gateways.conf b/ydb/library/yql/tools/dqrun/examples/gateways.conf
@@ -112,7 +112,6 @@ S3 {
         Name: "yq-tpc-local"
         Url: "file://./tpc/"
     }
-    MaxReadSizePerQuery: 100000000000
 }
 
 HttpGateway {

diff --git a/ydb/tests/tools/kqprun/configuration/app_config.conf b/ydb/tests/tools/kqprun/configuration/app_config.conf
@@ -123,7 +123,6 @@ QueryServiceConfig {
     MaxDiscoveryFilesPerQuery: 1000
     MaxFilesPerQuery: 500000
     MaxInflightListsPerQuery: 100
-    MaxReadSizePerQuery: 1000000000000
     MinDesiredDirectoriesOfFilesPerQuery: 1000
     RegexpCacheSize: 100