Changeset: ccf7bb0d5d00 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ccf7bb0d5d00
Modified Files:
clients/mapiclient/ReadlineTools.c
clients/mapiclient/ReadlineTools.h
clients/mapiclient/dump.c
clients/mapiclient/eventparser.h
clients/mapiclient/mnc.c
clients/mapiclient/stethoscope.c
clients/mapiclient/tachograph.c
clients/mapiclient/tomograph.c
clients/mapilib/mapi.c
clients/odbc/driver/SQLConnect.c
common/options/getopt.c
common/options/getopt1.c
gdk/gdk.h
gdk/gdk_join.c
gdk/gdk_utils.h
geom/lib/libgeom.c
geom/lib/libgeom.h
geom/monetdb5/geom.h
geom/monetdb5/geom_upgrade.c
monetdb5/mal/mal.c
monetdb5/mal/mal.h
monetdb5/mal/mal_sabaoth.h
monetdb5/mal/mal_session.c
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/inet.c
monetdb5/modules/atoms/json.c
monetdb5/modules/atoms/json.h
monetdb5/modules/atoms/mtime.h
monetdb5/modules/atoms/str.h
monetdb5/modules/atoms/streams.h
monetdb5/modules/atoms/url.h
monetdb5/modules/atoms/xml.h
monetdb5/modules/kernel/algebra.h
monetdb5/modules/kernel/bat5.h
monetdb5/modules/kernel/batcolor.h
monetdb5/modules/kernel/batstr.c
monetdb5/modules/kernel/microbenchmark.c
monetdb5/modules/kernel/microbenchmark.h
monetdb5/modules/mal/json_util.c
monetdb5/modules/mal/mal_io.h
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/mal_mapi.h
monetdb5/modules/mal/mkey.h
monetdb5/modules/mal/remote.h
monetdb5/modules/mal/sabaoth.c
monetdb5/modules/mal/sample.c
monetdb5/modules/mal/tablet.h
monetdb5/optimizer/opt_mitosis.c
sql/backends/monet5/mal_backend.h
sql/backends/monet5/prog.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql.h
sql/backends/monet5/sql_bat2time.c
sql/backends/monet5/sql_cast.c
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_cat.h
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_fround.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_gencode.h
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_result.h
sql/backends/monet5/sql_round.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_transaction.c
sql/backends/monet5/sql_transaction.h
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/vaults/lidar/lidar.c
sql/backends/monet5/vaults/netcdf/netcdf.c
sql/backends/monet5/vaults/shp/shp.c
sql/benchmarks/hist-uva/ground/main.c
sql/common/sql_list.c
sql/common/sql_mem.c
sql/common/sql_stack.c
sql/common/sql_string.c
sql/common/sql_types.h
sql/include/sql_catalog.h
sql/include/sql_hash.h
sql/include/sql_mem.h
sql/include/sql_relation.h
sql/include/sql_stack.h
sql/server/rel_exp.c
sql/server/rel_prop.c
sql/server/rel_psm.h
sql/server/rel_schema.h
sql/server/rel_semantic.h
sql/server/rel_sequence.h
sql/server/rel_updates.h
sql/server/sql_atom.c
sql/server/sql_atom.h
sql/server/sql_decimal.h
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/server/sql_parser.y
sql/server/sql_privileges.c
sql/server/sql_privileges.h
sql/server/sql_qc.h
sql/server/sql_scan.c
sql/server/sql_scan.h
sql/server/sql_semantic.c
sql/server/sql_semantic.h
sql/server/sql_symbol.c
sql/storage/bat/bat_logger.h
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_utils.h
sql/storage/store.c
sql/storage/store_sequence.c
testing/Mdiff.c
testing/Mtest.py.in
testing/Mtimeout.c
tools/merovingian/client/monetdb.c
tools/merovingian/daemon/argvcmds.c
tools/merovingian/daemon/argvcmds.h
tools/merovingian/daemon/client.c
tools/merovingian/daemon/connections.c
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/discoveryrunner.c
tools/merovingian/daemon/discoveryrunner.h
tools/merovingian/daemon/forkmserver.c
tools/merovingian/daemon/forkmserver.h
tools/merovingian/daemon/handlers.c
tools/merovingian/daemon/merovingian.c
tools/merovingian/daemon/multiplex-funnel.c
tools/merovingian/daemon/multiplex-funnel.h
tools/merovingian/daemon/proxy.c
tools/merovingian/utils/database.c
tools/mserver/mserver5.1.in
Branch: default
Log Message:
Merge with Jul2017 branch.
diffs (truncated from 2267 to 300 lines):
diff --git a/clients/mapiclient/ReadlineTools.c
b/clients/mapiclient/ReadlineTools.c
--- a/clients/mapiclient/ReadlineTools.c
+++ b/clients/mapiclient/ReadlineTools.c
@@ -10,7 +10,7 @@
* Readline specific stuff
*/
#include "monetdb_config.h"
-#include <monet_options.h>
+#include "monet_options.h"
#ifdef HAVE_LIBREADLINE
diff --git a/clients/mapiclient/ReadlineTools.h
b/clients/mapiclient/ReadlineTools.h
--- a/clients/mapiclient/ReadlineTools.h
+++ b/clients/mapiclient/ReadlineTools.h
@@ -11,7 +11,7 @@
#ifdef HAVE_LIBREADLINE
-#include <mapi.h>
+#include "mapi.h"
void init_readline(Mapi mid, char *language, int save_history);
void deinit_readline(void);
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -7,7 +7,7 @@
*/
#include "monetdb_config.h"
-#include <monet_options.h>
+#include "monet_options.h"
#include "mapi.h"
#include "stream.h"
#include <unistd.h>
diff --git a/clients/mapiclient/eventparser.h b/clients/mapiclient/eventparser.h
--- a/clients/mapiclient/eventparser.h
+++ b/clients/mapiclient/eventparser.h
@@ -19,8 +19,8 @@
#ifndef _EVENT_PARSER_
#define _EVENT_PARSER_
-#include <mapi.h>
-#include <stream.h>
+#include "mapi.h"
+#include "stream.h"
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/clients/mapiclient/mnc.c b/clients/mapiclient/mnc.c
--- a/clients/mapiclient/mnc.c
+++ b/clients/mapiclient/mnc.c
@@ -17,9 +17,9 @@
#include "monetdb_config.h"
#include "monet_options.h"
-#include <mapi.h>
-#include <stream.h>
-#include <stream_socket.h>
+#include "mapi.h"
+#include "stream.h"
+#include "stream_socket.h"
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/clients/mapiclient/stethoscope.c b/clients/mapiclient/stethoscope.c
--- a/clients/mapiclient/stethoscope.c
+++ b/clients/mapiclient/stethoscope.c
@@ -18,9 +18,9 @@
#include "monetdb_config.h"
#include "monet_options.h"
-#include <stream.h>
-#include <stream_socket.h>
-#include <mapi.h>
+#include "stream.h"
+#include "stream_socket.h"
+#include "mapi.h"
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/clients/mapiclient/tachograph.c b/clients/mapiclient/tachograph.c
--- a/clients/mapiclient/tachograph.c
+++ b/clients/mapiclient/tachograph.c
@@ -14,9 +14,9 @@
#include "monetdb_config.h"
#include "monet_options.h"
-#include <stream.h>
-#include <stream_socket.h>
-#include <mapi.h>
+#include "stream.h"
+#include "stream_socket.h"
+#include "mapi.h"
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c
--- a/clients/mapiclient/tomograph.c
+++ b/clients/mapiclient/tomograph.c
@@ -18,10 +18,10 @@
#include "monetdb_config.h"
#include "monet_options.h"
-#include <stream.h>
+#include "stream.h"
#include <stdio.h>
-#include <stream_socket.h>
-#include <mapi.h>
+#include "stream_socket.h"
+#include "mapi.h"
#include <string.h>
#include <stdlib.h>
#include <sys/stat.h>
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -714,8 +714,8 @@
*/
#include "monetdb_config.h"
-#include <stream.h> /* include before mapi.h */
-#include <stream_socket.h>
+#include "stream.h" /* include before mapi.h */
+#include "stream_socket.h"
#include <inttypes.h> /* for PRId64, PRIu64, SCNd64 format macros */
#include "mapi.h"
#include "mcrypt.h"
diff --git a/clients/odbc/driver/SQLConnect.c b/clients/odbc/driver/SQLConnect.c
--- a/clients/odbc/driver/SQLConnect.c
+++ b/clients/odbc/driver/SQLConnect.c
@@ -28,7 +28,7 @@
#include "ODBCGlobal.h"
#include "ODBCDbc.h"
#include "ODBCUtil.h"
-#include <monet_options.h>
+#include "monet_options.h"
#ifdef HAVE_TIME_H
#include <time.h>
#endif
diff --git a/common/options/getopt.c b/common/options/getopt.c
--- a/common/options/getopt.c
+++ b/common/options/getopt.c
@@ -35,7 +35,7 @@
# define _NO_PROTO
#endif
-#include <monetdb_config.h>
+#include "monetdb_config.h"
#if 0 /* already taken care of in config.h */
#if !defined __STDC__ || !__STDC__
diff --git a/common/options/getopt1.c b/common/options/getopt1.c
--- a/common/options/getopt1.c
+++ b/common/options/getopt1.c
@@ -26,7 +26,7 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-#include <monetdb_config.h>
+#include "monetdb_config.h"
#include "monet_getopt.h"
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -362,7 +362,7 @@
#include "gdk_system.h"
#include "gdk_posix.h"
-#include <stream.h>
+#include "stream.h"
#undef MIN
#undef MAX
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -3618,7 +3618,7 @@ subleftjoin(BAT **r1p, BAT **r2p, BAT *l
BATcount(r) * (Tsize(r) + (r->tvheap ? r->tvheap->size : 0)
+ 2 * sizeof(BUN)) > GDK_mem_maxsize / (GDKnr_threads ? GDKnr_threads : 1)))
return mergejoin(r1, r2, l, r, sl, sr, nil_matches,
nil_on_miss, semi, only_misses, maxsize, t0,
0);
- if (BATtdense(l) && BATordered(r) && (rcount * 1024) < lcount &&
ATOMtype(l->ttype) == TYPE_oid && !sl && !sr && !nil_matches && !only_misses)
+ if (BATtdense(l) && ATOMtype(l->ttype) == TYPE_oid && sl == NULL && sr
== NULL && !semi && !nil_matches && !only_misses && (rcount * 1024) < lcount &&
BATordered(r))
return fetchjoin(r1, r2, l, r);
return hashjoin(r1, r2, l, r, sl, sr, nil_matches,
nil_on_miss, semi, only_misses, maxsize, t0, 0,
"leftjoin");
diff --git a/gdk/gdk_utils.h b/gdk/gdk_utils.h
--- a/gdk/gdk_utils.h
+++ b/gdk/gdk_utils.h
@@ -9,7 +9,7 @@
#ifndef _GDK_UTILS_H_
#define _GDK_UTILS_H_
-#include <monet_options.h>
+#include "monet_options.h"
#include <setjmp.h>
gdk_export BAT *GDKkey;
diff --git a/geom/lib/libgeom.c b/geom/lib/libgeom.c
--- a/geom/lib/libgeom.c
+++ b/geom/lib/libgeom.c
@@ -13,7 +13,7 @@
* @* The simple geom library
*/
-#include <monetdb_config.h>
+#include "monetdb_config.h"
#include "libgeom.h"
#include <math.h>
diff --git a/geom/lib/libgeom.h b/geom/lib/libgeom.h
--- a/geom/lib/libgeom.h
+++ b/geom/lib/libgeom.h
@@ -9,7 +9,7 @@
#ifndef LIBGEOM_H
#define LIBGEOM_H
-#include <gdk.h>
+#include "gdk.h"
/*
* @+ Geos
@@ -29,7 +29,7 @@
#include <geos_c.h>
#ifdef HAVE_PROJ
-#include "proj_api.h" //it is needed to transform from one srid to another
+#include <proj_api.h> //it is needed to transform from one srid to another
#endif
/* geos does not support 3d envelope */
diff --git a/geom/monetdb5/geom.h b/geom/monetdb5/geom.h
--- a/geom/monetdb5/geom.h
+++ b/geom/monetdb5/geom.h
@@ -10,14 +10,14 @@
* @a Wouter Scherphof, Niels Nes, Foteini Alvanaki
*/
-#include <monetdb_config.h>
+#include "monetdb_config.h"
#include "libgeom.h"
-#include <mal.h>
-#include <mal_atom.h>
-#include <mal_exception.h>
-#include <mal_client.h>
-#include <stream.h>
+#include "mal.h"
+#include "mal_atom.h"
+#include "mal_exception.h"
+#include "mal_client.h"
+#include "stream.h"
#include <stdio.h>
#include <stdlib.h>
@@ -25,7 +25,7 @@
#include <math.h>
#include <time.h>
-#include <gdk_logger.h>
+#include "gdk_logger.h"
#ifdef WIN32
#ifndef LIBGEOM
diff --git a/geom/monetdb5/geom_upgrade.c b/geom/monetdb5/geom_upgrade.c
--- a/geom/monetdb5/geom_upgrade.c
+++ b/geom/monetdb5/geom_upgrade.c
@@ -11,7 +11,7 @@
*/
-#include <geom.h>
+#include "geom.h"
static char *
N(char *buf, const char *pre, const char *schema, const char *post)
diff --git a/monetdb5/mal/mal.c b/monetdb5/mal/mal.c
--- a/monetdb5/mal/mal.c
+++ b/monetdb5/mal/mal.c
@@ -7,8 +7,8 @@
*/
/* (author) M. Kersten */
-#include <monetdb_config.h>
-#include <mal.h>
+#include "monetdb_config.h"
+#include "mal.h"
char monet_cwd[FILENAME_MAX] = { 0 };
size_t monet_memory = 0;
diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h
--- a/monetdb5/mal/mal.h
+++ b/monetdb5/mal/mal.h
@@ -14,7 +14,7 @@
#ifndef _MAL_H
#define _MAL_H
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
