thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-19 16:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix small value DateTime64 constant folding in nested query

Browse Source
This commit is contained in:
shiyer7474 2024-08-13 08:38:30 +00:00
parent 58ed71bf11
commit 7f005a6ca4
3 changed files with 65 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Analyzer/ConstantNode.cpp
View File

@ -177,9 +177,15 @@ ASTPtr ConstantNode::toASTImpl(const ConvertToASTOptions & options) const
* It could also lead to ambiguous parsing because we don't know if the string literal represents a date or a Decimal64 literal.
* For this reason, we use a string literal representing a date instead of a Decimal64 literal.
*/
if (WhichDataType(constant_value_type->getTypeId()).isDateTime64())
if ((WhichDataType(constant_value_type->getTypeId()).isDateTime64()) ||
(WhichDataType(constant_value_type->getTypeId()).isNullable() && WhichDataType((typeid_cast<const DataTypeNullable *>(constant_value_type.get()))->getNestedType()->getTypeId()).isDateTime64()))
{
const auto * date_time_type = typeid_cast<const DataTypeDateTime64 *>(constant_value_type.get());
const DataTypeDateTime64 * date_time_type = nullptr;
if (WhichDataType(constant_value_type->getTypeId()).isNullable())
date_time_type = typeid_cast<const DataTypeDateTime64 *>((typeid_cast<const DataTypeNullable *>(constant_value_type.get()))->getNestedType().get());
else
date_time_type = typeid_cast<const DataTypeDateTime64 *>(constant_value_type.get());
DecimalField<Decimal64> decimal_value;
if (constant_value_literal.tryGet<DecimalField<Decimal64>>(decimal_value))
{

18
tests/queries/0_stateless/03222_datetime64_small_value_const.reference Normal file
View File

@ -0,0 +1,18 @@
0 1970-01-01 00:00:00.000
0 1970-01-01 00:00:05.000
0 1970-01-01 00:45:25.456789
0 1970-01-01 00:53:25.456789123
0 \N
1 1970-01-01 00:00:00.000
5 1970-01-01 00:00:00.000
2 1970-01-01 00:00:02.456
3 1970-01-01 00:00:04.811
4 1970-01-01 00:10:05.000
4 1970-01-01 00:10:05.000
1 1970-01-01 00:00:00.000
2 1970-01-01 00:00:02.456
3 1970-01-01 00:00:04.811
5 1970-01-01 00:00:00.000
0
0
5

39
tests/queries/0_stateless/03222_datetime64_small_value_const.sql Normal file
View File

@ -0,0 +1,39 @@
-- Tags: shard
select *, (select toDateTime64(0, 3)) from remote('127.0.0.1', system.one) settings prefer_localhost_replica=0;
select *, (select toDateTime64(5, 3)) from remote('127.0.0.1', system.one) settings prefer_localhost_replica=0;
select *, (select toDateTime64('1970-01-01 00:45:25.456789', 6)) from remote('127.0.0.1', system.one) settings prefer_localhost_replica=0;
select *, (select toDateTime64('1970-01-01 00:53:25.456789123', 9)) from remote('127.0.0.1', system.one) settings prefer_localhost_replica=0;
select *, (select toDateTime64(null,3)) from remote('127.0.0.1', system.one) settings prefer_localhost_replica=0;
create database if not exists shard_0;
create database if not exists shard_1;
drop table if exists shard_0.dt64_03222;
drop table if exists shard_1.dt64_03222;
drop table if exists distr_03222_dt64;
create table shard_0.dt64_03222(id UInt64, dt DateTime64(3)) engine = MergeTree order by id;
create table shard_1.dt64_03222(id UInt64, dt DateTime64(3)) engine = MergeTree order by id;
create table distr_03222_dt64 (id UInt64, dt DateTime64(3)) engine = Distributed(test_cluster_two_shards_different_databases, '', dt64_03222);
insert into shard_0.dt64_03222 values(1, toDateTime64('1970-01-01 00:00:00.000',3))
insert into shard_0.dt64_03222 values(2, toDateTime64('1970-01-01 00:00:02.456',3));
insert into shard_1.dt64_03222 values(3, toDateTime64('1970-01-01 00:00:04.811',3));
insert into shard_1.dt64_03222 values(4, toDateTime64('1970-01-01 00:10:05',3));
insert into shard_1.dt64_03222 values(5, toDateTime64(0,3));
--Output : 1,5 2,3,4 4 1,2,3,5 0 0 5
select id, dt from distr_03222_dt64 where dt = (select toDateTime64(0,3)) order by id;
select id, dt from distr_03222_dt64 where dt > (select toDateTime64(0,3)) order by id;
select id, dt from distr_03222_dt64 where dt > (select toDateTime64('1970-01-01 00:10:00.000',3)) order by id;
select id, dt from distr_03222_dt64 where dt < (select toDateTime64(5,3)) order by id;
select count(*) from distr_03222_dt64 where dt > (select toDateTime64('2024-07-20 00:00:00',3));
select count(*) from distr_03222_dt64 where dt > (select now());
select count(*) from distr_03222_dt64 where dt < (select toDateTime64('2004-07-20 00:00:00',3));
drop table if exists shard_0.dt64_03222;
drop table if exists shard_1.dt64_03222;
drop table if exists distr_03222_dt64;