Skip to content

[Enhancement] Support to specify warehouse for query_plan rest query #57930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zhangbutao wants to merge 3 commits into from
Closed

[Enhancement] Support to specify warehouse for query_plan rest query #57930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ce923a
[Enhancement] Support to specify warehouse for rest query
zhangbutao Apr 11, 2025
0432095
Added test
zhangbutao Apr 17, 2025
ecc40f2
check and set warehouse before execute query_plan
zhangbutao Apr 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions fe/fe-core/src/main/java/com/starrocks/http/rest/TableQueryPlanAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
import com.starrocks.thrift.TScanRangeLocations;
import com.starrocks.thrift.TTabletVersionInfo;
import com.starrocks.thrift.TUniqueId;
import com.starrocks.warehouse.Warehouse;
import io.netty.handler.codec.http.HttpMethod;
import io.netty.handler.codec.http.HttpResponseStatus;
import org.apache.logging.log4j.LogManager;
Expand Down Expand Up @@ -126,6 +127,16 @@ protected void executeWithoutPassword(BaseRequest request, BaseResponse response
|| Strings.isNullOrEmpty(tableName)) {
throw new StarRocksHttpException(HttpResponseStatus.BAD_REQUEST, "{database}/{table} must be selected");
}
if (request.getRequest().headers().contains(WAREHOUSE_KEY)) {
String warehouseName = request.getRequest().headers().get(WAREHOUSE_KEY);
Warehouse wh = globalStateMgr.getWarehouseMgr().getWarehouseAllowNull(warehouseName);
if (wh == null) {
throw new StarRocksHttpException(HttpResponseStatus.NOT_FOUND,
"Warehouse [" + warehouseName + "] " + "does not exist");
} else {
ConnectContext.get().setCurrentWarehouse(warehouseName);
}
}
if (Strings.isNullOrEmpty(postContent)) {
throw new StarRocksHttpException(HttpResponseStatus.BAD_REQUEST,
"POST body must contains [sql] root object");
Expand Down
23 changes: 23 additions & 0 deletions fe/fe-core/src/test/java/com/starrocks/http/TableQueryPlanActionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,4 +182,27 @@ public void testQueryPlanActionPruneEmpty() throws Exception {
Assert.assertEquals("{\"partitions\":{},\"opaqued_query_plan\":\"\",\"status\":200}", respStr);
}
}

@Test
public void testQueryPlanActionWithInvalidWarehouse() throws Exception {
super.setUpWithCatalog();
RequestBody body =
RequestBody.create(JSON, "{ \"sql\" : \" select k1 from " + DB_NAME + "." + TABLE_NAME + " \" }");
Request request = new Request.Builder()
.post(body)
.addHeader("Authorization", rootAuth)
.addHeader("warehouse", "invalid_warehouse")
.url(URI + PATH_URI)
.build();
try (Response response = networkClient.newCall(request).execute()) {
String respStr = Objects.requireNonNull(response.body()).string();
JSONObject jsonObject = new JSONObject(respStr);
System.out.println(respStr);
Assert.assertEquals(404, jsonObject.getInt("status"));
String exception = jsonObject.getString("exception");
Assert.assertNotNull(exception);
Assert.assertTrue(
exception.startsWith("Warehouse [invalid_warehouse] does not exist"));
}
}
}
Loading