MonetDB: bwd - * fixed one-side selections

[Holger Pirk]

Changeset: 38b5bb50dafe for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=38b5bb50dafe
Modified Files:
        monetdb5/extras/bwd/cl_program_utilities.c
        monetdb5/extras/bwd/operations.c
Branch: bwd
Log Message:

* fixed one-side selections


Unterschiede (26 Zeilen):

diff --git a/monetdb5/extras/bwd/cl_program_utilities.c 
b/monetdb5/extras/bwd/cl_program_utilities.c
--- a/monetdb5/extras/bwd/cl_program_utilities.c
+++ b/monetdb5/extras/bwd/cl_program_utilities.c
@@ -129,8 +129,9 @@ cl_program getUSelectProgram(int type, c
                " }\n"
                "}";
        char* sourceCode = malloc(16384);
-       snprintf(sourceCode, 16384, sourceCodeTemplate, (str[]){[TYPE_int] = 
"int"}[type], approximateOperation(predicateOperation), 
approximateOperation(predicateOperation2), approximationBits/8-offsetBits/8, 
predicateOperation2 == NULL?1:0, offsetBits/8);
+       snprintf(sourceCode, 16384, sourceCodeTemplate, (str[]){[TYPE_int] = 
"int"}[type], approximateOperation(predicateOperation), 
predicateOperation2?approximateOperation(predicateOperation2):"==", 
approximationBits/8-offsetBits/8, predicateOperation2 == NULL?1:0, 
offsetBits/8);
        cl_program program = compileProgram(sourceCode,"");
+       printf ("%s\n", sourceCode);
        free(sourceCode);
        return program;
 }
diff --git a/monetdb5/extras/bwd/operations.c b/monetdb5/extras/bwd/operations.c
--- a/monetdb5/extras/bwd/operations.c
+++ b/monetdb5/extras/bwd/operations.c
@@ -282,7 +282,7 @@ static inline str uselect(bat *res, bat 
 
                }
 
-               cl_program program = 
getUSelectProgram(ATOMstorage(BATttype(data)), OP, OP2?OP2:"==", 
batTailApproximationBits(data), batTailOffsetBits(data));
+               cl_program program = 
getUSelectProgram(ATOMstorage(BATttype(data)), OP, OP2, 
batTailApproximationBits(data), batTailOffsetBits(data));
 
                int err;
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list