You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2022/06/09 09:16:52 UTC
[incubator-doris] 05/05: fix: fix a thread safe problem in LoadAction.java (#9955)
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch dev-1.0.1
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
commit 83d44f8df84fcc4ca3d4a69c184cc42e651b8992
Author: tarepanda1024 <li...@gmail.com>
AuthorDate: Thu Jun 9 00:34:07 2022 +0800
fix: fix a thread safe problem in LoadAction.java (#9955)
---
.../main/java/org/apache/doris/httpv2/rest/LoadAction.java | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/LoadAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/LoadAction.java
index ebdda12926..1c3f88167a 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/LoadAction.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/LoadAction.java
@@ -57,8 +57,6 @@ public class LoadAction extends RestBaseController {
private ExecuteEnv execEnv = ExecuteEnv.getInstance();
- private boolean isStreamLoad = false;
-
@RequestMapping(path = "/api/{" + DB_KEY + "}/{" + TABLE_KEY + "}/_load", method = RequestMethod.PUT)
public Object load(HttpServletRequest request, HttpServletResponse response,
@PathVariable(value = DB_KEY) String db, @PathVariable(value = TABLE_KEY) String table) {
@@ -66,9 +64,8 @@ public class LoadAction extends RestBaseController {
ResponseEntity entity = ResponseEntityBuilder.notFound("The mini load operation has been disabled by default, if you need to add disable_mini_load=false in fe.conf.");
return entity;
} else {
- this.isStreamLoad = false;
executeCheckPassword(request, response);
- return executeWithoutPassword(request, response, db, table);
+ return executeWithoutPassword(request, response, db, table, false);
}
}
@@ -76,16 +73,14 @@ public class LoadAction extends RestBaseController {
public Object streamLoad(HttpServletRequest request,
HttpServletResponse response,
@PathVariable(value = DB_KEY) String db, @PathVariable(value = TABLE_KEY) String table) {
- this.isStreamLoad = true;
executeCheckPassword(request, response);
- return executeWithoutPassword(request, response, db, table);
+ return executeWithoutPassword(request, response, db, table, true);
}
@RequestMapping(path = "/api/{" + DB_KEY + "}/_stream_load_2pc", method = RequestMethod.PUT)
public Object streamLoad2PC(HttpServletRequest request,
HttpServletResponse response,
@PathVariable(value = DB_KEY) String db) {
- this.isStreamLoad = true;
executeCheckPassword(request, response);
return executeStreamLoad2PC(request, db);
}
@@ -93,7 +88,7 @@ public class LoadAction extends RestBaseController {
// Same as Multi load, to be compatible with http v1's response body,
// we return error by using RestBaseResult.
private Object executeWithoutPassword(HttpServletRequest request,
- HttpServletResponse response, String db, String table) {
+ HttpServletResponse response, String db, String table, boolean isStreamLoad) {
try {
String dbName = db;
String tableName = table;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org