Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 0dc85c0f4 -> 0d028886a


ddl xns default plus handling of errors with default constants placement


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

Branch: refs/heads/master
Commit: e1e727cbfb102a26d6fd0f06c8ad746f7fc64fa0
Parents: b7ecf18
Author: Cloud User <[email protected]>
Authored: Mon Apr 11 17:53:34 2016 +0000
Committer: Cloud User <[email protected]>
Committed: Mon Apr 11 17:53:34 2016 +0000

----------------------------------------------------------------------
 core/sqf/sql/scripts/get_libhdfs_files          |  9 ++-
 core/sql/arkcmp/CmpContext.cpp                  |  4 +
 core/sql/bin/SqlciErrors.txt                    |  1 +
 core/sql/cli/Context.cpp                        |  8 +-
 core/sql/cli/Statement.cpp                      |  7 +-
 core/sql/common/arkcmp_proc.cpp                 | 24 +++---
 core/sql/optimizer/SchemaDB.cpp                 |  4 +
 core/sql/regress/executor/EXPECTED013.SB        |  1 -
 core/sql/regress/executor/EXPECTED140           |  8 --
 core/sql/regress/fullstack2/EXPECTED062         |  3 -
 core/sql/regress/fullstack2/EXPECTED062.RELEASE |  3 -
 core/sql/regress/seabase/EXPECTED010            | 84 --------------------
 core/sql/regress/seabase/EXPECTED011            |  1 -
 core/sql/regress/seabase/EXPECTED016            |  7 --
 core/sql/regress/tools/sbdefs                   |  2 +-
 core/sql/sqlcomp/nadefaults.cpp                 | 23 ++++--
 16 files changed, 61 insertions(+), 128 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e1e727cb/core/sqf/sql/scripts/get_libhdfs_files
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/get_libhdfs_files 
b/core/sqf/sql/scripts/get_libhdfs_files
index 55d7197..e575acf 100755
--- a/core/sqf/sql/scripts/get_libhdfs_files
+++ b/core/sqf/sql/scripts/get_libhdfs_files
@@ -42,8 +42,14 @@ fi
 LOGFILE=${LIBHDFS_TEMP_DIR}/build.log
 
 # Hadoop source tar file to build libhdfs from
+#  Narendra
+#HADOOP_DEP_VER=2.6.0-cdh5.4.4
 HADOOP_ID=hadoop-${HADOOP_DEP_VER}
-HADOOP_MIRROR_URL=https://archive.apache.org/dist/hadoop/common/${HADOOP_ID}
+if [ -z $HADOOP_MIRROR_BASE ]; then
+   HADOOP_MIRROR_BASE=archive.apache.org
+fi
+echo "Here 1"
+HADOOP_MIRROR_URL=http://${HADOOP_MIRROR_BASE}/apache/hadoop/common/${HADOOP_ID}
 HADOOP_SRC_ID=${HADOOP_ID}-src
 HADOOP_SRC_TAR=${HADOOP_SRC_ID}.tar.gz
 HADOOP_BIN_TAR=${HADOOP_ID}.tar.gz
@@ -127,6 +133,7 @@ if [[ $FORCE_BUILD == true ||
 
   if [[ $SOURCE_BUILD != true ]]; then
     echo "Downloading Hadoop-common binary distro..." | tee -a ${LOGFILE}
+    echo "wget ${HADOOP_MIRROR_URL}/${HADOOP_BIN_TAR}"
     wget ${HADOOP_MIRROR_URL}/${HADOOP_BIN_TAR} 2>&1 >>${LOGFILE}
     tar -xzf $HADOOP_BIN_TAR  \
        $HADOOP_ID/lib/native/libhadoop\*so\* \

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e1e727cb/core/sql/arkcmp/CmpContext.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/CmpContext.cpp b/core/sql/arkcmp/CmpContext.cpp
index 55dd5fd..33da08b 100644
--- a/core/sql/arkcmp/CmpContext.cpp
+++ b/core/sql/arkcmp/CmpContext.cpp
@@ -203,6 +203,10 @@ CmpContext::CmpContext(UInt32 f, CollHeap * h)
     // globals for Optimizer -- also causes NADefaults table to be read in
     schemaDB_ = new(heap_) SchemaDB(readTableDef_);
 
+    // error during nadefault creation. Cannot proceed. Return.
+    if (! schemaDB_->getDefaults().getSqlParser_NADefaults_Ptr())
+      return;
+
     size_t memLimit = (size_t) 1024 * 
CmpCommon::getDefaultLong(MEMORY_LIMIT_NATABLECACHE_UPPER_KB);
     schemaDB_->getNATableDB()->getHeap()->setUpperLimit(memLimit);
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e1e727cb/core/sql/bin/SqlciErrors.txt
----------------------------------------------------------------------
diff --git a/core/sql/bin/SqlciErrors.txt b/core/sql/bin/SqlciErrors.txt
index 045b1f1..bb675f2 100644
--- a/core/sql/bin/SqlciErrors.txt
+++ b/core/sql/bin/SqlciErrors.txt
@@ -592,6 +592,7 @@
 2076 21000 99999 BEGINNER MAJOR DBADMIN HIST_NO_STATS_UEC should always be 
less than or equal to CQD HIST_NO_STATS_ROWCOUNT. Present Value of 
HIST_NO_STATS_ROWCOUNT is $0~string0.
 2077 ZZZZZ 99999 BEGINNER MINOR DBADMIN The max size $0~int0 must be greater 
than the initial size $1~int1.
 2078 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Assertion failure during semantic 
query optimization ($0~string0) in file $1~string1 at line $2~int0. Attempting 
to recover and produce a plan.
+2079 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Error occurred during initialization 
of NADefaults structure. Make sure that default constants specified in enum 
DefaultConstants are set up correctly in defaultDefaults[] array.
 2080 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Error $3~int2 while reading file: 
$2~int1 bytes were read from $0~string0 when $1~int0 were expected in module 
$4~string1.
 2081 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Error $1~int0 while opening file 
$0~string0 for read.
 2082 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Error $1~int0 while opening file 
$0~string0 for write.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e1e727cb/core/sql/cli/Context.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Context.cpp b/core/sql/cli/Context.cpp
index a0288f7..9ea6aca 100644
--- a/core/sql/cli/Context.cpp
+++ b/core/sql/cli/Context.cpp
@@ -5664,10 +5664,14 @@ Int32 ContextCli::switchToCmpContext(Int32 cmpCntxtType)
     {
       // find none to use, create new CmpContext instance
       CmpContext *savedCntxt = cmpCurrentContext;
-      if (arkcmp_main_entry())
+      Int32 rc = 0;
+      if (rc = arkcmp_main_entry())
         {
           cmpCurrentContext = savedCntxt;
-          return -1;  // failed to create new CmpContext instance
+          if (rc == 2)
+            return -2; // error during NADefaults creation
+          else
+            return -1;  // failed to create new CmpContext instance
         }
       
       cmpCntxt = CmpCommon::context();

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e1e727cb/core/sql/cli/Statement.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Statement.cpp b/core/sql/cli/Statement.cpp
index 66d175c..fe59d9f 100644
--- a/core/sql/cli/Statement.cpp
+++ b/core/sql/cli/Statement.cpp
@@ -1511,7 +1511,12 @@ RETCODE Statement::prepare2(char *source, ComDiagsArea 
&diagsArea,
           if (embeddedArkcmpSetup == 0)           
             {
              context_->setEmbeddedArkcmpIsInitialized(TRUE);
-         //    context_->setEmbeddedArkcmpContext(CmpCommon::context());
+              //    context_->setEmbeddedArkcmpContext(CmpCommon::context());
+            }
+          else if (embeddedArkcmpSetup == -2)
+            {
+              diagsArea << DgSqlCode(-2079);
+              return ERROR;
             }
           else
             {

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e1e727cb/core/sql/common/arkcmp_proc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/arkcmp_proc.cpp b/core/sql/common/arkcmp_proc.cpp
index 24fa248..729da5e 100644
--- a/core/sql/common/arkcmp_proc.cpp
+++ b/core/sql/common/arkcmp_proc.cpp
@@ -129,10 +129,9 @@ void deinitializeArkcmp()
 }
 
 
-
-//extern void bloom_filter_test();
-//extern void  hdfs_list_test(int argc, char **argv);
-
+// RETURN:  0, no error.  
+//          2, error during NADefaults creation. 
+//          1, other errors during CmpContext creation.
 Int32 arkcmp_main_entry()
 {
 
@@ -143,17 +142,10 @@ Int32 arkcmp_main_entry()
   // same order on NSK and Windows.
   cout.sync_with_stdio();
 
-
   initializeArkcmp();
-
-
   try
   {
-
-
     { // a local ctor scope, within a try block
-
-
       // Set up the context info for the connection, it contains the variables
       // persistent through each statement loops.
 
@@ -172,6 +164,16 @@ Int32 arkcmp_main_entry()
                         cmpContextHeap);
         cliSemaphore->release();
 
+        if (! 
context->getSchemaDB()->getDefaults().getSqlParser_NADefaults_Ptr())
+          {
+            // error during nadefault creation.
+            // Cannot proceed.
+            ArkcmpErrorMessageBox
+              (ARKCMP_ERROR_PREFIX "- Cannot initialize NADefaults data.",
+               ERROR_SEV, FALSE, FALSE, TRUE);
+            return(2);
+          }
+
       }
       catch (...)
       {

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e1e727cb/core/sql/optimizer/SchemaDB.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/SchemaDB.cpp b/core/sql/optimizer/SchemaDB.cpp
index 57eb5f6..d64bca7 100644
--- a/core/sql/optimizer/SchemaDB.cpp
+++ b/core/sql/optimizer/SchemaDB.cpp
@@ -100,6 +100,10 @@ SchemaDB::SchemaDB(ReadTableDef *rtd)
     currentDiskPool_(-1),
     hbaseBlockCacheFrac_(-1.0)
 {
+  // error during nadefault creation. Cannot proceed. Return.
+  if (! defaults_.getSqlParser_NADefaults_Ptr())
+    return;
+
   initPerStatement();
   routineDB_.setMetadata("NEO.UDF.ROUTINES");
   actionRoutineDB_.setMetadata("NEO.UDF.UUDR_ROUTINES");

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e1e727cb/core/sql/regress/executor/EXPECTED013.SB
----------------------------------------------------------------------
diff --git a/core/sql/regress/executor/EXPECTED013.SB 
b/core/sql/regress/executor/EXPECTED013.SB
index b83960c..c58c7a0 100644
--- a/core/sql/regress/executor/EXPECTED013.SB
+++ b/core/sql/regress/executor/EXPECTED013.SB
@@ -442,7 +442,6 @@ CONTROL QUERY DEFAULT
   HBASE_SMALL_SCANNER                  SYSTEM
   HBASE_FILTER_PREDS                   2
   TRAF_INDEX_CREATE_OPT                ON
-  DDL_TRANSACTIONS                     ON
   HBASE_ASYNC_DROP_TABLE               OFF
   POS                                  OFF
   SCHEMA                               TRAFODION.T013_SCH

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e1e727cb/core/sql/regress/executor/EXPECTED140
----------------------------------------------------------------------
diff --git a/core/sql/regress/executor/EXPECTED140 
b/core/sql/regress/executor/EXPECTED140
index c82aabd..7bccd88 100644
--- a/core/sql/regress/executor/EXPECTED140
+++ b/core/sql/regress/executor/EXPECTED140
@@ -103,7 +103,6 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... 2
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   GENERATE_EXPLAIN ....... ON
   ObjectUIDs ............. 7577396214768470203
@@ -204,7 +203,6 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... 2
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   GENERATE_EXPLAIN ....... ON
   ObjectUIDs ............. 7577396214768470287
@@ -292,7 +290,6 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... 2
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   GENERATE_EXPLAIN ....... ON
   ObjectUIDs ............. 7577396214768470203
@@ -391,7 +388,6 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... 2
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   GENERATE_EXPLAIN ....... ON
   ObjectUIDs ............. 7577396214768470203
@@ -488,7 +484,6 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... 2
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   GENERATE_EXPLAIN ....... ON
   ObjectUIDs ............. 7577396214768470203
@@ -621,7 +616,6 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... 2
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   GENERATE_EXPLAIN ....... ON
   ObjectUIDs ............. 7577396214768470203
@@ -717,7 +711,6 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... 2
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   GENERATE_EXPLAIN ....... ON
   ObjectUIDs ............. 7577396214768470203
@@ -865,7 +858,6 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... 2
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   GENERATE_EXPLAIN ....... ON
   ObjectUIDs ............. 7577396214768470203

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e1e727cb/core/sql/regress/fullstack2/EXPECTED062
----------------------------------------------------------------------
diff --git a/core/sql/regress/fullstack2/EXPECTED062 
b/core/sql/regress/fullstack2/EXPECTED062
index 4f2aa1f..ca88f6d 100644
--- a/core/sql/regress/fullstack2/EXPECTED062
+++ b/core/sql/regress/fullstack2/EXPECTED062
@@ -501,7 +501,6 @@ CONTROL QUERY DEFAULT
   HBASE_SMALL_SCANNER                  SYSTEM
   HBASE_FILTER_PREDS                   2
   TRAF_INDEX_CREATE_OPT                ON
-  DDL_TRANSACTIONS                     ON
   SHOWCONTROL_SHOW_ALL                 ON
   SCHEMA                               AAA.BBB
   CATALOG                              CCC
@@ -546,7 +545,6 @@ CONTROL QUERY DEFAULT
   HBASE_SMALL_SCANNER                  SYSTEM
   HBASE_FILTER_PREDS                   2
   TRAF_INDEX_CREATE_OPT                ON
-  DDL_TRANSACTIONS                     ON
   SHOWCONTROL_SHOW_ALL                 ON
   DEF_CHUNK_SIZE                       1000
   CPUCOST_DM_GET                       .001
@@ -582,7 +580,6 @@ CONTROL QUERY DEFAULT
   HBASE_SMALL_SCANNER                  SYSTEM
   HBASE_FILTER_PREDS                   2
   TRAF_INDEX_CREATE_OPT                ON
-  DDL_TRANSACTIONS                     ON
   SHOWCONTROL_SHOW_ALL                 ON
   DEF_CHUNK_SIZE                       1000
   CPUCOST_DM_GET                       .001

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e1e727cb/core/sql/regress/fullstack2/EXPECTED062.RELEASE
----------------------------------------------------------------------
diff --git a/core/sql/regress/fullstack2/EXPECTED062.RELEASE 
b/core/sql/regress/fullstack2/EXPECTED062.RELEASE
index d933dc7..4b48a87 100644
--- a/core/sql/regress/fullstack2/EXPECTED062.RELEASE
+++ b/core/sql/regress/fullstack2/EXPECTED062.RELEASE
@@ -501,7 +501,6 @@ CONTROL QUERY DEFAULT
   HBASE_SMALL_SCANNER                  SYSTEM
   HBASE_FILTER_PREDS                   2
   TRAF_INDEX_CREATE_OPT                ON
-  DDL_TRANSACTIONS                     ON
   SHOWCONTROL_SHOW_ALL                 ON
   SCHEMA                               AAA.BBB
   CATALOG                              CCC
@@ -546,7 +545,6 @@ CONTROL QUERY DEFAULT
   HBASE_SMALL_SCANNER                  SYSTEM
   HBASE_FILTER_PREDS                   2
   TRAF_INDEX_CREATE_OPT                ON
-  DDL_TRANSACTIONS                     ON
   SHOWCONTROL_SHOW_ALL                 ON
   DEF_CHUNK_SIZE                       1000
   CPUCOST_DM_GET                       .001
@@ -582,7 +580,6 @@ CONTROL QUERY DEFAULT
   HBASE_SMALL_SCANNER                  SYSTEM
   HBASE_FILTER_PREDS                   2
   TRAF_INDEX_CREATE_OPT                ON
-  DDL_TRANSACTIONS                     ON
   SHOWCONTROL_SHOW_ALL                 ON
   DEF_CHUNK_SIZE                       1000
   CPUCOST_DM_GET                       .001

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e1e727cb/core/sql/regress/seabase/EXPECTED010
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/EXPECTED010 
b/core/sql/regress/seabase/EXPECTED010
index 052b722..4d2cda8 100644
--- a/core/sql/regress/seabase/EXPECTED010
+++ b/core/sql/regress/seabase/EXPECTED010
@@ -252,7 +252,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -336,7 +335,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -418,7 +416,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -502,7 +499,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -810,7 +806,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -890,7 +885,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -970,7 +964,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -1050,7 +1043,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -1161,7 +1153,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -1233,7 +1224,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -1314,7 +1304,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -1395,7 +1384,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -1476,7 +1464,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -1588,7 +1575,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -1972,7 +1958,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -2056,7 +2041,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -2137,7 +2121,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -2220,7 +2203,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -2527,7 +2509,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -2607,7 +2588,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -2699,7 +2679,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -2782,7 +2761,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -2896,7 +2874,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -2971,7 +2948,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -3053,7 +3029,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -3135,7 +3110,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -3217,7 +3191,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -3329,7 +3302,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -3713,7 +3685,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -3797,7 +3768,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -3879,7 +3849,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -3963,7 +3932,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -4271,7 +4239,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -4352,7 +4319,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -4433,7 +4399,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -4514,7 +4479,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -4625,7 +4589,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -4697,7 +4660,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -4779,7 +4741,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -4861,7 +4822,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -4943,7 +4903,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -5055,7 +5014,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -5439,7 +5397,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -5523,7 +5480,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -5604,7 +5560,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -5687,7 +5642,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -5994,7 +5948,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -6073,7 +6026,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -6152,7 +6104,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -6231,7 +6182,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -6341,7 +6291,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -6416,7 +6365,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -6496,7 +6444,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -6576,7 +6523,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -6656,7 +6602,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -6767,7 +6712,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -7171,7 +7115,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -7255,7 +7198,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -7337,7 +7279,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -7422,7 +7363,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -7730,7 +7670,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -7810,7 +7749,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -7890,7 +7828,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -7970,7 +7907,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -8081,7 +8017,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -8153,7 +8088,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -8234,7 +8168,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -8315,7 +8248,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -8396,7 +8328,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -8508,7 +8439,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -8892,7 +8822,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -8976,7 +8905,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -9057,7 +8985,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -9141,7 +9068,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -9448,7 +9374,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -9527,7 +9452,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -9606,7 +9530,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -9685,7 +9608,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -9795,7 +9717,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -9870,7 +9791,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -9950,7 +9870,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -10030,7 +9949,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -10110,7 +10028,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20
@@ -10221,7 +10138,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... SYSTEM
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   HBASE_MAX_COLUMN_NAME_  10
   HBASE_MAX_COLUMN_VAL_L  20

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e1e727cb/core/sql/regress/seabase/EXPECTED011
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/EXPECTED011 
b/core/sql/regress/seabase/EXPECTED011
index 53ee692..6f88f5a 100644
--- a/core/sql/regress/seabase/EXPECTED011
+++ b/core/sql/regress/seabase/EXPECTED011
@@ -179,7 +179,6 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... 2
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.SCH
   QUERY_CACHE ............ 0
   GENERATE_EXPLAIN ....... ON

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e1e727cb/core/sql/regress/seabase/EXPECTED016
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/EXPECTED016 
b/core/sql/regress/seabase/EXPECTED016
index 2128d94..0f5efb9 100644
--- a/core/sql/regress/seabase/EXPECTED016
+++ b/core/sql/regress/seabase/EXPECTED016
@@ -218,7 +218,6 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... 2
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.HBASE
   QUERY_CACHE ............ 0
   CACHE_HISTOGRAMS ....... OFF
@@ -367,7 +366,6 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... 2
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.HBASE
   QUERY_CACHE ............ 0
   CACHE_HISTOGRAMS ....... OFF
@@ -516,7 +514,6 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... 2
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.HBASE
   QUERY_CACHE ............ 0
   CACHE_HISTOGRAMS ....... OFF
@@ -665,7 +662,6 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... 2
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.HBASE
   QUERY_CACHE ............ 0
   CACHE_HISTOGRAMS ....... OFF
@@ -814,7 +810,6 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... 2
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.HBASE
   QUERY_CACHE ............ 0
   CACHE_HISTOGRAMS ....... OFF
@@ -963,7 +958,6 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... 2
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.HBASE
   QUERY_CACHE ............ 0
   CACHE_HISTOGRAMS ....... OFF
@@ -1112,7 +1106,6 @@ DESCRIPTION
   HBASE_FILTER_PREDS ..... 2
   TRAF_ALIGNED_ROW_FORMAT  OFF
   TRAF_INDEX_CREATE_OPT    ON
-  DDL_TRANSACTIONS ....... ON
   SCHEMA ................. TRAFODION.HBASE
   QUERY_CACHE ............ 0
   CACHE_HISTOGRAMS ....... OFF

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e1e727cb/core/sql/regress/tools/sbdefs
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/sbdefs b/core/sql/regress/tools/sbdefs
index 5cb15b6..ec6d988 100644
--- a/core/sql/regress/tools/sbdefs
+++ b/core/sql/regress/tools/sbdefs
@@ -32,7 +32,7 @@ cqd hbase_filter_preds '2';
 cqd traf_aligned_row_format 'OFF';
 --cqd traf_default_col_charset 'UTF8';
 cqd traf_index_create_opt 'ON';
-cqd ddl_transactions 'ON';
+--cqd ddl_transactions 'ON';
 cqd schema '$$TEST_SCHEMA$$';
 set SCHEMA $$TEST_SCHEMA$$;
 #endif

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e1e727cb/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/nadefaults.cpp b/core/sql/sqlcomp/nadefaults.cpp
index 9d53aea..f11f315 100644
--- a/core/sql/sqlcomp/nadefaults.cpp
+++ b/core/sql/sqlcomp/nadefaults.cpp
@@ -1171,7 +1171,7 @@ SDDui___(CYCLIC_ESP_PLACEMENT,                  "1"),
  DDdskNS(DDL_DEFAULT_LOCATIONS,                ""),
 
   DDkwd__(DDL_EXPLAIN,                           "OFF"),
-  DDkwd__(DDL_TRANSACTIONS,         "OFF"),
+  DDkwd__(DDL_TRANSACTIONS,         "ON"),
 
     // We ignore this setting for the first (SYSTEM_DEFAULTS) table open+read.
   DDkwd__(DEFAULTS_TABLE_ACCESS_WARNINGS,      "OFF"),
@@ -3181,7 +3181,7 @@ SDDflt0_(QUERY_CACHE_SELECTIVITY_TOLERANCE,       "0"),
   DDkwd__(SHOW_MEMO_STATS,             "OFF"),
 
   DDkwd__(SIMILARITY_CHECK,                    "ON "),
-  DDkwd__(SIMPLE_COST_MODEL,                    "ON"),
+ DDkwd__(SIMPLE_COST_MODEL,                    "ON"),
 
  XDDkwd__(SKEW_EXPLAIN,                         "ON"),
  XDDflt__(SKEW_ROWCOUNT_THRESHOLD,              "1000000"), // Column row count
@@ -3568,7 +3568,7 @@ XDDkwd__(SUBQUERY_UNNESTING,                      "ON"),
   DDflt0_(USTAT_MIN_CHAR_UEC_FOR_IS,            "0.2"),  // minimum UEC for 
char type to use internal sort
   DDflt0_(USTAT_MIN_DEC_BIN_UEC_FOR_IS,         "0.0"),  // minimum UEC for 
binary types to use internal sort
 
-  DDflt0_(USTAT_MIN_ESTIMATE_FOR_ROWCOUNT,      "10000000"),
+ DDflt0_(USTAT_MIN_ESTIMATE_FOR_ROWCOUNT,      "10000000"),
   DDui1__(USTAT_MIN_ROWCOUNT_FOR_CTS_SAMPLE,    "10000"),
  XDDui1__(USTAT_MIN_ROWCOUNT_FOR_LOW_SAMPLE,    "1000000"),
  XDDui1__(USTAT_MIN_ROWCOUNT_FOR_SAMPLE,        "10000"),
@@ -3753,13 +3753,16 @@ const char 
*NADefaults::getCurrentDefaultsAttrNameAndValue(
 // -----------------------------------------------------------------------
 void NADefaults::initCurrentDefaultsWithDefaultDefaults()
 {
+  deleteMe();
+
   const size_t numAttrs = numDefaultAttributes();
+  if (numAttrs != sizeof(defaultDefaults) / sizeof(DefaultDefault))
+    return;
+
   CMPASSERT_STRING
     (numAttrs == sizeof(defaultDefaults) / sizeof(DefaultDefault),
      "Check sqlcomp/DefaultConstants.h for a gap in enum DefaultConstants or 
sqlcomp/nadefaults.cpp for duplicate entries in array defaultDefaults[].");
 
-  deleteMe();
-
   SqlParser_NADefaults_Glob =
   SqlParser_NADefaults_ = new NADHEAP SqlParser_NADefaults();
 
@@ -3798,6 +3801,7 @@ void NADefaults::initCurrentDefaultsWithDefaultDefaults()
   // for each entry of the (alphabetically sorted) default defaults
   // table, enter the default default into the current default table
   // which is sorted by enum values
+  NAString prevAttrName;
   for (i = 0; i < numAttrs; i++)
     {
       // the enum must be less than the max (if this assert fails
@@ -3831,6 +3835,15 @@ void NADefaults::initCurrentDefaultsWithDefaultDefaults()
       // set up our backlink which maps [enum] to its defaultDefaults entry
       defDefIx_[defaultDefaults[i].attrEnum] = i;
 
+      // attrs must be in ascending sorted order. If not, error out.
+      if (prevAttrName > defaultDefaults[i].attrName)
+        {
+          SqlParser_NADefaults_ = NULL;
+
+          return;
+        }
+      prevAttrName = defaultDefaults[i].attrName;
+
       // LCOV_EXCL_START
       // for debugging only
       #ifndef NDEBUG


Reply via email to