Changeset: 0a075d382bdc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0a075d382bdc
Added Files:
monetdb5/modules/kernel/Tests/math.malC
monetdb5/modules/kernel/Tests/math.stable.err
monetdb5/modules/kernel/Tests/math.stable.out
Modified Files:
buildtools/autogen/autogen/msc.py
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
debian/fix-deb.sh
gdk/Makefile.ag
gdk/gdk_batop.c
gdk/gdk_orderidx.c
gdk/gdk_private.h
gdk/gdk_ssort.c
gdk/gdk_ssort_impl.h
monetdb5/modules/kernel/Tests/All
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/algebra.mal
monetdb5/modules/kernel/batmmath.c
monetdb5/modules/kernel/batmmath.h
monetdb5/modules/kernel/batmmath.mal
monetdb5/modules/kernel/mmath.c
monetdb5/modules/kernel/mmath.h
monetdb5/modules/kernel/mmath.mal
monetdb5/modules/mal/Tests/orderidx00.malC
monetdb5/modules/mal/Tests/orderidx04.malC
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/sysmon.mal
monetdb5/optimizer/Tests/DCexample2.stable.out
monetdb5/optimizer/Tests/tst4700.stable.out
monetdb5/optimizer/opt_candidates.c
monetdb5/optimizer/opt_costModel.c
monetdb5/optimizer/opt_mosaic.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_reorder.c
monetdb5/optimizer/opt_support.c
monetdb5/optimizer/optimizer.mal
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_statement.c
sql/jdbc/tests/Tests/All
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
Branch: mosaic
Log Message:
Phase 2 of renaming
diffs (truncated from 1038 to 300 lines):
diff --git a/buildtools/autogen/autogen/msc.py
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -578,10 +578,6 @@ def msc_binary(fd, var, binmap, msc):
fd.write(" -Fe%s.exe $(%s_OBJS) /link $(%s_LIBS) /subsystem:console
/NODEFAULTLIB:LIBC\n" % (binname, binname2, binname2))
fd.write("\t$(EDITBIN) $@ /HEAP:1048576,1048576 /LARGEADDRESSAWARE\n");
fd.write("\tif exist [email protected] $(MT) -manifest [email protected]
-outputresource:$@;1\n");
- if condname:
- fd.write('!ELSE\n')
- fd.write('C_%s_exe =\n' % binname2)
- fd.write('!ENDIF\n')
fd.write('\n')
if SCRIPTS:
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -511,16 +511,16 @@ Ready.
[ "algebra", "slice", "command
algebra.slice(b:bat[:any_1],x:int,y:int):bat[:any_1] ", "ALGslice_int;",
"Return the slice with the BUNs at position x till y." ]
[ "algebra", "slice", "command
algebra.slice(b:bat[:any_1],x:lng,y:lng):bat[:any_1] ", "ALGslice_lng;",
"Return the slice with the BUNs at position x till y." ]
[ "algebra", "slice", "command
algebra.slice(b:bat[:any_1],x:oid,y:oid):bat[:any_1] ", "ALGslice_oid;",
"Return the slice based on head oid x till y (exclusive)." ]
+[ "algebra", "sort", "command
algebra.sort(b:bat[:any_1],reverse:bit,stable:bit):bat[:any_1] ",
"ALGsort11;", "Returns a copy of the BAT sorted on tail values.\n The
input and output are (must be) dense headed.\n The order is descending
if the reverse bit is set.\n\t\t This is a stable sort if the stable bit is
set." ]
+[ "algebra", "sort", "command
algebra.sort(b:bat[:any_1],reverse:bit,stable:bit)
(X_0:bat[:any_1],X_1:bat[:oid]) ", "ALGsort12;", "Returns a copy of the BAT
sorted on tail values and a BAT that\n specifies how the input was
reordered.\n The input and output are (must be) dense headed.\n
The order is descending if the reverse bit is set.\n\t\t This is a stable sort
if the stable bit is set." ]
+[ "algebra", "sort", "command
algebra.sort(b:bat[:any_1],reverse:bit,stable:bit)
(X_0:bat[:any_1],X_1:bat[:oid],X_2:bat[:oid]) ", "ALGsort13;", "Returns a
copy of the BAT sorted on tail values, a BAT that specifies\n how the
input was reordered, and a BAT with group information.\n The input and
output are (must be) dense headed.\n The order is descending if the
reverse bit is set.\n\t\t This is a stable sort if the stable bit is set." ]
+[ "algebra", "sort", "command
algebra.sort(b:bat[:any_1],o:bat[:oid],reverse:bit,stable:bit):bat[:any_1] ",
"ALGsort21;", "Returns a copy of the BAT sorted on tail values.\n The
input and output are (must be) dense headed.\n The order is descending
if the reverse bit is set.\n\t\t This is a stable sort if the stable bit is
set." ]
+[ "algebra", "sort", "command
algebra.sort(b:bat[:any_1],o:bat[:oid],reverse:bit,stable:bit)
(X_0:bat[:any_1],X_1:bat[:oid]) ", "ALGsort22;", "Returns a copy of the
BAT sorted on tail values and a BAT that\n specifies how the input was
reordered.\n The input and output are (must be) dense headed.\n
The order is descending if the reverse bit is set.\n\t\t This is a stable sort
if the stable bit is set." ]
+[ "algebra", "sort", "command
algebra.sort(b:bat[:any_1],o:bat[:oid],reverse:bit,stable:bit)
(X_0:bat[:any_1],X_1:bat[:oid],X_2:bat[:oid]) ", "ALGsort23;",
"Returns a copy of the BAT sorted on tail values, a BAT that specifies\n
how the input was reordered, and a BAT with group information.\n The
input and output are (must be) dense headed.\n The order is descending
if the reverse bit is set.\n\t\t This is a stable sort if the stable bit is
set." ]
+[ "algebra", "sort", "command
algebra.sort(b:bat[:any_1],o:bat[:oid],g:bat[:oid],reverse:bit,stable:bit):bat[:any_1]
", "ALGsort31;", "Returns a copy of the BAT sorted on tail values.\n
The input and output are (must be) dense headed.\n The order is
descending if the reverse bit is set.\n\t\t This is a stable sort if the stable
bit is set." ]
+[ "algebra", "sort", "command
algebra.sort(b:bat[:any_1],o:bat[:oid],g:bat[:oid],reverse:bit,stable:bit)
(X_0:bat[:any_1],X_1:bat[:oid]) ", "ALGsort32;", "Returns a copy of the BAT
sorted on tail values and a BAT that\n specifies how the input was
reordered.\n The input and output are (must be) dense headed.\n
The order is descending if the reverse bit is set.\n\t\t This is a stable sort
if the stable bit is set." ]
+[ "algebra", "sort", "command
algebra.sort(b:bat[:any_1],o:bat[:oid],g:bat[:oid],reverse:bit,stable:bit)
(X_0:bat[:any_1],X_1:bat[:oid],X_2:bat[:oid]) ", "ALGsort33;", "Returns a
copy of the BAT sorted on tail values, a BAT that specifies\n how the
input was reordered, and a BAT with group information.\n The input and
output are (must be) dense headed.\n The order is descending if the
reverse bit is set.\n\t\t This is a stable sort if the stable bit is set." ]
[ "algebra", "subslice", "command
algebra.subslice(b:bat[:any_1],x:lng,y:lng):bat[:oid] ",
"ALGsubslice_lng;", "Return the oids of the slice with the BUNs at position
x till y." ]
-[ "algebra", "subsort", "command
algebra.subsort(b:bat[:any_1],reverse:bit,stable:bit):bat[:any_1] ",
"ALGsubsort11;", "Returns a copy of the BAT sorted on tail values.\n
The input and output are (must be) dense headed.\n The order is
descending if the reverse bit is set.\n\t\t This is a stable sort if the stable
bit is set." ]
-[ "algebra", "subsort", "command
algebra.subsort(b:bat[:any_1],reverse:bit,stable:bit)
(X_0:bat[:any_1],X_1:bat[:oid]) ", "ALGsubsort12;", "Returns a
copy of the BAT sorted on tail values and a BAT that\n specifies how
the input was reordered.\n The input and output are (must be) dense
headed.\n The order is descending if the reverse bit is set.\n\t\t This
is a stable sort if the stable bit is set." ]
-[ "algebra", "subsort", "command
algebra.subsort(b:bat[:any_1],reverse:bit,stable:bit)
(X_0:bat[:any_1],X_1:bat[:oid],X_2:bat[:oid]) ", "ALGsubsort13;",
"Returns a copy of the BAT sorted on tail values, a BAT that specifies\n
how the input was reordered, and a BAT with group information.\n The
input and output are (must be) dense headed.\n The order is descending
if the reverse bit is set.\n\t\t This is a stable sort if the stable bit is
set." ]
-[ "algebra", "subsort", "command
algebra.subsort(b:bat[:any_1],o:bat[:oid],reverse:bit,stable:bit):bat[:any_1]
", "ALGsubsort21;", "Returns a copy of the BAT sorted on tail
values.\n The input and output are (must be) dense headed.\n
The order is descending if the reverse bit is set.\n\t\t This is a stable sort
if the stable bit is set." ]
-[ "algebra", "subsort", "command
algebra.subsort(b:bat[:any_1],o:bat[:oid],reverse:bit,stable:bit)
(X_0:bat[:any_1],X_1:bat[:oid]) ", "ALGsubsort22;", "Returns a copy of
the BAT sorted on tail values and a BAT that\n specifies how the input
was reordered.\n The input and output are (must be) dense headed.\n
The order is descending if the reverse bit is set.\n\t\t This is a stable
sort if the stable bit is set." ]
-[ "algebra", "subsort", "command
algebra.subsort(b:bat[:any_1],o:bat[:oid],reverse:bit,stable:bit)
(X_0:bat[:any_1],X_1:bat[:oid],X_2:bat[:oid]) ", "ALGsubsort23;",
"Returns a copy of the BAT sorted on tail values, a BAT that specifies\n
how the input was reordered, and a BAT with group information.\n The
input and output are (must be) dense headed.\n The order is descending
if the reverse bit is set.\n\t\t This is a stable sort if the stable bit is
set." ]
-[ "algebra", "subsort", "command
algebra.subsort(b:bat[:any_1],o:bat[:oid],g:bat[:oid],reverse:bit,stable:bit):bat[:any_1]
", "ALGsubsort31;", "Returns a copy of the BAT sorted on tail
values.\n The input and output are (must be) dense headed.\n
The order is descending if the reverse bit is set.\n\t\t This is a stable sort
if the stable bit is set." ]
-[ "algebra", "subsort", "command
algebra.subsort(b:bat[:any_1],o:bat[:oid],g:bat[:oid],reverse:bit,stable:bit)
(X_0:bat[:any_1],X_1:bat[:oid]) ", "ALGsubsort32;", "Returns a
copy of the BAT sorted on tail values and a BAT that\n specifies how
the input was reordered.\n The input and output are (must be) dense
headed.\n The order is descending if the reverse bit is set.\n\t\t This
is a stable sort if the stable bit is set." ]
-[ "algebra", "subsort", "command
algebra.subsort(b:bat[:any_1],o:bat[:oid],g:bat[:oid],reverse:bit,stable:bit)
(X_0:bat[:any_1],X_1:bat[:oid],X_2:bat[:oid]) ", "ALGsubsort33;",
"Returns a copy of the BAT sorted on tail values, a BAT that specifies\n
how the input was reordered, and a BAT with group information.\n The
input and output are (must be) dense headed.\n The order is descending
if the reverse bit is set.\n\t\t This is a stable sort if the stable bit is
set." ]
[ "algebra", "thetajoin", "command
algebra.thetajoin(l:bat[:any_1],r:bat[:any_1],sl:bat[:oid],sr:bat[:oid],op:int,nil_matches:bit,estimate:lng)
(X_0:bat[:oid],X_1:bat[:oid]) ", "ALGthetajoin;", "Theta join with
candidate lists" ]
[ "algebra", "thetaselect", "command
algebra.thetaselect(b:bat[:any_1],val:any_1,op:str):bat[:oid] ",
"ALGthetaselect1;", "Select all head values for which the tail value obeys
the relation\n\tvalue OP VAL.\n\tInput is a dense-headed BAT, output is a
dense-headed BAT with in\n\tthe tail the head value of the input BAT for which
the\n\trelationship holds. The output BAT is sorted on the tail value."
]
[ "algebra", "thetaselect", "command
algebra.thetaselect(b:bat[:any_1],s:bat[:oid],val:any_1,op:str):bat[:oid] ",
"ALGthetaselect2;", "Select all head values of the first input BAT for
which the tail value\n\tobeys the relation value OP VAL and for which the head
value occurs in\n\tthe tail of the second input BAT.\n\tInput is a dense-headed
BAT, output is a dense-headed BAT with in\n\tthe tail the head value of the
input BAT for which the\n\trelationship holds. The output BAT is sorted on the
tail value." ]
@@ -6029,6 +6029,8 @@ Ready.
[ "batmmath", "atan2", "command
batmmath.atan2(x:bat[:flt],y:flt):bat[:flt] ", "CMDscience_bat_cst_atan2_flt;",
"" ]
[ "batmmath", "atan2", "command
batmmath.atan2(x:dbl,y:bat[:dbl]):bat[:dbl] ", "CMDscience_cst_bat_atan2_dbl;",
"" ]
[ "batmmath", "atan2", "command
batmmath.atan2(x:flt,y:bat[:flt]):bat[:flt] ", "CMDscience_cst_bat_atan2_flt;",
"" ]
+[ "batmmath", "cbrt", "command batmmath.cbrt(x:bat[:dbl]):bat[:dbl] ",
"CMDscience_bat_dbl_cbrt;", "" ]
+[ "batmmath", "cbrt", "command batmmath.cbrt(x:bat[:flt]):bat[:flt] ",
"CMDscience_bat_flt_cbrt;", "" ]
[ "batmmath", "ceil", "command batmmath.ceil(x:bat[:dbl]):bat[:dbl] ",
"CMDscience_bat_dbl_ceil;", "" ]
[ "batmmath", "ceil", "command batmmath.ceil(x:bat[:flt]):bat[:flt] ",
"CMDscience_bat_flt_ceil;", "" ]
[ "batmmath", "cos", "command batmmath.cos(x:bat[:dbl]):bat[:dbl] ",
"CMDscience_bat_dbl_cos;", "" ]
@@ -7962,8 +7964,10 @@ Ready.
[ "mmath", "atan", "command mmath.atan(x:flt):flt ",
"MATHunary_ATANflt;", "" ]
[ "mmath", "atan2", "command mmath.atan2(x:dbl,y:dbl):dbl ",
"MATHbinary_ATAN2dbl;", "The atan2(x,y) function calculates the arc tangent of
the two \n variables x and y. It is similar to calculating the
arc\n\ttangent of y / x, except that the signs of both arguments are \n
used to determine the quadrant of the result. The value is \n\treturned in
radians and is mathematically defined to be between \n -PI/2 and PI/2
(inclusive)." ]
[ "mmath", "atan2", "command mmath.atan2(x:flt,y:flt):flt ",
"MATHbinary_ATAN2flt;", "" ]
+[ "mmath", "cbrt", "command mmath.cbrt(y:flt):flt ",
"MATHunary_CBRTflt;", "" ]
[ "mmath", "ceil", "command mmath.ceil(y:dbl):dbl ",
"MATHunary_CEILdbl;", "The ceil(x) function rounds x upwards to the nearest
integer." ]
[ "mmath", "ceil", "command mmath.ceil(y:flt):flt ",
"MATHunary_CEILflt;", "" ]
+[ "mmath", "cnrt", "command mmath.cnrt(y:dbl):dbl ",
"MATHunary_CBRTdbl;", "The cbrt(x) function returns the non-negative cube
root of x." ]
[ "mmath", "cos", "command mmath.cos(x:dbl):dbl ",
"MATHunary_COSdbl;", "The cos(x) function returns the cosine of x, where x
is given in \n radians. The return value is between -1 and 1." ]
[ "mmath", "cos", "command mmath.cos(x:flt):flt ",
"MATHunary_COSflt;", "" ]
[ "mmath", "cosh", "command mmath.cosh(x:dbl):dbl ",
"MATHunary_COSHdbl;", "The cosh() function returns the hyperbolic cosine of
x, which is \n\tdefined mathematically as (exp(x) + exp(-x)) / 2." ]
@@ -8000,7 +8004,7 @@ Ready.
[ "mmath", "sinh", "command mmath.sinh(x:dbl):dbl ",
"MATHunary_SINHdbl;", "The sinh() function returns the hyperbolic sine of
x, which \n is defined mathematically as (exp(x) - exp(-x)) / 2." ]
[ "mmath", "sinh", "command mmath.sinh(x:flt):flt ",
"MATHunary_SINHflt;", "" ]
[ "mmath", "sqlrand", "command mmath.sqlrand(seed:int):int ",
"MATHsqlrandint;", "initialize the rand() function with a seed and call
rand()" ]
-[ "mmath", "sqrt", "command mmath.sqrt(y:dbl):dbl ",
"MATHunary_SQRTdbl;", "The sqrt(x) function returns the non-negative square
root of x." ]
+[ "mmath", "sqrt", "command mmath.sqrt(y:dbl):dbl ",
"MATHunary_SQRTdbl;", "The cbrt(x) function returns the non-negative cube
root of x." ]
[ "mmath", "sqrt", "command mmath.sqrt(y:flt):flt ",
"MATHunary_SQRTflt;", "" ]
[ "mmath", "srand", "command mmath.srand(seed:int):void ",
"MATHsrandint;", "initialize the rand() function with a seed" ]
[ "mmath", "tan", "command mmath.tan(x:dbl):dbl ",
"MATHunary_TANdbl;", "The tan(x) function returns the tangent of x,\n
where x is given in radians" ]
@@ -8200,8 +8204,6 @@ Ready.
[ "optimizer", "constants", "pattern
optimizer.constants(mod:str,fcn:str):str ", "OPTwrapper;", "Duplicate
constant removal optimizer" ]
[ "optimizer", "costModel", "pattern optimizer.costModel():str ",
"OPTwrapper;", "" ]
[ "optimizer", "costModel", "pattern
optimizer.costModel(mod:str,fcn:str):str ", "OPTwrapper;", "Estimate the
cost of a relational expression" ]
-[ "optimizer", "crackers", "pattern optimizer.crackers():str ",
"OPTwrapper;", "" ]
-[ "optimizer", "crackers", "pattern
optimizer.crackers(mod:str,fcn:str):str ", "OPTwrapper;", "Replace algebra
select with crackers select" ]
[ "optimizer", "dataflow", "pattern optimizer.dataflow():str ",
"OPTwrapper;", "" ]
[ "optimizer", "dataflow", "pattern
optimizer.dataflow(mod:str,fcn:str):str ", "OPTwrapper;", "Dataflow
bracket code injection" ]
[ "optimizer", "deadcode", "pattern optimizer.deadcode():str ",
"OPTwrapper;", "" ]
@@ -8264,8 +8266,6 @@ Ready.
[ "optimizer", "remoteQueries", "pattern
optimizer.remoteQueries(mod:str,fcn:str):str ", "OPTwrapper;", "Resolve
the multi-table definitions" ]
[ "optimizer", "reorder", "pattern optimizer.reorder():str ",
"OPTwrapper;", "" ]
[ "optimizer", "reorder", "pattern optimizer.reorder(mod:str,fcn:str):str
", "OPTwrapper;", "Reorder by dataflow dependencies" ]
-[ "optimizer", "selcrack", "pattern optimizer.selcrack():str ",
"OPTwrapper;", "" ]
-[ "optimizer", "selcrack", "pattern
optimizer.selcrack(mod:str,fcn:str):str ", "OPTwrapper;", "Selection
cracking" ]
[ "optimizer", "sql_append", "pattern optimizer.sql_append():str ",
"OPTsql_append;", "Avoid extra BAT copy with sql.append() whenever
possible." ]
[ "optimizer", "sql_append", "pattern
optimizer.sql_append(mod:str,fcn:str):str ", "OPTsql_append;", "Avoid
extra BAT copy with sql.append() whenever possible." ]
[ "optimizer", "trace", "pattern optimizer.trace():str ",
"OPTwrapper;", "" ]
@@ -8619,16 +8619,16 @@ Ready.
[ "streams", "socketWriteBytes", "command
streams.socketWriteBytes(skt:int,name:str):streams ",
"mnstr_socket_wstreamwrap;", "open a socket stream for writing" ]
[ "streams", "writeInt", "command
streams.writeInt(s:streams,data:int):void ", "mnstr_writeIntwrap;", "write
data on the stream" ]
[ "streams", "writeStr", "command
streams.writeStr(s:streams,data:str):void ", "mnstr_write_stringwrap;",
"write data on the stream" ]
-[ "sysmon", "pause", "pattern sysmon.pause(id:int):void ",
"SYSMONpause;", "" ]
-[ "sysmon", "pause", "pattern sysmon.pause(id:lng):void ",
"SYSMONpause;", "Temporary suspend a single query" ]
-[ "sysmon", "pause", "pattern sysmon.pause(id:sht):void ",
"SYSMONpause;", "" ]
+[ "sysmon", "pause", "pattern sysmon.pause(id:int):void ",
"SYSMONpause;", "Suspend a running query" ]
+[ "sysmon", "pause", "pattern sysmon.pause(id:lng):void ",
"SYSMONpause;", "Suspend a running query" ]
+[ "sysmon", "pause", "pattern sysmon.pause(id:sht):void ",
"SYSMONpause;", "Suspend a running query" ]
[ "sysmon", "queue", "pattern sysmon.queue()
(tag:bat[:lng],user:bat[:str],started:bat[:timestamp],estimate:bat[:timestamp],progress:bat[:int],status:bat[:str],qrytag:bat[:oid],query:bat[:str])
", "SYSMONqueue;", "" ]
-[ "sysmon", "resume", "pattern sysmon.resume(id:int):void ",
"SYSMONresume;", "" ]
-[ "sysmon", "resume", "pattern sysmon.resume(id:lng):void ",
"SYSMONresume;", "Resume processing " ]
-[ "sysmon", "resume", "pattern sysmon.resume(id:sht):void ",
"SYSMONresume;", "" ]
-[ "sysmon", "stop", "pattern sysmon.stop(id:int):void ", "SYSMONstop;",
"" ]
+[ "sysmon", "resume", "pattern sysmon.resume(id:int):void ",
"SYSMONresume;", "Resume processing of a query " ]
+[ "sysmon", "resume", "pattern sysmon.resume(id:lng):void ",
"SYSMONresume;", "Resume processing of a query " ]
+[ "sysmon", "resume", "pattern sysmon.resume(id:sht):void ",
"SYSMONresume;", "Resume processing of a query " ]
+[ "sysmon", "stop", "pattern sysmon.stop(id:int):void ", "SYSMONstop;",
"Stop a single query a.s.a.p." ]
[ "sysmon", "stop", "pattern sysmon.stop(id:lng):void ", "SYSMONstop;",
"Stop a single query a.s.a.p." ]
-[ "sysmon", "stop", "pattern sysmon.stop(id:sht):void ", "SYSMONstop;",
"" ]
+[ "sysmon", "stop", "pattern sysmon.stop(id:sht):void ", "SYSMONstop;",
"Stop a single query a.s.a.p." ]
[ "timestamp", "!=", "pattern timestamp.!=(v:timestamp,w:timestamp):bit ",
"CMDvarNE;", "Equality of two timestamps" ]
[ "timestamp", "#fromstr", "command timestamp.#fromstr():void ",
"timestamp_fromstr;", "" ]
[ "timestamp", "#tostr", "command timestamp.#tostr():void ",
"timestamp_tostr;", "" ]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -615,16 +615,16 @@ Ready.
[ "algebra", "slice", "command
algebra.slice(b:bat[:any_1],x:int,y:int):bat[:any_1] ", "ALGslice_int;",
"Return the slice with the BUNs at position x till y." ]
[ "algebra", "slice", "command
algebra.slice(b:bat[:any_1],x:lng,y:lng):bat[:any_1] ", "ALGslice_lng;",
"Return the slice with the BUNs at position x till y." ]
[ "algebra", "slice", "command
algebra.slice(b:bat[:any_1],x:oid,y:oid):bat[:any_1] ", "ALGslice_oid;",
"Return the slice based on head oid x till y (exclusive)." ]
+[ "algebra", "sort", "command
algebra.sort(b:bat[:any_1],reverse:bit,stable:bit):bat[:any_1] ",
"ALGsort11;", "Returns a copy of the BAT sorted on tail values.\n The
input and output are (must be) dense headed.\n The order is descending
if the reverse bit is set.\n\t\t This is a stable sort if the stable bit is
set." ]
+[ "algebra", "sort", "command
algebra.sort(b:bat[:any_1],reverse:bit,stable:bit)
(X_0:bat[:any_1],X_1:bat[:oid]) ", "ALGsort12;", "Returns a copy of the BAT
sorted on tail values and a BAT that\n specifies how the input was
reordered.\n The input and output are (must be) dense headed.\n
The order is descending if the reverse bit is set.\n\t\t This is a stable sort
if the stable bit is set." ]
+[ "algebra", "sort", "command
algebra.sort(b:bat[:any_1],reverse:bit,stable:bit)
(X_0:bat[:any_1],X_1:bat[:oid],X_2:bat[:oid]) ", "ALGsort13;", "Returns a
copy of the BAT sorted on tail values, a BAT that specifies\n how the
input was reordered, and a BAT with group information.\n The input and
output are (must be) dense headed.\n The order is descending if the
reverse bit is set.\n\t\t This is a stable sort if the stable bit is set." ]
+[ "algebra", "sort", "command
algebra.sort(b:bat[:any_1],o:bat[:oid],reverse:bit,stable:bit):bat[:any_1] ",
"ALGsort21;", "Returns a copy of the BAT sorted on tail values.\n The
input and output are (must be) dense headed.\n The order is descending
if the reverse bit is set.\n\t\t This is a stable sort if the stable bit is
set." ]
+[ "algebra", "sort", "command
algebra.sort(b:bat[:any_1],o:bat[:oid],reverse:bit,stable:bit)
(X_0:bat[:any_1],X_1:bat[:oid]) ", "ALGsort22;", "Returns a copy of the
BAT sorted on tail values and a BAT that\n specifies how the input was
reordered.\n The input and output are (must be) dense headed.\n
The order is descending if the reverse bit is set.\n\t\t This is a stable sort
if the stable bit is set." ]
+[ "algebra", "sort", "command
algebra.sort(b:bat[:any_1],o:bat[:oid],reverse:bit,stable:bit)
(X_0:bat[:any_1],X_1:bat[:oid],X_2:bat[:oid]) ", "ALGsort23;",
"Returns a copy of the BAT sorted on tail values, a BAT that specifies\n
how the input was reordered, and a BAT with group information.\n The
input and output are (must be) dense headed.\n The order is descending
if the reverse bit is set.\n\t\t This is a stable sort if the stable bit is
set." ]
+[ "algebra", "sort", "command
algebra.sort(b:bat[:any_1],o:bat[:oid],g:bat[:oid],reverse:bit,stable:bit):bat[:any_1]
", "ALGsort31;", "Returns a copy of the BAT sorted on tail values.\n
The input and output are (must be) dense headed.\n The order is
descending if the reverse bit is set.\n\t\t This is a stable sort if the stable
bit is set." ]
+[ "algebra", "sort", "command
algebra.sort(b:bat[:any_1],o:bat[:oid],g:bat[:oid],reverse:bit,stable:bit)
(X_0:bat[:any_1],X_1:bat[:oid]) ", "ALGsort32;", "Returns a copy of the BAT
sorted on tail values and a BAT that\n specifies how the input was
reordered.\n The input and output are (must be) dense headed.\n
The order is descending if the reverse bit is set.\n\t\t This is a stable sort
if the stable bit is set." ]
+[ "algebra", "sort", "command
algebra.sort(b:bat[:any_1],o:bat[:oid],g:bat[:oid],reverse:bit,stable:bit)
(X_0:bat[:any_1],X_1:bat[:oid],X_2:bat[:oid]) ", "ALGsort33;", "Returns a
copy of the BAT sorted on tail values, a BAT that specifies\n how the
input was reordered, and a BAT with group information.\n The input and
output are (must be) dense headed.\n The order is descending if the
reverse bit is set.\n\t\t This is a stable sort if the stable bit is set." ]
[ "algebra", "subslice", "command
algebra.subslice(b:bat[:any_1],x:lng,y:lng):bat[:oid] ",
"ALGsubslice_lng;", "Return the oids of the slice with the BUNs at position
x till y." ]
-[ "algebra", "subsort", "command
algebra.subsort(b:bat[:any_1],reverse:bit,stable:bit):bat[:any_1] ",
"ALGsubsort11;", "Returns a copy of the BAT sorted on tail values.\n
The input and output are (must be) dense headed.\n The order is
descending if the reverse bit is set.\n\t\t This is a stable sort if the stable
bit is set." ]
-[ "algebra", "subsort", "command
algebra.subsort(b:bat[:any_1],reverse:bit,stable:bit)
(X_0:bat[:any_1],X_1:bat[:oid]) ", "ALGsubsort12;", "Returns a
copy of the BAT sorted on tail values and a BAT that\n specifies how
the input was reordered.\n The input and output are (must be) dense
headed.\n The order is descending if the reverse bit is set.\n\t\t This
is a stable sort if the stable bit is set." ]
-[ "algebra", "subsort", "command
algebra.subsort(b:bat[:any_1],reverse:bit,stable:bit)
(X_0:bat[:any_1],X_1:bat[:oid],X_2:bat[:oid]) ", "ALGsubsort13;",
"Returns a copy of the BAT sorted on tail values, a BAT that specifies\n
how the input was reordered, and a BAT with group information.\n The
input and output are (must be) dense headed.\n The order is descending
if the reverse bit is set.\n\t\t This is a stable sort if the stable bit is
set." ]
-[ "algebra", "subsort", "command
algebra.subsort(b:bat[:any_1],o:bat[:oid],reverse:bit,stable:bit):bat[:any_1]
", "ALGsubsort21;", "Returns a copy of the BAT sorted on tail
values.\n The input and output are (must be) dense headed.\n
The order is descending if the reverse bit is set.\n\t\t This is a stable sort
if the stable bit is set." ]
-[ "algebra", "subsort", "command
algebra.subsort(b:bat[:any_1],o:bat[:oid],reverse:bit,stable:bit)
(X_0:bat[:any_1],X_1:bat[:oid]) ", "ALGsubsort22;", "Returns a copy of
the BAT sorted on tail values and a BAT that\n specifies how the input
was reordered.\n The input and output are (must be) dense headed.\n
The order is descending if the reverse bit is set.\n\t\t This is a stable
sort if the stable bit is set." ]
-[ "algebra", "subsort", "command
algebra.subsort(b:bat[:any_1],o:bat[:oid],reverse:bit,stable:bit)
(X_0:bat[:any_1],X_1:bat[:oid],X_2:bat[:oid]) ", "ALGsubsort23;",
"Returns a copy of the BAT sorted on tail values, a BAT that specifies\n
how the input was reordered, and a BAT with group information.\n The
input and output are (must be) dense headed.\n The order is descending
if the reverse bit is set.\n\t\t This is a stable sort if the stable bit is
set." ]
-[ "algebra", "subsort", "command
algebra.subsort(b:bat[:any_1],o:bat[:oid],g:bat[:oid],reverse:bit,stable:bit):bat[:any_1]
", "ALGsubsort31;", "Returns a copy of the BAT sorted on tail
values.\n The input and output are (must be) dense headed.\n
The order is descending if the reverse bit is set.\n\t\t This is a stable sort
if the stable bit is set." ]
-[ "algebra", "subsort", "command
algebra.subsort(b:bat[:any_1],o:bat[:oid],g:bat[:oid],reverse:bit,stable:bit)
(X_0:bat[:any_1],X_1:bat[:oid]) ", "ALGsubsort32;", "Returns a
copy of the BAT sorted on tail values and a BAT that\n specifies how
the input was reordered.\n The input and output are (must be) dense
headed.\n The order is descending if the reverse bit is set.\n\t\t This
is a stable sort if the stable bit is set." ]
-[ "algebra", "subsort", "command
algebra.subsort(b:bat[:any_1],o:bat[:oid],g:bat[:oid],reverse:bit,stable:bit)
(X_0:bat[:any_1],X_1:bat[:oid],X_2:bat[:oid]) ", "ALGsubsort33;",
"Returns a copy of the BAT sorted on tail values, a BAT that specifies\n
how the input was reordered, and a BAT with group information.\n The
input and output are (must be) dense headed.\n The order is descending
if the reverse bit is set.\n\t\t This is a stable sort if the stable bit is
set." ]
[ "algebra", "thetajoin", "command
algebra.thetajoin(l:bat[:any_1],r:bat[:any_1],sl:bat[:oid],sr:bat[:oid],op:int,nil_matches:bit,estimate:lng)
(X_0:bat[:oid],X_1:bat[:oid]) ", "ALGthetajoin;", "Theta join with
candidate lists" ]
[ "algebra", "thetaselect", "command
algebra.thetaselect(b:bat[:any_1],val:any_1,op:str):bat[:oid] ",
"ALGthetaselect1;", "Select all head values for which the tail value obeys
the relation\n\tvalue OP VAL.\n\tInput is a dense-headed BAT, output is a
dense-headed BAT with in\n\tthe tail the head value of the input BAT for which
the\n\trelationship holds. The output BAT is sorted on the tail value."
]
[ "algebra", "thetaselect", "command
algebra.thetaselect(b:bat[:any_1],s:bat[:oid],val:any_1,op:str):bat[:oid] ",
"ALGthetaselect2;", "Select all head values of the first input BAT for
which the tail value\n\tobeys the relation value OP VAL and for which the head
value occurs in\n\tthe tail of the second input BAT.\n\tInput is a dense-headed
BAT, output is a dense-headed BAT with in\n\tthe tail the head value of the
input BAT for which the\n\trelationship holds. The output BAT is sorted on the
tail value." ]
@@ -7995,6 +7995,8 @@ Ready.
[ "batmmath", "atan2", "command
batmmath.atan2(x:bat[:flt],y:flt):bat[:flt] ", "CMDscience_bat_cst_atan2_flt;",
"" ]
[ "batmmath", "atan2", "command
batmmath.atan2(x:dbl,y:bat[:dbl]):bat[:dbl] ", "CMDscience_cst_bat_atan2_dbl;",
"" ]
[ "batmmath", "atan2", "command
batmmath.atan2(x:flt,y:bat[:flt]):bat[:flt] ", "CMDscience_cst_bat_atan2_flt;",
"" ]
+[ "batmmath", "cbrt", "command batmmath.cbrt(x:bat[:dbl]):bat[:dbl] ",
"CMDscience_bat_dbl_cbrt;", "" ]
+[ "batmmath", "cbrt", "command batmmath.cbrt(x:bat[:flt]):bat[:flt] ",
"CMDscience_bat_flt_cbrt;", "" ]
[ "batmmath", "ceil", "command batmmath.ceil(x:bat[:dbl]):bat[:dbl] ",
"CMDscience_bat_dbl_ceil;", "" ]
[ "batmmath", "ceil", "command batmmath.ceil(x:bat[:flt]):bat[:flt] ",
"CMDscience_bat_flt_ceil;", "" ]
[ "batmmath", "cos", "command batmmath.cos(x:bat[:dbl]):bat[:dbl] ",
"CMDscience_bat_dbl_cos;", "" ]
@@ -10324,8 +10326,10 @@ Ready.
[ "mmath", "atan", "command mmath.atan(x:flt):flt ",
"MATHunary_ATANflt;", "" ]
[ "mmath", "atan2", "command mmath.atan2(x:dbl,y:dbl):dbl ",
"MATHbinary_ATAN2dbl;", "The atan2(x,y) function calculates the arc tangent of
the two \n variables x and y. It is similar to calculating the
arc\n\ttangent of y / x, except that the signs of both arguments are \n
used to determine the quadrant of the result. The value is \n\treturned in
radians and is mathematically defined to be between \n -PI/2 and PI/2
(inclusive)." ]
[ "mmath", "atan2", "command mmath.atan2(x:flt,y:flt):flt ",
"MATHbinary_ATAN2flt;", "" ]
+[ "mmath", "cbrt", "command mmath.cbrt(y:flt):flt ",
"MATHunary_CBRTflt;", "" ]
[ "mmath", "ceil", "command mmath.ceil(y:dbl):dbl ",
"MATHunary_CEILdbl;", "The ceil(x) function rounds x upwards to the nearest
integer." ]
[ "mmath", "ceil", "command mmath.ceil(y:flt):flt ",
"MATHunary_CEILflt;", "" ]
+[ "mmath", "cnrt", "command mmath.cnrt(y:dbl):dbl ",
"MATHunary_CBRTdbl;", "The cbrt(x) function returns the non-negative cube
root of x." ]
[ "mmath", "cos", "command mmath.cos(x:dbl):dbl ",
"MATHunary_COSdbl;", "The cos(x) function returns the cosine of x, where x
is given in \n radians. The return value is between -1 and 1." ]
[ "mmath", "cos", "command mmath.cos(x:flt):flt ",
"MATHunary_COSflt;", "" ]
[ "mmath", "cosh", "command mmath.cosh(x:dbl):dbl ",
"MATHunary_COSHdbl;", "The cosh() function returns the hyperbolic cosine of
x, which is \n\tdefined mathematically as (exp(x) + exp(-x)) / 2." ]
@@ -10362,7 +10366,7 @@ Ready.
[ "mmath", "sinh", "command mmath.sinh(x:dbl):dbl ",
"MATHunary_SINHdbl;", "The sinh() function returns the hyperbolic sine of
x, which \n is defined mathematically as (exp(x) - exp(-x)) / 2." ]
[ "mmath", "sinh", "command mmath.sinh(x:flt):flt ",
"MATHunary_SINHflt;", "" ]
[ "mmath", "sqlrand", "command mmath.sqlrand(seed:int):int ",
"MATHsqlrandint;", "initialize the rand() function with a seed and call
rand()" ]
-[ "mmath", "sqrt", "command mmath.sqrt(y:dbl):dbl ",
"MATHunary_SQRTdbl;", "The sqrt(x) function returns the non-negative square
root of x." ]
+[ "mmath", "sqrt", "command mmath.sqrt(y:dbl):dbl ",
"MATHunary_SQRTdbl;", "The cbrt(x) function returns the non-negative cube
root of x." ]
[ "mmath", "sqrt", "command mmath.sqrt(y:flt):flt ",
"MATHunary_SQRTflt;", "" ]
[ "mmath", "srand", "command mmath.srand(seed:int):void ",
"MATHsrandint;", "initialize the rand() function with a seed" ]
[ "mmath", "tan", "command mmath.tan(x:dbl):dbl ",
"MATHunary_TANdbl;", "The tan(x) function returns the tangent of x,\n
where x is given in radians" ]
@@ -10562,8 +10566,6 @@ Ready.
[ "optimizer", "constants", "pattern
optimizer.constants(mod:str,fcn:str):str ", "OPTwrapper;", "Duplicate
constant removal optimizer" ]
[ "optimizer", "costModel", "pattern optimizer.costModel():str ",
"OPTwrapper;", "" ]
[ "optimizer", "costModel", "pattern
optimizer.costModel(mod:str,fcn:str):str ", "OPTwrapper;", "Estimate the
cost of a relational expression" ]
-[ "optimizer", "crackers", "pattern optimizer.crackers():str ",
"OPTwrapper;", "" ]
-[ "optimizer", "crackers", "pattern
optimizer.crackers(mod:str,fcn:str):str ", "OPTwrapper;", "Replace algebra
select with crackers select" ]
[ "optimizer", "dataflow", "pattern optimizer.dataflow():str ",
"OPTwrapper;", "" ]
[ "optimizer", "dataflow", "pattern
optimizer.dataflow(mod:str,fcn:str):str ", "OPTwrapper;", "Dataflow
bracket code injection" ]
[ "optimizer", "deadcode", "pattern optimizer.deadcode():str ",
"OPTwrapper;", "" ]
@@ -10626,8 +10628,6 @@ Ready.
[ "optimizer", "remoteQueries", "pattern
optimizer.remoteQueries(mod:str,fcn:str):str ", "OPTwrapper;", "Resolve
the multi-table definitions" ]
[ "optimizer", "reorder", "pattern optimizer.reorder():str ",
"OPTwrapper;", "" ]
[ "optimizer", "reorder", "pattern optimizer.reorder(mod:str,fcn:str):str
", "OPTwrapper;", "Reorder by dataflow dependencies" ]
-[ "optimizer", "selcrack", "pattern optimizer.selcrack():str ",
"OPTwrapper;", "" ]
-[ "optimizer", "selcrack", "pattern
optimizer.selcrack(mod:str,fcn:str):str ", "OPTwrapper;", "Selection
cracking" ]
[ "optimizer", "sql_append", "pattern optimizer.sql_append():str ",
"OPTsql_append;", "Avoid extra BAT copy with sql.append() whenever
possible." ]
[ "optimizer", "sql_append", "pattern
optimizer.sql_append(mod:str,fcn:str):str ", "OPTsql_append;", "Avoid
extra BAT copy with sql.append() whenever possible." ]
[ "optimizer", "trace", "pattern optimizer.trace():str ",
"OPTwrapper;", "" ]
@@ -10983,16 +10983,16 @@ Ready.
[ "streams", "socketWriteBytes", "command
streams.socketWriteBytes(skt:int,name:str):streams ",
"mnstr_socket_wstreamwrap;", "open a socket stream for writing" ]
[ "streams", "writeInt", "command
streams.writeInt(s:streams,data:int):void ", "mnstr_writeIntwrap;", "write
data on the stream" ]
[ "streams", "writeStr", "command
streams.writeStr(s:streams,data:str):void ", "mnstr_write_stringwrap;",
"write data on the stream" ]
-[ "sysmon", "pause", "pattern sysmon.pause(id:int):void ",
"SYSMONpause;", "" ]
-[ "sysmon", "pause", "pattern sysmon.pause(id:lng):void ",
"SYSMONpause;", "Temporary suspend a single query" ]
-[ "sysmon", "pause", "pattern sysmon.pause(id:sht):void ",
"SYSMONpause;", "" ]
+[ "sysmon", "pause", "pattern sysmon.pause(id:int):void ",
"SYSMONpause;", "Suspend a running query" ]
+[ "sysmon", "pause", "pattern sysmon.pause(id:lng):void ",
"SYSMONpause;", "Suspend a running query" ]
+[ "sysmon", "pause", "pattern sysmon.pause(id:sht):void ",
"SYSMONpause;", "Suspend a running query" ]
[ "sysmon", "queue", "pattern sysmon.queue()
(tag:bat[:lng],user:bat[:str],started:bat[:timestamp],estimate:bat[:timestamp],progress:bat[:int],status:bat[:str],qrytag:bat[:oid],query:bat[:str])
", "SYSMONqueue;", "" ]
-[ "sysmon", "resume", "pattern sysmon.resume(id:int):void ",
"SYSMONresume;", "" ]
-[ "sysmon", "resume", "pattern sysmon.resume(id:lng):void ",
"SYSMONresume;", "Resume processing " ]
-[ "sysmon", "resume", "pattern sysmon.resume(id:sht):void ",
"SYSMONresume;", "" ]
-[ "sysmon", "stop", "pattern sysmon.stop(id:int):void ", "SYSMONstop;",
"" ]
+[ "sysmon", "resume", "pattern sysmon.resume(id:int):void ",
"SYSMONresume;", "Resume processing of a query " ]
+[ "sysmon", "resume", "pattern sysmon.resume(id:lng):void ",
"SYSMONresume;", "Resume processing of a query " ]
+[ "sysmon", "resume", "pattern sysmon.resume(id:sht):void ",
"SYSMONresume;", "Resume processing of a query " ]
+[ "sysmon", "stop", "pattern sysmon.stop(id:int):void ", "SYSMONstop;",
"Stop a single query a.s.a.p." ]
[ "sysmon", "stop", "pattern sysmon.stop(id:lng):void ", "SYSMONstop;",
"Stop a single query a.s.a.p." ]
-[ "sysmon", "stop", "pattern sysmon.stop(id:sht):void ", "SYSMONstop;",
"" ]
+[ "sysmon", "stop", "pattern sysmon.stop(id:sht):void ", "SYSMONstop;",
"Stop a single query a.s.a.p." ]
[ "timestamp", "!=", "pattern timestamp.!=(v:timestamp,w:timestamp):bit ",
"CMDvarNE;", "Equality of two timestamps" ]
[ "timestamp", "#fromstr", "command timestamp.#fromstr():void ",
"timestamp_fromstr;", "" ]
[ "timestamp", "#tostr", "command timestamp.#tostr():void ",
"timestamp_tostr;", "" ]
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1049,6 +1049,7 @@ str CMDscience_bat_cst_pow_flt(bat *ret,
str CMDscience_bat_dbl_acos(bat *ret, const bat *bid);
str CMDscience_bat_dbl_asin(bat *ret, const bat *bid);
str CMDscience_bat_dbl_atan(bat *ret, const bat *bid);
+str CMDscience_bat_dbl_cbrt(bat *ret, const bat *bid);
str CMDscience_bat_dbl_ceil(bat *ret, const bat *bid);
str CMDscience_bat_dbl_cos(bat *ret, const bat *bid);
str CMDscience_bat_dbl_cosh(bat *ret, const bat *bid);
@@ -1067,6 +1068,7 @@ str CMDscience_bat_dbl_tanh(bat *ret, co
str CMDscience_bat_flt_acos(bat *ret, const bat *bid);
str CMDscience_bat_flt_asin(bat *ret, const bat *bid);
str CMDscience_bat_flt_atan(bat *ret, const bat *bid);
+str CMDscience_bat_flt_cbrt(bat *ret, const bat *bid);
str CMDscience_bat_flt_ceil(bat *ret, const bat *bid);
str CMDscience_bat_flt_cos(bat *ret, const bat *bid);
str CMDscience_bat_flt_cosh(bat *ret, const bat *bid);
@@ -1311,6 +1313,8 @@ str MATHunary_ASINdbl(dbl *res, const db
str MATHunary_ASINflt(flt *res, const flt *a);
str MATHunary_ATANdbl(dbl *res, const dbl *a);
str MATHunary_ATANflt(flt *res, const flt *a);
+str MATHunary_CBRTdbl(dbl *res, const dbl *a);
+str MATHunary_CBRTflt(flt *res, const flt *a);
str MATHunary_CEILdbl(dbl *res, const dbl *a);
str MATHunary_CEILflt(flt *res, const flt *a);
str MATHunary_COSHdbl(dbl *res, const dbl *a);
@@ -2125,7 +2129,6 @@ int cpyConstant(MalBlkPtr mb, VarPtr vr)
str createException(enum malexception, const char *, _In_z_
_Printf_format_string_ const char *, ...) __attribute__((__format__(__printf__,
3, 4)));
str createRef;
str crossRef;
-str datacyclotronRef;
str dataflowRef;
str dateRef;
int date_fromstr(const char *buf, int *len, date **d);
@@ -2548,6 +2551,7 @@ str schedulerRef;
str selectNotNilRef;
str selectRef;
str semaRef;
+str semijoinRef;
str seriesRef;
str setAccessRef;
void setArgType(MalBlkPtr mb, InstrPtr p, int i, int tpe);
@@ -2581,6 +2585,7 @@ str sinkRef;
void slash_2_dir_sep(str fname);
str sliceRef;
str sortRef;
+str sortRef;
str sortReverseRef;
str soundex_impl(str *res, str *Name);
str sqlRef;
@@ -2613,7 +2618,6 @@ str submedianRef;
str subminRef;
str subprodRef;
str subsliceRef;
-str subsortRef;
str subsumRef;
str subuniformRef;
str sumRef;
diff --git a/debian/fix-deb.sh b/debian/fix-deb.sh
--- a/debian/fix-deb.sh
+++ b/debian/fix-deb.sh
@@ -53,3 +53,13 @@ wheezy | jessie | precise | trusty | wil
sed -i 's/php-cli/php5-cli/;s/, *php-sockets//' debian/control
;;
esac
+
+case $SUITE in
+wheezy | precise)
+ # numpy is too old
+ sed -i -e 's/, python-dev[^,]*//;s/, python-numpy[^,]*//' \
+ -e '/^Package:.*monetdb-python2/,/^$/d' debian/control
+ sed -i '/pyintegration=yes/s/yes/no/' debian/rules
+ rm debian/monetdb-python2.install
+ ;;
+esac
diff --git a/gdk/Makefile.ag b/gdk/Makefile.ag
--- a/gdk/Makefile.ag
+++ b/gdk/Makefile.ag
@@ -12,21 +12,23 @@ lib_gdk = {
VERSION = $(GDK_VERSION)
NAME = bat
SOURCES = \
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
