This is an automated email from the ASF dual-hosted git repository.
lihaopeng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new ebe771d240 [refactor](executor) remove unused variable
ebe771d240 is described below
commit ebe771d240740155fd28a146a4f815a10c3f42b6
Author: Mryange <59914473+mrya...@users.noreply.github.com>
AuthorDate: Fri Jul 14 10:35:59 2023 +0800
[refactor](executor) remove unused variable
---
be/src/vec/sink/vdata_stream_sender.cpp | 36 ++++++----------------
be/src/vec/sink/vdata_stream_sender.h | 1 -
.../java/org/apache/doris/qe/SessionVariable.java | 6 ----
3 files changed, 9 insertions(+), 34 deletions(-)
diff --git a/be/src/vec/sink/vdata_stream_sender.cpp
b/be/src/vec/sink/vdata_stream_sender.cpp
index b49c6ec92e..d8c623353d 100644
--- a/be/src/vec/sink/vdata_stream_sender.cpp
+++ b/be/src/vec/sink/vdata_stream_sender.cpp
@@ -465,9 +465,6 @@ Status VDataStreamSender::prepare(RuntimeState* state) {
shuffle(_channels.begin(), _channels.end(), g);
} else if (_part_type == TPartitionType::HASH_PARTITIONED ||
_part_type == TPartitionType::BUCKET_SHFFULE_HASH_PARTITIONED) {
- if (_state->query_options().__isset.enable_new_shuffle_hash_method) {
- _new_shuffle_hash_method =
_state->query_options().enable_new_shuffle_hash_method;
- }
RETURN_IF_ERROR(VExpr::prepare(_partition_expr_ctxs, state,
_row_desc));
} else {
RETURN_IF_ERROR(VExpr::prepare(_partition_expr_ctxs, state,
_row_desc));
@@ -624,31 +621,16 @@ Status VDataStreamSender::send(RuntimeState* state,
Block* block, bool eos) {
// TODO: after we support new shuffle hash method, should simple the
code
if (_part_type == TPartitionType::HASH_PARTITIONED) {
- if (!_new_shuffle_hash_method) {
- SCOPED_TIMER(_split_block_hash_compute_timer);
- // for each row, we have a siphash val
- std::vector<SipHash> siphashs(rows);
- // result[j] means column index, i means rows index
- for (int j = 0; j < result_size; ++j) {
- // complex type most not implement get_data_at() method
which column_const will call
- unpack_if_const(block->get_by_position(result[j]).column)
- .first->update_hashes_with_value(siphashs);
- }
- for (int i = 0; i < rows; i++) {
- hashes[i] = siphashs[i].get64() % element_size;
- }
- } else {
- SCOPED_TIMER(_split_block_hash_compute_timer);
- // result[j] means column index, i means rows index, here to
calculate the xxhash value
- for (int j = 0; j < result_size; ++j) {
- // complex type most not implement get_data_at() method
which column_const will call
- unpack_if_const(block->get_by_position(result[j]).column)
- .first->update_hashes_with_value(hashes);
- }
+ SCOPED_TIMER(_split_block_hash_compute_timer);
+ // result[j] means column index, i means rows index, here to
calculate the xxhash value
+ for (int j = 0; j < result_size; ++j) {
+ // complex type most not implement get_data_at() method which
column_const will call
+ unpack_if_const(block->get_by_position(result[j]).column)
+ .first->update_hashes_with_value(hashes);
+ }
- for (int i = 0; i < rows; i++) {
- hashes[i] = hashes[i] % element_size;
- }
+ for (int i = 0; i < rows; i++) {
+ hashes[i] = hashes[i] % element_size;
}
{
diff --git a/be/src/vec/sink/vdata_stream_sender.h
b/be/src/vec/sink/vdata_stream_sender.h
index 2fdecac6cb..5998732406 100644
--- a/be/src/vec/sink/vdata_stream_sender.h
+++ b/be/src/vec/sink/vdata_stream_sender.h
@@ -194,7 +194,6 @@ protected:
segment_v2::CompressionTypePB _compression_type;
- bool _new_shuffle_hash_method = false;
bool _only_local_exchange = false;
bool _enable_pipeline_exec = false;
};
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
index 591e0291f2..7d5bfb4965 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
@@ -272,8 +272,6 @@ public class SessionVariable implements Serializable,
Writable {
public static final String SKIP_DELETE_BITMAP = "skip_delete_bitmap";
- public static final String ENABLE_NEW_SHUFFLE_HASH_METHOD =
"enable_new_shuffle_hash_method";
-
public static final String ENABLE_PUSH_DOWN_NO_GROUP_AGG =
"enable_push_down_no_group_agg";
public static final String ENABLE_CBO_STATISTICS = "enable_cbo_statistics";
@@ -867,9 +865,6 @@ public class SessionVariable implements Serializable,
Writable {
@VariableMgr.VarAttr(name = ENABLE_NEREIDS_TIMEOUT, needForward = true)
public boolean enableNereidsTimeout = true;
- @VariableMgr.VarAttr(name = ENABLE_NEW_SHUFFLE_HASH_METHOD)
- public boolean enableNewShuffleHashMethod = true;
-
@VariableMgr.VarAttr(name = ENABLE_PUSH_DOWN_NO_GROUP_AGG)
public boolean enablePushDownNoGroupAgg = true;
@@ -2057,7 +2052,6 @@ public class SessionVariable implements Serializable,
Writable {
tResult.setCheckOverflowForDecimal(checkOverflowForDecimal);
tResult.setFragmentTransmissionCompressionCodec(fragmentTransmissionCompressionCodec);
tResult.setEnableLocalExchange(enableLocalExchange);
- tResult.setEnableNewShuffleHashMethod(enableNewShuffleHashMethod);
tResult.setSkipStorageEngineMerge(skipStorageEngineMerge);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
