Changeset: 0b5e7a22514e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0b5e7a22514e
Removed Files:
monetdb5/modules/atoms/mtime_private.h
Modified Files:
MonetDB.spec
clients/mapiclient/dump.c
debian/rules
gdk/gdk_analytic_bounds.c
gdk/gdk_calc.c
gdk/gdk_posix.c
gdk/gdk_system.c
gdk/gdk_value.c
monetdb5/mal/mal.h
monetdb5/mal/mal_client.c
monetdb5/mal/mal_client.h
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_instruction.h
monetdb5/mal/mal_namespace.h
monetdb5/mal/mal_resolve.c
monetdb5/mal/mal_scenario.c
monetdb5/mal/mal_scenario.h
monetdb5/mal/mal_stack.h
monetdb5/mal/mal_type.h
monetdb5/modules/atoms/Makefile.ag
monetdb5/modules/atoms/mtime_analytic.c
monetdb5/optimizer/opt_wlc.c
sql/ChangeLog.Apr2019
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_rank.c
sql/server/rel_exp.c
sql/server/rel_propagate.c
sql/server/rel_select.c
sql/server/sql_atom.c
sql/server/sql_atom.h
sql/server/sql_partition.c
sql/storage/bat/bat_storage.c
sql/storage/store.c
sql/test/BugTracker-2014/Tests/acidity-fail.Bug-3635.py
sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/select2.test.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/select3.test.timeout
sql/test/analytics/Tests/analytics03.stable.err
sql/test/analytics/Tests/analytics03.stable.out
sql/test/merge-partitions/Tests/mergepart05.sql
sql/test/merge-partitions/Tests/mergepart05.stable.err
sql/test/merge-partitions/Tests/mergepart05.stable.out
sql/test/merge-partitions/Tests/mergepart07.stable.err
sql/test/testdb-reload/Tests/reload.stable.out
sql/test/testdb/Tests/dump.stable.out
sql/test/testdb/Tests/load.sql
Branch: mtime
Log Message:
Merge with default branch.
diffs (truncated from 14350 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -955,7 +955,6 @@ fi
export CFLAGS
%{configure} \
--enable-assert=no \
- --enable-console=yes \
--enable-debug=no \
--enable-developer=no \
--enable-embedded=no \
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -2702,14 +2702,20 @@ dump_database(Mapi mid, stream *toConsol
maxv = mapi_fetch_field(shdl, 1);
wnulls = mapi_fetch_field(shdl, 2);
}
- if (minv && maxv) {
+ if (minv || maxv) {
mnstr_printf(toConsole, " FROM ");
- squoted_print(toConsole, minv, '\'');
+ if (minv)
+ squoted_print(toConsole, minv,
'\'');
+ else
+ mnstr_printf(toConsole, "RANGE
MINVALUE");
mnstr_printf(toConsole, " TO ");
- squoted_print(toConsole, maxv, '\'');
+ if (maxv)
+ squoted_print(toConsole, maxv,
'\'');
+ else
+ mnstr_printf(toConsole, "RANGE
MAXVALUE");
}
if (strcmp(wnulls, "true") == 0) {
- mnstr_printf(toConsole, " %s NULL
VALUES", (minv && maxv) ? "WITH" : "FOR");
+ mnstr_printf(toConsole, " %s NULL
VALUES", (minv || maxv) ? "WITH" : "FOR");
}
mapi_close_handle(shdl);
}
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,6 @@ DH_VERBOSE=1
override_dh_auto_configure:
dh_auto_configure -- \
--enable-assert=no \
- --enable-console=yes \
--enable-debug=no \
--enable-developer=no \
--enable-embedded=no \
diff --git a/gdk/gdk_analytic_bounds.c b/gdk/gdk_analytic_bounds.c
--- a/gdk/gdk_analytic_bounds.c
+++ b/gdk/gdk_analytic_bounds.c
@@ -529,13 +529,13 @@ GDKanalyticalrowbounds(BAT *r, BAT *b, B
lng limit;
switch (tp2) {
case TYPE_bte:
- limit = (lng) (*(bte *) bound);
+ limit = is_bte_nil(*(bte *) bound) ? lng_nil : (lng)
*(bte *) bound;
break;
case TYPE_sht:
- limit = (lng) (*(sht *) bound);
+ limit = is_sht_nil(*(sht *) bound) ? lng_nil : (lng)
*(sht *) bound;
break;
case TYPE_int:
- limit = (lng) (*(int *) bound);
+ limit = is_int_nil(*(int *) bound) ? lng_nil : (lng)
*(int *) bound;
break;
case TYPE_lng:
limit = (lng) (*(lng *) bound);
@@ -543,7 +543,7 @@ GDKanalyticalrowbounds(BAT *r, BAT *b, B
default:
goto bound_not_supported;
}
- if (limit == GDK_lng_max) {
+ if (is_lng_nil(limit)) {
return GDKanalyticalallbounds(r, b, p, preceding);
} else if (preceding) {
ANALYTICAL_WINDOW_BOUNDS_BRANCHES_ROWS(_PRECEDING,
limit);
@@ -655,7 +655,7 @@ GDKanalyticalrangebounds(BAT *r, BAT *b,
switch (tp2) {
case TYPE_bte:{
bte ll = (*(bte *) bound);
- if (ll == GDK_bte_max) /* UNBOUNDED PRECEDING
and UNBOUNDED FOLLOWING cases, avoid overflow */
+ if (is_bte_nil(ll)) /* UNBOUNDED PRECEDING
and UNBOUNDED FOLLOWING cases, avoid overflow */
return GDKanalyticalallbounds(r, b, p,
preceding);
else
limit = (lng) ll;
@@ -663,7 +663,7 @@ GDKanalyticalrangebounds(BAT *r, BAT *b,
}
case TYPE_sht:{
sht ll = (*(sht *) bound);
- if (ll == GDK_sht_max)
+ if (is_sht_nil(ll))
return GDKanalyticalallbounds(r, b, p,
preceding);
else
limit = (lng) ll;
@@ -671,7 +671,7 @@ GDKanalyticalrangebounds(BAT *r, BAT *b,
}
case TYPE_int:{
int ll = (*(int *) bound);
- if (ll == GDK_int_max)
+ if (is_int_nil(ll))
return GDKanalyticalallbounds(r, b, p,
preceding);
else
limit = (lng) ll;
@@ -679,7 +679,7 @@ GDKanalyticalrangebounds(BAT *r, BAT *b,
}
case TYPE_lng:{
lng ll = (*(lng *) bound);
- if (ll == GDK_lng_max)
+ if (is_lng_nil(ll))
return GDKanalyticalallbounds(r, b, p,
preceding);
else
limit = (lng) ll;
@@ -697,7 +697,7 @@ GDKanalyticalrangebounds(BAT *r, BAT *b,
}
case TYPE_flt:{
flt limit = (*(flt *) bound);
- if (limit == GDK_flt_max) {
+ if (is_flt_nil(limit)) {
return GDKanalyticalallbounds(r, b, p,
preceding);
} else if (preceding) {
ANALYTICAL_WINDOW_BOUNDS_BRANCHES_RANGE_FLT(_PRECEDING, limit);
@@ -708,7 +708,7 @@ GDKanalyticalrangebounds(BAT *r, BAT *b,
}
case TYPE_dbl:{
dbl limit = (*(dbl *) bound);
- if (limit == GDK_dbl_max) {
+ if (is_dbl_nil(limit)) {
return GDKanalyticalallbounds(r, b, p,
preceding);
} else if (preceding) {
ANALYTICAL_WINDOW_BOUNDS_BRANCHES_RANGE_DBL(_PRECEDING, limit);
@@ -720,7 +720,7 @@ GDKanalyticalrangebounds(BAT *r, BAT *b,
#ifdef HAVE_HGE
case TYPE_hge:{
hge limit = (*(hge *) bound);
- if (limit == GDK_hge_max) {
+ if (is_hge_nil(limit)) {
return GDKanalyticalallbounds(r, b, p,
preceding);
} else if (preceding) {
ANALYTICAL_WINDOW_BOUNDS_BRANCHES_RANGE_HGE(_PRECEDING, limit);
@@ -804,13 +804,13 @@ GDKanalyticalgroupsbounds(BAT *r, BAT *b
lng limit;
switch (tp2) {
case TYPE_bte:
- limit = (lng) (*(bte *) bound);
+ limit = is_bte_nil(*(bte *) bound) ? lng_nil : (lng)
*(bte *) bound;
break;
case TYPE_sht:
- limit = (lng) (*(sht *) bound);
+ limit = is_sht_nil(*(sht *) bound) ? lng_nil : (lng)
*(sht *) bound;
break;
case TYPE_int:
- limit = (lng) (*(int *) bound);
+ limit = is_int_nil(*(int *) bound) ? lng_nil : (lng)
*(int *) bound;
break;
case TYPE_lng:
limit = (lng) (*(lng *) bound);
@@ -818,7 +818,7 @@ GDKanalyticalgroupsbounds(BAT *r, BAT *b
default:
goto bound_not_supported;
}
- if (limit == GDK_lng_max) {
+ if (is_lng_nil(limit)) {
return GDKanalyticalallbounds(r, b, p, preceding);
} else if (preceding) {
ANALYTICAL_WINDOW_BOUNDS_BRANCHES_GROUPS(_PRECEDING,
limit);
diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -14617,5 +14617,6 @@ VARconvert(ValPtr ret, const ValRecord *
ATOMname(v->vtype), ATOMname(ret->vtype));
return GDK_FAIL;
}
+ ret->len = ATOMlen(ret->vtype, VALptr(ret));
return nils == BUN_NONE ? GDK_FAIL : GDK_SUCCEED;
}
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -347,7 +347,6 @@ MT_getrss(void)
return 0;
}
-
void *
MT_mmap(const char *path, int mode, size_t len)
{
@@ -745,11 +744,9 @@ MT_init_posix(void)
size_t
MT_getrss(void)
{
-#ifdef _WIN64
PROCESS_MEMORY_COUNTERS ctr;
if (GetProcessMemoryInfo(GetCurrentProcess(), &ctr, sizeof(ctr)))
return ctr.WorkingSetSize;
-#endif
return 0;
}
@@ -903,7 +900,6 @@ MT_path_absolute(const char *pathname)
(pathname[0] == '\\' && pathname[1] == '\\'));
}
-
#ifndef HAVE_GETTIMEOFDAY
static int nodays[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
diff --git a/gdk/gdk_system.c b/gdk/gdk_system.c
--- a/gdk/gdk_system.c
+++ b/gdk/gdk_system.c
@@ -809,7 +809,6 @@ MT_join_thread(MT_Id t)
return 0;
}
-
int
MT_kill_thread(MT_Id t)
{
diff --git a/gdk/gdk_value.c b/gdk/gdk_value.c
--- a/gdk/gdk_value.c
+++ b/gdk/gdk_value.c
@@ -74,17 +74,15 @@ VALset(ValPtr v, int t, ptr p)
#endif
case TYPE_str:
v->val.sval = (str) p;
- v->len = strLen((str) p);
break;
case TYPE_ptr:
v->val.pval = *(ptr *) p;
- v->len = ATOMlen(t, *(ptr *) p);
break;
default:
v->val.pval = p;
- v->len = ATOMlen(t, p);
break;
}
+ v->len = ATOMlen(v->vtype, VALptr(v));
return v;
}
@@ -163,6 +161,7 @@ VALcopy(ValPtr d, const ValRecord *s)
return NULL;
memcpy(d->val.pval, p, d->len);
}
+ d->len = ATOMlen(d->vtype, VALptr(d));
return d;
}
@@ -219,8 +218,9 @@ VALinit(ValPtr d, int tpe, const void *s
if (d->val.pval == NULL)
return NULL;
memcpy(d->val.pval, s, d->len);
- break;
+ return d;
}
+ d->len = ATOMlen(d->vtype, VALptr(d));
return d;
}
diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h
--- a/monetdb5/mal/mal.h
+++ b/monetdb5/mal/mal.h
@@ -30,7 +30,6 @@
# include <sys/times.h>
#endif
-#include <setjmp.h>
/*
* MonetDB Calling Options
* The number of invocation arguments is kept to a minimum.
@@ -110,8 +109,6 @@ mal_export void mserver_reset(void);
#define VARARGS 1 /* deal with variable arguments
*/
#define VARRETS 2
-#define SERVERSHUTDOWNDELAY 5 /* seconds */
-
typedef int malType;
typedef str (*MALfcn) ();
@@ -206,7 +203,6 @@ typedef struct MALBLK {
#define STACKINCR 128
#define MAXGLOBALS (4 * STACKINCR)
-#define MAXSHARES 8
typedef int (*DFhook) (void *, void *, void *, void *);
@@ -217,8 +213,6 @@ typedef struct MALSTK {
int stkdepth; /* to protect against runtime stack overflow */
int calldepth; /* to protect against runtime stack overflow */
short keepAlive; /* do not garbage collect when set */
- short garbageCollect; /* stack needs garbage collection */
- lng tmpspace; /* amount of temporary space produced */
/*
* Parallel processing is mostly driven by dataflow, but within this
context
* there may be different schemes to take instructions into execution.
diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c
--- a/monetdb5/mal/mal_client.c
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
