Skip to content

feat(kv-ir): Add support for duplicate columns in projections. #1245

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
gibber9809 merged 11 commits into from
Sep 3, 2025
Merged

feat(kv-ir): Add support for duplicate columns in projections. #1245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
75ac68d
Add support for duplicate columns in kv-ir projection.
gibber9809 Aug 20, 2025
082296d
Add support for returning index of projected column within original l…
gibber9809 Aug 21, 2025
c24e269
Address rabbit comments
gibber9809 Aug 21, 2025
deaa66c
Update incomplete docstring.
gibber9809 Aug 21, 2025
873f122
Apply suggestions from code review
gibber9809 Aug 26, 2025
99d3083
Add missing cstddef include
gibber9809 Aug 26, 2025
1343e49
Merge remote-tracking branch 'upstream/main' into kv-ir-allow-duplica…
gibber9809 Aug 26, 2025
a91aaf1
Bundle key and original index together into a pair in the kv-ir proje…
gibber9809 Aug 26, 2025
d0e60cc
Merge branch 'main' into kv-ir-allow-duplicate-projection-columns
gibber9809 Sep 2, 2025
cfc431e
Merge branch 'main' into kv-ir-allow-duplicate-projection-columns
LinZhihao-723 Sep 2, 2025
f998bbb
Merge branch 'main' into kv-ir-allow-duplicate-projection-columns
gibber9809 Sep 2, 2025
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
6 changes: 4 additions & 2 deletions components/core/src/clp/ffi/ir_stream/search/NewProjectedSchemaTreeNodeCallbackReq.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
#ifndef CLP_FFI_IR_STREAM_SEARCH_NEWPROJECTEDSCHEMATREENODECALLBACKREQ_HPP
#define CLP_FFI_IR_STREAM_SEARCH_NEWPROJECTEDSCHEMATREENODECALLBACKREQ_HPP

#include <cstddef>
#include <string_view>
#include <type_traits>
#include <utility>

#include <ystdlib/error_handling/Result.hpp>

Expand All @@ -18,7 +20,7 @@ namespace clp::ffi::ir_stream::search {
* @tparam NewProjectedSchemaTreeNodeCallbackType
* @param arg_0 Whether the schema-tree node is for an auto-generated kv-pair.
* @param arg_1 The ID of the schema-tree node.
* @param arg_2 The projected key path.
* @param arg_2 The projected key path and its original index in the list of projections.
* @return A void result on success or a user-defined error code indicating the failure.
*/
template <typename NewProjectedSchemaTreeNodeCallbackType>
Expand All @@ -27,7 +29,7 @@ concept NewProjectedSchemaTreeNodeCallbackReq = std::is_invocable_r_v<
NewProjectedSchemaTreeNodeCallbackType,
bool,
SchemaTree::Node::id_t,
std::string_view>;
std::pair<std::string_view, size_t>>;
} // namespace clp::ffi::ir_stream::search

#endif // CLP_FFI_IR_STREAM_SEARCH_NEWPROJECTEDSCHEMATREENODECALLBACKREQ_HPP
12 changes: 9 additions & 3 deletions components/core/src/clp/ffi/ir_stream/search/QueryHandler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@ class QueryHandler {
public:
// Factory function
/**
* @param new_projected_schema_tree_node_callback
* @param new_projected_schema_tree_node_callback Callback for newly resolved projections.
* @param query The search query.
* @param projections The columns to project.
* @param case_sensitive_match Whether to use case-sensitive match for string comparison.
* @param allow_duplicate_projected_columns Whether to allow duplicate projected columns.
* @return A result containing the newly constructed `QueryHandler` on success, or an error code
* indicating the failure:
* - Forwards `QueryHandlerImpl::create`'s return values.
Expand All @@ -42,15 +46,17 @@ class QueryHandler {
std::shared_ptr<clp_s::search::ast::Expression> query,
std::vector<std::pair<std::string, clp_s::search::ast::literal_type_bitmask_t>> const&
projections,
bool case_sensitive_match
bool case_sensitive_match,
bool allow_duplicate_projected_columns = false
) -> ystdlib::error_handling::Result<QueryHandler> {
return QueryHandler{
new_projected_schema_tree_node_callback,
YSTDLIB_ERROR_HANDLING_TRYX(
QueryHandlerImpl::create(
std::move(query),
projections,
case_sensitive_match
case_sensitive_match,
allow_duplicate_projected_columns
)
)
};
Expand Down
55 changes: 35 additions & 20 deletions components/core/src/clp/ffi/ir_stream/search/QueryHandlerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "QueryHandlerImpl.hpp"

#include <cstddef>
#include <exception>
#include <memory>
#include <optional>
Expand Down Expand Up @@ -54,6 +55,7 @@ using clp_s::search::ast::literal_type_bitmask_t;
/**
* Creates column descriptors and column-to-original-key map from the given projections.
* @param projections
* @param allow_duplicate_projected_columns Whether to allow duplicate projected columns.
* @return A result containing a pair or an error code indicating the failure:
* - The pair:
* - A vector of projected columns.
Expand All @@ -65,7 +67,8 @@ using clp_s::search::ast::literal_type_bitmask_t;
* descriptor for the projected key.
*/
[[nodiscard]] auto create_projected_columns_and_projection_map(
std::vector<std::pair<std::string, literal_type_bitmask_t>> const& projections
std::vector<std::pair<std::string, literal_type_bitmask_t>> const& projections,
bool allow_duplicate_projected_columns
)
-> ystdlib::error_handling::Result<std::pair<
std::vector<std::shared_ptr<ColumnDescriptor>>,
Expand All @@ -74,7 +77,7 @@ using clp_s::search::ast::literal_type_bitmask_t;
/**
* Creates initial partial resolutions for the given query and projections.
* @param query
* @param projected_column_to_original_key
* @param projected_column_to_original_key_and_index
* @return A result containing a pair or an error code indicating the failure:
* - The pair:
* - The partial resolution for auto-generated keys.
Expand All @@ -86,7 +89,7 @@ using clp_s::search::ast::literal_type_bitmask_t;
*/
[[nodiscard]] auto create_initial_partial_resolutions(
std::shared_ptr<Expression> const& query,
QueryHandlerImpl::ProjectionMap const& projected_column_to_original_key
QueryHandlerImpl::ProjectionMap const& projected_column_to_original_key_and_index
)
-> ystdlib::error_handling::Result<std::pair<
QueryHandlerImpl::PartialResolutionMap,
Expand Down Expand Up @@ -182,20 +185,24 @@ auto preprocess_query(std::shared_ptr<Expression> query)
}

auto create_projected_columns_and_projection_map(
std::vector<std::pair<std::string, literal_type_bitmask_t>> const& projections
std::vector<std::pair<std::string, literal_type_bitmask_t>> const& projections,
bool allow_duplicate_projected_columns
)
-> ystdlib::error_handling::Result<std::pair<
std::vector<std::shared_ptr<ColumnDescriptor>>,
QueryHandlerImpl::ProjectionMap>> {
std::unordered_set<std::string_view> unique_projected_columns;
std::vector<std::shared_ptr<ColumnDescriptor>> projected_columns;
QueryHandlerImpl::ProjectionMap projected_column_to_original_key;
QueryHandlerImpl::ProjectionMap projected_column_to_original_key_and_index;

for (auto const& [key, types] : projections) {
if (unique_projected_columns.contains(key)) {
return ErrorCode{ErrorCodeEnum::DuplicateProjectedColumn};
for (size_t index{0}; index < projections.size(); ++index) {
auto const& [key, types] = projections[index];
if (false == allow_duplicate_projected_columns) {
if (unique_projected_columns.contains(key)) {
return ErrorCode{ErrorCodeEnum::DuplicateProjectedColumn};
}
unique_projected_columns.emplace(key);
}
unique_projected_columns.emplace(key);

std::vector<std::string> descriptor_tokens;
std::string descriptor_namespace;
Expand All @@ -220,26 +227,29 @@ auto create_projected_columns_and_projection_map(
{
return ErrorCode{ErrorCodeEnum::ProjectionColumnDescriptorCreationFailure};
}
projected_column_to_original_key.emplace(column_descriptor.get(), key);
projected_column_to_original_key_and_index.emplace(
column_descriptor.get(),
std::make_pair(key, index)
);
projected_columns.emplace_back(std::move(column_descriptor));
} catch (std::exception const& e) {
return ErrorCode{ErrorCodeEnum::ProjectionColumnDescriptorCreationFailure};
}
Comment on lines 235 to 237
Copy link
Contributor

@coderabbitai coderabbitai bot Aug 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick (assertive)

Remove unused exception variable to silence -Wunused warnings.

The exception object isn’t used.

-        } catch (std::exception const& e) {
+        } catch (std::exception const&) {
             return ErrorCode{ErrorCodeEnum::ProjectionColumnDescriptorCreationFailure};
         }
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
} catch (std::exception const& e) {
return ErrorCode{ErrorCodeEnum::ProjectionColumnDescriptorCreationFailure};
}
} catch (std::exception const&) {
return ErrorCode{ErrorCodeEnum::ProjectionColumnDescriptorCreationFailure};
}
🤖 Prompt for AI Agents 
In components/core/src/clp/ffi/ir_stream/search/QueryHandlerImpl.cpp around
lines 235-237, the catch clause declares an exception variable 'e' that is never
used causing -Wunused warnings; replace "catch (std::exception const& e)" with
"catch (std::exception const&)" (or use "catch (...)" if you intend to catch all
exceptions) and leave the return statement as-is to silence the warning.

}

return {std::move(projected_columns), std::move(projected_column_to_original_key)};
return {std::move(projected_columns), std::move(projected_column_to_original_key_and_index)};
}

auto create_initial_partial_resolutions(
std::shared_ptr<Expression> const& query,
QueryHandlerImpl::ProjectionMap const& projected_column_to_original_key
QueryHandlerImpl::ProjectionMap const& projected_column_to_original_key_and_index
)
-> ystdlib::error_handling::Result<std::pair<
QueryHandlerImpl::PartialResolutionMap,
QueryHandlerImpl::PartialResolutionMap>> {
QueryHandlerImpl::PartialResolutionMap auto_gen_namespace_partial_resolutions;
QueryHandlerImpl::PartialResolutionMap user_gen_namespace_partial_resolutions;
for (auto const& [col, key] : projected_column_to_original_key) {
for (auto const& [col, _] : projected_column_to_original_key_and_index) {
auto const optional_is_auto_gen{is_auto_generated(col->get_namespace())};
if (false == optional_is_auto_gen.has_value()) {
// Ignore unrecognized namespace
Expand Down Expand Up @@ -408,22 +418,27 @@ auto evaluate_wildcard_filter(
auto QueryHandlerImpl::create(
std::shared_ptr<Expression> query,
std::vector<std::pair<std::string, literal_type_bitmask_t>> const& projections,
bool case_sensitive_match
bool case_sensitive_match,
bool allow_duplicate_projected_columns
) -> ystdlib::error_handling::Result<QueryHandlerImpl> {
query = YSTDLIB_ERROR_HANDLING_TRYX(preprocess_query(query));
auto [projected_columns, projected_column_to_original_key]
= YSTDLIB_ERROR_HANDLING_TRYX(create_projected_columns_and_projection_map(projections));
auto [projected_columns, projected_column_to_original_key_and_index]
= YSTDLIB_ERROR_HANDLING_TRYX(create_projected_columns_and_projection_map(
projections,
allow_duplicate_projected_columns
));
auto [auto_gen_namespace_partial_resolutions, user_gen_namespace_partial_resolutions]
= YSTDLIB_ERROR_HANDLING_TRYX(
create_initial_partial_resolutions(query, projected_column_to_original_key)
);
= YSTDLIB_ERROR_HANDLING_TRYX(create_initial_partial_resolutions(
query,
projected_column_to_original_key_and_index
));

return QueryHandlerImpl{
std::move(query),
std::move(auto_gen_namespace_partial_resolutions),
std::move(user_gen_namespace_partial_resolutions),
std::move(projected_columns),
std::move(projected_column_to_original_key),
std::move(projected_column_to_original_key_and_index),
case_sensitive_match
};
}
Expand Down
22 changes: 15 additions & 7 deletions components/core/src/clp/ffi/ir_stream/search/QueryHandlerImpl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef CLP_FFI_IR_STREAM_SEARCH_QUERYHANDLERIMPL_HPP
#define CLP_FFI_IR_STREAM_SEARCH_QUERYHANDLERIMPL_HPP

#include <cstddef>
#include <memory>
#include <optional>
#include <string>
Expand Down Expand Up @@ -117,7 +118,8 @@ class QueryHandlerImpl {
clp_s::search::ast::DescriptorList::iterator m_next_token_it;
};

using ProjectionMap = std::unordered_map<clp_s::search::ast::ColumnDescriptor*, std::string>;
using ProjectionMap = std::
unordered_map<clp_s::search::ast::ColumnDescriptor*, std::pair<std::string, size_t>>;
Comment on lines +121 to +122
Copy link
Member

@LinZhihao-723 LinZhihao-723 Aug 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A high-level question: the current implementation will create different column descriptors for the same key. What's the reason for not using the same descriptor to track all project columns? I can see the major concern would be that they might be projecting different types of node values. Are there any other concerns?

Copy link
Contributor Author

@gibber9809 gibber9809 Aug 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The major one is projections with the same key name but different types, as you say. Generally though it's also unclear to me that sharing column descriptors for keys with the same name would give us any measurable benefits, so I prefer the simpler solution of just not sharing them.

Copy link
Member

@LinZhihao-723 LinZhihao-723 Aug 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, make sense.

Comment on lines +121 to +122
Copy link
Contributor

@coderabbitai coderabbitai bot Aug 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick (assertive)

Name the pair type to improve readability.

Using std::pair<std::string, size_t> directly obscures intent. A named alias (or a tiny struct) clarifies semantics and reduces .first/.second leakage elsewhere.

Apply this diff near the type section:

-    using ProjectionMap = std::
-            unordered_map<clp_s::search::ast::ColumnDescriptor*, std::pair<std::string, size_t>>;
+    using OriginalKeyAndIndex = std::pair<std::string, size_t>;
+    using ProjectionMap = std::
+            unordered_map<clp_s::search::ast::ColumnDescriptor*, OriginalKeyAndIndex>;
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
using ProjectionMap = std::
unordered_map<clp_s::search::ast::ColumnDescriptor*, std::pair<std::string, size_t>>;
// Name the pair type to improve readability
using OriginalKeyAndIndex = std::pair<std::string, size_t>;
using ProjectionMap = std::
unordered_map<clp_s::search::ast::ColumnDescriptor*, OriginalKeyAndIndex>;
🤖 Prompt for AI Agents 
In components/core/src/clp/ffi/ir_stream/search/QueryHandlerImpl.hpp around
lines 121-122, the map value type std::pair<std::string, size_t> is unnamed
which obscures meaning; introduce a named type (either a using alias like
ProjectionInfo = std::pair<std::string, size_t> or preferably a small struct
e.g. struct ProjectionInfo { std::string name; size_t index; };) and change
ProjectionMap to use that named type; update all downstream uses to replace
.first/.second with the explicit field names (e.g., .name/.index) for clarity.


using PartialResolutionMap = std::
unordered_map<SchemaTree::Node::id_t, std::vector<ColumnDescriptorTokenIterator>>;
Expand All @@ -127,6 +129,7 @@ class QueryHandlerImpl {
* @param query The search query.
* @param projections The columns to project.
* @param case_sensitive_match Whether to use case-sensitive match for string comparison.
* @param allow_duplicate_projected_columns Whether to allow duplicate projected columns.
* @return A result containing the newly constructed `QueryHandler` on success, or an error code
* indicating the failure:
* - Forwards `preprocess_query`'s return values.
Expand All @@ -137,7 +140,8 @@ class QueryHandlerImpl {
std::shared_ptr<clp_s::search::ast::Expression> query,
std::vector<std::pair<std::string, clp_s::search::ast::literal_type_bitmask_t>> const&
projections,
bool case_sensitive_match
bool case_sensitive_match,
bool allow_duplicate_projected_columns
) -> ystdlib::error_handling::Result<QueryHandlerImpl>;

// Delete copy constructor and assignment operator
Expand Down Expand Up @@ -292,7 +296,7 @@ class QueryHandlerImpl {
PartialResolutionMap auto_gen_namespace_partial_resolutions,
PartialResolutionMap user_gen_namespace_partial_resolutions,
std::vector<std::shared_ptr<clp_s::search::ast::ColumnDescriptor>> projected_columns,
ProjectionMap projected_column_to_original_key,
ProjectionMap projected_column_to_original_key_and_index,
bool case_sensitive_match
)
: m_query{std::move(query)},
Expand All @@ -306,7 +310,9 @@ class QueryHandlerImpl {
std::move(user_gen_namespace_partial_resolutions)
},
m_projected_columns{std::move(projected_columns)},
m_projected_column_to_original_key{std::move(projected_column_to_original_key)},
m_projected_column_to_original_key_and_index{
std::move(projected_column_to_original_key_and_index)
},
m_case_sensitive_match{case_sensitive_match} {}

// Methods
Expand Down Expand Up @@ -388,7 +394,7 @@ class QueryHandlerImpl {
std::unordered_set<SchemaTree::Node::id_t>>
m_resolved_column_to_schema_tree_node_ids;
std::vector<std::shared_ptr<clp_s::search::ast::ColumnDescriptor>> m_projected_columns;
ProjectionMap m_projected_column_to_original_key;
ProjectionMap m_projected_column_to_original_key_and_index;
bool m_case_sensitive_match;
std::vector<std::pair<AstExprIterator, ast_evaluation_result_bitmask_t>> m_ast_dfs_stack;
};
Expand Down Expand Up @@ -492,11 +498,13 @@ auto QueryHandlerImpl::handle_column_resolution_on_new_schema_tree_node(
}

auto* col{token_it.get_column_descriptor()};
if (m_projected_column_to_original_key.contains(col)) {
auto const original_key_and_index_it = m_projected_column_to_original_key_and_index.find(col);
if (m_projected_column_to_original_key_and_index.end() != original_key_and_index_it) {
auto const& [original_key, projected_index] = original_key_and_index_it->second;
Comment on lines +501 to +503
Copy link
Member

@LinZhihao-723 LinZhihao-723 Aug 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
auto const original_key_and_index_it = m_projected_column_to_original_key_and_index.find(col);
if (m_projected_column_to_original_key_and_index.end() != original_key_and_index_it) {
auto const& [original_key, projected_index] = original_key_and_index_it->second;
if (m_projected_column_to_original_key_and_index.contains(col)) {
auto const& [original_key, projected_index]
= m_projected_column_to_original_key_and_index.at(col);

I think our guideline prefers this way more than using find. With the compiler optimization it should be equivalent to the find form.

Copy link
Contributor Author

@gibber9809 gibber9809 Aug 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure? Older versions of g++ definitely don't optimize this away, and briefly playing around with this in godbolt recent versions of g++ still don't seem to optimize this away.

Copy link
Member

@LinZhihao-723 LinZhihao-723 Aug 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me double check.

Copy link
Member

@LinZhihao-723 LinZhihao-723 Aug 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think u're right. Tried both ways on the latest GCC and clang. Using contains + at involves two hash lookups, while using find + iterator comparison is only one. From the generated assembly, it seems like they can be manually optimized, as the first hash lookup dominates the second. But I guess it's also fair for the compiler not to aggressively look into this case as:

  • The user-defined hash function may have side effects.
  • at involves a throw on bad keys.

Anyway, I think the take-away is we should use find for better performance.

YSTDLIB_ERROR_HANDLING_TRYV(new_projected_schema_tree_node_callback(
is_auto_generated,
node_id,
m_projected_column_to_original_key.at(col)
std::make_pair(original_key, projected_index)
));
return ystdlib::error_handling::success();
}
Expand Down
17 changes: 10 additions & 7 deletions components/core/src/clp/ffi/ir_stream/search/test/test_QueryHandlerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <cstddef>
#include <map>
#include <memory>
#include <set>
Expand Down Expand Up @@ -410,7 +411,7 @@ TEST_CASE(
auto query_stream{std::istringstream{kql_query_str}};
auto query{clp_s::search::kql::parse_kql_expression(query_stream)};

auto query_handler_impl_result{QueryHandlerImpl::create(query, {}, true)};
auto query_handler_impl_result{QueryHandlerImpl::create(query, {}, true, false)};
Copy link
Contributor

@coderabbitai coderabbitai bot Aug 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Create() call sites updated; add coverage for allow_duplicate_projected_columns

Passing the new fourth parameter (false) is correct. To validate the new feature flag end-to-end, add a test path that sets allow_duplicate_projected_columns = true with intentionally duplicated projections and asserts multiple callback invocations with the correct indices.

Would you like me to open a follow-up to add a focused “duplicates in projections” section with synthetic duplicates and explicit index assertions?

Also applies to: 525-525, 620-620

🤖 Prompt for AI Agents 
components/core/src/clp/ffi/ir_stream/search/test/test_QueryHandlerImpl.cpp
around lines 414 (also apply similar changes at 525 and 620): the new Create()
signature added a fourth parameter allow_duplicate_projected_columns which
should be exercised true in tests; add a new test path that calls
QueryHandlerImpl::create(query, {}, true, true) (fourth arg true), supply
intentionally duplicated projection entries in the query, then assert that the
query handler invokes the projection callback multiple times for duplicate
projections and that each callback receives the correct projection indices (use
explicit expected index list and assert call count and order); update the three
call sites (lines ~414, ~525, ~620) to include this new test branch and add
assertions verifying multiple callback invocations and exact indices for
duplicates.

REQUIRE_FALSE(query_handler_impl_result.has_error());
auto& query_handler_impl{query_handler_impl_result.value()};

Expand Down Expand Up @@ -521,19 +522,21 @@ TEST_CASE("query_handler_handle_projection", "[ffi][ir_stream][search][QueryHand
unresolvable_projections_from_unrecognized_namespaces.cend()
);

auto query_handler_impl_result{QueryHandlerImpl::create(null_query, projections, true)};
auto query_handler_impl_result{QueryHandlerImpl::create(null_query, projections, true, false)};
REQUIRE_FALSE(query_handler_impl_result.has_error());
auto& query_handler_impl{query_handler_impl_result.value()};

SchemaTree::Node::id_t node_id{1};
std::map<std::string, std::set<SchemaTree::Node::id_t>> actual_resolved_projections;
auto new_projected_schema_tree_node_callback
= [&](bool is_auto_gen,
SchemaTree::Node::id_t node_id,
std::string_view key) -> ystdlib::error_handling::Result<void> {
= [&](
bool is_auto_gen,
SchemaTree::Node::id_t node_id,
std::pair<std::string_view, size_t> key_and_index
) -> ystdlib::error_handling::Result<void> {
REQUIRE((is_auto_generated == is_auto_gen));
auto [column_it, column_inserted] = actual_resolved_projections.try_emplace(
std::string{key},
std::string{key_and_index.first},
std::set<SchemaTree::Node::id_t>{}
);
auto [node_id_it, node_id_inserted] = column_it->second.emplace(node_id);
Expand Down Expand Up @@ -615,7 +618,7 @@ TEST_CASE("query_handler_evaluation_kv_pair_log_event", "[ffi][ir_stream][search
auto query{clp_s::search::kql::parse_kql_expression(query_stream)};
REQUIRE((nullptr != query));

auto query_handler_impl_result{QueryHandlerImpl::create(query, {}, true)};
auto query_handler_impl_result{QueryHandlerImpl::create(query, {}, true, false)};
REQUIRE_FALSE(query_handler_impl_result.has_error());
auto& query_handler_impl{query_handler_impl_result.value()};

Expand Down
2 changes: 1 addition & 1 deletion components/core/src/clp/ffi/ir_stream/search/test/utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ auto ColumnQueryPossibleMatches::serialize() const -> std::string {
auto trivial_new_projected_schema_tree_node_callback(
[[maybe_unused]] bool is_auto_generated,
[[maybe_unused]] SchemaTree::Node::id_t node_id,
[[maybe_unused]] std::string_view projected_key_path
[[maybe_unused]] std::pair<std::string_view, size_t> projected_key_path_and_index
) -> ystdlib::error_handling::Result<void> {
return ystdlib::error_handling::success();
}
Expand Down
4 changes: 2 additions & 2 deletions components/core/src/clp/ffi/ir_stream/search/test/utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@ class ColumnQueryPossibleMatches {
* doing anything.
* @param is_auto_generated
* @param node_id
* @param projected_key_path
* @param projected_key_path_and_index
* @return A void result.
*/
[[nodiscard]] auto trivial_new_projected_schema_tree_node_callback(
bool is_auto_generated,
SchemaTree::Node::id_t node_id,
std::string_view projected_key_path
std::pair<std::string_view, size_t> projected_key_path_and_index
) -> ystdlib::error_handling::Result<void>;

/**
Expand Down
2 changes: 1 addition & 1 deletion components/core/src/clp_s/kv_ir_search.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ auto deserialize_and_search_kv_ir_stream(
auto trivial_new_projected_schema_tree_node_callback
= []([[maybe_unused]] bool is_auto_generated,
[[maybe_unused]] SchemaTree::Node::id_t node_id,
[[maybe_unused]] std::string_view projected_key_path)
[[maybe_unused]] std::pair<std::string_view, size_t> projected_key_and_index)
-> ystdlib::error_handling::Result<void> { return ystdlib::error_handling::success(); };
using QueryHandlerType = clp::ffi::ir_stream::search::QueryHandler<
decltype(trivial_new_projected_schema_tree_node_callback)>;
Expand Down
Loading