Skip to content

Commit 2584a18

Browse files
bluestreak01bluestreak01
committed
speedup cairo & fuzz tests
1 parent 435a8bd commit 2584a18

15 files changed

+4518
-3847
lines changed

‎core/src/test/java/io/questdb/test/cairo/fuzz/CheckpointFuzzTest.java‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,15 @@
4545
import org.junit.Before;
4646
import org.junit.BeforeClass;
4747
import org.junit.Test;
48-
import org.junit.runner.RunWith;
49-
import org.junit.runners.Parameterized;
5048

51-
import java.util.Arrays;
52-
import java.util.Collection;
5349
import java.util.concurrent.atomic.AtomicReference;
5450

55-
@RunWith(Parameterized.class)
5651
public class CheckpointFuzzTest extends AbstractFuzzTest {
5752
static int SCOREBOARD_FORMAT = 1;
5853
private static Path triggerFilePath;
5954

60-
public CheckpointFuzzTest(int scoreboardFormat) throws Exception {
55+
public CheckpointFuzzTest() throws Exception {
56+
int scoreboardFormat = TestUtils.generateRandom(LOG).nextBoolean() ? 1 : 2;
6157
if (scoreboardFormat != SCOREBOARD_FORMAT) {
6258
SCOREBOARD_FORMAT = scoreboardFormat;
6359
tearDownStatic();
@@ -78,14 +74,6 @@ public static void tearDownStatic() {
7874
AbstractFuzzTest.tearDownStatic();
7975
}
8076

81-
@Parameterized.Parameters(name = "V{0}")
82-
public static Collection<Object[]> testParams() {
83-
return Arrays.asList(new Object[][]{
84-
{1},
85-
{2},
86-
});
87-
}
88-
8977
@Before
9078
public void setUp() {
9179
super.setUp();

‎core/src/test/java/io/questdb/test/cairo/fuzz/DedupInsertFuzzTest.java‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -66,30 +66,18 @@
6666
import org.junit.Assert;
6767
import org.junit.Assume;
6868
import org.junit.Test;
69-
import org.junit.runner.RunWith;
70-
import org.junit.runners.Parameterized;
7169

7270
import java.util.Arrays;
73-
import java.util.Collection;
7471
import java.util.List;
7572
import java.util.stream.Collectors;
7673

7774
import static io.questdb.test.tools.TestUtils.assertEquals;
7875

79-
@RunWith(Parameterized.class)
8076
public class DedupInsertFuzzTest extends AbstractFuzzTest {
8177
private final boolean convertToParquet;
8278

83-
public DedupInsertFuzzTest(boolean convertToParquet) {
84-
this.convertToParquet = convertToParquet;
85-
}
86-
87-
@Parameterized.Parameters(name = "parquet={0}")
88-
public static Collection<Object[]> data() {
89-
return Arrays.asList(new Object[][]{
90-
{true},
91-
{false},
92-
});
79+
public DedupInsertFuzzTest() {
80+
this.convertToParquet = TestUtils.generateRandom(LOG).nextBoolean();
9381
}
9482

9583
@Test
@@ -164,8 +152,6 @@ public void testDedupWithRandomShiftAndStepAndSymbolKey() throws Exception {
164152

165153
@Test
166154
public void testDedupWithRandomShiftAndStepAndSymbolKeyAndColumnTops() throws Exception {
167-
// TODO(eugene): Enable this test when adding columns after Parquet conversion is supported
168-
Assume.assumeFalse(convertToParquet);
169155
assertMemoryLeak(() -> {
170156
Rnd rnd = generateRandomAndProps();
171157

‎core/src/test/java/io/questdb/test/cairo/fuzz/O3MaxLagFuzzTest.java‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,35 +39,17 @@
3939
import io.questdb.std.ObjList;
4040
import io.questdb.std.Os;
4141
import io.questdb.std.Rnd;
42-
import io.questdb.test.TestTimestampType;
4342
import io.questdb.test.cairo.o3.AbstractO3Test;
4443
import io.questdb.test.fuzz.FuzzTransaction;
4544
import io.questdb.test.fuzz.FuzzTransactionGenerator;
4645
import io.questdb.test.fuzz.FuzzTransactionOperation;
4746
import io.questdb.test.tools.TestUtils;
4847
import org.junit.Assert;
4948
import org.junit.Test;
50-
import org.junit.runner.RunWith;
51-
import org.junit.runners.Parameterized;
5249

53-
import java.util.Arrays;
54-
import java.util.Collection;
55-
56-
@RunWith(Parameterized.class)
5750
public class O3MaxLagFuzzTest extends AbstractO3Test {
5851
private final static Log LOG = LogFactory.getLog(O3MaxLagFuzzTest.class);
5952

60-
public O3MaxLagFuzzTest(TestTimestampType timestampType) {
61-
super(timestampType);
62-
}
63-
64-
@Parameterized.Parameters(name = "{0}")
65-
public static Collection<Object[]> data() {
66-
return Arrays.asList(new Object[][]{
67-
{TestTimestampType.MICRO}, {TestTimestampType.NANO}
68-
});
69-
}
70-
7153
@Test
7254
public void testFuzzParallel() throws Exception {
7355
executeWithPool(2, this::testFuzz0);

‎core/src/test/java/io/questdb/test/cairo/fuzz/O3ParquetPartitionFuzzTest.java‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -44,36 +44,19 @@
4444
import io.questdb.std.Rnd;
4545
import io.questdb.std.str.Path;
4646
import io.questdb.std.str.StringSink;
47-
import io.questdb.test.TestTimestampType;
4847
import io.questdb.test.cairo.o3.AbstractO3Test;
4948
import io.questdb.test.fuzz.FuzzTransaction;
5049
import io.questdb.test.fuzz.FuzzTransactionGenerator;
5150
import io.questdb.test.fuzz.FuzzTransactionOperation;
5251
import io.questdb.test.tools.TestUtils;
5352
import org.junit.Assert;
5453
import org.junit.Test;
55-
import org.junit.runner.RunWith;
56-
import org.junit.runners.Parameterized;
5754

5855
import java.io.FileInputStream;
59-
import java.util.Arrays;
60-
import java.util.Collection;
6156
import java.util.zip.CRC32;
6257

63-
@RunWith(Parameterized.class)
6458
public class O3ParquetPartitionFuzzTest extends AbstractO3Test {
6559

66-
public O3ParquetPartitionFuzzTest(TestTimestampType timestampType) {
67-
super(timestampType);
68-
}
69-
70-
@Parameterized.Parameters(name = "{0}")
71-
public static Collection<Object[]> data() {
72-
return Arrays.asList(new Object[][]{
73-
{TestTimestampType.MICRO}, {TestTimestampType.NANO}
74-
});
75-
}
76-
7760
@Test
7861
public void testFuzz() throws Exception {
7962
executeWithPool(0, this::testFuzz0);

0 commit comments

Comments
 (0)