Changeset: c96ac3b965d8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c96ac3b965d8
Added Files:
sql/backends/monet5/Tests/pyloader06.sql
sql/backends/monet5/Tests/pyloader06.stable.err
sql/backends/monet5/Tests/pyloader06.stable.out
sql/test/BugTracker-2016/Tests/trigger_bulk.Bug-4045.sql
sql/test/BugTracker-2016/Tests/trigger_bulk.Bug-4045.stable.err
sql/test/BugTracker-2016/Tests/trigger_bulk.Bug-4045.stable.out
Modified Files:
NT/monetdb_config.h.in
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
clients/Tests/exports.stable.out
clients/Tests/malcheck.stable.out
clients/mapiclient/dump.c
clients/mapiclient/mclient.c
common/stream/stream.c
configure.ag
gdk/gdk_posix.c
gdk/gdk_utils.c
monetdb5/extras/mal_optimizer_template/opt_sql_append.c
monetdb5/extras/mal_optimizer_template/opt_sql_append.h
monetdb5/modules/atoms/batxml.c
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/batcolor.c
monetdb5/modules/kernel/batmmath.c
monetdb5/modules/kernel/batstr.c
monetdb5/modules/kernel/microbenchmark.c
monetdb5/modules/kernel/status.c
monetdb5/modules/mal/bbp.c
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/inspect.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/mdb.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/zorder.c
monetdb5/optimizer/opt_aliases.h
monetdb5/optimizer/opt_candidates.h
monetdb5/optimizer/opt_coercion.h
monetdb5/optimizer/opt_commonTerms.c
monetdb5/optimizer/opt_commonTerms.h
monetdb5/optimizer/opt_constants.c
monetdb5/optimizer/opt_constants.h
monetdb5/optimizer/opt_costModel.h
monetdb5/optimizer/opt_dataflow.c
monetdb5/optimizer/opt_dataflow.h
monetdb5/optimizer/opt_deadcode.c
monetdb5/optimizer/opt_deadcode.h
monetdb5/optimizer/opt_evaluate.c
monetdb5/optimizer/opt_evaluate.h
monetdb5/optimizer/opt_factorize.h
monetdb5/optimizer/opt_garbageCollector.c
monetdb5/optimizer/opt_garbageCollector.h
monetdb5/optimizer/opt_generator.h
monetdb5/optimizer/opt_inline.c
monetdb5/optimizer/opt_inline.h
monetdb5/optimizer/opt_iot.c
monetdb5/optimizer/opt_iot.h
monetdb5/optimizer/opt_json.h
monetdb5/optimizer/opt_macro.h
monetdb5/optimizer/opt_matpack.h
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_mergetable.h
monetdb5/optimizer/opt_mitosis.c
monetdb5/optimizer/opt_mitosis.h
monetdb5/optimizer/opt_multiplex.c
monetdb5/optimizer/opt_multiplex.h
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_profiler.h
monetdb5/optimizer/opt_projectionpath.c
monetdb5/optimizer/opt_projectionpath.h
monetdb5/optimizer/opt_pushselect.c
monetdb5/optimizer/opt_pushselect.h
monetdb5/optimizer/opt_querylog.h
monetdb5/optimizer/opt_reduce.h
monetdb5/optimizer/opt_remap.c
monetdb5/optimizer/opt_remap.h
monetdb5/optimizer/opt_remoteQueries.c
monetdb5/optimizer/opt_remoteQueries.h
monetdb5/optimizer/opt_reorder.c
monetdb5/optimizer/opt_reorder.h
monetdb5/optimizer/opt_support.c
monetdb5/optimizer/opt_support.h
monetdb5/optimizer/opt_volcano.h
sql/backends/monet5/Tests/pyloader04.stable.err
sql/backends/monet5/UDF/pyapi/emit.c
sql/backends/monet5/UDF/pyapi/emit.h
sql/backends/monet5/UDF/pyapi/pyloader.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_cast_impl_down_from_int.h
sql/backends/monet5/sql_cast_impl_up_to_flt.h
sql/backends/monet5/sql_cast_impl_up_to_int.h
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_rank.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statistics.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/sql_user.c
sql/scripts/80_statistics.sql
sql/server/rel_psm.c
sql/server/sql_mvc.c
sql/storage/bat/bat_storage.c
sql/storage/store.c
sql/test/BugTracker-2016/Tests/All
sql/test/BugTracker-2016/Tests/storagemodel.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/check.stable.out
sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/check.stable.out
sql/test/emptydb-upgrade/Tests/check.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check0.stable.out.int128
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/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/drop3.stable.out.int128
sql/test/leaks/Tests/select1.stable.out.int128
sql/test/leaks/Tests/select2.stable.out.int128
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp1.stable.out.int128
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp2.stable.out.int128
sql/test/leaks/Tests/temp3.stable.out
sql/test/leaks/Tests/temp3.stable.out.int128
sql/test/remote/Tests/partition_elim.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
testing/Mdiff.c
Branch: iot
Log Message:
Merge with default
diffs (truncated from 8287 to 300 lines):
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -187,6 +187,11 @@
/* Define to 1 if you have the `getaddrinfo' function. */
#define HAVE_GETADDRINFO 1
+/* Define to 1 if you have the `GetDynamicTimeZoneInformation' function. */
+#ifdef _MSC_VER
+#define HAVE_GETDYNAMICTIMEZONEINFORMATION 1
+#endif
+
/* Define to 1 if you have the `getexecname' function. */
/* #undef HAVE_GETEXECNAME */
@@ -202,23 +207,9 @@
/* Define to 1 if you have the `getopt_long' function. */
/* #undef HAVE_GETOPT_LONG */
-/* Define to 1 if you have the `getrlimit' function. */
-/* #undef HAVE_GETRLIMIT */
-
-/* Define to 1 if you have the `GetSystemInfo' function. */
-/* #undef HAVE_GETSYSTEMINFO */
-
/* Define to 1 if you have the `gettimeofday' function. */
/* #undef HAVE_GETTIMEOFDAY */
-/* Define to 1 if you have the `_get_timezone' function. */
-#ifdef _MSC_VER
-#define HAVE__GET_TIMEZONE 1
-#endif
-
-/* Define if you have the gsl library */
-/* #undef HAVE_GSL */
-
/* Define to 1 if you have the `getuid' function. */
/* #undef HAVE_GETUID */
@@ -246,9 +237,6 @@
#define HAVE_ISINF 1
#endif
-/* Define to 1 if you have the `kill' function. */
-/* #undef HAVE_KILL */
-
/* Define to 1 if you have the <kvm.h> header file. */
/* #undef HAVE_KVM_H */
@@ -363,9 +351,6 @@
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
-/* Define if the microhttpd server is to be enabled */
-/* #undef HAVE_MICROHTTPD */
-
/* Define to 1 if you have the `mremap' function. */
/* #undef HAVE_MREMAP */
@@ -404,8 +389,6 @@
/* Define to 1 if you have the <perfmon/pfmlib.h> header file. */
/* #undef HAVE_PERFMON_PFMLIB_H */
-/* Define to 1 if you have the `pipe' function. */
-#define HAVE_PIPE 1
#ifdef pipe
#undef pipe
#endif
@@ -432,12 +415,6 @@
/* Define if you have the pthread_kill function */
/* #undef HAVE_PTHREAD_KILL */
-/* Define if you have the pthread_kill_other_threads_np function */
-/* #undef HAVE_PTHREAD_KILL_OTHER_THREADS_NP */
-
-/* Define if you have the pthread_setschedprio function */
-/* #undef HAVE_PTHREAD_SETSCHEDPRIO */
-
/* Define if you have the pthread_sigmask function */
/* #undef HAVE_PTHREAD_SIGMASK */
@@ -450,18 +427,12 @@
/* Define to 1 if you have the <pwd.h> header file. */
/* #undef HAVE_PWD_H */
-/* Define to 1 if you have the <regex.h> header file. */
-/* #undef HAVE_REGEX_H */
-
/* Define if the compiler supports the restrict keyword */
/* #undef HAVE_RESTRICT */
/* Define to 1 if you have the `RIPEMD160' function. */
#define HAVE_RIPEMD160 1
-/* Define to 1 if you have the <rlimit.h> header file. */
-/* #undef HAVE_RLIMIT_H */
-
/* Define to 1 if you have the `round' function. */
#if !defined(_MSC_VER) || _MSC_VER > 1600
#define HAVE_ROUND 1
@@ -473,9 +444,6 @@
/* Define to 1 if you have the <samtools/kstring.h> header file. */
/* #undef HAVE_SAMTOOLS_KSTRING_H */
-/* Define to 1 if you have the `sbrk' function. */
-/* #undef HAVE_SBRK */
-
/* Define to 1 if you have the <sched.h> header file. */
/* #undef HAVE_SCHED_H */
@@ -515,9 +483,6 @@
/* Define to 1 if you have the <signal.h> header file. */
#define HAVE_SIGNAL_H 1
-/* Define if your mallinfo struct has signed elements */
-/* #undef HAVE_SIGNED_MALLINFO */
-
/* Define to 1 if the system has the type `socklen_t'. */
#define HAVE_SOCKLEN_T 1
@@ -604,9 +569,6 @@
#endif
#endif
-/* Define if you have struct mallinfo */
-/* #undef HAVE_STRUCT_MALLINFO */
-
/* Define to 1 if you have the `sysconf' function. */
/* #undef HAVE_SYSCONF */
@@ -689,9 +651,6 @@
/* Define if you have mallinfo */
/* #undef HAVE_USEFUL_MALLINFO */
-/* Define to 1 if you have the <utime.h> header file. */
-/* #undef HAVE_UTIME_H */
-
/* Define if you have the LibUriParser library */
/* #undef HAVE_URIPARSER */
@@ -709,17 +668,9 @@
#define HAVE__WFOPEN 1
#endif
-/* Define to 1 if you have the <winsock2.h> header file. */
-#define HAVE_WINSOCK2_H 1
-
/* Define to 1 if you have the <winsock.h> header file. */
#define HAVE_WINSOCK_H 1
-/* Define to 1 if you have the <xmmintrin.h> header file. */
-#if !defined(_MSC_VER) || _MSC_VER > 1600
-#define HAVE_XMMINTRIN_H 1
-#endif
-
/* Define to 1 if the system has the type `_Bool'. */
/* #undef HAVE__BOOL */
@@ -852,24 +803,21 @@
#define SIZEOF_LONG_LONG 8
#endif
-/* The size of `ptrdiff_t', as computed by sizeof. */
-#ifdef _WIN64
-#define SIZEOF_PTRDIFF_T 8
-#else
-#define SIZEOF_PTRDIFF_T 4
-#endif
-
/* The size of `short', as computed by sizeof. */
#define SIZEOF_SHORT 2
/* The size of `size_t', as computed by sizeof. */
-#define SIZEOF_SIZE_T SIZEOF_PTRDIFF_T
+#ifdef _WIN64
+#define SIZEOF_SIZE_T 8
+#else
+#define SIZEOF_SIZE_T 4
+#endif
/* The size of `ssize_t', as computed by sizeof. */
-#define SIZEOF_SSIZE_T SIZEOF_PTRDIFF_T
+#define SIZEOF_SSIZE_T SIZEOF_SIZE_T
/* The size of `void *', as computed by sizeof. */
-#define SIZEOF_VOID_P SIZEOF_PTRDIFF_T
+#define SIZEOF_VOID_P SIZEOF_SIZE_T
/* The size of `__int64', as computed by sizeof. */
#define SIZEOF___INT64 8
@@ -1104,10 +1052,7 @@ typedef __uint128_t uhge;
#define ULLFMT "%I64u"
/* define printf formats for printing size_t and ssize_t variables */
-#if defined(__MINGW32__)
-# define SZFMT "%u"
-# define SSZFMT "%ld"
-#elif SIZEOF_SIZE_T == SIZEOF_INT
+#if SIZEOF_SIZE_T == SIZEOF_INT
# define SZFMT "%u"
# define SSZFMT "%d"
#elif SIZEOF_SIZE_T == SIZEOF_LONG
@@ -1120,15 +1065,7 @@ typedef __uint128_t uhge;
# error no definition for SZFMT/SSZFMT
#endif
-#if SIZEOF_PTRDIFF_T == SIZEOF_INT
-#define PDFMT "%d"
-#elif SIZEOF_PTRDIFF_T == SIZEOF_LONG
-#define PDFMT "%ld"
-#elif SIZEOF_PTRDIFF_T == SIZEOF_LONG_LONG || SIZEOF_PTRDIFF_T ==
SIZEOF___INT64
-#define PDFMT LLFMT
-#else
-#error no definition for PDFMT
-#endif
+#define PDFMT SSZFMT
#define PTRFMT "%p"
#define PTRFMTCAST
diff --git a/clients/Tests/SQL-dump.stable.out
b/clients/Tests/SQL-dump.stable.out
--- a/clients/Tests/SQL-dump.stable.out
+++ b/clients/Tests/SQL-dump.stable.out
@@ -827,7 +827,7 @@ CREATE TABLE "sys"."privileges" ("obj_id
CREATE TABLE "sys"."schemas" ("id" INTEGER, "name" VARCHAR(1024),
"authorization" INTEGER, "owner" INTEGER, "system" BOOLEAN);
CREATE TABLE "sys"."sequences" ("id" INTEGER, "schema_id" INTEGER, "name"
VARCHAR(256), "start" BIGINT, "minvalue" BIGINT, "maxvalue" BIGINT, "increment"
BIGINT, "cacheinc" BIGINT, "cycle" BOOLEAN);
CREATE TABLE "sys"."spatial_ref_sys" ("srid" INTEGER NOT NULL, "auth_name"
VARCHAR(256), "auth_srid" INTEGER, "srtext" VARCHAR(2048), "proj4text"
VARCHAR(2048), CONSTRAINT "spatial_ref_sys_srid_pkey" PRIMARY KEY ("srid"));
-CREATE TABLE "sys"."statistics" ("column_id" INTEGER, "type" CHARACTER LARGE
OBJECT, "width" INTEGER, "stamp" TIMESTAMP, "sample" BIGINT, "count" BIGINT,
"unique" BIGINT, "nils" BIGINT, "minval" CHARACTER LARGE OBJECT, "maxval"
CHARACTER LARGE OBJECT, "sorted" BOOLEAN);
+CREATE TABLE "sys"."statistics" ("column_id" INTEGER, "type" CHARACTER LARGE
OBJECT, "width" INTEGER, "stamp" TIMESTAMP, "sample" BIGINT, "count" BIGINT,
"unique" BIGINT, "nils" BIGINT, "minval" CHARACTER LARGE OBJECT, "maxval"
CHARACTER LARGE OBJECT, "sorted" BOOLEAN, "revsorted" BOOLEAN);
CREATE TABLE "sys"."storagemodelinput" ("schema" CHARACTER LARGE OBJECT,
"table" CHARACTER LARGE OBJECT, "column" CHARACTER LARGE OBJECT, "type"
CHARACTER LARGE OBJECT, "typewidth" INTEGER, "count" BIGINT, "distinct" BIGINT,
"atomwidth" INTEGER, "reference" BOOLEAN, "sorted" BOOLEAN, "revsorted"
BOOLEAN, "unique" BOOLEAN, "orderidx" BIGINT);
CREATE TABLE "sys"."systemfunctions" ("function_id" INTEGER);
CREATE TABLE "sys"."table_types" ("table_type_id" SMALLINT NOT NULL,
"table_type_name" VARCHAR(25) NOT NULL, CONSTRAINT
"table_types_table_type_id_pkey" PRIMARY KEY ("table_type_id"), CONSTRAINT
"table_types_table_type_name_unique" UNIQUE ("table_type_name"));
@@ -1642,6 +1642,7 @@ drop function pcre_replace(string, strin
[ "statistics", "minval", "clob", 0, 0, NULL, true,
8, NULL ]
[ "statistics", "maxval", "clob", 0, 0, NULL, true,
9, NULL ]
[ "statistics", "sorted", "boolean", 1, 0, NULL,
true, 10, NULL ]
+[ "statistics", "revsorted", "boolean", 1, 0, NULL,
true, 11, NULL ]
[ "storage", "schema", "clob", 0, 0, NULL, true, 0,
NULL ]
[ "storage", "table", "clob", 0, 0, NULL, true, 1,
NULL ]
[ "storage", "column", "clob", 0, 0, NULL, true, 2,
NULL ]
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
@@ -1568,7 +1568,6 @@ int OPTreduceImplementation(Client cntxt
int OPTremapImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
int OPTremoteQueriesImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
int OPTreorderImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
-str OPTsetDebugStr(void *ret, str *nme);
int OPTvolcanoImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
str OPTwrapper(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str PCREilike2(bit *ret, const str *s, const str *pat);
@@ -2315,7 +2314,6 @@ str openRef;
int open_block_stream(Stream *S, Stream *is);
str open_block_streamwrap(Stream *S, Stream *is);
str operatorName(int i);
-lng optDebug;
str optimizeMALBlock(Client cntxt, MalBlkPtr mb);
str optimizerCheck(Client cntxt, MalBlkPtr mb, str name, int actions, lng
usec);
int optimizerIsApplied(MalBlkPtr mb, str name);
@@ -2391,7 +2389,6 @@ str refineRef;
str registerRef;
str remapRef;
str remoteRef;
-void removeDataflow(MalBlkPtr mb);
void removeInstruction(MalBlkPtr mb, InstrPtr p);
void removeInstructionBlock(MalBlkPtr mb, int pc, int cnt);
void renameVariable(MalBlkPtr mb, int i, str pattern, int newid);
@@ -2474,7 +2471,6 @@ void strBeforeCall(ValPtr v, ValPtr bak)
str strEpilogue(void *ret);
str strPrelude(void *ret);
str strRef;
-str streamRef;
str streamsRef;
str stringdiff_impl(int *res, str *s1, str *s2);
str subantijoinRef;
@@ -2529,7 +2525,6 @@ str updateRef;
void updateScenario(str scen, str nme, MALfcn fcn);
str userRef;
str vectorRef;
-str windowRef;
str zero_or_oneRef;
# stream
diff --git a/clients/Tests/malcheck.stable.out
b/clients/Tests/malcheck.stable.out
--- a/clients/Tests/malcheck.stable.out
+++ b/clients/Tests/malcheck.stable.out
@@ -5,6 +5,7 @@ stdout of test 'malcheck` in directory '
# 15:15:51 > "./malcheck.sh" "malcheck"
# 15:15:51 >
+OPTsetDebugStr: missing for MAL command mdb.traceOptimizer in
monetdb5/optimizer/optimizer.mal
BSKTdrop: missing for MAL command drop in sql/backends/monet5/iot/basket.mal
BSKTerror: missing for MAL command error in sql/backends/monet5/iot/iot.mal
PNstop: missing for MAL pattern stop in sql/backends/monet5/iot/iot.mal
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -1557,7 +1557,7 @@ dump_database(Mapi mid, stream *toConsol
"t.id = tr.table_id"
") "
"SELECT sname, query FROM vft ORDER BY id";
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
