@@ -31,6 +31,7 @@ int main() {
31
31
#include < sys/types.h>
32
32
#include < stdio.h>
33
33
#include < stdlib.h>
34
+ #include < exception>
34
35
#include < gflags/gflags.h>
35
36
#include " db/db_impl.h"
36
37
#include " db/version_set.h"
@@ -759,7 +760,7 @@ class StressTest {
759
760
? NewBloomFilterPolicy(FLAGS_bloom_bits)
760
761
: nullptr),
761
762
db_(nullptr ),
762
- new_column_family_name_(0 ),
763
+ new_column_family_name_(1 ),
763
764
num_times_reopened_(0 ) {
764
765
if (FLAGS_destroy_db_initially) {
765
766
std::vector<std::string> files;
@@ -1217,12 +1218,20 @@ class StressTest {
1217
1218
Status s __attribute__ ((unused));
1218
1219
s = db_->DropColumnFamily (column_families_[cf]);
1219
1220
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
+ }
1221
1226
s = db_->CreateColumnFamily (ColumnFamilyOptions (options_), new_name,
1222
1227
&column_families_[cf]);
1223
1228
column_family_names_[cf] = new_name;
1224
1229
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
+ }
1226
1235
thread->shared ->UnlockColumnFamily (cf);
1227
1236
}
1228
1237
}
@@ -1297,10 +1306,15 @@ class StressTest {
1297
1306
}
1298
1307
}
1299
1308
thread->shared ->Put (rand_column_family, rand_key, value_base);
1309
+ Status s;
1300
1310
if (FLAGS_use_merge) {
1301
- db_->Merge (write_opts, column_family, key, v);
1311
+ s = db_->Merge (write_opts, column_family, key, v);
1302
1312
} 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 ();
1304
1318
}
1305
1319
thread->stats .AddBytesForWrites (1 , sz);
1306
1320
} else {
@@ -1311,8 +1325,12 @@ class StressTest {
1311
1325
// OPERATION delete
1312
1326
if (!FLAGS_test_batches_snapshots) {
1313
1327
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);
1315
1329
thread->stats .AddDeletes (1 );
1330
+ if (!s.ok ()) {
1331
+ fprintf (stderr, " delete error: %s\n " , s.ToString ().c_str ());
1332
+ std::terminate ();
1333
+ }
1316
1334
} else {
1317
1335
MultiDelete (thread, write_opts, column_family, key);
1318
1336
}
0 commit comments