Merge pull request #563 from Altinity/customizations/23.8.16

23.8.16.43 Pre-release

Author: Enmk

cmake/autogenerated_versions.txt

@@ -8,9 +8,9 @@ SET(VERSION_MINOR 8)
 SET(VERSION_PATCH 16)
 
 SET(VERSION_GITHASH 060ff8e813a4a16a540063127f8c91e2108d9adf)
-SET(VERSION_TWEAK 42)
+SET(VERSION_TWEAK 43)
 SET(VERSION_FLAVOUR altinitystable)
 
-SET(VERSION_DESCRIBE v23.8.16.42.altinitystable)
-SET(VERSION_STRING 23.8.16.42.altinitystable)
+SET(VERSION_DESCRIBE v23.8.16.43.altinitystable)
+SET(VERSION_STRING 23.8.16.43.altinitystable)
 # end of autochange

rust/skim/Cargo.toml

@@ -7,11 +7,11 @@ edition = "2021"
 
 [dependencies]
 skim = { version = "0.10.2", default-features = false }
-cxx = "1.0.83"
+cxx = "=1.0.83"
 term = "0.7.0"
 
 [build-dependencies]
-cxx-build = "1.0.83"
+cxx-build = "=1.0.83"
 
 [lib]
 crate-type = ["staticlib"]

src/Storages/StorageMerge.cpp

@@ -688,7 +688,7 @@ QueryPipelineBuilderPtr ReadFromMerge::createSources(
         database_name,
         table_name,
         RowPolicyFilterType::SELECT_FILTER);
-    if (row_policy_filter_ptr)
+    if (row_policy_filter_ptr && !row_policy_filter_ptr->empty())
     {
         row_policy_data_ptr = std::make_unique<RowPolicyData>(row_policy_filter_ptr, storage, context);
         row_policy_data_ptr->extendNames(real_column_names);

tests/queries/0_stateless/02763_row_policy_storage_merge.reference

@@ -166,6 +166,10 @@ SELECT x, y from merge(currentDatabase(), 02763_merge
 4	14
 4	14
 4	14
+USING 0
+USING 1
+zzz
+====
 SETTINGS optimize_move_to_prewhere= 1
 SELECT * FROM 02763_merge_log_1
 3	13
@@ -312,3 +316,7 @@ SELECT x, y from merge(currentDatabase(), 02763_merge
 4	14
 4	14
 4	14
+USING 0
+USING 1
+zzz
+====

tests/queries/0_stateless/02763_row_policy_storage_merge.sql.j2

@@ -129,6 +129,27 @@ SELECT x, lc, cnst from merge(currentDatabase(), '02763_merge_fancycols') ORDER
 SELECT 'SELECT x, y from merge(currentDatabase(), 02763_merge';
 SELECT x, y from merge(currentDatabase(), '02763_merge') ORDER BY x SETTINGS optimize_move_to_prewhere= {{prew}};
 
+
+
+CREATE TABLE 02763_t1 ( b String ) ENGINE = MergeTree() ORDER BY tuple();
+INSERT INTO 02763_t1 VALUES('zzz');
+CREATE TABLE 02763_t2 AS 02763_t1 ENGINE = Merge(currentDatabase(), '02763_t1');
+
+SELECT 'USING 0';
+CREATE ROW POLICY OR REPLACE 02763_filter_t1 ON 02763_t1 USING 0 TO ALL;
+SELECT * FROM 02763_t2 SETTINGS optimize_move_to_prewhere= {{prew}};
+
+SELECT 'USING 1';
+CREATE ROW POLICY OR REPLACE 02763_filter_t1 ON 02763_t1 USING 1 TO ALL;
+SELECT * FROM 02763_t2 SETTINGS optimize_move_to_prewhere= {{prew}};
+
+
+DROP TABLE 02763_t1;
+DROP TABLE 02763_t2;
+SELECT '====';
+
+
+
 DROP TABLE 02763_merge_fancycols;
 
 DROP ROW POLICY 02763_filter_1 ON 02763_merge_log_1;
@@ -140,4 +161,6 @@ DROP ROW POLICY 02763_filter_4 ON 02763_merge_merge_1;
 DROP ROW POLICY 02763_filter_5 ON 02763_merge_fancycols;
 DROP ROW POLICY 02763_filter_6 ON 02763_merge_fancycols;
 
+DROP ROW POLICY 02763_filter_t1 ON 02763_t1;
+
 {% endfor %}