Skip to content

Fix ColumnSignature error message and jdk17 test issue. #14538

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

Merged
clintropolis merged 2 commits into from
Jul 6, 2023
Merged

Fix ColumnSignature error message and jdk17 test issue. #14538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c75b47
Fix ColumnSignature error message and jdk17 test issue.
gianm Jul 6, 2023
0eb0f0c
Fix format.
gianm Jul 6, 2023
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
2 changes: 1 addition & 1 deletion processing/src/main/java/org/apache/druid/segment/column/ColumnSignature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class ColumnSignature

// Name must be nonnull, but type can be null (if the type is unknown)
if (name == null || name.isEmpty()) {
throw new IAE(name, "Column name must be non-empty");
throw new IAE("Column name must be provided and non-empty");
Copy link
Copy Markdown
Contributor

@imply-cheddar imply-cheddar Jul 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Drive by comment, we could've interpolated the name value here:

"Column name [%s] must be provided and non-empty", name

Would help differentiate between empty and null. That said, I wonder if this should be throwing an InvalidInput instead of IAE now.

Copy link
Copy Markdown
Contributor Author

@gianm gianm Jul 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should probably have been doing InvalidInput. I forgot about those! Somehow!

Copy link
Copy Markdown
Contributor

@LakshSingla LakshSingla Jul 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gianm This leads to a 500 error being thrown if the user hits this error, instead of the 400 (which was the older behavior). Raised a PR yesterday which addresses this and cleans up exception handling of MSQ bits that reside in the broker. (#14534)

}
}

Expand Down
2 changes: 1 addition & 1 deletion sql/src/test/java/org/apache/druid/sql/calcite/CalciteInsertDmlTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1435,7 +1435,7 @@ public void testErrorWithUnableToConstructColumnSignatureWithExtern()
"general"
)
.expectMessageContains(
"Cannot construct instance of `org.apache.druid.segment.column.ColumnSignature`, problem: `java.lang.NullPointerException`\n"
"Cannot construct instance of `org.apache.druid.segment.column.ColumnSignature`, problem: Column name must be provided and non-empty"
)
)
.verify();
Expand Down