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.

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

*: fix release-8.5 darwin build #9648

Merged
merged 4 commits into from
Nov 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion dbms/src/Functions/tests/gtest_strings_replace.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ try
toVec({"你好世好", "你好好界", "你学世界", "习好世界"}),
executeFunction(
"replaceAll",
createConstColumn<String>(3, "你好世界"),
createConstColumn<String>(4, "你好世界"),
toVec({"界", "世", "好", "你"}),
toVec({"好", "好", "学", "习"})));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ Block ColumnFileSetWithVectorIndexInputStream::readImpl(FilterPtr & res_filter)
// read vector type column by vector index
auto tiny_reader = tiny_readers[current_file_index];
auto vec_column = vec_cd.type->createColumn();
const std::span file_selected_rows{selected_row_begin, selected_row_end};
const std::span file_selected_rows{&*selected_row_begin, selected_rows};
tiny_reader->read(vec_column, file_selected_rows, /* rowid_start_offset= */ read_rows, file_rows);
assert(vec_column->size() == file_rows);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ void ConcatVectorIndexBlockInputStream::load()
for (auto it = begin; it != end; ++it)
*it -= precedes_rows;
if (auto * index_stream = index_streams[i]; index_stream)
index_stream->setSelectedRows({begin, end});
index_stream->setSelectedRows({&*begin, static_cast<size_t>(std::distance(begin, end))});
else
RUNTIME_CHECK(begin == end);
precedes_rows += stream->rows[i];
Expand Down