Revert "Add ExecuteMode to YQL plugin for YT. Support validate and explain modes" (#1295)

Author: va-kuznecov

ydb/library/yql/yt/bridge/interface.h

@@ -96,10 +96,8 @@ using TFuncBridgeRun = TBridgeQueryResult*(
     const char* impersonationUser,
     const char* queryText,
     const char* settings,
-    int settingsLength,
     const TBridgeQueryFile* files,
-    int fileCount,
-    int executeMode);
+    int fileCount);
 using TFuncBridgeGetProgress = TBridgeQueryResult*(TBridgeYqlPlugin* plugin, const char* queryId);
 using TFuncBridgeAbort = TBridgeAbortResult*(TBridgeYqlPlugin* plugin, const char* queryId);
 using TFuncBridgeFreeAbortResult = void(TBridgeAbortResult* result);

ydb/library/yql/yt/dynamic/impl.cpp

@@ -12,7 +12,7 @@ extern "C" {
 
 ssize_t BridgeGetAbiVersion()
 {
-    return 2; // EYqlPluginAbiVersion
+    return 1; // EYqlPluginAbiVersion::AbortQuery
 }
 
 TBridgeYqlPlugin* BridgeCreateYqlPlugin(const TBridgeYqlPluginOptions* bridgeOptions)
@@ -74,10 +74,8 @@ TBridgeQueryResult* BridgeRun(
     const char* impersonationUser,
     const char* queryText,
     const char* settings,
-    int settingsLength,
     const TBridgeQueryFile* bridgeFiles,
-    int bridgeFileCount,
-    int executeMode)
+    int bridgeFileCount)
 {
     static const auto EmptyMap = TYsonString(TString("{}"));
 
@@ -98,9 +96,8 @@ TBridgeQueryResult* BridgeRun(
         NYT::TGuid::FromString(queryId),
         TString(impersonationUser),
         TString(queryText),
-        settings ? TYsonString(TString(settings, settingsLength)) : EmptyMap,
-        files,
-        executeMode);
+        settings ? TYsonString(TString(settings)) : EmptyMap,
+        files);
     FillString(bridgeResult->YsonResult, bridgeResult->YsonResultLength, result.YsonResult);
     FillString(bridgeResult->Plan, bridgeResult->PlanLength, result.Plan);
     FillString(bridgeResult->Statistics, bridgeResult->StatisticsLength, result.Statistics);

ydb/library/yql/yt/native/plugin.cpp

@@ -254,8 +254,7 @@ class TYqlPlugin
         TString impersonationUser,
         TString queryText,
         TYsonString settings,
-        std::vector<TQueryFile> files,
-        int executeMode)
+        std::vector<TQueryFile> files)
     {
         auto program = ProgramFactory_->Create("-memory-", queryText);
         {
@@ -315,23 +314,7 @@ class TYqlPlugin
         }
 
         NYql::TProgram::TStatus status = NYql::TProgram::TStatus::Error;
-
-        // NYT::NYqlClient::EExecuteMode (yt/yt/ytlib/yql_client/public.h)
-        switch (executeMode) {
-        case 0: // Validate.
-            status = program->Validate(impersonationUser, nullptr);
-            break;
-        case 1: // Optimize.
-            status = program->OptimizeWithConfig(impersonationUser, pipelineConfigurator);
-            break;
-        case 2: // Run.
-            status = program->RunWithConfig(impersonationUser, pipelineConfigurator);
-            break;
-        default: // Unknown.
-            return TQueryResult{
-                .YsonError = MessageToYtErrorYson(Format("Unknown execution mode: %v", executeMode)),
-            };
-        }
+        status = program->RunWithConfig(impersonationUser, pipelineConfigurator);
 
         if (status == NYql::TProgram::TStatus::Error) {
             return TQueryResult{
@@ -371,11 +354,10 @@ class TYqlPlugin
         TString impersonationUser,
         TString queryText,
         TYsonString settings,
-        std::vector<TQueryFile> files,
-        int executeMode) noexcept override
+        std::vector<TQueryFile> files) noexcept override
     {
         try {
-            return GuardedRun(queryId, impersonationUser, queryText, settings, files, executeMode);
+            return GuardedRun(queryId, impersonationUser, queryText, settings, files);
         } catch (const std::exception& ex) {
             {
                 auto guard = WriterGuard(ProgressSpinLock);

ydb/library/yql/yt/plugin.h

@@ -75,8 +75,7 @@ struct IYqlPlugin
         TString impersonationUser,
         TString queryText,
         NYson::TYsonString settings,
-        std::vector<TQueryFile> files,
-        int executeMode) noexcept = 0;
+        std::vector<TQueryFile> files) noexcept = 0;
     virtual TQueryResult GetProgress(TQueryId queryId) noexcept = 0;
 
     virtual TAbortResult Abort(TQueryId queryId) noexcept = 0;