MonetDB: geo - reverted gdk_bat.c

[Foteini Alvanaki]

Changeset: b74069f9f3cc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b74069f9f3cc
Modified Files:
        gdk/gdk_bat.c
Branch: geo
Log Message:

reverted gdk_bat.c


diffs (68 lines):

diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -192,7 +192,9 @@ BATcreatedesc(int ht, int tt, int heapna
        return NULL;
 }
 
-bte ATOMelmshift(int sz) {
+bte
+ATOMelmshift(int sz)
+{
        bte sh;
        int i = sz >> 1;
 
@@ -596,7 +598,7 @@ BATclear(BAT *b, int force)
        }
 
        if (force)
-               b->batFirst = b->batDeleted = b->batInserted = 0;
+                b->batFirst = b->batDeleted = b->batInserted = 0;
        else
                b->batFirst = b->batInserted;
        BATsetcount(b,0);
@@ -1437,7 +1439,6 @@ BUNdelete_(BAT *b, BUN p, bit force)
                        unsigned short hs = Hsize(b), ts = Tsize(b);
                        BATiter bi2 = bat_iterator(b);
 
-                       /* coverity[result_independent_of_operands] */
                        acc_move(last,p,idx2,idx1);
                        /* If a column was sorted before the BUN was
                           deleted, check whether it is still sorted
@@ -1805,9 +1806,9 @@ BUNfnd(BAT *b, const void *v)
                bi.b = b = BATmirror(b);                        \
        } while (0)
 
-#define dohash(hp)     (ATOMstorage(hp->type) != TYPE_bte &&   \
-                        (ATOMstorage(hp->type) != TYPE_str ||  \
-                         !GDK_ELIMDOUBLES(hp->vheap)))
+#define dohash(hp)        (ATOMstorage(hp->type) != TYPE_bte &&                
\
+                          (ATOMstorage(hp->type) != TYPE_str ||        \
+                           !GDK_ELIMDOUBLES(hp->vheap)))
 
 static BUN
 BUNlocate(BAT *b, const void *x, const void *y)
@@ -2308,6 +2309,23 @@ BATmmap(BAT *b, int hb, int tb, int hhp,
 }
 
 /*
+ * @- BATmadvise
+ * deprecated
+ */
+int
+BATmadvise(BAT *b, int hb, int tb, int hhp, int thp)
+{
+       (void) b;
+       (void) hb;
+       (void) tb;
+       (void) hhp;
+       (void) thp;
+       BATcheck(b, "BATmadvise");
+
+       return 0;
+}
+
+/*
  * @- Change the BAT access permissions (read, append, write)
  * Regrettably, BAT access-permissions, persistent status and memory
  * map modes, interact in ways that makes one's brain sizzle. This
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list