Merge 2e7bcd3 into ffa5093

Author: aavdonkin

ydb/core/kqp/ut/scheme/kqp_scheme_ut.cpp

@@ -5310,7 +5310,8 @@ Y_UNIT_TEST_SUITE(KqpScheme) {
             UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::GENERIC_ERROR, result.GetIssues().ToString());
         }
 
-        { // no partition by
+        { // nullable pk columns are disabled by default
+            kikimr.GetTestServer().GetRuntime()->GetAppData().ColumnShardConfig.SetAllowNullableColumnsInPK(false);
             auto query = TStringBuilder() << R"(
                 --!syntax_v1
                 CREATE TABLE `)" << tableName << R"(` (

ydb/core/protos/config.proto

@@ -1703,6 +1703,7 @@ message TColumnShardConfig {
     optional bool ColumnChunksV1Usage = 26 [default = true];
     optional uint64 MemoryLimitScanPortion = 27 [default = 100000000];
     optional string ReaderClassName = 28;
+    optional bool AllowNullableColumnsInPK = 29 [default = false];
 }
 
 message TSchemeShardConfig {

ydb/core/tx/schemeshard/olap/operations/alter/standalone/update.cpp

@@ -76,4 +76,4 @@ NKikimr::TConclusionStatus TStandaloneSchemaUpdate::DoInitializeImpl(const TUpda
     return TConclusionStatus::Success();
 }
 
-}
+}

ydb/core/tx/schemeshard/olap/operations/create_table.cpp

@@ -193,7 +193,7 @@ class TOlapTableConstructor : public TTableConstructorBase {
         }
 
         TOlapSchemaUpdate schemaDiff;
-        if (!schemaDiff.Parse(description.GetSchema(), errors)) {
+        if (!schemaDiff.Parse(description.GetSchema(), errors, AppData()->ColumnShardConfig.GetAllowNullableColumnsInPK())) {
             return false;
         }
 

ydb/core/tx/schemeshard/olap/schema/update.h

@@ -15,7 +15,7 @@ class TOlapSchemaUpdate {
     YDB_READONLY_DEF(TOlapColumnFamiliesUpdate, ColumnFamilies);
 
 public:
-    bool Parse(const NKikimrSchemeOp::TColumnTableSchema& tableSchema, IErrorCollector& errors, bool allowNullKeys = false);
+    bool Parse(const NKikimrSchemeOp::TColumnTableSchema& tableSchema, IErrorCollector& errors, bool allowNullKeys);
     bool Parse(const NKikimrSchemeOp::TAlterColumnTableSchema& alterRequest, IErrorCollector& errors);
 };
 }

ydb/core/tx/schemeshard/olap/store/store.cpp

@@ -153,7 +153,7 @@ bool TOlapStoreInfo::ParseFromRequest(const NKikimrSchemeOp::TColumnStoreDescrip
         preset.SetProtoIndex(protoIndex++);
 
         TOlapSchemaUpdate schemaDiff;
-        if (!schemaDiff.Parse(presetProto.GetSchema(), errors)) {
+        if (!schemaDiff.Parse(presetProto.GetSchema(), errors, AppData()->ColumnShardConfig.GetAllowNullableColumnsInPK())) {
             return false;
         }
 

ydb/core/tx/schemeshard/ut_olap/ut_olap.cpp

@@ -99,6 +99,81 @@ Y_UNIT_TEST_SUITE(TOlap) {
         TestLs(runtime, "/MyRoot/DirA/DirB/OlapStore", false, NLs::PathExist);
     }
 
+    Y_UNIT_TEST(CreateTableWithNullableKeysNotAllowed) {
+        TTestBasicRuntime runtime;
+        TTestEnv env(runtime);
+        ui64 txId = 100;
+
+        auto& appData = runtime.GetAppData();
+        appData.ColumnShardConfig.SetAllowNullableColumnsInPK(false);
+
+        TestCreateOlapStore(runtime, ++txId, "/MyRoot", R"(
+            Name: "MyStore"
+            ColumnShardCount: 1
+            SchemaPresets {
+                Name: "default"
+                Schema {
+                    Columns { Name: "timestamp" Type: "Timestamp" NotNull: true }
+                    Columns { Name: "key1" Type: "Uint32" }
+                    Columns { Name: "data" Type: "Utf8" }
+                    KeyColumnNames: [ "timestamp", "key1" ]
+                }
+            }
+        )", {NKikimrScheme::StatusSchemeError});
+        env.TestWaitNotification(runtime, txId);
+    }
+
+    Y_UNIT_TEST(CreateTableWithNullableKeys) {
+        TTestBasicRuntime runtime;
+        TTestEnv env(runtime);
+        ui64 txId = 100;
+
+        auto& appData = runtime.GetAppData();
+        appData.ColumnShardConfig.SetAllowNullableColumnsInPK(true);
+
+        TestCreateOlapStore(runtime, ++txId, "/MyRoot", R"(
+            Name: "MyStore"
+            ColumnShardCount: 1
+            SchemaPresets {
+                Name: "default"
+                Schema {
+                    Columns { Name: "timestamp" Type: "Timestamp" NotNull: true }
+                    Columns { Name: "key1" Type: "Uint32" }
+                    Columns { Name: "data" Type: "Utf8" }
+                    KeyColumnNames: [ "timestamp", "key1" ]
+                }
+            }
+        )");
+        env.TestWaitNotification(runtime, txId);
+
+        TestLs(runtime, "/MyRoot/MyStore", false, NLs::PathExist);
+
+        TestMkDir(runtime, ++txId, "/MyRoot", "MyDir");
+        env.TestWaitNotification(runtime, txId);
+
+        TestLs(runtime, "/MyRoot/MyDir", false, NLs::PathExist);
+
+        TestCreateColumnTable(runtime, ++txId, "/MyRoot/MyDir", R"(
+            Name: "MyTable"
+            ColumnShardCount: 1
+            Schema {
+                Columns { Name: "timestamp" Type: "Timestamp" NotNull: true }
+                Columns { Name: "key1" Type: "Uint32" }
+                Columns { Name: "data" Type: "Utf8" }
+                KeyColumnNames: [ "timestamp", "key1" ]
+            }
+        )");
+        env.TestWaitNotification(runtime, txId);
+
+        TestLsPathId(runtime, 4, NLs::PathStringEqual("/MyRoot/MyDir/MyTable"));
+
+        TestDropColumnTable(runtime, ++txId, "/MyRoot/MyDir", "MyTable");
+        env.TestWaitNotification(runtime, txId);
+
+        TestLs(runtime, "/MyRoot/MyDir/MyTable", false, NLs::PathNotExist);
+        TestLsPathId(runtime, 4, NLs::PathStringEqual(""));
+    }
+
     Y_UNIT_TEST(CreateTable) {
         TTestBasicRuntime runtime;
         TTestEnv env(runtime);
@@ -825,5 +900,5 @@ Y_UNIT_TEST_SUITE(TOlap) {
         env.TestWaitNotification(runtime, txId);
 
         TestLs(runtime, "/MyRoot/OlapStore", false, NLs::PathExist);
-    }    
+    }
 }