This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new c223d37 [Delete] Make some correct in delete operation (#3338)
c223d37 is described below
commit c223d37c99ed75e27ca78b9a4040bfb1cc80b3b5
Author: xy720 <22125576+xy...@users.noreply.github.com>
AuthorDate: Sun Apr 19 11:49:02 2020 +0800
[Delete] Make some correct in delete operation (#3338)
#3190
1. Correct the directory of DeleteJob.java
2. Fix some logic fault in DeleteHandlerTest.java
3. Add timeout value in log and exception
---
fe/src/main/java/org/apache/doris/load/DeleteHandler.java | 8 ++++----
.../java/org/apache/doris/{task => load}/DeleteJob.java | 5 ++---
fe/src/main/java/org/apache/doris/master/MasterImpl.java | 2 +-
.../test/java/org/apache/doris/load/DeleteHandlerTest.java | 13 +++++++++++--
4 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/fe/src/main/java/org/apache/doris/load/DeleteHandler.java
b/fe/src/main/java/org/apache/doris/load/DeleteHandler.java
index 9ed2c39..c6eee8e 100644
--- a/fe/src/main/java/org/apache/doris/load/DeleteHandler.java
+++ b/fe/src/main/java/org/apache/doris/load/DeleteHandler.java
@@ -64,8 +64,7 @@ import org.apache.doris.service.FrontendOptions;
import org.apache.doris.task.AgentBatchTask;
import org.apache.doris.task.AgentTaskExecutor;
import org.apache.doris.task.AgentTaskQueue;
-import org.apache.doris.task.DeleteJob;
-import org.apache.doris.task.DeleteJob.DeleteState;
+import org.apache.doris.load.DeleteJob.DeleteState;
import org.apache.doris.task.PushTask;
import org.apache.doris.thrift.TPriority;
import org.apache.doris.thrift.TPushType;
@@ -269,9 +268,10 @@ public class DeleteHandler implements Writable {
// only show at most 5 results
List<Entry<Long, Long>> subList =
unfinishedMarks.subList(0, Math.min(unfinishedMarks.size(), 5));
String errMsg = "Unfinished replicas:" + Joiner.on(",
").join(subList);
- LOG.warn("delete job timeout: transactionId {}, {}",
transactionId, errMsg);
+ LOG.warn("delete job timeout: transactionId {},
timeout {}, {}", transactionId, timeoutMs, errMsg);
cancelJob(deleteJob, CancelType.TIMEOUT, "delete job
timeout");
- throw new DdlException("failed to delete replicas from
job: " + transactionId + ", " + errMsg);
+ throw new DdlException("failed to delete replicas from
job: transactionId " + transactionId +
+ ", timeout " + timeoutMs + ", " + errMsg);
case QUORUM_FINISHED:
case FINISHED:
try {
diff --git a/fe/src/main/java/org/apache/doris/task/DeleteJob.java
b/fe/src/main/java/org/apache/doris/load/DeleteJob.java
similarity index 98%
rename from fe/src/main/java/org/apache/doris/task/DeleteJob.java
rename to fe/src/main/java/org/apache/doris/load/DeleteJob.java
index 3615920..972a9cd 100644
--- a/fe/src/main/java/org/apache/doris/task/DeleteJob.java
+++ b/fe/src/main/java/org/apache/doris/load/DeleteJob.java
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-package org.apache.doris.task;
+package org.apache.doris.load;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -25,8 +25,7 @@ import org.apache.doris.catalog.OlapTable;
import org.apache.doris.catalog.Replica;
import org.apache.doris.common.Config;
import org.apache.doris.common.MetaNotFoundException;
-import org.apache.doris.load.DeleteInfo;
-import org.apache.doris.load.TabletDeleteInfo;
+import org.apache.doris.task.PushTask;
import org.apache.doris.transaction.AbstractTxnStateChangeCallback;
import org.apache.doris.transaction.TransactionState;
import org.apache.logging.log4j.LogManager;
diff --git a/fe/src/main/java/org/apache/doris/master/MasterImpl.java
b/fe/src/main/java/org/apache/doris/master/MasterImpl.java
index 546257b..1ed6485 100644
--- a/fe/src/main/java/org/apache/doris/master/MasterImpl.java
+++ b/fe/src/main/java/org/apache/doris/master/MasterImpl.java
@@ -47,7 +47,7 @@ import org.apache.doris.task.ClearAlterTask;
import org.apache.doris.task.CloneTask;
import org.apache.doris.task.CreateReplicaTask;
import org.apache.doris.task.CreateRollupTask;
-import org.apache.doris.task.DeleteJob;
+import org.apache.doris.load.DeleteJob;
import org.apache.doris.task.DirMoveTask;
import org.apache.doris.task.DownloadTask;
import org.apache.doris.task.PublishVersionTask;
diff --git a/fe/src/test/java/org/apache/doris/load/DeleteHandlerTest.java
b/fe/src/test/java/org/apache/doris/load/DeleteHandlerTest.java
index 6c57650..6661aa4 100644
--- a/fe/src/test/java/org/apache/doris/load/DeleteHandlerTest.java
+++ b/fe/src/test/java/org/apache/doris/load/DeleteHandlerTest.java
@@ -34,8 +34,7 @@ import org.apache.doris.task.AgentBatchTask;
import org.apache.doris.task.AgentTask;
import org.apache.doris.task.AgentTaskExecutor;
import org.apache.doris.task.AgentTaskQueue;
-import org.apache.doris.task.DeleteJob;
-import org.apache.doris.task.DeleteJob.DeleteState;
+import org.apache.doris.load.DeleteJob.DeleteState;
import org.apache.doris.transaction.GlobalTransactionMgr;
import org.apache.doris.transaction.TabletCommitInfo;
import org.apache.doris.transaction.TransactionState;
@@ -173,6 +172,16 @@ public class DeleteHandlerTest {
DeleteStmt deleteStmt = new DeleteStmt(new TableName("test_db",
"test_tbl"),
new PartitionNames(false, Lists.newArrayList("test_tbl")),
binaryPredicate);
+
+ new Expectations(globalTransactionMgr) {
+ {
+ try {
+ globalTransactionMgr.abortTransaction(anyLong, anyString);
+ } catch (UserException e) {
+ }
+ minTimes = 0;
+ }
+ };
try {
deleteStmt.analyze(analyzer);
} catch (UserException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
