Skip to content

Commit 5239c4c

Browse files
committed
Merge remote-tracking branch 'pd/blog_format_no_wal' into fix_agent_review2
2 parents 2e21612 + 5ba6eb5 commit 5239c4c

45 files changed

Lines changed: 3700 additions & 191 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

BUCK

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
4141
"db/blob/blob_source.cc",
4242
"db/blob/blob_write_batch_transformer.cc",
4343
"db/blob/prefetch_buffer_collection.cc",
44+
"db/blog/blog_format.cc",
45+
"db/blog/blog_reader.cc",
46+
"db/blog/blog_writer.cc",
4447
"db/builder.cc",
4548
"db/c.cc",
4649
"db/coalescing_iterator.cc",
@@ -4592,6 +4595,18 @@ cpp_unittest_wrapper(name="block_test",
45924595
extra_compiler_flags=[])
45934596

45944597

4598+
cpp_unittest_wrapper(name="blog_format_test",
4599+
srcs=["db/blog/blog_format_test.cc"],
4600+
deps=[":rocksdb_test_lib"],
4601+
extra_compiler_flags=[])
4602+
4603+
4604+
cpp_unittest_wrapper(name="blog_writer_test",
4605+
srcs=["db/blog/blog_writer_test.cc"],
4606+
deps=[":rocksdb_test_lib"],
4607+
extra_compiler_flags=[])
4608+
4609+
45954610
cpp_unittest_wrapper(name="bloom_test",
45964611
srcs=["util/bloom_test.cc"],
45974612
deps=[":rocksdb_test_lib"],

CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -743,6 +743,9 @@ set(SOURCES
743743
db/blob/blob_source.cc
744744
db/blob/blob_write_batch_transformer.cc
745745
db/blob/prefetch_buffer_collection.cc
746+
db/blog/blog_format.cc
747+
db/blog/blog_reader.cc
748+
db/blog/blog_writer.cc
746749
db/builder.cc
747750
db/c.cc
748751
db/coalescing_iterator.cc
@@ -1431,6 +1434,8 @@ if(WITH_TESTS)
14311434
db/blob/db_blob_compaction_test.cc
14321435
db/blob/db_blob_corruption_test.cc
14331436
db/blob/db_blob_index_test.cc
1437+
db/blog/blog_format_test.cc
1438+
db/blog/blog_writer_test.cc
14341439
db/column_family_test.cc
14351440
db/compact_files_test.cc
14361441
db/compaction/clipping_iterator_test.cc

Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1536,6 +1536,12 @@ db_logical_block_size_cache_test: $(OBJ_DIR)/db/db_logical_block_size_cache_test
15361536
db_blob_index_test: $(OBJ_DIR)/db/blob/db_blob_index_test.o $(TEST_LIBRARY) $(LIBRARY)
15371537
$(AM_LINK)
15381538

1539+
blog_format_test: $(OBJ_DIR)/db/blog/blog_format_test.o $(TEST_LIBRARY) $(LIBRARY)
1540+
$(AM_LINK)
1541+
1542+
blog_writer_test: $(OBJ_DIR)/db/blog/blog_writer_test.o $(TEST_LIBRARY) $(LIBRARY)
1543+
$(AM_LINK)
1544+
15391545
db_block_cache_test: $(OBJ_DIR)/db/db_block_cache_test.o $(TEST_LIBRARY) $(LIBRARY)
15401546
$(AM_LINK)
15411547

blog_format_spec.html

Lines changed: 318 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)