Disable OLAP support for BATCH operations, add tests for ON and OLAP (#18293)

Author: dahbka-lis

ydb/core/kqp/session_actor/kqp_session_actor.cpp

@@ -1181,7 +1181,12 @@ class TKqpSessionActor : public TActorBootstrapped<TKqpSessionActor> {
         if (Settings.TableService.GetEnableOltpSink() && isBatchQuery) {
             if (!Settings.TableService.GetEnableBatchUpdates()) {
                 ReplyQueryError(Ydb::StatusIds::PRECONDITION_FAILED,
-                        "Batch updates and deletes are disabled at current time.");
+                    "BATCH operations are disabled by EnableBatchUpdates flag.");
+            }
+
+            if (QueryState->TxCtx->HasOlapTable) {
+                ReplyQueryError(Ydb::StatusIds::PRECONDITION_FAILED,
+                    "BATCH operations are not supported for column tables at the current time.");
             }
 
             ExecutePartitioned(tx);

ydb/core/kqp/ut/batch_operations/kqp_batch_delete_ut.cpp

@@ -335,6 +335,69 @@ Y_UNIT_TEST_SUITE(KqpBatchDelete) {
         }
     }
 
+    Y_UNIT_TEST(DeleteOn) {
+        TKikimrRunner kikimr(GetAppConfig());
+        auto db = kikimr.GetQueryClient();
+        auto session = db.GetSession().GetValueSync().GetSession();
+
+        {
+            auto query = Q_(R"(
+                BATCH DELETE FROM Test
+                    ON (Group, Name)
+                    VALUES (1u, "Anna");
+            )");
+
+            auto result = session.ExecuteQuery(query, TTxControl::NoTx()).ExtractValueSync();
+            UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::GENERIC_ERROR);
+            UNIT_ASSERT_STRING_CONTAINS_C(result.GetIssues().ToString(), "BATCH DELETE is unsupported with ON", result.GetIssues().ToString());
+        }
+    }
+
+    Y_UNIT_TEST(ColumnTable) {
+        TKikimrRunner kikimr(GetAppConfig());
+        auto db = kikimr.GetQueryClient();
+        auto session = db.GetSession().GetValueSync().GetSession();
+
+        {
+            auto query = Q_(R"(
+                CREATE TABLE TestOlap (
+                    Key Int32 NOT NULL,
+                    Value String,
+                    PRIMARY KEY (Key)
+                ) WITH (
+                    STORE = COLUMN
+                );
+            )");
+
+            auto result = session.ExecuteQuery(query, TTxControl::NoTx()).ExtractValueSync();
+            UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::SUCCESS);
+        }
+
+        {
+            auto query = Q_(R"(
+                INSERT INTO TestOlap (Key, Value) VALUES
+                    (1, "1"),
+                    (2, "2"),
+                    (3, "3");
+            )");
+
+            auto result = session.ExecuteQuery(query, TTxControl::NoTx()).ExtractValueSync();
+            UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::SUCCESS);
+        }
+
+        {
+            auto query = Q_(R"(
+                BATCH DELETE FROM TestOlap
+                    WHERE Key < 3;
+            )");
+
+            auto result = session.ExecuteQuery(query, TTxControl::NoTx()).ExtractValueSync();
+            UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::PRECONDITION_FAILED);
+            UNIT_ASSERT_STRING_CONTAINS_C(result.GetIssues().ToString(),
+                "BATCH operations are not supported for column tables at the current time.", result.GetIssues().ToString());
+        }
+    }
+
     Y_UNIT_TEST(HasTxControl) {
         TKikimrRunner kikimr(GetAppConfig());
         auto db = kikimr.GetQueryClient();

ydb/core/kqp/ut/batch_operations/kqp_batch_update_ut.cpp

@@ -439,6 +439,70 @@ Y_UNIT_TEST_SUITE(KqpBatchUpdate) {
         }
     }
 
+    Y_UNIT_TEST(UpdateOn) {
+        TKikimrRunner kikimr(GetAppConfig());
+        auto db = kikimr.GetQueryClient();
+        auto session = db.GetSession().GetValueSync().GetSession();
+
+        {
+            auto query = Q_(R"(
+                BATCH UPDATE Test
+                    ON (Amount, Comment)
+                    VALUES (100ul, "None");
+            )");
+
+            auto result = session.ExecuteQuery(query, TTxControl::NoTx()).ExtractValueSync();
+            UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::GENERIC_ERROR);
+            UNIT_ASSERT_STRING_CONTAINS_C(result.GetIssues().ToString(), "BATCH UPDATE is unsupported with ON", result.GetIssues().ToString());
+        }
+    }
+
+    Y_UNIT_TEST(ColumnTable) {
+        TKikimrRunner kikimr(GetAppConfig());
+        auto db = kikimr.GetQueryClient();
+        auto session = db.GetSession().GetValueSync().GetSession();
+
+        {
+            auto query = Q_(R"(
+                CREATE TABLE TestOlap (
+                    Key Int32 NOT NULL,
+                    Value String,
+                    PRIMARY KEY (Key)
+                ) WITH (
+                    STORE = COLUMN
+                );
+            )");
+
+            auto result = session.ExecuteQuery(query, TTxControl::NoTx()).ExtractValueSync();
+            UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::SUCCESS);
+        }
+
+        {
+            auto query = Q_(R"(
+                INSERT INTO TestOlap (Key, Value) VALUES
+                    (1, "1"),
+                    (2, "2"),
+                    (3, "3");
+            )");
+
+            auto result = session.ExecuteQuery(query, TTxControl::NoTx()).ExtractValueSync();
+            UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::SUCCESS);
+        }
+
+        {
+            auto query = Q_(R"(
+                BATCH UPDATE TestOlap
+                    SET Value = "None"
+                    WHERE Key < 3;
+            )");
+
+            auto result = session.ExecuteQuery(query, TTxControl::NoTx()).ExtractValueSync();
+            UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::PRECONDITION_FAILED);
+            UNIT_ASSERT_STRING_CONTAINS_C(result.GetIssues().ToString(),
+                "BATCH operations are not supported for column tables at the current time.", result.GetIssues().ToString());
+        }
+    }
+
     Y_UNIT_TEST(HasTxControl) {
         TKikimrRunner kikimr(GetAppConfig());
         auto db = kikimr.GetQueryClient();