This is an automated email from the ASF dual-hosted git repository.
karan 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 f47b05a98c Hyphenate multi value string for consistency. Fixup extra
space in javadoc. (#14043)
f47b05a98c is described below
commit f47b05a98cc3ec748bef6958fceac4ac3f91064e
Author: Abhishek Radhakrishnan <[email protected]>
AuthorDate: Thu Apr 6 23:16:07 2023 -0700
Hyphenate multi value string for consistency. Fixup extra space in javadoc.
(#14043)
---
.../src/main/java/org/apache/druid/msq/exec/MSQTasks.java | 2 +-
.../main/java/org/apache/druid/msq/indexing/error/MSQErrorReport.java | 2 +-
.../java/org/apache/druid/msq/indexing/error/QueryRuntimeFault.java | 2 +-
.../src/test/java/org/apache/druid/msq/exec/MSQInsertTest.java | 2 +-
.../src/test/java/org/apache/druid/msq/exec/MSQSelectTest.java | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/MSQTasks.java
b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/MSQTasks.java
index 3564ea59a9..bc00689867 100644
---
a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/MSQTasks.java
+++
b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/MSQTasks.java
@@ -230,7 +230,7 @@ public class MSQTasks
if (errorReport.getExceptionStackTrace() != null) {
if (errorReport.getFault() instanceof UnknownFault ||
errorReport.getFault() instanceof QueryRuntimeFault) {
- // Log full stack trace for unknown and QueryStack faults
+ // Log full stack trace for UnknownFault and QueryRuntimeFault
logMessage.append('\n').append(errorReport.getExceptionStackTrace());
} else {
// Log first line only (error class, message) for known faults, to
avoid polluting logs.
diff --git
a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQErrorReport.java
b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQErrorReport.java
index 2ed375c791..54c7d10ad1 100644
---
a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQErrorReport.java
+++
b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQErrorReport.java
@@ -194,7 +194,7 @@ public class MSQErrorReport
return new RowTooLargeFault(((FrameRowTooLargeException)
cause).getMaxFrameSize());
} else if (cause instanceof UnexpectedMultiValueDimensionException) {
return new QueryRuntimeFault(StringUtils.format(
- "Column [%s] is a multi value string. Please wrap the column using
MV_TO_ARRAY() to proceed further.",
+ "Column [%s] is a multi-value string. Please wrap the column using
MV_TO_ARRAY() to proceed further.",
((UnexpectedMultiValueDimensionException) cause).getDimensionName()
), cause.getMessage());
} else if
(cause.getClass().getPackage().getName().startsWith("org.apache.druid.query")) {
diff --git
a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/QueryRuntimeFault.java
b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/QueryRuntimeFault.java
index 2a34130579..0950ae4663 100644
---
a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/QueryRuntimeFault.java
+++
b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/QueryRuntimeFault.java
@@ -27,7 +27,7 @@ import javax.annotation.Nullable;
import java.util.Objects;
/**
- * Fault to throw when the error comes from the druid native query runtime
while running in the MSQ engine .
+ * Fault to throw when the error comes from the druid native query runtime
while running in the MSQ engine.
*/
@JsonTypeName(QueryRuntimeFault.CODE)
public class QueryRuntimeFault extends BaseMSQFault
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 bdafa57f04..82f35838f8 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
@@ -497,7 +497,7 @@ public class MSQInsertTest extends MSQTestBase
.setExpectedExecutionErrorMatcher(CoreMatchers.allOf(
CoreMatchers.instanceOf(ISE.class),
ThrowableMessageMatcher.hasMessage(CoreMatchers.containsString(
- "Column [dim3] is a multi value string. Please
wrap the column using MV_TO_ARRAY() to proceed further.")
+ "Column [dim3] is a multi-value string. Please
wrap the column using MV_TO_ARRAY() to proceed further.")
)
))
.verifyExecutionError();
diff --git
a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQSelectTest.java
b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQSelectTest.java
index 6ef5c09b21..d652446626 100644
---
a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQSelectTest.java
+++
b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQSelectTest.java
@@ -1316,7 +1316,7 @@ public class MSQSelectTest extends MSQTestBase
.setExpectedExecutionErrorMatcher(CoreMatchers.allOf(
CoreMatchers.instanceOf(ISE.class),
ThrowableMessageMatcher.hasMessage(CoreMatchers.containsString(
- "Column [dim3] is a multi value string. Please wrap the column
using MV_TO_ARRAY() to proceed further.")
+ "Column [dim3] is a multi-value string. Please wrap the column
using MV_TO_ARRAY() to proceed further.")
)
))
.verifyExecutionError();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
