From c85183ca29d0d8af81326232c8616fe46b31933b Mon Sep 17 00:00:00 2001 From: Gonzalo Ortiz Date: Thu, 30 Jan 2025 12:18:54 +0100 Subject: [PATCH 1/3] Improve error message when colocated join is requested but workermanager is disabled --- .../src/main/java/org/apache/pinot/query/QueryEnvironment.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/QueryEnvironment.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/QueryEnvironment.java index b71b1cecc720..e9ba1f9495bb 100644 --- a/pinot-query-planner/src/main/java/org/apache/pinot/query/QueryEnvironment.java +++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/QueryEnvironment.java @@ -152,7 +152,8 @@ private WorkerManager getWorkerManager(SqlNodeAndOptions sqlNodeAndOptions) { } switch (inferPartitionHint.toLowerCase()) { case "true": - Objects.requireNonNull(workerManager, "WorkerManager is required in order to infer partition hint"); + Objects.requireNonNull(workerManager, "WorkerManager is required in order to infer partition hint. " + + "Please enable it using " + CommonConstants.Broker.CONFIG_OF_ENABLE_PARTITION_METADATA_MANAGER + "=true"); return workerManager; case "false": return null; From d33924728768335a84613e5ce2182d7edea6c3b1 Mon Sep 17 00:00:00 2001 From: Gonzalo Ortiz Jaureguizar Date: Mon, 10 Feb 2025 09:04:15 +0100 Subject: [PATCH 2/3] Update pinot-query-planner/src/main/java/org/apache/pinot/query/QueryEnvironment.java Co-authored-by: Yash Mayya --- .../src/main/java/org/apache/pinot/query/QueryEnvironment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/QueryEnvironment.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/QueryEnvironment.java index e9ba1f9495bb..62c9f146d0b9 100644 --- a/pinot-query-planner/src/main/java/org/apache/pinot/query/QueryEnvironment.java +++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/QueryEnvironment.java @@ -153,7 +153,7 @@ private WorkerManager getWorkerManager(SqlNodeAndOptions sqlNodeAndOptions) { switch (inferPartitionHint.toLowerCase()) { case "true": Objects.requireNonNull(workerManager, "WorkerManager is required in order to infer partition hint. " - + "Please enable it using " + CommonConstants.Broker.CONFIG_OF_ENABLE_PARTITION_METADATA_MANAGER + "=true"); + + "Please enable it using broker config" + CommonConstants.Broker.CONFIG_OF_ENABLE_PARTITION_METADATA_MANAGER + "=true"); return workerManager; case "false": return null; From 4e7a58f118fc38ebcc3aa74ffd997c30cfe33e45 Mon Sep 17 00:00:00 2001 From: Gonzalo Ortiz Date: Tue, 11 Feb 2025 11:55:41 +0100 Subject: [PATCH 3/3] Fix checkstyle issue --- .../src/main/java/org/apache/pinot/query/QueryEnvironment.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/QueryEnvironment.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/QueryEnvironment.java index 62c9f146d0b9..4d4f05da8515 100644 --- a/pinot-query-planner/src/main/java/org/apache/pinot/query/QueryEnvironment.java +++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/QueryEnvironment.java @@ -153,7 +153,8 @@ private WorkerManager getWorkerManager(SqlNodeAndOptions sqlNodeAndOptions) { switch (inferPartitionHint.toLowerCase()) { case "true": Objects.requireNonNull(workerManager, "WorkerManager is required in order to infer partition hint. " - + "Please enable it using broker config" + CommonConstants.Broker.CONFIG_OF_ENABLE_PARTITION_METADATA_MANAGER + "=true"); + + "Please enable it using broker config" + + CommonConstants.Broker.CONFIG_OF_ENABLE_PARTITION_METADATA_MANAGER + "=true"); return workerManager; case "false": return null;