Resolve merge conflict -1

Author: schedutron

.travis.yml

@@ -14,7 +14,7 @@ matrix:
               - PELOTON_BUILD_TYPE=Debug
               - COVERALLS=Off
 
-        # Linux builds for gcc 4.8
+        # Linux builds for gcc 5
         - os: linux
           sudo: required
           dist: trusty
@@ -25,14 +25,13 @@ matrix:
                       - llvm-toolchain-precise-3.7
                       - ubuntu-toolchain-r-test
                   packages:
-                    - g++-4.8
+                    - g++-5
           env:
               # NAME has no actual use, just to make the travis jobs overview more clear
-              - NAME="gcc4.8 Debug+Tests+Coveralls"
-              - CXX=g++-4.8
-              - CC=gcc-4.8
+              - NAME="gcc5 Debug/Tests/AddressSanitizer/Coveralls"
+              - CXX=g++-5
+              - CC=gcc-5
               - PELOTON_BUILD_TYPE=Debug
-              # COVERALLS: we run coveralls only for one compiler
               - COVERALLS=On
           # override script value to run also tests and benchmarks
           script:
@@ -54,6 +53,8 @@ matrix:
               - bash ../script/testing/psql/psql_test.sh
               # run jdbc tests
               - python ../script/validators/jdbc_validator.py
+              # run junit tests
+              - python ../script/testing/junit/run_junit.py
               # upload coverage info
               - make coveralls
 
@@ -67,12 +68,12 @@ matrix:
                       - llvm-toolchain-precise-3.7
                       - ubuntu-toolchain-r-test
                   packages:
-                    - g++-4.8
+                    - g++-5
           env:
               # NAME has no actual use, just to make the travis jobs overview more clear
-              - NAME="gcc4.8 Release+Tests"
-              - CXX=g++-4.8
-              - CC=gcc-4.8
+              - NAME="gcc5 Release/Tests/AddressSanitizer"
+              - CXX=g++-5
+              - CC=gcc-5
               - PELOTON_BUILD_TYPE=Release
               - COVERALLS=Off
           # override script value to run also tests and benchmarks
@@ -95,45 +96,8 @@ matrix:
               - bash ../script/testing/psql/psql_test.sh
               # run jdbc tests
               - python ../script/validators/jdbc_validator.py
-
-        # Linux builds for gcc 5
-        - os: linux
-          sudo: required
-          dist: trusty
-          compiler: gcc
-          addons:
-              apt:
-                  sources:
-                      - llvm-toolchain-precise-3.7
-                      - ubuntu-toolchain-r-test
-                  packages:
-                    - g++-5
-          env:
-              # NAME has no actual use, just to make the travis jobs overview more clear
-              - NAME="gcc5 Debug"
-              - CXX=g++-5
-              - CC=gcc-5
-              - PELOTON_BUILD_TYPE=Debug
-              - COVERALLS=Off
-
-        - os: linux
-          sudo: required
-          dist: trusty
-          compiler: gcc
-          addons:
-              apt:
-                  sources:
-                      - llvm-toolchain-precise-3.7
-                      - ubuntu-toolchain-r-test
-                  packages:
-                    - g++-5
-          env:
-              # NAME has no actual use, just to make the travis jobs overview more clear
-              - NAME="gcc5 Release"
-              - CXX=g++-5
-              - CC=gcc-5
-              - PELOTON_BUILD_TYPE=Release
-              - COVERALLS=Off
+              # run junit tests
+              - python ../script/testing/junit/run_junit.py
 
 install:
     # setup environment

CMakeLists.txt

@@ -42,12 +42,12 @@ include(cmake/Dependencies.cmake)
 
 # ---[ C++11 Flags
 include(CheckCXXCompilerFlag)
-check_cxx_compiler_flag("-std=c++1y" COMPILER_SUPPORTS_CXX1Y)
+check_cxx_compiler_flag("-std=c++11" COMPILER_SUPPORTS_CXX11)
 
-if(COMPILER_SUPPORTS_CXX1Y)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y")
+if(COMPILER_SUPPORTS_CXX11)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-c++14-compat")
 else()
-    message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++1Y support. Please use a different C++ compiler.")
+    message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
 endif()
 
 # Create a new pre-processor macro __PELOTONFILE__ that has a truncated
@@ -77,6 +77,10 @@ if(UNIX OR APPLE)
     if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-tautological-undefined-compare -Wno-unused-private-field -Wno-braced-scalar-init -Wno-constant-conversion -Wno-potentially-evaluated-expression -Wno-infinite-recursion -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -I/usr/local/opt/openssl/include")
     endif()
+# ---[ close$NOCANCEL for Mac OS
+    if(APPLE)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-dollar-in-identifier-extension")
+    endif()
 endif()
 
 # There is a problem with building on g++5.4 on Ubuntu 17.10 where

Jenkinsfile

@@ -23,6 +23,7 @@ pipeline {
                         sh 'cd build && bash ../script/testing/psql/psql_test.sh'
                         sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
                         sh 'cd build && python ../script/validators/jdbc_validator.py'
+                        sh 'cd build && python ../script/testing/junit/run_junit.py'
                     }
                 }
 
@@ -38,13 +39,19 @@ pipeline {
                         sh 'cd build && bash ../script/testing/psql/psql_test.sh'
                         sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
                         sh 'cd build && python ../script/validators/jdbc_validator.py'
+                        sh 'cd build && python ../script/testing/junit/run_junit.py'
                     }
                 }
 
-                stage('Ubuntu Trusty/gcc-4.8.4/llvm-3.7.1 (Debug)') {
+                stage('Ubuntu Trusty/gcc-5.4.0/llvm-3.7.1 (Debug)') {
                     agent { docker { image 'ubuntu:trusty' } }
                     steps {
                         sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
+                        sh 'sudo apt-get -y install software-properties-common'
+                        sh 'sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test'
+                        sh 'sudo apt-get update'
+                        sh 'sudo apt-get -y install gcc-5 g++-5'
+                        sh 'sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 1 --slave /usr/bin/g++ g++ /usr/bin/g++-5'
                         sh 'python script/validators/source_validator.py'
                         sh 'mkdir build'
                         sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCOVERALLS=False .. && make -j4'
@@ -53,13 +60,19 @@ pipeline {
                         sh 'cd build && bash ../script/testing/psql/psql_test.sh'
                         sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
                         sh 'cd build && python ../script/validators/jdbc_validator.py'
+                        sh 'cd build && python ../script/testing/junit/run_junit.py'
                     }
                 }
 
-                stage('Ubuntu Trusty/gcc-4.8.4/llvm-3.7.1 (Release)') {
+                stage('Ubuntu Trusty/gcc-5.4.0/llvm-3.7.1 (Release)') {
                     agent { docker { image 'ubuntu:trusty' } }
                     steps {
                         sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
+                        sh 'sudo apt-get -y install software-properties-common'
+                        sh 'sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test'
+                        sh 'sudo apt-get update'
+                        sh 'sudo apt-get -y install gcc-5 g++-5'
+                        sh 'sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 1 --slave /usr/bin/g++ g++ /usr/bin/g++-5'
                         sh 'python script/validators/source_validator.py'
                         sh 'mkdir build'
                         sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
@@ -68,6 +81,7 @@ pipeline {
                         sh 'cd build && bash ../script/testing/psql/psql_test.sh'
                         sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
                         sh 'cd build && python ../script/validators/jdbc_validator.py'
+                        sh 'cd build && python ../script/testing/junit/run_junit.py'
                     }
                 }
 
@@ -93,6 +107,7 @@ pipeline {
                 //         sh 'cd build && bash ../script/testing/psql/psql_test.sh'
                 //         sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
                 //         sh 'cd build && python ../script/validators/jdbc_validator.py'
+		//         sh 'cd build && python ../script/testing/junit/run_junit.py'
                 //     }
                 // }
 
@@ -108,6 +123,7 @@ pipeline {
                 //         sh 'cd build && bash ../script/testing/psql/psql_test.sh'
                 //         sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
                 //         sh 'cd build && python ../script/validators/jdbc_validator.py'
+		//         sh 'cd build && python ../script/testing/junit/run_junit.py'
                 //     }
                 // }
 
@@ -123,6 +139,7 @@ pipeline {
                 //         sh 'cd build && bash ../script/testing/psql/psql_test.sh'
                 //         sh 'sudo dnf -q install -y wget java-devel' // prerequisites for jdbc_validator
                 //         sh 'cd build && python ../script/validators/jdbc_validator.py'
+		//         sh 'cd build && python ../script/testing/junit/run_junit.py'
                 //     }
                 // }
 
@@ -138,6 +155,7 @@ pipeline {
                 //         sh 'cd build && bash ../script/testing/psql/psql_test.sh'
                 //         sh 'sudo dnf -q install -y wget java-devel' // prerequisites for jdbc_validator
                 //         sh 'cd build && python ../script/validators/jdbc_validator.py'
+		//         sh 'cd build && python ../script/testing/junit/run_junit.py'
                 //     }
                 // }
 
@@ -153,6 +171,7 @@ pipeline {
                 //         sh 'cd build && bash ../script/testing/psql/psql_test.sh'
                 //         sh 'sudo dnf -q install -y wget java-devel' // prerequisites for jdbc_validator
                 //         sh 'cd build && python ../script/validators/jdbc_validator.py'
+		//         sh 'cd build && python ../script/testing/junit/run_junit.py'
                 //     }
                 // }
 
@@ -168,6 +187,7 @@ pipeline {
                 //         sh 'cd build && bash ../script/testing/psql/psql_test.sh'
                 //         sh 'sudo dnf -q install -y wget java-devel' // prerequisites for jdbc_validator
                 //         sh 'cd build && python ../script/validators/jdbc_validator.py'
+		//         sh 'cd build && python ../script/testing/junit/run_junit.py'
                 //     }
                 // }
 
@@ -183,6 +203,7 @@ pipeline {
                 //         sh 'cd build && bash ../script/testing/psql/psql_test.sh'
                 //         sh 'sudo yum -q install -y wget java-devel' // prerequisites for jdbc_validator
                 //         sh 'cd build && python ../script/validators/jdbc_validator.py'
+		//         sh 'cd build && python ../script/testing/junit/run_junit.py'
                 //     }
                 // }
 
@@ -198,6 +219,7 @@ pipeline {
                 //         sh 'cd build && bash ../script/testing/psql/psql_test.sh'
                 //         sh 'sudo yum -q install -y wget java-devel' // prerequisites for jdbc_validator
                 //         sh 'cd build && python ../script/validators/jdbc_validator.py'
+		//         sh 'cd build && python ../script/testing/junit/run_junit.py'
                 //     }
                 // }
                 // end gcc builds

README.md

@@ -30,13 +30,7 @@ Check out the [installation instructions](https://github.com/cmu-db/peloton/wiki
 
 ## Supported Platforms
 
-Peloton has been tested to work on the following platforms:
-
-* Ubuntu Linux 14.04+ (64-bit) [gcc4, gcc5]
-* Fedora Linux 24+ (64-bit) [gcc4, gcc5]
-* Mac OS X 10.9+ (64-bit) [XCode v8 Only]
-
- Please note that it will not compile on 32-bit systems.
+The Wiki also contains a [list of supported platforms](https://github.com/cmu-db/peloton/wiki/Installation#supported-platforms). 
 
 ## Development / Contributing
 

cmake/Dependencies.cmake

@@ -42,6 +42,10 @@ find_library(TFlowC
         PATHS "/usr/local/lib")
 list(APPEND Peloton_LINKER_LIBS ${TFlowC})
 
+# --[ Eigen3
+find_package(Eigen3 REQUIRED)
+include_directories(SYSTEM ${EIGEN3_INCLUDE_DIR})
+
 # ---[ Libevent
 find_package(Libevent REQUIRED)
 include_directories(SYSTEM ${LIBEVENT_INCLUDE_DIRS})

cmake/Modules/FindEigen3.cmake

@@ -0,0 +1,97 @@
+# - Try to find Eigen3 lib
+#
+# This module supports requiring a minimum version, e.g. you can do
+#   find_package(Eigen3 3.1.2)
+# to require version 3.1.2 or newer of Eigen3.
+#
+# Once done this will define
+#
+#  EIGEN3_FOUND - system has eigen lib with correct version
+#  EIGEN3_INCLUDE_DIR - the eigen include directory
+#  EIGEN3_VERSION - eigen version
+#
+# This module reads hints about search locations from 
+# the following enviroment variables:
+#
+# EIGEN3_ROOT
+# EIGEN3_ROOT_DIR
+
+# Copyright (c) 2006, 2007 Montel Laurent, <[email protected]>
+# Copyright (c) 2008, 2009 Gael Guennebaud, <[email protected]>
+# Copyright (c) 2009 Benoit Jacob <[email protected]>
+# Redistribution and use is allowed according to the terms of the 2-clause BSD license.
+
+if(NOT Eigen3_FIND_VERSION)
+  if(NOT Eigen3_FIND_VERSION_MAJOR)
+    set(Eigen3_FIND_VERSION_MAJOR 2)
+  endif(NOT Eigen3_FIND_VERSION_MAJOR)
+  if(NOT Eigen3_FIND_VERSION_MINOR)
+    set(Eigen3_FIND_VERSION_MINOR 91)
+  endif(NOT Eigen3_FIND_VERSION_MINOR)
+  if(NOT Eigen3_FIND_VERSION_PATCH)
+    set(Eigen3_FIND_VERSION_PATCH 0)
+  endif(NOT Eigen3_FIND_VERSION_PATCH)
+
+  set(Eigen3_FIND_VERSION "${Eigen3_FIND_VERSION_MAJOR}.${Eigen3_FIND_VERSION_MINOR}.${Eigen3_FIND_VERSION_PATCH}")
+endif(NOT Eigen3_FIND_VERSION)
+
+macro(_eigen3_check_version)
+  file(READ "${EIGEN3_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen3_version_header)
+
+  string(REGEX MATCH "define[ \t]+EIGEN_WORLD_VERSION[ \t]+([0-9]+)" _eigen3_world_version_match "${_eigen3_version_header}")
+  set(EIGEN3_WORLD_VERSION "${CMAKE_MATCH_1}")
+  string(REGEX MATCH "define[ \t]+EIGEN_MAJOR_VERSION[ \t]+([0-9]+)" _eigen3_major_version_match "${_eigen3_version_header}")
+  set(EIGEN3_MAJOR_VERSION "${CMAKE_MATCH_1}")
+  string(REGEX MATCH "define[ \t]+EIGEN_MINOR_VERSION[ \t]+([0-9]+)" _eigen3_minor_version_match "${_eigen3_version_header}")
+  set(EIGEN3_MINOR_VERSION "${CMAKE_MATCH_1}")
+
+  set(EIGEN3_VERSION ${EIGEN3_WORLD_VERSION}.${EIGEN3_MAJOR_VERSION}.${EIGEN3_MINOR_VERSION})
+  if(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
+    set(EIGEN3_VERSION_OK FALSE)
+  else(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
+    set(EIGEN3_VERSION_OK TRUE)
+  endif(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
+
+  if(NOT EIGEN3_VERSION_OK)
+
+    message(STATUS "Eigen3 version ${EIGEN3_VERSION} found in ${EIGEN3_INCLUDE_DIR}, "
+                   "but at least version ${Eigen3_FIND_VERSION} is required")
+  endif(NOT EIGEN3_VERSION_OK)
+endmacro(_eigen3_check_version)
+
+if (EIGEN3_INCLUDE_DIR)
+
+  # in cache already
+  _eigen3_check_version()
+  set(EIGEN3_FOUND ${EIGEN3_VERSION_OK})
+
+else (EIGEN3_INCLUDE_DIR)
+  
+  # search first if an Eigen3Config.cmake is available in the system,
+  # if successful this would set EIGEN3_INCLUDE_DIR and the rest of
+  # the script will work as usual
+  find_package(Eigen3 ${Eigen3_FIND_VERSION} NO_MODULE QUIET)
+
+  if(NOT EIGEN3_INCLUDE_DIR)
+    find_path(EIGEN3_INCLUDE_DIR NAMES signature_of_eigen3_matrix_library
+        HINTS
+        ENV EIGEN3_ROOT 
+        ENV EIGEN3_ROOT_DIR
+        PATHS
+        ${CMAKE_INSTALL_PREFIX}/include
+        ${KDE4_INCLUDE_DIR}
+        PATH_SUFFIXES eigen3 eigen
+      )
+  endif(NOT EIGEN3_INCLUDE_DIR)
+
+  if(EIGEN3_INCLUDE_DIR)
+    _eigen3_check_version()
+  endif(EIGEN3_INCLUDE_DIR)
+
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(Eigen3 DEFAULT_MSG EIGEN3_INCLUDE_DIR EIGEN3_VERSION_OK)
+
+  mark_as_advanced(EIGEN3_INCLUDE_DIR)
+
+endif(EIGEN3_INCLUDE_DIR)
+