This is an automated email from the ASF dual-hosted git repository.
zhaoc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 0f6e74f [BUG] Fix location url in agg_fn_evaluator (#3780)
0f6e74f is described below
commit 0f6e74f3f948e53b066a4842ad82872eaa299dbf
Author: HangyuanLiu <460660...@qq.com>
AuthorDate: Sat Jun 6 11:34:12 2020 +0800
[BUG] Fix location url in agg_fn_evaluator (#3780)
---
be/src/exprs/agg_fn_evaluator.cpp | 17 +++++++----------
be/src/exprs/agg_fn_evaluator.h | 9 ---------
2 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/be/src/exprs/agg_fn_evaluator.cpp
b/be/src/exprs/agg_fn_evaluator.cpp
index 6c0f211..02906ac 100755
--- a/be/src/exprs/agg_fn_evaluator.cpp
+++ b/be/src/exprs/agg_fn_evaluator.cpp
@@ -191,9 +191,6 @@ Status AggFnEvaluator::prepare(
// TODO: this should be made identical for the builtin and UDA case by
// putting all this logic in an improved opcode registry.
- DCHECK_EQ(_function_type, TFunctionBinaryType::BUILTIN);
-
-
// Load the function pointers. Merge is not required if this is evaluating
an
// analytic function.
if (_fn.aggregate_fn.init_fn_symbol.empty() ||
@@ -209,41 +206,41 @@ Status AggFnEvaluator::prepare(
// Load the function pointers.
RETURN_IF_ERROR(UserFunctionCache::instance()->get_function_ptr(
_fn.id, _fn.aggregate_fn.init_fn_symbol,
- _hdfs_location, _fn.checksum, &_init_fn, NULL));
+ _fn.hdfs_location, _fn.checksum, &_init_fn, NULL));
RETURN_IF_ERROR(UserFunctionCache::instance()->get_function_ptr(
_fn.id, _fn.aggregate_fn.update_fn_symbol,
- _hdfs_location, _fn.checksum, &_update_fn, NULL));
+ _fn.hdfs_location, _fn.checksum, &_update_fn, NULL));
// Merge() is not loaded if evaluating the agg fn as an analytic function.
if (!_is_analytic_fn) {
RETURN_IF_ERROR(UserFunctionCache::instance()->get_function_ptr(
_fn.id, _fn.aggregate_fn.merge_fn_symbol,
- _hdfs_location, _fn.checksum, &_merge_fn, NULL));
+ _fn.hdfs_location, _fn.checksum, &_merge_fn, NULL));
}
// Serialize and Finalize are optional
if (!_fn.aggregate_fn.serialize_fn_symbol.empty()) {
RETURN_IF_ERROR(UserFunctionCache::instance()->get_function_ptr(
_fn.id, _fn.aggregate_fn.serialize_fn_symbol,
- _hdfs_location, _fn.checksum, &_serialize_fn, NULL));
+ _fn.hdfs_location, _fn.checksum, &_serialize_fn, NULL));
}
if (!_fn.aggregate_fn.finalize_fn_symbol.empty()) {
RETURN_IF_ERROR(UserFunctionCache::instance()->get_function_ptr(
_fn.id, _fn.aggregate_fn.finalize_fn_symbol,
- _hdfs_location, _fn.checksum, &_finalize_fn, NULL));
+ _fn.hdfs_location, _fn.checksum, &_finalize_fn, NULL));
}
if (!_fn.aggregate_fn.get_value_fn_symbol.empty()) {
RETURN_IF_ERROR(UserFunctionCache::instance()->get_function_ptr(
_fn.id, _fn.aggregate_fn.get_value_fn_symbol,
- _hdfs_location, _fn.checksum, &_get_value_fn,
+ _fn.hdfs_location, _fn.checksum, &_get_value_fn,
NULL));
}
if (!_fn.aggregate_fn.remove_fn_symbol.empty()) {
RETURN_IF_ERROR(UserFunctionCache::instance()->get_function_ptr(
_fn.id, _fn.aggregate_fn.remove_fn_symbol,
- _hdfs_location, _fn.checksum, &_remove_fn,
+ _fn.hdfs_location, _fn.checksum, &_remove_fn,
NULL));
}
diff --git a/be/src/exprs/agg_fn_evaluator.h b/be/src/exprs/agg_fn_evaluator.h
index 09a7fce..eac15ab 100755
--- a/be/src/exprs/agg_fn_evaluator.h
+++ b/be/src/exprs/agg_fn_evaluator.h
@@ -223,15 +223,6 @@ private:
// If it's a builtin, the opcode.
AggregationOp _agg_op;
- // local path and function names for UDAs.
- long _fn_id;
- std::string _hdfs_location;
- std::string _init_fn_symbol;
- std::string _update_fn_symbol;
- std::string _merge_fn_symbol;
- std::string _serialize_fn_symbol;
- std::string _finalize_fn_symbol;
-
uint64_t _total_mem_consumption;
uint64_t _accumulated_mem_consumption;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
