You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by kx...@apache.org on 2023/08/22 03:55:42 UTC
[doris] branch branch-2.0 updated (9c0138f1ca -> d11df13ab2)
This is an automated email from the ASF dual-hosted git repository.
kxiao pushed a change to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
from 9c0138f1ca fix beNum not found (#23253)
new b0e3eb89dd [fix](session-var) fix forward parallel fragment instance num, and forward some session by the way (#23234)
new d11df13ab2 [fix](merge-on-write) process error of delete bitmap calculation (#23285)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
be/src/olap/tablet.cpp | 8 ++++----
.../java/org/apache/doris/qe/SessionVariable.java | 23 +++++++++++-----------
2 files changed, 16 insertions(+), 15 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[doris] 01/02: [fix](session-var) fix forward parallel fragment instance num, and forward some session by the way (#23234)
Posted by kx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
commit b0e3eb89dd711254733ec1a9c0d4b96d7b3d7d48
Author: Siyang Tang <82...@users.noreply.github.com>
AuthorDate: Tue Aug 22 09:00:29 2023 +0800
[fix](session-var) fix forward parallel fragment instance num, and forward some session by the way (#23234)
---
.../java/org/apache/doris/qe/SessionVariable.java | 23 +++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
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 d570dc3f7f..ebbc5d98cd 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
@@ -568,10 +568,10 @@ public class SessionVariable implements Serializable, Writable {
* the parallel exec instance num for one Fragment in one BE
* 1 means disable this feature
*/
- @VariableMgr.VarAttr(name = PARALLEL_FRAGMENT_EXEC_INSTANCE_NUM, fuzzy = true)
+ @VariableMgr.VarAttr(name = PARALLEL_FRAGMENT_EXEC_INSTANCE_NUM, needForward = true, fuzzy = true)
public int parallelExecInstanceNum = 1;
- @VariableMgr.VarAttr(name = PARALLEL_PIPELINE_TASK_NUM, fuzzy = true)
+ @VariableMgr.VarAttr(name = PARALLEL_PIPELINE_TASK_NUM, fuzzy = true, needForward = true)
public int parallelPipelineTaskNum = 0;
@VariableMgr.VarAttr(name = MAX_INSTANCE_NUM)
@@ -645,7 +645,8 @@ public class SessionVariable implements Serializable, Writable {
@VariableMgr.VarAttr(name = ENABLE_VECTORIZED_ENGINE, expType = ExperimentalType.EXPERIMENTAL_ONLINE)
public boolean enableVectorizedEngine = true;
- @VariableMgr.VarAttr(name = ENABLE_PIPELINE_ENGINE, fuzzy = true, expType = ExperimentalType.EXPERIMENTAL)
+ @VariableMgr.VarAttr(name = ENABLE_PIPELINE_ENGINE, fuzzy = true, needForward = true,
+ varType = VariableAnnotation.EXPERIMENTAL)
private boolean enablePipelineEngine = true;
@VariableMgr.VarAttr(name = ENABLE_AGG_STATE, fuzzy = false, expType = ExperimentalType.EXPERIMENTAL)
@@ -676,29 +677,29 @@ public class SessionVariable implements Serializable, Writable {
@VariableMgr.VarAttr(name = ENABLE_FOLD_CONSTANT_BY_BE, fuzzy = true)
private boolean enableFoldConstantByBe = false;
- @VariableMgr.VarAttr(name = RUNTIME_FILTER_MODE)
+ @VariableMgr.VarAttr(name = RUNTIME_FILTER_MODE, needForward = true)
private String runtimeFilterMode = "GLOBAL";
- @VariableMgr.VarAttr(name = RUNTIME_BLOOM_FILTER_SIZE)
+ @VariableMgr.VarAttr(name = RUNTIME_BLOOM_FILTER_SIZE, needForward = true)
private int runtimeBloomFilterSize = 2097152;
- @VariableMgr.VarAttr(name = RUNTIME_BLOOM_FILTER_MIN_SIZE)
+ @VariableMgr.VarAttr(name = RUNTIME_BLOOM_FILTER_MIN_SIZE, needForward = true)
private int runtimeBloomFilterMinSize = 1048576;
- @VariableMgr.VarAttr(name = RUNTIME_BLOOM_FILTER_MAX_SIZE)
+ @VariableMgr.VarAttr(name = RUNTIME_BLOOM_FILTER_MAX_SIZE, needForward = true)
private int runtimeBloomFilterMaxSize = 16777216;
- @VariableMgr.VarAttr(name = RUNTIME_FILTER_WAIT_TIME_MS)
+ @VariableMgr.VarAttr(name = RUNTIME_FILTER_WAIT_TIME_MS, needForward = true)
private int runtimeFilterWaitTimeMs = 1000;
- @VariableMgr.VarAttr(name = RUNTIME_FILTERS_MAX_NUM)
+ @VariableMgr.VarAttr(name = RUNTIME_FILTERS_MAX_NUM, needForward = true)
private int runtimeFiltersMaxNum = 10;
// Set runtimeFilterType to IN_OR_BLOOM filter
- @VariableMgr.VarAttr(name = RUNTIME_FILTER_TYPE, fuzzy = true)
+ @VariableMgr.VarAttr(name = RUNTIME_FILTER_TYPE, fuzzy = true, needForward = true)
private int runtimeFilterType = 8;
- @VariableMgr.VarAttr(name = RUNTIME_FILTER_MAX_IN_NUM)
+ @VariableMgr.VarAttr(name = RUNTIME_FILTER_MAX_IN_NUM, needForward = true)
private int runtimeFilterMaxInNum = 1024;
@VariableMgr.VarAttr(name = USE_RF_DEFAULT)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[doris] 02/02: [fix](merge-on-write) process error of delete bitmap calculation (#23285)
Posted by kx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
commit d11df13ab2a7307d91b4c0b9106a15ed3c235aa0
Author: zhannngchen <48...@users.noreply.github.com>
AuthorDate: Tue Aug 22 10:53:50 2023 +0800
[fix](merge-on-write) process error of delete bitmap calculation (#23285)
---
be/src/olap/tablet.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/be/src/olap/tablet.cpp b/be/src/olap/tablet.cpp
index 78c43c80ca..e6314365ad 100644
--- a/be/src/olap/tablet.cpp
+++ b/be/src/olap/tablet.cpp
@@ -3229,8 +3229,8 @@ Status Tablet::update_delete_bitmap_without_lock(const RowsetSharedPtr& rowset)
auto token = StorageEngine::instance()->calc_delete_bitmap_executor()->create_token();
RETURN_IF_ERROR(calc_delete_bitmap(rowset, segments, specified_rowsets, delete_bitmap,
cur_version - 1, token.get()));
- token->wait();
- token->get_delete_bitmap(delete_bitmap);
+ RETURN_IF_ERROR(token->wait());
+ RETURN_IF_ERROR(token->get_delete_bitmap(delete_bitmap));
size_t total_rows = std::accumulate(
segments.begin(), segments.end(), 0,
[](size_t sum, const segment_v2::SegmentSharedPtr& s) { return sum += s->num_rows(); });
@@ -3330,8 +3330,8 @@ Status Tablet::update_delete_bitmap(const RowsetSharedPtr& rowset,
auto token = StorageEngine::instance()->calc_delete_bitmap_executor()->create_token();
RETURN_IF_ERROR(calc_delete_bitmap(rowset, segments, specified_rowsets, delete_bitmap,
cur_version - 1, token.get(), rowset_writer));
- token->wait();
- token->get_delete_bitmap(delete_bitmap);
+ RETURN_IF_ERROR(token->wait());
+ RETURN_IF_ERROR(token->get_delete_bitmap(delete_bitmap));
size_t total_rows = std::accumulate(
segments.begin(), segments.end(), 0,
[](size_t sum, const segment_v2::SegmentSharedPtr& s) { return sum += s->num_rows(); });
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org