Changeset: 9a1fca9c09a5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9a1fca9c09a5
Modified Files:
gdk/gdk.h
sql/backends/monet5/dict.c
sql/backends/monet5/for.c
Branch: default
Log Message:
Unite and move down BATnegateprops (sync branches)
diffs (79 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1622,6 +1622,25 @@ BATsettrivprop(BAT *b)
}
}
+static inline void
+BATnegateprops(BAT *b)
+{
+ /* disable all properties here */
+ b->tnonil = false;
+ b->tnil = false;
+ if (b->ttype) {
+ b->tsorted = false;
+ b->trevsorted = false;
+ b->tnosorted = 0;
+ b->tnorevsorted = 0;
+ }
+ b->tseqbase = oid_nil;
+ b->tkey = false;
+ b->tnokey[0] = 0;
+ b->tnokey[1] = 0;
+ b->tmaxpos = b->tminpos = BUN_NONE;
+}
+
/*
* @- GDK error handling
* @multitable @columnfractions 0.08 0.7
diff --git a/sql/backends/monet5/dict.c b/sql/backends/monet5/dict.c
--- a/sql/backends/monet5/dict.c
+++ b/sql/backends/monet5/dict.c
@@ -25,22 +25,6 @@ get_newcolumn(sql_trans *tr, sql_column
}
static void
-BATnegateprops(BAT *b)
-{
- /* disable all properties here */
- b->tnonil = false;
- b->tnil = false;
- b->tsorted = false;
- b->trevsorted = false;
- b->tnosorted = 0;
- b->tnorevsorted = 0;
- b->tseqbase = oid_nil;
- b->tkey = false;
- b->tnokey[0] = 0;
- b->tnokey[1] = 0;
-}
-
-static void
BATmaxminpos_bte(BAT *o, bte m)
{
BUN minpos = BUN_NONE, maxpos = BUN_NONE, p, q;
diff --git a/sql/backends/monet5/for.c b/sql/backends/monet5/for.c
--- a/sql/backends/monet5/for.c
+++ b/sql/backends/monet5/for.c
@@ -24,20 +24,6 @@ get_newcolumn(sql_trans *tr, sql_column
return NULL;
}
-static void
-BATnegateprops(BAT *b)
-{
- /* disable all properties here */
- b->tsorted = false;
- b->trevsorted = false;
- b->tnosorted = 0;
- b->tnorevsorted = 0;
- b->tseqbase = oid_nil;
- b->tkey = false;
- b->tnokey[0] = 0;
- b->tnokey[1] = 0;
-}
-
BAT *
FORdecompress_(BAT *o, lng minval, int type, role_t role)
{
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
