Skip to content
This repository was archived by the owner on Sep 27, 2019. It is now read-only.

Commit 908417d

Browse files
pervazeapervazea
authored
Merge branch 'master' into non-unique-key-fix
2 parents d922e44 + c5ba800 commit 908417d

File tree

454 files changed

+11414
-4777
lines changed

Some content is hidden

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

454 files changed

+11414
-4777
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
*~
1010
# Merge files created by git.
1111
*.orig
12+
# Java bytecode
13+
*.class
1214
# Byte compiled python modules.
1315
*.pyc
1416
# vim swap files
@@ -306,6 +308,7 @@ docs/dev
306308
# Protobuf files
307309
*.pb.cc
308310
*.pb.h
311+
*.pb
309312

310313
# Third party
311314
third_party/gflags/

‎.travis.yml

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,50 @@ matrix:
2828
- g++-4.8
2929
env:
3030
# NAME has no actual use, just to make the travis jobs overview more clear
31-
- NAME="gcc4.8 Debug+Tests+Coveralls"
31+
- NAME="gcc4.8 Debug"
3232
- CXX=g++-4.8
3333
- CC=gcc-4.8
3434
- PELOTON_BUILD_TYPE=Debug
3535
# COVERALLS: we run coveralls only for one compiler
36+
- COVERALLS=Off
37+
38+
- os: linux
39+
sudo: required
40+
dist: trusty
41+
compiler: gcc
42+
addons:
43+
apt:
44+
sources:
45+
- llvm-toolchain-precise-3.7
46+
- ubuntu-toolchain-r-test
47+
packages:
48+
- g++-4.8
49+
env:
50+
# NAME has no actual use, just to make the travis jobs overview more clear
51+
- NAME="gcc4.8 Release"
52+
- CXX=g++-4.8
53+
- CC=gcc-4.8
54+
- PELOTON_BUILD_TYPE=Release
55+
- COVERALLS=Off
56+
57+
# Linux builds for gcc 5
58+
- os: linux
59+
sudo: required
60+
dist: trusty
61+
compiler: gcc
62+
addons:
63+
apt:
64+
sources:
65+
- llvm-toolchain-precise-3.7
66+
- ubuntu-toolchain-r-test
67+
packages:
68+
- g++-5
69+
env:
70+
# NAME has no actual use, just to make the travis jobs overview more clear
71+
- NAME="gcc5 Debug/Tests/AddressSanitizer/Coveralls"
72+
- CXX=g++-5
73+
- CC=gcc-5
74+
- PELOTON_BUILD_TYPE=Debug
3675
- COVERALLS=On
3776
# override script value to run also tests and benchmarks
3877
script:
@@ -67,12 +106,12 @@ matrix:
67106
- llvm-toolchain-precise-3.7
68107
- ubuntu-toolchain-r-test
69108
packages:
70-
- g++-4.8
109+
- g++-5
71110
env:
72111
# NAME has no actual use, just to make the travis jobs overview more clear
73-
- NAME="gcc4.8 Release+Tests"
74-
- CXX=g++-4.8
75-
- CC=gcc-4.8
112+
- NAME="gcc5 Release/Tests/AddressSanitizer"
113+
- CXX=g++-5
114+
- CC=gcc-5
76115
- PELOTON_BUILD_TYPE=Release
77116
- COVERALLS=Off
78117
# override script value to run also tests and benchmarks
@@ -96,45 +135,6 @@ matrix:
96135
# run jdbc tests
97136
- python ../script/validators/jdbc_validator.py
98137

99-
# Linux builds for gcc 5
100-
- os: linux
101-
sudo: required
102-
dist: trusty
103-
compiler: gcc
104-
addons:
105-
apt:
106-
sources:
107-
- llvm-toolchain-precise-3.7
108-
- ubuntu-toolchain-r-test
109-
packages:
110-
- g++-5
111-
env:
112-
# NAME has no actual use, just to make the travis jobs overview more clear
113-
- NAME="gcc5 Debug"
114-
- CXX=g++-5
115-
- CC=gcc-5
116-
- PELOTON_BUILD_TYPE=Debug
117-
- COVERALLS=Off
118-
119-
- os: linux
120-
sudo: required
121-
dist: trusty
122-
compiler: gcc
123-
addons:
124-
apt:
125-
sources:
126-
- llvm-toolchain-precise-3.7
127-
- ubuntu-toolchain-r-test
128-
packages:
129-
- g++-5
130-
env:
131-
# NAME has no actual use, just to make the travis jobs overview more clear
132-
- NAME="gcc5 Release"
133-
- CXX=g++-5
134-
- CC=gcc-5
135-
- PELOTON_BUILD_TYPE=Release
136-
- COVERALLS=Off
137-
138138
install:
139139
# setup environment
140140
- ./script/installation/packages.sh

‎Jenkinsfile

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pipeline {
1717
sh 'python script/validators/source_validator.py'
1818
sh 'mkdir build'
1919
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCOVERALLS=False .. && make -j4'
20-
sh 'cd build && make check -j4 || true'
20+
sh 'cd build && make check -j4'
2121
// sh 'cd build && cp -pr test /job/' // special tests collection step just for this stage
2222
sh 'cd build && make install'
2323
sh 'cd build && bash ../script/testing/psql/psql_test.sh'
@@ -33,7 +33,7 @@ pipeline {
3333
sh 'python script/validators/source_validator.py'
3434
sh 'mkdir build'
3535
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
36-
sh 'cd build && make check -j4 || true'
36+
sh 'cd build && make check -j4'
3737
sh 'cd build && make install'
3838
sh 'cd build && bash ../script/testing/psql/psql_test.sh'
3939
sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
@@ -48,7 +48,7 @@ pipeline {
4848
sh 'python script/validators/source_validator.py'
4949
sh 'mkdir build'
5050
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCOVERALLS=False .. && make -j4'
51-
sh 'cd build && make check -j4 || true'
51+
sh 'cd build && make check -j4'
5252
sh 'cd build && make install'
5353
sh 'cd build && bash ../script/testing/psql/psql_test.sh'
5454
sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
@@ -63,7 +63,7 @@ pipeline {
6363
sh 'python script/validators/source_validator.py'
6464
sh 'mkdir build'
6565
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
66-
sh 'cd build && make check -j4 || true'
66+
sh 'cd build && make check -j4'
6767
sh 'cd build && make install'
6868
sh 'cd build && bash ../script/testing/psql/psql_test.sh'
6969
sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
@@ -88,7 +88,7 @@ pipeline {
8888
// sh 'python script/validators/source_validator.py'
8989
// sh 'mkdir build'
9090
// sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCOVERALLS=False .. && make -j4'
91-
// sh 'cd build && make check -j4 || true'
91+
// sh 'cd build && make check -j4'
9292
// sh 'cd build && make install'
9393
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
9494
// sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
@@ -103,7 +103,7 @@ pipeline {
103103
// sh 'python script/validators/source_validator.py'
104104
// sh 'mkdir build'
105105
// sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
106-
// sh 'cd build && make check -j4 || true'
106+
// sh 'cd build && make check -j4'
107107
// sh 'cd build && make install'
108108
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
109109
// sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
@@ -118,7 +118,7 @@ pipeline {
118118
// sh 'python script/validators/source_validator.py'
119119
// sh 'mkdir build'
120120
// sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCOVERALLS=False .. && make -j4'
121-
// sh 'cd build && make check -j4 || true'
121+
// sh 'cd build && make check -j4'
122122
// sh 'cd build && make install'
123123
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
124124
// sh 'sudo dnf -q install -y wget java-devel' // prerequisites for jdbc_validator
@@ -133,43 +133,43 @@ pipeline {
133133
// sh 'python script/validators/source_validator.py'
134134
// sh 'mkdir build'
135135
// sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
136-
// sh 'cd build && make check -j4 || true'
136+
// sh 'cd build && make check -j4'
137137
// sh 'cd build && make install'
138138
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
139139
// sh 'sudo dnf -q install -y wget java-devel' // prerequisites for jdbc_validator
140140
// sh 'cd build && python ../script/validators/jdbc_validator.py'
141141
// }
142142
// }
143143

144-
stage('Fedora 27/gcc-7.2.1/llvm-4.0.1 (Debug)') {
145-
agent { docker { image 'fedora:27' } }
146-
steps {
147-
sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
148-
sh 'python ./script/validators/source_validator.py'
149-
sh 'mkdir build'
150-
sh 'cd build && PATH=/usr/lib64/llvm4.0/bin:$PATH cmake -DCMAKE_CXX_FLAGS="-isystem /usr/include/llvm4.0" -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCOVERALLS=False .. && make -j4'
151-
sh 'cd build && make check -j4 || true'
152-
sh 'cd build && make install'
153-
sh 'cd build && bash ../script/testing/psql/psql_test.sh'
154-
sh 'sudo dnf -q install -y wget java-devel' // prerequisites for jdbc_validator
155-
sh 'cd build && python ../script/validators/jdbc_validator.py'
156-
}
157-
}
144+
// stage('Fedora 27/gcc-7.2.1/llvm-4.0.1 (Debug)') {
145+
// agent { docker { image 'fedora:27' } }
146+
// steps {
147+
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
148+
// sh 'python ./script/validators/source_validator.py'
149+
// sh 'mkdir build'
150+
// sh 'cd build && PATH=/usr/lib64/llvm4.0/bin:$PATH cmake -DCMAKE_CXX_FLAGS="-isystem /usr/include/llvm4.0" -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCOVERALLS=False .. && make -j4'
151+
// sh 'cd build && make check -j4'
152+
// sh 'cd build && make install'
153+
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
154+
// sh 'sudo dnf -q install -y wget java-devel' // prerequisites for jdbc_validator
155+
// sh 'cd build && python ../script/validators/jdbc_validator.py'
156+
// }
157+
// }
158158

159-
stage('Fedora 27/gcc-7.2.1/llvm-4.0.1 (Release)') {
160-
agent { docker { image 'fedora:27' } }
161-
steps {
162-
sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
163-
sh 'python ./script/validators/source_validator.py'
164-
sh 'mkdir build'
165-
sh 'cd build && PATH=/usr/lib64/llvm4.0/bin:$PATH cmake -DCMAKE_CXX_FLAGS="-isystem /usr/include/llvm4.0" -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
166-
sh 'cd build && make check -j4 || true'
167-
sh 'cd build && make install'
168-
sh 'cd build && bash ../script/testing/psql/psql_test.sh'
169-
sh 'sudo dnf -q install -y wget java-devel' // prerequisites for jdbc_validator
170-
sh 'cd build && python ../script/validators/jdbc_validator.py'
171-
}
172-
}
159+
// stage('Fedora 27/gcc-7.2.1/llvm-4.0.1 (Release)') {
160+
// agent { docker { image 'fedora:27' } }
161+
// steps {
162+
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
163+
// sh 'python ./script/validators/source_validator.py'
164+
// sh 'mkdir build'
165+
// sh 'cd build && PATH=/usr/lib64/llvm4.0/bin:$PATH cmake -DCMAKE_CXX_FLAGS="-isystem /usr/include/llvm4.0" -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
166+
// sh 'cd build && make check -j4'
167+
// sh 'cd build && make install'
168+
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
169+
// sh 'sudo dnf -q install -y wget java-devel' // prerequisites for jdbc_validator
170+
// sh 'cd build && python ../script/validators/jdbc_validator.py'
171+
// }
172+
// }
173173

174174
// stage('CentOS 7/gcc-4.8.5/llvm-3.9.1 (Debug)') {
175175
// agent { docker { image 'centos:7' } }
@@ -178,7 +178,7 @@ pipeline {
178178
// sh 'python script/validators/source_validator.py'
179179
// sh 'mkdir build'
180180
// sh 'cd build && cmake3 -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4'
181-
// sh 'cd build && make check -j4 || true'
181+
// sh 'cd build && make check -j4'
182182
// sh 'cd build && make install'
183183
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
184184
// sh 'sudo yum -q install -y wget java-devel' // prerequisites for jdbc_validator
@@ -193,7 +193,7 @@ pipeline {
193193
// sh 'python script/validators/source_validator.py'
194194
// sh 'mkdir build'
195195
// sh 'cd build && cmake3 -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
196-
// sh 'cd build && make check -j4 || true'
196+
// sh 'cd build && make check -j4'
197197
// sh 'cd build && make install'
198198
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
199199
// sh 'sudo yum -q install -y wget java-devel' // prerequisites for jdbc_validator

‎README.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,7 @@ Check out the [installation instructions](https://github.com/cmu-db/peloton/wiki
3030

3131
## Supported Platforms
3232

33-
Peloton has been tested to work on the following platforms:
34-
35-
* Ubuntu Linux 14.04+ (64-bit) [gcc4, gcc5]
36-
* Fedora Linux 24+ (64-bit) [gcc4, gcc5]
37-
* Mac OS X 10.9+ (64-bit) [XCode v8 Only]
38-
39-
Please note that it will not compile on 32-bit systems.
33+
The Wiki also contains a [list of supported platforms](https://github.com/cmu-db/peloton/wiki/Installation#supported-platforms).
4034

4135
## Development / Contributing
4236

‎cmake/Dependencies.cmake

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ include("cmake/External/gflags.cmake")
2121
include_directories(SYSTEM ${GFLAGS_INCLUDE_DIRS})
2222
list(APPEND Peloton_LINKER_LIBS ${GFLAGS_LIBRARIES})
2323

24+
# ---[ intel tbb
25+
find_package(TBB REQUIRED)
26+
include_directories(SYSTEM ${TBB_INCLUDE_DIRS})
27+
list(APPEND Peloton_LINKER_LIBS ${TBB_LIBRARIES})
28+
2429
# ---[ Cap'nProto
2530
include("cmake/External/capnproto.cmake")
2631
include_directories(SYSTEM ${CAPNP_INCLUDE_DIRS})
@@ -31,6 +36,12 @@ include(cmake/CapnProtoMacros.cmake)
3136
# ---[ Google-protobuf
3237
include(cmake/ProtoBuf.cmake)
3338

39+
# --[ tensorflow
40+
find_library(TFlowC
41+
NAMES tensorflow
42+
PATHS "/usr/local/lib")
43+
list(APPEND Peloton_LINKER_LIBS ${TFlowC})
44+
3445
# ---[ Libevent
3546
find_package(Libevent REQUIRED)
3647
include_directories(SYSTEM ${LIBEVENT_INCLUDE_DIRS})

0 commit comments

Comments
 (0)