Skip to content
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

Jump to bottom

Storages: Fix returned column types may not match in late-materialization (#9176) #9182

Merged
merged 3 commits into from
Jul 10, 2024
Merged

Storages: Fix returned column types may not match in late-materialization (#9176) #9182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27299af
This is an automated cherry-pick of #9176
JinheLin Jul 3, 2024
13e4763
Resolve conflict
JinheLin Jul 9, 2024
6cc92ef
Merge branch 'release-7.1' into cherry-pick-9176-to-release-7.1
Lloyd-Pottiger Jul 10, 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
10 changes: 10 additions & 0 deletions dbms/src/Storages/DeltaMerge/DeltaMergeDefines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,3 +164,13 @@ static constexpr bool DM_RUN_CHECK = true;

} // namespace DM
} // namespace DB

template <>
struct fmt::formatter<DB::DM::ColumnDefine>
{
template <typename FormatContext>
auto format(const DB::DM::ColumnDefine & cd, FormatContext & ctx) const -> decltype(ctx.out())
{
return fmt::format_to(ctx.out(), "{}/{}", cd.id, cd.type->getName());
}
};
21 changes: 13 additions & 8 deletions dbms/src/Storages/DeltaMerge/DeltaMergeStore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1075,10 +1075,11 @@ BlockInputStreams DeltaMergeStore::read(const Context & db_context,
GET_METRIC(tiflash_storage_read_tasks_count).Increment(tasks.size());
size_t final_num_stream = std::max(1, std::min(num_streams, tasks.size()));
auto read_mode = getReadMode(db_context, is_fast_scan, keep_order, filter);
const auto & final_columns_to_read = filter && filter->extra_cast ? *filter->columns_after_cast : columns_to_read;
auto read_task_pool = std::make_shared<SegmentReadTaskPool>(
physical_table_id,
dm_context,
columns_to_read,
final_columns_to_read,
filter,
max_version,
expected_block_size,
Expand All @@ -1098,7 +1099,7 @@ BlockInputStreams DeltaMergeStore::read(const Context & db_context,
{
stream = std::make_shared<UnorderedInputStream>(
read_task_pool,
filter && filter->extra_cast ? *filter->columns_after_cast : columns_to_read,
final_columns_to_read,
extra_table_id_index,
physical_table_id,
log_tracing_id);
Expand All @@ -1109,7 +1110,7 @@ BlockInputStreams DeltaMergeStore::read(const Context & db_context,
dm_context,
read_task_pool,
after_segment_read,
columns_to_read,
final_columns_to_read,
filter,
max_version,
expected_block_size,
Expand All @@ -1122,9 +1123,11 @@ BlockInputStreams DeltaMergeStore::read(const Context & db_context,
}
LOG_INFO(
tracing_logger,
"Read create stream done, pool_id={} num_streams={}",
"Read create stream done, pool_id={} num_streams={} columns_to_read={} final_columns_to_read={}",
read_task_pool->poolId(),
final_num_stream);
final_num_stream,
columns_to_read,
final_columns_to_read);

return res;
}
Expand Down Expand Up @@ -1170,10 +1173,11 @@ SourceOps DeltaMergeStore::readSourceOps(

GET_METRIC(tiflash_storage_read_tasks_count).Increment(tasks.size());
size_t final_num_stream = std::max(1, num_streams);
const auto & final_columns_to_read = filter && filter->extra_cast ? *filter->columns_after_cast : columns_to_read;
auto read_task_pool = std::make_shared<SegmentReadTaskPool>(
physical_table_id,
dm_context,
columns_to_read,
final_columns_to_read,
filter,
max_version,
expected_block_size,
Expand All @@ -1193,12 +1197,13 @@ SourceOps DeltaMergeStore::readSourceOps(
std::make_unique<UnorderedSourceOp>(
exec_status_,
read_task_pool,
columns_to_read,
final_columns_to_read,
extra_table_id_index,
physical_table_id,
log_tracing_id));
}
LOG_INFO(tracing_logger, "Read create SourceOp done, pool_id={} num_streams={}", read_task_pool->poolId(), final_num_stream);
LOG_INFO(tracing_logger, "Read create SourceOp done, pool_id={} num_streams={} columns_to_read={} final_columns_to_read={}",
read_task_pool->poolId(), final_num_stream, columns_to_read, final_columns_to_read);

return res;
}
Expand Down
190 changes: 190 additions & 0 deletions tests/fullstack-test/expr/duration_filter_late_materialization2.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,190 @@
# Copyright 2023 PingCAP, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

mysql> drop table if exists test.t;
mysql> create table if not exists test.t(a time(4), i int);

# insert more than 8192 rows to make sure filter conditions can be pushed down.
mysql> insert into test.t values('-000:10:10.123456', 1), ('000:11:11.123500', 2), ('000:12:12.123500', 3), ('000:13:13.123500', 4);
mysql> insert into test.t values('-001:10:10.123456', 1), ('001:11:11.123500', 2), ('001:12:12.123500', 3), ('001:13:13.123500', 4);
mysql> insert into test.t values('-002:10:10.123456', 1), ('002:11:11.123500', 2), ('002:12:12.123500', 3), ('002:13:13.123500', 4);
mysql> insert into test.t values('-003:10:10.123456', 1), ('003:11:11.123500', 2), ('003:12:12.123500', 3), ('003:13:13.123500', 4);
mysql> insert into test.t values('-004:10:10.123456', 1), ('004:11:11.123500', 2), ('004:12:12.123500', 3), ('004:13:13.123500', 4);
mysql> insert into test.t values('-005:10:10.123456', 1), ('005:11:11.123500', 2), ('005:12:12.123500', 3), ('005:13:13.123500', 4);
mysql> insert into test.t values('-006:10:10.123456', 1), ('006:11:11.123500', 2), ('006:12:12.123500', 3), ('006:13:13.123500', 4);
mysql> insert into test.t values('-007:10:10.123456', 1), ('007:11:11.123500', 2), ('007:12:12.123500', 3), ('007:13:13.123500', 4);
mysql> insert into test.t values('-008:10:10.123456', 1), ('008:11:11.123500', 2), ('008:12:12.123500', 3), ('008:13:13.123500', 4);
mysql> insert into test.t values('-009:10:10.123456', 1), ('009:11:11.123500', 2), ('009:12:12.123500', 3), ('009:13:13.123500', 4);
mysql> insert into test.t values('-010:10:10.123456', 1), ('010:11:11.123500', 2), ('010:12:12.123500', 3), ('010:13:13.123500', 4);
mysql> insert into test.t values('-011:10:10.123456', 1), ('011:11:11.123500', 2), ('011:12:12.123500', 3), ('011:13:13.123500', 4);
mysql> insert into test.t values('-012:10:10.123456', 1), ('012:11:11.123500', 2), ('012:12:12.123500', 3), ('012:13:13.123500', 4);
mysql> insert into test.t values('-013:10:10.123456', 1), ('013:11:11.123500', 2), ('013:12:12.123500', 3), ('013:13:13.123500', 4);
mysql> insert into test.t values('-014:10:10.123456', 1), ('014:11:11.123500', 2), ('014:12:12.123500', 3), ('014:13:13.123500', 4);
mysql> insert into test.t values('-015:10:10.123456', 1), ('015:11:11.123500', 2), ('015:12:12.123500', 3), ('015:13:13.123500', 4);
mysql> insert into test.t values('-016:10:10.123456', 1), ('016:11:11.123500', 2), ('016:12:12.123500', 3), ('016:13:13.123500', 4);
mysql> insert into test.t values('-017:10:10.123456', 1), ('017:11:11.123500', 2), ('017:12:12.123500', 3), ('017:13:13.123500', 4);
mysql> insert into test.t values('-018:10:10.123456', 1), ('018:11:11.123500', 2), ('018:12:12.123500', 3), ('018:13:13.123500', 4);
mysql> insert into test.t values('-019:10:10.123456', 1), ('019:11:11.123500', 2), ('019:12:12.123500', 3), ('019:13:13.123500', 4);
mysql> insert into test.t values('-020:10:10.123456', 1), ('020:11:11.123500', 2), ('020:12:12.123500', 3), ('020:13:13.123500', 4);
mysql> insert into test.t values('-021:10:10.123456', 1), ('021:11:11.123500', 2), ('021:12:12.123500', 3), ('021:13:13.123500', 4);
mysql> insert into test.t values('-022:10:10.123456', 1), ('022:11:11.123500', 2), ('022:12:12.123500', 3), ('022:13:13.123500', 4);
mysql> insert into test.t values('-023:10:10.123456', 1), ('023:11:11.123500', 2), ('023:12:12.123500', 3), ('023:13:13.123500', 4);
mysql> insert into test.t values('-024:10:10.123456', 1), ('024:11:11.123500', 2), ('024:12:12.123500', 3), ('024:13:13.123500', 4);
mysql> insert into test.t select * from test.t;
mysql> insert into test.t select * from test.t;
mysql> insert into test.t select * from test.t;
mysql> insert into test.t select * from test.t;
mysql> insert into test.t select * from test.t;
mysql> insert into test.t select * from test.t;
mysql> insert into test.t select * from test.t;

mysql> alter table test.t set tiflash replica 1;

func> wait_table test t

mysql> set tidb_isolation_read_engines='tiflash'; select hour(a), i from test.t where a = '024:11:11.123500';
+---------+------+
| hour(a) | i |
+---------+------+
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
| 24 | 2 |
+---------+------+

mysql> drop table test.t;