Changeset: a88ca2fcdd0d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a88ca2fcdd0d
Modified Files:
Branch: default
Log Message:
Merge with Aug2011 branch.
diffs (261 lines):
diff --git a/buildtools/conf/rules.mk b/buildtools/conf/rules.mk
--- a/buildtools/conf/rules.mk
+++ b/buildtools/conf/rules.mk
@@ -131,4 +131,4 @@
distdir: check_dist
check_dist:
- @if [ "$(SWIG)" = "no" ]; then $(ECHO) "Cannot create distribution
because one of the necessary programs or libraries is missing"; echo "swig =
$(SWIG)"; exit 1; fi
+ @if [ "$(SWIG)" = "no" ]; then echo "Cannot create distribution because
one of the necessary programs or libraries is missing"; echo "swig =
$(SWIG)"; exit 1; fi
diff --git a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
--- a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
+++ b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
@@ -35,6 +35,7 @@
| mal |
+========+
| function user.s2_1{autoCommit=true}():void; |
+| X_48:bat[:oid,:str] := bat.new(nil:oid,nil:str); |
| X_2 := sql.mvc(); |
| X_37:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",0); |
| X_39 := algebra.thetauselect(X_37,2:sht,"<"); |
@@ -57,6 +58,7 @@
| X_20:bat[:oid,:str] := sql.bind(X_2,"sys","_tables","name",1); |
| X_27 := algebra.kunion(X_26,X_20); |
| X_47 := algebra.leftjoin(X_46,X_27); |
+| X_51 := bat.append(X_48,X_47,true); |
| X_12:bat[:oid,:sht] := sql.bind(X_2,"tmp","_tables","type",0); |
| X_13 := algebra.thetauselect(X_12,2:sht,"<"); |
| X_9:bat[:oid,:oid] := sql.bind_dbat(X_2,"tmp","_tables",1); |
@@ -66,8 +68,6 @@
| X_17 := bat.reverse(X_16); |
| X_4:bat[:oid,:str] := sql.bind(X_2,"tmp","_tables","name",0); |
| X_18 := algebra.leftjoin(X_17,X_4); |
-| X_48:bat[:oid,:str] := bat.new(nil:oid,nil:str); |
-| X_51 := bat.append(X_48,X_47,true); |
| X_53 := bat.append(X_51,X_18,true); |
| X_54 := sql.resultSet(1,1,X_53); |
| sql.rsColumn(X_54,".tables","name":str,"varchar",1024,0,X_53); |
diff --git a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
@@ -35,51 +35,58 @@
+==================================================================================================================+
| project (
|
| | group by (
|
-| | | project (
|
-| | | | union (
|
+| | | union (
|
+| | | | group by (
|
| | | | | project (
|
| | | | | | select (
|
| | | | | | | table(sys._tables) [ _tables.id as p.id, _tables.type as p.type,
_tables.%TID% NOT NULL as p.%TID% ] |
-| | | | | | ) [ p.type < convert(2 from tinyint to smallint) ]
|
-| | | | | ) [ p.id, p.type ],
|
+| | | | | | ) [ p.type < smallint[tinyint "2"] ]
|
+| | | | | ) [ p.id as tables.id ]
|
+| | | | ) [ sys.count() NOT NULL as L1 ],
|
+| | | | group by (
|
| | | | | project (
|
| | | | | | select (
|
| | | | | | | table(tmp._tables) [ _tables.id as t.id, _tables.type as t.type,
_tables.%TID% NOT NULL as t.%TID% ] |
-| | | | | | ) [ t.type < convert(2 from tinyint to smallint) ]
|
-| | | | | ) [ t.id, t.type ]
|
-| | | | ) [ id as tables.id, type as tables.type ]
|
-| | | ) [ tables.id ]
|
-| | ) [ ] [ count NOT NULL as L1 ]
|
+| | | | | | ) [ t.type < smallint[tinyint "2"] ]
|
+| | | | | ) [ t.id as tables.id ]
|
+| | | | ) [ sys.count() NOT NULL as L1 ]
|
+| | | ) [ L1 ]
|
+| | ) [ ] [ sys.sum no nil (L1) as L1 ]
|
| ) [ L1 NOT NULL ]
|
+------------------------------------------------------------------------------------------------------------------+
-18 rows
+20 rows
+
+--------+
| mal |
+========+
| function user.s3_1{autoCommit=true}():void; |
+| X_51:bat[:oid,:wrd] := bat.new(nil:oid,nil:wrd); |
| X_2 := sql.mvc(); |
-| X_37:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",0); |
-| X_39 := algebra.thetauselect(X_37,2:sht,"<"); |
-| X_35:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",2); |
-| X_41 := algebra.kdifference(X_39,X_35); |
+| X_40:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",0); |
+| X_41 := algebra.thetauselect(X_40,2:sht,"<"); |
+| X_38:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",2); |
+| X_42 := algebra.kdifference(X_41,X_38); |
+| X_39 := algebra.thetauselect(X_38,2:sht,"<"); |
+| X_43 := algebra.kunion(X_42,X_39); |
+| X_35:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",1); |
| X_36 := algebra.thetauselect(X_35,2:sht,"<"); |
-| X_42 := algebra.kunion(X_41,X_36); |
-| X_31:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",1); |
-| X_34 := algebra.thetauselect(X_31,2:sht,"<"); |
-| X_43 := algebra.kunion(X_42,X_34); |
-| X_28:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","_tables",1); |
-| X_30 := bat.reverse(X_28); |
-| X_44 := algebra.kdifference(X_43,X_30); |
-| X_45 := algebra.markT(X_44,0@0:oid); |
-| X_46 := bat.reverse(X_45); |
-| X_24:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",0); |
-| X_22:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",2); |
-| X_25 := algebra.kdifference(X_24,X_22); |
-| X_26 := algebra.kunion(X_25,X_22); |
+| X_44 := algebra.kunion(X_43,X_36); |
+| X_32:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","_tables",1); |
+| X_34 := bat.reverse(X_32); |
+| X_45 := algebra.kdifference(X_44,X_34); |
+| X_46 := algebra.markT(X_45,0@0:oid); |
+| X_47 := bat.reverse(X_46); |
+| X_25:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",0); |
+| X_23:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",2); |
+| X_28 := algebra.kdifference(X_25,X_23); |
+| X_29 := algebra.kunion(X_28,X_23); |
| X_20:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",1); |
-| X_27 := algebra.kunion(X_26,X_20); |
-| X_47 := algebra.leftjoin(X_46,X_27); |
+| X_30 := algebra.kunion(X_29,X_20); |
+| X_48 := algebra.leftjoin(X_47,X_30); |
+| X_49 := aggr.count(X_48); |
+| X_50 := sql.single(X_49); |
+| X_54 := bat.append(X_51,X_50,true); |
| X_12:bat[:oid,:sht] := sql.bind(X_2,"tmp","_tables","type",0); |
| X_13 := algebra.thetauselect(X_12,2:sht,"<"); |
| X_9:bat[:oid,:oid] := sql.bind_dbat(X_2,"tmp","_tables",1); |
@@ -89,14 +96,14 @@
| X_17 := bat.reverse(X_16); |
| X_4:bat[:oid,:int] := sql.bind(X_2,"tmp","_tables","id",0); |
| X_18 := algebra.leftjoin(X_17,X_4); |
-| X_48:bat[:oid,:int] := bat.new(nil:oid,nil:int); |
-| X_51 := bat.append(X_48,X_47,true); |
-| X_53 := bat.append(X_51,X_18,true); |
-| X_54 := aggr.count(X_53); |
-| sql.exportValue(1,".tables","L2":str,"wrd",64,0,6,X_54,""); |
+| X_19 := aggr.count(X_18); |
+| X_56 := bat.append(X_54,X_19,true); |
+| X_57 := algebra.selectNotNil(X_56); |
+| X_58:wrd := aggr.sum(X_57); |
+| sql.exportValue(1,".tables","L2":str,"wrd",64,0,6,X_58,""); |
| end s3_1; |
+--------+
-38 rows
+42 rows
# 13:30:20 >
diff --git
a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
@@ -35,51 +35,58 @@
+==================================================================================================================+
| project (
|
| | group by (
|
-| | | project (
|
-| | | | union (
|
+| | | union (
|
+| | | | group by (
|
| | | | | project (
|
| | | | | | select (
|
| | | | | | | table(sys._tables) [ _tables.id as p.id, _tables.type as p.type,
_tables.%TID% NOT NULL as p.%TID% ] |
-| | | | | | ) [ p.type < convert(2 from tinyint to smallint) ]
|
-| | | | | ) [ p.id, p.type ],
|
+| | | | | | ) [ p.type < smallint[tinyint "2"] ]
|
+| | | | | ) [ p.id as tables.id ]
|
+| | | | ) [ sys.count() NOT NULL as L1 ],
|
+| | | | group by (
|
| | | | | project (
|
| | | | | | select (
|
| | | | | | | table(tmp._tables) [ _tables.id as t.id, _tables.type as t.type,
_tables.%TID% NOT NULL as t.%TID% ] |
-| | | | | | ) [ t.type < convert(2 from tinyint to smallint) ]
|
-| | | | | ) [ t.id, t.type ]
|
-| | | | ) [ id as tables.id, type as tables.type ]
|
-| | | ) [ tables.id ]
|
-| | ) [ ] [ count NOT NULL as L1 ]
|
+| | | | | | ) [ t.type < smallint[tinyint "2"] ]
|
+| | | | | ) [ t.id as tables.id ]
|
+| | | | ) [ sys.count() NOT NULL as L1 ]
|
+| | | ) [ L1 ]
|
+| | ) [ ] [ sys.sum no nil (L1) as L1 ]
|
| ) [ L1 NOT NULL ]
|
+------------------------------------------------------------------------------------------------------------------+
-18 rows
+20 rows
+
+--------+
| mal |
+========+
| function user.s3_1{autoCommit=true}():void; |
+| X_51:bat[:oid,:wrd] := bat.new(nil:oid,nil:wrd); |
| X_2 := sql.mvc(); |
-| X_37:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",0); |
-| X_39 := algebra.thetauselect(X_37,2:sht,"<"); |
-| X_35:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",2); |
-| X_41 := algebra.kdifference(X_39,X_35); |
+| X_40:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",0); |
+| X_41 := algebra.thetauselect(X_40,2:sht,"<"); |
+| X_38:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",2); |
+| X_42 := algebra.kdifference(X_41,X_38); |
+| X_39 := algebra.thetauselect(X_38,2:sht,"<"); |
+| X_43 := algebra.kunion(X_42,X_39); |
+| X_35:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",1); |
| X_36 := algebra.thetauselect(X_35,2:sht,"<"); |
-| X_42 := algebra.kunion(X_41,X_36); |
-| X_31:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",1); |
-| X_34 := algebra.thetauselect(X_31,2:sht,"<"); |
-| X_43 := algebra.kunion(X_42,X_34); |
-| X_28:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","_tables",1); |
-| X_30 := bat.reverse(X_28); |
-| X_44 := algebra.kdifference(X_43,X_30); |
-| X_45 := algebra.markT(X_44,0@0:oid); |
-| X_46 := bat.reverse(X_45); |
-| X_24:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",0); |
-| X_22:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",2); |
-| X_25 := algebra.kdifference(X_24,X_22); |
-| X_26 := algebra.kunion(X_25,X_22); |
+| X_44 := algebra.kunion(X_43,X_36); |
+| X_32:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","_tables",1); |
+| X_34 := bat.reverse(X_32); |
+| X_45 := algebra.kdifference(X_44,X_34); |
+| X_46 := algebra.markT(X_45,0@0:oid); |
+| X_47 := bat.reverse(X_46); |
+| X_25:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",0); |
+| X_23:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",2); |
+| X_28 := algebra.kdifference(X_25,X_23); |
+| X_29 := algebra.kunion(X_28,X_23); |
| X_20:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",1); |
-| X_27 := algebra.kunion(X_26,X_20); |
-| X_47 := algebra.leftjoin(X_46,X_27); |
+| X_30 := algebra.kunion(X_29,X_20); |
+| X_48 := algebra.leftjoin(X_47,X_30); |
+| X_49 := aggr.count(X_48); |
+| X_50 := sql.single(X_49); |
+| X_54 := bat.append(X_51,X_50,true); |
| X_12:bat[:oid,:sht] := sql.bind(X_2,"tmp","_tables","type",0); |
| X_13 := algebra.thetauselect(X_12,2:sht,"<"); |
| X_9:bat[:oid,:oid] := sql.bind_dbat(X_2,"tmp","_tables",1); |
@@ -89,14 +96,14 @@
| X_17 := bat.reverse(X_16); |
| X_4:bat[:oid,:int] := sql.bind(X_2,"tmp","_tables","id",0); |
| X_18 := algebra.leftjoin(X_17,X_4); |
-| X_48:bat[:oid,:int] := bat.new(nil:oid,nil:int); |
-| X_51 := bat.append(X_48,X_47,true); |
-| X_53 := bat.append(X_51,X_18,true); |
-| X_54 := aggr.count(X_53); |
-| sql.exportValue(1,".tables","L2":str,"wrd",32,0,6,X_54,""); |
+| X_19 := aggr.count(X_18); |
+| X_56 := bat.append(X_54,X_19,true); |
+| X_57 := algebra.selectNotNil(X_56); |
+| X_58:wrd := aggr.sum(X_57); |
+| sql.exportValue(1,".tables","L2":str,"wrd",32,0,6,X_58,""); |
| end s3_1; |
+--------+
-38 rows
+42 rows
# 13:30:20 >
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
