Skip to content

Commit 770e0d1

Browse files
authored
RocksDB 6.11 (#99)
Merge RocksDB 6.11
1 parent aecf955 commit 770e0d1

File tree

505 files changed

+34824
-9335
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

505 files changed

+34824
-9335
lines changed

.circleci/config.yml

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
version: 2.1
2+
3+
orbs:
4+
win: circleci/[email protected]
5+
6+
executors:
7+
windows-2xlarge:
8+
machine:
9+
image: 'windows-server-2019-vs2019:201908-06'
10+
resource_class: windows.2xlarge
11+
shell: bash.exe
12+
13+
jobs:
14+
build-linux:
15+
machine:
16+
image: ubuntu-1604:201903-01
17+
resource_class: 2xlarge
18+
steps:
19+
- checkout # check out the code in the project directory
20+
- run: pyenv global 3.5.2
21+
- run: sudo apt-get update -y
22+
- run: sudo apt-get install -y libgflags-dev
23+
- run: SKIP_FORMAT_BUCK_CHECKS=1 PRINT_PARALLEL_OUTPUTS=1 make J=32 all check -j32
24+
25+
build-linux-release:
26+
machine:
27+
image: ubuntu-1604:201903-01
28+
resource_class: 2xlarge
29+
steps:
30+
- checkout # check out the code in the project directory
31+
- run: make release -j32
32+
33+
build-linux-lite:
34+
machine:
35+
image: ubuntu-1604:201903-01
36+
resource_class: 2xlarge
37+
steps:
38+
- checkout # check out the code in the project directory
39+
- run: pyenv global 3.5.2
40+
- run: SKIP_FORMAT_BUCK_CHECKS=1 PRINT_PARALLEL_OUTPUTS=1 LITE=1 make J=32 all check -j32
41+
42+
build-linux-lite-release:
43+
machine:
44+
image: ubuntu-1604:201903-01
45+
resource_class: large
46+
steps:
47+
- checkout # check out the code in the project directory
48+
- run: make release -j32
49+
50+
build-linux-clang-no-test:
51+
machine:
52+
image: ubuntu-1604:201903-01
53+
resource_class: 2xlarge
54+
steps:
55+
- checkout # check out the code in the project directory
56+
- run: USE_CLANG=1 make all -j32
57+
58+
build-linux-cmake:
59+
machine:
60+
image: ubuntu-1604:201903-01
61+
resource_class: 2xlarge
62+
steps:
63+
- checkout # check out the code in the project directory
64+
- run: mkdir build && cd build && cmake -DWITH_GFLAGS=0 .. && make -j32
65+
66+
build-windows:
67+
executor: windows-2xlarge
68+
69+
environment:
70+
THIRDPARTY_HOME: C:/Users/circleci/thirdparty
71+
CMAKE_HOME: C:/Users/circleci/thirdparty/cmake-3.16.4-win64-x64
72+
CMAKE_BIN: C:/Users/circleci/thirdparty/cmake-3.16.4-win64-x64/bin/cmake.exe
73+
CMAKE_GENERATOR: Visual Studio 16 2019
74+
SNAPPY_HOME: C:/Users/circleci/thirdparty/snappy-1.1.7
75+
SNAPPY_INCLUDE: C:/Users/circleci/thirdparty/snappy-1.1.7;C:/Users/circleci/thirdparty/snappy-1.1.7/build
76+
SNAPPY_LIB_DEBUG: C:/Users/circleci/thirdparty/snappy-1.1.7/build/Debug/snappy.lib
77+
78+
steps:
79+
- checkout
80+
- run:
81+
name: "Install thirdparty dependencies"
82+
command: |
83+
mkdir ${THIRDPARTY_HOME}
84+
cd ${THIRDPARTY_HOME}
85+
echo "Installing CMake..."
86+
curl --fail --silent --show-error --output cmake-3.16.4-win64-x64.zip --location https://github.com/Kitware/CMake/releases/download/v3.16.4/cmake-3.16.4-win64-x64.zip
87+
unzip -q cmake-3.16.4-win64-x64.zip
88+
echo "Building Snappy dependency..."
89+
curl --fail --silent --show-error --output snappy-1.1.7.zip --location https://github.com/google/snappy/archive/1.1.7.zip
90+
unzip -q snappy-1.1.7.zip
91+
cd snappy-1.1.7
92+
mkdir build
93+
cd build
94+
${CMAKE_BIN} -G "${CMAKE_GENERATOR}" ..
95+
msbuild.exe Snappy.sln -maxCpuCount -property:Configuration=Debug -property:Platform=x64
96+
- run:
97+
name: "Build RocksDB"
98+
command: |
99+
mkdir build
100+
cd build
101+
${CMAKE_BIN} -G "${CMAKE_GENERATOR}" -DCMAKE_BUILD_TYPE=Debug -DOPTDBG=1 -DPORTABLE=1 -DSNAPPY=1 -DJNI=1 ..
102+
cd ..
103+
msbuild.exe build/rocksdb.sln -maxCpuCount -property:Configuration=Debug -property:Platform=x64
104+
- run:
105+
name: "Test RocksDB"
106+
shell: powershell.exe
107+
command: |
108+
build_tools\run_ci_db_test.ps1 -SuiteRun db_basic_test,db_test,db_test2,env_basic_test,env_test,db_merge_operand_test -Concurrency 16
109+
110+
workflows:
111+
build-linux:
112+
jobs:
113+
- build-linux
114+
build-linux-lite:
115+
jobs:
116+
- build-linux-lite
117+
build-linux-release:
118+
jobs:
119+
- build-linux-release
120+
build-linux-lite-release:
121+
jobs:
122+
- build-linux-lite-release
123+
build-linux-clang-no-test:
124+
jobs:
125+
- build-linux-clang-no-test
126+
build-linux-cmake:
127+
jobs:
128+
- build-linux-cmake
129+
build-windows:
130+
jobs:
131+
- build-windows

.github/workflows/sanity_check.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Check buck targets and code format
2+
on: [push, pull_request]
3+
jobs:
4+
check:
5+
name: Check TARGETS file and code format
6+
runs-on: ubuntu-latest
7+
steps:
8+
- name: Checkout feature branch
9+
uses: actions/checkout@v2
10+
with:
11+
fetch-depth: 0
12+
13+
- name: Fetch from upstream
14+
run: |
15+
git remote add upstream https://github.com/facebook/rocksdb.git && git fetch upstream
16+
17+
- name: Where am I
18+
run: |
19+
echo git status && git status
20+
echo "git remote -v" && git remote -v
21+
echo git branch && git branch
22+
23+
- name: Setup Python
24+
uses: actions/setup-python@v1
25+
26+
- name: Install Dependencies
27+
run: python -m pip install --upgrade pip
28+
29+
- name: Install argparse
30+
run: pip install argparse
31+
32+
- name: Download clang-format-diff.py
33+
uses: wei/wget@v1
34+
with:
35+
args: https://raw.githubusercontent.com/llvm-mirror/clang/master/tools/clang-format/clang-format-diff.py
36+
37+
- name: Check format
38+
run: VERBOSE_CHECK=1 make check-format
39+
40+
- name: Compare buckify output
41+
run: make check-buck-targets

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ manifest_dump
3434
sst_dump
3535
blob_dump
3636
block_cache_trace_analyzer
37+
db_with_timestamp_basic_test
3738
tools/block_cache_analyzer/*.pyc
3839
column_aware_encoding_exp
3940
util/build_version.cc
@@ -87,3 +88,5 @@ buckifier/__pycache__
8788
compile_commands.json
8889
.vscode
8990
.clangd
91+
clang-format-diff.py
92+
.py3/

.travis.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@ sudo: required
22
dist: trusty
33
language: cpp
44
os:
5-
- linux
5+
- linux
6+
- osx
7+
arch:
8+
- amd64
9+
- arm64
10+
- ppc64le
611
compiler:
712
- gcc
813
osx_image: xcode9.4
9-
jdk:
10-
- openjdk7
1114
cache:
1215
directories:
1316
- "$BUILD_DIR/aws"

0 commit comments

Comments
 (0)