Skip to content

23.8.16.43 Pre-release #563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Dec 16, 2024
Merged

23.8.16.43 Pre-release #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fad15e1
Update Cargo.toml
MyroTk Dec 10, 2024
f73b996
Update Cargo.toml
MyroTk Dec 12, 2024
122a2cb
Update Cargo.toml
MyroTk Dec 12, 2024
ad9332f
Update Cargo.toml
MyroTk Dec 12, 2024
2a22977
Merge pull request #550 from Altinity/23.8_pin_cxx_version
MyroTk Dec 12, 2024
76bba0a
row_policy_zero_expression: initial
ilejn Mar 27, 2024
f33e5e7
row_policy_zero_expression: forgotten reference file
ilejn Mar 27, 2024
97a7e1a
row_policy_zero_expression: use RowPolicyFilter::empty()
ilejn Mar 29, 2024
71c7555
Merge pull request #534 from Altinity/backports/23.8/61971_crash_in_e…
Enmk Dec 13, 2024
af49172
Bumped version to 23.8.16.43
Enmk Dec 13, 2024
5aa5983
Merge pull request #562 from Altinity/Enmk-patch-2
Enmk Dec 16, 2024
2730d2a
Merge branch 'releases/23.8.16' into customizations/23.8.16
Enmk Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cmake/autogenerated_versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions rust/skim/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion src/Storages/StorageMerge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 8 additions & 0 deletions tests/queries/0_stateless/02763_row_policy_storage_merge.reference
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -312,3 +316,7 @@ SELECT x, y from merge(currentDatabase(), 02763_merge
4 14
4 14
4 14
USING 0
USING 1
zzz
====
23 changes: 23 additions & 0 deletions tests/queries/0_stateless/02763_row_policy_storage_merge.sql.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 %}
Loading