Skip to content

Commit b9759b4

Browse files
oralubenoraluben
authored
Reducer updates. (#892)
* use single `FileWriter` for reducer. * Trivial update. * Add warning when reducer is not available. * resolve comment. * Try to implement a reducer. * fix format * Bump `setup-java` to v3 to cache maven artifacts. * fix PMD. * Remove non-LTS Java versions. * Fix reducer log. * Resolve comments. * Update doc. * Extract reproducer to separate class. * Fix format issues. * Cleanup and update messages.
1 parent cddff69 commit b9759b4

File tree

8 files changed

+204
-135
lines changed

8 files changed

+204
-135
lines changed

‎.github/workflows/main.yml‎

Lines changed: 84 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@ jobs:
2424
with:
2525
fetch-depth: 0
2626
- name: Set up JDK 11
27-
uses: actions/setup-java@v1.4.4
27+
uses: actions/setup-java@v3
2828
with:
29-
java-version: 11
29+
distribution: 'temurin'
30+
java-version: '11'
31+
cache: 'maven'
3032
- name: Verify
3133
run: mvn -B verify -DskipTests=true
3234
- name: Misc Tests
@@ -46,9 +48,11 @@ jobs:
4648
with:
4749
fetch-depth: 0
4850
- name: Set up JDK 11
49-
uses: actions/setup-java@v1.4.4
51+
uses: actions/setup-java@v3
5052
with:
51-
java-version: 11
53+
distribution: 'temurin'
54+
java-version: '11'
55+
cache: 'maven'
5256
- name: Build SQLancer
5357
run: mvn -B package -DskipTests=true
5458
- name: Set up Citus
@@ -92,9 +96,11 @@ jobs:
9296
with:
9397
fetch-depth: 0
9498
- name: Set up JDK 11
95-
uses: actions/setup-java@v1.4.4
99+
uses: actions/setup-java@v3
96100
with:
97-
java-version: 11
101+
distribution: 'temurin'
102+
java-version: '11'
103+
cache: 'maven'
98104
- name: Build SQLancer
99105
run: mvn -B package -DskipTests=true
100106
- name: Set up ClickHouse
@@ -119,9 +125,11 @@ jobs:
119125
with:
120126
fetch-depth: 0
121127
- name: Set up JDK 11
122-
uses: actions/setup-java@v1.4.4
128+
uses: actions/setup-java@v3
123129
with:
124-
java-version: 11
130+
distribution: 'temurin'
131+
java-version: '11'
132+
cache: 'maven'
125133
- name: Build SQLancer
126134
run: mvn -B package -DskipTests=true
127135
- name: Set up CockroachDB
@@ -142,9 +150,11 @@ jobs:
142150
with:
143151
fetch-depth: 0
144152
- name: Set up JDK 11
145-
uses: actions/setup-java@v1.4.4
153+
uses: actions/setup-java@v3
146154
with:
147-
java-version: 11
155+
distribution: 'temurin'
156+
java-version: '11'
157+
cache: 'maven'
148158
- name: Build SQLancer
149159
run: mvn -B package -DskipTests=true
150160
- name: Set up CockroachDB
@@ -174,9 +184,11 @@ jobs:
174184
with:
175185
fetch-depth: 0
176186
- name: Set up JDK 11
177-
uses: actions/setup-java@v1.4.4
187+
uses: actions/setup-java@v3
178188
with:
179-
java-version: 11
189+
distribution: 'temurin'
190+
java-version: '11'
191+
cache: 'maven'
180192
- name: Build SQLancer
181193
run: mvn -B package -DskipTests=true
182194
- name: Run Tests
@@ -192,9 +204,11 @@ jobs:
192204
with:
193205
fetch-depth: 0
194206
- name: Set up JDK 11
195-
uses: actions/setup-java@v1.4.4
207+
uses: actions/setup-java@v3
196208
with:
197-
java-version: 11
209+
distribution: 'temurin'
210+
java-version: '11'
211+
cache: 'maven'
198212
- name: Build
199213
run: mvn -B package -DskipTests=true
200214
- name: DuckDB Tests
@@ -208,9 +222,11 @@ jobs:
208222
with:
209223
fetch-depth: 0
210224
- name: Set up JDK 11
211-
uses: actions/setup-java@v1.4.4
225+
uses: actions/setup-java@v3
212226
with:
213-
java-version: 11
227+
distribution: 'temurin'
228+
java-version: '11'
229+
cache: 'maven'
214230
- name: Build SQLancer
215231
run: mvn -B package -DskipTests=true
216232
- name: Run Tests
@@ -225,9 +241,11 @@ jobs:
225241
with:
226242
fetch-depth: 0
227243
- name: Set up JDK 11
228-
uses: actions/setup-java@v1.4.4
244+
uses: actions/setup-java@v3
229245
with:
230-
java-version: 11
246+
distribution: 'temurin'
247+
java-version: '11'
248+
cache: 'maven'
231249
- name: Build SQLancer
232250
run: mvn -B package -DskipTests=true
233251
- name: Install MariaDB
@@ -257,9 +275,11 @@ jobs:
257275
# Workaround for https://github.com/cockroachdb/cockroach/issues/93892
258276
psql postgres://root@localhost:26257 -c "SET CLUSTER SETTING sql.stats.forecasts.enabled = false"
259277
- name: Set up JDK 11
260-
uses: actions/setup-java@v1.4.4
278+
uses: actions/setup-java@v3
261279
with:
262-
java-version: 11
280+
distribution: 'temurin'
281+
java-version: '11'
282+
cache: 'maven'
263283
- name: Build SQLancer
264284
run: mvn -B package -DskipTests=true
265285
- name: Run Tests
@@ -282,9 +302,11 @@ jobs:
282302
# Workaround for https://github.com/cockroachdb/cockroach/issues/93892
283303
psql postgres://root@localhost:26257 -c "SET CLUSTER SETTING sql.stats.forecasts.enabled = false"
284304
- name: Set up JDK 11
285-
uses: actions/setup-java@v1.4.4
305+
uses: actions/setup-java@v3
286306
with:
287-
java-version: 11
307+
distribution: 'temurin'
308+
java-version: '11'
309+
cache: 'maven'
288310
- name: Build SQLancer
289311
run: mvn -B package -DskipTests=true
290312
- name: Run Tests
@@ -300,9 +322,11 @@ jobs:
300322
with:
301323
fetch-depth: 0
302324
- name: Set up JDK 11
303-
uses: actions/setup-java@v1.4.4
325+
uses: actions/setup-java@v3
304326
with:
305-
java-version: 11
327+
distribution: 'temurin'
328+
java-version: '11'
329+
cache: 'maven'
306330
- name: Build SQLancer
307331
run: mvn -B package -DskipTests=true
308332
- name: Set up MySQL
@@ -330,9 +354,11 @@ jobs:
330354
postgresql password: 'sqlancer'
331355
postgresql db: 'test'
332356
- name: Set up JDK 11
333-
uses: actions/setup-java@v1
357+
uses: actions/setup-java@v3
334358
with:
335-
java-version: 11
359+
distribution: 'temurin'
360+
java-version: '11'
361+
cache: 'maven'
336362
- name: Build SQLancer
337363
run: mvn -B package -DskipTests=true
338364
- name: Run Tests
@@ -347,9 +373,11 @@ jobs:
347373
with:
348374
fetch-depth: 0
349375
- name: Set up JDK 11
350-
uses: actions/setup-java@v1.4.4
376+
uses: actions/setup-java@v3
351377
with:
352-
java-version: 11
378+
distribution: 'temurin'
379+
java-version: '11'
380+
cache: 'maven'
353381
- name: Build
354382
run: mvn -B package -DskipTests=true
355383
- name: SQLite Tests
@@ -366,9 +394,11 @@ jobs:
366394
with:
367395
fetch-depth: 0
368396
- name: Set up JDK 11
369-
uses: actions/setup-java@v1.4.4
397+
uses: actions/setup-java@v3
370398
with:
371-
java-version: 11
399+
distribution: 'temurin'
400+
java-version: '11'
401+
cache: 'maven'
372402
- name: Build
373403
run: mvn -B package -DskipTests=true
374404
- name: SQLite Tests for QPG
@@ -393,9 +423,11 @@ jobs:
393423
docker exec $ContainerID /opt/stonedb57/install/bin/mysql -uroot -p123456 -e "CREATE USER 'sqlancer'@'%' IDENTIFIED WITH mysql_native_password BY 'sqlancer'; GRANT ALL PRIVILEGES ON *.* TO 'sqlancer'@'%' WITH GRANT OPTION; FLUSH PRIVILEGES;"
394424
sleep 60s
395425
- name: Set up JDK 11
396-
uses: actions/setup-java@v1.4.4
426+
uses: actions/setup-java@v3
397427
with:
398-
java-version: 11
428+
distribution: 'temurin'
429+
java-version: '11'
430+
cache: 'maven'
399431
- name: Build
400432
run: mvn -B package -DskipTests=true
401433
- name: StoneDB Tests
@@ -410,9 +442,11 @@ jobs:
410442
with:
411443
fetch-depth: 0
412444
- name: Set up JDK 11
413-
uses: actions/setup-java@v1.4.4
445+
uses: actions/setup-java@v3
414446
with:
415-
java-version: 11
447+
distribution: 'temurin'
448+
java-version: '11'
449+
cache: 'maven'
416450
- name: Build SQLancer
417451
run: mvn -B package -DskipTests=true
418452
- name: Set up TiDB
@@ -433,9 +467,11 @@ jobs:
433467
with:
434468
fetch-depth: 0
435469
- name: Set up JDK 11
436-
uses: actions/setup-java@v1.4.4
470+
uses: actions/setup-java@v3
437471
with:
438-
java-version: 11
472+
distribution: 'temurin'
473+
java-version: '11'
474+
cache: 'maven'
439475
- name: Build SQLancer
440476
run: mvn -B package -DskipTests=true
441477
- name: Set up TiDB
@@ -456,9 +492,11 @@ jobs:
456492
with:
457493
fetch-depth: 0
458494
- name: Set up JDK 11
459-
uses: actions/setup-java@v1.4.4
495+
uses: actions/setup-java@v3
460496
with:
461-
java-version: 11
497+
distribution: 'temurin'
498+
java-version: '11'
499+
cache: 'maven'
462500
- name: Build SQLancer
463501
run: mvn -B package -DskipTests=true
464502
- name: Set up Yugabyte
@@ -478,9 +516,11 @@ jobs:
478516
with:
479517
fetch-depth: 0
480518
- name: Set up JDK 11
481-
uses: actions/setup-java@v1
519+
uses: actions/setup-java@v3
482520
with:
483-
java-version: 11
521+
distribution: 'temurin'
522+
java-version: '11'
523+
cache: 'maven'
484524
- name: install mysql client
485525
run: |
486526
sudo apt update
@@ -509,58 +549,6 @@ jobs:
509549
- name: Run Tests
510550
run: DORIS_AVAILABLE=true mvn -Dtest=TestDoris test
511551

512-
513-
java13:
514-
name: Java 13 Compatibility (DuckDB)
515-
runs-on: ubuntu-latest
516-
517-
steps:
518-
- uses: actions/checkout@v3
519-
with:
520-
fetch-depth: 0
521-
- name: Set up JDK 13
522-
uses: actions/setup-java@v1.4.4
523-
with:
524-
java-version: 13
525-
- name: Build
526-
run: mvn -B package -DskipTests=true
527-
- name: Shortly run DuckDB
528-
run: cd target && java -jar $(ls | grep -P 'sqlancer-[0-9.]*.jar') --num-threads 4 --timeout-seconds 30 --num-queries 0 duckdb
529-
530-
java14:
531-
name: Java 14 Compatibility (DuckDB)
532-
runs-on: ubuntu-latest
533-
534-
steps:
535-
- uses: actions/checkout@v3
536-
with:
537-
fetch-depth: 0
538-
- name: Set up JDK 14
539-
uses: actions/setup-java@v1.4.4
540-
with:
541-
java-version: 14
542-
- name: Build
543-
run: mvn -B package -DskipTests=true
544-
- name: Shortly run DuckDB
545-
run: cd target && java -jar $(ls | grep -P 'sqlancer-[0-9.]*.jar') --num-threads 4 --timeout-seconds 30 --num-queries 0 duckdb
546-
547-
java15:
548-
name: Java 15 EA Compatibility (DuckDB)
549-
runs-on: ubuntu-latest
550-
551-
steps:
552-
- uses: actions/checkout@v3
553-
with:
554-
fetch-depth: 0
555-
- name: Set up JDK 15
556-
uses: actions/setup-java@v1.4.4
557-
with:
558-
java-version: 15-ea
559-
- name: Build
560-
run: mvn -B package -DskipTests=true
561-
- name: Shortly run DuckDB
562-
run: cd target && java -jar $(ls | grep -P 'sqlancer-[0-9.]*.jar') --num-threads 4 --timeout-seconds 30 --num-queries 0 duckdb
563-
564552
reducer:
565553
name: Reducer Tests
566554
runs-on: ubuntu-latest
@@ -570,9 +558,11 @@ jobs:
570558
with:
571559
fetch-depth: 0
572560
- name: Set up JDK 11
573-
uses: actions/setup-java@v1.4.4
561+
uses: actions/setup-java@v3
574562
with:
575-
java-version: 11
563+
distribution: 'temurin'
564+
java-version: '11'
565+
cache: 'maven'
576566
- name: Build
577567
run: mvn -B package -DskipTests=true
578568
- name: Run Tests

‎.github/workflows/release.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v2
1111
- name: Set up Maven Central Repository
12-
uses: actions/setup-java@v1
12+
uses: actions/setup-java@v3
1313
with:
14-
java-version: 11
14+
distribution: 'temurin'
15+
java-version: '11'
1516
server-id: ossrh
1617
server-username: MAVEN_USERNAME
1718
server-password: MAVEN_PASSWORD
@@ -29,9 +30,10 @@ jobs:
2930
- name: Check out the repo
3031
uses: actions/checkout@v2
3132
- name: Set up JDK 11
32-
uses: actions/setup-java@v1
33+
uses: actions/setup-java@v3
3334
with:
34-
java-version: 11
35+
distribution: 'temurin'
36+
java-version: '11'
3537
- name: Build SQLancer
3638
run: mvn -B package -DskipTests=true
3739
- name: Push to Docker Hub

0 commit comments

Comments
 (0)