Skip to content

Commit 0d6cd53

Browse files
Yukang-Liandataroaring
authored andcommitted
[Fix](group commit) Fix table not found fault when disable group commit (#39731)
## Proposed changes <!--Describe your changes.--> selectRedirectBackend param table id is only needed by group commit. In non group commit mode, if table id is null, we need to ignore it.
1 parent 8d0cd03 commit 0d6cd53

File tree

2 files changed

+56
-9
lines changed

2 files changed

+56
-9
lines changed

fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/LoadAction.java

+15-9
Original file line numberDiff line numberDiff line change
@@ -313,17 +313,20 @@ private Object executeWithoutPassword(HttpServletRequest request,
313313
return new RestBaseResult(e.getMessage());
314314
}
315315
} else {
316-
Optional<?> database = Env.getCurrentEnv().getCurrentCatalog().getDb(dbName);
317-
if (!database.isPresent()) {
318-
return new RestBaseResult("Database not founded.");
319-
}
316+
long tableId = -1;
317+
if (groupCommit) {
318+
Optional<?> database = Env.getCurrentEnv().getCurrentCatalog().getDb(dbName);
319+
if (!database.isPresent()) {
320+
return new RestBaseResult("Database not found.");
321+
}
320322

321-
Optional<?> olapTable = ((Database) database.get()).getTable(tableName);
322-
if (!olapTable.isPresent()) {
323-
return new RestBaseResult("OlapTable not founded.");
324-
}
323+
Optional<?> olapTable = ((Database) database.get()).getTable(tableName);
324+
if (!olapTable.isPresent()) {
325+
return new RestBaseResult("OlapTable not found.");
326+
}
325327

326-
long tableId = ((OlapTable) olapTable.get()).getId();
328+
tableId = ((OlapTable) olapTable.get()).getId();
329+
}
327330
redirectAddr = selectRedirectBackend(request, groupCommit, tableId);
328331
}
329332

@@ -403,6 +406,9 @@ private TNetworkAddress selectRedirectBackend(HttpServletRequest request, boolea
403406
}
404407
return selectCloudRedirectBackend(cloudClusterName, request, groupCommit, tableId);
405408
} else {
409+
if (groupCommit && tableId == -1) {
410+
throw new LoadException("Group commit table id wrong.");
411+
}
406412
return selectLocalRedirectBackend(groupCommit, request, tableId);
407413
}
408414
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
17+
18+
suite("test_group_commit_stream_load_with_nonexist_db_and_table") {
19+
def tableName = "test_group_commit_stream_load_with_nonexist_db_and_table"
20+
sql "create database if not exists ${tableName}"
21+
22+
try {
23+
def command = "curl --location-trusted -u ${context.config.feHttpUser}:${context.config.feHttpPassword}" +
24+
" -H group_commit:sync_mode" +
25+
" -H column_separator:," +
26+
" -T ${context.config.dataPath}/load_p0/stream_load/test_stream_load1.csv" +
27+
" http://${context.config.feHttpAddress}/api/${tableName}/${tableName}/_stream_load"
28+
log.info("stream load command: ${command}")
29+
30+
def process = command.execute()
31+
code = process.waitFor()
32+
out = process.text
33+
log.info("stream lad result: ${out}".toString())
34+
assertTrue(out.toString().contains("table not found"))
35+
} catch (Exception e) {
36+
logger.info("failed: " + e.getMessage())
37+
assertTrue(false)
38+
} finally {
39+
40+
}
41+
}

0 commit comments

Comments
 (0)