Changeset: 0e95d1e048d7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0e95d1e048d7
Modified Files:
gdk/gdk.h
gdk/gdk_bbp.c
gdk/gdk_private.h
monetdb5/extras/jaql/jaqlgencode.c
testing/Mtest.py.in
Branch: lodrdf
Log Message:
Merge with the default branch
diffs (174 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1838,11 +1838,11 @@ typedef struct {
} BBPrec;
gdk_export bat BBPlimit;
-#define N_BBPINIT 100
+#define N_BBPINIT 1000
#if SIZEOF_VOID_P == 4
#define BBPINITLOG 11
#else
-#define BBPINITLOG 13
+#define BBPINITLOG 14
#endif
#define BBPINIT (1 << BBPINITLOG)
/* absolute maximum number of BATs is N_BBPINIT * BBPINIT */
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -399,6 +399,7 @@ recover_dir(int direxists)
return GDKmove(BAKDIR, "BBP", "dir", BATDIR, "BBP", "dir");
}
+static int BBPrecover(void);
static int BBPrecover_subdir(void);
static int BBPdiskscan(const char *);
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -55,7 +55,6 @@ void BBPdump(void); /* never called: fo
void BBPexit(void);
void BBPinit(void);
bat BBPinsert(BATstore *bs);
-int BBPrecover(void);
void BBPreleaselref(bat i);
void BBPtrim(size_t delta);
void BBPunshare(bat b);
diff --git a/monetdb5/extras/jaql/jaqlgencode.c
b/monetdb5/extras/jaql/jaqlgencode.c
--- a/monetdb5/extras/jaql/jaqlgencode.c
+++ b/monetdb5/extras/jaql/jaqlgencode.c
@@ -5954,6 +5954,19 @@ dumptree(jc *j, Client cntxt, MalBlkPtr
b = dumprefvar(j, mb, w->tval2, a);
/* b should point to all "groups" now */
+ g = dumpnextid(mb, j->j1);
+ dumpbatwritable(j, mb, 1);
+ q = newInstruction(mb, ASSIGNsymbol);
+ setModuleId(q, batRef);
+ setFunctionId(q, insertRef);
+ q = pushReturn(mb, q,
newTmpVariable(mb, TYPE_any));
+ q = pushArgument(mb, q, j->j1);
+ q = pushArgument(mb, q, g);
+ q = pushBte(mb, q, 'a');
+ j->j1 = getArg(q, 0);
+ pushInstruction(mb, q);
+ j->startoid = g;
+ dumpbatwritable(j, mb, 5);
for (; *lp != -1; lp++) {
q = newInstruction(mb,
ASSIGNsymbol);
setModuleId(q, algebraRef);
@@ -6021,24 +6034,6 @@ dumptree(jc *j, Client cntxt, MalBlkPtr
/* e = grouparrayid:elementid */
q = newInstruction(mb,
ASSIGNsymbol);
- setModuleId(q, algebraRef);
- setFunctionId(q, projectRef);
- q = pushReturn(mb, q,
newTmpVariable(mb, TYPE_any));
- q = pushOid(mb, q, (oid)0);
- q = pushArgument(mb, q, e);
- d = getArg(q, 0);
- pushInstruction(mb, q);
- q = newInstruction(mb,
ASSIGNsymbol);
- setModuleId(q, algebraRef);
- setFunctionId(q,
putName("sdifference", 11));
- q = pushReturn(mb, q,
newTmpVariable(mb, TYPE_any));
- q = pushArgument(mb, q, j->j5);
- q = pushArgument(mb, q, d);
- j->j5 = getArg(q, 0);
- j->ro5 = 0;
- pushInstruction(mb, q);
-
- q = newInstruction(mb,
ASSIGNsymbol);
setModuleId(q, batRef);
setFunctionId(q, insertRef);
q = pushReturn(mb, q,
newTmpVariable(mb, TYPE_any));
@@ -6058,7 +6053,7 @@ dumptree(jc *j, Client cntxt, MalBlkPtr
setModuleId(q, algebraRef);
setFunctionId(q, projectRef);
q = pushReturn(mb, q,
newTmpVariable(mb, TYPE_any));
- q = pushOid(mb, q, (oid)0);
+ q = pushArgument(mb, q, g);
q = pushArgument(mb, q, e);
e = getArg(q, 0);
pushInstruction(mb, q);
@@ -6079,7 +6074,6 @@ dumptree(jc *j, Client cntxt, MalBlkPtr
q = pushBte(mb, q, 'a');
e = getArg(q, 0);
pushInstruction(mb, q);
- dumpbatwritable(j, mb, 1);
q = newInstruction(mb,
ASSIGNsymbol);
setModuleId(q, batRef);
setFunctionId(q, insertRef);
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -58,6 +58,16 @@ quiet = False
releaserun = False
+if os.isatty(sys.stdout.fileno()):
+ # color output a little
+ RED = '\033[1;31m'
+ GREEN = '\033[0;32m'
+ PURPLE = '\033[1;35m' # actually magenta
+ BLACK = '\033[0;0m'
+else:
+ # no coloring if not to a tty
+ RED = GREEN = PURPLE = BLACK = ''
+
# Python 2.3 doesn't know about os.devnull...
try:
os.devnull
@@ -74,7 +84,7 @@ def ErrExit(msg):
def _configure(str):
# expand configure variables in str and return result
config = [
- ('${source}', '@QXSOURCE@'),
+ ('{source}', '@QXSOURCE@'),
('${build}', '@QXBUILD@'),
('${bindir}', '@QXbindir@'),
@@ -2248,29 +2258,29 @@ def RunTest(env, TST, BusyPorts, COND, o
if not verbose and not quiet:
if tres == 'timeout':
- STDOUT.write("TIMEOUT")
+ STDOUT.write("%sTIMEOUT%s" % (PURPLE, BLACK))
elif tres == 'recursion':
- STDOUT.write("RECURSION")
+ STDOUT.write("%sRECURSION%s" % (PURPLE, BLACK))
elif tres == 'segfault':
- STDOUT.write("CRASHED")
+ STDOUT.write("%sCRASHED%s" % (PURPLE, BLACK))
elif tres == 'abort':
- STDOUT.write('ABORTED')
+ STDOUT.write('%sABORTED%s' % (PURPLE, BLACK))
elif tres == 'signal':
- STDOUT.write('SIGNALED')
+ STDOUT.write('%sSIGNALED%s' % (PURPLE, BLACK))
else:
if FailedOut == F_OK:
- STDOUT.write('OK ')
+ STDOUT.write('%sOK%s ' % (GREEN, BLACK))
elif FailedOut == F_WARN:
- STDOUT.write('minor')
+ STDOUT.write('%sminor%s' % (GREEN, BLACK))
else:
- STDOUT.write('MAJOR')
+ STDOUT.write('%sMAJOR%s' % (RED, BLACK))
STDOUT.write(' ')
if FailedErr == F_OK:
- STDOUT.write('OK')
+ STDOUT.write('%sOK%s' % (GREEN, BLACK))
elif FailedErr == F_WARN:
- STDOUT.write('minor')
+ STDOUT.write('%sminor%s' % (GREEN, BLACK))
else:
- STDOUT.write('MAJOR')
+ STDOUT.write('%sMAJOR%s' % (RED, BLACK))
STDOUT.write('\n')
return TX,FailedOut,FailedErr,elem,reason,links
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
