This is an automated email from the ASF dual-hosted git repository.
yiguolei 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 449bfe10d1 fix: fix a thread safe problem in LoadAction.java (#9955)
449bfe10d1 is described below
commit 449bfe10d15c34c9009ae244247047375422f1bb
Author: tarepanda1024 <[email protected]>
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 aab70c3742..72b088300e 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
@@ -56,8 +56,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) {
@@ -65,9 +63,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);
}
}
@@ -75,16 +72,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);
}
@@ -92,7 +87,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: [email protected]
For additional commands, e-mail: [email protected]
