Changeset: 0bc51fb2d997 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0bc51fb2d997
Modified Files:
        sql/test/orderidx/Tests/simpletable.sql
        sql/test/orderidx/Tests/simpletable.stable.out
        sql/test/orderidx/Tests/simpletable.stable.out.32bit
        sql/test/orderidx/Tests/smalltable.sql
        sql/test/orderidx/Tests/smalltable.stable.out
        sql/test/orderidx/Tests/smalltable.stable.out.32bit
        sql/test/pg_regress/Tests/vacuum.sql
        sql/test/pg_regress/Tests/vacuum.stable.out
Branch: Mar2018
Log Message:

Use sys.storage(schema, table) instead of WHERE clause.


diffs (truncated from 361 to 300 lines):

diff --git a/sql/test/orderidx/Tests/simpletable.sql 
b/sql/test/orderidx/Tests/simpletable.sql
--- a/sql/test/orderidx/Tests/simpletable.sql
+++ b/sql/test/orderidx/Tests/simpletable.sql
@@ -2,12 +2,12 @@ CREATE TABLE xtmp1(i integer);
 INSERT INTO xtmp1 VALUES (1),(2),(4),(0),(10),(7),(3),(1),(1),(-4),(-9),(-1);
 SELECT * FROM xtmp1;
 
-SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx FROM storage WHERE "table" = 'xtmp1';
+SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx FROM storage(current_schema, 'xtmp1');
 ALTER TABLE xtmp1 SET READ ONLY;
 --call createorderindex('sys','xtmp1','i');
 CREATE ORDERED INDEX sys_xtmp1_i_oidx ON xtmp1(i);
 
-SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx FROM storage WHERE "table" = 'xtmp1';
+SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx FROM storage(current_schema, 'xtmp1');
 
 SELECT * FROM xtmp1 WHERE i<0;
 SELECT * FROM xtmp1 WHERE i<1;
diff --git a/sql/test/orderidx/Tests/simpletable.stable.out 
b/sql/test/orderidx/Tests/simpletable.stable.out
--- a/sql/test/orderidx/Tests/simpletable.stable.out
+++ b/sql/test/orderidx/Tests/simpletable.stable.out
@@ -85,16 +85,16 @@ Ready.
 [ -4   ]
 [ -9   ]
 [ -1   ]
-#SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx FROM storage WHERE "table" = 'xtmp1';
-% .storage,    .storage,       .storage,       .storage,       .storage,       
.storage,       .storage,       .storage,       .storage,       .storage,       
.storage # table_name
+#SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx FROM storage(current_schema, 'xtmp1');
+% .L3, .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    
.L3 # table_name
 % schema,      table,  column, type,   mode,   count,  hashes, phash,  
imprints,       sorted, orderidx # name
 % clob,        clob,   clob,   clob,   clob,   bigint, bigint, boolean,        
bigint, boolean,        bigint # type
 % 3,   5,      1,      3,      8,      2,      1,      5,      1,      5,      
1 # length
 [ "sys",       "xtmp1",        "i",    "int",  "writable",     12,     0,      
false,  0,      false,  0       ]
 #ALTER TABLE xtmp1 SET READ ONLY;
 #CREATE ORDERED INDEX sys_xtmp1_i_oidx ON xtmp1(i);
-#SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx FROM storage WHERE "table" = 'xtmp1';
-% .storage,    .storage,       .storage,       .storage,       .storage,       
.storage,       .storage,       .storage,       .storage,       .storage,       
.storage # table_name
+#SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx FROM storage(current_schema, 'xtmp1');
+% .L3, .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    
.L3 # table_name
 % schema,      table,  column, type,   mode,   count,  hashes, phash,  
imprints,       sorted, orderidx # name
 % clob,        clob,   clob,   clob,   clob,   bigint, bigint, boolean,        
bigint, boolean,        bigint # type
 % 3,   5,      1,      3,      8,      2,      1,      5,      1,      5,      
3 # length
diff --git a/sql/test/orderidx/Tests/simpletable.stable.out.32bit 
b/sql/test/orderidx/Tests/simpletable.stable.out.32bit
--- a/sql/test/orderidx/Tests/simpletable.stable.out.32bit
+++ b/sql/test/orderidx/Tests/simpletable.stable.out.32bit
@@ -85,16 +85,16 @@ Ready.
 [ -4   ]
 [ -9   ]
 [ -1   ]
-#SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx FROM storage WHERE "table" = 'xtmp1';
-% .storage,    .storage,       .storage,       .storage,       .storage,       
.storage,       .storage,       .storage,       .storage,       .storage,       
.storage # table_name
+#SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx FROM storage(current_schema, 'xtmp1');
+% .L3, .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    
.L3 # table_name
 % schema,      table,  column, type,   mode,   count,  hashes, phash,  
imprints,       sorted, orderidx # name
 % clob,        clob,   clob,   clob,   clob,   bigint, bigint, boolean,        
bigint, boolean,        bigint # type
 % 3,   5,      1,      3,      8,      2,      1,      5,      1,      5,      
1 # length
 [ "sys",       "xtmp1",        "i",    "int",  "writable",     12,     0,      
false,  0,      false,  0       ]
 #ALTER TABLE xtmp1 SET READ ONLY;
 #CREATE ORDERED INDEX sys_xtmp1_i_oidx ON xtmp1(i);
-#SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx FROM storage WHERE "table" = 'xtmp1';
-% .storage,    .storage,       .storage,       .storage,       .storage,       
.storage,       .storage,       .storage,       .storage,       .storage,       
.storage # table_name
+#SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx FROM storage(current_schema, 'xtmp1');
+% .L3, .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    
.L3 # table_name
 % schema,      table,  column, type,   mode,   count,  hashes, phash,  
imprints,       sorted, orderidx # name
 % clob,        clob,   clob,   clob,   clob,   bigint, bigint, boolean,        
bigint, boolean,        bigint # type
 % 3,   5,      1,      3,      8,      2,      1,      5,      1,      5,      
2 # length
diff --git a/sql/test/orderidx/Tests/smalltable.sql 
b/sql/test/orderidx/Tests/smalltable.sql
--- a/sql/test/orderidx/Tests/smalltable.sql
+++ b/sql/test/orderidx/Tests/smalltable.sql
@@ -1,25 +1,25 @@
 -- test robustness against small tables
 CREATE TABLE xtmp2(i integer);
-SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx FROM storage WHERE "table"= 'xtmp2';
+SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx FROM storage(current_schema, 'xtmp2');
 ALTER TABLE xtmp2 SET read only;
 CREATE ORDERED INDEX sys_xtmp2_i_oidx ON xtmp2(i);
-SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx FROM storage WHERE "table"= 'xtmp2';
+SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx FROM storage(current_schema, 'xtmp2');
 SELECT * FROM xtmp2 wHERE i>=0 AND i<8;
 
 CREATE TABLE xtmp3(i integer);
 INSERT INTO xtmp3 VALUES(3);
-SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx FROM storage WHERE "table"= 'xtmp3';
+SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx FROM storage(current_schema, 'xtmp3');
 ALTER TABLE xtmp3 SET read only;
 CREATE ORDERED INDEX sys_xtmp3_i_oidx ON xtmp3(i);
-SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx from storage where "table"= 'xtmp3';
+SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx from storage(current_schema, 'xtmp3');
 SELECT * FROM xtmp3 WHERE i>=0 AND i<8;
 
 CREATE TABLE xtmp4(i integer);
 INSERT INTO xtmp4 VALUES (3),(0),(2);
-SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx FROM storage WHERE "table"= 'xtmp4';
+SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx FROM storage(current_schema, 'xtmp4');
 ALTER TABLE xtmp4 SET read only;
 CREATE ORDERED INDEX sys_xtmp4_i_oidx ON xtmp4(i);
-SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx from storage where "table"= 'xtmp4';
+SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx from storage(current_schema, 'xtmp4');
 SELECT * FROM xtmp4 WHERE i>=0 AND i<8;
 
 DROP INDEX sys_xtmp2_i_oidx;
diff --git a/sql/test/orderidx/Tests/smalltable.stable.out 
b/sql/test/orderidx/Tests/smalltable.stable.out
--- a/sql/test/orderidx/Tests/smalltable.stable.out
+++ b/sql/test/orderidx/Tests/smalltable.stable.out
@@ -29,17 +29,17 @@ Ready.
 # 11:38:23 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-25471" "--port=33382"
 # 11:38:23 >  
 
-#create table xtmp2( i integer);
-#select schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx from storage where "table"= 'xtmp2';
-% .storage,    .storage,       .storage,       .storage,       .storage,       
.storage,       .storage,       .storage,       .storage,       .storage,       
.storage # table_name
+#CREATE TABLE xtmp2(i integer);
+#SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx FROM storage(current_schema, 'xtmp2');
+% .L3, .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    
.L3 # table_name
 % schema,      table,  column, type,   mode,   count,  hashes, phash,  
imprints,       sorted, orderidx # name
 % clob,        clob,   clob,   clob,   clob,   bigint, bigint, boolean,        
bigint, boolean,        bigint # type
 % 3,   5,      1,      3,      8,      1,      1,      5,      1,      5,      
1 # length
 [ "sys",       "xtmp2",        "i",    "int",  "writable",     0,      0,      
false,  0,      true,   0       ]
-#alter table xtmp2 set read only;
-#create ordered index sys_xtmp2_i_oidx on xtmp2(i);
-#select schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx from storage where "table"= 'xtmp2';
-% .storage,    .storage,       .storage,       .storage,       .storage,       
.storage,       .storage,       .storage,       .storage,       .storage,       
.storage # table_name
+#ALTER TABLE xtmp2 SET read only;
+#CREATE ORDERED INDEX sys_xtmp2_i_oidx ON xtmp2(i);
+#SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx FROM storage(current_schema, 'xtmp2');
+% .L3, .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    
.L3 # table_name
 % schema,      table,  column, type,   mode,   count,  hashes, phash,  
imprints,       sorted, orderidx # name
 % clob,        clob,   clob,   clob,   clob,   bigint, bigint, boolean,        
bigint, boolean,        bigint # type
 % 3,   5,      1,      3,      8,      1,      1,      5,      1,      5,      
1 # length
@@ -52,16 +52,16 @@ Ready.
 #create table xtmp3( i integer);
 #insert into xtmp3 values(3);
 [ 1    ]
-#select schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx from storage where "table"= 'xtmp3';
-% .storage,    .storage,       .storage,       .storage,       .storage,       
.storage,       .storage,       .storage,       .storage,       .storage,       
.storage # table_name
+#SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx FROM storage(current_schema, 'xtmp3');
+% .L3, .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    
.L3 # table_name
 % schema,      table,  column, type,   mode,   count,  hashes, phash,  
imprints,       sorted, orderidx # name
 % clob,        clob,   clob,   clob,   clob,   bigint, bigint, boolean,        
bigint, boolean,        bigint # type
 % 3,   5,      1,      3,      8,      1,      1,      5,      1,      5,      
1 # length
 [ "sys",       "xtmp3",        "i",    "int",  "writable",     1,      0,      
false,  0,      true,   0       ]
-#alter table xtmp3 set read only;
-#create ordered index sys_xtmp3_i_oidx on xtmp3(i);
-#select schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx from storage where "table"= 'xtmp3';
-% .storage,    .storage,       .storage,       .storage,       .storage,       
.storage,       .storage,       .storage,       .storage,       .storage,       
.storage # table_name
+#ALTER TABLE xtmp3 SET read only;
+#CREATE ORDERED INDEX sys_xtmp3_i_oidx ON xtmp3(i);
+#SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx from storage(current_schema, 'xtmp3');
+% .L3, .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    
.L3 # table_name
 % schema,      table,  column, type,   mode,   count,  hashes, phash,  
imprints,       sorted, orderidx # name
 % clob,        clob,   clob,   clob,   clob,   bigint, bigint, boolean,        
bigint, boolean,        bigint # type
 % 3,   5,      1,      3,      8,      1,      1,      5,      1,      5,      
1 # length
@@ -75,16 +75,16 @@ Ready.
 #CREATE TABLE xtmp4(i integer);
 #INSERT INTO xtmp4 VALUES (3),(0),(2);
 [ 3    ]
-#SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx FROM storage WHERE "table"= 'xtmp4';
-% .storage,    .storage,       .storage,       .storage,       .storage,       
.storage,       .storage,       .storage,       .storage,       .storage,       
.storage # table_name
+#SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx FROM storage(current_schema, 'xtmp4');
+% .L3, .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    
.L3 # table_name
 % schema,      table,  column, type,   mode,   count,  hashes, phash,  
imprints,       sorted, orderidx # name
 % clob,        clob,   clob,   clob,   clob,   bigint, bigint, boolean,        
bigint, boolean,        bigint # type
 % 3,   5,      1,      3,      8,      1,      1,      5,      1,      5,      
1 # length
 [ "sys",       "xtmp4",        "i",    "int",  "writable",     3,      0,      
false,  0,      false,  0       ]
 #ALTER TABLE xtmp4 SET read only;
 #CREATE ORDERED INDEX sys_xtmp4_i_oidx ON xtmp4(i);
-#SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx from storage where "table"= 'xtmp4';
-% .storage,    .storage,       .storage,       .storage,       .storage,       
.storage,       .storage,       .storage,       .storage,       .storage,       
.storage # table_name
+#SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx from storage(current_schema, 'xtmp4');
+% .L3, .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    
.L3 # table_name
 % schema,      table,  column, type,   mode,   count,  hashes, phash,  
imprints,       sorted, orderidx # name
 % clob,        clob,   clob,   clob,   clob,   bigint, bigint, boolean,        
bigint, boolean,        bigint # type
 % 3,   5,      1,      3,      8,      1,      1,      5,      1,      5,      
2 # length
diff --git a/sql/test/orderidx/Tests/smalltable.stable.out.32bit 
b/sql/test/orderidx/Tests/smalltable.stable.out.32bit
--- a/sql/test/orderidx/Tests/smalltable.stable.out.32bit
+++ b/sql/test/orderidx/Tests/smalltable.stable.out.32bit
@@ -29,17 +29,17 @@ Ready.
 # 11:38:23 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-25471" "--port=33382"
 # 11:38:23 >  
 
-#create table xtmp2( i integer);
-#select schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx from storage where "table"= 'xtmp2';
-% .storage,    .storage,       .storage,       .storage,       .storage,       
.storage,       .storage,       .storage,       .storage,       .storage,       
.storage # table_name
+#CREATE TABLE xtmp2(i integer);
+#SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx FROM storage(current_schema, 'xtmp2');
+% .L3, .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    
.L3 # table_name
 % schema,      table,  column, type,   mode,   count,  hashes, phash,  
imprints,       sorted, orderidx # name
 % clob,        clob,   clob,   clob,   clob,   bigint, bigint, boolean,        
bigint, boolean,        bigint # type
 % 3,   5,      1,      3,      8,      1,      1,      5,      1,      5,      
1 # length
 [ "sys",       "xtmp2",        "i",    "int",  "writable",     0,      0,      
false,  0,      true,   0       ]
-#alter table xtmp2 set read only;
-#create ordered index sys_xtmp2_i_oidx on xtmp2(i);
-#select schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx from storage where "table"= 'xtmp2';
-% .storage,    .storage,       .storage,       .storage,       .storage,       
.storage,       .storage,       .storage,       .storage,       .storage,       
.storage # table_name
+#ALTER TABLE xtmp2 SET read only;
+#CREATE ORDERED INDEX sys_xtmp2_i_oidx ON xtmp2(i);
+#SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx FROM storage(current_schema, 'xtmp2');
+% .L3, .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    
.L3 # table_name
 % schema,      table,  column, type,   mode,   count,  hashes, phash,  
imprints,       sorted, orderidx # name
 % clob,        clob,   clob,   clob,   clob,   bigint, bigint, boolean,        
bigint, boolean,        bigint # type
 % 3,   5,      1,      3,      8,      1,      1,      5,      1,      5,      
1 # length
@@ -52,16 +52,16 @@ Ready.
 #create table xtmp3( i integer);
 #insert into xtmp3 values(3);
 [ 1    ]
-#select schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx from storage where "table"= 'xtmp3';
-% .storage,    .storage,       .storage,       .storage,       .storage,       
.storage,       .storage,       .storage,       .storage,       .storage,       
.storage # table_name
+#SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx FROM storage(current_schema, 'xtmp3');
+% .L3, .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    
.L3 # table_name
 % schema,      table,  column, type,   mode,   count,  hashes, phash,  
imprints,       sorted, orderidx # name
 % clob,        clob,   clob,   clob,   clob,   bigint, bigint, boolean,        
bigint, boolean,        bigint # type
 % 3,   5,      1,      3,      8,      1,      1,      5,      1,      5,      
1 # length
 [ "sys",       "xtmp3",        "i",    "int",  "writable",     1,      0,      
false,  0,      true,   0       ]
-#alter table xtmp3 set read only;
-#create ordered index sys_xtmp3_i_oidx on xtmp3(i);
-#select schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx from storage where "table"= 'xtmp3';
-% .storage,    .storage,       .storage,       .storage,       .storage,       
.storage,       .storage,       .storage,       .storage,       .storage,       
.storage # table_name
+#ALTER TABLE xtmp3 SET read only;
+#CREATE ORDERED INDEX sys_xtmp3_i_oidx ON xtmp3(i);
+#SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx from storage(current_schema, 'xtmp3');
+% .L3, .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    
.L3 # table_name
 % schema,      table,  column, type,   mode,   count,  hashes, phash,  
imprints,       sorted, orderidx # name
 % clob,        clob,   clob,   clob,   clob,   bigint, bigint, boolean,        
bigint, boolean,        bigint # type
 % 3,   5,      1,      3,      8,      1,      1,      5,      1,      5,      
1 # length
@@ -75,16 +75,16 @@ Ready.
 #CREATE TABLE xtmp4(i integer);
 #INSERT INTO xtmp4 VALUES (3),(0),(2);
 [ 3    ]
-#SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx FROM storage WHERE "table"= 'xtmp4';
-% .storage,    .storage,       .storage,       .storage,       .storage,       
.storage,       .storage,       .storage,       .storage,       .storage,       
.storage # table_name
+#SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx FROM storage(current_schema, 'xtmp4');
+% .L3, .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    
.L3 # table_name
 % schema,      table,  column, type,   mode,   count,  hashes, phash,  
imprints,       sorted, orderidx # name
 % clob,        clob,   clob,   clob,   clob,   bigint, bigint, boolean,        
bigint, boolean,        bigint # type
 % 3,   5,      1,      3,      8,      1,      1,      5,      1,      5,      
1 # length
 [ "sys",       "xtmp4",        "i",    "int",  "writable",     3,      0,      
false,  0,      false,  0       ]
 #ALTER TABLE xtmp4 SET read only;
 #CREATE ORDERED INDEX sys_xtmp4_i_oidx ON xtmp4(i);
-#SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx from storage where "table"= 'xtmp4';
-% .storage,    .storage,       .storage,       .storage,       .storage,       
.storage,       .storage,       .storage,       .storage,       .storage,       
.storage # table_name
+#SELECT schema, table, column, type, mode, count, hashes, phash, imprints, 
sorted, orderidx from storage(current_schema, 'xtmp4');
+% .L3, .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    .L3,    
.L3 # table_name
 % schema,      table,  column, type,   mode,   count,  hashes, phash,  
imprints,       sorted, orderidx # name
 % clob,        clob,   clob,   clob,   clob,   bigint, bigint, boolean,        
bigint, boolean,        bigint # type
 % 3,   5,      1,      3,      8,      1,      1,      5,      1,      5,      
2 # length
diff --git a/sql/test/pg_regress/Tests/vacuum.sql 
b/sql/test/pg_regress/Tests/vacuum.sql
--- a/sql/test/pg_regress/Tests/vacuum.sql
+++ b/sql/test/pg_regress/Tests/vacuum.sql
@@ -2,7 +2,7 @@
 -- VACUUM
 --
 -- Replaced PostgreSQL "VACUUM FULL my_table;"
--- with MonetDB "call vacuum('sys', 'my_table');"
+-- with MonetDB "call vacuum(current_schema, 'my_table');"
 --
 
 CREATE TABLE vactst (i INT);
@@ -25,9 +25,9 @@ SELECT count(*) FROM vactst WHERE i <> 0
 DELETE FROM vactst WHERE i <> 0;
 SELECT * FROM vactst;
 
-select "schema", "table", "column", type, count, typewidth, columnsize, 
heapsize, hashes, "imprints", sorted from sys.storage where "table" = 'vactst';
-call vacuum('sys', 'vactst');
-select "schema", "table", "column", type, count, typewidth, columnsize, 
heapsize, hashes, "imprints", sorted from sys.storage where "table" = 'vactst';
+select "schema", "table", "column", type, count, typewidth, columnsize, 
heapsize, hashes, "imprints", sorted from sys.storage(current_schema, 'vactst');
+call vacuum(current_schema, 'vactst');
+select "schema", "table", "column", type, count, typewidth, columnsize, 
heapsize, hashes, "imprints", sorted from sys.storage(current_schema, 'vactst');
 
 UPDATE vactst SET i = i + 1;
 INSERT INTO vactst SELECT * FROM vactst;
@@ -56,9 +56,9 @@ SELECT i, count(*) AS count FROM vactst 
 SELECT count(*) FROM vactst WHERE i <> 0;
 DELETE FROM vactst WHERE i <> 0;
 
-select "schema", "table", "column", type, count, typewidth, columnsize, 
heapsize, hashes, "imprints", sorted from sys.storage where "table" = 'vactst';
-call vacuum('sys', 'vactst');
-select "schema", "table", "column", type, count, typewidth, columnsize, 
heapsize, hashes, "imprints", sorted from sys.storage where "table" = 'vactst';
+select "schema", "table", "column", type, count, typewidth, columnsize, 
heapsize, hashes, "imprints", sorted from sys.storage(current_schema, 'vactst');
+call vacuum(current_schema, 'vactst');
+select "schema", "table", "column", type, count, typewidth, columnsize, 
heapsize, hashes, "imprints", sorted from sys.storage(current_schema, 'vactst');
 
 DELETE FROM vactst;
 SELECT * FROM vactst;
diff --git a/sql/test/pg_regress/Tests/vacuum.stable.out 
b/sql/test/pg_regress/Tests/vacuum.stable.out
--- a/sql/test/pg_regress/Tests/vacuum.stable.out
+++ b/sql/test/pg_regress/Tests/vacuum.stable.out
@@ -55,7 +55,7 @@ Ready.
 #INSERT INTO vactst VALUES (0);
 [ 1 ]
 #SELECT count(*) FROM vactst;
-% sys.L4 # table_name
+% sys.L3 # table_name
 % L3 # name
 % bigint # type
 % 4 # length
@@ -68,7 +68,7 @@ Ready.
 [ 0,   1       ]
 [ 1,   2048    ]
 #SELECT count(*) FROM vactst WHERE i <> 0;
-% sys.L4 # table_name
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to