Merge branch 'patch_rocks_db' into 'keydbpro'

public copy of rocksdb

See merge request keydb-dev/KeyDB-Pro!36

Former-commit-id: 4421396764688f7df2c967974f6a3b5dca28e3f5
This commit is contained in:
Malavan Sotheeswaran 2021-08-19 18:08:16 +00:00
commit df6aeee332
2 changed files with 5 additions and 4 deletions

View File

@ -12,7 +12,7 @@ build:
- docker - docker
stage: build stage: build
script: script:
- git submodule init && git submodule update - git submodule update --init --remote
- make distclean - make distclean
- make -j - make -j
artifacts: artifacts:
@ -113,7 +113,7 @@ endurance-test:
- docker - docker
stage: test stage: test
script: script:
- git submodule init && git submodule update - git submodule update --init --remote
- make distclean - make distclean
- make -j - make -j
- ./runtest --config server-threads 3 --loop --stop - ./runtest --config server-threads 3 --loop --stop
@ -125,7 +125,7 @@ coverage-test:
- docker - docker
stage: test stage: test
script: script:
- git submodule init && git submodule update - git submodule update --init --remote
- make distclean - make distclean
- make gcov -j - make gcov -j
- make install - make install

3
.gitmodules vendored
View File

@ -1,6 +1,7 @@
[submodule "deps/rocksdb"] [submodule "deps/rocksdb"]
path = deps/rocksdb path = deps/rocksdb
url = https://github.com/facebook/rocksdb.git url = https://gitlab.eqalpha.com/submodules/rocksdb.git
branch = keydb_v6
[submodule "deps/depot_tools"] [submodule "deps/depot_tools"]
path = deps/depot_tools path = deps/depot_tools
url = https://chromium.googlesource.com/chromium/tools/depot_tools.git url = https://chromium.googlesource.com/chromium/tools/depot_tools.git