10000 Merge branch 'json_agency_comm' of github.com:arangodb/arangodb into … · lethalbrains/arangodb@3773b0e · GitHub
[go: up one dir, main page]
Skip to content

Commit 3773b0e

Browse files
author
Andreas Streichardt
committed
Merge branch 'json_agency_comm' of github.com:arangodb/arangodb into json_agency_comm
2 parents 04ba515 + b98ea35 commit 3773b0e

File tree

1,071 files changed

+280978
-6459
lines changed

Some content is hidden

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

1,071 files changed

+280978
-6459
lines changed

‎3rdParty/.gitignore

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,3 @@ libev/event.lo
1111
libev/libev.la
1212
libev/libtool
1313
libev/stamp-h1
14-
15-
icu/BUILD
16-
icu/source/bin/
17-
icu/source/common/svchook.mk
18-
icu/source/config/Makefile.inc
19-
icu/source/config/icu-config
20-
icu/source/config/pkgdata.inc
21-
icu/source/config/pkgdataMakefile
22-
icu/source/data/icupkg.inc
23-
icu/source/data/out/
24-
icu/source/data/pkgdataMakefile
25-
icu/source/extra/uconv/pkgdataMakefile
26-
icu/source/icudefs.mk
27-
icu/source/test/testdata/pkgdataMakefile
28-
icu/source/tools/gentest/gentest
29-
icu/source/tools/icuinfo/icuinfo

‎3rdParty/CMakeLists.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,15 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libev)
1818

1919
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/OpenSSL)
2020

21+
################################################################################
22+
## ROCKSDB
23+
################################################################################
24+
25+
if (USE_ROCKSDB)
26+
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/rocksdb/)
27+
#add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/rocksdb)
28+
endif ()
29+
2130
################################################################################
2231
## V8 and ICU
2332
################################################################################

‎3rdParty/V8/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,9 +360,9 @@ else ()
360360

361361
option(USE_DEBUG_V8 "compile V8 in DEBUG mode" OFF)
362362

363-
set(V8_CFLAGS "")
364-
set(V8_CXXFLAGS "")
365-
set(V8_LDFLAGS "")
363+
set(V8_CFLAGS "$ENV{V8_CFLAGS}")
364+
set(V8_CXXFLAGS "$ENV{V8_CXXFLAGS}")
365+
set(V8_LDFLAGS "$ENV{V8_LDFLAGS}")
366366

367367
if (USE_DEBUG_V8)
368368
set(V8_TARGET_ARCH "${V8_PROC_ARCH}.debug")

‎3rdParty/linenoise-ng/src/linenoise.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2242,7 +2242,7 @@ int InputBuffer::incrementalHistorySearch(PromptBase& pi, int startChar) {
22422242
historyLinePosition); // draw user's text with our prompt
22432243

22442244
// loop until we get an exit character
2245-
int c;
2245+
int c = 0;
22462246
bool keepLooping = true;
22472247
bool useSearchedLine = true;
22482248
bool searchAgain = false;

‎3rdParty/rocksdb/rocksdb/.arcconfig

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"project_id" : "rocksdb",
3+
"conduit_uri" : "https://reviews.facebook.net/",
4+
"copyright_holder" : "Facebook",
5+
"load" : [
6+
"arcanist_util"
7+
],
8+
"lint.engine" : "FacebookFbcodeLintEngine",
9+
"lint.engine.single.linter" : "FbcodeCppLinter",
10+
"unit.engine" : "FacebookFbcodeUnitTestEngine",
11+
"arcanist_configuration" : "FacebookArcanistConfiguration",
12+
"base" : "git:HEAD^, hg:.^",
13+
"git.default-relative-commit" : "HEAD^",
14+
"git:arc.feature.start.default" : "origin/master",
15+
"arc.feature.start.default" : "master",
16+
"history.immutable" : false
17+
}

‎3rdParty/rocksdb/rocksdb/.clang-format

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Complete list of style options can be found at:
2+
# http://clang.llvm.org/docs/ClangFormatStyleOptions.html
3+
---
4+
BasedOnStyle: Google
5+
...

‎3rdParty/rocksdb/rocksdb/.gitignore

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
TARGETS
2+
make_config.mk
3+
4+
*.a
5+
*.arc
6+
*.d
7+
*.dylib*
8+
*.gcda
9+
*.gcno
10+
*.o
11+
*.so
12+
*.so.*
13+
*_test
14+
*_bench
15+
*_stress
16+
*.out
17+
*.class
18+
*.jar
19+
*.*jnilib*
20+
*.d-e
21+
*.o-*
22+
*.swp
23+
*~
24+
*.vcxproj
25+
*.vcxproj.filters
26+
*.sln
27+
*.cmake
28+
CMakeCache.txt
29+
CMakeFiles/
30+
build/
31+
32+
ldb
33+
manifest_dump
34+
sst_dump
35+
util/build_version.cc
36+
build_tools/VALGRIND_LOGS/
37+
coverage/COVERAGE_REPORT
38+
.gdbhistory
39+
package/
40+
.phutil_module_cache
41+
unity.a
42+
tags
43+
rocksdb_dump
44+
rocksdb_undump
45+
db_test2
46+
47+
java/out
48+
java/target
49+
java/test-libs
50+
java/*.log
51+
java/include/org_rocksdb_*.h
52+
53+
.idea/
54+
*.iml
55+
56+
rocksdb.cc
57+
rocksdb.h
58+
unity.cc
59+
java/crossbuild/.vagrant
60+
.vagrant/
61+
java/**.asc
62+
java/javadoc
63+
64+
scan_build_report/
65+
t
66+
LOG

‎3rdParty/rocksdb/rocksdb/.travis.yml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
sudo: false
2+
language: cpp
3+
os:
4+
- linux
5+
- osx
6+
compiler:
7+
- clang
8+
9+
addons:
10+
apt:
11+
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.6']
12+
packages: ['clang-3.6' , 'zlib1g-dev', 'libbz2-dev', 'libsnappy-dev', 'curl']
13+
env:
14+
# Run all tests before db_block_cache_test (db_test, db_test2)
15+
- JOB_NAME=unittests ROCKSDBTESTS_END=db_block_cache_test
16+
# Run all tests starting from db_block_cache_test (db_block_cache_test, db_iter_test, ...)
17+
- JOB_NAME=unittests ROCKSDBTESTS_START=db_block_cache_test
18+
# Run java tests
19+
- JOB_NAME=java_test
20+
# Build ROCKSDB_LITE
21+
- JOB_NAME=lite_build
22+
23+
install:
24+
# Build gflags
25+
# TODO(noetzli): Remove when gflags available through Travis
26+
- pushd /tmp/ && curl -L https://github.com/gflags/gflags/archive/v2.1.2.tar.gz -o gflags.tar.gz && tar xfz gflags.tar.gz && cd gflags-2.1.2 && cmake . && make && popd
27+
28+
before_script:
29+
# Add gflags to include/library paths
30+
# TODO(noetzli): Remove when gflags available through Travis
31+
- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/tmp/gflags-2.1.2/lib"
32+
- export LIBRARY_PATH="$LIBRARY_PATH:/tmp/gflags-2.1.2/lib"
33+
- export CPLUS_INCLUDE_PATH="$CPLUS_INCLUDE_PATH:/tmp/gflags-2.1.2/include"
34+
- if [[ "${TRAVIS_OS_NAME}" == 'linux' ]]; then CXX=clang++-3.6; fi
35+
- if [[ "${TRAVIS_OS_NAME}" == 'osx' ]]; then brew install gflags snappy; fi
36+
# Limit the maximum number of open file descriptors to 2000
37+
- ulimit -n 2000 || true
38+
39+
script:
40+
- if [[ "${JOB_NAME}" == 'unittests' ]]; then OPT=-DTRAVIS V=1 make -j4 check_some; fi
41+
- if [[ "${JOB_NAME}" == 'java_test' ]]; then OPT=-DTRAVIS V=1 make clean jclean rocksdbjava jtest; fi
42+
- if [[ "${JOB_NAME}" == 'lite_build' ]]; then OPT="-DTRAVIS -DROCKSDB_LITE" V=1 make -j4 static_lib; fi
43+
notifications:
44+
email:
45+
- leveldb@fb.com
46+
webhooks:
47+
- https://buildtimetrend.herokuapp.com/travis

‎3rdParty/rocksdb/rocksdb/AUTHORS

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Facebook Inc.
2+
Facebook Engineering Team
3+
4+
Google Inc.
5+
# Initial version authors:
6+
Jeffrey Dean <jeff@google.com>
7+
Sanjay Ghemawat <sanjay@google.com>
8+
9+
# Partial list of contributors:
10+
Kevin Regan <kevin.d.regan@gmail.com>
11+
Johan Bilien <jobi@litl.com>

0 commit comments

Comments
 (0)
0