Changeset: f54078a1f90b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f54078a1f90b
Modified Files:
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_function.c
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_resolve.c
Branch: default
Log Message:
Headless upgrade.
Don;t create BATs with oid head.
diffs (81 lines):
diff --git a/monetdb5/mal/mal_authorize.c b/monetdb5/mal/mal_authorize.c
--- a/monetdb5/mal/mal_authorize.c
+++ b/monetdb5/mal/mal_authorize.c
@@ -159,6 +159,9 @@ AUTHinitTables(str *passwd) {
isNew = 0;
}
assert(user);
+ if( user->htype != TYPE_void){
+ throw(MAL, "initTables", INTERNAL_AUTHORIZATION " authorization
table outdated !");
+ }
/* load/create password BAT */
bid = BBPindex("M5system_auth_passwd_v2");
@@ -180,6 +183,7 @@ AUTHinitTables(str *passwd) {
}
assert(pass);
+ // automagically convert an old authorization table
if (user->htype == TYPE_oid) {
BAT *b;
char name[10];
diff --git a/monetdb5/mal/mal_debugger.c b/monetdb5/mal/mal_debugger.c
--- a/monetdb5/mal/mal_debugger.c
+++ b/monetdb5/mal/mal_debugger.c
@@ -312,10 +312,8 @@ printBATproperties(stream *f, BAT *b)
mnstr_printf(f, " refs=%d ", BBP_refs(abs(b->batCacheid)));
if (b->batSharecnt)
mnstr_printf(f, " views=%d", b->batSharecnt);
- if (b->H->heap.parentid)
- mnstr_printf(f, "view on %s ", BBPname(b->H->heap.parentid));
if (b->T->heap.parentid)
- mnstr_printf(f, "tail view on %s ",
BBPname(b->T->heap.parentid));
+ mnstr_printf(f, "view on %s ", BBPname(b->T->heap.parentid));
}
/* MAL debugger parser
* The debugger structure is inherited from GDB.
diff --git a/monetdb5/mal/mal_function.c b/monetdb5/mal/mal_function.c
--- a/monetdb5/mal/mal_function.c
+++ b/monetdb5/mal/mal_function.c
@@ -296,7 +296,7 @@ static void replaceTypeVar(MalBlkPtr mb,
tx= 0;
tail = t;
}
- y= newBatType(TYPE_oid,tail);
+ y= newBatType(TYPE_void,tail);
setAnyColumnIndex(y,tx);
setArgType(mb,p,i,y);
#ifdef DEBUG_MAL_FCN
diff --git a/monetdb5/mal/mal_parser.c b/monetdb5/mal/mal_parser.c
--- a/monetdb5/mal/mal_parser.c
+++ b/monetdb5/mal/mal_parser.c
@@ -703,7 +703,7 @@ parseTypeId(Client cntxt, int defaultTyp
} else
tt = TYPE_any;
- i = newBatType(TYPE_oid, tt);
+ i = newBatType(TYPE_void, tt);
if (kh > 0)
setAnyHeadIndex(i, kh);
if (kt > 0)
diff --git a/monetdb5/mal/mal_resolve.c b/monetdb5/mal/mal_resolve.c
--- a/monetdb5/mal/mal_resolve.c
+++ b/monetdb5/mal/mal_resolve.c
@@ -535,7 +535,7 @@ resolveType(int dsttype, int srctype)
GDKfree(tpe3);
}
#endif
- return newBatType(TYPE_oid, t3);
+ return newBatType(TYPE_void, t3);
}
#ifdef DEBUG_MAL_RESOLVE
if (tracefcn)
@@ -843,7 +843,7 @@ getPolyType(malType t, int *polytype)
tail = ti == 0 ? getColumnType(t) : polytype[ti];
if (isaBatType(t))
- return newBatType(TYPE_oid, tail);
+ return newBatType(TYPE_void, tail);
return tail;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
