Changeset: ce0fa095c61c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ce0fa095c61c
Added Files:
        clients/R/Tests/SingleServer
        clients/Tests/SingleServer
        clients/mapiclient/Tests/SingleServer
        geom/BugTracker/Tests/SingleServer
        geom/sql/conformance/Tests/SingleServer
        geom/sql/functions/Tests/SingleServer
        geom/sql/pg_regression/Tests/SingleServer
        monetdb5/extras/mal_optimizer_template/Tests/SingleServer
        monetdb5/extras/rapi/Tests/SingleServer
        monetdb5/mal/Tests/SingleServer
        monetdb5/modules/atoms/Tests/SingleServer
        monetdb5/modules/kernel/Tests/SingleServer
        monetdb5/modules/mal/Tests/SingleServer
        monetdb5/optimizer/Tests/SingleServer
        monetdb5/scheduler/Tests/SingleServer
        sql/backends/monet5/Tests/SingleServer
        sql/backends/monet5/UDF/capi/Tests/SingleServer
        sql/backends/monet5/UDF/pyapi3/Tests/SingleServer
        sql/backends/monet5/UDF/udf/Tests/SingleServer
        sql/backends/monet5/generator/Tests/SingleServer
        sql/benchmarks/ATIS/Tests/SingleServer
        sql/benchmarks/arno/Tests/SingleServer
        sql/benchmarks/arno_flt/Tests/SingleServer
        sql/benchmarks/blob/Tests/SingleServer
        sql/benchmarks/moa/Tests/SingleServer
        sql/benchmarks/nobench/Tests/SingleServer
        sql/benchmarks/ssbm/Tests/SingleServer
        sql/benchmarks/tpcds/Tests/SingleServer
        sql/benchmarks/tpch/LOCKED/Tests/SingleServer
        sql/benchmarks/tpch/Tests/SingleServer
        sql/benchmarks/viam/Tests/SingleServer
        sql/jdbc/tests/Tests/SingleServer
        sql/jdbc/tests/Tests/bogus-auto-generated-keys.SQL.bat
        sql/jdbc/tests/Tests/bogus-auto-generated-keys.SQL.sh
        sql/jdbc/tests/Tests/bogus-auto-generated-keys.sql
        sql/jdbc/tests/Tests/bogus-auto-generated-keys.stable.err
        sql/jdbc/tests/Tests/bogus-auto-generated-keys.stable.out
        sql/odbc/samples/Tests/SingleServer
        sql/test/ADT2006/Tests/SingleServer
        sql/test/BugConstraints/Tests/SingleServer
        sql/test/BugDay_2005-10-06_2.8/Tests/SingleServer
        sql/test/BugDay_2005-10-06_2.9.3/Tests/SingleServer
        sql/test/BugDay_2005-11-09_2.8/Tests/SingleServer
        sql/test/BugDay_2005-11-09_2.9.3/Tests/SingleServer
        sql/test/BugDay_2005-12-19_2.9.3/Tests/SingleServer
        sql/test/BugTracker-2008/Tests/SingleServer
        sql/test/BugTracker-2009/Tests/SingleServer
        sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.SQL.py
        sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.SQL.py
        sql/test/BugTracker-2010/Tests/SingleServer
        sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.SQL.py
        
sql/test/BugTracker-2010/alter-table-restart-crash.SF-2975018/Tests/SingleServer
        
sql/test/BugTracker-2010/alter-table-restart-crash.SF-2975022/Tests/SingleServer
        sql/test/BugTracker-2011/Tests/SingleServer
        
sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py
        sql/test/BugTracker-2012/Tests/SingleServer
        sql/test/BugTracker-2013/Tests/SingleServer
        sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.SQL.py
        sql/test/BugTracker-2014/Tests/SingleServer
        sql/test/BugTracker-2015/Tests/SingleServer
        sql/test/BugTracker-2016/Tests/SingleServer
        sql/test/BugTracker-2017/Tests/SingleServer
        sql/test/BugTracker-2017/Tests/shutdown.Bug-6182.SQL.py
        sql/test/BugTracker-2018/Tests/SingleServer
        sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.SQL.py
        sql/test/BugTracker-2019/Tests/SingleServer
        
sql/test/BugTracker-2019/Tests/remote-table-non-existent-column.Bug-6750.stable.err
        sql/test/BugTracker-2020/Tests/SingleServer
        sql/test/BugTracker-2020/Tests/cume-dist-wrong-results.Bug-6827.sql
        
sql/test/BugTracker-2020/Tests/cume-dist-wrong-results.Bug-6827.stable.err
        
sql/test/BugTracker-2020/Tests/cume-dist-wrong-results.Bug-6827.stable.out
        sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.SQL.py
        sql/test/BugTracker-2020/Tests/ntile-wrong-results.Bug-6829.sql
        sql/test/BugTracker-2020/Tests/ntile-wrong-results.Bug-6829.stable.err
        sql/test/BugTracker-2020/Tests/ntile-wrong-results.Bug-6829.stable.out
        sql/test/BugTracker-2020/Tests/window-order-by-extract.Bug-6828.sql
        
sql/test/BugTracker-2020/Tests/window-order-by-extract.Bug-6828.stable.err
        
sql/test/BugTracker-2020/Tests/window-order-by-extract.Bug-6828.stable.out
        sql/test/BugTracker/Tests/SingleServer
        sql/test/BugTracker/Tests/connect_crash.SF-1436626.SQL.py
        sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.SQL.py
        sql/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.SQL.py
        
sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.SQL.py
        sql/test/Dependencies/Tests/SingleServer
        sql/test/DropCascade/Tests/SingleServer
        sql/test/Dump/Tests/SingleServer
        sql/test/FeatureRequests/Tests/SingleServer
        sql/test/LSST/Tests/SingleServer
        sql/test/SQLite_regress/sqllogictest/Tests/SingleServer
        sql/test/SQLite_regress/sqllogictest/Tests/select1.stable.err
        sql/test/SQLite_regress/sqllogictest/Tests/select1.stable.err-noapprove
        sql/test/SQLite_regress/sqllogictest/Tests/select1.stable.out
        sql/test/SQLite_regress/sqllogictest/Tests/select1.stable.out-noapprove
        sql/test/SQLite_regress/sqllogictest/Tests/select1.test
        sql/test/SQLite_regress/sqllogictest/Tests/select1.timeout
        sql/test/SQLite_regress/sqllogictest/Tests/select2.stable.err
        sql/test/SQLite_regress/sqllogictest/Tests/select2.stable.err-noapprove
        sql/test/SQLite_regress/sqllogictest/Tests/select2.stable.out
        sql/test/SQLite_regress/sqllogictest/Tests/select2.stable.out-noapprove
        sql/test/SQLite_regress/sqllogictest/Tests/select2.test
        sql/test/SQLite_regress/sqllogictest/Tests/select2.timeout
        sql/test/SQLite_regress/sqllogictest/Tests/select3.stable.err
        sql/test/SQLite_regress/sqllogictest/Tests/select3.stable.err-noapprove
        sql/test/SQLite_regress/sqllogictest/Tests/select3.stable.out
        sql/test/SQLite_regress/sqllogictest/Tests/select3.stable.out-noapprove
        sql/test/SQLite_regress/sqllogictest/Tests/select3.test
        sql/test/SQLite_regress/sqllogictest/Tests/select3.timeout
        sql/test/SQLite_regress/sqllogictest/Tests/select4.stable.err
        sql/test/SQLite_regress/sqllogictest/Tests/select4.stable.err-noapprove
        sql/test/SQLite_regress/sqllogictest/Tests/select4.stable.out
        sql/test/SQLite_regress/sqllogictest/Tests/select4.stable.out-noapprove
        sql/test/SQLite_regress/sqllogictest/Tests/select4.test
        sql/test/SQLite_regress/sqllogictest/Tests/select4.timeout
        sql/test/SQLite_regress/sqllogictest/Tests/select5.stable.err
        sql/test/SQLite_regress/sqllogictest/Tests/select5.stable.err-noapprove
        sql/test/SQLite_regress/sqllogictest/Tests/select5.stable.out
        sql/test/SQLite_regress/sqllogictest/Tests/select5.stable.out-noapprove
        sql/test/SQLite_regress/sqllogictest/Tests/select5.test
        sql/test/SQLite_regress/sqllogictest/Tests/select5.timeout
        sql/test/Skyserver/Tests/SingleServer
        sql/test/Skyserver/bugs/Tests/SingleServer
        sql/test/Tests/SingleServer
        sql/test/Triggers/Tests/SingleServer
        sql/test/Update_Delete_action/Tests/SingleServer
        sql/test/UserDump/Tests/SingleServer
        sql/test/Users/Tests/SingleServer
        sql/test/Users/Tests/metadataConsistency.sql
        sql/test/Users/Tests/metadataConsistency.stable.err
        sql/test/Users/Tests/metadataConsistency.stable.out
        sql/test/VOC/Tests/SingleServer
        sql/test/Via-m/Tests/SingleServer
        sql/test/Views/Tests/SingleServer
        sql/test/analytics/Tests/SingleServer
        sql/test/broken_delete/Tests/SingleServer
        sql/test/bugs/Tests/SingleServer
        sql/test/concurrent/Tests/SingleServer
        sql/test/copy/Tests/SingleServer
        sql/test/group-concat/Tests/SingleServer
        sql/test/in-value-list/Tests/SingleServer
        sql/test/json/Tests/SingleServer
        sql/test/lateral/Tests/SingleServer
        sql/test/mapi/Tests/SingleServer
        sql/test/merge-partitions/Tests/SingleServer
        sql/test/merge-partitions/Tests/mergepart23.SQL.py
        sql/test/merge-partitions/Tests/mergepart29.SQL.py
        sql/test/merge-statements/Tests/SingleServer
        sql/test/merge-statements/Tests/mergestmt04.sql
        sql/test/merge-statements/Tests/mergestmt04.stable.err
        sql/test/merge-statements/Tests/mergestmt04.stable.out
        sql/test/mergetables/Tests/SingleServer
        sql/test/mergetables/Tests/transaction-conflict.SQL.py
        sql/test/miscellaneous/Tests/SingleServer
        sql/test/miscellaneous/Tests/groupings.sql
        sql/test/miscellaneous/Tests/groupings.stable.err
        sql/test/miscellaneous/Tests/groupings.stable.out
        sql/test/miscellaneous/Tests/pk_fk_stress.SQL.py
        sql/test/null/Tests/SingleServer
        sql/test/orderidx/Tests/SingleServer
        sql/test/osm/Tests/SingleServer
        sql/test/pg_regress/Tests/SingleServer
        sql/test/quantiles/Tests/SingleServer
        sql/test/rdf/Tests/SingleServer
        sql/test/remote/Tests/SingleServer
        sql/test/rename/Tests/SingleServer
        sql/test/rename/Tests/rename00.SQL.py
        sql/test/sample/Tests/SingleServer
        sql/test/scripts/Tests/All
        sql/test/scripts/Tests/alastair_udf_mergetable_bug.py
        sql/test/scripts/Tests/alastair_udf_mergetable_bug.stable.err
        sql/test/scripts/Tests/alastair_udf_mergetable_bug.stable.out
        sql/test/scripts/Tests/copy-from-lz4.py
        sql/test/scripts/Tests/copy-from-lz4.stable.err
        sql/test/scripts/Tests/copy-from-lz4.stable.out
        sql/test/scripts/Tests/copy-into-lz4.sql.in
        sql/test/scripts/Tests/copy-into-lz4.stable.err
        sql/test/scripts/Tests/copy-into-lz4.stable.out
        sql/test/scripts/Tests/fsum.sql
        sql/test/scripts/Tests/fsum.stable.err
        sql/test/scripts/Tests/fsum.stable.out
        sql/test/scripts/Tests/fsum1.sql.src
        sql/test/scripts/Tests/fsum1.stable.err.src
        sql/test/scripts/Tests/fsum1.stable.out.src
        sql/test/scripts/Tests/lz4-dump.sql
        sql/test/scripts/Tests/testlz4.lz4
        sql/test/snodgrass/Tests/SingleServer
        sql/test/sql_xml/Tests/SingleServer
        sql/test/ssqq/Tests/SingleServer
        sql/test/subquery/Tests/SingleServer
        sql/test/sys-schema/Tests/SingleServer
        sql/test/xquery/Tests/SingleServer
        testing/mktest.py
        testing/sqllogictest.py
        tools/merovingian/client/Tests/monetdb_status.stable.err
        tools/merovingian/client/Tests/monetdb_status.stable.out
Removed Files:
        geom/sql/Tests/All
        geom/sql/Tests/T19.stable.err
        geom/sql/Tests/T19.stable.out
        geom/sql/Tests/T20.stable.err
        geom/sql/Tests/T20.stable.out
        geom/sql/Tests/T9.stable.err
        geom/sql/Tests/T9.stable.out
        geom/sql/Tests/area.sql
        geom/sql/Tests/asBinary.sql
        geom/sql/Tests/asBinary.stable.err
        geom/sql/Tests/asBinary.stable.out
        geom/sql/Tests/basic.modules
        geom/sql/Tests/basic.sql
        geom/sql/Tests/basic.stable.err
        geom/sql/Tests/basic.stable.out
        geom/sql/Tests/binary.sql
        geom/sql/Tests/binary.stable.err
        geom/sql/Tests/binary.stable.out
        geom/sql/Tests/centroid.sql
        geom/sql/Tests/distance.sql
        geom/sql/Tests/example.modules
        geom/sql/Tests/example.sql
        geom/sql/Tests/example.stable.err
        geom/sql/Tests/example.stable.out
        geom/sql/Tests/geom-null-tests.modules
        geom/sql/Tests/geom-null-tests.sql
        geom/sql/Tests/geom-null-tests.stable.err
        geom/sql/Tests/geom-null-tests.stable.out
        geom/sql/Tests/geom_curve.modules
        geom/sql/Tests/geom_curve.sql
        geom/sql/Tests/geom_curve.stable.err
        geom/sql/Tests/geom_curve.stable.out
        geom/sql/Tests/geom_geometry.modules
        geom/sql/Tests/geom_geometry.sql
        geom/sql/Tests/geom_geometry.stable.err
        geom/sql/Tests/geom_geometry.stable.out
        geom/sql/Tests/geom_linestring.modules
        geom/sql/Tests/geom_linestring.sql
        geom/sql/Tests/geom_linestring.stable.err
        geom/sql/Tests/geom_linestring.stable.out
        geom/sql/Tests/geom_mbr.modules
        geom/sql/Tests/geom_mbr.sql
        geom/sql/Tests/geom_mbr.stable.err
        geom/sql/Tests/geom_mbr.stable.out
        geom/sql/Tests/geom_multi.modules
        geom/sql/Tests/geom_multi.sql
        geom/sql/Tests/geom_multi.stable.err
        geom/sql/Tests/geom_multi.stable.out
        geom/sql/Tests/geom_point.modules
        geom/sql/Tests/geom_point.sql
        geom/sql/Tests/geom_point.stable.err
        geom/sql/Tests/geom_point.stable.out
        geom/sql/Tests/geom_polygon.modules
        geom/sql/Tests/geom_polygon.sql
        geom/sql/Tests/geom_polygon.stable.err
        geom/sql/Tests/geom_polygon.stable.out
        geom/sql/Tests/geom_surface.modules
        geom/sql/Tests/geom_surface.sql
        geom/sql/Tests/geom_surface.stable.err
        geom/sql/Tests/geom_surface.stable.out
        geom/sql/Tests/intersection.sql
        geom/sql/Tests/length.sql
        geom/sql/Tests/makeLine.sql
        geom/sql/Tests/makeLine.stable.err
        geom/sql/Tests/makeLine.stable.out
        geom/sql/Tests/mbr.sql
        geom/sql/Tests/mbr.stable.err
        geom/sql/Tests/mbr.stable.out
        geom/sql/Tests/mbr_left.sql
        geom/sql/Tests/mbr_left.stable.err
        geom/sql/Tests/mbr_left.stable.out
        geom/sql/Tests/mbr_right.sql
        geom/sql/Tests/mbr_right.stable.err
        geom/sql/Tests/mbr_right.stable.out
        geom/sql/Tests/normalized.sql
        geom/sql/Tests/normalized.stable.err
        geom/sql/Tests/normalized.stable.out
        geom/sql/Tests/null-mbr.Bug-2814.modules
        geom/sql/Tests/null-mbr.Bug-2814.sql
        geom/sql/Tests/null-mbr.Bug-2814.stable.err
        geom/sql/Tests/null-mbr.Bug-2814.stable.out
        geom/sql/Tests/pointOnSurface.sql
        geom/sql/Tests/pointOnSurface.stable.err
        geom/sql/Tests/pointOnSurface.stable.out
        geom/sql/Tests/relation.modules
        geom/sql/Tests/relation.sql
        geom/sql/Tests/relation.stable.err
        geom/sql/Tests/relation.stable.out
        geom/sql/Tests/spatial.modules
        geom/sql/Tests/spatial.sql
        geom/sql/Tests/spatial.stable.err
        geom/sql/Tests/spatial.stable.out
        geom/sql/Tests/union.sql
        geom/sql/Tests/union.stable.err
        geom/sql/Tests/union.stable.out
        sql/benchmarks/tpch/LOCKED/Tests/01-22.SQL.bat
        sql/benchmarks/tpch/LOCKED/Tests/01-22.SQL.sh
        sql/benchmarks/tpch/LOCKED/Tests/01-22.reqtests
        sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.err
        sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
        sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128
        sql/benchmarks/tpch/Tests/01-22.SQL.bat
        sql/benchmarks/tpch/Tests/01-22.SQL.sh
        sql/benchmarks/tpch/Tests/01-22.reqtests
        sql/benchmarks/tpch/Tests/01-22.stable.err
        sql/benchmarks/tpch/Tests/01-22.stable.out
        sql/benchmarks/tpch/Tests/01-22.stable.out.int128
        sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.py
        sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.py
        sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.py
        sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.py
        sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.py
        sql/test/BugTracker-2017/Tests/shutdown.Bug-6182.sql
        sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.py
        sql/test/BugTracker-2019/Tests/msqldump-mapi-cache.Bug-6777.timeout
        sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.py
        sql/test/BugTracker/Tests/connect_crash.SF-1436626.py
        sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py
        sql/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.py
        
sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.py
        sql/test/SQLite_regress/sqllogictest/Tests/test1.SQL.bat
        sql/test/SQLite_regress/sqllogictest/Tests/test1.SQL.sh
        sql/test/SQLite_regress/sqllogictest/Tests/test1.stable.err
        sql/test/SQLite_regress/sqllogictest/Tests/test1.stable.err-noapprove
        sql/test/SQLite_regress/sqllogictest/Tests/test1.stable.out
        sql/test/SQLite_regress/sqllogictest/Tests/test1.stable.out-noapprove
        sql/test/SQLite_regress/sqllogictest/Tests/test1.timeout
        sql/test/SQLite_regress/sqllogictest/Tests/test2.SQL.bat
        sql/test/SQLite_regress/sqllogictest/Tests/test2.SQL.sh
        sql/test/SQLite_regress/sqllogictest/Tests/test2.stable.err
        sql/test/SQLite_regress/sqllogictest/Tests/test2.stable.err-noapprove
        sql/test/SQLite_regress/sqllogictest/Tests/test2.stable.out
        sql/test/SQLite_regress/sqllogictest/Tests/test2.stable.out-noapprove
        sql/test/SQLite_regress/sqllogictest/Tests/test2.timeout
        sql/test/SQLite_regress/sqllogictest/Tests/test3.SQL.bat
        sql/test/SQLite_regress/sqllogictest/Tests/test3.SQL.sh
        sql/test/SQLite_regress/sqllogictest/Tests/test3.stable.err
        sql/test/SQLite_regress/sqllogictest/Tests/test3.stable.err-noapprove
        sql/test/SQLite_regress/sqllogictest/Tests/test3.stable.out
        sql/test/SQLite_regress/sqllogictest/Tests/test3.stable.out-noapprove
        sql/test/SQLite_regress/sqllogictest/Tests/test3.timeout
        sql/test/SQLite_regress/sqllogictest/Tests/test4.SQL.bat
        sql/test/SQLite_regress/sqllogictest/Tests/test4.SQL.sh
        sql/test/SQLite_regress/sqllogictest/Tests/test4.stable.err
        sql/test/SQLite_regress/sqllogictest/Tests/test4.stable.err-noapprove
        sql/test/SQLite_regress/sqllogictest/Tests/test4.stable.out
        sql/test/SQLite_regress/sqllogictest/Tests/test4.stable.out-noapprove
        sql/test/SQLite_regress/sqllogictest/Tests/test4.timeout
        sql/test/SQLite_regress/sqllogictest/Tests/test5.SQL.bat
        sql/test/SQLite_regress/sqllogictest/Tests/test5.SQL.sh
        sql/test/SQLite_regress/sqllogictest/Tests/test5.stable.err
        sql/test/SQLite_regress/sqllogictest/Tests/test5.stable.err-noapprove
        sql/test/SQLite_regress/sqllogictest/Tests/test5.stable.out
        sql/test/SQLite_regress/sqllogictest/Tests/test5.stable.out-noapprove
        sql/test/SQLite_regress/sqllogictest/Tests/test5.timeout
        sql/test/SQLite_regress/sqllogictest/select1.test
        sql/test/SQLite_regress/sqllogictest/select2.test
        sql/test/SQLite_regress/sqllogictest/select3.test
        sql/test/SQLite_regress/sqllogictest/select4.test
        sql/test/SQLite_regress/sqllogictest/select5.test
        sql/test/SQLite_regress/sqllogictest/sqllogictest.py
        sql/test/Tests/alastair_udf_mergetable_bug.py
        sql/test/Tests/alastair_udf_mergetable_bug.stable.err
        sql/test/Tests/alastair_udf_mergetable_bug.stable.out
        sql/test/Tests/bogus-auto-generated-keys.SQL.bat
        sql/test/Tests/bogus-auto-generated-keys.SQL.sh
        sql/test/Tests/bogus-auto-generated-keys.stable.err
        sql/test/Tests/bogus-auto-generated-keys.stable.out
        sql/test/Tests/copy-from-lz4.py
        sql/test/Tests/copy-from-lz4.stable.err
        sql/test/Tests/copy-from-lz4.stable.out
        sql/test/Tests/copy-into-lz4.sql.in
        sql/test/Tests/copy-into-lz4.stable.err
        sql/test/Tests/copy-into-lz4.stable.out
        sql/test/Tests/fsum.sql
        sql/test/Tests/fsum.stable.err
        sql/test/Tests/fsum.stable.out
        sql/test/Tests/fsum1.sql.src
        sql/test/Tests/fsum1.stable.err.src
        sql/test/Tests/fsum1.stable.out.src
        sql/test/Tests/lz4-dump.sql
        sql/test/Tests/testlz4.lz4
        sql/test/bogus-auto-generated-keys.sql
        sql/test/merge-partitions/Tests/mergepart23.py
        sql/test/merge-partitions/Tests/mergepart29.py
        sql/test/mergetables/Tests/transaction-conflict.py
        sql/test/miscellaneous/Tests/pk_fk_stress.py
        sql/test/rename/Tests/rename00.py
Modified Files:
        .hgtags
        MonetDB.spec
        NT/monetdb_config.h.in
        NT/rules.msc
        buildtools/selinux/monetdb.fc
        buildtools/selinux/monetdb.te
        clients/Tests/MAL-signatures.stable.out
        clients/Tests/MAL-signatures.stable.out.int128
        clients/mapilib/mapi.rc
        clients/odbc/driver/ODBCEnv.c
        clients/odbc/driver/driver.rc
        clients/odbc/winsetup/setup.rc
        configure.ag
        debian/changelog
        debian/rules
        gdk/gdk_analytic_func.c
        gdk/gdk_calc.c
        gdk/gdk_calc_compare.h
        gdk/gdk_string.c
        gdk/gdk_system.c
        gdk/gdk_system_private.h
        gdk/gdk_utils.c
        gdk/libbat.rc
        geom/monetdb5/geom.c
        geom/sql/Makefile.ag
        libversions
        monetdb5/extras/rapi/converters.c.h
        monetdb5/mal/mal_import.c
        monetdb5/mal/mal_interpreter.c
        monetdb5/mal/mal_parser.c
        monetdb5/modules/atoms/identifier.c
        monetdb5/modules/atoms/json.c
        monetdb5/modules/atoms/mtime.c
        monetdb5/modules/atoms/str.c
        monetdb5/modules/atoms/url.c
        monetdb5/modules/atoms/uuid.c
        monetdb5/modules/kernel/batstr.c
        monetdb5/modules/mal/clients.c
        monetdb5/modules/mal/mal_io.c
        monetdb5/modules/mal/mal_mapi.c
        monetdb5/modules/mal/pcre.c
        monetdb5/modules/mal/projectionpath.c
        monetdb5/modules/mal/remote.c
        monetdb5/modules/mal/tablet.c
        monetdb5/optimizer/opt_json.c
        monetdb5/optimizer/opt_macro.c
        monetdb5/optimizer/opt_mergetable.c
        monetdb5/optimizer/opt_pipes.c
        monetdb5/optimizer/opt_pushselect.c
        monetdb5/scheduler/run_adder.c
        monetdb5/tools/libmonetdb5.rc
        sql/backends/monet5/UDF/capi/capi.c
        sql/backends/monet5/UDF/pyapi3/connection3.c
        sql/backends/monet5/UDF/pyapi3/conversion3.c
        sql/backends/monet5/UDF/pyapi3/pyapi3.c
        sql/backends/monet5/UDF/udf/udf.c
        sql/backends/monet5/rel_bin.c
        sql/backends/monet5/sql.c
        sql/backends/monet5/sql.mal
        sql/backends/monet5/sql_cat.c
        sql/backends/monet5/sql_execute.c
        sql/backends/monet5/sql_gencode.c
        sql/backends/monet5/sql_optimizer.c
        sql/backends/monet5/sql_rank.c
        sql/backends/monet5/sql_result.c
        sql/backends/monet5/sql_statement.c
        sql/backends/monet5/sql_statement.h
        sql/backends/monet5/sql_transaction.c
        sql/backends/monet5/wlr.c
        sql/benchmarks/nobench/Tests/nobench.sql
        sql/benchmarks/nobench/Tests/nobench.stable.out
        sql/benchmarks/tpcds/Tests/44.stable.out
        sql/benchmarks/tpcds/Tests/54.stable.out
        sql/benchmarks/tpch/LOCKED/Tests/All
        sql/benchmarks/tpch/Tests/All
        sql/include/sql_catalog.h
        sql/include/sql_relation.h
        sql/jdbc/tests/Tests/All
        sql/rel.txt
        sql/server/rel_dump.c
        sql/server/rel_exp.c
        sql/server/rel_optimizer.c
        sql/server/rel_propagate.c
        sql/server/rel_psm.c
        sql/server/rel_rel.c
        sql/server/rel_schema.c
        sql/server/rel_select.c
        sql/server/rel_unnest.c
        sql/server/rel_updates.c
        sql/server/rel_updates.h
        sql/server/sql_atom.c
        sql/server/sql_mvc.c
        sql/server/sql_partition.c
        sql/server/sql_privileges.c
        sql/storage/bat/bat_logger.c
        sql/storage/store.c
        sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
        
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
        sql/test/BugTracker-2013/Tests/rangejoin_optimizer.Bug-3411.stable.out
        sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out
        
sql/test/BugTracker-2015/Tests/local-remotetable-crash.Bug-3754.stable.err
        sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out
        
sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out
        sql/test/BugTracker-2017/Tests/caching_stats_bug.6374.stable.out
        sql/test/BugTracker-2017/Tests/crash_on_NULL_ptr.Bug-6130.stable.out
        sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6477.stable.out
        
sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.out
        
sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.stable.out
        sql/test/BugTracker-2019/Tests/All
        sql/test/BugTracker-2019/Tests/alter_table_drop_column.Bug-6749.py
        sql/test/BugTracker-2019/Tests/grant-select-column.Bug-6765.py
        sql/test/BugTracker-2019/Tests/isaUUID.Bug-6784.sql
        sql/test/BugTracker-2019/Tests/isaUUID.Bug-6784.stable.out
        sql/test/BugTracker-2019/Tests/msqldump-mapi-cache.Bug-6777.py
        sql/test/BugTracker-2019/Tests/msqldump-mapi-cache.Bug-6777.stable.out
        sql/test/BugTracker-2019/Tests/python-loader-string.Bug-6759.py
        
sql/test/BugTracker-2019/Tests/remote-table-non-existent-column.Bug-6750.py
        sql/test/BugTracker-2020/Tests/All
        sql/test/BugTracker-2020/Tests/alter-table-add-column.Bug-6816.py
        sql/test/SQLite_regress/sqllogictest/Tests/All
        sql/test/Tests/All
        sql/test/Users/Tests/All
        sql/test/analytics/Tests/analytics01.stable.out
        sql/test/analytics/Tests/analytics02.stable.out
        sql/test/analytics/Tests/analytics13.stable.out
        sql/test/copy/Tests/embedded_sep.sql
        sql/test/copy/Tests/escaped_char.sql
        sql/test/copy/Tests/format_date.sql
        sql/test/copy/Tests/incorrect_columns.sql
        sql/test/copy/Tests/ingestion.sql
        sql/test/copy/Tests/int_parse_best.sql
        sql/test/copy/Tests/null_as_string.sql
        sql/test/copy/Tests/null_as_string_output.sql
        sql/test/copy/Tests/overflow_error.sql
        sql/test/json/Tests/jsonvalidity.Bug-3753.stable.out
        sql/test/merge-partitions/Tests/mergepart23.stable.out
        sql/test/merge-statements/Tests/All
        sql/test/mergetables/Tests/mergequery.stable.out
        sql/test/mergetables/Tests/sqlsmith-exists.sql
        sql/test/mergetables/Tests/sqlsmith-exists.stable.out
        sql/test/miscellaneous/Tests/All
        sql/test/miscellaneous/Tests/simple_selects.sql
        sql/test/miscellaneous/Tests/simple_selects.stable.out
        sql/test/orderidx/Tests/oidx_all_types.sql
        sql/test/orderidx/Tests/oidx_hge_type.sql
        sql/test/subquery/Tests/correlated.stable.out
        sql/test/subquery/Tests/subquery3.sql
        sql/test/subquery/Tests/subquery3.stable.err
        sql/test/subquery/Tests/subquery3.stable.out
        sql/test/wlcr/Tests/All
        testing/Makefile.ag
        testing/Mtest.py.in
        testing/README
        tools/merovingian/client/Tests/monetdb_status.py
        vertoo.data
Branch: scoping
Log Message:

Merged with default


diffs (truncated from 36985 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -758,3 +758,8 @@ 4eb6068f63cf87fc6996daed59fbcc917c8b2881
 7186b517a584f0244e20eb7abe61f7a7c0c9ea1b Nov2019_15
 4eb6068f63cf87fc6996daed59fbcc917c8b2881 Nov2019_SP2_release
 7186b517a584f0244e20eb7abe61f7a7c0c9ea1b Nov2019_SP2_release
+e1c7c70bceb205cf23b8a35179b628563871f949 Nov2019_17
+e1c7c70bceb205cf23b8a35179b628563871f949 Nov2019_SP3_release
+179977ed07cd8095f99a6a07968b8e9d1affa753 Nov2019_19
+e1c7c70bceb205cf23b8a35179b628563871f949 Nov2019_SP3_release
+179977ed07cd8095f99a6a07968b8e9d1affa753 Nov2019_SP3_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -105,7 +105,7 @@ Group: Applications/Databases
 License: MPLv2.0
 URL: https://www.monetdb.org/
 BugURL: https://bugs.monetdb.org/
-Source: 
https://www.monetdb.org/downloads/sources/Nov2019-SP2/%{name}-%{version}.tar.bz2
+Source: 
https://www.monetdb.org/downloads/sources/Nov2019-SP3/%{name}-%{version}.tar.bz2
 
 # we need systemd for the _unitdir macro to exist
 # we need checkpolicy and selinux-policy-devel for the SELinux policy
@@ -789,7 +789,9 @@ do
   /usr/sbin/semodule -s ${selinuxvariant} -i \
     %{_datadir}/selinux/${selinuxvariant}/monetdb.pp &> /dev/null || :
 done
-/sbin/restorecon -R %{_localstatedir}/monetdb5 %{_localstatedir}/log/monetdb 
%{_rundir}/monetdb %{_bindir}/monetdbd %{_bindir}/mserver5 
%{_unitdir}/monetdbd.service &> /dev/null || :
+# use /var/run/monetdb since that's what it says in the monetdb.fc file
+# it says that because /run/monetdb for some reason doesn't work
+/sbin/restorecon -R %{_localstatedir}/monetdb5 %{_localstatedir}/log/monetdb 
/var/run/monetdb %{_bindir}/monetdbd %{_bindir}/mserver5 
%{_unitdir}/monetdbd.service &> /dev/null || :
 /usr/bin/systemctl try-restart monetdbd.service
 
 %postun selinux
@@ -839,7 +841,7 @@ export CFLAGS
 # do not use --enable-optimize or --disable-optimize: we don't want
 # any changes to optimization flags
 %{configure} \
-       --with-rundir=%{_rundir} \
+       --with-rundir=%{_rundir}/monetdb \
        --enable-assert=no \
        --enable-debug=yes \
        --enable-developer=no \
@@ -941,6 +943,14 @@ fi
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sat Feb 22 2020 Sjoerd Mullender <sjo...@acm.org> - 11.35.19-20200222
+- Rebuilt.
+- BZ#6829: NTILE window function returns incorrect results
+
+* Fri Feb 21 2020 Sjoerd Mullender <sjo...@acm.org> - 11.35.17-20200221
+- Rebuilt.
+- BZ#6827: CUME_DIST window function returns incorrect results
+
 * Mon Feb 17 2020 Sjoerd Mullender <sjo...@acm.org> - 11.35.15-20200217
 - Rebuilt.
 - BZ#6817: running analyze on a schema which contains a stream table
diff --git a/buildtools/selinux/monetdb.fc b/buildtools/selinux/monetdb.fc
--- a/buildtools/selinux/monetdb.fc
+++ b/buildtools/selinux/monetdb.fc
@@ -4,6 +4,6 @@
 /var/log/monetdb(/.*)?                                 
gen_context(system_u:object_r:monetdbd_log_t,s0)
 /var/monetdb5/dbfarm(/.*)?                             
gen_context(system_u:object_r:mserver5_db_t,s0)
 /var/monetdb5/dbfarm/\.merovingian_properties  --      
gen_context(system_u:object_r:monetdbd_etc_t,s0)
-/run/monetdb(/.*)?                                     
gen_context(system_u:object_r:monetdbd_var_run_t,s0)
+/var/run/monetdb(/.*)?                                 
gen_context(system_u:object_r:monetdbd_var_run_t,s0)
 /var/monetdb5/dbfarm/\.merovingian_lock                --      
gen_context(system_u:object_r:monetdbd_lock_t,s0)
 /var/monetdb5/dbfarm/.*/\.gdk_lock             --      
gen_context(system_u:object_r:mserver5_lock_t,s0)
diff --git a/buildtools/selinux/monetdb.te b/buildtools/selinux/monetdb.te
--- a/buildtools/selinux/monetdb.te
+++ b/buildtools/selinux/monetdb.te
@@ -1,4 +1,4 @@
-policy_module(monetdb, 0.8)
+policy_module(monetdb, 0.9)
 # The above line declares that this file is a SELinux policy file. Its
 # name is monetdb, so the file should be saved as monetdb.te
 
diff --git a/clients/R/Tests/SingleServer b/clients/R/Tests/SingleServer
new file mode 100644
--- /dev/null
+++ b/clients/R/Tests/SingleServer
@@ -0,0 +1,1 @@
+--set embedded_r=yes
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
@@ -11257,7 +11257,6 @@ stdout of test 'MAL-signatures` in direc
 [ "profiler",  "getlimit",     "command profiler.getlimit():int ",     
"CMDgetprofilerlimit;", "Set profiler limit"    ]
 [ "profiler",  "noop", "command profiler.noop():void ",        
"CMDnoopProfiler;",     "Fetch any pending performance events"  ]
 [ "profiler",  "openstream",   "pattern profiler.openstream():void ",  
"CMDopenProfilerStream;",       "Start profiling the events, send to output 
stream"     ]
-[ "profiler",  "openstream",   "pattern profiler.openstream(mode:int):void ",  
"CMDopenProfilerStream;",       "Start profiling the events, send to output 
stream"     ]
 [ "profiler",  "setheartbeat", "command profiler.setheartbeat(b:int):void ",   
"CMDsetHeartbeat;",     "Set heart beat performance tracing"    ]
 [ "profiler",  "setlimit",     "command profiler.setlimit(l:int):void ",       
"CMDsetprofilerlimit;", "Get profiler limit"    ]
 [ "profiler",  "start",        "pattern profiler.start():void ",       
"CMDstartProfiler;",    "Start offline performance profiling"   ]
@@ -11457,7 +11456,8 @@ stdout of test 'MAL-signatures` in direc
 [ "sql",       "querylog_enable",      "command sql.querylog_enable():void ",  
"QLOGenable;",  ""      ]
 [ "sql",       "querylog_enable",      "command 
sql.querylog_enable(thres:int):void ", "QLOGenableThreshold;", ""      ]
 [ "sql",       "rank", "pattern sql.rank(b:any_1, p:bit, o:bit):int ", 
"SQLrank;",     "return the ranked groups"      ]
-[ "sql",       "register",     "pattern sql.register(mod:str, fname:str, 
rel_stmt:str, sig:str):int ", "RAstatement2;",        "Compile the relational 
statement (rel_smt) and register it as mal function, mod.fname(signature)"      
]
+[ "sql",       "register",     "pattern sql.register(mod:str, fname:str, 
rel_stmt:str, sig:str):int ", "RAstatement2;",        ""      ]
+[ "sql",       "register",     "pattern sql.register(mod:str, fname:str, 
rel_stmt:str, sig:str, typ:str):int ",        "RAstatement2;",        "Compile 
the relational statement (rel_smt) and register it as mal function, 
mod.fname(signature)"      ]
 [ "sql",       "restart",      "unsafe pattern sql.restart(sname:str, 
sequence:str, start:lng):lng ",  "mvc_restart_seq;",     "restart the sequence 
with value start" ]
 [ "sql",       "resultSet",    "unsafe pattern sql.resultSet(tbl:bat[:str], 
attr:bat[:str], tpe:bat[:str], len:bat[:int], scale:bat[:int], cols:any...):int 
", "mvc_row_result_wrap;", "Prepare a table result set for the client 
front-end"   ]
 [ "sql",       "resultSet",    "unsafe pattern sql.resultSet(tbl:str, 
attr:str, tpe:str, len:int, scale:int, eclass:int, val:any):int ",       
"mvc_scalar_value_wrap;",       "Prepare a table result set for the client 
front-end."  ]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128 
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -15679,7 +15679,6 @@ stdout of test 'MAL-signatures` in direc
 [ "profiler",  "getlimit",     "command profiler.getlimit():int ",     
"CMDgetprofilerlimit;", "Set profiler limit"    ]
 [ "profiler",  "noop", "command profiler.noop():void ",        
"CMDnoopProfiler;",     "Fetch any pending performance events"  ]
 [ "profiler",  "openstream",   "pattern profiler.openstream():void ",  
"CMDopenProfilerStream;",       "Start profiling the events, send to output 
stream"     ]
-[ "profiler",  "openstream",   "pattern profiler.openstream(mode:int):void ",  
"CMDopenProfilerStream;",       "Start profiling the events, send to output 
stream"     ]
 [ "profiler",  "setheartbeat", "command profiler.setheartbeat(b:int):void ",   
"CMDsetHeartbeat;",     "Set heart beat performance tracing"    ]
 [ "profiler",  "setlimit",     "command profiler.setlimit(l:int):void ",       
"CMDsetprofilerlimit;", "Get profiler limit"    ]
 [ "profiler",  "start",        "pattern profiler.start():void ",       
"CMDstartProfiler;",    "Start offline performance profiling"   ]
@@ -15889,7 +15888,8 @@ stdout of test 'MAL-signatures` in direc
 [ "sql",       "querylog_enable",      "command sql.querylog_enable():void ",  
"QLOGenable;",  ""      ]
 [ "sql",       "querylog_enable",      "command 
sql.querylog_enable(thres:int):void ", "QLOGenableThreshold;", ""      ]
 [ "sql",       "rank", "pattern sql.rank(b:any_1, p:bit, o:bit):int ", 
"SQLrank;",     "return the ranked groups"      ]
-[ "sql",       "register",     "pattern sql.register(mod:str, fname:str, 
rel_stmt:str, sig:str):int ", "RAstatement2;",        "Compile the relational 
statement (rel_smt) and register it as mal function, mod.fname(signature)"      
]
+[ "sql",       "register",     "pattern sql.register(mod:str, fname:str, 
rel_stmt:str, sig:str):int ", "RAstatement2;",        ""      ]
+[ "sql",       "register",     "pattern sql.register(mod:str, fname:str, 
rel_stmt:str, sig:str, typ:str):int ",        "RAstatement2;",        "Compile 
the relational statement (rel_smt) and register it as mal function, 
mod.fname(signature)"      ]
 [ "sql",       "restart",      "unsafe pattern sql.restart(sname:str, 
sequence:str, start:lng):lng ",  "mvc_restart_seq;",     "restart the sequence 
with value start" ]
 [ "sql",       "resultSet",    "unsafe pattern sql.resultSet(tbl:bat[:str], 
attr:bat[:str], tpe:bat[:str], len:bat[:int], scale:bat[:int], cols:any...):int 
", "mvc_row_result_wrap;", "Prepare a table result set for the client 
front-end"   ]
 [ "sql",       "resultSet",    "unsafe pattern sql.resultSet(tbl:str, 
attr:str, tpe:str, len:int, scale:int, eclass:int, val:any):int ",       
"mvc_scalar_value_wrap;",       "Prepare a table result set for the client 
front-end."  ]
diff --git a/clients/Tests/SingleServer b/clients/Tests/SingleServer
new file mode 100644
--- /dev/null
+++ b/clients/Tests/SingleServer
@@ -0,0 +1,2 @@
+--set embedded_py=2
+--set embedded_r=true
diff --git a/clients/mapiclient/Tests/SingleServer 
b/clients/mapiclient/Tests/SingleServer
new file mode 100644
diff --git a/clients/odbc/driver/ODBCEnv.c b/clients/odbc/driver/ODBCEnv.c
--- a/clients/odbc/driver/ODBCEnv.c
+++ b/clients/odbc/driver/ODBCEnv.c
@@ -113,7 +113,7 @@ ODBCError *
 getEnvError(ODBCEnv *env)
 {
        assert(isValidEnv(env));
-       return env->Error;;
+       return env->Error;
 }
 
 
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+monetdb (11.35.19) unstable; urgency=low
+
+  * Rebuilt.
+  * BZ#6829: NTILE window function returns incorrect results
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Sat, 22 Feb 2020 08:49:38 +0100
+
+monetdb (11.35.17) unstable; urgency=low
+
+  * Rebuilt.
+  * BZ#6827: CUME_DIST window function returns incorrect results
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Fri, 21 Feb 2020 14:22:38 +0100
+
 monetdb (11.35.15) unstable; urgency=low
 
   * Rebuilt.
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ DH_VERBOSE=1
 
 override_dh_auto_configure:
        dh_auto_configure -- \
-       --with-rundir=/run \
+       --with-rundir=/run/monetdb \
        --enable-assert=no \
        --enable-debug=yes \
        --enable-developer=no \
diff --git a/gdk/gdk_analytic_func.c b/gdk/gdk_analytic_func.c
--- a/gdk/gdk_analytic_func.c
+++ b/gdk/gdk_analytic_func.c
@@ -133,38 +133,35 @@ GDKanalyticaldiff(BAT *r, BAT *b, BAT *p
        return GDK_SUCCEED;
 }
 
-#define NTILE_CALC(TPE, NEXT_VALUE, NEXT_CAST) \
+#define NTILE_CALC(TPE, NEXT_VALUE, LNG_HGE, UPCAST)   \
        do {                                    \
-               TPE buckets, i, j; \
-               for (; rb < rp; rb++) { \
+               for (TPE i = 0; rb < rp; i++, rb++) {   \
                        TPE val = NEXT_VALUE; \
                        if (is_##TPE##_nil(val)) {      \
                                has_nils = true;        \
                                *rb = TPE##_nil;        \
                        } else { \
-                               BUN bval = (BUN) val; \
-                               if (bval >= ncnt) {     \
-                                       *rb = (TPE) ((rb - prb1) + 1);  \
+                               UPCAST nval = (UPCAST) LNG_HGE; \
+                               if (nval >= ncnt) { \
+                                       *rb = i + 1;  \
                                } else { \
-                                       buckets = (TPE) (ncnt / bval);  \
-                                       i = (ncnt % bval == 0) ? 1 : 0; \
-                                       j = 1; \
-                                       for (prb2 = prb1; prb2 < rb; i++, 
prb2++) {     \
-                                               if (i == buckets) {     \
-                                                       j++;    \
-                                                       i = 0;  \
-                                               }       \
-                                       } \
-                                       *rb = j;        \
+                                       UPCAST bsize = ncnt / nval; \
+                                       UPCAST top = ncnt - nval * bsize; \
+                                       UPCAST small = top * (bsize + 1); \
+                                       if ((UPCAST) i < small) \
+                                               *rb = (TPE)(1 + i / (bsize + 
1)); \
+                                       else \
+                                               *rb = (TPE)(1 + top + (i - 
small) / bsize); \
                                } \
                        } \
                } \
        } while (0)
 
-#define ANALYTICAL_NTILE_IMP(TPE, NEXT_VALUE, NEXT_CAST)       \
+#define ANALYTICAL_NTILE_IMP(TPE, NEXT_VALUE, LNG_HGE, UPCAST) \
        do {                                                    \
-               TPE *rp, *rb, *prb1, *prb2;     \
-               prb1 = rb = rp = (TPE*)Tloc(r, 0);              \
+               TPE *rp, *rb;   \
+               UPCAST ncnt; \
+               rb = rp = (TPE*)Tloc(r, 0);             \
                if (p) {                                        \
                        pnp = np = (bit*)Tloc(p, 0);    \
                        end = np + cnt;                         \
@@ -172,37 +169,37 @@ GDKanalyticaldiff(BAT *r, BAT *b, BAT *p
                                if (*np) {                      \
                                        ncnt = np - pnp;        \
                                        rp += ncnt;             \
-                                       NTILE_CALC(TPE, NEXT_VALUE, NEXT_CAST);\
+                                       NTILE_CALC(TPE, NEXT_VALUE, LNG_HGE, 
UPCAST);\
                                        pnp = np;       \
-                                       prb1 = rp;      \
                                }                               \
                        }                                       \
                        ncnt = np - pnp;                        \
                        rp += ncnt;                             \
-                       NTILE_CALC(TPE, NEXT_VALUE, NEXT_CAST); \
+                       NTILE_CALC(TPE, NEXT_VALUE, LNG_HGE, UPCAST);   \
                } else {                                        \
+                       ncnt = (UPCAST) cnt; \
                        rp += cnt;                              \
-                       NTILE_CALC(TPE, NEXT_VALUE, NEXT_CAST);\
+                       NTILE_CALC(TPE, NEXT_VALUE, LNG_HGE, UPCAST);   \
                }                                               \
        } while (0)
 
-#define ANALYTICAL_NTILE_SINGLE_IMP(TPE, NEXT_CAST) \
+#define ANALYTICAL_NTILE_SINGLE_IMP(TPE, LNG_HGE, UPCAST) \
        do {    \
                TPE ntl = *(TPE*) ntile; \
-               ANALYTICAL_NTILE_IMP(TPE, ntl, NEXT_CAST); \
+               ANALYTICAL_NTILE_IMP(TPE, ntl, LNG_HGE, UPCAST); \
        } while (0)
 
-#define ANALYTICAL_NTILE_MULTI_IMP(TPE, NEXT_CAST) \
+#define ANALYTICAL_NTILE_MULTI_IMP(TPE, LNG_HGE, UPCAST) \
        do {    \
                BUN k = 0; \
                TPE *restrict nn = (TPE*)Tloc(n, 0);    \
-               ANALYTICAL_NTILE_IMP(TPE, nn[k++], NEXT_CAST); \
+               ANALYTICAL_NTILE_IMP(TPE, nn[k++], LNG_HGE, UPCAST); \
        } while (0)
 
 gdk_return
 GDKanalyticalntile(BAT *r, BAT *b, BAT *p, BAT *n, int tpe, const void 
*restrict ntile)
 {
-       BUN cnt = BATcount(b), ncnt = cnt;
+       BUN cnt = BATcount(b);
        bit *np, *pnp, *end;
        bool has_nils = false;
 
@@ -211,21 +208,28 @@ GDKanalyticalntile(BAT *r, BAT *b, BAT *
        if (ntile) {
                switch (tpe) {
                case TYPE_bte:
-                       ANALYTICAL_NTILE_SINGLE_IMP(bte, val);
+                       ANALYTICAL_NTILE_SINGLE_IMP(bte, val, BUN);
                        break;
                case TYPE_sht:
-                       ANALYTICAL_NTILE_SINGLE_IMP(sht, val);
+                       ANALYTICAL_NTILE_SINGLE_IMP(sht, val, BUN);
                        break;
                case TYPE_int:
-                       ANALYTICAL_NTILE_SINGLE_IMP(int, val);
+                       ANALYTICAL_NTILE_SINGLE_IMP(int, val, BUN);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to