@nxtedition/rocksdb 13.5.7 → 13.5.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/binding.cc +248 -70
- package/binding.gyp +2 -2
- package/deps/rocksdb/rocksdb/BUCK +12 -0
- package/deps/rocksdb/rocksdb/CMakeLists.txt +7 -0
- package/deps/rocksdb/rocksdb/Makefile +28 -23
- package/deps/rocksdb/rocksdb/cache/cache.cc +0 -1
- package/deps/rocksdb/rocksdb/cache/cache_bench_tool.cc +1 -2
- package/deps/rocksdb/rocksdb/cache/compressed_secondary_cache.cc +43 -39
- package/deps/rocksdb/rocksdb/cache/compressed_secondary_cache.h +2 -0
- package/deps/rocksdb/rocksdb/cache/compressed_secondary_cache_test.cc +0 -1
- package/deps/rocksdb/rocksdb/cache/lru_cache.cc +2 -3
- package/deps/rocksdb/rocksdb/cache/lru_cache_test.cc +2 -2
- package/deps/rocksdb/rocksdb/cache/secondary_cache.cc +1 -3
- package/deps/rocksdb/rocksdb/cache/secondary_cache_adapter.cc +11 -1
- package/deps/rocksdb/rocksdb/cache/tiered_secondary_cache_test.cc +13 -5
- package/deps/rocksdb/rocksdb/crash_test.mk +61 -15
- package/deps/rocksdb/rocksdb/db/arena_wrapped_db_iter.cc +136 -45
- package/deps/rocksdb/rocksdb/db/arena_wrapped_db_iter.h +34 -16
- package/deps/rocksdb/rocksdb/db/blob/blob_file_builder.cc +10 -7
- package/deps/rocksdb/rocksdb/db/blob/blob_file_builder_test.cc +1 -2
- package/deps/rocksdb/rocksdb/db/blob/blob_file_meta.h +1 -0
- package/deps/rocksdb/rocksdb/db/blob/blob_file_reader.cc +12 -9
- package/deps/rocksdb/rocksdb/db/blob/blob_file_reader_test.cc +3 -4
- package/deps/rocksdb/rocksdb/db/blob/blob_source.cc +2 -2
- package/deps/rocksdb/rocksdb/db/blob/blob_source_test.cc +3 -4
- package/deps/rocksdb/rocksdb/db/builder.cc +22 -8
- package/deps/rocksdb/rocksdb/db/builder.h +5 -4
- package/deps/rocksdb/rocksdb/db/c.cc +556 -15
- package/deps/rocksdb/rocksdb/db/c_test.c +133 -12
- package/deps/rocksdb/rocksdb/db/column_family.cc +114 -50
- package/deps/rocksdb/rocksdb/db/column_family.h +53 -36
- package/deps/rocksdb/rocksdb/db/column_family_test.cc +6 -6
- package/deps/rocksdb/rocksdb/db/compact_files_test.cc +0 -1
- package/deps/rocksdb/rocksdb/db/compaction/compaction.cc +95 -70
- package/deps/rocksdb/rocksdb/db/compaction/compaction.h +71 -51
- package/deps/rocksdb/rocksdb/db/compaction/compaction_iterator.cc +7 -86
- package/deps/rocksdb/rocksdb/db/compaction/compaction_iterator.h +26 -68
- package/deps/rocksdb/rocksdb/db/compaction/compaction_iterator_test.cc +0 -122
- package/deps/rocksdb/rocksdb/db/compaction/compaction_job.cc +453 -258
- package/deps/rocksdb/rocksdb/db/compaction/compaction_job.h +117 -92
- package/deps/rocksdb/rocksdb/db/compaction/compaction_job_stats_test.cc +0 -1
- package/deps/rocksdb/rocksdb/db/compaction/compaction_job_test.cc +38 -38
- package/deps/rocksdb/rocksdb/db/compaction/compaction_outputs.cc +24 -17
- package/deps/rocksdb/rocksdb/db/compaction/compaction_outputs.h +34 -45
- package/deps/rocksdb/rocksdb/db/compaction/compaction_picker.cc +32 -31
- package/deps/rocksdb/rocksdb/db/compaction/compaction_picker.h +12 -3
- package/deps/rocksdb/rocksdb/db/compaction/compaction_picker_fifo.cc +1 -1
- package/deps/rocksdb/rocksdb/db/compaction/compaction_picker_fifo.h +2 -1
- package/deps/rocksdb/rocksdb/db/compaction/compaction_picker_level.cc +10 -10
- package/deps/rocksdb/rocksdb/db/compaction/compaction_picker_level.h +2 -1
- package/deps/rocksdb/rocksdb/db/compaction/compaction_picker_test.cc +82 -34
- package/deps/rocksdb/rocksdb/db/compaction/compaction_picker_universal.cc +267 -179
- package/deps/rocksdb/rocksdb/db/compaction/compaction_picker_universal.h +4 -1
- package/deps/rocksdb/rocksdb/db/compaction/compaction_service_job.cc +273 -89
- package/deps/rocksdb/rocksdb/db/compaction/compaction_service_test.cc +300 -14
- package/deps/rocksdb/rocksdb/db/compaction/compaction_state.cc +4 -4
- package/deps/rocksdb/rocksdb/db/compaction/compaction_state.h +2 -2
- package/deps/rocksdb/rocksdb/db/compaction/subcompaction_state.cc +28 -23
- package/deps/rocksdb/rocksdb/db/compaction/subcompaction_state.h +69 -51
- package/deps/rocksdb/rocksdb/db/compaction/tiered_compaction_test.cc +522 -245
- package/deps/rocksdb/rocksdb/db/convenience.cc +15 -4
- package/deps/rocksdb/rocksdb/db/corruption_test.cc +1 -3
- package/deps/rocksdb/rocksdb/db/cuckoo_table_db_test.cc +0 -2
- package/deps/rocksdb/rocksdb/db/db_basic_test.cc +196 -17
- package/deps/rocksdb/rocksdb/db/db_block_cache_test.cc +74 -62
- package/deps/rocksdb/rocksdb/db/db_bloom_filter_test.cc +48 -0
- package/deps/rocksdb/rocksdb/db/db_compaction_test.cc +682 -250
- package/deps/rocksdb/rocksdb/db/db_dynamic_level_test.cc +0 -1
- package/deps/rocksdb/rocksdb/db/db_encryption_test.cc +3 -4
- package/deps/rocksdb/rocksdb/db/db_filesnapshot.cc +11 -16
- package/deps/rocksdb/rocksdb/db/db_flush_test.cc +57 -0
- package/deps/rocksdb/rocksdb/db/db_impl/compacted_db_impl.cc +2 -2
- package/deps/rocksdb/rocksdb/db/db_impl/compacted_db_impl.h +1 -1
- package/deps/rocksdb/rocksdb/db/db_impl/db_impl.cc +540 -490
- package/deps/rocksdb/rocksdb/db/db_impl/db_impl.h +347 -188
- package/deps/rocksdb/rocksdb/db/db_impl/db_impl_compaction_flush.cc +584 -217
- package/deps/rocksdb/rocksdb/db/db_impl/db_impl_debug.cc +13 -9
- package/deps/rocksdb/rocksdb/db/db_impl/db_impl_experimental.cc +5 -7
- package/deps/rocksdb/rocksdb/db/db_impl/db_impl_files.cc +40 -36
- package/deps/rocksdb/rocksdb/db/db_impl/db_impl_follower.cc +1 -3
- package/deps/rocksdb/rocksdb/db/db_impl/db_impl_open.cc +751 -372
- package/deps/rocksdb/rocksdb/db/db_impl/db_impl_readonly.cc +35 -32
- package/deps/rocksdb/rocksdb/db/db_impl/db_impl_readonly.h +24 -2
- package/deps/rocksdb/rocksdb/db/db_impl/db_impl_secondary.cc +125 -63
- package/deps/rocksdb/rocksdb/db/db_impl/db_impl_secondary.h +2 -2
- package/deps/rocksdb/rocksdb/db/db_impl/db_impl_write.cc +311 -196
- package/deps/rocksdb/rocksdb/db/db_io_failure_test.cc +15 -5
- package/deps/rocksdb/rocksdb/db/db_iter.cc +42 -29
- package/deps/rocksdb/rocksdb/db/db_iter.h +96 -31
- package/deps/rocksdb/rocksdb/db/db_iter_stress_test.cc +3 -4
- package/deps/rocksdb/rocksdb/db/db_iter_test.cc +168 -228
- package/deps/rocksdb/rocksdb/db/db_iterator_test.cc +454 -0
- package/deps/rocksdb/rocksdb/db/db_kv_checksum_test.cc +8 -8
- package/deps/rocksdb/rocksdb/db/db_log_iter_test.cc +0 -1
- package/deps/rocksdb/rocksdb/db/db_memtable_test.cc +90 -0
- package/deps/rocksdb/rocksdb/db/db_merge_operand_test.cc +60 -2
- package/deps/rocksdb/rocksdb/db/db_merge_operator_test.cc +7 -3
- package/deps/rocksdb/rocksdb/db/db_options_test.cc +85 -27
- package/deps/rocksdb/rocksdb/db/db_properties_test.cc +3 -1
- package/deps/rocksdb/rocksdb/db/db_rate_limiter_test.cc +0 -2
- package/deps/rocksdb/rocksdb/db/db_secondary_test.cc +114 -2
- package/deps/rocksdb/rocksdb/db/db_sst_test.cc +0 -1
- package/deps/rocksdb/rocksdb/db/db_statistics_test.cc +0 -1
- package/deps/rocksdb/rocksdb/db/db_table_properties_test.cc +51 -3
- package/deps/rocksdb/rocksdb/db/db_tailing_iter_test.cc +0 -1
- package/deps/rocksdb/rocksdb/db/db_test.cc +325 -18
- package/deps/rocksdb/rocksdb/db/db_test2.cc +644 -20
- package/deps/rocksdb/rocksdb/db/db_test_util.cc +14 -6
- package/deps/rocksdb/rocksdb/db/db_test_util.h +9 -0
- package/deps/rocksdb/rocksdb/db/db_universal_compaction_test.cc +64 -45
- package/deps/rocksdb/rocksdb/db/db_wal_test.cc +203 -14
- package/deps/rocksdb/rocksdb/db/db_with_timestamp_basic_test.cc +259 -30
- package/deps/rocksdb/rocksdb/db/db_write_buffer_manager_test.cc +0 -1
- package/deps/rocksdb/rocksdb/db/db_write_test.cc +75 -1
- package/deps/rocksdb/rocksdb/db/dbformat.h +70 -6
- package/deps/rocksdb/rocksdb/db/deletefile_test.cc +0 -190
- package/deps/rocksdb/rocksdb/db/error_handler.cc +22 -7
- package/deps/rocksdb/rocksdb/db/error_handler.h +16 -1
- package/deps/rocksdb/rocksdb/db/event_helpers.cc +41 -26
- package/deps/rocksdb/rocksdb/db/experimental.cc +4 -3
- package/deps/rocksdb/rocksdb/db/external_sst_file_basic_test.cc +464 -78
- package/deps/rocksdb/rocksdb/db/external_sst_file_ingestion_job.cc +166 -69
- package/deps/rocksdb/rocksdb/db/external_sst_file_ingestion_job.h +54 -25
- package/deps/rocksdb/rocksdb/db/external_sst_file_test.cc +1 -3
- package/deps/rocksdb/rocksdb/db/flush_job.cc +98 -81
- package/deps/rocksdb/rocksdb/db/flush_job.h +4 -9
- package/deps/rocksdb/rocksdb/db/flush_job_test.cc +80 -84
- package/deps/rocksdb/rocksdb/db/forward_iterator.cc +1 -1
- package/deps/rocksdb/rocksdb/db/forward_iterator.h +2 -2
- package/deps/rocksdb/rocksdb/db/import_column_family_job.cc +12 -19
- package/deps/rocksdb/rocksdb/db/import_column_family_test.cc +0 -2
- package/deps/rocksdb/rocksdb/db/internal_stats.cc +41 -15
- package/deps/rocksdb/rocksdb/db/internal_stats.h +63 -52
- package/deps/rocksdb/rocksdb/db/job_context.h +59 -24
- package/deps/rocksdb/rocksdb/db/listener_test.cc +69 -10
- package/deps/rocksdb/rocksdb/db/log_format.h +11 -2
- package/deps/rocksdb/rocksdb/db/log_reader.cc +147 -34
- package/deps/rocksdb/rocksdb/db/log_reader.h +40 -11
- package/deps/rocksdb/rocksdb/db/log_test.cc +16 -3
- package/deps/rocksdb/rocksdb/db/log_writer.cc +102 -55
- package/deps/rocksdb/rocksdb/db/log_writer.h +21 -2
- package/deps/rocksdb/rocksdb/db/malloc_stats.h +0 -2
- package/deps/rocksdb/rocksdb/db/memtable.cc +16 -47
- package/deps/rocksdb/rocksdb/db/memtable.h +76 -12
- package/deps/rocksdb/rocksdb/db/memtable_list.cc +23 -20
- package/deps/rocksdb/rocksdb/db/memtable_list.h +9 -11
- package/deps/rocksdb/rocksdb/db/memtable_list_test.cc +18 -37
- package/deps/rocksdb/rocksdb/db/merge_context.h +2 -1
- package/deps/rocksdb/rocksdb/db/merge_test.cc +8 -0
- package/deps/rocksdb/rocksdb/db/obsolete_files_test.cc +3 -5
- package/deps/rocksdb/rocksdb/db/periodic_task_scheduler.cc +15 -7
- package/deps/rocksdb/rocksdb/db/periodic_task_scheduler.h +6 -3
- package/deps/rocksdb/rocksdb/db/periodic_task_scheduler_test.cc +22 -4
- package/deps/rocksdb/rocksdb/db/plain_table_db_test.cc +41 -1
- package/deps/rocksdb/rocksdb/db/prefix_test.cc +0 -1
- package/deps/rocksdb/rocksdb/db/repair.cc +29 -34
- package/deps/rocksdb/rocksdb/db/repair_test.cc +0 -1
- package/deps/rocksdb/rocksdb/db/seqno_time_test.cc +14 -15
- package/deps/rocksdb/rocksdb/db/seqno_to_time_mapping.cc +1 -3
- package/deps/rocksdb/rocksdb/db/seqno_to_time_mapping.h +47 -1
- package/deps/rocksdb/rocksdb/db/table_cache.cc +3 -3
- package/deps/rocksdb/rocksdb/db/transaction_log_impl.cc +1 -3
- package/deps/rocksdb/rocksdb/db/transaction_log_impl.h +2 -1
- package/deps/rocksdb/rocksdb/db/version_builder.cc +2 -2
- package/deps/rocksdb/rocksdb/db/version_edit.cc +8 -37
- package/deps/rocksdb/rocksdb/db/version_edit.h +32 -1
- package/deps/rocksdb/rocksdb/db/version_edit_handler.cc +26 -18
- package/deps/rocksdb/rocksdb/db/version_edit_handler.h +7 -5
- package/deps/rocksdb/rocksdb/db/version_set.cc +282 -197
- package/deps/rocksdb/rocksdb/db/version_set.h +54 -57
- package/deps/rocksdb/rocksdb/db/version_set_test.cc +28 -35
- package/deps/rocksdb/rocksdb/db/version_util.h +2 -3
- package/deps/rocksdb/rocksdb/db/wal_manager.cc +3 -2
- package/deps/rocksdb/rocksdb/db/wal_manager.h +0 -1
- package/deps/rocksdb/rocksdb/db/wal_manager_test.cc +0 -1
- package/deps/rocksdb/rocksdb/db/wide/wide_columns.cc +1 -0
- package/deps/rocksdb/rocksdb/db/write_batch.cc +22 -8
- package/deps/rocksdb/rocksdb/db/write_batch_internal.h +5 -4
- package/deps/rocksdb/rocksdb/db/write_batch_test.cc +7 -6
- package/deps/rocksdb/rocksdb/db/write_callback_test.cc +3 -4
- package/deps/rocksdb/rocksdb/db/write_thread.h +3 -3
- package/deps/rocksdb/rocksdb/db_stress_tool/cf_consistency_stress.cc +13 -5
- package/deps/rocksdb/rocksdb/db_stress_tool/db_stress_common.h +9 -2
- package/deps/rocksdb/rocksdb/db_stress_tool/db_stress_compaction_service.h +39 -0
- package/deps/rocksdb/rocksdb/db_stress_tool/db_stress_compression_manager.h +65 -0
- package/deps/rocksdb/rocksdb/db_stress_tool/db_stress_gflags.cc +45 -22
- package/deps/rocksdb/rocksdb/db_stress_tool/db_stress_listener.h +7 -4
- package/deps/rocksdb/rocksdb/db_stress_tool/db_stress_shared_state.h +22 -5
- package/deps/rocksdb/rocksdb/db_stress_tool/db_stress_table_properties_collector.h +28 -3
- package/deps/rocksdb/rocksdb/db_stress_tool/db_stress_test_base.cc +143 -38
- package/deps/rocksdb/rocksdb/db_stress_tool/db_stress_test_base.h +4 -3
- package/deps/rocksdb/rocksdb/db_stress_tool/expected_state.cc +80 -32
- package/deps/rocksdb/rocksdb/db_stress_tool/expected_state.h +51 -2
- package/deps/rocksdb/rocksdb/db_stress_tool/multi_ops_txns_stress.cc +23 -1
- package/deps/rocksdb/rocksdb/db_stress_tool/no_batched_ops_stress.cc +305 -15
- package/deps/rocksdb/rocksdb/env/env.cc +32 -2
- package/deps/rocksdb/rocksdb/env/env_encryption.cc +0 -2
- package/deps/rocksdb/rocksdb/env/env_encryption_ctr.h +2 -4
- package/deps/rocksdb/rocksdb/env/env_posix.cc +4 -2
- package/deps/rocksdb/rocksdb/env/env_test.cc +0 -1
- package/deps/rocksdb/rocksdb/env/fs_posix.cc +20 -11
- package/deps/rocksdb/rocksdb/env/fs_readonly.h +0 -2
- package/deps/rocksdb/rocksdb/env/fs_remap.cc +0 -2
- package/deps/rocksdb/rocksdb/env/fs_remap.h +0 -2
- package/deps/rocksdb/rocksdb/env/io_posix.cc +6 -4
- package/deps/rocksdb/rocksdb/env/io_posix.h +3 -2
- package/deps/rocksdb/rocksdb/env/mock_env.cc +0 -1
- package/deps/rocksdb/rocksdb/file/delete_scheduler.cc +2 -2
- package/deps/rocksdb/rocksdb/file/delete_scheduler.h +0 -2
- package/deps/rocksdb/rocksdb/file/delete_scheduler_test.cc +0 -2
- package/deps/rocksdb/rocksdb/file/file_prefetch_buffer.cc +30 -21
- package/deps/rocksdb/rocksdb/file/file_prefetch_buffer.h +16 -0
- package/deps/rocksdb/rocksdb/file/file_util.cc +32 -14
- package/deps/rocksdb/rocksdb/file/file_util.h +22 -5
- package/deps/rocksdb/rocksdb/file/prefetch_test.cc +229 -76
- package/deps/rocksdb/rocksdb/file/random_access_file_reader.cc +21 -12
- package/deps/rocksdb/rocksdb/file/random_access_file_reader.h +10 -7
- package/deps/rocksdb/rocksdb/file/random_access_file_reader_test.cc +12 -8
- package/deps/rocksdb/rocksdb/file/sst_file_manager_impl.cc +1 -2
- package/deps/rocksdb/rocksdb/file/sst_file_manager_impl.h +0 -2
- package/deps/rocksdb/rocksdb/file/writable_file_writer.cc +3 -3
- package/deps/rocksdb/rocksdb/include/rocksdb/advanced_compression.h +598 -0
- package/deps/rocksdb/rocksdb/include/rocksdb/advanced_iterator.h +36 -0
- package/deps/rocksdb/rocksdb/include/rocksdb/advanced_options.h +70 -11
- package/deps/rocksdb/rocksdb/include/rocksdb/c.h +232 -11
- package/deps/rocksdb/rocksdb/include/rocksdb/cache.h +1 -1
- package/deps/rocksdb/rocksdb/include/rocksdb/compaction_job_stats.h +3 -1
- package/deps/rocksdb/rocksdb/include/rocksdb/compression_type.h +149 -15
- package/deps/rocksdb/rocksdb/include/rocksdb/convenience.h +17 -2
- package/deps/rocksdb/rocksdb/include/rocksdb/data_structure.h +132 -34
- package/deps/rocksdb/rocksdb/include/rocksdb/db.h +158 -79
- package/deps/rocksdb/rocksdb/include/rocksdb/db_bench_tool.h +2 -1
- package/deps/rocksdb/rocksdb/include/rocksdb/env.h +4 -5
- package/deps/rocksdb/rocksdb/include/rocksdb/env_encryption.h +1 -3
- package/deps/rocksdb/rocksdb/include/rocksdb/experimental.h +5 -0
- package/deps/rocksdb/rocksdb/include/rocksdb/external_table.h +275 -0
- package/deps/rocksdb/rocksdb/include/rocksdb/file_checksum.h +2 -1
- package/deps/rocksdb/rocksdb/include/rocksdb/file_system.h +50 -5
- package/deps/rocksdb/rocksdb/include/rocksdb/iostats_context.h +10 -0
- package/deps/rocksdb/rocksdb/include/rocksdb/iterator.h +13 -0
- package/deps/rocksdb/rocksdb/include/rocksdb/ldb_tool.h +0 -1
- package/deps/rocksdb/rocksdb/include/rocksdb/listener.h +5 -2
- package/deps/rocksdb/rocksdb/include/rocksdb/memtablerep.h +13 -0
- package/deps/rocksdb/rocksdb/include/rocksdb/multi_scan.h +237 -0
- package/deps/rocksdb/rocksdb/include/rocksdb/options.h +230 -39
- package/deps/rocksdb/rocksdb/include/rocksdb/perf_context.h +15 -0
- package/deps/rocksdb/rocksdb/include/rocksdb/perf_level.h +31 -11
- package/deps/rocksdb/rocksdb/include/rocksdb/slice.h +41 -0
- package/deps/rocksdb/rocksdb/include/rocksdb/slice_transform.h +1 -1
- package/deps/rocksdb/rocksdb/include/rocksdb/sst_dump_tool.h +0 -1
- package/deps/rocksdb/rocksdb/include/rocksdb/sst_file_reader.h +5 -1
- package/deps/rocksdb/rocksdb/include/rocksdb/sst_file_writer.h +0 -1
- package/deps/rocksdb/rocksdb/include/rocksdb/statistics.h +18 -3
- package/deps/rocksdb/rocksdb/include/rocksdb/status.h +2 -0
- package/deps/rocksdb/rocksdb/include/rocksdb/table.h +20 -8
- package/deps/rocksdb/rocksdb/include/rocksdb/table_properties.h +19 -2
- package/deps/rocksdb/rocksdb/include/rocksdb/thread_status.h +1 -1
- package/deps/rocksdb/rocksdb/include/rocksdb/tool_hooks.h +124 -0
- package/deps/rocksdb/rocksdb/include/rocksdb/trace_record.h +1 -0
- package/deps/rocksdb/rocksdb/include/rocksdb/universal_compaction.h +26 -1
- package/deps/rocksdb/rocksdb/include/rocksdb/utilities/backup_engine.h +55 -6
- package/deps/rocksdb/rocksdb/include/rocksdb/utilities/debug.h +3 -5
- package/deps/rocksdb/rocksdb/include/rocksdb/utilities/env_mirror.h +0 -2
- package/deps/rocksdb/rocksdb/include/rocksdb/utilities/ldb_cmd.h +1 -2
- package/deps/rocksdb/rocksdb/include/rocksdb/utilities/memory_util.h +0 -1
- package/deps/rocksdb/rocksdb/include/rocksdb/utilities/object_registry.h +1 -2
- package/deps/rocksdb/rocksdb/include/rocksdb/utilities/options_util.h +0 -1
- package/deps/rocksdb/rocksdb/include/rocksdb/utilities/secondary_index.h +96 -8
- package/deps/rocksdb/rocksdb/include/rocksdb/utilities/secondary_index_faiss.h +117 -0
- package/deps/rocksdb/rocksdb/{utilities/secondary_index/faiss_ivf_index.h → include/rocksdb/utilities/secondary_index_simple.h} +11 -14
- package/deps/rocksdb/rocksdb/include/rocksdb/utilities/stackable_db.h +26 -11
- package/deps/rocksdb/rocksdb/include/rocksdb/utilities/table_properties_collectors.h +16 -3
- package/deps/rocksdb/rocksdb/include/rocksdb/utilities/transaction.h +0 -2
- package/deps/rocksdb/rocksdb/include/rocksdb/utilities/transaction_db.h +63 -7
- package/deps/rocksdb/rocksdb/include/rocksdb/utilities/transaction_db_mutex.h +0 -1
- package/deps/rocksdb/rocksdb/include/rocksdb/utilities/write_batch_with_index.h +28 -12
- package/deps/rocksdb/rocksdb/include/rocksdb/version.h +3 -3
- package/deps/rocksdb/rocksdb/logging/auto_roll_logger_test.cc +0 -2
- package/deps/rocksdb/rocksdb/logging/event_logger_test.cc +1 -2
- package/deps/rocksdb/rocksdb/memory/memory_allocator_impl.h +1 -1
- package/deps/rocksdb/rocksdb/memory/memory_allocator_test.cc +0 -1
- package/deps/rocksdb/rocksdb/memtable/hash_linklist_rep.cc +0 -1
- package/deps/rocksdb/rocksdb/memtable/memtablerep_bench.cc +3 -1
- package/deps/rocksdb/rocksdb/memtable/skiplist.h +2 -2
- package/deps/rocksdb/rocksdb/memtable/skiplistrep.cc +2 -4
- package/deps/rocksdb/rocksdb/memtable/vectorrep.cc +69 -8
- package/deps/rocksdb/rocksdb/memtable/wbwi_memtable.cc +32 -9
- package/deps/rocksdb/rocksdb/memtable/wbwi_memtable.h +58 -45
- package/deps/rocksdb/rocksdb/monitoring/histogram.h +1 -1
- package/deps/rocksdb/rocksdb/monitoring/perf_context.cc +5 -3
- package/deps/rocksdb/rocksdb/monitoring/statistics.cc +5 -0
- package/deps/rocksdb/rocksdb/monitoring/stats_history_test.cc +1 -1
- package/deps/rocksdb/rocksdb/monitoring/thread_status_util_debug.cc +3 -2
- package/deps/rocksdb/rocksdb/options/cf_options.cc +44 -13
- package/deps/rocksdb/rocksdb/options/cf_options.h +21 -7
- package/deps/rocksdb/rocksdb/options/configurable.cc +5 -5
- package/deps/rocksdb/rocksdb/options/configurable_test.h +1 -2
- package/deps/rocksdb/rocksdb/options/customizable.cc +0 -1
- package/deps/rocksdb/rocksdb/options/customizable_test.cc +4 -11
- package/deps/rocksdb/rocksdb/options/db_options.cc +18 -15
- package/deps/rocksdb/rocksdb/options/db_options.h +2 -2
- package/deps/rocksdb/rocksdb/options/options.cc +296 -305
- package/deps/rocksdb/rocksdb/options/options_helper.cc +188 -62
- package/deps/rocksdb/rocksdb/options/options_helper.h +3 -3
- package/deps/rocksdb/rocksdb/options/options_parser.cc +2 -4
- package/deps/rocksdb/rocksdb/options/options_parser.h +0 -1
- package/deps/rocksdb/rocksdb/options/options_settable_test.cc +17 -4
- package/deps/rocksdb/rocksdb/options/options_test.cc +101 -76
- package/deps/rocksdb/rocksdb/port/lang.h +2 -1
- package/deps/rocksdb/rocksdb/port/port_posix.cc +2 -1
- package/deps/rocksdb/rocksdb/port/stack_trace.cc +5 -4
- package/deps/rocksdb/rocksdb/port/win/env_win.cc +3 -2
- package/deps/rocksdb/rocksdb/port/win/xpress_win.cc +99 -1
- package/deps/rocksdb/rocksdb/port/win/xpress_win.h +6 -0
- package/deps/rocksdb/rocksdb/src.mk +17 -11
- package/deps/rocksdb/rocksdb/table/adaptive/adaptive_table_factory.h +0 -1
- package/deps/rocksdb/rocksdb/table/block_based/block_based_table_builder.cc +1094 -929
- package/deps/rocksdb/rocksdb/table/block_based/block_based_table_builder.h +6 -19
- package/deps/rocksdb/rocksdb/table/block_based/block_based_table_factory.cc +76 -22
- package/deps/rocksdb/rocksdb/table/block_based/block_based_table_factory.h +2 -0
- package/deps/rocksdb/rocksdb/table/block_based/block_based_table_reader.cc +221 -131
- package/deps/rocksdb/rocksdb/table/block_based/block_based_table_reader.h +12 -9
- package/deps/rocksdb/rocksdb/table/block_based/block_based_table_reader_impl.h +23 -24
- package/deps/rocksdb/rocksdb/table/block_based/block_based_table_reader_sync_and_async.h +38 -38
- package/deps/rocksdb/rocksdb/table/block_based/block_based_table_reader_test.cc +7 -4
- package/deps/rocksdb/rocksdb/table/block_based/block_cache.cc +5 -5
- package/deps/rocksdb/rocksdb/table/block_based/block_cache.h +10 -12
- package/deps/rocksdb/rocksdb/table/block_based/block_prefetcher.cc +6 -4
- package/deps/rocksdb/rocksdb/table/block_based/block_test.cc +35 -43
- package/deps/rocksdb/rocksdb/table/block_based/data_block_hash_index_test.cc +2 -1
- package/deps/rocksdb/rocksdb/table/block_based/filter_block.h +1 -1
- package/deps/rocksdb/rocksdb/table/block_based/filter_block_reader_common.cc +1 -2
- package/deps/rocksdb/rocksdb/table/block_based/filter_policy.cc +0 -4
- package/deps/rocksdb/rocksdb/table/block_based/filter_policy_internal.h +0 -1
- package/deps/rocksdb/rocksdb/table/block_based/hash_index_reader.cc +3 -3
- package/deps/rocksdb/rocksdb/table/block_based/index_reader_common.cc +3 -3
- package/deps/rocksdb/rocksdb/table/block_based/partitioned_filter_block.cc +4 -4
- package/deps/rocksdb/rocksdb/table/block_based/partitioned_index_reader.cc +1 -1
- package/deps/rocksdb/rocksdb/table/block_based/uncompression_dict_reader.cc +4 -5
- package/deps/rocksdb/rocksdb/table/block_based/uncompression_dict_reader.h +4 -4
- package/deps/rocksdb/rocksdb/table/block_fetcher.cc +37 -35
- package/deps/rocksdb/rocksdb/table/block_fetcher.h +11 -7
- package/deps/rocksdb/rocksdb/table/block_fetcher_test.cc +4 -3
- package/deps/rocksdb/rocksdb/table/compaction_merging_iterator.cc +31 -5
- package/deps/rocksdb/rocksdb/table/compaction_merging_iterator.h +2 -1
- package/deps/rocksdb/rocksdb/table/cuckoo/cuckoo_table_builder.h +0 -1
- package/deps/rocksdb/rocksdb/table/cuckoo/cuckoo_table_builder_test.cc +0 -1
- package/deps/rocksdb/rocksdb/table/cuckoo/cuckoo_table_reader_test.cc +0 -1
- package/deps/rocksdb/rocksdb/table/external_table.cc +483 -0
- package/deps/rocksdb/rocksdb/table/format.cc +62 -44
- package/deps/rocksdb/rocksdb/table/format.h +35 -12
- package/deps/rocksdb/rocksdb/table/internal_iterator.h +3 -13
- package/deps/rocksdb/rocksdb/table/iterator_wrapper.h +8 -0
- package/deps/rocksdb/rocksdb/table/merging_iterator.cc +6 -0
- package/deps/rocksdb/rocksdb/table/meta_blocks.cc +150 -141
- package/deps/rocksdb/rocksdb/table/meta_blocks.h +5 -0
- package/deps/rocksdb/rocksdb/table/multiget_context.h +3 -2
- package/deps/rocksdb/rocksdb/table/plain/plain_table_builder.cc +8 -0
- package/deps/rocksdb/rocksdb/table/plain/plain_table_index.cc +0 -1
- package/deps/rocksdb/rocksdb/table/plain/plain_table_index.h +0 -2
- package/deps/rocksdb/rocksdb/table/plain/plain_table_key_coding.h +0 -2
- package/deps/rocksdb/rocksdb/table/plain/plain_table_reader.cc +0 -1
- package/deps/rocksdb/rocksdb/table/sst_file_dumper.cc +6 -6
- package/deps/rocksdb/rocksdb/table/sst_file_dumper.h +0 -1
- package/deps/rocksdb/rocksdb/table/sst_file_reader.cc +86 -7
- package/deps/rocksdb/rocksdb/table/sst_file_reader_test.cc +88 -2
- package/deps/rocksdb/rocksdb/table/sst_file_writer.cc +0 -1
- package/deps/rocksdb/rocksdb/table/table_builder.h +10 -1
- package/deps/rocksdb/rocksdb/table/table_reader_bench.cc +3 -2
- package/deps/rocksdb/rocksdb/table/table_test.cc +899 -22
- package/deps/rocksdb/rocksdb/test_util/testutil.cc +3 -4
- package/deps/rocksdb/rocksdb/test_util/testutil.h +132 -1
- package/deps/rocksdb/rocksdb/test_util/transaction_test_util.cc +0 -1
- package/deps/rocksdb/rocksdb/test_util/transaction_test_util.h +0 -2
- package/deps/rocksdb/rocksdb/tools/db_bench_tool.cc +163 -77
- package/deps/rocksdb/rocksdb/tools/db_bench_tool_test.cc +0 -2
- package/deps/rocksdb/rocksdb/tools/db_repl_stress.cc +0 -1
- package/deps/rocksdb/rocksdb/tools/dump/db_dump_tool.cc +0 -1
- package/deps/rocksdb/rocksdb/tools/ldb_cmd.cc +120 -52
- package/deps/rocksdb/rocksdb/tools/ldb_cmd_test.cc +1 -0
- package/deps/rocksdb/rocksdb/tools/ldb_tool.cc +1 -1
- package/deps/rocksdb/rocksdb/tools/reduce_levels_test.cc +0 -2
- package/deps/rocksdb/rocksdb/tools/simulated_hybrid_file_system.cc +2 -2
- package/deps/rocksdb/rocksdb/tools/simulated_hybrid_file_system.h +0 -2
- package/deps/rocksdb/rocksdb/tools/sst_dump_tool.cc +2 -1
- package/deps/rocksdb/rocksdb/tools/tool_hooks.cc +94 -0
- package/deps/rocksdb/rocksdb/tools/trace_analyzer_tool.cc +0 -1
- package/deps/rocksdb/rocksdb/tools/trace_analyzer_tool.h +0 -1
- package/deps/rocksdb/rocksdb/trace_replay/io_tracer.cc +1 -1
- package/deps/rocksdb/rocksdb/trace_replay/io_tracer_test.cc +2 -1
- package/deps/rocksdb/rocksdb/trace_replay/trace_replay.cc +3 -5
- package/deps/rocksdb/rocksdb/util/async_file_reader.cc +1 -1
- package/deps/rocksdb/rocksdb/util/async_file_reader.h +15 -8
- package/deps/rocksdb/rocksdb/util/auto_skip_compressor.cc +131 -0
- package/deps/rocksdb/rocksdb/util/auto_skip_compressor.h +90 -0
- package/deps/rocksdb/rocksdb/util/autovector.h +1 -1
- package/deps/rocksdb/rocksdb/util/autovector_test.cc +2 -2
- package/deps/rocksdb/rocksdb/util/compaction_job_stats_impl.cc +0 -2
- package/deps/rocksdb/rocksdb/util/compression.cc +936 -4
- package/deps/rocksdb/rocksdb/util/compression.h +348 -232
- package/deps/rocksdb/rocksdb/util/compression_test.cc +229 -0
- package/deps/rocksdb/rocksdb/util/crc32c_arm64.cc +10 -10
- package/deps/rocksdb/rocksdb/util/crc32c_ppc.c +1 -0
- package/deps/rocksdb/rocksdb/util/data_structure.cc +2 -0
- package/deps/rocksdb/rocksdb/util/file_reader_writer_test.cc +1 -3
- package/deps/rocksdb/rocksdb/util/ppc-opcode.h +5 -5
- package/deps/rocksdb/rocksdb/util/simple_mixed_compressor.cc +108 -0
- package/deps/rocksdb/rocksdb/util/simple_mixed_compressor.h +67 -0
- package/deps/rocksdb/rocksdb/util/slice_test.cc +83 -0
- package/deps/rocksdb/rocksdb/util/string_util.cc +0 -2
- package/deps/rocksdb/rocksdb/util/string_util.h +10 -0
- package/deps/rocksdb/rocksdb/util/thread_operation.h +2 -1
- package/deps/rocksdb/rocksdb/util/udt_util.cc +18 -5
- package/deps/rocksdb/rocksdb/util/udt_util.h +10 -7
- package/deps/rocksdb/rocksdb/utilities/backup/backup_engine.cc +650 -154
- package/deps/rocksdb/rocksdb/utilities/backup/backup_engine_test.cc +438 -144
- package/deps/rocksdb/rocksdb/utilities/blob_db/blob_compaction_filter.cc +0 -1
- package/deps/rocksdb/rocksdb/utilities/blob_db/blob_db.h +0 -1
- package/deps/rocksdb/rocksdb/utilities/blob_db/blob_db_gc_stats.h +0 -1
- package/deps/rocksdb/rocksdb/utilities/blob_db/blob_db_impl.cc +16 -17
- package/deps/rocksdb/rocksdb/utilities/blob_db/blob_db_impl.h +2 -1
- package/deps/rocksdb/rocksdb/utilities/blob_db/blob_db_impl_filesnapshot.cc +0 -1
- package/deps/rocksdb/rocksdb/utilities/blob_db/blob_db_listener.h +0 -1
- package/deps/rocksdb/rocksdb/utilities/blob_db/blob_db_test.cc +7 -8
- package/deps/rocksdb/rocksdb/utilities/blob_db/blob_dump_tool.cc +4 -3
- package/deps/rocksdb/rocksdb/utilities/blob_db/blob_dump_tool.h +0 -1
- package/deps/rocksdb/rocksdb/utilities/cache_dump_load.cc +0 -1
- package/deps/rocksdb/rocksdb/utilities/cache_dump_load_impl.cc +2 -2
- package/deps/rocksdb/rocksdb/utilities/checkpoint/checkpoint_impl.cc +1 -1
- package/deps/rocksdb/rocksdb/utilities/checkpoint/checkpoint_test.cc +0 -48
- package/deps/rocksdb/rocksdb/utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc +0 -1
- package/deps/rocksdb/rocksdb/utilities/compaction_filters/remove_emptyvalue_compactionfilter.h +0 -1
- package/deps/rocksdb/rocksdb/utilities/debug.cc +7 -14
- package/deps/rocksdb/rocksdb/utilities/env_mirror.cc +0 -1
- package/deps/rocksdb/rocksdb/utilities/env_mirror_test.cc +0 -2
- package/deps/rocksdb/rocksdb/utilities/env_timed.cc +0 -1
- package/deps/rocksdb/rocksdb/utilities/env_timed_test.cc +0 -2
- package/deps/rocksdb/rocksdb/utilities/fault_injection_fs.cc +5 -3
- package/deps/rocksdb/rocksdb/utilities/fault_injection_fs.h +10 -9
- package/deps/rocksdb/rocksdb/utilities/memory/memory_test.cc +0 -1
- package/deps/rocksdb/rocksdb/utilities/memory/memory_util.cc +0 -1
- package/deps/rocksdb/rocksdb/utilities/memory_allocators.h +1 -0
- package/deps/rocksdb/rocksdb/utilities/object_registry_test.cc +0 -2
- package/deps/rocksdb/rocksdb/utilities/options/options_util.cc +0 -1
- package/deps/rocksdb/rocksdb/utilities/options/options_util_test.cc +0 -1
- package/deps/rocksdb/rocksdb/utilities/persistent_cache/block_cache_tier.cc +0 -1
- package/deps/rocksdb/rocksdb/utilities/persistent_cache/block_cache_tier.h +0 -2
- package/deps/rocksdb/rocksdb/utilities/persistent_cache/block_cache_tier_file.h +0 -2
- package/deps/rocksdb/rocksdb/utilities/persistent_cache/block_cache_tier_metadata.cc +0 -1
- package/deps/rocksdb/rocksdb/utilities/persistent_cache/block_cache_tier_metadata.h +0 -2
- package/deps/rocksdb/rocksdb/utilities/persistent_cache/hash_table.h +0 -2
- package/deps/rocksdb/rocksdb/utilities/persistent_cache/hash_table_evictable.h +0 -2
- package/deps/rocksdb/rocksdb/utilities/persistent_cache/lrulist.h +0 -2
- package/deps/rocksdb/rocksdb/utilities/persistent_cache/persistent_cache_test.h +0 -2
- package/deps/rocksdb/rocksdb/utilities/persistent_cache/persistent_cache_tier.cc +0 -1
- package/deps/rocksdb/rocksdb/utilities/persistent_cache/persistent_cache_tier.h +0 -2
- package/deps/rocksdb/rocksdb/utilities/persistent_cache/volatile_tier_impl.cc +0 -1
- package/deps/rocksdb/rocksdb/utilities/persistent_cache/volatile_tier_impl.h +0 -2
- package/deps/rocksdb/rocksdb/utilities/secondary_index/faiss_ivf_index.cc +183 -32
- package/deps/rocksdb/rocksdb/utilities/secondary_index/faiss_ivf_index_test.cc +258 -12
- package/deps/rocksdb/rocksdb/utilities/secondary_index/secondary_index_helper.h +33 -0
- package/deps/rocksdb/rocksdb/utilities/secondary_index/secondary_index_iterator.cc +99 -0
- package/deps/rocksdb/rocksdb/utilities/secondary_index/secondary_index_mixin.h +280 -120
- package/deps/rocksdb/rocksdb/utilities/secondary_index/simple_secondary_index.cc +79 -0
- package/deps/rocksdb/rocksdb/utilities/table_properties_collectors/compact_on_deletion_collector.cc +52 -16
- package/deps/rocksdb/rocksdb/utilities/table_properties_collectors/compact_on_deletion_collector.h +10 -6
- package/deps/rocksdb/rocksdb/utilities/table_properties_collectors/compact_on_deletion_collector_test.cc +55 -0
- package/deps/rocksdb/rocksdb/utilities/trace/replayer_impl.cc +0 -1
- package/deps/rocksdb/rocksdb/utilities/transactions/lock/lock_manager.cc +0 -2
- package/deps/rocksdb/rocksdb/utilities/transactions/lock/lock_manager.h +0 -1
- package/deps/rocksdb/rocksdb/utilities/transactions/lock/point/point_lock_manager.cc +37 -12
- package/deps/rocksdb/rocksdb/utilities/transactions/lock/point/point_lock_manager.h +2 -0
- package/deps/rocksdb/rocksdb/utilities/transactions/lock/point/point_lock_manager_test.cc +0 -2
- package/deps/rocksdb/rocksdb/utilities/transactions/lock/point/point_lock_tracker.cc +0 -2
- package/deps/rocksdb/rocksdb/utilities/transactions/lock/range/range_locking_test.cc +1 -1
- package/deps/rocksdb/rocksdb/utilities/transactions/lock/range/range_tree/lib/db.h +1 -1
- package/deps/rocksdb/rocksdb/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h +1 -1
- package/deps/rocksdb/rocksdb/utilities/transactions/lock/range/range_tree/lib/util/dbt.cc +2 -1
- package/deps/rocksdb/rocksdb/utilities/transactions/lock/range/range_tree/range_tree_lock_manager.cc +2 -2
- package/deps/rocksdb/rocksdb/utilities/transactions/optimistic_transaction.cc +0 -1
- package/deps/rocksdb/rocksdb/utilities/transactions/optimistic_transaction.h +0 -2
- package/deps/rocksdb/rocksdb/utilities/transactions/optimistic_transaction_db_impl.cc +1 -3
- package/deps/rocksdb/rocksdb/utilities/transactions/pessimistic_transaction.cc +36 -10
- package/deps/rocksdb/rocksdb/utilities/transactions/pessimistic_transaction.h +5 -7
- package/deps/rocksdb/rocksdb/utilities/transactions/pessimistic_transaction_db.cc +4 -5
- package/deps/rocksdb/rocksdb/utilities/transactions/snapshot_checker.cc +1 -4
- package/deps/rocksdb/rocksdb/utilities/transactions/transaction_base.h +1 -2
- package/deps/rocksdb/rocksdb/utilities/transactions/transaction_db_mutex_impl.cc +0 -2
- package/deps/rocksdb/rocksdb/utilities/transactions/transaction_db_mutex_impl.h +0 -1
- package/deps/rocksdb/rocksdb/utilities/transactions/transaction_test.cc +1118 -37
- package/deps/rocksdb/rocksdb/utilities/transactions/transaction_test.h +4 -7
- package/deps/rocksdb/rocksdb/utilities/transactions/transaction_util.cc +0 -2
- package/deps/rocksdb/rocksdb/utilities/transactions/transaction_util.h +0 -2
- package/deps/rocksdb/rocksdb/utilities/transactions/write_prepared_transaction_test.cc +3 -3
- package/deps/rocksdb/rocksdb/utilities/transactions/write_prepared_txn_db.cc +0 -1
- package/deps/rocksdb/rocksdb/utilities/transactions/write_unprepared_transaction_test.cc +0 -2
- package/deps/rocksdb/rocksdb/utilities/transactions/write_unprepared_txn.cc +1 -2
- package/deps/rocksdb/rocksdb/utilities/transactions/write_unprepared_txn.h +1 -2
- package/deps/rocksdb/rocksdb/utilities/transactions/write_unprepared_txn_db.cc +0 -1
- package/deps/rocksdb/rocksdb/utilities/ttl/ttl_test.cc +0 -3
- package/deps/rocksdb/rocksdb/utilities/write_batch_with_index/write_batch_with_index.cc +125 -127
- package/deps/rocksdb/rocksdb/utilities/write_batch_with_index/write_batch_with_index_internal.cc +45 -23
- package/deps/rocksdb/rocksdb/utilities/write_batch_with_index/write_batch_with_index_internal.h +54 -22
- package/deps/rocksdb/rocksdb/utilities/write_batch_with_index/write_batch_with_index_test.cc +477 -58
- package/deps/rocksdb/rocksdb.gyp +9 -4
- package/index.js +50 -9
- package/package.json +8 -1
- package/prebuilds/darwin-arm64/@nxtedition+rocksdb.node +0 -0
- package/prebuilds/linux-x64/@nxtedition+rocksdb.node +0 -0
|
@@ -0,0 +1,483 @@
|
|
|
1
|
+
// Copyright (c) Meta Platforms, Inc. and affiliates.
|
|
2
|
+
// This source code is licensed under both the GPLv2 (found in the
|
|
3
|
+
// COPYING file in the root directory) and Apache 2.0 License
|
|
4
|
+
// (found in the LICENSE.Apache file in the root directory).
|
|
5
|
+
|
|
6
|
+
#include "rocksdb/external_table.h"
|
|
7
|
+
|
|
8
|
+
#include "logging/logging.h"
|
|
9
|
+
#include "rocksdb/table.h"
|
|
10
|
+
#include "table/block_based/block.h"
|
|
11
|
+
#include "table/internal_iterator.h"
|
|
12
|
+
#include "table/meta_blocks.h"
|
|
13
|
+
#include "table/table_builder.h"
|
|
14
|
+
#include "table/table_reader.h"
|
|
15
|
+
|
|
16
|
+
namespace ROCKSDB_NAMESPACE {
|
|
17
|
+
|
|
18
|
+
namespace {
|
|
19
|
+
|
|
20
|
+
class ExternalTableIteratorAdapter : public InternalIterator {
|
|
21
|
+
public:
|
|
22
|
+
explicit ExternalTableIteratorAdapter(ExternalTableIterator* iterator)
|
|
23
|
+
: iterator_(iterator), valid_(false) {}
|
|
24
|
+
|
|
25
|
+
// No copying allowed
|
|
26
|
+
ExternalTableIteratorAdapter(const ExternalTableIteratorAdapter&) = delete;
|
|
27
|
+
ExternalTableIteratorAdapter& operator=(const ExternalTableIteratorAdapter&) =
|
|
28
|
+
delete;
|
|
29
|
+
|
|
30
|
+
~ExternalTableIteratorAdapter() override {}
|
|
31
|
+
|
|
32
|
+
bool Valid() const override { return valid_; }
|
|
33
|
+
|
|
34
|
+
void SeekToFirst() override {
|
|
35
|
+
status_ = Status::OK();
|
|
36
|
+
if (iterator_) {
|
|
37
|
+
iterator_->SeekToFirst();
|
|
38
|
+
UpdateKey(OptSlice());
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
void SeekToLast() override {
|
|
43
|
+
status_ = Status::OK();
|
|
44
|
+
if (iterator_) {
|
|
45
|
+
iterator_->SeekToLast();
|
|
46
|
+
UpdateKey(OptSlice());
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
void Seek(const Slice& target) override {
|
|
51
|
+
status_ = Status::OK();
|
|
52
|
+
if (iterator_) {
|
|
53
|
+
ParsedInternalKey pkey;
|
|
54
|
+
status_ = ParseInternalKey(target, &pkey, /*log_err_key=*/false);
|
|
55
|
+
if (status_.ok()) {
|
|
56
|
+
iterator_->Seek(pkey.user_key);
|
|
57
|
+
UpdateKey(OptSlice());
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
void SeekForPrev(const Slice& target) override {
|
|
63
|
+
status_ = Status::OK();
|
|
64
|
+
if (iterator_) {
|
|
65
|
+
ParsedInternalKey pkey;
|
|
66
|
+
status_ = ParseInternalKey(target, &pkey, /*log_err_key=*/false);
|
|
67
|
+
if (status_.ok()) {
|
|
68
|
+
iterator_->SeekForPrev(pkey.user_key);
|
|
69
|
+
UpdateKey(OptSlice());
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
void Next() override {
|
|
75
|
+
if (iterator_) {
|
|
76
|
+
iterator_->Next();
|
|
77
|
+
UpdateKey(OptSlice());
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
bool NextAndGetResult(IterateResult* result) override {
|
|
82
|
+
if (iterator_) {
|
|
83
|
+
valid_ = iterator_->NextAndGetResult(&result_);
|
|
84
|
+
result->value_prepared = result_.value_prepared;
|
|
85
|
+
result->bound_check_result = result_.bound_check_result;
|
|
86
|
+
if (valid_) {
|
|
87
|
+
UpdateKey(result_.key);
|
|
88
|
+
result->key = key();
|
|
89
|
+
}
|
|
90
|
+
} else {
|
|
91
|
+
valid_ = false;
|
|
92
|
+
}
|
|
93
|
+
return valid_;
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
bool PrepareValue() override {
|
|
97
|
+
if (iterator_ && !result_.value_prepared) {
|
|
98
|
+
valid_ = iterator_->PrepareValue();
|
|
99
|
+
result_.value_prepared = true;
|
|
100
|
+
}
|
|
101
|
+
return valid_;
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
IterBoundCheck UpperBoundCheckResult() override {
|
|
105
|
+
if (iterator_) {
|
|
106
|
+
result_.bound_check_result = iterator_->UpperBoundCheckResult();
|
|
107
|
+
}
|
|
108
|
+
return result_.bound_check_result;
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
void Prev() override {
|
|
112
|
+
if (iterator_) {
|
|
113
|
+
iterator_->Prev();
|
|
114
|
+
UpdateKey(OptSlice());
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
Slice key() const override {
|
|
119
|
+
if (iterator_) {
|
|
120
|
+
return Slice(*key_.const_rep());
|
|
121
|
+
}
|
|
122
|
+
return Slice();
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
Slice value() const override {
|
|
126
|
+
if (iterator_) {
|
|
127
|
+
return iterator_->value();
|
|
128
|
+
}
|
|
129
|
+
return Slice();
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
Status status() const override { return status_; }
|
|
133
|
+
|
|
134
|
+
void Prepare(const std::vector<ScanOptions>* scan_opts) override {
|
|
135
|
+
if (iterator_) {
|
|
136
|
+
iterator_->Prepare(scan_opts->data(), scan_opts->size());
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
private:
|
|
141
|
+
std::unique_ptr<ExternalTableIterator> iterator_;
|
|
142
|
+
InternalKey key_;
|
|
143
|
+
bool valid_;
|
|
144
|
+
Status status_;
|
|
145
|
+
IterateResult result_;
|
|
146
|
+
|
|
147
|
+
void UpdateKey(OptSlice res) {
|
|
148
|
+
if (iterator_) {
|
|
149
|
+
valid_ = iterator_->Valid();
|
|
150
|
+
status_ = iterator_->status();
|
|
151
|
+
if (valid_ && status_.ok()) {
|
|
152
|
+
key_.Set(res.has_value() ? res.value() : iterator_->key(), 0,
|
|
153
|
+
ValueType::kTypeValue);
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
};
|
|
158
|
+
|
|
159
|
+
class ExternalTableReaderAdapter : public TableReader {
|
|
160
|
+
public:
|
|
161
|
+
explicit ExternalTableReaderAdapter(
|
|
162
|
+
const ImmutableOptions& ioptions,
|
|
163
|
+
std::unique_ptr<ExternalTableReader>&& reader)
|
|
164
|
+
: ioptions_(ioptions), reader_(std::move(reader)) {}
|
|
165
|
+
|
|
166
|
+
~ExternalTableReaderAdapter() override {}
|
|
167
|
+
|
|
168
|
+
// No copying allowed
|
|
169
|
+
ExternalTableReaderAdapter(const ExternalTableReaderAdapter&) = delete;
|
|
170
|
+
ExternalTableReaderAdapter& operator=(const ExternalTableReaderAdapter&) =
|
|
171
|
+
delete;
|
|
172
|
+
|
|
173
|
+
InternalIterator* NewIterator(
|
|
174
|
+
const ReadOptions& read_options, const SliceTransform* prefix_extractor,
|
|
175
|
+
Arena* arena, bool /* skip_filters */, TableReaderCaller /* caller */,
|
|
176
|
+
size_t /* compaction_readahead_size */ = 0,
|
|
177
|
+
bool /* allow_unprepared_value */ = false) override {
|
|
178
|
+
auto iterator = reader_->NewIterator(read_options, prefix_extractor);
|
|
179
|
+
if (arena == nullptr) {
|
|
180
|
+
return new ExternalTableIteratorAdapter(iterator);
|
|
181
|
+
} else {
|
|
182
|
+
auto* mem = arena->AllocateAligned(sizeof(ExternalTableIteratorAdapter));
|
|
183
|
+
return new (mem) ExternalTableIteratorAdapter(iterator);
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
|
|
187
|
+
uint64_t ApproximateOffsetOf(const ReadOptions&, const Slice&,
|
|
188
|
+
TableReaderCaller) override {
|
|
189
|
+
return 0;
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
uint64_t ApproximateSize(const ReadOptions&, const Slice&, const Slice&,
|
|
193
|
+
TableReaderCaller) override {
|
|
194
|
+
return 0;
|
|
195
|
+
}
|
|
196
|
+
|
|
197
|
+
void SetupForCompaction() override {}
|
|
198
|
+
|
|
199
|
+
std::shared_ptr<const TableProperties> GetTableProperties() const override {
|
|
200
|
+
std::shared_ptr<TableProperties> props;
|
|
201
|
+
std::unique_ptr<char[]> property_block;
|
|
202
|
+
uint64_t property_block_size = 0;
|
|
203
|
+
uint64_t property_block_offset = 0;
|
|
204
|
+
Status s;
|
|
205
|
+
// Get the raw properties block from the external table reader. We don't
|
|
206
|
+
// support writing the global sequence number, but we still get and return
|
|
207
|
+
// the correct global seqno offset in the file to prevent accidental
|
|
208
|
+
// corruption.
|
|
209
|
+
s = reader_->GetPropertiesBlock(&property_block, &property_block_size,
|
|
210
|
+
&property_block_offset);
|
|
211
|
+
if (s.ok()) {
|
|
212
|
+
std::unique_ptr<TableProperties> table_properties =
|
|
213
|
+
std::make_unique<TableProperties>();
|
|
214
|
+
BlockContents block_contents(std::move(property_block),
|
|
215
|
+
property_block_size);
|
|
216
|
+
Block block(std::move(block_contents));
|
|
217
|
+
s = ParsePropertiesBlock(ioptions_, property_block_offset, block,
|
|
218
|
+
table_properties);
|
|
219
|
+
if (s.ok()) {
|
|
220
|
+
props.reset(table_properties.release());
|
|
221
|
+
}
|
|
222
|
+
} else {
|
|
223
|
+
// Fallback to getting a minimal table properties structure from the
|
|
224
|
+
// external table reader
|
|
225
|
+
props = std::make_shared<TableProperties>(*reader_->GetTableProperties());
|
|
226
|
+
props->key_largest_seqno = 0;
|
|
227
|
+
}
|
|
228
|
+
return props;
|
|
229
|
+
}
|
|
230
|
+
|
|
231
|
+
size_t ApproximateMemoryUsage() const override { return 0; }
|
|
232
|
+
|
|
233
|
+
Status Get(const ReadOptions&, const Slice&, GetContext*,
|
|
234
|
+
const SliceTransform*, bool = false) override {
|
|
235
|
+
return Status::NotSupported(
|
|
236
|
+
"Get() not supported on external file iterator");
|
|
237
|
+
}
|
|
238
|
+
|
|
239
|
+
virtual Status VerifyChecksum(const ReadOptions& /*ro*/,
|
|
240
|
+
TableReaderCaller /*caller*/) override {
|
|
241
|
+
return Status::OK();
|
|
242
|
+
}
|
|
243
|
+
|
|
244
|
+
private:
|
|
245
|
+
const ImmutableOptions& ioptions_;
|
|
246
|
+
std::unique_ptr<ExternalTableReader> reader_;
|
|
247
|
+
};
|
|
248
|
+
|
|
249
|
+
class ExternalTableBuilderAdapter : public TableBuilder {
|
|
250
|
+
public:
|
|
251
|
+
explicit ExternalTableBuilderAdapter(
|
|
252
|
+
const TableBuilderOptions& topts,
|
|
253
|
+
std::unique_ptr<ExternalTableBuilder>&& builder,
|
|
254
|
+
std::unique_ptr<FSWritableFile>&& file)
|
|
255
|
+
: builder_(std::move(builder)),
|
|
256
|
+
file_(std::move(file)),
|
|
257
|
+
ioptions_(topts.ioptions) {
|
|
258
|
+
properties_.num_data_blocks = 1;
|
|
259
|
+
properties_.index_size = 0;
|
|
260
|
+
properties_.filter_size = 0;
|
|
261
|
+
properties_.format_version = 0;
|
|
262
|
+
properties_.key_largest_seqno = 0;
|
|
263
|
+
properties_.column_family_id = topts.column_family_id;
|
|
264
|
+
properties_.column_family_name = topts.column_family_name;
|
|
265
|
+
properties_.db_id = topts.db_id;
|
|
266
|
+
properties_.db_session_id = topts.db_session_id;
|
|
267
|
+
properties_.db_host_id = topts.ioptions.db_host_id;
|
|
268
|
+
if (!ReifyDbHostIdProperty(topts.ioptions.env, &properties_.db_host_id)
|
|
269
|
+
.ok()) {
|
|
270
|
+
ROCKS_LOG_INFO(topts.ioptions.logger,
|
|
271
|
+
"db_host_id property will not be set");
|
|
272
|
+
}
|
|
273
|
+
properties_.orig_file_number = topts.cur_file_num;
|
|
274
|
+
properties_.comparator_name = topts.ioptions.user_comparator != nullptr
|
|
275
|
+
? topts.ioptions.user_comparator->Name()
|
|
276
|
+
: "nullptr";
|
|
277
|
+
properties_.prefix_extractor_name =
|
|
278
|
+
topts.moptions.prefix_extractor != nullptr
|
|
279
|
+
? topts.moptions.prefix_extractor->AsString()
|
|
280
|
+
: "nullptr";
|
|
281
|
+
|
|
282
|
+
for (auto& factory : *topts.internal_tbl_prop_coll_factories) {
|
|
283
|
+
assert(factory);
|
|
284
|
+
std::unique_ptr<InternalTblPropColl> collector{
|
|
285
|
+
factory->CreateInternalTblPropColl(topts.column_family_id,
|
|
286
|
+
topts.level_at_creation,
|
|
287
|
+
topts.ioptions.num_levels)};
|
|
288
|
+
if (collector) {
|
|
289
|
+
table_properties_collectors_.emplace_back(std::move(collector));
|
|
290
|
+
}
|
|
291
|
+
}
|
|
292
|
+
}
|
|
293
|
+
|
|
294
|
+
void Add(const Slice& key, const Slice& value) override {
|
|
295
|
+
ParsedInternalKey pkey;
|
|
296
|
+
status_ = ParseInternalKey(key, &pkey, /*log_err_key=*/false);
|
|
297
|
+
if (status_.ok()) {
|
|
298
|
+
if (pkey.type != ValueType::kTypeValue) {
|
|
299
|
+
status_ = Status::NotSupported(
|
|
300
|
+
"Value type " + std::to_string(pkey.type) + "not supported");
|
|
301
|
+
} else {
|
|
302
|
+
builder_->Add(pkey.user_key, value);
|
|
303
|
+
properties_.num_entries++;
|
|
304
|
+
properties_.raw_key_size += key.size();
|
|
305
|
+
properties_.raw_value_size += value.size();
|
|
306
|
+
NotifyCollectTableCollectorsOnAdd(key, value, /*offset=*/0,
|
|
307
|
+
table_properties_collectors_,
|
|
308
|
+
ioptions_.logger);
|
|
309
|
+
}
|
|
310
|
+
}
|
|
311
|
+
}
|
|
312
|
+
|
|
313
|
+
Status status() const override {
|
|
314
|
+
if (status_.ok()) {
|
|
315
|
+
return builder_->status();
|
|
316
|
+
} else {
|
|
317
|
+
return status_;
|
|
318
|
+
}
|
|
319
|
+
}
|
|
320
|
+
|
|
321
|
+
IOStatus io_status() const override { return status_to_io_status(status()); }
|
|
322
|
+
|
|
323
|
+
Status Finish() override {
|
|
324
|
+
// Approximate the data size
|
|
325
|
+
properties_.data_size =
|
|
326
|
+
properties_.raw_key_size + properties_.raw_value_size;
|
|
327
|
+
|
|
328
|
+
PropertyBlockBuilder property_block_builder;
|
|
329
|
+
property_block_builder.AddTableProperty(properties_);
|
|
330
|
+
UserCollectedProperties more_user_collected_properties;
|
|
331
|
+
NotifyCollectTableCollectorsOnFinish(
|
|
332
|
+
table_properties_collectors_, ioptions_.logger, &property_block_builder,
|
|
333
|
+
more_user_collected_properties, properties_.readable_properties);
|
|
334
|
+
properties_.user_collected_properties.insert(
|
|
335
|
+
more_user_collected_properties.begin(),
|
|
336
|
+
more_user_collected_properties.end());
|
|
337
|
+
|
|
338
|
+
Slice prop_block = property_block_builder.Finish();
|
|
339
|
+
Status s = builder_->PutPropertiesBlock(prop_block);
|
|
340
|
+
if (s.ok() || s.IsNotSupported()) {
|
|
341
|
+
// If the builder doesn't support writing the properties block,
|
|
342
|
+
// we still call Finish() and let the external builder handle it.
|
|
343
|
+
s = builder_->Finish();
|
|
344
|
+
}
|
|
345
|
+
|
|
346
|
+
return s;
|
|
347
|
+
}
|
|
348
|
+
|
|
349
|
+
void Abandon() override { builder_->Abandon(); }
|
|
350
|
+
|
|
351
|
+
uint64_t FileSize() const override { return builder_->FileSize(); }
|
|
352
|
+
|
|
353
|
+
uint64_t NumEntries() const override { return properties_.num_entries; }
|
|
354
|
+
|
|
355
|
+
TableProperties GetTableProperties() const override {
|
|
356
|
+
return builder_->GetTableProperties();
|
|
357
|
+
}
|
|
358
|
+
|
|
359
|
+
std::string GetFileChecksum() const override {
|
|
360
|
+
return builder_->GetFileChecksum();
|
|
361
|
+
}
|
|
362
|
+
|
|
363
|
+
const char* GetFileChecksumFuncName() const override {
|
|
364
|
+
return builder_->GetFileChecksumFuncName();
|
|
365
|
+
}
|
|
366
|
+
|
|
367
|
+
private:
|
|
368
|
+
Status status_;
|
|
369
|
+
std::unique_ptr<ExternalTableBuilder> builder_;
|
|
370
|
+
std::unique_ptr<FSWritableFile> file_;
|
|
371
|
+
const ImmutableOptions& ioptions_;
|
|
372
|
+
TableProperties properties_;
|
|
373
|
+
std::vector<std::unique_ptr<InternalTblPropColl>>
|
|
374
|
+
table_properties_collectors_;
|
|
375
|
+
};
|
|
376
|
+
|
|
377
|
+
class ExternalTableFactoryAdapter : public TableFactory {
|
|
378
|
+
public:
|
|
379
|
+
explicit ExternalTableFactoryAdapter(
|
|
380
|
+
std::shared_ptr<ExternalTableFactory> inner)
|
|
381
|
+
: inner_(std::move(inner)) {}
|
|
382
|
+
|
|
383
|
+
const char* Name() const override { return inner_->Name(); }
|
|
384
|
+
|
|
385
|
+
using TableFactory::NewTableReader;
|
|
386
|
+
Status NewTableReader(
|
|
387
|
+
const ReadOptions& ro, const TableReaderOptions& topts,
|
|
388
|
+
std::unique_ptr<RandomAccessFileReader>&& file, uint64_t /* file_size */,
|
|
389
|
+
std::unique_ptr<TableReader>* table_reader,
|
|
390
|
+
bool /* prefetch_index_and_filter_in_cache */) const override {
|
|
391
|
+
// SstFileReader specifies largest_seqno as kMaxSequenceNumber to denote
|
|
392
|
+
// that its unknown
|
|
393
|
+
if (topts.largest_seqno > 0 && topts.largest_seqno != kMaxSequenceNumber) {
|
|
394
|
+
return Status::NotSupported(
|
|
395
|
+
"Ingesting file with sequence number larger than 0");
|
|
396
|
+
}
|
|
397
|
+
std::unique_ptr<ExternalTableReader> reader;
|
|
398
|
+
FileOptions fopts(topts.env_options);
|
|
399
|
+
ExternalTableOptions ext_topts(topts.prefix_extractor,
|
|
400
|
+
topts.ioptions.user_comparator,
|
|
401
|
+
topts.ioptions.fs, fopts);
|
|
402
|
+
auto status =
|
|
403
|
+
inner_->NewTableReader(ro, file->file_name(), ext_topts, &reader);
|
|
404
|
+
if (!status.ok()) {
|
|
405
|
+
return status;
|
|
406
|
+
}
|
|
407
|
+
table_reader->reset(
|
|
408
|
+
new ExternalTableReaderAdapter(topts.ioptions, std::move(reader)));
|
|
409
|
+
file.reset();
|
|
410
|
+
return Status::OK();
|
|
411
|
+
}
|
|
412
|
+
|
|
413
|
+
using TableFactory::NewTableBuilder;
|
|
414
|
+
TableBuilder* NewTableBuilder(const TableBuilderOptions& topts,
|
|
415
|
+
WritableFileWriter* file) const override {
|
|
416
|
+
std::unique_ptr<ExternalTableBuilder> builder;
|
|
417
|
+
ExternalTableBuilderOptions ext_topts(
|
|
418
|
+
topts.read_options, topts.write_options,
|
|
419
|
+
topts.moptions.prefix_extractor, topts.ioptions.user_comparator,
|
|
420
|
+
topts.column_family_name, topts.reason);
|
|
421
|
+
auto file_wrapper =
|
|
422
|
+
std::make_unique<ExternalTableWritableFileWrapper>(file);
|
|
423
|
+
builder.reset(inner_->NewTableBuilder(ext_topts, file->file_name(),
|
|
424
|
+
file_wrapper.get()));
|
|
425
|
+
if (builder) {
|
|
426
|
+
return new ExternalTableBuilderAdapter(topts, std::move(builder),
|
|
427
|
+
std::move(file_wrapper));
|
|
428
|
+
}
|
|
429
|
+
return nullptr;
|
|
430
|
+
}
|
|
431
|
+
|
|
432
|
+
std::unique_ptr<TableFactory> Clone() const override { return nullptr; }
|
|
433
|
+
|
|
434
|
+
private:
|
|
435
|
+
// An FSWritableFile subclass for wrapping a WritableFileWriter. The
|
|
436
|
+
// latter is private to RocksDB, so we wrap it here in order to pass it
|
|
437
|
+
// to the ExternalTableBuilder. This is necessary for WritableFileWriter
|
|
438
|
+
// to intercept Append so that it can calculate the file checksum.
|
|
439
|
+
class ExternalTableWritableFileWrapper : public FSWritableFile {
|
|
440
|
+
public:
|
|
441
|
+
explicit ExternalTableWritableFileWrapper(WritableFileWriter* writer)
|
|
442
|
+
: writer_(writer) {}
|
|
443
|
+
|
|
444
|
+
using FSWritableFile::Append;
|
|
445
|
+
IOStatus Append(const Slice& data, const IOOptions& options,
|
|
446
|
+
IODebugContext* /*dbg*/) override {
|
|
447
|
+
return writer_->Append(options, data);
|
|
448
|
+
}
|
|
449
|
+
|
|
450
|
+
IOStatus Close(const IOOptions& options, IODebugContext* /*dbg*/) override {
|
|
451
|
+
return writer_->Close(options);
|
|
452
|
+
}
|
|
453
|
+
|
|
454
|
+
IOStatus Flush(const IOOptions& options, IODebugContext* /*dbg*/) override {
|
|
455
|
+
return writer_->Flush(options);
|
|
456
|
+
}
|
|
457
|
+
|
|
458
|
+
IOStatus Sync(const IOOptions& options, IODebugContext* /*dbg*/) override {
|
|
459
|
+
return writer_->Sync(options, /*use_fsync=*/false);
|
|
460
|
+
}
|
|
461
|
+
|
|
462
|
+
uint64_t GetFileSize(const IOOptions& options,
|
|
463
|
+
IODebugContext* dbg) override {
|
|
464
|
+
return writer_->writable_file()->GetFileSize(options, dbg);
|
|
465
|
+
}
|
|
466
|
+
|
|
467
|
+
private:
|
|
468
|
+
WritableFileWriter* writer_;
|
|
469
|
+
};
|
|
470
|
+
|
|
471
|
+
std::shared_ptr<ExternalTableFactory> inner_;
|
|
472
|
+
};
|
|
473
|
+
|
|
474
|
+
} // namespace
|
|
475
|
+
|
|
476
|
+
std::unique_ptr<TableFactory> NewExternalTableFactory(
|
|
477
|
+
std::shared_ptr<ExternalTableFactory> inner_factory) {
|
|
478
|
+
std::unique_ptr<TableFactory> res;
|
|
479
|
+
res = std::make_unique<ExternalTableFactoryAdapter>(std::move(inner_factory));
|
|
480
|
+
return res;
|
|
481
|
+
}
|
|
482
|
+
|
|
483
|
+
} // namespace ROCKSDB_NAMESPACE
|
|
@@ -229,7 +229,8 @@ Status FooterBuilder::Build(uint64_t magic_number, uint32_t format_version,
|
|
|
229
229
|
const BlockHandle& index_handle,
|
|
230
230
|
uint32_t base_context_checksum) {
|
|
231
231
|
assert(magic_number != Footer::kNullTableMagicNumber);
|
|
232
|
-
assert(IsSupportedFormatVersion(format_version)
|
|
232
|
+
assert(IsSupportedFormatVersion(format_version) ||
|
|
233
|
+
TEST_AllowUnsupportedFormatVersion());
|
|
233
234
|
|
|
234
235
|
char* part2;
|
|
235
236
|
char* part3;
|
|
@@ -362,7 +363,8 @@ Status Footer::DecodeFrom(Slice input, uint64_t input_offset,
|
|
|
362
363
|
} else {
|
|
363
364
|
part3_ptr = magic_ptr - 4;
|
|
364
365
|
format_version_ = DecodeFixed32(part3_ptr);
|
|
365
|
-
if (UNLIKELY(!IsSupportedFormatVersion(format_version_)
|
|
366
|
+
if (UNLIKELY(!IsSupportedFormatVersion(format_version_) &&
|
|
367
|
+
!TEST_AllowUnsupportedFormatVersion())) {
|
|
366
368
|
return Status::Corruption("Corrupt or unsupported format_version: " +
|
|
367
369
|
std::to_string(format_version_));
|
|
368
370
|
}
|
|
@@ -475,6 +477,11 @@ std::string Footer::ToString() const {
|
|
|
475
477
|
return result;
|
|
476
478
|
}
|
|
477
479
|
|
|
480
|
+
bool& TEST_AllowUnsupportedFormatVersion() {
|
|
481
|
+
static bool allow = false;
|
|
482
|
+
return allow;
|
|
483
|
+
}
|
|
484
|
+
|
|
478
485
|
static Status ReadFooterFromFileInternal(const IOOptions& opts,
|
|
479
486
|
RandomAccessFileReader* file,
|
|
480
487
|
FileSystem& fs,
|
|
@@ -653,70 +660,81 @@ uint32_t ComputeBuiltinChecksumWithLastByte(ChecksumType type, const char* data,
|
|
|
653
660
|
}
|
|
654
661
|
}
|
|
655
662
|
|
|
656
|
-
Status
|
|
657
|
-
|
|
658
|
-
BlockContents* out_contents, uint32_t format_version,
|
|
663
|
+
Status DecompressBlockData(Decompressor::Args& args, Decompressor& decompressor,
|
|
664
|
+
BlockContents* out_contents,
|
|
659
665
|
const ImmutableOptions& ioptions,
|
|
660
666
|
MemoryAllocator* allocator) {
|
|
661
|
-
|
|
662
|
-
|
|
663
|
-
assert(uncompression_info.type() != kNoCompression &&
|
|
664
|
-
"Invalid compression type");
|
|
667
|
+
assert(args.compression_type != kNoCompression && "Invalid compression type");
|
|
665
668
|
|
|
666
669
|
StopWatchNano timer(ioptions.clock,
|
|
667
670
|
ShouldReportDetailedTime(ioptions.env, ioptions.stats));
|
|
668
|
-
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
|
|
672
|
-
|
|
673
|
-
|
|
674
|
-
|
|
675
|
-
|
|
676
|
-
|
|
677
|
-
CompressionTypeToString(uncompression_info.type()));
|
|
678
|
-
} else {
|
|
679
|
-
std::ostringstream oss;
|
|
680
|
-
oss << "Corrupted compressed block contents";
|
|
681
|
-
if (error_msg) {
|
|
682
|
-
oss << ": " << error_msg;
|
|
683
|
-
}
|
|
684
|
-
ret = Status::Corruption(
|
|
685
|
-
oss.str(), CompressionTypeToString(uncompression_info.type()));
|
|
686
|
-
}
|
|
687
|
-
return ret;
|
|
671
|
+
|
|
672
|
+
Status s = decompressor.ExtractUncompressedSize(args);
|
|
673
|
+
if (UNLIKELY(!s.ok())) {
|
|
674
|
+
return s;
|
|
675
|
+
}
|
|
676
|
+
CacheAllocationPtr ubuf = AllocateBlock(args.uncompressed_size, allocator);
|
|
677
|
+
s = decompressor.DecompressBlock(args, ubuf.get());
|
|
678
|
+
if (UNLIKELY(!s.ok())) {
|
|
679
|
+
return s;
|
|
688
680
|
}
|
|
689
681
|
|
|
690
|
-
*out_contents = BlockContents(std::move(ubuf), uncompressed_size);
|
|
682
|
+
*out_contents = BlockContents(std::move(ubuf), args.uncompressed_size);
|
|
691
683
|
|
|
692
684
|
if (ShouldReportDetailedTime(ioptions.env, ioptions.stats)) {
|
|
693
685
|
RecordTimeToHistogram(ioptions.stats, DECOMPRESSION_TIMES_NANOS,
|
|
694
686
|
timer.ElapsedNanos());
|
|
695
687
|
}
|
|
696
|
-
RecordTick(ioptions.stats, BYTES_DECOMPRESSED_FROM,
|
|
688
|
+
RecordTick(ioptions.stats, BYTES_DECOMPRESSED_FROM,
|
|
689
|
+
args.compressed_data.size());
|
|
697
690
|
RecordTick(ioptions.stats, BYTES_DECOMPRESSED_TO, out_contents->data.size());
|
|
698
691
|
RecordTick(ioptions.stats, NUMBER_BLOCK_DECOMPRESSED);
|
|
699
692
|
|
|
700
|
-
TEST_SYNC_POINT_CALLBACK("
|
|
701
|
-
static_cast<void*>(&
|
|
702
|
-
TEST_SYNC_POINT_CALLBACK(
|
|
703
|
-
|
|
704
|
-
"TamperWithDecompressionOutput",
|
|
705
|
-
static_cast<void*>(out_contents));
|
|
693
|
+
TEST_SYNC_POINT_CALLBACK("DecompressBlockData:TamperWithReturnValue",
|
|
694
|
+
static_cast<void*>(&s));
|
|
695
|
+
TEST_SYNC_POINT_CALLBACK("DecompressBlockData:TamperWithDecompressionOutput",
|
|
696
|
+
static_cast<void*>(out_contents));
|
|
706
697
|
|
|
707
|
-
return
|
|
698
|
+
return s;
|
|
708
699
|
}
|
|
709
700
|
|
|
710
|
-
Status
|
|
711
|
-
|
|
701
|
+
Status DecompressBlockData(const char* data, size_t size, CompressionType type,
|
|
702
|
+
Decompressor& decompressor,
|
|
703
|
+
BlockContents* out_contents,
|
|
704
|
+
const ImmutableOptions& ioptions,
|
|
705
|
+
MemoryAllocator* allocator,
|
|
706
|
+
Decompressor::ManagedWorkingArea* working_area) {
|
|
707
|
+
Decompressor::Args args;
|
|
708
|
+
args.compressed_data = Slice(data, size);
|
|
709
|
+
args.compression_type = type;
|
|
710
|
+
args.working_area = working_area;
|
|
711
|
+
return DecompressBlockData(args, decompressor, out_contents, ioptions,
|
|
712
|
+
allocator);
|
|
713
|
+
}
|
|
714
|
+
|
|
715
|
+
Status DecompressSerializedBlock(const char* data, size_t size,
|
|
716
|
+
CompressionType type,
|
|
717
|
+
Decompressor& decompressor,
|
|
712
718
|
BlockContents* out_contents,
|
|
713
|
-
uint32_t format_version,
|
|
714
719
|
const ImmutableOptions& ioptions,
|
|
715
720
|
MemoryAllocator* allocator) {
|
|
716
721
|
assert(data[size] != kNoCompression);
|
|
717
|
-
assert(data[size] == static_cast<char>(
|
|
718
|
-
return
|
|
719
|
-
|
|
722
|
+
assert(data[size] == static_cast<char>(type));
|
|
723
|
+
return DecompressBlockData(data, size, type, decompressor, out_contents,
|
|
724
|
+
ioptions, allocator);
|
|
725
|
+
}
|
|
726
|
+
|
|
727
|
+
Status DecompressSerializedBlock(Decompressor::Args& args,
|
|
728
|
+
Decompressor& decompressor,
|
|
729
|
+
BlockContents* out_contents,
|
|
730
|
+
const ImmutableOptions& ioptions,
|
|
731
|
+
MemoryAllocator* allocator) {
|
|
732
|
+
assert(args.compressed_data.data()[args.compressed_data.size()] !=
|
|
733
|
+
kNoCompression);
|
|
734
|
+
assert(args.compressed_data.data()[args.compressed_data.size()] ==
|
|
735
|
+
static_cast<char>(args.compression_type));
|
|
736
|
+
return DecompressBlockData(args, decompressor, out_contents, ioptions,
|
|
737
|
+
allocator);
|
|
720
738
|
}
|
|
721
739
|
|
|
722
740
|
// Replace the contents of db_host_id with the actual hostname, if db_host_id
|