You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by yi...@apache.org on 2024/02/23 12:58:06 UTC
(doris) branch branch-2.1 updated (1c443661c15 -> b6ca76e7d44)
This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a change to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
from 1c443661c15 [Fix](rf) fix multi thread init error in RuntimeFilterMergeControllerEntity (#31337)
new db2f0b35744 [docs](stats) add sidebars for stats docs #31309
new b6ca76e7d44 fix routine load job throw exception after commit (#31303)
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:
.../sql-manual/sql-reference/Show-Statements/SHOW-ANALYZE.md | 4 +++-
.../sql-reference/Show-Statements/SHOW-COLUMN-STATS.md | 2 ++
.../sql-reference/Show-Statements/SHOW-TABLE-STATS.md | 2 ++
docs/sidebars.json | 6 +++++-
.../sql-manual/sql-reference/Show-Statements/SHOW-ANALYZE.md | 4 +++-
.../sql-reference/Show-Statements/SHOW-COLUMN-STATS.md | 2 ++
.../sql-reference/Show-Statements/SHOW-TABLE-STATS.md | 2 ++
.../java/org/apache/doris/load/routineload/RoutineLoadJob.java | 10 ++++++++++
.../org/apache/doris/load/routineload/RoutineLoadJobTest.java | 1 -
9 files changed, 29 insertions(+), 4 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
(doris) 02/02: fix routine load job throw exception after commit (#31303)
Posted by yi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
commit b6ca76e7d44411a3b888bd021e2d7a60b9348ecf
Author: HHoflittlefish777 <77...@users.noreply.github.com>
AuthorDate: Fri Feb 23 20:55:44 2024 +0800
fix routine load job throw exception after commit (#31303)
---
.../java/org/apache/doris/load/routineload/RoutineLoadJob.java | 10 ++++++++++
.../org/apache/doris/load/routineload/RoutineLoadJobTest.java | 1 -
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadJob.java b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadJob.java
index a8fb467a9bf..8760dc4b71c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadJob.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadJob.java
@@ -1018,6 +1018,16 @@ public abstract class RoutineLoadJob extends AbstractTxnStateChangeCallback impl
// find task in job
Optional<RoutineLoadTaskInfo> routineLoadTaskInfoOptional = routineLoadTaskInfoList.stream().filter(
entity -> entity.getTxnId() == txnState.getTransactionId()).findFirst();
+ if (!routineLoadTaskInfoOptional.isPresent()) {
+ // not find task in routineLoadTaskInfoList. this may happen in following case:
+ // the routine load job has been paused and before transaction committed.
+ // The routineLoadTaskInfoList will be cleared when job being paused.
+ // So the task can not be found here.
+ // This is a normal case, we just print a log here to observe.
+ LOG.info("Can not find task with transaction {} after committed, job: {}",
+ txnState.getTransactionId(), id);
+ return;
+ }
RoutineLoadTaskInfo routineLoadTaskInfo = routineLoadTaskInfoOptional.get();
taskBeId = routineLoadTaskInfo.getBeId();
executeTaskOnTxnStatusChanged(routineLoadTaskInfo, txnState, TransactionStatus.COMMITTED, null);
diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/routineload/RoutineLoadJobTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/routineload/RoutineLoadJobTest.java
index df7f3633816..8d903957453 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/load/routineload/RoutineLoadJobTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/load/routineload/RoutineLoadJobTest.java
@@ -172,7 +172,6 @@ public class RoutineLoadJobTest {
Deencapsulation.setField(routineLoadJob, "progress", progress);
try {
routineLoadJob.afterCommitted(transactionState, true);
- Assert.assertEquals(RoutineLoadJob.JobState.PAUSED, routineLoadJob.getState());
} catch (TransactionException e) {
Assert.fail();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
(doris) 01/02: [docs](stats) add sidebars for stats docs #31309
Posted by yi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
commit db2f0b35744ff9c842e0abaa74533a63b2863fbd
Author: camby <ca...@tencent.com>
AuthorDate: Fri Feb 23 20:51:07 2024 +0800
[docs](stats) add sidebars for stats docs #31309
---
.../docs/sql-manual/sql-reference/Show-Statements/SHOW-ANALYZE.md | 4 +++-
.../sql-manual/sql-reference/Show-Statements/SHOW-COLUMN-STATS.md | 2 ++
.../sql-manual/sql-reference/Show-Statements/SHOW-TABLE-STATS.md | 2 ++
docs/sidebars.json | 6 +++++-
.../docs/sql-manual/sql-reference/Show-Statements/SHOW-ANALYZE.md | 4 +++-
.../sql-manual/sql-reference/Show-Statements/SHOW-COLUMN-STATS.md | 2 ++
.../sql-manual/sql-reference/Show-Statements/SHOW-TABLE-STATS.md | 2 ++
7 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/docs/en/docs/sql-manual/sql-reference/Show-Statements/SHOW-ANALYZE.md b/docs/en/docs/sql-manual/sql-reference/Show-Statements/SHOW-ANALYZE.md
index 73ddaaa8099..0b12578737a 100644
--- a/docs/en/docs/sql-manual/sql-reference/Show-Statements/SHOW-ANALYZE.md
+++ b/docs/en/docs/sql-manual/sql-reference/Show-Statements/SHOW-ANALYZE.md
@@ -28,6 +28,8 @@ under the License.
### Name
+<version since="2.0"></version>
+
SHOW ANALYZE
### Description
@@ -106,4 +108,4 @@ mysql> show analyze task status 20038 ;
### Keywords
-SHOW, ANALYZE
\ No newline at end of file
+SHOW, ANALYZE
diff --git a/docs/en/docs/sql-manual/sql-reference/Show-Statements/SHOW-COLUMN-STATS.md b/docs/en/docs/sql-manual/sql-reference/Show-Statements/SHOW-COLUMN-STATS.md
index b64c5ad6f71..094ff7a7622 100644
--- a/docs/en/docs/sql-manual/sql-reference/Show-Statements/SHOW-COLUMN-STATS.md
+++ b/docs/en/docs/sql-manual/sql-reference/Show-Statements/SHOW-COLUMN-STATS.md
@@ -28,6 +28,8 @@ under the License.
### Name
+<version since="2.0"></version>
+
SHOW COLUMN STATS
### Description
diff --git a/docs/en/docs/sql-manual/sql-reference/Show-Statements/SHOW-TABLE-STATS.md b/docs/en/docs/sql-manual/sql-reference/Show-Statements/SHOW-TABLE-STATS.md
index 06f59b27ea5..e4dcd70be13 100644
--- a/docs/en/docs/sql-manual/sql-reference/Show-Statements/SHOW-TABLE-STATS.md
+++ b/docs/en/docs/sql-manual/sql-reference/Show-Statements/SHOW-TABLE-STATS.md
@@ -28,6 +28,8 @@ under the License.
### Name
+<version since="2.0"></version>
+
SHOW TABLE STATS
### Description
diff --git a/docs/sidebars.json b/docs/sidebars.json
index 0d07a890eac..e4a10438eb4 100644
--- a/docs/sidebars.json
+++ b/docs/sidebars.json
@@ -1090,7 +1090,8 @@
"sql-manual/sql-reference/Data-Manipulation-Statements/Manipulation/UPDATE",
"sql-manual/sql-reference/Data-Manipulation-Statements/Manipulation/EXPORT",
"sql-manual/sql-reference/Data-Manipulation-Statements/Manipulation/CANCEL-EXPORT",
- "sql-manual/sql-reference/Data-Manipulation-Statements/Manipulation/INSERT-OVERWRITE"
+ "sql-manual/sql-reference/Data-Manipulation-Statements/Manipulation/INSERT-OVERWRITE",
+ "sql-manual/sql-reference/Data-Manipulation-Statements/Manipulation/ANALYZE"
]
},
"sql-manual/sql-reference/Data-Manipulation-Statements/OUTFILE"
@@ -1102,6 +1103,7 @@
"items": [
"sql-manual/sql-reference/Show-Statements/SHOW-ALTER-TABLE-MATERIALIZED-VIEW",
"sql-manual/sql-reference/Show-Statements/SHOW-ALTER",
+ "sql-manual/sql-reference/Show-Statements/SHOW-ANALYZE",
"sql-manual/sql-reference/Show-Statements/SHOW-BACKUP",
"sql-manual/sql-reference/Show-Statements/SHOW-BACKENDS",
"sql-manual/sql-reference/Show-Statements/SHOW-BROKER",
@@ -1116,6 +1118,7 @@
"sql-manual/sql-reference/Show-Statements/SHOW-CREATE-ROUTINE-LOAD",
"sql-manual/sql-reference/Show-Statements/SHOW-CREATE-FUNCTION",
"sql-manual/sql-reference/Show-Statements/SHOW-COLUMNS",
+ "sql-manual/sql-reference/Show-Statements/SHOW-COLUMN-STATS",
"sql-manual/sql-reference/Show-Statements/SHOW-COLLATION",
"sql-manual/sql-reference/Show-Statements/SHOW-DATABASES",
"sql-manual/sql-reference/Show-Statements/SHOW-DATA-SKEW",
@@ -1151,6 +1154,7 @@
"sql-manual/sql-reference/Show-Statements/SHOW-PROCEDURE",
"sql-manual/sql-reference/Show-Statements/SHOW-ROUTINE-LOAD-TASK",
"sql-manual/sql-reference/Show-Statements/SHOW-PROC",
+ "sql-manual/sql-reference/Show-Statements/SHOW-TABLE-STATS",
"sql-manual/sql-reference/Show-Statements/SHOW-TABLE-STATUS",
"sql-manual/sql-reference/Show-Statements/SHOW-REPOSITORIES",
"sql-manual/sql-reference/Show-Statements/SHOW-QUERY-PROFILE",
diff --git a/docs/zh-CN/docs/sql-manual/sql-reference/Show-Statements/SHOW-ANALYZE.md b/docs/zh-CN/docs/sql-manual/sql-reference/Show-Statements/SHOW-ANALYZE.md
index 3feae39b2ad..07ac1f1d83a 100644
--- a/docs/zh-CN/docs/sql-manual/sql-reference/Show-Statements/SHOW-ANALYZE.md
+++ b/docs/zh-CN/docs/sql-manual/sql-reference/Show-Statements/SHOW-ANALYZE.md
@@ -28,6 +28,8 @@ under the License.
### Name
+<version since="2.0"></version>
+
SHOW ANALYZE
### Description
@@ -108,4 +110,4 @@ mysql> show analyze task status 20038 ;
### Keywords
-SHOW, ANALYZE
\ No newline at end of file
+SHOW, ANALYZE
diff --git a/docs/zh-CN/docs/sql-manual/sql-reference/Show-Statements/SHOW-COLUMN-STATS.md b/docs/zh-CN/docs/sql-manual/sql-reference/Show-Statements/SHOW-COLUMN-STATS.md
index 15d91b8a914..cabe52c2b3b 100644
--- a/docs/zh-CN/docs/sql-manual/sql-reference/Show-Statements/SHOW-COLUMN-STATS.md
+++ b/docs/zh-CN/docs/sql-manual/sql-reference/Show-Statements/SHOW-COLUMN-STATS.md
@@ -28,6 +28,8 @@ under the License.
### Name
+<version since="2.0"></version>
+
SHOW COLUMN STATS
### Description
diff --git a/docs/zh-CN/docs/sql-manual/sql-reference/Show-Statements/SHOW-TABLE-STATS.md b/docs/zh-CN/docs/sql-manual/sql-reference/Show-Statements/SHOW-TABLE-STATS.md
index 97391ed92eb..44577d7fe38 100644
--- a/docs/zh-CN/docs/sql-manual/sql-reference/Show-Statements/SHOW-TABLE-STATS.md
+++ b/docs/zh-CN/docs/sql-manual/sql-reference/Show-Statements/SHOW-TABLE-STATS.md
@@ -28,6 +28,8 @@ under the License.
### Name
+<version since="2.0"></version>
+
SHOW TABLE STATS
### Description
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org