From 9b8a2b52d451dd1a162ef34c59df907f4b476b59 Mon Sep 17 00:00:00 2001 From: Igor Canadi Date: Mon, 17 Mar 2014 10:02:46 -0700 Subject: [PATCH] No prefix iterator in db_stress Summary: We're trying to deprecate prefix iterators, so no need to test them in db_stress Test Plan: ran it Reviewers: ljin Reviewed By: ljin CC: leveldb Differential Revision: https://reviews.facebook.net/D16917 --- tools/db_stress.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/db_stress.cc b/tools/db_stress.cc index b7b8e91ea0..a47a03933b 100644 --- a/tools/db_stress.cc +++ b/tools/db_stress.cc @@ -952,10 +952,10 @@ class StressTest { prefixes[i].resize(FLAGS_prefix_size); prefix_slices[i] = Slice(prefixes[i]); readoptionscopy[i] = readoptions; - readoptionscopy[i].prefix = &prefix_slices[i]; + readoptionscopy[i].prefix_seek = true; readoptionscopy[i].snapshot = snapshot; iters[i] = db_->NewIterator(readoptionscopy[i]); - iters[i]->SeekToFirst(); + iters[i]->Seek(prefix_slices[i]); } int count = 0; @@ -1103,11 +1103,11 @@ class StressTest { // prefix if (!FLAGS_test_batches_snapshots) { Slice prefix = Slice(key.data(), FLAGS_prefix_size); - read_opts.prefix = &prefix; + read_opts.prefix_seek = true; Iterator* iter = db_->NewIterator(read_opts); int64_t count = 0; - for (iter->SeekToFirst(); iter->Valid(); iter->Next()) { - assert(iter->key().starts_with(prefix)); + for (iter->Seek(prefix); + iter->Valid() && iter->key().starts_with(prefix); iter->Next()) { ++count; } assert(count <= @@ -1121,7 +1121,6 @@ class StressTest { } else { MultiPrefixScan(thread, read_opts, key); } - read_opts.prefix = nullptr; } else if (prefixBound <= prob_op && prob_op < writeBound) { // OPERATION write uint32_t value_base = thread->rand.Next();