Changeset: 31e97b8b886e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=31e97b8b886e
Modified Files:
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
sql/test/remote/Tests/partition_elim.stable.out
Branch: mosaic
Log Message:
Approve output
diffs (truncated from 581 to 300 lines):
diff --git a/sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
b/sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
--- a/sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
+++ b/sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
@@ -79,8 +79,8 @@ Ready.
% owner, query, pipe, plan, mal # name
% clob, clob, clob, clob, int # type
% 7, 63, 12, 10, 2 # length
-[ "monetdb", "select 1;", "default_pipe", "user.s10_1", 44 ]
-[ "monetdb", "select owner, query, pipe, plan, mal from
sys.querylog_catalog;", "default_pipe", "user.s12_1", 77 ]
+[ "monetdb", "select 1;", "default_pipe", "user.s10_1", 45 ]
+[ "monetdb", "select owner, query, pipe, plan, mal from
sys.querylog_catalog;", "default_pipe", "user.s12_1", 78 ]
#select arguments, tuples from sys.querylog_calls;
% .querylog_calls, .querylog_calls # table_name
% arguments, tuples # name
@@ -93,9 +93,9 @@ Ready.
% owner, query, pipe, plan, mal, arguments, tuples # name
% clob, clob, clob, clob, int, clob, bigint # type
% 7, 63, 12, 10, 2, 18, 1 # length
-[ "monetdb", "select 1;", "default_pipe", "user.s10_1", 44,
"user.s10_1():void;", 1 ]
-[ "monetdb", "select owner, query, pipe, plan, mal from
sys.querylog_catalog;", "default_pipe", "user.s12_1", 77,
"user.s12_1():void;", 5 ]
-[ "monetdb", "select arguments, tuples from sys.querylog_calls;",
"default_pipe", "user.s14_1", 62, "user.s14_1():void;", 2 ]
+[ "monetdb", "select 1;", "default_pipe", "user.s10_1", 45,
"user.s10_1():void;", 1 ]
+[ "monetdb", "select owner, query, pipe, plan, mal from
sys.querylog_catalog;", "default_pipe", "user.s12_1", 78,
"user.s12_1():void;", 5 ]
+[ "monetdb", "select arguments, tuples from sys.querylog_calls;",
"default_pipe", "user.s14_1", 63, "user.s14_1():void;", 2 ]
#select * from sys.querylog_history;
% .querylog_history, .querylog_history, .querylog_history,
.querylog_history, .querylog_history, .querylog_history,
.querylog_history, .querylog_history, .querylog_history,
.querylog_history, .querylog_history, .querylog_history,
.querylog_history, .querylog_history, .querylog_history,
.querylog_history # table_name
% id, owner, defined, query, pipe, plan, mal, optimize,
start, stop, arguments, tuples, run, ship, cpu, io # name
diff --git a/sql/test/remote/Tests/partition_elim.stable.out
b/sql/test/remote/Tests/partition_elim.stable.out
--- a/sql/test/remote/Tests/partition_elim.stable.out
+++ b/sql/test/remote/Tests/partition_elim.stable.out
@@ -136,63 +136,63 @@ Ready.
% clob # type
% 118 # length
function user.main():void;
- X_1207:void := querylog.define("explain select x,y from test where x
between 4.0 and 6.0;","default_pipe",49:int);
-barrier X_1326 := language.dataflow();
- X_1250 := bat.new(nil:str);
- X_1257 := bat.append(X_1250,".test");
- X_1267 := bat.append(X_1257,".test");
- X_1252 := bat.new(nil:str);
- X_1259 := bat.append(X_1252,"x");
- X_1268 := bat.append(X_1259,"y");
- X_1253 := bat.new(nil:str);
- X_1261 := bat.append(X_1253,"double");
- X_1270 := bat.append(X_1261,"double");
- X_1254 := bat.new(nil:int);
- X_1263 := bat.append(X_1254,53:int);
- X_1271 := bat.append(X_1263,53:int);
- X_1256 := bat.new(nil:int);
- X_1265 := bat.append(X_1256,0:int);
- X_1272 := bat.append(X_1265,0:int);
- X_1242:bat[:dbl] := bat.new(nil:dbl);
- X_1210 := sql.mvc();
- X_1331:bat[:dbl] := sql.bind(X_1210,"sys","test2","x",0:int,0:int,2:int);
- X_1296:bat[:dbl] := mosaic.decompress(X_1331);
- C_1293:bat[:oid] := sql.tid(X_1210,"sys","test2",0:int,2:int);
- C_1301 := algebra.select(X_1296,C_1293,4:dbl,6:dbl,true,true,false);
- X_1303 := algebra.projection(C_1301,X_1296);
- X_1332:bat[:dbl] := sql.bind(X_1210,"sys","test2","x",0:int,1:int,2:int);
- X_1297:bat[:dbl] := mosaic.decompress(X_1332);
- C_1295:bat[:oid] := sql.tid(X_1210,"sys","test2",1:int,2:int);
- C_1302 := algebra.select(X_1297,C_1295,4:dbl,6:dbl,true,true,false);
- X_1304 := algebra.projection(C_1302,X_1297);
- X_1315 := mat.packIncrement(X_1303,2:int);
- X_1227 := mat.packIncrement(X_1315,X_1304);
- X_1244 := bat.append(X_1242,X_1227,true);
- X_1333:bat[:dbl] := sql.bind(X_1210,"sys","test3","x",0:int);
- X_1232:bat[:dbl] := mosaic.decompress(X_1333);
- C_1230:bat[:oid] := sql.tid(X_1210,"sys","test3");
- C_1238 := algebra.select(X_1232,C_1230,4:dbl,6:dbl,true,true,false);
- X_1239 := algebra.projection(C_1238,X_1232);
- X_1245 := bat.append(X_1244,X_1239,true);
- X_1246:bat[:dbl] := bat.new(nil:dbl);
- X_1298:bat[:dbl] := sql.bind(X_1210,"sys","test2","y",0:int,0:int,2:int);
- X_1305 := mosaic.projection(C_1301,X_1298);
- X_1299:bat[:dbl] := sql.bind(X_1210,"sys","test2","y",0:int,1:int,2:int);
- X_1306 := mosaic.projection(C_1302,X_1299);
- X_1317 := mat.packIncrement(X_1305,2:int);
- X_1228 := mat.packIncrement(X_1317,X_1306);
- X_1247 := bat.append(X_1246,X_1228,true);
- X_1234:bat[:dbl] := sql.bind(X_1210,"sys","test3","y",0:int);
- X_1240 := mosaic.projection(C_1238,X_1234);
- X_1248 := bat.append(X_1247,X_1240,true);
- language.pass(X_1296);
- language.pass(X_1297);
- language.pass(X_1232);
- language.pass(C_1301);
- language.pass(C_1302);
- language.pass(C_1238);
-exit X_1326;
- sql.resultSet(X_1267,X_1268,X_1270,X_1271,X_1272,X_1245,X_1248);
+ X_1223:void := querylog.define("explain select x,y from test where x
between 4.0 and 6.0;","default_pipe",49:int);
+barrier X_1342 := language.dataflow();
+ X_1266 := bat.new(nil:str);
+ X_1273 := bat.append(X_1266,".test");
+ X_1283 := bat.append(X_1273,".test");
+ X_1268 := bat.new(nil:str);
+ X_1275 := bat.append(X_1268,"x");
+ X_1284 := bat.append(X_1275,"y");
+ X_1269 := bat.new(nil:str);
+ X_1277 := bat.append(X_1269,"double");
+ X_1286 := bat.append(X_1277,"double");
+ X_1270 := bat.new(nil:int);
+ X_1279 := bat.append(X_1270,53:int);
+ X_1287 := bat.append(X_1279,53:int);
+ X_1272 := bat.new(nil:int);
+ X_1281 := bat.append(X_1272,0:int);
+ X_1288 := bat.append(X_1281,0:int);
+ X_1258:bat[:dbl] := bat.new(nil:dbl);
+ X_1226 := sql.mvc();
+ X_1347:bat[:dbl] := sql.bind(X_1226,"sys","test2","x",0:int,0:int,2:int);
+ X_1312:bat[:dbl] := mosaic.decompress(X_1347);
+ C_1309:bat[:oid] := sql.tid(X_1226,"sys","test2",0:int,2:int);
+ C_1317 := algebra.select(X_1312,C_1309,4:dbl,6:dbl,true,true,false);
+ X_1319 := algebra.projection(C_1317,X_1312);
+ X_1348:bat[:dbl] := sql.bind(X_1226,"sys","test2","x",0:int,1:int,2:int);
+ X_1313:bat[:dbl] := mosaic.decompress(X_1348);
+ C_1311:bat[:oid] := sql.tid(X_1226,"sys","test2",1:int,2:int);
+ C_1318 := algebra.select(X_1313,C_1311,4:dbl,6:dbl,true,true,false);
+ X_1320 := algebra.projection(C_1318,X_1313);
+ X_1331 := mat.packIncrement(X_1319,2:int);
+ X_1243 := mat.packIncrement(X_1331,X_1320);
+ X_1260 := bat.append(X_1258,X_1243,true);
+ X_1349:bat[:dbl] := sql.bind(X_1226,"sys","test3","x",0:int);
+ X_1248:bat[:dbl] := mosaic.decompress(X_1349);
+ C_1246:bat[:oid] := sql.tid(X_1226,"sys","test3");
+ C_1254 := algebra.select(X_1248,C_1246,4:dbl,6:dbl,true,true,false);
+ X_1255 := algebra.projection(C_1254,X_1248);
+ X_1261 := bat.append(X_1260,X_1255,true);
+ X_1262:bat[:dbl] := bat.new(nil:dbl);
+ X_1314:bat[:dbl] := sql.bind(X_1226,"sys","test2","y",0:int,0:int,2:int);
+ X_1321 := mosaic.projection(C_1317,X_1314);
+ X_1315:bat[:dbl] := sql.bind(X_1226,"sys","test2","y",0:int,1:int,2:int);
+ X_1322 := mosaic.projection(C_1318,X_1315);
+ X_1333 := mat.packIncrement(X_1321,2:int);
+ X_1244 := mat.packIncrement(X_1333,X_1322);
+ X_1263 := bat.append(X_1262,X_1244,true);
+ X_1250:bat[:dbl] := sql.bind(X_1226,"sys","test3","y",0:int);
+ X_1256 := mosaic.projection(C_1254,X_1250);
+ X_1264 := bat.append(X_1263,X_1256,true);
+ language.pass(X_1312);
+ language.pass(X_1313);
+ language.pass(X_1248);
+ language.pass(C_1317);
+ language.pass(C_1318);
+ language.pass(C_1254);
+exit X_1342;
+ sql.resultSet(X_1283,X_1284,X_1286,X_1287,X_1288,X_1261,X_1264);
end user.main;
#inline actions= 0 time=1 usec
#remap actions= 0 time=3 usec
@@ -224,63 +224,63 @@ end user.main;
% clob # type
% 122 # length
function user.main():void;
- X_1345:void := querylog.define("explain select x,y from test where x
between (7-3) and (7-1);","default_pipe",63:int);
-barrier X_1481 := language.dataflow();
- X_1400 := bat.new(nil:str);
- X_1407 := bat.append(X_1400,".test");
- X_1417 := bat.append(X_1407,".test");
- X_1402 := bat.new(nil:str);
- X_1409 := bat.append(X_1402,"x");
- X_1418 := bat.append(X_1409,"y");
- X_1403 := bat.new(nil:str);
- X_1411 := bat.append(X_1403,"double");
- X_1420 := bat.append(X_1411,"double");
- X_1404 := bat.new(nil:int);
- X_1413 := bat.append(X_1404,53:int);
- X_1421 := bat.append(X_1413,53:int);
- X_1406 := bat.new(nil:int);
- X_1415 := bat.append(X_1406,0:int);
- X_1422 := bat.append(X_1415,0:int);
- X_1392:bat[:dbl] := bat.new(nil:dbl);
- X_1348 := sql.mvc();
- X_1486:bat[:dbl] := sql.bind(X_1348,"sys","test2","x",0:int,0:int,2:int);
- X_1451:bat[:dbl] := mosaic.decompress(X_1486);
- C_1448:bat[:oid] := sql.tid(X_1348,"sys","test2",0:int,2:int);
- C_1456 := algebra.select(X_1451,C_1448,4:dbl,6:dbl,true,true,false);
- X_1458 := algebra.projection(C_1456,X_1451);
- X_1487:bat[:dbl] := sql.bind(X_1348,"sys","test2","x",0:int,1:int,2:int);
- X_1452:bat[:dbl] := mosaic.decompress(X_1487);
- C_1450:bat[:oid] := sql.tid(X_1348,"sys","test2",1:int,2:int);
- C_1457 := algebra.select(X_1452,C_1450,4:dbl,6:dbl,true,true,false);
- X_1459 := algebra.projection(C_1457,X_1452);
- X_1470 := mat.packIncrement(X_1458,2:int);
- X_1371 := mat.packIncrement(X_1470,X_1459);
- X_1394 := bat.append(X_1392,X_1371,true);
- X_1488:bat[:dbl] := sql.bind(X_1348,"sys","test3","x",0:int);
- X_1376:bat[:dbl] := mosaic.decompress(X_1488);
- C_1374:bat[:oid] := sql.tid(X_1348,"sys","test3");
- C_1388 := algebra.select(X_1376,C_1374,4:dbl,6:dbl,true,true,false);
- X_1389 := algebra.projection(C_1388,X_1376);
- X_1395 := bat.append(X_1394,X_1389,true);
- X_1396:bat[:dbl] := bat.new(nil:dbl);
- X_1453:bat[:dbl] := sql.bind(X_1348,"sys","test2","y",0:int,0:int,2:int);
- X_1460 := mosaic.projection(C_1456,X_1453);
- X_1454:bat[:dbl] := sql.bind(X_1348,"sys","test2","y",0:int,1:int,2:int);
- X_1461 := mosaic.projection(C_1457,X_1454);
- X_1472 := mat.packIncrement(X_1460,2:int);
- X_1372 := mat.packIncrement(X_1472,X_1461);
- X_1397 := bat.append(X_1396,X_1372,true);
- X_1378:bat[:dbl] := sql.bind(X_1348,"sys","test3","y",0:int);
- X_1390 := mosaic.projection(C_1388,X_1378);
- X_1398 := bat.append(X_1397,X_1390,true);
- language.pass(X_1451);
- language.pass(X_1452);
- language.pass(X_1376);
- language.pass(C_1456);
- language.pass(C_1457);
- language.pass(C_1388);
-exit X_1481;
- sql.resultSet(X_1417,X_1418,X_1420,X_1421,X_1422,X_1395,X_1398);
+ X_1362:void := querylog.define("explain select x,y from test where x
between (7-3) and (7-1);","default_pipe",63:int);
+barrier X_1498 := language.dataflow();
+ X_1417 := bat.new(nil:str);
+ X_1424 := bat.append(X_1417,".test");
+ X_1434 := bat.append(X_1424,".test");
+ X_1419 := bat.new(nil:str);
+ X_1426 := bat.append(X_1419,"x");
+ X_1435 := bat.append(X_1426,"y");
+ X_1420 := bat.new(nil:str);
+ X_1428 := bat.append(X_1420,"double");
+ X_1437 := bat.append(X_1428,"double");
+ X_1421 := bat.new(nil:int);
+ X_1430 := bat.append(X_1421,53:int);
+ X_1438 := bat.append(X_1430,53:int);
+ X_1423 := bat.new(nil:int);
+ X_1432 := bat.append(X_1423,0:int);
+ X_1439 := bat.append(X_1432,0:int);
+ X_1409:bat[:dbl] := bat.new(nil:dbl);
+ X_1365 := sql.mvc();
+ X_1503:bat[:dbl] := sql.bind(X_1365,"sys","test2","x",0:int,0:int,2:int);
+ X_1468:bat[:dbl] := mosaic.decompress(X_1503);
+ C_1465:bat[:oid] := sql.tid(X_1365,"sys","test2",0:int,2:int);
+ C_1473 := algebra.select(X_1468,C_1465,4:dbl,6:dbl,true,true,false);
+ X_1475 := algebra.projection(C_1473,X_1468);
+ X_1504:bat[:dbl] := sql.bind(X_1365,"sys","test2","x",0:int,1:int,2:int);
+ X_1469:bat[:dbl] := mosaic.decompress(X_1504);
+ C_1467:bat[:oid] := sql.tid(X_1365,"sys","test2",1:int,2:int);
+ C_1474 := algebra.select(X_1469,C_1467,4:dbl,6:dbl,true,true,false);
+ X_1476 := algebra.projection(C_1474,X_1469);
+ X_1487 := mat.packIncrement(X_1475,2:int);
+ X_1388 := mat.packIncrement(X_1487,X_1476);
+ X_1411 := bat.append(X_1409,X_1388,true);
+ X_1505:bat[:dbl] := sql.bind(X_1365,"sys","test3","x",0:int);
+ X_1393:bat[:dbl] := mosaic.decompress(X_1505);
+ C_1391:bat[:oid] := sql.tid(X_1365,"sys","test3");
+ C_1405 := algebra.select(X_1393,C_1391,4:dbl,6:dbl,true,true,false);
+ X_1406 := algebra.projection(C_1405,X_1393);
+ X_1412 := bat.append(X_1411,X_1406,true);
+ X_1413:bat[:dbl] := bat.new(nil:dbl);
+ X_1470:bat[:dbl] := sql.bind(X_1365,"sys","test2","y",0:int,0:int,2:int);
+ X_1477 := mosaic.projection(C_1473,X_1470);
+ X_1471:bat[:dbl] := sql.bind(X_1365,"sys","test2","y",0:int,1:int,2:int);
+ X_1478 := mosaic.projection(C_1474,X_1471);
+ X_1489 := mat.packIncrement(X_1477,2:int);
+ X_1389 := mat.packIncrement(X_1489,X_1478);
+ X_1414 := bat.append(X_1413,X_1389,true);
+ X_1395:bat[:dbl] := sql.bind(X_1365,"sys","test3","y",0:int);
+ X_1407 := mosaic.projection(C_1405,X_1395);
+ X_1415 := bat.append(X_1414,X_1407,true);
+ language.pass(X_1468);
+ language.pass(X_1469);
+ language.pass(X_1393);
+ language.pass(C_1473);
+ language.pass(C_1474);
+ language.pass(C_1405);
+exit X_1498;
+ sql.resultSet(X_1434,X_1435,X_1437,X_1438,X_1439,X_1412,X_1415);
end user.main;
#inline actions= 0 time=1 usec
#remap actions= 0 time=5 usec
@@ -312,54 +312,54 @@ end user.main;
% clob # type
% 144 # length
function user.main():void;
- X_1501:void := querylog.define("explain select x,y from test where x
between 4.0 and 6.0 and y between 0.0 and 2.0;","default_pipe",37:int);
-barrier X_1604 := language.dataflow();
- X_1528 := bat.new(nil:str);
- X_1535 := bat.append(X_1528,"sys.test");
- X_1544 := bat.append(X_1535,"sys.test");
- X_1530 := bat.new(nil:str);
- X_1537 := bat.append(X_1530,"x");
- X_1545 := bat.append(X_1537,"y");
- X_1531 := bat.new(nil:str);
- X_1538 := bat.append(X_1531,"double");
- X_1547 := bat.append(X_1538,"double");
- X_1532 := bat.new(nil:int);
- X_1540 := bat.append(X_1532,53:int);
- X_1548 := bat.append(X_1540,53:int);
- X_1534 := bat.new(nil:int);
- X_1542 := bat.append(X_1534,0:int);
- X_1549 := bat.append(X_1542,0:int);
- X_1504 := sql.mvc();
- X_1609:bat[:dbl] := sql.bind(X_1504,"sys","test3","y",0:int,0:int,2:int);
- X_1574:bat[:dbl] := mosaic.decompress(X_1609);
- X_1610:bat[:dbl] := sql.bind(X_1504,"sys","test3","x",0:int,0:int,2:int);
- X_1572:bat[:dbl] := mosaic.decompress(X_1610);
- C_1569:bat[:oid] := sql.tid(X_1504,"sys","test3",0:int,2:int);
- C_1577 := algebra.select(X_1572,C_1569,4:dbl,6:dbl,true,true,false);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
