August 2014 - developers-list

Re: MonetDB: Oct2014 - fixed reuse
by Stefan Manegold 26 Aug '14

26 Aug '14

Niels, this checkin adds "div_by_zero_in_return.Bug-3555" (in addition to "orderby_on_constant.Bug-3554") to sql/test/BugTracker-2014/Tests/All but does not add the respective files (div_by_zero_in_return.Bug-3555.*). Do you have these files ready, or should we remove "div_by_zero_in_return.Bug-3555" from sql/test/BugTracker-2014/Tests/All ? The respective bug report is still open: https://www.monetdb.org/bugzilla/show_bug.cgi?id=3555 Thanks! Stefan ----- Original Message ----- > Changeset: 6c4080d30b3e for MonetDB > URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6c4080d30b3e > Added Files: > sql/test/BugTracker-2014/Tests/orderby_on_constant.Bug-3554.sql > sql/test/BugTracker-2014/Tests/orderby_on_constant.Bug-3554.stable.err > sql/test/BugTracker-2014/Tests/orderby_on_constant.Bug-3554.stable.out > Modified Files: > monetdb5/modules/kernel/bat5.c > sql/backends/monet5/rel_bin.c > sql/backends/monet5/sql.c > sql/backends/monet5/sql_statement.c > sql/test/BugTracker-2014/Tests/All > Branch: Oct2014 > Log Message: > > fixed reuse > > fixed bug 3554, ie make sure single value order by /limit work > > > diffs (254 lines): > > diff --git a/monetdb5/modules/kernel/bat5.c b/monetdb5/modules/kernel/bat5.c > --- a/monetdb5/modules/kernel/bat5.c > +++ b/monetdb5/modules/kernel/bat5.c > @@ -2198,9 +2198,9 @@ BKCshrinkBATmap(int *ret, int *bid, int > Type *r = (Type*)Tloc(bn, BUNfirst(bn)); \ > for (;p<q; oidx++, p++) { \ > if ( *o == oidx ){ \ > - while ( *ol == bidx && ol>o) { \ > + while ( ol>o && *--ol == bidx) { \ > bidx--; \ > - ol--;q--; \ > + q--; \ > } \ > *r++ = *(--q); \ > o += (o < ol); \ > @@ -2241,9 +2241,10 @@ BKCreuseBAT(int *ret, int *bid, int *did > throw(MAL, "bat.reuse", MAL_MALLOC_FAIL ); > } > > - bidx= BUNlast(b)-1; > + oidx = b->hseqbase; > + bidx = oidx + BUNlast(b)-1; > o = (oid*)Tloc(bs, BUNfirst(bs)); > - ol= (oid*)Tloc(bs, BUNlast(bs))-1; > + ol= (oid*)Tloc(bs, BUNlast(bs)); > > switch(ATOMstorage(b->ttype) ){ > case TYPE_bte: reuseloop(bte); break; > @@ -2262,15 +2263,16 @@ BKCreuseBAT(int *ret, int *bid, int *did > > for (;p<q; oidx++, p++) { > if ( *o == oidx ){ > - while ( *ol == bidx && ol>o) { > + while ( ol > o && *--ol == bidx) { > bidx--; > - ol--;q--; > + q--; > } > BUNappend(bn, BUNtail(bi, --q), FALSE); > o += (o < ol); > bidx--; > - } else > + } else { > BUNappend(bn, BUNtail(bi, p), FALSE); > + } > } > } else { > switch( b->T->width){ > @@ -2298,6 +2300,7 @@ BKCreuseBAT(int *ret, int *bid, int *did > BBPkeepref(*ret= bn->batCacheid); > return MAL_SUCCEED; > } > + > str > BKCreuseBATmap(int *ret, int *bid, int *did) > { > @@ -2330,10 +2333,11 @@ BKCreuseBATmap(int *ret, int *bid, int * > throw(MAL, "bat.shrinkMap", MAL_MALLOC_FAIL ); > } > > - bidx= BUNlast(b)-1; > - o = (oid*)Tloc(bs, BUNfirst(bs)); > - ol= (oid*)Tloc(bs, BUNlast(bs)); > - r = (oid*)Tloc(bn, BUNfirst(bn)); > + oidx = b->hseqbase; > + bidx = oidx + BUNlast(b)-1; > + o = (oid*)Tloc(bs, BUNfirst(bs)); > + ol = (oid*)Tloc(bs, BUNlast(bs)); > + r = (oid*)Tloc(bn, BUNfirst(bn)); > > for (;oidx<bidx; oidx++) { > if ( *o == oidx ){ > @@ -2343,8 +2347,9 @@ BKCreuseBATmap(int *ret, int *bid, int * > *r++ = bidx; > o += (o < ol); > bidx--; > - } else > + } else { > *r++ = oidx; > + } > } > > BATsetcount(bn, BATcount(b)-BATcount(bs)); > diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c > --- a/sql/backends/monet5/rel_bin.c > +++ b/sql/backends/monet5/rel_bin.c > @@ -2306,6 +2306,8 @@ rel2bin_project( mvc *sql, sql_rel *rel, > if (!orderbycolstmt) > return NULL; > > + /* handle constants */ > + orderbycolstmt = column(sql->sa, orderbycolstmt); > if (!limit) { /* topn based on a single column */ > limit = stmt_limit(sql->sa, orderbycolstmt, stmt_atom_wrd(sql->sa, 0), > l, LIMIT_FLAG(distinct, is_ascending(orderbycole), last, 1)); > } else { /* topn based on 2 columns */ > diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c > --- a/sql/backends/monet5/sql.c > +++ b/sql/backends/monet5/sql.c > @@ -4136,6 +4136,11 @@ vacuum(Client cntxt, MalBlkPtr mb, MalSt > > /* get the deletions BAT */ > del = mvc_bind_dbat(m, *sch, *tbl, RD_INS); > + if (BATcount(del) == 0) { > + BBPreleaseref(del->batCacheid); > + return MAL_SUCCEED; > + } > + > > i = 0; > bids[i] = 0; > @@ -4163,6 +4168,7 @@ vacuum(Client cntxt, MalBlkPtr mb, MalSt > BBPdecref(bids[i], TRUE); > throw(SQL, name, "Too many columns to handle, use copy instead"); > } > + BBPreleaseref(del->batCacheid); > > mvc_clear_table(m, t); > for (o = t->columns.set->h, i = 0; o; o = o->next, i++) { > @@ -4245,13 +4251,15 @@ SQLvacuum(Client cntxt, MalBlkPtr mb, Ma > /* get the deletions BAT */ > del = mvc_bind_dbat(m, *sch, *tbl, RD_INS); > > - /* now decide on the algorithm */ > - if (ordered) { > - if (BATcount(del) > cnt / 20) > - SQLshrink(cntxt, mb, stk, pci); > - } else > - SQLreuse(cntxt, mb, stk, pci); > - > + if (BATcount(del) > 0) { > + /* now decide on the algorithm */ > + if (ordered) { > + if (BATcount(del) > cnt / 20) > + SQLshrink(cntxt, mb, stk, pci); > + } else { > + SQLreuse(cntxt, mb, stk, pci); > + } > + } > BBPreleaseref(del->batCacheid); > return MAL_SUCCEED; > } > diff --git a/sql/backends/monet5/sql_statement.c > b/sql/backends/monet5/sql_statement.c > --- a/sql/backends/monet5/sql_statement.c > +++ b/sql/backends/monet5/sql_statement.c > @@ -1719,6 +1719,9 @@ const_column(sql_allocator *sa, stmt *va > s->op1 = val; > s->op4.typeval = *ct; > s->nrcols = 1; > + > + s->tname = val->tname; > + s->cname = val->cname; > return s; > } > > diff --git a/sql/test/BugTracker-2014/Tests/All > b/sql/test/BugTracker-2014/Tests/All > --- a/sql/test/BugTracker-2014/Tests/All > +++ b/sql/test/BugTracker-2014/Tests/All > @@ -36,3 +36,5 @@ round.Bug-3542 > number_4_4.Bug-3543 > ifthenelse.Bug-3546 > subselect-reverse.Bug-3552 > +orderby_on_constant.Bug-3554 > +div_by_zero_in_return.Bug-3555 > diff --git a/sql/test/BugTracker-2014/Tests/orderby_on_constant.Bug-3554.sql > b/sql/test/BugTracker-2014/Tests/orderby_on_constant.Bug-3554.sql > new file mode 100644 > --- /dev/null > +++ b/sql/test/BugTracker-2014/Tests/orderby_on_constant.Bug-3554.sql > @@ -0,0 +1,1 @@ > +select a+b from (select 1 as a,1 as b) as q order by a limit 1; > diff --git > a/sql/test/BugTracker-2014/Tests/orderby_on_constant.Bug-3554.stable.err > b/sql/test/BugTracker-2014/Tests/orderby_on_constant.Bug-3554.stable.err > new file mode 100644 > --- /dev/null > +++ b/sql/test/BugTracker-2014/Tests/orderby_on_constant.Bug-3554.stable.err > @@ -0,0 +1,37 @@ > +stderr of test 'orderby_on_constant.Bug-3554` in directory > 'sql/test/BugTracker-2014` itself: > + > + > +# 19:40:06 > > +# 19:40:06 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" > "mapi_open=true" "--set" "mapi_port=31986" "--set" > "mapi_usock=/var/tmp/mtest-21225/.s.monetdb.31986" "--set" "monet_prompt=" > "--forcemito" "--set" "mal_listing=2" > "--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014" > "--set" "mal_listing=0" "--set" "embedded_r=yes" > +# 19:40:06 > > + > +# builtin opt gdk_dbpath = > /home/niels/scratch/rc-monetdb/Linux-x86_64/var/monetdb5/dbfarm/demo > +# builtin opt gdk_debug = 0 > +# builtin opt gdk_vmtrim = no > +# builtin opt monet_prompt = > > +# builtin opt monet_daemon = no > +# builtin opt mapi_port = 50000 > +# builtin opt mapi_open = false > +# builtin opt mapi_autosense = false > +# builtin opt sql_optimizer = default_pipe > +# builtin opt sql_debug = 0 > +# cmdline opt gdk_nr_threads = 0 > +# cmdline opt mapi_open = true > +# cmdline opt mapi_port = 31986 > +# cmdline opt mapi_usock = /var/tmp/mtest-21225/.s.monetdb.31986 > +# cmdline opt monet_prompt = > +# cmdline opt mal_listing = 2 > +# cmdline opt gdk_dbpath = > /home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014 > +# cmdline opt mal_listing = 0 > +# cmdline opt embedded_r = yes > +# cmdline opt gdk_debug = 536870922 > + > +# 19:40:07 > > +# 19:40:07 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" > "--host=/var/tmp/mtest-21225" "--port=31986" > +# 19:40:07 > > + > + > +# 19:40:07 > > +# 19:40:07 > "Done." > +# 19:40:07 > > + > diff --git > a/sql/test/BugTracker-2014/Tests/orderby_on_constant.Bug-3554.stable.out > b/sql/test/BugTracker-2014/Tests/orderby_on_constant.Bug-3554.stable.out > new file mode 100644 > --- /dev/null > +++ b/sql/test/BugTracker-2014/Tests/orderby_on_constant.Bug-3554.stable.out > @@ -0,0 +1,38 @@ > +stdout of test 'orderby_on_constant.Bug-3554` in directory > 'sql/test/BugTracker-2014` itself: > + > + > +# 19:40:06 > > +# 19:40:06 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" > "mapi_open=true" "--set" "mapi_port=31986" "--set" > "mapi_usock=/var/tmp/mtest-21225/.s.monetdb.31986" "--set" "monet_prompt=" > "--forcemito" "--set" "mal_listing=2" > "--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014" > "--set" "mal_listing=0" "--set" "embedded_r=yes" > +# 19:40:06 > > + > +# MonetDB 5 server v11.19.0 > +# This is an unreleased version > +# Serving database 'mTests_sql_test_BugTracker-2014', using 4 threads > +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically > linked > +# Found 7.334 GiB available main-memory. > +# Copyright (c) 1993-July 2008 CWI. > +# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved > +# Visit http://www.monetdb.org/ for further information > +# Listening for connection requests on > mapi:monetdb://localhost.nes.nl:31986/ > +# Listening for UNIX domain connection requests on > mapi:monetdb:///var/tmp/mtest-21225/.s.monetdb.31986 > +# MonetDB/GIS module loaded > +# MonetDB/SQL module loaded > +# MonetDB/R module loaded > + > +Ready. > + > +# 19:40:07 > > +# 19:40:07 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" > "--host=/var/tmp/mtest-21225" "--port=31986" > +# 19:40:07 > > + > +#select a+b from (select 1 as a,1 as b) as q order by a limit 1; > +% .L1 # table_name > +% L1 # name > +% smallint # type > +% 1 # length > +[ 2 ] > + > +# 19:40:07 > > +# 19:40:07 > "Done." > +# 19:40:07 > > + > _______________________________________________ > checkin-list mailing list > checkin-list(a)monetdb.org > https://www.monetdb.org/mailman/listinfo/checkin-list > -- | Stefan.Manegold(a)CWI.nl | DB Architectures (DA) | | www.CWI.nl/~manegold/ | Science Park 123 (L321) | | +31 (0)20 592-4212 | 1098 XG Amsterdam (NL) |

1 0

Re: MonetDB: Protobuf - Protocol buffer prototype for the record
by Stefan Manegold 26 Aug '14

26 Aug '14

Thanks, Hannes! Just for the records, new (and required) files pbstream.c pbstream.h mapi_pb-c.c mapi_pb-c.h are missing. Stefan ----- Original Message ----- > Changeset: af2757009ce3 for MonetDB > URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=af2757009ce3 > Modified Files: > clients/mapiclient/Makefile.ag > clients/mapiclient/mclient.c > clients/mapilib/Makefile.ag > clients/mapilib/mapi.c > clients/mapilib/mapi.h > common/stream/Makefile.ag > common/stream/stream.c > common/utils/mcrypt.c > common/utils/mcrypt.h > configure.ag > monetdb5/extras/jaql/Makefile.ag > monetdb5/extras/mal_optimizer_template/Makefile.ag > monetdb5/mal/Makefile.ag > monetdb5/mal/mal_authorize.c > monetdb5/mal/mal_client.c > monetdb5/mal/mal_client.h > monetdb5/mal/mal_debugger.c > monetdb5/mal/mal_readline.c > monetdb5/mal/mal_scenario.c > monetdb5/mal/mal_session.c > monetdb5/mal/mal_session.h > monetdb5/modules/atoms/Makefile.ag > monetdb5/modules/kernel/Makefile.ag > monetdb5/modules/mal/Makefile.ag > monetdb5/modules/mal/mal_mapi.c > monetdb5/modules/mal/mal_mapi.h > monetdb5/optimizer/Makefile.ag > monetdb5/scheduler/Makefile.ag > sql/backends/monet5/LSST/Makefile.ag > sql/backends/monet5/Makefile.ag > sql/backends/monet5/UDF/Makefile.ag > sql/backends/monet5/sql_result.c > sql/backends/monet5/sql_scenario.c > sql/backends/monet5/sql_scenario.h > sql/backends/monet5/vaults/Makefile.ag > sql/storage/bat/Makefile.ag > tools/merovingian/daemon/client.c > tools/mserver/Makefile.ag > tools/mserver/mserver5.c > Branch: Protobuf > Log Message: > > Protocol buffer prototype for the record > > > diffs (truncated from 2665 to 300 lines): > > diff --git a/clients/mapiclient/Makefile.ag b/clients/mapiclient/Makefile.ag > --- a/clients/mapiclient/Makefile.ag > +++ b/clients/mapiclient/Makefile.ag > @@ -16,7 +16,7 @@ > # All Rights Reserved. > > MTSAFE > -INCLUDES = ../mapilib ../../common/options ../../common/stream > $(READLINE_INCS) > +INCLUDES = ../mapilib ../../common/options ../../common/stream > $(READLINE_INCS) $(PROTOBUF_C_CFLAGS) > > lib_mcutil = { > NOINST > @@ -35,8 +35,8 @@ bin_msqldump = { > SOURCES = msqldump.c > LIBS = libmcutil ../mapilib/libmapi \ > ../../common/stream/libstream \ > - $(curl_LIBS) > -} > + $(curl_LIBS) > + } > > bin_stethoscope = { > SOURCES = stethoscope.c > diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c > --- a/clients/mapiclient/mclient.c > +++ b/clients/mapiclient/mclient.c > @@ -347,13 +347,9 @@ fetch_line(MapiHdl hdl) > static int > fetch_row(MapiHdl hdl) > { > - char *reply; > > - do { > - if ((reply = fetch_line(hdl)) == NULL) > - return 0; > - } while (*reply != '[' && *reply != '='); > - return mapi_split_line(hdl); > + // TODO: this is almost a NOP, because we already have everything from the > PB. fetch_line() just has to pay attention to the export size in the future. > + return mapi_fetch_row(hdl); > } > > static void > @@ -668,11 +664,14 @@ CSVrenderer(MapiHdl hdl) > s = mapi_get_name(hdl, i); > if (s == NULL) > s = ""; > - mnstr_printf(toConsole, "%s%s", > + printf( "%s%s", > i == 0 ? "" : sep, s ? s : ""); > } > - mnstr_printf(toConsole, "\n"); > + printf( "\n"); > } > + > + // TODO: switch on type! > + > while (!mnstr_errnr(toConsole) && (fields = fetch_row(hdl)) != 0) { > for (i = 0; i < fields; i++) { > s = mapi_fetch_field(hdl, i); > @@ -681,37 +680,38 @@ CSVrenderer(MapiHdl hdl) > if (strchr(s, *sep) != NULL || > strchr(s, '\n') != NULL || > strchr(s, '"') != NULL) { > - mnstr_printf(toConsole, "%s\"", > + printf( "%s\"", > i == 0 ? "" : sep); > + printf("%s",s); > while (*s) { > switch (*s) { > case '\n': > - mnstr_write(toConsole, "\\n", 1, 2); > + printf( "\\n"); > break; > case '\t': > - mnstr_write(toConsole, "\\t", 1, 2); > + printf( "\\t"); > break; > case '\r': > - mnstr_write(toConsole, "\\r", 1, 2); > + printf( "\\r"); > break; > case '\\': > - mnstr_write(toConsole, "\\\\", 1, 2); > + printf( "\\\\"); > break; > case '"': > - mnstr_write(toConsole, "\"\"", 1, 2); > + printf( "\"\""); > break; > default: > - mnstr_write(toConsole, s, 1, 1); > + > break; > } > s++; > } > - mnstr_write(toConsole, "\"", 1, 1); > + printf("\""); > } else > - mnstr_printf(toConsole, "%s%s", > + printf( "%s%s", > i == 0 ? "" : sep, s ? s : ""); > } > - mnstr_printf(toConsole, "\n"); > + printf( "\n"); > } > } > > diff --git a/clients/mapilib/Makefile.ag b/clients/mapilib/Makefile.ag > --- a/clients/mapilib/Makefile.ag > +++ b/clients/mapilib/Makefile.ag > @@ -18,11 +18,11 @@ > MTSAFE > > INCLUDES = ../../common/options ../../common/stream ../../common/utils \ > - $(MSGCONTROL_FLAGS) > + $(MSGCONTROL_FLAGS) $(PROTOBUF_C_CFLAGS) > > lib_mapi = { > VERSION = $(MAPI_VERSION) > - SOURCES = mapi.c mapi.rc > + SOURCES = mapi.c mapi.rc > LIBS = $(SOCKET_LIBS) ../../common/stream/libstream \ > ../../common/options/libmoptions \ > ../../common/utils/libmcrypt $(openssl_LIBS) > diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c > --- a/clients/mapilib/mapi.c > +++ b/clients/mapilib/mapi.c > @@ -772,10 +772,13 @@ > > #include "monetdb_config.h" > #include <stream.h> /* include before mapi.h */ > + > #include <stream_socket.h> > #include "mapi.h" > #include "mcrypt.h" > > +#include "pbstream.h" > + > #ifdef HAVE_UNISTD_H > # include <unistd.h> > #endif > @@ -946,6 +949,7 @@ struct MapiResultSet { > struct MapiColumn *fields; > struct MapiRowBuf cache; > int commentonly; /* only comments seen so far */ > + MapiReply__QueryResult *pb; > }; > > struct MapiStatement { > @@ -1429,7 +1433,6 @@ close_result(MapiHdl hdl) > { > struct MapiResultSet *result; > Mapi mid; > - int i; > > result = hdl->result; > if (result == NULL) > @@ -1438,125 +1441,13 @@ close_result(MapiHdl hdl) > assert(mid != NULL); > if (mid->trace == MAPI_TRACE) > printf("closing result set\n"); > - if (result->tableid >= 0 && result->querytype != Q_PREPARE) { > - if (mid->active && > - result->next == NULL && > - !mid->active->needmore && > - read_into_cache(mid->active, -1) != MOK) > - return MERROR; > - assert(hdl->npending_close == 0 || > - (hdl->npending_close > 0 && hdl->pending_close != NULL)); > - if (mid->active && > - (mid->active->active != result || > - result->cache.tuplecount < result->row_count)) > - { > - /* results for which we got all tuples at the initial > - * response, need not to be closed as the server already > - * did that immediately */ > - if (result->row_count > result->tuple_count) { > - /* can't write "X" commands now, so save for later */ > - REALLOC(hdl->pending_close, hdl->npending_close + 1); > - hdl->pending_close[hdl->npending_close] = result->tableid; > - hdl->npending_close++; > - } > - } else if (mid->to != NULL) { > - /* first close saved up to-be-closed tables */ > - for (i = 0; i < hdl->npending_close; i++) { > - char msg[256]; > - > - snprintf(msg, sizeof(msg), "Xclose %d\n", hdl->pending_close[i]); > - mapi_log_record(mid, msg); > - mid->active = hdl; > - if (mnstr_printf(mid->to, "%s", msg) < 0 || > - mnstr_flush(mid->to)) { > - close_connection(mid); > - mapi_setError(mid, mnstr_error(mid->to), "mapi_close_handle", > MTIMEOUT); > - break; > - } > - read_into_cache(hdl, 0); > - } > - hdl->npending_close = 0; > - if (hdl->pending_close) > - free(hdl->pending_close); > - hdl->pending_close = NULL; > - if (mid->to != NULL && result->tuple_count < result->row_count) { > - char msg[256]; > - > - snprintf(msg, sizeof(msg), "Xclose %d\n", result->tableid); > - mapi_log_record(mid, msg); > - mid->active = hdl; > - if (mnstr_printf(mid->to, "%s", msg) < 0 || > - mnstr_flush(mid->to)) { > - close_connection(mid); > - mapi_setError(mid, mnstr_error(mid->to), "mapi_close_handle", > MTIMEOUT); > - } else > - read_into_cache(hdl, 0); > - } > - } > - result->tableid = -1; > + if (hdl->active != NULL) { > + // TODO: cleanup > } > - if (mid->active == hdl && > - hdl->active == result && > - read_into_cache(hdl, -1) != MOK) > - return MERROR; > - assert(hdl->active != result); > - if (result->fields) { > - for (i = 0; i < result->maxfields; i++) { > - if (result->fields[i].tablename) > - free(result->fields[i].tablename); > - if (result->fields[i].columnname) > - free(result->fields[i].columnname); > - if (result->fields[i].columntype) > - free(result->fields[i].columntype); > - } > - free(result->fields); > - } > - result->fields = NULL; > - result->maxfields = result->fieldcnt = 0; > - if (result->cache.line) { > - for (i = 0; i < result->cache.writer; i++) { > - if (result->cache.line[i].rows) > - free(result->cache.line[i].rows); > - if (result->cache.line[i].anchors) { > - int j; > - > - for (j = 0; j < result->cache.line[i].fldcnt; j++) > - if (result->cache.line[i].anchors[j]) { > - free(result->cache.line[i].anchors[j]); > - result->cache.line[i].anchors[j] = NULL; > - } > - free(result->cache.line[i].anchors); > - } > - if (result->cache.line[i].lens) > - free(result->cache.line[i].lens); > - } > - free(result->cache.line); > - result->cache.line = NULL; > - result->cache.tuplecount = 0; > - } > - if (result->errorstr) > - free(result->errorstr); > - result->errorstr = NULL; > - result->hdl = NULL; > - hdl->result = result->next; > - if (hdl->result == NULL) > - hdl->lastresult = NULL; > - result->next = NULL; > - free(result); > + > return MOK; > } > > -static void > -add_error(struct MapiResultSet *result, char *error) > -{ > - /* concatenate the error messages */ > - size_t size = result->errorstr ? strlen(result->errorstr) : 0; > - > - REALLOC(result->errorstr, size + strlen(error) + 2); > - strcpy(result->errorstr + size, error); > - strcat(result->errorstr + size, "\n"); > -} > - > char * > mapi_result_error(MapiHdl hdl) > { > @@ -1571,17 +1462,11 @@ MapiMsg > mapi_next_result(MapiHdl hdl) > { > mapi_hdl_check(hdl, "mapi_next_result"); > - > - while (hdl->result != NULL) { > +// TODO: we only like to export more > + while (hdl->active != NULL) { > if (close_result(hdl) != MOK) > return MERROR; > - if (hdl->result && > - (hdl->result->querytype == -1 || > - /* basically exclude Q_PARSE and Q_BLOCK */ > _______________________________________________ > checkin-list mailing list > checkin-list(a)monetdb.org > https://www.monetdb.org/mailman/listinfo/checkin-list > -- | Stefan.Manegold(a)CWI.nl | DB Architectures (DA) | | www.CWI.nl/~manegold/ | Science Park 123 (L321) | | +31 (0)20 592-4212 | 1098 XG Amsterdam (NL) |

1 0

Re: Contents of developers-list Digest, Vol 24, Issue 3
by Foteini Alvanaki 14 Aug '14

14 Aug '14

The changes to the geos are neither documented nor send somewhere for future use. The implemented functions force users to create polygons without holes (there is no argument for the holes). In case the default geos library is used, an error informs the user that the geometry type she is using is not the correct one. My change in geos added this geometry type. Best, Foteini On 08/14/2014 12:00 PM, developers-list-request(a)monetdb.org wrote: > Send developers-list mailing list submissions to > developers-list(a)monetdb.org > > To subscribe or unsubscribe via the World Wide Web, visit > https://www.monetdb.org/mailman/listinfo/developers-list > or, via email, send a message with subject or body 'help' to > developers-list-request(a)monetdb.org > > You can reach the person managing the list at > developers-list-owner(a)monetdb.org > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of developers-list digest..." > > > Today's Topics: > > 1. Re: MonetDB: geo - MakePolygon/Polygon implmentation. Works > only for... (Stefan Manegold) > > > ---------------------------------------------------------------------- > > Message: 1 > Date: Wed, 13 Aug 2014 14:00:47 +0200 (CEST) > From: Stefan Manegold <Stefan.Manegold(a)cwi.nl> > To: developers-list(a)monetdb.org > Subject: Re: MonetDB: geo - MakePolygon/Polygon implmentation. Works > only for... > Message-ID: <1961125276.5600498.1407931247727.JavaMail.zimbra(a)cwi.nl> > Content-Type: text/plain; charset=utf-8 > > > Thanks! > > purely out of curiosity: > > - are there checks & warnings/ error messages in place > for not (trying) to use it for polygons with holes, > as well as a (configure) check whether the geos library > provides the required functionality? > > - are the changes to the geos module documented (at least > as "diff" with reference to which code version it applies), > or have these changes even been send "up-stream" to have them > by default included in a future version of the library? > > Thanks! > Stefan > > ----- Original Message ----- >> Changeset: 4d4c6ce1a817 for MonetDB >> URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4d4c6ce1a817 >> Modified Files: >> geom/monetdb5/geom.c >> geom/monetdb5/geom.mal >> geom/sql/40_geom.sql >> Branch: geo >> Log Message: >> >> MakePolygon/Polygon implmentation. Works only for polygons without holes. >> Changes to geos library were necessary so, it will not work with standard >> geos library. >> >> >> diffs (80 lines): >> >> diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c >> --- a/geom/monetdb5/geom.c >> +++ b/geom/monetdb5/geom.c >> @@ -600,7 +600,7 @@ str geom_2_geom(wkb** resWKB, wkb **valu >> int valueType = 0; >> >> int valueSRID = (*valueWKB)->srid; >> -//fprintf(stderr, "in geom_2_geom\n"); >> + >> /* get the geosGeometry from the wkb */ >> geosGeometry = wkb2geos(*valueWKB); >> /* get the number of coordinates the geometry has */ >> @@ -784,7 +784,7 @@ wkb* geos2wkb(const GEOSGeometry* geosGe >> geomWKB->srid = GEOSGetSRID(geosGeometry); >> memcpy(&geomWKB->data, w, wkbLen); >> GEOSFree(w); >> - >> + >> return geomWKB; >> } >> >> @@ -1944,13 +1944,13 @@ str wkbMakePolygon(wkb** out, wkb** exte >> } >> >> externalGeometry = wkb2geos(*external); >> - if ((GEOSGeomTypeId(externalGeometry)+1) != wkbLineString) { >> + if ((GEOSGeomTypeId(externalGeometry)+1) != wkbLinearRing) { >> *out = wkb_nil; >> GEOSGeom_destroy(externalGeometry); >> - throw(MAL, "geom.Polygon", "Geometries should be LineStrings"); >> + throw(MAL, "geom.Polygon", "Geometries should be LinearRings"); >> } >> >> - if(internalBAT_id == NULL) { >> + if(*internalBAT_id == 0) { >> geosGeometry = GEOSGeom_createPolygon(externalGeometry, NULL, 0); >> if(geosGeometry == NULL) { >> GEOSGeom_destroy(externalGeometry); >> diff --git a/geom/monetdb5/geom.mal b/geom/monetdb5/geom.mal >> --- a/geom/monetdb5/geom.mal >> +++ b/geom/monetdb5/geom.mal >> @@ -289,14 +289,14 @@ function MakeEnvelope(xmin:dbl, ymin:dbl >> return x; >> end MakeEnvelope; >> >> -#function MakePolygon(external:wkb) :wkb; >> -# x := Polygon(external, NULL, 0); >> -# return x; >> -#end MakePolygon; >> -#function MakePolygon(external:wkb, srid:int) :wkb; >> -# x := Polygon(external, NULL, srid); >> -# return x; >> -#end MakePolygon; >> +function MakePolygon(external:wkb) :wkb; >> + x := Polygon(external, nil:bat, 0); >> + return x; >> +end MakePolygon; >> +function MakePolygon(external:wkb, srid:int) :wkb; >> + x := Polygon(external, nil:bat, srid); >> + return x; >> +end MakePolygon; >> #function MakePolygon(external:wkb, internal:bat[:oid,:wkb]) :wkb; >> # x := Polygon(external, internal, 0); >> # return x; >> diff --git a/geom/sql/40_geom.sql b/geom/sql/40_geom.sql >> --- a/geom/sql/40_geom.sql >> +++ b/geom/sql/40_geom.sql >> @@ -4070,9 +4070,9 @@ CREATE FUNCTION ST_MakePointM(x double, >> --CREATE FUNCTION ST_LineFromMultiPoint(pointGeom Geometry) RETURNS Geometry >> external name geom."LineFromMultiPoint"; --gets mutlipoint returns >> linestring >> CREATE FUNCTION ST_MakeEnvelope(xmin double, ymin double, xmax double, ymax >> double, srid integer) RETURNS Geometry external name geom."MakeEnvelope"; >> CREATE FUNCTION ST_MakeEnvelope(xmin double, ymin double, xmax double, ymax >> double) RETURNS Geometry external name geom."MakeEnvelope"; >> ---CREATE FUNCTION ST_MakePolygon(geom Geometry) RETURNS Geometry external >> name geom."MakePolygon"; --gets linestring >> ---CREATE FUNCTION ST_MakePolygon(outerGeom Geometry, interiorGeoms >> Geometry[]) RETURNS Geometry external name geom."MakePolygon"; --gets >> linestrings >> ---CREATE FUNCTION ST_Polygon(geom Geometry, srid integer) RETURNS Geometry >> external name geom."MakePolygon"; --gets linestring >> +CREATE FUNCTION ST_MakePolygon(geom Geometry) RETURNS Geometry external name >> geom."MakePolygon"; --gets linestring >> +--CREATE FUNCTION ST_MakePolygon(outerGeom Geometry, interiorGeoms table(g >> Geometry)) RETURNS Geometry external name geom."MakePolygon"; --gets >> linestrings >> +CREATE FUNCTION ST_Polygon(geom Geometry, srid integer) RETURNS Geometry >> external name geom."MakePolygon"; --gets linestring >> CREATE FUNCTION ST_MakeBox2D(lowLeftPointGeom Geometry, upRightPointGeom >> Geometry) RETURNS mbr external name geom."MakeBox2D"; --gets 2d points >> --CREATE FUNCTION ST_3DMakeBox(lowLeftPointGeom Geometry, upRightPointGeom >> Geometry) RETURNS mbr external name geom."MakeBox3D"; --gets 3d points >> >> _______________________________________________ >> checkin-list mailing list >> checkin-list(a)monetdb.org >> https://www.monetdb.org/mailman/listinfo/checkin-list >>

1 0

Re: MonetDB: geo - MakePolygon/Polygon implmentation. Works only for...
by Stefan Manegold 13 Aug '14

13 Aug '14

Thanks! purely out of curiosity: - are there checks & warnings/ error messages in place for not (trying) to use it for polygons with holes, as well as a (configure) check whether the geos library provides the required functionality? - are the changes to the geos module documented (at least as "diff" with reference to which code version it applies), or have these changes even been send "up-stream" to have them by default included in a future version of the library? Thanks! Stefan ----- Original Message ----- > Changeset: 4d4c6ce1a817 for MonetDB > URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4d4c6ce1a817 > Modified Files: > geom/monetdb5/geom.c > geom/monetdb5/geom.mal > geom/sql/40_geom.sql > Branch: geo > Log Message: > > MakePolygon/Polygon implmentation. Works only for polygons without holes. > Changes to geos library were necessary so, it will not work with standard > geos library. > > > diffs (80 lines): > > diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c > --- a/geom/monetdb5/geom.c > +++ b/geom/monetdb5/geom.c > @@ -600,7 +600,7 @@ str geom_2_geom(wkb** resWKB, wkb **valu > int valueType = 0; > > int valueSRID = (*valueWKB)->srid; > -//fprintf(stderr, "in geom_2_geom\n"); > + > /* get the geosGeometry from the wkb */ > geosGeometry = wkb2geos(*valueWKB); > /* get the number of coordinates the geometry has */ > @@ -784,7 +784,7 @@ wkb* geos2wkb(const GEOSGeometry* geosGe > geomWKB->srid = GEOSGetSRID(geosGeometry); > memcpy(&geomWKB->data, w, wkbLen); > GEOSFree(w); > - > + > return geomWKB; > } > > @@ -1944,13 +1944,13 @@ str wkbMakePolygon(wkb** out, wkb** exte > } > > externalGeometry = wkb2geos(*external); > - if ((GEOSGeomTypeId(externalGeometry)+1) != wkbLineString) { > + if ((GEOSGeomTypeId(externalGeometry)+1) != wkbLinearRing) { > *out = wkb_nil; > GEOSGeom_destroy(externalGeometry); > - throw(MAL, "geom.Polygon", "Geometries should be LineStrings"); > + throw(MAL, "geom.Polygon", "Geometries should be LinearRings"); > } > > - if(internalBAT_id == NULL) { > + if(*internalBAT_id == 0) { > geosGeometry = GEOSGeom_createPolygon(externalGeometry, NULL, 0); > if(geosGeometry == NULL) { > GEOSGeom_destroy(externalGeometry); > diff --git a/geom/monetdb5/geom.mal b/geom/monetdb5/geom.mal > --- a/geom/monetdb5/geom.mal > +++ b/geom/monetdb5/geom.mal > @@ -289,14 +289,14 @@ function MakeEnvelope(xmin:dbl, ymin:dbl > return x; > end MakeEnvelope; > > -#function MakePolygon(external:wkb) :wkb; > -# x := Polygon(external, NULL, 0); > -# return x; > -#end MakePolygon; > -#function MakePolygon(external:wkb, srid:int) :wkb; > -# x := Polygon(external, NULL, srid); > -# return x; > -#end MakePolygon; > +function MakePolygon(external:wkb) :wkb; > + x := Polygon(external, nil:bat, 0); > + return x; > +end MakePolygon; > +function MakePolygon(external:wkb, srid:int) :wkb; > + x := Polygon(external, nil:bat, srid); > + return x; > +end MakePolygon; > #function MakePolygon(external:wkb, internal:bat[:oid,:wkb]) :wkb; > # x := Polygon(external, internal, 0); > # return x; > diff --git a/geom/sql/40_geom.sql b/geom/sql/40_geom.sql > --- a/geom/sql/40_geom.sql > +++ b/geom/sql/40_geom.sql > @@ -4070,9 +4070,9 @@ CREATE FUNCTION ST_MakePointM(x double, > --CREATE FUNCTION ST_LineFromMultiPoint(pointGeom Geometry) RETURNS Geometry > external name geom."LineFromMultiPoint"; --gets mutlipoint returns > linestring > CREATE FUNCTION ST_MakeEnvelope(xmin double, ymin double, xmax double, ymax > double, srid integer) RETURNS Geometry external name geom."MakeEnvelope"; > CREATE FUNCTION ST_MakeEnvelope(xmin double, ymin double, xmax double, ymax > double) RETURNS Geometry external name geom."MakeEnvelope"; > ---CREATE FUNCTION ST_MakePolygon(geom Geometry) RETURNS Geometry external > name geom."MakePolygon"; --gets linestring > ---CREATE FUNCTION ST_MakePolygon(outerGeom Geometry, interiorGeoms > Geometry[]) RETURNS Geometry external name geom."MakePolygon"; --gets > linestrings > ---CREATE FUNCTION ST_Polygon(geom Geometry, srid integer) RETURNS Geometry > external name geom."MakePolygon"; --gets linestring > +CREATE FUNCTION ST_MakePolygon(geom Geometry) RETURNS Geometry external name > geom."MakePolygon"; --gets linestring > +--CREATE FUNCTION ST_MakePolygon(outerGeom Geometry, interiorGeoms table(g > Geometry)) RETURNS Geometry external name geom."MakePolygon"; --gets > linestrings > +CREATE FUNCTION ST_Polygon(geom Geometry, srid integer) RETURNS Geometry > external name geom."MakePolygon"; --gets linestring > CREATE FUNCTION ST_MakeBox2D(lowLeftPointGeom Geometry, upRightPointGeom > Geometry) RETURNS mbr external name geom."MakeBox2D"; --gets 2d points > --CREATE FUNCTION ST_3DMakeBox(lowLeftPointGeom Geometry, upRightPointGeom > Geometry) RETURNS mbr external name geom."MakeBox3D"; --gets 3d points > > _______________________________________________ > checkin-list mailing list > checkin-list(a)monetdb.org > https://www.monetdb.org/mailman/listinfo/checkin-list > -- | Stefan.Manegold(a)CWI.nl | DB Architectures (DA) | | www.CWI.nl/~manegold/ | Science Park 123 (L321) | | +31 (0)20 592-4212 | 1098 XG Amsterdam (NL) |

1 0

editing monetDB source code
by Hina Khan 12 Aug '14

12 Aug '14

Hi All, I am a PHD student and my research is related to data exploration. In my recent work I have proposed a new query processing technique using columnar data storage layer. For experiments I need to implement a new operator that works in between two "Select" operators. I wanted to know if there is any way that I can implement this new operator and add it to the source code of MonetDB and change its "Select" operator so that it calls the new operator I have inserted. So in short my question is " Is there any way to edit the source code of MonetDB". I would highly appreciate your help in this regard. Cheers, Hina

2 1

New Oct2014 stable branch created
by Sjoerd Mullender 11 Aug '14

11 Aug '14

I have created a new stable branch for the next feature release. This branch was created in order to stabilize the code before the feature release. From now on *only* bug fixes may go to this new stable branch. I reserve the right to undo any changes that do not comply with this rule. I also reserve the right to admit changes that are not strictly bug fixes. The name for the branch is Oct2014. So in each of your stable checkout directories you can do hg pull hg update -rOct2014 to update to this new branch. -- Sjoerd Mullender

1 0

Re: MonetDB: default - Removed Alex's array implementation
by Ying Zhang 05 Aug '14

05 Aug '14

Dear all, I probably have broken Mtest.py with this changeset, since Mtest.py doesn't work for me any more just after this changeset. But I don't see what I did wrong. Does anyone have an idea? Thanks! Jennie On Aug 05, 2014, at 12:35, Jennie Zhang <commits(a)monetdb.org> wrote: > Changeset: b62643655146 for MonetDB > URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b62643655146 > Removed Files: > monetdb5/mal/Tests/tst267.mal > monetdb5/mal/Tests/tst267.stable.err > monetdb5/mal/Tests/tst267.stable.out > monetdb5/modules/kernel/array.c > monetdb5/modules/kernel/array.h > monetdb5/modules/kernel/array.mal > monetdb5/optimizer/Tests/AEexample.mal > monetdb5/optimizer/Tests/AEexample.stable.err > monetdb5/optimizer/Tests/AEexample.stable.out > monetdb5/optimizer/Tests/GCexample.mal > monetdb5/optimizer/Tests/GCexample.stable.err > monetdb5/optimizer/Tests/GCexample.stable.out > monetdb5/optimizer/Tests/tst4800.mal > monetdb5/optimizer/Tests/tst4800.stable.err > monetdb5/optimizer/Tests/tst4800.stable.out > monetdb5/optimizer/Tests/tst4801.mal > monetdb5/optimizer/Tests/tst4801.stable.err > monetdb5/optimizer/Tests/tst4801.stable.out > monetdb5/optimizer/Tests/tst4810.mal > monetdb5/optimizer/Tests/tst4810.stable.err > monetdb5/optimizer/Tests/tst4810.stable.out > monetdb5/optimizer/Tests/tst4900.mal > monetdb5/optimizer/Tests/tst4900.stable.err > monetdb5/optimizer/Tests/tst4900.stable.out > Modified Files: > clients/Tests/MAL-signatures.stable.out > clients/Tests/MAL-signatures_gsl.stable.out > clients/Tests/MAL-signatures_nocfitsio.stable.out > clients/Tests/MAL-signatures_sphinxclient.stable.out > clients/Tests/exports.stable.out > monetdb5/modules/kernel/Makefile.ag > Branch: default > Log Message: > > Removed Alex's array implementation > > > diffs (truncated from 2760 to 300 lines): > > 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 > @@ -2849,46 +2849,6 @@ command alarm.usec{unsafe}():lng > address ALARMusec; > comment return cpu microseconds info > > -command array.grid(b:bat[:oid,:lng],i:lng,j:lng,k:lng,l:lng,s:lng):bat[:oid,:lng] > -address ARRAYgridBATshift_lng; > -comment Fills an index BAT, (grpcount,grpsize,clustersize,offset)and shift all elemenets with a factor s > - > -command array.grid(b:bat[:oid,:lng],i:lng,j:lng,k:lng,l:lng):bat[:oid,:lng] > -address ARRAYgridBAT_lng; > -comment Fills an index BAT, (grpcount,grpsize,clustersize,offset) > - > -command array.grid(i:lng,j:lng,k:lng,l:lng,s:lng):bat[:oid,:lng] > -address ARRAYgridShift_lng; > -comment Generates an index BAT, (grpcount,grpsize,clustersize,offset)and shift all elements with a factor s > - > -command array.grid(i:lng,j:lng,k:lng,l:lng):bat[:oid,:lng] > -address ARRAYgrid_lng; > -comment Generates an index BAT, (grpcount,grpsize,clustersize,offset) > - > -command array.grid(b:bat[:oid,:int],i:int,j:int,k:int,l:int,s:int):bat[:oid,:int] > -address ARRAYgridBATshift_int; > -comment Fills an index BAT, (grpcount,grpsize,clustersize,offset)and shift all elemenets with a factor s > - > -command array.grid(b:bat[:oid,:int],i:int,j:int,k:int,l:int):bat[:oid,:int] > -address ARRAYgridBAT_int; > -comment Fills an index BAT, (grpcount,grpsize,clustersize,offset) > - > -command array.grid(i:int,j:int,k:int,l:int,s:int):bat[:oid,:int] > -address ARRAYgridShift_int; > -comment Generates an index BAT, (grpcount,grpsize,clustersize,offset)and shift all elements with a factor s > - > -command array.grid(i:int,j:int,k:int,l:int):bat[:oid,:int] > -address ARRAYgrid_int; > -comment Generates an index BAT, (grpcount,grpsize,clustersize,offset) > - > -command array.project(b:bat[:oid,:any_1],i:int):bat[:oid,:int] > -address ARRAYproject; > -comment Fill an array representation with constants > - > -command array.product(b:bat[:oid,:any_1],c:bat[:oid,:any_2]) (X_3:bat[:oid,:any_1],c:bat[:oid,:any_2]) > -address ARRAYproduct; > -comment Produce an array product > - > command batudf.fuse(one:bat[:oid,:int],two:bat[:oid,:int]):bat[:oid,:lng] > address UDFBATfuse; > comment fuse two (4-byte) int values into one (8-byte) lng value > diff --git a/clients/Tests/MAL-signatures_gsl.stable.out b/clients/Tests/MAL-signatures_gsl.stable.out > --- a/clients/Tests/MAL-signatures_gsl.stable.out > +++ b/clients/Tests/MAL-signatures_gsl.stable.out > @@ -2849,46 +2849,6 @@ command alarm.usec{unsafe}():lng > address ALARMusec; > comment return cpu microseconds info > > -command array.grid(b:bat[:oid,:lng],i:lng,j:lng,k:lng,l:lng,s:lng):bat[:oid,:lng] > -address ARRAYgridBATshift_lng; > -comment Fills an index BAT, (grpcount,grpsize,clustersize,offset)and shift all elemenets with a factor s > - > -command array.grid(b:bat[:oid,:lng],i:lng,j:lng,k:lng,l:lng):bat[:oid,:lng] > -address ARRAYgridBAT_lng; > -comment Fills an index BAT, (grpcount,grpsize,clustersize,offset) > - > -command array.grid(i:lng,j:lng,k:lng,l:lng,s:lng):bat[:oid,:lng] > -address ARRAYgridShift_lng; > -comment Generates an index BAT, (grpcount,grpsize,clustersize,offset)and shift all elements with a factor s > - > -command array.grid(i:lng,j:lng,k:lng,l:lng):bat[:oid,:lng] > -address ARRAYgrid_lng; > -comment Generates an index BAT, (grpcount,grpsize,clustersize,offset) > - > -command array.grid(b:bat[:oid,:int],i:int,j:int,k:int,l:int,s:int):bat[:oid,:int] > -address ARRAYgridBATshift_int; > -comment Fills an index BAT, (grpcount,grpsize,clustersize,offset)and shift all elemenets with a factor s > - > -command array.grid(b:bat[:oid,:int],i:int,j:int,k:int,l:int):bat[:oid,:int] > -address ARRAYgridBAT_int; > -comment Fills an index BAT, (grpcount,grpsize,clustersize,offset) > - > -command array.grid(i:int,j:int,k:int,l:int,s:int):bat[:oid,:int] > -address ARRAYgridShift_int; > -comment Generates an index BAT, (grpcount,grpsize,clustersize,offset)and shift all elements with a factor s > - > -command array.grid(i:int,j:int,k:int,l:int):bat[:oid,:int] > -address ARRAYgrid_int; > -comment Generates an index BAT, (grpcount,grpsize,clustersize,offset) > - > -command array.project(b:bat[:oid,:any_1],i:int):bat[:oid,:int] > -address ARRAYproject; > -comment Fill an array representation with constants > - > -command array.product(b:bat[:oid,:any_1],c:bat[:oid,:any_2]) (X_3:bat[:oid,:any_1],c:bat[:oid,:any_2]) > -address ARRAYproduct; > -comment Produce an array product > - > command batudf.fuse(one:bat[:oid,:int],two:bat[:oid,:int]):bat[:oid,:lng] > address UDFBATfuse; > comment fuse two (4-byte) int values into one (8-byte) lng value > diff --git a/clients/Tests/MAL-signatures_nocfitsio.stable.out b/clients/Tests/MAL-signatures_nocfitsio.stable.out > --- a/clients/Tests/MAL-signatures_nocfitsio.stable.out > +++ b/clients/Tests/MAL-signatures_nocfitsio.stable.out > @@ -2849,46 +2849,6 @@ command alarm.usec{unsafe}():lng > address ALARMusec; > comment return cpu microseconds info > > -command array.grid(b:bat[:oid,:lng],i:lng,j:lng,k:lng,l:lng,s:lng):bat[:oid,:lng] > -address ARRAYgridBATshift_lng; > -comment Fills an index BAT, (grpcount,grpsize,clustersize,offset)and shift all elemenets with a factor s > - > -command array.grid(b:bat[:oid,:lng],i:lng,j:lng,k:lng,l:lng):bat[:oid,:lng] > -address ARRAYgridBAT_lng; > -comment Fills an index BAT, (grpcount,grpsize,clustersize,offset) > - > -command array.grid(i:lng,j:lng,k:lng,l:lng,s:lng):bat[:oid,:lng] > -address ARRAYgridShift_lng; > -comment Generates an index BAT, (grpcount,grpsize,clustersize,offset)and shift all elements with a factor s > - > -command array.grid(i:lng,j:lng,k:lng,l:lng):bat[:oid,:lng] > -address ARRAYgrid_lng; > -comment Generates an index BAT, (grpcount,grpsize,clustersize,offset) > - > -command array.grid(b:bat[:oid,:int],i:int,j:int,k:int,l:int,s:int):bat[:oid,:int] > -address ARRAYgridBATshift_int; > -comment Fills an index BAT, (grpcount,grpsize,clustersize,offset)and shift all elemenets with a factor s > - > -command array.grid(b:bat[:oid,:int],i:int,j:int,k:int,l:int):bat[:oid,:int] > -address ARRAYgridBAT_int; > -comment Fills an index BAT, (grpcount,grpsize,clustersize,offset) > - > -command array.grid(i:int,j:int,k:int,l:int,s:int):bat[:oid,:int] > -address ARRAYgridShift_int; > -comment Generates an index BAT, (grpcount,grpsize,clustersize,offset)and shift all elements with a factor s > - > -command array.grid(i:int,j:int,k:int,l:int):bat[:oid,:int] > -address ARRAYgrid_int; > -comment Generates an index BAT, (grpcount,grpsize,clustersize,offset) > - > -command array.project(b:bat[:oid,:any_1],i:int):bat[:oid,:int] > -address ARRAYproject; > -comment Fill an array representation with constants > - > -command array.product(b:bat[:oid,:any_1],c:bat[:oid,:any_2]) (X_3:bat[:oid,:any_1],c:bat[:oid,:any_2]) > -address ARRAYproduct; > -comment Produce an array product > - > command batudf.fuse(one:bat[:oid,:int],two:bat[:oid,:int]):bat[:oid,:lng] > address UDFBATfuse; > comment fuse two (4-byte) int values into one (8-byte) lng value > diff --git a/clients/Tests/MAL-signatures_sphinxclient.stable.out b/clients/Tests/MAL-signatures_sphinxclient.stable.out > --- a/clients/Tests/MAL-signatures_sphinxclient.stable.out > +++ b/clients/Tests/MAL-signatures_sphinxclient.stable.out > @@ -2849,46 +2849,6 @@ command alarm.usec{unsafe}():lng > address ALARMusec; > comment return cpu microseconds info > > -command array.grid(b:bat[:oid,:lng],i:lng,j:lng,k:lng,l:lng,s:lng):bat[:oid,:lng] > -address ARRAYgridBATshift_lng; > -comment Fills an index BAT, (grpcount,grpsize,clustersize,offset)and shift all elemenets with a factor s > - > -command array.grid(b:bat[:oid,:lng],i:lng,j:lng,k:lng,l:lng):bat[:oid,:lng] > -address ARRAYgridBAT_lng; > -comment Fills an index BAT, (grpcount,grpsize,clustersize,offset) > - > -command array.grid(i:lng,j:lng,k:lng,l:lng,s:lng):bat[:oid,:lng] > -address ARRAYgridShift_lng; > -comment Generates an index BAT, (grpcount,grpsize,clustersize,offset)and shift all elements with a factor s > - > -command array.grid(i:lng,j:lng,k:lng,l:lng):bat[:oid,:lng] > -address ARRAYgrid_lng; > -comment Generates an index BAT, (grpcount,grpsize,clustersize,offset) > - > -command array.grid(b:bat[:oid,:int],i:int,j:int,k:int,l:int,s:int):bat[:oid,:int] > -address ARRAYgridBATshift_int; > -comment Fills an index BAT, (grpcount,grpsize,clustersize,offset)and shift all elemenets with a factor s > - > -command array.grid(b:bat[:oid,:int],i:int,j:int,k:int,l:int):bat[:oid,:int] > -address ARRAYgridBAT_int; > -comment Fills an index BAT, (grpcount,grpsize,clustersize,offset) > - > -command array.grid(i:int,j:int,k:int,l:int,s:int):bat[:oid,:int] > -address ARRAYgridShift_int; > -comment Generates an index BAT, (grpcount,grpsize,clustersize,offset)and shift all elements with a factor s > - > -command array.grid(i:int,j:int,k:int,l:int):bat[:oid,:int] > -address ARRAYgrid_int; > -comment Generates an index BAT, (grpcount,grpsize,clustersize,offset) > - > -command array.project(b:bat[:oid,:any_1],i:int):bat[:oid,:int] > -address ARRAYproject; > -comment Fill an array representation with constants > - > -command array.product(b:bat[:oid,:any_1],c:bat[:oid,:any_2]) (X_3:bat[:oid,:any_1],c:bat[:oid,:any_2]) > -address ARRAYproduct; > -comment Produce an array product > - > command batudf.fuse(one:bat[:oid,:int],two:bat[:oid,:int]):bat[:oid,:lng] > address UDFBATfuse; > comment fuse two (4-byte) int values into one (8-byte) lng value > 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 > @@ -838,21 +838,6 @@ str ALGuselect1(int *result, int *bid, p > str ALGuselectInclusive(int *result, int *bid, ptr low, ptr high, bit *lin, bit *rin); > str ALGvariance(dbl *res, int *bid); > str ALGvariancep(dbl *res, int *bid); > -str ARRAYgridBAT_int(int *ret, int *bid, int *groups, int *groupsize, int *clustersize, int *offset); > -str ARRAYgridBAT_lng(lng *ret, lng *bid, lng *groups, lng *groupsize, lng *clustersize, lng *offset); > -str ARRAYgridBATshift_int(int *ret, int *bid, int *groups, int *groupsize, int *clustersize, int *offset, int *shift); > -str ARRAYgridBATshift_lng(lng *ret, lng *bid, lng *groups, lng *groupsize, lng *clustersize, lng *offset, lng *shift); > -str ARRAYgridShift_int(int *ret, int *groups, int *groupsize, int *clustersize, int *offset, int *shift); > -str ARRAYgridShift_lng(lng *ret, lng *groups, lng *groupsize, lng *clustersize, lng *offset, lng *shift); > -str ARRAYgrid_int(int *ret, int *groups, int *groupsize, int *clustersize, int *offset); > -str ARRAYgrid_lng(lng *ret, lng *groups, lng *groupsize, lng *clustersize, lng *offset); > -str ARRAYmultiply_int_int(int *ret, int *bid, int *rid); > -str ARRAYmultiply_int_lng(int *ret, int *bid, int *rid); > -str ARRAYmultiply_lng_lng(int *ret, int *bid, int *rid); > -str ARRAYmultiply_sht_int(int *ret, int *bid, int *rid); > -str ARRAYmultiply_sht_lng(int *ret, int *bid, int *rid); > -str ARRAYproduct(int *ret, int *ret2, int *bid, int *rid); > -str ARRAYproject(int *ret, int *bid, int *cst); > str AUTHaddUser(oid *ret, Client *c, str *user, str *pass); > str AUTHchangePassword(Client *c, str *oldpass, str *passwd); > str AUTHchangeUsername(Client *c, str *olduser, str *newuser); > diff --git a/monetdb5/mal/Tests/tst267.mal b/monetdb5/mal/Tests/tst267.mal > deleted file mode 100644 > --- a/monetdb5/mal/Tests/tst267.mal > +++ /dev/null > @@ -1,14 +0,0 @@ > -# Grouped sums > -a:= bat.new(:oid,:int); > -b:= bat.new(:oid,:int); > -bat.append(a,1); > -bat.append(a,2); > -bat.append(b,5); > -bat.append(b,6); > -bat.append(b,7); > -bat.append(b,8); > -io.print(a); > -io.print(b); > - > -(g,h):= array.product(a,b); > -io.print(g,h); > diff --git a/monetdb5/mal/Tests/tst267.stable.err b/monetdb5/mal/Tests/tst267.stable.err > deleted file mode 100644 > --- a/monetdb5/mal/Tests/tst267.stable.err > +++ /dev/null > @@ -1,12 +0,0 @@ > -stderr of test 'tst267` in directory 'monetdb5/mal` itself: > - > - > -# 20:55:59 > > -# 20:55:59 > Mtimeout -timeout 60 Mserver "--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --debug=10 --set "monet_mod_path=/ufs/mk/monet5/Linux/lib/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib/MonetDB" --set "gdk_dbfarm=/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/log" --set mapi_port=40036 --set sql_port=52173 --set monet_prompt= --trace "--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --dbname=mTests_src_mal tst267.mal </dev/null > -# 20:55:59 > > - > - > -# 20:55:59 > > -# 20:55:59 > Done. > -# 20:55:59 > > - > diff --git a/monetdb5/mal/Tests/tst267.stable.out b/monetdb5/mal/Tests/tst267.stable.out > deleted file mode 100644 > --- a/monetdb5/mal/Tests/tst267.stable.out > +++ /dev/null > @@ -1,72 +0,0 @@ > -stdout of test 'tst267` in directory 'monetdb5/mal` itself: > - > - > -# 20:55:59 > > -# 20:55:59 > Mtimeout -timeout 60 Mserver "--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --debug=10 --set "monet_mod_path=/ufs/mk/monet5/Linux/lib/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib/MonetDB" --set "gdk_dbfarm=/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/log" --set mapi_port=40036 --set sql_port=52173 --set monet_prompt= --trace "--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --dbname=mTests_src_mal tst267.mal </dev/null > -# 20:55:59 > > - > -# Monet Database Server V4.7.0 > -# Copyright (c) 1993-2005, CWI. All rights reserved. > -# Compiled for i686-redhat-linux-gnu/32bit; dynamically linked. > -# config:/ufs/mk/monet5/src/mal/Tests/All.conf > -# dbfarm:/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/dbfarm > -# dbname:mTests_src_mal > -# Visit http://monetdb.cwi.nl/ for further information. > -## Grouped sums > -#a:= new(:void,:int); > -#setSequenceBase(a,0:oid); > -#b:= new(:void,:int); > -#setSequenceBase(b,0:oid); > -#insert(a,1); > -#insert(a,2); > -#insert(b,3); > -#insert(b,4); > -#insert(b,5); > -#print(a); > -#print(b); > -# > -#g:= array.*(a,b); > -#print(g); > -# > -function user.main():void; > -# Grouped sums > - a := bat.new(:oid,:int); > - b := bat.new(:oid,:int); > _______________________________________________ > checkin-list mailing list > checkin-list(a)monetdb.org > https://www.monetdb.org/mailman/listinfo/checkin-list

2 1