From 13f0034412cffe4f567e49e87bc97c8732dd305d Mon Sep 17 00:00:00 2001 From: PRANAV SHENOY Date: Sat, 13 Jan 2024 12:26:27 -0500 Subject: [PATCH 1/2] =?UTF-8?q?IsEmpty()=20checks=20were=20missing=20befor?= =?UTF-8?q?e=20some=20SwitchMemtable()=20invocation=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/db_impl/db_impl_write.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/db/db_impl/db_impl_write.cc b/db/db_impl/db_impl_write.cc index f6090e341f..e38ebfee7c 100644 --- a/db/db_impl/db_impl_write.cc +++ b/db/db_impl/db_impl_write.cc @@ -2140,7 +2140,10 @@ Status DBImpl::SwitchMemtable(ColumnFamilyData* cfd, WriteContext* context) { log::Writer* new_log = nullptr; MemTable* new_mem = nullptr; IOStatus io_s; - + + if(cfd->mem()->IsEmpty()) { + return Status::OK(); + } // Recoverable state is persisted in WAL. After memtable switch, WAL might // be deleted, so we write the state to memtable to be persisted as well. Status s = WriteRecoverableState(); From 002c48c8931bf10144cb9dd47327ccc884d8c188 Mon Sep 17 00:00:00 2001 From: PRANAV SHENOY Date: Sat, 2 Mar 2024 18:17:22 -0500 Subject: [PATCH 2/2] test --- examples/simple_example.cc | 188 +++++++++++++++++++++++++------------ 1 file changed, 128 insertions(+), 60 deletions(-) diff --git a/examples/simple_example.cc b/examples/simple_example.cc index 2d49c4d14d..cf844c0c2e 100644 --- a/examples/simple_example.cc +++ b/examples/simple_example.cc @@ -5,89 +5,157 @@ #include #include +#include #include "rocksdb/db.h" #include "rocksdb/options.h" #include "rocksdb/slice.h" +#include "rocksdb/iterator.h" +namespace fs = std::filesystem; -using ROCKSDB_NAMESPACE::DB; -using ROCKSDB_NAMESPACE::Options; -using ROCKSDB_NAMESPACE::PinnableSlice; -using ROCKSDB_NAMESPACE::ReadOptions; -using ROCKSDB_NAMESPACE::Status; -using ROCKSDB_NAMESPACE::WriteBatch; -using ROCKSDB_NAMESPACE::WriteOptions; - +using namespace ROCKSDB_NAMESPACE; +using namespace std; #if defined(OS_WIN) std::string kDBPath = "C:\\Windows\\TEMP\\rocksdb_simple_example"; #else std::string kDBPath = "/tmp/rocksdb_simple_example"; #endif -int main() { - DB* db; +DB* db; +std::string sst_root_dir = "/tmp/test/"; +vector paths; +// #define MAX_KEYS 100000 + +int max_keys = 0, per_iter_keys = 0, conc_writes = 0; + +int create_sst_file(int start, int end); +void ingest_file(); + +bool create_sst_files() { + for(int i=1;i get_all_files(string dir_path) { + return paths; +} + +int create_sst_file(int start, int end) { Options options; - // Optimize RocksDB. This is the easiest way to get RocksDB to perform well - options.IncreaseParallelism(); - options.OptimizeLevelStyleCompaction(); - // create the DB if it's not already present - options.create_if_missing = true; - // open DB - Status s = DB::Open(options, kDBPath, &db); - assert(s.ok()); + SstFileWriter sst_file_writer(EnvOptions(), options); + string file_path = sst_root_dir + std::to_string(start); + paths.push_back(file_path); + Status s = sst_file_writer.Open(file_path); + if (!s.ok()) { + printf("Error while opening file %s, Error: %s\n", file_path.c_str(), + s.ToString().c_str()); + return false; + } - // Put key-value - s = db->Put(WriteOptions(), "key1", "value"); - assert(s.ok()); - std::string value; - // get value - s = db->Get(ReadOptions(), "key1", &value); - assert(s.ok()); - assert(value == "value"); - - // atomically apply a set of updates - { - WriteBatch batch; - batch.Delete("key1"); - batch.Put("key2", value); - s = db->Write(WriteOptions(), &batch); + // Insert rows into the SST file, note that inserted keys must be + // strictly increasing (based on options.comparator) + std::vector nums; + for(int i=start;i<=end;i++) { + if(i%10 == 0) continue; + nums.push_back(std::to_string(i)); + } + std::sort(nums.begin(), nums.end()); + for(auto num : nums) { + s = sst_file_writer.Put(num, num); + if (!s.ok()) { + printf("Error while adding Key: %s, Error: %s\n", num.c_str(), + s.ToString().c_str()); + return false; + } } - s = db->Get(ReadOptions(), "key1", &value); - assert(s.IsNotFound()); + // Close the file + s = sst_file_writer.Finish(); + if (!s.ok()) { + printf("Error while finishing file %s, Error: %s\n", file_path.c_str(), + s.ToString().c_str()); + return false; + } + return true; +} - db->Get(ReadOptions(), "key2", &value); - assert(value == "value"); +void ingest_file() { + cout<<"executing ingest_file\n"; + IngestExternalFileOptions ifo; + vector ssts_files = get_all_files(sst_root_dir); + Status s = db->IngestExternalFile(ssts_files, ifo); + if (!s.ok()) { + printf("Error while ingesting files. Error %s\n", s.ToString().c_str()); + return; + } + return; +} - { - PinnableSlice pinnable_val; - db->Get(ReadOptions(), db->DefaultColumnFamily(), "key2", &pinnable_val); - assert(pinnable_val == "value"); +void read_kvs() { + auto it = db->NewIterator(ReadOptions()); + cout<<"Executing read_kvs\n"; + int iter = 100; + while(iter>0) { + + + it->SeekToFirst(); + while(it->Valid()) { + string key = it->key().ToString(); + string val = it->value().ToString(); + cout<<"Key: "<Next(); + } + iter--; } +} - { - std::string string_val; - // If it cannot pin the value, it copies the value to its internal buffer. - // The intenral buffer could be set during construction. - PinnableSlice pinnable_val(&string_val); - db->Get(ReadOptions(), db->DefaultColumnFamily(), "key2", &pinnable_val); - assert(pinnable_val == "value"); - // If the value is not pinned, the internal buffer must have the value. - assert(pinnable_val.IsPinned() || string_val == "value"); +void write_kvs() { + cout<<"Executing write_kvs\n"; + // Put key-value + for(int i=1; iPut(WriteOptions(), kv, kv); } +} - PinnableSlice pinnable_val; - s = db->Get(ReadOptions(), db->DefaultColumnFamily(), "key1", &pinnable_val); - assert(s.IsNotFound()); - // Reset PinnableSlice after each use and before each reuse - pinnable_val.Reset(); - db->Get(ReadOptions(), db->DefaultColumnFamily(), "key2", &pinnable_val); - assert(pinnable_val == "value"); - pinnable_val.Reset(); - // The Slice pointed by pinnable_val is not valid after this point - delete db; +int main(int argc, char *argv[]) { + + //create one instance of db for both ingesting and directly writing new keys to the db. db is global variable + Options options; + conc_writes = (int) std::stoi(argv[1]); + max_keys = (int) std::stoi(argv[2]); + per_iter_keys = (int) std::stoi(argv[3]); + options.IncreaseParallelism(); + // options.OptimizeLevelStyleCompaction(); + options.create_if_missing = true; + cout<<"Default Memtable size: "<