Merge d90e2f7b19 into 49fc7936d2

Backport #69684 to 24.6: Prohibit `ALTER TABLE ... ADD INDEX ... TYPE` inverted if setting = 0

src/Planner/Planner.cpp

@@ -1281,7 +1281,8 @@ void Planner::buildPlanForUnionNode()
 
     for (const auto & query_node : union_queries_nodes)
     {
-        Planner query_planner(query_node, select_query_options);
+        Planner query_planner(query_node, select_query_options, planner_context->getGlobalPlannerContext());
+
         query_planner.buildQueryPlanIfNeeded();
         for (const auto & row_policy : query_planner.getUsedRowPolicies())
             used_row_policies.insert(row_policy);

src/Storages/AlterCommands.cpp

@@ -1142,6 +1142,16 @@ bool AlterCommands::hasFullTextIndex(const StorageInMemoryMetadata & metadata)
     return false;
 }
 
+bool AlterCommands::hasLegacyInvertedIndex(const StorageInMemoryMetadata & metadata)
+{
+    for (const auto & index : metadata.secondary_indices)
+    {
+        if (index.type == INVERTED_INDEX_NAME)
+            return true;
+    }
+    return false;
+}
+
 void AlterCommands::apply(StorageInMemoryMetadata & metadata, ContextPtr context) const
 {
     if (!prepared)

src/Storages/AlterCommands.h

@@ -235,8 +235,10 @@ public:
     /// additional mutation command (MATERIALIZE_TTL) will be returned.
     MutationCommands getMutationCommands(StorageInMemoryMetadata metadata, bool materialize_ttl, ContextPtr context, bool with_alters=false) const;
 
-    /// Check if commands have any full-text index
+    /// Check if commands have any full-text index or a (legacy) inverted index
     static bool hasFullTextIndex(const StorageInMemoryMetadata & metadata);
+    static bool hasLegacyInvertedIndex(const StorageInMemoryMetadata & metadata);
+
 };
 
 }

src/Storages/MergeTree/MergeTreeData.cpp

@@ -3212,6 +3212,10 @@ void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, Context
         throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
                 "Experimental full-text index feature is not enabled (turn on setting 'allow_experimental_full_text_index')");
 
+    if (AlterCommands::hasLegacyInvertedIndex(new_metadata) && !settings.allow_experimental_inverted_index)
+        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
+                "Experimental inverted index feature is not enabled (turn on setting 'allow_experimental_inverted_index')");
+
     for (const auto & disk : getDisks())
         if (!disk->supportsHardLinks() && !commands.isSettingsAlter() && !commands.isCommentAlter())
             throw Exception(

tests/queries/0_stateless/02346_inverted_index_experimental_flag.sql

@@ -1,16 +1,60 @@
--- Tests that the inverted index can only be supported when allow_experimental_full_text_index = 1.
-
-SET allow_experimental_full_text_index = 0;
+-- Tests that CREATE TABLE and ADD INDEX respect settings 'allow_experimental_full_text_index' and `allow_experimental_inverted_index`
 
 DROP TABLE IF EXISTS tab;
-CREATE TABLE tab
-(
-    `key` UInt64,
-    `str` String
-)
-ENGINE = MergeTree
-ORDER BY key;
 
-ALTER TABLE tab ADD INDEX inv_idx(str) TYPE full_text(0); -- { serverError SUPPORT_IS_DISABLED }
+-- Test CREATE TABLE + full_text index setting
 
+SET allow_experimental_full_text_index = 0;
+CREATE TABLE tab (id UInt32, str String, INDEX idx str TYPE full_text(0)) ENGINE = MergeTree ORDER BY tuple(); -- { serverError SUPPORT_IS_DISABLED }
+CREATE TABLE tab (id UInt32, str String, INDEX idx str TYPE inverted(0)) ENGINE = MergeTree ORDER BY tuple(); -- { serverError ILLEGAL_INDEX }
+
+SET allow_experimental_full_text_index = 1;
+CREATE TABLE tab (id UInt32, str String, INDEX idx str TYPE full_text(0)) ENGINE = MergeTree ORDER BY tuple();
+CREATE TABLE tab (id UInt32, str String, INDEX idx str TYPE inverted(0)) ENGINE = MergeTree ORDER BY tuple(); -- { serverError ILLEGAL_INDEX }
 DROP TABLE tab;
+
+SET allow_experimental_full_text_index = 0; -- reset to default
+
+-- Test CREATE TABLE + inverted index setting
+
+SET allow_experimental_inverted_index = 0;
+CREATE TABLE tab (id UInt32, str String, INDEX idx str TYPE full_text(0)) ENGINE = MergeTree ORDER BY tuple(); -- { serverError SUPPORT_IS_DISABLED }
+CREATE TABLE tab (id UInt32, str String, INDEX idx str TYPE inverted(0)) ENGINE = MergeTree ORDER BY tuple(); -- { serverError ILLEGAL_INDEX }
+
+SET allow_experimental_inverted_index = 1;
+CREATE TABLE tab (id UInt32, str String, INDEX idx str TYPE full_text(0)) ENGINE = MergeTree ORDER BY tuple(); -- { serverError SUPPORT_IS_DISABLED }
+CREATE TABLE tab (id UInt32, str String, INDEX idx str TYPE inverted(0)) ENGINE = MergeTree ORDER BY tuple();
+DROP TABLE tab;
+
+SET allow_experimental_inverted_index = 0; -- reset to default
+
+-- Test ADD INDEX + full_text index setting
+
+SET allow_experimental_full_text_index = 0;
+CREATE TABLE tab (id UInt32, str String) ENGINE = MergeTree ORDER BY tuple();
+ALTER TABLE tab ADD INDEX idx1 str TYPE full_text(0);  -- { serverError SUPPORT_IS_DISABLED }
+ALTER TABLE tab ADD INDEX idx2 str TYPE inverted(0); -- { serverError SUPPORT_IS_DISABLED }
+DROP TABLE tab;
+
+SET allow_experimental_full_text_index = 1;
+CREATE TABLE tab (id UInt32, str String) ENGINE = MergeTree ORDER BY tuple();
+ALTER TABLE tab ADD INDEX idx1 str TYPE full_text(0);
+ALTER TABLE tab ADD INDEX idx2 str TYPE inverted(0); -- { serverError SUPPORT_IS_DISABLED }
+DROP TABLE tab;
+SET allow_experimental_full_text_index = 0; -- reset to default
+
+
+-- Test ADD INDEX + inverted index setting
+
+SET allow_experimental_inverted_index = 0;
+CREATE TABLE tab (id UInt32, str String) ENGINE = MergeTree ORDER BY tuple();
+ALTER TABLE tab ADD INDEX idx1 str TYPE full_text(0);  -- { serverError SUPPORT_IS_DISABLED }
+ALTER TABLE tab ADD INDEX idx2 str TYPE inverted(0); -- { serverError SUPPORT_IS_DISABLED }
+DROP TABLE tab;
+
+SET allow_experimental_inverted_index = 1;
+CREATE TABLE tab (id UInt32, str String) ENGINE = MergeTree ORDER BY tuple();
+ALTER TABLE tab ADD INDEX idx1 str TYPE full_text(0); -- { serverError SUPPORT_IS_DISABLED }
+ALTER TABLE tab ADD INDEX idx2 str TYPE inverted(0);
+DROP TABLE tab;
+SET allow_experimental_inverted_index = 0; -- reset to default

tests/queries/0_stateless/03231_pr_duplicate_announcement.reference

@@ -0,0 +1,2 @@
+0	Value_0
+1	Value_1

tests/queries/0_stateless/03231_pr_duplicate_announcement.sql

@@ -0,0 +1,23 @@
+DROP TABLE IF EXISTS test_table SYNC;
+CREATE TABLE test_table
+(
+    id UInt64,
+    value String
+) ENGINE=ReplicatedMergeTree('/clickhouse/test/{database}/test_table', 'r1') ORDER BY tuple();
+
+INSERT INTO test_table VALUES (0, 'Value_0'), (1, 'Value_1'), (2, 'Value_2');
+
+DROP TABLE IF EXISTS test_table_for_in SYNC;
+CREATE TABLE test_table_for_in
+(
+    id UInt64
+) ENGINE=ReplicatedMergeTree('/clickhouse/test/{database}/test_table_for_in', 'r1') ORDER BY tuple();
+
+INSERT INTO test_table_for_in VALUES (0), (1);
+
+SET allow_experimental_parallel_reading_from_replicas=1, max_parallel_replicas=3, cluster_for_parallel_replicas='test_cluster_one_shard_three_replicas_localhost';
+
+SELECT id, value FROM test_table WHERE id IN (SELECT id FROM test_table_for_in UNION DISTINCT SELECT id FROM test_table_for_in);
+
+DROP TABLE test_table SYNC;
+DROP TABLE test_table_for_in SYNC;

tests/queries/0_stateless/03231_pr_duplicate_announcement_2.reference

@@ -0,0 +1 @@
+CAT	2

tests/queries/0_stateless/03231_pr_duplicate_announcement_2.sql

@@ -0,0 +1,45 @@
+DROP TABLE IF EXISTS ANIMAL SYNC;
+
+CREATE TABLE ANIMAL ( ANIMAL Nullable(String) ) ENGINE = ReplicatedMergeTree('/clickhouse/test/{database}/animal', 'r1') ORDER BY tuple();
+
+INSERT INTO ANIMAL (ANIMAL) VALUES ('CAT'), ('FISH'), ('DOG'), ('HORSE'), ('BIRD');
+
+SET joined_subquery_requires_alias = 0;
+SET allow_experimental_parallel_reading_from_replicas=1, max_parallel_replicas=3, cluster_for_parallel_replicas='test_cluster_one_shard_three_replicas_localhost';
+
+SELECT *
+FROM
+(
+    SELECT
+        x.b AS x,
+        countDistinct(x.c) AS ANIMAL
+    FROM
+    (
+        SELECT
+            a.ANIMAL AS a,
+            'CAT' AS b,
+            c.ANIMAL AS c,
+            d.ANIMAL AS d
+        FROM ANIMAL AS a
+        INNER JOIN ANIMAL AS b ON a.ANIMAL = b.ANIMAL
+        LEFT JOIN ANIMAL AS c ON b.ANIMAL = c.ANIMAL
+        RIGHT JOIN
+        (
+            SELECT *
+            FROM ANIMAL
+            UNION ALL
+            SELECT *
+            FROM ANIMAL
+            UNION ALL
+            SELECT *
+            FROM ANIMAL
+        ) AS d ON a.ANIMAL = d.ANIMAL
+        WHERE (d.ANIMAL != 'CAT') AND (c.ANIMAL != 'DOG') AND (b.ANIMAL != 'FISH')
+    ) AS x
+    WHERE x.b >= 'CAT'
+    GROUP BY x.b
+    HAVING ANIMAL >= 0
+) AS ANIMAL
+WHERE ANIMAL.ANIMAL >= 0;
+
+DROP TABLE ANIMAL SYNC;