From 6171aa1b6e5f9572420f0a12aa5962d9f5119300 Mon Sep 17 00:00:00 2001
From: prabatuty <prabatuty>
Date: Sat, 2 Jul 2011 17:21:56 +0000
Subject: [PATCH] exp changes for char and varchar size issue fix

---
 test/sql/Datatype/exp.test004.ksh  |  8 ++++----
 test/sql/Datatype/exp.test005.ksh  |  8 ++++----
 test/sql/Datatype/exp.test006.ksh  |  8 ++++----
 test/sql/Datatype/exp.test007.ksh  |  4 ++--
 test/sql/Datatype/exp.test008.ksh  | 12 ++++++------
 test/sql/Datatype/exp.test009.ksh  | 10 +++++-----
 test/sql/Datatype/exp.test010.ksh  |  4 ++--
 test/tools/catalog/exp.test008.ksh |  6 +++---
 test/tools/csql/exp.test032.ksh    |  2 +-
 test/tools/csql/exp.test033.ksh    |  2 +-
 test/tools/csql/exp.test036.ksh    | 12 ++++++------
 test/tools/csql/exp.testnw020.ksh  |  2 +-
 test/tools/csql/exp.testnw021.ksh  |  2 +-
 13 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/test/sql/Datatype/exp.test004.ksh b/test/sql/Datatype/exp.test004.ksh
index e8d28305..a8535e07 100644
--- a/test/sql/Datatype/exp.test004.ksh
+++ b/test/sql/Datatype/exp.test004.ksh
@@ -57,7 +57,7 @@ echo select * from t2;
       <FieldInfo>
         <FieldName> f1 </FieldName>
         <Type> 32 </Type>
-        <Length> 12 </Length>
+        <Length> 11 </Length>
         <Primary> 1 </Primary>
         <Null> 1 </Null>
         <Default> 0 </Default>
@@ -66,7 +66,7 @@ echo select * from t2;
       <FieldInfo>
         <FieldName> f2 </FieldName>
         <Type> 0 </Type>
-        <Length> 4 </Length>
+        <Length> 3 </Length>
         <Primary> 0 </Primary>
         <Null> 0 </Null>
         <Default> 0 </Default>
@@ -78,7 +78,7 @@ echo select * from t2;
       <FieldInfo>
         <FieldName> f1 </FieldName>
         <Type> 32 </Type>
-        <Length> 12 </Length>
+        <Length> 11 </Length>
         <Primary> 0 </Primary>
         <Null> 0 </Null>
         <Default> 0 </Default>
@@ -87,7 +87,7 @@ echo select * from t2;
       <FieldInfo>
         <FieldName> f2 </FieldName>
         <Type> 2 </Type>
-        <Length> 8 </Length>
+        <Length> 7 </Length>
         <Primary> 0 </Primary>
         <Null> 0 </Null>
         <Default> 0 </Default>
diff --git a/test/sql/Datatype/exp.test005.ksh b/test/sql/Datatype/exp.test005.ksh
index f2ff5deb..4cde0c80 100644
--- a/test/sql/Datatype/exp.test005.ksh
+++ b/test/sql/Datatype/exp.test005.ksh
@@ -26,7 +26,7 @@ echo select * from t2;
       <FieldInfo>
         <FieldName> f1 </FieldName>
         <Type> 32 </Type>
-        <Length> 12 </Length>
+        <Length> 11 </Length>
         <Primary> 0 </Primary>
         <Null> 0 </Null>
         <Default> 0 </Default>
@@ -35,7 +35,7 @@ echo select * from t2;
       <FieldInfo>
         <FieldName> f2 </FieldName>
         <Type> 3 </Type>
-        <Length> 4 </Length>
+        <Length> 1 </Length>
         <Primary> 0 </Primary>
         <Null> 0 </Null>
         <Default> 0 </Default>
@@ -47,7 +47,7 @@ echo select * from t2;
       <FieldInfo>
         <FieldName> f1 </FieldName>
         <Type> 32 </Type>
-        <Length> 12 </Length>
+        <Length> 11 </Length>
         <Primary> 0 </Primary>
         <Null> 0 </Null>
         <Default> 0 </Default>
@@ -56,7 +56,7 @@ echo select * from t2;
       <FieldInfo>
         <FieldName> f2 </FieldName>
         <Type> 3 </Type>
-        <Length> 4 </Length>
+        <Length> 1 </Length>
         <Primary> 0 </Primary>
         <Null> 0 </Null>
         <Default> 0 </Default>
diff --git a/test/sql/Datatype/exp.test006.ksh b/test/sql/Datatype/exp.test006.ksh
index 0a43cbac..d815451f 100644
--- a/test/sql/Datatype/exp.test006.ksh
+++ b/test/sql/Datatype/exp.test006.ksh
@@ -12,7 +12,7 @@ Statement execute failed with error -16
       <FieldInfo>
         <FieldName> f1 </FieldName>
         <Type> 32 </Type>
-        <Length> 12 </Length>
+        <Length> 11 </Length>
         <Primary> 0 </Primary>
         <Null> 0 </Null>
         <Default> 0 </Default>
@@ -21,7 +21,7 @@ Statement execute failed with error -16
       <FieldInfo>
         <FieldName> f2 </FieldName>
         <Type> 3 </Type>
-        <Length> 4 </Length>
+        <Length> 1 </Length>
         <Primary> 0 </Primary>
         <Null> 0 </Null>
         <Default> 0 </Default>
@@ -33,7 +33,7 @@ Statement execute failed with error -16
       <FieldInfo>
         <FieldName> f1 </FieldName>
         <Type> 32 </Type>
-        <Length> 12 </Length>
+        <Length> 11 </Length>
         <Primary> 0 </Primary>
         <Null> 0 </Null>
         <Default> 0 </Default>
@@ -42,7 +42,7 @@ Statement execute failed with error -16
       <FieldInfo>
         <FieldName> f2 </FieldName>
         <Type> 3 </Type>
-        <Length> 4 </Length>
+        <Length> 1 </Length>
         <Primary> 0 </Primary>
         <Null> 0 </Null>
         <Default> 0 </Default>
diff --git a/test/sql/Datatype/exp.test007.ksh b/test/sql/Datatype/exp.test007.ksh
index 02d8c886..63ecf080 100644
--- a/test/sql/Datatype/exp.test007.ksh
+++ b/test/sql/Datatype/exp.test007.ksh
@@ -14,7 +14,7 @@ echo show tables;
       <FieldInfo>
         <FieldName> F1 </FieldName>
         <Type> 32 </Type>
-        <Length> 12 </Length>
+        <Length> 11 </Length>
         <Primary> 0 </Primary>
         <Null> 0 </Null>
         <Default> 0 </Default>
@@ -23,7 +23,7 @@ echo show tables;
       <FieldInfo>
         <FieldName> f2 </FieldName>
         <Type> 2 </Type>
-        <Length> 8 </Length>
+        <Length> 7 </Length>
         <Primary> 0 </Primary>
         <Null> 0 </Null>
         <Default> 0 </Default>
diff --git a/test/sql/Datatype/exp.test008.ksh b/test/sql/Datatype/exp.test008.ksh
index e42509d9..18ed5bae 100644
--- a/test/sql/Datatype/exp.test008.ksh
+++ b/test/sql/Datatype/exp.test008.ksh
@@ -22,7 +22,7 @@ echo show tables;
       <FieldInfo>
         <FieldName> f2 </FieldName>
         <Type> 32 </Type>
-        <Length> 12 </Length>
+        <Length> 11 </Length>
         <Primary> 0 </Primary>
         <Null> 0 </Null>
         <Default> 0 </Default>
@@ -31,7 +31,7 @@ echo show tables;
       <FieldInfo>
         <FieldName> f3 </FieldName>
         <Type> 30 </Type>
-        <Length> 12 </Length>
+        <Length> 10 </Length>
         <Primary> 0 </Primary>
         <Null> 0 </Null>
         <Default> 0 </Default>
@@ -40,7 +40,7 @@ echo show tables;
       <FieldInfo>
         <FieldName> f4 </FieldName>
         <Type> 32 </Type>
-        <Length> 12 </Length>
+        <Length> 10 </Length>
         <Primary> 0 </Primary>
         <Null> 0 </Null>
         <Default> 0 </Default>
@@ -52,7 +52,7 @@ echo show tables;
       <FieldInfo>
         <FieldName> f2 </FieldName>
         <Type> 32 </Type>
-        <Length> 12 </Length>
+        <Length> 11 </Length>
         <Primary> 0 </Primary>
         <Null> 0 </Null>
         <Default> 0 </Default>
@@ -61,7 +61,7 @@ echo show tables;
       <FieldInfo>
         <FieldName> f1 </FieldName>
         <Type> 0 </Type>
-        <Length> 4 </Length>
+        <Length> 3 </Length>
         <Primary> 0 </Primary>
         <Null> 0 </Null>
         <Default> 0 </Default>
@@ -70,7 +70,7 @@ echo show tables;
       <FieldInfo>
         <FieldName> f4 </FieldName>
         <Type> 32 </Type>
-        <Length> 12 </Length>
+        <Length> 11 </Length>
         <Primary> 0 </Primary>
         <Null> 0 </Null>
         <Default> 0 </Default>
diff --git a/test/sql/Datatype/exp.test009.ksh b/test/sql/Datatype/exp.test009.ksh
index 8121cc75..5e90a469 100644
--- a/test/sql/Datatype/exp.test009.ksh
+++ b/test/sql/Datatype/exp.test009.ksh
@@ -26,7 +26,7 @@ Statement execute failed with error -16
       <FieldInfo>
         <FieldName> f1 </FieldName>
         <Type> 4 </Type>
-        <Length> 4 </Length>
+        <Length> 1 </Length>
         <Primary> 0 </Primary>
         <Null> 0 </Null>
         <Default> 0 </Default>
@@ -35,7 +35,7 @@ Statement execute failed with error -16
       <FieldInfo>
         <FieldName> f2 </FieldName>
         <Type> 3 </Type>
-        <Length> 4 </Length>
+        <Length> 2 </Length>
         <Primary> 0 </Primary>
         <Null> 0 </Null>
         <Default> 0 </Default>
@@ -62,7 +62,7 @@ Statement execute failed with error -16
       <FieldInfo>
         <FieldName> f5 </FieldName>
         <Type> 30 </Type>
-        <Length> 12 </Length>
+        <Length> 11 </Length>
         <Primary> 0 </Primary>
         <Null> 0 </Null>
         <Default> 0 </Default>
@@ -71,7 +71,7 @@ Statement execute failed with error -16
       <FieldInfo>
         <FieldName> f6 </FieldName>
         <Type> 32 </Type>
-        <Length> 12 </Length>
+        <Length> 10 </Length>
         <Primary> 0 </Primary>
         <Null> 0 </Null>
         <Default> 0 </Default>
@@ -80,7 +80,7 @@ Statement execute failed with error -16
       <FieldInfo>
         <FieldName> f7 </FieldName>
         <Type> 11 </Type>
-        <Length> 4 </Length>
+        <Length> 3 </Length>
         <Primary> 0 </Primary>
         <Null> 0 </Null>
         <Default> 0 </Default>
diff --git a/test/sql/Datatype/exp.test010.ksh b/test/sql/Datatype/exp.test010.ksh
index 75515a1d..832ca0e5 100644
--- a/test/sql/Datatype/exp.test010.ksh
+++ b/test/sql/Datatype/exp.test010.ksh
@@ -49,7 +49,7 @@ echo select * from t1;
       <FieldInfo>
         <FieldName> f1 </FieldName>
         <Type> 32 </Type>
-        <Length> 20 </Length>
+        <Length> 21 </Length>
         <Primary> 0 </Primary>
         <Null> 0 </Null>
         <Default> 0 </Default>
@@ -58,7 +58,7 @@ echo select * from t1;
       <FieldInfo>
         <FieldName> f2 </FieldName>
         <Type> 32 </Type>
-        <Length> 32 </Length>
+        <Length> 30 </Length>
         <Primary> 0 </Primary>
         <Null> 0 </Null>
         <Default> 0 </Default>
diff --git a/test/tools/catalog/exp.test008.ksh b/test/tools/catalog/exp.test008.ksh
index 5252bebb..79d8acce 100644
--- a/test/tools/catalog/exp.test008.ksh
+++ b/test/tools/catalog/exp.test008.ksh
@@ -136,7 +136,7 @@ Case 2: With -D chunk option after table creation:
                 <TotalPages> 1250 </TotalPages> 
                 <ChunkName > t1 </ChunkName> 
                 <TotalDataNodes> 4999 </TotalDataNodes> 
-                <SizeOfDataNodes> 2016 </SizeOfDataNodes> 
+                <SizeOfDataNodes> 2020 </SizeOfDataNodes> 
                 <Allocation Type> FixedSizeAllocator </Allocation Type>
         <Chunk Id> 102 </Chunk Id> 
                 <TotalPages> 1 </TotalPages> 
@@ -259,7 +259,7 @@ Case 3: With -D chunk  option after record deleted:
                 <TotalPages> 1250 </TotalPages> 
                 <ChunkName > t1 </ChunkName> 
                 <TotalDataNodes> 1000 </TotalDataNodes> 
-                <SizeOfDataNodes> 2016 </SizeOfDataNodes> 
+                <SizeOfDataNodes> 2020 </SizeOfDataNodes> 
                 <Allocation Type> FixedSizeAllocator </Allocation Type>
         <Chunk Id> 102 </Chunk Id> 
                 <TotalPages> 1 </TotalPages> 
@@ -382,7 +382,7 @@ Case 4: With -D chunk  option after compact statement :
                 <TotalPages> 252 </TotalPages> 
                 <ChunkName > t1 </ChunkName> 
                 <TotalDataNodes> 1000 </TotalDataNodes> 
-                <SizeOfDataNodes> 2016 </SizeOfDataNodes> 
+                <SizeOfDataNodes> 2020 </SizeOfDataNodes> 
                 <Allocation Type> FixedSizeAllocator </Allocation Type>
         <Chunk Id> 102 </Chunk Id> 
                 <TotalPages> 1 </TotalPages> 
diff --git a/test/tools/csql/exp.test032.ksh b/test/tools/csql/exp.test032.ksh
index 15a5eaea..ecfab26a 100644
--- a/test/tools/csql/exp.test032.ksh
+++ b/test/tools/csql/exp.test032.ksh
@@ -46,7 +46,7 @@ echo select * from t1 where f1=10 and f2=6 and f3=10;
 	t1.f1	t1.f2	t1.f3	
 ---------------------------------------------------------
 	
-CREATE TABLE t1 (f1 INT  NOT NULL , f2 CHAR (12) NOT NULL , f3 INT );
+CREATE TABLE t1 (f1 INT  NOT NULL , f2 CHAR (10) NOT NULL , f3 INT );
 CREATE INDEX idx on t1 (  f1  ,f2  )  HASH  UNIQUE;
 INSERT INTO t1 VALUES(1, '1',1);
 INSERT INTO t1 VALUES(2, '1',2);
diff --git a/test/tools/csql/exp.test033.ksh b/test/tools/csql/exp.test033.ksh
index 238e665a..4ca58a2a 100644
--- a/test/tools/csql/exp.test033.ksh
+++ b/test/tools/csql/exp.test033.ksh
@@ -8,7 +8,7 @@ echo select count(f1) from t1;
 ---------------------------------------------------------
 	2	
 	
-CREATE TABLE t1 (f1 INT  NOT NULL , f2 CHAR (12) NOT NULL , f3 INT );
+CREATE TABLE t1 (f1 INT  NOT NULL , f2 CHAR (10) NOT NULL , f3 INT );
 INSERT INTO t1 VALUES(1, '1',1);
 INSERT INTO t1 VALUES(3, '1',3);
 Statement Executed
diff --git a/test/tools/csql/exp.test036.ksh b/test/tools/csql/exp.test036.ksh
index 7d2e7c68..fb770723 100644
--- a/test/tools/csql/exp.test036.ksh
+++ b/test/tools/csql/exp.test036.ksh
@@ -74,7 +74,7 @@ Statement execute failed with error -4
       <FieldInfo>
         <FieldName> f2 </FieldName>
         <Type> 30 </Type>
-        <Length> 12 </Length>
+        <Length> 11 </Length>
         <Primary> 1 </Primary>
         <Null> 1 </Null>
         <Default> 0 </Default>
@@ -83,7 +83,7 @@ Statement execute failed with error -4
       <FieldInfo>
         <FieldName> f3 </FieldName>
         <Type> 3 </Type>
-        <Length> 4 </Length>
+        <Length> 1 </Length>
         <Primary> 0 </Primary>
         <Null> 0 </Null>
         <Default> 0 </Default>
@@ -92,7 +92,7 @@ Statement execute failed with error -4
       <FieldInfo>
         <FieldName> f4 </FieldName>
         <Type> 4 </Type>
-        <Length> 4 </Length>
+        <Length> 1 </Length>
         <Primary> 0 </Primary>
         <Null> 0 </Null>
         <Default> 0 </Default>
@@ -113,7 +113,7 @@ Statement execute failed with error -4
       <FieldInfo>
         <FieldName> f2 </FieldName>
         <Type> 30 </Type>
-        <Length> 12 </Length>
+        <Length> 11 </Length>
         <Primary> 1 </Primary>
         <Null> 1 </Null>
         <Default> 0 </Default>
@@ -122,7 +122,7 @@ Statement execute failed with error -4
       <FieldInfo>
         <FieldName> f3 </FieldName>
         <Type> 3 </Type>
-        <Length> 4 </Length>
+        <Length> 1 </Length>
         <Primary> 0 </Primary>
         <Null> 0 </Null>
         <Default> 0 </Default>
@@ -131,7 +131,7 @@ Statement execute failed with error -4
       <FieldInfo>
         <FieldName> f4 </FieldName>
         <Type> 4 </Type>
-        <Length> 4 </Length>
+        <Length> 1 </Length>
         <Primary> 0 </Primary>
         <Null> 0 </Null>
         <Default> 0 </Default>
diff --git a/test/tools/csql/exp.testnw020.ksh b/test/tools/csql/exp.testnw020.ksh
index 0ee57999..fbaa758d 100644
--- a/test/tools/csql/exp.testnw020.ksh
+++ b/test/tools/csql/exp.testnw020.ksh
@@ -47,7 +47,7 @@ echo select * from t1 where f1=10 and f2=6 and f3=10;
 	t1.f1	t1.f2	t1.f3	
 ---------------------------------------------------------
 	
-CREATE TABLE t1 (f1 INT  NOT NULL , f2 CHAR (12) NOT NULL , f3 INT );
+CREATE TABLE t1 (f1 INT  NOT NULL , f2 CHAR (10) NOT NULL , f3 INT );
 CREATE INDEX idx on t1 (  f1  ,f2  )  HASH  UNIQUE;
 INSERT INTO t1 VALUES(1, '1',1);
 INSERT INTO t1 VALUES(2, '1',2);
diff --git a/test/tools/csql/exp.testnw021.ksh b/test/tools/csql/exp.testnw021.ksh
index 651a395e..13fea311 100644
--- a/test/tools/csql/exp.testnw021.ksh
+++ b/test/tools/csql/exp.testnw021.ksh
@@ -9,7 +9,7 @@ echo select count(f1) from t1;
 ---------------------------------------------------------
 	2	
 	
-CREATE TABLE t1 (f1 INT  NOT NULL , f2 CHAR (12) NOT NULL , f3 INT );
+CREATE TABLE t1 (f1 INT  NOT NULL , f2 CHAR (10) NOT NULL , f3 INT );
 INSERT INTO t1 VALUES(1, '1',1);
 INSERT INTO t1 VALUES(3, '1',3);
 Network CSql
-- 
2.11.4.GIT