Changeset: a331af9e20ea for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a331af9e20ea Modified Files: monetdb5/modules/mal/batcalc.mal monetdb5/modules/mal/batcalc.mal.sh Branch: int128 Log Message:
backing-out changeset 77c9c3da562c: Unfortunately, MonetDB / mserver5 / MAL parser / MAL interpreter is/are unable to handle the new monetdb5/modules/mal/batcalc.mal correctly. When starting the server, it complains about !TypeException:jaqlfunc.count[7]:'batcalc.lng' undefined in: r:any := batcalc.lng(x:bat[:oid,:wrd]) although the respective batcalc.lng(x:bat[:oid,:wrd]) is in monetdb5/modules/mal/batcalc.mal . Some tests indicate that the systems (MAL parser ?) has some problems handling MAL files >= ~1 MB correctly, but I did not manage to locate the actual nature or origin of the problem. Any help to get this working is highly appreciated. diffs (truncated from 7625 to 300 lines): diff --git a/monetdb5/modules/mal/batcalc.mal b/monetdb5/modules/mal/batcalc.mal --- a/monetdb5/modules/mal/batcalc.mal +++ b/monetdb5/modules/mal/batcalc.mal @@ -54,13 +54,6 @@ pattern iszero(b:bat[:oid,:lng],s:bat[:o address CMDbatISZERO comment "Unary check for zero over the tail of the bat with candidates list"; -pattern iszero(b:bat[:oid,:hge]) :bat[:oid,:bit] -address CMDbatISZERO -comment "Unary check for zero over the tail of the bat"; -pattern iszero(b:bat[:oid,:hge],s:bat[:oid,:oid]) :bat[:oid,:bit] -address CMDbatISZERO -comment "Unary check for zero over the tail of the bat with candidates list"; - pattern iszero(b:bat[:oid,:flt]) :bat[:oid,:bit] address CMDbatISZERO comment "Unary check for zero over the tail of the bat"; @@ -118,13 +111,6 @@ pattern isnil(b:bat[:oid,:lng],s:bat[:oi address CMDbatISNIL comment "Unary check for nil over the tail of the bat with candidates list"; -pattern isnil(b:bat[:oid,:hge]) :bat[:oid,:bit] -address CMDbatISNIL -comment "Unary check for nil over the tail of the bat"; -pattern isnil(b:bat[:oid,:hge],s:bat[:oid,:oid]) :bat[:oid,:bit] -address CMDbatISNIL -comment "Unary check for nil over the tail of the bat with candidates list"; - pattern isnil(b:bat[:oid,:flt]) :bat[:oid,:bit] address CMDbatISNIL comment "Unary check for nil over the tail of the bat"; @@ -196,13 +182,6 @@ pattern not(b:bat[:oid,:lng],s:bat[:oid, address CMDbatNOT comment "Unary bitwise not over the tail of the bat with candidates list"; -pattern not(b:bat[:oid,:hge]) :bat[:oid,:hge] -address CMDbatNOT -comment "Unary bitwise not over the tail of the bat"; -pattern not(b:bat[:oid,:hge],s:bat[:oid,:oid]) :bat[:oid,:hge] -address CMDbatNOT -comment "Unary bitwise not over the tail of the bat with candidates list"; - pattern sign(b:bat[:oid,:bte]) :bat[:oid,:bte] address CMDbatSIGN @@ -239,13 +218,6 @@ pattern sign(b:bat[:oid,:lng],s:bat[:oid address CMDbatSIGN comment "Unary sign (-1,0,1) over the tail of the bat with candidates list"; -pattern sign(b:bat[:oid,:hge]) :bat[:oid,:bte] -address CMDbatSIGN -comment "Unary sign (-1,0,1) over the tail of the bat"; -pattern sign(b:bat[:oid,:hge],s:bat[:oid,:oid]) :bat[:oid,:bte] -address CMDbatSIGN -comment "Unary sign (-1,0,1) over the tail of the bat with candidates list"; - pattern sign(b:bat[:oid,:flt]) :bat[:oid,:bte] address CMDbatSIGN comment "Unary sign (-1,0,1) over the tail of the bat"; @@ -296,13 +268,6 @@ pattern abs(b:bat[:oid,:lng],s:bat[:oid, address CMDbatABS comment "Unary abs over the tail of the bat with candidates list"; -pattern abs(b:bat[:oid,:hge]) :bat[:oid,:hge] -address CMDbatABS -comment "Unary abs over the tail of the bat"; -pattern abs(b:bat[:oid,:hge],s:bat[:oid,:oid]) :bat[:oid,:hge] -address CMDbatABS -comment "Unary abs over the tail of the bat with candidates list"; - pattern abs(b:bat[:oid,:flt]) :bat[:oid,:flt] address CMDbatABS comment "Unary abs over the tail of the bat"; @@ -353,13 +318,6 @@ pattern -(b:bat[:oid,:lng],s:bat[:oid,:o address CMDbatNEG comment "Unary neg over the tail of the bat with candidates list"; -pattern -(b:bat[:oid,:hge]) :bat[:oid,:hge] -address CMDbatNEG -comment "Unary neg over the tail of the bat"; -pattern -(b:bat[:oid,:hge],s:bat[:oid,:oid]) :bat[:oid,:hge] -address CMDbatNEG -comment "Unary neg over the tail of the bat with candidates list"; - pattern -(b:bat[:oid,:flt]) :bat[:oid,:flt] address CMDbatNEG comment "Unary neg over the tail of the bat"; @@ -410,13 +368,6 @@ pattern ++(b:bat[:oid,:lng],s:bat[:oid,: address CMDbatINCR comment "Unary increment over the tail of the bat with candidates list"; -pattern ++(b:bat[:oid,:hge]) :bat[:oid,:hge] -address CMDbatINCR -comment "Unary increment over the tail of the bat"; -pattern ++(b:bat[:oid,:hge],s:bat[:oid,:oid]) :bat[:oid,:hge] -address CMDbatINCR -comment "Unary increment over the tail of the bat with candidates list"; - pattern ++(b:bat[:oid,:flt]) :bat[:oid,:flt] address CMDbatINCR comment "Unary increment over the tail of the bat"; @@ -467,13 +418,6 @@ pattern --(b:bat[:oid,:lng],s:bat[:oid,: address CMDbatDECR comment "Unary decrement over the tail of the bat with candidates list"; -pattern --(b:bat[:oid,:hge]) :bat[:oid,:hge] -address CMDbatDECR -comment "Unary decrement over the tail of the bat"; -pattern --(b:bat[:oid,:hge],s:bat[:oid,:oid]) :bat[:oid,:hge] -address CMDbatDECR -comment "Unary decrement over the tail of the bat with candidates list"; - pattern --(b:bat[:oid,:flt]) :bat[:oid,:flt] address CMDbatDECR comment "Unary decrement over the tail of the bat"; @@ -546,25 +490,6 @@ pattern +(v:bte,b:bat[:oid,:int],s:bat[: address CMDbatADDenlarge comment "Return V + B with candidates list, guarantee no overflow by returning larger type"; -pattern +(b1:bat[:oid,:bte],b2:bat[:oid,:lng]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return B1 + B2, guarantee no overflow by returning larger type"; -pattern +(b1:bat[:oid,:bte],b2:bat[:oid,:lng],s:bat[:oid,:oid]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return B1 + B2 with candidates list, guarantee no overflow by returning larger type"; -pattern +(b:bat[:oid,:bte],v:lng) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return B + V, guarantee no overflow by returning larger type"; -pattern +(b:bat[:oid,:bte],v:lng,s:bat[:oid,:oid]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return B + V with candidates list, guarantee no overflow by returning larger type"; -pattern +(v:bte,b:bat[:oid,:lng]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return V + B, guarantee no overflow by returning larger type"; -pattern +(v:bte,b:bat[:oid,:lng],s:bat[:oid,:oid]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return V + B with candidates list, guarantee no overflow by returning larger type"; - pattern +(b1:bat[:oid,:bte],b2:bat[:oid,:flt]) :bat[:oid,:dbl] address CMDbatADDenlarge comment "Return B1 + B2, guarantee no overflow by returning larger type"; @@ -641,25 +566,6 @@ pattern +(v:sht,b:bat[:oid,:int],s:bat[: address CMDbatADDenlarge comment "Return V + B with candidates list, guarantee no overflow by returning larger type"; -pattern +(b1:bat[:oid,:sht],b2:bat[:oid,:lng]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return B1 + B2, guarantee no overflow by returning larger type"; -pattern +(b1:bat[:oid,:sht],b2:bat[:oid,:lng],s:bat[:oid,:oid]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return B1 + B2 with candidates list, guarantee no overflow by returning larger type"; -pattern +(b:bat[:oid,:sht],v:lng) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return B + V, guarantee no overflow by returning larger type"; -pattern +(b:bat[:oid,:sht],v:lng,s:bat[:oid,:oid]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return B + V with candidates list, guarantee no overflow by returning larger type"; -pattern +(v:sht,b:bat[:oid,:lng]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return V + B, guarantee no overflow by returning larger type"; -pattern +(v:sht,b:bat[:oid,:lng],s:bat[:oid,:oid]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return V + B with candidates list, guarantee no overflow by returning larger type"; - pattern +(b1:bat[:oid,:sht],b2:bat[:oid,:flt]) :bat[:oid,:dbl] address CMDbatADDenlarge comment "Return B1 + B2, guarantee no overflow by returning larger type"; @@ -736,25 +642,6 @@ pattern +(v:int,b:bat[:oid,:int],s:bat[: address CMDbatADDenlarge comment "Return V + B with candidates list, guarantee no overflow by returning larger type"; -pattern +(b1:bat[:oid,:int],b2:bat[:oid,:lng]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return B1 + B2, guarantee no overflow by returning larger type"; -pattern +(b1:bat[:oid,:int],b2:bat[:oid,:lng],s:bat[:oid,:oid]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return B1 + B2 with candidates list, guarantee no overflow by returning larger type"; -pattern +(b:bat[:oid,:int],v:lng) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return B + V, guarantee no overflow by returning larger type"; -pattern +(b:bat[:oid,:int],v:lng,s:bat[:oid,:oid]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return B + V with candidates list, guarantee no overflow by returning larger type"; -pattern +(v:int,b:bat[:oid,:lng]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return V + B, guarantee no overflow by returning larger type"; -pattern +(v:int,b:bat[:oid,:lng],s:bat[:oid,:oid]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return V + B with candidates list, guarantee no overflow by returning larger type"; - pattern +(b1:bat[:oid,:int],b2:bat[:oid,:flt]) :bat[:oid,:dbl] address CMDbatADDenlarge comment "Return B1 + B2, guarantee no overflow by returning larger type"; @@ -774,82 +661,6 @@ pattern +(v:int,b:bat[:oid,:flt],s:bat[: address CMDbatADDenlarge comment "Return V + B with candidates list, guarantee no overflow by returning larger type"; -pattern +(b1:bat[:oid,:lng],b2:bat[:oid,:bte]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return B1 + B2, guarantee no overflow by returning larger type"; -pattern +(b1:bat[:oid,:lng],b2:bat[:oid,:bte],s:bat[:oid,:oid]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return B1 + B2 with candidates list, guarantee no overflow by returning larger type"; -pattern +(b:bat[:oid,:lng],v:bte) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return B + V, guarantee no overflow by returning larger type"; -pattern +(b:bat[:oid,:lng],v:bte,s:bat[:oid,:oid]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return B + V with candidates list, guarantee no overflow by returning larger type"; -pattern +(v:lng,b:bat[:oid,:bte]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return V + B, guarantee no overflow by returning larger type"; -pattern +(v:lng,b:bat[:oid,:bte],s:bat[:oid,:oid]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return V + B with candidates list, guarantee no overflow by returning larger type"; - -pattern +(b1:bat[:oid,:lng],b2:bat[:oid,:sht]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return B1 + B2, guarantee no overflow by returning larger type"; -pattern +(b1:bat[:oid,:lng],b2:bat[:oid,:sht],s:bat[:oid,:oid]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return B1 + B2 with candidates list, guarantee no overflow by returning larger type"; -pattern +(b:bat[:oid,:lng],v:sht) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return B + V, guarantee no overflow by returning larger type"; -pattern +(b:bat[:oid,:lng],v:sht,s:bat[:oid,:oid]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return B + V with candidates list, guarantee no overflow by returning larger type"; -pattern +(v:lng,b:bat[:oid,:sht]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return V + B, guarantee no overflow by returning larger type"; -pattern +(v:lng,b:bat[:oid,:sht],s:bat[:oid,:oid]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return V + B with candidates list, guarantee no overflow by returning larger type"; - -pattern +(b1:bat[:oid,:lng],b2:bat[:oid,:int]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return B1 + B2, guarantee no overflow by returning larger type"; -pattern +(b1:bat[:oid,:lng],b2:bat[:oid,:int],s:bat[:oid,:oid]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return B1 + B2 with candidates list, guarantee no overflow by returning larger type"; -pattern +(b:bat[:oid,:lng],v:int) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return B + V, guarantee no overflow by returning larger type"; -pattern +(b:bat[:oid,:lng],v:int,s:bat[:oid,:oid]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return B + V with candidates list, guarantee no overflow by returning larger type"; -pattern +(v:lng,b:bat[:oid,:int]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return V + B, guarantee no overflow by returning larger type"; -pattern +(v:lng,b:bat[:oid,:int],s:bat[:oid,:oid]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return V + B with candidates list, guarantee no overflow by returning larger type"; - -pattern +(b1:bat[:oid,:lng],b2:bat[:oid,:lng]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return B1 + B2, guarantee no overflow by returning larger type"; -pattern +(b1:bat[:oid,:lng],b2:bat[:oid,:lng],s:bat[:oid,:oid]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return B1 + B2 with candidates list, guarantee no overflow by returning larger type"; -pattern +(b:bat[:oid,:lng],v:lng) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return B + V, guarantee no overflow by returning larger type"; -pattern +(b:bat[:oid,:lng],v:lng,s:bat[:oid,:oid]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return B + V with candidates list, guarantee no overflow by returning larger type"; -pattern +(v:lng,b:bat[:oid,:lng]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return V + B, guarantee no overflow by returning larger type"; -pattern +(v:lng,b:bat[:oid,:lng],s:bat[:oid,:oid]) :bat[:oid,:hge] -address CMDbatADDenlarge -comment "Return V + B with candidates list, guarantee no overflow by returning larger type"; - pattern +(b1:bat[:oid,:lng],b2:bat[:oid,:flt]) :bat[:oid,:dbl] address CMDbatADDenlarge comment "Return B1 + B2, guarantee no overflow by returning larger type"; @@ -869,25 +680,6 @@ pattern +(v:lng,b:bat[:oid,:flt],s:bat[: address CMDbatADDenlarge comment "Return V + B with candidates list, guarantee no overflow by returning larger type"; -pattern +(b1:bat[:oid,:hge],b2:bat[:oid,:flt]) :bat[:oid,:dbl] -address CMDbatADDenlarge -comment "Return B1 + B2, guarantee no overflow by returning larger type"; -pattern +(b1:bat[:oid,:hge],b2:bat[:oid,:flt],s:bat[:oid,:oid]) :bat[:oid,:dbl] -address CMDbatADDenlarge -comment "Return B1 + B2 with candidates list, guarantee no overflow by returning larger type"; -pattern +(b:bat[:oid,:hge],v:flt) :bat[:oid,:dbl] -address CMDbatADDenlarge -comment "Return B + V, guarantee no overflow by returning larger type"; -pattern +(b:bat[:oid,:hge],v:flt,s:bat[:oid,:oid]) :bat[:oid,:dbl] -address CMDbatADDenlarge -comment "Return B + V with candidates list, guarantee no overflow by returning larger type"; -pattern +(v:hge,b:bat[:oid,:flt]) :bat[:oid,:dbl] -address CMDbatADDenlarge -comment "Return V + B, guarantee no overflow by returning larger type"; -pattern +(v:hge,b:bat[:oid,:flt],s:bat[:oid,:oid]) :bat[:oid,:dbl] -address CMDbatADDenlarge -comment "Return V + B with candidates list, guarantee no overflow by returning larger type"; - pattern +(b1:bat[:oid,:flt],b2:bat[:oid,:bte]) :bat[:oid,:dbl] _______________________________________________ checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
