[1/4] trafodion git commit: [TRAFODION-3145] Make "hbase_options" as default setting and use cqd to change the default setting

2018-07-21 Thread liuming 
Repository: trafodion
Updated Branches:
  refs/heads/master 8b56ed242 -> 60b3eb02c


[TRAFODION-3145] Make "hbase_options" as default setting and use cqd to change 
the default setting


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

Branch: refs/heads/master
Commit: 86fdb25c09785da8d17b05e38e4f802af97932e9
Parents: 0db94ea
Author: Liu Ming 
Authored: Sun Jul 15 18:37:40 2018 -0400
Committer: Liu Ming 
Committed: Sun Jul 15 18:37:40 2018 -0400

--
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 19 +++
 core/sql/sqlcomp/DefaultConstants.h  |  1 +
 core/sql/sqlcomp/nadefaults.cpp  |  2 ++
 3 files changed, 22 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/trafodion/blob/86fdb25c/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
--
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp 
b/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
index 9e6e464..2565cfd 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
@@ -10880,8 +10880,10 @@ CmpSeabaseDDL::setupHbaseOptions(ElemDDLHbaseOptions * 
hbaseOptionsClause,
 
   NABoolean dataBlockEncodingOptionSpecified = FALSE;
   NABoolean compressionOptionSpecified = FALSE;
+  NABoolean memstoreFlushSizeOptionSpecified = FALSE;
   const char *dataBlockEncodingOptionString = "DATA_BLOCK_ENCODING";
   const char *compressionOptionString = "COMPRESSION";
+  const char *flushSizeOptionString = "MEMSTORE_FLUSH_SIZE";
 
   Lng32 numHbaseOptions = 0;
   if (hbaseOptionsClause)
@@ -10902,6 +10904,8 @@ CmpSeabaseDDL::setupHbaseOptions(ElemDDLHbaseOptions * 
hbaseOptionsClause,
 dataBlockEncodingOptionSpecified = TRUE;
   else if (hbaseOption->key() == compressionOptionString)
 compressionOptionSpecified = TRUE;
+  else if (hbaseOption->key() == flushSizeOptionString)
+memstoreFlushSizeOptionSpecified= TRUE;
   
   hbaseOptionsStr += hbaseOption->key();
   hbaseOptionsStr += "='";
@@ -10974,6 +10978,8 @@ CmpSeabaseDDL::setupHbaseOptions(ElemDDLHbaseOptions * 
hbaseOptionsClause,
 CmpCommon::getDefaultString(HBASE_DATA_BLOCK_ENCODING_OPTION);
   NAString compression = 
 CmpCommon::getDefaultString(HBASE_COMPRESSION_OPTION);
+  NAString flushSize =
+CmpCommon::getDefaultString(HBASE_MEMSTORE_FLUSH_SIZE_OPTION); 
   HbaseCreateOption * hbaseOption = NULL;
   
   char optionStr[200];
@@ -10991,7 +10997,20 @@ CmpSeabaseDDL::setupHbaseOptions(ElemDDLHbaseOptions * 
hbaseOptionsClause,
   hbaseOptionsStr += optionStr;
 }
 }
+  if (!flushSize.isNull() && !memstoreFlushSizeOptionSpecified)
+{
+  hbaseOption = new(STMTHEAP) HbaseCreateOption("MEMSTORE_FLUSH_SIZE", 
+flushSize.data());
+  hbaseCreateOptions.insert(hbaseOption);
 
+  if (ActiveSchemaDB()->getDefaults().userDefault
+  (HBASE_MEMSTORE_FLUSH_SIZE_OPTION) == TRUE)
+{
+  numHbaseOptions += 1;
+  sprintf(optionStr, "MEMSTORE_FLUSH_SIZE='%s'|", flushSize.data());
+  hbaseOptionsStr += optionStr;
+}
+}
   if (!compression.isNull() && !compressionOptionSpecified)
 {
   hbaseOption = new(STMTHEAP) HbaseCreateOption("COMPRESSION", 

http://git-wip-us.apache.org/repos/asf/trafodion/blob/86fdb25c/core/sql/sqlcomp/DefaultConstants.h
--
diff --git a/core/sql/sqlcomp/DefaultConstants.h 
b/core/sql/sqlcomp/DefaultConstants.h
index 77f14b4..ad75632 100644
--- a/core/sql/sqlcomp/DefaultConstants.h
+++ b/core/sql/sqlcomp/DefaultConstants.h
@@ -2921,6 +2921,7 @@ enum DefaultConstants
 
   HBASE_DATA_BLOCK_ENCODING_OPTION,
   HBASE_COMPRESSION_OPTION,
+  HBASE_MEMSTORE_FLUSH_SIZE_OPTION,
   HQC_LOG,
   HQC_LOG_FILE, // specify the HQC log file name
   HYBRID_QUERY_CACHE,

http://git-wip-us.apache.org/repos/asf/trafodion/blob/86fdb25c/core/sql/sqlcomp/nadefaults.cpp
--
diff --git a/core/sql/sqlcomp/nadefaults.cpp b/core/sql/sqlcomp/nadefaults.cpp
index a12557f..86447c7 100644
--- a/core/sql/sqlcomp/nadefaults.cpp
+++ b/core/sql/sqlcomp/nadefaults.cpp
@@ -1465,6 +1465,7 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,   "OFF"),
  DDui___(HBASE_MAX_COLUMN_VAL_LENGTH,  "1000"),
  DDui___(HBASE_MAX_ESPS,""),
  DDui___(HBASE_MAX_NUM_SEARCH_KEYS,  "512"),
+ DDkwd__(HBASE_MEMSTORE_FLUSH_SIZE_OPTION,  ""),
  DDui1__(HBASE_MIN_BYTES_PER_ESP_PARTITION, "67108864"),

[3/4] trafodion git commit: wrong usage of snprintf

2018-07-21 Thread liuming 
wrong usage of snprintf


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

Branch: refs/heads/master
Commit: 0ba13fb78f1bdc4ba4798c2d28ddea95637bae57
Parents: 8414249
Author: Liu Ming 
Authored: Tue Jul 17 21:16:58 2018 -0400
Committer: Liu Ming 
Committed: Tue Jul 17 21:16:58 2018 -0400

--
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafodion/blob/0ba13fb7/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
--
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp 
b/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
index 92b4928..e3735c8 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
@@ -10993,7 +10993,7 @@ CmpSeabaseDDL::setupHbaseOptions(ElemDDLHbaseOptions * 
hbaseOptionsClause,
   (HBASE_DATA_BLOCK_ENCODING_OPTION) == TRUE)
 {
   numHbaseOptions += 1;
-  snprintf(optionStr, 199, "DATA_BLOCK_ENCODING='%s'|", 
dataBlockEncoding.data());
+  snprintf(optionStr, 200, "DATA_BLOCK_ENCODING='%s'|", 
dataBlockEncoding.data());
   hbaseOptionsStr += optionStr;
 }
 }
@@ -11007,7 +11007,7 @@ CmpSeabaseDDL::setupHbaseOptions(ElemDDLHbaseOptions * 
hbaseOptionsClause,
   (HBASE_MEMSTORE_FLUSH_SIZE_OPTION) == TRUE)
 {
   numHbaseOptions += 1;
-  snprintf(optionStr, 199, "MEMSTORE_FLUSH_SIZE='%s'|", 
flushSize.data());
+  snprintf(optionStr, 200, "MEMSTORE_FLUSH_SIZE='%s'|", 
flushSize.data());
   hbaseOptionsStr += optionStr;
 }
 }
@@ -11021,7 +11021,7 @@ CmpSeabaseDDL::setupHbaseOptions(ElemDDLHbaseOptions * 
hbaseOptionsClause,
   (HBASE_COMPRESSION_OPTION) == TRUE)
 {
   numHbaseOptions += 1;
-  snprintf(optionStr, 199, "COMPRESSION='%s'|", compression.data());
+  snprintf(optionStr, 200, "COMPRESSION='%s'|", compression.data());
   hbaseOptionsStr += optionStr;
 }
 }
@@ -11036,7 +11036,7 @@ CmpSeabaseDDL::setupHbaseOptions(ElemDDLHbaseOptions * 
hbaseOptionsClause,
 hco += "HBASE_OPTIONS=>";
 
 char hbaseOptionsNumCharStr[HBASE_OPTION_MAX_INTEGER_LENGTH];
-snprintf(hbaseOptionsNumCharStr, HBASE_OPTION_MAX_INTEGER_LENGTH-1, 
"%04d", numHbaseOptions);
+snprintf(hbaseOptionsNumCharStr, HBASE_OPTION_MAX_INTEGER_LENGTH, "%04d", 
numHbaseOptions);
 hco += hbaseOptionsNumCharStr;
 
 hco += hbaseOptionsStr.data();

[4/4] trafodion git commit: merge [TRAFODION-3145] Make hbase_options as default setting and use cqd

2018-07-21 Thread liuming 
merge [TRAFODION-3145] Make hbase_options as default setting and use cqd 


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

Branch: refs/heads/master
Commit: 60b3eb02cc7bf6dba496cb9487419deb93d83a7b
Parents: 8b56ed2 0ba13fb
Author: Liu Ming 
Authored: Sat Jul 21 11:10:01 2018 +
Committer: Liu Ming 
Committed: Sat Jul 21 11:10:01 2018 +

--
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 25 ++---
 core/sql/sqlcomp/DefaultConstants.h  |  1 +
 core/sql/sqlcomp/nadefaults.cpp  |  2 ++
 3 files changed, 25 insertions(+), 3 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/trafodion/blob/60b3eb02/core/sql/sqlcomp/DefaultConstants.h
--

http://git-wip-us.apache.org/repos/asf/trafodion/blob/60b3eb02/core/sql/sqlcomp/nadefaults.cpp
--

[2/4] trafodion git commit: fix review comments

2018-07-21 Thread liuming 
fix review comments


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

Branch: refs/heads/master
Commit: 841424963b538c119a482093966f48b2c83b67b5
Parents: 86fdb25
Author: Liu Ming 
Authored: Tue Jul 17 03:58:12 2018 -0400
Committer: Liu Ming 
Committed: Tue Jul 17 03:58:12 2018 -0400

--
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafodion/blob/84142496/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
--
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp 
b/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
index 2565cfd..92b4928 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
@@ -10993,7 +10993,7 @@ CmpSeabaseDDL::setupHbaseOptions(ElemDDLHbaseOptions * 
hbaseOptionsClause,
   (HBASE_DATA_BLOCK_ENCODING_OPTION) == TRUE)
 {
   numHbaseOptions += 1;
-  sprintf(optionStr, "DATA_BLOCK_ENCODING='%s'|", 
dataBlockEncoding.data());
+  snprintf(optionStr, 199, "DATA_BLOCK_ENCODING='%s'|", 
dataBlockEncoding.data());
   hbaseOptionsStr += optionStr;
 }
 }
@@ -11007,7 +11007,7 @@ CmpSeabaseDDL::setupHbaseOptions(ElemDDLHbaseOptions * 
hbaseOptionsClause,
   (HBASE_MEMSTORE_FLUSH_SIZE_OPTION) == TRUE)
 {
   numHbaseOptions += 1;
-  sprintf(optionStr, "MEMSTORE_FLUSH_SIZE='%s'|", flushSize.data());
+  snprintf(optionStr, 199, "MEMSTORE_FLUSH_SIZE='%s'|", 
flushSize.data());
   hbaseOptionsStr += optionStr;
 }
 }
@@ -11021,7 +11021,7 @@ CmpSeabaseDDL::setupHbaseOptions(ElemDDLHbaseOptions * 
hbaseOptionsClause,
   (HBASE_COMPRESSION_OPTION) == TRUE)
 {
   numHbaseOptions += 1;
-  sprintf(optionStr, "COMPRESSION='%s'|", compression.data());
+  snprintf(optionStr, 199, "COMPRESSION='%s'|", compression.data());
   hbaseOptionsStr += optionStr;
 }
 }
@@ -11036,7 +11036,7 @@ CmpSeabaseDDL::setupHbaseOptions(ElemDDLHbaseOptions * 
hbaseOptionsClause,
 hco += "HBASE_OPTIONS=>";
 
 char hbaseOptionsNumCharStr[HBASE_OPTION_MAX_INTEGER_LENGTH];
-sprintf(hbaseOptionsNumCharStr, "%04d", numHbaseOptions);
+snprintf(hbaseOptionsNumCharStr, HBASE_OPTION_MAX_INTEGER_LENGTH-1, 
"%04d", numHbaseOptions);
 hco += hbaseOptionsNumCharStr;
 
 hco += hbaseOptionsStr.data();

[8/9] trafodion git commit: fix hive 009

2018-07-21 Thread liuming 
fix hive 009


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

Branch: refs/heads/master
Commit: d5d8f0ed05959df01e38c5bac613b15c81756aeb
Parents: 5146272
Author: Liu Ming 
Authored: Mon Jul 16 21:29:27 2018 -0400
Committer: Liu Ming 
Committed: Mon Jul 16 21:29:27 2018 -0400

--
 core/sql/regress/hive/DIFF009.KNOWN | 2 +-
 core/sql/regress/hive/EXPECTED009   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafodion/blob/d5d8f0ed/core/sql/regress/hive/DIFF009.KNOWN
--
diff --git a/core/sql/regress/hive/DIFF009.KNOWN 
b/core/sql/regress/hive/DIFF009.KNOWN
index 1d1cb73..6bcba59 100644
--- a/core/sql/regress/hive/DIFF009.KNOWN
+++ b/core/sql/regress/hive/DIFF009.KNOWN
@@ -1,3 +1,3 @@
-1071a1072,1073
+1074a1075,1076
 > *** WARNING[6008] Statistics for column (D_DATE) from table 
 > HIVE.HIVE.DATE_DIM were not available. As a result, the access path chosen 
 > might not be the best possible.
 > 

http://git-wip-us.apache.org/repos/asf/trafodion/blob/d5d8f0ed/core/sql/regress/hive/EXPECTED009
--
diff --git a/core/sql/regress/hive/EXPECTED009 
b/core/sql/regress/hive/EXPECTED009
index 26f220f..d819195 100644
--- a/core/sql/regress/hive/EXPECTED009
+++ b/core/sql/regress/hive/EXPECTED009
@@ -432,7 +432,7 @@ T009T2
 
 ===
  2 row(s) returned
- 
+
 --- SQL operation complete.
 >>invoke hive.sch_t009.t009t1;

[1/9] trafodion git commit: [TRAFODION-3101] enhance get command to show rows get

2018-07-21 Thread liuming 
Repository: trafodion
Updated Branches:
  refs/heads/master efd564727 -> 8b56ed242


[TRAFODION-3101] enhance get command to show rows get


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

Branch: refs/heads/master
Commit: 591e0fa60a13f9f57eee1bc7a9b35fe5a10145a2
Parents: 0db94ea
Author: Liu Ming 
Authored: Sun Jun 24 20:48:37 2018 -0400
Committer: Liu Ming 
Committed: Sun Jun 24 20:48:37 2018 -0400

--
 core/sql/executor/ExExeUtilGet.cpp   | 14 +++
 core/sql/regress/compGeneral/EXPECTED023 | 56 +++
 core/sql/regress/core/EXPECTED116| 21 ++
 core/sql/regress/executor/EXPECTED130|  4 ++
 core/sql/regress/seabase/EXPECTED011 |  4 ++
 core/sql/regress/seabase/EXPECTED012 | 52 +
 core/sql/regress/seabase/EXPECTED022 | 17 
 core/sql/regress/seabase/EXPECTED031 |  4 ++
 8 files changed, 172 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/trafodion/blob/591e0fa6/core/sql/executor/ExExeUtilGet.cpp
--
diff --git a/core/sql/executor/ExExeUtilGet.cpp 
b/core/sql/executor/ExExeUtilGet.cpp
index 163b190..5bb4793 100644
--- a/core/sql/executor/ExExeUtilGet.cpp
+++ b/core/sql/executor/ExExeUtilGet.cpp
@@ -949,6 +949,7 @@ short ExExeUtilGetMetadataInfoTcb::displayHeading()
 {
   if (getMItdb().noHeader())
 {
+printf("LMDBG noheader is true\n");
   return 0;
 }
   // make sure there is enough space to move header
@@ -1818,8 +1819,12 @@ short ExExeUtilGetMetadataInfoTcb::work()
 {
   short retcode = 0;
   Lng32 cliRC = 0;
+  Lng32 returnRowCount=0;
+  char returnMsg[256];
   ex_expr::exp_return_type exprRetCode = ex_expr::EXPR_OK;
 
+  memset(returnMsg, 0, 256);
+
   // if no parent request, return
   if (qparent_.down->isEmpty())
 return WORK_OK;
@@ -3184,6 +3189,7 @@ short ExExeUtilGetMetadataInfoTcb::work()
 }
 
infoList_->advance();
+returnRowCount++;
  }
break;
 
@@ -3343,6 +3349,14 @@ short ExExeUtilGetMetadataInfoTcb::work()
 
case DONE_:
  {
+if (NOT getMItdb().noHeader())
+{
+  short rc = 0;
+  sprintf(returnMsg, "\n===\nSummary info of 
get:\nGet %d rows.", returnRowCount);
+  moveRowToUpQueue(returnMsg, strlen(returnMsg), );
+  moveRowToUpQueue(" ");
+}
+
retcode = handleDone();
if (retcode == 1)
  return WORK_OK;

http://git-wip-us.apache.org/repos/asf/trafodion/blob/591e0fa6/core/sql/regress/compGeneral/EXPECTED023
--
diff --git a/core/sql/regress/compGeneral/EXPECTED023 
b/core/sql/regress/compGeneral/EXPECTED023
index 8a46e13..2f1f012 100644
--- a/core/sql/regress/compGeneral/EXPECTED023
+++ b/core/sql/regress/compGeneral/EXPECTED023
@@ -23,6 +23,10 @@ SB_HISTOGRAMS
 SB_HISTOGRAM_INTERVALS
 SB_PERSISTENT_SAMPLES
 
+===
+Summary info of get:
+Get 3 rows.
+
 --- SQL operation complete.
 >>
 >>CREATE TABLE stest
@@ -106,6 +110,10 @@ STEST
 STESTC
 STEST_EMPTY
 
+===
+Summary info of get:
+Get 6 rows.
+
 --- SQL operation complete.
 >>  -- should be just stest, stest_empty, stestc, and the sb_* tables
 >>
@@ -149,6 +157,10 @@ STESTC
 STEST_EMPTY
 TRAF_SAMPLE_07158060726899021395_1517441663_444545
 
+===
+Summary info of get:
+Get 7 rows.
+
 --- SQL operation complete.
 >> -- should be stest, stest_empty, stestc, sb_* tables + a sample table
 >>
@@ -173,6 +185,10 @@ STESTC
 STEST_EMPTY
 TRAF_SAMPLE_07158060726899021395_1517441711_141471
 
+===
+Summary info of get:
+Get 7 rows.
+
 --- SQL operation complete.
 >> -- should be stest, stest_empty, stestc, sb_* tables + a different sample 
 >> table
 >>
@@ -203,6 +219,10 @@ STEST
 STESTC
 STEST_EMPTY
 
+===
+Summary info of get:
+Get 6 rows.
+
 --- SQL operation complete.
 >> -- should be stest, stest_empty, stestc, sb_* tables only
 >>
@@ -230,6 +250,10 @@ STESTC
 STEST_EMPTY
 TRAF_SAMPLE_07158060726899021395_1517441748_979037
 
+===
+Summary info of get:
+Get 7 rows.
+
 --- SQL operation complete.
 >> -- should be stest, stest_empty, stestc, sb_* tables + another sample table
 >>
@@ -264,6 +288,10 @@ STESTC
 STEST_EMPTY
 TRAF_SAMPLE_07158060726899021395_1517441802_045572
 
+===
+Summary info of get:
+Get 7 rows.
+
 --- SQL operation complete.
 >> -- should be stest, stest_empty, stestc, sb_* tables + another

[3/9] trafodion git commit: fix issues for local var and support complex get command

2018-07-21 Thread liuming 
fix issues for local var and support complex get command


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

Branch: refs/heads/master
Commit: 14f57eaad0e8ffae58ff79f42c29b551e8fa2280
Parents: e18bab4
Author: Liu Ming 
Authored: Wed Jul 11 12:24:38 2018 -0400
Committer: Liu Ming 
Committed: Wed Jul 11 12:24:38 2018 -0400

--
 core/sql/executor/ExExeUtil.h  |  7 +++
 core/sql/executor/ExExeUtilGet.cpp | 21 -
 2 files changed, 23 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafodion/blob/14f57eaa/core/sql/executor/ExExeUtil.h
--
diff --git a/core/sql/executor/ExExeUtil.h b/core/sql/executor/ExExeUtil.h
index 595a0a6..dac9c18 100644
--- a/core/sql/executor/ExExeUtil.h
+++ b/core/sql/executor/ExExeUtil.h
@@ -2491,6 +2491,11 @@ protected:
   Lng32 getUsedObjects(Queue * infoList,
   NABoolean isShorthandView,
   char* , Lng32 );
+  void setReturnRowCount( Lng32 n) { returnRowCount_ = n; }
+
+  Lng32 getReturnRowCount() {return returnRowCount_;}
+
+  void incReturnRowCount() {returnRowCount_++; }
 
 private:
 
@@ -2518,6 +2523,8 @@ private:
 const char *schName,
 const char *objName);
 
+  Lng32 returnRowCount_;
+
 };
 
 //

http://git-wip-us.apache.org/repos/asf/trafodion/blob/14f57eaa/core/sql/executor/ExExeUtilGet.cpp
--
diff --git a/core/sql/executor/ExExeUtilGet.cpp 
b/core/sql/executor/ExExeUtilGet.cpp
index 27064e2..dbc5097 100644
--- a/core/sql/executor/ExExeUtilGet.cpp
+++ b/core/sql/executor/ExExeUtilGet.cpp
@@ -149,6 +149,7 @@ ExExeUtilGetMetadataInfoTcb::ExExeUtilGetMetadataInfoTcb(
   patternStr_ = new(glob->getDefaultHeap()) char[1000];
 
   numOutputEntries_ = 0;
+  returnRowCount_ = 0;
 }
 
 ExExeUtilGetMetadataInfoTcb::~ExExeUtilGetMetadataInfoTcb()
@@ -1818,11 +1819,8 @@ short ExExeUtilGetMetadataInfoTcb::work()
 {
   short retcode = 0;
   Lng32 cliRC = 0;
-  Lng32 returnRowCount=0;
-  char returnMsg[256];
   ex_expr::exp_return_type exprRetCode = ex_expr::EXPR_OK;
 
-  memset(returnMsg, 0, 256);
 
   // if no parent request, return
   if (qparent_.down->isEmpty())
@@ -3188,7 +3186,7 @@ short ExExeUtilGetMetadataInfoTcb::work()
 }
 
infoList_->advance();
-returnRowCount++;
+incReturnRowCount();
  }
break;
 
@@ -3351,7 +3349,9 @@ short ExExeUtilGetMetadataInfoTcb::work()
 if (NOT getMItdb().noHeader())
 {
   short rc = 0;
-  sprintf(returnMsg, "\n===\nSummary info of 
get:\nGet %d rows.", returnRowCount);
+  char returnMsg[256];
+  memset(returnMsg, 0, 256);
+  sprintf(returnMsg, "\n===\nSummary info of 
get:\nGet %d rows.", getReturnRowCount());
   moveRowToUpQueue(returnMsg, strlen(returnMsg), );
   moveRowToUpQueue(" ");
 }
@@ -3891,6 +3891,7 @@ short ExExeUtilGetMetadataInfoComplexTcb::work()
  moveRowToUpQueue(" ", 0, );
 
infoList_->advance();
+incReturnRowCount();
  }
break;
 
@@ -3906,6 +3907,15 @@ short ExExeUtilGetMetadataInfoComplexTcb::work()
 
case DONE_:
  {
+if (NOT getMItdb().noHeader())
+{
+  short rc = 0;
+  char returnMsg[256];
+  memset(returnMsg, 0, 256);
+  sprintf(returnMsg, "\n===\nSummary info of 
get:\nGet %d rows.", getReturnRowCount());
+  moveRowToUpQueue(returnMsg, strlen(returnMsg), );
+  moveRowToUpQueue(" ");
+}
retcode = handleDone();
if (retcode == 1)
  return WORK_OK;
@@ -4741,6 +4751,7 @@ short ExExeUtilGetHiveMetadataInfoTcb::work()
 }
 
infoList_->advance();
+incReturnRowCount();
  }
  break;

[9/9] trafodion git commit: merge [TRAFODION-3101] enhance get command to show rows get

2018-07-21 Thread liuming 
merge [TRAFODION-3101] enhance get command to show rows get


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

Branch: refs/heads/master
Commit: 8b56ed242aa177340ac2767766c42f529c470b88
Parents: efd5647 d5d8f0e
Author: Liu Ming 
Authored: Sat Jul 21 10:51:33 2018 +
Committer: Liu Ming 
Committed: Sat Jul 21 10:51:33 2018 +

--
 core/sql/executor/ExExeUtil.h|   8 +
 core/sql/executor/ExExeUtilGet.cpp   |  24 ++
 core/sql/regress/compGeneral/EXPECTED023 |  42 +++
 core/sql/regress/core/EXPECTED116|  12 +
 core/sql/regress/executor/EXPECTED130|   4 +
 core/sql/regress/hive/DIFF009.KNOWN  |   2 +-
 core/sql/regress/hive/EXPECTED007|  60 
 core/sql/regress/hive/EXPECTED009|   3 +
 core/sql/regress/privs1/EXPECTED123  | 318 +
 core/sql/regress/privs1/EXPECTED125  | 390 ++
 core/sql/regress/privs1/EXPECTED132  |  48 
 core/sql/regress/privs1/EXPECTED136  |   3 +
 core/sql/regress/privs1/EXPECTED141  |  30 ++
 core/sql/regress/privs2/EXPECTED135  |  18 ++
 core/sql/regress/privs2/EXPECTED138  | 105 +++
 core/sql/regress/privs2/EXPECTED140  |   3 +
 core/sql/regress/privs2/EXPECTED143  |  12 +
 core/sql/regress/privs2/EXPECTED144  |  45 +++
 core/sql/regress/privs2/EXPECTED146  |  36 +++
 core/sql/regress/seabase/EXPECTED011 |   3 +
 core/sql/regress/seabase/EXPECTED012 |  52 
 core/sql/regress/seabase/EXPECTED022 |  12 +
 core/sql/regress/seabase/EXPECTED031 |   3 +
 core/sql/regress/udr/EXPECTED001 |   6 +
 core/sql/regress/udr/EXPECTED102 |  30 ++
 core/sql/regress/udr/EXPECTED103 |   6 +
 core/sql/regress/udr/EXPECTED107.SB  |   3 +
 27 files changed, 1277 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/trafodion/blob/8b56ed24/core/sql/executor/ExExeUtil.h
--

http://git-wip-us.apache.org/repos/asf/trafodion/blob/8b56ed24/core/sql/executor/ExExeUtilGet.cpp
--

http://git-wip-us.apache.org/repos/asf/trafodion/blob/8b56ed24/core/sql/regress/executor/EXPECTED130
--

[5/9] trafodion git commit: fix regression failures

2018-07-21 Thread liuming 
fix regression failures


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

Branch: refs/heads/master
Commit: 833f820675f44c58b5ad219fe2d6265616723f5b
Parents: 00e9d5b
Author: Liu Ming 
Authored: Sun Jul 15 17:27:43 2018 -0400
Committer: Liu Ming 
Committed: Sun Jul 15 17:27:43 2018 -0400

--
 core/sql/executor/ExExeUtil.h|  3 +-
 core/sql/executor/ExExeUtilGet.cpp   |  2 ++
 core/sql/regress/hive/EXPECTED007| 60 +++
 core/sql/regress/hive/EXPECTED009|  4 +--
 core/sql/regress/privs1/EXPECTED132  | 48 +
 core/sql/regress/seabase/EXPECTED011 |  4 +--
 core/sql/regress/seabase/EXPECTED022 | 16 +++--
 core/sql/regress/seabase/EXPECTED031 |  4 +--
 8 files changed, 119 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafodion/blob/833f8206/core/sql/executor/ExExeUtil.h
--
diff --git a/core/sql/executor/ExExeUtil.h b/core/sql/executor/ExExeUtil.h
index dac9c18..4e760d9 100644
--- a/core/sql/executor/ExExeUtil.h
+++ b/core/sql/executor/ExExeUtil.h
@@ -2497,6 +2497,8 @@ protected:
 
   void incReturnRowCount() {returnRowCount_++; }
 
+  Lng32 returnRowCount_;
+
 private:
 
   NABoolean checkUserPrivs(ContextCli * currConnext, const 
ComTdbExeUtilGetMetadataInfo::QueryType queryType);
@@ -2523,7 +2525,6 @@ private:
 const char *schName,
 const char *objName);
 
-  Lng32 returnRowCount_;
 
 };
 

http://git-wip-us.apache.org/repos/asf/trafodion/blob/833f8206/core/sql/executor/ExExeUtilGet.cpp
--
diff --git a/core/sql/executor/ExExeUtilGet.cpp 
b/core/sql/executor/ExExeUtilGet.cpp
index 60486de..36e19f0 100644
--- a/core/sql/executor/ExExeUtilGet.cpp
+++ b/core/sql/executor/ExExeUtilGet.cpp
@@ -1851,6 +1851,7 @@ short ExExeUtilGetMetadataInfoTcb::work()
headingReturned_ = FALSE;
 
numOutputEntries_ = 1;
+returnRowCount_ = 0 ;
 
objectUid_[0] = 0;
  }
@@ -3420,6 +3421,7 @@ short ExExeUtilGetMetadataInfoComplexTcb::work()
case INITIAL_:
  {
step_ = SETUP_QUERY_;
+returnRowCount_ = 0 ;
  }
break;
 

http://git-wip-us.apache.org/repos/asf/trafodion/blob/833f8206/core/sql/regress/hive/EXPECTED007
--
diff --git a/core/sql/regress/hive/EXPECTED007 
b/core/sql/regress/hive/EXPECTED007
index 4674f01..600d1b8 100644
--- a/core/sql/regress/hive/EXPECTED007
+++ b/core/sql/regress/hive/EXPECTED007
@@ -198,6 +198,9 @@ Tables in View SCH007.VHIVE1
 
 HIVE.HIVE.THIVE1
 
+===
+ 1 row(s) returned
+
 --- SQL operation complete.
 >>get tables in view trafodion.sch007.vhive11;
 
@@ -206,6 +209,9 @@ Tables in View SCH007.VHIVE11
 
 HIVE.HIVE.THIVE2
 
+===
+ 1 row(s) returned
+
 --- SQL operation complete.
 >>
 >>get all tables in view trafodion.sch007.vhive3;
@@ -216,6 +222,9 @@ Tables in View SCH007.VHIVE3
 HIVE.HIVE.THIVE1
 HIVE.HIVE.THIVE2
 
+===
+ 2 row(s) returned
+
 --- SQL operation complete.
 >>get views in view trafodion.sch007.vhive3;
 
@@ -224,6 +233,9 @@ Views in View SCH007.VHIVE3
 
 TRAFODION.SCH007.VHIVE2
 
+===
+ 1 row(s) returned
+
 --- SQL operation complete.
 >>get views on table hive.hive.thive1;
 
@@ -233,6 +245,9 @@ Views on Table HIVE.THIVE1
 TRAFODION.SCH007.VHIVE1
 TRAFODION.SCH007.VHIVE2
 
+===
+ 2 row(s) returned
+
 --- SQL operation complete.
 >>get all views on table hive.hive.thive2;
 
@@ -244,6 +259,9 @@ TRAFODION.SCH007.VHIVE2
 TRAFODION.SCH007.VHIVE3
 TRAFODION.SCH007.VHIVEHBASE
 
+===
+ 4 row(s) returned
+
 --- SQL operation complete.
 >>
 >>drop external table thive2 for hive.hive.thive2 cascade;
@@ -283,6 +301,9 @@ TRAFODION.SCH007.VHIVE2
 TRAFODION.SCH007.VHIVE3
 TRAFODION.SCH007.VHIVEHBASE
 
+===
+ 4 row(s) returned
+
 --- SQL operation complete.
 >>
 >>obey TEST007(error_tests_traf);
@@ -647,6 +668,9 @@ Views in View SCH007.VTRAFONHIVE
 
 HIVE.HIVESCH007.VHIVE11
 
+===
+ 1 row(s) returned
+
 --- SQL operation complete.
 >>get views on view hive.hivesch007.vhive11;
 
@@ -655,6 +679,9 @@ Views ON View HIVESCH007.VHIVE11
 
 TRAFODION.SCH007.VTRAFONHIVE
 
+===
+ 1 row(s) returned
+
 --- SQL operation complete.
 >>
 >>unregister hive view hive.hivesch007.vhive11 cascade;
@@ -694,6 +721,9 @@ Views in View HIVESCH007.VHIVE11
 
 HIVE.HIVESCH007.VHIVE1

[4/9] trafodion git commit: fix regression failures

2018-07-21 Thread liuming 
fix regression failures


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

Branch: refs/heads/master
Commit: 00e9d5b5852d03da801892f5bb3633274d5bb540
Parents: 14f57ea
Author: Liu Ming 
Authored: Sat Jul 14 16:55:08 2018 -0400
Committer: Liu Ming 
Committed: Sat Jul 14 16:55:08 2018 -0400

--
 core/sql/executor/ExExeUtilGet.cpp   |  10 +-
 core/sql/regress/compGeneral/EXPECTED023 |  42 +--
 core/sql/regress/privs1/EXPECTED123  | 318 +
 core/sql/regress/privs1/EXPECTED125  | 390 ++
 core/sql/regress/privs1/EXPECTED136  |   3 +
 core/sql/regress/privs1/EXPECTED141  |  30 ++
 core/sql/regress/privs2/EXPECTED135  |  18 ++
 core/sql/regress/privs2/EXPECTED138  | 105 +++
 core/sql/regress/privs2/EXPECTED140  |   3 +
 core/sql/regress/privs2/EXPECTED143  |  12 +
 core/sql/regress/privs2/EXPECTED144  |  45 +++
 core/sql/regress/privs2/EXPECTED146  |  36 +++
 core/sql/regress/udr/EXPECTED001 |   6 +
 core/sql/regress/udr/EXPECTED102 |  30 ++
 core/sql/regress/udr/EXPECTED103 |   6 +
 core/sql/regress/udr/EXPECTED107.SB  |   3 +
 16 files changed, 1023 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafodion/blob/00e9d5b5/core/sql/executor/ExExeUtilGet.cpp
--
diff --git a/core/sql/executor/ExExeUtilGet.cpp 
b/core/sql/executor/ExExeUtilGet.cpp
index dbc5097..60486de 100644
--- a/core/sql/executor/ExExeUtilGet.cpp
+++ b/core/sql/executor/ExExeUtilGet.cpp
@@ -3346,14 +3346,13 @@ short ExExeUtilGetMetadataInfoTcb::work()
 
case DONE_:
  {
-if (NOT getMItdb().noHeader())
+if (NOT getMItdb().noHeader() && getReturnRowCount() > 0)
 {
   short rc = 0;
   char returnMsg[256];
   memset(returnMsg, 0, 256);
-  sprintf(returnMsg, "\n===\nSummary info of 
get:\nGet %d rows.", getReturnRowCount());
+  sprintf(returnMsg, "\n===\n %d row(s) 
returned", getReturnRowCount());
   moveRowToUpQueue(returnMsg, strlen(returnMsg), );
-  moveRowToUpQueue(" ");
 }
 
retcode = handleDone();
@@ -3907,14 +3906,13 @@ short ExExeUtilGetMetadataInfoComplexTcb::work()
 
case DONE_:
  {
-if (NOT getMItdb().noHeader())
+if (NOT getMItdb().noHeader() && getReturnRowCount() > 0)
 {
   short rc = 0;
   char returnMsg[256];
   memset(returnMsg, 0, 256);
-  sprintf(returnMsg, "\n===\nSummary info of 
get:\nGet %d rows.", getReturnRowCount());
+  sprintf(returnMsg, "\n===\n %d row(s) 
returned", getReturnRowCount());
   moveRowToUpQueue(returnMsg, strlen(returnMsg), );
-  moveRowToUpQueue(" ");
 }
retcode = handleDone();
if (retcode == 1)

http://git-wip-us.apache.org/repos/asf/trafodion/blob/00e9d5b5/core/sql/regress/compGeneral/EXPECTED023
--
diff --git a/core/sql/regress/compGeneral/EXPECTED023 
b/core/sql/regress/compGeneral/EXPECTED023
index 2f1f012..0ea3503 100644
--- a/core/sql/regress/compGeneral/EXPECTED023
+++ b/core/sql/regress/compGeneral/EXPECTED023
@@ -24,8 +24,7 @@ SB_HISTOGRAM_INTERVALS
 SB_PERSISTENT_SAMPLES
 
 ===
-Summary info of get:
-Get 3 rows.
+ 3 row(s) returned
 
 --- SQL operation complete.
 >>
@@ -111,8 +110,7 @@ STESTC
 STEST_EMPTY
 
 ===
-Summary info of get:
-Get 6 rows.
+ 6 row(s) returned
 
 --- SQL operation complete.
 >>  -- should be just stest, stest_empty, stestc, and the sb_* tables
@@ -158,8 +156,7 @@ STEST_EMPTY
 TRAF_SAMPLE_07158060726899021395_1517441663_444545
 
 ===
-Summary info of get:
-Get 7 rows.
+ 7 row(s) returned
 
 --- SQL operation complete.
 >> -- should be stest, stest_empty, stestc, sb_* tables + a sample table
@@ -186,8 +183,7 @@ STEST_EMPTY
 TRAF_SAMPLE_07158060726899021395_1517441711_141471
 
 ===
-Summary info of get:
-Get 7 rows.
+ 7 row(s) returned
 
 --- SQL operation complete.
 >> -- should be stest, stest_empty, stestc, sb_* tables + a different sample 
 >> table
@@ -220,8 +216,7 @@ STESTC
 STEST_EMPTY
 
 ===
-Summary info of get:
-Get 6 rows.
+ 6 row(s) returned
 
 --- SQL operation complete.
 >> -- should be stest, stest_empty, stestc, sb_* tables only

[7/9] trafodion git commit: fix regression failuer

2018-07-21 Thread liuming 
fix regression failuer


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

Branch: refs/heads/master
Commit: 5146272c41fc411458a903e4c6e3e52a37513588
Parents: ea5b8b7
Author: Liu Ming 
Authored: Mon Jul 16 03:04:25 2018 -0400
Committer: Liu Ming 
Committed: Mon Jul 16 03:04:25 2018 -0400

--
 core/sql/regress/core/EXPECTED116 | 6 --
 1 file changed, 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafodion/blob/5146272c/core/sql/regress/core/EXPECTED116
--
diff --git a/core/sql/regress/core/EXPECTED116 
b/core/sql/regress/core/EXPECTED116
index f85703d..c423f1a 100644
--- a/core/sql/regress/core/EXPECTED116
+++ b/core/sql/regress/core/EXPECTED116
@@ -777,12 +777,6 @@ T116T2
 --- SQL operation complete.
 >>get tables in schema t116sch1;
 
-
-===
-Summary info of get:
-Get 0 rows.
-
-
 --- SQL operation complete.
 >>select count(*) from "_MD_".objects where schema_name = 'T116SCH1' 
 +>   for read uncommitted access;

[2/9] trafodion git commit: fix sql regressions

2018-07-21 Thread liuming 
fix sql regressions


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

Branch: refs/heads/master
Commit: e18bab4d79c7eb6059bebbb78be7ddeeb05bfd1f
Parents: 591e0fa
Author: Liu Ming 
Authored: Mon Jun 25 02:47:42 2018 -0400
Committer: Liu Ming 
Committed: Mon Jun 25 02:47:42 2018 -0400

--
 core/sql/executor/ExExeUtilGet.cpp   | 1 -
 core/sql/regress/core/EXPECTED116| 5 +
 core/sql/regress/hive/EXPECTED009| 5 +
 core/sql/regress/seabase/EXPECTED011 | 1 +
 core/sql/regress/seabase/EXPECTED022 | 9 +
 core/sql/regress/seabase/EXPECTED031 | 1 +
 6 files changed, 21 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/trafodion/blob/e18bab4d/core/sql/executor/ExExeUtilGet.cpp
--
diff --git a/core/sql/executor/ExExeUtilGet.cpp 
b/core/sql/executor/ExExeUtilGet.cpp
index 5bb4793..27064e2 100644
--- a/core/sql/executor/ExExeUtilGet.cpp
+++ b/core/sql/executor/ExExeUtilGet.cpp
@@ -949,7 +949,6 @@ short ExExeUtilGetMetadataInfoTcb::displayHeading()
 {
   if (getMItdb().noHeader())
 {
-printf("LMDBG noheader is true\n");
   return 0;
 }
   // make sure there is enough space to move header

http://git-wip-us.apache.org/repos/asf/trafodion/blob/e18bab4d/core/sql/regress/core/EXPECTED116
--
diff --git a/core/sql/regress/core/EXPECTED116 
b/core/sql/regress/core/EXPECTED116
index fcce935..fed4995 100644
--- a/core/sql/regress/core/EXPECTED116
+++ b/core/sql/regress/core/EXPECTED116
@@ -739,6 +739,7 @@ T116T1
 Summary info of get:
 Get 1 rows.
 
+
 --- SQL operation complete.
 >>drop table t116t1;
 
@@ -756,6 +757,7 @@ SB_PERSISTENT_SAMPLES
 Summary info of get:
 Get 3 rows.
 
+
 --- SQL operation complete.
 >>create table t116t2 (a int);
 
@@ -774,6 +776,7 @@ T116T2
 Summary info of get:
 Get 4 rows.
 
+
 --- SQL operation complete.
 >>drop schema t116sch1 cascade;
 
@@ -785,6 +788,7 @@ Get 4 rows.
 Summary info of get:
 Get 0 rows.
 
+
 --- SQL operation complete.
 >>select count(*) from "_MD_".objects where schema_name = 'T116SCH1' 
 +>   for read uncommitted access;
@@ -812,6 +816,7 @@ T116T1
 Summary info of get:
 Get 4 rows.
 
+
 --- SQL operation complete.
 >>
 >>set schema sch;

http://git-wip-us.apache.org/repos/asf/trafodion/blob/e18bab4d/core/sql/regress/hive/EXPECTED009
--
diff --git a/core/sql/regress/hive/EXPECTED009 
b/core/sql/regress/hive/EXPECTED009
index fad737c..29f6d75 100644
--- a/core/sql/regress/hive/EXPECTED009
+++ b/core/sql/regress/hive/EXPECTED009
@@ -430,6 +430,11 @@ Tables in Schema TRAFODION._HV_SCH_T009_
 T009T1
 T009T2
 
+===
+Summary info of get:
+Get 2 rows.
+
+ 
 --- SQL operation complete.
 >>invoke hive.sch_t009.t009t1;
 

http://git-wip-us.apache.org/repos/asf/trafodion/blob/e18bab4d/core/sql/regress/seabase/EXPECTED011
--
diff --git a/core/sql/regress/seabase/EXPECTED011 
b/core/sql/regress/seabase/EXPECTED011
index b09633a..b69abc2 100644
--- a/core/sql/regress/seabase/EXPECTED011
+++ b/core/sql/regress/seabase/EXPECTED011
@@ -1299,6 +1299,7 @@ METRIC_TEXT_TABLE
 Summary info of get:
 Get 4 rows.
 
+
 --- SQL operation complete.
 >>invoke trafodion."_REPOS_".metric_query_table;
 

http://git-wip-us.apache.org/repos/asf/trafodion/blob/e18bab4d/core/sql/regress/seabase/EXPECTED022
--
diff --git a/core/sql/regress/seabase/EXPECTED022 
b/core/sql/regress/seabase/EXPECTED022
index c89b2bd..1a30599 100644
--- a/core/sql/regress/seabase/EXPECTED022
+++ b/core/sql/regress/seabase/EXPECTED022
@@ -1268,6 +1268,8 @@ HBase Registered Tables in Catalog TRAFODION
 ===
 Summary info of get:
 Get 2 rows.
+
+
 --- SQL operation complete.
 >>unregister hbase table t022hbm2;
 
@@ -1286,6 +1288,8 @@ HBase Registered Tables in Catalog TRAFODION
 ===
 Summary info of get:
 Get 2 rows.
+
+
 --- SQL operation complete.
 >>showddl hbase."_CELL_".t022hbm2;
 
@@ -1344,6 +1348,7 @@ REGISTER HBASE TABLE T022HBM2;
 Summary info of get:
 Get 0 rows.
 
+
 --- SQL operation complete.
 >>showddl hbase."_CELL_".t022hbm2;
 
@@ -1398,6 +1403,8 @@ HBase Registered Tables in Catalog TRAFODION
 ===
 Summary info of get:
 Get 1 rows.
+
+
 --- SQL operation complete.
 >>showddl hbase."_CELL_".t022hbm2;
 
@@ -1466,6 +1473,8 @@ HBase Registered Tables in Catalog TRAFODION
 ===

[6/9] trafodion git commit: fix regression test failure

2018-07-21 Thread liuming 
fix regression test failure


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

Branch: refs/heads/master
Commit: ea5b8b7f80ba4383dfd3737782ca36f5bf4e4256
Parents: 833f820
Author: Liu Ming 
Authored: Sun Jul 15 23:43:31 2018 -0400
Committer: Liu Ming 
Committed: Sun Jul 15 23:43:31 2018 -0400

--
 core/sql/regress/core/EXPECTED116| 16 
 core/sql/regress/seabase/EXPECTED022 |  6 --
 2 files changed, 4 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafodion/blob/ea5b8b7f/core/sql/regress/core/EXPECTED116
--
diff --git a/core/sql/regress/core/EXPECTED116 
b/core/sql/regress/core/EXPECTED116
index fed4995..f85703d 100644
--- a/core/sql/regress/core/EXPECTED116
+++ b/core/sql/regress/core/EXPECTED116
@@ -736,9 +736,7 @@ Tables in Schema TRAFODION.T116SCH1
 T116T1
 
 ===
-Summary info of get:
-Get 1 rows.
-
+ 1 row(s) returned
 
 --- SQL operation complete.
 >>drop table t116t1;
@@ -754,9 +752,7 @@ SB_HISTOGRAM_INTERVALS
 SB_PERSISTENT_SAMPLES
 
 ===
-Summary info of get:
-Get 3 rows.
-
+ 3 row(s) returned
 
 --- SQL operation complete.
 >>create table t116t2 (a int);
@@ -773,9 +769,7 @@ SB_PERSISTENT_SAMPLES
 T116T2
 
 ===
-Summary info of get:
-Get 4 rows.
-
+ 4 row(s) returned
 
 --- SQL operation complete.
 >>drop schema t116sch1 cascade;
@@ -813,9 +807,7 @@ SB_PERSISTENT_SAMPLES
 T116T1
 
 ===
-Summary info of get:
-Get 4 rows.
-
+ 4 row(s) returned
 
 --- SQL operation complete.
 >>

http://git-wip-us.apache.org/repos/asf/trafodion/blob/ea5b8b7f/core/sql/regress/seabase/EXPECTED022
--
diff --git a/core/sql/regress/seabase/EXPECTED022 
b/core/sql/regress/seabase/EXPECTED022
index d6af35f..ffd51e2 100644
--- a/core/sql/regress/seabase/EXPECTED022
+++ b/core/sql/regress/seabase/EXPECTED022
@@ -1339,12 +1339,6 @@ REGISTER HBASE TABLE T022HBM2;
 --- SQL operation complete.
 >>get hbase registered tables in catalog trafodion, match '%T022HBM2%';
 
-
-===
-Summary info of get:
-Get 0 rows.
-
-
 --- SQL operation complete.
 >>showddl hbase."_CELL_".t022hbm2;