Skip to content

tici: adapt to count FFI #10860

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

Merged
ti-chi-bot merged 4 commits into from
May 25, 2026
+25 −32
Merged

tici: adapt to count FFI #10860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4e2887b
ci
JinheLin May 22, 2026
0d752bb
ci
JinheLin May 22, 2026
cb3dd8e
ci
JinheLin May 22, 2026
9746492
ci
JinheLin May 25, 2026
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 contrib/tici
Open in desktop
Submodule tici updated from 780a9b to 648983
55 changes: 24 additions & 31 deletions dbms/src/Storages/Tantivy/TantivyInputStream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,32 @@ class TantivyInputStream : public IProfilingBlockInputStream
protected:
Block readFromS3(bool is_count)
{
auto return_fields = getFields(return_columns);
auto shard_info = query_shard_info;
LOG_DEBUG(log, "shard info: {}", shard_info.toString());
auto key_ranges = getKeyRanges(shard_info.key_ranges);

const auto shard = ::Shard{
.keyspace_id = keyspace_id,
.index_id = index_id,
.shard_id = shard_info.shard_id,
.shard_epoch = shard_info.shard_epoch,
};

RUNTIME_CHECK(shards_snapshot != nullptr);

Block res(return_columns);
if (is_count)
{
CountResult count_result = count(**shards_snapshot, shard, key_ranges, match_expr, read_ts);

RUNTIME_CHECK_MSG(return_columns.size() == 1, "count search should return one column");
auto & column = res.getByPosition(0).column->assumeMutableRef();
column.insert(Int64(count_result.count));
return res;
}

auto return_fields = getFields(return_columns);

rust::Vec<rust::String> tici_sort_column_names;
for (const auto & sort_column_id : sort_column_ids)
{
Expand All @@ -120,37 +141,9 @@ class TantivyInputStream : public IProfilingBlockInputStream
.sort_field_names = std::move(tici_sort_column_names),
.is_asc = std::move(tici_sort_column_asc),
};
if (is_count)
return_fields = {};

RUNTIME_CHECK(shards_snapshot != nullptr);
SearchResult search_result = search(
**shards_snapshot,
{
.keyspace_id = keyspace_id,
.index_id = index_id,
.shard_id = shard_info.shard_id,
.shard_epoch = shard_info.shard_epoch,
},
key_ranges,
return_fields,
match_expr,
search_param,
read_ts);

Block res(return_columns);
if (is_count)
{
RUNTIME_CHECK_MSG(return_columns.size() == 1, "count search should return one column");
auto & column = res.getByPosition(0).column->assumeMutableRef();
column.insert(Int64(search_result.count));
return res;
}

RUNTIME_CHECK_MSG(
search_result.result_type == result_type_rows(),
"expected row search result, got type {}",
search_result.result_type);
SearchResult search_result
= search(**shards_snapshot, shard, key_ranges, return_fields, match_expr, search_param, read_ts);

const auto row_count = static_cast<size_t>(search_result.row_count);
if (row_count == 0)
Expand Down