Changeset: 581ba79fe19b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=581ba79fe19b
Modified Files:
NT/makelibdef.py
NT/mkodbcwxs.py
NT/mksqlwxs.py
NT/winconfig.py
buildtools/autogen/autogen.py
buildtools/autogen/autogen/am.py
buildtools/autogen/autogen/codegen.py
buildtools/autogen/autogen/msc.py
buildtools/conf/fixlicense.py
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/examples/python/basics.py
clients/examples/python/sqlsample.py
clients/mapiclient/dotfile.py
monetdb5/mal/mal_runtime.c
monetdb5/modules/kernel/bat5.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_support.c
monetdb5/tools/Tests/mserver5-ipv6.py
sql/backends/monet5/Tests/dbextra_lock_test.py
sql/backends/monet5/Tests/shutdown.py
sql/backends/monet5/sql.c
sql/backends/monet5/sql.h
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_statement.c
sql/benchmarks/hist-uva/ground/create.py
sql/benchmarks/ssbm/Tests/explain.SQL.py
sql/benchmarks/ssbm/Tests/load.SQL.py
sql/benchmarks/ssbm/Tests/plan.SQL.py
sql/benchmarks/tpch/LOCKED/Tests/load.SQL.py
sql/benchmarks/tpch/Tests/explain.SQL.py
sql/benchmarks/tpch/Tests/load.SQL.py
sql/benchmarks/tpch/Tests/plan.SQL.py
sql/storage/store.c
sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.SQL.py
sql/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.py
sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.SQL.py
sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.SQL.py
sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.SQL.py
sql/test/BugTracker-2009/Tests/parallel_bulk-load.SF-2771052.unpack_csv.py
sql/test/BugTracker-2009/Tests/set_history_and_drop_table.SF-2607045.SQL.py
sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.SQL.py
sql/test/BugTracker-2010/Tests/operation-successful.Bug-2589.SQL.py
sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py
sql/test/BugTracker-2011/Tests/many-connects-cache.Bug-2904.SQL.py
sql/test/BugTracker-2011/Tests/python-connections-Bug.2901.SQL.py
sql/test/BugTracker-2011/Tests/user_create_temp_table.Bug-2916.SQL.py
sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.SQL.py
sql/test/BugTracker-2012/Tests/day-of-month-localization.Bug-2962.SQL.py
sql/test/BugTracker-2013/Tests/binary_copy_into.Bug-3345.SQL.py
sql/test/BugTracker-2013/Tests/binary_copy_into.Bug-3345.stable.err
sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.SQL.py
sql/test/BugTracker-2013/Tests/empty-strings.Bug-3261.SQL.py
sql/test/BugTracker-2013/Tests/psm_functions_and_accessrights.Bug-3300.SQL.py
sql/test/BugTracker-2014/Tests/acidity-fail.Bug-3635.py
sql/test/BugTracker-2014/Tests/copy-into.Bug-3481.SQL.py
sql/test/BugTracker-2014/Tests/python-microseconds.Bug-3439.SQL.py
sql/test/BugTracker-2014/Tests/utf8bom.Bug-3436.SQL.py
sql/test/BugTracker-2015/Tests/acidity2-fail.Bug-3635.SQL.py
sql/test/BugTracker-2015/Tests/concurrent-queries.Bug-3848.SQL.py
sql/test/BugTracker-2015/Tests/local-remotetable-crash.Bug-3754.SQL.py
sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py
sql/test/BugTracker-2017/Tests/shutdown.Bug-6182.SQL.py
sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.SQL.py
sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.SQL.py
sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.py
sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.py
sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.py
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/msqldump-mapi-cache.Bug-6777.py
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/alter-table-add-column.Bug-6816.py
sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.SQL.py
sql/test/BugTracker/Tests/auto_commit.SF-1724151.SQL.py
sql/test/BugTracker/Tests/connect_crash.SF-1436626.SQL.py
sql/test/BugTracker/Tests/local_temp_table.SF-1865953.SQL.py
sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.SQL.py
sql/test/BugTracker/Tests/python_escape.SF-1916844.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/Dependencies.SQL.py
sql/test/Dump/Tests/dump-again.SQL.py
sql/test/Dump/Tests/dump.SQL.py
sql/test/Dump/Tests/reload-again.SQL.py
sql/test/Dump/Tests/reload.SQL.py
sql/test/Skyserver/Tests/Skyserver.SQL.py
sql/test/Skyserver/Tests/Skyserver_v6.SQL.py
sql/test/Tests/comment-auth.SQL.py
sql/test/Tests/comment-dump.SQL.py
sql/test/Tests/hot-snapshot.py
sql/test/Tests/like_tests.SQL.py
sql/test/Tests/null-byte-hang.SQL.py
sql/test/Tests/zones2.SQL.py
sql/test/Triggers/Tests/trigger_owner.SQL.py
sql/test/UserDump/Tests/create.SQL.py
sql/test/Users/Tests/changePasswordUser.SQL.py
sql/test/Users/Tests/changeSchemaUser.SQL.py
sql/test/Users/Tests/columnRights.SQL.py
sql/test/Users/Tests/copyinto.SQL.py
sql/test/Users/Tests/dropManyUsers.Bug-3764.SQL.py
sql/test/Users/Tests/grantAndRevokeUserLoggedIN.Bug-3476.SQL.py
sql/test/Users/Tests/grantMonetdb.SQL.py
sql/test/Users/Tests/grantMonetdbToRegularUser.Bug-3771.SQL.py
sql/test/Users/Tests/grantMonetdbToSchemaOwner.Bug-3771.SQL.py
sql/test/Users/Tests/grantPrivilegesNonDefaultRole.Bug-3365.SQL.py
sql/test/Users/Tests/grantRevokeAndGrantAgain.Bug-3765.SQL.py
sql/test/Users/Tests/grantRole.Bug-3772.SQL.py
sql/test/Users/Tests/renameUser.SQL.py
sql/test/Users/Tests/role.SQL.py
sql/test/Users/Tests/role1.SQL.py
sql/test/Users/Tests/role2.SQL.py
sql/test/Users/Tests/schemaRights.SQL.py
sql/test/Users/Tests/table.SQL.py
sql/test/Users/Tests/test_privs2_p1.SQL.py
sql/test/Users/Tests/test_privs2_p2.SQL.py
sql/test/Users/Tests/test_privs_p1.SQL.py
sql/test/Users/Tests/test_privs_p2.SQL.py
sql/test/Users/Tests/unknown_user.SQL.py
sql/test/Users/Tests/withGrantOption.SQL.py
sql/test/VOC/Tests/VOC.SQL.py
sql/test/Views/Tests/Views.SQL.py
sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.SQL.py
sql/test/concurrent/Tests/simple_select.SQL.py
sql/test/emptydb-upgrade-chain-hge/Tests/package.py
sql/test/emptydb-upgrade-chain/Tests/package.py
sql/test/emptydb/Tests/check.SQL.py
sql/test/emptydb/Tests/package-hge.py
sql/test/emptydb/Tests/package.py
sql/test/malloc_fail/Tests/mallocs.SQL.py
sql/test/mapi/Tests/python_dec38.py
sql/test/mapi/Tests/python_int128.py
sql/test/mapi/Tests/utf8test.SQL.py
sql/test/merge-partitions/Tests/mergepart23.SQL.py
sql/test/merge-partitions/Tests/mergepart29.SQL.py
sql/test/miscellaneous/Tests/declared_tables.sql
sql/test/miscellaneous/Tests/declared_tables.stable.out
sql/test/miscellaneous/Tests/pk_fk_stress.SQL.py
sql/test/miscellaneous/Tests/table_udf_missing_var.py
sql/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-table.py
sql/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-view.py
sql/test/remote/Tests/creds.SQL.py
sql/test/remote/Tests/different_user.SQL.py
sql/test/remote/Tests/invalid_creds.SQL.py
sql/test/remote/Tests/ssbm.SQL.py
sql/test/rename/Tests/rename00.SQL.py
sql/test/rename/Tests/rename11.py
sql/test/scripts/Tests/alastair_udf_mergetable_bug.py
sql/test/scripts/Tests/copy-from-lz4.py
sql/test/subquery/Tests/subquery5.sql
sql/test/testdb-reload/Tests/reload.py
sql/test/testdb-upgrade-chain-hge/Tests/package.py
sql/test/testdb-upgrade-chain/Tests/package.py
sql/test/testdb-upgrade/Tests/upgrade.SQL.py
sql/test/testdb/Tests/package-hge.py
sql/test/testdb/Tests/package.py
sql/test/wlcr/Tests/wlc01.py
sql/test/wlcr/Tests/wlc100.py
sql/test/wlcr/Tests/wlc20.py
sql/test/wlcr/Tests/wlc21.py
sql/test/wlcr/Tests/wlc30.py
sql/test/wlcr/Tests/wlc40.py
sql/test/wlcr/Tests/wlc50.py
sql/test/wlcr/Tests/wlc70.py
sql/test/wlcr/Tests/wlc80.py
sql/test/wlcr/Tests/wlcr00.py
sql/test/wlcr/Tests/wlr01.py
sql/test/wlcr/Tests/wlr10.py
sql/test/wlcr/Tests/wlr100.py
sql/test/wlcr/Tests/wlr110.py
sql/test/wlcr/Tests/wlr20.py
sql/test/wlcr/Tests/wlr30.py
sql/test/wlcr/Tests/wlr35.py
sql/test/wlcr/Tests/wlr40.py
sql/test/wlcr/Tests/wlr50.py
sql/test/wlcr/Tests/wlr70.py
sql/test/wlcr/Tests/wlr80.py
testing/Mfilter.py
testing/cmptests.py
testing/malcheck.py
testing/process.py
tools/merovingian/client/Tests/monetdb_status.py
Branch: scoping
Log Message:
Merged with default
diffs (truncated from 8026 to 300 lines):
diff --git a/NT/makelibdef.py b/NT/makelibdef.py
--- a/NT/makelibdef.py
+++ b/NT/makelibdef.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
import fileinput, re
p = re.compile('^\s*\d+\s+[0-9A-F]+\s+[0-9A-F]+\s+(\w+)')
print('LIBRARY R')
diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py
--- a/NT/mkodbcwxs.py
+++ b/NT/mkodbcwxs.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
# python mkodbcwxs.py VERSION makedefs.txt PREFIX >
PREFIX/MonetDB-ODBC-Installer.wxs
# "c:\Program Files (x86)\WiX Toolset v3.10\bin\candle.exe" -nologo -arch
x64/x86 PREFIX/MonetDB-ODBC-Installer.wxs
# "c:\Program Files (x86)\WiX Toolset v3.10\bin\light.exe" -nologo -sice:ICE03
-sice:ICE60 -sice:ICE82 -ext WixUIExtension PREFIX/MonetDB-ODBC-Installer.wixobj
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
# python mksqlwxs.py VERSION makedefs.txt PREFIX >
PREFIX/MonetDB5-SQL-Installer.wxs
# "c:\Program Files (x86)\WiX Toolset v3.10\bin\candle.exe" -nologo -arch
x64/x86 PREFIX/MonetDB5-SQL-Installer.wxs
# "c:\Program Files (x86)\WiX Toolset v3.10\bin\light.exe" -nologo -sice:ICE03
-sice:ICE60 -sice:ICE82 -ext WixUIExtension PREFIX/MonetDB5-SQL-Installer.wixobj
diff --git a/NT/winconfig.py b/NT/winconfig.py
--- a/NT/winconfig.py
+++ b/NT/winconfig.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/buildtools/autogen/autogen.py b/buildtools/autogen/autogen.py
--- a/buildtools/autogen/autogen.py
+++ b/buildtools/autogen/autogen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -6,8 +6,6 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
-from __future__ import print_function
-
#
# autogen scans the makefile.ag
# and generates both the makefile.am and makefile.msc
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
@@ -4,8 +4,6 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
-from __future__ import print_function
-
import os
import posixpath
import sys
diff --git a/buildtools/autogen/autogen/codegen.py
b/buildtools/autogen/autogen/codegen.py
--- a/buildtools/autogen/autogen/codegen.py
+++ b/buildtools/autogen/autogen/codegen.py
@@ -4,8 +4,6 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
-from __future__ import print_function
-
import string
import re
import fileinput
diff --git a/buildtools/autogen/autogen/msc.py
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -4,8 +4,6 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
-from __future__ import print_function
-
import string
import os
import re
diff --git a/buildtools/conf/fixlicense.py b/buildtools/conf/fixlicense.py
--- a/buildtools/conf/fixlicense.py
+++ b/buildtools/conf/fixlicense.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -6,8 +6,6 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
-from __future__ import print_function
-
import os, sys, getopt, stat
usage = '''\
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
@@ -14077,7 +14077,7 @@ stdout of test 'MAL-signatures` in direc
[ "sql", "dec_round", "command sql.dec_round(v:int, r:int):int ",
"int_dec_round_wrap;", "round off the value v to nearests multiple of r"
]
[ "sql", "dec_round", "command sql.dec_round(v:lng, r:lng):lng ",
"lng_dec_round_wrap;", "round off the value v to nearests multiple of r"
]
[ "sql", "dec_round", "command sql.dec_round(v:sht, r:sht):sht ",
"sht_dec_round_wrap;", "round off the value v to nearests multiple of r"
]
-[ "sql", "delete", "unsafe pattern sql.delete(mvc:int, sname:str,
tname:str, b:any):int ", "mvc_delete_wrap;", "Delete a row from a table.
Returns sequence number for order dependece." ]
+[ "sql", "delete", "unsafe pattern sql.delete(mvc:int, sname:str,
tname:str, b:any):int ", "mvc_delete_wrap;", "Delete a row from a table.
Returns sequence number for order dependence." ]
[ "sql", "delta", "command sql.delta(col:bat[:any_3],
uid:bat[:oid], uval:bat[:any_3]):bat[:any_3] ", "DELTAbat2;", "Return
column bat with delta's applied." ]
[ "sql", "delta", "command sql.delta(col:bat[:any_3],
uid:bat[:oid], uval:bat[:any_3], ins:bat[:any_3]):bat[:any_3] ",
"DELTAbat;", "Return column bat with delta's applied." ]
[ "sql", "deltas", "pattern sql.deltas(schema:str) (ids:bat[:int],
cleared:bat[:bit], readonly:bat[:lng], inserted:bat[:lng], updated:bat[:lng],
deleted:bat[:lng], tr_level:bat[:int]) ", "mvc_delta_values;", "Return the
delta values sizes of all columns of the schema's tables, plus the current
transaction level" ]
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
@@ -19534,7 +19534,7 @@ stdout of test 'MAL-signatures` in direc
[ "sql", "dec_round", "command sql.dec_round(v:int, r:int):int ",
"int_dec_round_wrap;", "round off the value v to nearests multiple of r"
]
[ "sql", "dec_round", "command sql.dec_round(v:lng, r:lng):lng ",
"lng_dec_round_wrap;", "round off the value v to nearests multiple of r"
]
[ "sql", "dec_round", "command sql.dec_round(v:sht, r:sht):sht ",
"sht_dec_round_wrap;", "round off the value v to nearests multiple of r"
]
-[ "sql", "delete", "unsafe pattern sql.delete(mvc:int, sname:str,
tname:str, b:any):int ", "mvc_delete_wrap;", "Delete a row from a table.
Returns sequence number for order dependece." ]
+[ "sql", "delete", "unsafe pattern sql.delete(mvc:int, sname:str,
tname:str, b:any):int ", "mvc_delete_wrap;", "Delete a row from a table.
Returns sequence number for order dependence." ]
[ "sql", "delta", "command sql.delta(col:bat[:any_3],
uid:bat[:oid], uval:bat[:any_3]):bat[:any_3] ", "DELTAbat2;", "Return
column bat with delta's applied." ]
[ "sql", "delta", "command sql.delta(col:bat[:any_3],
uid:bat[:oid], uval:bat[:any_3], ins:bat[:any_3]):bat[:any_3] ",
"DELTAbat;", "Return column bat with delta's applied." ]
[ "sql", "deltas", "pattern sql.deltas(schema:str) (ids:bat[:int],
cleared:bat[:bit], readonly:bat[:lng], inserted:bat[:lng], updated:bat[:lng],
deleted:bat[:lng], tr_level:bat[:int]) ", "mvc_delta_values;", "Return the
delta values sizes of all columns of the schema's tables, plus the current
transaction level" ]
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -2043,6 +2043,7 @@ int bstream_destroy_wrap(Bstream *BS);
str bstream_destroy_wrapwrap(void *ret, Bstream *BS);
int bstream_read_wrap(int *res, Bstream *BS, int *size);
str bstream_read_wrapwrap(int *res, Bstream *BS, int *size);
+str bulk_rotate_xor_hashRef;
str calcRef;
str callMAL(Client cntxt, MalBlkPtr mb, MalStkPtr *glb, ValPtr argv[], char
debug);
str callString(Client c, str s, int listing);
@@ -2214,6 +2215,7 @@ malType getType(MalBlkPtr mb, str nme);
str getTypeIdentifier(malType tpe);
str getTypeName(malType tpe);
lng getUserTime(void);
+str getVariableRef;
lng getVolume(MalStkPtr stk, InstrPtr pci, int rd);
int getprofilerlimit(void);
Module globalModule(str nme);
@@ -2224,6 +2226,7 @@ str groupRef;
str group_concatRef;
str groupbyRef;
str groupdoneRef;
+str growRef;
int hasCommonResults(InstrPtr p, InstrPtr q);
int hasSameArguments(MalBlkPtr mb, InstrPtr p, InstrPtr q);
int hasSameSignature(MalBlkPtr mb, InstrPtr p, InstrPtr q);
@@ -2243,7 +2246,6 @@ void initParser(void);
void initProfiler(void);
str initQlog(void);
int inlineMALblock(MalBlkPtr mb, int pc, MalBlkPtr mc);
-str inplaceRef;
void insertSymbol(Module scope, Symbol prg);
str instruction2str(MalBlkPtr mb, MalStkPtr stl, InstrPtr p, int hidden);
str intRef;
diff --git a/clients/examples/python/basics.py
b/clients/examples/python/basics.py
--- a/clients/examples/python/basics.py
+++ b/clients/examples/python/basics.py
@@ -4,8 +4,6 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
-from __future__ import print_function
-
import logging
#configure the logger, so we can see what is happening
diff --git a/clients/examples/python/sqlsample.py
b/clients/examples/python/sqlsample.py
--- a/clients/examples/python/sqlsample.py
+++ b/clients/examples/python/sqlsample.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -6,8 +6,6 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
-from __future__ import print_function
-
import pymonetdb
import sys
diff --git a/clients/mapiclient/dotfile.py b/clients/mapiclient/dotfile.py
--- a/clients/mapiclient/dotfile.py
+++ b/clients/mapiclient/dotfile.py
@@ -4,8 +4,6 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
-from __future__ import print_function
-
'''
The output of the Stethoscope can be saved in JSON format using the -j flag.
This program converts such a Stethoscope output file into a .dot file
diff --git a/monetdb5/mal/mal_runtime.c b/monetdb5/mal/mal_runtime.c
--- a/monetdb5/mal/mal_runtime.c
+++ b/monetdb5/mal/mal_runtime.c
@@ -63,7 +63,7 @@ isaSQLquery(MalBlkPtr mb){
/* clear the next entry for a new call unless it is a running query */
static void
-clearQRYqueue(int idx)
+clearQRYqueue(lng idx)
{
QRYqueue[idx].query = 0;
QRYqueue[idx].cntxt = 0;
@@ -93,8 +93,10 @@ advanceQRYqueue(void)
if( s){
/* don;t wipe them when they are still running, prepared, or
paused */
/* The upper layer has assured there is at least one slot
available */
- if(QRYqueue[qhead].status == 0 || (QRYqueue[qhead].status[0] !=
'r' && QRYqueue[qhead].status[0] != 'p'))
- return advanceQRYqueue();
+ if(QRYqueue[qhead].status == 0 || (QRYqueue[qhead].status[0] !=
'r' && QRYqueue[qhead].status[0] != 'p')){
+ advanceQRYqueue();
+ return;
+ }
GDKfree(s);
GDKfree(QRYqueue[qhead].username);
clearQRYqueue(qhead);
@@ -104,7 +106,7 @@ advanceQRYqueue(void)
void
dropQRYqueue(void)
{
- int i;
+ lng i;
MT_lock_set(&mal_delayLock);
for(i = 0; i < qsize; i++){
if( QRYqueue[i].query)
diff --git a/monetdb5/modules/kernel/bat5.c b/monetdb5/modules/kernel/bat5.c
--- a/monetdb5/modules/kernel/bat5.c
+++ b/monetdb5/modules/kernel/bat5.c
@@ -226,7 +226,7 @@ BKCmirror(bat *ret, const bat *bid)
return MAL_SUCCEED;
}
-char *
+str
BKCdelete(bat *r, const bat *bid, const oid *h)
{
BAT *b;
@@ -274,7 +274,7 @@ BKCdelete_all(bat *r, const bat *bid)
throw(MAL, "bat.delete", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
if (BATclear(b, false) != GDK_SUCCEED) {
BBPunfix(b->batCacheid);
- throw(MAL, "bat.delete_all", GDK_EXCEPTION);
+ throw(MAL, "bat.delete", GDK_EXCEPTION);
}
if( !b->batTransient)
BATmsync(b);
@@ -282,7 +282,7 @@ BKCdelete_all(bat *r, const bat *bid)
return MAL_SUCCEED;
}
-char *
+str
BKCappend_cand_force_wrap(bat *r, const bat *bid, const bat *uid, const bat
*sid, const bit *force)
{
BAT *b, *u, *s = NULL;
@@ -315,19 +315,19 @@ BKCappend_cand_force_wrap(bat *r, const
return MAL_SUCCEED;
}
-char *
+str
BKCappend_cand_wrap(bat *r, const bat *bid, const bat *uid, const bat *sid)
{
return BKCappend_cand_force_wrap(r, bid, uid, sid, NULL);
}
-char *
+str
BKCappend_wrap(bat *r, const bat *bid, const bat *uid)
{
return BKCappend_cand_force_wrap(r, bid, uid, NULL, NULL);
}
-char *
+str
BKCappend_force_wrap(bat *r, const bat *bid, const bat *uid, const bit *force)
{
return BKCappend_cand_force_wrap(r, bid, uid, NULL, force);
diff --git a/monetdb5/optimizer/opt_prelude.c b/monetdb5/optimizer/opt_prelude.c
--- a/monetdb5/optimizer/opt_prelude.c
+++ b/monetdb5/optimizer/opt_prelude.c
@@ -68,6 +68,7 @@ str bindRef;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
