aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Sukhov <evanevannnn@ydb.tech>2024-11-25 15:40:23 +0300
committerGitHub <noreply@github.com>2024-11-25 15:40:23 +0300
commita458b3553b4765d37a41f05ea90857b0cd952ba9 (patch)
tree15c790a0a2d66ed60d3e53103044ec0e8d97b9b0
parent7e8cb6b2390a64c042f89e19f808d4bb36342da2 (diff)
downloadydb-a458b3553b4765d37a41f05ea90857b0cd952ba9.tar.gz
Removed S3 MaxReadSizePerQuery config (#11936)
-rw-r--r--ydb/library/benchmarks/runner/runner/test-gateways.conf1
-rw-r--r--ydb/library/yql/providers/s3/provider/yql_s3_logical_opt.cpp6
-rw-r--r--ydb/library/yql/providers/s3/provider/yql_s3_settings.cpp2
-rw-r--r--ydb/library/yql/providers/s3/provider/yql_s3_settings.h1
-rw-r--r--ydb/library/yql/tools/dqrun/examples/gateways.conf1
-rw-r--r--ydb/tests/tools/kqprun/configuration/app_config.conf1
6 files changed, 0 insertions, 12 deletions
diff --git a/ydb/library/benchmarks/runner/runner/test-gateways.conf b/ydb/library/benchmarks/runner/runner/test-gateways.conf
index 75fb74cb941..61f286cd2a0 100644
--- 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
index d3520efb68a..2d73cf33814 100644
--- 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 @@ public:
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
index f523195e17f..8b2c0169ac9 100644
--- 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
index 508bdc113c3..eecac4f1f9c 100644
--- 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
index caa399a8eb9..2b0719824d0 100644
--- 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
index 1c9c56cebd2..749a24bf952 100644
--- 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