[TRAFODION-3162] fix regression failure get command
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/8956a5b1 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/8956a5b1 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/8956a5b1 Branch: refs/heads/master Commit: 8956a5b11d2b49846d95326924a52d0038efd361 Parents: 60b3eb0 Author: Liu Ming <ovis_p...@sina.com> Authored: Mon Jul 23 05:53:07 2018 -0400 Committer: Liu Ming <ovis_p...@sina.com> Committed: Mon Jul 23 05:53:07 2018 -0400 ---------------------------------------------------------------------- core/sql/regress/executor/EXPECTED130 | 3 +-- core/sql/regress/privs2/EXPECTED144 | 36 +++++++++++++++++++++++++ core/sql/regress/privs2/EXPECTED146 | 6 ++--- core/sql/regress/seabase/EXPECTED012 | 42 +++++++----------------------- 4 files changed, 49 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/8956a5b1/core/sql/regress/executor/EXPECTED130 ---------------------------------------------------------------------- diff --git a/core/sql/regress/executor/EXPECTED130 b/core/sql/regress/executor/EXPECTED130 index 8f97dad..7ad8bbf 100644 --- a/core/sql/regress/executor/EXPECTED130 +++ b/core/sql/regress/executor/EXPECTED130 @@ -1596,8 +1596,7 @@ SB_PERSISTENT_SAMPLES TLOB130TS2 ======================= -Summary info of get: -Get 7 rows. + 7 row(s) returned --- SQL operation complete. >>drop schema trafodion.lobsch cascade; http://git-wip-us.apache.org/repos/asf/trafodion/blob/8956a5b1/core/sql/regress/privs2/EXPECTED144 ---------------------------------------------------------------------- diff --git a/core/sql/regress/privs2/EXPECTED144 b/core/sql/regress/privs2/EXPECTED144 index f9e0d8e..f3127e0 100644 --- a/core/sql/regress/privs2/EXPECTED144 +++ b/core/sql/regress/privs2/EXPECTED144 @@ -642,6 +642,9 @@ Privileges on Routine _LIBMGR_.HELP ------E SQL_USER2 +======================= + 1 row(s) returned + --- SQL operation complete. >>execute get_privs; @@ -870,6 +873,9 @@ Privileges on Routine T144USER1.GEN_RANDOM ------E SQL_USER3 +======================= + 1 row(s) returned + --- SQL operation complete. >>get privileges on function gen_time for user sql_user3; @@ -881,6 +887,9 @@ Privileges on Routine _LIBMGR_.HELP ------E SQL_USER3 +======================= + 1 row(s) returned + --- SQL operation complete. >>execute get_privs; @@ -1022,6 +1031,9 @@ Privileges on Routine T144USER1.GEN_RANDOM ------E T144ROLE1 +======================= + 1 row(s) returned + --- SQL operation complete. >>get privileges on function gen_time for user sql_user4; @@ -1030,6 +1042,9 @@ Privileges on Routine T144USER1.GEN_TIME ------E T144ROLE1 +======================= + 1 row(s) returned + --- SQL operation complete. >>get privileges on procedure "_LIBMGR_".help for user sql_user4; @@ -1038,6 +1053,9 @@ Privileges on Routine _LIBMGR_.HELP ------E T144ROLE1 +======================= + 1 row(s) returned + --- SQL operation complete. >>get privileges on function gen_random for t144role1; @@ -1046,6 +1064,9 @@ Privileges on Routine T144USER1.GEN_RANDOM ------E T144ROLE1 +======================= + 1 row(s) returned + --- SQL operation complete. >>execute get_privs; @@ -1094,6 +1115,9 @@ Privileges on Routine T144USER1.GEN_TIME ------E T144ROLE1 +======================= + 1 row(s) returned + --- SQL operation complete. >>-- should return no rows for users other than sql_user1 >>get privileges on function gen_random for sql_user1; @@ -1169,6 +1193,9 @@ Privileges on Routine T144USER1.GEN_PHONE ------E SQL_USER3 ------E SQL_USER5 +======================= + 4 row(s) returned + --- SQL operation complete. >>get privileges on function gen_random; @@ -1180,6 +1207,9 @@ Privileges on Routine T144USER1.GEN_RANDOM ------E SQL_USER3 ------E T144ROLE1 +======================= + 4 row(s) returned + --- SQL operation complete. >>get privileges on function gen_time; @@ -1190,6 +1220,9 @@ Privileges on Routine T144USER1.GEN_TIME ------E SQL_USER2 ------E T144ROLE1 +======================= + 3 row(s) returned + --- SQL operation complete. >>get privileges on procedure "_LIBMGR_".help; @@ -1202,6 +1235,9 @@ Privileges on Routine _LIBMGR_.HELP ------E SQL_USER3 ------E T144ROLE1 +======================= + 5 row(s) returned + --- SQL operation complete. >>obey TEST144(test_revokes); >>-- >>============================================================================ http://git-wip-us.apache.org/repos/asf/trafodion/blob/8956a5b1/core/sql/regress/privs2/EXPECTED146 ---------------------------------------------------------------------- diff --git a/core/sql/regress/privs2/EXPECTED146 b/core/sql/regress/privs2/EXPECTED146 index 66c4fd3..0752634 100644 --- a/core/sql/regress/privs2/EXPECTED146 +++ b/core/sql/regress/privs2/EXPECTED146 @@ -1611,7 +1611,7 @@ SIDU-R- TRAFODION._HB_MAP_.T146T1 SIDU-R- TRAFODION._HB_MAP_.T146T2 ======================= - 6 row(s) returned + 8 row(s) returned --- SQL operation complete. >> @@ -1753,7 +1753,7 @@ SIDU-R- TRAFODION._HB_MAP_.T146T1 SIDU-R- TRAFODION._HB_MAP_.T146T2 ======================= - 6 row(s) returned + 8 row(s) returned --- SQL operation complete. >> @@ -1772,7 +1772,7 @@ SIDU-R- HBASE._ROW_.T146T3 SIDU-R- TRAFODION._HB_MAP_.T146T1 ======================= - 4 row(s) returned + 5 row(s) returned --- SQL operation complete. >> http://git-wip-us.apache.org/repos/asf/trafodion/blob/8956a5b1/core/sql/regress/seabase/EXPECTED012 ---------------------------------------------------------------------- diff --git a/core/sql/regress/seabase/EXPECTED012 b/core/sql/regress/seabase/EXPECTED012 index 66c882b..5206fd8 100644 --- a/core/sql/regress/seabase/EXPECTED012 +++ b/core/sql/regress/seabase/EXPECTED012 @@ -290,8 +290,7 @@ T012T11 T012T12 ======================= -Summary info of get: -Get 5 rows. + 5 row(s) returned --- SQL operation complete. >>get indexes in schema trafodion.zschema; @@ -305,8 +304,7 @@ T012T11I1 T012T11I2 ======================= -Summary info of get: -Get 4 rows. + 4 row(s) returned --- SQL operation complete. >>get views in schema trafodion.zschema; @@ -317,8 +315,7 @@ Views in Schema TRAFODION.ZSCHEMA T012T11V1 ======================= -Summary info of get: -Get 1 rows. + 1 row(s) returned --- SQL operation complete. >> @@ -328,27 +325,12 @@ Get 1 rows. >> >>get tables in schema trafodion.zschema; - -======================= -Summary info of get: -Get 0 rows. - --- SQL operation complete. >>get indexes in schema trafodion.zschema; - -======================= -Summary info of get: -Get 0 rows. - --- SQL operation complete. >>get views in schema trafodion.zschema; - -======================= -Summary info of get: -Get 0 rows. - --- SQL operation complete. >> >>obey TEST012(getStmts); @@ -392,8 +374,7 @@ TRAFODION.ZSCHEMA1.T TRAFODION.ZSCHEMA2.T ======================= -Summary info of get: -Get 2 rows. + 2 row(s) returned --- SQL operation complete. >>get views on table zschema1.t; @@ -405,8 +386,7 @@ TRAFODION.ZSCHEMA1.V TRAFODION.ZSCHEMA2.V ======================= -Summary info of get: -Get 2 rows. + 2 row(s) returned --- SQL operation complete. >> @@ -418,8 +398,7 @@ Tables in View ZSCHEMA2.V2 TRAFODION.ZSCHEMA2.T ======================= -Summary info of get: -Get 1 rows. + 1 row(s) returned --- SQL operation complete. >>get all tables in view zschema2.v2; @@ -431,8 +410,7 @@ TRAFODION.ZSCHEMA1.T TRAFODION.ZSCHEMA2.T ======================= -Summary info of get: -Get 2 rows. + 2 row(s) returned --- SQL operation complete. >>get views in view zschema2.v2; @@ -443,8 +421,7 @@ Views in View ZSCHEMA2.V2 TRAFODION.ZSCHEMA1.V ======================= -Summary info of get: -Get 1 rows. + 1 row(s) returned --- SQL operation complete. >>get all objects in view zschema2.v2; @@ -458,8 +435,7 @@ TRAFODION.ZSCHEMA2.T ======================= -Summary info of get: -Get 3 rows. + 3 row(s) returned --- SQL operation complete. >>
