Changeset: b53774ea653a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b53774ea653a
Added Files:
documentation/Makefile
documentation/make.bat
documentation/source/conf.py
documentation/source/index.rst
Modified Files:
.hgignore
Makefile.ag
gdk/gdk_bat.c
monetdb5/mal/Tests/tst180.stable.err
monetdb5/mal/mal_client.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_instruction.c
monetdb5/modules/mal/wlc.c
sql/backends/monet5/UDF/pyapi/conversion.c
sql/backends/monet5/sql.c
sql/backends/monet5/wlr.c
sql/server/rel_schema.c
sql/test/BugTracker-2018/Tests/temp-table-performance.Bug-6577.sql
sql/test/BugTracker-2019/Tests/isaUUID.Bug-6784.stable.err
sql/test/miscellaneous/Tests/column_aliases.sql
sql/test/miscellaneous/Tests/column_aliases.stable.err
sql/test/miscellaneous/Tests/column_aliases.stable.out
Branch: statistics-analytics
Log Message:
Merge with default
diffs (truncated from 946 to 300 lines):
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -91,3 +91,6 @@ NT/unistd.h
# package building on Mac OS X
MacOSX/build
MacOSX/usr
+
+# Don't keep the result of the documentation compilation
+documentation/build
diff --git a/Makefile.ag b/Makefile.ag
--- a/Makefile.ag
+++ b/Makefile.ag
@@ -16,7 +16,7 @@ EXTRA_DIST = bootstrap configure configu
MonetDB.spec rpm.mk.in COPYING README.rst license.txt HowToStart.rst \
README-Fedora README-Debian
-EXTRA_DIST_DIR = NT debian MacOSX
+EXTRA_DIST_DIR = NT debian MacOSX documentation
headers_config = {
DIR = includedir/monetdb
diff --git a/documentation/Makefile b/documentation/Makefile
new file mode 100644
--- /dev/null
+++ b/documentation/Makefile
@@ -0,0 +1,20 @@
+# Minimal makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line, and also
+# from the environment for the first two.
+SPHINXOPTS ?=
+SPHINXBUILD ?= sphinx-build
+SOURCEDIR = source
+BUILDDIR = build
+
+# Put it first so that "make" without argument is like "make help".
+help:
+ @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: help Makefile
+
+# Catch-all target: route all unknown targets to Sphinx using the new
+# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
+%: Makefile
+ @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
diff --git a/documentation/make.bat b/documentation/make.bat
new file mode 100644
--- /dev/null
+++ b/documentation/make.bat
@@ -0,0 +1,35 @@
+@ECHO OFF
+
+pushd %~dp0
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+ set SPHINXBUILD=sphinx-build
+)
+set SOURCEDIR=source
+set BUILDDIR=build
+
+if "%1" == "" goto help
+
+%SPHINXBUILD% >NUL 2>NUL
+if errorlevel 9009 (
+ echo.
+ echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+ echo.installed, then set the SPHINXBUILD environment variable to point
+ echo.to the full path of the 'sphinx-build' executable. Alternatively
you
+ echo.may add the Sphinx directory to PATH.
+ echo.
+ echo.If you don't have Sphinx installed, grab it from
+ echo.http://sphinx-doc.org/
+ exit /b 1
+)
+
+%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+goto end
+
+:help
+%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+
+:end
+popd
diff --git a/documentation/source/conf.py b/documentation/source/conf.py
new file mode 100644
--- /dev/null
+++ b/documentation/source/conf.py
@@ -0,0 +1,52 @@
+# Configuration file for the Sphinx documentation builder.
+#
+# This file only contains a selection of the most common options. For a full
+# list see the documentation:
+# https://www.sphinx-doc.org/en/master/usage/configuration.html
+
+# -- Path setup --------------------------------------------------------------
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#
+# import os
+# import sys
+# sys.path.insert(0, os.path.abspath('.'))
+
+
+# -- Project information -----------------------------------------------------
+
+project = 'MonetDB'
+copyright = '2020, MonetDB B.V.'
+author = 'Panagiotis Koutsourakis'
+
+
+# -- General configuration ---------------------------------------------------
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+]
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This pattern also affects html_static_path and html_extra_path.
+exclude_patterns = []
+
+
+# -- Options for HTML output -------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages. See the documentation for
+# a list of builtin themes.
+#
+html_theme = 'alabaster'
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
diff --git a/documentation/source/index.rst b/documentation/source/index.rst
new file mode 100644
--- /dev/null
+++ b/documentation/source/index.rst
@@ -0,0 +1,20 @@
+.. MonetDB documentation master file, created by
+ sphinx-quickstart on Fri Jan 17 16:06:39 2020.
+ You can adapt this file completely to your liking, but it should at least
+ contain the root `toctree` directive.
+
+Welcome to MonetDB's documentation!
+===================================
+
+.. toctree::
+ :maxdepth: 2
+ :caption: Contents:
+
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -2213,9 +2213,9 @@ BATassertProps(BAT *b)
assert(b->tvheap->free <= b->tvheap->size);
assert(b->tvheap->free % SIZEOF_OID == 0);
if (b->tvheap->free > 0) {
- #ifndef NDEBUG
+#ifndef NDEBUG
const oid *oids = (const oid *)
b->tvheap->base;
- #endif
+#endif
q = b->tvheap->free / SIZEOF_OID;
assert(oids != NULL);
assert(b->tseqbase + BATcount(b) + q <=
GDK_oid_max);
@@ -2242,9 +2242,9 @@ BATassertProps(BAT *b)
assert(b->tkey);
assert(b->tnonil);
if ((q = b->batCount) != 0) {
- #ifndef NDEBUG
+#ifndef NDEBUG
const oid *o = (const oid *) Tloc(b, 0);
- #endif
+#endif
assert(*o == b->tseqbase);
for (p = 1; p < q; p++)
assert(o[p - 1] + 1 == o[p]);
diff --git a/monetdb5/mal/Tests/tst180.stable.err
b/monetdb5/mal/Tests/tst180.stable.err
--- a/monetdb5/mal/Tests/tst180.stable.err
+++ b/monetdb5/mal/Tests/tst180.stable.err
@@ -28,6 +28,7 @@ MAPI = (monetdb) /var/tmp/mtest-25335/.
QUERY = # errors in the constant types
x:= 1:bat[:int];
io.print(x);
+ERROR = !TypeException:user.main[0]:BAT coercion error
# 23:13:31 >
diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c
--- a/monetdb5/mal/mal_client.c
+++ b/monetdb5/mal/mal_client.c
@@ -48,14 +48,16 @@
#include "mal_authorize.h"
int MAL_MAXCLIENTS = 0;
-ClientRec *mal_clients;
+ClientRec *mal_clients = NULL;
void
mal_client_reset(void)
{
MAL_MAXCLIENTS = 0;
- if (mal_clients)
+ if (mal_clients) {
GDKfree(mal_clients);
+ mal_clients = NULL;
+ }
}
bool
@@ -68,7 +70,7 @@ MCinit(void)
maxclients = atoi(max_clients);
if (maxclients <= 0) {
maxclients = 64;
- GDKsetenv("max_clients", "64") ;
+ GDKsetenv("max_clients", "64");
}
MAL_MAXCLIENTS = /* client connections */ maxclients;
@@ -172,11 +174,11 @@ MCgetClient(int id)
static void
MCresetProfiler(stream *fdout)
{
- if (fdout != maleventstream)
- return;
- MT_lock_set(&mal_profileLock);
- maleventstream = 0;
- MT_lock_unset(&mal_profileLock);
+ if (fdout != maleventstream)
+ return;
+ MT_lock_set(&mal_profileLock);
+ maleventstream = 0;
+ MT_lock_unset(&mal_profileLock);
}
void
@@ -185,14 +187,13 @@ MCexitClient(Client c)
finishSessionProfiler(c);
MCresetProfiler(c->fdout);
if (c->father == NULL) { /* normal client */
- if (c->fdout && c->fdout != GDKstdout) {
+ if (c->fdout && c->fdout != GDKstdout)
close_stream(c->fdout);
- }
assert(c->bak == NULL);
if (c->fdin) {
/* protection against closing stdin stream */
- if (c->fdin->s == GDKstdin)
- c->fdin->s = NULL;
+ if (c->fdin->s == GDKstdin)
+ c->fdin->s = NULL;
bstream_destroy(c->fdin);
}
c->fdout = NULL;
@@ -289,7 +290,6 @@ MCinitClient(oid user, bstream *fin, str
return MCinitClientRecord(c, user, fin, fout);
}
-
/*
* The administrator should be initialized to enable interpretation of
* the command line arguments, before it starts servicing statements
diff --git a/monetdb5/mal/mal_debugger.c b/monetdb5/mal/mal_debugger.c
--- a/monetdb5/mal/mal_debugger.c
+++ b/monetdb5/mal/mal_debugger.c
@@ -690,8 +690,10 @@ retryRead:
for(i=0; i< fs->def->stop; i++)
fs->def->stmt[i]->typechk = TYPE_UNKNOWN;
msg =
chkProgram(cntxt->usermodule, fs->def);
- if( msg != MAL_SUCCEED)
- mnstr_printf(out,
"#<modnme>.<fcnnme> contains errors\n");
+ if( msg != MAL_SUCCEED){
+ mnstr_printf(out,
"#<modnme>.<fcnnme> contains errors: %s\n", msg);
+ freeException(msg);
+ }
}
} else
mnstr_printf(out, "#<modnme>.<fcnnme>
expected\n");
diff --git a/monetdb5/mal/mal_instruction.c b/monetdb5/mal/mal_instruction.c
--- a/monetdb5/mal/mal_instruction.c
+++ b/monetdb5/mal/mal_instruction.c
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
