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

Commit 8d0f87f

Browse files
pervazeapervazea
authored
Merge branch 'master' into lockfreearray
2 parents c2ff769 + 1aecc58 commit 8d0f87f

39 files changed

+857
-244
lines changed

‎.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

‎script/installation/packages.sh

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,12 @@ function install_protobuf3.4.0() {
6767
# Utility function for installing tensorflow components of python/C++
6868
function install_tf() {
6969
TFCApiFile=$1
70-
TFBinaryURL=$2
70+
TF_VERSION=$2
7171
LinkerConfigCmd=$3
7272
TARGET_DIRECTORY="/usr/local"
7373
# Install Tensorflow Python Binary
74-
sudo -E pip3 install --upgrade ${TFBinaryURL}
74+
sudo -E pip3 install --upgrade pip
75+
sudo -E pip3 install --upgrade tensorflow==${TF_VERSION}
7576

7677
# Install C-API
7778
TFCApiURL="https://storage.googleapis.com/tensorflow/libtensorflow/${TFCApiFile}"
@@ -88,7 +89,6 @@ function install_tf() {
8889
## ------------------------------------------------
8990
if [ "$DISTRO" = "UBUNTU" ]; then
9091
MAJOR_VER=$(echo "$DISTRO_VER" | cut -d '.' -f 1)
91-
9292
# Fix for LLVM-3.7 on Ubuntu 14 + 17
9393
if [ "$MAJOR_VER" == "14" -o "$MAJOR_VER" == "17" ]; then
9494
if [ "$MAJOR_VER" == "14" ]; then
@@ -120,19 +120,16 @@ if [ "$DISTRO" = "UBUNTU" ]; then
120120
if [ "$MAJOR_VER" == "14" ]; then
121121
PKG_CMAKE="cmake3"
122122
FORCE_Y="--force-yes"
123-
TF_VERSION="1.4.0"
124-
TFBinaryURL="https://storage.googleapis.com/tensorflow/linux/${TF_TYPE}/tensorflow-${TF_VERSION}-cp34-cp34m-linux_x86_64.whl"
123+
TF_VERSION="1.4.0"
125124
fi
126125
if [ "$MAJOR_VER" == "16" ]; then
127-
TF_VERSION="1.5.0"
128-
TFBinaryURL="https://storage.googleapis.com/tensorflow/linux/${TF_TYPE}/tensorflow-${TF_VERSION}-cp35-cp35m-linux_x86_64.whl"
126+
TF_VERSION="1.5.0"
129127
fi
130128
# Fix for llvm on Ubuntu 17.x
131129
if [ "$MAJOR_VER" == "17" ]; then
132130
PKG_LLVM="llvm-3.9"
133131
PKG_CLANG="clang-3.8"
134-
TF_VERSION="1.5.0"
135-
TFBinaryURL="https://storage.googleapis.com/tensorflow/linux/${TF_TYPE}/tensorflow-${TF_VERSION}-cp35-cp35m-linux_x86_64.whl"
132+
TF_VERSION="1.5.0"
136133
fi
137134
TFCApiFile="libtensorflow-${TF_TYPE}-linux-x86_64-${TF_VERSION}.tar.gz"
138135
LinkerConfigCmd="sudo ldconfig"
@@ -168,7 +165,7 @@ if [ "$DISTRO" = "UBUNTU" ]; then
168165
# Install version of protobuf needed by C-API
169166
install_protobuf3.4.0 "ubuntu"
170167
# Install tensorflow
171-
install_tf "$TFCApiFile" "$TFBinaryURL" "$LinkerConfigCmd"
168+
install_tf "$TFCApiFile" "$TF_VERSION" "$LinkerConfigCmd"
172169

173170
## ------------------------------------------------
174171
## DEBIAN
@@ -208,7 +205,6 @@ elif [[ "$DISTRO" == *"FEDORA"* ]]; then
208205
esac
209206
TF_VERSION="1.5.0"
210207
TFCApiFile="libtensorflow-${TF_TYPE}-linux-x86_64-${TF_VERSION}.tar.gz"
211-
TFBinaryURL="https://storage.googleapis.com/tensorflow/linux/${TF_TYPE}/tensorflow-${TF_VERSION}-cp36-cp36m-linux_x86_64.whl"
212208
LinkerConfigCmd="sudo ldconfig"
213209
sudo dnf -q install -y \
214210
git \
@@ -244,7 +240,7 @@ elif [[ "$DISTRO" == *"FEDORA"* ]]; then
244240
# Install version of protobuf needed by C-API
245241
install_protobuf3.4.0 "fedora"
246242
# Install tensorflow
247-
install_tf "$TFCApiFile" "$TFBinaryURL" "$LinkerConfigCmd"
243+
install_tf "$TFCApiFile" "$TF_VERSION" "$LinkerConfigCmd"
248244

249245
## ------------------------------------------------
250246
## REDHAT
@@ -325,7 +321,6 @@ elif [ "$DISTRO" = "DARWIN" ]; then
325321
ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
326322
fi
327323
TF_VERSION="1.4.0"
328-
TFBinaryURL="https://storage.googleapis.com/tensorflow/mac/${TF_TYPE}/tensorflow-${TF_VERSION}-py3-none-any.whl"
329324
TFCApiFile="libtensorflow-${TF_TYPE}-darwin-x86_64-${TF_VERSION}.tar.gz"
330325
LinkerConfigCmd="sudo update_dyld_shared_cache"
331326
brew install git
@@ -349,7 +344,7 @@ elif [ "$DISTRO" = "DARWIN" ]; then
349344
brew upgrade python
350345
# Brew installs correct version of Protobuf(3.5.1 >= 3.4.0)
351346
# So we can directly install tensorflow
352-
install_tf "$TFCApiFile" "$TFBinaryURL" "$LinkerConfigCmd"
347+
install_tf "$TFCApiFile" "$TF_VERSION" "$LinkerConfigCmd"
353348

354349
## ------------------------------------------------
355350
## UNKNOWN

‎script/testing/junit/.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11

2-
!Makefile
2+
!Makefile
3+
!lib/*.jar

‎script/testing/junit/InsertPSTest.java

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ public void testPS_1Tuple_CS_1() throws SQLException {
111111
* Prepared statement, 1 tuple insert, with columns inserted
112112
* in different order from schema.
113113
*/
114-
115-
// Currently fails. See #1197
116114
@Test
117115
public void testPS_1Tuple_CS_2() throws SQLException {
118116

@@ -135,8 +133,6 @@ public void testPS_1Tuple_CS_2() throws SQLException {
135133
* Prepared statement, 1 tuple insert, with columns inserted
136134
* in different order from schema, with one constant column.
137135
*/
138-
139-
// Currently fails. See #1197
140136
@Test
141137
public void testPS_1Tuple_CS_3() throws SQLException {
142138

@@ -182,8 +178,6 @@ public void testPS_1Tuple_CS_4() throws SQLException {
182178
* Prepared statement, 1 tuple insert, with columns inserted
183179
* in schema order, one constant column
184180
*/
185-
// Works, due to use of insert rather than push back
186-
187181
@Test
188182
public void testPS_1Tuple_CS_5() throws SQLException {
189183

@@ -205,8 +199,6 @@ public void testPS_1Tuple_CS_5() throws SQLException {
205199
/**
206200
* Prepared statement, 1 tuple insert, all constants
207201
*/
208-
// Works, due to use of insert rather than push back
209-
210202
@Test
211203
public void testPS_1Tuple_CS_6() throws SQLException {
212204

@@ -295,7 +287,6 @@ public void testPS_2Tuple_CS_1() throws SQLException {
295287
* Prepared statement, 2 tuple insert, with columns inserted
296288
* in different order from schema.
297289
*/
298-
// Currently fails. See #1197
299290
@Test
300291
public void testPS_2Tuple_CS_2() throws SQLException {
301292

@@ -325,7 +316,6 @@ public void testPS_2Tuple_CS_2() throws SQLException {
325316
* Prepared statement, 2 tuple insert, with columns inserted
326317
* in different order from schema, with one constant column.
327318
*/
328-
// Currently fails. See #1197
329319
@Test
330320
public void testPS_2Tuple_CS_3() throws SQLException {
331321

@@ -355,7 +345,6 @@ public void testPS_2Tuple_CS_3() throws SQLException {
355345
* in different order from schema, with one constant column.
356346
* Variant of above, with constant column last.
357347
*/
358-
// Currently fails. See #1197
359348
@Test
360349
public void testPS_2Tuple_CS_3a() throws SQLException {
361350

@@ -384,7 +373,6 @@ public void testPS_2Tuple_CS_3a() throws SQLException {
384373
* Prepared statement, 2 tuple insert, with columns inserted
385374
* in schema order, with 2nd column missing.
386375
*/
387-
// Currently failing. See comments in #1197
388376
@Test
389377
public void testPS_2Tuple_CS_4() throws SQLException {
390378

@@ -419,7 +407,7 @@ public void testPS_2Tuple_CS_4() throws SQLException {
419407
/**
420408
* 1 tuple insert, with no column specification.
421409
*/
422-
//@Test
410+
@Test
423411
public void test_1Tuple_NCS() throws SQLException {
424412

425413
String sql = "INSERT INTO tbl VALUES (1, 2, 3);";
@@ -440,7 +428,7 @@ public void test_1Tuple_NCS() throws SQLException {
440428
/**
441429
* 1 tuple insert, with columns inserted in schema order.
442430
*/
443-
//@Test
431+
@Test
444432
public void test_1Tuple_CS_1() throws SQLException {
445433

446434
String sql = "INSERT INTO tbl (c1, c2, c3) VALUES (1, 2, 3);";
@@ -461,7 +449,7 @@ public void test_1Tuple_CS_1() throws SQLException {
461449
/**
462450
* 1 tuple insert, with columns inserted in different order from schema.
463451
*/
464-
//@Test
452+
@Test
465453
public void test_1Tuple_CS_2() throws SQLException {
466454

467455
String sql = "INSERT INTO tbl (c3, c1, c2) VALUES (3, 1, 2);";
@@ -484,7 +472,7 @@ public void test_1Tuple_CS_2() throws SQLException {
484472
/**
485473
* 2 tuple insert, with no column specification.
486474
*/
487-
//@Test
475+
@Test
488476
public void test_2Tuple_NCS() throws SQLException {
489477

490478
String sql = "INSERT INTO tbl VALUES (1, 2, 3), (11, 12, 13);";

‎script/testing/junit/Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ clean:
2828
test: $(CLASSES)
2929
java -jar lib/junit-platform-console-standalone-1.1.0.jar \
3030
--class-path $(CP) \
31-
-c InsertPSTest
32-
# -c UpdateTest
33-
# -c InsertPSTest -c InsertTPCCTest
31+
-c InsertTPCCTest \
32+
-c InsertPSTest \
33+
-c UpdateTest
34+
3435

3536

3637

0 commit comments

Comments
 (0)