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 <ovis_p...@sina.com> Authored: Sun Jul 15 17:27:43 2018 -0400 Committer: Liu Ming <ovis_p...@sina.com> 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 +======================= + 1 row(s) returned + --- SQL operation complete. >>get views on table hive.hivesch007.thive1; @@ -702,6 +732,9 @@ Views on Table HIVESCH007.THIVE1 HIVE.HIVESCH007.VHIVE1 +======================= + 1 row(s) returned + --- SQL operation complete. >>get views on view hive.hivesch007.vhive1; @@ -710,6 +743,9 @@ Views ON View HIVESCH007.VHIVE1 HIVE.HIVESCH007.VHIVE11 +======================= + 1 row(s) returned + --- SQL operation complete. >> >>-- tests for recursive hive view/table register/unregister operations @@ -759,6 +795,9 @@ Tables in View HIVESCH0071.VH11 HIVE.HIVESCH0071.H1 +======================= + 1 row(s) returned + --- SQL operation complete. >>get views in view vh11; @@ -767,6 +806,9 @@ Views in View HIVESCH0071.VH11 HIVE.HIVESCH0071.VH1 +======================= + 1 row(s) returned + --- SQL operation complete. >>get all objects in view vh11; @@ -776,6 +818,9 @@ Objects in View HIVESCH0071.VH11 HIVE.HIVESCH0071.H1 HIVE.HIVESCH0071.VH1 +======================= + 2 row(s) returned + --- SQL operation complete. >> >>get hive registered tables in catalog trafodion, match '%hivesch0071%'; @@ -785,6 +830,9 @@ Hive Registered Tables in Catalog TRAFODION hive.hivesch0071.h1 +======================= + 1 row(s) returned + --- SQL operation complete. >>get hive registered views in catalog trafodion, match '%hivesch0071%'; @@ -794,6 +842,9 @@ Hive Registered Views in Catalog TRAFODION hive.hivesch0071.vh1 hive.hivesch0071.vh11 +======================= + 2 row(s) returned + --- SQL operation complete. >>get hive registered objects in catalog trafodion, match '%hivesch0071%'; @@ -804,6 +855,9 @@ hive.hivesch0071.h1 hive.hivesch0071.vh1 hive.hivesch0071.vh11 +======================= + 3 row(s) returned + --- SQL operation complete. >> >>select object_name from trafodion."_MD_".objects where schema_name = >>'HIVESCH0071'; @@ -884,6 +938,9 @@ Hive Registered Schemas in Catalog TRAFODION hive.hivesch0078 +======================= + 1 row(s) returned + --- SQL operation complete. >>unregister hive schema hive.hivesch0078; @@ -1017,6 +1074,9 @@ Privileges for User SQL_USER3 S------ HIVE.HIVESCH007.THIVE9 +======================= + 1 row(s) returned + --- SQL operation complete. >>insert into hive.hivesch007.thive9 values (1), (2), (3), (4), (5), (6); http://git-wip-us.apache.org/repos/asf/trafodion/blob/833f8206/core/sql/regress/hive/EXPECTED009 ---------------------------------------------------------------------- diff --git a/core/sql/regress/hive/EXPECTED009 b/core/sql/regress/hive/EXPECTED009 index 29f6d75..26f220f 100644 --- a/core/sql/regress/hive/EXPECTED009 +++ b/core/sql/regress/hive/EXPECTED009 @@ -431,9 +431,7 @@ T009T1 T009T2 ======================= -Summary info of get: -Get 2 rows. - + 2 row(s) returned --- SQL operation complete. >>invoke hive.sch_t009.t009t1; http://git-wip-us.apache.org/repos/asf/trafodion/blob/833f8206/core/sql/regress/privs1/EXPECTED132 ---------------------------------------------------------------------- diff --git a/core/sql/regress/privs1/EXPECTED132 b/core/sql/regress/privs1/EXPECTED132 index 0c9f2fe..7a60061 100644 --- a/core/sql/regress/privs1/EXPECTED132 +++ b/core/sql/regress/privs1/EXPECTED132 @@ -21,6 +21,9 @@ Privilege information on Component SQL_OPERATIONS for PUBLIC CREATE_SCHEMA SHOW +======================= + 2 row(s) returned + --- SQL operation complete. >> >>-- succeed: DB__ROOT can create a library @@ -42,6 +45,9 @@ Libraries in Schema TRAFODION.T132SCH T132_L1 +======================= + 1 row(s) returned + --- SQL operation complete. >>drop library t132_l1; @@ -103,6 +109,9 @@ Libraries in Schema TRAFODION.T132SCH T132_L1 +======================= + 1 row(s) returned + --- SQL operation complete. >>drop library t132_l1; @@ -171,6 +180,9 @@ Libraries in Schema TRAFODION.T132SCH T132_L1 +======================= + 1 row(s) returned + --- SQL operation complete. >>drop library t132_l1; @@ -199,6 +211,9 @@ Privilege information on Component SQL_OPERATIONS for PUBLIC CREATE_SCHEMA SHOW +======================= + 2 row(s) returned + --- SQL operation complete. >> >>obey TEST132(test_popindex); @@ -249,6 +264,9 @@ Tables in Schema TRAFODION.T132SCH T132T1 T132T2 +======================= + 2 row(s) returned + --- SQL operation complete. >>cqd SHOWDDL_DISPLAY_PRIVILEGE_GRANTS 'ON'; @@ -649,6 +667,9 @@ Privilege information on Component SQL_OPERATIONS for PUBLIC CREATE_SCHEMA SHOW +======================= + 2 row(s) returned + --- SQL operation complete. >>revoke component privilege "SHOW" on sql_operations from "PUBLIC"; @@ -660,6 +681,9 @@ Privilege information on Component SQL_OPERATIONS for PUBLIC CREATE_SCHEMA +======================= + 1 row(s) returned + --- SQL operation complete. >> >>-- DB__ROOT has all privileges @@ -1265,6 +1289,9 @@ Privilege information on Component SQL_OPERATIONS for PUBLIC CREATE_SCHEMA +======================= + 1 row(s) returned + --- SQL operation complete. >>grant component privilege "SHOW" on sql_operations to "PUBLIC"; @@ -1277,6 +1304,9 @@ Privilege information on Component SQL_OPERATIONS for PUBLIC CREATE_SCHEMA SHOW +======================= + 2 row(s) returned + --- SQL operation complete. >>changeuser sql_user1; >>obey TEST132(show_objects); @@ -1494,6 +1524,9 @@ Tables in Schema TRAFODION.T132SCH T132T1 T132T2 +======================= + 2 row(s) returned + --- SQL operation complete. >>select count(*) from t132t1; @@ -1636,6 +1669,9 @@ Privilege information on Component SQL_OPERATIONS for PUBLIC CREATE_SCHEMA SHOW +======================= + 2 row(s) returned + --- SQL operation complete. >>revoke component privilege "SHOW" on sql_operations from "PUBLIC"; @@ -1647,6 +1683,9 @@ Privilege information on Component SQL_OPERATIONS for PUBLIC CREATE_SCHEMA +======================= + 1 row(s) returned + --- SQL operation complete. >> >>-- Run with MANAGE_STATISTICS and no SHOW @@ -1709,6 +1748,9 @@ Privilege information on Component SQL_OPERATIONS for SQL_USER3 MANAGE_STATISTICS +======================= + 1 row(s) returned + --- SQL operation complete. >>changeuser sql_user3; >>obey TEST132(show_update_stats); @@ -1889,6 +1931,9 @@ Privilege information on Component SQL_OPERATIONS for SQL_USER3 MANAGE_STATISTICS +======================= + 1 row(s) returned + --- SQL operation complete. >>changeuser sql_user3; >>obey TEST132(update_stats1); @@ -1928,6 +1973,9 @@ Privilege information on Component SQL_OPERATIONS for PUBLIC CREATE_SCHEMA SHOW +======================= + 2 row(s) returned + --- SQL operation complete. >> >>drop table t132t1; http://git-wip-us.apache.org/repos/asf/trafodion/blob/833f8206/core/sql/regress/seabase/EXPECTED011 ---------------------------------------------------------------------- diff --git a/core/sql/regress/seabase/EXPECTED011 b/core/sql/regress/seabase/EXPECTED011 index b69abc2..b4c1608 100644 --- a/core/sql/regress/seabase/EXPECTED011 +++ b/core/sql/regress/seabase/EXPECTED011 @@ -1296,9 +1296,7 @@ METRIC_SESSION_TABLE METRIC_TEXT_TABLE ======================= -Summary info of get: -Get 4 rows. - + 4 row(s) returned --- SQL operation complete. >>invoke trafodion."_REPOS_".metric_query_table; http://git-wip-us.apache.org/repos/asf/trafodion/blob/833f8206/core/sql/regress/seabase/EXPECTED022 ---------------------------------------------------------------------- diff --git a/core/sql/regress/seabase/EXPECTED022 b/core/sql/regress/seabase/EXPECTED022 index 1a30599..d6af35f 100644 --- a/core/sql/regress/seabase/EXPECTED022 +++ b/core/sql/regress/seabase/EXPECTED022 @@ -1266,9 +1266,7 @@ HBase Registered Tables in Catalog TRAFODION "_ROW_".T022HBM2 ======================= -Summary info of get: -Get 2 rows. - + 2 row(s) returned --- SQL operation complete. >>unregister hbase table t022hbm2; @@ -1286,9 +1284,7 @@ HBase Registered Tables in Catalog TRAFODION "_ROW_".T022HBM2 ======================= -Summary info of get: -Get 2 rows. - + 2 row(s) returned --- SQL operation complete. >>showddl hbase."_CELL_".t022hbm2; @@ -1401,9 +1397,7 @@ HBase Registered Tables in Catalog TRAFODION "_CELL_".T022HBM2 ======================= -Summary info of get: -Get 1 rows. - + 1 row(s) returned --- SQL operation complete. >>showddl hbase."_CELL_".t022hbm2; @@ -1471,9 +1465,7 @@ HBase Registered Tables in Catalog TRAFODION "_CELL_".T022HBM2 ======================= -Summary info of get: -Get 1 rows. - + 1 row(s) returned --- SQL operation complete. >>showddl hbase."_CELL_".t022hbm2; http://git-wip-us.apache.org/repos/asf/trafodion/blob/833f8206/core/sql/regress/seabase/EXPECTED031 ---------------------------------------------------------------------- diff --git a/core/sql/regress/seabase/EXPECTED031 b/core/sql/regress/seabase/EXPECTED031 index c6e3562..fdb9f48 100644 --- a/core/sql/regress/seabase/EXPECTED031 +++ b/core/sql/regress/seabase/EXPECTED031 @@ -1073,9 +1073,7 @@ TRAFODION HIVE ======================= -Summary info of get: -Get 2 rows. - + 2 row(s) returned --- SQL operation complete. >>
