Changeset: b3d872e830f4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b3d872e830f4
Modified Files:
        sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.sql
        sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.out
Branch: Jun2016
Log Message:

Use modern feature of storage(): specify schema and table name.


diffs (90 lines):

diff --git a/sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.sql 
b/sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.sql
--- a/sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.sql
+++ b/sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.sql
@@ -2,7 +2,7 @@
 create table bug3923(i integer);
 
 -- skip columns location, count, columnsize.
-select "schema", "table", "column", "type", "mode", typewidth, hashes, phash, 
imprints, sorted from storage() where "table"= '_tables';
+select "schema", "table", "column", "type", "mode", typewidth, hashes, phash, 
imprints, sorted from storage('sys','_tables');
 
 call storagemodelinit();
 update storagemodelinput set "count" =10000 where "table" ='bug3923';
@@ -16,7 +16,7 @@ crate schema bug3923schema;
 create table bug3923(i integer);
 
 -- skip columns location, count, columnsize.
-select "schema", "table", "column", "type", "mode", typewidth, hashes, phash, 
imprints, sorted from storage() where "table"= '_tables';
+select "schema", "table", "column", "type", "mode", typewidth, hashes, phash, 
imprints, sorted from storage('sys','_tables');
 
 call storagemodelinit();
 update storagemodelinput set "count" =10000 where "table" ='bug3923';
diff --git a/sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.out 
b/sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.out
--- a/sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.out
+++ b/sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.out
@@ -66,27 +66,19 @@ Ready.
 # 23:38:44 >  
 
 #create table bug3923(i integer);
-#select "schema", "table", "column", "type", "mode", typewidth, hashes, phash, 
imprints, sorted from storage() where "table"= '_tables';
-% .L,  .L,     .L,     .L,     .L,     .L,     .L,     .L,     .L,     .L # 
table_name
+#select "schema", "table", "column", "type", "mode", typewidth, hashes, phash, 
imprints, sorted from storage('sys','_tables');
+% .L2, .L2,    .L2,    .L2,    .L2,    .L2,    .L2,    .L2,    .L2,    .L2 # 
table_name
 % schema,      table,  column, type,   mode,   typewidth,      hashes, phash,  
imprints,       sorted # name
 % clob,        clob,   clob,   clob,   clob,   int,    bigint, boolean,        
bigint, boolean # type
-% 3,   7,      13,     8,      8,      2,      1,      5,      1,      5 # 
length
+% 3,   7,      13,     8,      8,      3,      1,      5,      1,      5 # 
length
 [ "sys",       "_tables",      "id",   "int",  "writable",     4,      0,      
false,  0,      true    ]
-[ "sys",       "_tables",      "name", "varchar",      "writable",     9,      
0,      false,  0,      false   ]
+[ "sys",       "_tables",      "name", "varchar",      "writable",     8,      
0,      false,  0,      false   ]
 [ "sys",       "_tables",      "schema_id",    "int",  "writable",     4,      
0,      false,  0,      false   ]
-[ "sys",       "_tables",      "query",        "varchar",      "writable",     
55,     0,      false,  0,      false   ]
+[ "sys",       "_tables",      "query",        "varchar",      "writable",     
163,    0,      false,  0,      false   ]
 [ "sys",       "_tables",      "type", "smallint",     "writable",     2,      
0,      false,  0,      false   ]
 [ "sys",       "_tables",      "system",       "boolean",      "writable",     
1,      0,      false,  0,      false   ]
 [ "sys",       "_tables",      "commit_action",        "smallint",     
"writable",     2,      0,      false,  0,      false   ]
 [ "sys",       "_tables",      "access",       "smallint",     "writable",     
2,      0,      false,  0,      true    ]
-[ "tmp",       "_tables",      "id",   "int",  "writable",     4,      0,      
false,  0,      true    ]
-[ "tmp",       "_tables",      "name", "varchar",      "writable",     1,      
0,      false,  0,      true    ]
-[ "tmp",       "_tables",      "schema_id",    "int",  "writable",     4,      
0,      false,  0,      true    ]
-[ "tmp",       "_tables",      "query",        "varchar",      "writable",     
1,      0,      false,  0,      true    ]
-[ "tmp",       "_tables",      "type", "smallint",     "writable",     2,      
0,      false,  0,      true    ]
-[ "tmp",       "_tables",      "system",       "boolean",      "writable",     
1,      0,      false,  0,      true    ]
-[ "tmp",       "_tables",      "commit_action",        "smallint",     
"writable",     2,      0,      false,  0,      true    ]
-[ "tmp",       "_tables",      "access",       "smallint",     "writable",     
2,      0,      false,  0,      true    ]
 #update storagemodelinput set "count" =10000 where "table" ='bug3923';
 [ 1    ]
 #update storagemodelinput set "distinct" =10 where "table" ='bug3923' and 
"column" ='i';
@@ -99,27 +91,19 @@ Ready.
 [ "sys",       "bug3923",      "i",    "int",  10000,  40000,  0,      0,      
1200,   true    ]
 #drop table bug3923;
 #create table bug3923(i integer);
-#select "schema", "table", "column", "type", "mode", typewidth, hashes, phash, 
imprints, sorted from storage() where "table"= '_tables';
-% .L,  .L,     .L,     .L,     .L,     .L,     .L,     .L,     .L,     .L # 
table_name
+#select "schema", "table", "column", "type", "mode", typewidth, hashes, phash, 
imprints, sorted from storage('sys','_tables');
+% .L2, .L2,    .L2,    .L2,    .L2,    .L2,    .L2,    .L2,    .L2,    .L2 # 
table_name
 % schema,      table,  column, type,   mode,   typewidth,      hashes, phash,  
imprints,       sorted # name
 % clob,        clob,   clob,   clob,   clob,   int,    bigint, boolean,        
bigint, boolean # type
-% 3,   7,      13,     8,      8,      2,      4,      5,      1,      5 # 
length
+% 3,   7,      13,     8,      8,      3,      4,      5,      1,      5 # 
length
 [ "sys",       "_tables",      "id",   "int",  "writable",     4,      2600,   
false,  0,      false   ]
-[ "sys",       "_tables",      "name", "varchar",      "writable",     9,      
0,      false,  0,      false   ]
+[ "sys",       "_tables",      "name", "varchar",      "writable",     8,      
0,      false,  0,      false   ]
 [ "sys",       "_tables",      "schema_id",    "int",  "writable",     4,      
0,      false,  0,      false   ]
-[ "sys",       "_tables",      "query",        "varchar",      "writable",     
54,     0,      false,  0,      false   ]
+[ "sys",       "_tables",      "query",        "varchar",      "writable",     
163,    0,      false,  0,      false   ]
 [ "sys",       "_tables",      "type", "smallint",     "writable",     2,      
0,      false,  0,      false   ]
 [ "sys",       "_tables",      "system",       "boolean",      "writable",     
1,      0,      false,  0,      false   ]
 [ "sys",       "_tables",      "commit_action",        "smallint",     
"writable",     2,      0,      false,  0,      false   ]
 [ "sys",       "_tables",      "access",       "smallint",     "writable",     
2,      0,      false,  0,      true    ]
-[ "tmp",       "_tables",      "id",   "int",  "writable",     4,      0,      
false,  0,      true    ]
-[ "tmp",       "_tables",      "name", "varchar",      "writable",     1,      
0,      false,  0,      true    ]
-[ "tmp",       "_tables",      "schema_id",    "int",  "writable",     4,      
0,      false,  0,      true    ]
-[ "tmp",       "_tables",      "query",        "varchar",      "writable",     
1,      0,      false,  0,      true    ]
-[ "tmp",       "_tables",      "type", "smallint",     "writable",     2,      
0,      false,  0,      true    ]
-[ "tmp",       "_tables",      "system",       "boolean",      "writable",     
1,      0,      false,  0,      true    ]
-[ "tmp",       "_tables",      "commit_action",        "smallint",     
"writable",     2,      0,      false,  0,      true    ]
-[ "tmp",       "_tables",      "access",       "smallint",     "writable",     
2,      0,      false,  0,      true    ]
 #update storagemodelinput set "count" =10000 where "table" ='bug3923';
 [ 1    ]
 #update storagemodelinput set "distinct" =10 where "table" ='bug3923' and 
"column" ='i';
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to