[YQL-14969] Do not emit MrObject for S3 bindings

ref:509a09bc46e4236b9b84889b9a7434723a0dbb38

3 files changed, 1 insertions, 30 deletions

diff --git a/ydb/library/yql/sql/v1/context.h b/ydb/library/yql/sql/v1/context.h
index 359e419063a..bc1ef027507 100644
--- a/ydb/library/yql/sql/v1/context.h
+++ b/ydb/library/yql/sql/v1/context.h
@@ -272,8 +272,6 @@ namespace NSQLTranslationV1 {
         NYql::TWarningPolicy WarningPolicy;
         TString PqReadByRtmrCluster;
         bool EmitStartsWith = true;
-        // TODO: drop after transition to new s3 binding schema
-        bool S3BindingsAsTableHints = false; // if set, convert bindings to table_hints, not arguments of MrObject
     };
 
     class TColumnRefScope {
diff --git a/ydb/library/yql/sql/v1/sql.cpp b/ydb/library/yql/sql/v1/sql.cpp
index 7f98cdc7cb1..b689f8c20c9 100644
--- a/ydb/library/yql/sql/v1/sql.cpp
+++ b/ydb/library/yql/sql/v1/sql.cpp
@@ -1479,7 +1479,7 @@ bool TSqlTranslation::ApplyTableBinding(const TString& binding, TTableRef& tr, T
         return false;
     }
 
-    const bool emitObject = bindSettings.ClusterType == PqProviderName || !Ctx.S3BindingsAsTableHints;
+    const bool emitObject = bindSettings.ClusterType == PqProviderName;
 
     // ordered map ensures AST stability
     TMap<TString, TString> kvs(bindSettings.Settings.begin(), bindSettings.Settings.end());
@@ -9827,8 +9827,6 @@ TNodePtr TSqlQuery::PragmaStatement(const TRule_pragma_stmt& stmt, bool& success
         } else if (normalizedPragma == "disableansicurrentrow") {
             Ctx.AnsiCurrentRow = false;
             Ctx.IncrementMonCounter("sql_pragma", "DisableAnsiCurrentRow");
-        } else if (normalizedPragma == "s3bindingsastablehints") {
-            Ctx.S3BindingsAsTableHints = true;
         } else {
             Error() << "Unknown pragma: " << pragma;
             Ctx.IncrementMonCounter("sql_errors", "UnknownPragma");
diff --git a/ydb/library/yql/sql/v1/sql_ut.cpp b/ydb/library/yql/sql/v1/sql_ut.cpp
index 3786b3f70bd..6de785df3e5 100644
--- a/ydb/library/yql/sql/v1/sql_ut.cpp
+++ b/ydb/library/yql/sql/v1/sql_ut.cpp
@@ -1577,31 +1577,6 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) {
         TVerifyLineFunc verifyLine = [](const TString& word, const TString& line) {
             if (word == "MrObject") {
                 UNIT_ASSERT_VALUES_UNEQUAL(TString::npos,
-                    line.find(R"__((MrObject '"path" '"format" '('('"bar" (String '"1")) '('"compression" (String '"ccompression")))))__"));
-            } else if (word == "userschema") {
-                UNIT_ASSERT_VALUES_UNEQUAL(TString::npos,
-                    line.find(R"__('('('"partitionedby" '"key" '"subkey") '('"userschema" (SqlTypeFromYson)__"));
-            }
-        };
-
-        TWordCountHive elementStat = {{TString("MrObject"), 0}, {TString("userschema"), 0}};
-        VerifyProgram(res, elementStat, verifyLine);
-
-        UNIT_ASSERT_VALUES_EQUAL(1, elementStat["MrObject"]);
-        UNIT_ASSERT_VALUES_EQUAL(1, elementStat["userschema"]);
-    }
-
-    Y_UNIT_TEST(TableBindingsV2) {
-        NSQLTranslation::TTranslationSettings settings = GetSettingsWithS3Binding("foo");
-        NYql::TAstParseResult res = SqlToYqlWithSettings(
-            "pragma S3BindingsAsTableHints; select * from bindings.foo",
-            settings
-        );
-        UNIT_ASSERT(res.Root);
-
-        TVerifyLineFunc verifyLine = [](const TString& word, const TString& line) {
-            if (word == "MrObject") {
-                UNIT_ASSERT_VALUES_UNEQUAL(TString::npos,
                                            line.find(R"__((MrTableConcat (Key '('table (String '"path")))) (Void) '('('"bar" '"1") '('"compression" '"ccompression") '('"format" '"format") '('"partitionedby" '"key" '"subkey") '('"userschema" (SqlTypeFromYson)__"));
             }
         };