Changeset: 59e8d9ca4b15 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=59e8d9ca4b15
Modified Files:
monetdb5/extras/bwd/91_bwd.sql
monetdb5/extras/bwd/bwd.c
monetdb5/extras/bwd/operations.c
monetdb5/extras/bwd/opt_bwd.mal
monetdb5/extras/bwd/utilities.c
Branch: bwd
Log Message:
* cleanup
Unterschiede (72 Zeilen):
diff --git a/monetdb5/extras/bwd/91_bwd.sql b/monetdb5/extras/bwd/91_bwd.sql
--- a/monetdb5/extras/bwd/91_bwd.sql
+++ b/monetdb5/extras/bwd/91_bwd.sql
@@ -1,5 +1,5 @@
create function bwdecompose(col integer, bits integer)
-returns integer external name bwd.decompose;
+returns varchar(4096) external name bwd.decompose;
create function bwdevices()
diff --git a/monetdb5/extras/bwd/bwd.c b/monetdb5/extras/bwd/bwd.c
--- a/monetdb5/extras/bwd/bwd.c
+++ b/monetdb5/extras/bwd/bwd.c
@@ -97,9 +97,13 @@ str bwdecompose(bat * res, bat * subject
BAT* subject = BATdescriptor(*subjectBAT);
if (VIEWtparent(subject))
subject = BATdescriptor(abs(VIEWtparent(subject)));
- THRprintf (GDKout, "decomposing bat tail %d into %d and %d bits\n",
subject->batCacheid, approximationBits[0], Tsize(subject)*8-*approximationBits);
+ printf ("decomposing bat tail %d into %d and %d bits\n",
subject->batCacheid, approximationBits[0], Tsize(subject)*8-*approximationBits);
BATsetprop(subject, batRegistryIndex, TYPE_int,
(int[]){decomposeIntArray((int*)Tloc(subject, BUNfirst(subject)),
subject->batCount, *approximationBits)});
- BBPkeepref(*res = BATcopy(subject, subject->htype, subject->ttype,
TRUE)->batCacheid);
+ BAT* result = BATnew(TYPE_void, TYPE_str, 0);
+ char buffer[4096];
+ snprintf(buffer, 4096, "successfully decomposed bat %d",
subject->batCacheid);
+ BUNappend(result, buffer, 0);
+ BBPkeepref(*res = result->batCacheid);
return MAL_SUCCEED;
}
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
@@ -123,6 +123,8 @@ char* approximateOperation(char* exactOp
return exactOperation;
}
+static inline void superverboseprintf(const char * format, ... ){};
+
str BWDThetauselectApproximate(bat *res, bat *bid, ptr val, str *OP) {
BAT* data = BATdescriptor(*bid);
assert(BATttype(data) == TYPE_int); // type specific
@@ -167,7 +169,7 @@ str BWDThetauselectApproximate(bat *res,
"}";
char* sourceCode = malloc(16384);
snprintf(sourceCode, 16384, sourceCodeTemplate,
typeNames[BATttype(data)], approximateOperation(*OP),
batTailApproximationBits(data)/8, 32-batTailApproximationBits(data));
- THRprintf(GDKout, "#%s, sourceCode: %s;\n", __func__,
sourceCode);
+ superverboseprintf("#%s, sourceCode: %s;\n", __func__,
sourceCode);
cl_int err;
cl_program program = clCreateProgramWithSource(getCLContext(),
1, (const char*[]){sourceCode}, (size_t[]){strlen(sourceCode)}, &err);
if(err) THRprintf(GDKout, "#%s, clCreateProgramWithSource:
%s;\n", __func__, clError(err));
diff --git a/monetdb5/extras/bwd/opt_bwd.mal b/monetdb5/extras/bwd/opt_bwd.mal
--- a/monetdb5/extras/bwd/opt_bwd.mal
+++ b/monetdb5/extras/bwd/opt_bwd.mal
@@ -34,6 +34,6 @@ address bwdecomposeScalar;
module batbwd;
-command decompose(col:bat[:oid,:int],bits:int):bat[:oid,:int]
+command decompose(col:bat[:oid,:int],bits:int):bat[:oid,:str]
address bwdecompose;
diff --git a/monetdb5/extras/bwd/utilities.c b/monetdb5/extras/bwd/utilities.c
--- a/monetdb5/extras/bwd/utilities.c
+++ b/monetdb5/extras/bwd/utilities.c
@@ -200,7 +200,5 @@ const unsigned int decomposeIntArray(con
free(approximation);
-
- THRprintf (GDKout, "decomposing bat registry index: %d\n", newIndex);
return newIndex;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
