Changeset: 11e6a162eea1 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=11e6a162eea1 Added Files: sql/backends/monet5/sql_fround_impl.h sql/backends/monet5/sql_round_impl.h sql/test/BugTracker-2014/Tests/copy-into.Bug-3481.SQL.py sql/test/BugTracker-2014/Tests/copy-into.Bug-3481.stable.err sql/test/BugTracker-2014/Tests/copy-into.Bug-3481.stable.out sql/test/json/Tests/aggregate00.sql sql/test/json/Tests/aggregate00.stable.err sql/test/json/Tests/aggregate00.stable.out sql/test/pg_regress/monetdb/abstime.sql sql/test/pg_regress/monetdb/aggregates.sql sql/test/pg_regress/monetdb/alter_table.sql sql/test/pg_regress/monetdb/arrays.sql sql/test/pg_regress/monetdb/bit.sql sql/test/pg_regress/monetdb/boolean.sql sql/test/pg_regress/monetdb/box.sql sql/test/pg_regress/monetdb/btree_index.sql sql/test/pg_regress/monetdb/case.sql sql/test/pg_regress/monetdb/circle.sql sql/test/pg_regress/monetdb/cluster.sql sql/test/pg_regress/monetdb/comments.sql sql/test/pg_regress/monetdb/conversion.sql sql/test/pg_regress/monetdb/copy2.sql sql/test/pg_regress/monetdb/create_aggregate.sql sql/test/pg_regress/monetdb/create_index.sql sql/test/pg_regress/monetdb/create_misc.sql sql/test/pg_regress/monetdb/create_operator.sql sql/test/pg_regress/monetdb/create_type.sql sql/test/pg_regress/monetdb/create_view.sql sql/test/pg_regress/monetdb/date.sql sql/test/pg_regress/monetdb/domain.sql sql/test/pg_regress/monetdb/drop.sql sql/test/pg_regress/monetdb/errors.sql sql/test/pg_regress/monetdb/float4.sql sql/test/pg_regress/monetdb/float8.sql sql/test/pg_regress/monetdb/foreign_key.sql sql/test/pg_regress/monetdb/geometry.sql sql/test/pg_regress/monetdb/hash_index.sql sql/test/pg_regress/monetdb/horology.sql sql/test/pg_regress/monetdb/inet.sql sql/test/pg_regress/monetdb/inherit.sql sql/test/pg_regress/monetdb/insert.sql sql/test/pg_regress/monetdb/int2.sql sql/test/pg_regress/monetdb/int4.sql sql/test/pg_regress/monetdb/int8.sql sql/test/pg_regress/monetdb/interval.sql sql/test/pg_regress/monetdb/join.sql sql/test/pg_regress/monetdb/limit.sql sql/test/pg_regress/monetdb/lseg.sql sql/test/pg_regress/monetdb/mule_internal.sql sql/test/pg_regress/monetdb/name.sql sql/test/pg_regress/monetdb/namespace.sql sql/test/pg_regress/monetdb/numeric.sql sql/test/pg_regress/monetdb/numeric_big.sql sql/test/pg_regress/monetdb/numerology.sql sql/test/pg_regress/monetdb/oid.sql sql/test/pg_regress/monetdb/oidjoins.sql sql/test/pg_regress/monetdb/opr_sanity.sql sql/test/pg_regress/monetdb/path.sql sql/test/pg_regress/monetdb/plpgsql.sql sql/test/pg_regress/monetdb/point.sql sql/test/pg_regress/monetdb/polygon.sql sql/test/pg_regress/monetdb/polymorphism.sql sql/test/pg_regress/monetdb/portals.sql sql/test/pg_regress/monetdb/portals_p2.sql sql/test/pg_regress/monetdb/prepare.sql sql/test/pg_regress/monetdb/privileges.sql sql/test/pg_regress/monetdb/random.sql sql/test/pg_regress/monetdb/rangefuncs.sql sql/test/pg_regress/monetdb/reltime.sql sql/test/pg_regress/monetdb/rowtypes.sql sql/test/pg_regress/monetdb/rules.sql sql/test/pg_regress/monetdb/sanity_check.sql sql/test/pg_regress/monetdb/select.sql sql/test/pg_regress/monetdb/select_distinct.sql sql/test/pg_regress/monetdb/select_distinct_on.sql sql/test/pg_regress/monetdb/select_having.sql sql/test/pg_regress/monetdb/select_implicit.sql sql/test/pg_regress/monetdb/select_into.sql sql/test/pg_regress/monetdb/select_views.sql sql/test/pg_regress/monetdb/sequence.sql sql/test/pg_regress/monetdb/sql_ascii.sql sql/test/pg_regress/monetdb/stats.sql sql/test/pg_regress/monetdb/strings.sql sql/test/pg_regress/monetdb/subselect.sql sql/test/pg_regress/monetdb/temp.sql sql/test/pg_regress/monetdb/time.sql sql/test/pg_regress/monetdb/timestamp.sql sql/test/pg_regress/monetdb/timestamptz.sql sql/test/pg_regress/monetdb/timetz.sql sql/test/pg_regress/monetdb/tinterval.sql sql/test/pg_regress/monetdb/transactions.sql sql/test/pg_regress/monetdb/triggers.sql sql/test/pg_regress/monetdb/truncate.sql sql/test/pg_regress/monetdb/type_sanity.sql sql/test/pg_regress/monetdb/union.sql sql/test/pg_regress/monetdb/update.sql sql/test/pg_regress/monetdb/vacuum.sql sql/test/pg_regress/monetdb/without_oid.sql Modified Files: .hgtags MonetDB.spec NT/installer32/MonetDB-ODBC-Installer.vdproj NT/installer32/MonetDB5-Geom-Module.vdproj NT/installer32/MonetDB5-SQL-Installer.vdproj NT/installer64/MonetDB-ODBC-Installer.vdproj NT/installer64/MonetDB5-Geom-Module.vdproj NT/installer64/MonetDB5-SQL-Installer.vdproj NT/monetdb_config.h.in NT/rules.msc README buildtools/ChangeLog-Archive buildtools/ChangeLog.Jan2014 clients/ChangeLog-Archive clients/ChangeLog.Jan2014 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/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.32bit clients/Tests/SQL-dump.stable.out.64bit.oid32 clients/Tests/SQL-dump_gsl.stable.out clients/Tests/SQL-dump_gsl.stable.out.oid32 clients/Tests/SQL-dump_nogeom.stable.out clients/Tests/exports.stable.out clients/mapiclient/ReadlineTools.c clients/mapiclient/dump.c clients/mapiclient/mclient.c clients/mapiclient/msqldump.c clients/mapiclient/tomograph.c clients/mapilib/mapi.rc clients/odbc/driver/ODBCConvert.c clients/odbc/driver/ODBCEnv.c clients/odbc/driver/ODBCError.c clients/odbc/driver/ODBCStmt.c clients/odbc/driver/ODBCUtil.c clients/odbc/driver/ODBCUtil.h clients/odbc/driver/SQLBrowseConnect.c clients/odbc/driver/SQLColAttribute.c clients/odbc/driver/SQLColAttributes.c clients/odbc/driver/SQLColumnPrivileges.c clients/odbc/driver/SQLColumns.c clients/odbc/driver/SQLConnect.c clients/odbc/driver/SQLDataSources.c clients/odbc/driver/SQLDescribeCol.c clients/odbc/driver/SQLDriverConnect.c clients/odbc/driver/SQLError.c clients/odbc/driver/SQLExecDirect.c clients/odbc/driver/SQLExecute.c clients/odbc/driver/SQLForeignKeys.c clients/odbc/driver/SQLGetConnectAttr.c clients/odbc/driver/SQLGetConnectOption.c clients/odbc/driver/SQLGetCursorName.c clients/odbc/driver/SQLGetDescField.c clients/odbc/driver/SQLGetDescRec.c clients/odbc/driver/SQLGetDiagRec.c clients/odbc/driver/SQLGetInfo.c clients/odbc/driver/SQLNativeSql.c clients/odbc/driver/SQLPrepare.c clients/odbc/driver/SQLPrimaryKeys.c clients/odbc/driver/SQLProcedures.c clients/odbc/driver/SQLSetConnectAttr.c clients/odbc/driver/SQLSetDescField.c clients/odbc/driver/SQLSpecialColumns.c clients/odbc/driver/SQLStatistics.c clients/odbc/driver/SQLTablePrivileges.c clients/odbc/driver/SQLTables.c clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc clients/python2/monetdb/sql/pythonize.py clients/python2/setup.py clients/python2/test/capabilities.py clients/python3/monetdb/sql/pythonize.py clients/python3/setup.py clients/python3/test/capabilities.py common/stream/stream.c common/utils/mcrypt.c common/utils/msabaoth.c common/utils/mutils.c common/utils/mutils.h configure.ag debian/changelog gdk/gdk.h gdk/gdk_atoms.c gdk/gdk_atoms.h gdk/gdk_bat.c gdk/gdk_bbp.c gdk/gdk_bbp.h gdk/gdk_group.c gdk/gdk_heap.c gdk/gdk_imprints.c gdk/gdk_imprints.h gdk/gdk_join.c gdk/gdk_logger.c gdk/gdk_posix.c gdk/gdk_private.h gdk/gdk_search.c gdk/gdk_select.c gdk/gdk_select_legacy.c gdk/gdk_ssort.c gdk/gdk_storage.c gdk/gdk_utils.c gdk/libbat.rc geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err java/Makefile.ag java/build.properties java/example/SQLcopyinto.java java/pom.xml java/release.txt java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java java/src/nl/cwi/monetdb/mcl/net/MapiSocket.java libversions monetdb5/extras/sphinx/sphinx.c monetdb5/mal/mal_atom.c monetdb5/mal/mal_builder.c monetdb5/mal/mal_debugger.c monetdb5/mal/mal_function.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_linker.c monetdb5/mal/mal_parser.c monetdb5/mal/mal_profiler.c monetdb5/mal/mal_recycle.c monetdb5/mal/mal_runtime.c monetdb5/modules/atoms/json.c monetdb5/modules/atoms/json.h monetdb5/modules/atoms/json.mal monetdb5/modules/atoms/mcurl.c monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/str.c monetdb5/modules/atoms/xml.c monetdb5/modules/kernel/aggr.c monetdb5/modules/kernel/array.c monetdb5/modules/mal/batExtensions.c monetdb5/modules/mal/cluster.c monetdb5/modules/mal/groupby.c monetdb5/modules/mal/language.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/mat.c monetdb5/modules/mal/pcre.c monetdb5/modules/mal/pqueue.c monetdb5/modules/mal/remote.c monetdb5/modules/mal/tablet.c monetdb5/modules/mal/tokenizer.c monetdb5/modules/mal/txtsim.c monetdb5/optimizer/opt_macro.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_multiplex.c monetdb5/optimizer/opt_octopus.c monetdb5/optimizer/opt_pushselect.c monetdb5/optimizer/opt_querylog.c monetdb5/optimizer/opt_statistics.c monetdb5/optimizer/opt_wrapper.c monetdb5/scheduler/run_octopus.c monetdb5/scheduler/srvpool.c monetdb5/tools/libmonetdb5.rc sql/backends/monet5/Makefile.ag sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql_cast_impl_down_from_int.h sql/backends/monet5/sql_fround.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_round.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statistics.c sql/backends/monet5/vaults/fits.c sql/backends/monet5/vaults/vault.c sql/common/sql_list.c sql/common/sql_types.c sql/scripts/40_json.sql sql/server/rel_distribute.c sql/server/rel_dump.c sql/server/rel_exp.c sql/server/rel_optimizer.c sql/server/rel_planner.c sql/server/rel_psm.c sql/server/rel_schema.c sql/server/rel_select.c sql/server/rel_updates.c sql/server/sql_datetime.c sql/server/sql_mvc.c sql/server/sql_privileges.c sql/server/sql_qc.c sql/server/sql_scan.c sql/server/sql_semantic.c sql/storage/bat/bat_storage.c sql/storage/store.c sql/test/BugTracker-2008/Tests/copy-format.SF-2468513.stable.err sql/test/BugTracker-2008/Tests/varchar.SF-2471371.stable.err sql/test/BugTracker-2009/Tests/copy_into_error_off_by_one.SF-2833696.stable.err sql/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.stable.err sql/test/BugTracker-2010/Tests/incomplete-utf8-sequence.Bug-2575.stable.err sql/test/BugTracker/Tests/copy_decimal.SF-1582957.stable.err sql/test/BugTracker/Tests/copy_overflow_null_bug.SF-1842550.stable.err sql/test/copy/Tests/int_parse.stable.err sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.err sql/test/copy/Tests/null_as_string_errors.stable.err sql/test/json/Tests/All sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check1_gsl.stable.out sql/test/leaks/Tests/check1_nogeom.stable.out sql/test/leaks/Tests/check2.stable.out sql/test/leaks/Tests/check2_gsl.stable.out sql/test/leaks/Tests/check2_nogeom.stable.out sql/test/leaks/Tests/check3.stable.out sql/test/leaks/Tests/check3_gsl.stable.out sql/test/leaks/Tests/check3_nogeom.stable.out sql/test/leaks/Tests/check4.stable.out sql/test/leaks/Tests/check4_gsl.stable.out sql/test/leaks/Tests/check4_nogeom.stable.out sql/test/leaks/Tests/check5.stable.out sql/test/leaks/Tests/check5_gsl.stable.out sql/test/leaks/Tests/check5_nogeom.stable.out sql/test/mapi/Tests/python2_test_monetdb_sql.stable.err sql/test/mapi/Tests/python3_test_monetdb_sql.stable.err sql/test/pg_regress/monetdb/char.sql sql/test/testdb/Tests/testdb-load.stable.out tools/merovingian/client/monetdb.c tools/merovingian/daemon/controlrunner.c tools/merovingian/daemon/forkmserver.c tools/merovingian/daemon/merovingian.c tools/merovingian/daemon/merovingian.h tools/mserver/monet_version.c.in tools/mserver/mserver5.c vertoo.data Branch: multifarm Log Message:
Merge with default branch. diffs (truncated from 42447 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -562,3 +562,5 @@ fa6872e2a8cf8bb3b4fb25a3b356946316f52a6b 45d2af6f6cca3478319a11b5ddae69ecd9f19943 Jan2014_13 fa6872e2a8cf8bb3b4fb25a3b356946316f52a6b Jan2014_SP1_release 242fe4b4960f54c339f7a6fb79aedd8f3b5e217a Jan2014_SP1_release +c91c4d792dee1074ce6f489e94ce4bfc480edfb3 Jan2014_15 +13e1b24f442791f5ab790fa77453d3bd4e88a9c8 Jan2014_SP2_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -45,7 +45,7 @@ Vendor: MonetDB BV <i...@monetdb.org> Group: Applications/Databases License: MPL - http://www.monetdb.org/Legal/MonetDBLicense URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Jan2014-SP1/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Jan2014-SP2/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -800,6 +800,45 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetD rm -fr $RPM_BUILD_ROOT %changelog +* Thu May 08 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.15-20140508 +- Rebuilt. +- BZ#3424: numeric values at the front of strings determines whether + CAST works successfully +- BZ#3439: Python driver drops milliseconds from timestamps +- BZ#3446: SET READ ONLY forgets previous changes +- BZ#3455: String columns unusable from 64-bit .NET via ODBC +- BZ#3456: Insert fails +- BZ#3457: When kernel of remote client crashes, the connection remains + established on server side +- BZ#3458: mserver5 crash on SQL: SELECT COUNT(*) FROM SYS.TABLES HAVING + COUNT(*) > 0 +- BZ#3461: mserver5 crash on SQL: SELECT * FROM SYS.ARGS WHERE FUNC_ID + NOT IN (SELECT ID FROM SYS.FUNCTIONS) OR FUNC_ID NOT IN (SELECT * + FROM SYS.FUNCTIONS) +- BZ#3462: Invalid SQL (IN with subquery which returns multiple columns) + is accepted +- BZ#3463: Crash on SELECT with SERIAL aggregation and GROUP BY column + alias's +- BZ#3468: Local temporary table persists across sessions +- BZ#3469: Absolute network paths considered invalid for COPY INTO + ... FROM statement. +- BZ#3473: Various memory leaks in SQL compilation +- BZ#3477: ODBC driver raises "unexpected end of input" for prepared + string parameter from .NET application +- BZ#3481: Cannot run multiple COPY INTO statements in one 's'-command + +* Wed Apr 30 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.15-20140508 +- buildtools: Lots of minor fixes were made for potential defects found by Coverity + Scan. + +* Tue Apr 1 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.15-20140508 +- clients: ODBC: Implemented {call procedure-name(...)} escape. The version + {?=call ...} is not implemented. + +* Mon Mar 24 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.15-20140508 +- buildtools: On Windows we now build the geom module against version 3.4.2 of the + geos library. + * Thu Mar 06 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.13-20140306 - Rebuilt. - BZ#3452: ODBC driver build fails on Mac OS X due to a conflicting diff --git a/README b/README --- a/README +++ b/README @@ -35,4 +35,3 @@ The Initial Developer of the Original Co Portions created by CWI are Copyright (C) 1997-July 2008 CWI. Copyright August 2008-2014 MonetDB B.V. All Rights Reserved. - diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive --- a/buildtools/ChangeLog-Archive +++ b/buildtools/ChangeLog-Archive @@ -1,6 +1,14 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Wed Apr 30 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.15-20140508 +- Lots of minor fixes were made for potential defects found by Coverity + Scan. + +* Mon Mar 24 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.15-20140508 +- On Windows we now build the geom module against version 3.4.2 of the + geos library. + * Fri Feb 28 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.11-20140303 - Configure now enables the SQL front end by default. diff --git a/buildtools/ChangeLog.Jan2014 b/buildtools/ChangeLog.Jan2014 --- a/buildtools/ChangeLog.Jan2014 +++ b/buildtools/ChangeLog.Jan2014 @@ -1,7 +1,3 @@ # ChangeLog file for buildtools # This file is updated with Maddlog -* Mon Mar 24 2014 Sjoerd Mullender <sjo...@acm.org> -- On Windows we now build the geom module against version 3.4.2 of the - geos library. - diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive --- a/clients/ChangeLog-Archive +++ b/clients/ChangeLog-Archive @@ -1,6 +1,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Tue Apr 1 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.15-20140508 +- ODBC: Implemented {call procedure-name(...)} escape. The version + {?=call ...} is not implemented. + * Fri Sep 6 2013 Sjoerd Mullender <sjo...@acm.org> - 11.17.1-20140114 - ODBC: Implemented {fn scalar()} and {interval ...} escapes. diff --git a/clients/ChangeLog.Jan2014 b/clients/ChangeLog.Jan2014 --- a/clients/ChangeLog.Jan2014 +++ b/clients/ChangeLog.Jan2014 @@ -1,7 +1,3 @@ # ChangeLog file for clients # This file is updated with Maddlog -* Tue Apr 1 2014 Sjoerd Mullender <sjo...@acm.org> -- ODBC: Implemented {call procedure-name(...)} escape. The version - {?=call ...} is not implemented. - 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 @@ -39444,6 +39444,10 @@ command iterator.new(b:bat[:oid,:any_2], address ITRnewChunk; comment Create an iterator with fixed granule size. The result is a view. +command json.aggr(val:bat[:oid,:str]):str +address JSONgroupStr; +comment Aggregate the string values to array. + command json.dump(j:json):void address JSONdump; pattern json.fold(k:bat[:oid,:any]):json @@ -39532,6 +39536,10 @@ command json.new(j:str):json address JSONstr2json; comment Convert string to its JSON. Dealing with escape characters +command json.output(b:bat[:oid,:any_1]):str +address JSONtextString; +comment Pack the values into a single json structure + command json.prelude():void address JSONprelude; command json.resultSet(u:bat[:oid,:uuid],rev:bat[:oid,:lng],js:bat[:oid,:json]):json @@ -39542,6 +39550,18 @@ pattern json.renderarray(val:any...):jso address JSONrenderarray; pattern json.renderobject(val:any...):json address JSONrenderobject; +command json.subaggr(val:bat[:oid,:str],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:str] +address JSONsubjsoncand; +comment Grouped aggregation of values with candidates list. + +command json.subaggr(val:bat[:oid,:str],g:bat[:oid,:oid],e:bat[:oid,:any_1],skip_nils:bit):bat[:oid,:str] +address JSONsubjson; +comment Grouped aggregation of values. + +command json.suboutput(b:bat[:oid,:any_1],gid:bat[:oid,:oid],ext:bat[:oid,:wrd],flg:bit):bat[:oid,:str] +address JSONtextGrouped; +comment Pack the values into a json structure + command json.str(j:json):str address JSONjson2str; comment Convert JSON to its string equivalent. Dealing with escape characters @@ -41023,21 +41043,15 @@ command pcre.select(pat:str,strs:bat[:oi address PCREselectDef; comment Select tuples based on the pattern -pattern pqueue.topn_max(g:bat[:oid,:oid],b:bat[:oid,:any_1],n:wrd) (piv:bat[:oid,:oid],gid:bat[:oid,:oid]) -address PQtopn4_minmax; -comment Return unique top n withn groups - -pattern pqueue.topn_min(g:bat[:oid,:oid],b:bat[:oid,:any_1],n:wrd) (piv:bat[:oid,:oid],gid:bat[:oid,:oid]) -address PQtopn4_minmax; +function pqueue.topn_max(a:bat[:oid,:any_1],bp:bat[:oid,:oid],bg:bat[:oid,:oid],n:wrd):bat[:oid,:oid]; +function pqueue.topn_min(a:bat[:oid,:any_1],bp:bat[:oid,:oid],bg:bat[:oid,:oid],n:wrd):bat[:oid,:oid]; +pattern pqueue.topn_max(a:bat[:oid,:any_1],bp:bat[:oid,:oid],bg:bat[:oid,:oid],n:wrd) (cp:bat[:oid,:oid],cg:bat[:oid,:oid]) +address PQtopn3_minmax; comment Return unique top n within groups -pattern pqueue.topn_max(gid:bat[:oid,:oid],b:bat[:oid,:any_1],n:wrd):bat[:oid,:oid] +pattern pqueue.topn_min(a:bat[:oid,:any_1],bp:bat[:oid,:oid],bg:bat[:oid,:oid],n:wrd) (cp:bat[:oid,:oid],cg:bat[:oid,:oid]) address PQtopn3_minmax; -comment Return the top n elements using a max-pqueue - -pattern pqueue.topn_min(gid:bat[:oid,:oid],b:bat[:oid,:any_1],n:wrd):bat[:oid,:oid] -address PQtopn3_minmax; -comment Return the top n elements using a min-pqueue +comment Return unique top n within groups pattern pqueue.topn_max(b:bat[:oid,:any_1],n:wrd) (piv:bat[:oid,:oid],gid:bat[:oid,:oid]) address PQtopn2_minmax; @@ -41055,118 +41069,6 @@ pattern pqueue.topn_min(a:bat[:oid,:any_ address PQtopn_minmax; comment Return the top n elements using a min-pqueue -command pqueue.topn_max(a:bat[:oid,:oid],t:bat[:void,:any_1],n:wrd):bat[:oid,:oid] -address PQtopn2_anymax; -comment Return the topn elements of the bat t using a max-pqueue - -command pqueue.topn_max(a:bat[:oid,:oid],t:bat[:oid,:any_1],n:wrd):bat[:oid,:oid] -address PQtopn2_anymax; -comment Return the topn elements of the bat t using a max-pqueue - -command pqueue.topn_max(t:bat[:oid,:any_1],n:wrd):bat[:oid,:oid] -address PQtopn_anymax; -comment Return the topn elements of the bat t using a max-pqueue - -command pqueue.topn_min(a:bat[:oid,:oid],t:bat[:void,:any_1],n:wrd):bat[:oid,:oid] -address PQtopn2_anymin; -comment Return the topn elements of the bat t using a min-pqueue - -command pqueue.topn_min(a:bat[:oid,:oid],t:bat[:oid,:any_1],n:wrd):bat[:oid,:oid] -address PQtopn2_anymin; -comment Return the topn elements of the bat t using a min-pqueue - -command pqueue.topn_min(t:bat[:oid,:any_1],n:wrd):bat[:oid,:oid] -address PQtopn_anymin; -comment Return the topn elements of the bat t using a min-pqueue - -command pqueue.topn_max(t:bat[:oid,:dbl],n:wrd):bat[:oid,:oid] -address PQtopn_dblmax; -command pqueue.topn_min(t:bat[:oid,:dbl],n:wrd):bat[:oid,:oid] -address PQtopn_fltmin; -command pqueue.topn_max(t:bat[:oid,:flt],n:wrd):bat[:oid,:oid] -address PQtopn_fltmax; -command pqueue.topn_min(t:bat[:oid,:flt],n:wrd):bat[:oid,:oid] -address PQtopn_fltmin; -command pqueue.topn_max(t:bat[:oid,:lng],n:wrd):bat[:oid,:oid] -address PQtopn_lngmax; -command pqueue.topn_min(t:bat[:oid,:lng],n:wrd):bat[:oid,:oid] -address PQtopn_lngmin; -command pqueue.topn_max(t:bat[:oid,:wrd],n:wrd):bat[:oid,:oid] -address PQtopn_wrdmax; -command pqueue.topn_min(t:bat[:oid,:wrd],n:wrd):bat[:oid,:oid] -address PQtopn_wrdmin; -command pqueue.topn_max(t:bat[:oid,:int],n:wrd):bat[:oid,:oid] -address PQtopn_intmax; -command pqueue.topn_min(t:bat[:oid,:int],n:wrd):bat[:oid,:oid] -address PQtopn_intmin; -command pqueue.topn_max(t:bat[:oid,:sht],n:wrd):bat[:oid,:oid] -address PQtopn_shtmax; -command pqueue.topn_min(t:bat[:oid,:sht],n:wrd):bat[:oid,:oid] -address PQtopn_shtmin; -command pqueue.topn_max(t:bat[:oid,:bte],n:wrd):bat[:oid,:oid] -address PQtopn_btemax; -comment Return the topn elements of the bat t using a max-pqueue - -command pqueue.topn_min(t:bat[:oid,:bte],n:wrd):bat[:oid,:oid] -address PQtopn_btemin; -comment Return the topn elements of the bat t using a min-pqueue - -command pqueue.utopn_max(a:bat[:oid,:oid],t:bat[:void,:any_1],n:wrd):bat[:oid,:oid] -address PQutopn2_anymax; -comment Return the unique topn elements of the bat t using a max-pqueue - -command pqueue.utopn_max(a:bat[:oid,:oid],t:bat[:oid,:any_1],n:wrd):bat[:oid,:oid] -address PQutopn2_anymax; -comment Return the unique topn elements of the bat t using a max-pqueue - -command pqueue.utopn_max(t:bat[:oid,:any_1],n:wrd):bat[:oid,:oid] -address PQutopn_anymax; -comment Return the unique topn elements of the bat t using a max-pqueue - -command pqueue.utopn_min(a:bat[:oid,:oid],t:bat[:void,:any_1],n:wrd):bat[:oid,:oid] -address PQutopn2_anymin; -comment Return the unique topn elements of the bat t using a min-pqueue - -command pqueue.utopn_min(a:bat[:oid,:oid],t:bat[:oid,:any_1],n:wrd):bat[:oid,:oid] -address PQutopn2_anymin; -comment Return the unique topn elements of the bat t using a min-pqueue - -command pqueue.utopn_min(t:bat[:oid,:any_1],n:wrd):bat[:oid,:oid] -address PQutopn_anymin; -comment Return the unique topn elements of the bat t using a min-pqueue - -command pqueue.utopn_max(t:bat[:oid,:dbl],n:wrd):bat[:oid,:oid] -address PQutopn_dblmax; -command pqueue.utopn_min(t:bat[:oid,:dbl],n:wrd):bat[:oid,:oid] -address PQutopn_fltmin; -command pqueue.utopn_max(t:bat[:oid,:flt],n:wrd):bat[:oid,:oid] -address PQutopn_fltmax; -command pqueue.utopn_min(t:bat[:oid,:flt],n:wrd):bat[:oid,:oid] -address PQutopn_fltmin; -command pqueue.utopn_max(t:bat[:oid,:lng],n:wrd):bat[:oid,:oid] -address PQutopn_lngmax; -command pqueue.utopn_min(t:bat[:oid,:lng],n:wrd):bat[:oid,:oid] -address PQutopn_lngmin; -command pqueue.utopn_max(t:bat[:oid,:wrd],n:wrd):bat[:oid,:oid] -address PQutopn_wrdmax; -command pqueue.utopn_min(t:bat[:oid,:wrd],n:wrd):bat[:oid,:oid] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
