MonetDB: default - approved output after recent changes (revert ...
Changeset: 5fcf917126a8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5fcf917126a8
Modified Files:
sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/copy/Tests/int_parse_best.stable.out
sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.out
Branch: default
Log Message:
approved output after recent changes (revert of optimizers, and merge of
changes)
diffs (truncated from 765 to 300 lines):
diff --git a/sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
b/sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
@@ -52,110 +52,110 @@ Ready.
% clob # type
% 109 # length
function user.main():void;
-X_690 := bat.new(nil:str);
-X_697 := bat.append(X_690,"sys.lineitem");
-X_707 := bat.append(X_697,"sys.lineitem");
-X_713 := bat.append(X_707,"sys.L1");
-X_723 := bat.append(X_713,"sys.L2");
-X_730 := bat.append(X_723,"sys.L3");
-X_738 := bat.append(X_730,"sys.L4");
-X_746 := bat.append(X_738,"sys.L5");
-X_756 := bat.append(X_746,"sys.L6");
-X_763 := bat.append(X_756,"sys.L7");
-X_770 := bat.append(X_763,"sys.L10");
-X_692 := bat.new(nil:str);
-X_699 := bat.append(X_692,"l_returnflag");
-X_708 := bat.append(X_699,"l_linestatus");
-X_715 := bat.append(X_708,"sum_qty");
-X_725 := bat.append(X_715,"sum_base_price");
-X_732 := bat.append(X_725,"sum_disc_price");
-X_740 := bat.append(X_732,"sum_charge");
-X_748 := bat.append(X_740,"avg_qty");
-X_758 := bat.append(X_748,"avg_price");
-X_765 := bat.append(X_758,"avg_disc");
-X_772 := bat.append(X_765,"count_order");
-X_693 := bat.new(nil:str);
-X_701 := bat.append(X_693,"char");
-X_710 := bat.append(X_701,"char");
-X_717 := bat.append(X_710,"decimal");
-X_727 := bat.append(X_717,"decimal");
-X_734 := bat.append(X_727,"decimal");
-X_742 := bat.append(X_734,"decimal");
-X_750 := bat.append(X_742,"double");
-X_760 := bat.append(X_750,"double");
-X_767 := bat.append(X_760,"double");
-X_774 := bat.append(X_767,"bigint");
-X_694 := bat.new(nil:int);
-X_703 := bat.append(X_694,1);
-X_711 := bat.append(X_703,1);
-X_719 := bat.append(X_711,39);
-X_728 := bat.append(X_719,39);
-X_735 := bat.append(X_728,39);
-X_743 := bat.append(X_735,39);
-X_752 := bat.append(X_743,53);
-X_761 := bat.append(X_752,53);
-X_768 := bat.append(X_761,53);
-X_776 := bat.append(X_768,64);
-X_696 := bat.new(nil:int);
-X_705 := bat.append(X_696,0);
-X_712 := bat.append(X_705,0);
-X_721 := bat.append(X_712,2);
-X_729 := bat.append(X_721,2);
-X_736 := bat.append(X_729,4);
-X_744 := bat.append(X_736,6);
-X_754 := bat.append(X_744,0);
-X_762 := bat.append(X_754,0);
-X_769 := bat.append(X_762,0);
-X_778 := bat.append(X_769,0);
-X_556 := sql.mvc();
-X_560:bat[:date] := sql.bind(X_556,"sys","lineitem","l_shipdate",0);
-C_557:bat[:oid] := sql.tid(X_556,"sys","lineitem");
-X_572:date := mtime.date_sub_msec_interval("1998-12-01",777600);
-C_573 := algebra.thetasubselect(X_560,C_557,X_572,"<=");
-X_575:bat[:str] := sql.bind(X_556,"sys","lineitem","l_linestatus",0);
-X_582 := algebra.projection(C_573,X_575);
-X_583:bat[:str] := sql.bind(X_556,"sys","lineitem","l_returnflag",0);
-X_590 := algebra.projection(C_573,X_583);
-(X_591,r1_44,r2_44) := group.subgroup(X_590);
-(X_594,r1_47,r2_47) := group.subgroupdone(X_582,X_591);
-X_597 := algebra.projection(r1_47,X_582);
-X_598 := algebra.projection(r1_47,X_590);
-X_609:bat[:lng] := sql.bind(X_556,"sys","lineitem","l_quantity",0);
-X_616 := algebra.projection(C_573,X_609);
-X_617:bat[:hge] := aggr.subsum(X_616,X_594,r1_47,true,true);
-X_621:bat[:lng] := sql.bind(X_556,"sys","lineitem","l_extendedprice",0);
-X_628 := algebra.projection(C_573,X_621);
-X_629:bat[:hge] := aggr.subsum(X_628,X_594,r1_47,true,true);
-X_639:bat[:lng] := sql.bind(X_556,"sys","lineitem","l_discount",0);
-X_646 := algebra.projection(C_573,X_639);
-X_647:bat[:lng] := batcalc.-(100:lng,X_646);
-X_649:bat[:hge] := batcalc.*(X_628,X_647);
-X_651:bat[:hge] := aggr.subsum(X_649,X_594,r1_47,true,true);
-X_659:bat[:lng] := sql.bind(X_556,"sys","lineitem","l_tax",0);
-X_666 := algebra.projection(C_573,X_659);
-X_670:bat[:lng] :=
MonetDB: default - Approved output after recent changes
Changeset: 09e912ec79be for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=09e912ec79be Modified Files: sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check1_nogeom.stable.out sql/test/leaks/Tests/check2.stable.out sql/test/leaks/Tests/check2_nogeom.stable.out sql/test/leaks/Tests/check3.stable.out sql/test/leaks/Tests/check3_nogeom.stable.out sql/test/leaks/Tests/check4.stable.out sql/test/leaks/Tests/check4_nogeom.stable.out sql/test/leaks/Tests/check5.stable.out sql/test/leaks/Tests/check5_nogeom.stable.out sql/test/leaks/Tests/drop3_nogeom.stable.out sql/test/leaks/Tests/select1_nogeom.stable.out sql/test/leaks/Tests/select2_nogeom.stable.out sql/test/leaks/Tests/temp1_nogeom.stable.out sql/test/leaks/Tests/temp2_nogeom.stable.out sql/test/leaks/Tests/temp3_nogeom.stable.out sql/test/mapi/Tests/php_monetdb.stable.out sql/test/mapi/Tests/php_monetdb_nogeom.stable.out Branch: default Log Message: Approved output after recent changes diffs (truncated from 1047 to 300 lines): diff --git a/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out b/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out --- a/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out +++ b/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out @@ -35,7 +35,7 @@ stdout of test 'set_sql_debug_64__breaki % name,fullname, default_schema # name % varchar, varchar,int # type % 9, 10, 4 # length -[ skyserver, sky server, 7720] +[ skyserver, sky server, 7733] #alter user skyserver set schema sys; #drop schema sky; #drop user skyserver; diff --git a/sql/test/leaks/Tests/check1.stable.out b/sql/test/leaks/Tests/check1.stable.out --- a/sql/test/leaks/Tests/check1.stable.out +++ b/sql/test/leaks/Tests/check1.stable.out @@ -34,8 +34,8 @@ Ready. [ oid, bit, 69 ] [ oid, bit, 69 ] [ oid, bit, 393 ] -[ oid, bit, 1229] -[ oid, bit, 1229] +[ oid, bit, 1232] +[ oid, bit, 1232] [ oid, int, 0 ] [ oid, int, 0 ] [ oid, int, 0 ] @@ -72,12 +72,12 @@ Ready. [ oid, int, 19 ] [ oid, int, 19 ] [ oid, int, 19 ] -[ oid, int, 43 ] -[ oid, int, 43 ] -[ oid, int, 43 ] -[ oid, int, 43 ] -[ oid, int, 43 ] -[ oid, int, 43 ] +[ oid, int, 44 ] +[ oid, int, 44 ] +[ oid, int, 44 ] +[ oid, int, 44 ] +[ oid, int, 44 ] +[ oid, int, 44 ] [ oid, int, 69 ] [ oid, int, 69 ] [ oid, int, 135 ] @@ -88,15 +88,15 @@ Ready. [ oid, int, 393 ] [ oid, int, 393 ] [ oid, int, 393 ] -[ oid, int, 1229] -[ oid, int, 1229] -[ oid, int, 1229] -[ oid, int, 1229] -[ oid, int, 3341] -[ oid, int, 3341] -[ oid, int, 3341] -[ oid, int, 3341] -[ oid, int, 3341] +[ oid, int, 1232] +[ oid, int, 1232] +[ oid, int, 1232] +[ oid, int, 1232] +[ oid, int, 3347] +[ oid, int, 3347] +[ oid, int, 3347] +[ oid, int, 3347] +[ oid, int, 3347] [ oid, lng, 0 ] [ oid, lng, 0 ] [ oid, lng, 0 ] @@ -157,8 +157,8 @@ Ready. [ oid, str, 1 ] [ oid, str, 2 ] [ oid, str, 3 ] -[ oid, str, 43 ] -[ oid, str, 43 ] +[ oid, str, 44 ] +[ oid, str, 44 ] [ oid, str, 69 ] [ oid, str, 69 ] [ oid, str, 135 ] @@ -166,11 +166,11 @@ Ready. [ oid, str, 393 ] [ oid, str, 393 ] [ oid, str, 393 ] -[ oid, str, 1229] -[ oid, str, 1229] -[ oid, str, 1229] -[ oid, str, 3341] -[ oid, str, 3341] +[ oid, str, 1232] +[ oid, str, 1232] +[ oid, str, 1232] +[ oid, str, 3347] +[ oid, str, 3347] #select 'transient', count(*) from bbp() as bbp where kind like 'tran%'; % .L1, .L2 # table_name % L1, L2 # name diff --git a/sql/test/leaks/Tests/check1_nogeom.stable.out b/sql/test/leaks/Tests/check1_nogeom.stable.out --- a/sql/test/leaks/Tests/check1_nogeom.stable.out +++ b/sql/test/leaks/Tests/check1_nogeom.stable.out @@ -34,8 +34,8 @@ Ready. [ oid, bit, 69 ] [ oid, bit, 69 ] [ oid, bit, 393 ] -[ oid, bit,
MonetDB: default - approved output after recent changes.
Changeset: 7dbbc71e5a3f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7dbbc71e5a3f Modified Files: sql/backends/monet5/UDF/Tests/udf-fuse.stable.out sql/backends/monet5/UDF/Tests/udf-reverse.stable.out sql/backends/monet5/sql_scenario.c sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out sql/test/BugTracker-2009/Tests/ambiguous_order_by.SF-2827916.stable.err sql/test/BugTracker-2009/Tests/ambiguous_view.stable.err sql/test/BugTracker-2009/Tests/assert_in_update.SF-2807336.stable.err sql/test/BugTracker-2009/Tests/copy_into_error_off_by_one.SF-2833696.stable.err sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.stable.err sql/test/BugTracker-2009/Tests/create_table_dup_name.SF-2879005.stable.err sql/test/BugTracker-2009/Tests/drop-sequence-crash.SF-2854195.stable.err sql/test/BugTracker-2009/Tests/except_error_wrong.SF-2808409.stable.err sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.err sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out sql/test/BugTracker-2009/Tests/incomplete.SF.2536893.stable.err sql/test/BugTracker-2009/Tests/insert_into_values_bug.SF-2807609.stable.err sql/test/BugTracker-2009/Tests/limit_in_subquery.SF-2620437.stable.err sql/test/BugTracker-2009/Tests/not_invalidtable_crash.SF-2927174.stable.err sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err sql/test/BugTracker-2009/Tests/primekeyconstraint.SF-2783425.stable.err sql/test/BugTracker-2009/Tests/rollback_bug.stable.err sql/test/BugTracker-2009/Tests/rollback_mistake.SF-2814622.stable.err sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out sql/test/BugTracker-2009/Tests/segv_for_unknown_identifier_in_subquery.SF-2874045.stable.err sql/test/BugTracker-2009/Tests/select_X_where_bla_EQ_whatever.SF-282597.stable.err sql/test/BugTracker-2009/Tests/select_from_history.SF-2556566.stable.err sql/test/BugTracker-2009/Tests/subquery_returns_table_crash.SF-2513620.stable.err sql/test/BugTracker-2009/Tests/temp_table_fail_leaves_data.SF-2793286.stable.err sql/test/BugTracker-2009/Tests/temporary_table_leftover.SF-2734713.stable.err sql/test/BugTracker-2009/Tests/unique_constraint_on_char.SF-2873564.stable.err sql/test/BugTracker-2009/Tests/wrong_error_message.SF-2637051.stable.err sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out sql/test/BugTracker-2010/Tests/TypeException_with_missing_function.Bug-2674.stable.err sql/test/BugTracker-2010/Tests/call_function_without_warning.Bug-2752.stable.err sql/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.stable.err sql/test/BugTracker-2010/Tests/crash_default_unlocked.Bug-2744.stable.err sql/test/BugTracker-2010/Tests/crash_on_in_2.Bug-2604.stable.err sql/test/BugTracker-2010/Tests/crashonschema.Bug-2547.stable.err sql/test/BugTracker-2010/Tests/duplicate-key.Bug-2667.stable.err sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out sql/test/BugTracker-2010/Tests/incomplete-utf8-sequence.Bug-2575.stable.err sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.err sql/test/BugTracker-2010/Tests/second_function_existing_signature.Bug-2611.stable.err sql/test/BugTracker-2010/Tests/select_from_seq.Bug-2730.stable.err sql/test/BugTracker-2010/Tests/select_star.Bug-2563.stable.err sql/test/BugTracker-2010/Tests/sequence-restart-with-null.Bug-2648.stable.err sql/test/BugTracker-2010/Tests/subselect.Bug-2537.stable.err sql/test/BugTracker-2010/Tests/sum_on_date_crash.Bug-2643.stable.err sql/test/BugTracker-2010/Tests/times-crash.Bug-2586.stable.err sql/test/BugTracker-2010/Tests/wrong_error_message_dropping_view.Bug-2713.stable.err sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out sql/test/BugTracker-2012/Tests/table_function_with_column_subselects.Bug-3172.stable.err sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.stable.err sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out sql/test/leaks/Tests/temp2.stable.out Branch: default Log Message: approved output after recent changes. diffs (truncated from 1454 to 300 lines): diff --git a/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out b/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out ---
MonetDB: default - Approved output after recent changes.
Changeset: 84d0cbd527fd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=84d0cbd527fd
Modified Files:
clients/Tests/exports.stable.out
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/optimizer/Tests/inline07.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/Tests/setoptimizer.stable.err
sql/test/Tests/setoptimizer.stable.out
Branch: default
Log Message:
Approved output after recent changes.
diffs (208 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -2721,6 +2721,7 @@ str kunionRef;
str kuniqueRef;
str languageRef;
str lastline(Client cntxt);
+str leftfetchjoinPathRef;
str leftfetchjoinRef;
str leftjoinPathRef;
str leftjoinRef;
@@ -3031,6 +3032,7 @@ str schedulerRef;
str selectNotNilRef;
str selectRef;
str semaRef;
+str semijoinPathRef;
str semijoinRef;
str setAccessRef;
void setArgType(MalBlkPtr mb, InstrPtr p, int i, int tpe);
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
@@ -55,8 +55,8 @@ Ready.
% . # table_name
% def # name
% clob # type
-% 423 # length
-[
optimizer.inline();optimizer.remap();optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.groups();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.garbageCollector();
]
+% 446 # length
+[
optimizer.inline();optimizer.remap();optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.groups();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.garbageCollector();
]
#explain copy into ttt from '/:\tmp/xyz';
% .explain # table_name
% mal # name
@@ -66,8 +66,8 @@ function user.s2_1{autoCommit=true}():vo
X_2 := sql.mvc();
(X_5:bat[:oid,:int] ,X_6:bat[:oid,:int] ,X_7:bat[:oid,:int] ) :=
sql.copy_from(sys:str,ttt:str,|:str,\\n:str,nil:str,null:str,/:\\tmp/xyz:str,-1:lng,0:lng,0:int);
X_9 := sql.append(X_2,sys,ttt,a,X_5);
-X_11 := sql.append(X_9,sys:str,ttt:str,b,X_6);
-X_15 := sql.append(X_11,sys:str,ttt:str,c,X_7);
+X_11 := sql.append(X_9,sys,ttt,b,X_6);
+X_15 := sql.append(X_11,sys,ttt,c,X_7);
X_16 := aggr.count(X_7);
sql.affectedRows(X_15,X_16,);
end s2_1;
@@ -83,8 +83,8 @@ end s2_1;
% . # table_name
% def # name
% clob # type
-% 446 # length
-[
optimizer.inline();optimizer.remap();optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.groups();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.sql_append();optimizer.garbageCollector();
]
+% 469 # length
+[
optimizer.inline();optimizer.remap();optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.groups();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.sql_append();optimizer.garbageCollector();
]
#explain copy into ttt from '/:\tmp/xyz';
% .explain # table_name
% mal # name
diff --git a/monetdb5/optimizer/Tests/inline07.stable.out
b/monetdb5/optimizer/Tests/inline07.stable.out
--- a/monetdb5/optimizer/Tests/inline07.stable.out
+++ b/monetdb5/optimizer/Tests/inline07.stable.out
@@ -28,7 +28,7 @@ end main;
function user.qry():void; # 0 qry:void := user.qry() {G}
b := bat.new(:oid,:int);# 1 b:bat[:oid,:int] :=
CMDBATnew(_2:oid, _3:int) {G}
bat.insert(b,0@0,1);# 2 _4:bat[:oid,:int] :=
BKCinsert_bun(b:bat[:oid,:int], _5:oid, _6:int) {G}
-X_13 := aggr.sum(b);# 3 _13:dbl :=
aggr.sum(b:bat[:oid,:int]) {G}
+X_13 := aggr.sum(b);# 3 _13:dbl :=
CMDBATsum(b:bat[:oid,:int]) {G}
X_14 := batcalc.+(b,X_13);
MonetDB: default - approved output after recent changes
Changeset: 86358afed04e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=86358afed04e Modified Files: sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out sql/test/leaks/Tests/check0.stable.out sql/test/mapi/Tests/php_monetdb.stable.out Branch: default Log Message: approved output after recent changes diffs (100 lines): diff --git a/sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err b/sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err --- a/sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err +++ b/sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err @@ -79,7 +79,7 @@ # 19:33:23 mclient -lsql -umonetdb -Pmonetdb --host=alf --port=33470 # 19:33:23 -MAPI = monetdb@alf:32144 +MAPI = monetdb@alf:36639 QUERY = INSERT INTO examines (docID, vicID) VALUES ( ( @@ -94,8 +94,7 @@ ) ); ERROR = !SQLException:zero_or_one:cardinality violation (21) -!SQLException:zero_or_one:cardinality violation (21) -MAPI = monetdb@alf:32144 +MAPI = monetdb@alf:36639 QUERY = INSERT INTO timelines (vicID, time, event) VALUES ( ( diff --git a/sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out b/sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out --- a/sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out +++ b/sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out @@ -30,7 +30,25 @@ % tinyint # type % 1 # length [ 1] -% .tables, sys.tables, .tables,.tables,.tables, .tables,.tables,.tables,.tables,.tables # table_name +#SELECT * FROM ( +# SELECT 'demo' AS TABLE_CAT, +# schemas.name AS TABLE_SCHEM, +# tables.name AS TABLE_NAME, +# 'SYSTEM TABLE' AS TABLE_TYPE, +# '' AS REMARKS, +# null AS TYPE_CAT, +# null AS TYPE_SCHEM, +# null AS TYPE_NAME, +# 'rowid' AS SELF_REFERENCING_COL_NAME, +# 'SYSTEM' AS REF_GENERATION +# FROM tables, schemas +# WHERE tables.schema_id = schemas.id +# AND tables.system = true +# AND tables.type = 0 +#) AS tables +#WHERE 1 = 1 +# AND (TABLE_TYPE LIKE 'TABLE' OR TABLE_T +% .tables, .tables,.tables,.tables,.tables, .tables,.tables,.tables,.tables,.tables # table_name % TABLE_CAT, TABLE_SCHEM,TABLE_NAME, TABLE_TYPE, REMARKS, TYPE_CAT, TYPE_SCHEM, TYPE_NAME, SELF_REFERENCING_COL_NAME, REF_GENERATION # name % char,varchar,varchar,char, char, char, char, char, char, char # type % 4, 0, 0, 12, 0, 0, 0, 0, 5, 6 # length diff --git a/sql/test/leaks/Tests/check0.stable.out b/sql/test/leaks/Tests/check0.stable.out --- a/sql/test/leaks/Tests/check0.stable.out +++ b/sql/test/leaks/Tests/check0.stable.out @@ -47,6 +47,7 @@ [ oid, int, 3155] [ oid, int, 3155] [ oid, int, 3155] +[ oid, lng, 0 ] [ oid, lng, 19 ] [ oid, str, 1 ] [ oid, str, 1 ] @@ -61,13 +62,13 @@ % L1, L2 # name % char,wrd # type % 9, 3 # length -[ transient, 488 ] +[ transient, 487 ] #select 'persistent', count(*) from bbp() as bbp where kind like 'pers%'; % .L3, .bbp # table_name % L3, L4 # name % char,wrd # type % 10, 2 # length -[ persistent,24 ] +[ persistent,25 ] # 22:02:15 # 22:02:15 Done. diff --git a/sql/test/mapi/Tests/php_monetdb.stable.out b/sql/test/mapi/Tests/php_monetdb.stable.out --- a/sql/test/mapi/Tests/php_monetdb.stable.out +++ b/sql/test/mapi/Tests/php_monetdb.stable.out @@ -88,11 +88,11 @@ 5082 auths 20000 true0 false 0 5086 privileges 20000 true0 false 0 5199 queryhistory20000 true0 false 0 -5213 callhistory 20000 false 0 false 0 -5230 querylog2000create view querylog asnselect qd.*, ql.ctime, ql.arguments, ql.exec, ql.result, ql.foot, ql.memory, ql.tuples, ql.inblock, ql.oublock from queryhistory qd, callhistory qlnwhere qd.id = ql.id;1 false 0 false 0 -5656 systemfunctions 20000 false 0 false 0 +5213 callhistory 20000 true0 false 0 +5230 querylog2000create view querylog asnselect qd.*, ql.ctime, ql.arguments, ql.exec, ql.result, ql.foot, ql.memory,
MonetDB: default - approved output after recent changes
Changeset: bb7fb0e98b41 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bb7fb0e98b41
Modified Files:
MonetDB/src/gdk/gdk_bat.mx
MonetDB5/src/extras/xml/xml.mx
MonetDB5/src/modules/mal/tablet.mx
sql/rel.txt
sql/src/backends/monet5/sql.mx
sql/src/backends/monet5/sql_gencode.mx
sql/src/backends/monet5/sql_result.mx
sql/src/include/sql_relation.h
sql/src/server/rel_bin.c
sql/src/server/rel_optimizer.c
sql/src/server/rel_select.c
sql/src/server/rel_updates.c
sql/src/server/sql_mvc.h
sql/src/storage/sql_storage.h
sql/src/storage/store.c
sql/src/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
sql/src/test/Dependencies/Tests/Dependencies.stable.out
sql/src/test/leaks/Tests/check0.stable.out
sql/src/test/leaks/Tests/check1.stable.out
sql/src/test/leaks/Tests/check2.stable.out
sql/src/test/leaks/Tests/check3.stable.out
sql/src/test/leaks/Tests/check4.stable.out
sql/src/test/leaks/Tests/check5.stable.out
sql/src/test/sql_xml/Tests/funcs.sql
Branch: default
Log Message:
approved output after recent changes
added copy into ... locked. This allows for loading a data into a table
directly (no overhead of logging and delta management). The database is
fully locked during this process (ie no other active transactions can co
exist)
diffs (truncated from 1075 to 300 lines):
diff -r 639822cd6235 -r bb7fb0e98b41 MonetDB/src/gdk/gdk_bat.mx
--- a/MonetDB/src/gdk/gdk_bat.mxMon Dec 20 17:53:43 2010 +0100
+++ b/MonetDB/src/gdk/gdk_bat.mxMon Dec 20 20:39:27 2010 +0100
@@ -3507,7 +3507,7 @@
BATseqbase(b, *(oid *) BUNhloc(bi, BUNfirst(b)));
}
exit:
- if (mode BATPROPS_CHECK) {
+ if ((mode BATPROPS_CHECK) == BATPROPS_CHECK) {
if ((sorted_bak 1) !(BAThordered(b) 1)) {
GDKerror(BATpropcheck: BAT %s(%d)[%s,%s] with BUNFMT
tuples was incorrectly marked sorted!\n, BATgetId(b), b-batCacheid,
ATOMname(b-htype), ATOMname(b-ttype), b-batCount);
if (BAThordered(b))
diff -r 639822cd6235 -r bb7fb0e98b41 MonetDB5/src/extras/xml/xml.mx
--- a/MonetDB5/src/extras/xml/xml.mxMon Dec 20 17:53:43 2010 +0100
+++ b/MonetDB5/src/extras/xml/xml.mxMon Dec 20 20:39:27 2010 +0100
@@ -754,7 +754,7 @@
CREATE FUNCTION xml (s STRING) RETURNS xml external name xml.xml;
CREATE FUNCTION str (s XML) RETURNS STRING external name xml.str;
CREATE FUNCTION comment (s STRING) RETURNS xml external name xml.comment;
-CREATE FUNCTION parse (val STRING, option STRING) RETURNS xml external name
xml.parse;
+CREATE FUNCTION parse (doccont STRING, val STRING, option STRING) RETURNS
xml external name xml.parse;
CREATE FUNCTION pi (nme STRING, val STRING) RETURNS xml external name xml.pi;
CREATE FUNCTION root (val STRING, version STRING, standalone STRING) RETURNS
xml external name xml.root;
CREATE FUNCTION attribute (nme STRING, val STRING) RETURNS xml external name
xml.attribute;
diff -r 639822cd6235 -r bb7fb0e98b41 MonetDB5/src/modules/mal/tablet.mx
--- a/MonetDB5/src/modules/mal/tablet.mxMon Dec 20 17:53:43 2010 +0100
+++ b/MonetDB5/src/modules/mal/tablet.mxMon Dec 20 20:39:27 2010 +0100
@@ -478,6 +478,7 @@
tablet_export BUN TABLETload_file(Tablet * as, bstream *b, stream *out);
tablet_export BUN SQLload_file(Client cntxt, Tablet * as, bstream *b, stream
*out, char *csep, char *rsep, char quote, lng skip, lng maxrow);
tablet_export BAT *TABLETcollect_bats(Tablet * as);
+tablet_export BAT *TABLETcollect_parts(Tablet * as, BUN offset);
tablet_export void TABLETdestroy_format(Tablet * as);
tablet_export int TABLEToutput_file(Tablet * as, BAT *order, stream *s);
@@ -1340,6 +1341,54 @@
return bats;
}
+BAT *
+TABLETcollect_parts(Tablet * as, BUN offset)
+{
+ BAT *bats = BATnew(TYPE_str, TYPE_bat, as-nr_attrs);
+ Column *fmt = as-format;
+ BUN i;
+ BUN cnt = BATcount(fmt[0].c[0]);
+
+ if (bats == NULL)
+ return NULL;
+ for (i = 0; i as-nr_attrs; i++) {
+ BAT *b = fmt[i].c[0];
+ BAT *bv = BATslice(b, offset, BATcount(b));
+
+ BUNins(bats, (ptr) fmt[i].name, (ptr) bv-batCacheid, FALSE);
+ BATsetaccess(b, BAT_READ);
+ BATaccessBegin(bv, USE_ALL, MMAP_WILLNEED);
+ BATpropcheck(bv, BATPROPS_ALL);
+ /* drop the hashes, we don't need them now and they consume
space */
+ HASHremove(b);
+
+ BATpropcheck(BATmirror(bv), BATPROPS_ALL);
+ /* drop the hashes, we don't need them now and they consume
space */
+ HASHremove(BATmirror(b));
+ BATaccessEnd(bv, USE_ALL, MMAP_WILLNEED);
+
+ b-hkey = bv-hkey;
+ b-tkey = bv-tkey;
+
