Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent overlapping #175

Merged
merged 2 commits into from
Dec 12, 2017
Merged

Conversation

zhangjinpeng87
Copy link
Member

Cherry-pick bug-fix about using DeleteRange mix with DeleteFilesInRange.
delete range bug-fix
prevent overlapping

80134e9 Preserve overlapping file endpoint invariant (rust-rocksdb#11)
23ba5bb fix delete range bug (rust-rocksdb#10)
bfcf674 cherry-pick optimize ingest sst (rust-rocksdb#5)
7ecb1c0 cherry-pick table filter (rust-rocksdb#7)
149f822 Merge pull request rust-rocksdb#8 from zhangjinpeng1987/zhangjinpeng/5.8
b8655d9 cmake: pass "-msse4.2" to when building crc32c.cc if HAVE_SSE42
fe6e58b 5.8.fb
aead404 fix HISTORY.md typo
a0cdc3c Bump version to 5.8.7
7513f63 Fix IOError on WAL write doesn't propagate to write group follower
9e47084 Bump version to 5.8.6
36074ba Enable cacheline_aligned_alloc() to allocate from jemalloc if enabled.
aa00523 Add -DPORTABLE=1 to MSVC CI build
cf2b982 Bump version to 5.8.5
e8c9350 Blob DB: not using PinnableSlice move assignment
4907d24 Bump version to 5.8.4
5d928c7 Blob DB: Fix race condition between flush and write
725bb9d Blob DB: Fix release build
b7367fe Bump version to 5.8.3
13b2a9b Blob DB: use compression in file header instead of global options
5dc70a1 Fix PinnableSlice move assignment
9019e91 dynamically change current memtable size
7f1815c Bump version to 5.8.2
2584a18 Blob DB: Fix BlobDBTest::SnapshotAndGarbageCollection asan failure
17f67b5 PinnableSlice move assignment
6fb56c5 Blob DB: Add compaction filter to remove expired blob index entries
f90ced9 Blob DB: fix snapshot handling
632f36d Blob DB: option to enable garbage collection
11bacd5 Blob DB: Fix flaky BlobDBTest::GCExpiredKeyWhileOverwriting test
f98efcb Blob DB: Evict oldest blob file when close to blob db size limit
c1e99ed Blob DB: cleanup unused options
ffc3c62 Blob DB: Initialize all fields in Blob Header, Footer and Record structs
9e82540 Blob DB: update blob file format
d66bb21 Blob DB: Inline small values in base DB
05d5c57 Return write error on reaching blob dir size limit
2b8893b Blob DB: Store blob index as kTypeBlobIndex in base db
419b93c Blob DB: not writing sequence number as blob record footer
8afb003 fix lite build
dded348 Blob DB: Move BlobFile definition to a separate file
3747361 add GetLiveFiles and GetLiveFilesMetaData for BlobDB
8cff6e9 Enable WAL for blob index
c293472 Add ValueType::kTypeBlobIndex
eae53de Make it explicit blob db doesn't support CF
65aec19 Fix memory leak on blob db open
30b38c9 TableProperty::oldest_key_time defaults to 0
2879f4b Bump version to 5.8.1
88595c8 Add DB::Properties::kEstimateOldestKeyTime
266ac24 Bumping version to 5.8
64185c2 update HISTORY.md for DeleteRange bug fix
e83d6a0 Not using aligned_alloc with gcc4 + asan
0980dc6 Fix wrong smallest key of delete range tombstones
b767972 avoid use-after-move error
c417442 CMake: Fix formatting
c21ea8f CMake: Add support for CMake packages
5444345 add Erlang to the list of language bindings
2972a70 Minor updates to FlushWAL blog
fbfa3e7 WriteAtPrepare: Efficient read from snapshot list
b01f426 Blog post for FlushWAL
503db68 make blob file close synchronous
3c840d1 Allow DB reopen with reduced options.num_levels
92bfd6c Fix DropColumnFamily data race
7fdf735 Pinnableslice examples and blog post
7fbb9ec support disabling checksum in block-based table
19cc66d fix clang bug in block-based table reader
7eba54e test compaction input-level split range tombstone assumption
cd26af3 Add unit test for WritePrepared skeleton
a124798 Improved transactions support in C API
c10b391 LANGUAGE-BINDINGS.md: add another rust binding
9017743 Remove leftover references to phutil_module_cache
234f33a allow nullptr Slice only as sentinel
ccf7f83 Use PinnableSlice in Transactions
1dfcdb1 Extend pin_l0 to filter partitions
39ef900 stop calling memcmp with nullptrs
78cb6b6 Provide byte[] version of SstFileWriter.merge to reduce GC Stall
867fe92 Scale histogram bucket size by constant factor
f004307 CMake improvements
09ac620 Circumvent ASAN false positive
5b68b11 Blob db create a snapshot before every read
4624ae5 GC the oldest file when out of space
8ace1f7 add counter for deletion dropping optimization
0d8e992 Revert the mistake in version update
5358a80 add VerifyChecksum to HISTORY.md
ed0a4c9 perf_context measure user bytes read
1efc600 Preload l0 index partitions
bddd5d3 Added mechanism to track deadlock chain
c1384a7 fix db_stress uint64_t to int32 cast
29877ec Fix blob db crash during calculating write amp
8f2598a Enable Cassandra merge operator to be called with a single merge operand
9a44b4c Allow merge operator to be called even with a single operand
ac8fb77 fix some misspellings
2359317 minor improvements to db_stress
af012c0 fix deleterange with memtable prefix bloom
1c8dbe2 update scores after picking universal compaction
eb64253 Update WritePrepared with the pseudo code
132306f Remove PartialMerge implementation from Cassandra merge operator
71598cd Fix false removal of tombstone issue in FIFO and kCompactionStyleNone
3204a4f Fix missing stdlib include required for abort()
7aa96db db_stress rolling active window
dfa6c23 Update RocksDBCommonHelper to use escapeshellarg
e367774 Overload new[] to properly align LRUCacheShard
ad42d2f Remove residual arcanist_util directory
279296f properly set C[XX]FLAGS during CMake configure-time checks
c5f0c6c compile with correct flags to determine SSE4.2 support
185ade4 cmake: support more compression type
5449c09 rocksdb: make buildable on aarch64
a144a97 Fix for CMakeLists.txt on Windows for RocksJava
acf935e fix deletion dropping in intra-L0
8254e9b make sst_dump compression size command consistent
74f18c1 db_bench support for non-uniform column family ops
5de98f2 approximate histogram stats to save cpu
3f58884 Fix c_test ASAN failure
e5a1b72 Fix blob DB transaction usage while GC
6f051e0 fix corruption_test valgrind
ac098a4 expose set_skip_stats_update_on_db_open to C bindings
666a005 Support prefetch last 512KB with direct I/O in block based file reader
ad77ee0 Revert "Makefile: correct faligned-new test"
b87ee6f Use more keys per lock in daily TSAN crash test
25df242 Add column families related functions (C API)
64f8484 block_cache_tier: fix gcc-7 warnings
0cecf81 Write batch for `TransactionDB` in C API
6a9de43 Windows.h macro call fix
23c7d13 fix comment
1fbad84 Makefile: correct faligned-new test
7848f0b add VerifyChecksum() to db.h
47ed3bf fix WinEnv assertions
d97a72d Try to repair db with wal_dir option, avoid leak some WAL files
36375de gcc-7/i386: markup intentional fallthroughs
bdc056f Refactor PessimisticTransaction
a9a4e89 Fix valgrind complaint about initialization
4ca11b4 Update USERS.md
c9804e0 Refactor TransactionDBImpl
20dc5e7 Optimize range-delete aggregator call in merge helper.
0d4a2b7 Avoid blob db call Sync() while writing
627c9f1 Don't add -ljemalloc when DISABLE_JEMALLOC is set
dce6d5a db_bench background work thread pool size arguments
4f81ab3 Makefile: fix for GCC 7+ and clang 4+
92afe83 Update all blob db TTL and timestamps to uint64_t
5883a1a Fix /bin/bash shebangs
cc01985 Introduce bottom-pri thread pool for large universal compactions
0b814ba Allow concurrent writes to blob db
2c45ada Blob DB garbage collection should keep keys with newer version
58410ae Fix the overflow bug in AwaitState
c3d5c4d Refactor TransactionImpl
060ccd4 support multiple CFs with OPTIONS file
3453870 Fix statistics in RocksJava sample
1900771 Dump Blob DB options to info log
3218edc Fix universal compaction bug
6a36b3a fix db get/write stats
a84cee8 Add a missing "once" in .h
21696ba Replace dynamic_cast<>
e85f2c6 Prevent empty memtables from using a lot of memory
ac748c5 Fix FIFO Compaction with TTL tests
aaf42fe Move blob_db/ttl_extractor.h into blob_db/blob_db.h
aace465 Fix license headers in Cassandra related files
50a9691 CacheActivityLogger, component to log cache activity into a file
6083bc7 Blob DB TTL extractor
710411a fix asan/valgrind for TableCache cleanup
3a3fb00 TARGETS file not setting sse explicitly
fca4d6d Build fewer tests in Travis platform_dependent tests
8f553d3 remove unnecessary internal_comparator param in newIterator
7f6d012 "ccache -C" in Travis
d12691b move TableCache::EraseHandle outside of db mutex
f33f113 fix db_bench argument type
e7697b8 Fix LITE unit tests
3ce20e9 Fix use of RocksDBCommonHelper in cont_integration.sh
c281b44 Revert "CRC32 Power Optimization Changes"
9980de2 Fix FIFO compaction picker test
2289d38 CRC32 Power Optimization Changes
30b58cf Remove the orphan assert on !need_log_sync
fe1a555 Fix flaky write_callback_test
addbd27 5.6.1 release blog post
30edff3 buckification: remove explicit `-msse*` compiler flags
2b259c9 Lower num of iterations in DeadlockCycle test
277f6f2 Release note for partitioned index/filters
5e731a1 Remove unused rocksdb arcanist lib
9b11d43 Fix broken links
06f1917 add vcpkg as an windows option
ea8ad4f Fix compaction div by zero logging
34112ae Added db paths to c
1d8aa29 Gcc 7 ParsedInternalKey replace memset with clear function.
a4c42e8 Fix UBSAN issue of passing nullptr to memcmp
16e0388 LRUCacheShard cache line size alignment
216644c enable UBSAN macro in TARGETS
e67b35c Add Iterator::Refresh()
a34b2e3 Fix caching of compaction picker's next index
72502cf Revert "comment out unused parameters"
1d7048c comment out unused parameters
534c255 Cassandra compaction filter for purge expired columns and rows
63163a8 Remove make_new_version.sh
0302da4 Reduce blob db noisy logging
3e5ea29 Fix Flaky DeleteSchedulerTest::ImmediateDeleteOn25PercDBSize
a22b9cc overlapping endpoint fixes in level compaction picker
ffd2a2e delete ExpandInputsToCleanCut failure log
3e6e863 Remove arcanist_util directory
36651d1 Moving static AdaptationContext to outside function
6e3ee01 Update java/rocksjni.pom
ecff9d5 Include write_buffer_manager in ImmutableDBOptions::Dump
ae28634 Remove some left-over BSD headers
33b1de8 Remove format compatibility hack
2f37515 checkout local branch in check_format_compatible.sh
ddb22ac avoid collision with master branch in check format
0c03a7f set the remote for git checkout
7ac184c Revert cmake -DNDEBUG for non-MSVC
0655b58 enable PinnableSlice for RowCache
00464a3 Fix column_family_test with LITE build
b2dd192 tools/write_stress.cc: Correct "1204" typos.
cbaab30 table/block.h: change memset
f1a056e CodeMod: Prefer ADD_FAILURE() over EXPECT_TRUE(false), et cetera
4a2e489 Add back the LevelDB license file
a7321fc Remove the licensing description in CONTRIBUTING.md
3c327ac Change RocksDB License

git-subtree-dir: librocksdb_sys/rocksdb
git-subtree-split: 80134e957b9633d18ce61c251635ebb6eb1763f5
Copy link

@huachaohuang huachaohuang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@BusyJay
Copy link
Member

BusyJay commented Dec 12, 2017

LGTM

@zhangjinpeng87 zhangjinpeng87 merged commit f01a1b2 into tikv:master Dec 12, 2017
@zhangjinpeng87 zhangjinpeng87 deleted the prevet-overlapping branch December 12, 2017 08:44
yiwu-arbug pushed a commit that referenced this pull request Jun 4, 2020
update titan to include tikv/titan#169 for tikv-4.x

include the following changes
```
81814ec 2020-06-04 zbk602423539@gmail.. Fix GC may delete a already deleted blob file (#168) (#169)
80657c0 2020-06-04 zbk602423539@gmail.. Fix wrong assert delta < 0 for cocurrent compaction while flush (#172) (#176)
0db7976 2020-06-04 sre-bot@pingcap.com  Fix wrong live data size when encounter rewrite failure (#161) (#175)
c41f2a2 2020-06-04 sre-bot@pingcap.com  feat: Titan should return user value to compaction filter #163 (#164) (#174)
```

Signed-off-by: sre-bot <sre-bot@pingcap.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants