Skip to content

fix: TableInputSpec serialized two intervals fields. #19264

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

Open
gianm wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: TableInputSpec serialized two intervals fields. #19264

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
19bdba0
fix: TableInputSpec serialized two intervals fields.
gianm Apr 4, 2026
300b05b
Update test expectations.
gianm Apr 4, 2026
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
3 changes: 1 addition & 2 deletions multi-stage-query/src/main/java/org/apache/druid/msq/input/table/TableInputSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,12 @@ public String getDataSource()
return dataSource;
}

@JsonProperty
public List<Interval> getIntervals()
{
return intervals;
}

@JsonProperty
@JsonProperty("intervals")
@JsonInclude(JsonInclude.Include.NON_NULL)
@Nullable
private List<Interval> getIntervalsForSerialization()
Expand Down
3 changes: 1 addition & 2 deletions multi-stage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/msq1.iq
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ order by 1;
"id" : "<taskId>_0",
"input" : [ {
"type" : "table",
"dataSource" : "wikipedia",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "wikipedia"
} ],
"processor" : {
"type" : "groupByPreShuffle",
Expand Down
18 changes: 6 additions & 12 deletions multi-stage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/msqJoinHint.iq
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ where w1.cityName='New York';
"id" : "<taskId>_0",
"input" : [ {
"type" : "table",
"dataSource" : "wikipedia",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "wikipedia"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -80,8 +79,7 @@ where w1.cityName='New York';
"id" : "<taskId>_1",
"input" : [ {
"type" : "table",
"dataSource" : "wikipedia",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "wikipedia"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -246,8 +244,7 @@ LogicalJoin:[[broadcast inheritPath:[0, 0]]]
"id" : "<taskId>_0",
"input" : [ {
"type" : "table",
"dataSource" : "wikipedia",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "wikipedia"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -314,8 +311,7 @@ LogicalJoin:[[broadcast inheritPath:[0, 0]]]
"id" : "<taskId>_1",
"input" : [ {
"type" : "table",
"dataSource" : "wikipedia",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "wikipedia"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -481,8 +477,7 @@ LogicalJoin:[[sort_merge inheritPath:[0, 0]]]
"id" : "<taskId>_0",
"input" : [ {
"type" : "table",
"dataSource" : "wikipedia",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "wikipedia"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -549,8 +544,7 @@ LogicalJoin:[[sort_merge inheritPath:[0, 0]]]
"id" : "<taskId>_1",
"input" : [ {
"type" : "table",
"dataSource" : "wikipedia",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "wikipedia"
} ],
"processor" : {
"type" : "scan",
Expand Down
27 changes: 9 additions & 18 deletions ...tage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/msqNestedJoinHint.iq
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ where w1.cityName='New York';
"id" : "<taskId>_0",
"input" : [ {
"type" : "table",
"dataSource" : "wikipedia",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "wikipedia"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -77,8 +76,7 @@ where w1.cityName='New York';
"id" : "<taskId>_1",
"input" : [ {
"type" : "table",
"dataSource" : "wikipedia",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "wikipedia"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -142,8 +140,7 @@ where w1.cityName='New York';
"id" : "<taskId>_2",
"input" : [ {
"type" : "table",
"dataSource" : "wikipedia",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "wikipedia"
}, {
"type" : "stage",
"stage" : 0
Expand Down Expand Up @@ -266,8 +263,7 @@ LogicalJoin:[[sort_merge inheritPath:[0]]]
"id" : "<taskId>_0",
"input" : [ {
"type" : "table",
"dataSource" : "wikipedia",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "wikipedia"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -331,8 +327,7 @@ LogicalJoin:[[sort_merge inheritPath:[0]]]
"id" : "<taskId>_1",
"input" : [ {
"type" : "table",
"dataSource" : "wikipedia",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "wikipedia"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -393,8 +388,7 @@ LogicalJoin:[[sort_merge inheritPath:[0]]]
"id" : "<taskId>_2",
"input" : [ {
"type" : "table",
"dataSource" : "wikipedia",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "wikipedia"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -578,8 +572,7 @@ where w1.cityName='New York';
"id" : "<taskId>_0",
"input" : [ {
"type" : "table",
"dataSource" : "wikipedia",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "wikipedia"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -640,8 +633,7 @@ where w1.cityName='New York';
"id" : "<taskId>_1",
"input" : [ {
"type" : "table",
"dataSource" : "wikipedia",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "wikipedia"
}, {
"type" : "stage",
"stage" : 0
Expand Down Expand Up @@ -716,8 +708,7 @@ where w1.cityName='New York';
"id" : "<taskId>_2",
"input" : [ {
"type" : "table",
"dataSource" : "wikipedia",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "wikipedia"
} ],
"processor" : {
"type" : "scan",
Expand Down
66 changes: 22 additions & 44 deletions quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaArray/sql_explain.msq.iq
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ FROM test_array;
"id" : "<taskId>_0",
"input" : [ {
"type" : "table",
"dataSource" : "test_array",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "test_array"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -128,8 +127,7 @@ FROM test_array;
"id" : "<taskId>_0",
"input" : [ {
"type" : "table",
"dataSource" : "test_array",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "test_array"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -217,8 +215,7 @@ FROM test_array;
"id" : "<taskId>_0",
"input" : [ {
"type" : "table",
"dataSource" : "test_array",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "test_array"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -317,8 +314,7 @@ FROM test_array;
"id" : "<taskId>_0",
"input" : [ {
"type" : "table",
"dataSource" : "test_array",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "test_array"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -420,8 +416,7 @@ FROM test_array;
"id" : "<taskId>_0",
"input" : [ {
"type" : "table",
"dataSource" : "test_array",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "test_array"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -509,8 +504,7 @@ FROM test_array;
"id" : "<taskId>_0",
"input" : [ {
"type" : "table",
"dataSource" : "test_array",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "test_array"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -609,8 +603,7 @@ FROM test_array;
"id" : "<taskId>_0",
"input" : [ {
"type" : "table",
"dataSource" : "test_array",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "test_array"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -712,8 +705,7 @@ FROM test_array;
"id" : "<taskId>_0",
"input" : [ {
"type" : "table",
"dataSource" : "test_array",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "test_array"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -801,8 +793,7 @@ FROM test_array;
"id" : "<taskId>_0",
"input" : [ {
"type" : "table",
"dataSource" : "test_array",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "test_array"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -901,8 +892,7 @@ FROM test_array;
"id" : "<taskId>_0",
"input" : [ {
"type" : "table",
"dataSource" : "test_array",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "test_array"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -1004,8 +994,7 @@ FROM test_array;
"id" : "<taskId>_0",
"input" : [ {
"type" : "table",
"dataSource" : "test_array",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "test_array"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -1093,8 +1082,7 @@ FROM test_array;
"id" : "<taskId>_0",
"input" : [ {
"type" : "table",
"dataSource" : "test_array",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "test_array"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -1193,8 +1181,7 @@ FROM test_array;
"id" : "<taskId>_0",
"input" : [ {
"type" : "table",
"dataSource" : "test_array",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "test_array"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -1296,8 +1283,7 @@ FROM test_array;
"id" : "<taskId>_0",
"input" : [ {
"type" : "table",
"dataSource" : "test_array",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "test_array"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -1385,8 +1371,7 @@ FROM test_array;
"id" : "<taskId>_0",
"input" : [ {
"type" : "table",
"dataSource" : "test_array",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "test_array"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -1485,8 +1470,7 @@ FROM test_array;
"id" : "<taskId>_0",
"input" : [ {
"type" : "table",
"dataSource" : "test_array",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "test_array"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -1588,8 +1572,7 @@ FROM test_array;
"id" : "<taskId>_0",
"input" : [ {
"type" : "table",
"dataSource" : "test_array",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "test_array"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -1677,8 +1660,7 @@ FROM test_array;
"id" : "<taskId>_0",
"input" : [ {
"type" : "table",
"dataSource" : "test_array",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "test_array"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -1777,8 +1759,7 @@ FROM test_array;
"id" : "<taskId>_0",
"input" : [ {
"type" : "table",
"dataSource" : "test_array",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "test_array"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -1880,8 +1861,7 @@ FROM test_array;
"id" : "<taskId>_0",
"input" : [ {
"type" : "table",
"dataSource" : "test_array",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "test_array"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -1969,8 +1949,7 @@ FROM test_array;
"id" : "<taskId>_0",
"input" : [ {
"type" : "table",
"dataSource" : "test_array",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "test_array"
} ],
"processor" : {
"type" : "scan",
Expand Down Expand Up @@ -2069,8 +2048,7 @@ FROM test_array;
"id" : "<taskId>_0",
"input" : [ {
"type" : "table",
"dataSource" : "test_array",
"intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
"dataSource" : "test_array"
} ],
"processor" : {
"type" : "scan",
Expand Down
Loading
Loading