Skip to content
This repository was archived by the owner on May 9, 2024. It is now read-only.

Commit 866bb52

Browse files
committed
s
1 parent b55bf1b commit 866bb52

File tree

7 files changed

+417
-115
lines changed

7 files changed

+417
-115
lines changed

omniscidb/QueryEngine/ColumnFetcher.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ JoinColumn ColumnFetcher::makeJoinColumn(
147147
data_provider,
148148
column_cache);
149149
if (col_buff != nullptr) {
150+
join_chunk_array[num_chunks] = JoinChunk{col_buff, elem_count, num_elems};
150151
num_elems += elem_count;
151-
join_chunk_array[num_chunks] = JoinChunk{col_buff, elem_count};
152152
} else {
153153
continue;
154154
}
@@ -363,8 +363,8 @@ const int8_t* ColumnFetcher::getAllTableColumnFragments(
363363
raw_write_ptrs.emplace_back(write_ptrs[i].first);
364364
}
365365

366-
std::unique_ptr<ColumnarResults> merged_results(
367-
new ColumnarResults(raw_write_ptrs, total_row_count, col_info->type, thread_idx));
366+
std::unique_ptr<ColumnarResults> merged_results(new ColumnarResults(
367+
std::move(raw_write_ptrs), total_row_count, col_info->type, thread_idx));
368368

369369
table_column = merged_results.get();
370370
columnarized_scan_table_cache_.emplace(std::make_pair(table_id, col_id),

omniscidb/QueryEngine/JoinHashTable/Builders/PerfectHashTableBuilder.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ class PerfectJoinHashTableBuilder {
179179
// std::atomic<int> err{0};
180180
{
181181
auto timer_fill =
182-
DEBUG_TIMER("CPU One-To-One Perfect-Hash: fill_hash_join_buff_bucketized");
182+
DEBUG_TIMER("CPU One-To-One Perfect-Hash: fill_hash_join_buff_bucketized_cpu");
183183

184184
{
185185
// int partial_err = 0;

0 commit comments

Comments
 (0)