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.

Sign up for GitHub

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

c-deps: bump RocksDB from 5.13 to 5.17.2 #32931

Merged
merged 1 commit into from
Dec 7, 2018
Merged

c-deps: bump RocksDB from 5.13 to 5.17.2 #32931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ STRESSFLAGS :=
## Cluster to use for `make roachprod-stress`
CLUSTER :=

## Verbose allows turning on verbose output from the cmake builds.
VERBOSE :=

DUPLFLAGS := -t 100
GOFLAGS :=
TAGS :=
Expand Down Expand Up @@ -551,7 +554,8 @@ $(ROCKSDB_DIR)/Makefile: $(C_DEPS_DIR)/rocksdb-rebuild | bin/.submodules-initial
$(if $(findstring release,$(BUILDTYPE)),-DPORTABLE=ON) -DWITH_GFLAGS=OFF \
-DSNAPPY_LIBRARIES=$(LIBSNAPPY) -DSNAPPY_INCLUDE_DIR="$(SNAPPY_SRC_DIR);$(SNAPPY_DIR)" -DWITH_SNAPPY=ON \
$(if $(use-stdmalloc),,-DJEMALLOC_LIBRARIES=$(LIBJEMALLOC) -DJEMALLOC_INCLUDE_DIR=$(JEMALLOC_DIR)/include -DWITH_JEMALLOC=ON) \
-DCMAKE_BUILD_TYPE=$(if $(ENABLE_ROCKSDB_ASSERTIONS),Debug,Release)
-DCMAKE_BUILD_TYPE=$(if $(ENABLE_ROCKSDB_ASSERTIONS),Debug,Release) \
-DUSE_RTTI=1

$(SNAPPY_DIR)/Makefile: $(C_DEPS_DIR)/snappy-rebuild | bin/.submodules-initialized
rm -rf $(SNAPPY_DIR)
Expand Down
1 change: 1 addition & 0 deletions build/variables.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ define VALID_VARS
UI_TS_OSS
UNAME
USE_ROCKSDB_ASSERTIONS
VERBOSE
WEBPACK
WEBPACK_DASHBOARD
WEBPACK_DEV_SERVER
Expand Down
2 changes: 1 addition & 1 deletion c-deps/rocksdb
Open in desktop
Submodule rocksdb updated 626 files
2 changes: 1 addition & 1 deletion c-deps/rocksdb-rebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Bump the version below when changing rocksdb CMake flags. Search for "BUILD
ARTIFACT CACHING" in build/common.mk for rationale.

10
11
2 changes: 1 addition & 1 deletion pkg/storage/engine/rocksdb_error_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func TestRocksDBErrorSafeMessage(t *testing.T) {
{
err: rErr,
// "locks" is redacted because this last part of the message is actually from `strerror` (ANSI-C).
expMsg: "io error while lock file <redacted> no <redacted> available",
expMsg: "io error lock <redacted> <redacted> no <redacted> available",
},
{
// A real-world example.
Expand Down