소스 검색

查出了性能测试destroy错误的问题

pull/2/head
augurier 8 달 전
부모
커밋
b3de788556
3개의 변경된 파일7개의 추가작업 그리고 7개의 파일을 삭제
  1. +2
    -3
      benchmarks/db_bench_FieldDB.cc
  2. +2
    -2
      benchmarks/db_bench_testDB.cc
  3. +3
    -2
      testdb/testdb.cc

+ 2
- 3
benchmarks/db_bench_FieldDB.cc 파일 보기

@ -547,7 +547,7 @@ class Benchmark {
} }
} }
if (!FLAGS_use_existing_db) { if (!FLAGS_use_existing_db) {
DestroyDB(FLAGS_db, Options());
fielddb::DestroyDB(FLAGS_db, Options());
} }
} }
@ -676,7 +676,7 @@ class Benchmark {
} else { } else {
delete db_; delete db_;
db_ = nullptr; db_ = nullptr;
DestroyDB(FLAGS_db, Options());
fielddb::DestroyDB(FLAGS_db, Options());
Open(); Open();
} }
} }
@ -833,7 +833,6 @@ class Benchmark {
options.compression = options.compression =
FLAGS_compression ? kSnappyCompression : kNoCompression; FLAGS_compression ? kSnappyCompression : kNoCompression;
// Status s = DB::Open(options, FLAGS_db, &db_); // Status s = DB::Open(options, FLAGS_db, &db_);
//fielddb::DestroyDB(FLAGS_db, options);
db_ = new FieldDB(); db_ = new FieldDB();
Status s = FieldDB::OpenFieldDB(options, FLAGS_db, &db_); Status s = FieldDB::OpenFieldDB(options, FLAGS_db, &db_);
if (!s.ok()) { if (!s.ok()) {

+ 2
- 2
benchmarks/db_bench_testDB.cc 파일 보기

@ -544,7 +544,7 @@ class Benchmark {
} }
} }
if (!FLAGS_use_existing_db) { if (!FLAGS_use_existing_db) {
DestroyDB(FLAGS_db, Options());
testdb::DestroyDB(FLAGS_db, Options());
} }
} }
@ -665,7 +665,7 @@ class Benchmark {
} else { } else {
delete db_; delete db_;
db_ = nullptr; db_ = nullptr;
DestroyDB(FLAGS_db, Options());
testdb::DestroyDB(FLAGS_db, Options());
Open(); Open();
} }
} }

+ 3
- 2
testdb/testdb.cc 파일 보기

@ -2,6 +2,7 @@
#include "db/db_impl.h" #include "db/db_impl.h"
#include <memory> #include <memory>
#include "leveldb/status.h" #include "leveldb/status.h"
#include "testdb.h"
using namespace testdb; using namespace testdb;
Status testDB::OpentestDB(Options& options, Status testDB::OpentestDB(Options& options,
@ -93,7 +94,7 @@ void testDB::CompactRange(const Slice *begin, const Slice *end) {
kvDB_->CompactRange(begin, end); kvDB_->CompactRange(begin, end);
} }
Status DestroyDB(const std::string& name, const Options& options) {
Status testdb::DestroyDB(const std::string& name, const Options& options) {
Status s; Status s;
s = leveldb::DestroyDB(name+"_kvDB", options); s = leveldb::DestroyDB(name+"_kvDB", options);
assert(s.ok()); assert(s.ok());
@ -108,4 +109,4 @@ testDB::~testDB() {
delete kvDB_; delete kvDB_;
// delete indexDB_; // delete indexDB_;
// delete metaDB_; // delete metaDB_;
}
}

불러오는 중...
취소
저장