Merge 6ec71ea into a20c225

ydb-platform · Sep 4, 2024 · d40d4d2 · d40d4d2
2 parents a20c225 + 6ec71ea
commit d40d4d2
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 5 deletions.
diff --git a/ydb/core/kqp/ut/olap/sys_view_ut.cpp b/ydb/core/kqp/ut/olap/sys_view_ut.cpp
@@ -131,8 +131,9 @@ Y_UNIT_TEST_SUITE(KqpOlapSysView) {
         const ui32 rowsCount = 800000;
         const ui32 groupsCount = 512;
         {
-            auto settings = TKikimrSettings()
-                .SetWithSampleTables(false);
+            NKikimrConfig::TFeatureFlags featureFlags;
+            featureFlags.SetEnableOlapCompression(true);
+            auto settings = TKikimrSettings().SetWithSampleTables(false).SetFeatureFlags(featureFlags);
             TKikimrRunner kikimr(settings);
             Tests::NCommon::TLoggerInit(kikimr).Initialize();
             TTypedLocalHelper helper("Utf8", kikimr);
@@ -186,8 +187,9 @@ Y_UNIT_TEST_SUITE(KqpOlapSysView) {
         ui64 rawBytesPK1;
         ui64 bytesPK1;
         auto csController = NYDBTest::TControllers::RegisterCSControllerGuard<NOlap::TWaitCompactionController>();
-        auto settings = TKikimrSettings()
-            .SetWithSampleTables(false);
+        NKikimrConfig::TFeatureFlags featureFlags;
+        featureFlags.SetEnableOlapCompression(true);
+        auto settings = TKikimrSettings().SetWithSampleTables(false).SetFeatureFlags(featureFlags);
         TKikimrRunner kikimr(settings);
         Tests::NCommon::TLoggerInit(kikimr).Initialize();
         TTypedLocalHelper helper("", kikimr, "olapTable", "olapStore");

diff --git a/ydb/core/protos/feature_flags.proto b/ydb/core/protos/feature_flags.proto
@@ -154,4 +154,5 @@ message TFeatureFlags {
     optional bool EnableResourcePoolsCounters = 135 [default = false];
     optional bool EnableOptionalColumnsInColumnShard = 136 [default = false];
     optional bool EnableGranularTimecast = 137 [default = true];
+    optional bool EnableOlapCompression = 138 [default = false];
 }
diff --git a/ydb/core/testlib/basics/feature_flags.h b/ydb/core/testlib/basics/feature_flags.h
@@ -64,8 +64,9 @@ class TTestFeatureFlagsHolder {
     FEATURE_FLAG_SETTER(EnableChangefeedsOnIndexTables)
     FEATURE_FLAG_SETTER(EnableBackupService)
     FEATURE_FLAG_SETTER(EnableGranularTimecast)
+    FEATURE_FLAG_SETTER(EnableOlapCompression)
 
-    #undef FEATURE_FLAG_SETTER
+#undef FEATURE_FLAG_SETTER
 };
 
 } // NKikimr
diff --git a/ydb/core/tx/schemeshard/olap/operations/alter_store.cpp b/ydb/core/tx/schemeshard/olap/operations/alter_store.cpp
@@ -453,6 +453,17 @@ class TAlterOlapStore: public TSubOperation {
 
         auto result = MakeHolder<TProposeResponse>(NKikimrScheme::StatusAccepted, ui64(OperationId.GetTxId()), ui64(ssId));
 
+        if (HasAppData() && !AppDataVerified().FeatureFlags.GetEnableOlapCompression()) {
+            for (const auto& alterSchema : alter.GetAlterSchemaPresets()) {
+                for (const auto& alterColumn : alterSchema.GetAlterSchema().GetAlterColumns()) {
+                    if (alterColumn.HasSerializer()) {
+                        result->SetError(NKikimrScheme::StatusPreconditionFailed, "Compression is disabled for OLAP tables");
+                        return result;
+                    }
+                }
+            }
+        }
+
         if (!alter.HasName()) {
             result->SetError(NKikimrScheme::StatusInvalidParameter, "No store name in Alter");
             return result;

diff --git a/ydb/core/tx/schemeshard/olap/operations/alter_table.cpp b/ydb/core/tx/schemeshard/olap/operations/alter_table.cpp
@@ -265,6 +265,15 @@ class TAlterColumnTable: public TSubOperation {
 
         auto result = MakeHolder<TProposeResponse>(NKikimrScheme::StatusAccepted, ui64(OperationId.GetTxId()), ui64(ssId));
 
+        if (HasAppData() && !AppDataVerified().FeatureFlags.GetEnableOlapCompression()) {
+            for (const auto& alterColumn : Transaction.GetAlterColumnTable().GetAlterSchema().GetAlterColumns()) {
+                if (alterColumn.HasSerializer()) {
+                    result->SetError(NKikimrScheme::StatusPreconditionFailed, "Compression is disabled for OLAP tables");
+                    return result;
+                }
+            }
+        }
+
         const TString& parentPathStr = Transaction.GetWorkingDir();
         const TString& name = Transaction.HasAlterColumnTable() ? Transaction.GetAlterColumnTable().GetName() : Transaction.GetAlterTable().GetName();
         LOG_NOTICE_S(context.Ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,