You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by an...@apache.org on 2016/03/17 02:54:06 UTC

[1/9] incubator-trafodion git commit: JIRA 1849 Add support for alter column rename (details below)

Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 2a9e9f223 -> 616961db5


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
index ce3349b..53a9b74 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
@@ -1,4 +1,4 @@
- /**********************************************************************
+/**********************************************************************
 // @@@ START COPYRIGHT @@@
 //
 // Licensed to the Apache Software Foundation (ASF) under one
@@ -3057,7 +3057,9 @@ short CmpSeabaseDDL::dropSeabaseTable2(
     }
   else if (dropTableNode->getDropBehavior() == COM_CASCADE_DROP_BEHAVIOR)
     {
-      cliRC = getUsingViews(cliInterface, objUID, usingViewsQueue);
+      cliRC = getAllUsingViews(cliInterface, 
+                               catalogNamePart, schemaNamePart, objectNamePart,
+                               usingViewsQueue);
       if (cliRC < 0)
         {
           deallocEHI(ehi); 
@@ -3106,13 +3108,14 @@ short CmpSeabaseDDL::dropSeabaseTable2(
   // Drop referencing objects
   char query[4000];
 
+  // drop the views.
+  // usingViewsQueue contain them in ascending order of their create
+  // time. Drop them from last to first.
   if (usingViewsQueue)
     {
-      usingViewsQueue->position();
-      for (int idx = 0; idx < usingViewsQueue->numEntries(); idx++)
+      for (int idx = usingViewsQueue->numEntries()-1; idx >= 0; idx--)
         {
-          OutputInfo * vi = (OutputInfo*)usingViewsQueue->getNext(); 
-          
+          OutputInfo * vi = (OutputInfo*)usingViewsQueue->get(idx);
           char * viewName = vi->get(0);
           
           if (dropOneTableorView(*cliInterface,viewName,COM_VIEW_OBJECT,false))
@@ -4270,26 +4273,6 @@ short CmpSeabaseDDL::cloneSeabaseTable(
   return 0;
 }
 
-short CmpSeabaseDDL::recreateViews(ExeCliInterface &cliInterface,
-                                   NAList<NAString> &viewNameList,
-                                   NAList<NAString> &viewDefnList)
-{
-  Lng32 cliRC = 0;
-
-  for (Lng32 i = 0; i < viewDefnList.entries(); i++)
-    {
-      cliRC = cliInterface.executeImmediate(viewDefnList[i]);
-      if (cliRC < 0)
-        {
-          cliInterface.retrieveSQLDiagnostics(CmpCommon::diags());
-          
-          return -1;
-        }
-    }
-
-  return 0;
-}
-
 void CmpSeabaseDDL::alterSeabaseTableAddColumn(
                                                StmtDDLAlterTableAddColumn * alterAddColNode,
                                                NAString &currCatName, NAString &currSchName)
@@ -4342,6 +4325,16 @@ void CmpSeabaseDDL::alterSeabaseTableAddColumn(
       return;
     }
 
+  if (retcode == 0) // does not exist
+    {
+      *CmpCommon::diags() << DgSqlCode(-CAT_CANNOT_ALTER_WRONG_TYPE)
+                          << DgString0(extTableName);
+
+      processReturn();
+
+      return;
+    }
+
   ActiveSchemaDB()->getNATableDB()->useCache();
 
   BindWA bindWA(ActiveSchemaDB(), CmpCommon::context(), FALSE/*inDDL*/);
@@ -4853,6 +4846,285 @@ short CmpSeabaseDDL::updateMDforDropCol(ExeCliInterface &cliInterface,
   return 0;
 }
 
+///////////////////////////////////////////////////////////////////////
+//
+// An aligned table constains all columns in one hbase cell.
+// To drop a column, we need to read each row, create a
+// new row with the removed column and insert into the original table.
+//
+// Steps to drop a column from an aligned table:
+//
+// -- make a copy of the source aligned table using hbase copy
+// -- truncate the source table
+// -- Update metadata and remove the dropped column.
+// -- bulk load data from copied table into the source table
+// -- drop the copied temp table
+//
+// If an error happens after the source table has been truncated, then
+// it will be restored from the copied table.
+//
+///////////////////////////////////////////////////////////////////////
+short CmpSeabaseDDL::alignedFormatTableDropColumn
+(
+ const NAString &catalogNamePart,
+ const NAString &schemaNamePart,
+ const NAString &objectNamePart,
+ const NATable * naTable,
+ const NAString &altColName,
+ ElemDDLColDef *pColDef,
+ NABoolean ddlXns,
+ NAList<NAString> &viewNameList,
+ NAList<NAString> &viewDefnList)
+{
+  Lng32 cliRC = 0;
+
+  const NAFileSet * naf = naTable->getClusteringIndex();
+  
+  CorrName cn(objectNamePart, STMTHEAP, schemaNamePart, catalogNamePart);
+
+  ComUID comUID;
+  comUID.make_UID();
+  Int64 objUID = comUID.get_value();
+  
+  char objUIDbuf[100];
+
+  NAString tempTable(naTable->getTableName().getQualifiedNameAsAnsiString());
+  tempTable += "_";
+  tempTable += str_ltoa(objUID, objUIDbuf);
+
+  ExpHbaseInterface * ehi = allocEHI();
+  ExeCliInterface cliInterface
+    (STMTHEAP, NULL, NULL, 
+     CmpCommon::context()->sqlSession()->getParentQid());
+
+  Int64 tableUID = naTable->objectUid().castToInt64();
+  const NAColumnArray &naColArr = naTable->getNAColumnArray();
+  const NAColumn * altNaCol = naColArr.getColumn(altColName);
+  Lng32 altColNum = altNaCol->getPosition();
+
+  NAString tgtCols;
+  NAString srcCols;
+
+ NABoolean xnWasStartedHere = FALSE;
+
+  char buf[4000];
+
+  if (cloneSeabaseTable(cn, naTable, tempTable, ehi, &cliInterface))
+    {
+      cliRC = -1;
+      goto label_drop;
+    }
+  
+  if (truncateHbaseTable(catalogNamePart, schemaNamePart, objectNamePart,
+                         (NATable*)naTable, ehi))
+    {
+      cliRC = -1;
+      goto label_restore;
+    }
+
+  if (beginXnIfNotInProgress(&cliInterface, xnWasStartedHere))
+    {
+      cliRC = -1;
+      goto label_restore;
+    }
+
+  if (updateMDforDropCol(cliInterface, naTable, altColNum))
+    {
+      cliRC = -1;
+      goto label_restore;
+    }
+  
+  ActiveSchemaDB()->getNATableDB()->removeNATable
+    (cn,
+     ComQiScope::REMOVE_FROM_ALL_USERS, 
+     COM_BASE_TABLE_OBJECT, ddlXns, FALSE);
+
+  for (Int32 c = 0; c < naColArr.entries(); c++)
+    {
+      const NAColumn * nac = naColArr[c];
+      if (nac->getColName() == altColName)
+        continue;
+
+      if (nac->isComputedColumn())
+        continue;
+
+      if (nac->isSystemColumn())
+        continue;
+
+      tgtCols += nac->getColName();
+      tgtCols += ",";
+    } // for
+
+  tgtCols = tgtCols.strip(NAString::trailing, ',');
+
+  str_sprintf(buf, "upsert using load into %s(%s) select %s from %s",
+              naTable->getTableName().getQualifiedNameAsAnsiString().data(),
+              tgtCols.data(),
+              tgtCols.data(),
+              tempTable.data());
+  cliRC = cliInterface.executeImmediate(buf);
+  if (cliRC < 0)
+    {
+      cliInterface.retrieveSQLDiagnostics(CmpCommon::diags());
+      goto label_restore;
+    }
+
+  if ((cliRC = recreateUsingViews(&cliInterface, viewNameList, viewDefnList,
+                                  ddlXns)) < 0)
+    {
+      NAString reason = "Error occured while recreating views due to dependency on older column definition. Drop dependent views before doing the alter.";
+      *CmpCommon::diags() << DgSqlCode(-1404)
+                          << DgColumnName(altColName)
+                          << DgString0(reason);
+      goto label_restore;
+    }
+
+  endXnIfStartedHere(&cliInterface, xnWasStartedHere, 0);
+
+  str_sprintf(buf, "drop table %s", tempTable.data());
+  cliRC = cliInterface.executeImmediate(buf);
+  if (cliRC < 0)
+    {
+      cliInterface.retrieveSQLDiagnostics(CmpCommon::diags());
+      goto label_restore;
+    }
+  
+  deallocEHI(ehi); 
+  
+  return 0;
+
+ label_restore:
+  endXnIfStartedHere(&cliInterface, xnWasStartedHere, -1);
+
+  cloneHbaseTable(tempTable, 
+                  naTable->getTableName().getQualifiedNameAsAnsiString(),
+                  ehi);
+ 
+ label_drop:  
+  str_sprintf(buf, "drop table %s", tempTable.data());
+  Lng32 cliRC2 = cliInterface.executeImmediate(buf);
+  
+  deallocEHI(ehi); 
+  
+  return (cliRC < 0 ? -1 : 0);  
+}
+
+short CmpSeabaseDDL::hbaseFormatTableDropColumn(
+     ExpHbaseInterface *ehi,
+     const NAString &catalogNamePart,
+     const NAString &schemaNamePart,
+     const NAString &objectNamePart,
+     const NATable * naTable,
+     const NAString &altColName,
+     const NAColumn * nacol,
+     NABoolean ddlXns,
+     NAList<NAString> &viewNameList,
+     NAList<NAString> &viewDefnList)
+{
+  Lng32 cliRC = 0;
+
+  const NAString extNameForHbase = 
+    catalogNamePart + "." + schemaNamePart + "." + objectNamePart;
+
+  ExeCliInterface cliInterface(
+       STMTHEAP, NULL, NULL, 
+       CmpCommon::context()->sqlSession()->getParentQid());
+
+  Lng32 colNumber = nacol->getPosition();
+
+  NABoolean xnWasStartedHere = FALSE;
+  if (beginXnIfNotInProgress(&cliInterface, xnWasStartedHere))
+    {
+      cliRC = -1;
+      goto label_error;
+    }
+  
+  if (updateMDforDropCol(cliInterface, naTable, colNumber))
+    {
+      cliRC = -1;
+      goto label_error;
+    }
+  
+  // remove column from all rows of the base table
+  HbaseStr hbaseTable;
+  hbaseTable.val = (char*)extNameForHbase.data();
+  hbaseTable.len = extNameForHbase.length();
+  
+  {
+    NAString column(nacol->getHbaseColFam(), heap_);
+    column.append(":");
+    
+    char * colQualPtr = (char*)nacol->getHbaseColQual().data();
+    Lng32 colQualLen = nacol->getHbaseColQual().length();
+    Int64 colQval = str_atoi(colQualPtr, colQualLen);
+    if (colQval <= UCHAR_MAX)
+      {
+        unsigned char c = (unsigned char)colQval;
+        column.append((char*)&c, 1);
+      }
+    else if (colQval <= USHRT_MAX)
+      {
+        unsigned short s = (unsigned short)colQval;
+        column.append((char*)&s, 2);
+      }
+    else if (colQval <= ULONG_MAX)
+      {
+        Lng32 l = (Lng32)colQval;
+        column.append((char*)&l, 4);
+      }
+    else
+      column.append((char*)&colQval, 8);
+    
+    HbaseStr colNameStr;
+    char * col = (char *) heap_->allocateMemory(column.length() + 1, FALSE);
+    if (col)
+      {
+        memcpy(col, column.data(), column.length());
+        col[column.length()] = 0;
+        colNameStr.val = col;
+        colNameStr.len = column.length();
+      }
+    else
+      {
+        cliRC = -EXE_NO_MEM_TO_EXEC;
+        *CmpCommon::diags() << DgSqlCode(-EXE_NO_MEM_TO_EXEC);  // error -8571
+        
+        goto label_error;
+      }
+    
+    cliRC = ehi->deleteColumns(hbaseTable, colNameStr);
+    if (cliRC < 0)
+      {
+        *CmpCommon::diags() << DgSqlCode(-8448)
+                            << DgString0((char*)"ExpHbaseInterface::deleteColumns()")
+                            << DgString1(getHbaseErrStr(-cliRC))
+                            << DgInt0(-cliRC)
+                            << DgString2((char*)GetCliGlobals()->getJniErrorStr().data());
+        
+        goto label_error;
+      }
+  }
+  
+  if ((cliRC = recreateUsingViews(&cliInterface, viewNameList, viewDefnList,
+                                  ddlXns)) < 0)
+    {
+      NAString reason = "Error occured while recreating views due to dependency on older column definition. Drop dependent views before doing the alter.";
+      *CmpCommon::diags() << DgSqlCode(-1404)
+                          << DgColumnName(altColName)
+                          << DgString0(reason);
+      goto label_error;
+    }
+
+  endXnIfStartedHere(&cliInterface, xnWasStartedHere, 0);
+  
+  return 0;
+
+ label_error:
+  endXnIfStartedHere(&cliInterface, xnWasStartedHere, -1);
+
+  return -1;
+}
+
 void CmpSeabaseDDL::alterSeabaseTableDropColumn(
                                                 StmtDDLAlterTableDropColumn * alterDropColNode,
                                                 NAString &currCatName, NAString &currSchName)
@@ -4905,10 +5177,20 @@ void CmpSeabaseDDL::alterSeabaseTableDropColumn(
       return;
     }
 
-  ActiveSchemaDB()->getNATableDB()->useCache();
+  if (retcode == 0) // does not exist
+    {
+      *CmpCommon::diags() << DgSqlCode(-CAT_CANNOT_ALTER_WRONG_TYPE)
+                          << DgString0(extTableName);
 
-  BindWA bindWA(ActiveSchemaDB(), CmpCommon::context(), FALSE/*inDDL*/);
-  CorrName cn(tableName.getObjectNamePart().getInternalName(),
+      processReturn();
+
+      return;
+    }
+
+  ActiveSchemaDB()->getNATableDB()->useCache();
+
+  BindWA bindWA(ActiveSchemaDB(), CmpCommon::context(), FALSE/*inDDL*/);
+  CorrName cn(tableName.getObjectNamePart().getInternalName(),
               STMTHEAP,
               tableName.getSchemaNamePart().getInternalName(),
               tableName.getCatalogNamePart().getInternalName());
@@ -5025,7 +5307,8 @@ void CmpSeabaseDDL::alterSeabaseTableDropColumn(
   // this operation cannot be done if a xn is already in progress.
   if (xnInProgress(&cliInterface))
     {
-      *CmpCommon::diags() << DgSqlCode(-20123);
+      *CmpCommon::diags() << DgSqlCode(-20123)
+                          << DgString0("ALTER");
       
       processReturn();
       return;
@@ -5033,6 +5316,20 @@ void CmpSeabaseDDL::alterSeabaseTableDropColumn(
 
   Int64 objUID = naTable->objectUid().castToInt64();
 
+  NAList<NAString> viewNameList;
+  NAList<NAString> viewDefnList;
+  if (saveAndDropUsingViews(objUID, &cliInterface, viewNameList, viewDefnList))
+    {
+      NAString reason = "Error occured while saving views.";
+      *CmpCommon::diags() << DgSqlCode(-1404)
+                          << DgColumnName(colName)
+                          << DgString0(reason);
+
+      processReturn();
+      
+      return;
+    }
+
   NABoolean xnWasStartedHere = FALSE;
 
   Lng32 colNumber = nacol->getPosition();
@@ -5044,81 +5341,27 @@ void CmpSeabaseDDL::alterSeabaseTableDropColumn(
            catalogNamePart, schemaNamePart, objectNamePart,
            naTable, 
            alterDropColNode->getColName(),
-           NULL, alterDropColNode->ddlXns()))
+           NULL, alterDropColNode->ddlXns(),
+           viewNameList, viewDefnList))
         {
-          processReturn();
-          return;
+          cliRC = -1;
+          goto label_error;
         }
      }
   else
     {
-      if (beginXnIfNotInProgress(&cliInterface, xnWasStartedHere))
-        return;
-
-      if (updateMDforDropCol(cliInterface, naTable, colNumber))
+      if (hbaseFormatTableDropColumn
+          (
+               ehi,
+               catalogNamePart, schemaNamePart, objectNamePart,
+               naTable, 
+               alterDropColNode->getColName(),
+               nacol, alterDropColNode->ddlXns(),
+               viewNameList, viewDefnList))
         {
-          goto label_return;
+          cliRC = -1;
+          goto label_error;
         }
-
-      // remove column from all rows of the base table
-      HbaseStr hbaseTable;
-      hbaseTable.val = (char*)extNameForHbase.data();
-      hbaseTable.len = extNameForHbase.length();
-      
-      {
-        NAString column(nacol->getHbaseColFam(), heap_);
-        column.append(":");
-        
-        char * colQualPtr = (char*)nacol->getHbaseColQual().data();
-        Lng32 colQualLen = nacol->getHbaseColQual().length();
-        Int64 colQval = str_atoi(colQualPtr, colQualLen);
-        if (colQval <= UCHAR_MAX)
-          {
-            unsigned char c = (unsigned char)colQval;
-            column.append((char*)&c, 1);
-          }
-        else if (colQval <= USHRT_MAX)
-          {
-            unsigned short s = (unsigned short)colQval;
-            column.append((char*)&s, 2);
-          }
-        else if (colQval <= ULONG_MAX)
-          {
-            Lng32 l = (Lng32)colQval;
-            column.append((char*)&l, 4);
-          }
-        else
-          column.append((char*)&colQval, 8);
-        
-        HbaseStr colNameStr;
-        col = (char *) heap_->allocateMemory(column.length() + 1, FALSE);
-        if (col)
-          {
-            memcpy(col, column.data(), column.length());
-            col[column.length()] = 0;
-            colNameStr.val = col;
-            colNameStr.len = column.length();
-          }
-        else
-          {
-            cliRC = -EXE_NO_MEM_TO_EXEC;
-            *CmpCommon::diags() << DgSqlCode(-EXE_NO_MEM_TO_EXEC);  // error -8571
-            
-            goto label_return;
-          }
-
-        cliRC = ehi->deleteColumns(hbaseTable, colNameStr);
-        if (cliRC < 0)
-          {
-            *CmpCommon::diags() << DgSqlCode(-8448)
-                                << DgString0((char*)"ExpHbaseInterface::deleteColumns()")
-                                << DgString1(getHbaseErrStr(-retcode))
-                                << DgInt0(-retcode)
-                                << DgString2((char*)GetCliGlobals()->getJniErrorStr().data());
-            
-            goto label_return;
-          }
-      }
     } // hbase format table
 
   cliRC = updateObjectRedefTime(&cliInterface,
@@ -5126,12 +5369,31 @@ void CmpSeabaseDDL::alterSeabaseTableDropColumn(
                                 COM_BASE_TABLE_OBJECT_LIT);
   if (cliRC < 0)
     {
-      goto label_return;
+      goto label_error;
     }
 
  label_return:
   endXnIfStartedHere(&cliInterface, xnWasStartedHere, cliRC);
-  
+
+  ActiveSchemaDB()->getNATableDB()->removeNATable
+    (cn,
+     ComQiScope::REMOVE_FROM_ALL_USERS, COM_BASE_TABLE_OBJECT,
+     alterDropColNode->ddlXns(), FALSE);
+
+  return;
+
+ label_error:
+  endXnIfStartedHere(&cliInterface, xnWasStartedHere, cliRC);
+
+  if ((cliRC = recreateUsingViews(&cliInterface, viewNameList, viewDefnList,
+                                  alterDropColNode->ddlXns())) < 0)
+    {
+      NAString reason = "Error occured while recreating views due to dependency on older column definition. Drop dependent views before doing the alter.";
+      *CmpCommon::diags() << DgSqlCode(-1404)
+                          << DgColumnName(colName)
+                          << DgString0(reason);
+    }
+
   deallocEHI(ehi); 
   heap_->deallocateMemory(col);
 
@@ -5311,155 +5573,151 @@ void CmpSeabaseDDL::alterSeabaseTableAlterIdentityColumn(
   return;
 }
 
-///////////////////////////////////////////////////////////////////////
-//
-// An aligned table constains all columns in one hbase cell.
-// To drop a column, we need to read each row, create a
-// new row with the removed column and insert into the original table.
-//
-// Steps to drop a column from an aligned table:
-//
-// -- make a copy of the source aligned table using hbase copy
-// -- truncate the source table
-// -- Update metadata and remove the dropped column.
-// -- bulk load data from copied table into the source table
-// -- drop the copied temp table
-//
-// If an error happens after the source table has been truncated, then
-// it will be restored from the copied table.
-//
-///////////////////////////////////////////////////////////////////////
-short CmpSeabaseDDL::alignedFormatTableDropColumn
-(
- const NAString &catalogNamePart,
- const NAString &schemaNamePart,
- const NAString &objectNamePart,
- const NATable * naTable,
- const NAString &altColName,
- ElemDDLColDef *pColDef,
- NABoolean ddlXns)
+short CmpSeabaseDDL::saveAndDropUsingViews(Int64 objUID,
+                                           ExeCliInterface *cliInterface,
+                                           NAList<NAString> &viewNameList,
+                                           NAList<NAString> &viewDefnList)
 {
   Lng32 cliRC = 0;
 
-  const NAFileSet * naf = naTable->getClusteringIndex();
-  
-  CorrName cn(objectNamePart, STMTHEAP, schemaNamePart, catalogNamePart);
-
-  ComUID comUID;
-  comUID.make_UID();
-  Int64 objUID = comUID.get_value();
-  
-  char objUIDbuf[100];
-
-  NAString tempTable(naTable->getTableName().getQualifiedNameAsAnsiString());
-  tempTable += "_";
-  tempTable += str_ltoa(objUID, objUIDbuf);
-
-  ExpHbaseInterface * ehi = allocEHI();
-  ExeCliInterface cliInterface
-    (STMTHEAP, NULL, NULL, 
-     CmpCommon::context()->sqlSession()->getParentQid());
-
-  Int64 tableUID = naTable->objectUid().castToInt64();
-  const NAColumnArray &naColArr = naTable->getNAColumnArray();
-  const NAColumn * altNaCol = naColArr.getColumn(altColName);
-  Lng32 altColNum = altNaCol->getPosition();
-
-  NAString tgtCols;
-  NAString srcCols;
-
- NABoolean xnWasStartedHere = FALSE;
-
-  char buf[4000];
-
-  if (cloneSeabaseTable(cn, naTable, tempTable, ehi, &cliInterface))
-    {
-      cliRC = -1;
-      goto label_drop;
-    }
-  
-  if (truncateHbaseTable(catalogNamePart, schemaNamePart, objectNamePart,
-                         (NATable*)naTable, ehi))
+  NAString catName, schName, objName;
+  cliRC = getObjectName(cliInterface, objUID,
+                        catName, schName, objName);
+  if (cliRC < 0)
     {
-      cliRC = -1;
-      goto label_restore;
+      processReturn();
+      
+      return -1;
     }
 
-  if (beginXnIfNotInProgress(&cliInterface, xnWasStartedHere))
+  Queue * usingViewsQueue = NULL;
+  cliRC = getAllUsingViews(cliInterface, 
+                           catName, schName, objName, 
+                           usingViewsQueue);
+  if (cliRC < 0)
     {
-      cliRC = -1;
-      goto label_restore;
+      processReturn();
+      
+      return -1;
     }
 
-  if (updateMDforDropCol(cliInterface, naTable, altColNum))
+  if (usingViewsQueue->numEntries() == 0)
+    return 0;
+
+  NABoolean xnWasStartedHere = FALSE;
+  if (beginXnIfNotInProgress(cliInterface, xnWasStartedHere))
+    return -1;
+  
+  // find out any views on this table.
+  // save their definition and drop them.
+  // they will be recreated before return.
+  usingViewsQueue->position();
+  for (int idx = 0; idx < usingViewsQueue->numEntries(); idx++)
     {
-      cliRC = -1;
-      goto label_restore;
+      OutputInfo * vi = (OutputInfo*)usingViewsQueue->getNext(); 
+      char * viewName = vi->get(0);
+      
+      viewNameList.insert(viewName);
+      
+      ComObjectName viewCO(viewName, COM_TABLE_NAME);
+      
+      const NAString catName = viewCO.getCatalogNamePartAsAnsiString();
+      const NAString schName = viewCO.getSchemaNamePartAsAnsiString(TRUE);
+      const NAString objName = viewCO.getObjectNamePartAsAnsiString(TRUE);
+      
+      Int64 viewUID = getObjectUID(cliInterface,
+                                   catName.data(), schName.data(), objName.data(), 
+                                   COM_VIEW_OBJECT_LIT);
+      if (viewUID < 0 )
+        {
+          endXnIfStartedHere(cliInterface, xnWasStartedHere, -1);
+          
+          return -1;
+        }
+      
+      NAString viewText;
+      if (getTextFromMD(cliInterface, viewUID, COM_VIEW_TEXT, 0, viewText))
+        {
+          endXnIfStartedHere(cliInterface, xnWasStartedHere, -1);
+          
+          return -1;
+        }
+      
+      viewDefnList.insert(viewText);
     }
-  
-  ActiveSchemaDB()->getNATableDB()->removeNATable
-    (cn,
-     ComQiScope::REMOVE_FROM_ALL_USERS, 
-     COM_BASE_TABLE_OBJECT, ddlXns, FALSE);
 
-  for (Int32 c = 0; c < naColArr.entries(); c++)
+  // drop the views.
+  // usingViewsQueue contain them in ascending order of their create
+  // time. Drop them from last to first.
+  for (int idx = usingViewsQueue->numEntries()-1; idx >= 0; idx--)
     {
-      const NAColumn * nac = naColArr[c];
-      if (nac->getColName() == altColName)
-        continue;
-
-      if (nac->isComputedColumn())
-        continue;
+      OutputInfo * vi = (OutputInfo*)usingViewsQueue->get(idx);
+      char * viewName = vi->get(0);
 
-      if (nac->isSystemColumn())
-        continue;
+      if (dropOneTableorView(*cliInterface,viewName,COM_VIEW_OBJECT,false))
+        {
+          endXnIfStartedHere(cliInterface, xnWasStartedHere, -1);
+          
+          processReturn();
+          
+          return -1;
+        }
+    }
 
-      tgtCols += nac->getColName();
-      tgtCols += ",";
-    } // for
+  endXnIfStartedHere(cliInterface, xnWasStartedHere, 0);
+   
+  return 0;
+}
 
-  tgtCols = tgtCols.strip(NAString::trailing, ',');
+short CmpSeabaseDDL::recreateUsingViews(ExeCliInterface *cliInterface,
+                                        NAList<NAString> &viewNameList,
+                                        NAList<NAString> &viewDefnList,
+                                        NABoolean ddlXns)
+{
+  Lng32 cliRC = 0;
 
-  str_sprintf(buf, "upsert using load into %s(%s) select %s from %s",
-              naTable->getTableName().getQualifiedNameAsAnsiString().data(),
-              tgtCols.data(),
-              tgtCols.data(),
-              tempTable.data());
-  cliRC = cliInterface.executeImmediate(buf);
-  if (cliRC < 0)
-    {
-      cliInterface.retrieveSQLDiagnostics(CmpCommon::diags());
-      goto label_restore;
-    }
+  if (viewDefnList.entries() == 0)
+    return 0;
 
-  endXnIfStartedHere(&cliInterface, xnWasStartedHere, 0);
+  NABoolean xnWasStartedHere = FALSE;
+  if (beginXnIfNotInProgress(cliInterface, xnWasStartedHere))
+    return -1;
 
-  str_sprintf(buf, "drop table %s", tempTable.data());
-  cliRC = cliInterface.executeImmediate(buf);
-  if (cliRC < 0)
+  for (Lng32 i = 0; i < viewDefnList.entries(); i++)
     {
-      cliInterface.retrieveSQLDiagnostics(CmpCommon::diags());
-      goto label_restore;
+      cliRC = cliInterface->executeImmediate(viewDefnList[i]);
+      if (cliRC < 0)
+        {
+          cliInterface->retrieveSQLDiagnostics(CmpCommon::diags());
+          
+          cliRC = -1;
+          goto label_return;
+        }
     }
+
+  cliRC = 0;
   
-  deallocEHI(ehi); 
-  
-  return 0;
+label_return:
+  for (Lng32 i = 0; i < viewDefnList.entries(); i++)
+    {
+      ComObjectName tableName(viewNameList[i], COM_TABLE_NAME);
+      const NAString catalogNamePart = 
+        tableName.getCatalogNamePartAsAnsiString();
+      const NAString schemaNamePart = 
+        tableName.getSchemaNamePartAsAnsiString(TRUE);
+      const NAString objectNamePart = 
+        tableName.getObjectNamePartAsAnsiString(TRUE);
 
- label_restore:
-  endXnIfStartedHere(&cliInterface, xnWasStartedHere, -1);
+      CorrName cn(objectNamePart, STMTHEAP, schemaNamePart, catalogNamePart);
+      ActiveSchemaDB()->getNATableDB()->removeNATable
+        (cn,
+         ComQiScope::REMOVE_MINE_ONLY, COM_VIEW_OBJECT,
+         ddlXns, FALSE);
+    }
 
-  cloneHbaseTable(tempTable, 
-                  naTable->getTableName().getQualifiedNameAsAnsiString(),
-                  ehi);
+  endXnIfStartedHere(cliInterface, xnWasStartedHere, cliRC);
  
- label_drop:  
-  str_sprintf(buf, "drop table %s", tempTable.data());
-  Lng32 cliRC2 = cliInterface.executeImmediate(buf);
-  
-  deallocEHI(ehi); 
-  
-  return (cliRC < 0 ? -1 : 0);  
+  return cliRC;
 }
 
 ///////////////////////////////////////////////////////////////////////
@@ -5468,19 +5726,24 @@ short CmpSeabaseDDL::alignedFormatTableDropColumn
 // To alter a column, we need to read each row, create a
 // new row with the altered column and insert into the original table.
 //
+// Validation that altered col datatype is compatible with the
+// original datatype has already been done before this method
+// is called.
+//
 // Steps to alter a column from an aligned table:
 //
 // -- make a copy of the source aligned table using hbase copy
 // -- truncate the source table
 // -- Update metadata column definition with the new definition
 // -- bulk load data from copied table into the source table
+// -- recreate views, if existed, based on the new definition
 // -- drop the copied temp table
 //
 // If an error happens after the source table has been truncated, then
 // it will be restored from the copied table.
 //
 ///////////////////////////////////////////////////////////////////////
-short CmpSeabaseDDL::alignedFormatTableAlterColumn
+short CmpSeabaseDDL::alignedFormatTableAlterColumnAttr
 (
  const NAString &catalogNamePart,
  const NAString &schemaNamePart,
@@ -5488,7 +5751,9 @@ short CmpSeabaseDDL::alignedFormatTableAlterColumn
  const NATable * naTable,
  const NAString &altColName,
  ElemDDLColDef *pColDef,
- NABoolean ddlXns)
+ NABoolean ddlXns,
+ NAList<NAString> &viewNameList,
+ NAList<NAString> &viewDefnList)
 {
   Lng32 cliRC = 0;
 
@@ -5617,13 +5882,33 @@ short CmpSeabaseDDL::alignedFormatTableAlterColumn
       goto label_restore;
     }
 
-  deallocEHI(ehi); 
-  
-  endXnIfStartedHere(&cliInterface, xnWasStartedHere, 0);
+  if ((cliRC = recreateUsingViews(&cliInterface, viewNameList, viewDefnList,
+                                  ddlXns)) < 0)
+    {
+      NAString reason = "Error occured while recreating views due to dependency on older column definition. Drop dependent views before doing the alter.";
+      *CmpCommon::diags() << DgSqlCode(-1404)
+                          << DgColumnName(altColName)
+                          << DgString0(reason);
+      goto label_restore;
+    }
+
+  endXnIfStartedHere(&cliInterface, xnWasStartedHere, 0);
+  
+  str_sprintf(buf, "drop table %s", tempTable.data());
+  cliRC = cliInterface.executeImmediate(buf);
+  if (cliRC < 0)
+    {
+      cliInterface.retrieveSQLDiagnostics(CmpCommon::diags());
+      goto label_restore;
+    }
+
+  deallocEHI(ehi); 
   
   return 0;
 
  label_restore:
+  endXnIfStartedHere(&cliInterface, xnWasStartedHere, -1);
+
   cloneHbaseTable(tempTable, 
                   naTable->getTableName().getQualifiedNameAsAnsiString(),
                   ehi);
@@ -5639,44 +5924,98 @@ short CmpSeabaseDDL::alignedFormatTableAlterColumn
   return (cliRC < 0 ? -1 : 0);
 }
 
-short CmpSeabaseDDL::alterColumnAttr(
+/////////////////////////////////////////////////////////////////////
+// this method is called if alter could be done by metadata changes
+// only and without affecting table data.
+/////////////////////////////////////////////////////////////////////
+short CmpSeabaseDDL::mdOnlyAlterColumnAttr(
      const NAString &catalogNamePart, const NAString &schemaNamePart,
      const NAString &objectNamePart,
      const NATable * naTable, const NAColumn * naCol, NAType * newType,
-     StmtDDLAlterTableAlterColumnDatatype * alterColNode)
+     StmtDDLAlterTableAlterColumnDatatype * alterColNode,
+     NAList<NAString> &viewNameList,
+     NAList<NAString> &viewDefnList)
 {
+  Lng32 cliRC = 0;
+
   ExeCliInterface cliInterface
     (STMTHEAP, NULL, NULL, 
      CmpCommon::context()->sqlSession()->getParentQid());
+  
+  Int64 objUID = naTable->objectUid().castToInt64();
+  
+  Lng32 colNumber = naCol->getPosition();
+  
+  NABoolean xnWasStartedHere = FALSE;
+  if (beginXnIfNotInProgress(&cliInterface, xnWasStartedHere))
+    return -1;
 
-  // this operation cannot be done if a xn is already in progress.
-  if (xnInProgress(&cliInterface))
+  char buf[4000];
+  str_sprintf(buf, "update %s.\"%s\".%s set column_size = %d, column_class = '%s' where object_uid = %Ld and column_number = %d",
+              getSystemCatalog(), SEABASE_MD_SCHEMA, SEABASE_COLUMNS,
+              newType->getNominalSize(),
+              COM_ALTERED_USER_COLUMN_LIT,
+              objUID,
+              colNumber);
+  
+  cliRC = cliInterface.executeImmediate(buf);
+  if (cliRC < 0)
     {
-      *CmpCommon::diags() << DgSqlCode(-20123);
-
-      processReturn();
-      return -1;
+      cliInterface.retrieveSQLDiagnostics(CmpCommon::diags());
+      
+      goto label_error;
     }
-
-  if (naTable->isSQLMXAlignedTable())
+  
+  cliRC = recreateUsingViews(&cliInterface, viewNameList, viewDefnList, 
+                             alterColNode->ddlXns());
+  if (cliRC < 0)
     {
-      ElemDDLColDef *pColDef = 
-        alterColNode->getColToAlter()->castToElemDDLColDef();
+      NAString reason = "Error occured while recreating views due to dependency on older column definition. Drop dependent views before doing the alter.";
+      *CmpCommon::diags() << DgSqlCode(-1404)
+                          << DgColumnName(naCol->getColName().data())
+                          << DgString0(reason);
+      
+      goto label_error;
+    }
+  
+  endXnIfStartedHere(&cliInterface, xnWasStartedHere, cliRC);
 
-      if (alignedFormatTableAlterColumn
-          (
-           catalogNamePart, schemaNamePart, objectNamePart,
-           naTable,
-           naCol->getColName(), 
-           pColDef,
-           alterColNode->ddlXns()))
-        {
-          processReturn();
-          return -1;
-        }
+  return 0;
 
-      return 0;
-    }
+ label_error:
+  endXnIfStartedHere(&cliInterface, xnWasStartedHere, cliRC);
+
+  return -1;
+}
+
+///////////////////////////////////////////////////////////////////////
+//
+// Steps to alter a column from an hbase format table:
+//
+// Validation that altered col datatype is compatible with the
+// original datatype has already been done before this method
+// is called.
+//
+// -- add a temp column based on the altered datatype
+// -- update temp col with data from the original col 
+// -- update metadata column definition with the new col definition
+// -- update original col with data from temp col
+// -- recreate views, if existed, based on the new definition
+// -- drop the temp col. Dependent views will be recreated during drop.
+//
+// If an error happens after the source table has been truncated, then
+// it will be restored from the copied table.
+//
+///////////////////////////////////////////////////////////////////////
+short CmpSeabaseDDL::hbaseFormatTableAlterColumnAttr(
+     const NAString &catalogNamePart, const NAString &schemaNamePart,
+     const NAString &objectNamePart,
+     const NATable * naTable, const NAColumn * naCol, NAType * newType,
+     StmtDDLAlterTableAlterColumnDatatype * alterColNode)
+{
+  ExeCliInterface cliInterface
+    (STMTHEAP, NULL, NULL, 
+     CmpCommon::context()->sqlSession()->getParentQid());
 
   CorrName cn(objectNamePart, STMTHEAP, schemaNamePart,catalogNamePart);
 
@@ -5875,6 +6214,16 @@ void CmpSeabaseDDL::alterSeabaseTableAlterColumnDatatype(
       return;
     }
 
+  if (retcode == 0) // does not exist
+    {
+      *CmpCommon::diags() << DgSqlCode(-CAT_CANNOT_ALTER_WRONG_TYPE)
+                          << DgString0(extTableName);
+
+      processReturn();
+
+      return;
+    }
+
   ActiveSchemaDB()->getNATableDB()->useCache();
 
   BindWA bindWA(ActiveSchemaDB(), CmpCommon::context(), FALSE/*inDDL*/);
@@ -6042,36 +6391,431 @@ void CmpSeabaseDDL::alterSeabaseTableAlterColumnDatatype(
       return;
     }
 
+  // this operation cannot be done if a xn is already in progress.
+  if ((NOT mdAlterOnly) && (xnInProgress(&cliInterface)))
+    {
+      *CmpCommon::diags() << DgSqlCode(-20123)
+                          << DgString0("ALTER");
+
+      processReturn();
+      return;
+    }
+
+  Int64 objUID = naTable->objectUid().castToInt64();
+
+  // if there are views on the table, save the definition and drop
+  // the views.
+  // At the end of alter, views will be recreated. If an error happens
+  // during view recreation, alter will fail.
+  NAList<NAString> viewNameList;
+  NAList<NAString> viewDefnList;
+  if (saveAndDropUsingViews(objUID, &cliInterface, viewNameList, viewDefnList))
+     {
+      NAString reason = "Error occured while saving views.";
+      *CmpCommon::diags() << DgSqlCode(-1404)
+                          << DgColumnName(colName)
+                          << DgString0(reason);
+
+      processReturn();
+       
+      return;
+    }
+
   if (mdAlterOnly)
     {
-      Int64 objUID = naTable->objectUid().castToInt64();
+      if (mdOnlyAlterColumnAttr
+          (catalogNamePart, schemaNamePart, objectNamePart,
+           naTable, nacol, newType, alterColNode,
+           viewNameList, viewDefnList))
+        {
+          cliRC = -1;
+          
+          goto label_error;
+        }
+    }
+  else if (naTable->isSQLMXAlignedTable())
+    {
+      ElemDDLColDef *pColDef = 
+        alterColNode->getColToAlter()->castToElemDDLColDef();
       
-      Lng32 colNumber = nacol->getPosition();
+      if (alignedFormatTableAlterColumnAttr
+          (catalogNamePart, schemaNamePart, objectNamePart,
+           naTable,
+           colName,
+           pColDef,
+           alterColNode->ddlXns(),
+           viewNameList, viewDefnList))
+        {
+          cliRC = -1;
+          goto label_error;
+        }
+    }
+  else if (hbaseFormatTableAlterColumnAttr
+           (catalogNamePart, schemaNamePart, objectNamePart,
+            naTable, nacol, newType, alterColNode))
+    {
+      cliRC = -1;
       
-      char buf[4000];
-      str_sprintf(buf, "update %s.\"%s\".%s set column_size = %d, column_class = '%s' where object_uid = %Ld and column_number = %d",
-                  getSystemCatalog(), SEABASE_MD_SCHEMA, SEABASE_COLUMNS,
-                  newType->getNominalSize(),
-                  COM_ALTERED_USER_COLUMN_LIT,
-                  objUID,
-                  colNumber);
+      goto label_error;
+    }
+
+  cliRC = updateObjectRedefTime(&cliInterface,
+                                catalogNamePart, schemaNamePart, objectNamePart,
+                                COM_BASE_TABLE_OBJECT_LIT);
+  if (cliRC < 0)
+    {
+      goto label_error;
+    }
+  
+label_return:
+  ActiveSchemaDB()->getNATableDB()->removeNATable
+    (cn,
+     ComQiScope::REMOVE_FROM_ALL_USERS, COM_BASE_TABLE_OBJECT,
+     alterColNode->ddlXns(), FALSE);
+
+  processReturn();
+  
+  return;
+
+label_error:
+  if ((cliRC = recreateUsingViews(&cliInterface, viewNameList, viewDefnList,
+                                  alterColNode->ddlXns())) < 0)
+    {
+      NAString reason = "Error occured while recreating views due to dependency on older column definition. Drop dependent views before doing the alter.";
+      *CmpCommon::diags() << DgSqlCode(-1404)
+                          << DgColumnName(colName)
+                          << DgString0(reason);
+    }
+
+  ActiveSchemaDB()->getNATableDB()->removeNATable
+    (cn,
+     ComQiScope::REMOVE_FROM_ALL_USERS, COM_BASE_TABLE_OBJECT,
+     alterColNode->ddlXns(), FALSE);
+
+  processReturn();
+
+  return;
+}
+
+/////////////////////////////////////////////////////////////////////
+// this method renames an existing column to the specified new name.
+//
+// A column cannot be renamed if it is a system, salt, division by,
+// computed or a lob column.
+// 
+// If any index exists on the renamed column, then the index column
+// is also renamed.
+//
+// If views exist on the table, they are dropped and recreated after
+// rename. If recreation runs into an error, then alter fails.
+//
+///////////////////////////////////////////////////////////////////
+void CmpSeabaseDDL::alterSeabaseTableAlterColumnRename(
+     StmtDDLAlterTableAlterColumnRename * alterColNode,
+     NAString &currCatName, NAString &currSchName)
+{
+  Lng32 cliRC = 0;
+  Lng32 retcode = 0;
+
+  const NAString &tabName = alterColNode->getTableName();
+
+  ComObjectName tableName(tabName, COM_TABLE_NAME);
+  ComAnsiNamePart currCatAnsiName(currCatName);
+  ComAnsiNamePart currSchAnsiName(currSchName);
+  tableName.applyDefaults(currCatAnsiName, currSchAnsiName);
+
+  const NAString catalogNamePart = tableName.getCatalogNamePartAsAnsiString();
+  const NAString schemaNamePart = tableName.getSchemaNamePartAsAnsiString(TRUE);
+  const NAString objectNamePart = tableName.getObjectNamePartAsAnsiString(TRUE);
+  const NAString extTableName = tableName.getExternalName(TRUE);
+  const NAString extNameForHbase = catalogNamePart + "." + schemaNamePart + "." + objectNamePart;
+
+  ExeCliInterface cliInterface(STMTHEAP, NULL, NULL, 
+  CmpCommon::context()->sqlSession()->getParentQid());
+
+  if ((isSeabaseReservedSchema(tableName)) &&
+      (!Get_SqlParser_Flags(INTERNAL_QUERY_FROM_EXEUTIL)))
+    {
+      *CmpCommon::diags() << DgSqlCode(-CAT_CANNOT_ALTER_DEFINITION_METADATA_SCHEMA);
+      processReturn();
+      return;
+    }
+
+  retcode = existsInSeabaseMDTable(&cliInterface, 
+                                   catalogNamePart, schemaNamePart, objectNamePart,
+                                   COM_BASE_TABLE_OBJECT,
+                                   (Get_SqlParser_Flags(INTERNAL_QUERY_FROM_EXEUTIL) 
+                                    ? FALSE : TRUE),
+                                   TRUE, TRUE);
+  if (retcode < 0)
+    {
+      processReturn();
+
+      return;
+    }
+
+  if (retcode == 0) // does not exist
+    {
+      *CmpCommon::diags() << DgSqlCode(-CAT_CANNOT_ALTER_WRONG_TYPE)
+                          << DgString0(extTableName);
+
+      processReturn();
+
+      return;
+    }
+
+  ActiveSchemaDB()->getNATableDB()->useCache();
+
+  BindWA bindWA(ActiveSchemaDB(), CmpCommon::context(), FALSE/*inDDL*/);
+  CorrName cn(tableName.getObjectNamePart().getInternalName(),
+              STMTHEAP,
+              tableName.getSchemaNamePart().getInternalName(),
+              tableName.getCatalogNamePart().getInternalName());
+
+  NATable *naTable = bindWA.getNATable(cn); 
+  if (naTable == NULL || bindWA.errStatus())
+    {
+      *CmpCommon::diags()
+        << DgSqlCode(-4082)
+        << DgTableName(cn.getExposedNameAsAnsiString());
+    
+      processReturn();
+
+      return;
+    }
+
+  // Make sure user has the privilege to perform the alter column
+  if (!isDDLOperationAuthorized(SQLOperation::ALTER_TABLE,
+                                naTable->getOwner(),naTable->getSchemaOwner()))
+  {
+     *CmpCommon::diags() << DgSqlCode(-CAT_NOT_AUTHORIZED);
+
+     processReturn ();
+
+     return;
+  }
+
+  // return an error if trying to alter a column from a volatile table
+  if (naTable->isVolatileTable())
+    {
+      *CmpCommon::diags() << DgSqlCode(-CAT_REGULAR_OPERATION_ON_VOLATILE_OBJECT);
+     
+      processReturn ();
+
+      return;
+    }
+
+  const NAColumnArray &nacolArr = naTable->getNAColumnArray();
+  const NAString &colName = alterColNode->getColumnName();
+  const NAString &renamedColName = alterColNode->getRenamedColumnName();
+
+  const NAColumn * nacol = nacolArr.getColumn(colName);
+  if (! nacol)
+    {
+      // column doesnt exist. Error.
+      *CmpCommon::diags() << DgSqlCode(-CAT_COLUMN_DOES_NOT_EXIST_ERROR)
+                          << DgColumnName(colName);
+
+      processReturn();
+
+      return;
+    }
+
+  /*  Temporarily commenting out this code. It will be enabled after
+      support for reserved colnames check is delivered.
+  if ((CmpCommon::getDefault(TRAF_ALLOW_RESERVED_COLNAMES) == DF_OFF) &&
+      (ComTrafReservedColName(renamedColName)))
+    {
+      NAString reason = "Renamed column is a reserved name.";
+      *CmpCommon::diags() << DgSqlCode(-1404)
+                          << DgColumnName(colName)
+                          << DgString0(reason);
+
+      processReturn();
+
+      return;
+    }
+  */
+
+  if (nacol->isComputedColumn() || nacol->isSystemColumn())
+    {
+      NAString reason = "Cannot rename system or computed column.";
+      *CmpCommon::diags() << DgSqlCode(-1404)
+                          << DgColumnName(colName)
+                          << DgString0(reason);
+
+      processReturn();
+
+      return;
+    }
+
+  const NAColumn * renNacol = nacolArr.getColumn(renamedColName);
+  if (renNacol)
+    {
+      // column already exist. Error.
+      NAString reason = "Renamed column " + renamedColName + " already exist in the table.";
+      *CmpCommon::diags() << DgSqlCode(-1404)
+                          << DgColumnName(colName)
+                          << DgString0(reason);
+
+      processReturn();
+
+      return;
+    }
+
+  const NAType * currType = nacol->getType();
+
+  // If column is a LOB column , error
+  if ((currType->getFSDatatype() == REC_BLOB) || (currType->getFSDatatype() == REC_CLOB))
+    {
+      *CmpCommon::diags() << DgSqlCode(-CAT_LOB_COLUMN_ALTER)
+                          << DgColumnName(colName);
+      processReturn();
+      return;
+     }
+
+  const NAFileSet * naFS = naTable->getClusteringIndex();
+  const NAColumnArray &naKeyColArr = naFS->getIndexKeyColumns();
+  NABoolean isPkeyCol = FALSE;
+  if (naKeyColArr.getColumn(colName))
+    {
+      isPkeyCol = TRUE;
+    }
+
+  Int64 objUID = naTable->objectUid().castToInt64();
+  
+  NAList<NAString> viewNameList;
+  NAList<NAString> viewDefnList;
+  if (saveAndDropUsingViews(objUID, &cliInterface, viewNameList, viewDefnList))
+    {
+      NAString reason = "Error occured while saving dependent views.";
+      *CmpCommon::diags() << DgSqlCode(-1404)
+                          << DgColumnName(colName)
+                          << DgString0(reason);
       
-      cliRC = cliInterface.executeImmediate(buf);
-      if (cliRC < 0)
+      processReturn();
+       
+      return;
+    }
+
+  Lng32 colNumber = nacol->getPosition();
+  
+  char buf[4000];
+  str_sprintf(buf, "update %s.\"%s\".%s set column_name = '%s', column_class = '%s' where object_uid = %Ld and column_number = %d",
+              getSystemCatalog(), SEABASE_MD_SCHEMA, SEABASE_COLUMNS,
+              renamedColName.data(),
+              COM_ALTERED_USER_COLUMN_LIT,
+              objUID,
+              colNumber);
+  
+  cliRC = cliInterface.executeImmediate(buf);
+  if (cliRC < 0)
+    {
+      cliInterface.retrieveSQLDiagnostics(CmpCommon::diags());
+      
+      processReturn();
+      return;
+    }
+
+  if (isPkeyCol)
+    {
+      Lng32 divColPos = -1;
+      if ((naTable->hasDivisioningColumn(&divColPos)))
         {
-          cliInterface.retrieveSQLDiagnostics(CmpCommon::diags());
+          NAString reason = "Not supported with DIVISION BY clause.";
+          *CmpCommon::diags() << DgSqlCode(-1404)
+                              << DgColumnName(colName)
+                              << DgString0(reason);
           
           processReturn();
+          
           return;
         }
-    }
-  else
+
+      Lng32 saltColPos = -1;
+      if ((naTable->hasSaltedColumn(&saltColPos)))
+        {
+          NAString saltText;
+          cliRC = getTextFromMD(&cliInterface, objUID, COM_COMPUTED_COL_TEXT,
+                                saltColPos, saltText);
+          if (cliRC < 0)
+            {
+              processReturn();
+              return;
+            }   
+          
+          // replace col reference with renamed col
+          NAString quotedColName = "\"" + colName + "\"";
+          NAString renamedQuotedColName = "\"" + renamedColName + "\"";
+          saltText = replaceAll(saltText, quotedColName, renamedQuotedColName);
+          cliRC = updateTextTable(&cliInterface, objUID, COM_COMPUTED_COL_TEXT,
+                                  saltColPos, saltText, TRUE);
+          if (cliRC < 0)
+            {
+              processReturn();
+              return;
+            }   
+        } // saltCol
+    } // pkeyCol being renamed
+
+  if (naTable->hasSecondaryIndexes())
     {
-      if (alterColumnAttr(catalogNamePart, schemaNamePart, objectNamePart,
-                          naTable, nacol, newType, alterColNode))
-        return;
-    }
+      const NAFileSetList &naFsList = naTable->getIndexList();
+
+      for (Lng32 i = 0; i < naFsList.entries(); i++)
+        {
+          naFS = naFsList[i];
+          
+          // skip clustering index
+          if (naFS->getKeytag() == 0)
+            continue;
+
+          str_sprintf(buf, "update %s.\"%s\".%s set column_name = '%s' || '@' where object_uid = %Ld and column_name = '%s' || '@'",
+                      getSystemCatalog(), SEABASE_MD_SCHEMA, SEABASE_COLUMNS,
+                      renamedColName.data(),
+                      naFS->getIndexUID(),
+                      colName.data());
   
+          cliRC = cliInterface.executeImmediate(buf);
+          if (cliRC < 0)
+            {
+              cliInterface.retrieveSQLDiagnostics(CmpCommon::diags());
+              
+              processReturn();
+              return;
+            }
+
+         str_sprintf(buf, "update %s.\"%s\".%s set column_name = '%s' where object_uid = %Ld and column_name = '%s'",
+                      getSystemCatalog(), SEABASE_MD_SCHEMA, SEABASE_COLUMNS,
+                      renamedColName.data(),
+                      naFS->getIndexUID(),
+                      colName.data());
+  
+          cliRC = cliInterface.executeImmediate(buf);
+          if (cliRC < 0)
+            {
+              cliInterface.retrieveSQLDiagnostics(CmpCommon::diags());
+              
+              processReturn();
+              return;
+            }
+        } // for
+    } // secondary indexes present
+
+  cliRC = recreateUsingViews(&cliInterface, viewNameList, viewDefnList,
+                             alterColNode->ddlXns());
+  if (cliRC < 0)
+    {
+      NAString reason = "Error occured while recreating views due to dependency on older column definition. Drop dependent views before doing the alter.";
+      *CmpCommon::diags() << DgSqlCode(-1404)
+                          << DgColumnName(colName)
+                          << DgString0(reason);
+
+      processReturn();
+      
+      return;
+    }
+
   cliRC = updateObjectRedefTime(&cliInterface,
                                 catalogNamePart, schemaNamePart, objectNamePart,
                                 COM_BASE_TABLE_OBJECT_LIT);
@@ -6082,9 +6826,10 @@ void CmpSeabaseDDL::alterSeabaseTableAlterColumnDatatype(
   
   ActiveSchemaDB()->getNATableDB()->removeNATable
     (cn,
-     ComQiScope::REMOVE_FROM_ALL_USERS, COM_BASE_TABLE_OBJECT,
+     ComQiScope::REMOVE_FROM_ALL_USERS,
+     COM_BASE_TABLE_OBJECT,
      alterColNode->ddlXns(), FALSE);
-
+  
   processReturn();
   
   return;
@@ -9419,7 +10164,7 @@ desc_struct * CmpSeabaseDDL::getSeabaseUserTableDesc(const NAString &catName,
       populateKeyInfo(keyInfoArray[idx], vi);
     }
 
-  str_sprintf(query, "select O.catalog_name, O.schema_name, O.object_name, I.keytag, I.is_unique, I.is_explicit, I.key_colcount, I.nonkey_colcount, T.num_salt_partns, T.row_format from %s.\"%s\".%s I, %s.\"%s\".%s O ,  %s.\"%s\".%s T where I.base_table_uid = %Ld and I.index_uid = O.object_uid %s and I.index_uid = T.table_uid for read committed access order by 1,2,3",
+  str_sprintf(query, "select O.catalog_name, O.schema_name, O.object_name, I.keytag, I.is_unique, I.is_explicit, I.key_colcount, I.nonkey_colcount, T.num_salt_partns, T.row_format, I.index_uid from %s.\"%s\".%s I, %s.\"%s\".%s O ,  %s.\"%s\".%s T where I.base_table_uid = %Ld and I.index_uid = O.object_uid %s and I.index_uid = T.table_uid for read committed access order by 1,2,3",
               getSystemCatalog(), SEABASE_MD_SCHEMA, SEABASE_INDEXES,
               getSystemCatalog(), SEABASE_MD_SCHEMA, SEABASE_OBJECTS,
               getSystemCatalog(), SEABASE_MD_SCHEMA, SEABASE_TABLES,
@@ -9488,6 +10233,7 @@ desc_struct * CmpSeabaseDDL::getSeabaseUserTableDesc(const NAString &catName,
       Lng32 nonKeyColCount = *(Lng32*)vi->get(7);
       Lng32 idxNumSaltPartns = *(Lng32*)vi->get(8);
       char * format = vi->get(9);
+      Int64 indexUID = *(Int64*)vi->get(10);
       ComRowFormat idxRowFormat;
 
       if (memcmp(format, COM_ALIGNED_FORMAT_LIT, 2) == 0)
@@ -9539,6 +10285,7 @@ desc_struct * CmpSeabaseDDL::getSeabaseUserTableDesc(const NAString &catName,
         new(STMTHEAP) NAString(coIdxName.getExternalName(TRUE));
 
       indexInfoArray[idx].indexName = (char*)extIndexName->data();
+      indexInfoArray[idx].indexUID = indexUID;
       indexInfoArray[idx].keytag = keyTag;
       indexInfoArray[idx].isUnique = isUnique;
       indexInfoArray[idx].isExplicit = isExplicit;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/nadefaults.cpp b/core/sql/sqlcomp/nadefaults.cpp
index 711b964..49fff32 100644
--- a/core/sql/sqlcomp/nadefaults.cpp
+++ b/core/sql/sqlcomp/nadefaults.cpp
@@ -3299,28 +3299,28 @@ XDDkwd__(SUBQUERY_UNNESTING,			"ON"),
   DDint__(TEST_PASS_ONE_ASSERT_TASK_NUMBER,	"-1"),
   DDint__(TEST_PASS_TWO_ASSERT_TASK_NUMBER,	"-1"),
 
- XDDintN2(TIMEOUT,				"6000"),
+  XDDintN2(TIMEOUT,				"6000"),
  
- DDflt0_(TMUDF_CARDINALITY_FACTOR, "1"),
- DDflt0_(TMUDF_LEAF_CARDINALITY, "1"),
+  DDflt0_(TMUDF_CARDINALITY_FACTOR, "1"),
+  DDflt0_(TMUDF_LEAF_CARDINALITY, "1"),
 
   DDkwd__(TOTAL_RESOURCE_COSTING,               "ON"),
-
+ 
   DDint__(TRAF_ALIGNED_FORMAT_ADD_COL_METHOD,	"2"),
-
- DDkwd__(TRAF_ALIGNED_ROW_FORMAT,                 "OFF"),   
-
+ 
+  DDkwd__(TRAF_ALIGNED_ROW_FORMAT,                 "OFF"),   
+ 
   DDkwd__(TRAF_ALLOW_ESP_COLOCATION,             "OFF"),   
+ 
+  DDkwd__(TRAF_ALLOW_SELF_REF_CONSTR,                 "ON"),   
+ 
+  DDkwd__(TRAF_ALTER_COL_ATTRS,                 "ON"),   
 
- DDkwd__(TRAF_ALLOW_SELF_REF_CONSTR,                 "ON"),   
-
- DDkwd__(TRAF_ALTER_COL_ATTRS,                 "ON"),   
-
- DDkwd__(TRAF_BLOB_AS_VARCHAR,                 "ON"), //set to OFF to enable Lobs support  
+  DDkwd__(TRAF_BLOB_AS_VARCHAR,                 "ON"), //set to OFF to enable Lobs support  
 
- DDkwd__(TRAF_BOOTSTRAP_MD_MODE,                            "OFF"),   
+  DDkwd__(TRAF_BOOTSTRAP_MD_MODE,                            "OFF"),   
 
- DDkwd__(TRAF_CLOB_AS_VARCHAR,                 "ON"), //set to OFF to enable Lobs support  
+  DDkwd__(TRAF_CLOB_AS_VARCHAR,                 "ON"), //set to OFF to enable Lobs support  
 
   DDkwd__(TRAF_COL_LENGTH_IS_CHAR,                 "ON"),   
 


[3/9] incubator-trafodion git commit: JIRA 1849 Add support for alter column rename (details below)

Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/regress/seabase/EXPECTED010
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/EXPECTED010 b/core/sql/regress/seabase/EXPECTED010
index 1253abb..c6f739f 100644
--- a/core/sql/regress/seabase/EXPECTED010
+++ b/core/sql/regress/seabase/EXPECTED010
@@ -55,19 +55,20 @@
 >>invoke t010t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T010T1
--- Definition current  Wed Feb 10 17:24:52 2016
+-- Definition current  Tue Mar  8 05:44:04 2016
 
   (
     A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   , B                                CHAR(10) CHARACTER SET ISO88591 COLLATE
       DEFAULT DEFAULT NULL
   )
+  PRIMARY KEY (A ASC)
 
 --- SQL operation complete.
 >>invoke hbase."_CELL_"."TRAFODION.SCH.T010T1";
 
 -- Definition of Trafodion table HBASE."_CELL_"."TRAFODION.SCH.T010T1"
--- Definition current  Wed Feb 10 17:24:53 2016
+-- Definition current  Tue Mar  8 05:44:04 2016
 
   (
     ROW_ID                           VARCHAR(10) CHARACTER SET ISO88591 COLLATE
@@ -80,12 +81,13 @@
   , COL_VALUE                        VARCHAR(20) CHARACTER SET ISO88591 COLLATE
       DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (ROW_ID ASC)
 
 --- SQL operation complete.
 >>invoke hbase."_ROW_"."TRAFODION.SCH.T010T1";
 
 -- Definition of Trafodion table HBASE."_ROW_"."TRAFODION.SCH.T010T1"
--- Definition current  Wed Feb 10 17:24:53 2016
+-- Definition current  Tue Mar  8 05:44:04 2016
 
   (
     ROW_ID                           VARCHAR(10) CHARACTER SET ISO88591 COLLATE
@@ -93,6 +95,7 @@
   , COLUMN_DETAILS                   VARCHAR(60) CHARACTER SET ISO88591 COLLATE
       DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (ROW_ID ASC)
 
 --- SQL operation complete.
 >>
@@ -215,7 +218,7 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... XX
-PLAN_ID .................. 212321885094893012
+PLAN_ID .................. 212324175846829763
 ROWS_OUT ................ 11
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select * from t010t1 where a=1 or b='1';
@@ -258,7 +261,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177977067
+  ObjectUIDs ............. 4560549616040773770
   select_list ............ TRAFODION.SCH.T010T1.A, TRAFODION.SCH.T010T1.B
 
 
@@ -298,7 +301,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... XX
-PLAN_ID .................. 212321885094974287
+PLAN_ID .................. 212324175846906889
 ROWS_OUT ................. 1
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select * from t010t1 where a=1 and b='1';
@@ -342,7 +345,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177977067
+  ObjectUIDs ............. 4560549616040773770
   select_list ............ %(1), %('1')
   input_variables ........ %(1), %('1')
 
@@ -381,7 +384,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... XX
-PLAN_ID .................. 212321885095061744
+PLAN_ID .................. 212324175846969122
 ROWS_OUT ................ 10
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select * from t010t1 where b='1';
@@ -424,7 +427,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177977067
+  ObjectUIDs ............. 4560549616040773770
   select_list ............ TRAFODION.SCH.T010T1.A, %('1')
   input_variables ........ %('1')
 
@@ -464,7 +467,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... XX
-PLAN_ID .................. 212321885093467820
+PLAN_ID .................. 212324175845471717
 ROWS_OUT ................. 1
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select * from t010t1 where a = 2;
@@ -508,7 +511,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177977067
+  ObjectUIDs ............. 4560549616040773770
   select_list ............ %(2), TRAFODION.SCH.T010T1.B
   input_variables ........ %(2)
 
@@ -771,7 +774,7 @@ A            B           C            D
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... X1
-PLAN_ID .................. 212321885096382137
+PLAN_ID .................. 212324175848182134
 ROWS_OUT ................. 2
 EST_TOTAL_COST ........... 0
 STATEMENT ................ select *
@@ -816,7 +819,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177977162
+  ObjectUIDs ............. 4560549616040773848
   select_list ............ TRAFODION.SCH.T010T2.A, %('a'), %(1),
                              TRAFODION.SCH.T010T2.D
   input_variables ........ %('a'), %(1)
@@ -850,7 +853,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... X2
-PLAN_ID .................. 212321885096449206
+PLAN_ID .................. 212324175848230338
 ROWS_OUT ................. 5
 EST_TOTAL_COST ........... 0
 STATEMENT ................ select *
@@ -896,7 +899,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177977162
+  ObjectUIDs ............. 4560549616040773848
   select_list ............ TRAFODION.SCH.T010T2.A, %('a'),
                              TRAFODION.SCH.T010T2.C, TRAFODION.SCH.T010T2.D
   input_variables ........ %('a')
@@ -931,7 +934,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... X3
-PLAN_ID .................. 212321885096528149
+PLAN_ID .................. 212324175848288383
 ROWS_OUT ................. 4
 EST_TOTAL_COST ........... 0
 STATEMENT ................ select *
@@ -976,7 +979,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177977162
+  ObjectUIDs ............. 4560549616040773848
   select_list ............ TRAFODION.SCH.T010T2.A, %('a'),
                              TRAFODION.SCH.T010T2.C, TRAFODION.SCH.T010T2.D
   input_variables ........ %('a')
@@ -1011,7 +1014,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... X4
-PLAN_ID .................. 212321885096610874
+PLAN_ID .................. 212324175848362739
 ROWS_OUT ................. 4
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ delete from t010t2
@@ -1056,7 +1059,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177977162
+  ObjectUIDs ............. 4560549616040773848
   input_variables ........ %('a')
 
 
@@ -1120,7 +1123,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... X5
-PLAN_ID .................. 212321885096769866
+PLAN_ID .................. 212324175848523585
 ROWS_OUT ................. 2
 EST_TOTAL_COST ........... 0
 STATEMENT ................ update t010t2
@@ -1167,7 +1170,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177977162
+  ObjectUIDs ............. 4560549616040773848
   input_variables ........ %('upd'), %(4)
 
 
@@ -1194,7 +1197,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... Y1
-PLAN_ID .................. 212321885096839283
+PLAN_ID .................. 212324175848610087
 ROWS_OUT ................. 2
 EST_TOTAL_COST ........... 0
 STATEMENT ................ select *
@@ -1240,7 +1243,7 @@ DESCRIPTION
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... ON
   HBASE_MAX_NUM_SEARCH_KE  1
-  ObjectUIDs ............. 5395965056177977162
+  ObjectUIDs ............. 4560549616040773848
   select_list ............ TRAFODION.SCH.T010T2.A, %('a'), %(1),
                              TRAFODION.SCH.T010T2.D
   input_variables ........ %('a'), %(1)
@@ -1274,7 +1277,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... Y2
-PLAN_ID .................. 212321885096892358
+PLAN_ID .................. 212324175848664515
 ROWS_OUT ................. 5
 EST_TOTAL_COST ........... 0
 STATEMENT ................ select *
@@ -1321,7 +1324,7 @@ DESCRIPTION
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... ON
   HBASE_MAX_NUM_SEARCH_KE  1
-  ObjectUIDs ............. 5395965056177977162
+  ObjectUIDs ............. 4560549616040773848
   select_list ............ TRAFODION.SCH.T010T2.A, %('a'),
                              TRAFODION.SCH.T010T2.C, TRAFODION.SCH.T010T2.D
   input_variables ........ %('a')
@@ -1356,7 +1359,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... Y3
-PLAN_ID .................. 212321885096964168
+PLAN_ID .................. 212324175848732834
 ROWS_OUT ................. 4
 EST_TOTAL_COST ........... 0
 STATEMENT ................ select *
@@ -1402,7 +1405,7 @@ DESCRIPTION
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... ON
   HBASE_MAX_NUM_SEARCH_KE  1
-  ObjectUIDs ............. 5395965056177977162
+  ObjectUIDs ............. 4560549616040773848
   select_list ............ TRAFODION.SCH.T010T2.A, %('a'),
                              TRAFODION.SCH.T010T2.C, TRAFODION.SCH.T010T2.D
   input_variables ........ %('a')
@@ -1437,7 +1440,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... Y4
-PLAN_ID .................. 212321885097028060
+PLAN_ID .................. 212324175848803150
 ROWS_OUT ................. 4
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ delete from t010t2
@@ -1483,7 +1486,7 @@ DESCRIPTION
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... ON
   HBASE_MAX_NUM_SEARCH_KE  1
-  ObjectUIDs ............. 5395965056177977162
+  ObjectUIDs ............. 4560549616040773848
   input_variables ........ %('a')
 
 
@@ -1547,7 +1550,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... Y5
-PLAN_ID .................. 212321885097193080
+PLAN_ID .................. 212324175848938512
 ROWS_OUT ................. 2
 EST_TOTAL_COST ........... 0
 STATEMENT ................ update t010t2
@@ -1595,7 +1598,7 @@ DESCRIPTION
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... ON
   HBASE_MAX_NUM_SEARCH_KE  1
-  ObjectUIDs ............. 5395965056177977162
+  ObjectUIDs ............. 4560549616040773848
   input_variables ........ %('uuu'), %(4)
 
 
@@ -1772,19 +1775,20 @@ _SALT_      A            B           C            D
 >>invoke t010t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T010T1
--- Definition current  Wed Feb 10 17:25:15 2016
+-- Definition current  Tue Mar  8 05:44:33 2016
 
   (
     A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   , B                                CHAR(10) CHARACTER SET ISO88591 COLLATE
       DEFAULT DEFAULT NULL
   )
+  PRIMARY KEY (A ASC)
 
 --- SQL operation complete.
 >>invoke hbase."_CELL_"."TRAFODION.SCH.T010T1";
 
 -- Definition of Trafodion table HBASE."_CELL_"."TRAFODION.SCH.T010T1"
--- Definition current  Wed Feb 10 17:25:15 2016
+-- Definition current  Tue Mar  8 05:44:33 2016
 
   (
     ROW_ID                           VARCHAR(10) CHARACTER SET ISO88591 COLLATE
@@ -1797,12 +1801,13 @@ _SALT_      A            B           C            D
   , COL_VALUE                        VARCHAR(20) CHARACTER SET ISO88591 COLLATE
       DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (ROW_ID ASC)
 
 --- SQL operation complete.
 >>invoke hbase."_ROW_"."TRAFODION.SCH.T010T1";
 
 -- Definition of Trafodion table HBASE."_ROW_"."TRAFODION.SCH.T010T1"
--- Definition current  Wed Feb 10 17:25:15 2016
+-- Definition current  Tue Mar  8 05:44:33 2016
 
   (
     ROW_ID                           VARCHAR(10) CHARACTER SET ISO88591 COLLATE
@@ -1810,6 +1815,7 @@ _SALT_      A            B           C            D
   , COLUMN_DETAILS                   VARCHAR(60) CHARACTER SET ISO88591 COLLATE
       DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (ROW_ID ASC)
 
 --- SQL operation complete.
 >>
@@ -1932,7 +1938,7 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... XX
-PLAN_ID .................. 212321885117562364
+PLAN_ID .................. 212324175874760960
 ROWS_OUT ................ 11
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select * from t010t1 where a=1 or b='1';
@@ -1975,7 +1981,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... OFF
-  ObjectUIDs ............. 5395965056177979649
+  ObjectUIDs ............. 4560549616040776750
   select_list ............ TRAFODION.SCH.T010T1.A, TRAFODION.SCH.T010T1.B
 
 
@@ -2015,7 +2021,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... XX
-PLAN_ID .................. 212321885117630076
+PLAN_ID .................. 212324175874820914
 ROWS_OUT ................. 1
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select * from t010t1 where a=1 and b='1';
@@ -2059,7 +2065,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... OFF
-  ObjectUIDs ............. 5395965056177979649
+  ObjectUIDs ............. 4560549616040776750
   select_list ............ 1, '1'
 
 
@@ -2097,7 +2103,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... XX
-PLAN_ID .................. 212321885117688131
+PLAN_ID .................. 212324175874880851
 ROWS_OUT ................ 10
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select * from t010t1 where b='1';
@@ -2140,7 +2146,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... OFF
-  ObjectUIDs ............. 5395965056177979649
+  ObjectUIDs ............. 4560549616040776750
   select_list ............ TRAFODION.SCH.T010T1.A, '1'
 
 
@@ -2179,7 +2185,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... XX
-PLAN_ID .................. 212321885117743655
+PLAN_ID .................. 212324175874938755
 ROWS_OUT ................. 1
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select * from t010t1 where a=1;
@@ -2223,7 +2229,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... OFF
-  ObjectUIDs ............. 5395965056177979649
+  ObjectUIDs ............. 4560549616040776750
   select_list ............ 1, TRAFODION.SCH.T010T1.B
 
 
@@ -2485,7 +2491,7 @@ A            B           C            D
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... X1
-PLAN_ID .................. 212321885119498869
+PLAN_ID .................. 212324175876688173
 ROWS_OUT ................. 2
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select *
@@ -2530,7 +2536,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... OFF
-  ObjectUIDs ............. 5395965056177979769
+  ObjectUIDs ............. 4560549616040776809
   select_list ............ TRAFODION.SCH.T010T2.A, 'a', 1,
                              TRAFODION.SCH.T010T2.D
 
@@ -2564,7 +2570,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... X2
-PLAN_ID .................. 212321885119535261
+PLAN_ID .................. 212324175876724288
 ROWS_OUT ................. 5
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select *
@@ -2610,7 +2616,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... OFF
-  ObjectUIDs ............. 5395965056177979769
+  ObjectUIDs ............. 4560549616040776809
   select_list ............ TRAFODION.SCH.T010T2.A, 'a', TRAFODION.SCH.T010T2.C,
                              TRAFODION.SCH.T010T2.D
 
@@ -2657,7 +2663,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... X3
-PLAN_ID .................. 212321885119574822
+PLAN_ID .................. 212324175876780593
 ROWS_OUT ................. 4
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select *
@@ -2702,7 +2708,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... OFF
-  ObjectUIDs ............. 5395965056177979769
+  ObjectUIDs ............. 4560549616040776809
   select_list ............ TRAFODION.SCH.T010T2.A, 'a', TRAFODION.SCH.T010T2.C,
                              TRAFODION.SCH.T010T2.D
 
@@ -2740,7 +2746,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... X4
-PLAN_ID .................. 212321885119613489
+PLAN_ID .................. 212324175876833674
 ROWS_OUT ................. 4
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ delete from t010t2
@@ -2785,7 +2791,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... OFF
-  ObjectUIDs ............. 5395965056177979769
+  ObjectUIDs ............. 4560549616040776809
 
 
 TUPLE_FLOW ================================  SEQ_NO 3        CHILDREN 1, 2
@@ -2852,7 +2858,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... X5
-PLAN_ID .................. 212321885119716625
+PLAN_ID .................. 212324175876909335
 ROWS_OUT ................. 2
 EST_TOTAL_COST ........... 0
 STATEMENT ................ update t010t2
@@ -2899,7 +2905,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... OFF
-  ObjectUIDs ............. 5395965056177979769
+  ObjectUIDs ............. 4560549616040776809
 
 
 TRAFODION_UPDATE ==========================  SEQ_NO 1        NO CHILDREN
@@ -2929,7 +2935,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... Y1
-PLAN_ID .................. 212321885119793180
+PLAN_ID .................. 212324175876971746
 ROWS_OUT ................. 2
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select *
@@ -2975,7 +2981,7 @@ DESCRIPTION
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... OFF
   HBASE_MAX_NUM_SEARCH_KE  1
-  ObjectUIDs ............. 5395965056177979769
+  ObjectUIDs ............. 4560549616040776809
   select_list ............ TRAFODION.SCH.T010T2.A, 'a', 1,
                              TRAFODION.SCH.T010T2.D
 
@@ -3010,7 +3016,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... Y2
-PLAN_ID .................. 212321885119836459
+PLAN_ID .................. 212324175877010951
 ROWS_OUT ................. 5
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select *
@@ -3057,7 +3063,7 @@ DESCRIPTION
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... OFF
   HBASE_MAX_NUM_SEARCH_KE  1
-  ObjectUIDs ............. 5395965056177979769
+  ObjectUIDs ............. 4560549616040776809
   select_list ............ TRAFODION.SCH.T010T2.A, 'a', TRAFODION.SCH.T010T2.C,
                              TRAFODION.SCH.T010T2.D
 
@@ -3093,7 +3099,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... Y3
-PLAN_ID .................. 212321885119870483
+PLAN_ID .................. 212324175877059861
 ROWS_OUT ................. 4
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select *
@@ -3139,7 +3145,7 @@ DESCRIPTION
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... OFF
   HBASE_MAX_NUM_SEARCH_KE  1
-  ObjectUIDs ............. 5395965056177979769
+  ObjectUIDs ............. 4560549616040776809
   select_list ............ TRAFODION.SCH.T010T2.A, 'a', TRAFODION.SCH.T010T2.C,
                              TRAFODION.SCH.T010T2.D
 
@@ -3175,7 +3181,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... Y4
-PLAN_ID .................. 212321885119915606
+PLAN_ID .................. 212324175877104899
 ROWS_OUT ................. 4
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ delete from t010t2
@@ -3221,7 +3227,7 @@ DESCRIPTION
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... OFF
   HBASE_MAX_NUM_SEARCH_KE  1
-  ObjectUIDs ............. 5395965056177979769
+  ObjectUIDs ............. 4560549616040776809
 
 
 TUPLE_FLOW ================================  SEQ_NO 3        CHILDREN 1, 2
@@ -3285,7 +3291,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... Y5
-PLAN_ID .................. 212321885119998609
+PLAN_ID .................. 212324175877185429
 ROWS_OUT ................. 2
 EST_TOTAL_COST ........... 0
 STATEMENT ................ update t010t2
@@ -3333,7 +3339,7 @@ DESCRIPTION
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... OFF
   HBASE_MAX_NUM_SEARCH_KE  1
-  ObjectUIDs ............. 5395965056177979769
+  ObjectUIDs ............. 4560549616040776809
 
 
 TRAFODION_UPDATE ==========================  SEQ_NO 1        NO CHILDREN
@@ -3510,19 +3516,20 @@ _SALT_      A            B           C            D
 >>invoke t010t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T010T1
--- Definition current  Wed Feb 10 17:25:37 2016
+-- Definition current  Tue Mar  8 05:44:59 2016
 
   (
     A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   , B                                CHAR(10) CHARACTER SET ISO88591 COLLATE
       DEFAULT DEFAULT NULL
   )
+  PRIMARY KEY (A ASC)
 
 --- SQL operation complete.
 >>invoke hbase."_CELL_"."TRAFODION.SCH.T010T1";
 
 -- Definition of Trafodion table HBASE."_CELL_"."TRAFODION.SCH.T010T1"
--- Definition current  Wed Feb 10 17:25:37 2016
+-- Definition current  Tue Mar  8 05:44:59 2016
 
   (
     ROW_ID                           VARCHAR(10) CHARACTER SET ISO88591 COLLATE
@@ -3535,12 +3542,13 @@ _SALT_      A            B           C            D
   , COL_VALUE                        VARCHAR(20) CHARACTER SET ISO88591 COLLATE
       DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (ROW_ID ASC)
 
 --- SQL operation complete.
 >>invoke hbase."_ROW_"."TRAFODION.SCH.T010T1";
 
 -- Definition of Trafodion table HBASE."_ROW_"."TRAFODION.SCH.T010T1"
--- Definition current  Wed Feb 10 17:25:37 2016
+-- Definition current  Tue Mar  8 05:44:59 2016
 
   (
     ROW_ID                           VARCHAR(10) CHARACTER SET ISO88591 COLLATE
@@ -3548,6 +3556,7 @@ _SALT_      A            B           C            D
   , COLUMN_DETAILS                   VARCHAR(60) CHARACTER SET ISO88591 COLLATE
       DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (ROW_ID ASC)
 
 --- SQL operation complete.
 >>
@@ -3670,7 +3679,7 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... XX
-PLAN_ID .................. 212321885139456457
+PLAN_ID .................. 212324175901195506
 ROWS_OUT ................ 11
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select * from t010t1 where a=1 or b='1';
@@ -3713,7 +3722,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... OFF
-  ObjectUIDs ............. 5395965056177981872
+  ObjectUIDs ............. 4560549616040779258
   select_list ............ TRAFODION.SCH.T010T1.A, TRAFODION.SCH.T010T1.B
 
 
@@ -3753,7 +3762,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... XX
-PLAN_ID .................. 212321885139522620
+PLAN_ID .................. 212324175901265852
 ROWS_OUT ................. 1
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select * from t010t1 where a=1 and b='1';
@@ -3797,7 +3806,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... OFF
-  ObjectUIDs ............. 5395965056177981872
+  ObjectUIDs ............. 4560549616040779258
   select_list ............ %(1), %('1')
   input_variables ........ %(1), %('1')
 
@@ -3836,7 +3845,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... XX
-PLAN_ID .................. 212321885139598890
+PLAN_ID .................. 212324175901340557
 ROWS_OUT ................ 10
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select * from t010t1 where b='1';
@@ -3879,7 +3888,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... OFF
-  ObjectUIDs ............. 5395965056177981872
+  ObjectUIDs ............. 4560549616040779258
   select_list ............ TRAFODION.SCH.T010T1.A, %('1')
   input_variables ........ %('1')
 
@@ -3919,7 +3928,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... XX
-PLAN_ID .................. 212321885138325650
+PLAN_ID .................. 212324175899984759
 ROWS_OUT ................. 1
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select * from t010t1 where a = 2;
@@ -3963,7 +3972,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... OFF
-  ObjectUIDs ............. 5395965056177981872
+  ObjectUIDs ............. 4560549616040779258
   select_list ............ %(2), TRAFODION.SCH.T010T1.B
   input_variables ........ %(2)
 
@@ -4226,7 +4235,7 @@ A            B           C            D
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... X1
-PLAN_ID .................. 212321885141453521
+PLAN_ID .................. 212324175903165153
 ROWS_OUT ................. 2
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select *
@@ -4271,7 +4280,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... OFF
-  ObjectUIDs ............. 5395965056177981941
+  ObjectUIDs ............. 4560549616040779320
   select_list ............ TRAFODION.SCH.T010T2.A, %('a'), %(1),
                              TRAFODION.SCH.T010T2.D
   input_variables ........ %('a'), %(1)
@@ -4306,7 +4315,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... X2
-PLAN_ID .................. 212321885141492306
+PLAN_ID .................. 212324175903203605
 ROWS_OUT ................. 5
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select *
@@ -4352,7 +4361,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... OFF
-  ObjectUIDs ............. 5395965056177981941
+  ObjectUIDs ............. 4560549616040779320
   select_list ............ TRAFODION.SCH.T010T2.A, %('a'),
                              TRAFODION.SCH.T010T2.C, TRAFODION.SCH.T010T2.D
   input_variables ........ %('a')
@@ -4388,7 +4397,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... X3
-PLAN_ID .................. 212321885141528792
+PLAN_ID .................. 212324175903242740
 ROWS_OUT ................. 4
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select *
@@ -4433,7 +4442,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... OFF
-  ObjectUIDs ............. 5395965056177981941
+  ObjectUIDs ............. 4560549616040779320
   select_list ............ TRAFODION.SCH.T010T2.A, %('a'),
                              TRAFODION.SCH.T010T2.C, TRAFODION.SCH.T010T2.D
   input_variables ........ %('a')
@@ -4469,7 +4478,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... X4
-PLAN_ID .................. 212321885141575489
+PLAN_ID .................. 212324175903283921
 ROWS_OUT ................. 4
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ delete from t010t2
@@ -4514,7 +4523,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... OFF
-  ObjectUIDs ............. 5395965056177981941
+  ObjectUIDs ............. 4560549616040779320
   input_variables ........ %('a')
 
 
@@ -4578,7 +4587,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... X5
-PLAN_ID .................. 212321885141664461
+PLAN_ID .................. 212324175903360153
 ROWS_OUT ................. 2
 EST_TOTAL_COST ........... 0
 STATEMENT ................ update t010t2
@@ -4625,7 +4634,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... OFF
-  ObjectUIDs ............. 5395965056177981941
+  ObjectUIDs ............. 4560549616040779320
   input_variables ........ %('upd'), %(4)
 
 
@@ -4652,7 +4661,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... Y1
-PLAN_ID .................. 212321885141733289
+PLAN_ID .................. 212324175903436779
 ROWS_OUT ................. 2
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select *
@@ -4698,7 +4707,7 @@ DESCRIPTION
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... OFF
   HBASE_MAX_NUM_SEARCH_KE  1
-  ObjectUIDs ............. 5395965056177981941
+  ObjectUIDs ............. 4560549616040779320
   select_list ............ TRAFODION.SCH.T010T2.A, %('a'), %(1),
                              TRAFODION.SCH.T010T2.D
   input_variables ........ %('a'), %(1)
@@ -4733,7 +4742,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... Y2
-PLAN_ID .................. 212321885141769945
+PLAN_ID .................. 212324175903476720
 ROWS_OUT ................. 5
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select *
@@ -4780,7 +4789,7 @@ DESCRIPTION
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... OFF
   HBASE_MAX_NUM_SEARCH_KE  1
-  ObjectUIDs ............. 5395965056177981941
+  ObjectUIDs ............. 4560549616040779320
   select_list ............ TRAFODION.SCH.T010T2.A, %('a'),
                              TRAFODION.SCH.T010T2.C, TRAFODION.SCH.T010T2.D
   input_variables ........ %('a')
@@ -4816,7 +4825,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... Y3
-PLAN_ID .................. 212321885141803748
+PLAN_ID .................. 212324175903512047
 ROWS_OUT ................. 4
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select *
@@ -4862,7 +4871,7 @@ DESCRIPTION
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... OFF
   HBASE_MAX_NUM_SEARCH_KE  1
-  ObjectUIDs ............. 5395965056177981941
+  ObjectUIDs ............. 4560549616040779320
   select_list ............ TRAFODION.SCH.T010T2.A, %('a'),
                              TRAFODION.SCH.T010T2.C, TRAFODION.SCH.T010T2.D
   input_variables ........ %('a')
@@ -4898,7 +4907,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... Y4
-PLAN_ID .................. 212321885141846512
+PLAN_ID .................. 212324175903553526
 ROWS_OUT ................. 4
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ delete from t010t2
@@ -4944,7 +4953,7 @@ DESCRIPTION
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... OFF
   HBASE_MAX_NUM_SEARCH_KE  1
-  ObjectUIDs ............. 5395965056177981941
+  ObjectUIDs ............. 4560549616040779320
   input_variables ........ %('a')
 
 
@@ -5008,7 +5017,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... Y5
-PLAN_ID .................. 212321885141938820
+PLAN_ID .................. 212324175903632779
 ROWS_OUT ................. 2
 EST_TOTAL_COST ........... 0
 STATEMENT ................ update t010t2
@@ -5056,7 +5065,7 @@ DESCRIPTION
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... OFF
   HBASE_MAX_NUM_SEARCH_KE  1
-  ObjectUIDs ............. 5395965056177981941
+  ObjectUIDs ............. 4560549616040779320
   input_variables ........ %('uuu'), %(4)
 
 
@@ -5233,19 +5242,20 @@ _SALT_      A            B           C            D
 >>invoke t010t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T010T1
--- Definition current  Wed Feb 10 17:26:00 2016
+-- Definition current  Tue Mar  8 05:45:25 2016
 
   (
     A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   , B                                CHAR(10) CHARACTER SET ISO88591 COLLATE
       DEFAULT DEFAULT NULL
   )
+  PRIMARY KEY (A ASC)
 
 --- SQL operation complete.
 >>invoke hbase."_CELL_"."TRAFODION.SCH.T010T1";
 
 -- Definition of Trafodion table HBASE."_CELL_"."TRAFODION.SCH.T010T1"
--- Definition current  Wed Feb 10 17:26:00 2016
+-- Definition current  Tue Mar  8 05:45:25 2016
 
   (
     ROW_ID                           VARCHAR(10) CHARACTER SET ISO88591 COLLATE
@@ -5258,12 +5268,13 @@ _SALT_      A            B           C            D
   , COL_VALUE                        VARCHAR(20) CHARACTER SET ISO88591 COLLATE
       DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (ROW_ID ASC)
 
 --- SQL operation complete.
 >>invoke hbase."_ROW_"."TRAFODION.SCH.T010T1";
 
 -- Definition of Trafodion table HBASE."_ROW_"."TRAFODION.SCH.T010T1"
--- Definition current  Wed Feb 10 17:26:00 2016
+-- Definition current  Tue Mar  8 05:45:25 2016
 
   (
     ROW_ID                           VARCHAR(10) CHARACTER SET ISO88591 COLLATE
@@ -5271,6 +5282,7 @@ _SALT_      A            B           C            D
   , COLUMN_DETAILS                   VARCHAR(60) CHARACTER SET ISO88591 COLLATE
       DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (ROW_ID ASC)
 
 --- SQL operation complete.
 >>
@@ -5393,7 +5405,7 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... XX
-PLAN_ID .................. 212321885161677240
+PLAN_ID .................. 212324175927123261
 ROWS_OUT ................ 11
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select * from t010t1 where a=1 or b='1';
@@ -5436,7 +5448,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177984042
+  ObjectUIDs ............. 4560549616040781936
   select_list ............ TRAFODION.SCH.T010T1.A, TRAFODION.SCH.T010T1.B
 
 
@@ -5476,7 +5488,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... XX
-PLAN_ID .................. 212321885161745895
+PLAN_ID .................. 212324175927192763
 ROWS_OUT ................. 1
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select * from t010t1 where a=1 and b='1';
@@ -5520,7 +5532,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177984042
+  ObjectUIDs ............. 4560549616040781936
   select_list ............ 1, '1'
 
 
@@ -5558,7 +5570,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... XX
-PLAN_ID .................. 212321885161799613
+PLAN_ID .................. 212324175927251686
 ROWS_OUT ................ 10
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select * from t010t1 where b='1';
@@ -5601,7 +5613,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177984042
+  ObjectUIDs ............. 4560549616040781936
   select_list ............ TRAFODION.SCH.T010T1.A, '1'
 
 
@@ -5640,7 +5652,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... XX
-PLAN_ID .................. 212321885161866012
+PLAN_ID .................. 212324175927312652
 ROWS_OUT ................. 1
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select * from t010t1 where a=1;
@@ -5684,7 +5696,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177984042
+  ObjectUIDs ............. 4560549616040781936
   select_list ............ 1, TRAFODION.SCH.T010T1.B
 
 
@@ -5946,7 +5958,7 @@ A            B           C            D
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... X1
-PLAN_ID .................. 212321885163649284
+PLAN_ID .................. 212324175928946210
 ROWS_OUT ................. 2
 EST_TOTAL_COST ........... 0
 STATEMENT ................ select *
@@ -5991,7 +6003,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177984162
+  ObjectUIDs ............. 4560549616040781998
   select_list ............ TRAFODION.SCH.T010T2.A, 'a', 1,
                              TRAFODION.SCH.T010T2.D
 
@@ -6024,7 +6036,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... X2
-PLAN_ID .................. 212321885163703104
+PLAN_ID .................. 212324175929005102
 ROWS_OUT ................. 5
 EST_TOTAL_COST ........... 0
 STATEMENT ................ select *
@@ -6070,7 +6082,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177984162
+  ObjectUIDs ............. 4560549616040781998
   select_list ............ TRAFODION.SCH.T010T2.A, 'a', TRAFODION.SCH.T010T2.C,
                              TRAFODION.SCH.T010T2.D
 
@@ -6104,7 +6116,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... X3
-PLAN_ID .................. 212321885163762184
+PLAN_ID .................. 212324175929068640
 ROWS_OUT ................. 4
 EST_TOTAL_COST ........... 0
 STATEMENT ................ select *
@@ -6149,7 +6161,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177984162
+  ObjectUIDs ............. 4560549616040781998
   select_list ............ TRAFODION.SCH.T010T2.A, 'a', TRAFODION.SCH.T010T2.C,
                              TRAFODION.SCH.T010T2.D
 
@@ -6183,7 +6195,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... X4
-PLAN_ID .................. 212321885163841840
+PLAN_ID .................. 212324175929139799
 ROWS_OUT ................. 4
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ delete from t010t2
@@ -6228,7 +6240,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177984162
+  ObjectUIDs ............. 4560549616040781998
 
 
 TUPLE_FLOW ================================  SEQ_NO 3        CHILDREN 1, 2
@@ -6291,7 +6303,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... X5
-PLAN_ID .................. 212321885164005046
+PLAN_ID .................. 212324175929266354
 ROWS_OUT ................. 2
 EST_TOTAL_COST ........... 0
 STATEMENT ................ update t010t2
@@ -6338,7 +6350,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... OFF
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177984162
+  ObjectUIDs ............. 4560549616040781998
 
 
 TRAFODION_UPDATE ==========================  SEQ_NO 1        NO CHILDREN
@@ -6368,7 +6380,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... Y1
-PLAN_ID .................. 212321885164071839
+PLAN_ID .................. 212324175929346869
 ROWS_OUT ................. 2
 EST_TOTAL_COST ........... 0
 STATEMENT ................ select *
@@ -6414,7 +6426,7 @@ DESCRIPTION
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... ON
   HBASE_MAX_NUM_SEARCH_KE  1
-  ObjectUIDs ............. 5395965056177984162
+  ObjectUIDs ............. 4560549616040781998
   select_list ............ TRAFODION.SCH.T010T2.A, 'a', 1,
                              TRAFODION.SCH.T010T2.D
 
@@ -6447,7 +6459,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... Y2
-PLAN_ID .................. 212321885164141735
+PLAN_ID .................. 212324175929409191
 ROWS_OUT ................. 5
 EST_TOTAL_COST ........... 0
 STATEMENT ................ select *
@@ -6494,7 +6506,7 @@ DESCRIPTION
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... ON
   HBASE_MAX_NUM_SEARCH_KE  1
-  ObjectUIDs ............. 5395965056177984162
+  ObjectUIDs ............. 4560549616040781998
   select_list ............ TRAFODION.SCH.T010T2.A, 'a', TRAFODION.SCH.T010T2.C,
                              TRAFODION.SCH.T010T2.D
 
@@ -6528,7 +6540,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... Y3
-PLAN_ID .................. 212321885164217816
+PLAN_ID .................. 212324175929479669
 ROWS_OUT ................. 4
 EST_TOTAL_COST ........... 0
 STATEMENT ................ select *
@@ -6574,7 +6586,7 @@ DESCRIPTION
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... ON
   HBASE_MAX_NUM_SEARCH_KE  1
-  ObjectUIDs ............. 5395965056177984162
+  ObjectUIDs ............. 4560549616040781998
   select_list ............ TRAFODION.SCH.T010T2.A, 'a', TRAFODION.SCH.T010T2.C,
                              TRAFODION.SCH.T010T2.D
 
@@ -6608,7 +6620,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... Y4
-PLAN_ID .................. 212321885164282567
+PLAN_ID .................. 212324175929545793
 ROWS_OUT ................. 4
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ delete from t010t2
@@ -6654,7 +6666,7 @@ DESCRIPTION
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... ON
   HBASE_MAX_NUM_SEARCH_KE  1
-  ObjectUIDs ............. 5395965056177984162
+  ObjectUIDs ............. 4560549616040781998
 
 
 TUPLE_FLOW ================================  SEQ_NO 3        CHILDREN 1, 2
@@ -6717,7 +6729,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... Y5
-PLAN_ID .................. 212321885164415433
+PLAN_ID .................. 212324175929666763
 ROWS_OUT ................. 2
 EST_TOTAL_COST ........... 0
 STATEMENT ................ update t010t2
@@ -6765,7 +6777,7 @@ DESCRIPTION
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... ON
   HBASE_MAX_NUM_SEARCH_KE  1
-  ObjectUIDs ............. 5395965056177984162
+  ObjectUIDs ............. 4560549616040781998
 
 
 TRAFODION_UPDATE ==========================  SEQ_NO 1        NO CHILDREN
@@ -6962,19 +6974,20 @@ _SALT_      A            B           C            D
 >>invoke t010t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T010T1
--- Definition current  Wed Feb 10 17:26:23 2016
+-- Definition current  Tue Mar  8 05:45:52 2016
 
   (
     A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   , B                                CHAR(10) CHARACTER SET ISO88591 COLLATE
       DEFAULT DEFAULT NULL
   )
+  PRIMARY KEY (A ASC)
 
 --- SQL operation complete.
 >>invoke hbase."_CELL_"."TRAFODION.SCH.T010T1";
 
 -- Definition of Trafodion table HBASE."_CELL_"."TRAFODION.SCH.T010T1"
--- Definition current  Wed Feb 10 17:26:23 2016
+-- Definition current  Tue Mar  8 05:45:52 2016
 
   (
     ROW_ID                           VARCHAR(10) CHARACTER SET ISO88591 COLLATE
@@ -6987,12 +7000,13 @@ _SALT_      A            B           C            D
   , COL_VALUE                        VARCHAR(20) CHARACTER SET ISO88591 COLLATE
       DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (ROW_ID ASC)
 
 --- SQL operation complete.
 >>invoke hbase."_ROW_"."TRAFODION.SCH.T010T1";
 
 -- Definition of Trafodion table HBASE."_ROW_"."TRAFODION.SCH.T010T1"
--- Definition current  Wed Feb 10 17:26:23 2016
+-- Definition current  Tue Mar  8 05:45:52 2016
 
   (
     ROW_ID                           VARCHAR(10) CHARACTER SET ISO88591 COLLATE
@@ -7000,6 +7014,7 @@ _SALT_      A            B           C            D
   , COLUMN_DETAILS                   VARCHAR(60) CHARACTER SET ISO88591 COLLATE
       DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (ROW_ID ASC)
 
 --- SQL operation complete.
 >>
@@ -7122,7 +7137,7 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... XX
-PLAN_ID .................. 212321885185091978
+PLAN_ID .................. 212324175953641296
 ROWS_OUT ................ 11
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select * from t010t1 where a=1 or b='1';
@@ -7165,7 +7180,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... ON
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177986351
+  ObjectUIDs ............. 4560549616040784604
   select_list ............ TRAFODION.SCH.T010T1.A, TRAFODION.SCH.T010T1.B
 
 
@@ -7205,7 +7220,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... XX
-PLAN_ID .................. 212321885185152819
+PLAN_ID .................. 212324175953734141
 ROWS_OUT ................. 1
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select * from t010t1 where a=1 and b='1';
@@ -7249,7 +7264,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... ON
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177986351
+  ObjectUIDs ............. 4560549616040784604
   select_list ............ %(1), %('1')
   input_variables ........ %(1), %('1')
 
@@ -7288,7 +7303,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... XX
-PLAN_ID .................. 212321885185203931
+PLAN_ID .................. 212324175953816734
 ROWS_OUT ................ 10
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select * from t010t1 where b='1';
@@ -7331,7 +7346,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... ON
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177986351
+  ObjectUIDs ............. 4560549616040784604
   select_list ............ TRAFODION.SCH.T010T1.A, %('1')
   input_variables ........ %('1')
 
@@ -7372,7 +7387,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... XX
-PLAN_ID .................. 212321885183743840
+PLAN_ID .................. 212324175952493666
 ROWS_OUT ................. 1
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select * from t010t1 where a = 2;
@@ -7416,7 +7431,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... ON
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177986351
+  ObjectUIDs ............. 4560549616040784604
   select_list ............ %(2), TRAFODION.SCH.T010T1.B
   input_variables ........ %(2)
 
@@ -7679,7 +7694,7 @@ A            B           C            D
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... X1
-PLAN_ID .................. 212321885186898865
+PLAN_ID .................. 212324175955526117
 ROWS_OUT ................. 2
 EST_TOTAL_COST ........... 0
 STATEMENT ................ select *
@@ -7724,7 +7739,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... ON
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177986475
+  ObjectUIDs ............. 4560549616040784661
   select_list ............ TRAFODION.SCH.T010T2.A, %('a'), %(1),
                              TRAFODION.SCH.T010T2.D
   input_variables ........ %('a'), %(1)
@@ -7758,7 +7773,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... X2
-PLAN_ID .................. 212321885186959156
+PLAN_ID .................. 212324175955589592
 ROWS_OUT ................. 5
 EST_TOTAL_COST ........... 0
 STATEMENT ................ select *
@@ -7804,7 +7819,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... ON
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177986475
+  ObjectUIDs ............. 4560549616040784661
   select_list ............ TRAFODION.SCH.T010T2.A, %('a'),
                              TRAFODION.SCH.T010T2.C, TRAFODION.SCH.T010T2.D
   input_variables ........ %('a')
@@ -7839,7 +7854,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... X3
-PLAN_ID .................. 212321885187022838
+PLAN_ID .................. 212324175955661668
 ROWS_OUT ................. 4
 EST_TOTAL_COST ........... 0
 STATEMENT ................ select *
@@ -7884,7 +7899,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... ON
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177986475
+  ObjectUIDs ............. 4560549616040784661
   select_list ............ TRAFODION.SCH.T010T2.A, %('a'),
                              TRAFODION.SCH.T010T2.C, TRAFODION.SCH.T010T2.D
   input_variables ........ %('a')
@@ -7919,7 +7934,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... X4
-PLAN_ID .................. 212321885187080416
+PLAN_ID .................. 212324175955727413
 ROWS_OUT ................. 4
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ delete from t010t2
@@ -7964,7 +7979,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... ON
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177986475
+  ObjectUIDs ............. 4560549616040784661
   input_variables ........ %('a')
 
 
@@ -8028,7 +8043,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... X5
-PLAN_ID .................. 212321885187212767
+PLAN_ID .................. 212324175955856497
 ROWS_OUT ................. 2
 EST_TOTAL_COST ........... 0
 STATEMENT ................ update t010t2
@@ -8075,7 +8090,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... ON
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177986475
+  ObjectUIDs ............. 4560549616040784661
   input_variables ........ %('upd'), %(4)
 
 
@@ -8102,7 +8117,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... Y1
-PLAN_ID .................. 212321885187278448
+PLAN_ID .................. 212324175955924581
 ROWS_OUT ................. 2
 EST_TOTAL_COST ........... 0
 STATEMENT ................ select *
@@ -8148,7 +8163,7 @@ DESCRIPTION
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... ON
   HBASE_MAX_NUM_SEARCH_KE  1
-  ObjectUIDs ............. 5395965056177986475
+  ObjectUIDs ............. 4560549616040784661
   select_list ............ TRAFODION.SCH.T010T2.A, %('a'), %(1),
                              TRAFODION.SCH.T010T2.D
   input_variables ........ %('a'), %(1)
@@ -8182,7 +8197,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... Y2
-PLAN_ID .................. 212321885187324046
+PLAN_ID .................. 212324175955973846
 ROWS_OUT ................. 5
 EST_TOTAL_COST ........... 0
 STATEMENT ................ select *
@@ -8229,7 +8244,7 @@ DESCRIPTION
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... ON
   HBASE_MAX_NUM_SEARCH_KE  1
-  ObjectUIDs ............. 5395965056177986475
+  ObjectUIDs ............. 4560549616040784661
   select_list ............ TRAFODION.SCH.T010T2.A, %('a'),
                              TRAFODION.SCH.T010T2.C, TRAFODION.SCH.T010T2.D
   input_variables ........ %('a')
@@ -8264,7 +8279,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... Y3
-PLAN_ID .................. 212321885187382745
+PLAN_ID .................. 212324175956030695
 ROWS_OUT ................. 4
 EST_TOTAL_COST ........... 0
 STATEMENT ................ select *
@@ -8310,7 +8325,7 @@ DESCRIPTION
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... ON
   HBASE_MAX_NUM_SEARCH_KE  1
-  ObjectUIDs ............. 5395965056177986475
+  ObjectUIDs ............. 4560549616040784661
   select_list ............ TRAFODION.SCH.T010T2.A, %('a'),
                              TRAFODION.SCH.T010T2.C, TRAFODION.SCH.T010T2.D
   input_variables ........ %('a')
@@ -8345,7 +8360,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... Y4
-PLAN_ID .................. 212321885187439570
+PLAN_ID .................. 212324175956088526
 ROWS_OUT ................. 4
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ delete from t010t2
@@ -8391,7 +8406,7 @@ DESCRIPTION
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... ON
   HBASE_MAX_NUM_SEARCH_KE  1
-  ObjectUIDs ............. 5395965056177986475
+  ObjectUIDs ............. 4560549616040784661
   input_variables ........ %('a')
 
 
@@ -8455,7 +8470,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... Y5
-PLAN_ID .................. 212321885187560565
+PLAN_ID .................. 212324175956213485
 ROWS_OUT ................. 2
 EST_TOTAL_COST ........... 0
 STATEMENT ................ update t010t2
@@ -8503,7 +8518,7 @@ DESCRIPTION
   QUERY_CACHE ........ 1,024
   MDAM_SCAN_METHOD ....... ON
   HBASE_MAX_NUM_SEARCH_KE  1
-  ObjectUIDs ............. 5395965056177986475
+  ObjectUIDs ............. 4560549616040784661
   input_variables ........ %('uuu'), %(4)
 
 
@@ -8680,19 +8695,20 @@ _SALT_      A            B           C            D
 >>invoke t010t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T010T1
--- Definition current  Wed Feb 10 17:26:44 2016
+-- Definition current  Tue Mar  8 05:46:17 2016
 
   (
     A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   , B                                CHAR(10) CHARACTER SET ISO88591 COLLATE
       DEFAULT DEFAULT NULL
   )
+  PRIMARY KEY (A ASC)
 
 --- SQL operation complete.
 >>invoke hbase."_CELL_"."TRAFODION.SCH.T010T1";
 
 -- Definition of Trafodion table HBASE."_CELL_"."TRAFODION.SCH.T010T1"
--- Definition current  Wed Feb 10 17:26:44 2016
+-- Definition current  Tue Mar  8 05:46:17 2016
 
   (
     ROW_ID                           VARCHAR(10) CHARACTER SET ISO88591 COLLATE
@@ -8705,12 +8721,13 @@ _SALT_      A            B           C            D
   , COL_VALUE                        VARCHAR(20) CHARACTER SET ISO88591 COLLATE
       DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (ROW_ID ASC)
 
 --- SQL operation complete.
 >>invoke hbase."_ROW_"."TRAFODION.SCH.T010T1";
 
 -- Definition of Trafodion table HBASE."_ROW_"."TRAFODION.SCH.T010T1"
--- Definition current  Wed Feb 10 17:26:44 2016
+-- Definition current  Tue Mar  8 05:46:17 2016
 
   (
     ROW_ID                           VARCHAR(10) CHARACTER SET ISO88591 COLLATE
@@ -8718,6 +8735,7 @@ _SALT_      A            B           C            D
   , COLUMN_DETAILS                   VARCHAR(60) CHARACTER SET ISO88591 COLLATE
       DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (ROW_ID ASC)
 
 --- SQL operation complete.
 >>
@@ -8840,7 +8858,7 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... XX
-PLAN_ID .................. 212321885206481311
+PLAN_ID .................. 212324175978975431
 ROWS_OUT ................ 11
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select * from t010t1 where a=1 or b='1';
@@ -8883,7 +8901,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... ON
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177988580
+  ObjectUIDs ............. 4560549616040787190
   select_list ............ TRAFODION.SCH.T010T1.A, TRAFODION.SCH.T010T1.B
 
 
@@ -8923,7 +8941,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... XX
-PLAN_ID .................. 212321885206545625
+PLAN_ID .................. 212324175979034252
 ROWS_OUT ................. 1
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select * from t010t1 where a=1 and b='1';
@@ -8967,7 +8985,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... ON
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177988580
+  ObjectUIDs ............. 4560549616040787190
   select_list ............ 1, '1'
 
 
@@ -9005,7 +9023,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... XX
-PLAN_ID .................. 212321885206601773
+PLAN_ID .................. 212324175979087509
 ROWS_OUT ................ 10
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select * from t010t1 where b='1';
@@ -9048,7 +9066,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... ON
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177988580
+  ObjectUIDs ............. 4560549616040787190
   select_list ............ TRAFODION.SCH.T010T1.A, '1'
 
 
@@ -9088,7 +9106,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... XX
-PLAN_ID .................. 212321885206657193
+PLAN_ID .................. 212324175979144151
 ROWS_OUT ................. 1
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select * from t010t1 where a=1;
@@ -9132,7 +9150,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... ON
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177988580
+  ObjectUIDs ............. 4560549616040787190
   select_list ............ 1, TRAFODION.SCH.T010T1.B
 
 
@@ -9394,7 +9412,7 @@ A            B           C            D
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... X1
-PLAN_ID .................. 212321885208444428
+PLAN_ID .................. 212324175980723729
 ROWS_OUT ................. 2
 EST_TOTAL_COST ........... 0
 STATEMENT ................ select *
@@ -9439,7 +9457,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... ON
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177988641
+  ObjectUIDs ............. 4560549616040787250
   select_list ............ TRAFODION.SCH.T010T2.A, 'a', 1,
                              TRAFODION.SCH.T010T2.D
 
@@ -9472,7 +9490,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... X2
-PLAN_ID .................. 212321885208506444
+PLAN_ID .................. 212324175980766745
 ROWS_OUT ................. 5
 EST_TOTAL_COST ........... 0
 STATEMENT ................ select *
@@ -9518,7 +9536,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... ON
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177988641
+  ObjectUIDs ............. 4560549616040787250
   select_list ............ TRAFODION.SCH.T010T2.A, 'a', TRAFODION.SCH.T010T2.C,
                              TRAFODION.SCH.T010T2.D
 
@@ -9552,7 +9570,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... X3
-PLAN_ID .................. 212321885208569011
+PLAN_ID .................. 212324175980834930
 ROWS_OUT ................. 4
 EST_TOTAL_COST ........... 0
 STATEMENT ................ select *
@@ -9597,7 +9615,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... ON
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177988641
+  ObjectUIDs ............. 4560549616040787250
   select_list ............ TRAFODION.SCH.T010T2.A, 'a', TRAFODION.SCH.T010T2.C,
                              TRAFODION.SCH.T010T2.D
 
@@ -9631,7 +9649,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... X4
-PLAN_ID .................. 212321885208626953
+PLAN_ID .................. 212324175980894503
 ROWS_OUT ................. 4
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ delete from t010t2
@@ -9676,7 +9694,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... ON
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177988641
+  ObjectUIDs ............. 4560549616040787250
 
 
 TUPLE_FLOW ================================  SEQ_NO 3        CHILDREN 1, 2
@@ -9739,7 +9757,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... X5
-PLAN_ID .................. 212321885208874924
+PLAN_ID .................. 212324175981003233
 ROWS_OUT ................. 2
 EST_TOTAL_COST ........... 0
 STATEMENT ................ update t010t2
@@ -9786,7 +9804,7 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... ON
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... ON
-  ObjectUIDs ............. 5395965056177988641
+  ObjectUIDs ............. 4560549616040787250
 
 
 TRAFODION_UPDATE ==========================  SEQ_NO 1        NO CHILDREN
@@ -9816,7 +9834,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... Y1
-PLAN_ID .................. 212321885208941580
+PLAN_ID .................. 212324175981066009
 ROWS_OUT ................. 2
 EST_TOTAL_COST ........... 0
 STATEMENT ................ select *
@@ -9862,7 +9880,7 @@ DESCRIPTION
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... ON
   HBASE_MAX_NUM_SEARCH_KE  1
-  ObjectUIDs ............. 5395965056177988641
+  ObjectUIDs ............. 4560549616040787250
   select_list ............ TRAFODION.SCH.T010T2.A, 'a', 1,
                              TRAFODION.SCH.T010T2.D
 
@@ -9895,7 +9913,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... Y2
-PLAN_ID .................. 212321885208994111
+PLAN_ID .................. 212324175981117543
 ROWS_OUT ................. 5
 EST_TOTAL_COST ........... 0
 STATEMENT ................ select *
@@ -9942,7 +9960,7 @@ DESCRIPTION
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... ON
   HBASE_MAX_NUM_SEARCH_KE  1
-  ObjectUIDs ............. 5395965056177988641
+  ObjectUIDs ............. 4560549616040787250
   select_list ............ TRAFODION.SCH.T010T2.A, 'a', TRAFODION.SCH.T010T2.C,
                              TRAFODION.SCH.T010T2.D
 
@@ -9976,7 +9994,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... Y3
-PLAN_ID .................. 212321885209059552
+PLAN_ID .................. 212324175981174168
 ROWS_OUT ................. 4
 EST_TOTAL_COST ........... 0
 STATEMENT ................ select *
@@ -10022,7 +10040,7 @@ DESCRIPTION
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... ON
   HBASE_MAX_NUM_SEARCH_KE  1
-  ObjectUIDs ............. 5395965056177988641
+  ObjectUIDs ............. 4560549616040787250
   select_list ............ TRAFODION.SCH.T010T2.A, 'a', TRAFODION.SCH.T010T2.C,
                              TRAFODION.SCH.T010T2.D
 
@@ -10056,7 +10074,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... Y4
-PLAN_ID .................. 212321885209136694
+PLAN_ID .................. 212324175981243822
 ROWS_OUT ................. 4
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ delete from t010t2
@@ -10102,7 +10120,7 @@ DESCRIPTION
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... ON
   HBASE_MAX_NUM_SEARCH_KE  1
-  ObjectUIDs ............. 5395965056177988641
+  ObjectUIDs ............. 4560549616040787250
 
 
 TUPLE_FLOW ================================  SEQ_NO 3        CHILDREN 1, 2
@@ -10165,7 +10183,7 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... Y5
-PLAN_ID .................. 212321885209255812
+PLAN_ID .................. 212324175981365129
 ROWS_OUT ................. 2
 EST_TOTAL_COST ........... 0
 STATEMENT ................ update t010t2
@@ -10213,7 +10231,7 @@ DESCRIPTION
   QUERY_CACHE ............ 0
   MDAM_SCAN_METHOD ....... ON
   HBASE_MAX_NUM_SEARCH_KE  1
-  ObjectUIDs ............. 5395965056177988641
+  ObjectUIDs ............. 4560549616040787250
 
 
 TRAFODION_UPDATE ==========================  SEQ_NO 1        NO CHILDREN
@@ -10721,12 +10739,12 @@ CREATE TABLE TRAFODION.SCH."delim_tab"
 --- SQL operation complete.
 >>get all volatile schemas;
 
-Schema(Active  ): VOLATILE_SCHEMA_MXID110000259692123218850742930010000000002
+Schema(Active  ): VOLATILE_SCHEMA_MXID110000244852123241758147790010000000002
 
 --- SQL operation complete.
 >>get all volatile tables;
 
-Schema(Active  ): VOLATILE_SCHEMA_MXID110000259692123218850742930010000000002
+Schema(Active  ): VOLATILE_SCHEMA_MXID110000244852123241758147790010000000002
   Table: VTAB1
   Table: VTAB2
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/regress/seabase/EXPECTED011
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/EXPECTED011 b/core/sql/regress/seabase/EXPECTED011
index 400317e..53ee692 100644
--- a/core/sql/regress/seabase/EXPECTED011
+++ b/core/sql/regress/seabase/EXPECTED011
@@ -7,13 +7,14 @@
 >>invoke T011T1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T011T1
--- Definition current  Wed Mar  2 05:16:53 2016
+-- Definition current  Tue Mar  8 05:49:30 2016
 
   (
     A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   , B                                CHAR(10) CHARACTER SET ISO88591 COLLATE
       DEFAULT DEFAULT NULL
   )
+  PRIMARY KEY (A ASC)
 
 --- SQL operation complete.
 >>
@@ -142,7 +143,7 @@ A            B
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... NOT NAMED
-PLAN_ID .................. 212323655814425974
+PLAN_ID .................. 212324176171390042
 ROWS_OUT ................. 7
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select * from t011t1 where a >= 3 and a < 5;
@@ -182,7 +183,7 @@ DESCRIPTION
   SCHEMA ................. TRAFODION.SCH
   QUERY_CACHE ............ 0
   GENERATE_EXPLAIN ....... ON
-  ObjectUIDs ............. 4553793696580766799
+  ObjectUIDs ............. 7433846178641183029
   select_list ............ TRAFODION.SCH.T011T1.A, TRAFODION.SCH.T011T1.B
 
 
@@ -1269,7 +1270,7 @@ METRIC_TEXT_TABLE
 >>invoke trafodion."_REPOS_".metric_query_table;
 
 -- Definition of Trafodion table TRAFODION."_REPOS_".METRIC_QUERY_TABLE
--- Definition current  Wed Mar  2 05:18:55 2016
+-- Definition current  Tue Mar  8 05:51:31 2016
 
   (
     INSTANCE_ID                      INT UNSIGNED NO DEFAULT NOT NULL NOT
@@ -1424,7 +1425,10 @@ METRIC_TEXT_TABLE
   , NUM_NODES                        LARGEINT DEFAULT NULL
   , UDR_PROCESS_BUSY_TIME            LARGEINT DEFAULT NULL
   , PERTABLE_STATS                   INT DEFAULT NULL
+  , "_SALT_"                         INT UNSIGNED NO DEFAULT NOT NULL NOT
+      DROPPABLE
   )
+  PRIMARY KEY ("_SALT_" ASC, EXEC_START_UTC_TS ASC, QUERY_ID ASC)
 
 --- SQL operation complete.
 >>
@@ -1451,7 +1455,7 @@ METRIC_TEXT_TABLE
 >>-- get qid for the prepared stmt
 >>get qid for statement explstmt;
 
-MXID11000008089212323655795185001000000000206U3333300_1994_EXPLSTMT
+MXID11000029589212324176152856001000000000206U3333300_1994_EXPLSTMT
 
 --- SQL operation complete.
 >>
@@ -1503,7 +1507,7 @@ SEQ_NUM      OPERATOR
 --- SQL command prepared.
 >>get qid for statement explstmt2;
 
-MXID11000008089212323655795185001000000000206U3333300_2005_EXPLSTMT2
+MXID11000029589212324176152856001000000000206U3333300_2005_EXPLSTMT2
 
 --- SQL operation complete.
 >>set qid MXID123456 for explstmt2;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/regress/seabase/EXPECTED012
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/EXPECTED012 b/core/sql/regress/seabase/EXPECTED012
index e4ba376..4db69b5 100644
--- a/core/sql/regress/seabase/EXPECTED012
+++ b/core/sql/regress/seabase/EXPECTED012
@@ -41,7 +41,7 @@
 >>invoke t012t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T012T1
--- Definition current  Fri Feb  5 15:58:51 2016
+-- Definition current  Thu Feb 25 09:14:19 2016
 
   (
     A                                SMALLINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -55,6 +55,7 @@
       DEFAULT DEFAULT NULL
   , G                                NUMERIC(5, 2) DEFAULT NULL
   )
+  PRIMARY KEY (A DESC)
 
 --- SQL operation complete.
 >>
@@ -64,7 +65,7 @@
 >>invoke t012v1;
 
 -- Definition of Trafodion view TRAFODION.SCH.T012V1
--- Definition current  Fri Feb  5 15:58:54 2016
+-- Definition current  Thu Feb 25 09:14:22 2016
 
   (
     A                                SMALLINT NO DEFAULT NOT NULL NOT DROPPABLE

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/regress/seabase/EXPECTED020
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/EXPECTED020 b/core/sql/regress/seabase/EXPECTED020
index b1e8606..7e48cd3 100644
--- a/core/sql/regress/seabase/EXPECTED020
+++ b/core/sql/regress/seabase/EXPECTED020
@@ -6,13 +6,14 @@
 >>invoke test020t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.TEST020T1
--- Definition current  Fri Jun  5 10:06:01 2015
+-- Definition current  Tue Mar  8 22:57:06 2016
 
   (
     C1                               INT NO DEFAULT NOT NULL NOT DROPPABLE
   , C2                               CHAR(20) CHARACTER SET ISO88591 COLLATE
       DEFAULT DEFAULT _ISO88591't20t1''s column c2'
   )
+  PRIMARY KEY (C1 ASC)
 
 --- SQL operation complete.
 >>showddl test020t1;
@@ -48,13 +49,14 @@ C1           C2
 >>invoke test020t2;
 
 -- Definition of Trafodion table TRAFODION.SCH.TEST020T2
--- Definition current  Fri Jun  5 10:06:03 2015
+-- Definition current  Tue Mar  8 22:57:08 2016
 
   (
     C                                CHAR(15) CHARACTER SET ISO88591 COLLATE
       DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   , D                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (C ASC, D ASC)
 
 --- SQL operation complete.
 >>showddl test020t2;
@@ -158,13 +160,14 @@ G0
 >>invoke test020t5;
 
 -- Definition of Trafodion table TRAFODION.SCH.TEST020T5
--- Definition current  Fri Jun  5 10:06:10 2015
+-- Definition current  Tue Mar  8 22:57:24 2016
 
   (
     C                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   , SYSKEY                           CHAR(4) CHARACTER SET ISO88591 COLLATE
       DEFAULT DEFAULT NULL
   )
+  PRIMARY KEY (C ASC)
 
 --- SQL operation complete.
 >>showddl test020t5;
@@ -215,6 +218,7 @@ ALTER TABLE TRAFODION.SCH.TEST020T5 ADD CONSTRAINT TRAFODION.SCH.TEST020T5C1
 *** ERROR[8101] The operation is prevented by check constraint TRAFODION.SCH.TEST020T5C1 on table TRAFODION.SCH.TEST020T5.
 
 --- 0 row(s) inserted.
+>>
 >>--------------------------------------------
 >>-- test cases for solution 10-040607-6721 --
 >>--------------------------------------------
@@ -251,10 +255,11 @@ ALTER TABLE TRAFODION.SCH.TEST020T5 ADD CONSTRAINT TRAFODION.SCH.TEST020T5C1
 >>invoke test020t6;
 
 -- Definition of Trafodion table TRAFODION.SCH.TEST020T6
--- Definition current  Fri Jun  5 10:06:54 2015
+-- Definition current  Tue Mar  8 22:58:27 2016
 
   (
-    C                                INT DEFAULT NULL
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , C                                INT DEFAULT NULL
   )
 
 --- SQL operation complete.
@@ -415,10 +420,10 @@ ATEST        BTEST        CTEST        DTEST
 A          
 -----------
 
-          ?
           1
-          ?
           3
+          ?
+          ?
 
 --- 4 row(s) selected.
 >>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/regress/seabase/EXPECTED022
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/EXPECTED022 b/core/sql/regress/seabase/EXPECTED022
index 49c30f6..48b4c23 100644
--- a/core/sql/regress/seabase/EXPECTED022
+++ b/core/sql/regress/seabase/EXPECTED022
@@ -426,7 +426,7 @@ ROW_ID      (EXPR)
 >>invoke hbase."_CELL_".t022hbt2;
 
 -- Definition of Trafodion table HBASE."_CELL_".T022HBT2
--- Definition current  Mon Jul 27 15:00:54 2015
+-- Definition current  Thu Feb 25 09:47:53 2016
 
   (
     ROW_ID                           VARCHAR(100) CHARACTER SET ISO88591
@@ -439,12 +439,13 @@ ROW_ID      (EXPR)
   , COL_VALUE                        VARCHAR(1000) CHARACTER SET ISO88591
       COLLATE DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (ROW_ID ASC)
 
 --- SQL operation complete.
 >>invoke hbase."_ROW_".t022hbt2;
 
 -- Definition of Trafodion table HBASE."_ROW_".T022HBT2
--- Definition current  Mon Jul 27 15:00:54 2015
+-- Definition current  Thu Feb 25 09:47:53 2016
 
   (
     ROW_ID                           VARCHAR(100) CHARACTER SET ISO88591
@@ -452,6 +453,7 @@ ROW_ID      (EXPR)
   , COLUMN_DETAILS                   VARCHAR(10000) CHARACTER SET ISO88591
       COLLATE DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (ROW_ID ASC)
 
 --- SQL operation complete.
 >>cqd hbase_max_column_val_length '100000';
@@ -463,7 +465,7 @@ ROW_ID      (EXPR)
 >>invoke hbase."_CELL_".t022hbt2;
 
 -- Definition of Trafodion table HBASE."_CELL_".T022HBT2
--- Definition current  Mon Jul 27 15:00:54 2015
+-- Definition current  Thu Feb 25 09:47:53 2016
 
   (
     ROW_ID                           VARCHAR(100) CHARACTER SET ISO88591
@@ -476,12 +478,13 @@ ROW_ID      (EXPR)
   , COL_VALUE                        VARCHAR(100000) CHARACTER SET ISO88591
       COLLATE DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (ROW_ID ASC)
 
 --- SQL operation complete.
 >>invoke hbase."_ROW_".t022hbt2;
 
 -- Definition of Trafodion table HBASE."_ROW_".T022HBT2
--- Definition current  Mon Jul 27 15:00:54 2015
+-- Definition current  Thu Feb 25 09:47:53 2016
 
   (
     ROW_ID                           VARCHAR(100) CHARACTER SET ISO88591
@@ -489,6 +492,7 @@ ROW_ID      (EXPR)
   , COLUMN_DETAILS                   VARCHAR(100000) CHARACTER SET ISO88591
       COLLATE DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (ROW_ID ASC)
 
 --- SQL operation complete.
 >>insert into hbase."_CELL_".t022hbt2 values ('1', 'cf', 'a', -1, repeat('a', 100000));

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/regress/seabase/EXPECTED025
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/EXPECTED025 b/core/sql/regress/seabase/EXPECTED025
index 5834ac7..522f424 100644
--- a/core/sql/regress/seabase/EXPECTED025
+++ b/core/sql/regress/seabase/EXPECTED025
@@ -1884,7 +1884,7 @@ CREATE TABLE TRAFODION.S025.T025T004
 >>insert into T025T003 values  	
 +>(DEFAULT,-3,0,1,'dasf',2.1,'dfaf','dfa','dfa','d');
 
-*** ERROR[8101] The operation is prevented by check constraint TRAFODION.S025.T025T003_953976361_2228 on table TRAFODION.S025.T025T003.
+*** ERROR[8101] The operation is prevented by check constraint TRAFODION.S025.T025T003_527751321_8674 on table TRAFODION.S025.T025T003.
 
 --- 0 row(s) inserted.
 >>
@@ -1894,7 +1894,7 @@ CREATE TABLE TRAFODION.S025.T025T004
 +>(DEFAULT,-2,1,1,'dasf',2.1,'dfaf','dfa','dfa','d'),	
 +>(DEFAULT,-1,2,1,'dasf',2.1,'dfaf','dfa','dfa','d');
 
-*** ERROR[8101] The operation is prevented by check constraint TRAFODION.S025.T025T003_953976361_2228 on table TRAFODION.S025.T025T003.
+*** ERROR[8101] The operation is prevented by check constraint TRAFODION.S025.T025T003_527751321_8674 on table TRAFODION.S025.T025T003.
 
 --- 0 row(s) inserted.
 >>
@@ -2603,7 +2603,7 @@ CREATE VOLATILE TABLE T025T00V2
 >>invoke T025T00V2;
 
 -- Definition of Trafodion volatile table T025T00V2
--- Definition current  Sun May 31 00:47:11 2015
+-- Definition current  Thu Feb 25 09:56:14 2016
 
   (
     SURROGATE_KEY                    SMALLINT UNSIGNED GENERATED BY DEFAULT AS
@@ -2612,6 +2612,7 @@ CREATE VOLATILE TABLE T025T00V2
       DROPPABLE
   , C                                INT UNSIGNED DEFAULT NULL
   )
+  PRIMARY KEY (SURROGATE_KEY ASC)
 
 --- SQL operation complete.
 >>


[2/9] incubator-trafodion git commit: JIRA 1849 Add support for alter column rename (details below)

Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/regress/seabase/EXPECTED027
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/EXPECTED027 b/core/sql/regress/seabase/EXPECTED027
index 8c48546..13b0f13 100644
--- a/core/sql/regress/seabase/EXPECTED027
+++ b/core/sql/regress/seabase/EXPECTED027
@@ -12,11 +12,12 @@
 >>invoke t027t01;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T01
--- Definition current  Fri Feb 26 20:36:16 2016
+-- Definition current  Sat Mar 12 02:58:49 2016
 
   (
     A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (A ASC)
 
 --- SQL operation complete.
 >>showddl t027t01;
@@ -39,11 +40,12 @@ CREATE TABLE TRAFODION.SCH027.T027T01
 >>invoke t027t01;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T01
--- Definition current  Fri Feb 26 20:36:25 2016
+-- Definition current  Sat Mar 12 02:58:59 2016
 
   (
     "cf".A                           INT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (A ASC)
 
 --- SQL operation complete.
 >>showddl t027t01;
@@ -67,12 +69,13 @@ CREATE TABLE TRAFODION.SCH027.T027T01
 >>invoke t027t01;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T01
--- Definition current  Fri Feb 26 20:36:30 2016
+-- Definition current  Sat Mar 12 02:59:05 2016
 
   (
     "cf".A                           INT NO DEFAULT NOT NULL NOT DROPPABLE
   , "cf2".B                          INT DEFAULT NULL
   )
+  PRIMARY KEY (A ASC)
 
 --- SQL operation complete.
 >>showddl t027t01;
@@ -98,13 +101,14 @@ CREATE TABLE TRAFODION.SCH027.T027T01
 >>invoke t027t01;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T01
--- Definition current  Fri Feb 26 20:36:39 2016
+-- Definition current  Sat Mar 12 02:59:14 2016
 
   (
     "cf".A                           INT NO DEFAULT NOT NULL NOT DROPPABLE
   , "cf2".B                          INT DEFAULT NULL
   , CF3.C                            INT DEFAULT NULL
   )
+  PRIMARY KEY (A ASC)
 
 --- SQL operation complete.
 >>showddl t027t01;
@@ -127,13 +131,14 @@ CREATE TABLE TRAFODION.SCH027.T027T01
 >>invoke t027t01;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T01
--- Definition current  Fri Feb 26 20:36:40 2016
+-- Definition current  Sat Mar 12 02:59:16 2016
 
   (
     "cf".A                           INT NO DEFAULT NOT NULL NOT DROPPABLE
   , "cf2".B                          INT DEFAULT NULL
   , CF3.C                            INT DEFAULT NULL
   )
+  PRIMARY KEY (A ASC)
 
 --- SQL operation complete.
 >>showddl t027t01;
@@ -191,7 +196,7 @@ A            B            C
 >>invoke t027t01;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T01
--- Definition current  Fri Feb 26 20:36:46 2016
+-- Definition current  Sat Mar 12 02:59:22 2016
 
   (
     "cf".A                           INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -199,6 +204,7 @@ A            B            C
   , CF3.C                            INT DEFAULT NULL
   , "cf2".D                          INT DEFAULT NULL /*added_col*/
   )
+  PRIMARY KEY (A ASC)
 
 --- SQL operation complete.
 >>showddl t027t01;
@@ -228,7 +234,7 @@ CREATE INDEX T027T01I1 ON TRAFODION.SCH027.T027T01
 >>invoke t027t01;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T01
--- Definition current  Fri Feb 26 20:36:49 2016
+-- Definition current  Sat Mar 12 02:59:26 2016
 
   (
     "cf".A                           INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -237,6 +243,7 @@ CREATE INDEX T027T01I1 ON TRAFODION.SCH027.T027T01
   , "cf2".D                          INT DEFAULT NULL /*added_col*/
   , "cf4".E                          INT DEFAULT NULL /*added_col*/
   )
+  PRIMARY KEY (A ASC)
 
 --- SQL operation complete.
 >>showddl t027t01;
@@ -267,7 +274,7 @@ CREATE INDEX T027T01I1 ON TRAFODION.SCH027.T027T01
 >>invoke t027t01;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T01
--- Definition current  Fri Feb 26 20:36:54 2016
+-- Definition current  Sat Mar 12 02:59:31 2016
 
   (
     "cf".A                           INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -275,6 +282,7 @@ CREATE INDEX T027T01I1 ON TRAFODION.SCH027.T027T01
   , CF3.C                            INT DEFAULT NULL
   , "cf4".E                          INT DEFAULT NULL /*added_col*/
   )
+  PRIMARY KEY (A ASC)
 
 --- SQL operation complete.
 >>showddl t027t01;
@@ -304,7 +312,7 @@ CREATE INDEX T027T01I1 ON TRAFODION.SCH027.T027T01
 >>invoke t027t01;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T01
--- Definition current  Fri Feb 26 20:36:55 2016
+-- Definition current  Sat Mar 12 02:59:32 2016
 
   (
     "cf".A                           INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -313,6 +321,7 @@ CREATE INDEX T027T01I1 ON TRAFODION.SCH027.T027T01
   , "cf4".E                          INT DEFAULT NULL /*added_col*/
   , "cf2".D                          INT DEFAULT NULL /*added_col*/
   )
+  PRIMARY KEY (A ASC)
 
 --- SQL operation complete.
 >>showddl t027t01;
@@ -343,7 +352,7 @@ CREATE INDEX T027T01I1 ON TRAFODION.SCH027.T027T01
 >>invoke t027t011;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T011
--- Definition current  Fri Feb 26 20:37:02 2016
+-- Definition current  Sat Mar 12 02:59:40 2016
 
   (
     "cf".A                           INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -352,6 +361,7 @@ CREATE INDEX T027T01I1 ON TRAFODION.SCH027.T027T01
   , "cf4".E                          INT DEFAULT NULL
   , "cf2".D                          INT DEFAULT NULL
   )
+  PRIMARY KEY (A ASC)
 
 --- SQL operation complete.
 >>showddl t027t011;
@@ -387,7 +397,7 @@ A            B            C            E            D
 >>invoke t027t011;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T011
--- Definition current  Fri Feb 26 20:37:06 2016
+-- Definition current  Sat Mar 12 02:59:43 2016
 
   (
     "cf".A                           INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -396,6 +406,7 @@ A            B            C            E            D
   , "cf4".E                          INT DEFAULT NULL
   , "cf2".D                          INT DEFAULT NULL
   )
+  PRIMARY KEY (A ASC)
 
 --- SQL operation complete.
 >>showddl t027t011;
@@ -426,10 +437,11 @@ CREATE TABLE TRAFODION.SCH027.T027T011
 >>invoke t027t011;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T011
--- Definition current  Fri Feb 26 20:37:15 2016
+-- Definition current  Sat Mar 12 02:59:53 2016
 
   (
-    A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   , B                                INT DEFAULT NULL
   , C                                INT DEFAULT NULL
   , E                                INT DEFAULT NULL
@@ -460,10 +472,11 @@ CREATE TABLE TRAFODION.SCH027.T027T011
 >>invoke t027t011;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T011
--- Definition current  Fri Feb 26 20:37:19 2016
+-- Definition current  Sat Mar 12 02:59:57 2016
 
   (
-    "cf".A                           INT NO DEFAULT NOT NULL NOT DROPPABLE
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , "cf".A                           INT NO DEFAULT NOT NULL NOT DROPPABLE
   , "cf2".B                          INT DEFAULT NULL
   , CF3.C                            INT DEFAULT NULL
   , "cf4".E                          INT DEFAULT NULL
@@ -491,13 +504,14 @@ CREATE TABLE TRAFODION.SCH027.T027T011
 >>invoke t027t03;
 
 -- Definition of Trafodion volatile table T027T03
--- Definition current  Fri Feb 26 20:37:25 2016
+-- Definition current  Sat Mar 12 03:00:03 2016
 
   (
     "cf1".A                          INT NO DEFAULT NOT NULL NOT DROPPABLE
   , "cf2".B                          INT DEFAULT NULL
   , C                                INT DEFAULT NULL
   )
+  PRIMARY KEY (A ASC)
 
 --- SQL operation complete.
 >>showddl t027t03;
@@ -522,13 +536,14 @@ CREATE VOLATILE TABLE T027T03
 >>invoke t027t03;
 
 -- Definition of Trafodion volatile table T027T03
--- Definition current  Fri Feb 26 20:37:45 2016
+-- Definition current  Sat Mar 12 03:00:24 2016
 
   (
     "cf1".A                          INT NO DEFAULT NOT NULL NOT DROPPABLE
   , "cf2".B                          INT DEFAULT NULL
   , "cf".C                           INT DEFAULT NULL
   )
+  PRIMARY KEY (A ASC)
 
 --- SQL operation complete.
 >>showddl t027t03;
@@ -570,10 +585,11 @@ CREATE VOLATILE TABLE T027T03
 >>invoke t027t02;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T02
--- Definition current  Fri Feb 26 20:38:04 2016
+-- Definition current  Sat Mar 12 03:00:45 2016
 
   (
-    "cf".A0A0                        INT DEFAULT NULL
+    "cf".SYSKEY                      LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , "cf".A0A0                        INT DEFAULT NULL
   , "cf".A1A1                        INT DEFAULT NULL
   , "cf".A2A2                        INT DEFAULT NULL
   , "cf".A3A3                        INT DEFAULT NULL
@@ -621,7 +637,7 @@ CREATE VOLATILE TABLE T027T03
 >>invoke t027t03;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T03
--- Definition current  Fri Feb 26 20:38:26 2016
+-- Definition current  Sat Mar 12 03:01:07 2016
 
   (
     "cf1".A                          INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -629,6 +645,7 @@ CREATE VOLATILE TABLE T027T03
   , C                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   , D                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (A ASC, B ASC)
 
 --- SQL operation complete.
 >>insert into t027t03 values (1,1,1,1);
@@ -657,7 +674,7 @@ A            B            C            D
 >>invoke t027t02;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T02
--- Definition current  Fri Feb 26 20:38:40 2016
+-- Definition current  Sat Mar 12 03:01:20 2016
 
   (
     OBJECT_UID                       LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -669,6 +686,7 @@ A            B            C            D
   , NONKEYCOL                        INT NO DEFAULT NOT NULL NOT DROPPABLE
   , FLAGS                            LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (OBJECT_UID ASC, KEYSEQ_NUMBER ASC)
 
 --- SQL operation complete.
 >>select * from t027t02;
@@ -769,7 +787,7 @@ create index t027t01i2 on t027t01("cf2".b);
 >>invoke t027t7;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T7
--- Definition current  Fri Feb 26 20:39:06 2016
+-- Definition current  Sat Mar 12 03:01:46 2016
 
   (
     A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -778,7 +796,10 @@ create index t027t01i2 on t027t01("cf2".b);
   , C                                VARCHAR(4 CHARS) CHARACTER SET UTF8
       COLLATE DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   , Z                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+  , "_SALT_"                         INT UNSIGNED NO DEFAULT NOT NULL NOT
+      DROPPABLE
   )
+  PRIMARY KEY ("_SALT_" ASC, Z ASC)
 
 --- SQL operation complete.
 >>insert into t027t7 values (1, 'ab', 'cd', 10);
@@ -798,7 +819,7 @@ A            B   C                 Z
 >>invoke t027t7;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T7
--- Definition current  Fri Feb 26 20:39:13 2016
+-- Definition current  Sat Mar 12 03:01:54 2016
 
   (
     A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -807,7 +828,10 @@ A            B   C                 Z
   , C                                VARCHAR(4 CHARS) CHARACTER SET UTF8
       COLLATE DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   , Z                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+  , "_SALT_"                         INT UNSIGNED NO DEFAULT NOT NULL NOT
+      DROPPABLE
   )
+  PRIMARY KEY ("_SALT_" ASC, Z ASC)
 
 --- SQL operation complete.
 >>alter table t027t7 alter column c varchar(5) character set utf8;
@@ -816,7 +840,7 @@ A            B   C                 Z
 >>invoke t027t7;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T7
--- Definition current  Fri Feb 26 20:39:35 2016
+-- Definition current  Sat Mar 12 03:02:19 2016
 
   (
     A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -825,7 +849,10 @@ A            B   C                 Z
   , C                                VARCHAR(5 CHARS) CHARACTER SET UTF8
       COLLATE DEFAULT DEFAULT NULL /*altered_col*/
   , Z                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+  , "_SALT_"                         INT UNSIGNED NO DEFAULT NOT NULL NOT
+      DROPPABLE
   )
+  PRIMARY KEY ("_SALT_" ASC, Z ASC)
 
 --- SQL operation complete.
 >>alter table t027t7 alter column c varchar(4) character set utf8;
@@ -834,7 +861,7 @@ A            B   C                 Z
 >>invoke t027t7;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T7
--- Definition current  Fri Feb 26 20:39:50 2016
+-- Definition current  Sat Mar 12 03:02:42 2016
 
   (
     A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -843,7 +870,10 @@ A            B   C                 Z
   , C                                VARCHAR(4 CHARS) CHARACTER SET UTF8
       COLLATE DEFAULT DEFAULT NULL /*altered_col*/
   , Z                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+  , "_SALT_"                         INT UNSIGNED NO DEFAULT NOT NULL NOT
+      DROPPABLE
   )
+  PRIMARY KEY ("_SALT_" ASC, Z ASC)
 
 --- SQL operation complete.
 >>
@@ -853,7 +883,7 @@ A            B   C                 Z
 >>invoke t027t7;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T7
--- Definition current  Fri Feb 26 20:40:08 2016
+-- Definition current  Sat Mar 12 03:03:05 2016
 
   (
     A                                LARGEINT DEFAULT NULL /*altered_col*/
@@ -862,7 +892,10 @@ A            B   C                 Z
   , C                                VARCHAR(4 CHARS) CHARACTER SET UTF8
       COLLATE DEFAULT DEFAULT NULL /*altered_col*/
   , Z                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+  , "_SALT_"                         INT UNSIGNED NO DEFAULT NOT NULL NOT
+      DROPPABLE
   )
+  PRIMARY KEY ("_SALT_" ASC, Z ASC)
 
 --- SQL operation complete.
 >>alter table t027t7 alter column b varchar(4) character set utf8;
@@ -871,7 +904,7 @@ A            B   C                 Z
 >>invoke t027t7;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T7
--- Definition current  Fri Feb 26 20:40:26 2016
+-- Definition current  Sat Mar 12 03:03:25 2016
 
   (
     A                                LARGEINT DEFAULT NULL /*altered_col*/
@@ -880,7 +913,10 @@ A            B   C                 Z
   , C                                VARCHAR(4 CHARS) CHARACTER SET UTF8
       COLLATE DEFAULT DEFAULT NULL /*altered_col*/
   , Z                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+  , "_SALT_"                         INT UNSIGNED NO DEFAULT NOT NULL NOT
+      DROPPABLE
   )
+  PRIMARY KEY ("_SALT_" ASC, Z ASC)
 
 --- SQL operation complete.
 >>alter table t027t7 alter column c varchar(6);
@@ -889,7 +925,7 @@ A            B   C                 Z
 >>invoke t027t7;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T7
--- Definition current  Fri Feb 26 20:40:43 2016
+-- Definition current  Sat Mar 12 03:03:42 2016
 
   (
     A                                LARGEINT DEFAULT NULL /*altered_col*/
@@ -898,7 +934,10 @@ A            B   C                 Z
   , C                                VARCHAR(6) CHARACTER SET ISO88591 COLLATE
       DEFAULT DEFAULT NULL /*altered_col*/
   , Z                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+  , "_SALT_"                         INT UNSIGNED NO DEFAULT NOT NULL NOT
+      DROPPABLE
   )
+  PRIMARY KEY ("_SALT_" ASC, Z ASC)
 
 --- SQL operation complete.
 >>alter table t027t7 alter column b varchar(2);
@@ -907,7 +946,7 @@ A            B   C                 Z
 >>invoke t027t7;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T7
--- Definition current  Fri Feb 26 20:40:58 2016
+-- Definition current  Sat Mar 12 03:04:05 2016
 
   (
     A                                LARGEINT DEFAULT NULL /*altered_col*/
@@ -916,7 +955,10 @@ A            B   C                 Z
   , C                                VARCHAR(6) CHARACTER SET ISO88591 COLLATE
       DEFAULT DEFAULT NULL /*altered_col*/
   , Z                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+  , "_SALT_"                         INT UNSIGNED NO DEFAULT NOT NULL NOT
+      DROPPABLE
   )
+  PRIMARY KEY ("_SALT_" ASC, Z ASC)
 
 --- SQL operation complete.
 >>alter table t027t7 alter column a int;
@@ -925,7 +967,7 @@ A            B   C                 Z
 >>invoke t027t7;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T7
--- Definition current  Fri Feb 26 20:41:12 2016
+-- Definition current  Sat Mar 12 03:04:25 2016
 
   (
     A                                INT DEFAULT NULL /*altered_col*/
@@ -934,7 +976,10 @@ A            B   C                 Z
   , C                                VARCHAR(6) CHARACTER SET ISO88591 COLLATE
       DEFAULT DEFAULT NULL /*altered_col*/
   , Z                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+  , "_SALT_"                         INT UNSIGNED NO DEFAULT NOT NULL NOT
+      DROPPABLE
   )
+  PRIMARY KEY ("_SALT_" ASC, Z ASC)
 
 --- SQL operation complete.
 >>alter table t027t7 alter column a smallint default 0 not null;
@@ -943,7 +988,7 @@ A            B   C                 Z
 >>invoke t027t7;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T7
--- Definition current  Fri Feb 26 20:41:30 2016
+-- Definition current  Sat Mar 12 03:04:44 2016
 
   (
     A                                SMALLINT DEFAULT 0 NOT NULL NOT DROPPABLE
@@ -953,7 +998,10 @@ A            B   C                 Z
   , C                                VARCHAR(6) CHARACTER SET ISO88591 COLLATE
       DEFAULT DEFAULT NULL /*altered_col*/
   , Z                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+  , "_SALT_"                         INT UNSIGNED NO DEFAULT NOT NULL NOT
+      DROPPABLE
   )
+  PRIMARY KEY ("_SALT_" ASC, Z ASC)
 
 --- SQL operation complete.
 >>select * from t027t7;
@@ -966,7 +1014,7 @@ A       B   C       Z
 --- 1 row(s) selected.
 >>
 >>-- aligned format
->>drop table if exists t027t7;
+>>drop table if exists t027t7 cascade;
 
 --- SQL operation complete.
 >>create table t027t7(a int not null, b varchar(2), 
@@ -977,7 +1025,7 @@ A       B   C       Z
 >>invoke t027t7;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T7
--- Definition current  Fri Feb 26 20:41:52 2016
+-- Definition current  Sat Mar 12 03:05:07 2016
 
   (
     A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -986,7 +1034,10 @@ A       B   C       Z
   , C                                VARCHAR(4 CHARS) CHARACTER SET UTF8
       COLLATE DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   , Z                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+  , "_SALT_"                         INT UNSIGNED NO DEFAULT NOT NULL NOT
+      DROPPABLE
   )
+  PRIMARY KEY ("_SALT_" ASC, Z ASC)
 
 --- SQL operation complete.
 >>insert into t027t7 values (1, 'ab', 'cd', 10);
@@ -1006,7 +1057,7 @@ A            B   C                 Z
 >>invoke t027t7;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T7
--- Definition current  Fri Feb 26 20:42:09 2016
+-- Definition current  Sat Mar 12 03:05:32 2016
 
   (
     A                                LARGEINT DEFAULT NULL /*altered_col*/
@@ -1015,7 +1066,10 @@ A            B   C                 Z
   , C                                VARCHAR(4 CHARS) CHARACTER SET UTF8
       COLLATE DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   , Z                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+  , "_SALT_"                         INT UNSIGNED NO DEFAULT NOT NULL NOT
+      DROPPABLE
   )
+  PRIMARY KEY ("_SALT_" ASC, Z ASC)
 
 --- SQL operation complete.
 >>select * from t027t7;
@@ -1032,14 +1086,17 @@ A                     B   C                 Z
 >>invoke t027t7;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T7
--- Definition current  Fri Feb 26 20:42:35 2016
+-- Definition current  Sat Mar 12 03:05:57 2016
 
   (
     A                                LARGEINT DEFAULT NULL /*altered_col*/
   , C                                VARCHAR(4 CHARS) CHARACTER SET UTF8
       COLLATE DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   , Z                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+  , "_SALT_"                         INT UNSIGNED NO DEFAULT NOT NULL NOT
+      DROPPABLE
   )
+  PRIMARY KEY ("_SALT_" ASC, Z ASC)
 
 --- SQL operation complete.
 >>select * from t027t7;
@@ -1056,16 +1113,19 @@ A                     C                 Z
 >>invoke t027t7;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T7
--- Definition current  Fri Feb 26 20:42:38 2016
+-- Definition current  Sat Mar 12 03:06:00 2016
 
   (
     A                                LARGEINT DEFAULT NULL /*altered_col*/
   , C                                VARCHAR(4 CHARS) CHARACTER SET UTF8
       COLLATE DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   , Z                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+  , "_SALT_"                         INT UNSIGNED NO DEFAULT NOT NULL NOT
+      DROPPABLE
   , B                                CHAR(10) CHARACTER SET ISO88591 COLLATE
       DEFAULT DEFAULT _ISO88591'abc' NOT NULL NOT DROPPABLE /*added_col*/
   )
+  PRIMARY KEY ("_SALT_" ASC, Z ASC)
 
 --- SQL operation complete.
 >>select * from t027t7;
@@ -1082,14 +1142,17 @@ A                     C                 Z            B
 >>invoke t027t7;
 
 -- Definition of Trafodion table TRAFODION.SCH027.T027T7
--- Definition current  Fri Feb 26 20:43:02 2016
+-- Definition current  Sat Mar 12 03:06:25 2016
 
   (
     A                                LARGEINT DEFAULT NULL /*altered_col*/
   , C                                VARCHAR(4 CHARS) CHARACTER SET UTF8
       COLLATE DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   , Z                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+  , "_SALT_"                         INT UNSIGNED NO DEFAULT NOT NULL NOT
+      DROPPABLE
   )
+  PRIMARY KEY ("_SALT_" ASC, Z ASC)
 
 --- SQL operation complete.
 >>select * from t027t7;
@@ -1100,6 +1163,46 @@ A                     C                 Z
                    1  cd                         10
 
 --- 1 row(s) selected.
+>>create view t027v1 as select * from t027t7;
+
+--- SQL operation complete.
+>>get all views on table t027t7;
+
+Views on Table SCH027.T027T7
+============================
+
+SCH027.T027V1
+
+--- SQL operation complete.
+>>invoke t027v1;
+
+-- Definition of Trafodion view TRAFODION.SCH027.T027V1
+-- Definition current  Sat Mar 12 03:06:33 2016
+
+  (
+    A                                LARGEINT DEFAULT NULL
+  , C                                VARCHAR(4 CHARS) CHARACTER SET UTF8
+      COLLATE DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
+  , Z                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+  )
+
+--- SQL operation complete.
+>>alter table t027t7 alter column a smallint;
+
+--- SQL operation complete.
+>>invoke t027v1;
+
+-- Definition of Trafodion view TRAFODION.SCH027.T027V1
+-- Definition current  Sat Mar 12 03:07:06 2016
+
+  (
+    A                                SMALLINT DEFAULT NULL
+  , C                                VARCHAR(4 CHARS) CHARACTER SET UTF8
+      COLLATE DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
+  , Z                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+  )
+
+--- SQL operation complete.
 >>
 >>-- negative tests for alter/drop column
 >>alter table t027t7 alter column b int;
@@ -1116,8 +1219,6 @@ A                     C                 Z
 
 *** ERROR[8402] A string overflow occurred during the evaluation of a character expression. Conversion of Source Type:VARCHAR(REC_BYTE_V_ASCII,2 BYTES,ISO88591) Source Value:cd to Target Type:CHAR(REC_BYTE_F_ASCII,1 BYTES,ISO88591).
 
-*** ERROR[8839] Transaction was aborted.
-
 *** ERROR[1404] Column C cannot be altered. Reason: Old data could not be updated using the altered column definition.
 
 --- SQL operation failed with errors.
@@ -1126,9 +1227,263 @@ A                     C                 Z
 *** ERROR[1009] Column E does not exist in the specified table.
 
 --- SQL operation failed with errors.
+>>alter table t027t7 drop column a;
+
+*** ERROR[4003] Column TRAFODION.SCH027.T027T7.A is not a column in table TRAFODION.SCH027.T027T7, or, after a NATURAL JOIN or JOIN USING, is no longer allowed to be specified with a table correlation name.
+
+*** ERROR[1404] Column A cannot be altered. Reason: Error occured while recreating views due to dependency on older column definition. Drop dependent views before doing the alter.
+
+--- SQL operation failed with errors.
+>>alter table t027v1 alter column a smallint;
+
+*** ERROR[1146] Object TRAFODION.SCH027.T027V1 could not be altered because it either does not exist or is not a table.
+
+--- SQL operation failed with errors.
+>>get all views on table t027t7;
+
+Views on Table SCH027.T027T7
+============================
+
+SCH027.T027V1
+
+--- SQL operation complete.
+>>
+>>-- tests for alter column rename
+>>drop table if exists t027t7 cascade;
+
+--- SQL operation complete.
+>>create table t027t7(a int not null, b varchar(2), 
++>   c varchar(4) character set utf8 not null, z int not null primary key)
++>salt using 2 partitions;
+
+--- SQL operation complete.
+>>create index t027t7i1 on t027t7(b);
+
+--- SQL operation complete.
+>>insert into t027t7 values (1, 'ab', 'cd', 10);
+
+--- 1 row(s) inserted.
+>>invoke t027t7;
+
+-- Definition of Trafodion table TRAFODION.SCH027.T027T7
+-- Definition current  Sat Mar 12 03:09:01 2016
+
+  (
+    A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+  , B                                VARCHAR(2) CHARACTER SET ISO88591 COLLATE
+      DEFAULT DEFAULT NULL
+  , C                                VARCHAR(4 CHARS) CHARACTER SET UTF8
+      COLLATE DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
+  , Z                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+  , "_SALT_"                         INT UNSIGNED NO DEFAULT NOT NULL NOT
+      DROPPABLE
+  )
+  PRIMARY KEY ("_SALT_" ASC, Z ASC)
+
+--- SQL operation complete.
+>>select * from t027t7;
+
+A            B   C                 Z          
+-----------  --  ----------------  -----------
+
+          1  ab  cd                         10
+
+--- 1 row(s) selected.
+>>alter table t027t7 alter column b rename to bb;
+
+--- SQL operation complete.
+>>invoke t027t7;
+
+-- Definition of Trafodion table TRAFODION.SCH027.T027T7
+-- Definition current  Sat Mar 12 03:09:12 2016
+
+  (
+    A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+  , BB                               VARCHAR(2) CHARACTER SET ISO88591 COLLATE
+      DEFAULT DEFAULT NULL /*altered_col*/
+  , C                                VARCHAR(4 CHARS) CHARACTER SET UTF8
+      COLLATE DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
+  , Z                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+  , "_SALT_"                         INT UNSIGNED NO DEFAULT NOT NULL NOT
+      DROPPABLE
+  )
+  PRIMARY KEY ("_SALT_" ASC, Z ASC)
+
+--- SQL operation complete.
+>>select * from t027t7;
+
+A            BB  C                 Z          
+-----------  --  ----------------  -----------
+
+          1  ab  cd                         10
+
+--- 1 row(s) selected.
+>>alter table t027t7 alter column z rename to zz;
+
+--- SQL operation complete.
+>>invoke t027t7;
+
+-- Definition of Trafodion table TRAFODION.SCH027.T027T7
+-- Definition current  Sat Mar 12 03:09:24 2016
+
+  (
+    A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+  , BB                               VARCHAR(2) CHARACTER SET ISO88591 COLLATE
+      DEFAULT DEFAULT NULL /*altered_col*/
+  , C                                VARCHAR(4 CHARS) CHARACTER SET UTF8
+      COLLATE DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
+  , ZZ                               INT NO DEFAULT NOT NULL NOT DROPPABLE
+      /*altered_col*/
+  , "_SALT_"                         INT UNSIGNED NO DEFAULT NOT NULL NOT
+      DROPPABLE
+  )
+  PRIMARY KEY ("_SALT_" ASC, ZZ ASC)
+
+--- SQL operation complete.
+>>select * from t027t7;
+
+A            BB  C                 ZZ         
+-----------  --  ----------------  -----------
+
+          1  ab  cd                         10
+
+--- 1 row(s) selected.
+>>create view t027v1(zz) as select zz from t027t7;
+
+--- SQL operation complete.
+>>alter table t027t7 alter column c rename to cc;
+
+--- SQL operation complete.
+>>create view t027v2(zz) as select zz from t027t7 where cc = 'a';
+
+--- SQL operation complete.
+>>showddl t027v2;
+
+CREATE VIEW TRAFODION.SCH027.T027V2 (ZZ) AS
+  SELECT TRAFODION.SCH027.T027T7.ZZ FROM TRAFODION.SCH027.T027T7 WHERE
+    TRAFODION.SCH027.T027T7.CC = 'a' ;
+
+--- SQL operation complete.
+>>
+>>-- negative tests for alter column rename
+>>alter table t027t7 alter column zz rename to a;
+
+*** ERROR[1404] Column ZZ cannot be altered. Reason: Renamed column A already exist in the table.
+
+--- SQL operation failed with errors.
+>>alter table t027t7 alter column "_SALT_" rename to nosalt;
+
+*** ERROR[1404] Column _SALT_ cannot be altered. Reason: Cannot rename system or computed column.
+
+--- SQL operation failed with errors.
+>>alter table t027t7 alter column cc rename to "_SALT_";
+
+*** ERROR[1404] Column CC cannot be altered. Reason: Renamed column _SALT_ already exist in the table.
+
+--- SQL operation failed with errors.
+>>alter table t027t7 alter column zz rename to zzz;
+
+*** ERROR[4003] Column TRAFODION.SCH027.T027T7.ZZ is not a column in table TRAFODION.SCH027.T027T7, or, after a NATURAL JOIN or JOIN USING, is no longer allowed to be specified with a table correlation name.
+
+*** ERROR[1404] Column ZZ cannot be altered. Reason: Error occured while recreating views due to dependency on older column definition. Drop dependent views before doing the alter.
+
+--- SQL operation failed with errors.
+>>alter table t027t7 alter column cc rename to ccc;
+
+*** ERROR[4003] Column TRAFODION.SCH027.T027T7.CC is not a column in table TRAFODION.SCH027.T027T7, or, after a NATURAL JOIN or JOIN USING, is no longer allowed to be specified with a table correlation name.
+
+*** ERROR[1404] Column CC cannot be altered. Reason: Error occured while recreating views due to dependency on older column definition. Drop dependent views before doing the alter.
+
+--- SQL operation failed with errors.
+>>
+>>-- alter col with views
+>>drop table if exists t027t7 cascade;
+
+--- SQL operation complete.
+>>create table t027t7 (a varchar(10), b int);
+
+--- SQL operation complete.
+>>create view t027v1 as select * from t027t7;
+
+--- SQL operation complete.
+>>create view t027v12 as select * from t027v1;
+
+--- SQL operation complete.
+>>create view t027v11 as select * from t027t7;
+
+--- SQL operation complete.
+>>create view t027v122 as select * from t027v12;
+
+--- SQL operation complete.
+>>create view t027v113 as select * from t027v11;
+
+--- SQL operation complete.
+>>get all views on table t027t7;
+
+Views on Table SCH027.T027T7
+============================
+
+SCH027.T027V1
+SCH027.T027V11
+SCH027.T027V113
+SCH027.T027V12
+SCH027.T027V122
+
+--- SQL operation complete.
+>>alter table t027t7 alter column a varchar(20);
+
+--- SQL operation complete.
+>>get all views on table t027t7;
+
+Views on Table SCH027.T027T7
+============================
+
+SCH027.T027V1
+SCH027.T027V11
+SCH027.T027V113
+SCH027.T027V12
+SCH027.T027V122
+
+--- SQL operation complete.
+>>
+>>-- some alter operations cannot be performed within a user xn
+>>cqd ddl_transactions 'ON';
+
+--- SQL operation complete.
+>>begin work;
+
+--- SQL operation complete.
+>>alter table t027t7 drop column b;
+
+*** ERROR[20123] A user-defined transaction has been started. ALTER cannot be performed.
+
+*** ERROR[8839] Transaction was aborted.
+
+--- SQL operation failed with errors.
+>>rollback work;
+
+*** ERROR[8609] Waited rollback performed without starting a transaction.
+
+--- SQL operation failed with errors.
+>>begin work;
+
+--- SQL operation complete.
+>>alter table t027t7 alter column b largeint;
+
+*** ERROR[20123] A user-defined transaction has been started. ALTER cannot be performed.
+
+*** ERROR[8839] Transaction was aborted.
+
+--- SQL operation failed with errors.
+>>rollback work;
+
+*** ERROR[8609] Waited rollback performed without starting a transaction.
+
+--- SQL operation failed with errors.
 >>
 >>-- cleanup
->>drop table if exists t027t7;
+>>?section clean_up
+>>drop table if exists t027t7 cascade;
 
 --- SQL operation complete.
 >>drop table if exists t027t01;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/regress/seabase/TEST020
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/TEST020 b/core/sql/regress/seabase/TEST020
index 64afa3c..65f1231 100755
--- a/core/sql/regress/seabase/TEST020
+++ b/core/sql/regress/seabase/TEST020
@@ -151,6 +151,7 @@ alter table test020t5 add constraint test020t5c1 check (syskey >= 'aaaa');
 showddl test020t5;
 -- Expecting an error message when the following insert statement is executed.
 insert into test020t5 values (3, '1234');
+
 --------------------------------------------
 -- test cases for solution 10-040607-6721 --
 --------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/regress/seabase/TEST027
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/TEST027 b/core/sql/regress/seabase/TEST027
index d828640..8ef95f0 100644
--- a/core/sql/regress/seabase/TEST027
+++ b/core/sql/regress/seabase/TEST027
@@ -25,10 +25,7 @@
 create schema trafodion.sch027;
 set schema trafodion.sch027;
 
-drop table if exists t027t01;
-drop table if exists t027t011;
-drop table t027t02;
-drop table t027t03;
+obey TEST027(clean_up);
 
 log LOG027 clear;
 
@@ -210,7 +207,7 @@ invoke t027t7;
 select * from t027t7;
 
 -- aligned format
-drop table if exists t027t7;
+drop table if exists t027t7 cascade;
 create table t027t7(a int not null, b varchar(2), 
    c varchar(4) character set utf8 not null, z int not null primary key)
 salt using 2 partitions attribute aligned format;
@@ -229,15 +226,72 @@ select * from t027t7;
 alter table t027t7 drop column b;
 invoke t027t7;
 select * from t027t7;
+create view t027v1 as select * from t027t7;
+get all views on table t027t7;
+invoke t027v1;
+alter table t027t7 alter column a smallint;
+invoke t027v1;
 
 -- negative tests for alter/drop column
 alter table t027t7 alter column b int;
 alter table t027t7 alter column a char(10);
 alter table t027t7 alter column c char(1);
 alter table t027t7 drop column e;
+alter table t027t7 drop column a;
+alter table t027v1 alter column a smallint;
+get all views on table t027t7;
+
+-- tests for alter column rename
+drop table if exists t027t7 cascade;
+create table t027t7(a int not null, b varchar(2), 
+   c varchar(4) character set utf8 not null, z int not null primary key)
+salt using 2 partitions;
+create index t027t7i1 on t027t7(b);
+insert into t027t7 values (1, 'ab', 'cd', 10);
+invoke t027t7;
+select * from t027t7;
+alter table t027t7 alter column b rename to bb;
+invoke t027t7;
+select * from t027t7;
+alter table t027t7 alter column z rename to zz;
+invoke t027t7;
+select * from t027t7;
+create view t027v1(zz) as select zz from t027t7;
+alter table t027t7 alter column c rename to cc;
+create view t027v2(zz) as select zz from t027t7 where cc = 'a';
+showddl t027v2;
+
+-- negative tests for alter column rename
+alter table t027t7 alter column zz rename to a;
+alter table t027t7 alter column "_SALT_" rename to nosalt;
+alter table t027t7 alter column cc rename to "_SALT_";
+alter table t027t7 alter column zz rename to zzz;
+alter table t027t7 alter column cc rename to ccc;
+
+-- alter col with views
+drop table if exists t027t7 cascade;
+create table t027t7 (a varchar(10), b int);
+create view t027v1 as select * from t027t7;
+create view t027v12 as select * from t027v1;
+create view t027v11 as select * from t027t7;
+create view t027v122 as select * from t027v12;
+create view t027v113 as select * from t027v11;
+get all views on table t027t7;
+alter table t027t7 alter column a varchar(20);
+get all views on table t027t7;
+
+-- some alter operations cannot be performed within a user xn
+cqd ddl_transactions 'ON';
+begin work;
+alter table t027t7 drop column b;
+rollback work;
+begin work;
+alter table t027t7 alter column b largeint;
+rollback work;
 
 -- cleanup
-drop table if exists t027t7;
+?section clean_up
+drop table if exists t027t7 cascade;
 drop table if exists t027t01;
 drop table if exists t027t02;
 drop table if exists t027t011;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/sqlcat/desc.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlcat/desc.h b/core/sql/sqlcat/desc.h
index c4f61dc..1391843 100644
--- a/core/sql/sqlcat/desc.h
+++ b/core/sql/sqlcat/desc.h
@@ -171,6 +171,7 @@ struct indexes_desc_struct {
   char *indexname;  // physical name of index. Different from ext_indexname
                     // for ARK tables.
   ULng32 redeftime[2];
+  Int64 indexUID;
   Int32 issystemtablecode;	// ...but too much bother in ReadTableDef.C
   // Indicates whether it is a vertical partition or an index
   ComPartitioningScheme partitioningScheme;     // round robin, range, etc.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/sqlcomp/CmpDescribe.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpDescribe.cpp b/core/sql/sqlcomp/CmpDescribe.cpp
index 1b0b290..2ba9652 100644
--- a/core/sql/sqlcomp/CmpDescribe.cpp
+++ b/core/sql/sqlcomp/CmpDescribe.cpp
@@ -446,29 +446,6 @@ static size_t indexLastNewline(const NAString & text,
   return newlinePos;
 }
 
-NAString &replaceAll(NAString &source, NAString &searchFor,
-                     NAString &replaceWith)
-{
-  size_t indexOfReplace = NA_NPOS;
-  indexOfReplace = source.index(searchFor);
-  if (indexOfReplace != NA_NPOS)
-    {
-      // Replace all occurences of searchFor with replaceWith. When no
-      // more occurences are found or end of string is reached, index()
-      // will return NA_NPOS.
-      while (indexOfReplace != NA_NPOS)
-        {
-          source.replace(indexOfReplace, searchFor.length(), 
-                         replaceWith);
-          // Find index of next occurence to replace.
-          indexOfReplace = 
-            source.index(searchFor, indexOfReplace + replaceWith.length()); 
-        }
-    }
-
-  return source;
-}
-
 static Int32 displayDefaultValue(const char * defVal, const char * colName,
                                  NAString &displayableDefVal)
 {
@@ -2691,7 +2668,7 @@ short CmpDescribeSeabaseTable (
  
   // display syscols for invoke if not running regrs
   //
-  NABoolean displaySystemCols = ((!sqlmxRegr) && (type == 1));
+  NABoolean displaySystemCols = (type == 1);
 
   NABoolean isView = (naTable->getViewText() ? TRUE : FALSE);
 
@@ -2893,8 +2870,7 @@ short CmpDescribeSeabaseTable (
     {
       if ((naTable->getClusteringIndex()) &&
           (nonSystemKeyCols > 0) &&
-          (NOT isStoreBy) &&
-          (((type == 1) && (! sqlmxRegr)) || (type != 1)))
+          (NOT isStoreBy))
         {
           numBTpkeys = naf->getIndexKeyColumns().entries();
           
@@ -3029,7 +3005,7 @@ short CmpDescribeSeabaseTable (
         }
 
       NABoolean attributesSet = FALSE;
-      if (((NOT sqlmxRegr) && ((NOT isAudited) || (isAligned))) ||
+      if ((((NOT isAudited) || (isAligned))) ||
           ((sqlmxRegr) && (type == 3) && ((NOT isAudited) || (isAligned))) ||
           ((NOT naTable->defaultColFam().isNull()) && 
            (naTable->defaultColFam() != SEABASE_DEFAULT_COL_FAMILY)))

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/sqlcomp/CmpDescribe.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpDescribe.h b/core/sql/sqlcomp/CmpDescribe.h
index c5759b3..7a9004f 100644
--- a/core/sql/sqlcomp/CmpDescribe.h
+++ b/core/sql/sqlcomp/CmpDescribe.h
@@ -58,6 +58,4 @@ void sendParserFlag (ULng32 flag);
 
 short setParentQidAtSession(NAHeap *heap, const char *parentQid);
 
-NAString &replaceAll(NAString &source, NAString &searchFor, NAString &replaceWith);
-
 #endif

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/sqlcomp/CmpSeabaseDDL.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDL.h b/core/sql/sqlcomp/CmpSeabaseDDL.h
index 243c95e..ec5e89b 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDL.h
+++ b/core/sql/sqlcomp/CmpSeabaseDDL.h
@@ -622,6 +622,12 @@ class CmpSeabaseDDL
                       Int64 objectUID,
                       Queue * &usingViewsQueue);
   
+  short getAllUsingViews(ExeCliInterface *cliInterface,
+                         NAString &catName,
+                         NAString &schName,
+                         NAString &objName,
+                         Queue * &usingViewsQueue);
+
   void handleDDLCreateAuthorizationError(
      int32_t SQLErrorCode,
      const NAString & catalogName, 
@@ -726,7 +732,8 @@ class CmpSeabaseDDL
                         Int64 objUID, 
                         ComTextType textType, 
                         Lng32 subID, 
-                        NAString &text);
+                        NAString &text,
+                        NABoolean withDelete = FALSE); // del before ins
 
   short deleteFromTextTable(ExeCliInterface *cliInterface,
                             Int64 objUID, 
@@ -1006,29 +1013,62 @@ class CmpSeabaseDDL
                            const NATable * naTable,
                            Lng32 dropColNum);
 
-  short alignedFormatTableDropColumn
-  (
+  short alignedFormatTableDropColumn(
        const NAString &catalogNamePart,
        const NAString &schemaNamePart,
        const NAString &objectNamePart,
        const NATable * naTable,
        const NAString &altColName,
        ElemDDLColDef *pColDef,
-       NABoolean ddlXns);
+       NABoolean ddlXns,
+       NAList<NAString> &viewNameList,
+       NAList<NAString> &viewDefnList);
+  
+ short hbaseFormatTableDropColumn(
+      ExpHbaseInterface *ehi,
+      const NAString &catalogNamePart,
+      const NAString &schemaNamePart,
+      const NAString &objectNamePart,
+      const NATable * naTable,
+      const NAString &altColName,
+      const NAColumn * nacol,
+      NABoolean ddlXns,
+      NAList<NAString> &viewNameList,
+      NAList<NAString> &viewDefnList);
   
   void alterSeabaseTableDropColumn(
        StmtDDLAlterTableDropColumn * alterDropColNode,
        NAString &currCatName, NAString &currSchName);
   
-  short recreateViews(ExeCliInterface &cliInterface,
-                      NAList<NAString> &viewNameList,
-                      NAList<NAString> &viewDefnList);
+  short saveAndDropUsingViews(Int64 objUID,
+                              ExeCliInterface *cliInterface,
+                              NAList<NAString> &viewNameList,
+                              NAList<NAString> &viewDefnList);
+  
+  short recreateUsingViews(ExeCliInterface *cliInterface,
+                           NAList<NAString> &viewNameList,
+                           NAList<NAString> &viewDefnList,
+                           NABoolean ddlXns);
 
   void alterSeabaseTableAlterIdentityColumn(
        StmtDDLAlterTableAlterColumnSetSGOption * alterIdentityColNode,
        NAString &currCatName, NAString &currSchName);
   
-  short alignedFormatTableAlterColumn
+  short mdOnlyAlterColumnAttr(
+       const NAString &catalogNamePart, const NAString &schemaNamePart,
+       const NAString &objectNamePart,
+       const NATable * naTable, const NAColumn * naCol, NAType * newType,
+       StmtDDLAlterTableAlterColumnDatatype * alterColNode,
+       NAList<NAString> &viewNameList,
+       NAList<NAString> &viewDefnList);
+  
+  short hbaseFormatTableAlterColumnAttr(
+       const NAString &catalogNamePart, const NAString &schemaNamePart,
+       const NAString &objectNamePart,
+       const NATable * naTable, const NAColumn * naCol, NAType * newType,
+       StmtDDLAlterTableAlterColumnDatatype * alterColNode);
+  
+  short alignedFormatTableAlterColumnAttr
   (
        const NAString &catalogNamePart,
        const NAString &schemaNamePart,
@@ -1036,18 +1076,18 @@ class CmpSeabaseDDL
        const NATable * naTable,
        const NAString &altColName,
        ElemDDLColDef *pColDef,
-       NABoolean ddlXns);
-  
-  short alterColumnAttr(
-       const NAString &catalogNamePart, const NAString &schemaNamePart,
-       const NAString &objectNamePart,
-       const NATable * naTable, const NAColumn * naCol, NAType * newType,
-       StmtDDLAlterTableAlterColumnDatatype * alterColNode);
+       NABoolean ddlXns,
+       NAList<NAString> &viewNameList,
+       NAList<NAString> &viewDefnList);
   
   void alterSeabaseTableAlterColumnDatatype(
        StmtDDLAlterTableAlterColumnDatatype * alterColumnDatatype,
        NAString &currCatName, NAString &currSchName);
   
+  void alterSeabaseTableAlterColumnRename(
+       StmtDDLAlterTableAlterColumnRename * alterColumnDatatype,
+       NAString &currCatName, NAString &currSchName);
+  
   void alterSeabaseTableAddPKeyConstraint(
        StmtDDLAddConstraint * alterAddConstraint,
        NAString &currCatName, NAString &currSchName);

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp b/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
index 781ee1f..0ced283 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
@@ -3919,6 +3919,39 @@ short CmpSeabaseDDL::getUsingViews(ExeCliInterface *cliInterface,
   
   return 0;
 }
+
+// finds all views that directly or indirectly(thru another view) contains
+// the given object.
+// Returns them in ascending order of their create time.
+short CmpSeabaseDDL::getAllUsingViews(ExeCliInterface *cliInterface,
+                                      NAString &catName,
+                                      NAString &schName,
+                                      NAString &objName,
+                                      Queue * &usingViewsQueue)
+{
+  Lng32 retcode = 0;
+  Lng32 cliRC = 0;
+
+  char buf[4000];
+              
+  str_sprintf(buf, "select '\"' || trim(o.catalog_name) || '\"' || '.' || '\"' || trim(o.schema_name) || '\"' || '.' || '\"' || trim(o.object_name) || '\"' "
+    ", o.create_time from %s.\"%s\".%s O, "
+    " (get all views on table \"%s\".\"%s\".\"%s\") x(a) "
+    " where trim(O.schema_name) || '.' || trim(O.object_name) = x.a "
+    " order by 2",
+              getSystemCatalog(), SEABASE_MD_SCHEMA, SEABASE_OBJECTS,
+              catName.data(), schName.data(), objName.data());
+  
+  cliRC = cliInterface->fetchAllRows(usingViewsQueue, buf, 0, FALSE, FALSE, TRUE);
+  if (cliRC < 0)
+    {
+      cliInterface->retrieveSQLDiagnostics(CmpCommon::diags());
+      return cliRC;
+    }
+  
+  return 0;
+}
+
 /* 
 Get the salt column text for a given table or index.
 Returns 0 for object does not have salt column
@@ -5822,9 +5855,24 @@ short CmpSeabaseDDL::updateTextTable(ExeCliInterface *cliInterface,
                                      Int64 objUID, 
                                      ComTextType textType, 
                                      Lng32 subID, 
-                                     NAString &text)
+                                     NAString &text,
+                                     NABoolean withDelete)
 {
   Lng32 cliRC = 0;
+  if (withDelete)
+    {
+      // Note: It might be tempting to try an upsert instead of a
+      // delete followed by an insert, but this won't work. It is
+      // possible that the metadata text could shrink and take fewer
+      // rows in its new form than the old. So we do the simple thing
+      // to avoid such complications.
+       cliRC = deleteFromTextTable(cliInterface, objUID, textType, subID);
+      if (cliRC < 0)
+        {
+          return -1;
+        }
+    }
+
   Lng32 textLen = text.length();
   Lng32 bufLen = (textLen>TEXTLEN ? TEXTLEN : textLen) + 1000;
   char * buf = new(STMTHEAP) char[bufLen];
@@ -8356,7 +8404,6 @@ short CmpSeabaseDDL::executeSeabaseDDL(DDLExpr * ddlExpr, ExprNode * ddlNode,
     }
 
   NABoolean startXn = TRUE;
-
   // no DDL transactions.
   if ((NOT ddlExpr->ddlXns()) &&
       ((ddlExpr->dropHbase()) ||
@@ -8389,6 +8436,7 @@ short CmpSeabaseDDL::executeSeabaseDDL(DDLExpr * ddlExpr, ExprNode * ddlNode,
        (ddlNode->getOperatorType() == DDL_CREATE_TABLE) ||
        (ddlNode->getOperatorType() == DDL_ALTER_TABLE_DROP_COLUMN) ||
        (ddlNode->getOperatorType() == DDL_ALTER_TABLE_ALTER_COLUMN_DATATYPE) ||
+       //       (ddlNode->getOperatorType() == DDL_ALTER_TABLE_ALTER_COLUMN_RENAME) ||
        (ddlNode->getOperatorType() == DDL_DROP_TABLE)))
     {
       // transaction will be started and commited in called methods.
@@ -8424,7 +8472,7 @@ short CmpSeabaseDDL::executeSeabaseDDL(DDLExpr * ddlExpr, ExprNode * ddlNode,
        ddlNode->castToStmtDDLNode()->ddlXns()) &&
       ((ddlNode->getOperatorType() == DDL_CLEANUP_OBJECTS) ||
        (ddlNode->getOperatorType() == DDL_ALTER_TABLE_DROP_COLUMN) ||
-       (ddlNode->getOperatorType() ==  DDL_ALTER_TABLE_ALTER_COLUMN_DATATYPE)))
+       (ddlNode->getOperatorType() == DDL_ALTER_TABLE_ALTER_COLUMN_DATATYPE)))
     {
       // transaction will be started and commited in called methods.
       startXn = FALSE;
@@ -8935,6 +8983,14 @@ short CmpSeabaseDDL::executeSeabaseDDL(DDLExpr * ddlExpr, ExprNode * ddlNode,
            alterSeabaseTableAlterColumnDatatype(alterColNode, 
                                                 currCatName, currSchName);
         }
+       else if (ddlNode->getOperatorType() ==  DDL_ALTER_TABLE_ALTER_COLUMN_RENAME)
+         {
+           StmtDDLAlterTableAlterColumnRename * alterColNode =
+             ddlNode->castToStmtDDLNode()->castToStmtDDLAlterTableAlterColumnRename();
+           
+           alterSeabaseTableAlterColumnRename(alterColNode, 
+                                              currCatName, currSchName);
+        }
        else if (ddlNode->getOperatorType() ==  DDL_CLEANUP_OBJECTS)
          {
            StmtDDLCleanupObjects * co = 
@@ -8961,13 +9017,13 @@ label_return:
       cliRC = -1;
 
       // some ddl stmts are executed as multiple sub statements.
-      // with ddl xns, some of those sub stmts may abort the enclosing
-      // xn in case of an error amd add an error condition that the xn
+      // some of those sub stmts may abort the enclosing xn started here
+      // in case of an error, and add an error condition that the xn
       // was aborted.
       // remove that error condition from the diags area. But dont do it
-      // if it is main error.
-      if (ddlXns && xnWasStartedHere && 
-          (CmpCommon::diags()->mainSQLCODE() != -CLI_VALIDATE_TRANSACTION_ERROR))
+      // if it is the main error.
+      //      if (xnWasStartedHere && 
+      if (CmpCommon::diags()->mainSQLCODE() != -CLI_VALIDATE_TRANSACTION_ERROR)
         {
           CollIndex i = 
             CmpCommon::diags()->returnIndex(-CLI_VALIDATE_TRANSACTION_ERROR);


[6/9] incubator-trafodion git commit: fix for compGeneral/test006 diff

Posted by an...@apache.org.
fix for compGeneral/test006 diff


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

Branch: refs/heads/master
Commit: 62eefa12ca4d6e010745867620fade71b930cd2f
Parents: d406cc5
Author: Cloud User <ce...@ansharma-3.novalocal>
Authored: Sun Mar 13 16:53:25 2016 +0000
Committer: Cloud User <ce...@ansharma-3.novalocal>
Committed: Sun Mar 13 16:53:25 2016 +0000

----------------------------------------------------------------------
 core/sql/optimizer/BindItemExpr.cpp         | 16 +++++++++++++++-
 core/sql/regress/compGeneral/EXPECTED006.SB |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62eefa12/core/sql/optimizer/BindItemExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/BindItemExpr.cpp b/core/sql/optimizer/BindItemExpr.cpp
index ba7595f..173e373 100644
--- a/core/sql/optimizer/BindItemExpr.cpp
+++ b/core/sql/optimizer/BindItemExpr.cpp
@@ -4043,6 +4043,12 @@ NABoolean DateFormat::errorChecks(Lng32 frmt, BindWA *bindWA,
       else if ((NOT ms4) && (opType->getTypeQualifier() != NA_CHARACTER_TYPE))
         error = 4; // error 4043
 
+      // operand must be numeric with nf (numeric format)
+      else if (ms4 && nf && (opType->getTypeQualifier() != NA_NUMERIC_TYPE))
+        {
+          error = 7; // error 4045
+        }
+
       // numeric must be exact with scale of 0
       else if (ms4 && (opType->getTypeQualifier() == NA_NUMERIC_TYPE))
         {
@@ -4100,8 +4106,16 @@ NABoolean DateFormat::errorChecks(Lng32 frmt, BindWA *bindWA,
             bindWA->setErrStatus();
           }
           break;
-        } // switch
       
+        case 7:
+          {
+            *CmpCommon::diags() << DgSqlCode(-4045) << DgString0("TO_DATE");
+            bindWA->setErrStatus();
+          }
+          break;
+
+        } // switch
+
       return TRUE;
     }
   

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62eefa12/core/sql/regress/compGeneral/EXPECTED006.SB
----------------------------------------------------------------------
diff --git a/core/sql/regress/compGeneral/EXPECTED006.SB b/core/sql/regress/compGeneral/EXPECTED006.SB
index 96cd90c..c72e759 100644
--- a/core/sql/regress/compGeneral/EXPECTED006.SB
+++ b/core/sql/regress/compGeneral/EXPECTED006.SB
@@ -280,7 +280,7 @@
 --- SQL operation complete.
 >>prepare xx from select * from t006t1 where to_date(A, '99:99:99:99') = A;
 
-*** ERROR[4045] The operand of function FORMAT must be numeric.
+*** ERROR[4045] The operand of function TO_DATE must be numeric.
 
 *** ERROR[8822] The statement was not prepared.
 


[9/9] incubator-trafodion git commit: Merge [TRAFODION-1849] PR-381

Posted by an...@apache.org.
Merge [TRAFODION-1849] PR-381


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

Branch: refs/heads/master
Commit: 616961db5e877975d5e31bd61be8ad637737ce1b
Parents: 2a9e9f2 71cd5ce
Author: Anoop Sharma <an...@edev06.esgyn.local>
Authored: Thu Mar 17 01:53:21 2016 +0000
Committer: Anoop Sharma <an...@edev06.esgyn.local>
Committed: Thu Mar 17 01:53:21 2016 +0000

----------------------------------------------------------------------
 core/sql/bin/SqlciErrors.txt                    |    2 +-
 core/sql/cli/Cli.cpp                            |    3 +-
 core/sql/comexe/ComQueue.h                      |    2 +-
 core/sql/comexe/ComTdb.h                        |    1 +
 core/sql/common/ComMisc.cpp                     |    1 -
 core/sql/common/NAString.cpp                    |   23 +
 core/sql/common/NAString.h                      |    3 +
 core/sql/common/OperTypeEnum.h                  |    1 +
 core/sql/generator/Generator.cpp                |   10 +-
 core/sql/optimizer/BindItemExpr.cpp             |   16 +-
 core/sql/optimizer/NAFileSet.cpp                |    2 +
 core/sql/optimizer/NAFileSet.h                  |    7 +
 core/sql/optimizer/NATable.cpp                  |   24 +-
 core/sql/optimizer/NATable.h                    |    3 +-
 core/sql/optimizer/RelExeUtil.cpp               |    7 +-
 core/sql/parser/ElemDDLNode.cpp                 |    6 +
 core/sql/parser/ElemDDLNode.h                   |    3 +
 .../sql/parser/StmtDDLAlterTableAlterColumn.cpp |   39 +-
 core/sql/parser/StmtDDLAlterTableAlterColumn.h  |   40 +-
 core/sql/parser/sqlparser.y                     |   19 +-
 core/sql/regress/charsets/DIFF012.KNOWN.SB      |    2 +-
 core/sql/regress/charsets/EXPECTED002           |    9 +-
 core/sql/regress/charsets/EXPECTED003           |   11 +-
 core/sql/regress/charsets/EXPECTED012           |   19 +-
 core/sql/regress/core/EXPECTED001.SB            |    6 +-
 core/sql/regress/core/EXPECTED037.SB            |   14 +-
 core/sql/regress/core/EXPECTED061.SB            |   13 +-
 core/sql/regress/core/EXPECTED116               |  149 +-
 core/sql/regress/core/TEST116                   |   11 +-
 core/sql/regress/executor/EXPECTED001           |   80 +-
 core/sql/regress/executor/EXPECTED013.SB        |   59 +-
 core/sql/regress/executor/EXPECTED014.SB        |   73 +-
 core/sql/regress/executor/EXPECTED016.SB        |   10 +-
 core/sql/regress/executor/EXPECTED122           |   20 +-
 core/sql/regress/hive/EXPECTED009               |    7 +
 core/sql/regress/hive/EXPECTED017               |    3 +
 core/sql/regress/privs1/EXPECTED132             |   96 +-
 core/sql/regress/seabase/EXPECTED010            |  394 +++---
 core/sql/regress/seabase/EXPECTED011            |   16 +-
 core/sql/regress/seabase/EXPECTED012            |    5 +-
 core/sql/regress/seabase/EXPECTED020            |   19 +-
 core/sql/regress/seabase/EXPECTED022            |   12 +-
 core/sql/regress/seabase/EXPECTED025            |    7 +-
 core/sql/regress/seabase/EXPECTED027            |  435 +++++-
 core/sql/regress/seabase/TEST020                |    1 +
 core/sql/regress/seabase/TEST027                |   66 +-
 core/sql/sqlcat/desc.h                          |    1 +
 core/sql/sqlcomp/CmpDescribe.cpp                |   30 +-
 core/sql/sqlcomp/CmpDescribe.h                  |    2 -
 core/sql/sqlcomp/CmpSeabaseDDL.h                |   70 +-
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp        |   72 +-
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp         | 1297 ++++++++++++++----
 core/sql/sqlcomp/nadefaults.cpp                 |   28 +-
 53 files changed, 2444 insertions(+), 805 deletions(-)
----------------------------------------------------------------------



[8/9] incubator-trafodion git commit: fixed spelling of 'occurred'

Posted by an...@apache.org.
fixed spelling of 'occurred'


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

Branch: refs/heads/master
Commit: 71cd5ceea276c2c15312958f47cd3a13311d3afa
Parents: 2272412
Author: Cloud User <ce...@ansharma-3.novalocal>
Authored: Wed Mar 16 22:22:27 2016 +0000
Committer: Cloud User <ce...@ansharma-3.novalocal>
Committed: Wed Mar 16 22:22:27 2016 +0000

----------------------------------------------------------------------
 core/sql/regress/seabase/EXPECTED027    |  6 +++---
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/71cd5cee/core/sql/regress/seabase/EXPECTED027
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/EXPECTED027 b/core/sql/regress/seabase/EXPECTED027
index 13b0f13..ac04eff 100644
--- a/core/sql/regress/seabase/EXPECTED027
+++ b/core/sql/regress/seabase/EXPECTED027
@@ -1231,7 +1231,7 @@ SCH027.T027V1
 
 *** ERROR[4003] Column TRAFODION.SCH027.T027T7.A is not a column in table TRAFODION.SCH027.T027T7, or, after a NATURAL JOIN or JOIN USING, is no longer allowed to be specified with a table correlation name.
 
-*** ERROR[1404] Column A cannot be altered. Reason: Error occured while recreating views due to dependency on older column definition. Drop dependent views before doing the alter.
+*** ERROR[1404] Column A cannot be altered. Reason: Error occurred while recreating views due to dependency on older column definition. Drop dependent views before doing the alter.
 
 --- SQL operation failed with errors.
 >>alter table t027v1 alter column a smallint;
@@ -1385,14 +1385,14 @@ CREATE VIEW TRAFODION.SCH027.T027V2 (ZZ) AS
 
 *** ERROR[4003] Column TRAFODION.SCH027.T027T7.ZZ is not a column in table TRAFODION.SCH027.T027T7, or, after a NATURAL JOIN or JOIN USING, is no longer allowed to be specified with a table correlation name.
 
-*** ERROR[1404] Column ZZ cannot be altered. Reason: Error occured while recreating views due to dependency on older column definition. Drop dependent views before doing the alter.
+*** ERROR[1404] Column ZZ cannot be altered. Reason: Error occurred while recreating views due to dependency on older column definition. Drop dependent views before doing the alter.
 
 --- SQL operation failed with errors.
 >>alter table t027t7 alter column cc rename to ccc;
 
 *** ERROR[4003] Column TRAFODION.SCH027.T027T7.CC is not a column in table TRAFODION.SCH027.T027T7, or, after a NATURAL JOIN or JOIN USING, is no longer allowed to be specified with a table correlation name.
 
-*** ERROR[1404] Column CC cannot be altered. Reason: Error occured while recreating views due to dependency on older column definition. Drop dependent views before doing the alter.
+*** ERROR[1404] Column CC cannot be altered. Reason: Error occurred while recreating views due to dependency on older column definition. Drop dependent views before doing the alter.
 
 --- SQL operation failed with errors.
 >>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/71cd5cee/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
index 179ff80..a401828 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
@@ -4973,7 +4973,7 @@ short CmpSeabaseDDL::alignedFormatTableDropColumn
   if ((cliRC = recreateUsingViews(&cliInterface, viewNameList, viewDefnList,
                                   ddlXns)) < 0)
     {
-      NAString reason = "Error occured while recreating views due to dependency on older column definition. Drop dependent views before doing the alter.";
+      NAString reason = "Error occurred while recreating views due to dependency on older column definition. Drop dependent views before doing the alter.";
       *CmpCommon::diags() << DgSqlCode(-1404)
                           << DgColumnName(altColName)
                           << DgString0(reason);
@@ -5109,7 +5109,7 @@ short CmpSeabaseDDL::hbaseFormatTableDropColumn(
   if ((cliRC = recreateUsingViews(&cliInterface, viewNameList, viewDefnList,
                                   ddlXns)) < 0)
     {
-      NAString reason = "Error occured while recreating views due to dependency on older column definition. Drop dependent views before doing the alter.";
+      NAString reason = "Error occurred while recreating views due to dependency on older column definition. Drop dependent views before doing the alter.";
       *CmpCommon::diags() << DgSqlCode(-1404)
                           << DgColumnName(altColName)
                           << DgString0(reason);
@@ -5321,7 +5321,7 @@ void CmpSeabaseDDL::alterSeabaseTableDropColumn(
   NAList<NAString> viewDefnList;
   if (saveAndDropUsingViews(objUID, &cliInterface, viewNameList, viewDefnList))
     {
-      NAString reason = "Error occured while saving views.";
+      NAString reason = "Error occurred while saving views.";
       *CmpCommon::diags() << DgSqlCode(-1404)
                           << DgColumnName(colName)
                           << DgString0(reason);
@@ -5389,7 +5389,7 @@ void CmpSeabaseDDL::alterSeabaseTableDropColumn(
   if ((cliRC = recreateUsingViews(&cliInterface, viewNameList, viewDefnList,
                                   alterDropColNode->ddlXns())) < 0)
     {
-      NAString reason = "Error occured while recreating views due to dependency on older column definition. Drop dependent views before doing the alter.";
+      NAString reason = "Error occurred while recreating views due to dependency on older column definition. Drop dependent views before doing the alter.";
       *CmpCommon::diags() << DgSqlCode(-1404)
                           << DgColumnName(colName)
                           << DgString0(reason);
@@ -5886,7 +5886,7 @@ short CmpSeabaseDDL::alignedFormatTableAlterColumnAttr
   if ((cliRC = recreateUsingViews(&cliInterface, viewNameList, viewDefnList,
                                   ddlXns)) < 0)
     {
-      NAString reason = "Error occured while recreating views due to dependency on older column definition. Drop dependent views before doing the alter.";
+      NAString reason = "Error occurred while recreating views due to dependency on older column definition. Drop dependent views before doing the alter.";
       *CmpCommon::diags() << DgSqlCode(-1404)
                           << DgColumnName(altColName)
                           << DgString0(reason);
@@ -5971,7 +5971,7 @@ short CmpSeabaseDDL::mdOnlyAlterColumnAttr(
                              alterColNode->ddlXns());
   if (cliRC < 0)
     {
-      NAString reason = "Error occured while recreating views due to dependency on older column definition. Drop dependent views before doing the alter.";
+      NAString reason = "Error occurred while recreating views due to dependency on older column definition. Drop dependent views before doing the alter.";
       *CmpCommon::diags() << DgSqlCode(-1404)
                           << DgColumnName(naCol->getColName().data())
                           << DgString0(reason);
@@ -6412,7 +6412,7 @@ void CmpSeabaseDDL::alterSeabaseTableAlterColumnDatatype(
   NAList<NAString> viewDefnList;
   if (saveAndDropUsingViews(objUID, &cliInterface, viewNameList, viewDefnList))
      {
-      NAString reason = "Error occured while saving views.";
+      NAString reason = "Error occurred while saving views.";
       *CmpCommon::diags() << DgSqlCode(-1404)
                           << DgColumnName(colName)
                           << DgString0(reason);
@@ -6482,7 +6482,7 @@ label_error:
   if ((cliRC = recreateUsingViews(&cliInterface, viewNameList, viewDefnList,
                                   alterColNode->ddlXns())) < 0)
     {
-      NAString reason = "Error occured while recreating views due to dependency on older column definition. Drop dependent views before doing the alter.";
+      NAString reason = "Error occurred while recreating views due to dependency on older column definition. Drop dependent views before doing the alter.";
       *CmpCommon::diags() << DgSqlCode(-1404)
                           << DgColumnName(colName)
                           << DgString0(reason);
@@ -6689,7 +6689,7 @@ void CmpSeabaseDDL::alterSeabaseTableAlterColumnRename(
   NAList<NAString> viewDefnList;
   if (saveAndDropUsingViews(objUID, &cliInterface, viewNameList, viewDefnList))
     {
-      NAString reason = "Error occured while saving dependent views.";
+      NAString reason = "Error occurred while saving dependent views.";
       *CmpCommon::diags() << DgSqlCode(-1404)
                           << DgColumnName(colName)
                           << DgString0(reason);
@@ -6807,7 +6807,7 @@ void CmpSeabaseDDL::alterSeabaseTableAlterColumnRename(
                              alterColNode->ddlXns());
   if (cliRC < 0)
     {
-      NAString reason = "Error occured while recreating views due to dependency on older column definition. Drop dependent views before doing the alter.";
+      NAString reason = "Error occurred while recreating views due to dependency on older column definition. Drop dependent views before doing the alter.";
       *CmpCommon::diags() << DgSqlCode(-1404)
                           << DgColumnName(colName)
                           << DgString0(reason);


[7/9] incubator-trafodion git commit: Merge remote branch 'origin/master' into altcolren_br_deliver

Posted by an...@apache.org.
Merge remote branch 'origin/master' into altcolren_br_deliver

Conflicts:
	core/sql/cli/Cli.cpp
	core/sql/regress/compGeneral/EXPECTED006.SB


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

Branch: refs/heads/master
Commit: 227241276f0a26604f592311bc98c068489c5a3d
Parents: 62eefa1 2a9e9f2
Author: Cloud User <ce...@ansharma-3.novalocal>
Authored: Wed Mar 16 21:14:01 2016 +0000
Committer: Cloud User <ce...@ansharma-3.novalocal>
Committed: Wed Mar 16 21:14:01 2016 +0000

----------------------------------------------------------------------
 .rat-excludes                                   |    1 +
 core/sqf/monitor/linux/clio.cxx                 |    7 +
 core/sqf/monitor/linux/monitor.cxx              |    6 +
 core/sqf/monitor/linux/shell.cxx                |    6 +
 core/sqf/sql/scripts/install_local_hadoop       |    1 -
 core/sqf/src/seabed/src/msmon.cpp               |    6 +
 .../transactional/SplitBalanceHelper.java       |    8 +-
 core/sqf/src/tm/Makefile                        |    3 +
 core/sqf/src/tm/tm.cpp                          |   33 +-
 core/sqf/src/tm/tmaudit.cpp                     |   18 +-
 core/sqf/src/tm/tmauditobj.cpp                  |    6 +-
 core/sqf/src/tm/tmddlrequests.cpp               |   12 +-
 core/sqf/src/tm/tmlib.cpp                       |   13 +-
 core/sqf/src/tm/tmpoolelement.h                 |    2 +-
 core/sqf/src/tm/tmrecov.cpp                     |    3 +-
 core/sqf/src/tm/tmregisterregion.cpp            |    4 +-
 core/sqf/src/tm/tmrmhbase.cpp                   |    3 -
 core/sqf/src/tm/tmrmtse.cpp                     |    3 +-
 core/sqf/src/tm/tmtime.h                        |    3 +-
 core/sqf/src/tm/tmxarmmain.cpp                  |    2 +-
 core/sqf/src/tm/tmxatxn.cpp                     |    4 +-
 core/sqf/src/tm/tools/Makefile                  |    3 +
 core/sqf/src/tm/tools/dtmci.cpp                 |   14 +-
 core/sqf/src/tm/xarmapi.cpp                     |    5 +-
 core/sqf/src/tm/xatmapi.cpp                     |    7 +-
 core/sql/common/ComSmallDefs.h                  |    4 +-
 core/sql/exp/ExpLOB.cpp                         |   16 +-
 core/sql/exp/exp_function.cpp                   |    6 +-
 core/sql/optimizer/BindRelExpr.cpp              |   40 +-
 core/sql/optimizer/RelUpdate.h                  |    3 +-
 core/sql/optimizer/Stats.h                      |    8 +-
 core/sql/regress/compGeneral/DIFF006.KNOWN.SB   |    4 -
 .../sql/regress/compGeneral/DIFF006.KNOWN.SB.OS |    2 +-
 core/sql/regress/compGeneral/EXPECTED006        | 1235 ------------------
 core/sql/regress/compGeneral/EXPECTED006.SB     |    5 +-
 core/sql/regress/seabase/EXPECTED020            |   20 +
 core/sql/regress/seabase/TEST020                |    7 +
 core/sql/sqlcomp/CmpSeabaseDDL.h                |    2 +-
 core/sql/sqlcomp/CmpSeabaseDDLauth.cpp          |   86 +-
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp        |   11 +
 core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp       |    6 +-
 core/sql/sqlcomp/CmpSeabaseDDLschema.cpp        |   84 +-
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp         |    9 +-
 dcs/Makefile                                    |    2 +
 dcs/pom.xml                                     |    6 +-
 .../src/asciidoc/_chapters/odbc_windows.adoc    |   10 +-
 docs/cqd_reference/pom.xml                      |    8 +-
 .../src/asciidoc/_chapters/debugging.adoc       |   95 ++
 .../src/asciidoc/_chapters/histograms.adoc      |   38 +-
 .../src/asciidoc/_chapters/introduction.adoc    |   13 +-
 .../_chapters/operational_controls.adoc         |  138 +-
 .../src/asciidoc/_chapters/query_execution.adoc |  239 ++++
 .../src/asciidoc/_chapters/query_plans.adoc     |  330 ++++-
 .../asciidoc/_chapters/runtime_controls.adoc    |    4 +-
 .../src/asciidoc/_chapters/schema_controls.adoc |   24 +-
 .../asciidoc/_chapters/table_definition.adoc    |  142 ++
 .../src/asciidoc/_chapters/transactions.adoc    |    4 +-
 .../src/asciidoc/_chapters/update_stats.adoc    |   31 +-
 docs/cqd_reference/src/asciidoc/index.adoc      |    3 +
 docs/load_transform/pom.xml                     |    8 +-
 .../src/asciidoc/_chapters/about.adoc           |    8 +-
 .../src/asciidoc/_chapters/bulk_load.adoc       |   37 +-
 .../src/asciidoc/_chapters/introduction.adoc    |   14 +-
 .../src/asciidoc/_chapters/tables_indexes.adoc  |   18 +-
 .../src/asciidoc/_chapters/trickle_load.adoc    |   12 +-
 .../src/asciidoc/_chapters/troubleshoot.adoc    |    4 +-
 .../src/asciidoc/_chapters/about.adoc           |    4 +-
 .../src/asciidoc/_chapters/cqds.adoc            |  329 -----
 .../src/asciidoc/_chapters/introduction.adoc    |   11 +-
 .../src/asciidoc/_chapters/sql_statements.adoc  |    6 +-
 docs/sql_reference/src/asciidoc/index.adoc      |    1 -
 docs/src/site/markdown/documentation.md         |   66 +-
 docs/src/site/markdown/logo.md                  |    2 +-
 .../resources/images/logos/pb-Trafodion.png     |  Bin 49089 -> 0 bytes
 .../resources/images/logos/pb-trafodion.png     |  Bin 0 -> 49089 bytes
 docs/src/site/site.xml                          |    1 +
 install/installer/checkHBase                    |   37 +
 install/installer/parseHBaseSite.py             |   25 +-
 install/installer/traf_add_sudoAccess           |    3 +-
 install/installer/traf_cloudera_mods98          |   40 +-
 install/installer/traf_config_check             |   48 +-
 install/installer/traf_config_setup             |    3 +-
 install/installer/traf_getHadoopNodes           |   21 +-
 install/installer/traf_hortonworks_mods98       |   68 +-
 install/installer/traf_package_setup            |    2 +-
 install/installer/trafodion_install             |   88 +-
 licenses/lic-dcs-bin                            |  651 ++++++++-
 licenses/not-dcs-bin                            |   20 +
 pom.xml                                         |    2 +
 89 files changed, 2211 insertions(+), 2126 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/22724127/core/sql/regress/seabase/EXPECTED020
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/22724127/core/sql/regress/seabase/TEST020
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/22724127/core/sql/sqlcomp/CmpSeabaseDDL.h
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/22724127/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/22724127/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------


[5/9] incubator-trafodion git commit: JIRA 1849 Add support for alter column rename (details below)

Posted by an...@apache.org.
JIRA 1849 Add support for alter column rename (details below)

-- support for 'add column c rename to newc'
-- fixed issue with ddl stmts and aqr, it now works correctly
  if ddl_transactions are being used
-- drop table with views now drops them in reverse creation order.
  That way dependent views are dropped correctly.
-- views are dropped before and recreated after an alter column
  statement.
-- dev regressions tests now show system columns in invoke.
-- index uid is now stored in desc and NATable structs


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

Branch: refs/heads/master
Commit: d406cc524027bd07380db4e6c0726c6e76c349e4
Parents: 6b9dea5
Author: Cloud User <ce...@ansharma-3.novalocal>
Authored: Sun Mar 13 01:32:25 2016 +0000
Committer: Cloud User <ce...@ansharma-3.novalocal>
Committed: Sun Mar 13 01:32:25 2016 +0000

----------------------------------------------------------------------
 core/sql/bin/SqlciErrors.txt                    |    2 +-
 core/sql/cli/Cli.cpp                            |    3 +-
 core/sql/comexe/ComQueue.h                      |    2 +-
 core/sql/comexe/ComTdb.h                        |    1 +
 core/sql/common/ComMisc.cpp                     |    1 -
 core/sql/common/NAString.cpp                    |   23 +
 core/sql/common/NAString.h                      |    3 +
 core/sql/common/OperTypeEnum.h                  |    1 +
 core/sql/generator/Generator.cpp                |   10 +-
 core/sql/optimizer/NAFileSet.cpp                |    2 +
 core/sql/optimizer/NAFileSet.h                  |    7 +
 core/sql/optimizer/NATable.cpp                  |   24 +-
 core/sql/optimizer/NATable.h                    |    3 +-
 core/sql/optimizer/RelExeUtil.cpp               |    7 +-
 core/sql/parser/ElemDDLNode.cpp                 |    6 +
 core/sql/parser/ElemDDLNode.h                   |    3 +
 .../sql/parser/StmtDDLAlterTableAlterColumn.cpp |   39 +-
 core/sql/parser/StmtDDLAlterTableAlterColumn.h  |   40 +-
 core/sql/parser/sqlparser.y                     |   19 +-
 core/sql/regress/charsets/DIFF012.KNOWN.SB      |    2 +-
 core/sql/regress/charsets/EXPECTED002           |    9 +-
 core/sql/regress/charsets/EXPECTED003           |   11 +-
 core/sql/regress/charsets/EXPECTED012           |   19 +-
 core/sql/regress/core/EXPECTED001.SB            |    6 +-
 core/sql/regress/core/EXPECTED037.SB            |   14 +-
 core/sql/regress/core/EXPECTED061.SB            |   13 +-
 core/sql/regress/core/EXPECTED116               |  149 +-
 core/sql/regress/core/TEST116                   |   11 +-
 core/sql/regress/executor/EXPECTED001           |   80 +-
 core/sql/regress/executor/EXPECTED013.SB        |   59 +-
 core/sql/regress/executor/EXPECTED014.SB        |   73 +-
 core/sql/regress/executor/EXPECTED016.SB        |   10 +-
 core/sql/regress/executor/EXPECTED122           |   20 +-
 core/sql/regress/hive/EXPECTED009               |    7 +
 core/sql/regress/hive/EXPECTED017               |    3 +
 core/sql/regress/privs1/EXPECTED132             |   96 +-
 core/sql/regress/seabase/EXPECTED010            |  394 +++---
 core/sql/regress/seabase/EXPECTED011            |   16 +-
 core/sql/regress/seabase/EXPECTED012            |    5 +-
 core/sql/regress/seabase/EXPECTED020            |   19 +-
 core/sql/regress/seabase/EXPECTED022            |   12 +-
 core/sql/regress/seabase/EXPECTED025            |    7 +-
 core/sql/regress/seabase/EXPECTED027            |  435 +++++-
 core/sql/regress/seabase/TEST020                |    1 +
 core/sql/regress/seabase/TEST027                |   66 +-
 core/sql/sqlcat/desc.h                          |    1 +
 core/sql/sqlcomp/CmpDescribe.cpp                |   30 +-
 core/sql/sqlcomp/CmpDescribe.h                  |    2 -
 core/sql/sqlcomp/CmpSeabaseDDL.h                |   70 +-
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp        |   72 +-
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp         | 1297 ++++++++++++++----
 core/sql/sqlcomp/nadefaults.cpp                 |   28 +-
 52 files changed, 2429 insertions(+), 804 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/bin/SqlciErrors.txt
----------------------------------------------------------------------
diff --git a/core/sql/bin/SqlciErrors.txt b/core/sql/bin/SqlciErrors.txt
index 084a4fd..316c94d 100644
--- a/core/sql/bin/SqlciErrors.txt
+++ b/core/sql/bin/SqlciErrors.txt
@@ -145,7 +145,7 @@
 1143 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Validation of constraint $0~ConstraintName failed; incompatible data exists in referencing base table $1~TableName and referenced base table $2~String0.  To display the data that violates the constraint, please use the following DML statement: $3~String1
 1144 ZZZZZ 99999 BEGINNER MAJOR DBADMIN A quoted string was expected in first key clause for column $0~ColumnName on table $1~TableName, but the value detected is ($2~String0).
 1145 3D000 99999 BEGINNER MAJOR DBADMIN The catalog name $0~CatalogName is reserved for SQL metadata.
-1146 ZZZZZ 99999 BEGINNER MINOR DBADMIN Object $0~TableName could not be altered because it is not a $1~String0.
+1146 ZZZZZ 99999 BEGINNER MINOR DBADMIN Object $0~String0 could not be altered because it either does not exist or is not a table.
 1147 ZZZZZ 99999 BEGINNER MINOR DBADMIN System-generated column $0~ColumnName of base table $1~TableName cannot appear in a unique or primary key constraint definition.
 1148 23000 99999 BEGINNER MINOR DBADMIN System-generated column $0~ColumnName of base table $1~TableName cannot appear in a referential integrity constraint definition.
 1149 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Column $0~ColumnName does not exist in table $1~TableName.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/cli/Cli.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Cli.cpp b/core/sql/cli/Cli.cpp
index 82f1f19..a6b7f1a 100644
--- a/core/sql/cli/Cli.cpp
+++ b/core/sql/cli/Cli.cpp
@@ -2456,7 +2456,8 @@ Lng32 SQLCLI_ProcessRetryQuery(
             return retcode;
         }
 
-      if (rootTdb->updDelInsertQuery())
+      if ((rootTdb->updDelInsertQuery()) ||
+          (rootTdb->ddlQuery()))
         {
           if (rootTdb->transactionReqd() &&
               (NOT exTransaction->xnInProgress()))

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/comexe/ComQueue.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComQueue.h b/core/sql/comexe/ComQueue.h
index 7dbfe89..b42c472 100644
--- a/core/sql/comexe/ComQueue.h
+++ b/core/sql/comexe/ComQueue.h
@@ -203,7 +203,7 @@ NA_EIDPROC
 NA_EIDPROC
   void * get();
 
-  // returns the i'th entry
+  // returns the i'th entry. 0 based. First entry is i = 0
 NA_EIDPROC
   void * get(ULng32 i);
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/comexe/ComTdb.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdb.h b/core/sql/comexe/ComTdb.h
index 5846fd8..a7f7d25 100644
--- a/core/sql/comexe/ComTdb.h
+++ b/core/sql/comexe/ComTdb.h
@@ -995,6 +995,7 @@ class ComTdbVirtTableIndexInfo : public ComTdbVirtTableBase
 
   const char * baseTableName;
   const char * indexName;
+  Int64 indexUID;
   Lng32 keytag;
   Lng32 isUnique;
   Lng32 isExplicit;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/common/ComMisc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/ComMisc.cpp b/core/sql/common/ComMisc.cpp
index b9b94a5..5c41b94 100644
--- a/core/sql/common/ComMisc.cpp
+++ b/core/sql/common/ComMisc.cpp
@@ -228,4 +228,3 @@ NAString ComConvertTrafNameToNativeName(
   return convertedName;
 }
 
-

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/common/NAString.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/NAString.cpp b/core/sql/common/NAString.cpp
index 8de31fc..3b9830e 100644
--- a/core/sql/common/NAString.cpp
+++ b/core/sql/common/NAString.cpp
@@ -280,6 +280,29 @@ NAString Int64ToNAString(Int64 l)
   return NAString(resultstr);
 }
 
+NAString &replaceAll(NAString &source, const NAString &searchFor,
+                     const NAString &replaceWith)
+{
+  size_t indexOfReplace = NA_NPOS;
+  indexOfReplace = source.index(searchFor);
+  if (indexOfReplace != NA_NPOS)
+    {
+      // Replace all occurences of searchFor with replaceWith. When no
+      // more occurences are found or end of string is reached, index()
+      // will return NA_NPOS.
+      while (indexOfReplace != NA_NPOS)
+        {
+          source.replace(indexOfReplace, searchFor.length(), 
+                         replaceWith);
+          // Find index of next occurence to replace.
+          indexOfReplace = 
+            source.index(searchFor, indexOfReplace + replaceWith.length()); 
+        }
+    }
+
+  return source;
+}
+
 // ---------------------------------------------------------------------
 // Hash function for NAString types in NAKeyLookup
 // ---------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/common/NAString.h
----------------------------------------------------------------------
diff --git a/core/sql/common/NAString.h b/core/sql/common/NAString.h
index d87cf42..10fd288 100644
--- a/core/sql/common/NAString.h
+++ b/core/sql/common/NAString.h
@@ -160,6 +160,9 @@ void	  RemoveTrailingZeros(NAString &ns);
 
 NAString Latin1StrToUTF8(const NAString & latin1Str, NAMemory * heap = NULL);
 
+NAString &replaceAll(NAString &source, const NAString &searchFor,
+                     const NAString &replaceWith);
+
 
 // See notes at NAString.cpp specialSQL_TEXT[].
 //

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/common/OperTypeEnum.h
----------------------------------------------------------------------
diff --git a/core/sql/common/OperTypeEnum.h b/core/sql/common/OperTypeEnum.h
index 12cc0cf..30b4fa5 100644
--- a/core/sql/common/OperTypeEnum.h
+++ b/core/sql/common/OperTypeEnum.h
@@ -857,6 +857,7 @@ enum OperatorTypeEnum {
                         DDL_ALTER_TABLE_TOGGLE_ONLINE,
                         DDL_ALTER_TABLE_NAMESPACE,
                         DDL_ALTER_TABLE_ALTER_COLUMN_DATATYPE,
+                        DDL_ALTER_TABLE_ALTER_COLUMN_RENAME,
                         DDL_ALTER_TABLE_ALTER_COLUMN_DEFAULT_VALUE,
                         DDL_ALTER_TABLE_ALTER_COLUMN_SET_SG_OPTION,
                         DDL_ALTER_TABLE_ALTER_HBASE_OPTIONS,

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/generator/Generator.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/Generator.cpp b/core/sql/generator/Generator.cpp
index 2486755..d1e174b 100644
--- a/core/sql/generator/Generator.cpp
+++ b/core/sql/generator/Generator.cpp
@@ -1979,6 +1979,7 @@ desc_struct * Generator::createVirtualTableDesc(
   index_desc->body.indexes_desc.tablename = table_desc->body.table_desc.tablename;
   index_desc->body.indexes_desc.indexname = table_desc->body.table_desc.tablename;
   index_desc->body.indexes_desc.keytag = 0; // primary index
+  index_desc->body.indexes_desc.indexUID = 0;
   index_desc->body.indexes_desc.record_length = table_desc->body.table_desc.record_length;
   index_desc->body.indexes_desc.colcount = table_desc->body.table_desc.colcount;
   index_desc->body.indexes_desc.isVerticalPartition = 0;
@@ -1989,8 +1990,10 @@ desc_struct * Generator::createVirtualTableDesc(
   index_desc->body.indexes_desc.rowFormat = table_desc->body.table_desc.rowFormat;
   if (tableInfo)
   {
-      index_desc->body.indexes_desc.numSaltPartns = tableInfo->numSaltPartns;
-      if (tableInfo->hbaseCreateOptions)
+    index_desc->body.indexes_desc.indexUID = tableInfo->objUID;
+    
+    index_desc->body.indexes_desc.numSaltPartns = tableInfo->numSaltPartns;
+    if (tableInfo->hbaseCreateOptions)
       {
         index_desc->body.indexes_desc.hbaseCreateOptions  = 
           new HEAP char[strlen(tableInfo->hbaseCreateOptions) + 1];
@@ -1998,7 +2001,7 @@ desc_struct * Generator::createVirtualTableDesc(
                tableInfo->hbaseCreateOptions);
       }
   }
-
+  
   if (numIndexes > 0)
     {
       desc_struct * prev_desc = index_desc;
@@ -2014,6 +2017,7 @@ desc_struct * Generator::createVirtualTableDesc(
 	  curr_index_desc->body.indexes_desc.indexname = new HEAP char[strlen(indexInfo[i].indexName)+1];
 	  strcpy(curr_index_desc->body.indexes_desc.indexname, indexInfo[i].indexName);
 
+          curr_index_desc->body.indexes_desc.indexUID = indexInfo[i].indexUID;
 	  curr_index_desc->body.indexes_desc.keytag = indexInfo[i].keytag;
 	  curr_index_desc->body.indexes_desc.unique = indexInfo[i].isUnique;
 	  curr_index_desc->body.indexes_desc.isCreatedExplicitly = indexInfo[i].isExplicit;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/optimizer/NAFileSet.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/NAFileSet.cpp b/core/sql/optimizer/NAFileSet.cpp
index 83d34a8..ea6b840 100644
--- a/core/sql/optimizer/NAFileSet.cpp
+++ b/core/sql/optimizer/NAFileSet.cpp
@@ -75,6 +75,7 @@ NAFileSet::NAFileSet(const QualifiedName & fileSetName,
                      Lng32 fileCode,
 		     NABoolean isVolatile,
 		     NABoolean inMemObjectDefn,
+                     Int64 indexUID,
                      desc_struct *keysDesc,
                      HHDFSTableStats *hHDFSTableStats,
                      Lng32 numSaltPartns,
@@ -113,6 +114,7 @@ NAFileSet::NAFileSet(const QualifiedName & fileSetName,
            thisRemoteIndexGone_(FALSE),
            isDecoupledRangePartitioned_(isDecoupledRangePartitioned),
            fileCode_(fileCode),
+           indexUID_(indexUID),
            keysDesc_(keysDesc),
            hHDFSTableStats_(hHDFSTableStats),
            numSaltPartns_(numSaltPartns),

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/optimizer/NAFileSet.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/NAFileSet.h b/core/sql/optimizer/NAFileSet.h
index 04b4c0e..f8ca7ed 100644
--- a/core/sql/optimizer/NAFileSet.h
+++ b/core/sql/optimizer/NAFileSet.h
@@ -115,6 +115,7 @@ public:
             Lng32 fileCode,
 	    NABoolean isVolatile,
 	    NABoolean inMemObjectDefn,
+            Int64 indexUID,
             desc_struct *keysDesc,
             HHDFSTableStats *hHDFSTableStats,
             Lng32 numSaltPartns,
@@ -170,6 +171,9 @@ public:
 
   Lng32 getFileCode() const { return fileCode_; }
 
+  const Int64 &getIndexUID() const { return indexUID_; }
+  Int64 &getIndexUID() { return indexUID_; }
+
   const HHDFSTableStats *getHHDFSTableStats() const { return hHDFSTableStats_; }
   HHDFSTableStats *getHHDFSTableStats()             { return hHDFSTableStats_; }
 
@@ -382,6 +386,9 @@ private:
   // ---------------------------------------------------------------------
   NAColumnArray indexKeyColumns_;
 
+  // uid for index
+  Int64 indexUID_;
+
   desc_struct *keysDesc_;  // needed for parallel label operations.
 
   // ---------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/optimizer/NATable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/NATable.cpp b/core/sql/optimizer/NATable.cpp
index 46f6f0d..c01998c 100644
--- a/core/sql/optimizer/NATable.cpp
+++ b/core/sql/optimizer/NATable.cpp
@@ -4300,6 +4300,7 @@ NABoolean createNAFileSets(desc_struct * table_desc       /*IN*/,
                   files_desc ? files_desc->body.files_desc.fileCode : 0,
 		  (indexes_desc->body.indexes_desc.isVolatile != 0),
 		  (indexes_desc->body.indexes_desc.isInMemoryObjectDefn != 0),
+                  indexes_desc->body.indexes_desc.indexUID,
                   indexes_desc->body.indexes_desc.keys_desc,
                   NULL, // no Hive stats
                   indexes_desc->body.indexes_desc.numSaltPartns,
@@ -4635,6 +4636,7 @@ NABoolean createNAFileSets(hive_tbl_desc* hvt_desc        /*IN*/,
                   0, // file code
 		  0, // not a volatile
 		  0, // inMemObjectDefn
+                  0,
                   NULL, // indexes_desc->body.indexes_desc.keys_desc,
                   hiveHDFSTableStats,
                   0, // saltPartns
@@ -7538,12 +7540,30 @@ ExtendedQualName::SpecialTableType NATable::getTableType()
   return qualifiedName_.getSpecialType();
 }
 
-NABoolean NATable::hasSaltedColumn()
+NABoolean NATable::hasSaltedColumn(Lng32 * saltColPos)
 {
   for (CollIndex i=0; i<colArray_.entries(); i++ )
   {
     if ( colArray_[i]->isSaltColumn() ) 
-      return TRUE;
+      {
+        if (saltColPos)
+          *saltColPos = i;
+        return TRUE;
+      }
+  }
+  return FALSE;
+}
+
+NABoolean NATable::hasDivisioningColumn(Lng32 * divColPos)
+{
+  for (CollIndex i=0; i<colArray_.entries(); i++ )
+  {
+    if ( colArray_[i]->isDivisioningColumn() ) 
+      {
+        if (divColPos)
+          *divColPos = i;
+        return TRUE;
+      }
   }
   return FALSE;
 }

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/optimizer/NATable.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/NATable.h b/core/sql/optimizer/NATable.h
index 3f58406..e496242 100644
--- a/core/sql/optimizer/NATable.h
+++ b/core/sql/optimizer/NATable.h
@@ -561,7 +561,8 @@ public:
 
   const char *getViewCheck() const              { return viewCheck_; }
 
-  NABoolean hasSaltedColumn();
+  NABoolean hasSaltedColumn(Lng32 * saltColPos = NULL);
+  NABoolean hasDivisioningColumn(Lng32 * divColPos = NULL);
 
   void setUpdatable( NABoolean value )
   {  value ? flags_ |= IS_UPDATABLE : flags_ &= ~IS_UPDATABLE; }

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/optimizer/RelExeUtil.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelExeUtil.cpp b/core/sql/optimizer/RelExeUtil.cpp
index a5b210d..e1b28ca 100644
--- a/core/sql/optimizer/RelExeUtil.cpp
+++ b/core/sql/optimizer/RelExeUtil.cpp
@@ -3794,6 +3794,7 @@ RelExpr * DDLExpr::bindNode(BindWA *bindWA)
   NABoolean alterRenameTable = FALSE;
   NABoolean alterIdentityCol = FALSE;
   NABoolean alterColDatatype = FALSE;
+  NABoolean alterColRename = FALSE;
   NABoolean externalTable = FALSE;
   
   returnStatus_ = FALSE;
@@ -4017,7 +4018,9 @@ RelExpr * DDLExpr::bindNode(BindWA *bindWA)
          alterIdentityCol = TRUE;
       else if (getExprNode()->castToStmtDDLNode()->castToStmtDDLAlterTableAlterColumnDatatype())
          alterColDatatype = TRUE;
-      else if (getExprNode()->castToStmtDDLNode()->castToStmtDDLAlterTableHBaseOptions())
+       else if (getExprNode()->castToStmtDDLNode()->castToStmtDDLAlterTableAlterColumnRename())
+         alterColRename = TRUE;
+       else if (getExprNode()->castToStmtDDLNode()->castToStmtDDLAlterTableHBaseOptions())
          alterHBaseOptions = TRUE;
        else
         otherAlters = TRUE;
@@ -4215,7 +4218,7 @@ RelExpr * DDLExpr::bindNode(BindWA *bindWA)
          (isCreate_ || isDrop_ || purgedataHbase_ ||
           (isAlter_ && (alterAddCol || alterDropCol || alterDisableIndex || alterEnableIndex || 
 			alterAddConstr || alterDropConstr || alterRenameTable ||
-                        alterIdentityCol || alterColDatatype ||
+                        alterIdentityCol || alterColDatatype || alterColRename ||
                         alterHBaseOptions || otherAlters)))))
       {
 	if (NOT isNative_)

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/parser/ElemDDLNode.cpp
----------------------------------------------------------------------
diff --git a/core/sql/parser/ElemDDLNode.cpp b/core/sql/parser/ElemDDLNode.cpp
index 3e9b21b..ebb56e0 100644
--- a/core/sql/parser/ElemDDLNode.cpp
+++ b/core/sql/parser/ElemDDLNode.cpp
@@ -1403,6 +1403,12 @@ ElemDDLNode::castToStmtDDLAlterTableAlterColumnDatatype()
   return NULL;
 }
 
+StmtDDLAlterTableAlterColumnRename *
+ElemDDLNode::castToStmtDDLAlterTableAlterColumnRename()
+{
+  return NULL;
+}
+
 StmtDDLAlterTableAlterColumnSetSGOption *
 ElemDDLNode::castToStmtDDLAlterTableAlterColumnSetSGOption()
 {

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/parser/ElemDDLNode.h
----------------------------------------------------------------------
diff --git a/core/sql/parser/ElemDDLNode.h b/core/sql/parser/ElemDDLNode.h
index e1d540a..e873a11 100644
--- a/core/sql/parser/ElemDDLNode.h
+++ b/core/sql/parser/ElemDDLNode.h
@@ -275,6 +275,7 @@ class StmtDDLAlterTablePartition;
 class StmtDDLAlterTableRename;
 class StmtDDLAlterTableNamespace;
 class StmtDDLAlterTableAlterColumnDatatype;
+class StmtDDLAlterTableAlterColumnRename;
 class StmtDDLAlterTableAlterColumnDefaultValue;
 class StmtDDLAlterTableAlterColumnSetSGOption;
 class StmtDDLAlterTableSetConstraint;
@@ -606,6 +607,8 @@ public:
                 castToStmtDDLAlterTableAlterColumnDefaultValue();
   virtual StmtDDLAlterTableAlterColumnDatatype* 
                 castToStmtDDLAlterTableAlterColumnDatatype();
+  virtual StmtDDLAlterTableAlterColumnRename* 
+                castToStmtDDLAlterTableAlterColumnRename();
   virtual StmtDDLAlterTableSetConstraint*
                 castToStmtDDLAlterTableSetConstraint();
   virtual StmtDDLAlterTableToggleConstraint*

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/parser/StmtDDLAlterTableAlterColumn.cpp
----------------------------------------------------------------------
diff --git a/core/sql/parser/StmtDDLAlterTableAlterColumn.cpp b/core/sql/parser/StmtDDLAlterTableAlterColumn.cpp
index b2c1f9c..cb68092 100644
--- a/core/sql/parser/StmtDDLAlterTableAlterColumn.cpp
+++ b/core/sql/parser/StmtDDLAlterTableAlterColumn.cpp
@@ -51,7 +51,6 @@ StmtDDLAlterTableAlterColumn::getText() const
 }
 	
 
-
 //----------------------------------------------------------------------------
 // CLASS StmtDDLAlterTableAlterColumnDatatype
 //----------------------------------------------------------------------------
@@ -96,6 +95,44 @@ StmtDDLAlterTableAlterColumnDatatype::getText() const
   return "StmtDDLAlterTableAlterColumnDatatype" ;
 }
 	
+//----------------------------------------------------------------------------
+// CLASS StmtDDLAlterTableAlterColumnRename
+//----------------------------------------------------------------------------
+StmtDDLAlterTableAlterColumnRename::StmtDDLAlterTableAlterColumnRename( 
+     const NAString &columnName,
+     const NAString &renamedColumnName,
+     CollHeap *heap)
+    : StmtDDLAlterTableAlterColumn(DDL_ALTER_TABLE_ALTER_COLUMN_RENAME, 
+                                   columnName,
+                                   NULL,
+                                   heap),
+      renamedColumnName_(renamedColumnName)
+{
+}
+
+//
+// Virtual destructor
+//
+
+StmtDDLAlterTableAlterColumnRename::~StmtDDLAlterTableAlterColumnRename()
+{}
+
+//
+// Cast function: to provide the safe castdown to the current object
+//
+
+StmtDDLAlterTableAlterColumnRename *
+StmtDDLAlterTableAlterColumnRename::castToStmtDDLAlterTableAlterColumnRename()
+{
+  return this;
+}
+
+const NAString
+StmtDDLAlterTableAlterColumnRename::getText() const
+{
+  return "StmtDDLAlterTableAlterColumnRename" ;
+}
+	
 
 //----------------------------------------------------------------------------
 // CLASS StmtDDLAlterTableAlterColumnDefaultValue

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/parser/StmtDDLAlterTableAlterColumn.h
----------------------------------------------------------------------
diff --git a/core/sql/parser/StmtDDLAlterTableAlterColumn.h b/core/sql/parser/StmtDDLAlterTableAlterColumn.h
index 7ad20de..ecb2178 100644
--- a/core/sql/parser/StmtDDLAlterTableAlterColumn.h
+++ b/core/sql/parser/StmtDDLAlterTableAlterColumn.h
@@ -135,7 +135,6 @@ private:
 
 }; // class StmtDDLAlterTableAlterColumnDefaultValue
 
-
 // -----------------------------------------------------------------------
 // definition of class StmtDDLAlterTableAlterColumnDatatype
 // -----------------------------------------------------------------------
@@ -178,4 +177,43 @@ private:
 
 }; // class StmtDDLAlterTableAlterColumnDatatype
 
+// -----------------------------------------------------------------------
+// definition of class StmtDDLAlterTableAlterColumnRename
+// -----------------------------------------------------------------------
+class StmtDDLAlterTableAlterColumnRename : public StmtDDLAlterTableAlterColumn
+{
+public:
+  
+  // constructor
+  StmtDDLAlterTableAlterColumnRename( const NAString &columnName,
+                                      const NAString &renamedColumnName,
+                                      CollHeap    * heap = PARSERHEAP());
+  
+  // virtual destructor
+  virtual ~StmtDDLAlterTableAlterColumnRename();
+  
+  // cast
+  virtual StmtDDLAlterTableAlterColumnRename * castToStmtDDLAlterTableAlterColumnRename();
+  
+  // accessors
+  NAString getRenamedColumnName() { return renamedColumnName_; }
+  const NAString getRenamedColumnName() const { return renamedColumnName_; }
+  
+  // method for tracing
+  virtual const NAString getText() const;
+  
+private: 
+  // column name
+  NAString renamedColumnName_;
+  
+  //
+  // please do not use the following methods
+  //
+  
+  StmtDDLAlterTableAlterColumnRename();   // DO NOT USE
+  StmtDDLAlterTableAlterColumnRename(const StmtDDLAlterTableAlterColumnRename &);   // DO NOT USE
+  StmtDDLAlterTableAlterColumnRename & operator=(const StmtDDLAlterTableAlterColumnRename &);  // DO NOT USE
+  
+}; // class StmtDDLAlterTableAlterColumnRename
+
 #endif //STMTDDLALTERTABLEALTERCOLUMN_H

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/parser/sqlparser.y
----------------------------------------------------------------------
diff --git a/core/sql/parser/sqlparser.y b/core/sql/parser/sqlparser.y
index 3f61169..5190988 100755
--- a/core/sql/parser/sqlparser.y
+++ b/core/sql/parser/sqlparser.y
@@ -2494,6 +2494,7 @@ static void enableMakeQuotedStringISO88591Mechanism()
 %type <pStmtDDL>  		alter_table_alter_column_default_value 
 %type <pStmtDDL>  		alter_table_alter_column_datatype
 %type <pStmtDDL>  		alter_table_alter_column_set_sg_option 
+%type <pStmtDDL>  		alter_table_alter_column_rename
 %type <boolean>   		alter_column_type //++ MV
 %type <pStmtDDL>  		alter_table_set_constraint_clause
 %type <pStmtDDL>                alter_table_disable_constraint_clause
@@ -31217,9 +31218,11 @@ alter_table_action : add_table_constraint_definition
 		      | alter_table_alter_column_datatype
 			{
       				$$ = $1;
-
 			}
-			
+		      | alter_table_alter_column_rename
+			{
+      				$$ = $1;
+			}
 		      | alter_table_alter_column_default_value 
 			{
       				$$ = $1;
@@ -31298,6 +31301,18 @@ alter_table_alter_column_default_value : TOK_ALTER TOK_COLUMN column_name TOK_DE
                 		       delete $3;
 			       	       restoreInferCharsetState();
 				}
+
+// type pStmtDDL
+alter_table_alter_column_rename : TOK_ALTER TOK_COLUMN column_name TOK_RENAME TOK_TO column_name
+				{
+				  $$ = new (PARSERHEAP())
+                                    StmtDDLAlterTableAlterColumnRename(
+                                         *$3,  // column name
+                                         *$6); // renamed column name
+                                  delete $3;
+                                  delete $6;
+                                  restoreInferCharsetState();
+				}
 				
 // type pStmtDDL
 alter_table_alter_column_set_sg_option : TOK_ALTER TOK_COLUMN column_name TOK_SET sequence_generator_options

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/regress/charsets/DIFF012.KNOWN.SB
----------------------------------------------------------------------
diff --git a/core/sql/regress/charsets/DIFF012.KNOWN.SB b/core/sql/regress/charsets/DIFF012.KNOWN.SB
index 72130ac..7dadfad 100644
--- a/core/sql/regress/charsets/DIFF012.KNOWN.SB
+++ b/core/sql/regress/charsets/DIFF012.KNOWN.SB
@@ -1,2 +1,2 @@
-125d124
+126d125
 < good day_suffix

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/regress/charsets/EXPECTED002
----------------------------------------------------------------------
diff --git a/core/sql/regress/charsets/EXPECTED002 b/core/sql/regress/charsets/EXPECTED002
index 3d40878..c9c8173 100755
--- a/core/sql/regress/charsets/EXPECTED002
+++ b/core/sql/regress/charsets/EXPECTED002
@@ -92,7 +92,7 @@
 >>--no UCS2 strings in a view text
 >>create view nt006v1 as select * from t013 where c > _UCS2'aaaa';
 
-*** ERROR[4082] Object CAT.SCH.T013 does not exist or is inaccessible.
+*** ERROR[4082] Object TRAFODION.SCH.T013 does not exist or is inaccessible.
 
 --- SQL operation failed with errors.
 >>
@@ -143,11 +143,12 @@
 --- SQL operation complete.
 >>invoke t013;
 
--- Definition of table CAT.SCH.T013
--- Definition current  Fri Jul 23 16:05:50 2010
+-- Definition of Trafodion table TRAFODION.SCH.T013
+-- Definition current  Thu Feb 25 10:20:47 2016
 
   (
-    A                                CHAR(10) CHARACTER SET UCS2 COLLATE
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                CHAR(10) CHARACTER SET UCS2 COLLATE
       DEFAULT DEFAULT _UCS2'aa'
   )
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/regress/charsets/EXPECTED003
----------------------------------------------------------------------
diff --git a/core/sql/regress/charsets/EXPECTED003 b/core/sql/regress/charsets/EXPECTED003
index af07866..4aad76f 100755
--- a/core/sql/regress/charsets/EXPECTED003
+++ b/core/sql/regress/charsets/EXPECTED003
@@ -11,18 +11,19 @@
 >>--INVOKE and SHOWDDL work for tables with columns associated with UCS2.
 >>invoke t002;
 
--- Definition of table CAT.SCH.T002
--- Definition current  Fri Apr 23 14:40:12 2010
+-- Definition of Trafodion table TRAFODION.SCH.T002
+-- Definition current  Thu Feb 25 10:23:15 2016
 
   (
-    C                                CHAR(10) CHARACTER SET UCS2 COLLATE
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , C                                CHAR(10) CHARACTER SET UCS2 COLLATE
       DEFAULT DEFAULT NULL
   )
 
 --- SQL operation complete.
 >>showddl t002;
 
-CREATE TABLE CAT.SCH.T002
+CREATE TABLE TRAFODION.SCH.T002
   (
     C                                CHAR(10) CHARACTER SET UCS2 COLLATE
       DEFAULT DEFAULT NULL
@@ -71,7 +72,7 @@ ucs2      iso88591  xxxx
 
 *** ERROR[15001] A syntax error occurred at or before: 
 insert into t002 values(_UNICODE'asdf');
-                        ^ (25 characters from start of SQL statement)
+                              ^ (31 characters from start of SQL statement)
 
 *** ERROR[8822] The statement was not prepared.
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/regress/charsets/EXPECTED012
----------------------------------------------------------------------
diff --git a/core/sql/regress/charsets/EXPECTED012 b/core/sql/regress/charsets/EXPECTED012
index 4574ba5..d38b2df 100755
--- a/core/sql/regress/charsets/EXPECTED012
+++ b/core/sql/regress/charsets/EXPECTED012
@@ -19,7 +19,7 @@
 >>
 >>showddl tlongvarchar0;
 
-CREATE TABLE CAT.SCH.TLONGVARCHAR0
+CREATE TABLE TRAFODION.SCH.TLONGVARCHAR0
   (
     A                                VARCHAR(10) CHARACTER SET UCS2 COLLATE
       DEFAULT DEFAULT NULL
@@ -29,7 +29,7 @@ CREATE TABLE CAT.SCH.TLONGVARCHAR0
 --- SQL operation complete.
 >>showddl tlongwvarchar0;
 
-CREATE TABLE CAT.SCH.TLONGWVARCHAR0
+CREATE TABLE TRAFODION.SCH.TLONGWVARCHAR0
   (
     A                                VARCHAR(50) CHARACTER SET UCS2 COLLATE
       DEFAULT DEFAULT NULL
@@ -39,11 +39,12 @@ CREATE TABLE CAT.SCH.TLONGWVARCHAR0
 --- SQL operation complete.
 >>invoke  tlongwvarchar1;
 
--- Definition of table CAT.SCH.TLONGWVARCHAR1
--- Definition current  Sat Jul 29 13:18:17 2006
+-- Definition of Trafodion table TRAFODION.SCH.TLONGWVARCHAR1
+-- Definition current  Thu Feb 25 10:25:29 2016
 
   (
-    A                                VARCHAR(2000) CHARACTER SET UCS2 COLLATE
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                VARCHAR(2000) CHARACTER SET UCS2 COLLATE
       DEFAULT DEFAULT _UCS2'good day'
   , B                                VARCHAR(2000) CHARACTER SET UCS2 COLLATE
       DEFAULT DEFAULT _UCS2'today'
@@ -120,11 +121,11 @@ tomorrow_suffix
 >>select a || _ucs2'_suffix' from tlongwvarchar1;
 
 (EXPR)
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 --------
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 --------------------------
 
-abc_suffix                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
         
-today_suffix                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
         
-good day_suffix                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
         
+abc_suffix                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
                           
+today_suffix                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
                           
+good day_suffix                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
                           
 
 --- 3 row(s) selected.
 >>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/regress/core/EXPECTED001.SB
----------------------------------------------------------------------
diff --git a/core/sql/regress/core/EXPECTED001.SB b/core/sql/regress/core/EXPECTED001.SB
index 06bdac1..8870be4 100644
--- a/core/sql/regress/core/EXPECTED001.SB
+++ b/core/sql/regress/core/EXPECTED001.SB
@@ -17,7 +17,8 @@
 -- Definition current  Mon Mar  7 19:30:10 2016
 
   (
-    A                                INT DEFAULT NULL
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                INT DEFAULT NULL
   , B                                CHAR(9) CHARACTER SET ISO88591 COLLATE
       DEFAULT DEFAULT NULL
   , C                                INT DEFAULT NULL
@@ -34,7 +35,8 @@
 -- Definition current  Mon Mar  7 19:30:10 2016
 
   (
-    A                                INT DEFAULT NULL
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                INT DEFAULT NULL
   , B                                CHAR(9) CHARACTER SET UCS2 COLLATE DEFAULT
       DEFAULT NULL
   , C                                INT DEFAULT NULL

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/regress/core/EXPECTED037.SB
----------------------------------------------------------------------
diff --git a/core/sql/regress/core/EXPECTED037.SB b/core/sql/regress/core/EXPECTED037.SB
index 144e600..809df01 100755
--- a/core/sql/regress/core/EXPECTED037.SB
+++ b/core/sql/regress/core/EXPECTED037.SB
@@ -75,10 +75,11 @@
 >>invoke table_name;
 
 -- Definition of Trafodion table TRAFODION.SCH.TABLE_NAME
--- Definition current  Fri Aug  8 22:34:29 2014
+-- Definition current  Thu Feb 25 06:24:08 2016
 
   (
-    ABSOLUTE                         INT NO DEFAULT NOT NULL NOT DROPPABLE
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , ABSOLUTE                         INT NO DEFAULT NOT NULL NOT DROPPABLE
   , ACCESS                           INT NO DEFAULT NOT NULL NOT DROPPABLE
   , ANSIVARCHAR                      INT NO DEFAULT NOT NULL NOT DROPPABLE
   , ASCENDING                        INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -223,10 +224,11 @@
 >>invoke system_name;
 
 -- Definition of Trafodion table TRAFODION.SCH.SYSTEM_NAME
--- Definition current  Fri Aug  8 22:34:33 2014
+-- Definition current  Thu Feb 25 06:24:10 2016
 
   (
-    LARGEINT                         INT NO DEFAULT NOT NULL NOT DROPPABLE
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , LARGEINT                         INT NO DEFAULT NOT NULL NOT DROPPABLE
   , LEADING_PRECISION                INT NO DEFAULT NOT NULL NOT DROPPABLE
   , LENGTH                           INT NO DEFAULT NOT NULL NOT DROPPABLE
   , LINE_NUMBER                      INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -648,7 +650,7 @@ SELECT GENERAL GENERAL from (values(0)) GENERAL(GENERAL);
 
 *** ERROR[15001] A syntax error occurred at or before: 
 SELECT IDENTITY IDENTITY from (values(0)) IDENTITY(IDENTITY);
-                       ^ (24 characters from start of SQL statement)
+              ^ (15 characters from start of SQL statement)
 
 *** ERROR[8822] The statement was not prepared.
 
@@ -1010,7 +1012,7 @@ SELECT ROUTINE ROUTINE from (values(0)) ROUTINE(ROUTINE);
 
 *** ERROR[15001] A syntax error occurred at or before: 
 SELECT ROW ROW from (values(0)) ROW(ROW);
-             ^ (14 characters from start of SQL statement)
+         ^ (10 characters from start of SQL statement)
 
 *** ERROR[8822] The statement was not prepared.
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/regress/core/EXPECTED061.SB
----------------------------------------------------------------------
diff --git a/core/sql/regress/core/EXPECTED061.SB b/core/sql/regress/core/EXPECTED061.SB
index 7d026dd..f25fb2a 100755
--- a/core/sql/regress/core/EXPECTED061.SB
+++ b/core/sql/regress/core/EXPECTED061.SB
@@ -10,10 +10,11 @@
 >>invoke t2421;
 
 -- Definition of Trafodion table TRAFODION.SCH.T2421
--- Definition current  Sun Aug 17 13:04:04 2014
+-- Definition current  Thu Feb 25 06:40:41 2016
 
   (
-    A                                DECIMAL(1, 0) UNSIGNED DEFAULT NULL
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                DECIMAL(1, 0) UNSIGNED DEFAULT NULL
   , B                                DECIMAL(1, 1) UNSIGNED DEFAULT NULL
   , C                                DECIMAL(18, 8) DEFAULT NULL
   , D                                DECIMAL(2, 1) DEFAULT NULL
@@ -47,10 +48,11 @@ A  B   C                     D     E    F   H
 >>invoke        t101t2;
 
 -- Definition of Trafodion table TRAFODION.SCH.T101T2
--- Definition current  Sun Aug 17 13:04:07 2014
+-- Definition current  Thu Feb 25 06:40:43 2016
 
   (
-    C01                              CHAR(2) CHARACTER SET ISO88591 COLLATE
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , C01                              CHAR(2) CHARACTER SET ISO88591 COLLATE
       DEFAULT DEFAULT NULL
   , C02                              CHAR(2) CHARACTER SET ISO88591 COLLATE
       DEFAULT DEFAULT NULL
@@ -103,13 +105,14 @@ ab   4    abcdefghijklmnopqrstu  1
 >>invoke t104t2;
 
 -- Definition of Trafodion table TRAFODION.SCH.T104T2
--- Definition current  Sun Aug 17 13:04:09 2014
+-- Definition current  Thu Feb 25 06:40:45 2016
 
   (
     C                                CHAR(15) CHARACTER SET ISO88591 COLLATE
       DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   , D                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (C ASC, D ASC)
 
 --- SQL operation complete.
 >>showddl t104t2;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/regress/core/EXPECTED116
----------------------------------------------------------------------
diff --git a/core/sql/regress/core/EXPECTED116 b/core/sql/regress/core/EXPECTED116
index 42092e2..1128c8e 100644
--- a/core/sql/regress/core/EXPECTED116
+++ b/core/sql/regress/core/EXPECTED116
@@ -335,13 +335,17 @@ A1           C1           B1
 +>   c varchar(4) character set utf8 not null);
 
 --- SQL operation complete.
+>>create view t116v1 as select * from t116t1;
+
+--- SQL operation complete.
 >>invoke t116t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T116T1
--- Definition current  Mon Feb 15 16:04:39 2016
+-- Definition current  Sun Mar 13 00:13:59 2016
 
   (
-    A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   , B                                VARCHAR(2) CHARACTER SET ISO88591 COLLATE
       DEFAULT DEFAULT NULL
   , C                                VARCHAR(4 CHARS) CHARACTER SET UTF8
@@ -352,16 +356,46 @@ A1           C1           B1
 >>begin work;
 
 --- SQL operation complete.
+>>invoke t116t1;
+
+-- Definition of Trafodion table TRAFODION.SCH.T116T1
+-- Definition current  Sun Mar 13 00:13:59 2016
+
+  (
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+  , B                                VARCHAR(2) CHARACTER SET ISO88591 COLLATE
+      DEFAULT DEFAULT NULL
+  , C                                VARCHAR(4 CHARS) CHARACTER SET UTF8
+      COLLATE DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
+  )
+
+--- SQL operation complete.
+>>invoke t116v1;
+
+-- Definition of Trafodion view TRAFODION.SCH.T116V1
+-- Definition current  Sun Mar 13 00:14:00 2016
+
+  (
+    A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+  , B                                VARCHAR(2) CHARACTER SET ISO88591 COLLATE
+      DEFAULT DEFAULT NULL
+  , C                                VARCHAR(4 CHARS) CHARACTER SET UTF8
+      COLLATE DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
+  )
+
+--- SQL operation complete.
 >>alter table t116t1 alter column b varchar(3);
 
 --- SQL operation complete.
 >>invoke t116t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T116T1
--- Definition current  Mon Feb 15 16:04:40 2016
+-- Definition current  Sun Mar 13 00:14:10 2016
 
   (
-    A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   , B                                VARCHAR(3) CHARACTER SET ISO88591 COLLATE
       DEFAULT DEFAULT NULL /*altered_col*/
   , C                                VARCHAR(4 CHARS) CHARACTER SET UTF8
@@ -369,16 +403,31 @@ A1           C1           B1
   )
 
 --- SQL operation complete.
+>>invoke t116v1;
+
+-- Definition of Trafodion view TRAFODION.SCH.T116V1
+-- Definition current  Sun Mar 13 00:14:10 2016
+
+  (
+    A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+  , B                                VARCHAR(3) CHARACTER SET ISO88591 COLLATE
+      DEFAULT DEFAULT NULL
+  , C                                VARCHAR(4 CHARS) CHARACTER SET UTF8
+      COLLATE DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
+  )
+
+--- SQL operation complete.
 >>commit work;
 
 --- SQL operation complete.
 >>invoke t116t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T116T1
--- Definition current  Mon Feb 15 16:04:51 2016
+-- Definition current  Sun Mar 13 00:14:14 2016
 
   (
-    A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   , B                                VARCHAR(3) CHARACTER SET ISO88591 COLLATE
       DEFAULT DEFAULT NULL /*altered_col*/
   , C                                VARCHAR(4 CHARS) CHARACTER SET UTF8
@@ -386,20 +435,64 @@ A1           C1           B1
   )
 
 --- SQL operation complete.
+>>invoke t116v1;
+
+-- Definition of Trafodion view TRAFODION.SCH.T116V1
+-- Definition current  Sun Mar 13 00:14:15 2016
+
+  (
+    A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+  , B                                VARCHAR(3) CHARACTER SET ISO88591 COLLATE
+      DEFAULT DEFAULT NULL
+  , C                                VARCHAR(4 CHARS) CHARACTER SET UTF8
+      COLLATE DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
+  )
+
+--- SQL operation complete.
 >>
 >>begin work;
 
 --- SQL operation complete.
+>>invoke t116t1;
+
+-- Definition of Trafodion table TRAFODION.SCH.T116T1
+-- Definition current  Sun Mar 13 00:14:15 2016
+
+  (
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+  , B                                VARCHAR(3) CHARACTER SET ISO88591 COLLATE
+      DEFAULT DEFAULT NULL /*altered_col*/
+  , C                                VARCHAR(4 CHARS) CHARACTER SET UTF8
+      COLLATE DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
+  )
+
+--- SQL operation complete.
+>>invoke t116v1;
+
+-- Definition of Trafodion view TRAFODION.SCH.T116V1
+-- Definition current  Sun Mar 13 00:14:15 2016
+
+  (
+    A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+  , B                                VARCHAR(3) CHARACTER SET ISO88591 COLLATE
+      DEFAULT DEFAULT NULL
+  , C                                VARCHAR(4 CHARS) CHARACTER SET UTF8
+      COLLATE DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
+  )
+
+--- SQL operation complete.
 >>alter table t116t1 alter column b varchar(4);
 
 --- SQL operation complete.
 >>invoke t116t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T116T1
--- Definition current  Mon Feb 15 16:04:52 2016
+-- Definition current  Sun Mar 13 00:14:25 2016
 
   (
-    A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   , B                                VARCHAR(4) CHARACTER SET ISO88591 COLLATE
       DEFAULT DEFAULT NULL /*altered_col*/
   , C                                VARCHAR(4 CHARS) CHARACTER SET UTF8
@@ -407,6 +500,20 @@ A1           C1           B1
   )
 
 --- SQL operation complete.
+>>invoke t116v1;
+
+-- Definition of Trafodion view TRAFODION.SCH.T116V1
+-- Definition current  Sun Mar 13 00:14:25 2016
+
+  (
+    A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+  , B                                VARCHAR(4) CHARACTER SET ISO88591 COLLATE
+      DEFAULT DEFAULT NULL
+  , C                                VARCHAR(4 CHARS) CHARACTER SET UTF8
+      COLLATE DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
+  )
+
+--- SQL operation complete.
 >>rollback work;
 
 --- SQL operation complete.
@@ -414,10 +521,11 @@ A1           C1           B1
 >>invoke t116t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T116T1
--- Definition current  Mon Feb 15 16:05:01 2016
+-- Definition current  Sun Mar 13 00:14:30 2016
 
   (
-    A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   , B                                VARCHAR(3) CHARACTER SET ISO88591 COLLATE
       DEFAULT DEFAULT NULL /*altered_col*/
   , C                                VARCHAR(4 CHARS) CHARACTER SET UTF8
@@ -425,9 +533,23 @@ A1           C1           B1
   )
 
 --- SQL operation complete.
+>>invoke t116v1;
+
+-- Definition of Trafodion view TRAFODION.SCH.T116V1
+-- Definition current  Sun Mar 13 00:14:30 2016
+
+  (
+    A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+  , B                                VARCHAR(3) CHARACTER SET ISO88591 COLLATE
+      DEFAULT DEFAULT NULL
+  , C                                VARCHAR(4 CHARS) CHARACTER SET UTF8
+      COLLATE DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
+  )
+
+--- SQL operation complete.
 >>
 >>-- concurrent ddl operations
->>drop table if exists t116t1;
+>>drop table if exists t116t1 cascade;
 
 --- SQL operation complete.
 >>begin work;
@@ -472,10 +594,11 @@ End of MXCI Session
 >>invoke t116t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T116T1
--- Definition current  Mon Feb 15 16:05:22 2016
+-- Definition current  Sun Mar 13 00:14:46 2016
 
   (
-    A                                INT DEFAULT NULL
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                INT DEFAULT NULL
   )
 
 --- SQL operation complete.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/regress/core/TEST116
----------------------------------------------------------------------
diff --git a/core/sql/regress/core/TEST116 b/core/sql/regress/core/TEST116
index 9d04754..663a593 100755
--- a/core/sql/regress/core/TEST116
+++ b/core/sql/regress/core/TEST116
@@ -143,22 +143,31 @@ insert into t116t3 values(2,2,'b');
 drop table if exists t116t1;
 create table t116t1(a int not null, b varchar(2), 
    c varchar(4) character set utf8 not null);
+create view t116v1 as select * from t116t1;
 invoke t116t1;
 begin work;
+invoke t116t1;
+invoke t116v1;
 alter table t116t1 alter column b varchar(3);
 invoke t116t1;
+invoke t116v1;
 commit work;
 invoke t116t1;
+invoke t116v1;
 
 begin work;
+invoke t116t1;
+invoke t116v1;
 alter table t116t1 alter column b varchar(4);
 invoke t116t1;
+invoke t116v1;
 rollback work;
 
 invoke t116t1;
+invoke t116v1;
 
 -- concurrent ddl operations
-drop table if exists t116t1;
+drop table if exists t116t1 cascade;
 begin work;
 create table t116t1 (a int);
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/regress/executor/EXPECTED001
----------------------------------------------------------------------
diff --git a/core/sql/regress/executor/EXPECTED001 b/core/sql/regress/executor/EXPECTED001
index cc27d67..26e1f4e 100755
--- a/core/sql/regress/executor/EXPECTED001
+++ b/core/sql/regress/executor/EXPECTED001
@@ -32,11 +32,12 @@
 >>
 >>invoke t001t1;
 
--- Definition of table CAT.SCH.T001T1
--- Definition current  Tue Aug 10 22:34:12 2010
+-- Definition of Trafodion table TRAFODION.SCH.T001T1
+-- Definition current  Thu Feb 25 07:44:34 2016
 
   (
-    A                                INT DEFAULT NULL
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                INT DEFAULT NULL
   , B                                CHAR(9) CHARACTER SET ISO88591 COLLATE
       DEFAULT DEFAULT NULL
   , C                                INT DEFAULT NULL
@@ -47,13 +48,13 @@
 --- SQL operation complete.
 >>invoke t001tn;
 
-*** ERROR[4082] Object CAT.SCH.T001TN does not exist or is inaccessible.
+*** ERROR[4082] Object TRAFODION.SCH.T001TN does not exist or is inaccessible.
 
 --- SQL operation failed with errors.
 >>invoke t001t2;
 
--- Definition of table CAT.SCH.T001T2
--- Definition current  Tue Aug 10 22:34:12 2010
+-- Definition of Trafodion table TRAFODION.SCH.T001T2
+-- Definition current  Thu Feb 25 07:44:36 2016
 
   (
     A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -63,12 +64,13 @@
   , D                                CHAR(4) CHARACTER SET ISO88591 COLLATE
       DEFAULT DEFAULT NULL
   )
+  PRIMARY KEY (A ASC)
 
 --- SQL operation complete.
 >>invoke t001t3;
 
--- Definition of table CAT.SCH.T001T3
--- Definition current  Tue Aug 10 22:34:12 2010
+-- Definition of Trafodion table TRAFODION.SCH.T001T3
+-- Definition current  Thu Feb 25 07:44:38 2016
 
   (
     A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -78,17 +80,19 @@
   , D                                CHAR(4) CHARACTER SET ISO88591 COLLATE
       DEFAULT DEFAULT NULL
   )
+  PRIMARY KEY (A ASC, B ASC)
 
 --- SQL operation complete.
 >>
 >>#ifMX
 >>invoke $$TEST_SCHEMA$$.t001ut1;
 
--- Definition of table CAT.SCH.T001UT1
--- Definition current  Tue Aug 10 22:34:12 2010
+-- Definition of Trafodion table TRAFODION.SCH.T001UT1
+-- Definition current  Thu Feb 25 07:44:38 2016
 
   (
-    A                                INT DEFAULT NULL
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                INT DEFAULT NULL
   , B                                CHAR(9) CHARACTER SET UCS2 COLLATE DEFAULT
       DEFAULT NULL
   , C                                INT DEFAULT NULL
@@ -99,8 +103,8 @@
 --- SQL operation complete.
 >>invoke $$TEST_SCHEMA_NAME$$.t001ut2;
 
--- Definition of table CAT.SCH.T001UT2
--- Definition current  Tue Aug 10 22:34:12 2010
+-- Definition of Trafodion table TRAFODION.SCH.T001UT2
+-- Definition current  Thu Feb 25 07:44:39 2016
 
   (
     A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -110,12 +114,13 @@
   , D                                CHAR(4) CHARACTER SET UCS2 COLLATE DEFAULT
       DEFAULT NULL
   )
+  PRIMARY KEY (A ASC)
 
 --- SQL operation complete.
 >>invoke         t001ut3;
 
--- Definition of table CAT.SCH.T001UT3
--- Definition current  Tue Aug 10 22:34:12 2010
+-- Definition of Trafodion table TRAFODION.SCH.T001UT3
+-- Definition current  Thu Feb 25 07:44:40 2016
 
   (
     A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -125,6 +130,7 @@
   , D                                CHAR(4) CHARACTER SET UCS2 COLLATE DEFAULT
       DEFAULT NULL
   )
+  PRIMARY KEY (A ASC, B ASC)
 
 --- SQL operation complete.
 >>#ifMX
@@ -173,8 +179,8 @@ A            B          C            D
 A            B          C            D   
 -----------  ---------  -----------  ----
 
-         20  defg                30  wx  
          10  abc                 20  xy  
+         20  defg                30  wx  
 
 --- 2 row(s) selected.
 >>select * from t001t3;
@@ -202,8 +208,8 @@ A            B                   C            D
 A            B                   C            D       
 -----------  ------------------  -----------  --------
 
-         20  defg                         30  wx      
          10  abc                          20  xy      
+         20  defg                         30  wx      
 
 --- 2 row(s) selected.
 >>select * from t001ut3;
@@ -211,8 +217,8 @@ A            B                   C            D
 A            B                   C            D       
 -----------  ------------------  -----------  --------
 
-         20  defg                         30  wx      
          10  abc                          20  xy      
+         20  defg                         30  wx      
 
 --- 2 row(s) selected.
 >>#ifMX
@@ -396,10 +402,10 @@ A            D
 A            B                   C            D         A            B                   C            D
 -----------  ------------------  -----------  --------  -----------  ------------------  -----------  --------
 
-         10  abc                          20  xy                 20  defg                         30  wx      
          10  abc                          20  xy                 10  abc                          20  xy      
-         20  defg                         30  wx                 20  defg                         30  wx      
+         10  abc                          20  xy                 20  defg                         30  wx      
          20  defg                         30  wx                 10  abc                          20  xy      
+         20  defg                         30  wx                 20  defg                         30  wx      
 
 --- 4 row(s) selected.
 >>#ifMX
@@ -554,14 +560,14 @@ select a from t001t1 where b like _SJIS'sj';
 >>
 >>select b from t001tn UNION     select d from t001tn;
 
-*** ERROR[4082] Object CAT.SCH.T001TN does not exist or is inaccessible.
+*** ERROR[4082] Object TRAFODION.SCH.T001TN does not exist or is inaccessible.
 
 *** ERROR[8822] The statement was not prepared.
 
 >>			-- not comparable
 >>select b from t001tn UNION ALL select d from t001tn;
 
-*** ERROR[4082] Object CAT.SCH.T001TN does not exist or is inaccessible.
+*** ERROR[4082] Object TRAFODION.SCH.T001TN does not exist or is inaccessible.
 
 *** ERROR[8822] The statement was not prepared.
 
@@ -569,7 +575,7 @@ select a from t001t1 where b like _SJIS'sj';
 >>select * from (
 +>  select b from t001tn UNION ALL select d from t001tn) u(b) where b='x';
 
-*** ERROR[4082] Object CAT.SCH.T001TN does not exist or is inaccessible.
+*** ERROR[4082] Object TRAFODION.SCH.T001TN does not exist or is inaccessible.
 
 *** ERROR[8822] The statement was not prepared.
 
@@ -577,7 +583,7 @@ select a from t001t1 where b like _SJIS'sj';
 >>select * from (
 +>  select b from t001tn UNION ALL select d from t001tn) u(b) where b=(select b from t001tn);
 
-*** ERROR[4082] Object CAT.SCH.T001TN does not exist or is inaccessible.
+*** ERROR[4082] Object TRAFODION.SCH.T001TN does not exist or is inaccessible.
 
 *** ERROR[8822] The statement was not prepared.
 
@@ -586,7 +592,7 @@ select a from t001t1 where b like _SJIS'sj';
 
 *** WARNING[3169] SJIS is not a known collation.
 
-*** ERROR[4082] Object CAT.SCH.T001TN does not exist or is inaccessible.
+*** ERROR[4082] Object TRAFODION.SCH.T001TN does not exist or is inaccessible.
 
 *** ERROR[8822] The statement was not prepared.
 
@@ -595,7 +601,7 @@ select a from t001t1 where b like _SJIS'sj';
 
 *** WARNING[3169] SJIS is not a known collation.
 
-*** ERROR[4082] Object CAT.SCH.T001TN does not exist or is inaccessible.
+*** ERROR[4082] Object TRAFODION.SCH.T001TN does not exist or is inaccessible.
 
 *** ERROR[8822] The statement was not prepared.
 
@@ -605,7 +611,7 @@ select a from t001t1 where b like _SJIS'sj';
 
 *** WARNING[3169] SJIS is not a known collation.
 
-*** ERROR[4082] Object CAT.SCH.T001TN does not exist or is inaccessible.
+*** ERROR[4082] Object TRAFODION.SCH.T001TN does not exist or is inaccessible.
 
 *** ERROR[8822] The statement was not prepared.
 
@@ -613,7 +619,7 @@ select a from t001t1 where b like _SJIS'sj';
 
 *** WARNING[3169] XYZW is not a known collation.
 
-*** ERROR[4082] Object CAT.SCH.T001TN does not exist or is inaccessible.
+*** ERROR[4082] Object TRAFODION.SCH.T001TN does not exist or is inaccessible.
 
 *** ERROR[8822] The statement was not prepared.
 
@@ -622,7 +628,7 @@ select a from t001t1 where b like _SJIS'sj';
 
 *** WARNING[3169] XYZW is not a known collation.
 
-*** ERROR[4082] Object CAT.SCH.T001TN does not exist or is inaccessible.
+*** ERROR[4082] Object TRAFODION.SCH.T001TN does not exist or is inaccessible.
 
 *** ERROR[8822] The statement was not prepared.
 
@@ -663,8 +669,8 @@ A            A
 A            A          
 -----------  -----------
 
-         10           20
          10           10
+         10           20
          20           10
 
 --- 3 row(s) selected.
@@ -675,8 +681,8 @@ A            A
 A            A          
 -----------  -----------
 
-         10           20
          10           10
+         10           20
          20           10
 
 --- 3 row(s) selected.
@@ -696,10 +702,10 @@ A            A
 A            B          C            D     A            B          C            D
 -----------  ---------  -----------  ----  -----------  ---------  -----------  ----
 
-         10  abc                 20  xy             20  defg                30  wx  
          10  abc                 20  xy             10  abc                 20  xy  
-         20  defg                30  wx             20  defg                30  wx  
+         10  abc                 20  xy             20  defg                30  wx  
          20  defg                30  wx             10  abc                 20  xy  
+         20  defg                30  wx             20  defg                30  wx  
 
 --- 4 row(s) selected.
 >>
@@ -737,8 +743,8 @@ A
 A            B        
 -----------  ---------
 
-         20  defg     
          10  abc      
+         20  defg     
 
 --- 2 row(s) selected.
 >>
@@ -766,8 +772,8 @@ A
 A          
 -----------
 
-         20
          10
+         20
 
 --- 2 row(s) selected.
 >>select x.a, x.b from (select a, b, c from t001ut1 natural join t001ut2) x join t001ut3
@@ -886,8 +892,8 @@ A            B          C            D
 A            B          C            D   
 -----------  ---------  -----------  ----
 
-         20  gfe                 31  wx  
          10  abc                 20  xy  
+         20  gfe                 31  wx  
 
 --- 2 row(s) selected.
 >>
@@ -914,8 +920,8 @@ A            B                   C            D
 A            B                   C            D       
 -----------  ------------------  -----------  --------
 
-         20  gfe                          31  wx      
          10  abc                          20  xy      
+         20  gfe                          31  wx      
 
 --- 2 row(s) selected.
 >>#ifMX


[4/9] incubator-trafodion git commit: JIRA 1849 Add support for alter column rename (details below)

Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/regress/executor/EXPECTED013.SB
----------------------------------------------------------------------
diff --git a/core/sql/regress/executor/EXPECTED013.SB b/core/sql/regress/executor/EXPECTED013.SB
index 808f9ef..b83960c 100644
--- a/core/sql/regress/executor/EXPECTED013.SB
+++ b/core/sql/regress/executor/EXPECTED013.SB
@@ -21,10 +21,11 @@
 >>invoke t013t1;
 
 -- Definition of Trafodion table TRAFODION.T013_SCH.T013T1
--- Definition current  Sun Feb 21 07:35:15 2016
+-- Definition current  Sat Mar 12 07:39:38 2016
 
   (
-    A                                INT DEFAULT NULL
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                INT DEFAULT NULL
   )
 
 --- SQL operation complete.
@@ -49,12 +50,13 @@ A
 >>invoke t013t1;
 
 -- Definition of Trafodion volatile table T013T1
--- Definition current  Sun Feb 21 07:35:27 2016
+-- Definition current  Sat Mar 12 07:39:53 2016
 
   (
     A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   , B                                INT DEFAULT NULL
   )
+  PRIMARY KEY (A ASC)
 
 --- SQL operation complete.
 >>insert into t013t1 values (1,2);
@@ -111,10 +113,11 @@ A
 >>invoke t013t1;
 
 -- Definition of Trafodion table TRAFODION.T013_SCH.T013T1
--- Definition current  Sun Feb 21 07:36:26 2016
+-- Definition current  Sat Mar 12 07:40:59 2016
 
   (
-    A                                INT DEFAULT NULL
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                INT DEFAULT NULL
   )
 
 --- SQL operation complete.
@@ -136,13 +139,14 @@ A
 >>invoke t013t1;
 
 -- Definition of Trafodion volatile table T013T1
--- Definition current  Sun Feb 21 07:36:38 2016
+-- Definition current  Sat Mar 12 07:41:18 2016
 
   (
     A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   , B                                INT DEFAULT NULL
   , C                                INT DEFAULT NULL
   )
+  PRIMARY KEY (A ASC)
 
 --- SQL operation complete.
 >>insert into t013t1 values (1,2,3);
@@ -175,10 +179,11 @@ A            B            C
 >>invoke t013t1;
 
 -- Definition of Trafodion table TRAFODION.T013_SCH.T013T1
--- Definition current  Sun Feb 21 07:36:52 2016
+-- Definition current  Sat Mar 12 07:41:32 2016
 
   (
-    A                                INT DEFAULT NULL
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                INT DEFAULT NULL
   )
 
 --- SQL operation complete.
@@ -197,7 +202,7 @@ A
 >>invoke t013t1;
 
 -- Definition of Trafodion volatile table T013T1
--- Definition current  Sun Feb 21 07:36:58 2016
+-- Definition current  Sat Mar 12 07:41:38 2016
 
   (
     A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -205,6 +210,7 @@ A
   , C                                INT DEFAULT NULL
   , D                                INT DEFAULT NULL
   )
+  PRIMARY KEY (A ASC)
 
 --- SQL operation complete.
 >>insert into t013t1 values (1,2,3,4);
@@ -335,7 +341,7 @@ CREATE VIEW TRAFODION.T013_SCH.TEMPV AS
 >>-- this will return an error, no permanent table exists
 >>alter table t013t2 add column z int default 0 not null;
 
-*** ERROR[4082] Object TRAFODION.T013_SCH.T013T2 does not exist or is inaccessible.
+*** ERROR[1146] Object TRAFODION.T013_SCH.T013T2 could not be altered because it either does not exist or is not a table.
 
 --- SQL operation failed with errors.
 >>
@@ -449,10 +455,11 @@ CONTROL QUERY DEFAULT
 >>invoke t013t1;
 
 -- Definition of Trafodion table TRAFODION.T013_SCH.T013T1
--- Definition current  Sun Feb 21 07:37:55 2016
+-- Definition current  Sat Mar 12 07:42:40 2016
 
   (
-    A                                INT DEFAULT NULL
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                INT DEFAULT NULL
   , Z                                INT DEFAULT 0 NOT NULL NOT DROPPABLE
       /*added_col*/
   )
@@ -469,10 +476,11 @@ CONTROL QUERY DEFAULT
 >>invoke t013t1;
 
 -- Definition of Trafodion table TRAFODION.T013_SCH.T013T1
--- Definition current  Sun Feb 21 07:38:00 2016
+-- Definition current  Sat Mar 12 07:42:49 2016
 
   (
-    A                                INT DEFAULT NULL
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                INT DEFAULT NULL
   , Z                                INT DEFAULT 0 NOT NULL NOT DROPPABLE
       /*added_col*/
   )
@@ -560,10 +568,11 @@ control query shape nested_join(anything,anything);
 >>invoke t013t3;
 
 -- Definition of Trafodion table TRAFODION.T013SCH1.T013T3
--- Definition current  Sun Feb 21 07:38:45 2016
+-- Definition current  Sat Mar 12 07:43:35 2016
 
   (
-    A                                INT DEFAULT NULL
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                INT DEFAULT NULL
   , B                                INT DEFAULT NULL
   )
 
@@ -577,11 +586,12 @@ control query shape nested_join(anything,anything);
 >>invoke t013t3;
 
 -- Definition of Trafodion volatile table T013T3
--- Definition current  Sun Feb 21 07:38:50 2016
+-- Definition current  Sat Mar 12 07:43:40 2016
 
   (
     A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (A ASC)
 
 --- SQL operation complete.
 >>
@@ -592,10 +602,11 @@ control query shape nested_join(anything,anything);
 >>invoke t013t3;
 
 -- Definition of Trafodion table TRAFODION.T013SCH1.T013T3
--- Definition current  Sun Feb 21 07:39:03 2016
+-- Definition current  Sat Mar 12 07:43:52 2016
 
   (
-    A                                INT DEFAULT NULL
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                INT DEFAULT NULL
   , B                                INT DEFAULT NULL
   )
 
@@ -657,10 +668,11 @@ CREATE VOLATILE TABLE T013T3
 >>invoke t013t3;
 
 -- Definition of Trafodion table TRAFODION.T013SCH1.T013T3
--- Definition current  Sun Feb 21 07:39:46 2016
+-- Definition current  Sat Mar 12 07:44:35 2016
 
   (
-    A                                INT DEFAULT NULL
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                INT DEFAULT NULL
   , B                                INT DEFAULT NULL
   )
 
@@ -1278,10 +1290,11 @@ CREATE VOLATILE TABLE T013T1
 >>invoke t013t1;
 
 -- Definition of Trafodion table TRAFODION.T013_SCH.T013T1
--- Definition current  Sun Feb 21 07:46:01 2016
+-- Definition current  Sat Mar 12 07:51:06 2016
 
   (
-    A                                INT DEFAULT NULL
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                INT DEFAULT NULL
   , Z                                INT DEFAULT 0 NOT NULL NOT DROPPABLE
       /*added_col*/
   )

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/regress/executor/EXPECTED014.SB
----------------------------------------------------------------------
diff --git a/core/sql/regress/executor/EXPECTED014.SB b/core/sql/regress/executor/EXPECTED014.SB
index ad663f0..2615fc5 100755
--- a/core/sql/regress/executor/EXPECTED014.SB
+++ b/core/sql/regress/executor/EXPECTED014.SB
@@ -12,11 +12,12 @@
 >>log;
 >>invoke t014t1t;
 
--- Definition of Seabase table CAT.SCH.T014T1T
--- Definition current  Thu Mar 22 15:48:07 2012
+-- Definition of Trafodion table TRAFODION.SCH.T014T1T
+-- Definition current  Thu Feb 25 08:03:23 2016
 
   (
-    A                                INT DEFAULT NULL
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                INT DEFAULT NULL
   , B                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   )
 
@@ -39,11 +40,12 @@ A            B
 --- 2 row(s) inserted.
 >>invoke t014t1t;
 
--- Definition of Seabase table CAT.SCH.T014T1T
--- Definition current  Thu Mar 22 15:48:11 2012
+-- Definition of Trafodion table TRAFODION.SCH.T014T1T
+-- Definition current  Thu Feb 25 08:03:30 2016
 
   (
-    A                                INT DEFAULT NULL
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                INT DEFAULT NULL
   , B                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   )
 
@@ -66,11 +68,12 @@ A            B
 --- 2 row(s) inserted.
 >>invoke t014t1t;
 
--- Definition of Seabase table CAT.SCH.T014T1T
--- Definition current  Thu Mar 22 15:48:15 2012
+-- Definition of Trafodion table TRAFODION.SCH.T014T1T
+-- Definition current  Thu Feb 25 08:03:35 2016
 
   (
-    A                                LARGEINT DEFAULT NULL
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                LARGEINT DEFAULT NULL
   , B                                DOUBLE PRECISION NO DEFAULT NOT NULL NOT
       DROPPABLE
   )
@@ -94,11 +97,12 @@ A                     B
 --- 2 row(s) inserted.
 >>invoke t014t1t;
 
--- Definition of Seabase table CAT.SCH.T014T1T
--- Definition current  Thu Mar 22 15:48:18 2012
+-- Definition of Trafodion table TRAFODION.SCH.T014T1T
+-- Definition current  Thu Feb 25 08:03:42 2016
 
   (
-    C                                INT DEFAULT NULL
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , C                                INT DEFAULT NULL
   , D                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   )
 
@@ -121,11 +125,12 @@ C            D
 --- 2 row(s) inserted.
 >>invoke t014t1t;
 
--- Definition of Seabase table CAT.SCH.T014T1T
--- Definition current  Thu Mar 22 15:48:22 2012
+-- Definition of Trafodion table TRAFODION.SCH.T014T1T
+-- Definition current  Thu Feb 25 08:03:46 2016
 
   (
-    C                                INT DEFAULT NULL
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , C                                INT DEFAULT NULL
   , D                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   )
 
@@ -148,11 +153,12 @@ C            D
 --- 2 row(s) inserted.
 >>invoke t014t1t;
 
--- Definition of Seabase table CAT.SCH.T014T1T
--- Definition current  Thu Mar 22 15:48:26 2012
+-- Definition of Trafodion table TRAFODION.SCH.T014T1T
+-- Definition current  Thu Feb 25 08:03:51 2016
 
   (
-    C                                NUMERIC(11, 0) DEFAULT NULL
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , C                                NUMERIC(11, 0) DEFAULT NULL
   , D                                NUMERIC(11, 0) NO DEFAULT NOT NULL NOT
       DROPPABLE
   )
@@ -176,11 +182,12 @@ C                     D
 --- 2 row(s) inserted.
 >>invoke t014t1t;
 
--- Definition of Seabase table CAT.SCH.T014T1T
--- Definition current  Thu Mar 22 15:48:29 2012
+-- Definition of Trafodion table TRAFODION.SCH.T014T1T
+-- Definition current  Thu Feb 25 08:03:55 2016
 
   (
-    C                                NUMERIC(11, 0) DEFAULT NULL
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , C                                NUMERIC(11, 0) DEFAULT NULL
   , D                                NUMERIC(11, 0) NO DEFAULT NOT NULL NOT
       DROPPABLE
   )
@@ -204,11 +211,12 @@ C                     D
 --- 2 row(s) inserted.
 >>invoke t014t1t;
 
--- Definition of Seabase table CAT.SCH.T014T1T
--- Definition current  Thu Mar 22 15:48:33 2012
+-- Definition of Trafodion table TRAFODION.SCH.T014T1T
+-- Definition current  Thu Feb 25 08:04:00 2016
 
   (
-    A                                INT DEFAULT NULL
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                INT DEFAULT NULL
   , B                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   )
 
@@ -234,11 +242,12 @@ A            B
 --- 2 row(s) inserted.
 >>invoke t014t1t;
 
--- Definition of Seabase table CAT.SCH.T014T1T
--- Definition current  Thu Mar 22 15:48:36 2012
+-- Definition of Trafodion table TRAFODION.SCH.T014T1T
+-- Definition current  Thu Feb 25 08:04:04 2016
 
   (
-    A                                INT DEFAULT NULL
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                INT DEFAULT NULL
   , B                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   )
 
@@ -272,7 +281,7 @@ A            B
 --- 2 row(s) inserted.
 >>showddl t014t1t;
 
-CREATE TABLE CAT.SCH.T014T1T
+CREATE TABLE TRAFODION.SCH.T014T1T
   (
     A                                INT DEFAULT NULL
   , B                                INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -299,7 +308,7 @@ A            B
 --- 2 row(s) inserted.
 >>showddl t014t1t;
 
-CREATE TABLE CAT.SCH.T014T1T
+CREATE TABLE TRAFODION.SCH.T014T1T
   (
     C                                INT DEFAULT NULL
   , D                                INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -326,7 +335,7 @@ C            D
 --- 2 row(s) inserted.
 >>showddl t014t1t;
 
-CREATE TABLE CAT.SCH.T014T1T
+CREATE TABLE TRAFODION.SCH.T014T1T
   (
     C                                INT DEFAULT NULL
   , D                                INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -353,7 +362,7 @@ C            D
 --- 2 row(s) inserted.
 >>showddl t014t1t;
 
-CREATE TABLE CAT.SCH.T014T1T
+CREATE TABLE TRAFODION.SCH.T014T1T
   (
     A                                INT DEFAULT NULL
   , B                                INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -408,7 +417,7 @@ A            B
 
 *** ERROR[15001] A syntax error occurred at or before: 
 create schema tempsch create table t014t1 as select * from t014t1s;
-                                                                  ^ (67 characters from start of SQL statement)
+                           ^ (28 characters from start of SQL statement)
 
 *** ERROR[8822] The statement was not prepared.
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/regress/executor/EXPECTED016.SB
----------------------------------------------------------------------
diff --git a/core/sql/regress/executor/EXPECTED016.SB b/core/sql/regress/executor/EXPECTED016.SB
index 1d60ec5..c6306f5 100644
--- a/core/sql/regress/executor/EXPECTED016.SB
+++ b/core/sql/regress/executor/EXPECTED016.SB
@@ -71,7 +71,8 @@
 -- Definition current  Wed May 14 05:01:26 2014
 
   (
-    A                                NUMERIC(10, 0) UNSIGNED DEFAULT NULL
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                NUMERIC(10, 0) UNSIGNED DEFAULT NULL
   , B                                NUMERIC(18, 0) UNSIGNED NO DEFAULT NOT
       NULL NOT DROPPABLE
   , C                                NUMERIC(20, 0) DEFAULT
@@ -135,6 +136,7 @@ CREATE TABLE TRAFODION.SCH.T016T1
       NULL NOT DROPPABLE
   , C                                NUMERIC(21, 21) DEFAULT NULL
   )
+  PRIMARY KEY (A ASC, B ASC)
 
 --- SQL operation complete.
 >>showddl t016t2;
@@ -382,7 +384,8 @@ A                                          B                      C
 -- Definition current  Wed May 14 05:01:40 2014
 
   (
-    A                                NUMERIC(10, 0) UNSIGNED DEFAULT NULL
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                NUMERIC(10, 0) UNSIGNED DEFAULT NULL
   , B                                NUMERIC(18, 0) UNSIGNED NO DEFAULT NOT
       NULL NOT DROPPABLE
   , C                                NUMERIC(20, 0) DEFAULT NULL
@@ -416,7 +419,8 @@ A                                          B                      C
 -- Definition current  Wed May 14 05:01:42 2014
 
   (
-    JJ                               NUMERIC(128, 0) UNSIGNED DEFAULT NULL
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , JJ                               NUMERIC(128, 0) UNSIGNED DEFAULT NULL
   , KF                               NUMERIC(128, 0) DEFAULT NULL
   )
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/regress/executor/EXPECTED122
----------------------------------------------------------------------
diff --git a/core/sql/regress/executor/EXPECTED122 b/core/sql/regress/executor/EXPECTED122
index f011381..c372676 100644
--- a/core/sql/regress/executor/EXPECTED122
+++ b/core/sql/regress/executor/EXPECTED122
@@ -65,10 +65,11 @@ A
 >>invoke t122t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T122T1
--- Definition current  Wed Apr 22 14:46:39 2015
+-- Definition current  Thu Feb 25 08:40:12 2016
 
   (
-    A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   )
 
 --- SQL operation complete.
@@ -117,10 +118,11 @@ A
 >>execute s3;
 
 -- Definition of Trafodion table TRAFODION.SCH.T122T1
--- Definition current  Wed Apr 22 14:46:39 2015
+-- Definition current  Thu Feb 25 08:40:13 2016
 
   (
-    A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   )
 
 --- SQL operation complete.
@@ -176,10 +178,11 @@ iv
 >>invoke t122t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T122T1
--- Definition current  Wed Apr 22 14:46:59 2015
+-- Definition current  Thu Feb 25 08:40:32 2016
 
   (
-    A                                CHAR(4) CHARACTER SET ISO88591 COLLATE
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                CHAR(4) CHARACTER SET ISO88591 COLLATE
       DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   )
 
@@ -226,10 +229,11 @@ iv
 
 
 -- Definition of Trafodion table TRAFODION.SCH.T122T1
--- Definition current  Wed Apr 22 14:47:01 2015
+-- Definition current  Thu Feb 25 08:40:34 2016
 
   (
-    A                                CHAR(4) CHARACTER SET ISO88591 COLLATE
+    SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
+  , A                                CHAR(4) CHARACTER SET ISO88591 COLLATE
       DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   )
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/regress/hive/EXPECTED009
----------------------------------------------------------------------
diff --git a/core/sql/regress/hive/EXPECTED009 b/core/sql/regress/hive/EXPECTED009
index 0f4be9e..df03c8e 100644
--- a/core/sql/regress/hive/EXPECTED009
+++ b/core/sql/regress/hive/EXPECTED009
@@ -82,6 +82,7 @@ CREATE EXTERNAL TABLE TRAFODION."_HV_HIVE_".CUSTOMER
   , C_LAST_REVIEW_DATE               VARCHAR(32000 BYTES) CHARACTER SET UTF8
       COLLATE DEFAULT DEFAULT NULL
   )
+ ATTRIBUTES NO AUDIT
 ;
 
 --- SQL operation complete.
@@ -124,6 +125,7 @@ CREATE EXTERNAL TABLE TRAFODION."_HV_HIVE_".ITEM
   , I_PRODUCT_NAME                   VARCHAR(32000 BYTES) CHARACTER SET UTF8
       COLLATE DEFAULT DEFAULT NULL
   )
+ ATTRIBUTES NO AUDIT
 ;
 
 --- SQL operation complete.
@@ -164,6 +166,7 @@ CREATE EXTERNAL TABLE TRAFODION."_HV_HIVE_".PROMOTION
   , P_DISCOUNT_ACTIVE                VARCHAR(32000 BYTES) CHARACTER SET UTF8
       COLLATE DEFAULT DEFAULT NULL
   )
+ ATTRIBUTES NO AUDIT
 ;
 
 --- SQL operation complete.
@@ -193,6 +196,7 @@ CREATE EXTERNAL TABLE TRAFODION."_HV_SCH_T009_".T009T1
   , B                                INT DEFAULT NULL
   , C                                INT DEFAULT NULL
   )
+ ATTRIBUTES NO AUDIT
 ;
 
 --- SQL operation complete.
@@ -204,6 +208,7 @@ CREATE EXTERNAL TABLE TRAFODION."_HV_SCH_T009_".T009T2
   , B                                INT DEFAULT NULL
   , C                                INT DEFAULT NULL
   )
+ ATTRIBUTES NO AUDIT
 ;
 
 --- SQL operation complete.
@@ -520,6 +525,7 @@ CREATE EXTERNAL TABLE TRAFODION."_HB__ROW__"."baseball"
   , COLUMN_DETAILS                   VARCHAR(10000) CHARACTER SET ISO88591
       COLLATE DEFAULT DEFAULT NULL NOT NULL NOT DROPPABLE
   )
+ ATTRIBUTES NO AUDIT
 ;
 
 --- SQL operation complete.
@@ -538,6 +544,7 @@ CREATE EXTERNAL TABLE TRAFODION."_HB__CELL__"."baseball"
   , COL_VALUE                        VARCHAR(1000) CHARACTER SET ISO88591
       COLLATE DEFAULT DEFAULT NULL NOT NULL NOT DROPPABLE
   )
+ ATTRIBUTES NO AUDIT
 ;
 
 --- SQL operation complete.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/regress/hive/EXPECTED017
----------------------------------------------------------------------
diff --git a/core/sql/regress/hive/EXPECTED017 b/core/sql/regress/hive/EXPECTED017
index 34ce3fd..2e746b7 100644
--- a/core/sql/regress/hive/EXPECTED017
+++ b/core/sql/regress/hive/EXPECTED017
@@ -322,6 +322,7 @@ CREATE TABLE TRAFODION.HBASE.T017TTCIDXB
   , A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
   , PRIMARY KEY ("B@" ASC, "_SALT_" ASC, A ASC)
   )
+ ATTRIBUTES ALIGNED FORMAT
 ;
 
 --- SQL operation complete.
@@ -474,6 +475,7 @@ CREATE TABLE TRAFODION.HBASE.T017TTDIDXB
   , SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
   , PRIMARY KEY ("B@" ASC, A ASC, SYSKEY ASC)
   )
+ ATTRIBUTES ALIGNED FORMAT
 ;
 
 --- SQL operation complete.
@@ -616,6 +618,7 @@ CREATE TABLE TRAFODION.HBASE.T017TTEIDXB
   , SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
   , PRIMARY KEY ("B@" ASC, SYSKEY ASC)
   )
+ ATTRIBUTES ALIGNED FORMAT
 ;
 
 --- SQL operation complete.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d406cc52/core/sql/regress/privs1/EXPECTED132
----------------------------------------------------------------------
diff --git a/core/sql/regress/privs1/EXPECTED132 b/core/sql/regress/privs1/EXPECTED132
index ea090c5..0e9828c 100644
--- a/core/sql/regress/privs1/EXPECTED132
+++ b/core/sql/regress/privs1/EXPECTED132
@@ -863,7 +863,7 @@ CREATE SEQUENCE TRAFODION.T132SCH.T132_TEAM_NUMBER_SEQUENCE
 >>invoke t132_games;
 
 -- Definition of Trafodion table TRAFODION.T132SCH.T132_GAMES
--- Definition current  Sat Feb 13 01:27:45 2016
+-- Definition current  Thu Feb 25 11:15:40 2016
 
   (
     HOME_TEAM_NUMBER                 INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -874,12 +874,13 @@ CREATE SEQUENCE TRAFODION.T132SCH.T132_TEAM_NUMBER_SEQUENCE
   , GAME_LOCATION                    VARCHAR(50) CHARACTER SET ISO88591 COLLATE
       DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (GAME_NUMBER ASC)
 
 --- SQL operation complete.
 >>invoke t132_teams;
 
 -- Definition of Trafodion table TRAFODION.T132SCH.T132_TEAMS
--- Definition current  Sat Feb 13 01:27:47 2016
+-- Definition current  Thu Feb 25 11:15:42 2016
 
   (
     TEAM_NUMBER                      INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -890,12 +891,13 @@ CREATE SEQUENCE TRAFODION.T132SCH.T132_TEAM_NUMBER_SEQUENCE
   , TEAM_CONTACT_NUMBER              CHAR(10) CHARACTER SET ISO88591 COLLATE
       DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (TEAM_NUMBER ASC)
 
 --- SQL operation complete.
 >>invoke t132_giants_games;
 
 -- Definition of Trafodion view TRAFODION.T132SCH.T132_GIANTS_GAMES
--- Definition current  Sat Feb 13 01:27:49 2016
+-- Definition current  Thu Feb 25 11:15:43 2016
 
   (
     GAME_NUMBER                      INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -909,7 +911,7 @@ CREATE SEQUENCE TRAFODION.T132SCH.T132_TEAM_NUMBER_SEQUENCE
 >>invoke t132_home_teams_games;
 
 -- Definition of Trafodion view TRAFODION.T132SCH.T132_HOME_TEAMS_GAMES
--- Definition current  Sat Feb 13 01:27:50 2016
+-- Definition current  Thu Feb 25 11:15:45 2016
 
   (
     TEAM_NUMBER                      INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -979,7 +981,7 @@ ALTER TABLE TRAFODION.T132SCH.T132_GAMES ADD CONSTRAINT
 >>invoke t132_games;
 
 -- Definition of Trafodion table TRAFODION.T132SCH.T132_GAMES
--- Definition current  Sat Feb 13 01:28:08 2016
+-- Definition current  Thu Feb 25 11:16:00 2016
 
   (
     HOME_TEAM_NUMBER                 INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -990,6 +992,7 @@ ALTER TABLE TRAFODION.T132SCH.T132_GAMES ADD CONSTRAINT
   , GAME_LOCATION                    VARCHAR(50) CHARACTER SET ISO88591 COLLATE
       DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (GAME_NUMBER ASC)
 
 --- SQL operation complete.
 >>invoke t132_teams;
@@ -1173,7 +1176,7 @@ CREATE SEQUENCE TRAFODION.T132SCH.T132_TEAM_NUMBER_SEQUENCE
 >>invoke t132_games;
 
 -- Definition of Trafodion table TRAFODION.T132SCH.T132_GAMES
--- Definition current  Sat Feb 13 01:28:45 2016
+-- Definition current  Thu Feb 25 11:16:33 2016
 
   (
     HOME_TEAM_NUMBER                 INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -1184,12 +1187,13 @@ CREATE SEQUENCE TRAFODION.T132SCH.T132_TEAM_NUMBER_SEQUENCE
   , GAME_LOCATION                    VARCHAR(50) CHARACTER SET ISO88591 COLLATE
       DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (GAME_NUMBER ASC)
 
 --- SQL operation complete.
 >>invoke t132_teams;
 
 -- Definition of Trafodion table TRAFODION.T132SCH.T132_TEAMS
--- Definition current  Sat Feb 13 01:28:45 2016
+-- Definition current  Thu Feb 25 11:16:33 2016
 
   (
     TEAM_NUMBER                      INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -1200,12 +1204,13 @@ CREATE SEQUENCE TRAFODION.T132SCH.T132_TEAM_NUMBER_SEQUENCE
   , TEAM_CONTACT_NUMBER              CHAR(10) CHARACTER SET ISO88591 COLLATE
       DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (TEAM_NUMBER ASC)
 
 --- SQL operation complete.
 >>invoke t132_giants_games;
 
 -- Definition of Trafodion view TRAFODION.T132SCH.T132_GIANTS_GAMES
--- Definition current  Sat Feb 13 01:28:45 2016
+-- Definition current  Thu Feb 25 11:16:33 2016
 
   (
     GAME_NUMBER                      INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -1219,7 +1224,7 @@ CREATE SEQUENCE TRAFODION.T132SCH.T132_TEAM_NUMBER_SEQUENCE
 >>invoke t132_home_teams_games;
 
 -- Definition of Trafodion view TRAFODION.T132SCH.T132_HOME_TEAMS_GAMES
--- Definition current  Sat Feb 13 01:28:45 2016
+-- Definition current  Thu Feb 25 11:16:33 2016
 
   (
     TEAM_NUMBER                      INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -1299,7 +1304,7 @@ ALTER TABLE TRAFODION.T132SCH.T132_TEAMS ADD CONSTRAINT
 >>invoke t132_teams;
 
 -- Definition of Trafodion table TRAFODION.T132SCH.T132_TEAMS
--- Definition current  Sat Feb 13 01:29:10 2016
+-- Definition current  Thu Feb 25 11:16:51 2016
 
   (
     TEAM_NUMBER                      INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -1310,6 +1315,7 @@ ALTER TABLE TRAFODION.T132SCH.T132_TEAMS ADD CONSTRAINT
   , TEAM_CONTACT_NUMBER              CHAR(10) CHARACTER SET ISO88591 COLLATE
       DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (TEAM_NUMBER ASC)
 
 --- SQL operation complete.
 >>invoke t132_giants_games;
@@ -1447,7 +1453,7 @@ CREATE SEQUENCE TRAFODION.T132SCH.T132_TEAM_NUMBER_SEQUENCE
 >>invoke t132_games;
 
 -- Definition of Trafodion table TRAFODION.T132SCH.T132_GAMES
--- Definition current  Sat Feb 13 01:29:32 2016
+-- Definition current  Thu Feb 25 11:17:10 2016
 
   (
     HOME_TEAM_NUMBER                 INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -1458,12 +1464,13 @@ CREATE SEQUENCE TRAFODION.T132SCH.T132_TEAM_NUMBER_SEQUENCE
   , GAME_LOCATION                    VARCHAR(50) CHARACTER SET ISO88591 COLLATE
       DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (GAME_NUMBER ASC)
 
 --- SQL operation complete.
 >>invoke t132_teams;
 
 -- Definition of Trafodion table TRAFODION.T132SCH.T132_TEAMS
--- Definition current  Sat Feb 13 01:29:32 2016
+-- Definition current  Thu Feb 25 11:17:10 2016
 
   (
     TEAM_NUMBER                      INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -1474,12 +1481,13 @@ CREATE SEQUENCE TRAFODION.T132SCH.T132_TEAM_NUMBER_SEQUENCE
   , TEAM_CONTACT_NUMBER              CHAR(10) CHARACTER SET ISO88591 COLLATE
       DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (TEAM_NUMBER ASC)
 
 --- SQL operation complete.
 >>invoke t132_giants_games;
 
 -- Definition of Trafodion view TRAFODION.T132SCH.T132_GIANTS_GAMES
--- Definition current  Sat Feb 13 01:29:32 2016
+-- Definition current  Thu Feb 25 11:17:10 2016
 
   (
     GAME_NUMBER                      INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -1493,7 +1501,7 @@ CREATE SEQUENCE TRAFODION.T132SCH.T132_TEAM_NUMBER_SEQUENCE
 >>invoke t132_home_teams_games;
 
 -- Definition of Trafodion view TRAFODION.T132SCH.T132_HOME_TEAMS_GAMES
--- Definition current  Sat Feb 13 01:29:32 2016
+-- Definition current  Thu Feb 25 11:17:10 2016
 
   (
     TEAM_NUMBER                      INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -1606,7 +1614,7 @@ CREATE SEQUENCE TRAFODION.T132SCH.T132_TEAM_NUMBER_SEQUENCE
 >>invoke t132_games;
 
 -- Definition of Trafodion table TRAFODION.T132SCH.T132_GAMES
--- Definition current  Sat Feb 13 01:29:53 2016
+-- Definition current  Thu Feb 25 11:17:27 2016
 
   (
     HOME_TEAM_NUMBER                 INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -1617,12 +1625,13 @@ CREATE SEQUENCE TRAFODION.T132SCH.T132_TEAM_NUMBER_SEQUENCE
   , GAME_LOCATION                    VARCHAR(50) CHARACTER SET ISO88591 COLLATE
       DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (GAME_NUMBER ASC)
 
 --- SQL operation complete.
 >>invoke t132_teams;
 
 -- Definition of Trafodion table TRAFODION.T132SCH.T132_TEAMS
--- Definition current  Sat Feb 13 01:29:53 2016
+-- Definition current  Thu Feb 25 11:17:27 2016
 
   (
     TEAM_NUMBER                      INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -1633,12 +1642,13 @@ CREATE SEQUENCE TRAFODION.T132SCH.T132_TEAM_NUMBER_SEQUENCE
   , TEAM_CONTACT_NUMBER              CHAR(10) CHARACTER SET ISO88591 COLLATE
       DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (TEAM_NUMBER ASC)
 
 --- SQL operation complete.
 >>invoke t132_giants_games;
 
 -- Definition of Trafodion view TRAFODION.T132SCH.T132_GIANTS_GAMES
--- Definition current  Sat Feb 13 01:29:53 2016
+-- Definition current  Thu Feb 25 11:17:27 2016
 
   (
     GAME_NUMBER                      INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -1652,7 +1662,7 @@ CREATE SEQUENCE TRAFODION.T132SCH.T132_TEAM_NUMBER_SEQUENCE
 >>invoke t132_home_teams_games;
 
 -- Definition of Trafodion view TRAFODION.T132SCH.T132_HOME_TEAMS_GAMES
--- Definition current  Sat Feb 13 01:29:53 2016
+-- Definition current  Thu Feb 25 11:17:27 2016
 
   (
     TEAM_NUMBER                      INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -1765,7 +1775,7 @@ CREATE SEQUENCE TRAFODION.T132SCH.T132_TEAM_NUMBER_SEQUENCE
 >>invoke t132_games;
 
 -- Definition of Trafodion table TRAFODION.T132SCH.T132_GAMES
--- Definition current  Sat Feb 13 01:30:13 2016
+-- Definition current  Thu Feb 25 11:17:44 2016
 
   (
     HOME_TEAM_NUMBER                 INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -1776,12 +1786,13 @@ CREATE SEQUENCE TRAFODION.T132SCH.T132_TEAM_NUMBER_SEQUENCE
   , GAME_LOCATION                    VARCHAR(50) CHARACTER SET ISO88591 COLLATE
       DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (GAME_NUMBER ASC)
 
 --- SQL operation complete.
 >>invoke t132_teams;
 
 -- Definition of Trafodion table TRAFODION.T132SCH.T132_TEAMS
--- Definition current  Sat Feb 13 01:30:13 2016
+-- Definition current  Thu Feb 25 11:17:44 2016
 
   (
     TEAM_NUMBER                      INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -1792,12 +1803,13 @@ CREATE SEQUENCE TRAFODION.T132SCH.T132_TEAM_NUMBER_SEQUENCE
   , TEAM_CONTACT_NUMBER              CHAR(10) CHARACTER SET ISO88591 COLLATE
       DEFAULT NO DEFAULT NOT NULL NOT DROPPABLE
   )
+  PRIMARY KEY (TEAM_NUMBER ASC)
 
 --- SQL operation complete.
 >>invoke t132_giants_games;
 
 -- Definition of Trafodion view TRAFODION.T132SCH.T132_GIANTS_GAMES
--- Definition current  Sat Feb 13 01:30:13 2016
+-- Definition current  Thu Feb 25 11:17:44 2016
 
   (
     GAME_NUMBER                      INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -1811,7 +1823,7 @@ CREATE SEQUENCE TRAFODION.T132SCH.T132_TEAM_NUMBER_SEQUENCE
 >>invoke t132_home_teams_games;
 
 -- Definition of Trafodion view TRAFODION.T132SCH.T132_HOME_TEAMS_GAMES
--- Definition current  Sat Feb 13 01:30:13 2016
+-- Definition current  Thu Feb 25 11:17:44 2016
 
   (
     TEAM_NUMBER                      INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -1979,26 +1991,26 @@ End of MXCI Session
 >>showstats for table t132t1 on every column;
 
 Histogram data for Table TRAFODION.T132SCH.T132T1
-Table ID: 8532722397900169867
+Table ID: 9082725574613497403
 
    Hist ID # Ints    Rowcount         UEC Colname(s)
 ========== ====== =========== =========== ===========================
- 835649386      8           8           8 SYSKEY
- 835649383      8           8           8 C1
- 835649376      8           8           8 C2
+1275314956      8           8           8 SYSKEY
+1275314953      8           8           8 C1
+1275314946      8           8           8 C2
 
 
 --- SQL operation complete.
 >>showstats for table t132t2 on every column;
 
 Histogram data for Table TRAFODION.T132SCH.T132T2
-Table ID: 8532722397900169937
+Table ID: 9082725574613497462
 
    Hist ID # Ints    Rowcount         UEC Colname(s)
 ========== ====== =========== =========== ===========================
- 839319130      8           8           8 SYSKEY
- 839319125      8           8           8 C1
- 839319120      8           8           8 C2
+1278381713      8           8           8 SYSKEY
+1278381708      8           8           8 C1
+1278381703      8           8           8 C2
 
 
 --- SQL operation complete.
@@ -2104,26 +2116,26 @@ MANAGE_STATISTICS
 >>showstats for table t132t1 on every column;
 
 Histogram data for Table TRAFODION.T132SCH.T132T1
-Table ID: 8532722397900169867
+Table ID: 9082725574613497403
 
    Hist ID # Ints    Rowcount         UEC Colname(s)
 ========== ====== =========== =========== ===========================
- 835649387      8           8           8 SYSKEY
- 835649382      8           8           8 C1
- 835649377      8           8           8 C2
+1275314957      8           8           8 SYSKEY
+1275314952      8           8           8 C1
+1275314947      8           8           8 C2
 
 
 --- SQL operation complete.
 >>showstats for table t132t2 on every column;
 
 Histogram data for Table TRAFODION.T132SCH.T132T2
-Table ID: 8532722397900169937
+Table ID: 9082725574613497462
 
    Hist ID # Ints    Rowcount         UEC Colname(s)
 ========== ====== =========== =========== ===========================
- 839319131      8           8           8 SYSKEY
- 839319124      8           8           8 C1
- 839319121      8           8           8 C2
+1278381712      8           8           8 SYSKEY
+1278381709      8           8           8 C1
+1278381702      8           8           8 C2
 
 
 --- SQL operation complete.
@@ -2184,13 +2196,13 @@ CREATE TABLE TRAFODION.T132SCH.T132T1
 >>showstats for table t132t1 on every column;
 
 Histogram data for Table TRAFODION.T132SCH.T132T1
-Table ID: 8532722397900169867
+Table ID: 9082725574613497403
 
    Hist ID # Ints    Rowcount         UEC Colname(s)
 ========== ====== =========== =========== ===========================
- 835649387      8           8           8 SYSKEY
- 835649382      8           8           8 C1
- 835649377      8           8           8 C2
+1275314957      8           8           8 SYSKEY
+1275314952      8           8           8 C1
+1275314947      8           8           8 C2
 
 
 --- SQL operation complete.