Changeset: 0ca1c38fc396 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0ca1c38fc396
Modified Files:
gdk/gdk_select.c
gdk/gdk_setop.mx
testing/Mfilter.py.in
testing/cmptests.py
testing/listexports.py.in
testing/process.py
testing/subprocess26.py
Branch: Feb2013
Log Message:
Merge with Oct2012 branch.
diffs (truncated from 684 to 300 lines):
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -200,111 +200,111 @@ do {
\
} while (0)
/* scan select predicate switch */
-#define scantest(CAND,READ,COMP,NIL1,NIL2)
\
-do {
\
- if (equi ) {
\
- scanloop(CAND,READ, COMP(v,==,vl) );
\
- } else
\
- if ( anti && b->T->nonil && lval && !li && hval && !hi) {
\
- scanloop(CAND,READ,(COMP(v,<=,vl) || COMP(v,>=,vh)) );
\
- } else
\
- if ( anti && b->T->nonil && lval && !li && hval && hi) {
\
- scanloop(CAND,READ,(COMP(v,<=,vl) || COMP(v,> ,vh)) );
\
- } else
\
- if ( anti && b->T->nonil && lval && li && hval && !hi) {
\
- scanloop(CAND,READ,(COMP(v,< ,vl) || COMP(v,>=,vh)) );
\
- } else
\
- if ( anti && b->T->nonil && lval && li && hval && hi) {
\
- scanloop(CAND,READ,(COMP(v,< ,vl) || COMP(v,> ,vh)) );
\
- } else
\
- if ( anti && b->T->nonil && lval && !li && !hval ) {
\
- scanloop(CAND,READ,(COMP(v,<=,vl) ) );
\
- } else
\
- if ( anti && b->T->nonil && lval && li && !hval ) {
\
- scanloop(CAND,READ,(COMP(v,< ,vl) ) );
\
- } else
\
- if ( anti && b->T->nonil && !lval && hval && !hi) {
\
- scanloop(CAND,READ,( COMP(v,>=,vh)) );
\
- } else
\
- if ( anti && b->T->nonil && !lval && hval && hi) {
\
- scanloop(CAND,READ,( COMP(v,> ,vh)) );
\
- } else
\
- if ( anti && !b->T->nonil && lval && !li && hval && !hi) {
\
- scanloop(CAND,READ,(COMP(v,<=,vl) || COMP(v,>=,vh)) NIL1(v));
\
- } else
\
- if ( anti && !b->T->nonil && lval && !li && hval && hi) {
\
- scanloop(CAND,READ,(COMP(v,<=,vl) || COMP(v,> ,vh)) NIL1(v));
\
- } else
\
- if ( anti && !b->T->nonil && lval && li && hval && !hi) {
\
- scanloop(CAND,READ,(COMP(v,< ,vl) || COMP(v,>=,vh)) NIL1(v));
\
- } else
\
- if ( anti && !b->T->nonil && lval && li && hval && hi) {
\
- scanloop(CAND,READ,(COMP(v,< ,vl) || COMP(v,> ,vh)) NIL1(v));
\
- } else
\
- if ( anti && !b->T->nonil && lval && !li && !hval ) {
\
- scanloop(CAND,READ,(COMP(v,<=,vl) ) NIL1(v));
\
- } else
\
- if ( anti && !b->T->nonil && lval && li && !hval ) {
\
- scanloop(CAND,READ,(COMP(v,< ,vl) ) NIL1(v));
\
- } else
\
- if ( anti && !b->T->nonil && !lval && hval && !hi) {
\
- scanloop(CAND,READ,( COMP(v,>=,vh)) NIL2(v));
\
- } else
\
- if ( anti && !b->T->nonil && !lval && hval && hi) {
\
- scanloop(CAND,READ,( COMP(v,> ,vh)) NIL2(v));
\
- } else
\
- if (!anti && b->T->nonil && lval && !li && hval && !hi) {
\
- scanloop(CAND,READ,(COMP(v,> ,vl) && COMP(v,< ,vh)) );
\
- } else
\
- if (!anti && b->T->nonil && lval && !li && hval && hi) {
\
- scanloop(CAND,READ,(COMP(v,> ,vl) && COMP(v,<=,vh)) );
\
- } else
\
- if (!anti && b->T->nonil && lval && li && hval && !hi) {
\
- scanloop(CAND,READ,(COMP(v,>=,vl) && COMP(v,< ,vh)) );
\
- } else
\
- if (!anti && b->T->nonil && lval && li && hval && hi) {
\
- scanloop(CAND,READ,(COMP(v,>=,vl) && COMP(v,<=,vh)) );
\
- } else
\
- if (!anti && b->T->nonil && lval && !li && !hval ) {
\
- scanloop(CAND,READ,(COMP(v,> ,vl) ) );
\
- } else
\
- if (!anti && b->T->nonil && lval && li && !hval ) {
\
- scanloop(CAND,READ,(COMP(v,>=,vl) ) );
\
- } else
\
- if (!anti && b->T->nonil && !lval && hval && !hi) {
\
- scanloop(CAND,READ,( COMP(v,< ,vh)) );
\
- } else
\
- if (!anti && b->T->nonil && !lval && hval && hi) {
\
- scanloop(CAND,READ,( COMP(v,<=,vh)) );
\
- } else
\
- if (!anti && !b->T->nonil && lval && !li && hval && !hi) {
\
- scanloop(CAND,READ,(COMP(v,> ,vl) && COMP(v,< ,vh)) NIL2(v));
\
- } else
\
- if (!anti && !b->T->nonil && lval && !li && hval && hi) {
\
- scanloop(CAND,READ,(COMP(v,> ,vl) && COMP(v,<=,vh)) NIL2(v));
\
- } else
\
- if (!anti && !b->T->nonil && lval && li && hval && !hi) {
\
- scanloop(CAND,READ,(COMP(v,>=,vl) && COMP(v,< ,vh)) NIL2(v));
\
- } else
\
- if (!anti && !b->T->nonil && lval && li && hval && hi) {
\
- scanloop(CAND,READ,(COMP(v,>=,vl) && COMP(v,<=,vh)) NIL2(v));
\
- } else
\
- if (!anti && !b->T->nonil && lval && !li && !hval ) {
\
- scanloop(CAND,READ,(COMP(v,> ,vl) ) NIL2(v));
\
- } else
\
- if (!anti && !b->T->nonil && lval && li && !hval ) {
\
- scanloop(CAND,READ,(COMP(v,>=,vl) ) NIL2(v));
\
- } else
\
- if (!anti && !b->T->nonil && !lval && hval && !hi) {
\
- scanloop(CAND,READ,( COMP(v,< ,vh)) NIL1(v));
\
- } else
\
- if (!anti && !b->T->nonil && !lval && hval && hi) {
\
- scanloop(CAND,READ,( COMP(v,<=,vh)) NIL1(v));
\
- } else
\
- if (!anti && !b->T->nonil && !lval && !hval ) {
\
- scanloop(CAND,READ, COMP(v,!=,nil) );
\
- } else
\
- assert(0);
\
+#define scantest(CAND,READ,COMP,NIL1,NIL2) \
+do { \
+ if (equi ) { \
+ scanloop(CAND,READ, COMP(v,==,vl) ); \
+ } else \
+ if ( anti && b->T->nonil && lval && !li && hval && !hi) { \
+ scanloop(CAND,READ,(COMP(v,<=,vl) || COMP(v,>=,vh)) ); \
+ } else \
+ if ( anti && b->T->nonil && lval && !li && hval && hi) { \
+ scanloop(CAND,READ,(COMP(v,<=,vl) || COMP(v,> ,vh)) ); \
+ } else \
+ if ( anti && b->T->nonil && lval && li && hval && !hi) { \
+ scanloop(CAND,READ,(COMP(v,< ,vl) || COMP(v,>=,vh)) ); \
+ } else \
+ if ( anti && b->T->nonil && lval && li && hval && hi) { \
+ scanloop(CAND,READ,(COMP(v,< ,vl) || COMP(v,> ,vh)) ); \
+ } else \
+ if ( anti && b->T->nonil && lval && !li && !hval ) { \
+ scanloop(CAND,READ,(COMP(v,<=,vl) ) ); \
+ } else \
+ if ( anti && b->T->nonil && lval && li && !hval ) { \
+ scanloop(CAND,READ,(COMP(v,< ,vl) ) ); \
+ } else \
+ if ( anti && b->T->nonil && !lval && hval && !hi) { \
+ scanloop(CAND,READ,( COMP(v,>=,vh)) ); \
+ } else \
+ if ( anti && b->T->nonil && !lval && hval && hi) { \
+ scanloop(CAND,READ,( COMP(v,> ,vh)) ); \
+ } else \
+ if ( anti && !b->T->nonil && lval && !li && hval && !hi) { \
+ scanloop(CAND,READ,(COMP(v,<=,vl) || COMP(v,>=,vh)) NIL1(v)); \
+ } else \
+ if ( anti && !b->T->nonil && lval && !li && hval && hi) { \
+ scanloop(CAND,READ,(COMP(v,<=,vl) || COMP(v,> ,vh)) NIL1(v)); \
+ } else \
+ if ( anti && !b->T->nonil && lval && li && hval && !hi) { \
+ scanloop(CAND,READ,(COMP(v,< ,vl) || COMP(v,>=,vh)) NIL1(v)); \
+ } else \
+ if ( anti && !b->T->nonil && lval && li && hval && hi) { \
+ scanloop(CAND,READ,(COMP(v,< ,vl) || COMP(v,> ,vh)) NIL1(v)); \
+ } else \
+ if ( anti && !b->T->nonil && lval && !li && !hval ) { \
+ scanloop(CAND,READ,(COMP(v,<=,vl) ) NIL1(v)); \
+ } else \
+ if ( anti && !b->T->nonil && lval && li && !hval ) { \
+ scanloop(CAND,READ,(COMP(v,< ,vl) ) NIL1(v)); \
+ } else \
+ if ( anti && !b->T->nonil && !lval && hval && !hi) { \
+ scanloop(CAND,READ,( COMP(v,>=,vh)) NIL2(v)); \
+ } else \
+ if ( anti && !b->T->nonil && !lval && hval && hi) { \
+ scanloop(CAND,READ,( COMP(v,> ,vh)) NIL2(v)); \
+ } else \
+ if (!anti && b->T->nonil && lval && !li && hval && !hi) { \
+ scanloop(CAND,READ,(COMP(v,> ,vl) && COMP(v,< ,vh)) ); \
+ } else \
+ if (!anti && b->T->nonil && lval && !li && hval && hi) { \
+ scanloop(CAND,READ,(COMP(v,> ,vl) && COMP(v,<=,vh)) ); \
+ } else \
+ if (!anti && b->T->nonil && lval && li && hval && !hi) { \
+ scanloop(CAND,READ,(COMP(v,>=,vl) && COMP(v,< ,vh)) ); \
+ } else \
+ if (!anti && b->T->nonil && lval && li && hval && hi) { \
+ scanloop(CAND,READ,(COMP(v,>=,vl) && COMP(v,<=,vh)) ); \
+ } else \
+ if (!anti && b->T->nonil && lval && !li && !hval ) { \
+ scanloop(CAND,READ,(COMP(v,> ,vl) ) ); \
+ } else \
+ if (!anti && b->T->nonil && lval && li && !hval ) { \
+ scanloop(CAND,READ,(COMP(v,>=,vl) ) ); \
+ } else \
+ if (!anti && b->T->nonil && !lval && hval && !hi) { \
+ scanloop(CAND,READ,( COMP(v,< ,vh)) ); \
+ } else \
+ if (!anti && b->T->nonil && !lval && hval && hi) { \
+ scanloop(CAND,READ,( COMP(v,<=,vh)) ); \
+ } else \
+ if (!anti && !b->T->nonil && lval && !li && hval && !hi) { \
+ scanloop(CAND,READ,(COMP(v,> ,vl) && COMP(v,< ,vh)) NIL2(v)); \
+ } else \
+ if (!anti && !b->T->nonil && lval && !li && hval && hi) { \
+ scanloop(CAND,READ,(COMP(v,> ,vl) && COMP(v,<=,vh)) NIL2(v)); \
+ } else \
+ if (!anti && !b->T->nonil && lval && li && hval && !hi) { \
+ scanloop(CAND,READ,(COMP(v,>=,vl) && COMP(v,< ,vh)) NIL2(v)); \
+ } else \
+ if (!anti && !b->T->nonil && lval && li && hval && hi) { \
+ scanloop(CAND,READ,(COMP(v,>=,vl) && COMP(v,<=,vh)) NIL2(v)); \
+ } else \
+ if (!anti && !b->T->nonil && lval && !li && !hval ) { \
+ scanloop(CAND,READ,(COMP(v,> ,vl) ) NIL2(v)); \
+ } else \
+ if (!anti && !b->T->nonil && lval && li && !hval ) { \
+ scanloop(CAND,READ,(COMP(v,>=,vl) ) NIL2(v)); \
+ } else \
+ if (!anti && !b->T->nonil && !lval && hval && !hi) { \
+ scanloop(CAND,READ,( COMP(v,< ,vh)) NIL1(v)); \
+ } else \
+ if (!anti && !b->T->nonil && !lval && hval && hi) { \
+ scanloop(CAND,READ,( COMP(v,<=,vh)) NIL1(v)); \
+ } else \
+ if (!anti && !b->T->nonil && !lval && !hval ) { \
+ scanloop(CAND,READ, COMP(v,!=,nil) ); \
+ } else \
+ assert(0); \
} while (0)
/* local variables for known fixed-width types */
@@ -327,7 +327,7 @@ do {
\
/* various comparison calls for known fixed-width types */
#define scancomp_fix(l,o,r) (l) o (r)
#define scannil1_fix(v) && scancomp_fix(v,!=,nil)
-#define scannil2_fix(v)
+#define scannil2_fix(v)
/* various comparison calls for generic types */
#define scancomp_var(l,o,r) (*cmp)((l),(r)) o 0
@@ -905,8 +905,8 @@ BATsubselect(BAT *b, BAT *s, const void
s ? BATgetId(s) : "NULL", anti);
bn = BAT_hashselect(b, s, bn, tl, maximum);
} else {
- bn = BAT_scanselect(b, s, bn, tl, th, li, hi, equi, anti, lval,
hval,
- maximum);
+ bn = BAT_scanselect(b, s, bn, tl, th, li, hi, equi, anti,
+ lval, hval, maximum);
}
return bn;
diff --git a/gdk/gdk_setop.mx b/gdk/gdk_setop.mx
--- a/gdk/gdk_setop.mx
+++ b/gdk/gdk_setop.mx
@@ -330,7 +330,6 @@ BATkunique(BAT *b)
if (b->halign == 0) {
b->halign = OIDnew(1);
}
- BATkey(bn, TRUE); /* this we accomplished */
BATkey(BATmirror(bn), BATtkey(b));
bn->hsorted = BAThordered(b);
bn->hrevsorted = BAThrevordered(b);
@@ -341,6 +340,7 @@ BATkunique(BAT *b)
if (BATcount(bn) == BATcount(b)) {
ALIGNset(bn, b);
}
+ BATkey(bn, TRUE); /* this we accomplished */
return bn;
}
@@ -376,7 +376,6 @@ BATsunique(BAT *b)
}
/* property management */
- BATset(bn, TRUE); /* this we accomplished */
BATkey(bn, BAThkey(b));
BATkey(BATmirror(bn), BATtkey(b));
bn->hsorted = BAThordered(b);
@@ -388,6 +387,7 @@ BATsunique(BAT *b)
if (BATcount(bn) == BATcount(b)) {
ALIGNset(bn, b);
}
+ BATset(bn, TRUE); /* this we accomplished */
return bn;
}
diff --git a/testing/Mfilter.py.in b/testing/Mfilter.py.in
--- a/testing/Mfilter.py.in
+++ b/testing/Mfilter.py.in
@@ -26,14 +26,14 @@ import re
# FUNCTIONS
def Usage(THISFILE) :
- print """
+ print("""
Usage: %s [-I<exp>] <files>
-I<exp> : ignore lines matching <exp> during first count (optional, default:
-I'^#`)
<files> : list of files to be processed
-""" % THISFILE
+""" % THISFILE)
### Usage(THISFILE) #
def warn(THISFILE,TEXT) :
@@ -233,7 +233,9 @@ def mFilter (FILE, IGNORE) :
ln = ln[:-1].replace('\n', '\n' + pref) + '\n'
try:
fout.write(ln.expandtabs())
- except IOError, (IOerrNo, IOerrStr):
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
