This is an automated email from the ASF dual-hosted git repository.

frankchen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git


The following commit(s) were added to refs/heads/master by this push:
     new a3391693eb Improve a MSQ planning error message (#13113)
a3391693eb is described below

commit a3391693eb4af9b38f3c23aa275765749d0a5cb9
Author: Frank Chen <[email protected]>
AuthorDate: Mon Sep 19 23:11:54 2022 +0800

    Improve a MSQ planning error message (#13113)
---
 .../src/main/java/org/apache/druid/msq/sql/MSQTaskSqlEngine.java     | 5 +----
 .../src/test/java/org/apache/druid/msq/exec/MSQInsertTest.java       | 2 +-
 .../src/test/java/org/apache/druid/msq/exec/MSQReplaceTest.java      | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git 
a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/MSQTaskSqlEngine.java
 
b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/MSQTaskSqlEngine.java
index 226c4ffcdb..02563f27e5 100644
--- 
a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/MSQTaskSqlEngine.java
+++ 
b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/MSQTaskSqlEngine.java
@@ -275,10 +275,7 @@ public class MSQTaskSqlEngine implements SqlEngine
       // and LIMIT/OFFSET prevent shuffle statistics from being generated. 
This is because they always send everything
       // to a single partition, so there are no shuffle statistics.
       throw new ValidationException(
-          StringUtils.format(
-              "INSERT and REPLACE queries cannot have a LIMIT unless %s is 
\"all\".",
-              DruidSqlInsert.SQL_INSERT_SEGMENT_GRANULARITY
-          )
+          "INSERT and REPLACE queries cannot have a LIMIT unless PARTITIONED 
BY is \"ALL\"."
       );
     }
     if (sort != null && sort.offset != null) {
diff --git 
a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQInsertTest.java
 
b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQInsertTest.java
index 18ad9f050d..4e2d16bfa7 100644
--- 
a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQInsertTest.java
+++ 
b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQInsertTest.java
@@ -531,7 +531,7 @@ public class MSQInsertTest extends MSQTestBase
                      .setExpectedValidationErrorMatcher(CoreMatchers.allOf(
                          CoreMatchers.instanceOf(SqlPlanningException.class),
                          
ThrowableMessageMatcher.hasMessage(CoreMatchers.containsString(
-                             "INSERT and REPLACE queries cannot have a LIMIT 
unless sqlInsertSegmentGranularity is \"all\""))
+                             "INSERT and REPLACE queries cannot have a LIMIT 
unless PARTITIONED BY is \"ALL\""))
                      ))
                      .verifyPlanningErrors();
   }
diff --git 
a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQReplaceTest.java
 
b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQReplaceTest.java
index ca7d5d3203..cfc4d063b1 100644
--- 
a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQReplaceTest.java
+++ 
b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQReplaceTest.java
@@ -326,7 +326,7 @@ public class MSQReplaceTest extends MSQTestBase
                      .setExpectedValidationErrorMatcher(CoreMatchers.allOf(
                          CoreMatchers.instanceOf(SqlPlanningException.class),
                          
ThrowableMessageMatcher.hasMessage(CoreMatchers.containsString(
-                             "INSERT and REPLACE queries cannot have a LIMIT 
unless sqlInsertSegmentGranularity is \"all\""))
+                             "INSERT and REPLACE queries cannot have a LIMIT 
unless PARTITIONED BY is \"ALL\""))
                      ))
                      .verifyPlanningErrors();
   }


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to