MonetDB: headless - Move it out of the way

[mk]

Changeset: bc709230d1ef for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bc709230d1ef
Modified Files:
        monetdb5/optimizer/opt_dictionary.c
Branch: headless
Log Message:

Move it out of the way
It requires a complete rework for columns


diffs (39 lines):

diff --git a/monetdb5/optimizer/opt_dictionary.c 
b/monetdb5/optimizer/opt_dictionary.c
--- a/monetdb5/optimizer/opt_dictionary.c
+++ b/monetdb5/optimizer/opt_dictionary.c
@@ -131,7 +131,7 @@
 static int 
 DICTfind(int *idx, int *val, int *base, str nme)
 {
-       BUN p;
+       oid p;
        COLiter bidx = col_iterator(dictIndex);
        COLiter bval = col_iterator(dictValue);
        COLiter bbase = col_iterator(dictBase);
@@ -152,7 +152,7 @@
        int *idx, *val;
        InstrPtr *old,q, qq;
        int x, v, limit;
-       BUN p;
+       oid p;
        char buf[BUFSIZ];
        COL *bi, *bv;
        str dictionaryRef = putName("dictionary",10);
@@ -698,7 +698,7 @@
        size_t cnt;
        COL *b, *bo, *bx = 0, *bv = 0, *bs, *bh =0;
        COLiter bi;
-       BUN p,q;
+       oid p,q;
        double ratio = 0.0;
 
        if( DICTinit()  == 0)
@@ -950,7 +950,7 @@
 {
        COL *bi, *bv, *b;
        COLiter bii,bvi;
-       BUN p,q;
+       oid p,q;
 
        bi= COLdescriptor(*idx);
     if (bi == 0)
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list