Changeset: be7b32ba7c68 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=be7b32ba7c68 Modified Files: Branch: default Log Message:
Merge with Apr2011 branch.
diffs (222 lines):
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out
b/monetdb5/modules/mal/Tests/inspect05.stable.out
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out
@@ -33,6 +33,7 @@
[ "load", "pattern", "fits",
"(tablename:str):void ",
"FITSloadTable;" ]
[ "listdirpattern", "pattern", "fits",
"(dirname:str,pattern:str):void ",
"FITSdirpat;"
]
[ "listdir", "pattern", "fits",
"(dirname:str):void ",
"FITSdir;" ]
+[ "next_value", "pattern", "batsql",
"(sname:bat[:oid,:str],sequence:str):bat[:oid,:lng] ",
"mvc_bat_next_value;" ]
[ "Area", "command", "geom", "(g:wkb):dbl
",
"wkbArea;" ]
[ "AsText", "command", "geom", "(w:wkb):str
",
"wkbAsText;" ]
[ "Buffer", "command", "geom",
"(a:wkb,distance:dbl):wkb ",
"wkbBuffer;" ]
@@ -101,7 +102,6 @@
[ "#tostr", "command", "wkb", "():str ",
"wkbTOSTR;" ]
[ "wkb", "command", "wkb", "(v:str):wkb
",
"wkbFromString;" ]
[ "#write", "command", "wkb", "():void ",
"wkbWRITE;" ]
-[ "next_value", "pattern", "batsql",
"(sname:bat[:oid,:str],sequence:str):bat[:oid,:lng] ",
"mvc_bat_next_value;" ]
[ "bidding", "pattern", "scheduler",
"():bit ",
"OCTOPUSbidding;"
]
[ "costPrediction", "pattern", "scheduler", "(a:any):lng
",
"RUNcostPrediction;"
]
[ "choice", "pattern", "scheduler",
"(arg:any...):void ",
"RUNchoice;"
]
@@ -4495,7 +4495,6 @@
[ "getBAT", "command", "calc",
"(b:BAT):bat[:any_1,:any_2] ",
"CALCbatid2bat;"
]
[ "getBATidentifier", "command", "calc",
"(b:bat[:any_1,:any_2]):BAT ",
"CALCbat2batid;"
]
[ "hash", "pattern", "calc", "(v:any):wrd
",
"MKEYhash;" ]
-[ "isnil", "command", "calc", "(v:wkb):bit
",
"wkbIsnil;" ]
[ "int", "command", "calc",
"(s1:int,v:lng,d2:int,s2:int):int ",
"lng_dec2dec_int;" ]
[ "int", "command", "calc",
"(s1:int,v:lng):int ",
"lng_dec2_int;" ]
[ "int", "command", "calc",
"(v:lng,digits:int,scale:int):int ",
"lng_num2dec_int;" ]
@@ -4523,6 +4522,7 @@
[ "int", "command", "calc",
"(v:str,digits:int,scale:int):int ",
"str_2dec_int;" ]
[ "int", "command", "calc",
"(v:str,digits:int):int ",
"str_2num_int;" ]
[ "int", "command", "calc", "(v:str):int
",
"str_2_int;" ]
+[ "isnil", "command", "calc", "(v:wkb):bit ",
"wkbIsnil;" ]
[ "isnil", "command", "calc", "(v:inet):bit
",
"INET_isnil;"
]
[ "inet", "command", "calc", "(s:str):inet
",
"INET_fromstr;"
]
[ "inet", "command", "calc",
"(s:inet):inet ",
"INET_inet;"
]
@@ -4579,7 +4579,6 @@
[ "isnil", "command", "calc", "(v:chr):bit
",
"CALCisnil_chr;"
]
[ "isnotnil", "command", "calc", "(v:bit):bit
",
"CALCisnotnil_bit;"
]
[ "isnil", "command", "calc", "(v:bit):bit
",
"CALCisnil_bit;"
]
-[ "linestring", "function", "calc",
"(wkt:str):wkb;",
"nil" ]
[ "lng", "command", "calc",
"(s1:int,v:lng,d2:int,s2:int):lng ",
"lng_dec2dec_lng;" ]
[ "lng", "command", "calc",
"(s1:int,v:lng):lng ",
"lng_dec2_lng;" ]
[ "lng", "command", "calc",
"(v:lng,digits:int,scale:int):lng ",
"lng_num2dec_lng;" ]
@@ -4607,6 +4606,7 @@
[ "lng", "command", "calc",
"(v:str,digits:int,scale:int):lng ",
"str_2dec_lng;" ]
[ "lng", "command", "calc",
"(v:str,digits:int):lng ",
"str_2num_lng;" ]
[ "lng", "command", "calc", "(v:str):lng
",
"str_2_lng;" ]
+[ "linestring", "function", "calc",
"(wkt:str):wkb;",
"nil" ]
[ "lng", "command", "calc", "(v:void):lng
",
"CALCnil2lng;"
]
[ "lng", "command", "calc", "(v:str):lng
",
"CALCstr2lng;"
]
[ "lng", "command", "calc", "(x:dbl):lng
",
"CALCdbl2lng;"
]
@@ -4620,6 +4620,12 @@
[ "lng", "command", "calc", "(x:bit):lng
",
"CALCbit2lng;"
]
[ "lng", "command", "calc", "(x:oid):lng
",
"CALCoid2lng;"
]
[ "length", "command", "calc", "(x:str):int
",
"CALClengthstr;"
]
+[ "month_interval", "command", "calc",
"(v:lng,ek:int,sk:int):int ",
"month_interval_lng;" ]
+[ "month_interval", "command", "calc",
"(v:wrd,ek:int,sk:int):int ",
"month_interval_wrd;" ]
+[ "month_interval", "command", "calc",
"(v:int,ek:int,sk:int):int ",
"month_interval_int;" ]
+[ "month_interval", "command", "calc",
"(v:sht,ek:int,sk:int):int ",
"month_interval_sht;" ]
+[ "month_interval", "command", "calc",
"(v:bte,ek:int,sk:int):int ",
"month_interval_bte;" ]
+[ "month_interval", "command", "calc",
"(v:str,ek:int,sk:int):int ",
"month_interval_str;" ]
[ "multipolygon", "function", "calc",
"(wkt:str):wkb;",
"nil" ]
[ "multisurface", "function", "calc",
"(wkt:str):wkb;",
"nil" ]
[ "multilinestring", "function", "calc",
"(wkt:str):wkb;",
"nil" ]
@@ -4627,12 +4633,6 @@
[ "multipoint", "function", "calc",
"(wkt:str):wkb;",
"nil" ]
[ "mbr", "command", "calc", "(v:mbr):mbr
",
"mbrFromMBR;" ]
[ "mbr", "command", "calc", "(v:str):mbr
",
"mbrFromString;" ]
-[ "month_interval", "command", "calc",
"(v:lng,ek:int,sk:int):int ",
"month_interval_lng;" ]
-[ "month_interval", "command", "calc",
"(v:wrd,ek:int,sk:int):int ",
"month_interval_wrd;" ]
-[ "month_interval", "command", "calc",
"(v:int,ek:int,sk:int):int ",
"month_interval_int;" ]
-[ "month_interval", "command", "calc",
"(v:sht,ek:int,sk:int):int ",
"month_interval_sht;" ]
-[ "month_interval", "command", "calc",
"(v:bte,ek:int,sk:int):int ",
"month_interval_bte;" ]
-[ "month_interval", "command", "calc",
"(v:str,ek:int,sk:int):int ",
"month_interval_str;" ]
[ "max_no_nil", "command", "calc",
"(v:timestamp,w:timestamp):timestamp ",
"MTIMEtimestamp_max_no_nil;" ]
[ "min_no_nil", "command", "calc",
"(v:timestamp,w:timestamp):timestamp ",
"MTIMEtimestamp_min_no_nil;" ]
[ "max", "command", "calc",
"(v:timestamp,w:timestamp):timestamp ",
"MTIMEtimestamp_max;"
]
@@ -4721,7 +4721,6 @@
[ "ptr", "command", "calc",
"(x:ptr):ptr ",
"CALCptr2ptr;"
]
[ "rowid", "command", "calc",
"(v:any_1,schema:str,table:str):oid ",
"sql_rowid;" ]
[ "rotate_xor_hash", "pattern", "calc",
"(h:wrd,nbits:int,v:any_1):wrd ",
"MKEYrotate_xor_hash;" ]
-[ "surface", "function", "calc",
"(wkt:str):wkb;",
"nil" ]
[ "second_interval", "command", "calc",
"(v:daytime,ek:int,sk:int):lng ",
"second_interval_daytime;" ]
[ "second_interval", "command", "calc",
"(v:lng,ek:int,sk:int):lng ",
"second_interval_lng;" ]
[ "second_interval", "command", "calc",
"(v:wrd,ek:int,sk:int):lng ",
"second_interval_wrd;" ]
@@ -4768,6 +4767,7 @@
[ "sht", "command", "calc",
"(v:str,digits:int,scale:int):sht ",
"str_2dec_sht;" ]
[ "sht", "command", "calc",
"(v:str,digits:int):sht ",
"str_2num_sht;" ]
[ "sht", "command", "calc", "(v:str):sht
",
"str_2_sht;" ]
+[ "surface", "function", "calc", "(wkt:str):wkb;",
"nil"
]
[ "sqlblob", "command", "calc",
"(s:str):sqlblob ",
"BLOBsqlblob_fromstr;"
]
[ "sqlblob", "command", "calc",
"(b:sqlblob):sqlblob ",
"BLOBblob_blob;"
]
[ "setoid", "command", "calc", "():oid ",
"CALCsetoidBase;"
]
@@ -4902,8 +4902,6 @@
[ "void", "command", "calc", "(v:sht):void
",
"CALCsht2void;"
]
[ "void", "command", "calc", "(v:int):void
",
"CALCint2void;"
]
[ "void", "command", "calc",
"(v:void):void ",
"CALCnil2void;"
]
-[ "wkb", "command", "calc", "(v:wkb):wkb
",
"wkbFromWKB;" ]
-[ "wkb", "command", "calc", "(v:str):wkb
",
"wkbFromString;" ]
[ "wrd", "command", "calc",
"(s1:int,v:wrd,d2:int,s2:int):wrd ",
"wrd_dec2dec_wrd;" ]
[ "wrd", "command", "calc",
"(s1:int,v:wrd):wrd ",
"wrd_dec2_wrd;" ]
[ "wrd", "command", "calc",
"(v:wrd,digits:int,scale:int):wrd ",
"wrd_num2dec_wrd;" ]
@@ -4925,6 +4923,8 @@
[ "wrd", "command", "calc",
"(v:flt,digits:int,scale:int):wrd ",
"flt_num2dec_wrd;" ]
[ "wrd", "command", "calc", "(v:flt):wrd
",
"flt_2_wrd;" ]
[ "wrd", "command", "calc", "(v:str):wrd
",
"str_2_wrd;" ]
+[ "wkb", "command", "calc", "(v:wkb):wkb ",
"wkbFromWKB;" ]
+[ "wkb", "command", "calc", "(v:str):wkb ",
"wkbFromString;" ]
[ "wrd", "command", "calc", "(x:dbl):wrd
",
"CALCdbl2wrd;"
]
[ "wrd", "command", "calc", "(x:flt):wrd
",
"CALCflt2wrd;"
]
[ "wrd", "command", "calc", "(x:lng):wrd
",
"CALClng2wrd;"
]
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
b/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
@@ -28,6 +28,7 @@
# str str str str
str
# type
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------#
[ "main", "function", "user", "():void;",
"nil"
]
+[ "next_value", "pattern", "batsql",
"(sname:bat[:oid,:str],sequence:str):bat[:oid,:lng] ",
"mvc_bat_next_value;" ]
[ "Area", "command", "geom", "(g:wkb):dbl ",
"wkbArea;" ]
[ "AsText", "command", "geom", "(w:wkb):str ",
"wkbAsText;" ]
[ "Buffer", "command", "geom",
"(a:wkb,distance:dbl):wkb ",
"wkbBuffer;" ]
@@ -96,7 +97,6 @@
[ "#tostr", "command", "wkb", "():str ",
"wkbTOSTR;" ]
[ "wkb", "command", "wkb", "(v:str):wkb ",
"wkbFromString;" ]
[ "#write", "command", "wkb", "():void ",
"wkbWRITE;" ]
-[ "next_value", "pattern", "batsql",
"(sname:bat[:oid,:str],sequence:str):bat[:oid,:lng] ",
"mvc_bat_next_value;" ]
[ "bidding", "pattern", "scheduler",
"():bit ",
"OCTOPUSbidding;"
]
[ "costPrediction", "pattern", "scheduler", "(a:any):lng
",
"RUNcostPrediction;"
]
[ "choice", "pattern", "scheduler",
"(arg:any...):void ",
"RUNchoice;"
]
@@ -4490,7 +4490,6 @@
[ "getBAT", "command", "calc",
"(b:BAT):bat[:any_1,:any_2] ",
"CALCbatid2bat;"
]
[ "getBATidentifier", "command", "calc",
"(b:bat[:any_1,:any_2]):BAT ",
"CALCbat2batid;"
]
[ "hash", "pattern", "calc", "(v:any):wrd
",
"MKEYhash;" ]
-[ "isnil", "command", "calc", "(v:wkb):bit
",
"wkbIsnil;" ]
[ "int", "command", "calc",
"(s1:int,v:lng,d2:int,s2:int):int ",
"lng_dec2dec_int;" ]
[ "int", "command", "calc",
"(s1:int,v:lng):int ",
"lng_dec2_int;" ]
[ "int", "command", "calc",
"(v:lng,digits:int,scale:int):int ",
"lng_num2dec_int;" ]
@@ -4518,6 +4517,7 @@
[ "int", "command", "calc",
"(v:str,digits:int,scale:int):int ",
"str_2dec_int;" ]
[ "int", "command", "calc",
"(v:str,digits:int):int ",
"str_2num_int;" ]
[ "int", "command", "calc", "(v:str):int
",
"str_2_int;" ]
+[ "isnil", "command", "calc", "(v:wkb):bit ",
"wkbIsnil;" ]
[ "isnil", "command", "calc", "(v:inet):bit
",
"INET_isnil;"
]
[ "inet", "command", "calc", "(s:str):inet
",
"INET_fromstr;"
]
[ "inet", "command", "calc",
"(s:inet):inet ",
"INET_inet;"
]
@@ -4574,7 +4574,6 @@
[ "isnil", "command", "calc", "(v:chr):bit
",
"CALCisnil_chr;"
]
[ "isnotnil", "command", "calc", "(v:bit):bit
",
"CALCisnotnil_bit;"
]
[ "isnil", "command", "calc", "(v:bit):bit
",
"CALCisnil_bit;"
]
-[ "linestring", "function", "calc",
"(wkt:str):wkb;",
"nil" ]
[ "lng", "command", "calc",
"(s1:int,v:lng,d2:int,s2:int):lng ",
"lng_dec2dec_lng;" ]
[ "lng", "command", "calc",
"(s1:int,v:lng):lng ",
"lng_dec2_lng;" ]
[ "lng", "command", "calc",
"(v:lng,digits:int,scale:int):lng ",
"lng_num2dec_lng;" ]
@@ -4602,6 +4601,7 @@
[ "lng", "command", "calc",
"(v:str,digits:int,scale:int):lng ",
"str_2dec_lng;" ]
[ "lng", "command", "calc",
"(v:str,digits:int):lng ",
"str_2num_lng;" ]
[ "lng", "command", "calc", "(v:str):lng
",
"str_2_lng;" ]
+[ "linestring", "function", "calc",
"(wkt:str):wkb;",
"nil" ]
[ "lng", "command", "calc", "(v:void):lng
",
"CALCnil2lng;"
]
[ "lng", "command", "calc", "(v:str):lng
",
"CALCstr2lng;"
]
[ "lng", "command", "calc", "(x:dbl):lng
",
"CALCdbl2lng;"
]
@@ -4615,6 +4615,12 @@
[ "lng", "command", "calc", "(x:bit):lng
",
"CALCbit2lng;"
]
[ "lng", "command", "calc", "(x:oid):lng
",
"CALCoid2lng;"
]
[ "length", "command", "calc", "(x:str):int
",
"CALClengthstr;"
]
+[ "month_interval", "command", "calc",
"(v:lng,ek:int,sk:int):int ",
"month_interval_lng;" ]
+[ "month_interval", "command", "calc",
"(v:wrd,ek:int,sk:int):int ",
"month_interval_wrd;" ]
+[ "month_interval", "command", "calc",
"(v:int,ek:int,sk:int):int ",
"month_interval_int;" ]
+[ "month_interval", "command", "calc",
"(v:sht,ek:int,sk:int):int ",
"month_interval_sht;" ]
+[ "month_interval", "command", "calc",
"(v:bte,ek:int,sk:int):int ",
"month_interval_bte;" ]
+[ "month_interval", "command", "calc",
"(v:str,ek:int,sk:int):int ",
"month_interval_str;" ]
[ "multipolygon", "function", "calc",
"(wkt:str):wkb;",
"nil" ]
[ "multisurface", "function", "calc",
"(wkt:str):wkb;",
"nil" ]
[ "multilinestring", "function", "calc",
"(wkt:str):wkb;",
"nil" ]
@@ -4622,12 +4628,6 @@
[ "multipoint", "function", "calc",
"(wkt:str):wkb;",
"nil" ]
[ "mbr", "command", "calc", "(v:mbr):mbr
",
"mbrFromMBR;" ]
[ "mbr", "command", "calc", "(v:str):mbr
",
"mbrFromString;" ]
-[ "month_interval", "command", "calc",
"(v:lng,ek:int,sk:int):int ",
"month_interval_lng;" ]
-[ "month_interval", "command", "calc",
"(v:wrd,ek:int,sk:int):int ",
"month_interval_wrd;" ]
-[ "month_interval", "command", "calc",
"(v:int,ek:int,sk:int):int ",
"month_interval_int;" ]
-[ "month_interval", "command", "calc",
"(v:sht,ek:int,sk:int):int ",
"month_interval_sht;" ]
-[ "month_interval", "command", "calc",
"(v:bte,ek:int,sk:int):int ",
"month_interval_bte;" ]
-[ "month_interval", "command", "calc",
"(v:str,ek:int,sk:int):int ",
"month_interval_str;" ]
[ "max_no_nil", "command", "calc",
"(v:timestamp,w:timestamp):timestamp ",
"MTIMEtimestamp_max_no_nil;" ]
[ "min_no_nil", "command", "calc",
"(v:timestamp,w:timestamp):timestamp ",
"MTIMEtimestamp_min_no_nil;" ]
[ "max", "command", "calc",
"(v:timestamp,w:timestamp):timestamp ",
"MTIMEtimestamp_max;"
]
@@ -4716,7 +4716,6 @@
[ "ptr", "command", "calc",
"(x:ptr):ptr ",
"CALCptr2ptr;"
]
[ "rowid", "command", "calc",
"(v:any_1,schema:str,table:str):oid ",
"sql_rowid;" ]
[ "rotate_xor_hash", "pattern", "calc",
"(h:wrd,nbits:int,v:any_1):wrd ",
"MKEYrotate_xor_hash;" ]
-[ "surface", "function", "calc",
"(wkt:str):wkb;",
"nil" ]
[ "second_interval", "command", "calc",
"(v:daytime,ek:int,sk:int):lng ",
"second_interval_daytime;" ]
[ "second_interval", "command", "calc",
"(v:lng,ek:int,sk:int):lng ",
"second_interval_lng;" ]
[ "second_interval", "command", "calc",
"(v:wrd,ek:int,sk:int):lng ",
"second_interval_wrd;" ]
@@ -4763,6 +4762,7 @@
[ "sht", "command", "calc",
"(v:str,digits:int,scale:int):sht ",
"str_2dec_sht;" ]
[ "sht", "command", "calc",
"(v:str,digits:int):sht ",
"str_2num_sht;" ]
[ "sht", "command", "calc", "(v:str):sht
",
"str_2_sht;" ]
+[ "surface", "function", "calc", "(wkt:str):wkb;",
"nil"
]
[ "sqlblob", "command", "calc",
"(s:str):sqlblob ",
"BLOBsqlblob_fromstr;"
]
[ "sqlblob", "command", "calc",
"(b:sqlblob):sqlblob ",
"BLOBblob_blob;"
]
[ "setoid", "command", "calc", "():oid ",
"CALCsetoidBase;"
]
@@ -4897,8 +4897,6 @@
[ "void", "command", "calc", "(v:sht):void
",
"CALCsht2void;"
]
[ "void", "command", "calc", "(v:int):void
",
"CALCint2void;"
]
[ "void", "command", "calc",
"(v:void):void ",
"CALCnil2void;"
]
-[ "wkb", "command", "calc", "(v:wkb):wkb
",
"wkbFromWKB;" ]
-[ "wkb", "command", "calc", "(v:str):wkb
",
"wkbFromString;" ]
[ "wrd", "command", "calc",
"(s1:int,v:wrd,d2:int,s2:int):wrd ",
"wrd_dec2dec_wrd;" ]
[ "wrd", "command", "calc",
"(s1:int,v:wrd):wrd ",
"wrd_dec2_wrd;" ]
[ "wrd", "command", "calc",
"(v:wrd,digits:int,scale:int):wrd ",
"wrd_num2dec_wrd;" ]
@@ -4920,6 +4918,8 @@
[ "wrd", "command", "calc",
"(v:flt,digits:int,scale:int):wrd ",
"flt_num2dec_wrd;" ]
[ "wrd", "command", "calc", "(v:flt):wrd
",
"flt_2_wrd;" ]
[ "wrd", "command", "calc", "(v:str):wrd
",
"str_2_wrd;" ]
+[ "wkb", "command", "calc", "(v:wkb):wkb ",
"wkbFromWKB;" ]
+[ "wkb", "command", "calc", "(v:str):wkb ",
"wkbFromString;" ]
[ "wrd", "command", "calc", "(x:dbl):wrd
",
"CALCdbl2wrd;"
]
[ "wrd", "command", "calc", "(x:flt):wrd
",
"CALCflt2wrd;"
]
[ "wrd", "command", "calc", "(x:lng):wrd
",
"CALClng2wrd;"
]
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
