Changeset: 88851281fb92 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=88851281fb92
Added Files:
sql/test/BugTracker-2015/Tests/schemadiff.SQL.py
Removed Files:
clients/mapiclient/mapisplit-dummy.c
clients/mapiclient/profiler-dummy.c
Modified Files:
MacOSX/MonetDB.pkgproj
MonetDB.spec
clients/Makefile.ag
clients/R/Tests/deps-test.timeout
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/stethoscope.c
clients/mapiclient/tachograph.c
clients/mapiclient/tomograph.c
clients/odbc/driver/Makefile.ag
clients/python3/ChangeLog.Jul2015
debian/control
gdk/gdk_heap.c
gdk/gdk_private.h
gdk/gdk_storage.c
gdk/gdk_utils.c
monetdb5/optimizer/opt_mergetable.c
sql/ChangeLog.Jul2015
sql/backends/monet5/sql_upgrades.c
sql/scripts/17_temporal.sql
sql/scripts/75_storagemodel.sql
sql/scripts/80_statistics.sql
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.err
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out.int128
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5.stable.out.int128
sql/test/mosaic/Tests/compressionRLE.stable.out
sql/test/remote/Tests/ssbm.SQL.py
sql/test/remote/Tests/ssbm.stable.out
sql/test/remote/Tests/ssbm.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/dump.stable.out
sql/test/testdb-upgrade-chain/Tests/dump.stable.out.Windows
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/dump.stable.out
sql/test/testdb-upgrade/Tests/dump.stable.out.Windows
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: mosaic
Log Message:
Merge with default
diffs (truncated from 2792 to 300 lines):
diff --git a/MacOSX/MonetDB.pkgproj b/MacOSX/MonetDB.pkgproj
--- a/MacOSX/MonetDB.pkgproj
+++ b/MacOSX/MonetDB.pkgproj
@@ -504,7 +504,7 @@
<key>CONCLUSION_ACTION</key>
<integer>0</integer>
<key>IDENTIFIER</key>
-
<string>com.monetdbsolutions.pkg.monetdb</string>
+ <string>org.monetdb.pkg.monetdb</string>
<key>NAME</key>
<string>MonetDB</string>
<key>OVERWRITE_PERMISSIONS</key>
@@ -815,13 +815,6 @@
<key>PATH_TYPE</key>
<integer>1</integer>
</dict>
- <key>CERTIFICATE</key>
- <dict>
- <key>NAME</key>
- <string>Developer ID Installer: MonetDB
Solutions B.V. (YEJLE7L8A4)</string>
- <key>PATH</key>
-
<string>/Users/sjoerd/Library/Keychains/login.keychain</string>
- </dict>
<key>EXCLUDED_FILES</key>
<array>
<dict>
@@ -991,7 +984,7 @@
</dict>
</array>
<key>NAME</key>
- <string>MonetDB</string>
+ <string>MonetDB-unsigned</string>
</dict>
</dict>
<key>TYPE</key>
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -136,9 +136,9 @@ BuildRequires: R-core-devel
%endif
%if (0%{?fedora} >= 22)
-Recommends: %{name}-SQL-server5
-Recommends: MonetDB5-server
-Suggests: %{name}-client
+Recommends: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
+Recommends: MonetDB5-server%{?_isa} = %{version}-%{release}
+Suggests: %{name}-client%{?_isa} = %{version}-%{release}
%endif
# need to define python_sitelib on RHEL 5 and older
@@ -233,7 +233,7 @@ library.
Summary: MonetDB - Monet Database Management System Client Programs
Group: Applications/Databases
%if (0%{?fedora} >= 22)
-Recommends: %{name}-SQL-server5
+Recommends: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
%endif
%description client
@@ -598,9 +598,11 @@ Requires(pre): shadow-utils
Requires: %{name}-client%{?_isa} = %{version}-%{release}
Obsoletes: MonetDB5-server-rdf
%if (0%{?fedora} >= 22)
-Recommends: %{name}-SQL-server5
-Recommends: MonetDB5-server-hugeint
-Suggests: %{name}-client
+Recommends: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
+%if %{bits} == 64
+Recommends: MonetDB5-server-hugeint%{?_isa} = %{version}-%{release}
+%endif
+Suggests: %{name}-client%{?_isa} = %{version}-%{release}
%endif
%description -n MonetDB5-server
@@ -655,7 +657,9 @@ fi
%exclude %{_libdir}/monetdb5/rapi.mal
%endif
%exclude %{_libdir}/monetdb5/sql*.mal
+%if %{bits} == 64
%exclude %{_libdir}/monetdb5/*_hge.mal
+%endif
%{_libdir}/monetdb5/*.mal
%if %{?with_geos:1}%{!?with_geos:0}
%exclude %{_libdir}/monetdb5/autoload/*_geom.mal
@@ -685,6 +689,7 @@ fi
%docdir %{_datadir}/doc/MonetDB
%{_datadir}/doc/MonetDB/*
+%if %{bits} == 64
%package -n MonetDB5-server-hugeint
Summary: MonetDB - 128-bit integer support for MonetDB5-server
Group: Application/Databases
@@ -704,6 +709,7 @@ MonetDB5-server component.
%{_libdir}/monetdb5/*_hge.mal
%exclude %{_libdir}/monetdb5/autoload/??_sql_hge.mal
%{_libdir}/monetdb5/autoload/*_hge.mal
+%endif
%package -n MonetDB5-server-devel
Summary: MonetDB development files
@@ -738,8 +744,10 @@ Requires: %{_bindir}/systemd-tmpfiles
Obsoletes: MonetDB-SQL-devel
Obsoletes: %{name}-SQL
%if (0%{?fedora} >= 22)
-Recommends: %{name}-SQL-server5-hugeint
-Suggests: %{name}-client
+%if %{bits} == 64
+Recommends: %{name}-SQL-server5-hugeint%{?_isa} = %{version}-%{release}
+%endif
+Suggests: %{name}-client%{?_isa} = %{version}-%{release}
%endif
%description SQL-server5
@@ -781,16 +789,19 @@ systemd-tmpfiles --create %{_sysconfdir}
%if %{?with_samtools:1}%{!?with_samtools:0}
%exclude %{_libdir}/monetdb5/createdb/*_bam.sql
%endif
+%{_libdir}/monetdb5/createdb/*.sql
+%{_libdir}/monetdb5/sql*.mal
+%if %{bits} == 64
%exclude %{_libdir}/monetdb5/createdb/*_hge.sql
-%{_libdir}/monetdb5/createdb/*.sql
%exclude %{_libdir}/monetdb5/sql*_hge.mal
-%{_libdir}/monetdb5/sql*.mal
+%endif
%doc %{_mandir}/man1/monetdb.1.gz
%doc %{_mandir}/man1/monetdbd.1.gz
%dir %{_datadir}/doc/MonetDB-SQL
%docdir %{_datadir}/doc/MonetDB-SQL
%{_datadir}/doc/MonetDB-SQL/*
+%if %{bits} == 64
%package SQL-server5-hugeint
Summary: MonetDB5 128 bit integer (hugeint) support for SQL
Group: Applications/Databases
@@ -811,6 +822,7 @@ frontend of MonetDB.
%{_libdir}/monetdb5/autoload/??_sql_hge.mal
%{_libdir}/monetdb5/createdb/*_hge.sql
%{_libdir}/monetdb5/sql*_hge.mal
+%endif
%package -n python-monetdb
Summary: Native MonetDB client Python API
diff --git a/clients/Makefile.ag b/clients/Makefile.ag
--- a/clients/Makefile.ag
+++ b/clients/Makefile.ag
@@ -6,4 +6,4 @@
SUBDIRS = mapilib mapiclient HAVE_ODBC?odbc HAVE_PERL?perl php
HAVE_RUBYGEM?ruby examples HAVE_PYTHON2?python2 HAVE_PYTHON3?python3
NATIVE_WIN32?NT
-EXTRA_DIST_DIR = Tests R
+EXTRA_DIST_DIR = Tests R nodejs
diff --git a/clients/R/Tests/deps-test.timeout
b/clients/R/Tests/deps-test.timeout
--- a/clients/R/Tests/deps-test.timeout
+++ b/clients/R/Tests/deps-test.timeout
@@ -1,1 +1,1 @@
-300
+5
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
@@ -1536,6 +1536,8 @@ void MOSadvance_literal(Client cntxt, MO
void MOSadvance_prefix(Client cntxt, MOStask task);
void MOSadvance_runlength(Client cntxt, MOStask task);
str MOSanalyse(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+int MOSanalyseInternal(Client cntxt, int threshold, MOStask task, bat bid);
+void MOSanalyseReport(Client cntxt, BAT *b, BAT *btech, BAT *output, BAT
*factor, lng sample);
void MOSblk(MosaicBlk blk);
BUN MOSblocklimit;
str MOScompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
@@ -1585,6 +1587,14 @@ str MOSjoin_linear(Client cntxt, MOStask
str MOSjoin_literal(Client cntxt, MOStask task);
str MOSjoin_prefix(Client cntxt, MOStask task);
str MOSjoin_runlength(Client cntxt, MOStask task);
+str MOSlayout(Client cntxt, BAT *b, BAT *btech, BAT *bcount, BAT *binput, BAT
*boutput, BAT *bproperties);
+void MOSlayout_delta(Client cntxt, MOStask task, BAT *btech, BAT *bcount, BAT
*binput, BAT *boutput, BAT *bproperties);
+void MOSlayout_dictionary(Client cntxt, MOStask task, BAT *btech, BAT *bcount,
BAT *binput, BAT *boutput, BAT *bproperties);
+void MOSlayout_frame(Client cntxt, MOStask task, BAT *btech, BAT *bcount, BAT
*binput, BAT *boutput, BAT *bproperties);
+void MOSlayout_linear(Client cntxt, MOStask task, BAT *btech, BAT *bcount, BAT
*binput, BAT *boutput, BAT *bproperties);
+void MOSlayout_literal(Client cntxt, MOStask task, BAT *btech, BAT *bcount,
BAT *binput, BAT *boutput, BAT *bproperties);
+void MOSlayout_prefix(Client cntxt, MOStask task, BAT *btech, BAT *bcount, BAT
*binput, BAT *boutput, BAT *bproperties);
+void MOSlayout_runlength(Client cntxt, MOStask task, BAT *btech, BAT *bcount,
BAT *binput, BAT *boutput, BAT *bproperties);
str MOSleftfetchjoin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str MOSleftfetchjoin_delta(Client cntxt, MOStask task);
str MOSleftfetchjoin_dictionary(Client cntxt, MOStask task);
@@ -1603,6 +1613,7 @@ void MOSskip_literal(Client cntxt, MOSta
void MOSskip_prefix(Client cntxt, MOStask task);
void MOSskip_runlength(Client cntxt, MOStask task);
str MOSslice(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str MOSsliceInternal(Client cntxt, bat *slices, BUN size, BAT *b);
str MOSsubselect(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str MOSsubselect_delta(Client cntxt, MOStask task, void *low, void *hgh, bit
*li, bit *hi, bit *anti);
str MOSsubselect_dictionary(Client cntxt, MOStask task, void *low, void *hgh,
bit *li, bit *hi, bit *anti);
diff --git a/clients/mapiclient/mapisplit-dummy.c
b/clients/mapiclient/mapisplit-dummy.c
deleted file mode 100644
--- a/clients/mapiclient/mapisplit-dummy.c
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-This refers to ../R/MonetDB.R/src/mapisplit.c . We cannot have this file here,
-as the R connector needs to be able to compile stand-alone.
-*/
-#include "mapisplit.c"
diff --git a/clients/mapiclient/profiler-dummy.c
b/clients/mapiclient/profiler-dummy.c
deleted file mode 100644
--- a/clients/mapiclient/profiler-dummy.c
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-This refers to ../R/MonetDB.R/src/profiler.c . We cannot have this file here,
-as the R connector needs to be able to compile stand-alone.
-*/
-#include "profiler.c"
diff --git a/clients/mapiclient/stethoscope.c b/clients/mapiclient/stethoscope.c
--- a/clients/mapiclient/stethoscope.c
+++ b/clients/mapiclient/stethoscope.c
@@ -110,14 +110,14 @@ int
main(int argc, char **argv)
{
ssize_t n;
- size_t len;
+ size_t len, buflen;
char *host = NULL;
int portnr = 0;
char *dbname = NULL;
char *uri = NULL;
char *user = NULL;
char *password = NULL;
- char buf[BUFSIZ], *e, *response;
+ char buf[BUFSIZ], *buffer, *e, *response;
int line = 0;
FILE *trace = NULL;
@@ -268,11 +268,17 @@ main(int argc, char **argv)
fprintf(stderr,"Could not create trace file\n");
len = 0;
- while ((n = mnstr_read(conn, buf + len, 1, BUFSIZ - len)) > 0) {
- buf[len + n] = 0;
+ buflen = BUFSIZ;
+ buffer = (char *) malloc(buflen);
+ if( buffer == NULL){
+ fprintf(stderr,"Could not create input buffer\n");
+ exit(-1);
+ }
+ while ((n = mnstr_read(conn, buffer + len, 1, buflen - len)) > 0) {
+ buffer[len + n] = 0;
if( trace)
- fprintf(trace,"%s",buf);
- response = buf;
+ fprintf(trace,"%s",buffer);
+ response = buffer;
while ((e = strchr(response, '\n')) != NULL) {
*e = 0;
printf("%s\n", response);
@@ -281,12 +287,22 @@ main(int argc, char **argv)
}
response = e + 1;
}
+ /* handle the case that the line is not yet completed */
+ if( response == buffer){
+ char *new = (char *) realloc(buffer, buflen + BUFSIZ);
+ if( new == NULL){
+ fprintf(stderr,"Could not extend input
buffer\n");
+ exit(-1);
+ }
+ buffer = new;
+ buflen += BUFSIZ;
+ }
/* handle last line in buffer */
if (*response) {
if (debug)
printf("LASTLINE:%s", response);
len = strlen(response);
- strncpy(buf, response, len + 1);
+ strncpy(buffer, response, len + 1);
} else
len = 0;
}
diff --git a/clients/mapiclient/tachograph.c b/clients/mapiclient/tachograph.c
--- a/clients/mapiclient/tachograph.c
+++ b/clients/mapiclient/tachograph.c
@@ -679,6 +679,7 @@ update(EventRecord *ev)
fprintf(tachojson,"{\n");
fprintf(tachojson,"\"qid\":\"%s\",\n",currentfunction?currentfunction:"");
fprintf(tachojson,"\"tag\":%d,\n",ev->tag);
+ fprintf(tachojson,"\"thread\":%d,\n",ev->thread);
fprintf(tachojson,"\"pc\":%d,\n",ev->pc);
fprintf(tachojson,"\"time\": "LLFMT",\n",ev->clkticks);
fprintf(tachojson,"\"status\": \"start\",\n");
@@ -787,13 +788,13 @@ int
main(int argc, char **argv)
{
ssize_t n;
- size_t len;
+ size_t len, buflen;
char *host = NULL;
int portnr = 0;
char *uri = NULL;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
