MonetDB: default - Consistently use t* macros instead of T.*.

[Sjoerd Mullender]

Changeset: 68d9e826eb47 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=68d9e826eb47
Modified Files:
        gdk/gdk.h
        gdk/gdk_analytic_func.c
        gdk/gdk_join.c
        sql/backends/monet5/UDF/capi/capi.c
Branch: default
Log Message:

Consistently use t* macros instead of T.*.


diffs (57 lines):

diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -9,7 +9,7 @@
 /*
  * @t The Goblin Database Kernel
  * @v Version 3.05
- * @a Martin L. Kersten, Peter Boncz, Niels Nes
+ * @a Martin L. Kersten, Peter Boncz, Niels Nes, Sjoerd Mullender
  *
  * @+ The Inner Core
  * The innermost library of the MonetDB database system is formed by
@@ -1234,7 +1234,7 @@ typedef var_t stridx_t;
                         (is_oid_nil((b)->tseqbase)                     \
                          ? ((b)->ttype == TYPE_void                    \
                             ? (void) (p), oid_nil                      \
-                            : ((const oid *) (b)->T.heap.base)[p])     \
+                            : ((const oid *) (b)->theap.base)[p])      \
                          : (oid) ((b)->tseqbase + (BUN) (p))))
 
 static inline BATiter
diff --git a/gdk/gdk_analytic_func.c b/gdk/gdk_analytic_func.c
--- a/gdk/gdk_analytic_func.c
+++ b/gdk/gdk_analytic_func.c
@@ -1000,7 +1000,7 @@ GDKanalyticalcount(BAT *r, BAT *b, BAT *
        start = (lng*)Tloc(s, 0);
        end = (lng*)Tloc(e, 0);
 
-       if(!*ignore_nils || b->T.nonil) {
+       if(!*ignore_nils || b->tnonil) {
                for(; i<cnt; i++, rb++)
                        *rb = (end[i] > start[i]) ? (end[i] - start[i]) : 0;
        } else {
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -2334,7 +2334,7 @@ mergejoin(BAT *r1, BAT *r2, BAT *l, BAT 
                         * be that the next value added isn't
                         * consecutive with the last one */
                        if (lskipped ||
-                           (lcand && ((oid *) r1->T.heap.base)[r1->batCount - 
1] + 1 != lcand[-(ssize_t)nl]))
+                           (lcand && ((oid *) r1->theap.base)[r1->batCount - 
1] + 1 != lcand[-(ssize_t)nl]))
                                r1->tseqbase = oid_nil;
                }
 
diff --git a/sql/backends/monet5/UDF/capi/capi.c 
b/sql/backends/monet5/UDF/capi/capi.c
--- a/sql/backends/monet5/UDF/capi/capi.c
+++ b/sql/backends/monet5/UDF/capi/capi.c
@@ -309,7 +309,7 @@ static void blob_initialize(struct cudf_
                bat_data->null_value = tpe##_nil;                               
       \
                if (BATtdense(b)) {                                     \
                        size_t it = 0;                                          
           \
-                       tpe val = b->T.seq;                                     
           \
+                       tpe val = b->tseqbase;                                  
           \
                        /* bat is dense, materialize it */                      
           \
                        bat_data->data = wrapped_GDK_malloc_nojump(             
           \
                                bat_data->count * 
sizeof(bat_data->null_value));               \
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list