YQ kqprun support creating tenants (#8675)

Author: GrigoriyPA

ydb/tests/fq/yt/cfg/test_whitelist.txt

@@ -607,7 +607,6 @@ join/lookupjoin_bug8533
 join/lookupjoin_semi
 join/lookupjoin_semi_empty
 join/bush_in_in_in
-pg/join_brackets2
 join/mapjoin_with_empty_read
 key_filter/empty_range_over_dynamic
 join/join_without_correlation_and_struct_access

ydb/tests/fq/yt/kqprun.py

@@ -53,7 +53,7 @@ def yql_exec(self, program=None, program_file=None, verbose=False, check_error=T
             for table in tables:
                 if table.format != 'yson':
                     pytest.skip('skip tests containing tables with a non-yson attribute format')
-                cmd += '--table=yt.Root/%s@%s ' % (table.full_name, table.yqlrun_file)
+                cmd += '--table=yt./Root/%s@%s ' % (table.full_name, table.yqlrun_file)
 
         proc_result = yatest.common.process.execute(cmd.strip().split(), check_exit_code=False, cwd=self.res_dir)
         if proc_result.exit_code != 0 and check_error:

ydb/tests/tools/kqprun/configuration/app_config.conf

@@ -2,6 +2,7 @@ FeatureFlags {
   EnableExternalDataSources: true
   EnableScriptExecutionOperations: true
   EnableExternalSourceSchemaInference: true
+  EnableTempTables: true
 }
 
 KQPConfig {

ydb/tests/tools/kqprun/kqprun.cpp

@@ -40,6 +40,7 @@ struct TExecutionOptions {
     bool ForgetExecution = false;
     std::vector<EExecutionCase> ExecutionCases;
     std::vector<NKikimrKqp::EQueryAction> ScriptQueryActions;
+    std::vector<TString> Databases;
     std::vector<TString> TraceIds;
     std::vector<TString> PoolIds;
     std::vector<TString> UserSIDs;
@@ -81,7 +82,8 @@ struct TExecutionOptions {
             .Action = NKikimrKqp::EQueryAction::QUERY_ACTION_EXECUTE,
             .TraceId = DefaultTraceId,
             .PoolId = "",
-            .UserSID = BUILTIN_ACL_ROOT
+            .UserSID = BUILTIN_ACL_ROOT,
+            .Database = ""
         };
     }
 
@@ -99,7 +101,8 @@ struct TExecutionOptions {
             .Action = GetScriptQueryAction(index),
             .TraceId = TStringBuilder() << GetValue(index, TraceIds, DefaultTraceId) << "-" << startTime.ToString(),
             .PoolId = GetValue(index, PoolIds, TString()),
-            .UserSID = GetValue(index, UserSIDs, TString(BUILTIN_ACL_ROOT))
+            .UserSID = GetValue(index, UserSIDs, TString(BUILTIN_ACL_ROOT)),
+            .Database = GetValue(index, Databases, TString())
         };
     }
 
@@ -510,6 +513,10 @@ class TMain : public TMainClassArgs {
             .DefaultValue(1000)
             .StoreMappedResultT<ui64>(&ExecutionOptions.LoopDelay, &TDuration::MilliSeconds<ui64>);
 
+        options.AddLongOption('D', "database", "Database path for -p queries")
+            .RequiredArgument("path")
+            .EmplaceTo(&ExecutionOptions.Databases);
+
         options.AddLongOption('U', "user", "User SID for -p queries")
             .RequiredArgument("user-SID")
             .EmplaceTo(&ExecutionOptions.UserSIDs);
@@ -552,6 +559,23 @@ class TMain : public TMainClassArgs {
             .NoArgument()
             .SetFlag(&EmulateYt);
 
+        options.AddLongOption("domain", "Test cluster domain name")
+            .RequiredArgument("name")
+            .DefaultValue(RunnerOptions.YdbSettings.DomainName)
+            .StoreResult(&RunnerOptions.YdbSettings.DomainName);
+
+        options.AddLongOption("dedicated", "Dedicated tenant path, relative inside domain")
+            .RequiredArgument("path")
+            .InsertTo(&RunnerOptions.YdbSettings.DedicatedTenants);
+
+        options.AddLongOption("shared", "Shared tenant path, relative inside domain")
+            .RequiredArgument("path")
+            .InsertTo(&RunnerOptions.YdbSettings.SharedTenants);
+
+        options.AddLongOption("serverless", "Serverless tenant path, relative inside domain (use string serverless-name@shared-name to specify shared database)")
+            .RequiredArgument("path")
+            .InsertTo(&RunnerOptions.YdbSettings.ServerlessTenants);
+
         TChoices<std::function<void()>> backtrace({
             {"heavy", &NKikimr::EnableYDBBacktraceFormat},
             {"light", []() { SetFormatBackTraceFn(FormatBackTrace); }}

ydb/tests/tools/kqprun/src/common.h

@@ -27,6 +27,9 @@ struct TAsyncQueriesSettings {
 struct TYdbSetupSettings {
     ui32 NodeCount = 1;
     TString DomainName = "Root";
+    std::unordered_set<TString> DedicatedTenants;
+    std::unordered_set<TString> SharedTenants;
+    std::unordered_set<TString> ServerlessTenants;
     TDuration InitializationTimeout = TDuration::Seconds(10);
 
     bool MonitoringEnabled = false;
@@ -83,6 +86,7 @@ struct TRequestOptions {
     TString TraceId;
     TString PoolId;
     TString UserSID;
+    TString Database;
 };
 
 }  // namespace NKqpRun

ydb/tests/tools/kqprun/src/kqp_runner.cpp

@@ -128,6 +128,9 @@ class TKqpRunner::TImpl {
             return false;
         }
 
+        ExecutionMeta_ = TExecutionMeta();
+        ExecutionMeta_.Database = script.Database;
+
         return WaitScriptExecutionOperation();
     }
 
@@ -183,7 +186,7 @@ class TKqpRunner::TImpl {
         ResultSets_.clear();
         ResultSets_.resize(ExecutionMeta_.ResultSetsCount);
         for (i32 resultSetId = 0; resultSetId < ExecutionMeta_.ResultSetsCount; ++resultSetId) {
-            TRequestResult status = YdbSetup_.FetchScriptExecutionResultsRequest(ExecutionOperation_, resultSetId, ResultSets_[resultSetId]);
+            TRequestResult status = YdbSetup_.FetchScriptExecutionResultsRequest(ExecutionMeta_.Database, ExecutionOperation_, resultSetId, ResultSets_[resultSetId]);
 
             if (!status.IsSuccess()) {
                 Cerr << CerrColors_.Red() << "Failed to fetch result set with id " << resultSetId << ", reason:" << CerrColors_.Default() << Endl << status.ToString() << Endl;
@@ -197,7 +200,7 @@ class TKqpRunner::TImpl {
     bool ForgetExecutionOperation() {
         TYdbSetup::StopTraceOpt();
 
-        TRequestResult status = YdbSetup_.ForgetScriptExecutionOperationRequest(ExecutionOperation_);
+        TRequestResult status = YdbSetup_.ForgetScriptExecutionOperationRequest(ExecutionMeta_.Database, ExecutionOperation_);
 
         if (!status.IsSuccess()) {
             Cerr << CerrColors_.Red() << "Failed to forget script execution operation, reason:" << CerrColors_.Default() << Endl << status.ToString() << Endl;
@@ -226,7 +229,6 @@ class TKqpRunner::TImpl {
 private:
     bool WaitScriptExecutionOperation() {
         StartTime_ = TInstant::Now();
-        ExecutionMeta_ = TExecutionMeta();
 
         TDuration getOperationPeriod = TDuration::Seconds(1);
         if (auto progressStatsPeriodMs = Options_.YdbSettings.AppConfig.GetQueryServiceConfig().GetProgressStatsPeriodMs()) {
@@ -235,7 +237,7 @@ class TKqpRunner::TImpl {
 
         TRequestResult status;
         while (true) {
-            status = YdbSetup_.GetScriptExecutionOperationRequest(ExecutionOperation_, ExecutionMeta_);
+            status = YdbSetup_.GetScriptExecutionOperationRequest(ExecutionMeta_.Database, ExecutionOperation_, ExecutionMeta_);
             PrintScriptProgress(ExecutionMeta_.Plan);
 
             if (ExecutionMeta_.Ready) {
@@ -249,7 +251,7 @@ class TKqpRunner::TImpl {
 
             if (Options_.ScriptCancelAfter && TInstant::Now() - StartTime_ > Options_.ScriptCancelAfter) {
                 Cout << CoutColors_.Yellow() << TInstant::Now().ToIsoStringLocal() << " Cancelling script execution..." << CoutColors_.Default() << Endl;
-                TRequestResult cancelStatus = YdbSetup_.CancelScriptExecutionOperationRequest(ExecutionOperation_);
+                TRequestResult cancelStatus = YdbSetup_.CancelScriptExecutionOperationRequest(ExecutionMeta_.Database, ExecutionOperation_);
                 if (!cancelStatus.IsSuccess()) {
                     Cerr << CerrColors_.Red() << "Failed to cancel script execution operation, reason:" << CerrColors_.Default() << Endl << cancelStatus.ToString() << Endl;
                     return false;