Merge 51f46b8 into 80bf6ef

Author: zverevgeny

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

@@ -327,12 +327,10 @@ class TCreateOlapStore: public TSubOperation {
         TEvSchemeShard::EStatus status = NKikimrScheme::StatusAccepted;
         auto result = MakeHolder<TProposeResponse>(status, ui64(OperationId.GetTxId()), ui64(ssId));
 
-        if (context.SS->IsServerlessDomain(TPath::Init(context.SS->RootPathId(), context.SS))) {
-            if (AppData()->ColumnShardConfig.GetDisabledOnSchemeShard()) {
-                result->SetError(NKikimrScheme::StatusPreconditionFailed,
-                    "OLAP schema operations are not supported");
-                return result;
-            }
+        if (AppData()->ColumnShardConfig.GetDisabledOnSchemeShard() && context.SS->OlapStores.empty()) {
+            result->SetError(NKikimrScheme::StatusPreconditionFailed,
+                "OLAP schema operations are not supported");
+            return result;
         }
 
         NSchemeShard::TPath parentPath = NSchemeShard::TPath::Resolve(parentPathStr, context.SS);

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

@@ -607,12 +607,10 @@ class TCreateColumnTable: public TSubOperation {
         TEvSchemeShard::EStatus status = NKikimrScheme::StatusAccepted;
         auto result = MakeHolder<TProposeResponse>(status, ui64(opTxId), ui64(ssId));
 
-        if (context.SS->IsServerlessDomain(TPath::Init(context.SS->RootPathId(), context.SS))) {
-            if (AppData()->ColumnShardConfig.GetDisabledOnSchemeShard()) {
-                result->SetError(NKikimrScheme::StatusPreconditionFailed,
-                    "OLAP schema operations are not supported");
-                return result;
-            }
+        if (AppData()->ColumnShardConfig.GetDisabledOnSchemeShard() && context.SS->ColumnTables.empty()) {
+            result->SetError(NKikimrScheme::StatusPreconditionFailed,
+                "OLAP schema operations are not supported");
+            return result;
         }
 
         TOlapStoreInfo::TPtr storeInfo;

ydb/core/tx/schemeshard/schemeshard_tables_storage.h

@@ -252,7 +252,9 @@ class TTablesStorage {
     TTableCreatedGuard BuildNew(const TPathId& id, TColumnTableInfo::TPtr object);
     TTableExtractedGuard TakeVerified(const TPathId& id);
     TTableExtractedGuard TakeAlterVerified(const TPathId& id);
-
+    bool empty() const {
+        return Tables.empty();
+    }
     bool contains(const TPathId& id) const {
         return Tables.contains(id);
     }

ydb/core/tx/tiering/ut/ut_tiers.cpp

@@ -416,6 +416,7 @@ Y_UNIT_TEST_SUITE(ColumnShardTiers) {
 
         NKikimrConfig::TAppConfig appConfig;
         appConfig.MutableTableServiceConfig()->SetEnablePreparedDdl(true);
+        appConfig.MutableColumnShardConfig()->SetDisabledOnSchemeShard(false);
 
         Tests::TServerSettings serverSettings(msgbPort);
         serverSettings.Port = msgbPort;

ydb/tests/library/harness/resources/default_yaml.yml

@@ -256,3 +256,5 @@ federated_query_config:
       uri: ""
   pinger:
     ping_period: "30s"
+column_shard_config:
+  disabled_on_scheme_shard: false