Merge 6d21224 into cea9d83

ydb-platform · Sep 6, 2024 · 553b4a7 · 553b4a7
2 parents cea9d83 + 6d21224
commit 553b4a7
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 4 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
@@ -157,4 +157,5 @@ message TFeatureFlags {
     optional bool EnableAlterShardingInColumnShard = 138 [default = false];
     optional bool EnablePgSyntax = 139 [default = true];
     optional bool EnableTieringInColumnShard = 140 [default = false];
+    optional bool EnableOlapCompression = 141 [default = false];
 }
diff --git a/ydb/core/testlib/basics/feature_flags.h b/ydb/core/testlib/basics/feature_flags.h
@@ -66,6 +66,7 @@ class TTestFeatureFlagsHolder {
     FEATURE_FLAG_SETTER(EnableGranularTimecast)
     FEATURE_FLAG_SETTER(EnablePgSyntax)
     FEATURE_FLAG_SETTER(EnableTieringInColumnShard)
+    FEATURE_FLAG_SETTER(EnableOlapCompression)
 
     #undef FEATURE_FLAG_SETTER
 };

diff --git a/ydb/core/tx/schemeshard/olap/operations/alter_store.cpp b/ydb/core/tx/schemeshard/olap/operations/alter_store.cpp
@@ -434,6 +434,18 @@ class TAlterOlapStore: public TSubOperation {
         }
     }
 
+    bool isAlterCompression() const {
+        const auto& alter = Transaction.GetAlterColumnStore();
+        for (const auto& alterSchema : alter.GetAlterSchemaPresets()) {
+            for (const auto& alterColumn : alterSchema.GetAlterSchema().GetAlterColumns()) {
+                if (alterColumn.HasSerializer()) {
+                        return true;
+                }
+            }
+        }
+        return false;
+    }
+
 public:
     using TSubOperation::TSubOperation;
 
@@ -458,6 +470,11 @@ class TAlterOlapStore: public TSubOperation {
             return result;
         }
 
+        if (!AppDataVerified().FeatureFlags.GetEnableOlapCompression() && isAlterCompression()) {
+            result->SetError(NKikimrScheme::StatusPreconditionFailed, "Compression is disabled for OLAP tables");
+            return result;
+        }
+
         TPath path = TPath::Resolve(parentPathStr, context.SS).Dive(name);
         {
             TPath::TChecker checks = path.Check();

diff --git a/ydb/core/tx/schemeshard/olap/operations/alter_table.cpp b/ydb/core/tx/schemeshard/olap/operations/alter_table.cpp
@@ -257,6 +257,15 @@ class TAlterColumnTable: public TSubOperation {
         }
     }
 
+    bool isAlterCompression() const {
+        for (const auto& alterColumn : Transaction.GetAlterColumnTable().GetAlterSchema().GetAlterColumns()) {
+            if (alterColumn.HasSerializer()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
 public:
     using TSubOperation::TSubOperation;
 
@@ -270,6 +279,11 @@ class TAlterColumnTable: public TSubOperation {
             result->SetError(NKikimrScheme::StatusPreconditionFailed, "Alter sharding is disabled for OLAP tables");
             return result;
         }
+
+        if (!AppDataVerified().FeatureFlags.GetEnableOlapCompression() && isAlterCompression()) {
+            result->SetError(NKikimrScheme::StatusPreconditionFailed, "Compression is disabled for OLAP tables");
+            return result;
+        }
 
         const bool hasTiering = Transaction.HasAlterColumnTable() && Transaction.GetAlterColumnTable().HasAlterTtlSettings() &&
                                 Transaction.GetAlterColumnTable().GetAlterTtlSettings().HasUseTiering();