Skip to content
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

perf(sql): speed up parallel sample by with fill #5143

Draft
wants to merge 23 commits into
base: master
Choose a base branch
from
Draft

perf(sql): speed up parallel sample by with fill #5143

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
7d7b64d
add some basic validation to catch mismatched type error earlier
nwoolmer Nov 6, 2024
7f91fb0
fix condition
nwoolmer Nov 6, 2024
bcf3703
fix SqlOptimiserTest
nwoolmer Nov 7, 2024
2c22e95
condition was back to front
nwoolmer Nov 7, 2024
2e7d305
refactor to pass fill values positions
nwoolmer Nov 19, 2024
536cdb7
comments
nwoolmer Nov 19, 2024
7de45a9
fix condition
nwoolmer Nov 19, 2024
fe086c7
Merge branch 'master' into nw_fill_range_error
nwoolmer Nov 19, 2024
3348c92
Merge remote-tracking branch 'origin/master' into nw_fill_range_error
bluestreak01 Jan 4, 2025
413d43e
merge fallout
bluestreak01 Jan 4, 2025
1355786
fixes
bluestreak01 Jan 4, 2025
23aa47c
formatting
bluestreak01 Jan 4, 2025
b0acefb
rework parallel sample by fill. now `FillRange` requires a designated…
nwoolmer Jan 7, 2025
b3c763a
fix tests, still todo - fix set operations
nwoolmer Jan 7, 2025
90e634f
Merge branch 'master' into nw_fill_range_error
nwoolmer Jan 7, 2025
bbddae6
improve error message
nwoolmer Jan 7, 2025
e77eadb
safety
nwoolmer Jan 8, 2025
5c4ec03
safety
nwoolmer Jan 9, 2025
3dd80f6
still not a fix
nwoolmer Jan 10, 2025
9f1a08e
hacky fix, more attention required
nwoolmer Jan 10, 2025
924b648
Merge branch 'refs/heads/master' into nw_fill_range_error
nwoolmer Jan 10, 2025
f8e51df
Merge branch 'master' into nw_fill_range_error
nwoolmer Jan 13, 2025
21ce459
fix test
nwoolmer Jan 13, 2025
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
Prev Previous commit
Next Next commit
fix tests, still todo - fix set operations
  • Loading branch information
@nwoolmer
nwoolmer committed Jan 7, 2025
commit b3c763a620a069eff535ad3724d92df1f1b1e178
20 changes: 10 additions & 10 deletions core/src/test/java/io/questdb/test/griffin/ExplainPlanTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6787,11 +6787,11 @@ public void testSampleByFillNull() throws Exception {
assertPlanNoLeakCheck(
"select first(i) from a sample by 1h fill(null) align to calendar",
"SelectedRecord\n" +
" Sort\n" +
" keys: [ts]\n" +
" Fill Range\n" +
" stride: '1h'\n" +
" values: [null]\n" +
" Fill Range\n" +
" stride: '1h'\n" +
" values: [null]\n" +
" Radix sort light\n" +
" keys: [ts]\n" +
" Async Group By workers: 1\n" +
" keys: [ts]\n" +
" values: [first(i)]\n" +
Expand Down Expand Up @@ -6915,11 +6915,11 @@ public void testSampleByFillValueNotKeyed() throws Exception {
assertPlanNoLeakCheck(
"select first(i) from a sample by 1h fill(1) align to calendar",
"SelectedRecord\n" +
" Sort\n" +
" keys: [ts]\n" +
" Fill Range\n" +
" stride: '1h'\n" +
" values: [1]\n" +
" Fill Range\n" +
" stride: '1h'\n" +
" values: [1]\n" +
" Radix sort light\n" +
" keys: [ts]\n" +
" Async Group By workers: 1\n" +
" keys: [ts]\n" +
" values: [first(i)]\n" +
Expand Down
2 changes: 1 addition & 1 deletion core/src/test/java/io/questdb/test/griffin/OrderByRadixSortTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ public void testOrderByTimestampColumnDescMixedValues() throws Exception {
" end as timestamp) as a" +
" from long_sequence(25)" +
")",
null,
"a###DESC",
true,
true
);
Expand Down
10 changes: 5 additions & 5 deletions core/src/test/java/io/questdb/test/griffin/SampleBySqlParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public void testAlignToCalendarTimeZoneWithSomethingUnexpected() throws Exceptio
@Test
public void testAlignToCalendarWithTimeZoneAndLimit() throws SqlException {
assertQuery(
"select-choose a, sum from (select-group-by [a, sum(a) sum, timestamp_floor('1h',timestamp) timestamp] a, sum(a) sum, timestamp_floor('1h',timestamp) timestamp from (select [a, timestamp] from x timestamp (timestamp) stride 1h) order by timestamp limit 1)",
"select-choose a, sum from (select-group-by [a, sum(a) sum, timestamp_floor('1h',timestamp) timestamp] a, sum(a) sum, timestamp_floor('1h',timestamp) timestamp from (select [a, timestamp] from x timestamp (timestamp)) stride 1h order by timestamp limit 1)",
"select a, sum(a) from x sample by 1h align to calendar time zone 'UTC' limit 1;",
model()
);
Expand All @@ -173,7 +173,7 @@ public void testAlignToCalendarWithTimeZoneAndLimit() throws SqlException {
@Test
public void testAlignToCalendarWithTimeZoneAndOrderBy() throws SqlException {
assertQuery(
"select-choose a, sum from (select-group-by [a, sum(a) sum, timestamp_floor('1h',timestamp) timestamp] a, sum(a) sum, timestamp_floor('1h',timestamp) timestamp from (select [a, timestamp] from x timestamp (timestamp) stride 1h) order by a desc)",
"select-choose a, sum from (select-group-by [a, sum(a) sum, timestamp_floor('1h',timestamp) timestamp] a, sum(a) sum, timestamp_floor('1h',timestamp) timestamp from (select [a, timestamp] from x timestamp (timestamp)) stride 1h order by a desc)",
"select a, sum(a) from x sample by 1h align to calendar time zone 'UTC' order by a desc;",
model()
);
Expand All @@ -182,7 +182,7 @@ public void testAlignToCalendarWithTimeZoneAndOrderBy() throws SqlException {
@Test
public void testAlignToCalendarWithTimeZoneEndingWithSemicolon() throws SqlException {
assertQuery(
"select-choose a, sum from (select-group-by [a, sum(a) sum, timestamp_floor('1h',timestamp) timestamp] a, sum(a) sum, timestamp_floor('1h',timestamp) timestamp from (select [a, timestamp] from x timestamp (timestamp) stride 1h) order by timestamp)",
"select-choose a, sum from (select-group-by [a, sum(a) sum, timestamp_floor('1h',timestamp) timestamp] a, sum(a) sum, timestamp_floor('1h',timestamp) timestamp from (select [a, timestamp] from x timestamp (timestamp)) stride 1h order by timestamp)",
"select a, sum(a) from x sample by 1h align to calendar time zone 'UTC';",
model()
);
Expand All @@ -191,7 +191,7 @@ public void testAlignToCalendarWithTimeZoneEndingWithSemicolon() throws SqlExcep
@Test
public void testAlignToCalendarWithoutTimezoneNorOffsetAndLimit() throws SqlException {
assertQuery(
"select-choose a, sum from (select-group-by [a, sum(a) sum, timestamp_floor('1h',timestamp) timestamp] a, sum(a) sum, timestamp_floor('1h',timestamp) timestamp from (select [a, timestamp] from x timestamp (timestamp) stride 1h) order by timestamp limit 1)",
"select-choose a, sum from (select-group-by [a, sum(a) sum, timestamp_floor('1h',timestamp) timestamp] a, sum(a) sum, timestamp_floor('1h',timestamp) timestamp from (select [a, timestamp] from x timestamp (timestamp)) stride 1h order by timestamp limit 1)",
"select a, sum(a) from x sample by 1h align to calendar limit 1;",
model()
);
Expand All @@ -210,7 +210,7 @@ public void testAlignToSomethingInvalid() throws Exception {
@Test
public void testCalendar() throws SqlException {
assertQuery(
"select-choose b, sum, k1, k from (select-group-by [b, sum(a) sum, k k1, k, timestamp_floor('3h',timestamp) timestamp] b, sum(a) sum, k k1, k, timestamp_floor('3h',timestamp) timestamp from (select [b, a, k, timestamp] from x y timestamp (timestamp) stride 3h) y order by timestamp)",
"select-choose b, sum, k1, k from (select-group-by [b, sum(a) sum, k k1, k, timestamp_floor('3h',timestamp) timestamp] b, sum(a) sum, k k1, k, timestamp_floor('3h',timestamp) timestamp from (select [b, a, k, timestamp] from x y timestamp (timestamp)) y stride 3h order by timestamp)",
"select b, sum(a), k k1, k from x y sample by 3h align to calendar",
model()
);
Expand Down
Loading
Loading