Skip to content

Commit ba54aa0

Browse files
gianmgianm
authored
SqlTestFramework: Load datasets using injected ObjectMapper. (apache#18429)
* SqlTestFramework: Load datasets using injected ObjectMapper. Previously, datasets were loaded using TestHelper's default object mapper. Using the injected ObjectMapper ensures all the proper modules are loaded to be able to create test datasets. * QTest updates. * Restore duration expectations.
1 parent acc216f commit ba54aa0

57 files changed

Lines changed: 2536 additions & 2522 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎multi-stage-query/src/test/java/org/apache/druid/msq/test/DartComponentSupplier.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import org.apache.druid.query.TestBufferPool;
4242
import org.apache.druid.rpc.ServiceClientFactory;
4343
import org.apache.druid.rpc.guice.ServiceClientModule;
44+
import org.apache.druid.segment.TestHelper;
4445
import org.apache.druid.server.SpecificSegmentsQuerySegmentWalker;
4546
import org.apache.druid.sql.avatica.DartDruidMeta;
4647
import org.apache.druid.sql.avatica.DruidMeta;
@@ -74,9 +75,10 @@ public void gatherProperties(Properties properties)
7475
@Override
7576
public SpecificSegmentsQuerySegmentWalker addSegmentsToWalker(SpecificSegmentsQuerySegmentWalker walker)
7677
{
77-
walker.add(TestDataSet.NUMBERS, getTempDirProducer().newTempFolder("tmp_numbers"));
78+
walker.add(TestDataSet.NUMBERS, TestHelper.JSON_MAPPER, getTempDirProducer().newTempFolder("tmp_numbers"));
7879
return super.addSegmentsToWalker(walker);
7980
}
81+
8082
@Override
8183
public DruidModule getCoreModule()
8284
{

‎processing/src/test/java/org/apache/druid/segment/IndexBuilder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,10 +465,10 @@ public static InputSourceReader buildIncrementalIndexWithInputSource(
465465
Preconditions.checkNotNull(inputSource, "inputSource");
466466
Preconditions.checkNotNull(inputFormat, "inputFormat");
467467
Preconditions.checkNotNull(inputSourceTmpDir, "inputSourceTmpDir");
468-
TransformSpec tranformer = transformSpec != null ? transformSpec : TransformSpec.NONE;
468+
TransformSpec transformer = transformSpec != null ? transformSpec : TransformSpec.NONE;
469469
InputRowSchema rowSchema = new InputRowSchema(schema.getTimestampSpec(), schema.getDimensionsSpec(), null);
470470
InputSourceReader reader = inputSource.reader(rowSchema, inputFormat, inputSourceTmpDir);
471-
InputSourceReader transformingReader = tranformer.decorate(reader);
471+
InputSourceReader transformingReader = transformer.decorate(reader);
472472
return transformingReader;
473473
}
474474

‎quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaArray/ingest_dynamic_rollup_false.01.std.iq‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ FROM test_array;
309309
+---+
310310
| c |
311311
+---+
312-
| 0 |
312+
| 2 |
313313
+---+
314314
(1 row)
315315

‎quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaArray/ingest_dynamic_rollup_false.02.std.iq‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ WHERE t_bool_scalar1 = 'true';
540540
+---+
541541
| c |
542542
+---+
543-
| 0 |
543+
| 2 |
544544
+---+
545545
(1 row)
546546

@@ -555,7 +555,7 @@ WHERE t_bool_scalar1 IS NULL;
555555
+---+
556556
| c |
557557
+---+
558-
| 4 |
558+
| 2 |
559559
+---+
560560
(1 row)
561561

@@ -570,7 +570,7 @@ WHERE t_int_scalar1 = 1;
570570
+---+
571571
| c |
572572
+---+
573-
| 0 |
573+
| 2 |
574574
+---+
575575
(1 row)
576576

@@ -585,7 +585,7 @@ WHERE t_int_scalar1 IS NULL;
585585
+---+
586586
| c |
587587
+---+
588-
| 4 |
588+
| 2 |
589589
+---+
590590
(1 row)
591591

@@ -600,7 +600,7 @@ WHERE t_float_scalar1 = 0.1;
600600
+---+
601601
| c |
602602
+---+
603-
| 0 |
603+
| 2 |
604604
+---+
605605
(1 row)
606606

@@ -615,7 +615,7 @@ WHERE t_float_scalar1 IS NULL;
615615
+---+
616616
| c |
617617
+---+
618-
| 4 |
618+
| 2 |
619619
+---+
620620
(1 row)
621621

@@ -630,7 +630,7 @@ WHERE t_str_scalar1 = 'S1';
630630
+---+
631631
| c |
632632
+---+
633-
| 0 |
633+
| 2 |
634634
+---+
635635
(1 row)
636636

@@ -645,7 +645,7 @@ WHERE t_str_scalar1 IS NULL;
645645
+---+
646646
| c |
647647
+---+
648-
| 4 |
648+
| 2 |
649649
+---+
650650
(1 row)
651651

@@ -720,7 +720,7 @@ WHERE t_mixed_scalar1 = 'true';
720720
+---+
721721
| c |
722722
+---+
723-
| 0 |
723+
| 2 |
724724
+---+
725725
(1 row)
726726

@@ -735,7 +735,7 @@ WHERE t_mixed_scalar1 IS NULL;
735735
+---+
736736
| c |
737737
+---+
738-
| 4 |
738+
| 2 |
739739
+---+
740740
(1 row)
741741

‎quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaArray/ingest_hashed_rollup_true.01.std.iq‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ FROM test_array;
309309
+---+
310310
| c |
311311
+---+
312-
| 0 |
312+
| 1 |
313313
+---+
314314
(1 row)
315315

‎quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaArray/ingest_hashed_rollup_true.02.std.iq‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ WHERE t_bool_scalar1 = 'true';
540540
+---+
541541
| c |
542542
+---+
543-
| 0 |
543+
| 1 |
544544
+---+
545545
(1 row)
546546

@@ -555,7 +555,7 @@ WHERE t_bool_scalar1 IS NULL;
555555
+---+
556556
| c |
557557
+---+
558-
| 2 |
558+
| 1 |
559559
+---+
560560
(1 row)
561561

@@ -570,7 +570,7 @@ WHERE t_int_scalar1 = 1;
570570
+---+
571571
| c |
572572
+---+
573-
| 0 |
573+
| 1 |
574574
+---+
575575
(1 row)
576576

@@ -585,7 +585,7 @@ WHERE t_int_scalar1 IS NULL;
585585
+---+
586586
| c |
587587
+---+
588-
| 2 |
588+
| 1 |
589589
+---+
590590
(1 row)
591591

@@ -600,7 +600,7 @@ WHERE t_float_scalar1 = 0.1;
600600
+---+
601601
| c |
602602
+---+
603-
| 0 |
603+
| 1 |
604604
+---+
605605
(1 row)
606606

@@ -615,7 +615,7 @@ WHERE t_float_scalar1 IS NULL;
615615
+---+
616616
| c |
617617
+---+
618-
| 2 |
618+
| 1 |
619619
+---+
620620
(1 row)
621621

@@ -630,7 +630,7 @@ WHERE t_str_scalar1 = 'S1';
630630
+---+
631631
| c |
632632
+---+
633-
| 0 |
633+
| 1 |
634634
+---+
635635
(1 row)
636636

@@ -645,7 +645,7 @@ WHERE t_str_scalar1 IS NULL;
645645
+---+
646646
| c |
647647
+---+
648-
| 2 |
648+
| 1 |
649649
+---+
650650
(1 row)
651651

@@ -720,7 +720,7 @@ WHERE t_mixed_scalar1 = 'true';
720720
+---+
721721
| c |
722722
+---+
723-
| 0 |
723+
| 1 |
724724
+---+
725725
(1 row)
726726

@@ -735,7 +735,7 @@ WHERE t_mixed_scalar1 IS NULL;
735735
+---+
736736
| c |
737737
+---+
738-
| 2 |
738+
| 1 |
739739
+---+
740740
(1 row)
741741

‎quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaArray/ingest_range_rollup_true.01.std.iq‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ FROM test_array;
309309
+---+
310310
| c |
311311
+---+
312-
| 0 |
312+
| 1 |
313313
+---+
314314
(1 row)
315315

‎quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaArray/ingest_range_rollup_true.02.std.iq‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ WHERE t_bool_scalar1 = 'true';
540540
+---+
541541
| c |
542542
+---+
543-
| 0 |
543+
| 1 |
544544
+---+
545545
(1 row)
546546

@@ -555,7 +555,7 @@ WHERE t_bool_scalar1 IS NULL;
555555
+---+
556556
| c |
557557
+---+
558-
| 2 |
558+
| 1 |
559559
+---+
560560
(1 row)
561561

@@ -570,7 +570,7 @@ WHERE t_int_scalar1 = 1;
570570
+---+
571571
| c |
572572
+---+
573-
| 0 |
573+
| 1 |
574574
+---+
575575
(1 row)
576576

@@ -585,7 +585,7 @@ WHERE t_int_scalar1 IS NULL;
585585
+---+
586586
| c |
587587
+---+
588-
| 2 |
588+
| 1 |
589589
+---+
590590
(1 row)
591591

@@ -600,7 +600,7 @@ WHERE t_float_scalar1 = 0.1;
600600
+---+
601601
| c |
602602
+---+
603-
| 0 |
603+
| 1 |
604604
+---+
605605
(1 row)
606606

@@ -615,7 +615,7 @@ WHERE t_float_scalar1 IS NULL;
615615
+---+
616616
| c |
617617
+---+
618-
| 2 |
618+
| 1 |
619619
+---+
620620
(1 row)
621621

@@ -630,7 +630,7 @@ WHERE t_str_scalar1 = 'S1';
630630
+---+
631631
| c |
632632
+---+
633-
| 0 |
633+
| 1 |
634634
+---+
635635
(1 row)
636636

@@ -645,7 +645,7 @@ WHERE t_str_scalar1 IS NULL;
645645
+---+
646646
| c |
647647
+---+
648-
| 2 |
648+
| 1 |
649649
+---+
650650
(1 row)
651651

@@ -720,7 +720,7 @@ WHERE t_mixed_scalar1 = 'true';
720720
+---+
721721
| c |
722722
+---+
723-
| 0 |
723+
| 1 |
724724
+---+
725725
(1 row)
726726

@@ -735,7 +735,7 @@ WHERE t_mixed_scalar1 IS NULL;
735735
+---+
736736
| c |
737737
+---+
738-
| 2 |
738+
| 1 |
739739
+---+
740740
(1 row)
741741

‎quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaArray/ingest_schema_discovery_dynamic_rollup_true.01.std.iq‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ FROM test_array;
309309
+---+
310310
| c |
311311
+---+
312-
| 0 |
312+
| 1 |
313313
+---+
314314
(1 row)
315315

0 commit comments

Comments
 (0)