Changeset: fe7504e8da48 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fe7504e8da48
Added Files:
sql/test/BugTracker-2016/Tests/convert-function-test-hge.Bug-3460.sql
sql/test/BugTracker-2016/Tests/convert-function-test-hge.Bug-3460.stable.err
sql/test/BugTracker-2016/Tests/convert-function-test-hge.Bug-3460.stable.out
sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.sql
sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.err
sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.err.int128
sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out
sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out.int128
sql/test/BugTracker-2016/Tests/querylog.stable.err
sql/test/BugTracker-2016/Tests/querylog.stable.out
sql/test/malloc_fail/Tests/All
sql/test/malloc_fail/Tests/setmemorylimit-fail.sql
sql/test/malloc_fail/Tests/setmemorylimit-fail.stable.err
sql/test/malloc_fail/Tests/setmemorylimit-fail.stable.out
sql/test/malloc_fail/Tests/setmemorylimit-fail2.sql
sql/test/malloc_fail/Tests/setmemorylimit.sql
sql/test/malloc_fail/Tests/setmemorylimit.stable.err
sql/test/malloc_fail/Tests/setmemorylimit.stable.out
Removed Files:
debian/python-monetdb.install
debian/python3-monetdb.install
monetdb5/mal/Tests/recycle00.malC
monetdb5/mal/Tests/recycle00.stable.err
monetdb5/mal/Tests/recycle00.stable.out
monetdb5/mal/Tests/recycle01.malC
monetdb5/mal/Tests/recycle01.stable.err
monetdb5/mal/Tests/recycle01.stable.out
monetdb5/mal/Tests/recycle02.malC
monetdb5/mal/Tests/recycle02.stable.err
monetdb5/mal/Tests/recycle02.stable.out
monetdb5/mal/Tests/recycle03.malC
monetdb5/mal/Tests/recycle03.stable.err
monetdb5/mal/Tests/recycle03.stable.out
monetdb5/mal/Tests/recycle04.malC
monetdb5/mal/Tests/recycle04.stable.err
monetdb5/mal/Tests/recycle04.stable.out
monetdb5/mal/Tests/recycle05.malC
monetdb5/mal/Tests/recycle05.stable.err
monetdb5/mal/Tests/recycle05.stable.out
monetdb5/mal/Tests/recycle07.malC
monetdb5/mal/Tests/recycle07.stable.err
monetdb5/mal/Tests/recycle07.stable.out
monetdb5/mal/Tests/recycle08.malC
monetdb5/mal/Tests/recycle08.stable.err
monetdb5/mal/Tests/recycle08.stable.out
monetdb5/mal/Tests/recycle10.malC
monetdb5/mal/Tests/recycle10.stable.err
monetdb5/mal/Tests/recycle10.stable.out
monetdb5/mal/Tests/recycle11.malC
monetdb5/mal/Tests/recycle11.stable.err
monetdb5/mal/Tests/recycle11.stable.out
monetdb5/mal/Tests/recycle12.malC
monetdb5/mal/Tests/recycle12.stable.err
monetdb5/mal/Tests/recycle12.stable.out
monetdb5/mal/mal_recycle.c
monetdb5/mal/mal_recycle.h
monetdb5/modules/mal/recycle.c
monetdb5/modules/mal/recycle.h
monetdb5/modules/mal/recycle.mal
monetdb5/optimizer/opt_recycler.c
monetdb5/optimizer/opt_recycler.h
sql/test/BugTracker-2009/Tests/table-leftovers.SF-2779462.sql
sql/test/BugTracker-2009/Tests/table-leftovers.SF-2779462.stable.err
sql/test/BugTracker-2009/Tests/table-leftovers.SF-2779462.stable.out
sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.err.oid32
sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.out.oid32
sql/test/pg_regress/Tests/oid.stable.err.64bit.oid32
sql/test/pg_regress/Tests/oid.stable.err.Windows.oid32
sql/test/pg_regress/Tests/oid.stable.err.oid32.int128
sql/test/pg_regress/Tests/oid.stable.out.oid32
sql/test/pg_regress/Tests/without_oid.stable.out.oid32
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.oid32
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.oid32
Modified Files:
MonetDB.spec
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
NT/rules.msc
buildtools/ChangeLog
clients/Tests/All
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/SQL-dump.stable.out
clients/Tests/exports.stable.out
common/stream/stream.h
configure.ag
debian/control
debian/rules
gdk/gdk.h
gdk/gdk_utils.c
gdk/gdk_utils.h
java/tests/Test_CisValid.java
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/mal/Makefile.ag
monetdb5/mal/Tests/All
monetdb5/mal/Tests/tst013.stable.err
monetdb5/mal/Tests/tst903.stable.out
monetdb5/mal/Tests/tst904.stable.out
monetdb5/mal/Tests/tst907.stable.out
monetdb5/mal/mal.c
monetdb5/mal/mal.h
monetdb5/mal/mal_builder.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_exception.c
monetdb5/mal/mal_exception.h
monetdb5/mal/mal_function.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_instruction.h
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_interpreter.h
monetdb5/mal/mal_listing.c
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_runtime.c
monetdb5/mal/mal_scenario.c
monetdb5/mal/mal_session.c
monetdb5/mal/mal_type.c
monetdb5/mal/mal_type.h
monetdb5/modules/atoms/xml.c
monetdb5/modules/mal/Makefile.ag
monetdb5/modules/mal/Tests/inspect00.stable.out
monetdb5/modules/mal/Tests/inspect05.stable.out.int128
monetdb5/modules/mal/Tests/remote03.stable.err
monetdb5/modules/mal/Tests/remote03.stable.out
monetdb5/modules/mal/Tests/remote04.stable.out
monetdb5/modules/mal/mal_init.mal
monetdb5/modules/mal/mal_io.c
monetdb5/modules/mal/mal_io.h
monetdb5/modules/mal/mal_io.mal
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/mdb.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/tablet.c
monetdb5/optimizer/Makefile.ag
monetdb5/optimizer/Tests/Mexample.stable.out
monetdb5/optimizer/Tests/dataflow.stable.out
monetdb5/optimizer/Tests/dataflow3.stable.out
monetdb5/optimizer/Tests/dataflow4.stable.out
monetdb5/optimizer/Tests/inline00.stable.out
monetdb5/optimizer/Tests/inline01.stable.out
monetdb5/optimizer/Tests/inline02.stable.out
monetdb5/optimizer/Tests/inline03.stable.out
monetdb5/optimizer/Tests/inline04.stable.out
monetdb5/optimizer/Tests/inline06.stable.out
monetdb5/optimizer/Tests/inline07.stable.out
monetdb5/optimizer/Tests/inline09.stable.out
monetdb5/optimizer/Tests/inline10.stable.out
monetdb5/optimizer/Tests/inline12.stable.out
monetdb5/optimizer/Tests/inlineCst.stable.out
monetdb5/optimizer/Tests/inlineFunction.stable.out
monetdb5/optimizer/Tests/inlineFunction1.stable.out
monetdb5/optimizer/Tests/inlineFunction2.stable.out
monetdb5/optimizer/Tests/inlineFunction3.stable.out
monetdb5/optimizer/Tests/inlineFunction4.stable.out
monetdb5/optimizer/Tests/manifold2.stable.out
monetdb5/optimizer/opt_dataflow.c
monetdb5/optimizer/opt_factorize.c
monetdb5/optimizer/opt_macro.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_querylog.c
monetdb5/optimizer/opt_remoteQueries.c
monetdb5/optimizer/opt_support.c
monetdb5/optimizer/opt_support.h
monetdb5/optimizer/opt_wrapper.c
sql/ChangeLog
sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out
sql/backends/monet5/UDF/pyapi/pyapi.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_optimizer.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_user.c
sql/benchmarks/ssbm/Tests/01-explain.stable.out
sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/02-explain.stable.out
sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/03-explain.stable.out
sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/11-explain.stable.out
sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/12-explain.stable.out
sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/13-explain.stable.out
sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128
sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
sql/benchmarks/tpch/Tests/02-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out.int128
sql/benchmarks/tpch/Tests/04-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out.int128
sql/benchmarks/tpch/Tests/06-explain.stable.out.int128
sql/benchmarks/tpch/Tests/07-explain.stable.out.int128
sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
sql/benchmarks/tpch/Tests/09-explain.stable.out.int128
sql/benchmarks/tpch/Tests/10-explain.stable.out.int128
sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
sql/benchmarks/tpch/Tests/12-explain.stable.out.int128
sql/benchmarks/tpch/Tests/13-explain.stable.out
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
sql/benchmarks/tpch/Tests/16-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/21-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
sql/common/sql_list.c
sql/common/sql_mem.c
sql/jdbc/tests/Tests/Test_CisValid.stable.err
sql/rel.txt
sql/server/rel_dump.c
sql/server/rel_optimizer.c
sql/server/rel_rel.c
sql/server/rel_rel.h
sql/server/rel_select.c
sql/server/rel_select.h
sql/server/rel_semantic.c
sql/storage/sql_catalog.c
sql/test/BugTracker-2009/Tests/All
sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out
sql/test/BugTracker-2016/Tests/All
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
sql/test/BugTracker-2016/Tests/storagemodel.stable.out
sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/datacell/Tests/All
sql/test/emptydb/Tests/All
sql/test/mapi/Tests/sql_int128.stable.out
sql/test/mergetables/Tests/mergequery.stable.out
sql/test/remote/Tests/partition_elim.stable.out
testing/MkillUsers.in
testing/Mtest.py.in
tools/merovingian/daemon/argvcmds.c
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/discoveryrunner.c
tools/merovingian/daemon/merovingian.c
tools/merovingian/utils/utils.c
tools/merovingian/utils/utils.h
tools/mserver/monet_version.c.in
tools/mserver/mserver5.c
Branch: pythonloader
Log Message:
Merge with default branch.
diffs (truncated from 57423 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -12,12 +12,7 @@
%define with_int128 1
%endif
-# only add .oidXX suffix if oid size differs from bit size
-%if %{bits} == 64 && %{?oid32:1}%{!?oid32:0}
-%define oidsuf .oid32
-%endif
-
-%define release %{buildno}%{?dist}%{?oidsuf}
+%define release %{buildno}%{?dist}
# On RedHat Enterprise Linux and derivatives, if the Extra Packages
# for Enterprise Linux (EPEL) repository is available, you can define
@@ -905,7 +900,6 @@ developer, but if you do want to test, t
--enable-monetdb5=yes \
--enable-netcdf=no \
--enable-odbc=yes \
- --enable-oid32=%{?oid32:yes}%{!?oid32:no} \
--enable-optimize=yes \
--enable-profile=no \
--enable-rintegration=%{?with_rintegration:yes}%{!?with_rintegration:no} \
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -891,12 +891,6 @@
}
"Entry"
{
- "MsmKey" = "8:_E8534226BFAE4A2B872E1E20D3283276"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_EC1D2673E41648D1A0365DCCBC13211F"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -3950,26 +3944,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E8534226BFAE4A2B872E1E20D3283276"
- {
- "SourcePath" = "8:lib\\monetdb5\\recycle.mal"
- "TargetName" = "8:recycle.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EC1D2673E41648D1A0365DCCBC13211F"
{
"SourcePath" = "8:lib\\monetdb5\\createdb\\09_like.sql"
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -891,12 +891,6 @@
}
"Entry"
{
- "MsmKey" = "8:_E8534226BFAE4A2B872E1E20D3283276"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_EC1D2673E41648D1A0365DCCBC13211F"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -3950,26 +3944,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E8534226BFAE4A2B872E1E20D3283276"
- {
- "SourcePath" = "8:lib\\monetdb5\\recycle.mal"
- "TargetName" = "8:recycle.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EC1D2673E41648D1A0365DCCBC13211F"
{
"SourcePath" = "8:lib\\monetdb5\\createdb\\09_like.sql"
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -799,9 +799,6 @@
/* Release name or "unreleased" */
#define MONETDB_RELEASE "unreleased"
-/* Define if the oid type should use 32 bits on a 64-bit architecture */
-/* #undef MONET_OID32 */
-
/* Suffix for C++ files */
#define MX_CXX_SUFFIX "cxx"
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -280,19 +280,12 @@ create_winconfig_conds_new_py:
!IFDEF BITS32
$(ECHO) BITS32_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
$(ECHO) BITS64_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
- $(ECHO) BITS64OID32_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
$(ECHO) BITS32_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!IFDEF BITS64
$(ECHO) BITS64_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
-!IFDEF MONET_OID32
- $(ECHO) BITS64OID32_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ELSE
- $(ECHO) BITS64OID32_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ENDIF
!ELSE
$(ECHO) BITS64_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
- $(ECHO) BITS64OID32_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!ENDIF
!IFDEF CROSS_COMPILING
@@ -521,16 +514,6 @@ MAKEDEBUG=DEBUG=1
PSAPILIB = psapi.lib
-# When compiled with plain `nmake`,
-# 64-bit OIDs are used by default on 64-bit Windows
-# (see monetdb_config.h.in for details);
-# compile with `nmake MONET_OID32=1` to use 32-bit OIDs on 64-bit Windows.
-!IF $(bits) == 64
-!IFDEF MONET_OID32
-CFLAGS = $(CFLAGS) -DMONET_OID32
-!ENDIF
-!ENDIF
-
CONFIG_H = monetdb_config.h
{$(srcdir)}.c.obj:
diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog
--- a/buildtools/ChangeLog
+++ b/buildtools/ChangeLog
@@ -1,3 +1,12 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
+* Tue Jul 19 2016 Stefan Manegold <[email protected]>
+- With OID size equal to ABI/word size, mserver5 does not need to print
+ the OID size, anymore.
+- Removed obsolete code associated with long gone static linking option.
+
+* Mon Jul 18 2016 Sjoerd Mullender <[email protected]>
+- Removed configure option --enable-oid32 to compile with 32 bit OIDs
+ on a 64 bit architecture.
+
diff --git a/clients/Tests/All b/clients/Tests/All
--- a/clients/Tests/All
+++ b/clients/Tests/All
@@ -1,4 +1,4 @@
exports
HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_LIBPY&HAVE_LIBR&!HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&HAVE_SPHINXCLIENT?MAL-signatures
-!BITS32&!BITS64OID32&HAVE_FITS&HAVE_GEOM&HAVE_GSL&!HAVE_LIDAR&HAVE_NETCDF&HAVE_PCRE&HAVE_SHP&HAVE_SAMTOOLS?SQL-dump
+!BITS32&HAVE_FITS&HAVE_GEOM&HAVE_GSL&!HAVE_LIDAR&HAVE_NETCDF&HAVE_PCRE&HAVE_SHP&HAVE_SAMTOOLS?SQL-dump
MERCURIAL?malcheck
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
@@ -20,7 +20,7 @@ Ready.
# 17:25:33 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-25210" "--port=34276"
# 17:25:33 >
-command aggr.avg(b:bat[:dbl],g:bat[:oid],e:bat[:any_1])
(X_4:bat[:dbl],X_5:bat[:lng])
+command aggr.avg(b:bat[:dbl],g:bat[:oid],e:bat[:any_1])
(X_0:bat[:dbl],X_1:bat[:lng])
address AGGRavg23_dbl;
comment Grouped tail average on dbl, also returns count
@@ -28,7 +28,7 @@ command aggr.avg(b:bat[:dbl],g:bat[:oid]
address AGGRavg13_dbl;
comment Grouped tail average on dbl
-command aggr.avg(b:bat[:flt],g:bat[:oid],e:bat[:any_1])
(X_4:bat[:dbl],X_5:bat[:lng])
+command aggr.avg(b:bat[:flt],g:bat[:oid],e:bat[:any_1])
(X_0:bat[:dbl],X_1:bat[:lng])
address AGGRavg23_dbl;
comment Grouped tail average on flt, also returns count
@@ -36,7 +36,7 @@ command aggr.avg(b:bat[:flt],g:bat[:oid]
address AGGRavg13_dbl;
comment Grouped tail average on flt
-command aggr.avg(b:bat[:lng],g:bat[:oid],e:bat[:any_1])
(X_4:bat[:dbl],X_5:bat[:lng])
+command aggr.avg(b:bat[:lng],g:bat[:oid],e:bat[:any_1])
(X_0:bat[:dbl],X_1:bat[:lng])
address AGGRavg23_dbl;
comment Grouped tail average on lng, also returns count
@@ -44,7 +44,7 @@ command aggr.avg(b:bat[:lng],g:bat[:oid]
address AGGRavg13_dbl;
comment Grouped tail average on lng
-command aggr.avg(b:bat[:int],g:bat[:oid],e:bat[:any_1])
(X_4:bat[:dbl],X_5:bat[:lng])
+command aggr.avg(b:bat[:int],g:bat[:oid],e:bat[:any_1])
(X_0:bat[:dbl],X_1:bat[:lng])
address AGGRavg23_dbl;
comment Grouped tail average on int, also returns count
@@ -52,7 +52,7 @@ command aggr.avg(b:bat[:int],g:bat[:oid]
address AGGRavg13_dbl;
comment Grouped tail average on int
-command aggr.avg(b:bat[:sht],g:bat[:oid],e:bat[:any_1])
(X_4:bat[:dbl],X_5:bat[:lng])
+command aggr.avg(b:bat[:sht],g:bat[:oid],e:bat[:any_1])
(X_0:bat[:dbl],X_1:bat[:lng])
address AGGRavg23_dbl;
comment Grouped tail average on sht, also returns count
@@ -60,7 +60,7 @@ command aggr.avg(b:bat[:sht],g:bat[:oid]
address AGGRavg13_dbl;
comment Grouped tail average on sht
-command aggr.avg(b:bat[:bte],g:bat[:oid],e:bat[:any_1])
(X_4:bat[:dbl],X_5:bat[:lng])
+command aggr.avg(b:bat[:bte],g:bat[:oid],e:bat[:any_1])
(X_0:bat[:dbl],X_1:bat[:lng])
address AGGRavg23_dbl;
comment Grouped tail average on bte, also returns count
@@ -868,11 +868,11 @@ command aggr.stdev(b:bat[:dbl],g:bat[:oi
address AGGRstdev3_dbl;
comment Grouped tail standard deviation (sample/non-biased) on dbl
-command
aggr.subavg(b:bat[:dbl],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
(X_7:bat[:dbl],X_8:bat[:lng])
+command
aggr.subavg(b:bat[:dbl],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
(X_0:bat[:dbl],X_1:bat[:lng])
address AGGRsubavg2cand_dbl;
comment Grouped average aggregate with candidates list, also returns count
-command
aggr.subavg(b:bat[:dbl],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
(X_6:bat[:dbl],X_7:bat[:lng])
+command
aggr.subavg(b:bat[:dbl],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
(X_0:bat[:dbl],X_1:bat[:lng])
address AGGRsubavg2_dbl;
comment Grouped average aggregate, also returns count
@@ -924,11 +924,11 @@ command aggr.stdev(b:bat[:flt],g:bat[:oi
address AGGRstdev3_dbl;
comment Grouped tail standard deviation (sample/non-biased) on flt
-command
aggr.subavg(b:bat[:flt],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
(X_7:bat[:dbl],X_8:bat[:lng])
+command
aggr.subavg(b:bat[:flt],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
(X_0:bat[:dbl],X_1:bat[:lng])
address AGGRsubavg2cand_dbl;
comment Grouped average aggregate with candidates list, also returns count
-command
aggr.subavg(b:bat[:flt],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
(X_6:bat[:dbl],X_7:bat[:lng])
+command
aggr.subavg(b:bat[:flt],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
(X_0:bat[:dbl],X_1:bat[:lng])
address AGGRsubavg2_dbl;
comment Grouped average aggregate, also returns count
@@ -980,11 +980,11 @@ command aggr.stdev(b:bat[:lng],g:bat[:oi
address AGGRstdev3_dbl;
comment Grouped tail standard deviation (sample/non-biased) on lng
-command
aggr.subavg(b:bat[:lng],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
(X_7:bat[:dbl],X_8:bat[:lng])
+command
aggr.subavg(b:bat[:lng],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
(X_0:bat[:dbl],X_1:bat[:lng])
address AGGRsubavg2cand_dbl;
comment Grouped average aggregate with candidates list, also returns count
-command
aggr.subavg(b:bat[:lng],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
(X_6:bat[:dbl],X_7:bat[:lng])
+command
aggr.subavg(b:bat[:lng],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
(X_0:bat[:dbl],X_1:bat[:lng])
address AGGRsubavg2_dbl;
comment Grouped average aggregate, also returns count
@@ -1036,11 +1036,11 @@ command aggr.stdev(b:bat[:int],g:bat[:oi
address AGGRstdev3_dbl;
comment Grouped tail standard deviation (sample/non-biased) on int
-command
aggr.subavg(b:bat[:int],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
(X_7:bat[:dbl],X_8:bat[:lng])
+command
aggr.subavg(b:bat[:int],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit)
(X_0:bat[:dbl],X_1:bat[:lng])
address AGGRsubavg2cand_dbl;
comment Grouped average aggregate with candidates list, also returns count
-command
aggr.subavg(b:bat[:int],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
(X_6:bat[:dbl],X_7:bat[:lng])
+command
aggr.subavg(b:bat[:int],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit)
(X_0:bat[:dbl],X_1:bat[:lng])
address AGGRsubavg2_dbl;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
