changes based on review comments.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/f849d74b Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/f849d74b Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/f849d74b Branch: refs/heads/master Commit: f849d74b3e021b076d26ac63fbe5fc81ff0c6a92 Parents: 1d61439 Author: Anoop Sharma <[email protected]> Authored: Tue Apr 26 13:31:44 2016 +0000 Committer: Anoop Sharma <[email protected]> Committed: Tue Apr 26 13:31:44 2016 +0000 ---------------------------------------------------------------------- core/sqf/sql/scripts/get_libhdfs_files | 7 ++----- core/sql/executor/ExExeUtilVolTab.cpp | 7 ++++++- core/sql/exp/exp_datetime.cpp | 2 +- core/sql/generator/GenRelDCL.cpp | 1 + core/sql/regress/compGeneral/TEST004 | 3 --- 5 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f849d74b/core/sqf/sql/scripts/get_libhdfs_files ---------------------------------------------------------------------- diff --git a/core/sqf/sql/scripts/get_libhdfs_files b/core/sqf/sql/scripts/get_libhdfs_files index e575acf..b023d14 100755 --- a/core/sqf/sql/scripts/get_libhdfs_files +++ b/core/sqf/sql/scripts/get_libhdfs_files @@ -42,14 +42,11 @@ fi LOGFILE=${LIBHDFS_TEMP_DIR}/build.log # Hadoop source tar file to build libhdfs from -# Narendra -#HADOOP_DEP_VER=2.6.0-cdh5.4.4 HADOOP_ID=hadoop-${HADOOP_DEP_VER} if [ -z $HADOOP_MIRROR_BASE ]; then - HADOOP_MIRROR_BASE=archive.apache.org + HADOOP_MIRROR_BASE=archive.apache.org/dist fi -echo "Here 1" -HADOOP_MIRROR_URL=http://${HADOOP_MIRROR_BASE}/apache/hadoop/common/${HADOOP_ID} +HADOOP_MIRROR_URL=http://${HADOOP_MIRROR_BASE}/hadoop/common/${HADOOP_ID} HADOOP_SRC_ID=${HADOOP_ID}-src HADOOP_SRC_TAR=${HADOOP_SRC_ID}.tar.gz HADOOP_BIN_TAR=${HADOOP_ID}.tar.gz http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f849d74b/core/sql/executor/ExExeUtilVolTab.cpp ---------------------------------------------------------------------- diff --git a/core/sql/executor/ExExeUtilVolTab.cpp b/core/sql/executor/ExExeUtilVolTab.cpp index 278d1e3..9f2d0e5 100644 --- a/core/sql/executor/ExExeUtilVolTab.cpp +++ b/core/sql/executor/ExExeUtilVolTab.cpp @@ -554,7 +554,12 @@ short ExExeUtilCleanupVolatileTablesTcb::work() retcode = 0; if ((strlen(errorSchemas_) + strlen(schemaName)) < 1000) - strcat(errorSchemas_, schemaName); + { + strcat(errorSchemas_, schemaName); + strcat(errorSchemas_, " "); + } + else + strcat(errorSchemas_, "..."); // could not fit someSchemasCouldNotBeDropped_ = TRUE; } http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f849d74b/core/sql/exp/exp_datetime.cpp ---------------------------------------------------------------------- diff --git a/core/sql/exp/exp_datetime.cpp b/core/sql/exp/exp_datetime.cpp index 962c6ee..724bdb9 100644 --- a/core/sql/exp/exp_datetime.cpp +++ b/core/sql/exp/exp_datetime.cpp @@ -2837,7 +2837,7 @@ ExpDatetime::convAsciiToDate(char *srcData, break; case DATETIME_FORMAT_TS2: // DD.MM.YYYY:HH24:MI:SS - case DATETIME_FORMAT_TS10: // DD.MM.YYYY:HH24:MI:SS + case DATETIME_FORMAT_TS10: // DD.MM.YYYY HH24:MI:SS { // the day if (convSrcDataToDst(2, srcData, 1, &dstData[3], ".", heap, diagsArea)) http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f849d74b/core/sql/generator/GenRelDCL.cpp ---------------------------------------------------------------------- diff --git a/core/sql/generator/GenRelDCL.cpp b/core/sql/generator/GenRelDCL.cpp index 4698ad4..7a56319 100644 --- a/core/sql/generator/GenRelDCL.cpp +++ b/core/sql/generator/GenRelDCL.cpp @@ -259,6 +259,7 @@ short RelTransaction::codeGen(Generator * generator) generator->setExplainTuple( addExplainInfo(trans_tdb, 0, 0, generator)); } + return 0; } http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f849d74b/core/sql/regress/compGeneral/TEST004 ---------------------------------------------------------------------- diff --git a/core/sql/regress/compGeneral/TEST004 b/core/sql/regress/compGeneral/TEST004 index caf0794..6479f59 100644 --- a/core/sql/regress/compGeneral/TEST004 +++ b/core/sql/regress/compGeneral/TEST004 @@ -857,8 +857,5 @@ explain options 'f' st1; log; obey test004(clean_up); ---set parserflags 131072; ---select object_name from "_MD_".objects where schema_name like 'VOLATILE_SCHEMA%'; ---drop implicit volatile schema cleanup cascade;
