diff --git a/mock/jogasaki/executor/process/mock/task_context.cpp b/mock/jogasaki/executor/process/mock/task_context.cpp index 25b79632..a106305a 100644 --- a/mock/jogasaki/executor/process/mock/task_context.cpp +++ b/mock/jogasaki/executor/process/mock/task_context.cpp @@ -16,4 +16,4 @@ #include "task_context.h" namespace jogasaki::executor::process::mock { -} // jogasaki::executor::process::mock \ No newline at end of file +} // namespace jogasaki::executor::process::mock diff --git a/src/jogasaki/data/aligned_buffer.cpp b/src/jogasaki/data/aligned_buffer.cpp index 763c8761..b7e54c06 100644 --- a/src/jogasaki/data/aligned_buffer.cpp +++ b/src/jogasaki/data/aligned_buffer.cpp @@ -143,4 +143,4 @@ void aligned_buffer::dump(std::ostream& out, int indent) const noexcept{ } -} // namespace jogasaki::data \ No newline at end of file +} // namespace jogasaki::data diff --git a/src/jogasaki/data/aligned_buffer.h b/src/jogasaki/data/aligned_buffer.h index 7f13ac1b..97f3700d 100644 --- a/src/jogasaki/data/aligned_buffer.h +++ b/src/jogasaki/data/aligned_buffer.h @@ -179,4 +179,4 @@ class aligned_buffer { void resize_internal(std::size_t sz, bool copydata); }; -} // namespace jogasaki::data \ No newline at end of file +} // namespace jogasaki::data diff --git a/src/jogasaki/executor/process/abstract/task_context.h b/src/jogasaki/executor/process/abstract/task_context.h index 28dc8638..3a001f10 100644 --- a/src/jogasaki/executor/process/abstract/task_context.h +++ b/src/jogasaki/executor/process/abstract/task_context.h @@ -150,4 +150,4 @@ inline bool operator!=(task_context const& a, task_context const& b) noexcept { return !(a == b); } -} // namespace jogasaki::executor::process::abstract \ No newline at end of file +} // namespace jogasaki::executor::process::abstract diff --git a/src/jogasaki/executor/process/flow.cpp b/src/jogasaki/executor/process/flow.cpp index f5edd26a..9420286e 100644 --- a/src/jogasaki/executor/process/flow.cpp +++ b/src/jogasaki/executor/process/flow.cpp @@ -190,4 +190,4 @@ std::shared_ptr flow::create_task_context( return ctx; } -} // namespace jogasaki::executor::process \ No newline at end of file +} // namespace jogasaki::executor::process diff --git a/src/jogasaki/executor/process/impl/bound.cpp b/src/jogasaki/executor/process/impl/bound.cpp index 2da784c8..acdbc9a7 100644 --- a/src/jogasaki/executor/process/impl/bound.cpp +++ b/src/jogasaki/executor/process/impl/bound.cpp @@ -30,4 +30,4 @@ void bound::dump(std::ostream& out, int indent) const noexcept { out << indent_space << " key_: " << *key_ << "\n"; key_->dump(out, indent + 2); } -} // namespace jogasaki::executor::process::impl \ No newline at end of file +} // namespace jogasaki::executor::process::impl diff --git a/src/jogasaki/executor/process/impl/bound.h b/src/jogasaki/executor/process/impl/bound.h index 927784ef..c058e8ed 100644 --- a/src/jogasaki/executor/process/impl/bound.h +++ b/src/jogasaki/executor/process/impl/bound.h @@ -49,4 +49,4 @@ class bound { std::unique_ptr key_{}; }; -} // namespace jogasaki::executor::process::impl \ No newline at end of file +} // namespace jogasaki::executor::process::impl diff --git a/src/jogasaki/executor/process/impl/ops/details/encode_key.cpp b/src/jogasaki/executor/process/impl/ops/details/encode_key.cpp index e7ecfc3f..9476bee7 100644 --- a/src/jogasaki/executor/process/impl/ops/details/encode_key.cpp +++ b/src/jogasaki/executor/process/impl/ops/details/encode_key.cpp @@ -125,4 +125,4 @@ status two_encode_keys(request_context* context, return status::ok; } -} // namespace jogasaki::executor::process::impl::ops::details \ No newline at end of file +} // namespace jogasaki::executor::process::impl::ops::details diff --git a/src/jogasaki/executor/process/impl/ops/details/encode_key.h b/src/jogasaki/executor/process/impl/ops/details/encode_key.h index 87a405ea..7d4eed61 100644 --- a/src/jogasaki/executor/process/impl/ops/details/encode_key.h +++ b/src/jogasaki/executor/process/impl/ops/details/encode_key.h @@ -84,4 +84,4 @@ status two_encode_keys( std::size_t& elen ); -} // namespace jogasaki::executor::process::impl::ops::details \ No newline at end of file +} // namespace jogasaki::executor::process::impl::ops::details diff --git a/src/jogasaki/executor/process/impl/ops/operator_builder.cpp b/src/jogasaki/executor/process/impl/ops/operator_builder.cpp index b177a0aa..836ee506 100644 --- a/src/jogasaki/executor/process/impl/ops/operator_builder.cpp +++ b/src/jogasaki/executor/process/impl/ops/operator_builder.cpp @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include #include @@ -416,4 +416,4 @@ operator_container create_operators( }(); } -} // namespace jogasaki::executor::process::impl::ops \ No newline at end of file +} // namespace jogasaki::executor::process::impl::ops diff --git a/src/jogasaki/executor/process/impl/ops/operator_builder.h b/src/jogasaki/executor/process/impl/ops/operator_builder.h index 78c1d648..ee9a6a1d 100644 --- a/src/jogasaki/executor/process/impl/ops/operator_builder.h +++ b/src/jogasaki/executor/process/impl/ops/operator_builder.h @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include @@ -153,4 +153,4 @@ class operator_builder { request_context* request_context = nullptr ); -} // namespace jogasaki::executor::process::impl::ops \ No newline at end of file +} // namespace jogasaki::executor::process::impl::ops diff --git a/src/jogasaki/executor/process/impl/ops/operator_container.cpp b/src/jogasaki/executor/process/impl/ops/operator_container.cpp index 695e053c..dc739e15 100644 --- a/src/jogasaki/executor/process/impl/ops/operator_container.cpp +++ b/src/jogasaki/executor/process/impl/ops/operator_container.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include namespace jogasaki::executor::process::impl::ops { @@ -46,4 +46,4 @@ operator_base& operator_container::root() const noexcept { std::shared_ptr const& operator_container::range() const noexcept { return range_; } -} // namespace jogasaki::executor::process::impl::ops \ No newline at end of file +} // namespace jogasaki::executor::process::impl::ops diff --git a/src/jogasaki/executor/process/impl/ops/operator_container.h b/src/jogasaki/executor/process/impl/ops/operator_container.h index 07f4e4a9..fd25f511 100644 --- a/src/jogasaki/executor/process/impl/ops/operator_container.h +++ b/src/jogasaki/executor/process/impl/ops/operator_container.h @@ -20,7 +20,7 @@ #include #include -#include +#include namespace jogasaki::executor::process::impl::ops { @@ -69,7 +69,7 @@ class operator_container { /** * @brief accessor to scan_range - * @return the scan_range, or nullptr if there is no scan operation in the process + * @return the range, or nullptr if there is no scan operation in the process */ [[nodiscard]] std::shared_ptr const& range() const noexcept; private: @@ -79,4 +79,4 @@ class operator_container { std::shared_ptr range_{}; }; -} // namespace jogasaki::executor::process::impl::ops \ No newline at end of file +} // namespace jogasaki::executor::process::impl::ops diff --git a/src/jogasaki/executor/process/impl/ops/scan.cpp b/src/jogasaki/executor/process/impl/ops/scan.cpp index bbfeabe7..2164321e 100644 --- a/src/jogasaki/executor/process/impl/ops/scan.cpp +++ b/src/jogasaki/executor/process/impl/ops/scan.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include @@ -325,4 +325,4 @@ void scan::dump() const noexcept { std::cerr << head << std::setw(width) << "field_mapper_:" << "not implemented yet" << std::endl; } -} // namespace jogasaki::executor::process::impl::ops \ No newline at end of file +} // namespace jogasaki::executor::process::impl::ops diff --git a/src/jogasaki/executor/process/impl/ops/scan_context.cpp b/src/jogasaki/executor/process/impl/ops/scan_context.cpp index 9d09a84b..b9f3b309 100644 --- a/src/jogasaki/executor/process/impl/ops/scan_context.cpp +++ b/src/jogasaki/executor/process/impl/ops/scan_context.cpp @@ -17,7 +17,7 @@ #include -#include +#include #include #include diff --git a/src/jogasaki/executor/process/impl/ops/scan_context.h b/src/jogasaki/executor/process/impl/ops/scan_context.h index 067e1355..3e8c9905 100644 --- a/src/jogasaki/executor/process/impl/ops/scan_context.h +++ b/src/jogasaki/executor/process/impl/ops/scan_context.h @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -53,7 +53,7 @@ class scan_context : public context_base { std::unique_ptr stg, std::unique_ptr secondary_stg, transaction_context* tx, - impl::scan_range const* range_, + impl::scan_range const* range, memory_resource* resource, memory_resource* varlen_resource ); diff --git a/src/jogasaki/executor/process/impl/processor.cpp b/src/jogasaki/executor/process/impl/processor.cpp index 5ac006d7..3b636c8a 100644 --- a/src/jogasaki/executor/process/impl/processor.cpp +++ b/src/jogasaki/executor/process/impl/processor.cpp @@ -96,4 +96,4 @@ ops::operator_container const& processor::operators() const noexcept { return operators_; } -} // namespace jogasaki::executor::process::impl \ No newline at end of file +} // namespace jogasaki::executor::process::impl diff --git a/src/jogasaki/executor/process/impl/processor.h b/src/jogasaki/executor/process/impl/processor.h index a0d35e6c..01546fe6 100644 --- a/src/jogasaki/executor/process/impl/processor.h +++ b/src/jogasaki/executor/process/impl/processor.h @@ -78,4 +78,4 @@ class processor : public process::abstract::processor { std::shared_ptr relation_io_map_{}; }; -} // namespace jogasaki::executor::process::impl \ No newline at end of file +} // namespace jogasaki::executor::process::impl diff --git a/src/jogasaki/executor/process/impl/range.cpp b/src/jogasaki/executor/process/impl/scan_range.cpp similarity index 89% rename from src/jogasaki/executor/process/impl/range.cpp rename to src/jogasaki/executor/process/impl/scan_range.cpp index f8023486..95455aec 100644 --- a/src/jogasaki/executor/process/impl/range.cpp +++ b/src/jogasaki/executor/process/impl/scan_range.cpp @@ -16,17 +16,13 @@ #include -#include "range.h" +#include "scan_range.h" namespace jogasaki::executor::process::impl { scan_range::scan_range(bound begin, bound end, bool is_empty) noexcept - : begin_(std::move(begin)), end_(std::move(end)), is_empty_(is_empty) { - - BOOST_ASSERT(&begin_); - BOOST_ASSERT(&end_); -} - + : begin_(std::move(begin)), end_(std::move(end)), is_empty_(is_empty) {} +scan_range::scan_range() noexcept : begin_(), end_(), is_empty_(true) {} [[nodiscard]] bound const& scan_range::begin() const noexcept { return begin_; } [[nodiscard]] bound const& scan_range::end() const noexcept { return end_; } [[nodiscard]] bool scan_range::is_empty() const noexcept { return is_empty_; } @@ -39,4 +35,4 @@ void scan_range::dump(std::ostream& out, int indent) const noexcept { end_.dump(out, indent + 2); out << indent_space << " is_empty_: " << is_empty_ << "\n"; } -} // namespace jogasaki::executor::process::impl \ No newline at end of file +} // namespace jogasaki::executor::process::impl diff --git a/src/jogasaki/executor/process/impl/range.h b/src/jogasaki/executor/process/impl/scan_range.h similarity index 92% rename from src/jogasaki/executor/process/impl/range.h rename to src/jogasaki/executor/process/impl/scan_range.h index ab4e9102..12fd702b 100644 --- a/src/jogasaki/executor/process/impl/range.h +++ b/src/jogasaki/executor/process/impl/scan_range.h @@ -23,8 +23,8 @@ namespace jogasaki::executor::process::impl { class scan_range : public abstract::range { public: explicit scan_range(bound begin, bound end, bool is_empty = true) noexcept; - - ~scan_range() override = default; + scan_range() noexcept; + ~scan_range() override = default; scan_range(scan_range const& other) = delete; scan_range& operator=(scan_range const& other) = delete; scan_range(scan_range&& other) noexcept = default; @@ -46,4 +46,4 @@ class scan_range : public abstract::range { bool is_empty_; }; -} // namespace jogasaki::executor::process::impl \ No newline at end of file +} // namespace jogasaki::executor::process::impl diff --git a/src/jogasaki/executor/process/impl/task_context.cpp b/src/jogasaki/executor/process/impl/task_context.cpp index 6b2ae146..b4054250 100644 --- a/src/jogasaki/executor/process/impl/task_context.cpp +++ b/src/jogasaki/executor/process/impl/task_context.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -132,4 +132,4 @@ io::record_channel* task_context::channel() const noexcept { return channel_; } -} // namespace jogasaki::executor::process::impl \ No newline at end of file +} // namespace jogasaki::executor::process::impl diff --git a/src/jogasaki/executor/process/impl/task_context.h b/src/jogasaki/executor/process/impl/task_context.h index e0e746f5..6f1efc94 100644 --- a/src/jogasaki/executor/process/impl/task_context.h +++ b/src/jogasaki/executor/process/impl/task_context.h @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include @@ -94,4 +94,4 @@ class task_context : public abstract::task_context { partition_index sink_index_{}; }; -} // namespace jogasaki::executor::process::impl \ No newline at end of file +} // namespace jogasaki::executor::process::impl diff --git a/src/jogasaki/kvs/storage.cpp b/src/jogasaki/kvs/storage.cpp index 418ae9f5..8cf02719 100644 --- a/src/jogasaki/kvs/storage.cpp +++ b/src/jogasaki/kvs/storage.cpp @@ -180,4 +180,4 @@ std::ostream& operator<<(std::ostream& os, end_point_kind kind) { return os; } -} \ No newline at end of file +} // namespace jogasaki::kvs diff --git a/src/jogasaki/kvs/storage.h b/src/jogasaki/kvs/storage.h index bd99ebbb..98207ba9 100644 --- a/src/jogasaki/kvs/storage.h +++ b/src/jogasaki/kvs/storage.h @@ -263,5 +263,5 @@ end_point_kind adjust_endpoint_kind(bool use_secondary, kvs::end_point_kind endp * @return The output stream with the string representation appended. */ std::ostream& operator<<(std::ostream& os, end_point_kind kind); -} +} // namespace jogasaki::kvs diff --git a/test/jogasaki/executor/process/ops/join_find_test.cpp b/test/jogasaki/executor/process/ops/join_find_test.cpp index 06375ff3..1c41e2c5 100644 --- a/test/jogasaki/executor/process/ops/join_find_test.cpp +++ b/test/jogasaki/executor/process/ops/join_find_test.cpp @@ -434,4 +434,4 @@ TEST_F(join_find_test, host_variable_with_condition_expr) { ctx.release(); } -} // namespace jogasaki::executor::process::impl::ops \ No newline at end of file +} // namespace jogasaki::executor::process::impl::ops diff --git a/test/jogasaki/executor/process/ops/scan_test.cpp b/test/jogasaki/executor/process/ops/scan_test.cpp index d3ae4e20..d0f7bb3d 100644 --- a/test/jogasaki/executor/process/ops/scan_test.cpp +++ b/test/jogasaki/executor/process/ops/scan_test.cpp @@ -583,4 +583,4 @@ TEST_F(scan_test, host_variables) { ASSERT_EQ(status::ok, tx->commit()); } -} // namespace jogasaki::executor::process::impl::ops \ No newline at end of file +} // namespace jogasaki::executor::process::impl::ops diff --git a/test/jogasaki/executor/process/process_executor_test.cpp b/test/jogasaki/executor/process/process_executor_test.cpp index 3805939c..71f142b2 100644 --- a/test/jogasaki/executor/process/process_executor_test.cpp +++ b/test/jogasaki/executor/process/process_executor_test.cpp @@ -147,4 +147,4 @@ TEST_F(process_executor_test, custom_factory) { EXPECT_TRUE(ewriter->is_released()); } -} // namespace jogasaki::executor::process::impl \ No newline at end of file +} // namespace jogasaki::executor::process::impl diff --git a/test/jogasaki/executor/process/processor_test.cpp b/test/jogasaki/executor/process/processor_test.cpp index 08a210d0..b9b71492 100644 --- a/test/jogasaki/executor/process/processor_test.cpp +++ b/test/jogasaki/executor/process/processor_test.cpp @@ -67,4 +67,4 @@ TEST_F(processor_test, basic) { // proc->run(context.get()); } -} // namespace jogasaki::executor::process::impl \ No newline at end of file +} // namespace jogasaki::executor::process::impl