Skip to content

Commit 132567c

Browse files
zhanglei1949zhanglei1949
committed
fix test
1 parent 1ddbf41 commit 132567c

4 files changed

Lines changed: 58 additions & 13 deletions

File tree

‎tests/transaction/test_acid.cc‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ void neug_append_string_to_field(StorageTPUpdateInterface& gui, label_t label,
197197
std::shared_ptr<neug::NeugDBService> neug_AtomicityInit(
198198
NeugDB& db, const std::string& work_dir, int thread_num) {
199199
db.Open(work_dir, thread_num);
200-
auto service = std::make_shared<neug::NeugDBService>(db);
201200
{
202201
auto conn = db.Connect();
203202
EXPECT_TRUE(conn->Query(
@@ -206,6 +205,7 @@ std::shared_ptr<neug::NeugDBService> neug_AtomicityInit(
206205
EXPECT_TRUE(conn->Query(
207206
"CREATE REL TABLE KNOWS(FROM PERSON TO PERSON, since INT64);"));
208207
}
208+
auto service = std::make_shared<neug::NeugDBService>(db);
209209

210210
auto sess = service->AcquireSession();
211211
auto txn = sess->GetInsertTransaction();
@@ -323,7 +323,6 @@ std::shared_ptr<neug::NeugDBService> G0Init(NeugDB& db,
323323
const std::string& work_dir,
324324
int thread_num) {
325325
db.Open(work_dir, thread_num);
326-
auto svc = std::make_shared<neug::NeugDBService>(db);
327326
{
328327
auto conn = db.Connect();
329328
EXPECT_TRUE(
@@ -334,6 +333,7 @@ std::shared_ptr<neug::NeugDBService> G0Init(NeugDB& db,
334333
"CREATE REL TABLE KNOWS(FROM PERSON TO PERSON, versionHistory "
335334
"STRING);"));
336335
}
336+
auto svc = std::make_shared<neug::NeugDBService>(db);
337337

338338
auto sess = svc->AcquireSession();
339339
auto txn = sess->GetInsertTransaction();
@@ -512,13 +512,13 @@ std::shared_ptr<neug::NeugDBService> InitPersonWithVersion(
512512
NeugDB& db, const std::string& work_dir, int thread_num,
513513
int64_t initial_version) {
514514
db.Open(work_dir, thread_num);
515-
auto svc = std::make_shared<neug::NeugDBService>(db);
516515
{
517516
auto conn = db.Connect();
518517
EXPECT_TRUE(conn->Query(
519518
"CREATE NODE TABLE PERSON (id INT64, id_prop INT64, version INT64, "
520519
"PRIMARY KEY(id));"));
521520
}
521+
auto svc = std::make_shared<neug::NeugDBService>(db);
522522

523523
auto sess = svc->AcquireSession();
524524
auto txn = sess->GetInsertTransaction();
@@ -694,7 +694,6 @@ std::shared_ptr<neug::NeugDBService> PMPInit(NeugDB& db,
694694
const std::string& work_dir,
695695
int thread_num) {
696696
db.Open(work_dir, thread_num);
697-
auto svc = std::make_shared<neug::NeugDBService>(db);
698697
{
699698
auto conn = db.Connect();
700699
EXPECT_TRUE(
@@ -704,6 +703,7 @@ std::shared_ptr<neug::NeugDBService> PMPInit(NeugDB& db,
704703
"CREATE NODE TABLE POST (id INT64, id_prop INT64, PRIMARY KEY(id));"));
705704
EXPECT_TRUE(conn->Query("CREATE REL TABLE LIKES(FROM PERSON TO POST);"));
706705
}
706+
auto svc = std::make_shared<neug::NeugDBService>(db);
707707

708708
auto sess = svc->AcquireSession();
709709
auto txn = sess->GetInsertTransaction();
@@ -821,14 +821,14 @@ std::shared_ptr<neug::NeugDBService> OTVInit(NeugDB& db,
821821
const std::string& work_dir,
822822
int thread_num) {
823823
db.Open(work_dir, thread_num);
824-
auto svc = std::make_shared<neug::NeugDBService>(db);
825824
{
826825
auto conn = db.Connect();
827826
EXPECT_TRUE(conn->Query(
828827
"CREATE NODE TABLE PERSON (id INT64, id_prop INT64, name STRING, "
829828
"version INT64, PRIMARY KEY(id));"));
830829
EXPECT_TRUE(conn->Query("CREATE REL TABLE KNOWS(FROM PERSON TO PERSON);"));
831830
}
831+
auto svc = std::make_shared<neug::NeugDBService>(db);
832832
const auto& schema = db.schema();
833833

834834
auto person_label_id = schema.get_vertex_label_id("PERSON");
@@ -1024,14 +1024,14 @@ std::shared_ptr<neug::NeugDBService> LUInit(NeugDB& db,
10241024
const std::string& work_dir,
10251025
int thread_num) {
10261026
db.Open(work_dir, thread_num);
1027-
auto svc = std::make_shared<neug::NeugDBService>(db);
10281027
{
10291028
auto conn = db.Connect();
10301029
EXPECT_TRUE(
10311030
conn->Query("CREATE NODE TABLE PERSON (id INT64, id_prop INT64, "
10321031
"num_friends INT64, "
10331032
"PRIMARY KEY(id));"));
10341033
}
1034+
auto svc = std::make_shared<neug::NeugDBService>(db);
10351035

10361036
auto sess = svc->AcquireSession();
10371037
auto txn = sess->GetInsertTransaction();
@@ -1107,13 +1107,13 @@ std::shared_ptr<neug::NeugDBService> WSInit(NeugDB& db,
11071107
const std::string& work_dir,
11081108
int thread_num) {
11091109
db.Open(work_dir, thread_num);
1110-
auto svc = std::make_shared<neug::NeugDBService>(db);
11111110
{
11121111
auto conn = db.Connect();
11131112
EXPECT_TRUE(conn->Query(
11141113
"CREATE NODE TABLE PERSON (id INT64, id_prop INT64, version INT64, "
11151114
"PRIMARY KEY(id));"));
11161115
}
1116+
auto svc = std::make_shared<neug::NeugDBService>(db);
11171117

11181118
auto sess = svc->AcquireSession();
11191119
auto txn = sess->GetInsertTransaction();
@@ -1557,7 +1557,6 @@ constexpr int kSeedEdges = 500;
15571557
std::shared_ptr<NeugDBService> cc_init(NeugDB& db, const std::string& work_dir,
15581558
int thread_num) {
15591559
db.Open(work_dir, thread_num);
1560-
auto svc = std::make_shared<NeugDBService>(db);
15611560
{
15621561
auto conn = db.Connect();
15631562
EXPECT_TRUE(conn->Query(
@@ -1566,6 +1565,7 @@ std::shared_ptr<NeugDBService> cc_init(NeugDB& db, const std::string& work_dir,
15661565
EXPECT_TRUE(conn->Query(
15671566
"CREATE REL TABLE knows(FROM person TO person, weight DOUBLE);"));
15681567
}
1568+
auto svc = std::make_shared<NeugDBService>(db);
15691569
auto person_label = db.schema().get_vertex_label_id("person");
15701570
auto knows_label = db.schema().get_edge_label_id("knows");
15711571

‎tests/transaction/test_compact_transaction.cc‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ TEST_F(CompactTransactionTest, CommitAbortAndDestructorPreserveData) {
152152
1);
153153
EXPECT_TRUE(txn.Commit());
154154
}
155+
svc.reset();
155156
db.Close();
156157
}
157158

@@ -161,14 +162,14 @@ TEST_F(CompactTransactionTest, DeleteThenCompactPurgesData) {
161162
neug::NeugDBConfig config(db_dir);
162163
config.memory_level = neug::MemoryLevel::kInMemory;
163164
db.Open(config);
164-
auto svc = std::make_shared<neug::NeugDBService>(db);
165165

166166
// Delete person id=2 via Cypher
167167
{
168168
auto conn = db.Connect();
169169
EXPECT_TRUE(conn->Query("MATCH (v:person) WHERE v.id = 2 DELETE v;"));
170170
conn->Close();
171171
}
172+
auto svc = std::make_shared<neug::NeugDBService>(db);
172173

173174
// Verify deletion visible before compact
174175
{
@@ -207,6 +208,7 @@ TEST_F(CompactTransactionTest, DeleteThenCompactPurgesData) {
207208
0);
208209
EXPECT_TRUE(txn.Commit());
209210
}
211+
svc.reset();
210212
db.Close();
211213
}
212214

@@ -218,14 +220,14 @@ TEST_F(CompactTransactionTest, CompactAndReopenPersistsData) {
218220
config.memory_level = neug::MemoryLevel::kInMemory;
219221
config.checkpoint_on_close = true;
220222
db.Open(config);
221-
auto svc = std::make_shared<neug::NeugDBService>(db);
222223

223224
// Delete person id=1 via Cypher
224225
{
225226
auto conn = db.Connect();
226227
EXPECT_TRUE(conn->Query("MATCH (v:person) WHERE v.id = 1 DELETE v;"));
227228
conn->Close();
228229
}
230+
auto svc = std::make_shared<neug::NeugDBService>(db);
229231

230232
// Compact explicitly before close
231233
{
@@ -234,6 +236,7 @@ TEST_F(CompactTransactionTest, CompactAndReopenPersistsData) {
234236
EXPECT_TRUE(compact_txn.Commit());
235237
}
236238

239+
svc.reset();
237240
db.Close();
238241
}
239242

@@ -258,7 +261,6 @@ TEST_F(CompactTransactionTest, CompactAndReopenPersistsData) {
258261
EXPECT_EQ(
259262
count_edges(gi, person_label, software_label, created_label, true), 1);
260263
EXPECT_TRUE(txn.Commit());
261-
db2.Close();
262264
}
263265
}
264266

@@ -287,6 +289,7 @@ TEST_F(CompactTransactionTest, IdempotentCommitAndAbort) {
287289
EXPECT_EQ(count_vertices(gi, person_label), 2);
288290
EXPECT_TRUE(txn.Commit());
289291
}
292+
svc.reset();
290293
db.Close();
291294
}
292295

‎tests/transaction/test_insert_transaction.cc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ TEST_F(InsertTransactionTest, AddVertex) {
140140
auto person_label = gi.schema().get_vertex_label_id("person");
141141
EXPECT_EQ(count_vertices(gi, person_label), 3);
142142
}
143+
svc.reset();
143144
db.Close();
144145
}
145146

@@ -190,6 +191,7 @@ TEST_F(InsertTransactionTest, AddEdge) {
190191
}
191192
EXPECT_EQ(edge_count, 2);
192193
}
194+
svc.reset();
193195
db.Close();
194196
}
195197

0 commit comments

Comments
 (0)