Add API for writing wide-column entities (#10242)
Summary: The patch builds on https://github.com/facebook/rocksdb/pull/9915 and adds a new API called `PutEntity` that can be used to write a wide-column entity to the database. The new API is added to both `DB` and `WriteBatch`. Note that currently there is no way to retrieve these entities; more precisely, all read APIs (`Get`, `MultiGet`, and iterator) return `NotSupported` when they encounter a wide-column entity that is required to answer a query. Read-side support (as well as other missing functionality like `Merge`, compaction filter, and timestamp support) will be added in later PRs. Pull Request resolved: https://github.com/facebook/rocksdb/pull/10242 Test Plan: `make check` Reviewed By: riversand963 Differential Revision: D37369748 Pulled By: ltamasi fbshipit-source-id: 7f5e412359ed7a400fd80b897dae5599dbcd685dmain
Levi Tamasi
2 years ago
committed by
Facebook GitHub Bot
parent
f322f273b0
commit
c73d2a9d18
@ -0,0 +1,213 @@ |
||||
// Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||
// This source code is licensed under both the GPLv2 (found in the
|
||||
// COPYING file in the root directory) and Apache 2.0 License
|
||||
// (found in the LICENSE.Apache file in the root directory).
|
||||
|
||||
#include <array> |
||||
#include <memory> |
||||
|
||||
#include "db/db_test_util.h" |
||||
#include "port/stack_trace.h" |
||||
#include "test_util/testutil.h" |
||||
#include "utilities/merge_operators.h" |
||||
|
||||
namespace ROCKSDB_NAMESPACE { |
||||
|
||||
class DBWideBasicTest : public DBTestBase { |
||||
protected: |
||||
explicit DBWideBasicTest() |
||||
: DBTestBase("db_wide_basic_test", /* env_do_fsync */ false) {} |
||||
}; |
||||
|
||||
TEST_F(DBWideBasicTest, PutEntity) { |
||||
Options options = GetDefaultOptions(); |
||||
|
||||
// Use the DB::PutEntity API
|
||||
constexpr char first_key[] = "first"; |
||||
WideColumns first_columns{{"attr_name1", "foo"}, {"attr_name2", "bar"}}; |
||||
|
||||
ASSERT_OK(db_->PutEntity(WriteOptions(), db_->DefaultColumnFamily(), |
||||
first_key, first_columns)); |
||||
|
||||
// Use WriteBatch
|
||||
constexpr char second_key[] = "second"; |
||||
WideColumns second_columns{{"attr_one", "two"}, {"attr_three", "four"}}; |
||||
|
||||
WriteBatch batch; |
||||
ASSERT_OK( |
||||
batch.PutEntity(db_->DefaultColumnFamily(), second_key, second_columns)); |
||||
ASSERT_OK(db_->Write(WriteOptions(), &batch)); |
||||
|
||||
// Note: currently, read APIs are supposed to return NotSupported
|
||||
auto verify = [&]() { |
||||
{ |
||||
PinnableSlice result; |
||||
ASSERT_TRUE(db_->Get(ReadOptions(), db_->DefaultColumnFamily(), first_key, |
||||
&result) |
||||
.IsNotSupported()); |
||||
} |
||||
|
||||
{ |
||||
PinnableSlice result; |
||||
ASSERT_TRUE(db_->Get(ReadOptions(), db_->DefaultColumnFamily(), |
||||
second_key, &result) |
||||
.IsNotSupported()); |
||||
} |
||||
|
||||
{ |
||||
constexpr size_t num_keys = 2; |
||||
|
||||
std::array<Slice, num_keys> keys{{first_key, second_key}}; |
||||
std::array<PinnableSlice, num_keys> values; |
||||
std::array<Status, num_keys> statuses; |
||||
|
||||
db_->MultiGet(ReadOptions(), db_->DefaultColumnFamily(), num_keys, |
||||
&keys[0], &values[0], &statuses[0]); |
||||
|
||||
ASSERT_TRUE(values[0].empty()); |
||||
ASSERT_TRUE(statuses[0].IsNotSupported()); |
||||
|
||||
ASSERT_TRUE(values[1].empty()); |
||||
ASSERT_TRUE(statuses[1].IsNotSupported()); |
||||
} |
||||
|
||||
{ |
||||
std::unique_ptr<Iterator> iter(db_->NewIterator(ReadOptions())); |
||||
|
||||
iter->SeekToFirst(); |
||||
ASSERT_FALSE(iter->Valid()); |
||||
ASSERT_TRUE(iter->status().IsNotSupported()); |
||||
|
||||
iter->SeekToLast(); |
||||
ASSERT_FALSE(iter->Valid()); |
||||
ASSERT_TRUE(iter->status().IsNotSupported()); |
||||
} |
||||
}; |
||||
|
||||
// Try reading from memtable
|
||||
verify(); |
||||
|
||||
// Try reading after recovery
|
||||
Close(); |
||||
options.avoid_flush_during_recovery = true; |
||||
Reopen(options); |
||||
|
||||
verify(); |
||||
|
||||
// Try reading from storage
|
||||
ASSERT_OK(Flush()); |
||||
|
||||
verify(); |
||||
|
||||
// Add a couple of merge operands
|
||||
Close(); |
||||
options.merge_operator = MergeOperators::CreateStringAppendOperator(); |
||||
Reopen(options); |
||||
|
||||
constexpr char merge_operand[] = "bla"; |
||||
|
||||
ASSERT_OK(db_->Merge(WriteOptions(), db_->DefaultColumnFamily(), first_key, |
||||
merge_operand)); |
||||
ASSERT_OK(db_->Merge(WriteOptions(), db_->DefaultColumnFamily(), second_key, |
||||
merge_operand)); |
||||
|
||||
// Try reading from memtable
|
||||
verify(); |
||||
|
||||
// Try reading from storage
|
||||
ASSERT_OK(Flush()); |
||||
|
||||
verify(); |
||||
|
||||
// Do it again, with the Put and the Merge in the same memtable
|
||||
ASSERT_OK(db_->PutEntity(WriteOptions(), db_->DefaultColumnFamily(), |
||||
first_key, first_columns)); |
||||
ASSERT_OK(db_->Write(WriteOptions(), &batch)); |
||||
ASSERT_OK(db_->Merge(WriteOptions(), db_->DefaultColumnFamily(), first_key, |
||||
merge_operand)); |
||||
ASSERT_OK(db_->Merge(WriteOptions(), db_->DefaultColumnFamily(), second_key, |
||||
merge_operand)); |
||||
|
||||
// Try reading from memtable
|
||||
verify(); |
||||
} |
||||
|
||||
TEST_F(DBWideBasicTest, PutEntityColumnFamily) { |
||||
Options options = GetDefaultOptions(); |
||||
CreateAndReopenWithCF({"corinthian"}, options); |
||||
|
||||
// Use the DB::PutEntity API
|
||||
constexpr char first_key[] = "first"; |
||||
WideColumns first_columns{{"attr_name1", "foo"}, {"attr_name2", "bar"}}; |
||||
|
||||
ASSERT_OK( |
||||
db_->PutEntity(WriteOptions(), handles_[1], first_key, first_columns)); |
||||
|
||||
// Use WriteBatch
|
||||
constexpr char second_key[] = "second"; |
||||
WideColumns second_columns{{"attr_one", "two"}, {"attr_three", "four"}}; |
||||
|
||||
WriteBatch batch; |
||||
ASSERT_OK(batch.PutEntity(handles_[1], second_key, second_columns)); |
||||
ASSERT_OK(db_->Write(WriteOptions(), &batch)); |
||||
} |
||||
|
||||
TEST_F(DBWideBasicTest, PutEntityTimestampError) { |
||||
// Note: timestamps are currently not supported
|
||||
|
||||
Options options = GetDefaultOptions(); |
||||
options.comparator = test::BytewiseComparatorWithU64TsWrapper(); |
||||
|
||||
ColumnFamilyHandle* handle = nullptr; |
||||
ASSERT_OK(db_->CreateColumnFamily(options, "corinthian", &handle)); |
||||
std::unique_ptr<ColumnFamilyHandle> handle_guard(handle); |
||||
|
||||
// Use the DB::PutEntity API
|
||||
constexpr char first_key[] = "first"; |
||||
WideColumns first_columns{{"attr_name1", "foo"}, {"attr_name2", "bar"}}; |
||||
|
||||
ASSERT_TRUE(db_->PutEntity(WriteOptions(), handle, first_key, first_columns) |
||||
.IsInvalidArgument()); |
||||
|
||||
// Use WriteBatch
|
||||
constexpr char second_key[] = "second"; |
||||
WideColumns second_columns{{"doric", "column"}, {"ionic", "column"}}; |
||||
|
||||
WriteBatch batch; |
||||
ASSERT_TRUE( |
||||
batch.PutEntity(handle, second_key, second_columns).IsInvalidArgument()); |
||||
ASSERT_OK(db_->Write(WriteOptions(), &batch)); |
||||
} |
||||
|
||||
TEST_F(DBWideBasicTest, PutEntitySerializationError) { |
||||
// Make sure duplicate columns are caught
|
||||
|
||||
Options options = GetDefaultOptions(); |
||||
|
||||
// Use the DB::PutEntity API
|
||||
constexpr char first_key[] = "first"; |
||||
WideColumns first_columns{{"foo", "bar"}, {"foo", "baz"}}; |
||||
|
||||
ASSERT_TRUE(db_->PutEntity(WriteOptions(), db_->DefaultColumnFamily(), |
||||
first_key, first_columns) |
||||
.IsCorruption()); |
||||
|
||||
// Use WriteBatch
|
||||
constexpr char second_key[] = "second"; |
||||
WideColumns second_columns{{"column", "doric"}, {"column", "ionic"}}; |
||||
|
||||
WriteBatch batch; |
||||
ASSERT_TRUE( |
||||
batch.PutEntity(db_->DefaultColumnFamily(), second_key, second_columns) |
||||
.IsCorruption()); |
||||
ASSERT_OK(db_->Write(WriteOptions(), &batch)); |
||||
} |
||||
|
||||
} // namespace ROCKSDB_NAMESPACE
|
||||
|
||||
int main(int argc, char** argv) { |
||||
ROCKSDB_NAMESPACE::port::InstallStackTraceHandler(); |
||||
::testing::InitGoogleTest(&argc, argv); |
||||
RegisterCustomObjects(argc, argv); |
||||
return RUN_ALL_TESTS(); |
||||
} |
||||
Loading…
Reference in new issue