[TRAFODION-1672] Failures when running regressions twice Fixing tests executor/TEST009 and executor/TEST130 so they clean up correctly at the end and can be run more than once.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/849de1a3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/849de1a3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/849de1a3 Branch: refs/heads/master Commit: 849de1a32c34c11e16ace6d9a4d4064148d594be Parents: 680900c Author: Hans Zeller <[email protected]> Authored: Wed Dec 9 16:58:39 2015 +0000 Committer: Hans Zeller <[email protected]> Committed: Wed Dec 9 16:58:39 2015 +0000 ---------------------------------------------------------------------- core/sql/regress/executor/EXPECTED130 | 28 ++++++++++++++-------------- core/sql/regress/executor/TEST016 | 5 +++++ core/sql/regress/executor/TEST130 | 7 ++++--- 3 files changed, 23 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/849de1a3/core/sql/regress/executor/EXPECTED130 ---------------------------------------------------------------------- diff --git a/core/sql/regress/executor/EXPECTED130 b/core/sql/regress/executor/EXPECTED130 index cea117a..0e2ee61 100644 --- a/core/sql/regress/executor/EXPECTED130 +++ b/core/sql/regress/executor/EXPECTED130 @@ -1,8 +1,8 @@ >>obey TEST130(setup); ->>create schema trafodion.lob; +>>create schema trafodion.lob130; --- SQL operation complete. ->>set schema trafodion.lob; +>>set schema trafodion.lob130; --- SQL operation complete. >>create table t130lob1 (c1 blob); @@ -53,9 +53,9 @@ C1 C1 C2 ----------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ ---------------------------------------- - 1 LOBH00000200010882713693210510862219414564511952143513218212313794957530571017"TRAFODION"."LOB" - 2 LOBH00000200010882713693210510862219414564511952725470718212313794971638403017"TRAFODION"."LOB" - 3 LOBH00000200010882713693210510862219414564511953242068818212313794976885710017"TRAFODION"."LOB" + 1 LOBH00000200010279963438587423229119541341101965990251118212316399994956986020"TRAFODION"."LOB130" + 2 LOBH00000200010279963438587423229119541341101966300063218212316400003010310020"TRAFODION"."LOB130" + 3 LOBH00000200010279963438587423229119541341101966584793118212316400005859531020"TRAFODION"."LOB130" --- 3 row(s) selected. >> @@ -333,7 +333,7 @@ And the dish ran away with the fork ! >>sh grep "^LOBH" TMP130 | sed "s/^/extract lobtofile(LOB '/g" | sed "s/$/' , >>'tlob130_txt1.txt');/g" >> t130_extract_command; >> >>obey t130_extract_command; ->>extract lobtofile(LOB 'LOBH00000200010882713693210514378719414564511984818875018212313795291895359017"TRAFODION"."LOB" ' , 'tlob130_txt1.txt'); +>>extract lobtofile(LOB 'LOBH00000200010279963438587425446719541341101986101346918212316400201031850020"TRAFODION"."LOB130" ' , 'tlob130_txt1.txt'); Success. Targetfile :tlob130_txt1.txt Length : 19 --- SQL operation complete. @@ -349,7 +349,7 @@ Success. Targetfile :tlob130_txt1.txt Length : 19 >>sh rm t130_extract_command; >>sh grep "^LOBH" TMP130 | sed "s/^/extract lobtofile(LOB '/g" | sed "s/$/' , >>'tlob130_deep.jpg');/g" >> t130_extract_command; >>obey t130_extract_command; ->>extract lobtofile(LOB 'LOBH00000200010882713693210514444119414564511990648251418212313795350940159017"TRAFODION"."LOB" ' , 'tlob130_deep.jpg'); +>>extract lobtofile(LOB 'LOBH00000200010279963438587425504419541341101988962025518212316400229655406020"TRAFODION"."LOB130" ' , 'tlob130_deep.jpg'); Success. Targetfile :tlob130_deep.jpg Length : 159018 --- SQL operation complete. @@ -365,7 +365,7 @@ Success. Targetfile :tlob130_deep.jpg Length : 159018 >>sh grep "^LOBH" TMP130 | sed "s/^/extract lobtofile(LOB '/g" | sed "s/$/' , >>'tlob130_anoush.jpg');/g" >> t130_extract_command; >> >>obey t130_extract_command; ->>extract lobtofile(LOB 'LOBH00000200010882713693210514444119414564511990648251418212313795350940159017"TRAFODION"."LOB" ' , 'tlob130_anoush.jpg'); +>>extract lobtofile(LOB 'LOBH00000200010279963438587425504419541341101988962025518212316400229655406020"TRAFODION"."LOB130" ' , 'tlob130_anoush.jpg'); Success. Targetfile :tlob130_anoush.jpg Length : 230150 --- SQL operation complete. @@ -484,7 +484,7 @@ And the dish ran away with the fork ! >>sh grep "^LOBH" TMP130 | sed "s/^/extract lobtofile(LOB '/g" | sed "s/$/' , >>'hdfs:\/\/\/lobs\/tlob130_txt2.txt');/g" >> t130_extract_command; >> >>obey t130_extract_command; ->>extract lobtofile(LOB 'LOBH00000200010882713693210515418219414564511997894836018212313795423154729017"TRAFODION"."LOB" ' , 'hdfs:///lobs/tlob130_txt2.txt'); +>>extract lobtofile(LOB 'LOBH00000200010279963438587426033019541341101993803370618212316400277653681020"TRAFODION"."LOB130" ' , 'hdfs:///lobs/tlob130_txt2.txt'); Success. Targetfile :hdfs:///lobs/tlob130_txt2.txt Length : 19 --- SQL operation complete. @@ -500,7 +500,7 @@ Success. Targetfile :hdfs:///lobs/tlob130_txt2.txt Length : 19 >>sh rm t130_extract_command; >>sh grep "^LOBH" TMP130 | sed "s/^/extract lobtofile(LOB '/g" | sed "s/$/' , >>'hdfs:\/\/\/lobs\/tlob130_deep.jpg');/g" >> t130_extract_command; >>obey t130_extract_command; ->>extract lobtofile(LOB 'LOBH00000200010882713693210515488319414564512003657955318212313795480776063017"TRAFODION"."LOB" ' , 'hdfs:///lobs/tlob130_deep.jpg'); +>>extract lobtofile(LOB 'LOBH00000200010279963438587426095919541341101996655440218212316400306584607020"TRAFODION"."LOB130" ' , 'hdfs:///lobs/tlob130_deep.jpg'); Success. Targetfile :hdfs:///lobs/tlob130_deep.jpg Length : 159018 --- SQL operation complete. @@ -516,7 +516,7 @@ Success. Targetfile :hdfs:///lobs/tlob130_deep.jpg Length : 159018 >>sh grep "^LOBH" TMP130 | sed "s/^/extract lobtofile(LOB '/g" | sed "s/$/' , >>'hdfs:\/\/\/lobs\/tlob130_anoush.jpg');/g" >> t130_extract_command; >> >>obey t130_extract_command; ->>extract lobtofile(LOB 'LOBH00000200010882713693210514444119414564511990648251418212313795350940159017"TRAFODION"."LOB" ' , 'hdfs:///lobs/tlob130_anoush.jpg'); +>>extract lobtofile(LOB 'LOBH00000200010279963438587425504419541341101988962025518212316400229655406020"TRAFODION"."LOB130" ' , 'hdfs:///lobs/tlob130_anoush.jpg'); Success. Targetfile :hdfs:///lobs/tlob130_anoush.jpg Length : 230150 --- SQL operation complete. @@ -566,7 +566,7 @@ And the dish ran away with the spoon. >>sh rm t130_extract_command; >>sh grep "^LOBH" TMP130 | sed "s/^/extract lobtofile(LOB '/g" | sed "s/$/' , >>'tlob130_deep2.jpg');/g" >> t130_extract_command; >>obey t130_extract_command; ->>extract lobtofile(LOB 'LOBH00000200020882713693210517156319414564512012287022618212313795567334522017"TRAFODION"."LOB" ' , 'tlob130_deep2.jpg'); +>>extract lobtofile(LOB 'LOBH00000200020279963438587427046219541341102002085013918212316400360882889020"TRAFODION"."LOB130" ' , 'tlob130_deep2.jpg'); Success. Targetfile :tlob130_deep2.jpg Length : 159018 --- SQL operation complete. @@ -575,7 +575,7 @@ Success. Targetfile :tlob130_deep2.jpg Length : 159018 >>sh rm t130_extract_command; >>sh grep "^LOBH" TMP130 | sed "s/^/extract lobtofile(LOB '/g" | sed "s/$/' , >>'hdfs:\/\/\/lobs\/tlob130_anoush2.jpg');/g" >> t130_extract_command; >>obey t130_extract_command; ->>extract lobtofile(LOB 'LOBH00000200030882713693210517156319414564512012826755818212313795572444089017"TRAFODION"."LOB" ' , 'hdfs:///lobs/tlob130_anoush2.jpg'); +>>extract lobtofile(LOB 'LOBH00000200030279963438587427046219541341102002340817618212316400363467910020"TRAFODION"."LOB130" ' , 'hdfs:///lobs/tlob130_anoush2.jpg'); Success. Targetfile :hdfs:///lobs/tlob130_anoush2.jpg Length : 230150 --- SQL operation complete. @@ -602,7 +602,7 @@ Hey diddle diddle, >>sh rm t130_extract_command; >>sh grep "^LOBH" TMP130 | sed "s/^/extract lobtofile(LOB '/g" | sed "s/$/' , >>'tlob130_anoush3.jpg',create,truncate);/g" >> t130_extract_command; >>obey t130_extract_command; ->>extract lobtofile(LOB 'LOBH00000200030882713693210517507719414564512016516238718212313795609661744017"TRAFODION"."LOB" ' , 'tlob130_anoush3.jpg',create,truncate); +>>extract lobtofile(LOB 'LOBH00000200030279963438587427288519541341102004608530918212316400386132885020"TRAFODION"."LOB130" ' , 'tlob130_anoush3.jpg',create,truncate); Success. Targetfile :tlob130_anoush3.jpg Length : 230150 --- SQL operation complete. http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/849de1a3/core/sql/regress/executor/TEST016 ---------------------------------------------------------------------- diff --git a/core/sql/regress/executor/TEST016 b/core/sql/regress/executor/TEST016 index fc1085b..0d314dd 100644 --- a/core/sql/regress/executor/TEST016 +++ b/core/sql/regress/executor/TEST016 @@ -27,6 +27,8 @@ -- To do: -- Revision history: +?section cleanup + drop table t016t1 cascade; drop table t016t2 cascade; drop table t016t3 cascade; @@ -41,6 +43,8 @@ drop mvgroup mvg_016; drop procedure rs016; +?section tests + #ifNT control query default ARKCMP_FAKE_HW 'ON'; control query default DEF_NUM_SMP_CPUS '2'; @@ -315,3 +319,4 @@ drop table t016_2535_3; log; +obey TEST016(cleanup); http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/849de1a3/core/sql/regress/executor/TEST130 ---------------------------------------------------------------------- diff --git a/core/sql/regress/executor/TEST130 b/core/sql/regress/executor/TEST130 index 6bf031e..2503121 100755 --- a/core/sql/regress/executor/TEST130 +++ b/core/sql/regress/executor/TEST130 @@ -45,6 +45,7 @@ obey TEST130(setup); ?section clnup +set schema trafodion.lob130; drop table t130lob1 cascade; drop table t130lob2 cascade; drop table t130lob3 cascade; @@ -52,8 +53,8 @@ drop table t130lob4 cascade; ?section setup -create schema trafodion.lob; -set schema trafodion.lob; +create schema trafodion.lob130; +set schema trafodion.lob130; create table t130lob1 (c1 blob); create table t130lob2 (c1 int not null, c2 blob , primary key (c1)); create table t130lob3 (c1 int not null, @@ -427,7 +428,7 @@ drop table tlob130bin2; sh rm TMP130; sh rm tlob130txt2; -drop schema trafodion.lob; +drop schema trafodion.lob130 cascade; exit;
