Changeset: 848124347522 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=848124347522
Removed Files:
clients/Tests/mclient-uri.SQL.bat
clients/Tests/mclient-uri.SQL.sh
clients/Tests/mclient-uri.stable.err
clients/Tests/mclient-uri.stable.out
clients/Tests/mclient-uri.stable.out.Windows
documentation/source/windowsbuild.rst
sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.SQL.py
sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.err
sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out
sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.stable.err
sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.stable.out
sql/test/BugTracker-2019/Tests/grant-select-column.Bug-6765.stable.err
sql/test/BugTracker-2019/Tests/grant-select-column.Bug-6765.stable.out
sql/test/Users/Tests/changePasswordUser.reqtests
sql/test/Users/Tests/changeSchemaUser.reqtests
sql/test/Users/Tests/createSetUp.sql
sql/test/Users/Tests/createSetUp.test
sql/test/Users/Tests/createUserRollback.reqtests
sql/test/Users/Tests/grantMonetdb.stable.err
sql/test/Users/Tests/grantMonetdb.stable.out
sql/test/Users/Tests/metadataConsistency.stable.err
sql/test/Users/Tests/metadataConsistency.stable.out
sql/test/Users/Tests/renameUser.stable.err
sql/test/Users/Tests/renameUser.stable.out
sql/test/Users/Tests/schemaRights.stable.err
sql/test/Users/Tests/schemaRights.stable.out
sql/test/Users/Tests/sessioncontrol.sql
sql/test/Users/Tests/sessioncontrol.stable.err
sql/test/Users/Tests/sessioncontrol.stable.out
sql/test/Users/Tests/sessioncontrol.test
sql/test/Users/Tests/userCallFunction.stable.err
sql/test/Users/Tests/userCallFunction.stable.out
sql/test/Users/Tests/withGrantOption.stable.err
sql/test/Users/Tests/withGrantOption.stable.out
Modified Files:
sql/backends/monet5/sql.c
sql/scripts/52_describe.sql
sql/server/rel_unnest.c
sql/test/BugTracker-2012/Tests/incorrect_cast_from_double_to_int.Bug-2579.stable.err
sql/test/BugTracker-2012/Tests/incorrect_cast_from_double_to_int.Bug-2579.stable.out
sql/test/BugTracker-2012/Tests/name_resolution_in_proc.Bug-3074.stable.err
sql/test/BugTracker-2012/Tests/table_returning_func_returns_too_many_columns.Bug-3077.stable.err
sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.stable.err
Branch: monetdbe-proxy
Log Message:
Merge with default.
diffs (truncated from 59634 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -187,6 +187,8 @@ need this package, but you will also nee
package, and most likely also %{name}-SQL-server5, as well as one or
more client packages.
+%ldconfig_scriptlets
+
%files
%license COPYING
%defattr(-,root,root)
@@ -572,6 +574,7 @@ used from the MAL level.
%files -n MonetDB5-server-devel
%defattr(-,root,root)
%{_includedir}/monetdb/mal*.h
+%{_includedir}/monetdb/mel.h
%{_libdir}/libmonetdb5.so
%{_libdir}/pkgconfig/monetdb5.pc
@@ -635,6 +638,24 @@ configuration.
%docdir %{_datadir}/doc/MonetDB-SQL
%{_datadir}/doc/MonetDB-SQL/*
+%package SQL-server5-devel
+Summary: MonetDB5 SQL server modules
+Group: Applications/Databases
+Requires: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
+Requires: MonetDB5-server-devel%{?_isa} = %{version}-%{release}
+
+%description SQL-server5-devel
+MonetDB is a database management system that is developed from a
+main-memory perspective with use of a fully decomposed storage model,
+automatic index management, extensibility of data types and search
+accelerators. It also has an SQL front end.
+
+This package contains files needed to develop SQL extensions.
+
+%files SQL-server5-devel
+%defattr(-,root,root)
+%{_includedir}/monetdb/sql*.h
+
%package embedded
Summary: MonetDB as an embedded library
Group: Applications/Databases
@@ -847,10 +868,6 @@ sed -i 's|/var/run|/run|' \
%{buildroot}%{_unitdir}/monetdbd.service
%endif
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
%changelog
* Wed Nov 18 2020 Sjoerd Mullender <sjo...@acm.org> - 11.39.7-20201118
- Rebuilt.
@@ -2698,7 +2715,7 @@ sed -i 's|/var/run|/run|' \
are equal to 1.1. (The old code returned 33554432 instead of 1.1e8.)
* Sun Nov 5 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.9-20171105
-- BZ#6460 - selinux doen't allow mmap
+- BZ#6460: selinux doen't allow mmap
* Mon Oct 23 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.9-20171023
- Rebuilt.
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -173,9 +173,10 @@ def main():
print(r' <Directory Id="include" Name="include">')
print(r' <Directory Id="monetdb" Name="monetdb">')
id = comp(extend, id, 16,
- sorted([r'include\monetdb\{}'.format(x) for x in filter(lambda
x: (x.startswith('gdk') or x.startswith('monet') or x.startswith('mal')) and
x.endswith('.h'), os.listdir(os.path.join(sys.argv[3], 'include', 'monetdb')))]
+
+ sorted([r'include\monetdb\{}'.format(x) for x in filter(lambda
x: (x.startswith('gdk') or x.startswith('monet') or x.startswith('mal') or
x.startswith('sql')) and x.endswith('.h'), os.listdir(os.path.join(sys.argv[3],
'include', 'monetdb')))] +
[r'include\monetdb\mapi.h',
r'include\monetdb\matomic.h',
+ r'include\monetdb\mel.h',
r'include\monetdb\mstring.h',
r'include\monetdb\stream.h',
r'include\monetdb\stream_socket.h']),
diff --git a/buildtools/coverity_model.c b/buildtools/coverity_model.c
--- a/buildtools/coverity_model.c
+++ b/buildtools/coverity_model.c
@@ -20,8 +20,13 @@
* author: Sjoerd Mullender
*/
+int
+rand(void)
+{
+ /* ignore */
+}
+
typedef enum { GDK_FAIL, GDK_SUCCEED } gdk_return;
-typedef struct {} *MalBlkPtr;
void
GDKfree(void *blk)
@@ -51,7 +56,8 @@ GDKzalloc(size_t size)
{
void *p = GDKmalloc(size);
if (p) {
- for (size_t i = 0; i < size; i++)
+ size_t i;
+ for (i = 0; i < size; i++)
((char *) p)[i] = 0;
}
return p;
@@ -136,6 +142,24 @@ GDKmremap(const char *path, int mode, vo
return p;
}
+typedef struct {} *MalBlkPtr;
+enum malexception {
+ MAL,
+ ILLARG /*,
+ OUTOFBNDS,
+ IO,
+ INVCRED,
+ OPTIMIZER,
+ STKOF,
+ SYNTAX,
+ TYPE,
+ LOADER,
+ PARSE,
+ ARITH,
+ PERMD,
+ SQL */
+};
+
char *
createException(enum malexception type, const char *fcn, const char *format,
...)
{
@@ -177,8 +201,8 @@ freeException(char *p)
char *
concatErrors(char *err1, const char *err2)
{
+ char *p;
freeException(err1);
- char *p;
p = __coverity_alloc_nosize__();
__coverity_mark_as_afm_allocated__(p, "freeException");
return p;
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
@@ -9513,7 +9513,7 @@ stdout of test 'MAL-signatures` in direc
[ "sqlcatalog", "alter_seq", "pattern sqlcatalog.alter_seq(X_1:str,
X_2:str, X_3:ptr, X_4:lng):void ", "SQLalter_seq;", "" ]
[ "sqlcatalog", "alter_set_table", "pattern
sqlcatalog.alter_set_table(X_1:str, X_2:str, X_3:int):void ",
"SQLalter_set_table;", "" ]
[ "sqlcatalog", "alter_table", "pattern
sqlcatalog.alter_table(X_1:str, X_2:str, X_3:ptr, X_4:int):void ",
"SQLalter_table;", "" ]
-[ "sqlcatalog", "alter_user", "pattern sqlcatalog.alter_user(X_1:str,
X_2:str, X_3:int, X_4:str, X_5:str):void ", "SQLalter_user;", ""
]
+[ "sqlcatalog", "alter_user", "pattern sqlcatalog.alter_user(X_1:str,
X_2:str, X_3:int, X_4:str, X_5:str, X_6:str):void ", "SQLalter_user;",
"" ]
[ "sqlcatalog", "comment_on", "pattern sqlcatalog.comment_on(X_1:int,
X_2:str):void ", "SQLcomment_on;", "" ]
[ "sqlcatalog", "create_function", "pattern
sqlcatalog.create_function(X_1:str, X_2:str, X_3:ptr):void ",
"SQLcreate_function;", "" ]
[ "sqlcatalog", "create_role", "pattern
sqlcatalog.create_role(X_1:str, X_2:str, X_3:int):void ",
"SQLcreate_role;", "" ]
@@ -9522,7 +9522,7 @@ stdout of test 'MAL-signatures` in direc
[ "sqlcatalog", "create_table", "pattern
sqlcatalog.create_table(X_1:str, X_2:str, X_3:ptr, X_4:int):void ",
"SQLcreate_table;", "" ]
[ "sqlcatalog", "create_trigger", "pattern
sqlcatalog.create_trigger(X_1:str, X_2:str, X_3:str, X_4:int, X_5:int, X_6:int,
X_7:str, X_8:str, X_9:str, X_10:str):void ", "SQLcreate_trigger;", "" ]
[ "sqlcatalog", "create_type", "pattern
sqlcatalog.create_type(X_1:str, X_2:str, X_3:str):void ",
"SQLcreate_type;", "" ]
-[ "sqlcatalog", "create_user", "pattern
sqlcatalog.create_user(X_1:str, X_2:str, X_3:int, X_4:str, X_5:str):void ",
"SQLcreate_user;", "" ]
+[ "sqlcatalog", "create_user", "pattern
sqlcatalog.create_user(X_1:str, X_2:str, X_3:int, X_4:str, X_5:str,
X_6:str):void ", "SQLcreate_user;", "" ]
[ "sqlcatalog", "create_view", "pattern
sqlcatalog.create_view(X_1:str, X_2:str, X_3:ptr, X_4:int):void ",
"SQLcreate_view;", "" ]
[ "sqlcatalog", "drop_constraint", "pattern
sqlcatalog.drop_constraint(X_1:str, X_2:str, X_3:int, X_4:int):void ",
"SQLdrop_constraint;", "" ]
[ "sqlcatalog", "drop_function", "pattern
sqlcatalog.drop_function(X_1:str, X_2:str, X_3:int, X_4:int, X_5:int):void ",
"SQLdrop_function;", "" ]
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
@@ -12836,7 +12836,7 @@ stdout of test 'MAL-signatures` in direc
[ "sqlcatalog", "alter_seq", "pattern sqlcatalog.alter_seq(X_1:str,
X_2:str, X_3:ptr, X_4:lng):void ", "SQLalter_seq;", "" ]
[ "sqlcatalog", "alter_set_table", "pattern
sqlcatalog.alter_set_table(X_1:str, X_2:str, X_3:int):void ",
"SQLalter_set_table;", "" ]
[ "sqlcatalog", "alter_table", "pattern
sqlcatalog.alter_table(X_1:str, X_2:str, X_3:ptr, X_4:int):void ",
"SQLalter_table;", "" ]
-[ "sqlcatalog", "alter_user", "pattern sqlcatalog.alter_user(X_1:str,
X_2:str, X_3:int, X_4:str, X_5:str):void ", "SQLalter_user;", ""
]
+[ "sqlcatalog", "alter_user", "pattern sqlcatalog.alter_user(X_1:str,
X_2:str, X_3:int, X_4:str, X_5:str, X_6:str):void ", "SQLalter_user;",
"" ]
[ "sqlcatalog", "comment_on", "pattern sqlcatalog.comment_on(X_1:int,
X_2:str):void ", "SQLcomment_on;", "" ]
[ "sqlcatalog", "create_function", "pattern
sqlcatalog.create_function(X_1:str, X_2:str, X_3:ptr):void ",
"SQLcreate_function;", "" ]
[ "sqlcatalog", "create_role", "pattern
sqlcatalog.create_role(X_1:str, X_2:str, X_3:int):void ",
"SQLcreate_role;", "" ]
@@ -12845,7 +12845,7 @@ stdout of test 'MAL-signatures` in direc
[ "sqlcatalog", "create_table", "pattern
sqlcatalog.create_table(X_1:str, X_2:str, X_3:ptr, X_4:int):void ",
"SQLcreate_table;", "" ]
[ "sqlcatalog", "create_trigger", "pattern
sqlcatalog.create_trigger(X_1:str, X_2:str, X_3:str, X_4:int, X_5:int, X_6:int,
X_7:str, X_8:str, X_9:str, X_10:str):void ", "SQLcreate_trigger;", "" ]
[ "sqlcatalog", "create_type", "pattern
sqlcatalog.create_type(X_1:str, X_2:str, X_3:str):void ",
"SQLcreate_type;", "" ]
-[ "sqlcatalog", "create_user", "pattern
sqlcatalog.create_user(X_1:str, X_2:str, X_3:int, X_4:str, X_5:str):void ",
"SQLcreate_user;", "" ]
+[ "sqlcatalog", "create_user", "pattern
sqlcatalog.create_user(X_1:str, X_2:str, X_3:int, X_4:str, X_5:str,
X_6:str):void ", "SQLcreate_user;", "" ]
[ "sqlcatalog", "create_view", "pattern
sqlcatalog.create_view(X_1:str, X_2:str, X_3:ptr, X_4:int):void ",
"SQLcreate_view;", "" ]
[ "sqlcatalog", "drop_constraint", "pattern
sqlcatalog.drop_constraint(X_1:str, X_2:str, X_3:int, X_4:int):void ",
"SQLdrop_constraint;", "" ]
[ "sqlcatalog", "drop_function", "pattern
sqlcatalog.drop_function(X_1:str, X_2:str, X_3:int, X_4:int, X_5:int):void ",
"SQLdrop_function;", "" ]
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
@@ -1301,7 +1301,7 @@ str io_stdin(Client cntxt, MalBlkPtr mb,
str io_stdout(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
int isBlocking(InstrPtr p);
int isDelta(InstrPtr q);
-int isExceptionVariable(str nme);
+bool isExceptionVariable(const char *nme);
int isFragmentGroup(InstrPtr q);
int isFragmentGroup2(InstrPtr q);
int isIdentifier(str s);
diff --git a/clients/Tests/mclient-uri.SQL.bat
b/clients/Tests/mclient-uri.SQL.bat
deleted file mode 100755
--- a/clients/Tests/mclient-uri.SQL.bat
+++ /dev/null
@@ -1,6 +0,0 @@
-@prompt # $t $g
-@echo on
-
-@rem Windows doesn't do UNIX domain sockets, so only the one test here.
-
-mclient -d
"mapi:monetdb://%HOST%:%MAPIPORT%/%TSTDB%?language=sql&user=monetdb" -f test -t
none -E utf-8 -s "select 1"
diff --git a/clients/Tests/mclient-uri.SQL.py b/clients/Tests/mclient-uri.SQL.py
new file mode 100644
--- /dev/null
+++ b/clients/Tests/mclient-uri.SQL.py
@@ -0,0 +1,19 @@
+import os, sys
+from MonetDBtesting import process
+
+with process.client('sql',
dbname='mapi:monetdb://{}:{}/{}?language=sql&user=monetdb'.format(os.getenv('HOST',
'localhost'), os.getenv('MAPIPORT', 50000), os.getenv('TSTDB', 'demo')),
host='', port='', format='csv', echo=False, stdin=process.PIPE,
stdout=process.PIPE, stderr=process.PIPE) as c:
+ out, err = c.communicate('select 1;\n')
+
+if out != '1\n':
+ print(out)
+if err:
+ print(err, file=sys.stderr)
+
+if os.name != 'nt':
+ with process.client('sql',
dbname='mapi:monetdb://{}/.s.monetdb.{}?database={}&language=sql&user=monetdb'.format(os.getenv('MAPIHOST',
'/tmp'), os.getenv('MAPIPORT', 50000), os.getenv('TSTDB', 'demo')), host='',
port='', format='csv', echo=False, stdin=process.PIPE, stdout=process.PIPE,
stderr=process.PIPE) as c:
+ out, err = c.communicate('select 1;\n')
+
+ if out != '1\n':
+ print(out)
+ if err:
+ print(err, file=sys.stderr)
diff --git a/clients/Tests/mclient-uri.SQL.sh b/clients/Tests/mclient-uri.SQL.sh
deleted file mode 100755
--- a/clients/Tests/mclient-uri.SQL.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# test the URI parsing capabilities of the MAPI library
-
-mclient -d "mapi:monetdb://$HOST:$MAPIPORT/$TSTDB?language=sql&user=monetdb"
-f csv -t none -E utf-8 -s 'select 1' | grep -v '^1$'
-if [ $? -eq 2 ]; then
- return 2;
-fi
-
-mclient -d
"mapi:monetdb://$MAPIHOST/.s.monetdb.$MAPIPORT?database=$TSTDB&language=sql&user=monetdb"
-f csv -t none -E utf-8 -s 'select 1' | grep -v '^1$'
-if [ $? -eq 2 ]; then
- return 2;
-fi
diff --git a/clients/Tests/mclient-uri.stable.err
b/clients/Tests/mclient-uri.stable.err
deleted file mode 100644
--- a/clients/Tests/mclient-uri.stable.err
+++ /dev/null
@@ -1,44 +0,0 @@
-stderr of test 'mclient-uri` in directory 'clients` itself:
-
-
-# 10:30:50 >
-# 10:30:50 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36840" "--set"
"mapi_usock=/var/tmp/mtest-2769/.s.monetdb.36840" "--set" "monet_prompt="
"--forcemito" "--dbpath=/ufs/sjoerd/@Monet-stable/var/MonetDB/mTests_clients"
-# 10:30:50 >
-
-# builtin opt gdk_dbpath = /ufs/sjoerd/@Monet-stable/var/monetdb5/dbfarm/demo
-# builtin opt gdk_debug = 0
-# builtin opt gdk_vmtrim = no
-# builtin opt monet_prompt = >
-# builtin opt monet_daemon = no
-# builtin opt mapi_port = 50000
-# builtin opt mapi_open = false
-# builtin opt mapi_autosense = false
-# builtin opt sql_optimizer = default_pipe
-# builtin opt sql_debug = 0
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 36840
-# cmdline opt mapi_usock = /var/tmp/mtest-2769/.s.monetdb.36840
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbpath =
/ufs/sjoerd/@Monet-stable/var/MonetDB/mTests_clients
-# cmdline opt gdk_debug = 536870922
-
-# 10:30:51 >
-# 10:30:51 > "./mclient-uri.SQL.sh" "mclient-uri"
-# 10:30:51 >
-
-
-# 10:30:51 >
-# 10:30:51 > mclient -d
mapi:monetdb://madrid:36840/mTests_clients?language=sql&user=monetdb -f test -E
utf-8 -s select 1
-# 10:30:51 >
-
-
-# 10:30:51 >
-# 10:30:51 > mclient -d
mapi:monetdb:///var/tmp/mtest-2769/.s.monetdb.36840?database=mTests_clients&language=sql&user=monetdb
-f test -E utf-8 -s select 1
-# 10:30:51 >
-
-
-# 10:30:51 >
-# 10:30:51 > "Done."
-# 10:30:51 >
-
diff --git a/clients/Tests/mclient-uri.stable.out
b/clients/Tests/mclient-uri.stable.out
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
