MonetDB: default - Merge with default branch.
Changeset: 2e0da9356727 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/2e0da9356727
Modified Files:
gdk/gdk_bbp.c
Branch: default
Log Message:
Merge with default branch.
diffs (26 lines):
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -2082,11 +2082,11 @@ BBPdir_step(bat bid, BUN size, int n, ch
}
}
if (!found) {
- TRC_WARNING(GDK, "file %s not
found (expected size %zu)\n", fname, free);
+ TRC_WARNING(GDK, "file %s not
found (expected size %" PRIu64 ")\n", fname, free);
} else {
assert((uint64_t) stb.st_size
>= free);
if ((uint64_t) stb.st_size <
free)
- TRC_WARNING(GDK, "file
%s too small (expected %zu, actual %zu)\n", fname, free, (size_t) stb.st_size);
+ TRC_WARNING(GDK, "file
%s too small (expected %" PRIu64 ", actual %zu)\n", fname, free, (size_t)
stb.st_size);
}
GDKfree(fname);
if (vfree == 0)
@@ -2114,7 +2114,7 @@ BBPdir_step(bat bid, BUN size, int n, ch
}
assert((uint64_t) stb.st_size >= vfree);
if ((uint64_t) stb.st_size < vfree)
- TRC_WARNING(GDK, "file %s too
small (expected %zu, actual %zu)\n", fname, vfree, (size_t) stb.st_size);
+ TRC_WARNING(GDK, "file %s too
small (expected %" PRIu64 ", actual %zu)\n", fname, vfree, (size_t)
stb.st_size);
GDKfree(fname);
break;
}
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with default branch.
Changeset: 9caddb6e0c80 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9caddb6e0c80
Modified Files:
testing/Mtest.py.in
Branch: default
Log Message:
Merge with default branch.
diffs (58 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -39,6 +39,9 @@ quiet = False
releaserun = False
+global_timeout = 0
+start_time = time.time()
+
# whether output goes to a tty
isatty = os.isatty(sys.stdout.fileno())
@@ -1223,6 +1226,8 @@ def PerformDir(env, testdir, testlist, B
body_bad.append(bodyline)
if FtOut == F_OK and FtErr == F_OK:
oktests.append(TST)
+if global_timeout and start_time + global_timeout < time.time():
+break
TIMES.append((TSTDIR, '', "%7.3f" % td, td, FdOut, FdErr, None))
if testweb:
os.chdir(TSTTRGDIR)
@@ -3540,6 +3545,8 @@ def main(argv) :
'special handling for Jenkins'),
('addreqs', None, 'addreqs', None,
'automatically add required tests when testing individual tests'),
+('global_timeout', 'T', 'global_timeout', '',
+ 'global timeout'),
]
if THISFILE == 'Mtest.py':
@@ -3621,6 +3628,7 @@ def main(argv) :
CONDITIONALS['RELEASERUN'] = releaserun
jenkins = False
addreqs = False
+global global_timeout
if THISFILE == "Mtest.py":
_IGNORE = dftIGNORE
par['IGNORE'] = opts.get('ignore', _IGNORE)
@@ -3664,6 +3672,9 @@ def main(argv) :
env['MULTIFARM'] = 'True'
jenkins = opts.get('jenkins', False)
addreqs = opts.get('addreqs', False)
+a = opts.get('global_timeout')
+if a is not None:
+global_timeout = int(a)
if THISFILE == 'Mapprove.py':
a = opts.get('ext')
if a is None:
@@ -4185,6 +4196,8 @@ def main(argv) :
body_good.append(elem)
else:
body_bad.append(elem)
+if global_timeout and start_time + global_timeout <
time.time():
+break
body = body_bad + body_good
if THISFILE == "Mtest.py":
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with default branch.
Changeset: be2906c62a48 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=be2906c62a48
Modified Files:
gdk/gdk_align.c
sql/backends/monet5/sql.c
Branch: default
Log Message:
Merge with default branch.
diffs (23 lines):
diff --git a/gdk/gdk_align.c b/gdk/gdk_align.c
--- a/gdk/gdk_align.c
+++ b/gdk/gdk_align.c
@@ -567,7 +567,7 @@ VIEWreset(BAT *b)
tp = VIEWtparent(b);
hvp = VIEWvhparent(b);
tvp = VIEWvtparent(b);
- if (hp || tp) {
+ if (hp || tp || hvp || tvp) {
BAT *m;
BATstore *bs;
BUN cnt;
@@ -590,8 +590,8 @@ VIEWreset(BAT *b)
nmelen = nme ? strlen(nme) : 0;
assert(n->batCacheid > 0);
- assert(hp || !b->htype);
- assert(tp || !b->ttype);
+ assert(hp || hvp || !b->htype);
+ assert(tp || tvp || !b->ttype);
head.farmid = BBPselectfarm(n->batRole, n->htype, offheap);
tail.farmid = BBPselectfarm(n->batRole, n->ttype, offheap);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - merge with default branch for Feb2013 release...
Changeset: 0dfed08a75b4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0dfed08a75b4
Added Files:
sql/test/centipede/Tests/olap.stable.err
sql/test/centipede/Tests/olap.stable.out
sql/test/json/Tests/books.stable.err
sql/test/json/Tests/books.stable.out
Modified Files:
monetdb5/modules/mal/tablet.c
monetdb5/optimizer/opt_centipede.c
sql/backends/monet5/rel_bin.c
sql/include/sql_relation.h
sql/server/rel_updates.c
sql/server/sql_parser.y
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_storage.h
Branch: default
Log Message:
merge with default branch for Feb2013 release branch
diffs (truncated from 1424 to 300 lines):
diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -1341,6 +1341,8 @@ SQLloader(void *p)
}
}
+#define MAXWORKERS 64
+
BUN
SQLload_file(Client cntxt, Tablet *as, bstream *b, stream *out, char *csep,
char *rsep, char quote, lng skip, lng maxrow)
{
@@ -1351,13 +1353,13 @@ SQLload_file(Client cntxt, Tablet *as, b
BUN i;
size_t rseplen;
READERtask *task = (READERtask *) GDKzalloc(sizeof(READERtask));
- READERtask ptask[16];
- int threads = (!maxrow || maxrow (1 16)) ? (GDKnr_threads 16 ?
GDKnr_threads : 16) : 1;
+ READERtask ptask[MAXWORKERS];
+ int threads = (!maxrow || maxrow (1 16)) ? (GDKnr_threads
MAXWORKERS ? GDKnr_threads : MAXWORKERS) : 1;
lng lio = 0, tio, t1 = 0, total = 0, iototal = 0;
int vmtrim = GDK_vm_trim;
str msg = MAL_SUCCEED;
- for (i = 0; i 16; i++)
+ for (i = 0; i MAXWORKERS; i++)
ptask[i].cols = 0;
if (task == 0) {
@@ -1524,7 +1526,7 @@ SQLload_file(Client cntxt, Tablet *as, b
* In the first phase we simply break the lines at the
* record boundary. */
if (quote == 0) {
- if (rseplen == 1)
+ if (rseplen == 1) {
for (; *e; e++) {
if (*e == '\\') {
e++;
@@ -1532,7 +1534,17 @@ SQLload_file(Client cntxt, Tablet *as, b
}
if (*e == *rsep)
break;
- } else
+ }
+ } else if (rseplen == 2) {
+ for (; *e; e++) {
+ if (*e == '\\') {
+ e++;
+ continue;
+ }
+ if (*e == *rsep e[1] ==
rsep[1])
+ break;
+ }
+ } else {
for (; *e; e++) {
if (*e == '\\') {
e++;
@@ -1541,6 +1553,7 @@ SQLload_file(Client cntxt, Tablet *as, b
if (*e == *rsep strncmp(e,
rsep, rseplen) == 0)
break;
}
+ }
if (*e == 0)
e = 0; /* nonterminated
record, we need more */
} else if (rseplen == 1) {
@@ -1557,6 +1570,20 @@ SQLload_file(Client cntxt, Tablet *as, b
}
if (*e == 0)
e = 0; /* nonterminated
record, we need more */
+ } else if (rseplen == 2) {
+ for (; *e; e++) {
+ if (*e == q)
+ q = 0;
+ else if (*e == quote)
+ q = *e;
+ else if (*e == '\\') {
+ if (e[1])
+ e++;
+ } else if (!q e[0] == rsep[0]
e[1] == rsep[1])
+ break;
+ }
+ if (*e == 0)
+ e = 0; /* nonterminated
record, we
Re: MonetDB: default - Merge with default branch.
oop, sorry, message should have been
Merge with Apr2012 branch.
Stefan
On Sat, Mar 17, 2012 at 03:20:38PM +0100, Stefan Manegold wrote:
Changeset: 498e01451664 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=498e01451664
Modified Files:
clients/mapiclient/mclient.c
monetdb5/mal/mal_resolve.c
sql/backends/monet5/UDF/udf.c
sql/backends/monet5/UDF/udf.h
sql/test/bugs/Tests/crash_order_by.stable.out
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/merovingian.c
Branch: default
Log Message:
Merge with default branch.
diffs (truncated from 413 to 300 lines):
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -654,7 +654,9 @@ CSVrenderer(MapiHdl hdl)
s = mapi_fetch_field(hdl, i);
if (s == NULL)
s = nullstring == default_nullstring ? :
nullstring;
- if (strchr(s, *sep) != NULL || strchr(s, '\n') != NULL
|| strchr(s, '') != NULL) {
+ if (strchr(s, *sep) != NULL ||
+ strchr(s, '\n') != NULL ||
+ strchr(s, '') != NULL) {
mnstr_printf(toConsole, %s\,
i == 0 ? : sep);
while (*s) {
@@ -675,8 +677,6 @@ CSVrenderer(MapiHdl hdl)
mnstr_write(toConsole, \\,
1, 2);
break;
default:
- if (*s == *sep)
- mnstr_write(toConsole,
\\, 1, 1);
mnstr_write(toConsole, s, 1, 1);
break;
}
diff --git a/monetdb5/mal/mal_resolve.c b/monetdb5/mal/mal_resolve.c
--- a/monetdb5/mal/mal_resolve.c
+++ b/monetdb5/mal/mal_resolve.c
@@ -68,7 +68,7 @@
* These examples give little room to achieve our prime objective, i.e.
* a fast and early type resolution scheme. Any non-polymorphic function
* can be type checked and marked type-safe upon completion.
- * Type checking polymorphic functions are post-poned until a concrete
+ * Type checking polymorphic functions are postponed until a concrete
* type instance is known. It leads to a clone, which can be type checked
* and is entered into the symbol table.
* The type resolution status is marked in each instruction.
diff --git a/sql/backends/monet5/UDF/udf.c b/sql/backends/monet5/UDF/udf.c
--- a/sql/backends/monet5/UDF/udf.c
+++ b/sql/backends/monet5/UDF/udf.c
@@ -3,26 +3,26 @@
* Version 1.1 (the License); you may not use this file except in
* compliance with the License. You may obtain a copy of the License at
* http://www.monetdb.org/Legal/MonetDBLicense
- *
+ *
* Software distributed under the License is distributed on an AS IS
* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
* License for the specific language governing rights and limitations
* under the License.
- *
+ *
* The Original Code is the MonetDB Database System.
- *
+ *
* The Initial Developer of the Original Code is CWI.
* Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
* Copyright August 2008-2012 MonetDB B.V.
* All Rights Reserved.
-*/
-
+ */
#include monetdb_config.h
#include udf.h
/* Reverse a string */
-str UDFreverse ( str *ret , str *arg )
+str
+UDFreverse(str *ret, str *arg)
{
size_t len = 0;
str src = NULL, dst = NULL;
@@ -37,7 +37,8 @@ str UDFreverse ( str *ret , str *arg )
if (src == NULL || strcmp(src, str_nil) == 0) {
*ret = GDKstrdup(str_nil);
if (*ret == NULL)
- throw(MAL, udf.reverse, failed to create copy of
str_nil);
+ throw(MAL, udf.reverse,
+ failed to create copy of str_nil);
return MAL_SUCCEED;
}
@@ -46,7 +47,8 @@ str UDFreverse ( str *ret , str *arg )
len = strlen(src);
*ret = dst = GDKmalloc(len + 1);
if (dst == NULL)
- throw(MAL, udf.reverse, failed to allocate string of length
SZFMT, len+1);
+ throw(MAL, udf.reverse,
+ failed to allocate string of length SZFMT, len + 1);
/* copy characters from src to dst in reverse order */
dst[len] = 0;
@@ -62,7 +64,8 @@ str UDFreverse ( str *ret , str *arg )
* Generic type-oblivious version,
* using generic type-oblivious BAT access interface.
*/
-str UDFBATreverse ( bat *ret , bat *bid )
+str
+UDFBATreverse(bat *ret, bat *bid)
{
BATiter li;
BAT *bn =
