Changeset: c507044cffb5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c507044cffb5 Added Files: sql/scripts/17_temporal.sql sql/test/BugTracker-2013/Tests/copy-into-compressed-bz2.Bug-3351.sql.in sql/test/BugTracker-2013/Tests/copy-into-compressed-bz2.Bug-3351.stable.err sql/test/BugTracker-2013/Tests/copy-into-compressed-bz2.Bug-3351.stable.out sql/test/BugTracker-2013/Tests/copy-into-compressed-gz.Bug-3351.sql.in sql/test/BugTracker-2013/Tests/copy-into-compressed-gz.Bug-3351.stable.err sql/test/BugTracker-2013/Tests/copy-into-compressed-gz.Bug-3351.stable.out sql/test/mergetables/Tests/mergekey.stable.err sql/test/mergetables/Tests/mergekey.stable.out Removed Files: monetdb5/mal/Tests/venks.mal monetdb5/mal/Tests/venks.stable.err monetdb5/mal/Tests/venks.stable.out monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/union_semantics.SF-1192348.mal monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/union_semantics.SF-1192348.stable.err monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/union_semantics.SF-1192348.stable.out monetdb5/tests/BugTracker/Tests/kunion-and-nil.Bug-1667.mal monetdb5/tests/BugTracker/Tests/kunion-and-nil.Bug-1667.stable.err monetdb5/tests/BugTracker/Tests/kunion-and-nil.Bug-1667.stable.out monetdb5/tests/gdkTests/Tests/intersect_diff_nil.mal monetdb5/tests/gdkTests/Tests/intersect_diff_nil.stable.err monetdb5/tests/gdkTests/Tests/intersect_diff_nil.stable.out monetdb5/tests/gdkTests/Tests/intersect_diff_void.mal monetdb5/tests/gdkTests/Tests/intersect_diff_void.stable.err monetdb5/tests/gdkTests/Tests/intersect_diff_void.stable.out monetdb5/tests/suite_00/Tests/test_15.mal monetdb5/tests/suite_00/Tests/test_15.stable.err monetdb5/tests/suite_00/Tests/test_15.stable.out sql/backends/monet5/sql_sort.mal sql/scripts/mtime.sql sql/scripts/replication.sql sql/scripts/temporal.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 buildtools/autogen/autogen/am.py clients/ChangeLog-Archive clients/ChangeLog.Oct2014 clients/Tests/SQL-dump_all.stable.out clients/Tests/SQL-dump_all.stable.out.oid32 clients/Tests/SQL-dump_geom.stable.out clients/Tests/SQL-dump_geom.stable.out.32bit clients/Tests/SQL-dump_geom.stable.out.64bit.oid32 clients/Tests/SQL-dump_none.stable.out clients/Tests/exports.stable.out clients/mapiclient/mclient.1 clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc clients/python2/setup.py clients/python3/setup.py common/stream/stream.c configure.ag debian/changelog gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_atoms.c gdk/gdk_bat.c gdk/gdk_bbp.c gdk/gdk_bbp.h gdk/gdk_delta.c gdk/gdk_delta.h gdk/gdk_heap.c gdk/gdk_imprints.c gdk/gdk_posix.c gdk/gdk_private.h gdk/gdk_storage.c gdk/gdk_system.c gdk/gdk_system.h gdk/gdk_utils.c gdk/libbat.rc geom/monetdb5/geom.c java/Makefile.ag java/build.properties java/pom.xml java/release.txt libversions monetdb5/extras/rapi/rapi.c monetdb5/extras/rdf/rdfalgebra.c monetdb5/mal/Tests/All monetdb5/mal/mal_recycle.c monetdb5/mal/mal_runtime.c monetdb5/modules/atoms/batxml.c monetdb5/modules/atoms/json.c monetdb5/modules/atoms/mtime.c monetdb5/modules/kernel/aggr.c monetdb5/modules/kernel/aggr.mal monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.h monetdb5/modules/kernel/algebra.mal monetdb5/modules/kernel/bat5.c monetdb5/modules/kernel/bat5.mal monetdb5/modules/kernel/batcolor.c monetdb5/modules/kernel/batmmath.c monetdb5/modules/kernel/batstr.c monetdb5/modules/kernel/counters.c monetdb5/modules/kernel/group.c monetdb5/modules/kernel/status.c monetdb5/modules/mal/00_batcalc_hge.mal monetdb5/modules/mal/00_batcalc_hge.mal.sh monetdb5/modules/mal/Tests/inspect05.stable.out.int128 monetdb5/modules/mal/batExtensions.c monetdb5/modules/mal/batcalc.c monetdb5/modules/mal/bbp.c monetdb5/modules/mal/calc.c monetdb5/modules/mal/clients.c monetdb5/modules/mal/cluster.c monetdb5/modules/mal/groupby.c monetdb5/modules/mal/inspect.c monetdb5/modules/mal/joinpath.c monetdb5/modules/mal/json_util.c monetdb5/modules/mal/manifold.c monetdb5/modules/mal/mat.c monetdb5/modules/mal/mdb.c monetdb5/modules/mal/mkey.c monetdb5/modules/mal/pcre.c monetdb5/modules/mal/querylog.c monetdb5/modules/mal/remote.c monetdb5/modules/mal/sysmon.c monetdb5/modules/mal/tablet.c monetdb5/modules/mal/txtsim.c monetdb5/modules/mal/zorder.c monetdb5/optimizer/Tests/All monetdb5/optimizer/Tests/ESexample.mal monetdb5/optimizer/Tests/ESexample.stable.out monetdb5/optimizer/opt_costModel.c monetdb5/optimizer/opt_dataflow.c monetdb5/optimizer/opt_emptySet.c monetdb5/optimizer/opt_groups.c monetdb5/optimizer/opt_mapreduce.c monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_support.c monetdb5/scheduler/run_octopus.c monetdb5/scheduler/srvpool.c monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/All monetdb5/tests/BugTracker/Tests/All monetdb5/tests/gdkTests/Tests/All monetdb5/tests/gdkTests/Tests/TMsubcommit.mal monetdb5/tests/gdkTests/Tests/TMsubcommit.stable.out monetdb5/tests/suite_00/Tests/All monetdb5/tests/suite_00/Tests/test_10.mal monetdb5/tests/suite_00/Tests/test_10.stable.out monetdb5/tools/libmonetdb5.rc sql/ChangeLog-Archive sql/ChangeLog.Oct2014 sql/backends/monet5/LSST/lsst.c sql/backends/monet5/Makefile.ag sql/backends/monet5/Tests/limithack.stable.out sql/backends/monet5/UDF/udf.c sql/backends/monet5/bam/bam_db_interface.c sql/backends/monet5/bam/bam_export.c sql/backends/monet5/bam/bam_globals.c sql/backends/monet5/bam/bam_lib.c sql/backends/monet5/datacell/basket.c sql/backends/monet5/datacell/dcoperator.c sql/backends/monet5/datacell/emitter.c sql/backends/monet5/datacell/petrinet.c sql/backends/monet5/datacell/receptor.c sql/backends/monet5/generator/Tests/generator01.stable.err sql/backends/monet5/generator/Tests/generator04.stable.err sql/backends/monet5/generator/generator.c sql/backends/monet5/gsl/gsl.c sql/backends/monet5/sql.c sql/backends/monet5/sql.mal sql/backends/monet5/sql_bat2time.c sql/backends/monet5/sql_cast.c sql/backends/monet5/sql_cast_impl_down_from_flt.h sql/backends/monet5/sql_cast_impl_down_from_int.h sql/backends/monet5/sql_cast_impl_up_to_flt.h sql/backends/monet5/sql_cast_impl_up_to_int.h sql/backends/monet5/sql_fround_impl.h sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_result.c sql/backends/monet5/sql_round_impl.h sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_statistics.c sql/backends/monet5/sql_upgrades.c sql/backends/monet5/vaults/mseed.c sql/jdbc/tests/Tests/Test_Dobjects.stable.out sql/jdbc/tests/Tests/Test_Dobjects_bam.stable.out sql/scripts/75_storagemodel.sql sql/scripts/Makefile.ag sql/server/rel_dump.c sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.sql sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.sql sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.sql sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.sql sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out sql/test/BugTracker-2013/Tests/All sql/test/BugTracker-2013/Tests/copy-into-compressed.Bug-3351.sql.in sql/test/BugTracker-2013/Tests/copy-into-compressed.Bug-3351.stable.out sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.sql sql/test/BugTracker-2013/Tests/swapped_likejoin.Bug-3375.stable.out sql/test/BugTracker-2014/Tests/select-having.Bug-3458.sql sql/test/BugTracker-2014/Tests/too_general_errmsg.Bug-3605.stable.err sql/test/Tests/systemfunctions_bam.stable.out.int128 sql/test/bugs/Tests/crash_order_by.sql sql/test/bugs/Tests/simple_view.sql sql/test/bugs/insert_delete-bug-sf-904025.sql sql/test/leaks/Tests/check1_bam.stable.out.int128 sql/test/leaks/Tests/check2_bam.stable.out.int128 sql/test/leaks/Tests/check3_bam.stable.out.int128 sql/test/leaks/Tests/check4_bam.stable.out.int128 sql/test/leaks/Tests/check5_bam.stable.out.int128 sql/test/pg_regress/Tests/All sql/test/pg_regress/Tests/create_view.sql sql/test/pg_regress/Tests/create_view.stable.err sql/test/pg_regress/Tests/create_view.stable.out sql/test/pg_regress/Tests/drop.sql sql/test/pg_regress/Tests/drop.stable.err sql/test/pg_regress/Tests/select_views.sql sql/test/pg_regress/Tests/select_views.stable.out sql/test/pg_regress/postgresql2sql99.sh sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 vertoo.data Branch: transaction-replication Log Message:
Merge with default branch. This should also pull changes that (partly) resolve issue with failing Mtests when transaction.commit() is used. diffs (truncated from 15874 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -586,3 +586,5 @@ 2da8cbcb65ed56690bad29f089d996eac347b48d ee3d8e3af6aae6be6cfaa876a379a0751f164e97 Oct2014_7 2da8cbcb65ed56690bad29f089d996eac347b48d Oct2014_SP1_release 6607367487d91eb02c5eb7dfb9d96606f8f7c6f0 Oct2014_SP1_release +e3d0eecdc35dc633fdd89157ba704f60f03756c1 Oct2014_9 +d98df578687e677ae3abbc0ba41e3bb0631ef08a Oct2014_SP2_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -91,7 +91,7 @@ Vendor: MonetDB BV <[email protected]> Group: Applications/Databases License: MPL - http://www.monetdb.org/Legal/MonetDBLicense URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Oct2014-SP1/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Oct2014-SP2/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -960,6 +960,68 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetD rm -fr $RPM_BUILD_ROOT %changelog +* Fri Jan 23 2015 Sjoerd Mullender <[email protected]> - 11.19.9-20150123 +- Rebuilt. +- BZ#3467: Field aliases with '#' character excise field names in + result set. +- BZ#3605: relational query without result +- BZ#3619: Missing dll on MonetDB Start +- BZ#3622: Type resolution error +- BZ#3624: insert of incomplete or invalid ip address values in + inet column is silently accepted but the values are not stored (they + become/show nil) +- BZ#3626: casting a type without alias results in program contains errors +- BZ#3628: mclient and ODBC driver report 'type mismatch' when stddev_pop + used in a select which returns 0 rows +- BZ#3629: IF THEN ELSEIF always evaluates the first test as true +- BZ#3630: segv on rel_order_by_column_exp +- BZ#3632: running make clean twice gives an error in clients/ruby/adapter +- BZ#3633: Wrong result for HAVING with floating-point constant +- BZ#3640: Missing implementation of scalar function: sql_sub(<date>, + <month interval>) +- BZ#3641: SQL lexer fails to detect string end if it the last character + is U+FEFF ZERO WIDTH NO-BREAK SPACE +- BZ#3642: Combined WHERE conditions less-than plus equals-to produce + incorrect results +- BZ#3643: Missing implementations of scalar function: sql_sub(<timetz>, + arg2) +- BZ#3644: COPY INTO fails to import "inet" data type when value has + prefix length in CIDR notation +- BZ#3646: ORDER BY clause does not produce proper results on 'inet' + datatype +- BZ#3649: recycler crashes with concurrent transactions + +* Mon Jan 19 2015 Sjoerd Mullender <[email protected]> - 11.19.9-20150123 +- sql: Fixed a typo in a column name of the sys.tablestoragemodel view + (auxillary changed to auxiliary). + +* Tue Jan 13 2015 Sjoerd Mullender <[email protected]> - 11.19.9-20150123 +- clients: Changes to the Perl interface, thanks to Stefan O'Rear: + 1. removes "use sigtrap", because this has global effects and should + not be used by modules, only by the application. + 2. allows Perl 5.8.1+ Unicode strings to be passed to quote() and + included in statements (UTF-8 encoded, as expected by Monet's str + module) + 3. quote and unquote now use the same quoting rules as the MonetDB + server, allowing for all characters except NUL to be round-tripped + 4. several character loops have been reimplemented in regex for much + greater performance + 5. micro-optimizations to the result fetch loop + 6. block boundaries are preserved in piggyback data so that Xclose is + not appended or prepended to a SQL command + 7. diagnostic messages #foo before a result header are ignored, this + is necessary to use recycler_pipe + 8. fail quickly and loudly if we receive a continuation prompt (or any + other response that starts with a non-ASCII character) + 9. header lines must start with %, not merely contain %, fixing a bug + when querying a table where string values contain % + 10. after closing a large resultset, account for the fact that a reply + will come and do not lose sync + 11. allow a MAPI_TRACE environment variable to dump wire protocol + frames to standard output + 12. fixes maximum MAPI block size to match the server limit of 16k. + previously would crash on blocks larger than 16k + * Fri Nov 21 2014 Sjoerd Mullender <[email protected]> - 11.19.7-20141121 - Rebuilt. diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py --- a/buildtools/autogen/autogen/am.py +++ b/buildtools/autogen/autogen/am.py @@ -977,7 +977,7 @@ def am_gem(fd, var, gem, am): for src in srcs: fd.write("\t[ '$(srcdir)' -ef . ] || rm -f '%s'\n" % src) for d in sorted(dirs, reverse = True): - fd.write("\t[ '$(srcdir)' -ef . ] || rmdir '%s'\n" % d) + fd.write("\t[ '$(srcdir)' -ef . -o ! -d '%s' ] || rmdir '%s'\n" % (d, d)) fd.write("install-exec-local-%s: %s\n" % (sf, f[:-4])) fd.write("\tmkdir -p $(DESTDIR)'%s'\n" % rd) fd.write("\tgem install --local --install-dir $(DESTDIR)'%s' --force --rdoc '%s'\n" % (rd, f[:-4])) @@ -1026,7 +1026,7 @@ def am_python_generic(fd, var, python, a fd.write("\trm '$(DESTDIR)$(prefix)/$(%s_LIBDIR)'/%s-*.egg-info\n" % (PYTHON, name.replace('-', '_'))) fd.write('mostlyclean-local:\n') for pkgdir in sorted(pkgdirs, reverse = True): - fd.write("\t[ '$(srcdir)' -ef . ] || rm -r '%s'\n" % pkgdir) + fd.write("\t[ '$(srcdir)' -ef . -o ! -d '%s' ] || rm -r '%s'\n" % (pkgdir, pkgdir)) def am_python2(fd, var, python, am): am_python_generic(fd, var, python, am, 'PYTHON2') diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive --- a/clients/ChangeLog-Archive +++ b/clients/ChangeLog-Archive @@ -1,6 +1,33 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Tue Jan 13 2015 Sjoerd Mullender <[email protected]> - 11.19.9-20150123 +- Changes to the Perl interface, thanks to Stefan O'Rear: + 1. removes "use sigtrap", because this has global effects and should + not be used by modules, only by the application. + 2. allows Perl 5.8.1+ Unicode strings to be passed to quote() and + included in statements (UTF-8 encoded, as expected by Monet's str + module) + 3. quote and unquote now use the same quoting rules as the MonetDB + server, allowing for all characters except NUL to be round-tripped + 4. several character loops have been reimplemented in regex for much + greater performance + 5. micro-optimizations to the result fetch loop + 6. block boundaries are preserved in piggyback data so that Xclose is + not appended or prepended to a SQL command + 7. diagnostic messages #foo before a result header are ignored, this + is necessary to use recycler_pipe + 8. fail quickly and loudly if we receive a continuation prompt (or any + other response that starts with a non-ASCII character) + 9. header lines must start with %, not merely contain %, fixing a bug + when querying a table where string values contain % + 10. after closing a large resultset, account for the fact that a reply + will come and do not lose sync + 11. allow a MAPI_TRACE environment variable to dump wire protocol + frames to standard output + 12. fixes maximum MAPI block size to match the server limit of 16k. + previously would crash on blocks larger than 16k + * Tue Apr 1 2014 Sjoerd Mullender <[email protected]> - 11.17.15-20140508 - ODBC: Implemented {call procedure-name(...)} escape. The version {?=call ...} is not implemented. diff --git a/clients/ChangeLog.Oct2014 b/clients/ChangeLog.Oct2014 --- a/clients/ChangeLog.Oct2014 +++ b/clients/ChangeLog.Oct2014 @@ -1,30 +1,3 @@ # ChangeLog file for clients # This file is updated with Maddlog -* Tue Jan 13 2015 Sjoerd Mullender <[email protected]> -- Changes to the Perl interface, thanks to Stefan O'Rear: - 1. removes "use sigtrap", because this has global effects and should - not be used by modules, only by the application. - 2. allows Perl 5.8.1+ Unicode strings to be passed to quote() and - included in statements (UTF-8 encoded, as expected by Monet's str - module) - 3. quote and unquote now use the same quoting rules as the MonetDB - server, allowing for all characters except NUL to be round-tripped - 4. several character loops have been reimplemented in regex for much - greater performance - 5. micro-optimizations to the result fetch loop - 6. block boundaries are preserved in piggyback data so that Xclose is - not appended or prepended to a SQL command - 7. diagnostic messages #foo before a result header are ignored, this - is necessary to use recycler_pipe - 8. fail quickly and loudly if we receive a continuation prompt (or any - other response that starts with a non-ASCII character) - 9. header lines must start with %, not merely contain %, fixing a bug - when querying a table where string values contain % - 10. after closing a large resultset, account for the fact that a reply - will come and do not lose sync - 11. allow a MAPI_TRACE environment variable to dump wire protocol - frames to standard output - 12. fixes maximum MAPI block size to match the server limit of 16k. - previously would crash on blocks larger than 16k - diff --git a/clients/Tests/SQL-dump_all.stable.out b/clients/Tests/SQL-dump_all.stable.out --- a/clients/Tests/SQL-dump_all.stable.out +++ b/clients/Tests/SQL-dump_all.stable.out @@ -427,7 +427,7 @@ create view sys.storage as select * from create view sys.storagemodel as select * from sys.storagemodel(); SELECT * FROM (SELECT p.*, 0 AS "temporary" FROM "sys"."_tables" AS p UNION ALL SELECT t.*, 1 AS "temporary" FROM "tmp"."_tables" AS t) AS tables where tables.type <> 2; -- A summary of the table storage requirement is is available as a table view. --- The auxillary column denotes the maximum space if all non-sorted columns +-- The auxiliary column denotes the maximum space if all non-sorted columns -- would be augmented with a hash (rare situation) create view sys.tablestoragemodel as select "schema","table",max(count) as "count", @@ -435,7 +435,7 @@ as select "schema","table",max(count) as sum(heapsize) as heapsize, sum(hashes) as hashes, sum(imprints) as imprints, - sum(case when sorted = false then 8 * count else 0 end) as auxillary + sum(case when sorted = false then 8 * count else 0 end) as auxiliary from sys.storagemodel() group by "schema","table"; create view sys.tracelog as select * from sys.tracelog(); SELECT u."name" AS "name", ui."fullname", ui."default_schema" FROM db_users() AS u LEFT JOIN "sys"."db_user_info" AS ui ON u."name" = ui."name" ; @@ -1830,7 +1830,7 @@ 6458 "columnsize" "bigint" 64 0 6463 NUL 6459 "heapsize" "bigint" 64 0 6463 NULL true 4 NULL 6460 "hashes" "bigint" 64 0 6463 NULL true 5 NULL 6461 "imprints" "bigint" 64 0 6463 NULL true 6 NULL -6462 "auxillary" "bigint" 53 0 6463 NULL true 7 NULL +6462 "auxiliary" "bigint" 53 0 6463 NULL true 7 NULL 6465 "column_id" "int" 32 0 6476 NULL true 0 NULL 6466 "type" "clob" 0 0 6476 NULL true 1 NULL 6467 "width" "int" 32 0 6476 NULL true 2 NULL @@ -1936,7 +1936,7 @@ 5737 "queue" 2000 "create view sys.queue 6393 "storage" 2000 "create view sys.storage as select * from sys.storage();" 1 true 0 false 6405 "storagemodelinput" 2000 NULL 0 true 0 false 6453 "storagemodel" 2000 "create view sys.storagemodel as select * from sys.storagemodel();" 1 true 0 false -6463 "tablestoragemodel" 2000 "-- A summary of the table storage requirement is is available as a table view.\n-- The auxillary column denotes the maximum space if all non-sorted columns\n-- would be augmented with a hash (rare situation)\ncreate view sys.tablestoragemodel\nas select ""schema"",""table"",max(count) as ""count"",\n\tsum(columnsize) as columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(hashes) as hashes,\n\tsum(imprints) as imprints,\n\tsum(case when sorted = false then 8 * count else 0 end) as auxillary\nfrom sys.storagemodel() group by ""schema"",""table"";" 1 true 0 false +6463 "tablestoragemodel" 2000 "-- A summary of the table storage requirement is is available as a table view.\n-- The auxiliary column denotes the maximum space if all non-sorted columns\n-- would be augmented with a hash (rare situation)\ncreate view sys.tablestoragemodel\nas select ""schema"",""table"",max(count) as ""count"",\n\tsum(columnsize) as columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(hashes) as hashes,\n\tsum(imprints) as imprints,\n\tsum(case when sorted = false then 8 * count else 0 end) as auxiliary\nfrom sys.storagemodel() group by ""schema"",""table"";" 1 true 0 false 6476 "statistics" 2000 NULL 0 true 0 false 6579 "files" 6528 NULL 0 true 0 false 6592 "sq" 6528 NULL 0 true 0 false diff --git a/clients/Tests/SQL-dump_all.stable.out.oid32 b/clients/Tests/SQL-dump_all.stable.out.oid32 --- a/clients/Tests/SQL-dump_all.stable.out.oid32 +++ b/clients/Tests/SQL-dump_all.stable.out.oid32 @@ -427,7 +427,7 @@ create view sys.storage as select * from create view sys.storagemodel as select * from sys.storagemodel(); SELECT * FROM (SELECT p.*, 0 AS "temporary" FROM "sys"."_tables" AS p UNION ALL SELECT t.*, 1 AS "temporary" FROM "tmp"."_tables" AS t) AS tables where tables.type <> 2; -- A summary of the table storage requirement is is available as a table view. --- The auxillary column denotes the maximum space if all non-sorted columns +-- The auxiliary column denotes the maximum space if all non-sorted columns -- would be augmented with a hash (rare situation) create view sys.tablestoragemodel as select "schema","table",max(count) as "count", @@ -435,7 +435,7 @@ as select "schema","table",max(count) as sum(heapsize) as heapsize, sum(hashes) as hashes, sum(imprints) as imprints, - sum(case when sorted = false then 8 * count else 0 end) as auxillary + sum(case when sorted = false then 8 * count else 0 end) as auxiliary from sys.storagemodel() group by "schema","table"; create view sys.tracelog as select * from sys.tracelog(); SELECT u."name" AS "name", ui."fullname", ui."default_schema" FROM db_users() AS u LEFT JOIN "sys"."db_user_info" AS ui ON u."name" = ui."name" ; @@ -1830,7 +1830,7 @@ 6458 "columnsize" "bigint" 64 0 6463 NUL 6459 "heapsize" "bigint" 64 0 6463 NULL true 4 NULL 6460 "hashes" "bigint" 64 0 6463 NULL true 5 NULL 6461 "imprints" "bigint" 64 0 6463 NULL true 6 NULL -6462 "auxillary" "bigint" 53 0 6463 NULL true 7 NULL +6462 "auxiliary" "bigint" 53 0 6463 NULL true 7 NULL 6465 "column_id" "int" 32 0 6476 NULL true 0 NULL 6466 "type" "clob" 0 0 6476 NULL true 1 NULL 6467 "width" "int" 32 0 6476 NULL true 2 NULL @@ -1936,7 +1936,7 @@ 5737 "queue" 2000 "create view sys.queue 6393 "storage" 2000 "create view sys.storage as select * from sys.storage();" 1 true 0 false 6405 "storagemodelinput" 2000 NULL 0 true 0 false 6453 "storagemodel" 2000 "create view sys.storagemodel as select * from sys.storagemodel();" 1 true 0 false -6463 "tablestoragemodel" 2000 "-- A summary of the table storage requirement is is available as a table view.\n-- The auxillary column denotes the maximum space if all non-sorted columns\n-- would be augmented with a hash (rare situation)\ncreate view sys.tablestoragemodel\nas select ""schema"",""table"",max(count) as ""count"",\n\tsum(columnsize) as columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(hashes) as hashes,\n\tsum(imprints) as imprints,\n\tsum(case when sorted = false then 8 * count else 0 end) as auxillary\nfrom sys.storagemodel() group by ""schema"",""table"";" 1 true 0 false +6463 "tablestoragemodel" 2000 "-- A summary of the table storage requirement is is available as a table view.\n-- The auxiliary column denotes the maximum space if all non-sorted columns\n-- would be augmented with a hash (rare situation)\ncreate view sys.tablestoragemodel\nas select ""schema"",""table"",max(count) as ""count"",\n\tsum(columnsize) as columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(hashes) as hashes,\n\tsum(imprints) as imprints,\n\tsum(case when sorted = false then 8 * count else 0 end) as auxiliary\nfrom sys.storagemodel() group by ""schema"",""table"";" 1 true 0 false 6476 "statistics" 2000 NULL 0 true 0 false 6579 "files" 6528 NULL 0 true 0 false 6592 "sq" 6528 NULL 0 true 0 false diff --git a/clients/Tests/SQL-dump_geom.stable.out b/clients/Tests/SQL-dump_geom.stable.out --- a/clients/Tests/SQL-dump_geom.stable.out +++ b/clients/Tests/SQL-dump_geom.stable.out @@ -424,7 +424,7 @@ create view sys.storage as select * from create view sys.storagemodel as select * from sys.storagemodel(); SELECT * FROM (SELECT p.*, 0 AS "temporary" FROM "sys"."_tables" AS p UNION ALL SELECT t.*, 1 AS "temporary" FROM "tmp"."_tables" AS t) AS tables where tables.type <> 2; -- A summary of the table storage requirement is is available as a table view. --- The auxillary column denotes the maximum space if all non-sorted columns +-- The auxiliary column denotes the maximum space if all non-sorted columns -- would be augmented with a hash (rare situation) create view sys.tablestoragemodel as select "schema","table",max(count) as "count", @@ -432,7 +432,7 @@ as select "schema","table",max(count) as sum(heapsize) as heapsize, sum(hashes) as hashes, sum(imprints) as imprints, - sum(case when sorted = false then 8 * count else 0 end) as auxillary + sum(case when sorted = false then 8 * count else 0 end) as auxiliary from sys.storagemodel() group by "schema","table"; create view sys.tracelog as select * from sys.tracelog(); SELECT u."name" AS "name", ui."fullname", ui."default_schema" FROM db_users() AS u LEFT JOIN "sys"."db_user_info" AS ui ON u."name" = ui."name" ; @@ -1804,7 +1804,7 @@ 6453 "columnsize" "bigint" 64 0 6458 NUL 6454 "heapsize" "bigint" 64 0 6458 NULL true 4 NULL 6455 "hashes" "bigint" 64 0 6458 NULL true 5 NULL 6456 "imprints" "bigint" 64 0 6458 NULL true 6 NULL -6457 "auxillary" "bigint" 53 0 6458 NULL true 7 NULL +6457 "auxiliary" "bigint" 53 0 6458 NULL true 7 NULL 6460 "column_id" "int" 32 0 6471 NULL true 0 NULL 6461 "type" "clob" 0 0 6471 NULL true 1 NULL 6462 "width" "int" 32 0 6471 NULL true 2 NULL @@ -1867,7 +1867,7 @@ 5737 "queue" 2000 "create view sys.queue 6388 "storage" 2000 "create view sys.storage as select * from sys.storage();" 1 true 0 false 6400 "storagemodelinput" 2000 NULL 0 true 0 false 6448 "storagemodel" 2000 "create view sys.storagemodel as select * from sys.storagemodel();" 1 true 0 false -6458 "tablestoragemodel" 2000 "-- A summary of the table storage requirement is is available as a table view.\n-- The auxillary column denotes the maximum space if all non-sorted columns\n-- would be augmented with a hash (rare situation)\ncreate view sys.tablestoragemodel\nas select ""schema"",""table"",max(count) as ""count"",\n\tsum(columnsize) as columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(hashes) as hashes,\n\tsum(imprints) as imprints,\n\tsum(case when sorted = false then 8 * count else 0 end) as auxillary\nfrom sys.storagemodel() group by ""schema"",""table"";" 1 true 0 false +6458 "tablestoragemodel" 2000 "-- A summary of the table storage requirement is is available as a table view.\n-- The auxiliary column denotes the maximum space if all non-sorted columns\n-- would be augmented with a hash (rare situation)\ncreate view sys.tablestoragemodel\nas select ""schema"",""table"",max(count) as ""count"",\n\tsum(columnsize) as columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(hashes) as hashes,\n\tsum(imprints) as imprints,\n\tsum(case when sorted = false then 8 * count else 0 end) as auxiliary\nfrom sys.storagemodel() group by ""schema"",""table"";" 1 true 0 false 6471 "statistics" 2000 NULL 0 true 0 false 6593 "systemfunctions" 2000 NULL 0 true 0 false COMMIT; diff --git a/clients/Tests/SQL-dump_geom.stable.out.32bit b/clients/Tests/SQL-dump_geom.stable.out.32bit _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
