thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-25 00:52:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20303 from azat/constant-folding-fixes

Browse Source 
Do not allow early constant folding of explicitly forbidden functions
This commit is contained in:
alexey-milovidov 2021-02-13 02:20:06 +03:00 committed by GitHub
commit 371e84957a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Functions/ignore.cpp
View File

@ -29,6 +29,7 @@ public:
}
bool useDefaultImplementationForNulls() const override { return false; }
bool isSuitableForConstantFolding() const override { return false; }
/// We should never return LowCardinality result, cause we declare that result is always constant zero.
/// (in getResultIfAlwaysReturnsConstantAndHasArguments)

3
src/Interpreters/ExpressionAnalyzer.cpp
View File

@ -89,8 +89,7 @@ bool allowEarlyConstantFolding(const ActionsDAG & actions, const Settings & sett
{
if (node.type == ActionsDAG::ActionType::FUNCTION && node.function_base)
{
auto name = node.function_base->getName();
if (name == "ignore")
if (!node.function_base->isSuitableForConstantFolding())
return false;
}
}

6
tests/integration/test_system_merges/test.py
View File

@ -134,7 +134,9 @@ def test_mutation_simple(started_cluster, replicated):
result_part = "all_{}_{}_0_{}".format(starting_block, starting_block, starting_block + 1)
def alter():
node1.query("ALTER TABLE {name} UPDATE a = 42 WHERE sleep(2) OR 1".format(name=name))
node1.query("ALTER TABLE {name} UPDATE a = 42 WHERE sleep(2) OR 1".format(name=name), settings={
'mutations_sync': 1,
})
t = threading.Thread(target=alter)
t.start()
@ -159,8 +161,6 @@ def test_mutation_simple(started_cluster, replicated):
]
t.join()
time.sleep(1.5)
assert node_check.query("SELECT * FROM system.merges WHERE table = '{name}'".format(name=table_name)) == ""
finally:

1
tests/queries/0_stateless/00597_push_down_predicate.reference
View File

@ -115,6 +115,7 @@ FROM
SELECT
1 AS id,
identity(cast(1, \'UInt8\')) AS subquery
WHERE subquery = 1
)
WHERE subquery = 1
1 1

2
tests/queries/0_stateless/01029_early_constant_folding.reference
View File

@ -2,7 +2,7 @@ SELECT 1
WHERE 0
SELECT 1
SELECT 1
WHERE 0
WHERE (1 IN (0, 2)) AND (2 = (identity(cast(2, \'UInt8\')) AS subquery))
SELECT 1
WHERE 1 IN (
(

2
tests/queries/0_stateless/01029_early_constant_folding.sql
View File

@ -4,7 +4,7 @@ EXPLAIN SYNTAX SELECT 1 WHERE 1 = 0;
EXPLAIN SYNTAX SELECT 1 WHERE 1 IN (0, 1, 2);
EXPLAIN SYNTAX SELECT 1 WHERE 1 IN (0, 2) AND 2 = (SELECT 2);
EXPLAIN SYNTAX SELECT 1 WHERE 1 IN (0, 2) AND 2 = ((SELECT 2) AS subquery);
-- no constant folding

2
tests/queries/0_stateless/01611_constant_folding_subqueries.reference
View File

@ -7,3 +7,5 @@ EXPLAIN SYNTAX SELECT (SELECT * FROM system.numbers LIMIT 1 OFFSET 1) AS n, toUI
SELECT
identity(cast(0, \'UInt64\')) AS n,
toUInt64(10 / n)
SELECT * FROM (WITH (SELECT * FROM system.numbers LIMIT 1 OFFSET 1) AS n, toUInt64(10 / n) as q SELECT * FROM system.one WHERE q > 0);
0

1
tests/queries/0_stateless/01611_constant_folding_subqueries.sql
View File

@ -2,3 +2,4 @@
SELECT * FROM (SELECT (SELECT * FROM system.numbers LIMIT 1 OFFSET 1) AS n, toUInt64(10 / n)) FORMAT CSV;
SELECT (SELECT * FROM system.numbers LIMIT 1 OFFSET 1) AS n, toUInt64(10 / n) FORMAT CSV;
EXPLAIN SYNTAX SELECT (SELECT * FROM system.numbers LIMIT 1 OFFSET 1) AS n, toUInt64(10 / n);
SELECT * FROM (WITH (SELECT * FROM system.numbers LIMIT 1 OFFSET 1) AS n, toUInt64(10 / n) as q SELECT * FROM system.one WHERE q > 0);