Changeset: fde08e68dc41 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fde08e68dc41
Modified Files:
gdk/gdk_logger.c
gdk/gdk_logger.h
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_user.c
sql/server/rel_optimizer.c
sql/server/rel_updates.c
sql/storage/bat/bat_storage.c
sql/storage/store.c
Branch: nospare
Log Message:
merged with default
diffs (truncated from 2244 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.
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/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/mapiclient/mhelp.c b/clients/mapiclient/mhelp.c
--- a/clients/mapiclient/mhelp.c
+++ b/clients/mapiclient/mhelp.c
@@ -49,18 +49,18 @@ SQLhelp sqlhelp1[] = {
"ALTER TABLE [ IF EXISTS ] qname DROP TABLE qname [ RESTRICT | CASCADE
]\n"
"ALTER TABLE [ IF EXISTS ] qname SET TABLE qname AS PARTITION
partition_spec",
"qname,partition_spec",
- "See also
https://www.monetdb.org/Documentation/Cookbooks/SQLrecipes/DataPartitioning"},
+ "See also
https://www.monetdb.org/Documentation/ServerAdministration/DistributedQueryProcessing/DataPartitioning"},
{"ALTER SCHEMA",
"",
"ALTER SCHEMA [ IF EXISTS ] ident RENAME TO ident",
"ident",
- "See also https://www.monetdb.org/Documentation/SQLreference/Alter"},
+ "See also
https://www.monetdb.org/Documentation/SQLreference/TableDefinitions/AlterStatement"},
{"ALTER SEQUENCE",
"",
"ALTER SEQUENCE qname [ AS seq_int_datatype] [ RESTART [WITH intval]]
[INCREMENT BY intval]\n"
"[MINVALUE intval | NO MINVALUE] [MAXVALUE intval | NO MAXVALUE]
[CACHE intval] [[NO] CYCLE]",
"seq_int_datatype,intval",
- "See also
https://www.monetdb.org/Documentation/Manuals/SQLreference/SerialTypes"},
+ "See also
https://www.monetdb.org/Documentation/SQLReference/DataTypes/SerialDatatypes"},
{"ALTER TABLE",
"",
"ALTER TABLE [ IF EXISTS ] qname ADD [ COLUMN ] column_def\n"
@@ -76,7 +76,7 @@ SQLhelp sqlhelp1[] = {
"ALTER TABLE [ IF EXISTS ] qname SET { INSERT ONLY | READ ONLY | READ
WRITE }\n"
"ALTER TABLE [ IF EXISTS ] qname SET SCHEMA ident",
"qname,column_def,table_constraint,ident",
- "See also https://www.monetdb.org/Documentation/SQLreference/Alter"},
+ "See also
https://www.monetdb.org/Documentation/SQLreference/TableDefinitions/AlterStatement"},
{"ALTER USER",
"Change a user's login name or password or default schema",
"ALTER USER ident RENAME TO ident\n"
@@ -85,12 +85,12 @@ SQLhelp sqlhelp1[] = {
"ALTER USER ident [WITH [ENCRYPTED | UNENCRYPTED] PASSWORD string] SET
SCHEMA ident\n"
"ALTER USER ident [WITH [ENCRYPTED | UNENCRYPTED] PASSWORD string]
SCHEMA PATH string",
"ident",
- "See also https://www.monetdb.org/Documentation/SQLreference/Users"},
+ "See also
https://www.monetdb.org/Documentation/SQLReference/DataDefinition/Privileges/Users"},
{"ANALYZE",
"Collect column/table/schema data statistics for analysis and
optimizer usage",
"ANALYZE ident [ . ident [ column_list ] ] [SAMPLE size] [MINMAX]",
"ident,column_list",
- "See also
https://www.monetdb.org/Documentation/Cookbooks/SQLrecipes/statistics"},
+ "See also
https://www.monetdb.org/Documentation/ServerAdministration/TableStatistics"},
{"CALL",
"Call a stored procedure",
"CALL qname '(' [ scalar_expression [',' ...] ] ')' | CALL ident '.'
ident",
@@ -106,12 +106,12 @@ SQLhelp sqlhelp1[] = {
"Commit the current transaction",
"COMMIT [ WORK ] [ AND CHAIN | AND NO CHAIN ]",
NULL,
- NULL},
+ "See also
https://www.monetdb.org/Documentation/SQLreference/Transactions"},
{"COPY BINARY",
"Append binary representations into a table",
"COPY [nrofrecords] BINARY INTO qname [column_list] FROM string [','
...] [ON { CLIENT | SERVER }] [NO CONSTRAINT]",
"nrofrecords,qname,column_list",
- "See also
https://www.monetdb.org/Documentation/Cookbooks/SQLrecipes/BinaryBulkLoad"},
+ "See also
https://www.monetdb.org/Documentation/ServerAdministration/LoadingBulkData/BinaryBulkLoad"},
{"COPY INTO",
"Parse a csv file into a table or write a query result to a csv file",
"COPY [nrofrecords] INTO qname [column_list] FROM string [',' ...]
[headerlist] [ON { CLIENT | SERVER }] [ separators]\n"
@@ -120,7 +120,7 @@ SQLhelp sqlhelp1[] = {
" [NULL [AS] string] [LOCKED] [BEST EFFORT] [NO CONSTRAINT]\n"
"COPY query_expression INTO [STDOUT | string [ON { CLIENT | SERVER }]]
[separators] [NULL [AS] string]",
"nrofrecords,qname,column_list,headerlist,separators",
- "See also
https://www.monetdb.org/Documentation/Cookbooks/SQLrecipes/LoadingBulkData"},
+ "See also
https://www.monetdb.org/Documentation/ServerAdministration/LoadingBulkData"},
{"COPY LOADER",
"Copy into using a user supplied parsing function",
"COPY LOADER INTO qname FROM qname '(' [ scalar_expression ... ] ')'",
@@ -136,14 +136,14 @@ SQLhelp sqlhelp1[] = {
" RETURNS function_return_data_type\n"
" LANGUAGE language_keyword external_code",
"qname,param,function_return_data_type,ident,language_keyword,external_code",
- "See also
https://www.monetdb.org/Documentation/Manuals/SQLreference/Functions"},
+ "See also
https://www.monetdb.org/Documentation/SQLreference/ProgrammingSQL/Functions"},
{"CREATE FILTER FUNCTION",
"Create a user-defined filter function. Currently only MAL
definitions\n"
"CREATE [ OR REPLACE ] FILTER [ FUNCTION ] qname '(' { '*' | [ param
[',' ...]] } ')'\n"
" RETURNS function_return_data_type\n"
" EXTERNAL NAME ident ',' ident",
"qname,param,function_return_data_type,ident",
- "See also
https://www.monetdb.org/Documentation/Manuals/SQLreference/Functions"},
+ "See also
https://www.monetdb.org/Documentation/SQLreference/ProgrammingSQL/Functions"},
{"CREATE FUNCTION",
"Create a user-defined function (UDF). The body of the function can be
defined in\n"
" PL/SQL or programming languages such as Python, R, C or CPP when
embedded on the server.",
@@ -157,12 +157,12 @@ SQLhelp sqlhelp1[] = {
" RETURNS function_return_data_type\n"
" LANGUAGE language_keyword external_code",
"qname,param,function_return_data_type,statement,ident,language_keyword,external_code",
- "See also
https://www.monetdb.org/Documentation/Manuals/SQLreference/Functions"},
+ "See also
https://www.monetdb.org/Documentation/SQLreference/ProgrammingSQL/Functions"},
{"CREATE INDEX",
"Create a hint for a secondary index on a column or set of columns of
a table",
"CREATE [ UNIQUE | ORDERED | IMPRINTS ] INDEX ident ON qname '('
ident_list ')'",
NULL,
- "See also
https://www.monetdb.org/Documentation/Manuals/SQLreference/Indices"},
+ "See also
https://www.monetdb.org/Documentation/SQLreference/TableDefinitions/IndexDefinitions"},
{"CREATE LOADER",
"Create a custom (external) data loader function. The body is defined
in Python language",
"CREATE [ OR REPLACE ] LOADER [ FUNCTION ] qname '(' [ param [','
...]] ')'\n"
@@ -173,7 +173,7 @@ SQLhelp sqlhelp1[] = {
"",
"CREATE MERGE TABLE [ IF NOT EXISTS ] qname table_source [
partition_by ]",
"table_source,partition_by",
- "See also
https://www.monetdb.org/Documentation/Cookbooks/SQLrecipes/DataPartitioning"},
+ "See also
https://www.monetdb.org/Documentation/ServerAdministration/DistributedQueryProcessing/DataPartitioning"},
{"CREATE PROCEDURE",
"Create a user-defined procedure",
"CREATE [ OR REPLACE ] PROCEDURE qname '(' { '*' | [ param [',' ...]]
} ')'\n"
@@ -181,7 +181,7 @@ SQLhelp sqlhelp1[] = {
"CREATE [ OR REPLACE ] PROCEDURE qname '(' { '*' | [ param [',' ...]]
} ')'\n"
" EXTERNAL NAME ident ',' ident",
"qname,param,procedure_statement,ident",
- "See also
https://www.monetdb.org/Documentation/Manuals/SQLreference/Procedures"},
+ "See also
https://www.monetdb.org/Documentation/SQLreference/ProgrammingSQL/Procedures"},
{"CREATE REMOTE TABLE",
"",
"CREATE REMOTE TABLE [ IF NOT EXISTS ] qname ON string [WITH [USER
'username'] [[ENCRYPTED] PASSWORD 'password']]",
@@ -197,32 +197,32 @@ SQLhelp sqlhelp1[] = {
"grant a role (or multiple roles) to specific users",
"CREATE ROLE ident [ WITH ADMIN { CURRENT_USER | CURRENT_ROLE } ]",
"ident",
- "See also https://www.monetdb.org/Documentation/SQLreference/Roles"},
+ "See also
https://www.monetdb.org/Documentation/SQLReference/DataDefinition/Privileges/Roles"},
{"CREATE SCHEMA",
"Create a new schema",
"CREATE SCHEMA [ IF NOT EXISTS ] schema_name [default_char_set]
[path_spec] [schema_element]",
"schema_name,default_char_set,path_spec,schema_element",
- "See also https://www.monetdb.org/Documentation/SQLreference/Schema"},
+ "See also
https://www.monetdb.org/Documentation/SQLReference/DataDefinition/SchemaDefinitions"},
{"CREATE SEQUENCE",
"Define a new integer number sequence generator",
"CREATE SEQUENCE qname [ AS seq_int_datatype] [ START [WITH intval]]
[INCREMENT BY intval]\n"
"[MINVALUE intval | NO MINVALUE] [MAXVALUE intval | NO MAXVALUE]
[CACHE intval] [[NO] CYCLE]",
"seq_int_datatype,intval",
- "See also
https://www.monetdb.org/Documentation/Manuals/SQLreference/SerialTypes"},
+ "See also
https://www.monetdb.org/Documentation/SQLReference/DataTypes/SerialDatatypes"},
{"CREATE TABLE",
"Create a new table",
"CREATE TABLE [ IF NOT EXISTS ] qname table_source [STORAGE ident
string]\n"
"CREATE TABLE [ IF NOT EXISTS ] qname FROM LOADER function_ref\n"
"CREATE [ LOCAL | GLOBAL ] { TEMPORARY | TEMP } TABLE [ IF NOT EXISTS
] qname table_source [on_commit]",
"table_source,on_commit,function_ref",
- "See also
https://www.monetdb.org/Documentation/Manuals/SQLreference/Tables"},
+ "See also
https://www.monetdb.org/Documentation/SQLReference/TableDefinitions"},
{"CREATE TRIGGER",
"Define a triggered action for a table data update event",
"CREATE [ OR REPLACE ] TRIGGER ident { BEFORE | AFTER }\n"
" { INSERT | DELETE | TRUNCATE | UPDATE [ OF ident_list ] }\n"
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
