Changeset: 05a6c02139b5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=05a6c02139b5
Modified Files:
sql/server/rel_updates.c
Branch: default
Log Message:
Merge with oscar branch.
diffs (59 lines):
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -750,7 +750,7 @@ COLcopy(BAT *b, int tt, bool writable, r
/* make sure we use the correct capacity */
bn->batCapacity = (BUN) (bn->ttype ? bn->theap.size >>
bn->tshift : 0);
- } else if (BATatoms[tt].atomFix || tt != TYPE_void ||
ATOMextern(tt)) {
+ } else if (BATatoms[tt].atomFix || ATOMextern(tt)) {
/* case (4): one-by-one BUN insert (really slow) */
BUN p, q, r = 0;
BATiter bi = bat_iterator(b);
diff --git a/sql/server/rel_updates.c b/sql/server/rel_updates.c
--- a/sql/server/rel_updates.c
+++ b/sql/server/rel_updates.c
@@ -1665,7 +1665,7 @@ copyfrom(sql_query *query, dlist *qname,
size_t l = strlen(cs->type.type->sqlname);
char *fname = sa_alloc(sql->sa, l+8);
- snprintf(fname, l+8, "str_to_%s",
cs->type.type->sqlname);
+ snprintf(fname, l+8, "str_to_%s",
strcmp(cs->type.type->sqlname, "timestamptz") == 0 ? "timestamp" :
cs->type.type->sqlname);
sql_find_subtype(&st, "clob", 0, 0);
f = sql_bind_func_result(sql->sa, sys, fname,
F_FUNC, &cs->type, 2, &st, &st);
if (!f)
diff --git a/testing/Mfilter.py b/testing/Mfilter.py
--- a/testing/Mfilter.py
+++ b/testing/Mfilter.py
@@ -157,7 +157,8 @@ def mFilter (FILE, IGNORE) :
ftmp = []
- ig = n = 0
+ n = 0
+ ig = False
il = iw = ic = el = ew = ec = al = aw = ac = 0
for iline in openutf8(FILE, 'rU'):
iline = iline.replace('\033[?1034h','')
@@ -173,7 +174,7 @@ def mFilter (FILE, IGNORE) :
iline = re.sub(r'(\d+(?:\.\d*)?e[-+]?)0*(\d+)', r'\1\2', iline)
oline = xline = ""
if iline == "#~BeginVariableOutput~#\n" or iline ==
"#~BeginProfilingOutput~#\n" or iline == "[ \"~BeginVariableOutput~\"\t]\n" or
iline == "[ \"~BeginProfilingOutput~\"\t]\n":
- ig = 1
+ ig = True
n = 0
if ig and ( len(iline) == 0 or iline[0] != "!" or iline[:9] !=
"ERROR = !" ):
# ignore differences in "VariableOutput" or "ProfilingOutput"
@@ -226,10 +227,10 @@ def mFilter (FILE, IGNORE) :
else:
oline = iline
if iline == "#~EndVariableOutput~#\n" or iline == "[
\"~EndVariableOutput~\"\t]\n":
- ig = 0
+ ig = False
xline = "~ " + str(n) + " ~\n"
if iline == "#~EndProfilingOutput~#\n" or iline == "[
\"~EndProfilingOutput~\"\t]\n":
- ig = 0
+ ig = False
for ln in oline, xline:
if len(ln):
w = len(ln.split())
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
