Skip to content

Commit ab4dcb7

Browse files
kuron99kuron99
committed
modify code style to return operation_status
1 parent d170647 commit ab4dcb7

File tree

18 files changed

+86
-86
lines changed

18 files changed

+86
-86
lines changed

‎src/jogasaki/executor/process/impl/ops/aggregate_group.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ operation_status aggregate_group::operator()(
159159
abstract::task_context* context
160160
) {
161161
if (ctx.aborted()) {
162-
return {operation_status_kind::aborted};
162+
return operation_status_kind::aborted;
163163
}
164164
for(std::size_t i=0, n=arguments_.size(); i < n; ++i) {
165165
// append value store the values
@@ -195,7 +195,7 @@ operation_status aggregate_group::operator()(
195195
if (downstream_) {
196196
if(auto st = unsafe_downcast<record_operator>(downstream_.get())->process_record(context); !st) {
197197
ctx.abort();
198-
return {operation_status_kind::aborted};
198+
return operation_status_kind::aborted;
199199
}
200200
}
201201
// reset
@@ -205,7 +205,7 @@ operation_status aggregate_group::operator()(
205205
ctx.nulls_resources_[i]->deallocate_after(memory::lifo_paged_memory_resource::initial_checkpoint);
206206
}
207207
}
208-
return {};
208+
return operation_status_kind::ok;
209209
}
210210

211211
operator_kind aggregate_group::kind() const noexcept {

‎src/jogasaki/executor/process/impl/ops/apply.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ operation_status apply::process_record(abstract::task_context* context) {
9696

9797
operation_status apply::operator()(apply_context& ctx, abstract::task_context* context) { //NOLINT(readability-function-cognitive-complexity)
9898
if (ctx.aborted()) {
99-
return {operation_status_kind::aborted};
99+
return operation_status_kind::aborted;
100100
}
101101

102102
// setup evaluator context blob session once per record
@@ -108,7 +108,7 @@ operation_status apply::operator()(apply_context& ctx, abstract::task_context* c
108108
ctx.args_.reserve(argument_evaluators_.size());
109109
if (! evaluate_arguments(ctx, ctx.args_)) {
110110
ctx.abort();
111-
return {operation_status_kind::aborted};
111+
return operation_status_kind::aborted;
112112
}
113113

114114
// call table-valued function
@@ -120,7 +120,7 @@ operation_status apply::operator()(apply_context& ctx, abstract::task_context* c
120120
status::err_unknown
121121
);
122122
ctx.abort();
123-
return {operation_status_kind::aborted};
123+
return operation_status_kind::aborted;
124124
}
125125

126126
auto stream = function_info_->function_body()(
@@ -142,7 +142,7 @@ operation_status apply::operator()(apply_context& ctx, abstract::task_context* c
142142
status::err_expression_evaluation_failure
143143
);
144144
ctx.abort();
145-
return {operation_status_kind::aborted};
145+
return operation_status_kind::aborted;
146146
}
147147

148148
// synchronously collect all results
@@ -171,7 +171,7 @@ operation_status apply::operator()(apply_context& ctx, abstract::task_context* c
171171
}
172172
stream->close();
173173
ctx.abort();
174-
return {operation_status_kind::aborted};
174+
return operation_status_kind::aborted;
175175
}
176176

177177
if (status == data::any_sequence_stream_status::ok) {
@@ -180,7 +180,7 @@ operation_status apply::operator()(apply_context& ctx, abstract::task_context* c
180180
if (! assign_sequence_to_variables(ctx, sequence)) {
181181
stream->close();
182182
ctx.abort();
183-
return {operation_status_kind::aborted};
183+
return operation_status_kind::aborted;
184184
}
185185
ctx.has_output_ = true;
186186

@@ -189,7 +189,7 @@ operation_status apply::operator()(apply_context& ctx, abstract::task_context* c
189189
if (auto st = unsafe_downcast<record_operator>(downstream_.get())->process_record(context); ! st) {
190190
stream->close();
191191
ctx.abort();
192-
return {operation_status_kind::aborted};
192+
return operation_status_kind::aborted;
193193
}
194194
}
195195
}
@@ -203,13 +203,13 @@ operation_status apply::operator()(apply_context& ctx, abstract::task_context* c
203203
if (auto st = unsafe_downcast<record_operator>(downstream_.get())->process_record(context); ! st) {
204204
stream->close();
205205
ctx.abort();
206-
return {operation_status_kind::aborted};
206+
return operation_status_kind::aborted;
207207
}
208208
}
209209
}
210210

211211
stream->close();
212-
return {};
212+
return operation_status_kind::ok;
213213
}
214214

215215
operator_kind apply::kind() const noexcept {

‎src/jogasaki/executor/process/impl/ops/details/error_abort.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ operation_status error_abort_impl(
3737
) {
3838
ctx.abort();
3939
if(ctx.req_context()->error_info()) {
40-
return {operation_status_kind::aborted};
40+
return operation_status_kind::aborted;
4141
}
4242
switch(res) {
4343
case status::err_unique_constraint_violation:
@@ -130,7 +130,7 @@ operation_status error_abort_impl(
130130
);
131131
break;
132132
}
133-
return {operation_status_kind::aborted};
133+
return operation_status_kind::aborted;
134134
}
135135

136136
}

‎src/jogasaki/executor/process/impl/ops/details/expression_error.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ operation_status handle_expression_error_impl( //NOLINT(readability-function-co
6060
rc,
6161
false);
6262
ctx.abort();
63-
return {operation_status_kind::aborted};
63+
return operation_status_kind::aborted;
6464
}
6565
if (err.kind() == expr::error_kind::lost_precision_value_too_long) {
6666
auto rc = status::err_expression_evaluation_failure;
@@ -73,7 +73,7 @@ operation_status handle_expression_error_impl( //NOLINT(readability-function-co
7373
rc,
7474
false);
7575
ctx.abort();
76-
return {operation_status_kind::aborted};
76+
return operation_status_kind::aborted;
7777
}
7878
if (err.kind() == expr::error_kind::lob_file_io_error) {
7979
auto rc = status::err_io_error;
@@ -86,7 +86,7 @@ operation_status handle_expression_error_impl( //NOLINT(readability-function-co
8686
rc,
8787
false);
8888
ctx.abort();
89-
return {operation_status_kind::aborted};
89+
return operation_status_kind::aborted;
9090
}
9191
if (err.kind() == expr::error_kind::lob_reference_invalid) {
9292
auto rc = status::err_invalid_state;
@@ -99,12 +99,12 @@ operation_status handle_expression_error_impl( //NOLINT(readability-function-co
9999
rc,
100100
false);
101101
ctx.abort();
102-
return {operation_status_kind::aborted};
102+
return operation_status_kind::aborted;
103103
}
104104
if(err.kind() == expr::error_kind::error_info_provided) {
105105
set_error_info(*ctx.req_context(), ectx.get_error_info());
106106
ctx.abort();
107-
return {operation_status_kind::aborted};
107+
return operation_status_kind::aborted;
108108
}
109109
if (err.kind() == expr::error_kind::invalid_input_value) {
110110
auto rc = status::err_expression_evaluation_failure;
@@ -117,7 +117,7 @@ operation_status handle_expression_error_impl( //NOLINT(readability-function-co
117117
rc,
118118
false);
119119
ctx.abort();
120-
return {operation_status_kind::aborted};
120+
return operation_status_kind::aborted;
121121
}
122122
if (err.kind() == expr::error_kind::arithmetic_error) {
123123
std::string_view msg = "arithmetic error occurred"; // generic message - use more specific one if available
@@ -152,7 +152,7 @@ operation_status handle_expression_error_impl( //NOLINT(readability-function-co
152152
rc,
153153
false);
154154
ctx.abort();
155-
return {operation_status_kind::aborted};
155+
return operation_status_kind::aborted;
156156
}
157157
auto rc = status::err_expression_evaluation_failure;
158158

@@ -176,7 +176,7 @@ operation_status handle_expression_error_impl( //NOLINT(readability-function-co
176176
rc,
177177
false);
178178
ctx.abort();
179-
return {operation_status_kind::aborted};
179+
return operation_status_kind::aborted;
180180
}
181181

182182
} // namespace jogasaki::executor::process::impl::ops::details

‎src/jogasaki/executor/process/impl/ops/emit.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ operation_status emit::process_record(abstract::task_context *context) {
7979

8080
operation_status emit::operator()(emit_context &ctx) {
8181
if (ctx.aborted()) {
82-
return {operation_status_kind::aborted};
82+
return operation_status_kind::aborted;
8383
}
8484
auto target = ctx.buffer_.ref();
8585
auto source = ctx.input_variables().store().ref();
@@ -104,7 +104,7 @@ operation_status emit::operator()(emit_context &ctx) {
104104
status::err_io_error
105105
);
106106
ctx.abort();
107-
return {operation_status_kind::aborted};
107+
return operation_status_kind::aborted;
108108
}
109109
if(! writer->write(target)) {
110110
// possibly writer error due to buffer overflow
@@ -116,9 +116,9 @@ operation_status emit::operator()(emit_context &ctx) {
116116
status::err_io_error
117117
);
118118
ctx.abort();
119-
return {operation_status_kind::aborted};
119+
return operation_status_kind::aborted;
120120
}
121-
return {};
121+
return operation_status_kind::ok;
122122
}
123123

124124
maybe_shared_ptr<meta::external_record_meta> const& emit::meta() const noexcept {

‎src/jogasaki/executor/process/impl/ops/filter.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ operation_status filter::process_record(abstract::task_context* context) {
6666

6767
operation_status filter::operator()(filter_context& ctx, abstract::task_context* context) {
6868
if (ctx.aborted()) {
69-
return {operation_status_kind::aborted};
69+
return operation_status_kind::aborted;
7070
}
7171
auto& vars = ctx.input_variables();
7272
auto resource = ctx.varlen_resource();
@@ -83,11 +83,11 @@ operation_status filter::operator()(filter_context& ctx, abstract::task_context*
8383
if (downstream_) {
8484
if(auto st = unsafe_downcast<record_operator>(downstream_.get())->process_record(context); !st) {
8585
ctx.abort();
86-
return {operation_status_kind::aborted};
86+
return operation_status_kind::aborted;
8787
}
8888
}
8989
}
90-
return {};
90+
return operation_status_kind::ok;
9191
}
9292

9393
operator_kind filter::kind() const noexcept {

‎src/jogasaki/executor/process/impl/ops/find.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -153,23 +153,23 @@ operation_status find::call_downstream(
153153
if (downstream_) {
154154
if(auto st = unsafe_downcast<record_operator>(downstream_.get())->process_record(context); !st) {
155155
ctx.abort();
156-
return {operation_status_kind::aborted};
156+
return operation_status_kind::aborted;
157157
}
158158
}
159-
return {};
159+
return operation_status_kind::ok;
160160
}
161161

162162
operation_status find::operator()(class find_context& ctx, abstract::task_context* context) { //NOLINT(readability-function-cognitive-complexity)
163163
if (ctx.aborted()) {
164-
return {operation_status_kind::aborted};
164+
return operation_status_kind::aborted;
165165
}
166166
if(utils::request_cancel_enabled(request_cancel_kind::find) && ctx.req_context()) {
167167
auto& res_src = ctx.req_context()->req_info().response_source();
168168
if(res_src && res_src->check_cancel()) {
169169
cancel_request(*ctx.req_context());
170170
ctx.abort();
171171
finish(context);
172-
return {operation_status_kind::aborted};
172+
return operation_status_kind::aborted;
173173
}
174174
}
175175
auto target = ctx.output_variables().store().ref();
@@ -195,12 +195,12 @@ operation_status find::operator()(class find_context& ctx, abstract::task_contex
195195
msg,
196196
res
197197
);
198-
return {operation_status_kind::aborted};
198+
return operation_status_kind::aborted;
199199
}
200200
if (res == status::err_integrity_constraint_violation) {
201201
// null is assigned for find condition. Nothing should be found.
202202
finish(context);
203-
return {};
203+
return operation_status_kind::ok;
204204
}
205205
return error_abort(ctx, res);
206206
}
@@ -212,7 +212,7 @@ operation_status find::operator()(class find_context& ctx, abstract::task_contex
212212
finish(context);
213213
utils::modify_concurrent_operation_status(*ctx.tx_->object(), res, false);
214214
if (res == status::not_found) {
215-
return {};
215+
return operation_status_kind::ok;
216216
}
217217
handle_kvs_errors(*ctx.req_context(), res);
218218
return error_abort(ctx, res);
@@ -236,7 +236,7 @@ operation_status find::operator()(class find_context& ctx, abstract::task_contex
236236
if(auto res = it->next(); res != status::ok) {
237237
finish(context);
238238
if (res == status::not_found) {
239-
return {};
239+
return operation_status_kind::ok;
240240
}
241241
handle_kvs_errors(*ctx.req_context(), res);
242242
return error_abort(ctx, res);
@@ -259,7 +259,7 @@ operation_status find::operator()(class find_context& ctx, abstract::task_contex
259259
}
260260
}
261261
finish(context);
262-
return {};
262+
return operation_status_kind::ok;
263263
}
264264

265265
operator_kind find::kind() const noexcept {

‎src/jogasaki/executor/process/impl/ops/flatten.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ operation_status flatten::process_group(abstract::task_context* context, bool la
5959

6060
operation_status flatten::operator()(flatten_context& ctx, abstract::task_context* context) {
6161
if (ctx.aborted()) {
62-
return {operation_status_kind::aborted};
62+
return operation_status_kind::aborted;
6363
}
6464
if (downstream_) {
6565
if(auto st = unsafe_downcast<record_operator>(downstream_.get())->process_record(context); !st) {
6666
ctx.abort();
67-
return {operation_status_kind::aborted};
67+
return operation_status_kind::aborted;
6868
}
6969
}
70-
return {};
70+
return operation_status_kind::ok;
7171
}
7272

7373
operator_kind flatten::kind() const noexcept {

‎src/jogasaki/executor/process/impl/ops/index_join.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ class index_join : public record_operator {
326326
*/
327327
operation_status operator()(index_join_context<MatchInfo>& ctx, abstract::task_context* context = nullptr) { //NOLINT(readability-function-cognitive-complexity)
328328
if (ctx.aborted()) {
329-
return {operation_status_kind::aborted};
329+
return operation_status_kind::aborted;
330330
}
331331
auto resource = ctx.varlen_resource();
332332
nullify_output_variables(ctx.output_variables().store().ref());
@@ -372,7 +372,7 @@ class index_join : public record_operator {
372372
if (downstream_) {
373373
if(auto st = unsafe_downcast<record_operator>(downstream_.get())->process_record(context); !st) {
374374
ctx.abort();
375-
return {operation_status_kind::aborted};
375+
return operation_status_kind::aborted;
376376
}
377377
}
378378
// clean output variables for next record just in case
@@ -383,9 +383,9 @@ class index_join : public record_operator {
383383
if(auto res = ctx.matcher_->result(); res != status::ok && res != status::not_found) {
384384
// on error, error info is already filled in the request context so just finish the operator
385385
ctx.abort();
386-
return {operation_status_kind::aborted};
386+
return operation_status_kind::aborted;
387387
}
388-
return {};
388+
return operation_status_kind::ok;
389389
}
390390

391391
/**

0 commit comments

Comments
 (0)