trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sand...@apache.org
Subject [1/2] incubator-trafodion git commit: Additional changes to JIRA TRAFODION-2060 plus couple other fixes
Date Fri, 02 Sep 2016 21:19:44 GMT
Repository: incubator-trafodion
Updated Branches:
  refs/heads/master c581a16ae -> f7ed14f03


Additional changes to JIRA TRAFODION-2060 plus couple other fixes

-- interval computations involving tinyint are fixed.
-- hive data mod mismatch error now prints the compile and runtime
   timestamps that caused the mismatch.
-- hive test003 updated to truncate data before insert


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a2568f4d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a2568f4d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a2568f4d

Branch: refs/heads/master
Commit: a2568f4dec299f756b9d3d751ff9419bc7e3735d
Parents: 1b51c43
Author: Anoop Sharma <anoop.sharma@esgyn.com>
Authored: Thu Sep 1 19:54:15 2016 +0000
Committer: Anoop Sharma <anoop.sharma@esgyn.com>
Committed: Thu Sep 1 19:54:15 2016 +0000

----------------------------------------------------------------------
 core/sql/bin/SqlciErrors.txt                |   2 +-
 core/sql/common/ComSysUtils.cpp             |  42 +++++
 core/sql/common/ComSysUtils.h               |   1 +
 core/sql/executor/ExExeUtilMisc.cpp         |  12 +-
 core/sql/executor/ExFastTransport.cpp       |  16 +-
 core/sql/executor/ExFastTransport.h         |   2 +-
 core/sql/executor/ExHdfsScan.cpp            |  12 +-
 core/sql/exp/ExpLOBaccess.cpp               |  38 ++++-
 core/sql/exp/ExpLOBaccess.h                 |   7 +-
 core/sql/exp/ExpLOBinterface.cpp            |  12 +-
 core/sql/exp/ExpLOBinterface.h              |   4 +-
 core/sql/generator/GenPreCode.cpp           |   4 +-
 core/sql/regress/compGeneral/EXPECTED071    |   4 +-
 core/sql/regress/hive/EXPECTED003           |   7 +-
 core/sql/regress/hive/EXPECTED005           |  24 +--
 core/sql/regress/hive/EXPECTED018           | 186 +++++++++++------------
 core/sql/regress/hive/TEST003               |   1 +
 core/sql/regress/seabase/EXPECTED030        |  57 +++++++
 core/sql/regress/seabase/TEST030            |   8 +
 core/sql/regress/tools/regress-filter-linux |   3 +
 core/sql/regress/tools/runregr              |   1 +
 core/sql/ustat/hs_cli.cpp                   |   3 +
 22 files changed, 311 insertions(+), 135 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a2568f4d/core/sql/bin/SqlciErrors.txt
----------------------------------------------------------------------
diff --git a/core/sql/bin/SqlciErrors.txt b/core/sql/bin/SqlciErrors.txt
index 78b026b..27cd2ab 100644
--- a/core/sql/bin/SqlciErrors.txt
+++ b/core/sql/bin/SqlciErrors.txt
@@ -1558,7 +1558,7 @@ $1~String1 --------------------------------
 8433 22003 99999 BEGINNER MINOR LOGONLY Invalid $0~string0 character encountered in $1~string1.
 8434 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Invalid target column for LOB function. The column needs to be blob/clob type. 
 8435 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU --- unused ---
-8436 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Mismatch detected between compiletime and runtime hive table definitions.
+8436 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Mismatch detected between compiletime and runtime hive table definitions. DataModMismatchDetails: $0~string0
 8437 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Mismatch detected between external table and underlying hive table definitions.
 8440 ZZZZZ 99999 BEGINNER MAJOR DBADMIN The size of the history buffer is too small to execute one or more of the OLAP Windowed Functions in the query. 
 8441 ZZZZZ 99999 BEGINNER MAJOR DBADMIN one or more of the OLAP Windowed Functions in the query may require overflow which is not supported yet.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a2568f4d/core/sql/common/ComSysUtils.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/ComSysUtils.cpp b/core/sql/common/ComSysUtils.cpp
index 041262c..38bbcd2 100644
--- a/core/sql/common/ComSysUtils.cpp
+++ b/core/sql/common/ComSysUtils.cpp
@@ -98,6 +98,11 @@ void copyInteger (void *destination, Int32 targetLength,
 {
   switch (targetLength)
     {
+    case SQL_TINY_SIZE: {
+      Int8 *target = (Int8 *)destination;
+      copyToInteger1 (target, sourceAddress, sourceLength);
+      break;
+    }
     case SQL_SMALL_SIZE: {
       short *target = (short *)destination;
       copyToInteger2 (target, sourceAddress, sourceLength);
@@ -121,6 +126,42 @@ void copyInteger (void *destination, Int32 targetLength,
 
 }
 
+void copyToInteger1 (Int8 *destination, void *sourceAddress, Int32 sourceSize)
+{
+  switch (sourceSize)
+    {
+    case SQL_TINY_SIZE: {
+      Int8 *source = (Int8 *)sourceAddress;
+      *destination = *source;
+      break;
+    }
+
+    case SQL_SMALL_SIZE: {
+      short *source = (short *)sourceAddress;
+      *destination = (Int8)*source;
+      break;
+    }
+
+    case SQL_INT_SIZE: {
+      Lng32 *source = (Lng32 *)sourceAddress;
+      *destination = (Int8)*source;
+      break;
+    }
+
+    case SQL_LARGE_SIZE: {
+      Int64 *source = (Int64 *)sourceAddress;
+      *destination = (Int8)*source;
+      break;
+    }
+
+    default :
+      break;
+
+    }
+
+
+}
+
 void copyToInteger2 (short *destination, void *sourceAddress, Int32 sourceSize)
 {
   switch (sourceSize)
@@ -151,6 +192,7 @@ void copyToInteger2 (short *destination, void *sourceAddress, Int32 sourceSize)
 
 }
 
+
 void copyToInteger4 (Lng32 *destination, void *sourceAddress, Int32 sourceSize)
 {
   switch (sourceSize)

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a2568f4d/core/sql/common/ComSysUtils.h
----------------------------------------------------------------------
diff --git a/core/sql/common/ComSysUtils.h b/core/sql/common/ComSysUtils.h
index 866a553..8f786e4 100644
--- a/core/sql/common/ComSysUtils.h
+++ b/core/sql/common/ComSysUtils.h
@@ -166,6 +166,7 @@ NA_EIDPROC
 void copyInteger (void *destination, Int32 targetLength, 
 		  void *sourceAddress, Int32 sourceLength);
 
+void copyToInteger1 (Int8 *destination, void *sourceAddress, Int32 sourceSize);
 NA_EIDPROC 
 void copyToInteger2 (short *destination, void *sourceAddress, Int32 sourceSize);
 NA_EIDPROC 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a2568f4d/core/sql/executor/ExExeUtilMisc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExExeUtilMisc.cpp b/core/sql/executor/ExExeUtilMisc.cpp
index 300fd95..47c817d 100644
--- a/core/sql/executor/ExExeUtilMisc.cpp
+++ b/core/sql/executor/ExExeUtilMisc.cpp
@@ -2302,6 +2302,7 @@ short ExExeUtilHiveTruncateTcb::work()
 
       case DATA_MOD_CHECK_:
       {
+        Int64 failedModTS = -1;
         cliRC = ExpLOBinterfaceDataModCheck
           (lobGlob_,
            (htTdb().getPartnLocation() ? 
@@ -2310,7 +2311,8 @@ short ExExeUtilHiveTruncateTcb::work()
            htTdb().getHdfsHost(),
            htTdb().getHdfsPort(),
            htTdb().getModTS(),
-           0);
+           0,
+           failedModTS);
 
         if (cliRC < 0)
         {
@@ -2333,9 +2335,15 @@ short ExExeUtilHiveTruncateTcb::work()
 
         if (cliRC == 1) // data mod check failed
         {
+          char errStr[200];
+          str_sprintf(errStr, "genModTS = %Ld, failedModTS = %Ld", 
+                      htTdb().getModTS(), failedModTS);
+          
           ComDiagsArea * diagsArea = NULL;
           ExRaiseSqlError(getHeap(), &diagsArea, 
-                          (ExeErrorCode)(EXE_HIVE_DATA_MOD_CHECK_ERROR));
+                          (ExeErrorCode)(EXE_HIVE_DATA_MOD_CHECK_ERROR), NULL,
+                          NULL, NULL, NULL,
+                          errStr);
           pentry_down->setDiagsArea(diagsArea);
           
           step_ = ERROR_;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a2568f4d/core/sql/executor/ExFastTransport.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExFastTransport.cpp b/core/sql/executor/ExFastTransport.cpp
index 7676013..8c7e9bb 100644
--- a/core/sql/executor/ExFastTransport.cpp
+++ b/core/sql/executor/ExFastTransport.cpp
@@ -482,14 +482,15 @@ Lng32 ExHdfsFastExtractTcb::lobInterfaceCreate()
 
 }
 
-Lng32 ExHdfsFastExtractTcb::lobInterfaceDataModCheck()
+Lng32 ExHdfsFastExtractTcb::lobInterfaceDataModCheck(Int64 &failedModTS)
 {
   return ExpLOBinterfaceDataModCheck(lobGlob_,
                                      targetLocation_,
                                      hdfsHost_,
                                      hdfsPort_,
                                      myTdb().getModTSforDir(),
-                                     0);
+                                     0,
+                                     failedModTS);
 }
 
 
@@ -719,7 +720,8 @@ ExWorkProcRetcode ExHdfsFastExtractTcb::work()
       memset (targetLocation_, '\0', sizeof(targetLocation_));
       snprintf(targetLocation_,999, "%s", myTdb().getTargetName());
 
-      retcode = lobInterfaceDataModCheck();
+      Int64 failedModTS = -1;
+      retcode = lobInterfaceDataModCheck(failedModTS);
       if (retcode < 0)
       {
         Lng32 cliError = 0;
@@ -741,9 +743,15 @@ ExWorkProcRetcode ExHdfsFastExtractTcb::work()
       
       if (retcode == 1) // check failed
       {
+        char errStr[200];
+        str_sprintf(errStr, "genModTS = %Ld, failedModTS = %Ld", 
+                    myTdb().getModTSforDir(), failedModTS);
+        
         ComDiagsArea * diagsArea = NULL;
         ExRaiseSqlError(getHeap(), &diagsArea, 
-                        (ExeErrorCode)(EXE_HIVE_DATA_MOD_CHECK_ERROR));
+                        (ExeErrorCode)(EXE_HIVE_DATA_MOD_CHECK_ERROR), NULL,
+                        NULL, NULL, NULL,
+                        errStr);
         pentry_down->setDiagsArea(diagsArea);
         pstate.step_ = EXTRACT_ERROR;
         break;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a2568f4d/core/sql/executor/ExFastTransport.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExFastTransport.h b/core/sql/executor/ExFastTransport.h
index 5de05aa..428ad42 100644
--- a/core/sql/executor/ExFastTransport.h
+++ b/core/sql/executor/ExFastTransport.h
@@ -405,7 +405,7 @@ protected:
   Lng32 lobInterfaceInsert(ssize_t bytesToWrite);
   Lng32 lobInterfaceCreate();
   Lng32 lobInterfaceClose();
-  Lng32 lobInterfaceDataModCheck();
+  Lng32 lobInterfaceDataModCheck(Int64 &failedModTS);
 
   virtual void insertUpQueueEntry(ex_queue::up_status status,
                           ComDiagsArea *diags,

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a2568f4d/core/sql/executor/ExHdfsScan.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExHdfsScan.cpp b/core/sql/executor/ExHdfsScan.cpp
index cbaeabc..222ed71 100644
--- a/core/sql/executor/ExHdfsScan.cpp
+++ b/core/sql/executor/ExHdfsScan.cpp
@@ -448,13 +448,15 @@ ExWorkProcRetcode ExHdfsScanTcb::work()
                     // TBD
                   }
              
+                Int64 failedModTS = -1;
                 retcode = ExpLOBinterfaceDataModCheck
                   (lobGlob_,
                    dirPath,
                    hdfsScanTdb().hostName_,
                    hdfsScanTdb().port_,
                    modTS,
-                   numOfPartLevels);
+                   numOfPartLevels,
+                   failedModTS);
               
                 if (retcode < 0)
                   {
@@ -477,9 +479,15 @@ ExWorkProcRetcode ExHdfsScanTcb::work()
 
                 if (retcode == 1) // check failed
                   {
+                    char errStr[200];
+                    str_sprintf(errStr, "genModTS = %Ld, failedModTS = %Ld", 
+                                modTS, failedModTS);
+
                     ComDiagsArea * diagsArea = NULL;
                     ExRaiseSqlError(getHeap(), &diagsArea, 
-                                    (ExeErrorCode)(EXE_HIVE_DATA_MOD_CHECK_ERROR));
+                                    (ExeErrorCode)(EXE_HIVE_DATA_MOD_CHECK_ERROR), NULL,
+                                    NULL, NULL, NULL,
+                                    errStr);
                     pentry_down->setDiagsArea(diagsArea);
                     step_ = HANDLE_ERROR_AND_DONE;
                     break;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a2568f4d/core/sql/exp/ExpLOBaccess.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOBaccess.cpp b/core/sql/exp/ExpLOBaccess.cpp
index 4526749..93a89c9 100644
--- a/core/sql/exp/ExpLOBaccess.cpp
+++ b/core/sql/exp/ExpLOBaccess.cpp
@@ -373,7 +373,8 @@ Ex_Lob_Error ExLob::writeDataSimple(char *data, Int64 size, LobsSubOper subOpera
 Ex_Lob_Error ExLob::dataModCheck2(
        char * dirPath, 
        Int64  inputModTS,
-       Lng32  numOfPartLevels)
+       Lng32  numOfPartLevels,
+       Int64 &failedModTS)
 {
   if (numOfPartLevels == 0)
     return LOB_OPER_OK;
@@ -396,7 +397,10 @@ Ex_Lob_Error ExLob::dataModCheck2(
           if ((inputModTS > 0) &&
               (currModTS > inputModTS) &&
 	      (!strstr(fileInfo.mName, ".hive-staging_hive_")))
-            failed = TRUE;
+            {
+              failed = TRUE;
+              failedModTS = currModTS;
+            }
         }
     }
 
@@ -411,7 +415,8 @@ Ex_Lob_Error ExLob::dataModCheck2(
       for (Lng32 i = 0; ((NOT failed) && (i < currNumFilesInDir)); i++)
         {
           hdfsFileInfo &fileInfo = fileInfos[i];
-          err = dataModCheck2(fileInfo.mName, inputModTS, numOfPartLevels);
+          err = dataModCheck2(fileInfo.mName, inputModTS, numOfPartLevels,
+                              failedModTS);
           if (err != LOB_OPER_OK)
             return err;
         }
@@ -422,12 +427,16 @@ Ex_Lob_Error ExLob::dataModCheck2(
 
 // numOfPartLevels: 0, if not partitioned
 //                  N, number of partitioning cols
+// failedModTS: timestamp value that caused the mismatch
 Ex_Lob_Error ExLob::dataModCheck(
        char * dirPath, 
        Int64  inputModTS,
        Lng32  numOfPartLevels,
-       ExLobGlobals *lobGlobals)
+       ExLobGlobals *lobGlobals,
+       Int64 &failedModTS)
 {
+  failedModTS = -1;
+
   // find mod time of root dir
   hdfsFileInfo *fileInfos = hdfsGetPathInfo(fs_, dirPath);
   if (fileInfos == NULL)
@@ -439,11 +448,14 @@ Ex_Lob_Error ExLob::dataModCheck(
   hdfsFreeFileInfo(fileInfos, 1);
   if ((inputModTS > 0) &&
       (currModTS > inputModTS))
-    return LOB_DATA_MOD_CHECK_ERROR;
+    {
+      failedModTS = currModTS;
+      return LOB_DATA_MOD_CHECK_ERROR;
+    }
 
   if (numOfPartLevels > 0)
     {
-      return dataModCheck2(dirPath, inputModTS, numOfPartLevels);
+      return dataModCheck2(dirPath, inputModTS, numOfPartLevels, failedModTS);
     }
 
   return LOB_OPER_OK;
@@ -2189,23 +2201,33 @@ Ex_Lob_Error ExLob::initStats()
 
 Ex_Lob_Error ExLobsOper (
 			 char        *lobName,          // lob name
+
 			 char        *handleIn,         // input handle (for cli calls)
 			 Int32       handleInLen,       // input handle len
+
 			 char        *hdfsServer,       // server where hdfs fs resides
 			 Int64       hdfsPort,          // port number to access hdfs server
+
 			 char        *handleOut,        // output handle (for cli calls)
 			 Int32       &handleOutLen,     // output handle len
+
 			 Int64       descNumIn,         // input desc Num (for flat files only)
 			 Int64       &descNumOut,       // output desc Num (for flat files only)
+
 			 Int64       &retOperLen,       // length of data involved in this operation
+
 			 Int64       requestTagIn,      // only for checking status
 			 Int64       &requestTagOut,    // returned with every request other than check status
+
 			 Ex_Lob_Error  &requestStatus,  // returned req status
 			 Int64       &cliError,         // err returned by cli call
+
 			 char        *lobStorageLocation,              // directory in the storage
 			 LobsStorage storage,           // storage type
+
 			 char        *source,           // source (memory addr, filename, foreign lob etc)
 			 Int64       sourceLen,         // source len (memory len, foreign desc offset etc)
+
 			 Int64       cursorBytes,
 			 char        *cursorId,
 			 LobsOper    operation,         // LOB operation
@@ -2507,8 +2529,10 @@ Ex_Lob_Error ExLobsOper (
         Int64 inputModTS = *(Int64*)blackBox;
         Int32 inputNumOfPartLevels = 
           *(Lng32*)&((char*)blackBox)[sizeof(inputModTS)];
+        Int64 failedModTS = -1;
         err = lobPtr->dataModCheck(lobStorageLocation, inputModTS, inputNumOfPartLevels,
-                                   lobGlobals);
+                                   lobGlobals, failedModTS);
+        descNumOut = failedModTS;
       }
       break;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a2568f4d/core/sql/exp/ExpLOBaccess.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOBaccess.h b/core/sql/exp/ExpLOBaccess.h
index b05eb8f..102735d 100644
--- a/core/sql/exp/ExpLOBaccess.h
+++ b/core/sql/exp/ExpLOBaccess.h
@@ -481,17 +481,20 @@ class ExLob
   // dirPath: path to needed directory (includes directory name)
   // modTS is the latest timestamp on any file/dir under dirPath.
   // This method validates that current modTS is not greater then input modTS.
+  // On return, failedModTS contains current timestamp that caused mismatch.
   // Return: LOB_OPER_OK, if passes. LOB_DATA_MOD_CHECK_ERROR, if fails.
   Ex_Lob_Error dataModCheck(
        char * dirPath, 
        Int64  modTS,
        Lng32  numOfPartLevels,
-       ExLobGlobals *lobGlobals);
+       ExLobGlobals *lobGlobals,
+       Int64 &failedModTS);
 
   Ex_Lob_Error dataModCheck2(
        char * dirPath, 
        Int64  modTS,
-       Lng32  numOfPartLevels);
+       Lng32  numOfPartLevels,
+       Int64 &failedModTS);
 
   Ex_Lob_Error emptyDirectory(char* dirPath, ExLobGlobals* lobGlobals);
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a2568f4d/core/sql/exp/ExpLOBinterface.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOBinterface.cpp b/core/sql/exp/ExpLOBinterface.cpp
index 9c3c213..25a7b4b 100644
--- a/core/sql/exp/ExpLOBinterface.cpp
+++ b/core/sql/exp/ExpLOBinterface.cpp
@@ -256,7 +256,8 @@ Lng32 ExpLOBinterfaceDataModCheck(void * exLobGlob,
                                   char * lobHdfsServer,
                                   Lng32  lobHdfsPort,
                                   Int64  modTS,
-                                  Lng32  numOfPartLevels)
+                                  Lng32  numOfPartLevels,
+                                  Int64 &failedModTS)
 {
   Ex_Lob_Error err;
 
@@ -269,11 +270,15 @@ Lng32 ExpLOBinterfaceDataModCheck(void * exLobGlob,
   *(Int64*)dirInfoBuf = modTS;
   *(Lng32*)&dirInfoBuf[sizeof(modTS)] = numOfPartLevels;
   Lng32 dirInfoBufLen = sizeof(modTS) + sizeof(numOfPartLevels);
+  failedModTS = -1;
   err = ExLobsOper((char*)"",
                    NULL, 0,
                    lobHdfsServer, lobHdfsPort,
-                   NULL, dummyParam2, 0, dummyParam,
-                   dummyParam, 0, dummyParam, status, cliError,
+                   NULL, dummyParam2, 
+                   0, failedModTS,
+                   dummyParam, 
+                   0, dummyParam,
+                   status, cliError,
                    dirPath, (LobsStorage)Lob_HDFS_File,
                    NULL, 0,
 		   0,NULL,
@@ -284,7 +289,6 @@ Lng32 ExpLOBinterfaceDataModCheck(void * exLobGlob,
                    0, 
                    dirInfoBuf, dirInfoBufLen
                    );
-
   if (err == LOB_DATA_MOD_CHECK_ERROR)
     return 1;
   else if (err != LOB_OPER_OK)

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a2568f4d/core/sql/exp/ExpLOBinterface.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOBinterface.h b/core/sql/exp/ExpLOBinterface.h
index cb6fda8..4a4ede2 100644
--- a/core/sql/exp/ExpLOBinterface.h
+++ b/core/sql/exp/ExpLOBinterface.h
@@ -295,13 +295,15 @@ Lng32 ExpLOBinterfacePurgeBackupLobDataFile(void *& lobGlob,  char *hdfsServer,
 // dirPath: path to needed directory (includes directory name)
 // modTS is the latest timestamp on any file/dir under dirPath.
 // This method validates that current modTS is not greater then input modTS.
+// On return, failedModTS contains current timestamp that caused mismatch.
 // Return: 1, if check fails. 0, if passes. -1, if error.
 Lng32 ExpLOBinterfaceDataModCheck(void * lobGlob,
                                   char * dirPath,
                                   char * lobHdfsServer,
                                   Lng32  lobHdfsPort,
                                   Int64  modTS,
-                                  Lng32  numOfPartLevels);
+                                  Lng32  numOfPartLevels,
+                                  Int64 &failedModTS);
 
 Lng32 ExpLOBinterfaceEmptyDirectory(void * lobGlob,
                             char * lobName,

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a2568f4d/core/sql/generator/GenPreCode.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenPreCode.cpp b/core/sql/generator/GenPreCode.cpp
index 998d62c..5d36854 100644
--- a/core/sql/generator/GenPreCode.cpp
+++ b/core/sql/generator/GenPreCode.cpp
@@ -7665,7 +7665,7 @@ ItemExpr * BiArith::preCodeGen(Generator * generator)
       child(0) = generator->getExpGenerator()->convertNumericToInterval(
                                                  child(0)->getValueId(),
                                                  *result_type);
-      strcpy(str, "1");
+      strcpy(str, "001"); // to make sure it is not a tinyint
       child(1) = generator->getExpGenerator()->createExprTree(str, CharInfo::ISO88591);
       child(1)->bindNode(generator->getBindWA());
       type_op2 = (NAType *)(&(child(1)->getValueId().getType()));
@@ -7714,7 +7714,7 @@ ItemExpr * BiArith::preCodeGen(Generator * generator)
       child(0) = generator->getExpGenerator()->convertNumericToInterval(
                                                  child(0)->getValueId(),
                                                  *result_type);
-      strcpy(str, "1");
+      strcpy(str, "001"); // to make sure it is not a tinyint
       child(1) = generator->getExpGenerator()->createExprTree(str, CharInfo::ISO88591);
       child(1)->bindNode(generator->getBindWA());
       type_op2 = (NAType *)(&(child(1)->getValueId().getType()));

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a2568f4d/core/sql/regress/compGeneral/EXPECTED071
----------------------------------------------------------------------
diff --git a/core/sql/regress/compGeneral/EXPECTED071 b/core/sql/regress/compGeneral/EXPECTED071
index 0182828..fe3fea5 100644
--- a/core/sql/regress/compGeneral/EXPECTED071
+++ b/core/sql/regress/compGeneral/EXPECTED071
@@ -1015,7 +1015,7 @@ TRAFODION_SCAN                  MTDN1
 OPERATOR                        TNAME                                                         BKEY                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      EKEY
 ------------------------------  ------------------------------------------------------------  ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-TRAFODION_SCAN                  MTDN3                                                         begin_key: (_SALT_ = <min>), (_DIVISION_1_ = DATE_PART('YEARQUARTER',%(2009-12-06 12:13:14))), (_DIVISION_2_ = 'ab  '), (_DIVISION_3_ = cast((cast(((cast((cast(((cast(%(2099-01-06 12:13:14.555555)) - cast((cast(dayofweek(%(2099-01-06 12:13:14.555555))) - cast(1)))) - (cast(1900-01-01) - cast((cast(dayofweek(1900-01-01)) - cast(1)))))) * cast(10))) / cast(7)) / cast(10))) / cast(1)))), (_DIVISION_4_ = 'ab'), (_DIVISION_5_ = <min>), (PC1 = %(2009-12-06 12:13:14)), (PC2 = %(2099-01-06 12:13:14.555555)), (PC3 = 'ab'), (PC4 = <min>)                                                                     end_key: (_SALT_ = <max>), (_DIVISION_1_ = DATE_PART('YEARQUARTER',%(2009-12-06 12:13:14))), (_DIVISION_2_ = 'abcf'), (_DIVISION_3_ = cast((cast(((cast((cast(((cast(%(2099-01-06 12:13:14.555555)) - cast((cast(dayofweek(%(2099-01-06 12:13:14.555555))) - cast(1)))) - (cast(1900-01-01) - cast((cast(dayo
 fweek(1900-01-01)) - cast(1)))))) * cast(10))) / cast(7)) / cast(10))) / cast(1)))), (_DIVISION_4_ = 'ab'), (_DIVISION_5_ = <max>), (PC1 = %(2009-12-06 12:13:14)), (PC2 = %(2099-01-06 12:13:14.555555)), (PC3 = 'abcf'), (PC4 = <max>)                                                                   
+TRAFODION_SCAN                  MTDN3                                                         begin_key: (_SALT_ = <min>), (_DIVISION_1_ = DATE_PART('YEARQUARTER',%(2009-12-06 12:13:14))), (_DIVISION_2_ = 'ab  '), (_DIVISION_3_ = cast((cast(((cast((cast(((cast(%(2099-01-06 12:13:14.555555)) - cast((cast(dayofweek(%(2099-01-06 12:13:14.555555))) - cast(1)))) - (cast(1900-01-01) - cast((cast(dayofweek(1900-01-01)) - cast(1)))))) * cast(10))) / cast(7)) / cast(10))) / cast(001)))), (_DIVISION_4_ = 'ab'), (_DIVISION_5_ = <min>), (PC1 = %(2009-12-06 12:13:14)), (PC2 = %(2099-01-06 12:13:14.555555)), (PC3 = 'ab'), (PC4 = <min>)                                                                   end_key: (_SALT_ = <max>), (_DIVISION_1_ = DATE_PART('YEARQUARTER',%(2009-12-06 12:13:14))), (_DIVISION_2_ = 'abcf'), (_DIVISION_3_ = cast((cast(((cast((cast(((cast(%(2099-01-06 12:13:14.555555)) - cast((cast(dayofweek(%(2099-01-06 12:13:14.555555))) - cast(1)))) - (cast(1900-01-01) - cast((cast(dayo
 fweek(1900-01-01)) - cast(1)))))) * cast(10))) / cast(7)) / cast(10))) / cast(001)))), (_DIVISION_4_ = 'ab'), (_DIVISION_5_ = <max>), (PC1 = %(2009-12-06 12:13:14)), (PC2 = %(2099-01-06 12:13:14.555555)), (PC3 = 'abcf'), (PC4 = <max>)                                                                 
 
 --- 1 row(s) selected.
 >>-- ("_DIVISION_1_", "_DIVISION_2_", "_DIVISION_3_", "_DIVISION_4_") has (=, between, = between, none) predicates
@@ -1033,7 +1033,7 @@ TRAFODION_SCAN                  MTDN3
 OPERATOR                        TNAME                                                         BKEY                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      EKEY
 ------------------------------  ------------------------------------------------------------  ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-TRAFODION_SCAN                  MTDN3                                                         begin_key: (_SALT_ = <min>), (_DIVISION_1_ = DATE_PART('YEARQUARTER',%(2009-12-06 12:13:14))), (_DIVISION_2_ = 'ab  '), (_DIVISION_3_ = cast((cast(((cast((cast(((cast(%(2099-01-06 12:13:14.555555)) - cast((cast(dayofweek(%(2099-01-06 12:13:14.555555))) - cast(1)))) - (cast(1900-01-01) - cast((cast(dayofweek(1900-01-01)) - cast(1)))))) * cast(10))) / cast(7)) / cast(10))) / cast(1)))), (_DIVISION_4_ = 'ab'), (_DIVISION_5_ = <min>), (PC1 = %(2009-12-06 12:13:14)), (PC2 = %(2099-01-06 12:13:14.555555)), (PC3 = 'ab'), (PC4 = <min>)                                                                     end_key: (_SALT_ = <max>), (_DIVISION_1_ = DATE_PART('YEARQUARTER',%(2009-12-06 12:13:14))), (_DIVISION_2_ = 'abcf'), (_DIVISION_3_ = cast((cast(((cast((cast(((cast(%(2099-01-06 12:13:14.555555)) - cast((cast(dayofweek(%(2099-01-06 12:13:14.555555))) - cast(1)))) - (cast(1900-01-01) - cast((cast(dayo
 fweek(1900-01-01)) - cast(1)))))) * cast(10))) / cast(7)) / cast(10))) / cast(1)))), (_DIVISION_4_ = 'ab'), (_DIVISION_5_ = <max>), (PC1 = %(2009-12-06 12:13:14)), (PC2 = %(2099-01-06 12:13:14.555555)), (PC3 = 'abcf'), (PC4 = <max>)                                                                   
+TRAFODION_SCAN                  MTDN3                                                         begin_key: (_SALT_ = <min>), (_DIVISION_1_ = DATE_PART('YEARQUARTER',%(2009-12-06 12:13:14))), (_DIVISION_2_ = 'ab  '), (_DIVISION_3_ = cast((cast(((cast((cast(((cast(%(2099-01-06 12:13:14.555555)) - cast((cast(dayofweek(%(2099-01-06 12:13:14.555555))) - cast(1)))) - (cast(1900-01-01) - cast((cast(dayofweek(1900-01-01)) - cast(1)))))) * cast(10))) / cast(7)) / cast(10))) / cast(001)))), (_DIVISION_4_ = 'ab'), (_DIVISION_5_ = <min>), (PC1 = %(2009-12-06 12:13:14)), (PC2 = %(2099-01-06 12:13:14.555555)), (PC3 = 'ab'), (PC4 = <min>)                                                                   end_key: (_SALT_ = <max>), (_DIVISION_1_ = DATE_PART('YEARQUARTER',%(2009-12-06 12:13:14))), (_DIVISION_2_ = 'abcf'), (_DIVISION_3_ = cast((cast(((cast((cast(((cast(%(2099-01-06 12:13:14.555555)) - cast((cast(dayofweek(%(2099-01-06 12:13:14.555555))) - cast(1)))) - (cast(1900-01-01) - cast((cast(dayo
 fweek(1900-01-01)) - cast(1)))))) * cast(10))) / cast(7)) / cast(10))) / cast(001)))), (_DIVISION_4_ = 'ab'), (_DIVISION_5_ = <max>), (PC1 = %(2009-12-06 12:13:14)), (PC2 = %(2099-01-06 12:13:14.555555)), (PC3 = 'abcf'), (PC4 = <max>)                                                                 
 
 --- 1 row(s) selected.
 >>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a2568f4d/core/sql/regress/hive/EXPECTED003
----------------------------------------------------------------------
diff --git a/core/sql/regress/hive/EXPECTED003 b/core/sql/regress/hive/EXPECTED003
index dc6ef06..b4c29de 100644
--- a/core/sql/regress/hive/EXPECTED003
+++ b/core/sql/regress/hive/EXPECTED003
@@ -191,7 +191,7 @@ P_PROMO_SK   P_PROMO_ID                 P_START_DATE_SK  P_END_DATE_SK  P_ITEM_S
 
 *** WARNING[8597] Statement was automatically retried 1 time(s). Delay before each retry was 0 seconds. See next entry for the error that caused this retry.
 
-*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions.
+*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions. DataModMismatchDetails: genModTS = 1472755958, failedModTS = 1472755959
 
 (EXPR)              
 --------------------
@@ -532,6 +532,9 @@ T_TIME_SK    T_TIME_ID                  T_TIME       T_HOUR       T_MINUTE     T
 >>cqd HIVE_MAX_STRING_LENGTH '25' ;
 
 --- SQL operation complete.
+>>truncate ins_store_sales_summary;
+
+--- SQL operation complete.
 >>control query shape esp_exchange(cut);
 
 --- SQL operation complete.
@@ -648,7 +651,7 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 ---
 > *** WARNING[8597] Statement was automatically retried 1 time(s). Delay before each retry was 0 seconds. See next entry for the error that caused this retry.
 > 
-> *** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions.
+> *** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions. DataModMismatchDetails: genModTS = 1472756038, failedModTS = 1472756057
 > 
 > SS_SOLD_DATE_SK  SS_STORE_SK  SS_QUANTITY
 > ---------------  -----------  -----------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a2568f4d/core/sql/regress/hive/EXPECTED005
----------------------------------------------------------------------
diff --git a/core/sql/regress/hive/EXPECTED005 b/core/sql/regress/hive/EXPECTED005
index 8b290e4..665a151 100644
--- a/core/sql/regress/hive/EXPECTED005
+++ b/core/sql/regress/hive/EXPECTED005
@@ -72,7 +72,7 @@
 
 *** WARNING[8597] Statement was automatically retried 1 time(s). Delay before each retry was 0 seconds. See next entry for the error that caused this retry. 
 
-*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions.
+*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions. DataModMismatchDetails: genModTS = 1472657273, failedModTS = 1472657341
 
 C_PREFERRED_CUST_FLAG      (EXPR)              
 -------------------------  --------------------
@@ -108,7 +108,7 @@ Y                                          9525
 
 *** WARNING[8597] Statement was automatically retried 1 time(s). Delay before each retry was 0 seconds. See next entry for the error that caused this retry. 
 
-*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions.
+*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions. DataModMismatchDetails: genModTS = 1472657273, failedModTS = 1472657341
 
 C_PREFERRED_CUST_FLAG      (EXPR)              
 -------------------------  --------------------
@@ -177,7 +177,7 @@ Y                                          9525
 
 *** WARNING[8597] Statement was automatically retried 1 time(s). Delay before each retry was 0 seconds. See next entry for the error that caused this retry. 
 
-*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions.
+*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions. DataModMismatchDetails: genModTS = 1472657345, failedModTS = 1472657357
 
 A                        
 -------------------------
@@ -227,7 +227,7 @@ xyz
 
 *** WARNING[8597] Statement was automatically retried 1 time(s). Delay before each retry was 0 seconds. See next entry for the error that caused this retry. 
 
-*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions.
+*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions. DataModMismatchDetails: genModTS = 1472657341, failedModTS = 1472657378
 
 C_PREFERRED_CUST_FLAG      (EXPR)              
 -------------------------  --------------------
@@ -242,7 +242,7 @@ Y                                         18984
 
 *** WARNING[8597] Statement was automatically retried 1 time(s). Delay before each retry was 0 seconds. See next entry for the error that caused this retry. 
 
-*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions.
+*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions. DataModMismatchDetails: genModTS = 1472657341, failedModTS = 1472657378
 
 C_PREFERRED_CUST_FLAG      (EXPR)              
 -------------------------  --------------------
@@ -298,7 +298,7 @@ Y                                         18984
 
 *** WARNING[8597] Statement was automatically retried 1 time(s). Delay before each retry was 0 seconds. See next entry for the error that caused this retry. 
 
-*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions.
+*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions. DataModMismatchDetails: genModTS = 1472657375, failedModTS = 1472657383
 
 A            B                        
 -----------  -------------------------
@@ -681,7 +681,7 @@ C1           C2                    C3                         C4               C
 
 *** WARNING[8597] Statement was automatically retried 1 time(s). Delay before each retry was 0 seconds. See next entry for the error that caused this retry. 
 
-*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions.
+*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions. DataModMismatchDetails: genModTS = 1472657488, failedModTS = 1472657504
 
 A          
 -----------
@@ -715,7 +715,7 @@ A
 
 *** WARNING[8597] Statement was automatically retried 1 time(s). Delay before each retry was 0 seconds. See next entry for the error that caused this retry. 
 
-*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions.
+*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions. DataModMismatchDetails: genModTS = 1472657505, failedModTS = 1472657542
 
 A          
 -----------
@@ -742,7 +742,7 @@ A            B
 
 *** WARNING[8597] Statement was automatically retried 1 time(s). Delay before each retry was 0 seconds. See next entry for the error that caused this retry. 
 
-*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions.
+*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions. DataModMismatchDetails: genModTS = 1472657542, failedModTS = 1472657545
 
 --- 0 row(s) selected.
 >>insert into hive.hive.thive values (10, 20);
@@ -766,7 +766,7 @@ A            B
 
 *** WARNING[8597] Statement was automatically retried 1 time(s). Delay before each retry was 0 seconds. See next entry for the error that caused this retry. 
 
-*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions.
+*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions. DataModMismatchDetails: genModTS = 1472657548, failedModTS = 1472657549
 
 --- 0 row(s) selected.
 >>
@@ -856,7 +856,7 @@ t005part.a	t005part.b	t005part.c
 >>invoke hive.hive.thive_insert_smallint;
 
 -- Definition of hive table THIVE_INSERT_SMALLINT
--- Definition current  Wed Aug 24 21:29:53 2016
+-- Definition current  Wed Aug 31 15:35:21 2016
 
   (
     A                                SMALLINT
@@ -961,7 +961,7 @@ A
 >>invoke hive.hive.thive_insert_varchar;
 
 -- Definition of hive table THIVE_INSERT_VARCHAR
--- Definition current  Wed Aug 24 21:29:58 2016
+-- Definition current  Wed Aug 31 15:35:26 2016
 
   (
     A                                VARCHAR(1 CHAR) CHARACTER SET UTF8 COLLATE

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a2568f4d/core/sql/regress/hive/EXPECTED018
----------------------------------------------------------------------
diff --git a/core/sql/regress/hive/EXPECTED018 b/core/sql/regress/hive/EXPECTED018
index 14cd75a..d28f47f 100644
--- a/core/sql/regress/hive/EXPECTED018
+++ b/core/sql/regress/hive/EXPECTED018
@@ -150,9 +150,9 @@ Task:  CLEANUP         Status: Started    Object: TRAFODION.HBASE.CUSTOMER_ADDRE
 Task:  CLEANUP         Status: Ended      Object: TRAFODION.HBASE.CUSTOMER_ADDRESS
 Task:  PREPARATION     Status: Started    Object: TRAFODION.HBASE.CUSTOMER_ADDRESS
        Rows Processed: 50000 
-Task:  PREPARATION     Status: Ended      ET: 00:00:08.019
+Task:  PREPARATION     Status: Ended      ET: 00:00:08.257
 Task:  COMPLETION      Status: Started    Object: TRAFODION.HBASE.CUSTOMER_ADDRESS
-Task:  COMPLETION      Status: Ended      ET: 00:00:00.251
+Task:  COMPLETION      Status: Ended      ET: 00:00:00.283
 
 --- 50000 row(s) loaded.
 >>--
@@ -181,9 +181,9 @@ Task:  CLEANUP         Status: Started    Object: TRAFODION.HBASE.CUSTOMER_DEMOG
 Task:  CLEANUP         Status: Ended      Object: TRAFODION.HBASE.CUSTOMER_DEMOGRAPHICS
 Task:  PREPARATION     Status: Started    Object: TRAFODION.HBASE.CUSTOMER_DEMOGRAPHICS
        Rows Processed: 20000 
-Task:  PREPARATION     Status: Ended      ET: 00:00:10.738
+Task:  PREPARATION     Status: Ended      ET: 00:00:11.898
 Task:  COMPLETION      Status: Started    Object: TRAFODION.HBASE.CUSTOMER_DEMOGRAPHICS
-Task:  COMPLETION      Status: Ended      ET: 00:00:00.182
+Task:  COMPLETION      Status: Ended      ET: 00:00:00.311
 
 --- 20000 row(s) loaded.
 >>--
@@ -213,9 +213,9 @@ Task:  CLEANUP         Status: Started    Object: TRAFODION.HBASE.CUSTOMER_DEMOG
 Task:  CLEANUP         Status: Ended      Object: TRAFODION.HBASE.CUSTOMER_DEMOGRAPHICS_SALT
 Task:  PREPARATION     Status: Started    Object: TRAFODION.HBASE.CUSTOMER_DEMOGRAPHICS_SALT
        Rows Processed: 20000 
-Task:  PREPARATION     Status: Ended      ET: 00:00:08.632
+Task:  PREPARATION     Status: Ended      ET: 00:00:08.869
 Task:  COMPLETION      Status: Started    Object: TRAFODION.HBASE.CUSTOMER_DEMOGRAPHICS_SALT
-Task:  COMPLETION      Status: Ended      ET: 00:00:00.165
+Task:  COMPLETION      Status: Ended      ET: 00:00:00.331
 
 --- 20000 row(s) loaded.
 >>--                                                                              
@@ -235,9 +235,9 @@ Task:  CLEANUP         Status: Started    Object: TRAFODION.HBASE.CUSTOMER_SALT
 Task:  CLEANUP         Status: Ended      Object: TRAFODION.HBASE.CUSTOMER_SALT
 Task:  PREPARATION     Status: Started    Object: TRAFODION.HBASE.CUSTOMER_SALT
        Rows Processed: 100000 
-Task:  PREPARATION     Status: Ended      ET: 00:00:07.306
+Task:  PREPARATION     Status: Ended      ET: 00:00:11.286
 Task:  COMPLETION      Status: Started    Object: TRAFODION.HBASE.CUSTOMER_SALT
-Task:  COMPLETION      Status: Ended      ET: 00:00:00.192
+Task:  COMPLETION      Status: Ended      ET: 00:00:00.377
 
 --- 100000 row(s) loaded.
 >>--
@@ -266,9 +266,9 @@ Task:  CLEANUP         Status: Started    Object: TRAFODION.HBASE.STORE_SALES_SA
 Task:  CLEANUP         Status: Ended      Object: TRAFODION.HBASE.STORE_SALES_SALT
 Task:  PREPARATION     Status: Started    Object: TRAFODION.HBASE.STORE_SALES_SALT
        Rows Processed: 160756 
-Task:  PREPARATION     Status: Ended      ET: 00:00:10.315
+Task:  PREPARATION     Status: Ended      ET: 00:00:15.910
 Task:  COMPLETION      Status: Started    Object: TRAFODION.HBASE.STORE_SALES_SALT
-Task:  COMPLETION      Status: Ended      ET: 00:00:00.168
+Task:  COMPLETION      Status: Ended      ET: 00:00:00.330
 
 --- 160756 row(s) loaded.
 >>--
@@ -356,10 +356,10 @@ a
 +>   select * from null_format_src;
 Task: UNLOAD           Status: Started
 Task:  EMPTY TARGET    Status: Started
-Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.003
+Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.004
 Task:  EXTRACT         Status: Started
        Rows Processed: 10 
-Task:  EXTRACT         Status: Ended      ET: 00:00:00.219
+Task:  EXTRACT         Status: Ended      ET: 00:00:00.123
 
 --- 10 row(s) unloaded.
 >>select * from hive.hive.null_format_default;
@@ -388,7 +388,7 @@ Task:  EMPTY TARGET    Status: Started
 Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.004
 Task:  EXTRACT         Status: Started
        Rows Processed: 10 
-Task:  EXTRACT         Status: Ended      ET: 00:00:00.196
+Task:  EXTRACT         Status: Ended      ET: 00:00:00.089
 
 --- 10 row(s) unloaded.
 >>select * from hive.hive.null_format_empty;
@@ -414,10 +414,10 @@ a                                                             ?
 +>   select * from null_format_src;
 Task: UNLOAD           Status: Started
 Task:  EMPTY TARGET    Status: Started
-Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.003
+Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.005
 Task:  EXTRACT         Status: Started
        Rows Processed: 10 
-Task:  EXTRACT         Status: Ended      ET: 00:00:00.199
+Task:  EXTRACT         Status: Ended      ET: 00:00:00.074
 
 --- 10 row(s) unloaded.
 >>select * from hive.hive.null_format_colon;
@@ -480,12 +480,12 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 +>;
 Task: UNLOAD           Status: Started
 Task:  EMPTY TARGET    Status: Started
-Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.024
+Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.008
 Task:  EXTRACT         Status: Started
        Rows Processed: 50000 
-Task:  EXTRACT         Status: Ended      ET: 00:00:02.162
+Task:  EXTRACT         Status: Ended      ET: 00:00:03.704
 Task:  MERGE FILES     Status: Started
-Task:  MERGE FILES     Status: Ended      ET: 00:00:00.038
+Task:  MERGE FILES     Status: Ended      ET: 00:00:00.042
 
 --- 50000 row(s) unloaded.
 >>log;
@@ -518,12 +518,12 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 +><<+ cardinality 10e10 >>;
 Task: UNLOAD           Status: Started
 Task:  EMPTY TARGET    Status: Started
-Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.003
+Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.011
 Task:  EXTRACT         Status: Started
        Rows Processed: 20000 
-Task:  EXTRACT         Status: Ended      ET: 00:00:00.631
+Task:  EXTRACT         Status: Ended      ET: 00:00:00.908
 Task:  MERGE FILES     Status: Started
-Task:  MERGE FILES     Status: Ended      ET: 00:00:00.017
+Task:  MERGE FILES     Status: Ended      ET: 00:00:01.101
 
 --- 20000 row(s) unloaded.
 >>log;
@@ -542,12 +542,12 @@ cat /tmp/merged_customer_demogs | wc -l
 +><<+ cardinality 10e10 >>;
 Task: UNLOAD           Status: Started
 Task:  EMPTY TARGET    Status: Started
-Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.005
+Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.007
 Task:  EXTRACT         Status: Started
        Rows Processed: 20000 
-Task:  EXTRACT         Status: Ended      ET: 00:00:00.593
+Task:  EXTRACT         Status: Ended      ET: 00:00:01.154
 Task:  MERGE FILES     Status: Started
-Task:  MERGE FILES     Status: Ended      ET: 00:00:00.036
+Task:  MERGE FILES     Status: Ended      ET: 00:00:00.025
 
 --- 20000 row(s) unloaded.
 >>log;
@@ -579,12 +579,12 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 +><<+ cardinality 10e10 >>;
 Task: UNLOAD           Status: Started
 Task:  EMPTY TARGET    Status: Started
-Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.003
+Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.005
 Task:  EXTRACT         Status: Started
        Rows Processed: 20000 
-Task:  EXTRACT         Status: Ended      ET: 00:00:00.790
+Task:  EXTRACT         Status: Ended      ET: 00:00:00.822
 Task:  MERGE FILES     Status: Started
-Task:  MERGE FILES     Status: Ended      ET: 00:00:00.028
+Task:  MERGE FILES     Status: Ended      ET: 00:00:00.047
 
 --- 20000 row(s) unloaded.
 >>
@@ -602,12 +602,12 @@ regrhadoop.ksh fs -du -s /bulkload/customer_demographics_salt/merged_customer_de
 +><<+ cardinality 10e10 >>;
 Task: UNLOAD           Status: Started
 Task:  EMPTY TARGET    Status: Started
-Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.003
+Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.010
 Task:  EXTRACT         Status: Started
        Rows Processed: 20000 
-Task:  EXTRACT         Status: Ended      ET: 00:00:00.560
+Task:  EXTRACT         Status: Ended      ET: 00:00:00.609
 Task:  MERGE FILES     Status: Started
-Task:  MERGE FILES     Status: Ended      ET: 00:00:00.032
+Task:  MERGE FILES     Status: Ended      ET: 00:00:00.051
 
 --- 20000 row(s) unloaded.
 >>
@@ -640,10 +640,10 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 +><<+ cardinality 10e10 >>;
 Task: UNLOAD           Status: Started
 Task:  EMPTY TARGET    Status: Started
-Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.003
+Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.005
 Task:  EXTRACT         Status: Started
        Rows Processed: 20000 
-Task:  EXTRACT         Status: Ended      ET: 00:00:00.467
+Task:  EXTRACT         Status: Ended      ET: 00:00:00.399
 
 --- 20000 row(s) unloaded.
 >>
@@ -663,12 +663,12 @@ regrhadoop.ksh fs -ls /bulkload/customer_demographics_salt/file* |  grep file |
 +><<+ cardinality 10e10 >>;
 Task: UNLOAD           Status: Started
 Task:  EMPTY TARGET    Status: Started
-Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.009
+Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.018
 Task:  EXTRACT         Status: Started
        Rows Processed: 20000 
-Task:  EXTRACT         Status: Ended      ET: 00:00:00.504
+Task:  EXTRACT         Status: Ended      ET: 00:00:00.428
 Task:  MERGE FILES     Status: Started
-Task:  MERGE FILES     Status: Ended      ET: 00:00:00.030
+Task:  MERGE FILES     Status: Ended      ET: 00:00:00.045
 
 --- 20000 row(s) unloaded.
 >>
@@ -801,12 +801,12 @@ CD_DEMO_SK   CD_GENDER
 +><<+ cardinality 10e10 >>;
 Task: UNLOAD           Status: Started
 Task:  EMPTY TARGET    Status: Started
-Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.003
+Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.004
 Task:  EXTRACT         Status: Started
        Rows Processed: 20000 
-Task:  EXTRACT         Status: Ended      ET: 00:00:00.560
+Task:  EXTRACT         Status: Ended      ET: 00:00:00.528
 Task:  MERGE FILES     Status: Started
-Task:  MERGE FILES     Status: Ended      ET: 00:00:00.035
+Task:  MERGE FILES     Status: Ended      ET: 00:00:00.046
 
 --- 20000 row(s) unloaded.
 >>log;
@@ -841,12 +841,12 @@ regrhadoop.ksh fs -ls /bulkload/customer_demographics_salt/merged* | grep merge
 +><<+ cardinality 10e10 >>;
 Task: UNLOAD           Status: Started
 Task:  EMPTY TARGET    Status: Started
-Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.004
+Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.005
 Task:  EXTRACT         Status: Started
        Rows Processed: 20000 
-Task:  EXTRACT         Status: Ended      ET: 00:00:00.477
+Task:  EXTRACT         Status: Ended      ET: 00:00:00.403
 Task:  MERGE FILES     Status: Started
-Task:  MERGE FILES     Status: Ended      ET: 00:00:00.074
+Task:  MERGE FILES     Status: Ended      ET: 00:00:00.062
 
 --- 20000 row(s) unloaded.
 >>--sh sleep 10;
@@ -899,7 +899,7 @@ Task:  EMPTY TARGET    Status: Started
 Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.004
 Task:  EXTRACT         Status: Started
        Rows Processed: 20000 
-Task:  EXTRACT         Status: Ended      ET: 00:00:00.448
+Task:  EXTRACT         Status: Ended      ET: 00:00:00.381
 
 --- 20000 row(s) unloaded.
 >>--sh sleep 10;
@@ -907,7 +907,7 @@ Task:  EXTRACT         Status: Ended      ET: 00:00:00.448
 
 *** WARNING[8597] Statement was automatically retried 1 time(s). Delay before each retry was 0 seconds. See next entry for the error that caused this retry.
 
-*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions.
+*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions. DataModMismatchDetails: genModTS = 1472659421, failedModTS = 1472659422
 
 (EXPR)              
 --------------------
@@ -950,10 +950,10 @@ CD_DEMO_SK   CD_GENDER
 +>select * from trafodion.hbase.customer_address ;
 Task: UNLOAD           Status: Started
 Task:  EMPTY TARGET    Status: Started
-Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.003
+Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.004
 Task:  EXTRACT         Status: Started
        Rows Processed: 50000 
-Task:  EXTRACT         Status: Ended      ET: 00:00:01.450
+Task:  EXTRACT         Status: Ended      ET: 00:00:02.414
 
 --- 50000 row(s) unloaded.
 >>--sh sleep 10;
@@ -1003,10 +1003,10 @@ CA_ADDRESS_SK  CA_ADDRESS_ID
 +>select * from trafodion.hbase.customer_address ;
 Task: UNLOAD           Status: Started
 Task:  EMPTY TARGET    Status: Started
-Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.011
+Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.004
 Task:  EXTRACT         Status: Started
        Rows Processed: 50000 
-Task:  EXTRACT         Status: Ended      ET: 00:00:01.355
+Task:  EXTRACT         Status: Ended      ET: 00:00:02.159
 
 --- 50000 row(s) unloaded.
 >>--sh sleep 10;
@@ -1014,7 +1014,7 @@ Task:  EXTRACT         Status: Ended      ET: 00:00:01.355
 
 *** WARNING[8597] Statement was automatically retried 1 time(s). Delay before each retry was 0 seconds. See next entry for the error that caused this retry.
 
-*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions.
+*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions. DataModMismatchDetails: genModTS = 1472659426, failedModTS = 1472659428
 
 (EXPR)              
 --------------------
@@ -1069,10 +1069,10 @@ CA_ADDRESS_SK  CA_ADDRESS_ID
 +>select * from trafodion.hbase.customer_salt;
 Task: UNLOAD           Status: Started
 Task:  EMPTY TARGET    Status: Started
-Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.003
+Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.004
 Task:  EXTRACT         Status: Started
        Rows Processed: 100000 
-Task:  EXTRACT         Status: Ended      ET: 00:00:04.708
+Task:  EXTRACT         Status: Ended      ET: 00:00:07.519
 
 --- 100000 row(s) unloaded.
 >>--sh sleep 10;
@@ -1126,7 +1126,7 @@ Task:  EMPTY TARGET    Status: Started
 Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.008
 Task:  EXTRACT         Status: Started
        Rows Processed: 20000 
-Task:  EXTRACT         Status: Ended      ET: 00:00:00.708
+Task:  EXTRACT         Status: Ended      ET: 00:00:00.938
 
 --- 20000 row(s) unloaded.
 >>--sh sleep 10;
@@ -1176,12 +1176,12 @@ CD_DEMO_SK   CD_GENDER
 +>select * from trafodion.hbase.customer_address where ca_address_sk < 100;
 Task: UNLOAD           Status: Started
 Task:  EMPTY TARGET    Status: Started
-Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.003
+Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.006
 Task:  EXTRACT         Status: Started
        Rows Processed: 99 
-Task:  EXTRACT         Status: Ended      ET: 00:00:00.200
+Task:  EXTRACT         Status: Ended      ET: 00:00:00.075
 Task:  MERGE FILES     Status: Started
-Task:  MERGE FILES     Status: Ended      ET: 00:00:00.020
+Task:  MERGE FILES     Status: Ended      ET: 00:00:00.035
 
 --- 99 row(s) unloaded.
 >>
@@ -1217,10 +1217,10 @@ regrhadoop.ksh fs -rm /user/hive/exttables/unload_customer_demographics/*
 +>select ss_sold_date_sk,ss_store_sk, sum (ss_quantity) from store_sales_salt group by  ss_sold_date_sk ,ss_store_sk;
 Task: UNLOAD           Status: Started
 Task:  EMPTY TARGET    Status: Started
-Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.004
+Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.005
 Task:  EXTRACT         Status: Started
        Rows Processed: 12349 
-Task:  EXTRACT         Status: Ended      ET: 00:00:05.157
+Task:  EXTRACT         Status: Ended      ET: 00:00:07.755
 
 --- 12349 row(s) unloaded.
 >>--sh sleep 10;
@@ -1339,10 +1339,10 @@ SS_SOLD_DATE_SK  SS_STORE_SK  SS_QUANTITY
 +>select * from trafodion.hbase.customer_salt c join trafodion.hbase.customer_address ca on c.c_current_addr_sk = ca.ca_address_sk ;
 Task: UNLOAD           Status: Started
 Task:  EMPTY TARGET    Status: Started
-Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.003
+Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.004
 Task:  EXTRACT         Status: Started
        Rows Processed: 100000 
-Task:  EXTRACT         Status: Ended      ET: 00:00:05.823
+Task:  EXTRACT         Status: Ended      ET: 00:00:08.828
 
 --- 100000 row(s) unloaded.
 >>--sh sleep 10;
@@ -1390,10 +1390,10 @@ C_CUSTOMER_SK  C_CUSTOMER_ID
 +>select * from customer_address where ca_address_sk < 1000 union select * from customer_address where ca_address_sk > 40000  and ca_address_sk < 41000;
 Task: UNLOAD           Status: Started
 Task:  EMPTY TARGET    Status: Started
-Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.004
+Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.025
 Task:  EXTRACT         Status: Started
        Rows Processed: 1998 
-Task:  EXTRACT         Status: Ended      ET: 00:00:00.449
+Task:  EXTRACT         Status: Ended      ET: 00:00:00.298
 
 --- 1998 row(s) unloaded.
 >>--sh sleep 10;
@@ -1504,7 +1504,7 @@ ESP_EXCHANGE ==============================  SEQ_NO 3        ONLY CHILD 2
   use_snapshot_scan ...... TRUE
   full_table_name ........ TRAFODION.HBASE.CUSTOMER_DEMOGRAPHICS_SALT
   snapshot_name .......... TRAFODION.HBASE.CUSTOMER_DEMOGRAPHICS_SALT_SNAP111
-  snapshot_temp_location   /bulkload/20160728184715/
+  snapshot_temp_location   /bulkload/20160831160431/
 grep -i -e 'explain reg' -e snapshot -e full_table_name  -e esp_exchange  LOG018_REGULAR_SCAN_PLAN.TXT | grep -v snapshot_scan_run_id
 >>--no snapshot
 >>explain reg;
@@ -1584,7 +1584,7 @@ grep -i -e 'explain snp' -e snapshot -e full_table_name -e esp_exchange LOG018_S
   use_snapshot_scan ...... TRUE
   full_table_name ........ TRAFODION.HBASE.CUSTOMER_ADDRESS
   snapshot_name .......... TRAFODION.HBASE.CUSTOMER_ADDRESS_SNAP111
-  snapshot_temp_location   /bulkload/20160728184722/
+  snapshot_temp_location   /bulkload/20160831160440/
 grep -i -e 'explain reg' -e snapshot -e full_table_name  -e esp_exchange  LOG018_REGULAR_SCAN_PLAN.TXT | grep -v snapshot_scan_run_id
 >>--no snapshot
 >>explain reg;
@@ -1666,11 +1666,11 @@ grep -i -e 'explain snp' -e snapshot -e full_table_name -e esp_exchange LOG018_S
   use_snapshot_scan ...... TRUE
   full_table_name ........ TRAFODION.HBASE.CUSTOMER_SALT
   snapshot_name .......... TRAFODION.HBASE.CUSTOMER_SALT_SNAP111
-  snapshot_temp_location   /bulkload/20160728184741/
+  snapshot_temp_location   /bulkload/20160831160504/
   use_snapshot_scan ...... TRUE
   full_table_name ........ TRAFODION.HBASE.CUSTOMER_ADDRESS
   snapshot_name .......... TRAFODION.HBASE.CUSTOMER_ADDRESS_SNAP111
-  snapshot_temp_location   /bulkload/20160728184741/
+  snapshot_temp_location   /bulkload/20160831160504/
 grep -i -e 'explain reg' -e snapshot -e full_table_name  -e esp_exchange  LOG018_REGULAR_SCAN_PLAN.TXT | grep -v snapshot_scan_run_id
 >>--no snapshot
 >>explain reg;
@@ -1783,13 +1783,13 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 +><<+ cardinality 10e10 >>;
 Task: UNLOAD           Status: Started
 Task:  EMPTY TARGET    Status: Started
-Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.003
+Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.005
 Task:  VERIFY SNAPSHO  Status: Started
        Snapshots verified: 1 
-Task:  VERIFY SNAPSHO  Status: Ended      ET: 00:00:00.294
+Task:  VERIFY SNAPSHO  Status: Ended      ET: 00:00:00.347
 Task:  EXTRACT         Status: Started
        Rows Processed: 50000 
-Task:  EXTRACT         Status: Ended      ET: 00:00:01.446
+Task:  EXTRACT         Status: Ended      ET: 00:00:01.797
 
 --- 50000 row(s) unloaded.
 >>
@@ -1864,10 +1864,10 @@ Task:  EMPTY TARGET    Status: Started
 Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.003
 Task:  VERIFY SNAPSHO  Status: Started
        Snapshots verified: 1 
-Task:  VERIFY SNAPSHO  Status: Ended      ET: 00:00:00.297
+Task:  VERIFY SNAPSHO  Status: Ended      ET: 00:00:00.333
 Task:  EXTRACT         Status: Started
        Rows Processed: 20000 
-Task:  EXTRACT         Status: Ended      ET: 00:00:01.827
+Task:  EXTRACT         Status: Ended      ET: 00:00:01.984
 
 --- 20000 row(s) unloaded.
 >>
@@ -1915,16 +1915,16 @@ CD_DEMO_SK   CD_GENDER
 +>select * from trafodion.hbase.customer_demographics_salt <<+ cardinality 10e10 >>;
 Task: UNLOAD           Status: Started
 Task:  EMPTY TARGET    Status: Started
-Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.007
+Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.008
 Task:  CREATE SNAPSHO  Status: Started
        Snapshots created: 1 
-Task:  CREATE SNAPSHO  Status: Ended      ET: 00:00:00.436
+Task:  CREATE SNAPSHO  Status: Ended      ET: 00:00:00.960
 Task:  EXTRACT         Status: Started
        Rows Processed: 20000 
-Task:  EXTRACT         Status: Ended      ET: 00:00:01.026
+Task:  EXTRACT         Status: Ended      ET: 00:00:01.198
 Task:  DELETE SNAPSHO  Status: Started
        Snapshots deleted: 1 
-Task:  DELETE SNAPSHO  Status: Ended      ET: 00:00:00.010
+Task:  DELETE SNAPSHO  Status: Ended      ET: 00:00:00.011
 
 --- 20000 row(s) unloaded.
 >>
@@ -1932,7 +1932,7 @@ Task:  DELETE SNAPSHO  Status: Ended      ET: 00:00:00.010
 
 *** WARNING[8597] Statement was automatically retried 1 time(s). Delay before each retry was 0 seconds. See next entry for the error that caused this retry.
 
-*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions.
+*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions. DataModMismatchDetails: genModTS = 1472659615, failedModTS = 1472659617
 
 (EXPR)              
 --------------------
@@ -1976,13 +1976,13 @@ CD_DEMO_SK   CD_GENDER
 +>select * from trafodion.hbase.customer_demographics_salt <<+ cardinality 10e10 >>;
 Task: UNLOAD           Status: Started
 Task:  EMPTY TARGET    Status: Started
-Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.007
+Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.008
 Task:  CREATE SNAPSHO  Status: Started
        Snapshots created: 1 
-Task:  CREATE SNAPSHO  Status: Ended      ET: 00:00:00.590
+Task:  CREATE SNAPSHO  Status: Ended      ET: 00:00:00.736
 Task:  EXTRACT         Status: Started
        Rows Processed: 20000 
-Task:  EXTRACT         Status: Ended      ET: 00:00:00.996
+Task:  EXTRACT         Status: Ended      ET: 00:00:00.706
 Task:  DELETE SNAPSHO  Status: Started
        Snapshots deleted: 1 
 Task:  DELETE SNAPSHO  Status: Ended      ET: 00:00:00.004
@@ -2001,7 +2001,7 @@ Task:  DELETE SNAPSHO  Status: Ended      ET: 00:00:00.004
 
 *** WARNING[8597] Statement was automatically retried 1 time(s). Delay before each retry was 0 seconds. See next entry for the error that caused this retry.
 
-*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions.
+*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions. DataModMismatchDetails: genModTS = 1472659618, failedModTS = 1472659621
 
 CD_DEMO_SK   CD_GENDER                                                                                             CD_MARITAL_STATUS                                                                                     CD_EDUCATION_STATUS                                                                                   CD_PURCHASE_ESTIMATE  CD_CREDIT_RATING                                                                                      CD_DEP_COUNT  CD_DEP_EMPLOYED_COUNT  CD_DEP_COLLEGE_COUNT
 -----------  ----------------------------------------------------------------------------------------------------  ----------------------------------------------------------------------------------------------------  ----------------------------------------------------------------------------------------------------  --------------------  ----------------------------------------------------------------------------------------------------  ------------  ---------------------  --------------------
@@ -2038,13 +2038,13 @@ CD_DEMO_SK   CD_GENDER
 +>select * from customer_address where ca_address_sk < 1000 union select * from customer_address where ca_address_sk > 40000  and ca_address_sk < 41000;
 Task: UNLOAD           Status: Started
 Task:  EMPTY TARGET    Status: Started
-Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.005
+Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.004
 Task:  CREATE SNAPSHO  Status: Started
        Snapshots created: 1 
-Task:  CREATE SNAPSHO  Status: Ended      ET: 00:00:00.500
+Task:  CREATE SNAPSHO  Status: Ended      ET: 00:00:00.782
 Task:  EXTRACT         Status: Started
        Rows Processed: 1998 
-Task:  EXTRACT         Status: Ended      ET: 00:00:00.562
+Task:  EXTRACT         Status: Ended      ET: 00:00:00.490
 Task:  DELETE SNAPSHO  Status: Started
        Snapshots deleted: 1 
 Task:  DELETE SNAPSHO  Status: Ended      ET: 00:00:00.003
@@ -2122,16 +2122,16 @@ CA_ADDRESS_SK  CA_ADDRESS_ID
 +>select * from trafodion.hbase.customer_salt c join trafodion.hbase.customer_address ca on c.c_current_addr_sk = ca.ca_address_sk ;
 Task: UNLOAD           Status: Started
 Task:  EMPTY TARGET    Status: Started
-Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.003
+Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.005
 Task:  CREATE SNAPSHO  Status: Started
        Snapshots created: 2 
-Task:  CREATE SNAPSHO  Status: Ended      ET: 00:00:01.644
+Task:  CREATE SNAPSHO  Status: Ended      ET: 00:00:02.378
 Task:  EXTRACT         Status: Started
        Rows Processed: 100000 
-Task:  EXTRACT         Status: Ended      ET: 00:00:06.607
+Task:  EXTRACT         Status: Ended      ET: 00:00:08.125
 Task:  DELETE SNAPSHO  Status: Started
        Snapshots deleted: 2 
-Task:  DELETE SNAPSHO  Status: Ended      ET: 00:00:00.006
+Task:  DELETE SNAPSHO  Status: Ended      ET: 00:00:00.009
 
 --- 100000 row(s) unloaded.
 >>--sh sleep 10;
@@ -2199,16 +2199,16 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 +>select c_first_name,c_last_name from trafodion.hbase.customer_salt;
 Task: UNLOAD           Status: Started
 Task:  EMPTY TARGET    Status: Started
-Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.009
+Task:  EMPTY TARGET    Status: Ended      ET: 00:00:00.004
 Task:  CREATE SNAPSHO  Status: Started
        Snapshots created: 1 
-Task:  CREATE SNAPSHO  Status: Ended      ET: 00:00:00.361
+Task:  CREATE SNAPSHO  Status: Ended      ET: 00:00:00.634
 Task:  EXTRACT         Status: Started
        Rows Processed: 100000 
-Task:  EXTRACT         Status: Ended      ET: 00:00:01.350
+Task:  EXTRACT         Status: Ended      ET: 00:00:01.045
 Task:  DELETE SNAPSHO  Status: Started
        Snapshots deleted: 1 
-Task:  DELETE SNAPSHO  Status: Ended      ET: 00:00:00.004
+Task:  DELETE SNAPSHO  Status: Ended      ET: 00:00:00.003
 
 --- 100000 row(s) unloaded.
 >>--sh sleep 10;
@@ -2254,7 +2254,7 @@ C_FIRST_NAME
 Task: UNLOAD           Status: Started
 Task:  EXTRACT         Status: Started
 
-*** ERROR[8447] An error occurred during hdfs access. Error Detail: Java exception in hdfsCreate().
+*** ERROR[8447] An error occurred during hdfs access. Error Detail: Java exception in hdfsCreate(). 
 java.io.IOException: No FileSystem for scheme: null
 org.apache.hadoop.fs.FileSystem.getFileSystemClass(FileSystem.java:2584)
 org.apache.hadoop.fs.FileSystem.createFileSystem(FileSystem.java:2591)
@@ -2262,7 +2262,7 @@ org.apache.hadoop.fs.FileSystem.access$200(FileSystem.java:91)
 org.apache.hadoop.fs.FileSystem$Cache.getInternal(FileSystem.java:2630)
 org.apache.hadoop.fs.FileSystem$Cache.get(FileSystem.java:2612)
 org.apache.hadoop.fs.FileSystem.get(FileSystem.java:370)
-org.trafodion.sql.SequenceFileWriter.hdfsCreate(SequenceFileWriter.java:162)
+org.trafodion.sql.SequenceFileWriter.hdfsCreate(SequenceFileWriter.java:163)
 
 --- 0 row(s) unloaded.
 >>
@@ -2289,7 +2289,7 @@ unload with delimiter 0 into '/bulkload/test' select * from CUSTOMER_ADDRESS;
 Task: UNLOAD           Status: Started
 Task:  EXTRACT         Status: Started
        Rows Processed: 50000 
-Task:  EXTRACT         Status: Ended      ET: 00:00:01.328
+Task:  EXTRACT         Status: Ended      ET: 00:00:02.218
 
 --- 50000 row(s) unloaded.
 >>--unload  24 -- should give an error
@@ -2354,7 +2354,7 @@ regrhadoop.ksh fs -rm /user/hive/exttables/unload_customer_demographics/*
 Task: UNLOAD           Status: Started
 Task:  EXTRACT         Status: Started
        Rows Processed but NOT Written to Disk: 20000 
-Task:  EXTRACT         Status: Ended      ET: 00:00:00.435
+Task:  EXTRACT         Status: Ended      ET: 00:00:00.704
 
 --- 20000 row(s) unloaded.
 >>--sh sleep 10;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a2568f4d/core/sql/regress/hive/TEST003
----------------------------------------------------------------------
diff --git a/core/sql/regress/hive/TEST003 b/core/sql/regress/hive/TEST003
index f5e4cde..67b6845 100644
--- a/core/sql/regress/hive/TEST003
+++ b/core/sql/regress/hive/TEST003
@@ -167,6 +167,7 @@ cqd PARALLEL_NUM_ESPS '2';
 set schema hive;
 cqd hive_max_esps '2';
 cqd HIVE_MAX_STRING_LENGTH '25' ;
+truncate ins_store_sales_summary;
 control query shape esp_exchange(cut);
 prepare s from insert into table ins_store_sales_summary select ss_sold_date_sk,ss_store_sk, sum (ss_quantity) from store_sales group by  ss_sold_date_sk ,ss_store_sk; 
 explain options 'f' s;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a2568f4d/core/sql/regress/seabase/EXPECTED030
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/EXPECTED030 b/core/sql/regress/seabase/EXPECTED030
index 431dfaa..8daaf86 100644
--- a/core/sql/regress/seabase/EXPECTED030
+++ b/core/sql/regress/seabase/EXPECTED030
@@ -491,6 +491,63 @@ March 01, 2016, 10:11:12
 
 --- 1 row(s) selected.
 >>
+>>select YEAR(interval '10-05' year to month) from (values(1)) as t(a);
+
+(EXPR)
+------
+
+    10
+
+--- 1 row(s) selected.
+>>select MONTH(interval '02-05' year to month) from (values(1)) as t(a);
+
+(EXPR)
+------
+
+     5
+
+--- 1 row(s) selected.
+>>select DAY(interval '5' day) from (values(1)) as t(a);
+
+(EXPR)
+------
+
+     5
+
+--- 1 row(s) selected.
+>>select HOUR(interval '5:2:15:36.33' day to second(2)) from (values(1)) as t(a);
+
+(EXPR)
+------
+
+     2
+
+--- 1 row(s) selected.
+>>select MINUTE(interval '5:13:25:2.12' day to second(2)) from (values(1)) as t(a);
+
+(EXPR)
+------
+
+    25
+
+--- 1 row(s) selected.
+>>select extract (year from INTERVAL '97-02' YEAR TO MONTH) from (values (1)) as t(a);
+
+(EXPR)
+------
+
+    97
+
+--- 1 row(s) selected.
+>>select interval '8' year / 4 from dual;
+
+(EXPR)
+------
+
+     2
+
+--- 1 row(s) selected.
+>>
 >>drop table if exists t030t1;
 
 --- SQL operation complete.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a2568f4d/core/sql/regress/seabase/TEST030
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/TEST030 b/core/sql/regress/seabase/TEST030
index 900d982..7aee335 100644
--- a/core/sql/regress/seabase/TEST030
+++ b/core/sql/regress/seabase/TEST030
@@ -89,6 +89,14 @@ select dateformat(timestamp '2016-03-01 10:11:12.12', usa) from (values(1)) x(a)
 select dateformat(timestamp '2016-03-01 20:11:12.12', usa) from (values(1)) x(a);
 select cast(DATEFORMAT (TIMESTAMP '1990-06-11 07:00:09.00', USA) as char(30)) from (values (1)) x(a);
 
+select YEAR(interval '10-05' year to month) from (values(1)) as t(a);
+select MONTH(interval '02-05' year to month) from (values(1)) as t(a);
+select DAY(interval '5' day) from (values(1)) as t(a);
+select HOUR(interval '5:2:15:36.33' day to second(2)) from (values(1)) as t(a);
+select MINUTE(interval '5:13:25:2.12' day to second(2)) from (values(1)) as t(a);
+select extract (year from INTERVAL '97-02' YEAR TO MONTH) from (values (1)) as t(a);
+select interval '8' year / 4 from dual;
+
 drop table if exists t030t1;
 create table t030t1 (a date, b char(30), c varchar(30));
 insert into t030t1 values (date '2016-03-01', '2016-03-01', '2016-03-01');

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a2568f4d/core/sql/regress/tools/regress-filter-linux
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/regress-filter-linux b/core/sql/regress/tools/regress-filter-linux
index f345fd2..2238f86 100755
--- a/core/sql/regress/tools/regress-filter-linux
+++ b/core/sql/regress/tools/regress-filter-linux
@@ -434,6 +434,9 @@ s/^ ObjectUIDs \.\.\.\.\.\.\.\.\.\.\.\.\. [0-9,]*$/  ObjectUIDs filtered/g
 # Query IDs
 s/qid MXID11.*$/qid filtered/g
 s/ID MXID11.*$/qid filtered/g
+
+s/DataModMismatchDetails:[ 0-9a-zA-Z:,=]*/DataModMismatchDetails: removed/g
+
 " $sedInput
 
 #

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a2568f4d/core/sql/regress/tools/runregr
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/runregr b/core/sql/regress/tools/runregr
index 5786ac4..f6a47e8 100755
--- a/core/sql/regress/tools/runregr
+++ b/core/sql/regress/tools/runregr
@@ -37,6 +37,7 @@ concurrent_execution=0
 exclusive_execution=0
 log_qualifier=
 diffs=0
+failed=0
 
 # Parse command line options.  Options must appear on the command line before
 # test names.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a2568f4d/core/sql/ustat/hs_cli.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_cli.cpp b/core/sql/ustat/hs_cli.cpp
index cc16591..c27f644 100644
--- a/core/sql/ustat/hs_cli.cpp
+++ b/core/sql/ustat/hs_cli.cpp
@@ -3215,6 +3215,9 @@ NAType* ConstructNumericType( Long addr
 {
   NAType *type;
   switch(length) {
+  case 1:
+    type = new(currHeap) SQLTiny(allowNeg, nullflag, currHeap);
+    break;
   case 2:
     if (!ALIGN2(addr))
       {


Mime
View raw message