You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by li...@apache.org on 2020/03/25 04:01:18 UTC

[incubator-doris] 01/01: Revert "Remove deep copy when doing hash table EvalRow (#3171)" (#3173)

This is an automated email from the ASF dual-hosted git repository.

lichaoyong pushed a commit to branch branch-0.12
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git

commit 5e08725b2180a9a3dfcdd5ac63231bf8eb31a214
Author: EmmyMiao87 <52...@qq.com>
AuthorDate: Mon Mar 23 15:29:46 2020 +0800

    Revert "Remove deep copy when doing hash table EvalRow (#3171)" (#3173)
---
 be/src/exec/partitioned_hash_table.cc | 2 +-
 gensrc/script/gen_build_version.sh    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/be/src/exec/partitioned_hash_table.cc b/be/src/exec/partitioned_hash_table.cc
index 9598951..9c50754 100644
--- a/be/src/exec/partitioned_hash_table.cc
+++ b/be/src/exec/partitioned_hash_table.cc
@@ -235,7 +235,7 @@ bool PartitionedHashTableCtx::EvalRow(TupleRow* row, const vector<ExprContext*>&
       expr_values_null[i] = false;
       DCHECK_LE(build_exprs_[i]->type().get_slot_size(),
           sizeof(NULL_VALUE));
-      RawValue::write(val, loc, build_exprs_[i]->type(), nullptr);
+      RawValue::write(val, loc, build_exprs_[i]->type(), expr_results_pool_);
     }
   }
   return has_null;
diff --git a/gensrc/script/gen_build_version.sh b/gensrc/script/gen_build_version.sh
index 21bb1b8..0b3550b 100755
--- a/gensrc/script/gen_build_version.sh
+++ b/gensrc/script/gen_build_version.sh
@@ -25,7 +25,7 @@
 # contains the build version based on the git hash or svn revision.
 ##############################################################
 
-build_version="trunk"
+build_version="branch-0.12"
 
 unset LANG
 unset LC_CTYPE


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org