Changeset: 7d0e8f44a892 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7d0e8f44a892
Modified Files:
        monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
Branch: default
Log Message:

Merge with Aug2011 branch.


diffs (truncated from 1103 to 300 lines):

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
@@ -30,95 +30,83 @@ end main;
 [ "main",                        "function",     "user",         "():void;",   
                                                                                
                                          "nil"                                 
                  ]
 [ "reverse",             "command",      "udf",          
"(b:bat[:oid,:str]):bat[:oid,:str] ",                                           
                                        "UDFBATreverse;"                        
        ]
 [ "reverse",             "command",      "udf",          "(ra1:str):str ",     
                                                                                
                  "UDFreverse;"                                   ]
-[ "reverse",             "command",      "udf",          
"(b:bat[:oid,:str]):bat[:oid,:str] ",                                           
                                        "UDFBATreverse;"                        
        ]
-[ "reverse",             "command",      "udf",          "(ra1:str):str ",     
                                                                                
                  "UDFreverse;"                                   ]
-[ "reverse",             "command",      "udf",          
"(b:bat[:oid,:str]):bat[:oid,:str] ",                                           
                                        "UDFBATreverse;"                        
        ]
-[ "reverse",             "command",      "udf",          "(ra1:str):str ",     
                                                                                
                  "UDFreverse;"                                   ]
-[ "reverse",             "command",      "udf",          
"(b:bat[:oid,:str]):bat[:oid,:str] ",                                           
                                        "UDFBATreverse;"                        
        ]
-[ "reverse",             "command",      "udf",          "(ra1:str):str ",     
                                                                                
                  "UDFreverse;"                                   ]
-[ "next_value",                  "pattern",      "batsql",       
"(sname:bat[:oid,:str],sequence:str):bat[:oid,:lng] ",                          
                "mvc_bat_next_value;"                           ]
-[ "reverse",             "command",      "udf",          
"(b:bat[:oid,:str]):bat[:oid,:str] ",                                           
                                        "UDFBATreverse;"                        
        ]
-[ "reverse",             "command",      "udf",          "(ra1:str):str ",     
                                                                                
                  "UDFreverse;"                                   ]
-[ "Area",                "command",      "geom",         "(g:wkb):dbl ",       
                                                                                
          "wkbArea;"                              ]
-[ "AsText",              "command",      "geom",         "(w:wkb):str ",       
                                                                                
          "wkbAsText;"                            ]
 [ "alpha",               "command",      "batsql",       
"(dec:bat[:oid,:dbl],theta:dbl):bat[:oid,:dbl] ",                               
                                        "SQLbat_alpha;"                         
        ]
-[ "Buffer",              "command",      "geom",         
"(a:wkb,distance:dbl):wkb ",                                                    
                                "wkbBuffer;"                            ]
-[ "Boundary",            "command",      "geom",         "(w:wkb):wkb ",       
                                                                                
          "wkbBoundary;"                          ]
-[ "alpha",               "command",      "batsql",       
"(dec:bat[:oid,:dbl],theta:dbl):bat[:oid,:dbl] ",                               
                                        "SQLbat_alpha;"                         
        ]
-[ "ConvexHull",                  "command",      "geom",         "(a:wkb):wkb 
",                                                                              
                   "wkbConvexHull;"                        ]
-[ "Contains",            "command",      "geom",         "(a:wkb,b:wkb):bit ", 
                                                                                
          "wkbContains;"                          ]
-[ "alpha",               "command",      "batsql",       
"(dec:bat[:oid,:dbl],theta:dbl):bat[:oid,:dbl] ",                               
                                        "SQLbat_alpha;"                         
        ]
-[ "Crosses",             "command",      "geom",         "(a:wkb,b:wkb):bit ", 
                                                                                
          "wkbCrosses;"                           ]
-[ "CurveFromText",       "function",     "geom",         
"(wkt:str,srid:sht):wkb;",                                                      
                                "nil"                                   ]
-[ "alpha",               "command",      "batsql",       
"(dec:bat[:oid,:dbl],theta:dbl):bat[:oid,:dbl] ",                               
                                        "SQLbat_alpha;"                         
        ]
-[ "Difference",                  "command",      "geom",         
"(a:wkb,b:wkb):wkb ",                                                           
                                "wkbDifference;"                        ]
-[ "Distance",            "command",      "geom",         "(a:wkb,b:wkb):dbl ", 
                                                                                
          "wkbDistance;"                          ]
-[ "Disjoint",            "command",      "geom",         "(a:wkb,b:wkb):bit ", 
                                                                                
          "wkbDisjoint;"                          ]
-[ "alpha",               "command",      "batsql",       
"(dec:bat[:oid,:dbl],theta:dbl):bat[:oid,:dbl] ",                               
                                        "SQLbat_alpha;"                         
        ]
-[ "Dimension",           "command",      "geom",         "(w:wkb):int ",       
                                                                                
          "wkbDimension;"                         ]
-[ "Equals",              "command",      "geom",         "(a:wkb,b:wkb):bit ", 
                                                                                
          "wkbEquals;"                            ]
-[ "Envelope",            "command",      "geom",         "(w:wkb):wkb ",       
                                                                                
          "wkbEnvelope;"                          ]
-[ "GeometryTypeId",      "command",      "geom",         "(w:wkb):int ",       
                                                                                
          "wkbGeometryTypeId;"                    ]
-[ "GeomCollectionFromText", "function",          "geom",         
"(wkt:str,srid:sht):wkb;",                                                      
                                "nil"                                   ]
-[ "GeomFromText",        "function",     "geom",         
"(wkt:str,srid:sht):wkb;",                                                      
                                "nil"                                   ]
-[ "Intersection",        "command",      "geom",         "(a:wkb,b:wkb):wkb ", 
                                                                                
          "wkbIntersection;"                      ]
-[ "Intersect",           "command",      "geom",         "(a:wkb,b:wkb):bit ", 
                                                                                
          "wkbIntersect;"                         ]
-[ "IsSimple",            "command",      "geom",         "(w:wkb):bit ",       
                                                                                
          "wkbIsSimple;"                          ]
-[ "IsEmpty",             "command",      "geom",         "(w:wkb):bit ",       
                                                                                
          "wkbIsEmpty;"                           ]
-[ "Length",              "command",      "geom",         "(g:wkb):dbl ",       
                                                                                
          "wkbLength;"                            ]
-[ "LineFromText",        "function",     "geom",         
"(wkt:str,srid:sht):wkb;",                                                      
                                "nil"                                   ]
-[ "MultiPolyFromText",   "function",     "geom",         
"(wkt:str,srid:sht):wkb;",                                                      
                                "nil"                                   ]
-[ "MultiSurfaceFromText", "function",    "geom",         
"(wkt:str,srid:sht):wkb;",                                                      
                                "nil"                                   ]
-[ "MultiLineFromText",   "function",     "geom",         
"(wkt:str,srid:sht):wkb;",                                                      
                                "nil"                                   ]
-[ "MultiCurveFromText",          "function",     "geom",         
"(wkt:str,srid:sht):wkb;",                                                      
                                "nil"                                   ]
-[ "MultiPointFromText",          "function",     "geom",         
"(wkt:str,srid:sht):wkb;",                                                      
                                "nil"                                   ]
-[ "Overlaps",            "command",      "geom",         "(a:wkb,b:wkb):bit ", 
                                                                                
          "wkbOverlaps;"                          ]
-[ "PolyFromText",        "function",     "geom",         
"(wkt:str,srid:sht):wkb;",                                                      
                                "nil"                                   ]
-[ "PointFromText",       "function",     "geom",         
"(wkt:str,srid:sht):wkb;",                                                      
                                "nil"                                   ]
-[ "Relate",              "command",      "geom",         
"(a:wkb,b:wkb,intersectionPatternMatrix:str):bit ",                             
                                "wkbRelate;"                            ]
-[ "SymDifference",       "command",      "geom",         "(a:wkb,b:wkb):wkb ", 
                                                                                
          "wkbSymDifference;"                     ]
-[ "SRID",                "command",      "geom",         "(w:wkb):int ",       
                                                                                
          "wkbSRID;"                              ]
-[ "SurfaceFromText",     "function",     "geom",         
"(wkt:str,srid:sht):wkb;",                                                      
                                "nil"                                   ]
-[ "Touches",             "command",      "geom",         "(a:wkb,b:wkb):bit ", 
                                                                                
          "wkbTouches;"                           ]
-[ "Union",               "command",      "geom",         "(a:wkb,b:wkb):wkb ", 
                                                                                
          "wkbUnion;"                             ]
-[ "Within",              "command",      "geom",         "(a:wkb,b:wkb):bit ", 
                                                                                
          "wkbWithin;"                            ]
-[ "X",                   "command",      "geom",         "(g:wkb):dbl ",       
                                                                                
          "wkbgetcoordX;"                         ]
-[ "Y",                   "command",      "geom",         "(g:wkb):dbl ",       
                                                                                
          "wkbgetcoordY;"                         ]
-[ "epilogue",            "command",      "geom",         "():void ",           
                                                                                
          "geom_epilogue;"                        ]
-[ "mbr",                 "command",      "geom",         "(_1:wkb):mbr ",      
                                                                                
          "wkbMBR;"                               ]
-[ "mbr",                 "command",      "geom",         
"(_1:flt,_2:flt,_3:flt,_4:flt):mbr ",                                           
                                "ordinatesMBR;"                         ]
-[ "mbroverlaps",         "command",      "geom",         "(a:mbr,b:mbr):bit ", 
                                                                                
          "mbroverlaps;"                          ]
-[ "prelude",             "command",      "geom",         "():void ",           
                                                                                
          "geom_prelude;"                         ]
-[ "point",               "command",      "geom",         "(x:dbl,y:dbl):wkb ", 
                                                                                
          "wkbcreatepoint;"                       ]
-[ "point",               "command",      "batgeom",      
"(x:bat[:oid,:dbl],y:bat[:oid,:dbl]):bat[:oid,:wkb] ",                          
                                "wkbcreatepoint_bat;"                   ]
-[ "#cmp",                "command",      "mbr",          "():int ",            
                                                                                
          "mbrCOMP;"                              ]
-[ "#fromstr",            "command",      "mbr",          "():mbr ",            
                                                                                
          "mbrFROMSTR;"                           ]
-[ "#hash",               "command",      "mbr",          "():int ",            
                                                                                
          "mbrHASH;"                              ]
-[ "mbr",                 "command",      "mbr",          "(v:str):mbr ",       
                                                                                
          "mbrFromString;"                        ]
-[ "#null",               "command",      "mbr",          "():int ",            
                                                                                
          "mbrNULL;"                              ]
-[ "#read",               "command",      "mbr",          "():void ",           
                                                                                
          "mbrREAD;"                              ]
-[ "#tostr",              "command",      "mbr",          "():str ",            
                                                                                
          "mbrTOSTR;"                             ]
-[ "#write",              "command",      "mbr",          "():void ",           
                                                                                
          "mbrWRITE;"                             ]
-[ "FromText",            "command",      "wkb",          "(w:str,type:int):wkb 
",                                                                              
          "wkbFromText;"                          ]
-[ "#cmp",                "command",      "wkb",          "():int ",            
                                                                                
          "wkbCOMP;"                              ]
-[ "#del",                "command",      "wkb",          "():int ",            
                                                                                
          "wkbDEL;"                               ]
-[ "#fromstr",            "command",      "wkb",          "():wkb ",            
                                                                                
          "wkbFROMSTR;"                           ]
-[ "#heap",               "command",      "wkb",          "():int ",            
                                                                                
          "wkbHEAP;"                              ]
-[ "#hash",               "command",      "wkb",          "():int ",            
                                                                                
          "wkbHASH;"                              ]
-[ "#length",             "command",      "wkb",          "():int ",            
                                                                                
          "wkbLENGTH;"                            ]
-[ "#null",               "command",      "wkb",          "():int ",            
                                                                                
          "wkbNULL;"                              ]
-[ "#put",                "command",      "wkb",          "():int ",            
                                                                                
          "wkbPUT;"                               ]
-[ "#read",               "command",      "wkb",          "():void ",           
                                                                                
          "wkbREAD;"                              ]
-[ "#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;"                   ]
+[ "Area",                "command",      "geom",                 "(g:wkb):dbl 
",                                                                         
"wkbArea;"                              ]
+[ "AsText",              "command",      "geom",                 "(w:wkb):str 
",                                                                         
"wkbAsText;"                            ]
+[ "Buffer",              "command",      "geom",                 
"(a:wkb,distance:dbl):wkb ",                                                    
        "wkbBuffer;"                            ]
+[ "Boundary",            "command",      "geom",                 "(w:wkb):wkb 
",                                                                         
"wkbBoundary;"                          ]
+[ "ConvexHull",                  "command",      "geom",                 
"(a:wkb):wkb ",                                                                 
        "wkbConvexHull;"                        ]
+[ "Contains",            "command",      "geom",                 
"(a:wkb,b:wkb):bit ",                                                           
        "wkbContains;"                          ]
+[ "Crosses",             "command",      "geom",                 
"(a:wkb,b:wkb):bit ",                                                           
        "wkbCrosses;"                           ]
+[ "CurveFromText",       "function",     "geom",                 
"(wkt:str,srid:sht):wkb;",                                                      
        "nil"                                   ]
+[ "Difference",                  "command",      "geom",                 
"(a:wkb,b:wkb):wkb ",                                                           
        "wkbDifference;"                        ]
+[ "Distance",            "command",      "geom",                 
"(a:wkb,b:wkb):dbl ",                                                           
        "wkbDistance;"                          ]
+[ "Disjoint",            "command",      "geom",                 
"(a:wkb,b:wkb):bit ",                                                           
        "wkbDisjoint;"                          ]
+[ "Dimension",           "command",      "geom",                 "(w:wkb):int 
",                                                                         
"wkbDimension;"                         ]
+[ "Equals",              "command",      "geom",                 
"(a:wkb,b:wkb):bit ",                                                           
        "wkbEquals;"                            ]
+[ "Envelope",            "command",      "geom",                 "(w:wkb):wkb 
",                                                                         
"wkbEnvelope;"                          ]
+[ "GeometryTypeId",      "command",      "geom",                 "(w:wkb):int 
",                                                                         
"wkbGeometryTypeId;"                    ]
+[ "GeomCollectionFromText", "function",          "geom",                 
"(wkt:str,srid:sht):wkb;",                                                      
        "nil"                                   ]
+[ "GeomFromText",        "function",     "geom",                 
"(wkt:str,srid:sht):wkb;",                                                      
        "nil"                                   ]
+[ "Intersection",        "command",      "geom",                 
"(a:wkb,b:wkb):wkb ",                                                           
        "wkbIntersection;"                      ]
+[ "Intersect",           "command",      "geom",                 
"(a:wkb,b:wkb):bit ",                                                           
        "wkbIntersect;"                         ]
+[ "IsSimple",            "command",      "geom",                 "(w:wkb):bit 
",                                                                         
"wkbIsSimple;"                          ]
+[ "IsEmpty",             "command",      "geom",                 "(w:wkb):bit 
",                                                                         
"wkbIsEmpty;"                           ]
+[ "Length",              "command",      "geom",                 "(g:wkb):dbl 
",                                                                         
"wkbLength;"                            ]
+[ "LineFromText",        "function",     "geom",                 
"(wkt:str,srid:sht):wkb;",                                                      
        "nil"                                   ]
+[ "MultiPolyFromText",   "function",     "geom",                 
"(wkt:str,srid:sht):wkb;",                                                      
        "nil"                                   ]
+[ "MultiSurfaceFromText", "function",    "geom",                 
"(wkt:str,srid:sht):wkb;",                                                      
        "nil"                                   ]
+[ "MultiLineFromText",   "function",     "geom",                 
"(wkt:str,srid:sht):wkb;",                                                      
        "nil"                                   ]
+[ "MultiCurveFromText",          "function",     "geom",                 
"(wkt:str,srid:sht):wkb;",                                                      
        "nil"                                   ]
+[ "MultiPointFromText",          "function",     "geom",                 
"(wkt:str,srid:sht):wkb;",                                                      
        "nil"                                   ]
+[ "Overlaps",            "command",      "geom",                 
"(a:wkb,b:wkb):bit ",                                                           
        "wkbOverlaps;"                          ]
+[ "PolyFromText",        "function",     "geom",                 
"(wkt:str,srid:sht):wkb;",                                                      
        "nil"                                   ]
+[ "PointFromText",       "function",     "geom",                 
"(wkt:str,srid:sht):wkb;",                                                      
        "nil"                                   ]
+[ "Relate",              "command",      "geom",                 
"(a:wkb,b:wkb,intersectionPatternMatrix:str):bit ",                             
        "wkbRelate;"                            ]
+[ "SymDifference",       "command",      "geom",                 
"(a:wkb,b:wkb):wkb ",                                                           
        "wkbSymDifference;"                     ]
+[ "SRID",                "command",      "geom",                 "(w:wkb):int 
",                                                                         
"wkbSRID;"                              ]
+[ "SurfaceFromText",     "function",     "geom",                 
"(wkt:str,srid:sht):wkb;",                                                      
        "nil"                                   ]
+[ "Touches",             "command",      "geom",                 
"(a:wkb,b:wkb):bit ",                                                           
        "wkbTouches;"                           ]
+[ "Union",               "command",      "geom",                 
"(a:wkb,b:wkb):wkb ",                                                           
        "wkbUnion;"                             ]
+[ "Within",              "command",      "geom",                 
"(a:wkb,b:wkb):bit ",                                                           
        "wkbWithin;"                            ]
+[ "X",                   "command",      "geom",                 "(g:wkb):dbl 
",                                                                         
"wkbgetcoordX;"                         ]
+[ "Y",                   "command",      "geom",                 "(g:wkb):dbl 
",                                                                         
"wkbgetcoordY;"                         ]
+[ "epilogue",            "command",      "geom",                 "():void ",   
                                                                          
"geom_epilogue;"                        ]
+[ "mbr",                 "command",      "geom",                 "(_1:wkb):mbr 
",                                                                        
"wkbMBR;"                               ]
+[ "mbr",                 "command",      "geom",                 
"(_1:flt,_2:flt,_3:flt,_4:flt):mbr ",                                           
        "ordinatesMBR;"                         ]
+[ "mbroverlaps",         "command",      "geom",                 
"(a:mbr,b:mbr):bit ",                                                           
        "mbroverlaps;"                          ]
+[ "prelude",             "command",      "geom",                 "():void ",   
                                                                          
"geom_prelude;"                         ]
+[ "point",               "command",      "geom",                 
"(x:dbl,y:dbl):wkb ",                                                           
        "wkbcreatepoint;"                       ]
+[ "point",               "command",      "batgeom",              
"(x:bat[:oid,:dbl],y:bat[:oid,:dbl]):bat[:oid,:wkb] ",                          
        "wkbcreatepoint_bat;"                   ]
+[ "#cmp",                "command",      "mbr",                  "():int ",    
                                                                          
"mbrCOMP;"                              ]
+[ "#fromstr",            "command",      "mbr",                  "():mbr ",    
                                                                          
"mbrFROMSTR;"                           ]
+[ "#hash",               "command",      "mbr",                  "():int ",    
                                                                          
"mbrHASH;"                              ]
+[ "mbr",                 "command",      "mbr",                  "(v:str):mbr 
",                                                                         
"mbrFromString;"                        ]
+[ "#null",               "command",      "mbr",                  "():int ",    
                                                                          
"mbrNULL;"                              ]
+[ "#read",               "command",      "mbr",                  "():void ",   
                                                                          
"mbrREAD;"                              ]
+[ "#tostr",              "command",      "mbr",                  "():str ",    
                                                                          
"mbrTOSTR;"                             ]
+[ "#write",              "command",      "mbr",                  "():void ",   
                                                                          
"mbrWRITE;"                             ]
+[ "FromText",            "command",      "wkb",                  
"(w:str,type:int):wkb ",                                                        
        "wkbFromText;"                          ]
+[ "#cmp",                "command",      "wkb",                  "():int ",    
                                                                          
"wkbCOMP;"                              ]
+[ "#del",                "command",      "wkb",                  "():int ",    
                                                                          
"wkbDEL;"                               ]
+[ "#fromstr",            "command",      "wkb",                  "():wkb ",    
                                                                          
"wkbFROMSTR;"                           ]
+[ "#heap",               "command",      "wkb",                  "():int ",    
                                                                          
"wkbHEAP;"                              ]
+[ "#hash",               "command",      "wkb",                  "():int ",    
                                                                          
"wkbHASH;"                              ]
+[ "#length",             "command",      "wkb",                  "():int ",    
                                                                          
"wkbLENGTH;"                            ]
+[ "#null",               "command",      "wkb",                  "():int ",    
                                                                          
"wkbNULL;"                              ]
+[ "#put",                "command",      "wkb",                  "():int ",    
                                                                          
"wkbPUT;"                               ]
+[ "#read",               "command",      "wkb",                  "():void ",   
                                                                          
"wkbREAD;"                              ]
+[ "#tostr",              "command",      "wkb",                  "():str ",    
                                                                          
"wkbTOSTR;"                             ]
+[ "wkb",                 "command",      "wkb",                  "(v:str):wkb 
",                                                                         
"wkbFromString;"                        ]
+[ "#write",              "command",      "wkb",                  "():void ",   
                                                                          
"wkbWRITE;"                             ]
 [ "bidding",                             "pattern",      "scheduler",    
"():bit ",                                                                      
                                                "OCTOPUSbidding;"               
                        ]
 [ "costPrediction",              "pattern",      "scheduler",    "(a:any):lng 
",                                                                              
                                           "RUNcostPrediction;"                 
                   ]
 [ "choice",                      "pattern",      "scheduler",    
"(arg:any...):void ",                                                           
                                                        "RUNchoice;"            
                                ]
 [ "choice",                      "pattern",      "scheduler",    "():void ",   
                                                                                
                                          "RUNchoice;"                          
                  ]
 [ "isolation",                   "pattern",      "scheduler",    "():void ",   
                                                                                
                                          "RUNisolation;"                       
                  ]
-[ "makeSchedule",                "pattern",      "scheduler",    
"(_1:int,_2:lng...):str... ",                                                   
                                "OCTOPUSmakeSchedule;"                          
]
-[ "octopus",             "pattern",      "scheduler",    "(t:int):bit ",       
                                                                                
          "OCTOPUSrun;"                           ]
+[ "makeSchedule",                "pattern",      "scheduler",    
"(_1:int,_2:lng...):str... ",                                                   
                                                        "OCTOPUSmakeSchedule;"  
                                ]
+[ "octopus",                     "pattern",      "scheduler",    "(t:int):bit 
",                                                                              
                           "OCTOPUSrun;"                           ]
 [ "pick",                        "pattern",      "scheduler",    
"(arg:any_1...):any_1 ",                                                        
                                                        "RUNpickResult;"        
                                ]
 [ "register",                            "pattern",      "scheduler",    
"():bit ",                                                                      
                                                "OCTOPUSdiscoverRegister;"      
                        ]
 [ "volumeCost",                          "pattern",      "scheduler",    
"(a:any):lng ",                                                                 
                                                        "RUNvolumeCost;"        
                                ]
@@ -132,26 +120,26 @@ end main;
 [ "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;"                     
                  ]
-[ "decode_y",                    "command",      "zorder",       
"(z:bat[:oid,:oid]):bat[:oid,:int] ",                                           
                                "ZORDbatdecode_int_oid_y;"                      
]
-[ "decode_y",                    "command",      "zorder",       "(z:oid):int 
",                                                                              
                   "ZORDdecode_int_oid_y;"                         ]
-[ "decode_x",                    "command",      "zorder",       
"(z:bat[:oid,:oid]):bat[:oid,:int] ",                                           
                                "ZORDbatdecode_int_oid_x;"                      
]
-[ "decode_x",                    "command",      "zorder",       "(z:oid):int 
",                                                                              
                   "ZORDdecode_int_oid_x;"                         ]
-[ "decode",                      "command",      "zorder",       
"(z:bat[:oid,:oid]) (_2:bat[:oid,:int],_3:bat[:oid,:int]) ",                    
                                "ZORDbatdecode_int_oid;"                        
]
-[ "decode",                      "command",      "zorder",       "(z:oid) 
(x:int,y:int) ",                                                                
                       "ZORDdecode_int_oid;"                           ]
-[ "encode",                      "command",      "zorder",       
"(x:bat[:oid,:int],y:bat[:oid,:int]):bat[:oid,:oid] ",                          
                                "ZORDbatencode_int_oid;"                        
]
-[ "encode",                      "command",      "zorder",       
"(x:int,y:int):oid ",                                                           
                                "ZORDencode_int_oid;"                           
]
-[ "slice",                       "command",      "zorder",       
"(xb:int,yb:int,xt:int,yt:int):bat[:oid,:oid] ",                                
                                "ZORDslice_int;"                                
]
-[ "sql_slice",                   "command",      "zorder",       
"(xb:int,yb:int,xt:int,yt:int):bat[:str,:BAT] ",                                
                                "ZORDsql_slice_int;"                            
]
-[ "append",              "command",      "tokenizer",    "(u:str):oid ",       
                                                                                
          "TKNZRappend;"                          ]
-[ "close",               "command",      "tokenizer",    "():void ",           
                                                                                
          "TKNZRclose;"                           ]
-[ "depositFile",         "command",      "tokenizer",    "(fnme:str):void ",   
                                                                                
          "TKNZRdepositFile;"                     ]
-[ "getCardinality",      "command",      "tokenizer",    "():bat[:void,:wrd] 
",                                                                              
            "TKNZRgetCardinality;"                  ]
-[ "getCount",            "command",      "tokenizer",    "():bat[:void,:wrd] 
",                                                                              
            "TKNZRgetCount;"                        ]
-[ "getIndex",            "command",      "tokenizer",    "():bat[:void,:oid] 
",                                                                              
            "TKNZRgetIndex;"                        ]
-[ "getLevel",            "command",      "tokenizer",    
"(i:int):bat[:oid,:str] ",                                                      
                                "TKNZRgetLevel;"                        ]
-[ "locate",              "pattern",      "tokenizer",    "(s:str):oid ",       
                                                                                
          "TKNZRlocate;"                          ]
-[ "open",                "command",      "tokenizer",    "(name:str):void ",   
                                                                                
          "TKNZRopen;"                            ]
-[ "take",                "pattern",      "tokenizer",    "(i:oid):str ",       
                                                                                
          "TKNZRtakeOid;"                         ]
+[ "decode_y",                    "command",      "zorder",       
"(z:bat[:oid,:oid]):bat[:oid,:int] ",                                           
                                                        
"ZORDbatdecode_int_oid_y;"                              ]
+[ "decode_y",                    "command",      "zorder",       "(z:oid):int 
",                                                                              
                                           "ZORDdecode_int_oid_y;"              
                   ]
+[ "decode_x",                    "command",      "zorder",       
"(z:bat[:oid,:oid]):bat[:oid,:int] ",                                           
                                                        
"ZORDbatdecode_int_oid_x;"                              ]
+[ "decode_x",                    "command",      "zorder",       "(z:oid):int 
",                                                                              
                                           "ZORDdecode_int_oid_x;"              
                   ]
+[ "decode",                      "command",      "zorder",       
"(z:bat[:oid,:oid]) (_2:bat[:oid,:int],_3:bat[:oid,:int]) ",                    
                                                        
"ZORDbatdecode_int_oid;"                                ]
+[ "decode",                      "command",      "zorder",       "(z:oid) 
(x:int,y:int) ",                                                                
                                               "ZORDdecode_int_oid;"            
                       ]
+[ "encode",                      "command",      "zorder",       
"(x:bat[:oid,:int],y:bat[:oid,:int]):bat[:oid,:oid] ",                          
                                                        
"ZORDbatencode_int_oid;"                                ]
+[ "encode",                      "command",      "zorder",       
"(x:int,y:int):oid ",                                                           
                                                        "ZORDencode_int_oid;"   
                                ]
+[ "slice",                       "command",      "zorder",       
"(xb:int,yb:int,xt:int,yt:int):bat[:oid,:oid] ",                                
                                                        "ZORDslice_int;"        
                                ]
+[ "sql_slice",                   "command",      "zorder",       
"(xb:int,yb:int,xt:int,yt:int):bat[:str,:BAT] ",                                
                                                        "ZORDsql_slice_int;"    
                                ]
+[ "append",                      "command",      "tokenizer",    "(u:str):oid 
",                                                                              
                                           "TKNZRappend;"                       
                   ]
+[ "close",                               "command",      "tokenizer",    
"():void ",                                                                     
                                        "TKNZRclose;"                           
                ]
+[ "depositFile",                         "command",      "tokenizer",    
"(fnme:str):void ",                                                             
                                        "TKNZRdepositFile;"                     
                ]
+[ "getCardinality",                      "command",      "tokenizer",    
"():bat[:void,:wrd] ",                                                          
                                                                
"TKNZRgetCardinality;"                                  ]
+[ "getCount",                            "command",      "tokenizer",    
"():bat[:void,:wrd] ",                                                          
                                                                
"TKNZRgetCount;"                                        ]
+[ "getIndex",                    "command",      "tokenizer",    
"():bat[:void,:oid] ",                                                          
                                                        "TKNZRgetIndex;"        
                                ]
+[ "getLevel",                            "command",      "tokenizer",    
"(i:int):bat[:oid,:str] ",                                                      
                                        "TKNZRgetLevel;"                        
                ]
+[ "locate",                              "pattern",      "tokenizer",    
"(s:str):oid ",                                                                 
                                        "TKNZRlocate;"                          
                ]
+[ "open",                                "command",      "tokenizer",    
"(name:str):void ",                                                             
                                        "TKNZRopen;"                            
                ]
+[ "take",                                "pattern",      "tokenizer",    
"(i:oid):str ",                                                                 
                                        "TKNZRtakeOid;"                         
                ]
 [ "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;"                                ]
@@ -187,177 +175,149 @@ end main;
 [ "split",                       "pattern",      "cluster",      
"(clustered:bat[:oid,:any_1],psum:bat[:oid,:wrd]):bat[:oid,:any_1]... ",        
                                                                                
                        "CLS_split;"                                    ]
 [ "table",                               "pattern",      "cluster",      
"(b:bat[:oid,:any]...):bat[:oid,:oid] ",                                        
                                        "CLUSTER_table;"                        
                ]
 [ "getCloud",                    "command",      "mapreduce",    
"(nme:str):bat[:oid,:str] ",                                                    
                                                        "MRgetCloud;"           
                                ]
+[ "multiplex",                   "pattern",      "mal",          
"(a:any...):any ",                                                              
                                                        "OPTremapMultiplex;"    
                                ]
 [ "alpha",               "command",      "sql",          
"(dec:dbl,theta:dbl):dbl ",                                                     
                                        "SQLdbl_alpha;"                         
        ]
-[ "multiplex",                   "pattern",      "mal",          
"(a:any...):any ",                                                              
                                                        "OPTremapMultiplex;"    
                                ]
-[ "argRecord",           "pattern",      "sql",          "(a:any...):str ",    
                                                                                
          "SQLargRecord;"                         ]
-[ "argRecord",           "pattern",      "sql",          "():str ",            
                                                                                
          "SQLargRecord;"                         ]
-[ "alpha",               "command",      "sql",          
"(dec:dbl,theta:dbl):dbl ",                                                     
                                        "SQLdbl_alpha;"                         
        ]
-[ "affectedRows",        "pattern",      "sql",          "(nr:wrd,w:str):void 
",                                                                              
           "mvc_affected_rows_wrap;"               ]
-[ "append",              "pattern",      "sql",          
"(mvc:ptr,sname:str,tname:str,cname:str,ins:any):ptr ",                         
                                "mvc_append_wrap;"                      ]
-[ "assert",              "pattern",      "sql",          "(b:lng,msg:str):void 
",                                                                              
          "SQLassertLng;"                         ]
-[ "alpha",               "command",      "sql",          
"(dec:dbl,theta:dbl):dbl ",                                                     
                                        "SQLdbl_alpha;"                         
        ]
-[ "assert",              "pattern",      "sql",          "(b:wrd,msg:str):void 
",                                                                              
          "SQLassertWrd;"                         ]
-[ "assert",              "pattern",      "sql",          "(b:int,msg:str):void 
",                                                                              
          "SQLassertInt;"                         ]
-[ "assert",              "pattern",      "sql",          "(b:bit,msg:str):void 
",                                                                              
          "SQLassert;"                            ]
-[ "alpha",               "command",      "sql",          
"(dec:dbl,theta:dbl):dbl ",                                                     
                                        "SQLdbl_alpha;"                         
        ]
-[ "bbp",                 "function",     "sql",          "():bat[:str,:BAT];", 
                                                                                
          "nil"                                   ]
-[ "bind_dbat",           "command",      "sql",          
"(clientid:int,schema:str,table:str,access:int,oldversion:lng,version:lng):bat[:oid,:oid]
 ",                    "mvc_diff_dbat_wrap;"                   ]
-[ "bind",                "pattern",      "sql",          
"(mvc:ptr,schema:str,table:str,column:str,access:int,part_nr:int,nr_parts:int):bat[:oid,:any_1]
 ",              "mvc_bind_wrap;"                        ]
-[ "bind",                "pattern",      "sql",          
"(mvc:ptr,schema:str,table:str,column:str,access:int,low:oid,hgh:oid):bat[:oid,:any_1]
 ",                       "mvc_bind_wrap;"                        ]
-[ "alpha",               "command",      "sql",          
"(dec:dbl,theta:dbl):dbl ",                                                     
                                        "SQLdbl_alpha;"                         
        ]
-[ "bind",                "pattern",      "sql",          
"(mvc:ptr,schema:str,table:str,column:str,access:int):bat[:oid,:any_1] ",       
                                "mvc_bind_wrap;"                        ]
-[ "bind_idxbat",         "pattern",      "sql",          
"(mvc:ptr,schema:str,table:str,index:str,access:int,part_nr:int,nr_parts:int):bat[:oid,:any_1]
 ",               "mvc_bind_idxbat_wrap;"                 ]
-[ "bind_idxbat",         "pattern",      "sql",          
"(mvc:ptr,schema:str,table:str,index:str,access:int,low:oid,hgh:oid):bat[:oid,:any_1]
 ",                        "mvc_bind_idxbat_wrap;"                 ]
-[ "bind_idxbat",         "pattern",      "sql",          
"(mvc:ptr,schema:str,table:str,index:str,access:int):bat[:oid,:any_1] ",        
                                "mvc_bind_idxbat_wrap;"                 ]
-[ "bind_dbat",           "pattern",      "sql",          
"(mvc:ptr,schema:str,table:str,access:int):bat[:oid,:oid] ",                    
                                "mvc_bind_dbat_wrap;"                   ]
-[ "cluster2",            "pattern",      "sql",          
"(sch:str,tbl:str):void ",                                                      
                                "SQLcluster2;"                          ]
-[ "cluster1",            "pattern",      "sql",          
"(sch:str,tbl:str):void ",                                                      
                                "SQLcluster1;"                          ]
-[ "clients",             "function",     "sql",          "():bat[:str,:BAT];", 
                                                                                
          "nil"                                   ]
-[ "copyfrom",            "function",     "sql",          
"(sname:str,tname:str,tsep:str,rsep:str,ssep:str,ns:str,nr:lng,offset:lng,locked:int):bat[:str,:BAT];",
         "nil"                                   ]
-[ "copy_from",           "function",     "sql",          
"(sname:str,tname:str,tsep:str,rsep:str,ssep:str,ns:str,fname:str,nr:lng,offset:lng,locked:int):bat[:str,:BAT];",
 "nil"                                         ]
-[ "columnBind",                  "command",      "sql",          
"(b:bat[:str,:BAT],nme:str):bat[:oid,:any_1] ",                                 
                                "mvc_bind_single_wrap;"                 ]
-[ "clear_table",         "pattern",      "sql",          
"(sname:str,tname:str):wrd ",                                                   
                                "mvc_clear_table_wrap;"                 ]
-[ "catalog",             "pattern",      "sql",          
"(type:int,iname:str,itype:int,sname:str,tname:str...):void ",                  
                                "SQLcatalog;"                           ]
-[ "catalog",             "pattern",      "sql",          
"(type:int,tname:str,grantee:str,privs:int,cname:str,grant:int,grantor:int):void
 ",                             "SQLcatalog;"                           ]
+[ "argRecord",           "pattern",      "sql",                  
"(a:any...):str ",                                                              
        "SQLargRecord;"                         ]
+[ "argRecord",           "pattern",      "sql",                  "():str ",    
                                                                          
"SQLargRecord;"                         ]
+[ "affectedRows",                "pattern",      "sql",          
"(mvc:int,nr:wrd,w:str):int ",                                                  
                                "mvc_affected_rows_wrap;"                       
]
+[ "append",                      "pattern",      "sql",          
"(mvc:int,sname:str,tname:str,cname:str,ins:any):int ",                         
                                "mvc_append_wrap;"                              
]
+[ "assert",              "pattern",      "sql",                  
"(b:lng,msg:str):void ",                                                        
        "SQLassertLng;"                         ]
+[ "assert",              "pattern",      "sql",                  
"(b:wrd,msg:str):void ",                                                        
        "SQLassertWrd;"                         ]
+[ "assert",              "pattern",      "sql",                  
"(b:int,msg:str):void ",                                                        
        "SQLassertInt;"                         ]
+[ "assert",              "pattern",      "sql",                  
"(b:bit,msg:str):void ",                                                        
        "SQLassert;"                            ]
+[ "bbp",                 "function",     "sql",                  
"():bat[:str,:BAT];",                                                           
        "nil"                                   ]
+[ "bind_dbat",           "command",      "sql",                  
"(clientid:int,schema:str,table:str,access:int,oldversion:lng,version:lng):bat[:oid,:oid]
 ", "mvc_diff_dbat_wrap;"                      ]
+[ "bind",                        "pattern",      "sql",          
"(mvc:int,schema:str,table:str,column:str,access:int,part_nr:int,nr_parts:int):bat[:oid,:any_1]
 ",              "mvc_bind_wrap;"                                ]
+[ "bind",                        "pattern",      "sql",          
"(mvc:int,schema:str,table:str,column:str,access:int,low:oid,hgh:oid):bat[:oid,:any_1]
 ",                       "mvc_bind_wrap;"                                ]
+[ "bind",                        "pattern",      "sql",          
"(mvc:int,schema:str,table:str,column:str,access:int):bat[:oid,:any_1] ",       
                                "mvc_bind_wrap;"                                
]
+[ "bind_idxbat",                 "pattern",      "sql",          
"(mvc:int,schema:str,table:str,index:str,access:int,part_nr:int,nr_parts:int):bat[:oid,:any_1]
 ",               "mvc_bind_idxbat_wrap;"                         ]
+[ "bind_idxbat",                 "pattern",      "sql",          
"(mvc:int,schema:str,table:str,index:str,access:int,low:oid,hgh:oid):bat[:oid,:any_1]
 ",                        "mvc_bind_idxbat_wrap;"                         ]
+[ "bind_idxbat",                 "pattern",      "sql",          
"(mvc:int,schema:str,table:str,index:str,access:int):bat[:oid,:any_1] ",        
                                "mvc_bind_idxbat_wrap;"                         
]
+[ "bind_dbat",                   "pattern",      "sql",          
"(mvc:int,schema:str,table:str,access:int):bat[:oid,:oid] ",                    
                                "mvc_bind_dbat_wrap;"                           
]
+[ "cluster2",            "pattern",      "sql",                  
"(sch:str,tbl:str):void ",                                                      
        "SQLcluster2;"                          ]
+[ "cluster1",            "pattern",      "sql",                  
"(sch:str,tbl:str):void ",                                                      
        "SQLcluster1;"                          ]
+[ "clients",             "function",     "sql",                  
"():bat[:str,:BAT];",                                                           
        "nil"                                   ]
+[ "copyfrom",            "function",     "sql",                  
"(sname:str,tname:str,tsep:str,rsep:str,ssep:str,ns:str,nr:lng,offset:lng,locked:int):bat[:str,:BAT];",
 "nil"                                   ]
+[ "copy_from",           "function",     "sql",                  
"(sname:str,tname:str,tsep:str,rsep:str,ssep:str,ns:str,fname:str,nr:lng,offset:lng,locked:int):bat[:str,:BAT];",
 "nil"                                         ]
+[ "columnBind",                  "command",      "sql",                  
"(b:bat[:str,:BAT],nme:str):bat[:oid,:any_1] ",                                 
        "mvc_bind_single_wrap;"                 ]
+[ "clear_table",         "pattern",      "sql",                  
"(sname:str,tname:str):wrd ",                                                   
        "mvc_clear_table_wrap;"                 ]
+[ "catalog",                     "pattern",      "sql",          
"(type:int,iname:str,itype:int,sname:str,tname:str...):void ",                  
                                        "SQLcatalog;"                           
]
+[ "catalog",                     "pattern",      "sql",          
"(type:int,tname:str,grantee:str,privs:int,cname:str,grant:int,grantor:int):void
 ",                                     "SQLcatalog;"                           
]
+[ "catalog",                     "pattern",      "sql",          
"(type:int,user:str,passwd:str,enc:int,schema:str,fullname:str):void ",         
                                        "SQLcatalog;"                           
]
+[ "catalog",                     "pattern",      "sql",          
"(type:int,grantee:str,role:str):void ",                                        
                                        "SQLcatalog;"                           
]
+[ "catalog",             "pattern",      "sql",                  
"(type:int,sname:str,t:ptr,restart:lng):void ",                                 
        "SQLcatalog;"                           ]
+[ "catalog",             "pattern",      "sql",                  
"(type:int,sname:str,t:ptr,temp:int):void ",                                    
        "SQLcatalog;"                           ]
+[ "catalog",             "pattern",      "sql",                  
"(type:int,sname:str,name:str,action:int):void ",                               
        "SQLcatalog;"                           ]
 [ "commit",              "pattern",      "sql",          "():void ",           
                                                                                
                  "SQLcommit;"                                    ]
-[ "catalog",             "pattern",      "sql",          
"(type:int,user:str,passwd:str,enc:int,schema:str,fullname:str):void ",         
                                "SQLcatalog;"                           ]
-[ "catalog",             "pattern",      "sql",          
"(type:int,grantee:str,role:str):void ",                                        
                                "SQLcatalog;"                           ]
-[ "catalog",             "pattern",      "sql",          
"(type:int,sname:str,t:ptr,restart:lng):void ",                                 
                                "SQLcatalog;"                           ]
-[ "catalog",             "pattern",      "sql",          
"(type:int,sname:str,t:ptr,temp:int):void ",                                    
                                "SQLcatalog;"                           ]
-[ "commit",              "pattern",      "sql",          "():void ",           
                                                                                
                  "SQLcommit;"                                    ]
-[ "catalog",             "pattern",      "sql",          
"(type:int,sname:str,name:str,action:int):void ",                               
                                "SQLcatalog;"                           ]
-[ "dropdictionary",      "pattern",      "sql",          
"(sch:str,tbl:str):void ",                                                      
                                "SQLdropDictionary;"                    ]
-[ "drop_hash",           "pattern",      "sql",          
"(sch:str,tbl:str):void ",                                                      
                                "SQLdrop_hash;"                         ]
-[ "dense_rank",                  "command",      "sql",          
"(b:bat[:oid,:any_1]):bat[:oid,:int] ",                                         
                                "sql_dense_rank;"                       ]
-[ "commit",              "pattern",      "sql",          "():void ",           
                                                                                
                  "SQLcommit;"                                    ]
-[ "dense_rank_grp",      "command",      "sql",          
"(b:bat[:oid,:any_1],gp:bat[:oid,:oid],gpe:bat[:oid,:oid]):bat[:oid,:int] ",    
                                "sql_dense_rank_grp;"                   ]
-[ "dec_round",           "command",      "sql",          "(v:dbl,r:dbl):dbl ", 
                                                                                
          "dbl_dec_round_wrap;"                   ]
-[ "dec_round",           "command",      "sql",          "(v:flt,r:flt):flt ", 
                                                                                
          "flt_dec_round_wrap;"                   ]
-[ "dec_round",           "command",      "sql",          "(v:lng,r:lng):lng ", 
                                                                                
          "lng_dec_round_wrap;"                   ]
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to