Fixes for regression tests and expected files
diff --git a/core/sql/optimizer/UdfDllInteraction.cpp b/core/sql/optimizer/UdfDllInteraction.cpp
index b7444cb..368a477 100644
--- a/core/sql/optimizer/UdfDllInteraction.cpp
+++ b/core/sql/optimizer/UdfDllInteraction.cpp
@@ -161,7 +161,7 @@
NAString cachedFullName = cachedLibPath+"/"+cachedLibName;
char errString[200];
NAString errNAString;
- sprintf(errString , "Error %d creating directory :",err);
+ sprintf(errString , "Error %d creating directory :",errno);
errNAString = errString;
errNAString += cachedFullName;
*CmpCommon::diags() << DgSqlCode(-4316)
diff --git a/core/sql/regress/compGeneral/EXPECTED072 b/core/sql/regress/compGeneral/EXPECTED072
index 9a0fb32..f52da89 100644
--- a/core/sql/regress/compGeneral/EXPECTED072
+++ b/core/sql/regress/compGeneral/EXPECTED072
@@ -237,7 +237,7 @@
--- SQL operation complete.
>>showddl library t072sch_comment.t072ddl;
-CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL FILE '$rundir/compGeneral/TEST072.dll'
+CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL FILE 'TEST072.dll'
;
COMMENT ON LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL IS
@@ -245,7 +245,7 @@
--- SQL operation complete.
>>showddl library t072sch_comment.t072jar;
-CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072JAR FILE '$rundir/compGeneral/TEST072.jar'
+CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072JAR FILE 'TEST072.jar'
;
COMMENT ON LIBRARY TRAFODION.T072SCH_COMMENT.T072JAR IS
@@ -501,7 +501,7 @@
--- SQL operation complete.
>>showddl library t072sch_comment.t072ddl;
-CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL FILE '$rundir/compGeneral/TEST072.dll'
+CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL FILE 'TEST072.dll'
;
COMMENT ON LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL IS
@@ -509,7 +509,7 @@
--- SQL operation complete.
>>showddl library t072sch_comment.t072jar;
-CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072JAR FILE '$rundir/compGeneral/TEST072.jar'
+CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072JAR FILE 'TEST072.jar'
;
COMMENT ON LIBRARY TRAFODION.T072SCH_COMMENT.T072JAR IS
@@ -687,7 +687,7 @@
--- SQL operation complete.
>>showddl library t072sch_comment.t072ddl;
-CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL FILE '$rundir/compGeneral/TEST072.dll'
+CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL FILE 'TEST072.dll'
;
COMMENT ON LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL IS
@@ -695,7 +695,7 @@
--- SQL operation complete.
>>showddl library t072sch_comment.t072jar;
-CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072JAR FILE '$rundir/compGeneral/TEST072.jar'
+CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072JAR FILE 'TEST072.jar'
;
COMMENT ON LIBRARY TRAFODION.T072SCH_COMMENT.T072JAR IS
@@ -860,7 +860,7 @@
--- SQL operation complete.
>>showddl library t072sch_comment.t072ddl;
-CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL FILE '$rundir/compGeneral/TEST072.dll'
+CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL FILE 'TEST072.dll'
;
COMMENT ON LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL IS
@@ -868,7 +868,7 @@
--- SQL operation complete.
>>showddl library t072sch_comment.t072jar;
-CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072JAR FILE '$rundir/compGeneral/TEST072.jar'
+CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072JAR FILE 'TEST072.jar'
;
--- SQL operation complete.
@@ -1058,7 +1058,7 @@
--- SQL operation complete.
>>showddl library t072sch_comment.t072ddl;
-CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL FILE '$rundir/compGeneral/TEST072.dll'
+CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL FILE 'TEST072.dll'
;
COMMENT ON LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL IS
@@ -1066,7 +1066,7 @@
--- SQL operation complete.
>>showddl library t072sch_comment.t072jar;
-CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072JAR FILE '$rundir/compGeneral/TEST072.jar'
+CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072JAR FILE 'TEST072.jar'
;
--- SQL operation complete.
diff --git a/core/sql/regress/executor/EXPECTED130 b/core/sql/regress/executor/EXPECTED130
index 6aeb277..b2641af 100644
--- a/core/sql/regress/executor/EXPECTED130
+++ b/core/sql/regress/executor/EXPECTED130
@@ -63,11 +63,9 @@
C1 C2
----------- ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
- 1 LOBH0000000200010189730973312766405019189730973325743020118212400522666936189020"TRAFODION"."LOB130"
- 2 LOBH0000000200010189730973312766405019189730973325822915418212400522668231546020"TRAFODION"."LOB130"
- 3 LOBH0000000200010189730973312766405019189730973325854670118212400522668551834020"TRAFODION"."LOB130"
-
+ 1 LOBH0000000200010300745482833305681419300745482850950512918212408309768124545020"TRAFODION"."LOB130"
+ 2 LOBH0000000200010300745482833305681419300745482851837009418212408309781533139020"TRAFODION"."LOB130"
+ 3 LOBH0000000200010300745482833305681419300745482852175832418212408309784920179020"TRAFODION"."LOB130"
--- 3 row(s) selected.
>>
@@ -670,9 +668,7 @@
>>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 'LOBH0000000200010189730973312770821219189730973368818826218212400523097801680020"TRAFODION"."LOB130" ' , 'tlob130_txt1.txt');
-
+>>extract lobtofile(LOB 'LOBH0000000200010300745482833311965919300745482912147951318212408310382781266020"TRAFODION"."LOB130" ' , 'tlob130_txt1.txt');
Success. Targetfile :tlob130_txt1.txt Length : 19
--- SQL operation complete.
@@ -688,9 +684,7 @@
>>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 'LOBH0000000200010189730973312770991919189730973372704796118212400523136699585020"TRAFODION"."LOB130" ' , 'tlob130_deep.jpg');
-
+>>extract lobtofile(LOB 'LOBH0000000200010300745482833312181519300745482917613081818212408310438198726020"TRAFODION"."LOB130" ' , 'tlob130_deep.jpg');
Success. Targetfile :tlob130_deep.jpg Length : 159018
--- SQL operation complete.
@@ -706,9 +700,7 @@
>>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 'LOBH0000000200010189730973312770991919189730973372704796118212400523136699585020"TRAFODION"."LOB130" ' , 'tlob130_anoush.jpg');
-
+>>extract lobtofile(LOB 'LOBH0000000200010300745482833312181519300745482917613081818212408310438198726020"TRAFODION"."LOB130" ' , 'tlob130_anoush.jpg');
Success. Targetfile :tlob130_anoush.jpg Length : 230150
--- SQL operation complete.
@@ -829,9 +821,7 @@
>>
>>sh grep "^LOBH" TMP130 | sed "s/^/extract lobtofile(LOB '/g" | sed "s/$/' , 'hdfs:\/\/\/user\/trafodion\/lobs\/tlob130_txt2.txt');/g" >> t130_extract_command;
>>obey t130_extract_command;
-
->>extract lobtofile(LOB 'LOBH0000000200010189730973312772090419189730973379454400718212400523204167938020"TRAFODION"."LOB130" ' , 'hdfs:///user/trafodion/lobs/tlob130_txt2.txt');
-
+>>extract lobtofile(LOB 'LOBH0000000200010300745482833313997219300745482930956115318212408310571499255020"TRAFODION"."LOB130" ' , 'hdfs:///user/trafodion/lobs/tlob130_txt2.txt');
Success. Targetfile :hdfs:///user/trafodion/lobs/tlob130_txt2.txt Length : 19
--- SQL operation complete.
@@ -847,9 +837,7 @@
>>sh rm t130_extract_command;
>>sh grep "^LOBH" TMP130 | sed "s/^/extract lobtofile(LOB '/g" | sed "s/$/' , 'hdfs:\/\/\/user\/trafodion\/lobs\/tlob130_deep.jpg');/g" >> t130_extract_command;
>>obey t130_extract_command;
-
->>extract lobtofile(LOB 'LOBH0000000200010189730973312772260419189730973382656270118212400523236180902020"TRAFODION"."LOB130" ' , 'hdfs:///user/trafodion/lobs/tlob130_deep.jpg');
-
+>>extract lobtofile(LOB 'LOBH0000000200010300745482833314345419300745482933540084218212408310597443090020"TRAFODION"."LOB130" ' , 'hdfs:///user/trafodion/lobs/tlob130_deep.jpg');
Success. Targetfile :hdfs:///user/trafodion/lobs/tlob130_deep.jpg Length : 159018
--- SQL operation complete.
@@ -865,9 +853,7 @@
>>sh grep "^LOBH" TMP130 | sed "s/^/extract lobtofile(LOB '/g" | sed "s/$/' , 'hdfs:\/\/\/user\/trafodion\/lobs\/tlob130_anoush.jpg');/g" >> t130_extract_command;
>>
>>obey t130_extract_command;
-
->>extract lobtofile(LOB 'LOBH0000000200010189730973312770991919189730973372704796118212400523136699585020"TRAFODION"."LOB130" ' , 'hdfs:///user/trafodion/lobs/tlob130_anoush.jpg');
-
+>>extract lobtofile(LOB 'LOBH0000000200010300745482833312181519300745482917613081818212408310438198726020"TRAFODION"."LOB130" ' , 'hdfs:///user/trafodion/lobs/tlob130_anoush.jpg');
Success. Targetfile :hdfs:///user/trafodion/lobs/tlob130_anoush.jpg Length : 230150
--- SQL operation complete.
@@ -886,7 +872,7 @@
Input a filename to extract to :
Output File Name : lobc2out.jpg
Extracting lob handle for column c2...
-LOB handle for c2: LOBH000000020001001786226097943372181817862261042772793218212399607632028402020"TRAFODION"."LOB130"
+LOB handle for c2: LOBH0000000200010300745482833312181519300745482917613081818212408310438198726020"TRAFODION"."LOB130"
Extracting LOB data length for the above handle...
LOB data length :230150
Extracting lob data into file in chunks ...
@@ -960,7 +946,7 @@
>>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 'LOBH000000020002001786226097943695171817862261069432940218212399607898537297020"TRAFODION"."LOB130" ' , 'tlob130_deep2.jpg');
+>>extract lobtofile(LOB 'LOBH0000000200020300745482833316114619300745482946794081418212408310729851677020"TRAFODION"."LOB130" ' , 'tlob130_deep2.jpg');
Success. Targetfile :tlob130_deep2.jpg Length : 159018
--- SQL operation complete.
@@ -969,9 +955,7 @@
>>sh rm t130_extract_command;
>>sh grep "^LOBH" TMP130 | sed "s/^/extract lobtofile(LOB '/g" | sed "s/$/' , 'hdfs:\/\/\/user\/trafodion\/lobs\/tlob130_anoush2.jpg');/g" >> t130_extract_command;
>>obey t130_extract_command;
-
->>extract lobtofile(LOB 'LOBH0000000200030189730973312773623919189730973392250459518212400523332159942020"TRAFODION"."LOB130" ' , 'hdfs:///user/trafodion/lobs/tlob130_anoush2.jpg');
-
+>>extract lobtofile(LOB 'LOBH0000000200030300745482833316114619300745482947373789618212408310735818629020"TRAFODION"."LOB130" ' , 'hdfs:///user/trafodion/lobs/tlob130_anoush2.jpg');
Success. Targetfile :hdfs:///user/trafodion/lobs/tlob130_anoush2.jpg Length : 230150
--- SQL operation complete.
@@ -998,7 +982,7 @@
>>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 'LOBH000000020003001786226097943740601817862261074243267718212399607946607514020"TRAFODION"."LOB130" ' , 'tlob130_anoush3.jpg',create,truncate);
+>>extract lobtofile(LOB 'LOBH0000000200030300745482833316575219300745482951988505718212408310781947084020"TRAFODION"."LOB130" ' , 'tlob130_anoush3.jpg',create,truncate);
Success. Targetfile :tlob130_anoush3.jpg Length : 230150
--- SQL operation complete.
@@ -1099,12 +1083,12 @@
ColumnName : C2
Lob Location : /user/trafodion/lobs
- LOB Data File: LOBP_00178622609794394274_0001
+ LOB Data File: LOBP_03007454828333187412_0001
LOB EOD : 0
LOB Used Len : 0
ColumnName : C3
Lob Location : /user/trafodion/lobs
- LOB Data File: LOBP_00178622609794394274_0002
+ LOB Data File: LOBP_03007454828333187412_0002
LOB EOD : 0
LOB Used Len : 0
ColumnName : C4
@@ -1119,8 +1103,8 @@
CATALOG_NAME SCHEMA_NAME OBJECT_NAME COLUMN_NAME LOB_LOCATION LOB_DATA_FILE LOB_DATA_FILE_SIZE_EOD LOB_DATA_FILE_SIZE_USED
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------- -----------------------
-TRAFODION LOB130 TLOB130GT2 C2 /user/trafodion/lobs LOBP_00178622609794394274_0001 0 0
-TRAFODION LOB130 TLOB130GT2 C3 /user/trafodion/lobs LOBP_00178622609794394274_0002 0 0
+TRAFODION LOB130 TLOB130GT2 C2 /user/trafodion/lobs LOBP_03007454828333187412_0001 0 0
+TRAFODION LOB130 TLOB130GT2 C3 /user/trafodion/lobs LOBP_03007454828333187412_0002 0 0
TRAFODION LOB130 TLOB130GT2 C4 External HDFS Location External HDFS File 0 0
--- 3 row(s) selected.
@@ -1141,17 +1125,17 @@
ColumnName : C2
Lob Location : /user/trafodion/lobs
- LOB Data File: LOBP_00178622609794390525_0001
+ LOB Data File: LOBP_03007454828333183740_0001
LOB EOD : 15
LOB Used Len : 15
ColumnName : C3
Lob Location : /user/trafodion/lobs
- LOB Data File: LOBP_00178622609794390525_0002
+ LOB Data File: LOBP_03007454828333183740_0002
LOB EOD : 15
LOB Used Len : 15
ColumnName : C4
Lob Location : /user/trafodion/lobs
- LOB Data File: LOBP_00178622609794390525_0003
+ LOB Data File: LOBP_03007454828333183740_0003
LOB EOD : 45
LOB Used Len : 45
@@ -1161,9 +1145,9 @@
CATALOG_NAME SCHEMA_NAME OBJECT_NAME COLUMN_NAME LOB_LOCATION LOB_DATA_FILE LOB_DATA_FILE_SIZE_EOD LOB_DATA_FILE_SIZE_USED
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------- -----------------------
-TRAFODION LOB130 TLOB130GT C2 /user/trafodion/lobs LOBP_00178622609794390525_0001 15 15
-TRAFODION LOB130 TLOB130GT C3 /user/trafodion/lobs LOBP_00178622609794390525_0002 15 15
-TRAFODION LOB130 TLOB130GT C4 /user/trafodion/lobs LOBP_00178622609794390525_0003 45 45
+TRAFODION LOB130 TLOB130GT C2 /user/trafodion/lobs LOBP_03007454828333183740_0001 15 15
+TRAFODION LOB130 TLOB130GT C3 /user/trafodion/lobs LOBP_03007454828333183740_0002 15 15
+TRAFODION LOB130 TLOB130GT C4 /user/trafodion/lobs LOBP_03007454828333183740_0003 45 45
--- 3 row(s) selected.
>>delete from tlob130gt where c1=2;
@@ -1180,17 +1164,17 @@
ColumnName : C2
Lob Location : /user/trafodion/lobs
- LOB Data File: LOBP_00178622609794390525_0001
+ LOB Data File: LOBP_03007454828333183740_0001
LOB EOD : 30
LOB Used Len : 25
ColumnName : C3
Lob Location : /user/trafodion/lobs
- LOB Data File: LOBP_00178622609794390525_0002
+ LOB Data File: LOBP_03007454828333183740_0002
LOB EOD : 31
LOB Used Len : 26
ColumnName : C4
Lob Location : /user/trafodion/lobs
- LOB Data File: LOBP_00178622609794390525_0003
+ LOB Data File: LOBP_03007454828333183740_0003
LOB EOD : 71
LOB Used Len : 56
@@ -1200,9 +1184,9 @@
CATALOG_NAME SCHEMA_NAME OBJECT_NAME COLUMN_NAME LOB_LOCATION LOB_DATA_FILE LOB_DATA_FILE_SIZE_EOD LOB_DATA_FILE_SIZE_USED
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------- -----------------------
-TRAFODION LOB130 TLOB130GT C2 /user/trafodion/lobs LOBP_00178622609794390525_0001 30 25
-TRAFODION LOB130 TLOB130GT C3 /user/trafodion/lobs LOBP_00178622609794390525_0002 31 26
-TRAFODION LOB130 TLOB130GT C4 /user/trafodion/lobs LOBP_00178622609794390525_0003 71 56
+TRAFODION LOB130 TLOB130GT C2 /user/trafodion/lobs LOBP_03007454828333183740_0001 30 25
+TRAFODION LOB130 TLOB130GT C3 /user/trafodion/lobs LOBP_03007454828333183740_0002 31 26
+TRAFODION LOB130 TLOB130GT C4 /user/trafodion/lobs LOBP_03007454828333183740_0003 71 56
--- 3 row(s) selected.
>>
@@ -1233,16 +1217,14 @@
>>sh rm t130_extract_command;
>>sh grep "^LOBH" TMP130 | sed "s/^/extract name(LOB '/g" | sed "s/$/');/g" >> t130_extract_command;
>>obey t130_extract_command;
-
->>extract name(LOB 'LOBH0000000200020189730973312776402419189730973430096815918212400523710965517020"TRAFODION"."LOB130" ');
- LOB filename : /user/trafodion/lobs/LOBP_01897309733127764024_0002
+>>extract name(LOB 'LOBH0000000200020300745482833319828419300745482996367304918212408311226827708020"TRAFODION"."LOB130" ');
+ LOB filename : /user/trafodion/lobs/LOBP_03007454828333198284_0002
--- SQL operation complete.
>>sh rm t130_extract_command;
>>sh grep "^LOBH" TMP130 | sed "s/^/extract offset(LOB '/g" | sed "s/$/');/g" >> t130_extract_command;
>>obey t130_extract_command;
->>extract offset(LOB 'LOBH0000000200020189730973312776402419189730973430096815918212400523710965517020"TRAFODION"."LOB130" ');
-
+>>extract offset(LOB 'LOBH0000000200020300745482833319828419300745482996367304918212408311226827708020"TRAFODION"."LOB130" ');
LOB Offset : 43
--- SQL operation complete.
@@ -1395,12 +1377,12 @@
ColumnName : C2
Lob Location : /user/trafodion/lobs
- LOB Data File: LOBP_00178622609794405852_0001
+ LOB Data File: LOBP_03007454828333198284_0001
LOB EOD : 70
LOB Used Len : 42
ColumnName : C3
Lob Location : /user/trafodion/lobs
- LOB Data File: LOBP_00178622609794405852_0002
+ LOB Data File: LOBP_03007454828333198284_0002
LOB EOD : 125
LOB Used Len : 68
ColumnName : C4
@@ -1415,8 +1397,8 @@
CATALOG_NAME SCHEMA_NAME OBJECT_NAME COLUMN_NAME LOB_LOCATION LOB_DATA_FILE LOB_DATA_FILE_SIZE_EOD LOB_DATA_FILE_SIZE_USED
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------- -----------------------
-TRAFODION LOB130 TLOB130EXT C2 /user/trafodion/lobs LOBP_00178622609794405852_0001 70 42
-TRAFODION LOB130 TLOB130EXT C3 /user/trafodion/lobs LOBP_00178622609794405852_0002 125 68
+TRAFODION LOB130 TLOB130EXT C2 /user/trafodion/lobs LOBP_03007454828333198284_0001 70 42
+TRAFODION LOB130 TLOB130EXT C3 /user/trafodion/lobs LOBP_03007454828333198284_0002 125 68
TRAFODION LOB130 TLOB130EXT C4 External HDFS Location External HDFS File 0 0
--- 3 row(s) selected.
@@ -1433,7 +1415,7 @@
Input a filename to extract to :
Output File Name : lobc4ext.txt
Extracting lob handle for column c4...
-LOB handle for c4: LOBH000000080003001786226097944058521817862261119125928418212399608396514208020"TRAFODION"."LOB130"
+LOB handle for c4: LOBH0000000800030300745482833319828419300745482998133041418212408311244482357020"TRAFODION"."LOB130"
Extracting LOB data length for the above handle...
LOB data length :19
Extracting lob data into file in chunks ...
@@ -1499,7 +1481,7 @@
Input lob column name to get handle from :
Column Name : c2
Extracting lob handle for column c2...
-LOB handle for c2: LOBH000000020001001786226097944338431817862261132439379818212399608528506845020"TRAFODION"."LOB130"
+LOB handle for c2: LOBH0000000200010300745482833322901519300745483013669594718212408311398690482020"TRAFODION"."LOB130"
>>select lobtostring(c2,20) from t130lob5;
(EXPR)
@@ -1516,7 +1498,7 @@
Input lob column name to get handle from :
Column Name : c2
Extracting lob handle for column c2...
-LOB handle for c2: LOBH000000020001001786226097944338431817862261132439379818212399608528506845020"TRAFODION"."LOB130"
+LOB handle for c2: LOBH0000000200010300745482833322901519300745483013669594718212408311398690482020"TRAFODION"."LOB130"
>>select lobtostring(c2,40) from t130lob5;
(EXPR)
@@ -1533,7 +1515,7 @@
Input lob column name to get handle from :
Column Name : c2
Extracting lob handle for column c2...
-LOB handle for c2: LOBH000000020001001786226097944338431817862261132439379818212399608528506845020"TRAFODION"."LOB130"
+LOB handle for c2: LOBH0000000200010300745482833322901519300745483013669594718212408311398690482020"TRAFODION"."LOB130"
>>select lobtostring(c2,20) from t130lob5;
(EXPR)
@@ -1550,7 +1532,7 @@
Input lob column name to get handle from :
Column Name : c2
Extracting lob handle for column c2...
-LOB handle for c2: LOBH000000020001001786226097944338431817862261132439379818212399608528506845020"TRAFODION"."LOB130"
+LOB handle for c2: LOBH0000000200010300745482833322901519300745483013669594718212408311398690482020"TRAFODION"."LOB130"
>>select lobtostring(c2,40) from t130lob5;
(EXPR)
@@ -1577,7 +1559,7 @@
C2
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-LOBH000000020001001786226097944058521817862261143587581118212399608641118580020"TRAFODION"."LOB130"
+LOBH0000000200010300745482833319828419300745483028364605518212408311546793975020"TRAFODION"."LOB130"
--- 1 row(s) selected.
>>-- following should return error since only external lobs will be allowed
@@ -1620,9 +1602,9 @@
Tables in Schema TRAFODION.LOBSCH
=================================
-LOBDescChunks__00178622609794451968_0001
-LOBDescHandle__00178622609794451968_0001
-LOBMD__00178622609794451968
+LOBDescChunks__03007454828333249817_0001
+LOBDescHandle__03007454828333249817_0001
+LOBMD__03007454828333249817
SB_HISTOGRAMS
SB_HISTOGRAM_INTERVALS
SB_PERSISTENT_SAMPLES
diff --git a/core/sql/regress/privs2/EXPECTED143 b/core/sql/regress/privs2/EXPECTED143
index 863d74f..bdcbae9 100644
--- a/core/sql/regress/privs2/EXPECTED143
+++ b/core/sql/regress/privs2/EXPECTED143
@@ -917,6 +917,28 @@
--- SQL operation complete.
>>execute get_obj_privs;
+*** ERROR[8734] Statement must be recompiled to allow privileges to be re-evaluated.
+
+--- 0 row(s) selected.
+>>prepare get_obj_privs from
++>select distinct
++> substring (object_name,11,15) as object_name,
++> object_type as type,
++> substring(authname(grantor_id),1,10) as grantor,
++> substring(authname(grantee_id),1,10) as grantee,
++> t143_udr.translateBitmap(privileges_bitmap) as granted_privs,
++> t143_udr.translateBitmap(grantable_bitmap) as grantable_privs
++>from "_PRIVMGR_MD_".object_privileges
++>where object_uid in
++> (select object_uid
++> from "_MD_".objects
++> where object_name like 'U%' and schema_name like 'T143_USER%')
++> order by 1, 2, 3
++>;
+
+--- SQL command prepared.
+>>execute get_obj_privs;
+
OBJECT_NAME TYPE GRANTOR GRANTEE GRANTED_PRIVS GRANTABLE_PRIVS
------------------------------------------------------------ ---- ---------- ---------- -------------------- --------------------
@@ -934,6 +956,27 @@
--- 10 row(s) selected.
>>execute get_col_privs;
+*** ERROR[8734] Statement must be recompiled to allow privileges to be re-evaluated.
+
+--- 0 row(s) selected.
+>>prepare get_col_privs from
++>select distinct
++> substring (object_name,11,15) as object_name,
++> column_number,
++> substring(authname(grantor_id),1,10) as grantor,
++> substring(authname(grantee_id),1,10) as grantee,
++> t143_udr.translateBitmap(privileges_bitmap) as granted_privs,
++> t143_udr.translateBitmap(grantable_bitmap) as grantable_privs
++>from "_PRIVMGR_MD_".column_privileges
++>where object_uid in
++> (select object_uid
++> from "_MD_".objects
++> where object_name like 'U%' and schema_name like 'T143_USER%')
++> order by 1, 2, 3, 4;
+
+--- SQL command prepared.
+>>execute get_col_privs;
+
OBJECT_NAME COLUMN_NUMBER GRANTOR GRANTEE GRANTED_PRIVS GRANTABLE_PRIVS
------------------------------------------------------------ ------------- ---------- ---------- -------------------- --------------------
@@ -1095,6 +1138,40 @@
T143_USER5.U5V2 VI -2 SQL_USER5 S----R- S----R-
--- 9 row(s) selected.
+>>prepare get_obj_privs from
++>select distinct
++> substring (object_name,11,15) as object_name,
++> object_type as type,
++> substring(authname(grantor_id),1,10) as grantor,
++> substring(authname(grantee_id),1,10) as grantee,
++> t143_udr.translateBitmap(privileges_bitmap) as granted_privs,
++> t143_udr.translateBitmap(grantable_bitmap) as grantable_privs
++>from "_PRIVMGR_MD_".object_privileges
++>where object_uid in
++> (select object_uid
++> from "_MD_".objects
++> where object_name like 'U%' and schema_name like 'T143_USER%')
++> order by 1, 2, 3
++>;
+
+--- SQL command prepared.
+>>
+>>execute get_obj_privs;
+
+OBJECT_NAME TYPE GRANTOR GRANTEE GRANTED_PRIVS GRANTABLE_PRIVS
+------------------------------------------------------------ ---- ---------- ---------- -------------------- --------------------
+
+T143_USER1.U1T1 BT -2 SQL_USER1 SIDU-R- SIDU-R-
+T143_USER1.U1V1 VI -2 SQL_USER1 S-DU-R- S-DU-R-
+T143_USER1.U1V1 VI SQL_USER1 SQL_USER5 S------ NONE
+T143_USER1.U1V1 VI SQL_USER1 USER2_ROLE S------ S------
+T143_USER2.U2V1 VI -2 USER2_ROLE S------ S------
+T143_USER2.U2V1 VI USER2_ROLE SQL_USER6 S------ S------
+T143_USER3.U3V1 VI -2 SQL_USER3 S------ NONE
+T143_USER5.U5V1 VI -2 SQL_USER5 S------ NONE
+T143_USER5.U5V2 VI -2 SQL_USER5 S----R- S----R-
+
+--- 9 row(s) selected.
>>
>>-- u1t1 user1 grants: c1-select, c2/c3-select WGO user5
>>-- u2v1 user2_role grants: c1/c2-select user3, select-c2 user6
@@ -1111,6 +1188,36 @@
T143_USER2.U2V1 1 USER2_ROLE SQL_USER6 S------ NONE
--- 6 row(s) selected.
+>>prepare get_col_privs from
++>select distinct
++> substring (object_name,11,15) as object_name,
++> column_number,
++> substring(authname(grantor_id),1,10) as grantor,
++> substring(authname(grantee_id),1,10) as grantee,
++> t143_udr.translateBitmap(privileges_bitmap) as granted_privs,
++> t143_udr.translateBitmap(grantable_bitmap) as grantable_privs
++>from "_PRIVMGR_MD_".column_privileges
++>where object_uid in
++> (select object_uid
++> from "_MD_".objects
++> where object_name like 'U%' and schema_name like 'T143_USER%')
++> order by 1, 2, 3, 4;
+
+--- SQL command prepared.
+>>
+>>execute get_col_privs;
+
+OBJECT_NAME COLUMN_NUMBER GRANTOR GRANTEE GRANTED_PRIVS GRANTABLE_PRIVS
+------------------------------------------------------------ ------------- ---------- ---------- -------------------- --------------------
+
+T143_USER1.U1T1 0 SQL_USER1 SQL_USER5 S------ NONE
+T143_USER1.U1T1 1 SQL_USER1 SQL_USER5 S------ S------
+T143_USER1.U1T1 2 SQL_USER1 SQL_USER5 S------ S------
+T143_USER2.U2V1 0 USER2_ROLE SQL_USER3 S------ NONE
+T143_USER2.U2V1 1 USER2_ROLE SQL_USER3 S------ NONE
+T143_USER2.U2V1 1 USER2_ROLE SQL_USER6 S------ NONE
+
+--- 6 row(s) selected.
>>
>>-- Run some different tests:
>>
@@ -1231,6 +1338,41 @@
T143_USER5.U5V2 VI SQL_USER5 SQL_USER4 S------ NONE
--- 11 row(s) selected.
+>>prepare get_obj_privs from
++>select distinct
++> substring (object_name,11,15) as object_name,
++> object_type as type,
++> substring(authname(grantor_id),1,10) as grantor,
++> substring(authname(grantee_id),1,10) as grantee,
++> t143_udr.translateBitmap(privileges_bitmap) as granted_privs,
++> t143_udr.translateBitmap(grantable_bitmap) as grantable_privs
++>from "_PRIVMGR_MD_".object_privileges
++>where object_uid in
++> (select object_uid
++> from "_MD_".objects
++> where object_name like 'U%' and schema_name like 'T143_USER%')
++> order by 1, 2, 3;
+
+--- SQL command prepared.
+>>
+>>execute get_obj_privs;
+
+OBJECT_NAME TYPE GRANTOR GRANTEE GRANTED_PRIVS GRANTABLE_PRIVS
+------------------------------------------------------------ ---- ---------- ---------- -------------------- --------------------
+
+T143_USER1.U1T1 BT -2 SQL_USER1 SIDU-R- SIDU-R-
+T143_USER1.U1T1 BT SQL_USER1 USER2_ROLE -I----- -I-----
+T143_USER1.U1V1 VI -2 SQL_USER1 S-DU-R- S-DU-R-
+T143_USER1.U1V1 VI SQL_USER1 SQL_USER5 S------ NONE
+T143_USER1.U1V1 VI SQL_USER1 USER2_ROLE S--U--- S------
+T143_USER2.U2V1 VI -2 USER2_ROLE S--U--- S------
+T143_USER2.U2V1 VI USER2_ROLE SQL_USER6 S------ S------
+T143_USER3.U3V1 VI -2 SQL_USER3 S------ S------
+T143_USER5.U5V1 VI -2 SQL_USER5 S------ NONE
+T143_USER5.U5V2 VI -2 SQL_USER5 S----R- S----R-
+T143_USER5.U5V2 VI SQL_USER5 SQL_USER4 S------ NONE
+
+--- 11 row(s) selected.
>>execute get_col_privs;
OBJECT_NAME COLUMN_NUMBER GRANTOR GRANTEE GRANTED_PRIVS GRANTABLE_PRIVS
@@ -1246,6 +1388,37 @@
T143_USER3.U3V1 1 SQL_USER3 SQL_USER4 S------ NONE
--- 8 row(s) selected.
+>>prepare get_col_privs from
++>select distinct
++> substring (object_name,11,15) as object_name,
++> column_number,
++> substring(authname(grantor_id),1,10) as grantor,
++> substring(authname(grantee_id),1,10) as grantee,
++> t143_udr.translateBitmap(privileges_bitmap) as granted_privs,
++> t143_udr.translateBitmap(grantable_bitmap) as grantable_privs
++>from "_PRIVMGR_MD_".column_privileges
++>where object_uid in
++> (select object_uid
++> from "_MD_".objects
++> where object_name like 'U%' and schema_name like 'T143_USER%')
++> order by 1, 2, 3, 4;
+
+--- SQL command prepared.
>>
+>>execute get_col_privs;
+
+OBJECT_NAME COLUMN_NUMBER GRANTOR GRANTEE GRANTED_PRIVS GRANTABLE_PRIVS
+------------------------------------------------------------ ------------- ---------- ---------- -------------------- --------------------
+
+T143_USER1.U1T1 0 SQL_USER1 SQL_USER5 S------ NONE
+T143_USER1.U1T1 1 SQL_USER1 SQL_USER5 S------ S------
+T143_USER1.U1T1 2 SQL_USER1 SQL_USER5 S------ S------
+T143_USER2.U2V1 0 USER2_ROLE SQL_USER3 S------ S------
+T143_USER2.U2V1 1 USER2_ROLE SQL_USER3 S------ S------
+T143_USER2.U2V1 1 USER2_ROLE SQL_USER6 S------ NONE
+T143_USER3.U3V1 0 SQL_USER3 SQL_USER4 S------ NONE
+T143_USER3.U3V1 1 SQL_USER3 SQL_USER4 S------ NONE
+
+--- 8 row(s) selected.
>>-- ============================================================================
>>log;
diff --git a/core/sql/regress/privs2/TEST143 b/core/sql/regress/privs2/TEST143
index 3f7f5b1..ece3c38 100755
--- a/core/sql/regress/privs2/TEST143
+++ b/core/sql/regress/privs2/TEST143
@@ -302,6 +302,37 @@
revoke update on t143_user1.u1t3 from user3_role;
revoke grant option for select (c2, c3) on t143_user1.u1t3 from user3_role;
execute get_obj_privs;
+prepare get_obj_privs from
+select distinct
+ substring (object_name,11,15) as object_name,
+ object_type as type,
+ substring(authname(grantor_id),1,10) as grantor,
+ substring(authname(grantee_id),1,10) as grantee,
+ t143_udr.translateBitmap(privileges_bitmap) as granted_privs,
+ t143_udr.translateBitmap(grantable_bitmap) as grantable_privs
+from "_PRIVMGR_MD_".object_privileges
+where object_uid in
+ (select object_uid
+ from "_MD_".objects
+ where object_name like 'U%' and schema_name like 'T143_USER%')
+ order by 1, 2, 3
+;
+execute get_obj_privs;
+execute get_col_privs;
+prepare get_col_privs from
+select distinct
+ substring (object_name,11,15) as object_name,
+ column_number,
+ substring(authname(grantor_id),1,10) as grantor,
+ substring(authname(grantee_id),1,10) as grantee,
+ t143_udr.translateBitmap(privileges_bitmap) as granted_privs,
+ t143_udr.translateBitmap(grantable_bitmap) as grantable_privs
+from "_PRIVMGR_MD_".column_privileges
+where object_uid in
+ (select object_uid
+ from "_MD_".objects
+ where object_name like 'U%' and schema_name like 'T143_USER%')
+ order by 1, 2, 3, 4;
execute get_col_privs;
-- ============================================================================
@@ -369,10 +400,43 @@
-- u1v1 user1 grants: select user2_role WGO, select user5
-- u2v1 user2-role grants: select user6 WGO
execute get_obj_privs;
+prepare get_obj_privs from
+select distinct
+ substring (object_name,11,15) as object_name,
+ object_type as type,
+ substring(authname(grantor_id),1,10) as grantor,
+ substring(authname(grantee_id),1,10) as grantee,
+ t143_udr.translateBitmap(privileges_bitmap) as granted_privs,
+ t143_udr.translateBitmap(grantable_bitmap) as grantable_privs
+from "_PRIVMGR_MD_".object_privileges
+where object_uid in
+ (select object_uid
+ from "_MD_".objects
+ where object_name like 'U%' and schema_name like 'T143_USER%')
+ order by 1, 2, 3
+;
+
+execute get_obj_privs;
-- u1t1 user1 grants: c1-select, c2/c3-select WGO user5
-- u2v1 user2_role grants: c1/c2-select user3, select-c2 user6
execute get_col_privs;
+prepare get_col_privs from
+select distinct
+ substring (object_name,11,15) as object_name,
+ column_number,
+ substring(authname(grantor_id),1,10) as grantor,
+ substring(authname(grantee_id),1,10) as grantee,
+ t143_udr.translateBitmap(privileges_bitmap) as granted_privs,
+ t143_udr.translateBitmap(grantable_bitmap) as grantable_privs
+from "_PRIVMGR_MD_".column_privileges
+where object_uid in
+ (select object_uid
+ from "_MD_".objects
+ where object_name like 'U%' and schema_name like 'T143_USER%')
+ order by 1, 2, 3, 4;
+
+execute get_col_privs;
-- Run some different tests:
@@ -416,8 +480,39 @@
-- u1v1 user1 grants: + update user2_role
-- u5v2 user5 grants: c1-select user4
execute get_obj_privs;
-execute get_col_privs;
+prepare get_obj_privs from
+select distinct
+ substring (object_name,11,15) as object_name,
+ object_type as type,
+ substring(authname(grantor_id),1,10) as grantor,
+ substring(authname(grantee_id),1,10) as grantee,
+ t143_udr.translateBitmap(privileges_bitmap) as granted_privs,
+ t143_udr.translateBitmap(grantable_bitmap) as grantable_privs
+from "_PRIVMGR_MD_".object_privileges
+where object_uid in
+ (select object_uid
+ from "_MD_".objects
+ where object_name like 'U%' and schema_name like 'T143_USER%')
+ order by 1, 2, 3;
+execute get_obj_privs;
+execute get_col_privs;
+prepare get_col_privs from
+select distinct
+ substring (object_name,11,15) as object_name,
+ column_number,
+ substring(authname(grantor_id),1,10) as grantor,
+ substring(authname(grantee_id),1,10) as grantee,
+ t143_udr.translateBitmap(privileges_bitmap) as granted_privs,
+ t143_udr.translateBitmap(grantable_bitmap) as grantable_privs
+from "_PRIVMGR_MD_".column_privileges
+where object_uid in
+ (select object_uid
+ from "_MD_".objects
+ where object_name like 'U%' and schema_name like 'T143_USER%')
+ order by 1, 2, 3, 4;
+
+execute get_col_privs;
-- ============================================================================
?section user2_views
-- ============================================================================
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp b/core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp
index 1501661..17dfc45 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp
@@ -573,12 +573,13 @@
libNameNoPath = libFileName(lastSlash+1, libFileName.length()-lastSlash-1);
else
{
- *CmpCommon::diags() << DgSqlCode(-1382)
+ /**CmpCommon::diags() << DgSqlCode(-1382)
<< DgString0(libFileName);
deallocEHI(ehi);
processReturn();
- return;
-
+ return;*/
+ libNameNoPath = libFileName;
+
}
ComTdbVirtTableTableInfo * tableInfo = new(STMTHEAP) ComTdbVirtTableTableInfo[1];
tableInfo->tableName = NULL,
