fork of https://github.com/oxigraph/rocksdb and https://github.com/facebook/rocksdb for nextgraph and oxigraph

Levi Tamasi 7867a1112b Handle Merges correctly in GetEntity (#10894 An error occurred ) ... Summary: The PR fixes the handling of `Merge`s in `GetEntity`. Note that `Merge` is not yet supported for wide-column entities written using `PutEntity`; this change is about returning correct (i.e. consistent with `Get`) results in cases like when the base value is a plain old key-value written using `Put` or when there is no real base value because we hit either a tombstone or the beginning of history. Implementation-wise, the patch introduces a new wrapper around the existing `MergeHelper::TimedFullMerge` that can store the merge result in either a string (for the purposes of `Get`) or a `PinnableWideColumns` instance (for `GetEntity`). Pull Request resolved: https://github.com/facebook/rocksdb/pull/10894 Test Plan: `make check` Reviewed By: riversand963 Differential Revision: D40782708 Pulled By: ltamasi fbshipit-source-id: 3d700d56b2ef81f02ba1e2d93f6481bf13abcc90		2 years ago
..
db_wide_basic_test.cc	Handle Merges correctly in GetEntity (#10894 An error occurred )	2 years ago
wide_column_serialization.cc	Support providing the default column separately when serializing columns (#10839 An error occurred )	2 years ago
wide_column_serialization.h	Support providing the default column separately when serializing columns (#10839 An error occurred )	2 years ago
wide_column_serialization_test.cc	Support providing the default column separately when serializing columns (#10839 An error occurred )	2 years ago
wide_columns.cc	Verify columns in NonBatchedOpsStressTest::VerifyDb (#10783 An error occurred )	3 years ago