This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
commit ef64d7a011f505915b9cc7a1c083f13454ed01da
Author: wuwenchi <wuwenchi...@hotmail.com>
AuthorDate: Fri Apr 12 12:03:47 2024 +0800
[feature](profile) add transaction statistics for profile (#33488)
1. commit total time
2. fs operator total time
rename file count
rename dir count
delete dir count
3. add partition total time
add partition count
4. update partition total time
update partition count
like:
```
- Transaction Commit Time: 906ms
- FileSystem Operator Time: 833ms
- Rename File Count: 4
- Rename Dir Count: 0
- Delete Dir Count: 0
- HMS Add Partition Time: 0ms
- HMS Add Partition Count: 0
- HMS Update Partition Time: 68ms
- HMS Update Partition Count: 4
```
---
.../org/apache/doris/common/profile/Profile.java | 2 +-
.../doris/common/profile/SummaryProfile.java | 117 ++++++++++++++++++++-
.../doris/datasource/hive/HMSTransaction.java | 92 ++++++++++++++--
.../plans/commands/insert/HiveInsertExecutor.java | 11 +-
.../java/org/apache/doris/qe/StmtExecutor.java | 4 +-
.../apache/doris/transaction/TransactionType.java | 24 +++++
.../doris/datasource/hive/HmsCommitTest.java | 5 +
7 files changed, 239 insertions(+), 16 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/common/profile/Profile.java
b/fe/fe-core/src/main/java/org/apache/doris/common/profile/Profile.java
index 12ba687bfd1..b9cefdd0c4a 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/profile/Profile.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/profile/Profile.java
@@ -89,7 +89,7 @@ public class Profile {
}
// This API will also add the profile to ProfileManager, so that we could
get the profile from ProfileManager.
- // isFinished ONLY means the cooridnator or stmtexecutor is finished.
+ // isFinished ONLY means the coordinator or stmtexecutor is finished.
public synchronized void updateSummary(long startTime, Map<String, String>
summaryInfo, boolean isFinished,
Planner planner) {
try {
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/common/profile/SummaryProfile.java
b/fe/fe-core/src/main/java/org/apache/doris/common/profile/SummaryProfile.java
index 3ca627f4d99..a8f64f14435 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/common/profile/SummaryProfile.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/common/profile/SummaryProfile.java
@@ -20,6 +20,7 @@ package org.apache.doris.common.profile;
import org.apache.doris.common.util.RuntimeProfile;
import org.apache.doris.common.util.TimeUtils;
import org.apache.doris.thrift.TUnit;
+import org.apache.doris.transaction.TransactionType;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -83,10 +84,19 @@ public class SummaryProfile {
public static final String FRAGMENT_COMPRESSED_SIZE = "Fragment Compressed
Size";
public static final String FRAGMENT_RPC_COUNT = "Fragment RPC Count";
+ public static final String TRANSACTION_COMMIT_TIME = "Transaction Commit
Time";
+ public static final String FILESYSTEM_OPT_TIME = "FileSystem Operator
Time";
+ public static final String FILESYSTEM_OPT_RENAME_FILE_CNT = "Rename File
Count";
+ public static final String FILESYSTEM_OPT_RENAME_DIR_CNT = "Rename Dir
Count";
+ public static final String FILESYSTEM_OPT_DELETE_DIR_CNT = "Delete Dir
Count";
+ public static final String HMS_ADD_PARTITION_TIME = "HMS Add Partition
Time";
+ public static final String HMS_ADD_PARTITION_CNT = "HMS Add Partition
Count";
+ public static final String HMS_UPDATE_PARTITION_TIME = "HMS Update
Partition Time";
+ public static final String HMS_UPDATE_PARTITION_CNT = "HMS Update
Partition Count";
// These info will display on FE's web ui table, every one will be
displayed as
// a column, so that should not
- // add many columns here. Add to ExcecutionSummary list.
+ // add many columns here. Add to ExecutionSummary list.
public static final ImmutableList<String> SUMMARY_KEYS =
ImmutableList.of(PROFILE_ID, TASK_TYPE,
START_TIME, END_TIME, TOTAL_TIME, TASK_STATE, USER, DEFAULT_DB,
SQL_STATEMENT);
@@ -126,7 +136,9 @@ public class SummaryProfile {
TOTAL_INSTANCES_NUM,
INSTANCES_NUM_PER_BE,
PARALLEL_FRAGMENT_EXEC_INSTANCE,
- TRACE_ID);
+ TRACE_ID,
+ TRANSACTION_COMMIT_TIME
+ );
// Ident of each item. Default is 0, which doesn't need to present in this
Map.
// Please set this map for new profile items if they need ident.
@@ -149,6 +161,14 @@ public class SummaryProfile {
.put(SEND_FRAGMENT_PHASE2_TIME, 1)
.put(FRAGMENT_COMPRESSED_SIZE, 1)
.put(FRAGMENT_RPC_COUNT, 1)
+ .put(FILESYSTEM_OPT_TIME, 1)
+ .put(FILESYSTEM_OPT_RENAME_FILE_CNT, 2)
+ .put(FILESYSTEM_OPT_RENAME_DIR_CNT, 2)
+ .put(FILESYSTEM_OPT_DELETE_DIR_CNT, 2)
+ .put(HMS_ADD_PARTITION_TIME, 1)
+ .put(HMS_ADD_PARTITION_CNT, 2)
+ .put(HMS_UPDATE_PARTITION_TIME, 1)
+ .put(HMS_UPDATE_PARTITION_CNT, 2)
.build();
private RuntimeProfile summaryProfile;
@@ -194,6 +214,17 @@ public class SummaryProfile {
private long tempStarTime = -1;
private long queryFetchResultConsumeTime = 0;
private long queryWriteResultConsumeTime = 0;
+ private long transactionCommitBeginTime = -1;
+ private long transactionCommitEndTime = -1;
+ private long filesystemOptTime = -1;
+ private long hmsAddPartitionTime = -1;
+ private long hmsAddPartitionCnt = 0;
+ private long hmsUpdatePartitionTime = -1;
+ private long hmsUpdatePartitionCnt = 0;
+ private long filesystemRenameFileCnt = 0;
+ private long filesystemRenameDirCnt = 0;
+ private long filesystemDeleteDirCnt = 0;
+ private TransactionType transactionType = TransactionType.UNKNOWN;
public SummaryProfile() {
summaryProfile = new RuntimeProfile(SUMMARY_PROFILE_NAME);
@@ -299,6 +330,32 @@ public class SummaryProfile {
RuntimeProfile.printCounter(queryFetchResultConsumeTime,
TUnit.TIME_MS));
executionSummaryProfile.addInfoString(WRITE_RESULT_TIME,
RuntimeProfile.printCounter(queryWriteResultConsumeTime,
TUnit.TIME_MS));
+ setTransactionSummary();
+ }
+
+ public void setTransactionSummary() {
+ executionSummaryProfile.addInfoString(TRANSACTION_COMMIT_TIME,
+ getPrettyTime(transactionCommitEndTime,
transactionCommitBeginTime, TUnit.TIME_MS));
+
+ if (transactionType.equals(TransactionType.HMS)) {
+ executionSummaryProfile.addInfoString(FILESYSTEM_OPT_TIME,
+ getPrettyTime(filesystemOptTime, 0, TUnit.TIME_MS));
+
executionSummaryProfile.addInfoString(FILESYSTEM_OPT_RENAME_FILE_CNT,
+ getPrettyCount(filesystemRenameFileCnt));
+
executionSummaryProfile.addInfoString(FILESYSTEM_OPT_RENAME_DIR_CNT,
+ getPrettyCount(filesystemRenameDirCnt));
+
executionSummaryProfile.addInfoString(FILESYSTEM_OPT_DELETE_DIR_CNT,
+ getPrettyCount(filesystemDeleteDirCnt));
+
+ executionSummaryProfile.addInfoString(HMS_ADD_PARTITION_TIME,
+ getPrettyTime(hmsAddPartitionTime, 0, TUnit.TIME_MS));
+ executionSummaryProfile.addInfoString(HMS_ADD_PARTITION_CNT,
+ getPrettyCount(hmsAddPartitionCnt));
+ executionSummaryProfile.addInfoString(HMS_UPDATE_PARTITION_TIME,
+ getPrettyTime(hmsUpdatePartitionTime, 0, TUnit.TIME_MS));
+ executionSummaryProfile.addInfoString(HMS_UPDATE_PARTITION_CNT,
+ getPrettyCount(hmsUpdatePartitionCnt));
+ }
}
public void setParseSqlStartTime(long parseSqlStartTime) {
@@ -543,6 +600,10 @@ public class SummaryProfile {
return getPrettyTime(nereidsOptimizeFinishTime,
nereidsRewriteFinishTime, TUnit.TIME_MS);
}
+ private String getPrettyCount(long cnt) {
+ return RuntimeProfile.printCounter(cnt, TUnit.UNIT);
+ }
+
public String getPrettyNereidsTranslateTime() {
return getPrettyTime(nereidsTranslateFinishTime,
nereidsOptimizeFinishTime, TUnit.TIME_MS);
}
@@ -553,4 +614,56 @@ public class SummaryProfile {
}
return RuntimeProfile.printCounter(end - start, unit);
}
+
+ public void setTransactionBeginTime(TransactionType type) {
+ this.transactionCommitBeginTime = TimeUtils.getStartTimeMs();
+ this.transactionType = type;
+ }
+
+ public void setTransactionEndTime() {
+ this.transactionCommitEndTime = TimeUtils.getStartTimeMs();
+ }
+
+ public void freshFilesystemOptTime() {
+ if (this.filesystemOptTime == -1) {
+ // Because this value needs to be summed up.
+ // If it is not set zero here:
+ // 1. If the detection time is longer than 1ms,
+ // the final cumulative value will be 1 ms less due to -1
initialization.
+ // 2. if the detection time is no longer than 1ms,
+ // the final cumulative value will be -1 always.
+ // This is considered to be the indicator's not being
detected,
+ // Apparently not, it's just that the value detected is 0.
+ this.filesystemOptTime = 0;
+ }
+ this.filesystemOptTime += System.currentTimeMillis() - tempStarTime;
+ }
+
+ public void setHmsAddPartitionTime() {
+ this.hmsAddPartitionTime = TimeUtils.getStartTimeMs() - tempStarTime;
+ }
+
+ public void addHmsAddPartitionCnt(long c) {
+ this.hmsAddPartitionCnt = c;
+ }
+
+ public void setHmsUpdatePartitionTime() {
+ this.hmsUpdatePartitionTime = TimeUtils.getStartTimeMs() -
tempStarTime;
+ }
+
+ public void addHmsUpdatePartitionCnt(long c) {
+ this.hmsUpdatePartitionCnt = c;
+ }
+
+ public void addRenameFileCnt(long c) {
+ this.filesystemRenameFileCnt += c;
+ }
+
+ public void incRenameDirCnt() {
+ this.filesystemRenameDirCnt += 1;
+ }
+
+ public void incDeleteDirRecursiveCnt() {
+ this.filesystemDeleteDirCnt += 1;
+ }
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSTransaction.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSTransaction.java
index 84221b74e7f..0e668e0eda5 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSTransaction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSTransaction.java
@@ -23,8 +23,10 @@ package org.apache.doris.datasource.hive;
import org.apache.doris.backup.Status;
import org.apache.doris.common.Pair;
+import org.apache.doris.common.profile.SummaryProfile;
import org.apache.doris.fs.FileSystem;
import org.apache.doris.fs.remote.RemoteFile;
+import org.apache.doris.qe.ConnectContext;
import org.apache.doris.thrift.THivePartitionUpdate;
import org.apache.doris.thrift.TUpdateMode;
import org.apache.doris.transaction.Transaction;
@@ -68,6 +70,7 @@ public class HMSTransaction implements Transaction {
private final FileSystem fs;
private String dbName;
private String tbName;
+ private Optional<SummaryProfile> summaryProfile = Optional.empty();
private final Map<DatabaseTableName, Action<TableAndMore>> tableActions =
new HashMap<>();
private final Map<DatabaseTableName, Map<List<String>,
Action<PartitionAndMore>>>
@@ -79,6 +82,10 @@ public class HMSTransaction implements Transaction {
public HMSTransaction(HiveMetadataOps hiveOps) {
this.hiveOps = hiveOps;
this.fs = hiveOps.getFs();
+
+ if (ConnectContext.get().getExecutor() != null) {
+ summaryProfile =
Optional.of(ConnectContext.get().getExecutor().getSummaryProfile());
+ }
}
@Override
@@ -597,7 +604,7 @@ public class HMSTransaction implements Transaction {
}
public boolean deleteIfExists(Path path) {
- Status status = fs.delete(path.toString());
+ Status status = wrapperDeleteWithProfileSummary(path.toString());
if (status.ok()) {
return true;
}
@@ -1057,7 +1064,7 @@ public class HMSTransaction implements Transaction {
String targetPath = table.getSd().getLocation();
String writePath = tableAndMore.getCurrentLocation();
if (!targetPath.equals(writePath)) {
- fs.asyncRename(
+ wrapperAsyncRenameWithProfileSummary(
fileSystemExecutor,
asyncFileSystemTaskFutures,
fileSystemTaskCancelled,
@@ -1083,7 +1090,7 @@ public class HMSTransaction implements Transaction {
if (!targetPath.equals(writePath)) {
Path path = new Path(targetPath);
String oldTablePath = new Path(path.getParent(), "_temp_" +
path.getName()).toString();
- Status status = fs.renameDir(
+ Status status = wrapperRenameDirWithProfileSummary(
targetPath,
oldTablePath,
() -> renameDirectoryTasksForAbort.add(new
RenameDirectoryTask(oldTablePath, targetPath)));
@@ -1093,7 +1100,7 @@ public class HMSTransaction implements Transaction {
}
clearDirsForFinish.add(oldTablePath);
- status = fs.renameDir(
+ status = wrapperRenameDirWithProfileSummary(
writePath,
targetPath,
() -> directoryCleanUpTasksForAbort.add(
@@ -1120,7 +1127,7 @@ public class HMSTransaction implements Transaction {
String writePath = partitionAndMore.getCurrentLocation();
if (!targetPath.equals(writePath)) {
- fs.asyncRenameDir(
+ wrapperAsyncRenameDirWithProfileSummary(
fileSystemExecutor,
asyncFileSystemTaskFutures,
fileSystemTaskCancelled,
@@ -1160,7 +1167,7 @@ public class HMSTransaction implements Transaction {
directoryCleanUpTasksForAbort.add(new
DirectoryCleanUpTask(targetPath, false));
if (!targetPath.equals(writePath)) {
- fs.asyncRename(
+ wrapperAsyncRenameWithProfileSummary(
fileSystemExecutor,
asyncFileSystemTaskFutures,
fileSystemTaskCancelled,
@@ -1189,7 +1196,7 @@ public class HMSTransaction implements Transaction {
for (RenameDirectoryTask task : renameDirectoryTasksForAbort) {
status = fs.exists(task.getRenameFrom());
if (status.ok()) {
- status = fs.renameDir(task.getRenameFrom(),
task.getRenameTo(), () -> {});
+ status =
wrapperRenameDirWithProfileSummary(task.getRenameFrom(), task.getRenameTo(), ()
-> {});
if (!status.ok()) {
LOG.warn("Failed to abort rename dir from {} to {}:{}",
task.getRenameFrom(), task.getRenameTo(),
status.getErrMsg());
@@ -1201,7 +1208,7 @@ public class HMSTransaction implements Transaction {
private void runClearPathsForFinish() {
Status status;
for (String path : clearDirsForFinish) {
- status = fs.delete(path);
+ status = wrapperDeleteWithProfileSummary(path);
if (!status.ok()) {
LOG.warn("Failed to recursively delete path {}:{}", path,
status.getErrCode());
}
@@ -1216,7 +1223,7 @@ public class HMSTransaction implements Transaction {
if (!targetPath.equals(writePath)) {
Path path = new Path(targetPath);
String oldPartitionPath = new Path(path.getParent(), "_temp_"
+ path.getName()).toString();
- Status status = fs.renameDir(
+ Status status = wrapperRenameDirWithProfileSummary(
targetPath,
oldPartitionPath,
() -> renameDirectoryTasksForAbort.add(new
RenameDirectoryTask(oldPartitionPath, targetPath)));
@@ -1228,7 +1235,7 @@ public class HMSTransaction implements Transaction {
}
clearDirsForFinish.add(oldPartitionPath);
- status = fs.renameDir(
+ status = wrapperRenameDirWithProfileSummary(
writePath,
targetPath,
() -> directoryCleanUpTasksForAbort.add(new
DirectoryCleanUpTask(targetPath, true)));
@@ -1250,18 +1257,35 @@ public class HMSTransaction implements Transaction {
private void waitForAsyncFileSystemTasks() {
+ summaryProfile.ifPresent(SummaryProfile::setTempStartTime);
+
for (CompletableFuture<?> future : asyncFileSystemTaskFutures) {
MoreFutures.getFutureValue(future, RuntimeException.class);
}
+
+ summaryProfile.ifPresent(SummaryProfile::freshFilesystemOptTime);
}
private void doAddPartitionsTask() {
+
+ summaryProfile.ifPresent(profile -> {
+ profile.setTempStartTime();
+
profile.addHmsAddPartitionCnt(addPartitionsTask.getPartitions().size());
+ });
+
if (!addPartitionsTask.isEmpty()) {
addPartitionsTask.run(hiveOps);
}
+
+ summaryProfile.ifPresent(SummaryProfile::setHmsAddPartitionTime);
}
private void doUpdateStatisticsTasks() {
+ summaryProfile.ifPresent(profile -> {
+ profile.setTempStartTime();
+ profile.addHmsUpdatePartitionCnt(updateStatisticsTasks.size());
+ });
+
ImmutableList.Builder<CompletableFuture<?>> updateStatsFutures =
ImmutableList.builder();
List<String> failedTaskDescriptions = new ArrayList<>();
List<Throwable> suppressedExceptions = new ArrayList<>();
@@ -1289,6 +1313,8 @@ public class HMSTransaction implements Transaction {
suppressedExceptions.forEach(exception::addSuppressed);
throw exception;
}
+
+
summaryProfile.ifPresent(SummaryProfile::setHmsUpdatePartitionTime);
}
public void doNothing() {
@@ -1312,4 +1338,50 @@ public class HMSTransaction implements Transaction {
runRenameDirTasksForAbort();
}
}
+
+ public Status wrapperRenameDirWithProfileSummary(String origFilePath,
+ String destFilePath,
+ Runnable
runWhenPathNotExist) {
+ summaryProfile.ifPresent(profile -> {
+ profile.setTempStartTime();
+ profile.incRenameDirCnt();
+ });
+
+ Status status = fs.renameDir(origFilePath, destFilePath,
runWhenPathNotExist);
+
+ summaryProfile.ifPresent(SummaryProfile::freshFilesystemOptTime);
+ return status;
+ }
+
+ public Status wrapperDeleteWithProfileSummary(String remotePath) {
+ summaryProfile.ifPresent(profile -> {
+ profile.setTempStartTime();
+ profile.incDeleteDirRecursiveCnt();
+ });
+
+ Status status = fs.delete(remotePath);
+
+ summaryProfile.ifPresent(SummaryProfile::freshFilesystemOptTime);
+ return status;
+ }
+
+ public void wrapperAsyncRenameWithProfileSummary(Executor executor,
+
List<CompletableFuture<?>> renameFileFutures,
+ AtomicBoolean cancelled,
+ String origFilePath,
+ String destFilePath,
+ List<String> fileNames) {
+ fs.asyncRename(executor, renameFileFutures, cancelled, origFilePath,
destFilePath, fileNames);
+ summaryProfile.ifPresent(profile ->
profile.addRenameFileCnt(fileNames.size()));
+ }
+
+ public void wrapperAsyncRenameDirWithProfileSummary(Executor executor,
+
List<CompletableFuture<?>> renameFileFutures,
+ AtomicBoolean
cancelled,
+ String origFilePath,
+ String destFilePath,
+ Runnable
runWhenPathNotExist) {
+ fs.asyncRenameDir(executor, renameFileFutures, cancelled,
origFilePath, destFilePath, runWhenPathNotExist);
+ summaryProfile.ifPresent(SummaryProfile::incRenameDirCnt);
+ }
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/insert/HiveInsertExecutor.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/insert/HiveInsertExecutor.java
index 66dfe763e46..116a04215d8 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/insert/HiveInsertExecutor.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/insert/HiveInsertExecutor.java
@@ -20,6 +20,7 @@ package org.apache.doris.nereids.trees.plans.commands.insert;
import org.apache.doris.catalog.Env;
import org.apache.doris.common.ErrorCode;
import org.apache.doris.common.UserException;
+import org.apache.doris.common.profile.SummaryProfile;
import org.apache.doris.common.util.DebugUtil;
import org.apache.doris.datasource.hive.HMSExternalTable;
import org.apache.doris.datasource.hive.HMSTransaction;
@@ -36,6 +37,7 @@ import org.apache.doris.qe.QueryState;
import org.apache.doris.qe.StmtExecutor;
import org.apache.doris.transaction.TransactionManager;
import org.apache.doris.transaction.TransactionStatus;
+import org.apache.doris.transaction.TransactionType;
import com.google.common.base.Strings;
import org.apache.logging.log4j.LogManager;
@@ -53,6 +55,7 @@ public class HiveInsertExecutor extends
AbstractInsertExecutor {
private TransactionStatus txnStatus = TransactionStatus.ABORTED;
private final TransactionManager transactionManager;
private final String catalogName;
+ private Optional<SummaryProfile> summaryProfile = Optional.empty();
/**
* constructor
@@ -63,6 +66,10 @@ public class HiveInsertExecutor extends
AbstractInsertExecutor {
super(ctx, table, labelName, planner, insertCtx);
catalogName = table.getCatalog().getName();
transactionManager = table.getCatalog().getTransactionManager();
+
+ if (ConnectContext.get().getExecutor() != null) {
+ summaryProfile =
Optional.of(ConnectContext.get().getExecutor().getSummaryProfile());
+ }
}
public long getTxnId() {
@@ -102,7 +109,9 @@ public class HiveInsertExecutor extends
AbstractInsertExecutor {
String dbName = ((HMSExternalTable) table).getDbName();
String tbName = table.getName();
transaction.finishInsertTable(dbName, tbName);
+ summaryProfile.ifPresent(profile ->
profile.setTransactionBeginTime(TransactionType.HMS));
transactionManager.commit(txnId);
+ summaryProfile.ifPresent(SummaryProfile::setTransactionEndTime);
txnStatus = TransactionStatus.COMMITTED;
Env.getCurrentEnv().getCatalogMgr().refreshExternalTable(
dbName,
@@ -135,7 +144,7 @@ public class HiveInsertExecutor extends
AbstractInsertExecutor {
sb.append("{");
sb.append("'status':'")
.append(ctx.isTxnModel() ? TransactionStatus.PREPARE.name() :
txnStatus.name());
- // sb.append("', 'txnId':'").append(txnId).append("'");
+ sb.append("', 'txnId':'").append(txnId).append("'");
if (!Strings.isNullOrEmpty(errMsg)) {
sb.append(", 'err':'").append(errMsg).append("'");
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
index 0a0adc17f77..ad4339072b4 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
@@ -1006,13 +1006,13 @@ public class StmtExecutor {
if (!context.getSessionVariable().enableProfile()) {
return;
}
- // If any error happends in update profile, we should ignore this error
+ // If any error happened in update profile, we should ignore this error
// and ensure the sql is finished normally. For example, if update
profile
// failed, the insert stmt should be success
try {
profile.updateSummary(context.startTime,
getSummaryInfo(isFinished), isFinished, this.planner);
} catch (Throwable t) {
- LOG.warn("failed to update profile, ingore this error", t);
+ LOG.warn("failed to update profile, ignore this error", t);
}
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionType.java
b/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionType.java
new file mode 100644
index 00000000000..2372c199738
--- /dev/null
+++ b/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionType.java
@@ -0,0 +1,24 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.transaction;
+
+public enum TransactionType {
+ UNKNOWN,
+ HMS,
+ ICEBERG
+}
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/datasource/hive/HmsCommitTest.java
b/fe/fe-core/src/test/java/org/apache/doris/datasource/hive/HmsCommitTest.java
index fba91cb0b55..54bbf5eca3f 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/datasource/hive/HmsCommitTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/datasource/hive/HmsCommitTest.java
@@ -21,6 +21,7 @@ import org.apache.doris.catalog.Column;
import org.apache.doris.catalog.PrimitiveType;
import org.apache.doris.datasource.HMSCachedClientTest;
import org.apache.doris.fs.LocalDfsFileSystem;
+import org.apache.doris.qe.ConnectContext;
import org.apache.doris.thrift.THiveLocationParams;
import org.apache.doris.thrift.THivePartitionUpdate;
import org.apache.doris.thrift.TUpdateMode;
@@ -69,6 +70,10 @@ public class HmsCommitTest {
writeLocation = "file://" + writePath.toAbsolutePath() + "/";
createTestHiveCatalog();
createTestHiveDatabase();
+
+ // context
+ ConnectContext connectContext = new ConnectContext();
+ connectContext.setThreadLocalInfo();
}
@AfterClass
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
