Skip to content

Commit 8ed70fc

Browse files
author
Feng Zhu
committed
add assert to db Put in db_stress test
Summary: 1. assert db->Put to be true in db_stress 2. begin column family with name "1". Test Plan: 1. ./db_stress Reviewers: ljin, yhchiang, dhruba, sdong, igor Reviewed By: sdong, igor Subscribers: leveldb Differential Revision: https://reviews.facebook.net/D22659
1 parent 7f19bb9 commit 8ed70fc

File tree

1 file changed

+24
-6
lines changed

1 file changed

+24
-6
lines changed

tools/db_stress.cc

+24-6
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ int main() {
3131
#include <sys/types.h>
3232
#include <stdio.h>
3333
#include <stdlib.h>
34+
#include <exception>
3435
#include <gflags/gflags.h>
3536
#include "db/db_impl.h"
3637
#include "db/version_set.h"
@@ -759,7 +760,7 @@ class StressTest {
759760
? NewBloomFilterPolicy(FLAGS_bloom_bits)
760761
: nullptr),
761762
db_(nullptr),
762-
new_column_family_name_(0),
763+
new_column_family_name_(1),
763764
num_times_reopened_(0) {
764765
if (FLAGS_destroy_db_initially) {
765766
std::vector<std::string> files;
@@ -1217,12 +1218,20 @@ class StressTest {
12171218
Status s __attribute__((unused));
12181219
s = db_->DropColumnFamily(column_families_[cf]);
12191220
delete column_families_[cf];
1220-
assert(s.ok());
1221+
if (!s.ok()) {
1222+
fprintf(stderr, "dropping column family error: %s\n",
1223+
s.ToString().c_str());
1224+
std::terminate();
1225+
}
12211226
s = db_->CreateColumnFamily(ColumnFamilyOptions(options_), new_name,
12221227
&column_families_[cf]);
12231228
column_family_names_[cf] = new_name;
12241229
thread->shared->ClearColumnFamily(cf);
1225-
assert(s.ok());
1230+
if (!s.ok()) {
1231+
fprintf(stderr, "creating column family error: %s\n",
1232+
s.ToString().c_str());
1233+
std::terminate();
1234+
}
12261235
thread->shared->UnlockColumnFamily(cf);
12271236
}
12281237
}
@@ -1297,10 +1306,15 @@ class StressTest {
12971306
}
12981307
}
12991308
thread->shared->Put(rand_column_family, rand_key, value_base);
1309+
Status s;
13001310
if (FLAGS_use_merge) {
1301-
db_->Merge(write_opts, column_family, key, v);
1311+
s = db_->Merge(write_opts, column_family, key, v);
13021312
} else {
1303-
db_->Put(write_opts, column_family, key, v);
1313+
s = db_->Put(write_opts, column_family, key, v);
1314+
}
1315+
if (!s.ok()) {
1316+
fprintf(stderr, "put or merge error: %s\n", s.ToString().c_str());
1317+
std::terminate();
13041318
}
13051319
thread->stats.AddBytesForWrites(1, sz);
13061320
} else {
@@ -1311,8 +1325,12 @@ class StressTest {
13111325
// OPERATION delete
13121326
if (!FLAGS_test_batches_snapshots) {
13131327
thread->shared->Delete(rand_column_family, rand_key);
1314-
db_->Delete(write_opts, column_family, key);
1328+
Status s = db_->Delete(write_opts, column_family, key);
13151329
thread->stats.AddDeletes(1);
1330+
if (!s.ok()) {
1331+
fprintf(stderr, "delete error: %s\n", s.ToString().c_str());
1332+
std::terminate();
1333+
}
13161334
} else {
13171335
MultiDelete(thread, write_opts, column_family, key);
13181336
}

0 commit comments

Comments
 (0)