Some changes required as per build document

ibmsoe · May 11, 2016 · 478f753 · 478f753
1 parent 17cff0b
commit 478f753
Show file tree

Hide file tree

Showing 57 changed files with 2,820 additions and 3,913 deletions.
diff --git a/be/src/codegen/CMakeLists.txt b/be/src/codegen/CMakeLists.txt
@@ -26,7 +26,6 @@ set(IR_NO_SSE_C_FILE $ENV{IMPALA_HOME}/be/generated-sources/impala-ir/impala-no-
 add_library(CodeGen
   codegen-anyval.cc
   llvm-codegen.cc
-  subexpr-elimination.cc
   instruction-counter.cc
   ${IR_SSE_C_FILE}
   ${IR_NO_SSE_C_FILE}

diff --git a/be/src/codegen/subexpr-elimination.cc b/be/src/codegen/subexpr-elimination.cc
diff --git a/be/src/codegen/subexpr-elimination.h b/be/src/codegen/subexpr-elimination.h
diff --git a/be/src/exec/aggregation-node.cc b/be/src/exec/aggregation-node.cc
@@ -19,8 +19,6 @@
 #include <boost/functional/hash.hpp>
 #include <thrift/protocol/TDebugProtocol.h>
 
-#include <x86intrin.h>
-
 #include "codegen/codegen-anyval.h"
 #include "codegen/llvm-codegen.h"
 #include "exec/old-hash-table.inline.h"

diff --git a/be/src/util/veclib_headers.h b/be/src/util/veclib_headers.h
@@ -1,20 +1,20 @@
-#ifndef _H_VECLIB_HEADERS
-#define _H_VECLIB_HEADERS
-
-
-#ifdef __ALTIVEC__
-#define VECLIB_VSX
-#include <altivec.h>
-#include "util/veclib_types.h"
-#include "util/vec128str.h"
-#include "util/vecmisc.h"
-#include "util/vec128int.h"
-
-#define _mm_crc32_u8 vec_crc321ub
-#define _mm_crc32_u32 vec_crc324ub
-//#define POPCNT_popcnt_u64 vec_popcount1uw
-#define _mm_loadu_si128 vec_load1q
-#define _mm_loadl_epi64 vec_loadlower1sd
-#define _mm_extract_epi16 vec_extract8sh
-#endif
-#endif
+#ifndef _H_VECLIB_HEADERS
+#define _H_VECLIB_HEADERS
+
+
+#ifdef __ALTIVEC__
+#define VECLIB_VSX
+#include <altivec.h>
+#include "util/veclib_types.h"
+#include "util/vec128str.h"
+#include "util/vecmisc.h"
+#include "util/vec128int.h"
+
+#define _mm_crc32_u8 vec_crc321ub
+#define _mm_crc32_u32 vec_crc324ub
+//#define POPCNT_popcnt_u64 vec_popcount1uw
+#define _mm_loadu_si128 vec_load1q
+#define _mm_loadl_epi64 vec_loadlower1sd
+#define _mm_extract_epi16 vec_extract8sh
+#endif
+#endif
diff --git a/bin/impala-config.sh b/bin/impala-config.sh
@@ -124,8 +124,8 @@ fi
 KUDU_IS_SUPPORTED=false
 
 export CDH_MAJOR_VERSION=5
-export HADOOP_LZO=${HADOOP_LZO-$IMPALA_HOME/../Imphala_prerequisites/hadoop-lzo}
-export IMPALA_LZO=${IMPALA_LZO-$IMPALA_HOME/../Impala-lzo}
+export HADOOP_LZO=${HADOOP_LZO-$IMPALA_HOME/../hadoop-lzo}
+export IMPALA_LZO=${IMPALA_LZO-$IMPALA_HOME/../impala-lzo}
 export IMPALA_AUX_TEST_HOME=${IMPALA_AUX_TEST_HOME-$IMPALA_HOME/../Impala-auxiliary-tests}
 export TARGET_FILESYSTEM=${TARGET_FILESYSTEM-"hdfs"}
 export FILESYSTEM_PREFIX=${FILESYSTEM_PREFIX-""}
@@ -290,7 +290,7 @@ export PATH=$IMPALA_HOME/bin:$PATH
 
 # Hadoop dependencies are snapshots in the Impala tree
 #export HADOOP_HOME=$IMPALA_HOME/thirdparty/hadoop-${IMPALA_HADOOP_VERSION}/
-export HADOOP_HOME=/root/nishidha/Imphala_prerequisites/hadoop-2.6.0-cdh5.5.1/src/hadoop-dist/target/hadoop-2.6.0-cdh5.5.1
+export HADOOP_HOME=/home/test/nishidha/ImphalaPrerequisites/hadoop-2.6.0-cdh5.7.0/src/hadoop-dist/target/hadoop-2.6.0-cdh5.7.0
 
 export HADOOP_CONF_DIR=$IMPALA_FE_DIR/src/test/resources
 

diff --git a/cmake_modules/FindGTest.cmake b/cmake_modules/FindGTest.cmake
@@ -43,14 +43,14 @@ find_path(GTEST_INCLUDE_DIR ${GTEST_H}
 
 find_library(GTEST_LIBRARY NAMES gtest
   PATHS ${GTEST_ROOT}/lib
-        $ENV{IMPALA_HOME}/thirdparty/gtest-1.6.0/lib/.libs
+        $ENV{IMPALA_HOME}/thirdparty/gtest-1.6.0/lib
         NO_DEFAULT_PATH
   DOC   "Google's framework for writing C++ tests (gtest)"
 )
 
 find_library(GTEST_MAIN_LIBRARY NAMES gtest_main
   PATHS ${GTEST_ROOT}/lib
-        $ENV{IMPALA_HOME}/thirdparty/gtest-1.6.0/lib/.libs
+        $ENV{IMPALA_HOME}/thirdparty/gtest-1.6.0/lib
         NO_DEFAULT_PATH
   DOC   "Google's framework for writing C++ tests (gtest_main)"
 )

diff --git a/cmake_modules/FindLz4.cmake b/cmake_modules/FindLz4.cmake
@@ -9,7 +9,7 @@
 
 set(LZ4_SEARCH_LIB_PATH
   ${LZ4_ROOT}/lib
-  $ENV{IMPALA_HOME}/thirdparty/lz4
+  $ENV{IMPALA_HOME}/thirdparty/lz4/build
 )
 
 set(LZ4_SEARCH_INCLUDE_DIR

diff --git a/thirdparty/cyrus-sasl-2.1.23/Makefile.in b/thirdparty/cyrus-sasl-2.1.23/Makefile.in
@@ -97,14 +97,17 @@ am__aclocal_m4_deps = $(top_srcdir)/cmulocal/berkdb.m4 \
 	$(top_srcdir)/cmulocal/cyrus.m4 \
 	$(top_srcdir)/cmulocal/init_automake.m4 \
 	$(top_srcdir)/cmulocal/ipv6.m4 \
+	$(top_srcdir)/cmulocal/kerberos_v4.m4 \
 	$(top_srcdir)/cmulocal/libtool.m4 \
 	$(top_srcdir)/cmulocal/ltoptions.m4 \
 	$(top_srcdir)/cmulocal/ltsugar.m4 \
 	$(top_srcdir)/cmulocal/ltversion.m4 \
 	$(top_srcdir)/cmulocal/lt~obsolete.m4 \
 	$(top_srcdir)/cmulocal/openldap.m4 \
 	$(top_srcdir)/cmulocal/openssl.m4 \
-	$(top_srcdir)/cmulocal/sasl2.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/cmulocal/plain.m4 \
+	$(top_srcdir)/cmulocal/sasl2.m4 \
+	$(top_srcdir)/cmulocal/sasldb.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \