edponce commented on code in PR #12460:
URL: https://github.com/apache/arrow/pull/12460#discussion_r847856201
##########
cpp/src/arrow/compute/api_vector.h:
##########
@@ -188,6 +188,27 @@ class ARROW_EXPORT PartitionNthOptions : public
FunctionOptions {
NullPlacement null_placement;
};
+/// \brief Options for cumulative sum function
+class ARROW_EXPORT CumulativeSumOptions : public FunctionOptions {
+ public:
+ explicit CumulativeSumOptions(double start = 0, bool skip_nulls = false,
Review Comment:
L194 (explicit...) is indented incorrectly.
##########
cpp/src/arrow/compute/kernels/vector_cumulative_ops.cc:
##########
@@ -0,0 +1,215 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+#include "arrow/array/array_base.h"
+#include "arrow/compute/api_scalar.h"
+#include "arrow/compute/api_vector.h"
+#include "arrow/compute/cast.h"
+#include "arrow/compute/kernels/base_arithmetic_internal.h"
+#include "arrow/compute/kernels/codegen_internal.h"
+#include "arrow/compute/kernels/common.h"
+#include "arrow/result.h"
+#include "arrow/util/bit_util.h"
+#include "arrow/visit_type_inline.h"
+
+namespace arrow {
+namespace compute {
+namespace internal {
+namespace {
+template <typename OptionsType>
+struct CumulativeOptionsWrapper : public OptionsWrapper<OptionsType> {
+ using State = CumulativeOptionsWrapper<OptionsType>;
+
+ explicit CumulativeOptionsWrapper(OptionsType options) :
OptionsWrapper<OptionsType>(std::move(options)) {}
+
+ static Result<std::unique_ptr<KernelState>> Init(KernelContext* ctx,
+ const KernelInitArgs& args)
{
+ auto options = static_cast<const OptionsType*>(args.options);
+ if (!options) {
+ return Status::Invalid(
+ "Attempted to initialize KernelState from null FunctionOptions");
+ }
+
+ const auto& start = options->start;
+ if (!start || !start->is_valid) {
+ return Status::Invalid("Cumulative `start` option must be non-null and
valid");
+ }
+
+ // Ensure `start` option matches input type
+ if (!start->type->Equals(args.inputs[0].type)) {
+ ARROW_ASSIGN_OR_RAISE(auto casted_start, Cast(Datum(start),
args.inputs[0].type));
+ auto new_options = OptionsType(casted_start.scalar(),
options->skip_nulls);
+ return ::arrow::internal::make_unique<State>(new_options);
+ }
+ return ::arrow::internal::make_unique<State>(*options);
+ }
+};
+
+// The driver kernel for all cumulative compute functions. Op is a compute
kernel
+// representing any binary associative operation (add, product, min, max,
etc.) and
+// OptionsType the options type corresponding to Op. ArgType and OutType are
the input
+// and output types, which will normally be the same (e.g. the cumulative sum
of an array
+// of Int64Type will result in an array of Int64Type).
+template <typename OutType, typename ArgType, typename Op, typename
OptionsType>
+struct CumulativeGeneric {
+ using OutValue = typename GetOutputType<OutType>::T;
+ using ArgValue = typename GetViewType<ArgType>::T;
+
+ static Status Exec(KernelContext* ctx, const ExecBatch& batch, Datum* out) {
+ const auto& options = CumulativeOptionsWrapper<OptionsType>::Get(ctx);
+ auto start = UnboxScalar<OutType>::Unbox(*(options.start));
+ auto skip_nulls = options.skip_nulls;
+
+ int64_t base_output_offset = 0;
+ bool encountered_null = false;
+ ArrayData* out_arr = out->mutable_array();
Review Comment:
Fix segfault with Scalar input by moving the `out->mutable_array()`
statement to the switch-case blocks of Array and ChunkedArray.
##########
cpp/src/arrow/compute/kernels/vector_cumulative_ops.cc:
##########
@@ -0,0 +1,215 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+#include "arrow/array/array_base.h"
+#include "arrow/compute/api_scalar.h"
+#include "arrow/compute/api_vector.h"
+#include "arrow/compute/cast.h"
+#include "arrow/compute/kernels/base_arithmetic_internal.h"
+#include "arrow/compute/kernels/codegen_internal.h"
+#include "arrow/compute/kernels/common.h"
+#include "arrow/result.h"
+#include "arrow/util/bit_util.h"
+#include "arrow/visit_type_inline.h"
+
+namespace arrow {
+namespace compute {
+namespace internal {
+namespace {
+template <typename OptionsType>
+struct CumulativeOptionsWrapper : public OptionsWrapper<OptionsType> {
+ using State = CumulativeOptionsWrapper<OptionsType>;
+
+ explicit CumulativeOptionsWrapper(OptionsType options) :
OptionsWrapper<OptionsType>(std::move(options)) {}
+
+ static Result<std::unique_ptr<KernelState>> Init(KernelContext* ctx,
+ const KernelInitArgs& args)
{
+ auto options = static_cast<const OptionsType*>(args.options);
+ if (!options) {
+ return Status::Invalid(
+ "Attempted to initialize KernelState from null FunctionOptions");
+ }
+
+ const auto& start = options->start;
+ if (!start || !start->is_valid) {
+ return Status::Invalid("Cumulative `start` option must be non-null and
valid");
+ }
+
+ // Ensure `start` option matches input type
+ if (!start->type->Equals(args.inputs[0].type)) {
+ ARROW_ASSIGN_OR_RAISE(auto casted_start, Cast(Datum(start),
args.inputs[0].type));
Review Comment:
In my PR I forgot to pass context to `Cast`:
```
Cast(Datum(start), args.inputs[0].type, CastOptions::Safe(),
ctx->exec_context())
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
