Update of /cvsroot/monetdb/MonetDB5/src/modules/mal/Tests In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5179/src/modules/mal/Tests
Modified Files:
inspect05.stable.out
Log Message:
(re)introduced module batstr (as opt_remap needs simple translation from
single value at a time module into bluk version module name). Example
str.trim into batstr.trim. This make a lot of functions in sql a lot faster.
Fixed a couple of variable atom referencing bugs in batstr.mx
added a mal function for the new rangejoin to algebra.mx
opt_mergetable got lots of fixes
Index: inspect05.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/Tests/inspect05.stable.out,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -d -r1.346 -r1.347
--- inspect05.stable.out 18 Dec 2007 10:48:05 -0000 1.346
+++ inspect05.stable.out 21 Dec 2007 15:29:35 -0000 1.347
@@ -93,6 +93,17 @@
[ "prev", "command", "transaction",
"(b:bat[:any_1,:any_2]):bat[:any_1,:any_2] ",
"TRNtrans_prev;"
]
[ "subcommit", "command", "transaction",
"(b:bat[:any_1,:str]):bit ",
"TRNsubcommit;"
]
[ "sync", "command", "transaction",
"():bit ",
"TRNglobal_sync;"
]
+[ "editdistance2", "command", "txtsim",
"(s:str,t:str):int ",
"levenshteinbasic2_impl;" ]
+[ "editdistance", "command", "txtsim",
"(s:str,t:str):int ",
"levenshteinbasic_impl;" ]
+[ "levenshtein", "command", "txtsim",
"(s:str,t:str):int ",
"levenshteinbasic_impl;" ]
+[ "levenshtein", "command", "txtsim",
"(s:str,t:str,insdel_cost:int,replace_cost:int,transpose_cost:int):int ",
"levenshtein_impl;" ]
+[ "qgramselfjoin", "command", "txtsim",
"(qgram:bat[:oid,:oid],id:bat[:oid,:oid],pos:bat[:oid,:int],len:bat[:oid,:int],c:flt,k:int):bat[:int,:int]
", "CMDqgramselfjoin;" ]
+[ "qgramnormalize", "command", "txtsim",
"(input:str):str ",
"CMDqgramnormalize;" ]
+[ "str2qgrams", "function", "txtsim",
"(s:str):bat[:oid,:str];",
"nil"
]
+[ "stringdiff", "command", "txtsim",
"(s1:str,s2:str):int ",
"stringdiff_impl;" ]
+[ "soundex", "command", "txtsim",
"(name:str):str ",
"soundex_impl;"
]
+[ "similarity", "command", "txtsim",
"(string1:str,string2:str):dbl ",
"fstrcmp0_impl;" ]
+[ "similarity", "command", "txtsim",
"(string1:str,string2:str,minimum:dbl):dbl ",
"fstrcmp_impl;"
]
[ "multiplex", "pattern", "mal",
"(a:any...):any ",
"OPTremapMultiplex;"
]
[ "accessmode", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPTaccessmode;"
]
[ "accessmode", "pattern", "optimizer",
"():str ",
"OPTaccessmode;"
]
@@ -552,6 +563,32 @@
[ "str", "command", "batcolor",
"(b:bat[:oid,:color]):bat[:oid,:str] ",
"CLRbatStr;"
]
[ "value", "command", "batcolor",
"(c:bat[:oid,:color]):bat[:oid,:flt] ",
"CLRbatValue;"
]
[ "value", "command", "batcolor",
"(c:bat[:oid,:color]):bat[:oid,:int] ",
"CLRbatValueInt;"
]
+[ "chrAt", "command", "batstr",
"(s:bat[:oid,:str],index:int):bat[:oid,:chr] ",
"STRbatChrAtcst;" ]
+[ "chrAt", "command", "batstr",
"(s:bat[:oid,:str],index:bat[:oid,:int]):bat[:oid,:chr] ",
"STRbatChrAt;"
]
+[ "endsWith", "command", "batstr",
"(s:bat[:oid,:str],suffix:str):bat[:oid,:bit] ",
"STRbatSuffixcst;" ]
+[ "endsWith", "command", "batstr",
"(s:bat[:oid,:str],suffix:bat[:oid,:str]):bat[:oid,:bit] ",
"STRbatSuffix;"
]
+[ "like", "command", "batstr",
"(s:bat[:oid,:str],pat:str,esc:str):bat[:oid,:oid] ",
"STRbatlike;"
]
+[ "like", "command", "batstr",
"(s:bat[:oid,:str],pat:str):bat[:oid,:oid] ",
"STRbatlike2;"
]
+[ "ltrim", "command", "batstr",
"(s:bat[:oid,:str]):bat[:oid,:str] ",
"STRbatLtrim;"
]
+[ "length", "command", "batstr",
"(s:bat[:oid,:str]):bat[:oid,:int] ",
"STRbatLength;"
]
+[ "nbytes", "command", "batstr",
"(s:bat[:oid,:str]):bat[:oid,:int] ",
"STRbatBytes;"
]
+[ "r_search", "command", "batstr",
"(s:bat[:oid,:str],c:str):bat[:oid,:int] ",
"STRbatRstrSearchcst;" ]
+[ "r_search", "command", "batstr",
"(s:bat[:oid,:str],c:bat[:oid,:str]):bat[:oid,:int] ",
"STRbatRstrSearch;" ]
+[ "rtrim", "command", "batstr",
"(s:bat[:oid,:str]):bat[:oid,:str] ",
"STRbatRtrim;"
]
+[ "substitute", "command", "batstr",
"(s:bat[:oid,:str],src:str,dst:str,rep:bit):bat[:oid,:str] ",
"STRbatSubstitutecst;" ]
+[ "substring", "command", "batstr",
"(s:bat[:oid,:str],start:int,index:int):bat[:oid,:str] ",
"STRbatsubstringcst;" ]
+[ "substring", "command", "batstr",
"(s:bat[:oid,:str],start:bat[:oid,:int],index:bat[:oid,:int]):bat[:oid,:str] ",
"STRbatsubstring;" ]
+[ "string", "command", "batstr",
"(b:bat[:oid,:str],offset:int):bat[:oid,:str] ",
"STRbatTailcst;" ]
+[ "string", "command", "batstr",
"(b:bat[:oid,:str],offset:bat[:oid,:int]):bat[:oid,:str] ",
"STRbatTail;"
]
+[ "search", "command", "batstr",
"(s:bat[:oid,:str],c:str):bat[:oid,:int] ",
"STRbatstrSearchcst;" ]
+[ "search", "command", "batstr",
"(s:bat[:oid,:str],c:bat[:oid,:str]):bat[:oid,:int] ",
"STRbatstrSearch;" ]
+[ "startsWith", "command", "batstr",
"(s:bat[:oid,:str],prefix:str):bat[:oid,:bit] ",
"STRbatPrefixcst;" ]
+[ "startsWith", "command", "batstr",
"(s:bat[:oid,:str],prefix:bat[:oid,:str]):bat[:oid,:bit] ",
"STRbatPrefix;"
]
+[ "trim", "command", "batstr",
"(s:bat[:oid,:str]):bat[:oid,:str] ",
"STRbatStrip;"
]
+[ "toUpper", "command", "batstr",
"(s:bat[:oid,:str]):bat[:oid,:str] ",
"STRbatUpper;"
]
+[ "toLower", "command", "batstr",
"(s:bat[:oid,:str]):bat[:oid,:str] ",
"STRbatLower;"
]
+[ "unicodeAt", "command", "batstr",
"(s:bat[:oid,:str],index:int):bat[:oid,:int] ",
"STRbatWChrAtcst;" ]
+[ "unicodeAt", "command", "batstr",
"(s:bat[:oid,:str],index:bat[:oid,:int]):bat[:oid,:int] ",
"STRbatWChrAt;"
]
[ "!=", "command", "batcalc",
"(l:bat[:oid,:str],r:str):bat[:oid,:bit] ",
"STRbatNotEqualCst;"
]
[ "!=", "command", "batcalc",
"(l:bat[:oid,:str],r:bat[:oid,:str]):bat[:oid,:bit] ",
"STRbatNotEqual;"
]
[ "!=", "command", "batcalc",
"(l:bat[:void,:timestamp],r:timestamp):bat[:void,:bit] ",
"MTIMEtimestampbat_NEQcst;"
]
@@ -1343,8 +1380,6 @@
[ "bte", "command", "batcalc",
"(b:bat[:any_1,:sht]):bat[:any_1,:bte] ",
"CMDconvert_sht_bte;"
]
[ "bte", "command", "batcalc",
"(b:bat[:any_1,:bte]):bat[:any_1,:bte] ",
"CMDconvert_bte;"
]
[ "bit", "command", "batcalc",
"(b:bat[:any_1,:bit]):bat[:any_1,:bit] ",
"CMDconvert_bit;"
]
-[ "chrAt", "command", "batcalc",
"(s:bat[:oid,:str],index:int):bat[:oid,:chr] ",
"STRbatChrAtcst;"
]
-[ "chrAt", "command", "batcalc",
"(s:bat[:oid,:str],index:bat[:oid,:int]):bat[:oid,:chr] ",
"STRbatChrAt;"
]
[ "chr", "command", "batcalc",
"(b:bat[:any_1,:chr]):bat[:any_1,:chr] ",
"CMDconvert_chr;"
]
[ "dbl", "command", "batcalc",
"(b:bat[:any_1,:flt]):bat[:any_1,:dbl] ",
"CMDconvert_flt_dbl;"
]
[ "dbl", "command", "batcalc",
"(b:bat[:any_1,:oid]):bat[:any_1,:dbl] ",
"CMDconvert_oid_dbl;"
]
@@ -1353,8 +1388,6 @@
[ "dbl", "command", "batcalc",
"(b:bat[:any_1,:sht]):bat[:any_1,:dbl] ",
"CMDconvert_sht_dbl;"
]
[ "dbl", "command", "batcalc",
"(b:bat[:any_1,:bte]):bat[:any_1,:dbl] ",
"CMDconvert_bte_dbl;"
]
[ "dbl", "command", "batcalc",
"(b:bat[:any_1,:dbl]):bat[:any_1,:dbl] ",
"CMDconvert_dbl;"
]
-[ "endsWith", "command", "batcalc",
"(s:bat[:oid,:str],suffix:str):bat[:oid,:bit] ",
"STRbatSuffixcst;"
]
-[ "endsWith", "command", "batcalc",
"(s:bat[:oid,:str],suffix:bat[:oid,:str]):bat[:oid,:bit] ",
"STRbatSuffix;"
]
[ "flt", "command", "batcalc",
"(b:bat[:any_1,:dbl]):bat[:any_1,:flt] ",
"CMDconvert_dbl_flt;"
]
[ "flt", "command", "batcalc",
"(b:bat[:any_1,:oid]):bat[:any_1,:flt] ",
"CMDconvert_oid_flt;"
]
[ "flt", "command", "batcalc",
"(b:bat[:any_1,:lng]):bat[:any_1,:flt] ",
"CMDconvert_lng_flt;"
]
@@ -1441,10 +1474,6 @@
[ "isnil", "command", "batcalc",
"(b:bat[:any_1,:sht]):bat[:any_1,:bit] ",
"CMDunaryISNIL;"
]
[ "isnil", "command", "batcalc",
"(b:bat[:any_1,:bte]):bat[:any_1,:bit] ",
"CMDunaryISNIL;"
]
[ "isnil", "command", "batcalc",
"(b:bat[:any_1,:oid]):bat[:any_1,:bit] ",
"CMDunaryISNIL;"
]
-[ "like", "command", "batcalc",
"(s:bat[:oid,:str],pat:str,esc:str):bat[:oid,:oid] ",
"STRbatlike;"
]
-[ "like", "command", "batcalc",
"(s:bat[:oid,:str],pat:str):bat[:oid,:oid] ",
"STRbatlike2;"
]
-[ "ltrim", "command", "batcalc",
"(s:bat[:oid,:str]):bat[:oid,:str] ",
"STRbatLtrim;"
]
-[ "length", "command", "batcalc",
"(s:bat[:oid,:str]):bat[:oid,:int] ",
"STRbatLength;"
]
[ "lng", "command", "batcalc",
"(b:bat[:any_1,:bit]):bat[:any_1,:lng] ",
"CMDconvert_bit_lng;"
]
[ "lng", "command", "batcalc",
"(b:bat[:any_1,:dbl]):bat[:any_1,:lng] ",
"CMDconvert_dbl_lng;"
]
[ "lng", "command", "batcalc",
"(b:bat[:any_1,:flt]):bat[:any_1,:lng] ",
"CMDconvert_flt_lng;"
]
@@ -1453,8 +1482,6 @@
[ "lng", "command", "batcalc",
"(b:bat[:any_1,:sht]):bat[:any_1,:lng] ",
"CMDconvert_sht_lng;"
]
[ "lng", "command", "batcalc",
"(b:bat[:any_1,:bte]):bat[:any_1,:lng] ",
"CMDconvert_bte_lng;"
]
[ "lng", "command", "batcalc",
"(b:bat[:any_1,:lng]):bat[:any_1,:lng] ",
"CMDconvert_lng;"
]
-[ "match", "command", "batcalc",
"(b:bat[:oid,:str],pat:str):bat[:oid,:bit] ",
"STRbatmatchCst;"
]
-[ "nbytes", "command", "batcalc",
"(s:bat[:oid,:str]):bat[:oid,:int] ",
"STRbatBytes;"
]
[ "not", "command", "batcalc",
"(a:bat[:any_1,:bit],b:bat[:any_1,:bit]):bat[:any_1,:bit] ",
"CMDbitbataccumNOT;"
]
[ "not", "command", "batcalc",
"(b:bat[:any_1,:bit]):bat[:any_1,:bit] ",
"CMDbitbatNOT;"
]
[ "oid", "command", "batcalc",
"(b:bat[:any_1,:lng]):bat[:any_1,:oid] ",
"CMDconvert_lng_oid;"
]
@@ -1497,18 +1524,6 @@
[ "or", "command", "batcalc",
"(a:bat[:oid,:oid],b:bat[:oid,:oid],cst:oid):bat[:oid,:oid] ",
"CMDbataccumORcst_oid_oid_oid;"
]
[ "or", "command", "batcalc",
"(a:bat[:oid,:oid],cst:oid,b:bat[:oid,:oid]):bat[:oid,:oid] ",
"CMDbataccumORcst2_oid_oid_oid;"
]
[ "or", "command", "batcalc",
"(a:bat[:oid,:oid],b:bat[:oid,:oid],c:bat[:oid,:oid]):bat[:oid,:oid] ",
"CMDbataccumOR_oid_oid_oid;"
]
-[ "r_search", "command", "batcalc",
"(s:bat[:oid,:str],c:str):bat[:oid,:int] ",
"STRbatRstrSearchcst;"
]
-[ "r_search", "command", "batcalc",
"(s:bat[:oid,:str],c:bat[:oid,:str]):bat[:oid,:int] ",
"STRbatRstrSearch;"
]
-[ "rtrim", "command", "batcalc",
"(s:bat[:oid,:str]):bat[:oid,:str] ",
"STRbatRtrim;"
]
-[ "substitute", "command", "batcalc",
"(s:bat[:oid,:str],src:str,dst:str,rep:bit):bat[:oid,:str] ",
"STRbatSubstitutecst;"
]
-[ "substring", "command", "batcalc",
"(s:bat[:oid,:str],start:int,index:int):bat[:oid,:str] ",
"STRbatsubstringcst;"
]
-[ "substring", "command", "batcalc",
"(s:bat[:oid,:str],start:bat[:oid,:int],index:bat[:oid,:int]):bat[:oid,:str] ",
"STRbatsubstring;"
]
-[ "string", "command", "batcalc",
"(b:bat[:oid,:str],offset:int):bat[:oid,:str] ",
"STRbatTailcst;"
]
-[ "string", "command", "batcalc",
"(b:bat[:oid,:str],offset:bat[:oid,:int]):bat[:oid,:str] ",
"STRbatTail;"
]
-[ "search", "command", "batcalc",
"(s:bat[:oid,:str],c:str):bat[:oid,:int] ",
"STRbatstrSearchcst;"
]
-[ "search", "command", "batcalc",
"(s:bat[:oid,:str],c:bat[:oid,:str]):bat[:oid,:int] ",
"STRbatstrSearch;"
]
-[ "startsWith", "command", "batcalc",
"(s:bat[:oid,:str],prefix:str):bat[:oid,:bit] ",
"STRbatPrefixcst;"
]
-[ "startsWith", "command", "batcalc",
"(s:bat[:oid,:str],prefix:bat[:oid,:str]):bat[:oid,:bit] ",
"STRbatPrefix;"
]
[ "sht", "command", "batcalc",
"(b:bat[:any_1,:bit]):bat[:any_1,:sht] ",
"CMDconvert_bit_sht;"
]
[ "sht", "command", "batcalc",
"(b:bat[:any_1,:dbl]):bat[:any_1,:sht] ",
"CMDconvert_dbl_sht;"
]
[ "sht", "command", "batcalc",
"(b:bat[:any_1,:flt]):bat[:any_1,:sht] ",
"CMDconvert_flt_sht;"
]
@@ -1518,11 +1533,6 @@
[ "sht", "command", "batcalc",
"(b:bat[:any_1,:bte]):bat[:any_1,:sht] ",
"CMDconvert_bte_sht;"
]
[ "str", "command", "batcalc",
"(b:bat[:any_1,:str]):bat[:any_1,:str] ",
"CMDconvert_str;"
]
[ "sht", "command", "batcalc",
"(b:bat[:any_1,:sht]):bat[:any_1,:sht] ",
"CMDconvert_sht;"
]
-[ "trim", "command", "batcalc",
"(s:bat[:oid,:str]):bat[:oid,:str] ",
"STRbatStrip;"
]
-[ "toUpper", "command", "batcalc",
"(s:bat[:oid,:str]):bat[:oid,:str] ",
"STRbatUpper;"
]
-[ "toLower", "command", "batcalc",
"(s:bat[:oid,:str]):bat[:oid,:str] ",
"STRbatLower;"
]
-[ "unicodeAt", "command", "batcalc",
"(s:bat[:oid,:str],index:int):bat[:oid,:int] ",
"STRbatWChrAtcst;"
]
-[ "unicodeAt", "command", "batcalc",
"(s:bat[:oid,:str],index:bat[:oid,:int]):bat[:oid,:int] ",
"STRbatWChrAt;"
]
[ "xml", "command", "batcalc",
"(src:bat[:oid,:str]):bat[:oid,:xml] ",
"BATXMLstr2xml;"
]
[ "xor", "command", "batcalc",
"(b:bat[:oid,:lng],c:bat[:oid,:lng]):bat[:oid,:lng] ",
"CMDbatXOR_lng_lng_lng;"
]
[ "xor", "command", "batcalc",
"(cst:lng,b:bat[:oid,:lng]):bat[:oid,:lng] ",
"CMDcstXORbat_lng_lng_lng;"
]
@@ -2954,6 +2964,7 @@
[ "indexjoin", "command", "algebra",
"(left:bat[:any_1,:any_2],right:bat[:any_2,:any_3]):bat[:any_1,:any_3] ",
"ALGindexjoin;"
]
[ "intersect", "command", "algebra",
"(left:bat[:any_1,:any_2],right:bat[:any_1,:any_2]):bat[:any_1,:any_2] ",
"ALGsintersect;"
]
[ "joinPath", "pattern", "algebra",
"(l:bat[:any,:any]...):bat[:any,:any] ",
"ALGjoinPath;"
]
+[ "join", "command", "algebra",
"(l:bat[:any_1,:any_2],rl:bat[:any_3,:any_2],rh:bat[:any_3,:any_2],li:bit,hi:bit):bat[:any_1,:any_3]
", "ALGrangejoin;"
]
[ "join", "command", "algebra",
"(left:bat[:any_1,:any_2],right:bat[:any_2,:any_3],estimate:lng):bat[:any_1,:any_3]
", "ALGjoinestimate;"
]
[ "join", "command", "algebra",
"(left:bat[:any_1,:any_2],right:bat[:any_2,:any_3]):bat[:any_1,:any_3] ",
"ALGjoin;"
]
[ "join", "command", "algebra",
"(left:bat[:any_1,:any_2],right:bat[:any_2,:any_3]):bat[:any_1,:any_3] ",
"ALGjoin;"
]
@@ -3358,14 +3369,14 @@
[ "cos", "command", "mmath",
"(x:flt):flt ",
"MATHunary_COSflt;"
]
[ "exp", "command", "mmath",
"(x:dbl):dbl ",
"MATHunary_EXPdbl;"
]
[ "exp", "command", "mmath",
"(x:flt):flt ",
"MATHunary_EXPflt;"
]
-[ "finite", "command", "mmath",
"(d:dbl):bit ",
"math_unary_FINITE;"
]
+[ "finite", "command", "mmath", "(d:dbl):bit
",
"MATHunary_FINITE;"
]
[ "fmod", "command", "mmath",
"(y:dbl,x:dbl):dbl ",
"MATHbinary_FMODdbl;"
]
[ "fmod", "command", "mmath",
"(y:flt,x:flt):flt ",
"MATHbinary_FMODflt;"
]
[ "floor", "command", "mmath",
"(y:dbl):dbl ",
"MATHunary_FLOORdbl;"
]
[ "floor", "command", "mmath",
"(y:flt):flt ",
"MATHunary_FLOORflt;"
]
[ "fabs", "command", "mmath",
"(y:dbl):dbl ",
"MATHunary_FABSdbl;"
]
-[ "isinf", "command", "mmath",
"(d:dbl):int ",
"math_unary_ISINF;"
]
-[ "isnan", "command", "mmath",
"(d:dbl):bit ",
"math_unary_ISNAN;"
]
+[ "isinf", "command", "mmath", "(d:dbl):int
",
"MATHunary_ISINF;"
]
+[ "isnan", "command", "mmath", "(d:dbl):bit
",
"MATHunary_ISNAN;"
]
[ "log10", "command", "mmath",
"(x:dbl):dbl ",
"MATHunary_LOG10dbl;"
]
[ "log10", "command", "mmath",
"(x:flt):flt ",
"MATHunary_LOG10flt;"
]
[ "log", "command", "mmath",
"(x:dbl):dbl ",
"MATHunary_LOGdbl;"
]
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
