Skip to content

Commit 62fb024

Browse files
*: fix release-8.5 darwin build (#9648)
close #9647 Signed-off-by: Lloyd-Pottiger <yan1579196623@gmail.com> Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
1 parent 4e66879 commit 62fb024

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

dbms/src/Functions/tests/gtest_strings_replace.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ try
220220
toVec({"你好世好", "你好好界", "你学世界", "习好世界"}),
221221
executeFunction(
222222
"replaceAll",
223-
createConstColumn<String>(3, "你好世界"),
223+
createConstColumn<String>(4, "你好世界"),
224224
toVec({"", "", "", ""}),
225225
toVec({"", "", "", ""})));
226226
}

dbms/src/Storages/DeltaMerge/ColumnFile/ColumnFileSetWithVectorIndexInputStream.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ Block ColumnFileSetWithVectorIndexInputStream::readImpl(FilterPtr & res_filter)
132132
// read vector type column by vector index
133133
auto tiny_reader = tiny_readers[current_file_index];
134134
auto vec_column = vec_cd.type->createColumn();
135-
const std::span file_selected_rows{selected_row_begin, selected_row_end};
135+
const std::span file_selected_rows{&*selected_row_begin, selected_rows};
136136
tiny_reader->read(vec_column, file_selected_rows, /* rowid_start_offset= */ read_rows, file_rows);
137137
assert(vec_column->size() == file_rows);
138138

dbms/src/Storages/DeltaMerge/ConcatSkippableBlockInputStream.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ void ConcatVectorIndexBlockInputStream::load()
231231
for (auto it = begin; it != end; ++it)
232232
*it -= precedes_rows;
233233
if (auto * index_stream = index_streams[i]; index_stream)
234-
index_stream->setSelectedRows({begin, end});
234+
index_stream->setSelectedRows({&*begin, static_cast<size_t>(std::distance(begin, end))});
235235
else
236236
RUNTIME_CHECK(begin == end);
237237
precedes_rows += stream->rows[i];

0 commit comments

Comments
 (0)