Repository: trafodion Updated Branches: refs/heads/master 8e38189d4 -> 06b648612
Fixed regression test issue for privs1/TEST120 Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/480e07ef Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/480e07ef Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/480e07ef Branch: refs/heads/master Commit: 480e07ef2f3798007144baae0d011240790d6b1f Parents: 8e38189 Author: Roberta Marton <[email protected]> Authored: Fri Oct 26 18:51:32 2018 +0000 Committer: Roberta Marton <[email protected]> Committed: Fri Oct 26 18:51:32 2018 +0000 ---------------------------------------------------------------------- core/sql/regress/privs1/EXPECTED120 | 13 ++++--------- core/sql/regress/privs1/TEST120 | 11 +++++++++-- 2 files changed, 13 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/480e07ef/core/sql/regress/privs1/EXPECTED120 ---------------------------------------------------------------------- diff --git a/core/sql/regress/privs1/EXPECTED120 b/core/sql/regress/privs1/EXPECTED120 index 45713b9..08379f8 100644 --- a/core/sql/regress/privs1/EXPECTED120 +++ b/core/sql/regress/privs1/EXPECTED120 @@ -583,16 +583,12 @@ End of MXCI Session >>-- AR - role involved, check query plans that rely on roles during revoke >>log; Query_Invalidation_Keys explain output for select_games, select_teams, insert_teams, update_teams, select_players, select_standings: -Query_Invalidation_Keys{,,CS}{,, -UR}{,,CS}{, -,UR} +Query_Invalidation_Keys{,,CS}{,,UR}{,,CS}{,,UR} Query_Invalidation_Keys{,,OS} Query_Invalidation_Keys{,,OI}{,,UR} -Query_Invalidation_Keys{,,OS}{,, -CU}{,,UR} +Query_Invalidation_Keys{,,OS}{,,CU}{,,UR} Query_Invalidation_Keys{,,OS} -Query_Invalidation_Keys{,,OS}{,, -OG}{,,UR} +Query_Invalidation_Keys{,,OS}{,,OG}{,,UR} >> >>-- Verify that sql_user9 can select from games >>sh sqlci -i "TEST120(select_queries)" -u sql_user9; @@ -1280,8 +1276,7 @@ End of MXCI Session --- SQL command prepared. >>log; Query_Invalidation_Keys explain output for select_stats: -Query_Invalidation_Keys{,,CS}{,, -UR}{,,UZ} +Query_Invalidation_Keys{,,CS}{,,UR}{,,UZ} >>shecho"Query_Invalidation_Keysexplainoutputforselect_stats:">>LOG; >> >>execute select_stats; http://git-wip-us.apache.org/repos/asf/trafodion/blob/480e07ef/core/sql/regress/privs1/TEST120 ---------------------------------------------------------------------- diff --git a/core/sql/regress/privs1/TEST120 b/core/sql/regress/privs1/TEST120 index 632202c..f451dc8 100755 --- a/core/sql/regress/privs1/TEST120 +++ b/core/sql/regress/privs1/TEST120 @@ -235,7 +235,14 @@ explain select_standings; log; sh echo "Query_Invalidation_Keys explain output for select_games, select_teams, insert_teams, update_teams, select_players, select_standings: " >> LOG120; -sh sed '/Query_Invalidation_Keys/,/ObjectUIDs/!d;/ObjectUIDs/d' EXPLAIN120 | sed -e 's/[0-9 \t]*//g' >> LOG120; +-- Explanation of next command: +-- Extract rows between Query_Invalidation_Keys and ObjectUIDs from explain plan +-- -> sed '/Query_Invalidation_Keys/,/ObjectUIDs/!d;/ObjectUIDs/d' +-- Remove numeric invalidation key hashes +-- -> sed -e 's/[0-9 \t]*//g' +-- Join rows for each invalidation key set +-- -> awk '/Query_Invalidation_Keys/{if (NR!=1)print ""}{printf $0}END{print "";}' +sh sed '/Query_Invalidation_Keys/,/ObjectUIDs/!d;/ObjectUIDs/d' EXPLAIN120 | sed -e 's/[0-9 \t]*//g' | awk '/Query_Invalidation_Keys/{if (NR!=1)print ""}{printf $0}END{print "";}' >> LOG120; log; log LOG120; @@ -297,7 +304,7 @@ log; log EXPLAIN120 clear; explain select_stats; sh echo "Query_Invalidation_Keys explain output for select_stats: " >> LOG120; -sh sed '/Query_Invalidation_Keys/,/ObjectUIDs/!d;/ObjectUIDs/d' EXPLAIN120 | sed -e 's/[0-9 \t]*//g' >> LOG120; +sh sed '/Query_Invalidation_Keys/,/ObjectUIDs/!d;/ObjectUIDs/d' EXPLAIN120 | sed -e 's/[0-9 \t]*//g' | awk '/Query_Invalidation_Keys/{if (NR!=1)print ""}{printf $0}END{print "";}' >> LOG120; log; log LOG120;
