Commit 3f34060
yiwu-arbug
update rocksdb for master (#408)
Update rocksdb for master branch with following changes:
Cherry-picking flaky test fix:
```
8c436ff96 2019-12-16 [email protected] Fix DBFlushTest::FireOnFlushCompletedAfterCommittedResult hang (#6018)
```
Cherry-picking titan iterator fix:
```
74a1cac78 2019-11-25 [email protected] Fix blob context when db_iter uses seek (#6051)
```
Cherry-picking intra-L0 fixes:
```
193cded5a 2019-11-25 bupt2013211450@gma.. fix unstable unittest caused by #5958 (#6061)
7f67659af 2019-11-25 bupt2013211450@gma.. Fix corruption with intra-L0 on ingested files (#5958)
```
Cherry-picking unordered_write fixes:
```
165702113 2019-11-25 bupt2013211450@gma.. Fix IngestExternalFile's bug with two_write_queue (#5976)
720acf34a 2019-12-16 zbk602423539@gmail.. wait pending memtable writes on file ingestion or compact range (#6113)
380779db1 2019-12-16 [email protected] Move pipeline write waiting logic into WaitForPendingWrites() (#5716)
```
Upgrade from rocksdb 6.4.4 to 6.4.6:
```
2c55ed1e3 2019-11-25 [email protected] Bump up the version to 6.4.6
5fe5d4b90 2019-11-25 [email protected] Update HISTORY for SeekForPrev bug fix (#5925)
dee7a8cb6 2019-11-25 [email protected] Fix SeekForPrev bug with Partitioned Filters and Prefix (#5907)
aa28dae99 2019-11-25 anand76@devvm1373... Update HISTORY.md with a bug fix
b626c6a2a 2019-11-25 anand76@devvm1373... Fix data block upper bound checking for iterator reseek case (#5883)
c4801798b 2019-11-25 [email protected] Fix a bug of the previous fix.
da1af09f7 2019-11-25 [email protected] Bump up the version to 6.4.5
47526f4c9 2019-11-25 [email protected] Revert "Merging iterator to avoid child iterator reseek for some cases (#5286)" (#5871)
```
Signed-off-by: Yi Wu <[email protected]>1 parent 809c1dc commit 3f34060
1 file changed
+1
-1
lines changed- HISTORY.md+9-1
- db/column_family.cc+5-1
- db/compaction/compaction_picker.cc+33-12
- db/compaction/compaction_picker.h+14-13
- db/compaction/compaction_picker_fifo.cc+2-1
- db/compaction/compaction_picker_fifo.h+4-4
- db/compaction/compaction_picker_level.cc+11-6
- db/compaction/compaction_picker_level.h+4-4
- db/compaction/compaction_picker_test.cc+44-12
- db/compaction/compaction_picker_universal.cc+2-1
- db/compaction/compaction_picker_universal.h+4-5
- db/db_blob_index_test.cc+20
- db/db_compaction_test.cc+203
- db/db_flush_test.cc+2-2
- db/db_impl/db_impl.cc+7
- db/db_impl/db_impl.h+13
- db/db_impl/db_impl_compaction_flush.cc+18-2
- db/db_impl/db_impl_debug.cc+10-1
- db/db_impl/db_impl_write.cc+31-23
- db/db_iter.cc+2
- db/db_iterator_test.cc+27-69
- db/error_handler_test.cc+4-2
- db/external_sst_file_test.cc+49
- db/version_set.cc+1-2
- include/rocksdb/version.h+1-1
- table/block_based/block_based_table_reader.cc+10-1
- table/block_based/block_based_table_reader.h+1-2
- table/block_based/partitioned_filter_block.cc+6-1
- table/block_based/partitioned_filter_block_test.cc+11-1
- table/internal_iterator.h+2-3
- table/iterator_wrapper.h-1
- table/merging_iterator.cc+2-17
- tools/db_crashtest.py+3-4
0 commit comments