mirrors/arrow
0
0 Fork 0
mirror of https://github.com/apache/arrow.git synced 2026-10-29 09:05:47 +08:00
Code Activity

Conform style guide

Browse Source
This commit is contained in:
François Saint-Jacques committed 2019-06-05 07:46:25 -04:00
1 parent 1402a98eeb
commit 864c679666
2 files changed
+11 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

cpp/src/arrow/compute/kernels/filter.cc
+5 -3
View File
@@ -35,19 +35,21 @@ Status FilterBinaryKernel::Call(FunctionContext* ctx, const Datum& left,
auto lk = left.kind();
auto rk = right.kind();
auto out_array = out->array();
if (lk == Datum::ARRAY && rk == Datum::SCALAR) {
auto array = left.array();
auto scalar = right.scalar();
return filter_function_->Filter(*array, *scalar, out->array());
return filter_function_->Filter(*array, *scalar, &out_array);
} else if (lk == Datum::SCALAR && rk == Datum::ARRAY) {
auto scalar = left.scalar();
auto array = right.array();
return filter_function_->Filter(*scalar, *array, out->array());
auto out_array = out->array();
return filter_function_->Filter(*scalar, *array, &out_array);
} else if (lk == Datum::ARRAY && rk == Datum::ARRAY) {
auto lhs = left.array();
auto rhs = right.array();
return filter_function_->Filter(*lhs, *rhs, out->array());
return filter_function_->Filter(*lhs, *rhs, &out_array);
}
return Status::Invalid("Invalid datum signature for FilterBinaryKernel");
cpp/src/arrow/compute/kernels/filter.h
+6 -6
View File
@@ -43,16 +43,16 @@ class ARROW_EXPORT FilterFunction {
ArrayData* output) const = 0;
Status Filter(const ArrayData& array, const Scalar& scalar,
std::shared_ptr<ArrayData>&& output) {
return Filter(array, scalar, output.get());
std::shared_ptr<ArrayData>* output) {
return Filter(array, scalar, output->get());
}
virtual Status Filter(const Scalar& scalar, const ArrayData& array,
ArrayData* output) const = 0;
Status Filter(const Scalar& scalar, const ArrayData& array,
std::shared_ptr<ArrayData>&& output) {
return Filter(scalar, array, output.get());
std::shared_ptr<ArrayData>* output) {
return Filter(scalar, array, output->get());
}
/// Filter an array with an array argument.
@@ -60,8 +60,8 @@ class ARROW_EXPORT FilterFunction {
ArrayData* output) const = 0;
Status Filter(const ArrayData& lhs, const ArrayData& rhs,
std::shared_ptr<ArrayData>&& output) {
return Filter(lhs, rhs, output.get());
std::shared_ptr<ArrayData>* output) {
return Filter(lhs, rhs, output->get());
}
/// By default, FilterFunction emits a result bitmap.