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

Replaced scan_info definition with the range class #129

Merged
merged 4 commits into from
Nov 13, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
4 changes: 2 additions & 2 deletions src/jogasaki/executor/process/impl/bound.h
Copy link
Contributor

Choose a reason for hiding this comment

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

すごい細かい話ですが、ファイルの末尾に改行だけを含む空の行を追加してもらえますか?
古いC言語の規約でファイル末尾は空の行でないとならないという話があって、最近のC++では関係ないはずなのですが、各種フォーマッタがこれに準じて勝手に空行を挿入しgitにdiffとして検出されてしまうことがあるので。

Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ class bound {
bound() = default;
bound(bound const& other) = delete;
bound& operator=(bound const& other) = delete;
bound(bound&& other) noexcept = delete;
bound& operator=(bound&& other) noexcept = delete;
bound(bound&& other) noexcept = default;
bound& operator=(bound&& other) noexcept = default;
~bound() = default;
bound(kvs::end_point_kind endpointkind, std::size_t len,
std::unique_ptr<data::aligned_buffer> key)
Expand Down
32 changes: 13 additions & 19 deletions src/jogasaki/executor/process/impl/ops/details/encode_key.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -97,34 +97,28 @@ status encode_key( //NOLINT(readability-function-cognitive-complexity)
return status::ok;
}

status two_encode_keys(
request_context* context,
status two_encode_keys(request_context* context,
std::vector<details::search_key_field_info> const& begin_keys,
std::vector<details::search_key_field_info> const& end_keys,
variable_table& input_variables,
memory::lifo_paged_memory_resource& resource,
data::aligned_buffer& key_begin,
std::size_t& blen,
data::aligned_buffer& key_end,
std::size_t& elen
) {
std::vector<details::search_key_field_info> const& end_keys, variable_table& input_variables,
memory::lifo_paged_memory_resource& resource, data::aligned_buffer& key_begin,
std::size_t& blen, data::aligned_buffer& key_end, std::size_t& elen) {
status status_result = status::ok;
std::string message;
if ((status_result = impl::ops::details::encode_key(
context, begin_keys, input_variables, resource, key_begin, blen, message))
!= status::ok) {

if ((status_result = impl::ops::details::encode_key(context, begin_keys, input_variables,
resource, key_begin, blen, message)) != status::ok) {

if (status_result == status::err_type_mismatch) {
set_error(*context, error_code::unsupported_runtime_feature_exception, message, status_result);
set_error(*context, error_code::unsupported_runtime_feature_exception, message,
status_result);
}
return status_result;
}
if ((status_result = impl::ops::details::encode_key(
context, end_keys, input_variables, resource, key_end, elen, message))
!= status::ok) {

context, end_keys, input_variables, resource, key_end, elen, message)) != status::ok) {

if (status_result == status::err_type_mismatch) {
set_error(*context, error_code::unsupported_runtime_feature_exception, message, status_result);
set_error(*context, error_code::unsupported_runtime_feature_exception, message,
status_result);
}
return status_result;
}
Expand Down
Loading