Changeset: 6cf20adcc260 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6cf20adcc260 Added Files: clients/examples/python/sqlsample.py sql/test/mapi/Tests/python2_dbapi.SQL.bat sql/test/mapi/Tests/python2_dbapi.SQL.sh sql/test/mapi/Tests/python2_dbapi.stable.err sql/test/mapi/Tests/python2_dbapi.stable.out sql/test/mapi/Tests/python3_dbapi.SQL.bat sql/test/mapi/Tests/python3_dbapi.SQL.sh sql/test/mapi/Tests/python3_dbapi.stable.err sql/test/mapi/Tests/python3_dbapi.stable.out Removed Files: clients/examples/python/Makefile.ag clients/examples/python/sqlsample.py.in sql/test/mapi/Tests/python_dbapi.SQL.bat sql/test/mapi/Tests/python_dbapi.SQL.sh sql/test/mapi/Tests/python_dbapi.stable.err sql/test/mapi/Tests/python_dbapi.stable.out Modified Files: clients/Tests/exports.stable.out clients/examples/Makefile.ag clients/python3/monetdb/mapi.py monetdb5/modules/atoms/batxml.c monetdb5/modules/atoms/batxml.mal monetdb5/modules/kernel/aggr.c monetdb5/modules/kernel/aggr.mal monetdb5/modules/kernel/aggr.mal.sh monetdb5/modules/mal/tokenizer.c monetdb5/optimizer/Tests/tst4900.mal monetdb5/optimizer/Tests/tst4900.stable.out monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_prelude.c sql/backends/monet5/sql.mx sql/backends/monet5/sql_gencode.c sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out sql/test/mapi/Tests/All sql/test/mapi/Tests/python2_test_monetdb_sql.SQL.bat sql/test/mapi/Tests/python2_test_monetdb_sql.SQL.sh sql/test/mapi/Tests/python3_test_monetdb_sql.SQL.bat sql/test/mapi/Tests/python3_test_monetdb_sql.SQL.sh sql/test/mapi/Tests/python3_test_monetdb_sql.stable.err testing/Mtest.py.in Branch: default Log Message:
Merge with Feb2013 branch. diffs (truncated from 3080 to 300 lines): 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 @@ -610,7 +610,7 @@ str AGGRcount3nils(bat *retval, bat *bid str AGGRcount3nonils(bat *retval, bat *bid, bat *gid, bat *eid); str AGGRmax2(bat *retval, bat *bid, bat *eid); str AGGRmax3(bat *retval, bat *bid, bat *gid, bat *eid); -str AGGRmedian(bat *retval, bat *bid, int *skip_nils); +str AGGRmedian(bat *retval, bat *bid, bit *skip_nils); str AGGRmedian3(bat *retval, bat *bid, bat *gid, bat *eid); str AGGRmin2(bat *retval, bat *bid, bat *eid); str AGGRmin3(bat *retval, bat *bid, bat *gid, bat *eid); @@ -633,58 +633,58 @@ str AGGRstdev2_dbl(bat *retval, bat *bid str AGGRstdev3_dbl(bat *retval, bat *bid, bat *gid, bat *eid); str AGGRstdevp2_dbl(bat *retval, bat *bid, bat *eid); str AGGRstdevp3_dbl(bat *retval, bat *bid, bat *gid, bat *eid); -str AGGRsubavg_dbl(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); -str AGGRsubavgcand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils, int *abort_on_error); -str AGGRsubcount(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils); -str AGGRsubcountcand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils); -str AGGRsubmax(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils); -str AGGRsubmax_val(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils); -str AGGRsubmaxcand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils); -str AGGRsubmaxcand_val(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils); -str AGGRsubmedian(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils); -str AGGRsubmediancand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils); -str AGGRsubmin(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils); -str AGGRsubmin_val(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils); -str AGGRsubmincand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils); -str AGGRsubmincand_val(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils); -str AGGRsubprod_bte(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); -str AGGRsubprod_dbl(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); -str AGGRsubprod_flt(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); -str AGGRsubprod_int(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); -str AGGRsubprod_lng(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); -str AGGRsubprod_sht(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); -str AGGRsubprod_wrd(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); -str AGGRsubprodcand_bte(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils, int *abort_on_error); -str AGGRsubprodcand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils, int *abort_on_error); -str AGGRsubprodcand_flt(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils, int *abort_on_error); -str AGGRsubprodcand_int(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils, int *abort_on_error); -str AGGRsubprodcand_lng(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils, int *abort_on_error); -str AGGRsubprodcand_sht(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils, int *abort_on_error); -str AGGRsubprodcand_wrd(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils, int *abort_on_error); -str AGGRsubstdev_dbl(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); -str AGGRsubstdevcand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils, int *abort_on_error); -str AGGRsubstdevp_dbl(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); -str AGGRsubstdevpcand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils, int *abort_on_error); -str AGGRsubsum_bte(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); -str AGGRsubsum_dbl(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); -str AGGRsubsum_flt(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); -str AGGRsubsum_int(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); -str AGGRsubsum_lng(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); -str AGGRsubsum_sht(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); -str AGGRsubsum_wrd(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); -str AGGRsubsumcand_bte(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils, int *abort_on_error); -str AGGRsubsumcand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils, int *abort_on_error); -str AGGRsubsumcand_flt(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils, int *abort_on_error); -str AGGRsubsumcand_int(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils, int *abort_on_error); -str AGGRsubsumcand_lng(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils, int *abort_on_error); -str AGGRsubsumcand_sht(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils, int *abort_on_error); -str AGGRsubsumcand_wrd(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils, int *abort_on_error); -str AGGRsubvariance_dbl(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); -str AGGRsubvariancecand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils, int *abort_on_error); -str AGGRsubvariancep_dbl(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); -str AGGRsubvariancepcand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils, int *abort_on_error); -str AGGRsubxml(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils); -str AGGRsubxmlcand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils); +str AGGRsubavg_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, bit *abort_on_error); +str AGGRsubavgcand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit *skip_nils, bit *abort_on_error); +str AGGRsubcount(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils); +str AGGRsubcountcand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit *skip_nils); +str AGGRsubmax(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils); +str AGGRsubmax_val(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils); +str AGGRsubmaxcand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit *skip_nils); +str AGGRsubmaxcand_val(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit *skip_nils); +str AGGRsubmedian(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils); +str AGGRsubmediancand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit *skip_nils); +str AGGRsubmin(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils); +str AGGRsubmin_val(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils); +str AGGRsubmincand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit *skip_nils); +str AGGRsubmincand_val(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit *skip_nils); +str AGGRsubprod_bte(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, bit *abort_on_error); +str AGGRsubprod_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, bit *abort_on_error); +str AGGRsubprod_flt(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, bit *abort_on_error); +str AGGRsubprod_int(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, bit *abort_on_error); +str AGGRsubprod_lng(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, bit *abort_on_error); +str AGGRsubprod_sht(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, bit *abort_on_error); +str AGGRsubprod_wrd(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, bit *abort_on_error); +str AGGRsubprodcand_bte(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit *skip_nils, bit *abort_on_error); +str AGGRsubprodcand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit *skip_nils, bit *abort_on_error); +str AGGRsubprodcand_flt(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit *skip_nils, bit *abort_on_error); +str AGGRsubprodcand_int(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit *skip_nils, bit *abort_on_error); +str AGGRsubprodcand_lng(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit *skip_nils, bit *abort_on_error); +str AGGRsubprodcand_sht(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit *skip_nils, bit *abort_on_error); +str AGGRsubprodcand_wrd(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit *skip_nils, bit *abort_on_error); +str AGGRsubstdev_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, bit *abort_on_error); +str AGGRsubstdevcand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit *skip_nils, bit *abort_on_error); +str AGGRsubstdevp_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, bit *abort_on_error); +str AGGRsubstdevpcand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit *skip_nils, bit *abort_on_error); +str AGGRsubsum_bte(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, bit *abort_on_error); +str AGGRsubsum_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, bit *abort_on_error); +str AGGRsubsum_flt(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, bit *abort_on_error); +str AGGRsubsum_int(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, bit *abort_on_error); +str AGGRsubsum_lng(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, bit *abort_on_error); +str AGGRsubsum_sht(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, bit *abort_on_error); +str AGGRsubsum_wrd(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, bit *abort_on_error); +str AGGRsubsumcand_bte(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit *skip_nils, bit *abort_on_error); +str AGGRsubsumcand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit *skip_nils, bit *abort_on_error); +str AGGRsubsumcand_flt(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit *skip_nils, bit *abort_on_error); +str AGGRsubsumcand_int(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit *skip_nils, bit *abort_on_error); +str AGGRsubsumcand_lng(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit *skip_nils, bit *abort_on_error); +str AGGRsubsumcand_sht(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit *skip_nils, bit *abort_on_error); +str AGGRsubsumcand_wrd(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit *skip_nils, bit *abort_on_error); +str AGGRsubvariance_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, bit *abort_on_error); +str AGGRsubvariancecand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit *skip_nils, bit *abort_on_error); +str AGGRsubvariancep_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, bit *abort_on_error); +str AGGRsubvariancepcand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit *skip_nils, bit *abort_on_error); +str AGGRsubxml(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils); +str AGGRsubxmlcand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit *skip_nils); str AGGRsum2_bte(bat *retval, bat *bid, bat *eid); str AGGRsum2_dbl(bat *retval, bat *bid, bat *eid); str AGGRsum2_flt(bat *retval, bat *bid, bat *eid); @@ -703,7 +703,6 @@ str AGGRvariance2_dbl(bat *retval, bat * str AGGRvariance3_dbl(bat *retval, bat *bid, bat *gid, bat *eid); str AGGRvariancep2_dbl(bat *retval, bat *bid, bat *eid); str AGGRvariancep3_dbl(bat *retval, bat *bid, bat *gid, bat *eid); -str AGGRxml(bat *retval, bat *bid, int *skip_nils); str ALARMctime(str *res); str ALARMepilogue(void); str ALARMepoch(int *res); @@ -1579,6 +1578,7 @@ str MALassertTriple(Client cntxt, MalBlk int MALcommentsOnly(MalBlkPtr mb); str MALengine(Client c); str MALexitClient(Client c); +str MALgarbagesink(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str MALinitClient(Client c); int MALkeyword(Client cntxt, str kw, int length); int MALlookahead(Client cntxt, str kw, int length); @@ -3110,6 +3110,7 @@ str shutdownFactory(Client cntxt, MalBlk str shutdownFactoryByName(Client cntxt, Module m, str nme); int sidewaysSelectProp; str singleRef; +str sinkRef; void slash_2_dir_sep(str fname); str sliceRef; str sortHRef; diff --git a/clients/examples/Makefile.ag b/clients/examples/Makefile.ag --- a/clients/examples/Makefile.ag +++ b/clients/examples/Makefile.ag @@ -15,4 +15,6 @@ # Copyright August 2008-2012 MonetDB B.V. # All Rights Reserved. -SUBDIRS = C python php +SUBDIRS = C php + +EXTRA_DIST_DIR = python diff --git a/clients/examples/python/Makefile.ag b/clients/examples/python/Makefile.ag deleted file mode 100644 --- a/clients/examples/python/Makefile.ag +++ /dev/null @@ -1,24 +0,0 @@ -# The contents of this file are subject to the MonetDB Public License -# Version 1.1 (the "License"); you may not use this file except in -# compliance with the License. You may obtain a copy of the License at -# http://www.monetdb.org/Legal/MonetDBLicense -# -# Software distributed under the License is distributed on an "AS IS" -# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the -# License for the specific language governing rights and limitations -# under the License. -# -# The Original Code is the MonetDB Database System. -# -# The Initial Developer of the Original Code is CWI. -# Portions created by CWI are Copyright (C) 1997-July 2008 CWI. -# Copyright August 2008-2012 MonetDB B.V. -# All Rights Reserved. - -MTSAFE - -scripts_py = { - COND = HAVE_TESTING - DIR = bindir - SOURCES = sqlsample.py.in -} diff --git a/clients/examples/python/sqlsample.py.in b/clients/examples/python/sqlsample.py rename from clients/examples/python/sqlsample.py.in rename to clients/examples/python/sqlsample.py --- a/clients/examples/python/sqlsample.py.in +++ b/clients/examples/python/sqlsample.py @@ -1,4 +1,4 @@ -#!@PYTHON@ +#!/usr/bin/env python # The contents of this file are subject to the MonetDB Public License # Version 1.1 (the "License"); you may not use this file except in @@ -33,7 +33,7 @@ print(cursor.fetchone()) # deliberately executing a wrong SQL statement: try: cursor.execute('( xyz 1);') -except monetdb.sql.OperationalError, e: +except monetdb.sql.OperationalError as e: print(e) cursor.execute('create table python_table (i smallint,s string);'); diff --git a/clients/python3/monetdb/mapi.py b/clients/python3/monetdb/mapi.py --- a/clients/python3/monetdb/mapi.py +++ b/clients/python3/monetdb/mapi.py @@ -191,7 +191,7 @@ class Server(object): password = h.hexdigest() except ValueError as e: raise NotSupportedError(e.message) - else: + else: raise NotSupportedError("We only speak protocol v9") h = hashes.split(",") diff --git a/monetdb5/modules/atoms/batxml.c b/monetdb5/modules/atoms/batxml.c --- a/monetdb5/modules/atoms/batxml.c +++ b/monetdb5/modules/atoms/batxml.c @@ -78,9 +78,8 @@ batxml_export str BATXMLforest(Client cn batxml_export str BATXMLagg(int *ret, int *bid, int *grp); batxml_export str BATXMLagg3(int *ret, int *bid, int *grp, int *e); batxml_export str BATXMLgroup(xml *ret, int *bid); -batxml_export str AGGRsubxmlcand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils); -batxml_export str AGGRsubxml(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils); -batxml_export str AGGRxml(bat *retval, bat *bid, int *skip_nils); +batxml_export str AGGRsubxmlcand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit *skip_nils); +batxml_export str AGGRsubxml(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils); #define prepareOperand(X,Y,Z) \ @@ -1600,7 +1599,7 @@ BATxmlaggr(BAT **bnp, BAT *b, BAT *g, BA } str -AGGRsubxmlcand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils) +AGGRsubxmlcand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit *skip_nils) { BAT *b, *g, *e, *s, *bn = NULL; const char *err; @@ -1647,18 +1646,12 @@ AGGRsubxmlcand(bat *retval, bat *bid, ba } str -AGGRsubxml(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils) +AGGRsubxml(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils) { return AGGRsubxmlcand(retval, bid, gid, eid, NULL, skip_nils); } str -AGGRxml(bat *retval, bat *bid, int *skip_nils) -{ - return AGGRsubxmlcand(retval, bid, NULL, NULL, NULL, skip_nils); -} - -str BATXMLxquery(int *ret, int *bid, str *expr) { (void) ret; diff --git a/monetdb5/modules/atoms/batxml.mal b/monetdb5/modules/atoms/batxml.mal --- a/monetdb5/modules/atoms/batxml.mal +++ b/monetdb5/modules/atoms/batxml.mal @@ -91,11 +91,11 @@ command xml.aggr(val:bat[:oid,:xml]):xml address BATXMLgroup comment "Aggregate the XML values."; -command xml.subaggr(val:bat[:oid,:xml],g:bat[:oid,:oid],e:bat[:oid,:any_1], skip_nils:int) :bat[:oid,:xml] +command xml.subaggr(val:bat[:oid,:xml],g:bat[:oid,:oid],e:bat[:oid,:any_1], skip_nils:bit) :bat[:oid,:xml] address AGGRsubxml comment "Grouped aggregation of XML values."; -command xml.subaggr(val:bat[:oid,:xml],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid], skip_nils:int) :bat[:oid,:xml] +command xml.subaggr(val:bat[:oid,:xml],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid], skip_nils:bit) :bat[:oid,:xml] address AGGRsubxmlcand comment "Grouped aggregation of XML values with candidates list."; diff --git a/monetdb5/modules/kernel/aggr.c b/monetdb5/modules/kernel/aggr.c --- a/monetdb5/modules/kernel/aggr.c +++ b/monetdb5/modules/kernel/aggr.c @@ -626,361 +626,361 @@ AGGRsubgrouped(bat *retval, bat *bid, ba return MAL_SUCCEED; } -aggr_export str AGGRsubsum_bte(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); +aggr_export str AGGRsubsum_bte(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, bit *abort_on_error); str -AGGRsubsum_bte(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error) +AGGRsubsum_bte(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, bit *abort_on_error) { return AGGRsubgrouped(retval, bid, gid, eid, NULL, *skip_nils, *abort_on_error, TYPE_bte, BATgroupsum, "aggr.subsum"); } -aggr_export str AGGRsubsum_sht(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); +aggr_export str AGGRsubsum_sht(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, bit *abort_on_error); str _______________________________________________ checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
