MonetDB: default - removed creation of empty update bats (no lon...

[Niels Nes]

Changeset: 566d5d9d99b2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=566d5d9d99b2
Modified Files:
        sql/storage/bat/bat_utils.c
        sql/storage/bat/bat_utils.h
Branch: default
Log Message:

removed creation of empty update bats (no longer used)


diffs (90 lines):

diff --git a/sql/storage/bat/bat_utils.c b/sql/storage/bat/bat_utils.c
--- a/sql/storage/bat/bat_utils.c
+++ b/sql/storage/bat/bat_utils.c
@@ -110,7 +110,6 @@ copy_inserted(BAT *b, BAT *i )
 }
 
 BAT *ebats[MAXATOMS] = { NULL };
-BAT *eubats[MAXATOMS] = { NULL };
 
 log_bid 
 ebat2real(log_bid b, oid ibase)
@@ -145,15 +144,6 @@ e_BAT(int type)
 }
 
 log_bid 
-e_ubat(int type)
-{
-       if (!eubats[type]) 
-               eubats[type] = bat_new(TYPE_oid, type, 0, TRANSIENT);
-       return temp_create(eubats[type]);
-}
-
-
-log_bid 
 ebat_copy(log_bid b, oid ibase, int temp)
 {
        /* make a copy of b */
@@ -180,31 +170,6 @@ ebat_copy(log_bid b, oid ibase, int temp
        return r;
 }
 
-log_bid 
-eubat_copy(log_bid b, int temp)
-{
-       /* make a copy of b */
-       BAT *o = temp_descriptor(b);
-       BAT *c;
-       log_bid r;
-
-       if (!eubats[o->ttype]) 
-               eubats[o->ttype] = bat_new(TYPE_oid, o->ttype, 0, TRANSIENT);
-
-       if (!temp && BATcount(o)) {
-               c = BATcopy(o, TYPE_oid, o->ttype, TRUE, PERSISTENT);
-               BATcommit(c);
-               r = temp_create(c);
-               bat_set_access(c, BAT_READ);
-               bat_destroy(c);
-       } else {
-               c = eubats[o->ttype];
-               r = temp_create(c);
-       }
-       bat_destroy(o);
-       return r;
-}
-
 void
 bat_utils_init(void)
 {
@@ -212,9 +177,7 @@ bat_utils_init(void)
 
        for (t=1; t<GDKatomcnt; t++) {
                if (t != TYPE_bat && BATatoms[t].name[0]) {
-                       eubats[t] = bat_new(TYPE_oid, t, 0, TRANSIENT);
                        ebats[t] = bat_new(TYPE_void, t, 0, TRANSIENT);
-                       bat_set_access(eubats[t], BAT_READ);
                        bat_set_access(ebats[t], BAT_READ);
                }
        }
diff --git a/sql/storage/bat/bat_utils.h b/sql/storage/bat/bat_utils.h
--- a/sql/storage/bat/bat_utils.h
+++ b/sql/storage/bat/bat_utils.h
@@ -29,17 +29,13 @@ extern BUN append_inserted(BAT *b, BAT *
 extern BUN copy_inserted(BAT *b, BAT *i );
 
 extern BAT *ebats[MAXATOMS];
-extern BAT *eubats[MAXATOMS];
 
 #define isEbat(b)      (ebats[b->ttype] && ebats[b->ttype] == b) 
-#define isEUbat(b)     (eubats[b->ttype] && eubats[b->ttype] == b) 
 
 extern log_bid ebat2real(log_bid b, oid ibase);
 extern log_bid e_bat(int type);
 extern BAT *e_BAT(int type);
-extern log_bid e_ubat(int type);
 extern log_bid ebat_copy(log_bid b, oid ibase, int temp);
-extern log_bid eubat_copy(log_bid b, int temp);
 extern void bat_utils_init(void);
 
 extern sql_schema * tr_find_schema( sql_trans *tr, sql_schema *s);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list