MonetDB: rdf - Fix check (csId == -1) when using csIdFreqIdxMap

[Linnea Passing]

Changeset: 66f9493e49b6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=66f9493e49b6
Modified Files:
        monetdb5/extras/rdf/rdflabels.c
Branch: rdf
Log Message:

Fix check (csId == -1) when using csIdFreqIdxMap


diffs (27 lines):

diff --git a/monetdb5/extras/rdf/rdflabels.c b/monetdb5/extras/rdf/rdflabels.c
--- a/monetdb5/extras/rdf/rdflabels.c
+++ b/monetdb5/extras/rdf/rdflabels.c
@@ -246,9 +246,10 @@ Relation*** initRelationMetadata(int** r
        relationMetadata = (Relation ***) malloc(sizeof(Relation **) * 
freqCSset->numCSadded);
        if (!relationMetadata) fprintf(stderr, "ERROR: Couldn't malloc 
memory!\n");
        for (i = 0; i < num; ++i) { // CS
+               CS cs;
                int csId = csIdFreqIdxMap[i];
-               CS cs = (CS) freqCSset->items[csId];
                if (csId == -1) continue; // ignore
+               cs = (CS) freqCSset->items[csId];
                relationMetadata[csId] = (Relation **) malloc (sizeof(Relation 
*) * cs.numProp);
                if (!relationMetadata[csId]) fprintf(stderr, "ERROR: Couldn't 
malloc memory!\n");
                for (j = 0; j < cs.numProp; ++j) { // propNo in CS order
@@ -491,9 +492,10 @@ void createSQLMetadata(CSset* freqCSset,
 
        // set values
        for (i = 0; i < num; ++i) {
+               CS cs;
                int csId = csIdFreqIdxMap[i];
-               CS cs = (CS) freqCSset->items[csId];
                if (csId == -1) continue; // ignore
+               cs = (CS) freqCSset->items[csId];
 
                for (j = 0; j < cs.numProp; ++j) { // propNo in CS order
                        // check foreign key frequency
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list