Skip to content

Commit 20a6bab

Browse files
committed
Update to leveldb upstream using subtree merge
2 parents 2755b2b + 6648082 commit 20a6bab

File tree

156 files changed

+8569
-7863
lines changed

Some content is hidden

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

156 files changed

+8569
-7863
lines changed

src/leveldb/.appveyor.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# Build matrix / environment variables are explained on:
2+
# https://www.appveyor.com/docs/appveyor-yml/
3+
# This file can be validated on: https://ci.appveyor.com/tools/validate-yaml
4+
5+
version: "{build}"
6+
7+
environment:
8+
matrix:
9+
# AppVeyor currently has no custom job name feature.
10+
# http://help.appveyor.com/discussions/questions/1623-can-i-provide-a-friendly-name-for-jobs
11+
- JOB: Visual Studio 2017
12+
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
13+
CMAKE_GENERATOR: Visual Studio 15 2017
14+
15+
platform:
16+
- x86
17+
- x64
18+
19+
configuration:
20+
- RelWithDebInfo
21+
- Debug
22+
23+
build_script:
24+
- git submodule update --init --recursive
25+
- mkdir build
26+
- cd build
27+
- if "%platform%"=="x64" set CMAKE_GENERATOR=%CMAKE_GENERATOR% Win64
28+
- cmake --version
29+
- cmake .. -G "%CMAKE_GENERATOR%"
30+
-DCMAKE_CONFIGURATION_TYPES="%CONFIGURATION%"
31+
- cmake --build . --config "%CONFIGURATION%"
32+
- cd ..
33+
34+
test_script:
35+
- cd build && ctest --verbose --build-config "%CONFIGURATION%" && cd ..

src/leveldb/.clang-format

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Run manually to reformat a file:
2+
# clang-format -i --style=file <file>
3+
# find . -iname '*.cc' -o -iname '*.h' -o -iname '*.h.in' | xargs clang-format -i --style=file
4+
BasedOnStyle: Google
5+
DerivePointerAlignment: false
6+
7+
# Public headers are in a different location in the internal Google repository.
8+
# Order them so that when imported to the authoritative repository they will be
9+
# in correct alphabetical order.
10+
IncludeCategories:
11+
- Regex: '^(<|"(benchmarks|db|helpers)/)'
12+
Priority: 1
13+
- Regex: '^"(leveldb)/'
14+
Priority: 2
15+
- Regex: '^(<|"(issues|port|table|third_party|util)/)'
16+
Priority: 3
17+
- Regex: '.*'
18+
Priority: 4

src/leveldb/.gitignore

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
1-
build_config.mk
2-
*.a
3-
*.o
4-
*.dylib*
5-
*.so
6-
*.so.*
7-
*_test
8-
db_bench
9-
leveldbutil
10-
Release
11-
Debug
12-
Benchmark
13-
vs2010.*
1+
# Editors.
2+
*.sw*
3+
.vscode
4+
.DS_Store
5+
6+
# Build directory.
7+
build/
8+
out/

src/leveldb/.travis.yml

Lines changed: 75 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,82 @@
1+
# Build matrix / environment variables are explained on:
2+
# http://about.travis-ci.org/docs/user/build-configuration/
3+
# This file can be validated on: http://lint.travis-ci.org/
4+
15
language: cpp
6+
dist: bionic
7+
osx_image: xcode10.3
8+
29
compiler:
3-
- clang
410
- gcc
11+
- clang
512
os:
613
- linux
714
- osx
8-
sudo: false
9-
before_install:
10-
- echo $LANG
11-
- echo $LC_ALL
15+
16+
env:
17+
- BUILD_TYPE=Debug
18+
- BUILD_TYPE=RelWithDebInfo
19+
20+
addons:
21+
apt:
22+
sources:
23+
- sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main'
24+
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
25+
- sourceline: 'ppa:ubuntu-toolchain-r/test'
26+
packages:
27+
- clang-9
28+
- cmake
29+
- gcc-9
30+
- g++-9
31+
- libgoogle-perftools-dev
32+
- libkyotocabinet-dev
33+
- libsnappy-dev
34+
- libsqlite3-dev
35+
- ninja-build
36+
homebrew:
37+
packages:
38+
- cmake
39+
- crc32c
40+
- gcc@9
41+
- gperftools
42+
- kyoto-cabinet
43+
- llvm@9
44+
- ninja
45+
- snappy
46+
- sqlite3
47+
update: true
48+
49+
install:
50+
# The following Homebrew packages aren't linked by default, and need to be
51+
# prepended to the path explicitly.
52+
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then
53+
export PATH="$(brew --prefix llvm)/bin:$PATH";
54+
fi
55+
# /usr/bin/gcc points to an older compiler on both Linux and macOS.
56+
- if [ "$CXX" = "g++" ]; then export CXX="g++-9" CC="gcc-9"; fi
57+
# /usr/bin/clang points to an older compiler on both Linux and macOS.
58+
#
59+
# Homebrew's llvm package doesn't ship a versioned clang++ binary, so the values
60+
# below don't work on macOS. Fortunately, the path change above makes the
61+
# default values (clang and clang++) resolve to the correct compiler on macOS.
62+
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then
63+
if [ "$CXX" = "clang++" ]; then export CXX="clang++-9" CC="clang-9"; fi;
64+
fi
65+
- echo ${CC}
66+
- echo ${CXX}
67+
- ${CXX} --version
68+
- cmake --version
69+
70+
before_script:
71+
- mkdir -p build && cd build
72+
- cmake .. -G Ninja -DCMAKE_BUILD_TYPE=$BUILD_TYPE
73+
-DCMAKE_INSTALL_PREFIX=$HOME/.local
74+
- cmake --build .
75+
- cd ..
76+
1277
script:
13-
- make -j 4 check
78+
- cd build && ctest --verbose && cd ..
79+
- "if [ -f build/db_bench ] ; then build/db_bench ; fi"
80+
- "if [ -f build/db_bench_sqlite3 ] ; then build/db_bench_sqlite3 ; fi"
81+
- "if [ -f build/db_bench_tree_db ] ; then build/db_bench_tree_db ; fi"
82+
- cd build && cmake --build . --target install

0 commit comments

Comments
 (0)