Skip to content

Commit c87df4c

Browse files
ray6080ray6080
committed
updates
1 parent b8e3ac7 commit c87df4c

File tree

10 files changed

+46
-40
lines changed

10 files changed

+46
-40
lines changed

‎Makefile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,12 @@ test-build:
158158
test: test-build
159159
ctest --test-dir build/$(call get-build-path,RelWithDebInfo)/test --output-on-failure -j ${TEST_JOBS}
160160

161+
test-fast: test-build
162+
ctest --test-dir build/$(call get-build-path,RelWithDebInfo)/test --output-on-failure -j ${TEST_JOBS} -E ".*_SLOW"
163+
164+
test-slow: test-build
165+
ctest --test-dir build/$(call get-build-path,RelWithDebInfo)/test --output-on-failure -j ${TEST_JOBS} -R ".*_SLOW"
166+
161167
lcov:
162168
$(call run-cmake-release, -DBUILD_TESTS=TRUE -DBUILD_LCOV=TRUE)
163169
ctest --test-dir build/$(call get-build-path,Release)/test --output-on-failure -j ${TEST_JOBS}

‎test/copy/copy_test.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ void CopyTest::BMExceptionRecoveryTest(BMExceptionRecoveryTestConfig cfg) {
166166
}
167167
}
168168

169-
TEST_F(CopyTest, NodeCopyBMExceptionRecoverySameConnection) {
169+
TEST_F(CopyTest, NodeCopyBMExceptionRecoverySameConnection_SLOW) {
170170
if (inMemMode) {
171171
GTEST_SKIP();
172172
}
@@ -192,7 +192,7 @@ TEST_F(CopyTest, NodeCopyBMExceptionRecoverySameConnection) {
192192
BMExceptionRecoveryTest(cfg);
193193
}
194194

195-
TEST_F(CopyTest, NodeCopyBMExceptionRecoverySameConnectionStringKey) {
195+
TEST_F(CopyTest, NodeCopyBMExceptionRecoverySameConnectionStringKey_SLOW) {
196196
if (inMemMode) {
197197
GTEST_SKIP();
198198
}
@@ -218,7 +218,7 @@ TEST_F(CopyTest, NodeCopyBMExceptionRecoverySameConnectionStringKey) {
218218
BMExceptionRecoveryTest(cfg);
219219
}
220220

221-
TEST_F(CopyTest, RelCopyBMExceptionRecoverySameConnection) {
221+
TEST_F(CopyTest, RelCopyBMExceptionRecoverySameConnection_SLOW) {
222222
if (inMemMode ||
223223
common::StorageConfig::NODE_GROUP_SIZE_LOG2 != TestParser::STANDARD_NODE_GROUP_SIZE_LOG_2) {
224224
GTEST_SKIP();
@@ -267,7 +267,7 @@ TEST_F(CopyTest, RelCopyBMExceptionRecoverySameConnection) {
267267
BMExceptionRecoveryTest(cfg);
268268
}
269269

270-
TEST_F(CopyTest, NodeInsertBMExceptionDuringCommitRecovery) {
270+
TEST_F(CopyTest, NodeInsertBMExceptionDuringCommitRecovery_SLOW) {
271271
static constexpr uint64_t numValues = 200000;
272272
BMExceptionRecoveryTestConfig cfg{.canFailDuringExecute = false,
273273
.canFailDuringCheckpoint = false,
@@ -290,7 +290,7 @@ TEST_F(CopyTest, NodeInsertBMExceptionDuringCommitRecovery) {
290290
BMExceptionRecoveryTest(cfg);
291291
}
292292

293-
TEST_F(CopyTest, RelInsertBMExceptionDuringCommitRecovery) {
293+
TEST_F(CopyTest, RelInsertBMExceptionDuringCommitRecovery_SLOW) {
294294
static constexpr auto numNodes = 10000;
295295
BMExceptionRecoveryTestConfig cfg{.canFailDuringExecute = false,
296296
.canFailDuringCheckpoint = false,
@@ -320,7 +320,7 @@ TEST_F(CopyTest, RelInsertBMExceptionDuringCommitRecovery) {
320320
BMExceptionRecoveryTest(cfg);
321321
}
322322

323-
TEST_F(CopyTest, NodeCopyBMExceptionDuringCheckpointRecovery) {
323+
TEST_F(CopyTest, NodeCopyBMExceptionDuringCheckpointRecovery_SLOW) {
324324
if (inMemMode || systemConfig->forceCheckpointOnClose == false) {
325325
GTEST_SKIP();
326326
}
@@ -352,7 +352,7 @@ TEST_F(CopyTest, NodeCopyBMExceptionDuringCheckpointRecovery) {
352352
BMExceptionRecoveryTest(cfg);
353353
}
354354

355-
TEST_F(CopyTest, RelCopyCheckpointBMExceptionRecovery) {
355+
TEST_F(CopyTest, RelCopyCheckpointBMExceptionRecovery_SLOW) {
356356
if (inMemMode || systemConfig->forceCheckpointOnClose == false) {
357357
GTEST_SKIP();
358358
}

‎test/copy/multi_copy_test.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,14 @@ class MultiCopyTest : public EmptyDBTest {
9696
size_t totalTuples = 0;
9797
};
9898

99-
TEST_F(MultiCopyTest, SingleSerialCopy) {
99+
TEST_F(MultiCopyTest, SingleSerialCopy_SLOW) {
100100
copySerial(common::StorageConfig::NODE_GROUP_SIZE * 10.5);
101101
validate(true /* isSerial */);
102102
}
103103

104104
// Tests that multiple copies that only add to the existing node group succeed
105105
// This is also covered by the tinysnb dataset
106-
TEST_F(MultiCopyTest, OneNodeGroup) {
106+
TEST_F(MultiCopyTest, OneNodeGroup_SLOW) {
107107
copy(150);
108108
copy(175);
109109
copy(1);
@@ -112,7 +112,7 @@ TEST_F(MultiCopyTest, OneNodeGroup) {
112112
}
113113

114114
// Tests that a second copy that does not modify any existing node groups succeeds
115-
TEST_F(MultiCopyTest, FullFirstNodeGroup) {
115+
TEST_F(MultiCopyTest, FullFirstNodeGroup_SLOW) {
116116
copy(common::StorageConfig::NODE_GROUP_SIZE);
117117
copy(common::StorageConfig::NODE_GROUP_SIZE);
118118
copy(common::StorageConfig::NODE_GROUP_SIZE);
@@ -126,15 +126,15 @@ TEST_F(MultiCopyTest, FullFirstNodeGroup) {
126126
// on how the work is divided between threads. This assumes that two test threads handle half of the
127127
// work each, so that each thread finishes with appendIncompleteNodeGroup and the second one fills
128128
// the shared group.
129-
TEST_F(MultiCopyTest, PartialGroupSecondCopyWrite) {
129+
TEST_F(MultiCopyTest, PartialGroupSecondCopyWrite_SLOW) {
130130
copy(common::StorageConfig::NODE_GROUP_SIZE / 2);
131131
copy(common::StorageConfig::NODE_GROUP_SIZE);
132132
validate();
133133
}
134134

135135
// Tests that a second copy that modifies the existing node group and copies more than one node
136136
// group succeeds
137-
TEST_F(MultiCopyTest, PartialFirstNodeGroup) {
137+
TEST_F(MultiCopyTest, PartialFirstNodeGroup_SLOW) {
138138
copy(common::StorageConfig::NODE_GROUP_SIZE / 2);
139139
copy(common::StorageConfig::NODE_GROUP_SIZE * 2);
140140
copy(common::StorageConfig::NODE_GROUP_SIZE * 2);
@@ -145,14 +145,14 @@ TEST_F(MultiCopyTest, PartialFirstNodeGroup) {
145145
// local node group, so the second one to write that to the shared group
146146
// will need to write twice before it can move its remaining nodes into the shared group
147147
// See https://github.com/kuzudb/kuzu/issues/3714
148-
TEST_F(MultiCopyTest, SharedWriteToExistingNodeGroup) {
148+
TEST_F(MultiCopyTest, SharedWriteToExistingNodeGroup_SLOW) {
149149
copy(common::StorageConfig::NODE_GROUP_SIZE * 0.75);
150150
copy(common::StorageConfig::NODE_GROUP_SIZE * systemConfig->maxNumThreads * 0.75);
151151
validate();
152152
}
153153

154154
// Tests that a second copy that copies a large number of node groups succeeds
155-
TEST_F(MultiCopyTest, MultipleNodeGroups) {
155+
TEST_F(MultiCopyTest, MultipleNodeGroups_SLOW) {
156156
copy(common::StorageConfig::NODE_GROUP_SIZE * 10.1);
157157
copy(common::StorageConfig::NODE_GROUP_SIZE * 20.8);
158158
copy(1);

‎test/storage/node_update_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ TEST_F(NodeUpdateTest, UpdateSameRow) {
2727
ASSERT_EQ(res->getNext()->getValue(0)->val.int64Val, 300);
2828
}
2929

30-
TEST_F(NodeUpdateTest, UpdateSameRowRedundantly) {
30+
TEST_F(NodeUpdateTest, UpdateSameRowRedundantly_SLOW) {
3131
if (inMemMode || systemConfig->checkpointThreshold == 0) {
3232
GTEST_SKIP();
3333
}

‎test/test_files/agg/hash_ldbc.test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
-BUFFER_POOL_SIZE 1073741824
33

44
--
5-
-CASE AggHash
5+
-CASE AggHash_SLOW
66
-LOG TestAggregateListsWithNulls
77
# p.language, p.content and p.imageFile both include nulls
88
-STATEMENT MATCH (p:Post) RETURN [p.language], [p.language, p.content], COUNT(p) as n ORDER BY n DESC LIMIT 5;

‎test/test_files/copy/copy_node_parquet.test‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
--
55

6-
-CASE CopyNodeTest
6+
-CASE CopyNodeTest_SLOW
77

88
-LOG SubsetTest
99
-STATEMENT MATCH (row:tableOfTypes) WHERE row.id >= 20 AND row.id <= 24 RETURN row.*;
@@ -59,7 +59,7 @@
5959
---- error
6060
Binder exception: Copy from Parquet cannot have options other than IGNORE_ERRORS.
6161

62-
-CASE IgnoreErrorsTest
62+
-CASE IgnoreErrorsTest_SLOW
6363
-STATEMENT COPY person FROM "${KUZU_ROOT_DIRECTORY}/dataset/copy-test/node/parquet/invalid_pk_col.parquet" (IGNORE_ERRORS=true);
6464
---- ok
6565
-STATEMENT CALL show_warnings() RETURN message

‎test/test_files/copy/copy_partial_column.test‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
--
77

8-
-CASE RelPartialColumnsTest
8+
-CASE RelPartialColumnsTest_SLOW
99

1010
-STATEMENT CREATE NODE TABLE person (ID INt64, fName StRING, gender INT64, isStudent BoOLEAN, isWorker BOOLEAN,
1111
age INT64, eyeSight DOUBLE, birthdate DATE, registerTime TIMESTAMP,
@@ -88,7 +88,7 @@ Binder exception: Table knows3 does not contain column dummy.
8888
---- 1
8989
21|15
9090

91-
-CASE NodePartialColumnsTest
91+
-CASE NodePartialColumnsTest_SLOW
9292
-LOG AllPartialColumns
9393
-STATEMENT CREATE NODE TABLE tableOfTypes2 (id INT64, int64Column INT64, doubleColumn DOUBLE, booleanColumn BOOLEAN,
9494
dateColumn DATE, timestampColumn TIMESTAMP, stringColumn STRING,

‎test/test_files/dml_rel/create/create_ldbc_sf01.test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
--
66

7-
-CASE CreateLikeComment
7+
-CASE CreateLikeComment_SLOW
88
-STATEMENT MATCH (n:Person), (m:Comment) WHERE n.id=24189255812290 AND m.id=412317157805 CREATE (n)-[:likes_Comment {creationDate: 202311180116}]->(m);
99
---- ok
1010
-STATEMENT MATCH (n:Person)-[r:likes_Comment]->(m:Comment) WHERE n.id=24189255812290 AND m.id=412317157805 RETURN r.creationDate;

‎test/transaction/checkpoint_test.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class FlakyCheckpointerFailsOnCheckpointStorage final : public Checkpointer {
6262
bool checkpointStorage() override { throw RuntimeException("checkpoint failed."); }
6363
};
6464

65-
TEST_F(FlakyCheckpointerTest, RecoverFromCheckpointStorageFailure) {
65+
TEST_F(FlakyCheckpointerTest, RecoverFromCheckpointStorageFailure_SLOW) {
6666
if (inMemMode || systemConfig->checkpointThreshold == 0) {
6767
GTEST_SKIP();
6868
}
@@ -83,7 +83,7 @@ class FlakyCheckpointerFailsOnSerialization final : public Checkpointer {
8383
}
8484
};
8585

86-
TEST_F(FlakyCheckpointerTest, RecoverFromCheckpointSerializeFailure) {
86+
TEST_F(FlakyCheckpointerTest, RecoverFromCheckpointSerializeFailure_SLOW) {
8787
if (inMemMode || systemConfig->checkpointThreshold == 0) {
8888
GTEST_SKIP();
8989
}
@@ -104,7 +104,7 @@ class FlakyCheckpointerFailsOnWritingHeader final : public Checkpointer {
104104
}
105105
};
106106

107-
TEST_F(FlakyCheckpointerTest, RecoverFromCheckpointWriteHeaderFailure) {
107+
TEST_F(FlakyCheckpointerTest, RecoverFromCheckpointWriteHeaderFailure_SLOW) {
108108
if (inMemMode || systemConfig->checkpointThreshold == 0) {
109109
GTEST_SKIP();
110110
}
@@ -126,7 +126,7 @@ class FlakyCheckpointerFailsOnFlushingShadow final : public Checkpointer {
126126
}
127127
};
128128

129-
TEST_F(FlakyCheckpointerTest, RecoverFromCheckpointFlushingShadowFailure) {
129+
TEST_F(FlakyCheckpointerTest, RecoverFromCheckpointFlushingShadowFailure_SLOW) {
130130
if (inMemMode || systemConfig->checkpointThreshold == 0) {
131131
GTEST_SKIP();
132132
}
@@ -152,7 +152,7 @@ class FlakyCheckpointerFailsOnLoggingCheckpoint final : public Checkpointer {
152152
}
153153
};
154154

155-
TEST_F(FlakyCheckpointerTest, RecoverFromCheckpointLoggingCheckpointFailure) {
155+
TEST_F(FlakyCheckpointerTest, RecoverFromCheckpointLoggingCheckpointFailure_SLOW) {
156156
if (inMemMode || systemConfig->checkpointThreshold == 0) {
157157
GTEST_SKIP();
158158
}
@@ -185,7 +185,7 @@ class FlakyCheckpointerFailsOnApplyingShadow final : public Checkpointer {
185185
}
186186
};
187187

188-
TEST_F(FlakyCheckpointerTest, RecoverFromCheckpointApplyingShadowFailure) {
188+
TEST_F(FlakyCheckpointerTest, RecoverFromCheckpointApplyingShadowFailure_SLOW) {
189189
if (inMemMode || systemConfig->checkpointThreshold == 0) {
190190
GTEST_SKIP();
191191
}
@@ -219,7 +219,7 @@ class FlakyCheckpointerFailsOnClearingFiles final : public Checkpointer {
219219
}
220220
};
221221

222-
TEST_F(FlakyCheckpointerTest, RecoverFromCheckpointClearingFilesFailure) {
222+
TEST_F(FlakyCheckpointerTest, RecoverFromCheckpointClearingFilesFailure_SLOW) {
223223
if (inMemMode || systemConfig->checkpointThreshold == 0) {
224224
GTEST_SKIP();
225225
}
@@ -232,7 +232,7 @@ TEST_F(FlakyCheckpointerTest, RecoverFromCheckpointClearingFilesFailure) {
232232

233233
// Simulates a situation where a database attempts to replay a shadow file from an older database
234234
// with the same path
235-
TEST_F(FlakyCheckpointerTest, ShadowFileDatabaseIDMismatchExistingDB) {
235+
TEST_F(FlakyCheckpointerTest, ShadowFileDatabaseIDMismatchExistingDB_SLOW) {
236236
if (inMemMode || systemConfig->checkpointThreshold == 0) {
237237
GTEST_SKIP();
238238
}
@@ -270,7 +270,7 @@ TEST_F(FlakyCheckpointerTest, ShadowFileDatabaseIDMismatchExistingDB) {
270270
EXPECT_THROW(createDBAndConn(), RuntimeException);
271271
}
272272

273-
TEST_F(FlakyCheckpointerTest, ShadowFileDatabaseIDMismatchNewDB) {
273+
TEST_F(FlakyCheckpointerTest, ShadowFileDatabaseIDMismatchNewDB_SLOW) {
274274
if (inMemMode || systemConfig->checkpointThreshold == 0) {
275275
GTEST_SKIP();
276276
}
@@ -286,7 +286,7 @@ TEST_F(FlakyCheckpointerTest, ShadowFileDatabaseIDMismatchNewDB) {
286286
EXPECT_THROW(createDBAndConn(), RuntimeException);
287287
}
288288

289-
TEST_F(FlakyCheckpointerTest, ShadowFileDatabaseIDMismatchCorruptedDB) {
289+
TEST_F(FlakyCheckpointerTest, ShadowFileDatabaseIDMismatchCorruptedDB_SLOW) {
290290
if (inMemMode || systemConfig->checkpointThreshold == 0) {
291291
GTEST_SKIP();
292292
}

‎test/transaction/transaction_test.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ static void insertNodes(uint64_t startID, uint64_t num, kuzu::main::Database& da
144144
}
145145
}
146146

147-
TEST_F(EmptyDBTransactionTest, ConcurrentNodeInsertions) {
147+
TEST_F(EmptyDBTransactionTest, ConcurrentNodeInsertions_SLOW) {
148148
if (systemConfig->checkpointThreshold == 0) {
149149
GTEST_SKIP();
150150
}
@@ -188,7 +188,7 @@ static void insertNodesWithMixedTypes(uint64_t startID, uint64_t num,
188188
}
189189
}
190190

191-
TEST_F(EmptyDBTransactionTest, ConcurrentNodeInsertionsMixedTypes) {
191+
TEST_F(EmptyDBTransactionTest, ConcurrentNodeInsertionsMixedTypes_SLOW) {
192192
if (systemConfig->checkpointThreshold == 0) {
193193
GTEST_SKIP();
194194
}
@@ -234,7 +234,7 @@ static void insertRelationships(uint64_t startID, uint64_t num, kuzu::main::Data
234234
}
235235
}
236236

237-
TEST_F(EmptyDBTransactionTest, ConcurrentRelationshipInsertions) {
237+
TEST_F(EmptyDBTransactionTest, ConcurrentRelationshipInsertions_SLOW) {
238238
if (systemConfig->checkpointThreshold == 0) {
239239
GTEST_SKIP();
240240
}
@@ -294,7 +294,7 @@ static void insertComplexRelationships(uint64_t startID, uint64_t num,
294294
}
295295
}
296296

297-
TEST_F(EmptyDBTransactionTest, ConcurrentComplexRelationshipInsertions) {
297+
TEST_F(EmptyDBTransactionTest, ConcurrentComplexRelationshipInsertions_SLOW) {
298298
if (systemConfig->checkpointThreshold == 0) {
299299
GTEST_SKIP();
300300
}
@@ -354,7 +354,7 @@ static void updateNodes(uint64_t startID, uint64_t num, kuzu::main::Database& da
354354
}
355355
}
356356

357-
TEST_F(EmptyDBTransactionTest, ConcurrentNodeUpdates) {
357+
TEST_F(EmptyDBTransactionTest, ConcurrentNodeUpdates_SLOW) {
358358
if (systemConfig->checkpointThreshold == 0) {
359359
GTEST_SKIP();
360360
}
@@ -412,7 +412,7 @@ static void updateMixedTypeNodes(uint64_t startID, uint64_t num, kuzu::main::Dat
412412
}
413413
}
414414

415-
TEST_F(EmptyDBTransactionTest, ConcurrentMixedTypeUpdates) {
415+
TEST_F(EmptyDBTransactionTest, ConcurrentMixedTypeUpdates_SLOW) {
416416
if (systemConfig->checkpointThreshold == 0) {
417417
GTEST_SKIP();
418418
}
@@ -489,7 +489,7 @@ static void updateRelationships(uint64_t startID, uint64_t num, kuzu::main::Data
489489
}
490490
}
491491

492-
TEST_F(EmptyDBTransactionTest, ConcurrentRelationshipUpdates) {
492+
TEST_F(EmptyDBTransactionTest, ConcurrentRelationshipUpdates_SLOW) {
493493
if (systemConfig->checkpointThreshold == 0) {
494494
GTEST_SKIP();
495495
}
@@ -564,7 +564,7 @@ static void updateNodesWithMixedTransactions(uint64_t startID, uint64_t num, boo
564564
}
565565
}
566566

567-
TEST_F(EmptyDBTransactionTest, ConcurrentNodeUpdatesWithMixedTransactions) {
567+
TEST_F(EmptyDBTransactionTest, ConcurrentNodeUpdatesWithMixedTransactions_SLOW) {
568568
if (systemConfig->checkpointThreshold == 0) {
569569
GTEST_SKIP();
570570
}
@@ -636,7 +636,7 @@ static void updateRelationshipsWithMixedTransactions(uint64_t startID, uint64_t
636636
}
637637
}
638638

639-
TEST_F(EmptyDBTransactionTest, ConcurrentRelationshipUpdatesWithMixedTransactions) {
639+
TEST_F(EmptyDBTransactionTest, ConcurrentRelationshipUpdatesWithMixedTransactions_SLOW) {
640640
if (systemConfig->checkpointThreshold == 0) {
641641
GTEST_SKIP();
642642
}

0 commit comments

Comments
 (0)