Repository: incubator-trafodion
Updated Branches:
refs/heads/master 94d2d7898 -> 6046c6ee4
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5b891875/core/sql/regress/executor/EXPECTED130
----------------------------------------------------------------------
diff --git a/core/sql/regress/executor/EXPECTED130 b/core/sql/regress/executor/EXPECTED130
index 6ef2e2e..d4f218f 100644
--- a/core/sql/regress/executor/EXPECTED130
+++ b/core/sql/regress/executor/EXPECTED130
@@ -52,9 +52,9 @@ C1
C1 C2
----------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
----------------------------------------
- 1 LOBH0000000200010142212969739357136819142212969747411655818212350247568274762020"TRAFODION"."LOB130"
- 2 LOBH0000000200010142212969739357136819142212969748084819018212350247577286862020"TRAFODION"."LOB130"
- 3 LOBH0000000200010142212969739357136819142212969748688732818212350247583331989020"TRAFODION"."LOB130"
+ 1 LOBH0000000200010693284694666931821619693284694675520439318212350402808136646020"TRAFODION"."LOB130"
+ 2 LOBH0000000200010693284694666931821619693284694676238320918212350402817603197020"TRAFODION"."LOB130"
+ 3 LOBH0000000200010693284694666931821619693284694676863363518212350402823890682020"TRAFODION"."LOB130"
--- 3 row(s) selected.
>>
@@ -477,7 +477,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 'LOBH0000000200010142212969739361409919142212969790143623818212350247997800554020"TRAFODION"."LOB130"
' , 'tlob130_txt1.txt');
+>>extract lobtofile(LOB 'LOBH0000000200010693284694666936172119693284694718802636218212350403243416736020"TRAFODION"."LOB130"
' , 'tlob130_txt1.txt');
Success. Targetfile :tlob130_txt1.txt Length : 19
--- SQL operation complete.
@@ -493,7 +493,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 'LOBH0000000200010142212969739361518319142212969797283553518212350248069433370020"TRAFODION"."LOB130"
' , 'tlob130_deep.jpg');
+>>extract lobtofile(LOB 'LOBH0000000200010693284694666936277719693284694725950422618212350403314769123020"TRAFODION"."LOB130"
' , 'tlob130_deep.jpg');
Success. Targetfile :tlob130_deep.jpg Length : 159018
--- SQL operation complete.
@@ -509,7 +509,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 'LOBH0000000200010142212969739361518319142212969797283553518212350248069433370020"TRAFODION"."LOB130"
' , 'tlob130_anoush.jpg');
+>>extract lobtofile(LOB 'LOBH0000000200010693284694666936277719693284694725950422618212350403314769123020"TRAFODION"."LOB130"
' , 'tlob130_anoush.jpg');
Success. Targetfile :tlob130_anoush.jpg Length : 230150
--- SQL operation complete.
@@ -629,7 +629,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 'LOBH0000000200010142212969739362939919142212969804796758418212350248144579643020"TRAFODION"."LOB130"
' , 'hdfs:///lobs/tlob130_txt2.txt');
+>>extract lobtofile(LOB 'LOBH0000000200010693284694666937699219693284694733387350918212350403389004357020"TRAFODION"."LOB130"
' , 'hdfs:///lobs/tlob130_txt2.txt');
Success. Targetfile :hdfs:///lobs/tlob130_txt2.txt Length : 19
--- SQL operation complete.
@@ -645,7 +645,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 'LOBH0000000200010142212969739363045119142212969811561569418212350248212165893020"TRAFODION"."LOB130"
' , 'hdfs:///lobs/tlob130_deep.jpg');
+>>extract lobtofile(LOB 'LOBH0000000200010693284694666937807719693284694740112181518212350403456401952020"TRAFODION"."LOB130"
' , 'hdfs:///lobs/tlob130_deep.jpg');
Success. Targetfile :hdfs:///lobs/tlob130_deep.jpg Length : 159018
--- SQL operation complete.
@@ -661,7 +661,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 'LOBH0000000200010142212969739361518319142212969797283553518212350248069433370020"TRAFODION"."LOB130"
' , 'hdfs:///lobs/tlob130_anoush.jpg');
+>>extract lobtofile(LOB 'LOBH0000000200010693284694666936277719693284694725950422618212350403314769123020"TRAFODION"."LOB130"
' , 'hdfs:///lobs/tlob130_anoush.jpg');
Success. Targetfile :hdfs:///lobs/tlob130_anoush.jpg Length : 230150
--- SQL operation complete.
@@ -680,7 +680,7 @@ Column Name : c2
Input a filename to extract to :
Output File Name : lobc2out.jpg
Extracting lob handle for column c2...
-LOB handle for c2: LOBH0000000200010142212969739361518319142212969797283553518212350248069433370020"TRAFODION"."LOB130"
+LOB handle for c2: LOBH0000000200010693284694666936277719693284694725950422618212350403314769123020"TRAFODION"."LOB130"
Extracting LOB data length for the above handle...
LOB data length :230150
Extracting lob data into file in chunks of 1000 ...
@@ -961,7 +961,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 'LOBH0000000200020142212969739365125919142212969824502225318212350248341508013020"TRAFODION"."LOB130"
' , 'tlob130_deep2.jpg');
+>>extract lobtofile(LOB 'LOBH0000000200020693284694666939887019693284694753101879518212350403586346705020"TRAFODION"."LOB130"
' , 'tlob130_deep2.jpg');
Success. Targetfile :tlob130_deep2.jpg Length : 159018
--- SQL operation complete.
@@ -970,7 +970,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 'LOBH0000000200030142212969739365125919142212969825145833218212350248348062450020"TRAFODION"."LOB130"
' , 'hdfs:///lobs/tlob130_anoush2.jpg');
+>>extract lobtofile(LOB 'LOBH0000000200030693284694666939887019693284694753661757718212350403591996291020"TRAFODION"."LOB130"
' , 'hdfs:///lobs/tlob130_anoush2.jpg');
Success. Targetfile :hdfs:///lobs/tlob130_anoush2.jpg Length : 230150
--- SQL operation complete.
@@ -997,7 +997,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 'LOBH0000000200030142212969739365600419142212969829851389518212350248395152929020"TRAFODION"."LOB130"
' , 'tlob130_anoush3.jpg',create,truncate);
+>>extract lobtofile(LOB 'LOBH0000000200030693284694666940355019693284694758323311318212350403638460438020"TRAFODION"."LOB130"
' , 'tlob130_anoush3.jpg',create,truncate);
Success. Targetfile :tlob130_anoush3.jpg Length : 230150
--- SQL operation complete.
@@ -1098,12 +1098,12 @@ Lob Information for table: "TRAFODION".LOB130.TLOB130GT2
ColumnName : C2
Lob Location : /lobs
- LOB Data File: LOBP_01422129697393687431_0001
+ LOB Data File: LOBP_06932846946669434383_0001
LOB EOD : 0
LOB Used Len : 0
ColumnName : C3
Lob Location : /lobs
- LOB Data File: LOBP_01422129697393687431_0002
+ LOB Data File: LOBP_06932846946669434383_0002
LOB EOD : 0
LOB Used Len : 0
ColumnName : C4
@@ -1118,8 +1118,8 @@ Lob Information for table: "TRAFODION".LOB130.TLOB130GT2
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
/lobs LOBP_01422129697393687431_0001 0 0
-TRAFODION LOB130 TLOB130GT2 C3
/lobs LOBP_01422129697393687431_0002 0 0
+TRAFODION LOB130 TLOB130GT2 C2
/lobs LOBP_06932846946669434383_0001 0 0
+TRAFODION LOB130 TLOB130GT2 C3
/lobs LOBP_06932846946669434383_0002 0 0
TRAFODION LOB130 TLOB130GT2 C4
External HDFS Location External HDFS File 0 0
--- 3 row(s) selected.
@@ -1140,17 +1140,17 @@ Lob Information for table: "TRAFODION".LOB130.TLOB130GT
ColumnName : C2
Lob Location : /lobs
- LOB Data File: LOBP_01422129697393685086_0001
+ LOB Data File: LOBP_06932846946669431934_0001
LOB EOD : 15
LOB Used Len : 15
ColumnName : C3
Lob Location : /lobs
- LOB Data File: LOBP_01422129697393685086_0002
+ LOB Data File: LOBP_06932846946669431934_0002
LOB EOD : 15
LOB Used Len : 15
ColumnName : C4
Lob Location : /lobs
- LOB Data File: LOBP_01422129697393685086_0003
+ LOB Data File: LOBP_06932846946669431934_0003
LOB EOD : 45
LOB Used Len : 45
@@ -1160,9 +1160,9 @@ Lob Information for table: "TRAFODION".LOB130.TLOB130GT
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
/lobs LOBP_01422129697393685086_0001 15 15
-TRAFODION LOB130 TLOB130GT C3
/lobs LOBP_01422129697393685086_0002 15 15
-TRAFODION LOB130 TLOB130GT C4
/lobs LOBP_01422129697393685086_0003 45 45
+TRAFODION LOB130 TLOB130GT C2
/lobs LOBP_06932846946669431934_0001 15 15
+TRAFODION LOB130 TLOB130GT C3
/lobs LOBP_06932846946669431934_0002 15 15
+TRAFODION LOB130 TLOB130GT C4
/lobs LOBP_06932846946669431934_0003 45 45
--- 3 row(s) selected.
>>delete from tlob130gt where c1=2;
@@ -1179,17 +1179,17 @@ Lob Information for table: "TRAFODION".LOB130.TLOB130GT
ColumnName : C2
Lob Location : /lobs
- LOB Data File: LOBP_01422129697393685086_0001
+ LOB Data File: LOBP_06932846946669431934_0001
LOB EOD : 30
LOB Used Len : 25
ColumnName : C3
Lob Location : /lobs
- LOB Data File: LOBP_01422129697393685086_0002
+ LOB Data File: LOBP_06932846946669431934_0002
LOB EOD : 31
LOB Used Len : 26
ColumnName : C4
Lob Location : /lobs
- LOB Data File: LOBP_01422129697393685086_0003
+ LOB Data File: LOBP_06932846946669431934_0003
LOB EOD : 71
LOB Used Len : 56
@@ -1199,9 +1199,9 @@ Lob Information for table: "TRAFODION".LOB130.TLOB130GT
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
/lobs LOBP_01422129697393685086_0001 30 25
-TRAFODION LOB130 TLOB130GT C3
/lobs LOBP_01422129697393685086_0002 31 26
-TRAFODION LOB130 TLOB130GT C4
/lobs LOBP_01422129697393685086_0003 71 56
+TRAFODION LOB130 TLOB130GT C2
/lobs LOBP_06932846946669431934_0001 30 25
+TRAFODION LOB130 TLOB130GT C3
/lobs LOBP_06932846946669431934_0002 31 26
+TRAFODION LOB130 TLOB130GT C4
/lobs LOBP_06932846946669431934_0003 71 56
--- 3 row(s) selected.
>>
@@ -1356,12 +1356,12 @@ Lob Information for table: "TRAFODION".LOB130.TLOB130EXT
ColumnName : C2
Lob Location : /lobs
- LOB Data File: LOBP_01422129697393698695_0001
+ LOB Data File: LOBP_06932846946669445784_0001
LOB EOD : 61
LOB Used Len : 42
ColumnName : C3
Lob Location : /lobs
- LOB Data File: LOBP_01422129697393698695_0002
+ LOB Data File: LOBP_06932846946669445784_0002
LOB EOD : 106
LOB Used Len : 68
ColumnName : C4
@@ -1376,8 +1376,8 @@ Lob Information for table: "TRAFODION".LOB130.TLOB130EXT
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
/lobs LOBP_01422129697393698695_0001 61 42
-TRAFODION LOB130 TLOB130EXT C3
/lobs LOBP_01422129697393698695_0002 106 68
+TRAFODION LOB130 TLOB130EXT C2
/lobs LOBP_06932846946669445784_0001 61 42
+TRAFODION LOB130 TLOB130EXT C3
/lobs LOBP_06932846946669445784_0002 106 68
TRAFODION LOB130 TLOB130EXT C4
External HDFS Location External HDFS File 0 0
--- 3 row(s) selected.
@@ -1394,7 +1394,7 @@ Column Name : c4
Input a filename to extract to :
Output File Name : lobc4ext.txt
Extracting lob handle for column c4...
-LOB handle for c4: LOBH0000000800030142212969739369869519142212969878486944318212350248881460409020"TRAFODION"."LOB130"
+LOB handle for c4: LOBH0000000800030693284694666944578419693284694806495512618212350404120317726020"TRAFODION"."LOB130"
Extracting LOB data length for the above handle...
LOB data length :19
Extracting lob data into file in chunks of 1000 ...
@@ -1419,7 +1419,7 @@ Table name : TRAFODION.LOB130.t130lob5
Input lob column name to get handle from :
Column Name : c2
Extracting lob handle for column c2...
-LOB handle for c2: LOBH0000000200010142212969739372339819142212969896046280918212350249056905390020"TRAFODION"."LOB130"
+LOB handle for c2: LOBH0000000200010693284694666947044019693284694824175608718212350404297138941020"TRAFODION"."LOB130"
>>select lobtostring(c2,20) from t130lob5;
(EXPR)
@@ -1436,13 +1436,13 @@ Table name : TRAFODION.LOB130.t130lob5
Input lob column name to get handle from :
Column Name : c2
Extracting lob handle for column c2...
-LOB handle for c2: LOBH0000000200010142212969739372339819142212969896046280918212350249056905390020"TRAFODION"."LOB130"
->>select lobtostring(c2,20) from t130lob5;
+LOB handle for c2: LOBH0000000200010693284694666947044019693284694824175608718212350404297138941020"TRAFODION"."LOB130"
+>>select lobtostring(c2,40) from t130lob5;
-(EXPR)
---------------------
+(EXPR)
+----------------------------------------
-zzzzzzzzzzzzzzzzzzzz
+zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz
--- 1 row(s) selected.
>>sh clitestdriver 8 < TEST130_argfile3 2>&1 | tee -a LOG130;
@@ -1453,7 +1453,7 @@ Table name : TRAFODION.LOB130.t130lob5
Input lob column name to get handle from :
Column Name : c2
Extracting lob handle for column c2...
-LOB handle for c2: LOBH0000000200010142212969739372339819142212969896046280918212350249056905390020"TRAFODION"."LOB130"
+LOB handle for c2: LOBH0000000200010693284694666947044019693284694824175608718212350404297138941020"TRAFODION"."LOB130"
>>select lobtostring(c2,20) from t130lob5;
(EXPR)
@@ -1470,13 +1470,13 @@ Table name : TRAFODION.LOB130.t130lob5
Input lob column name to get handle from :
Column Name : c2
Extracting lob handle for column c2...
-LOB handle for c2: LOBH0000000200010142212969739372339819142212969896046280918212350249056905390020"TRAFODION"."LOB130"
->>select lobtostring(c2,20) from t130lob5;
+LOB handle for c2: LOBH0000000200010693284694666947044019693284694824175608718212350404297138941020"TRAFODION"."LOB130"
+>>select lobtostring(c2,40) from t130lob5;
-(EXPR)
---------------------
+(EXPR)
+----------------------------------------
-zzzzzzzzzzzzzzzzzzzz
+zzzzzzzzzzzzzzzzzzzz
--- 1 row(s) selected.
>>delete from t130lob5;
@@ -1497,7 +1497,7 @@ zzzzzzzzzzzzzzzzzzzz
C2
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
---------------------------
-LOBH0000000200010142212969739369869519142212969908695313318212350249183357269020"TRAFODION"."LOB130"
+LOBH0000000200010693284694666944578419693284694836695682418212350404422379045020"TRAFODION"."LOB130"
--- 1 row(s) selected.
>>-- following should return error since only external lobs will be allowed
@@ -1540,9 +1540,9 @@ LOBH0000000200010142212969739369869519142212969908695313318212350249183357269020
Tables in Schema TRAFODION.LOBSCH
=================================
-LOBDescChunks__01422129697393740805_0001
-LOBDescHandle__01422129697393740805_0001
-LOBMD__01422129697393740805
+LOBDescChunks__06932846946669487886_0001
+LOBDescHandle__06932846946669487886_0001
+LOBMD__06932846946669487886
SB_HISTOGRAMS
SB_HISTOGRAM_INTERVALS
SB_PERSISTENT_SAMPLES
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5b891875/core/sql/regress/executor/TEST130
----------------------------------------------------------------------
diff --git a/core/sql/regress/executor/TEST130 b/core/sql/regress/executor/TEST130
index 0fa5335..208ca5f 100755
--- a/core/sql/regress/executor/TEST130
+++ b/core/sql/regress/executor/TEST130
@@ -528,11 +528,11 @@ insert into t130lob5 values (1,empty_blob());
sh clitestdriver 6 < TEST130_argfile3 2>&1 | tee -a LOG130;
select lobtostring(c2,20) from t130lob5;
sh clitestdriver 7 < TEST130_argfile3 2>&1 | tee -a LOG130;
-select lobtostring(c2,20) from t130lob5;
+select lobtostring(c2,40) from t130lob5;
sh clitestdriver 8 < TEST130_argfile3 2>&1 | tee -a LOG130;
select lobtostring(c2,20) from t130lob5;
sh clitestdriver 6 < TEST130_argfile3 2>&1 | tee -a LOG130;
-select lobtostring(c2,20) from t130lob5;
+select lobtostring(c2,40) from t130lob5;
delete from t130lob5;
Merge remote branch 'origin/pr/903/head' into merge_903 Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/6046c6ee Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/6046c6ee Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/6046c6ee Branch: refs/heads/master Commit: 6046c6ee47a77f41dc7ea68457e14a06da62257a Parents: 94d2d78 8f06af3 Author: Sandhya Sundaresan <sa...@apache.org> Authored: Mon Jan 9 17:06:34 2017 +0000 Committer: Sandhya Sundaresan <sa...@apache.org> Committed: Mon Jan 9 17:06:34 2017 +0000 ---------------------------------------------------------------------- core/sql/clitest/blobtest.cpp | 12 ++-- core/sql/executor/ExExeUtilLoad.cpp | 9 +-- core/sql/exp/ExpLOB.cpp | 8 ++- core/sql/exp/ExpLOBaccess.cpp | 15 +---- core/sql/regress/executor/EXPECTED130 | 100 ++++++++++++++--------------- core/sql/regress/executor/TEST130 | 4 +- 6 files changed, 69 insertions(+), 79 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6046c6ee/core/sql/executor/ExExeUtilLoad.cpp ----------------------------------------------------------------------
Testware changes to address memory corruption
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/5b891875
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/5b891875
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/5b891875
Branch: refs/heads/master
Commit: 5b89187528f44cf3c9bac7b0ec6de7132a74e814
Parents: df254b0
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Thu Jan 5 21:36:41 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Thu Jan 5 21:36:41 2017 +0000
----------------------------------------------------------------------
core/sql/clitest/blobtest.cpp | 12 ++--
core/sql/regress/executor/EXPECTED130 | 100 ++++++++++++++---------------
core/sql/regress/executor/TEST130 | 4 +-
3 files changed, 58 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5b891875/core/sql/clitest/blobtest.cpp
----------------------------------------------------------------------
diff --git a/core/sql/clitest/blobtest.cpp b/core/sql/clitest/blobtest.cpp
index 28246c5..71eeca3 100644
--- a/core/sql/clitest/blobtest.cpp
+++ b/core/sql/clitest/blobtest.cpp
@@ -208,7 +208,7 @@ Int32 updateBufferToLob(CliGlobals *cliglob, char *tableName, char *columnName)
char statusBuf[200] = {'\0'};
Int32 statusBufLen = 0;
- Int64 lobUpdateLen = 10;
+ Int64 lobUpdateLen = 20;
char *lobDataBuf = new char[lobUpdateLen];
memcpy(lobDataBuf, "zzzzzzzzzzzzzzzzzzzz",20);
str_sprintf(query,"update %s set %s= buffertolob(LOCATION %Ld, SIZE %Ld)", tableName,columnName, (Int64)lobDataBuf, lobUpdateLen);
@@ -244,7 +244,7 @@ Int32 updateAppendBufferToLob(CliGlobals *cliglob, char *tableName, char *column
char statusBuf[200] = {'\0'};
Int32 statusBufLen = 0;
- Int64 lobUpdateLen = 10;
+ Int64 lobUpdateLen = 15;
char *lobDataBuf = new char[lobUpdateLen];
memcpy(lobDataBuf, "aaaaabbbbbccccc",15);
str_sprintf(query,"update %s set %s=buffertolob (LOCATION %Ld, SIZE %Ld,append)", tableName, columnName,(Int64)lobDataBuf, lobUpdateLen);
@@ -279,7 +279,7 @@ Int32 updateBufferToLobHandle(CliGlobals *cliglob,char *handle)
char statusBuf[200] = {'\0'};
Int32 statusBufLen = 0;
- Int64 lobUpdateLen = 50;
+ Int64 lobUpdateLen = 20;
char *lobDataBuf = new char[lobUpdateLen];
memcpy(lobDataBuf, "zzzzzzzzzzzzzzzzzzzz",20);
str_sprintf(query,"update lob (LOB '%s' , LOCATION %Ld, SIZE %Ld)", handle, (Int64)lobDataBuf, lobUpdateLen);
@@ -313,7 +313,7 @@ Int32 updateAppendBufferToLobHandle(CliGlobals *cliglob,char *handle)
char statusBuf[200] = {'\0'};
Int32 statusBufLen = 0;
- Int64 lobUpdateLen = 50;
+ Int64 lobUpdateLen = 20;
char *lobDataBuf = new char[lobUpdateLen];
memcpy(lobDataBuf, "zzzzzzzzzzzzzzzzzzzz",20);
str_sprintf(query,"update lob (LOB '%s' , LOCATION %Ld, SIZE %Ld,append )", handle, (Int64)lobDataBuf, lobUpdateLen);
@@ -348,10 +348,10 @@ Int32 updateTruncateLobHandle(CliGlobals *cliglob,char *handle)
char statusBuf[200] = {'\0'};
Int32 statusBufLen = 0;
- Int64 lobUpdateLen = 50;
+ Int64 lobUpdateLen = 20;
char *lobDataBuf = new char[lobUpdateLen];
memcpy(lobDataBuf, "zzzzzzzzzzzzzzzzzzzz",20);
- str_sprintf(query,"update lob (LOB '%s' , empty_blob())", handle, (Int64)lobDataBuf, lobUpdateLen);
+ str_sprintf(query,"update lob (LOB '%s' , empty_blob())", handle);
retcode = cliInterface.executeImmediate(query);
The cause ffor the core could be due to the use of an address of a stack variable being passed out of scope. Removed the use of the stack intermediate variable and simplified the passing of a user buffer address to the LOB interfaces. In all cases now, the user buffer address contents are used directly eliminating one level of indirection.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/8f06af35
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/8f06af35
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/8f06af35
Branch: refs/heads/master
Commit: 8f06af3501e0f9cae8e22ff65fd7d63791a11fbd
Parents: 5b89187
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Sat Jan 7 00:19:43 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Sat Jan 7 00:19:43 2017 +0000
----------------------------------------------------------------------
core/sql/executor/ExExeUtilLoad.cpp | 9 ++-------
core/sql/exp/ExpLOB.cpp | 8 ++++++--
core/sql/exp/ExpLOBaccess.cpp | 15 +++------------
3 files changed, 11 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f06af35/core/sql/executor/ExExeUtilLoad.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExExeUtilLoad.cpp b/core/sql/executor/ExExeUtilLoad.cpp
index 6a2a293..4da4a28 100644
--- a/core/sql/executor/ExExeUtilLoad.cpp
+++ b/core/sql/executor/ExExeUtilLoad.cpp
@@ -3455,13 +3455,8 @@ short ExExeUtilLobUpdateTcb::work()
so= Lob_Buffer;
Int64 lobLen = lobTdb().updateSize();
- char * data = (char *)lobTdb().getBufAddr();
-
- if (so == Lob_Buffer)
- {
- Int64 inputAddr = lobTdb().getBufAddr();
- data = (char *)&inputAddr;
- }
+ char * data = (char *)(lobTdb().getBufAddr());
+
void * lobGlobs = getLobGlobals()->lobAccessGlobals();
while (1)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f06af35/core/sql/exp/ExpLOB.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOB.cpp b/core/sql/exp/ExpLOB.cpp
index ac97b89..feb9641 100644
--- a/core/sql/exp/ExpLOB.cpp
+++ b/core/sql/exp/ExpLOB.cpp
@@ -926,7 +926,9 @@ ex_expr::exp_return_type ExpLOBiud::insertData(Lng32 handleLen,
if (fromBuffer())
{
memcpy(&lobLen, op_data[2],sizeof(Int64)); // user specified buffer length
- memcpy(lobData,op_data[1],sizeof(Int64)); // user buffer address
+ Int64 userBufAddr = 0;
+ memcpy(&userBufAddr,op_data[1],sizeof(Int64));
+ lobData = (char *)userBufAddr;
}
LobsOper lo ;
@@ -1348,7 +1350,9 @@ ex_expr::exp_return_type ExpLOBupdate::eval(char *op_data[],
if (fromBuffer())
{
memcpy(&lobLen, op_data[3],sizeof(Int64)); // user specified buffer length
- memcpy(data,op_data[1],sizeof(Int64)); // user buffer address
+ Int64 userBufAddr = 0;
+ memcpy(&userBufAddr,op_data[1],sizeof(Int64));
+ data = (char *)userBufAddr;
}
if(fromEmpty())
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f06af35/core/sql/exp/ExpLOBaccess.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOBaccess.cpp b/core/sql/exp/ExpLOBaccess.cpp
index 0788382..aecf153 100644
--- a/core/sql/exp/ExpLOBaccess.cpp
+++ b/core/sql/exp/ExpLOBaccess.cpp
@@ -1132,10 +1132,7 @@ Ex_Lob_Error ExLob::append(char *data, Int64 size, LobsSubOper so, Int64 headDes
}
char *inputAddr = data;
- if (so == Lob_Buffer)
- {
- inputAddr = (char *)(*(long *)data);
- }
+
str_sprintf(logBuf,"Calling writeLobData: inputAddr: %Ld, InputSize%Ld, tgtOffset:%Ld",(long)inputAddr,sourceLen,dataOffset);
err = writeLobData(inputAddr, sourceLen,so,dataOffset,operLen,lobMaxChunkMemSize);
if (err != LOB_OPER_OK)
@@ -1170,10 +1167,7 @@ Ex_Lob_Error ExLob::insertData(char *data, Int64 size, LobsSubOper so,Int64 head
}
char *inputAddr = data;
- if (so == Lob_Buffer)
- {
- inputAddr = (char *)(*(long *)data);
- }
+
Int64 inputSize = desc.getSize();
Int64 tgtOffset = desc.getOffset();
str_sprintf(logBuf,"Calling writeLobData: inputAddr: %Ld, InputSize%Ld, tgtOffset:%Ld",(long)inputAddr,inputSize,tgtOffset);
@@ -1247,10 +1241,7 @@ Ex_Lob_Error ExLob::update(char *data, Int64 size, LobsSubOper so,Int64 headDesc
return err;
}
char *inputAddr = data;
- if (so == Lob_Buffer)
- {
- inputAddr = (char *)(*(long *)data);
- }
+
str_sprintf(logBuf,"Calling writeLobData.sourceLen:%Ld, dataOffset:%Ld",sourceLen,dataOffset);
lobDebugInfo(logBuf,0,__LINE__,lobTrace_);