andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Hotfix RocksDB 3.5

Browse Source 
Summary: We'll release this as 3.5.1

Test Plan: Tested in master

Reviewers: tnovak, yhchiang, sdong, ljin

Reviewed By: ljin

Subscribers: leveldb

Differential Revision: https://reviews.facebook.net/D24639
This commit is contained in:
Igor Canadi 2014-10-08 10:04:12 -07:00
parent d67500a591
commit 1fdd726a82
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -177,7 +177,7 @@ SHARED = $(SHARED1)
else else
# Update db.h if you change these. # Update db.h if you change these.
SHARED_MAJOR = 3 SHARED_MAJOR = 3
SHARED_MINOR = 4 SHARED_MINOR = 5
SHARED1 = ${LIBNAME}.$(PLATFORM_SHARED_EXT) SHARED1 = ${LIBNAME}.$(PLATFORM_SHARED_EXT)
SHARED2 = $(SHARED1).$(SHARED_MAJOR) SHARED2 = $(SHARED1).$(SHARED_MAJOR)
SHARED3 = $(SHARED1).$(SHARED_MAJOR).$(SHARED_MINOR) SHARED3 = $(SHARED1).$(SHARED_MAJOR).$(SHARED_MINOR)

20
db/db_impl.cc
View File

@ -4163,15 +4163,19 @@ void DBImpl::BuildBatchGroup(Writer** last_writer,
break; break;
} }
if (w->batch != nullptr) { if (w->batch == nullptr) {
size += WriteBatchInternal::ByteSize(w->batch); // Do not include those writes with nullptr batch. Those are not writes,
if (size > max_size) { // those are something else. They want to be alone
// Do not make batch too big break;
break;
}
write_batch_group->push_back(w->batch);
} }
size += WriteBatchInternal::ByteSize(w->batch);
if (size > max_size) {
// Do not make batch too big
break;
}
write_batch_group->push_back(w->batch);
w->in_batch_group = true; w->in_batch_group = true;
*last_writer = w; *last_writer = w;
} }

2
include/rocksdb/version.h
View File

@ -7,7 +7,7 @@
// Also update Makefile if you change these // Also update Makefile if you change these
#define ROCKSDB_MAJOR 3 #define ROCKSDB_MAJOR 3
#define ROCKSDB_MINOR 5 #define ROCKSDB_MINOR 5
#define ROCKSDB_PATCH 0 #define ROCKSDB_PATCH 1
// Do not use these. We made the mistake of declaring macros starting with // Do not use these. We made the mistake of declaring macros starting with
// double underscore. Now we have to live with our choice. We'll deprecate these // double underscore. Now we have to live with our choice. We'll deprecate these