Changeset: 27e8ad035c2d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=27e8ad035c2d Modified Files: clients/Tests/MAL-signatures_all.stable.out clients/Tests/MAL-signatures_fits_geom.stable.out clients/Tests/MAL-signatures_geom.stable.out clients/Tests/MAL-signatures_none.stable.out clients/Tests/exports.stable.out monetdb5/modules/kernel/bat5.mal Branch: Oct2014 Log Message:
Fix and approve after changeset b01c80c4e44f. diffs (135 lines): diff --git a/clients/Tests/MAL-signatures_all.stable.out b/clients/Tests/MAL-signatures_all.stable.out --- a/clients/Tests/MAL-signatures_all.stable.out +++ b/clients/Tests/MAL-signatures_all.stable.out @@ -31621,10 +31621,6 @@ command bat.delete(b:bat[:any_1,:any_2], address BKCdelete_bat_bun; comment Delete from the first BAT all BUNs with a corresponding BUN in the second. -command bat.deleteHead(b:bat[:any_1,:any_2],src:bat[:any_1,:any]):bat[:any_1,:any_2] -address BKCdelete_bat; -comment Delete from the first BAT all BUNs with a corresponding head in the second. - command bat.delete(b:bat[:any_1,:any_2]):bat[:any_1,:any_2] address BKCdelete_all; comment Delete all BUNs in a BAT. @@ -31905,7 +31901,11 @@ command bat.shrink(b:bat[:oid,:any_1],de address BKCshrinkBAT; comment Shrink the BAT based on a list of entries identified as to-be-deleted -command bat.setHash(b:bat[:oid,:any_2],prop:bit):bit +command bat.setImprints(b:bat[:oid,:any_2]):bit +address BKCsetImprints; +comment Create n imprints structure on the column + +command bat.setHash(b:bat[:oid,:any_2]):bit address BKCsetHash; comment Create a hash structure on the column diff --git a/clients/Tests/MAL-signatures_fits_geom.stable.out b/clients/Tests/MAL-signatures_fits_geom.stable.out --- a/clients/Tests/MAL-signatures_fits_geom.stable.out +++ b/clients/Tests/MAL-signatures_fits_geom.stable.out @@ -31542,10 +31542,6 @@ command bat.delete(b:bat[:any_1,:any_2], address BKCdelete_bat_bun; comment Delete from the first BAT all BUNs with a corresponding BUN in the second. -command bat.deleteHead(b:bat[:any_1,:any_2],src:bat[:any_1,:any]):bat[:any_1,:any_2] -address BKCdelete_bat; -comment Delete from the first BAT all BUNs with a corresponding head in the second. - command bat.delete(b:bat[:any_1,:any_2]):bat[:any_1,:any_2] address BKCdelete_all; comment Delete all BUNs in a BAT. @@ -31826,7 +31822,11 @@ command bat.shrink(b:bat[:oid,:any_1],de address BKCshrinkBAT; comment Shrink the BAT based on a list of entries identified as to-be-deleted -command bat.setHash(b:bat[:oid,:any_2],prop:bit):bit +command bat.setImprints(b:bat[:oid,:any_2]):bit +address BKCsetImprints; +comment Create n imprints structure on the column + +command bat.setHash(b:bat[:oid,:any_2]):bit address BKCsetHash; comment Create a hash structure on the column diff --git a/clients/Tests/MAL-signatures_geom.stable.out b/clients/Tests/MAL-signatures_geom.stable.out --- a/clients/Tests/MAL-signatures_geom.stable.out +++ b/clients/Tests/MAL-signatures_geom.stable.out @@ -31542,10 +31542,6 @@ command bat.delete(b:bat[:any_1,:any_2], address BKCdelete_bat_bun; comment Delete from the first BAT all BUNs with a corresponding BUN in the second. -command bat.deleteHead(b:bat[:any_1,:any_2],src:bat[:any_1,:any]):bat[:any_1,:any_2] -address BKCdelete_bat; -comment Delete from the first BAT all BUNs with a corresponding head in the second. - command bat.delete(b:bat[:any_1,:any_2]):bat[:any_1,:any_2] address BKCdelete_all; comment Delete all BUNs in a BAT. @@ -31826,7 +31822,11 @@ command bat.shrink(b:bat[:oid,:any_1],de address BKCshrinkBAT; comment Shrink the BAT based on a list of entries identified as to-be-deleted -command bat.setHash(b:bat[:oid,:any_2],prop:bit):bit +command bat.setImprints(b:bat[:oid,:any_2]):bit +address BKCsetImprints; +comment Create n imprints structure on the column + +command bat.setHash(b:bat[:oid,:any_2]):bit address BKCsetHash; comment Create a hash structure on the column diff --git a/clients/Tests/MAL-signatures_none.stable.out b/clients/Tests/MAL-signatures_none.stable.out --- a/clients/Tests/MAL-signatures_none.stable.out +++ b/clients/Tests/MAL-signatures_none.stable.out @@ -31537,10 +31537,6 @@ command bat.delete(b:bat[:any_1,:any_2], address BKCdelete_bat_bun; comment Delete from the first BAT all BUNs with a corresponding BUN in the second. -command bat.deleteHead(b:bat[:any_1,:any_2],src:bat[:any_1,:any]):bat[:any_1,:any_2] -address BKCdelete_bat; -comment Delete from the first BAT all BUNs with a corresponding head in the second. - command bat.delete(b:bat[:any_1,:any_2]):bat[:any_1,:any_2] address BKCdelete_all; comment Delete all BUNs in a BAT. @@ -31821,7 +31817,11 @@ command bat.shrink(b:bat[:oid,:any_1],de address BKCshrinkBAT; comment Shrink the BAT based on a list of entries identified as to-be-deleted -command bat.setHash(b:bat[:oid,:any_2],prop:bit):bit +command bat.setImprints(b:bat[:oid,:any_2]):bit +address BKCsetImprints; +comment Create n imprints structure on the column + +command bat.setHash(b:bat[:oid,:any_2]):bit address BKCsetHash; comment Create a hash structure on the column diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -950,7 +950,8 @@ str BKCsetAccess(bat *res, const bat *bi str BKCsetAppendMode(bat *res, const bat *bid); str BKCsetColumn(void *r, const bat *bid, const char *const *tname); str BKCsetColumns(void *r, const bat *bid, const char *const *hname, const char *const *tname); -str BKCsetHash(bit *ret, const bat *bid, const bit *prop); +str BKCsetHash(bit *ret, const bat *bid); +str BKCsetImprints(bit *ret, const bat *bid); str BKCsetName(void *r, const bat *bid, const char *const *s); str BKCsetPersistent(void *r, const bat *bid); str BKCsetReadMode(bat *res, const bat *bid); diff --git a/monetdb5/modules/kernel/bat5.mal b/monetdb5/modules/kernel/bat5.mal --- a/monetdb5/modules/kernel/bat5.mal +++ b/monetdb5/modules/kernel/bat5.mal @@ -339,8 +339,8 @@ command setHash(b:bat[:oid,:any_2]):bit address BKCsetHash comment "Create a hash structure on the column"; -command setImpints(b:bat[:oid,:any_2]):bit -address BKCsetImpints +command setImprints(b:bat[:oid,:any_2]):bit +address BKCsetImprints comment "Create n imprints structure on the column"; command isSynced (b1:bat[:oid,:any_2], b2:bat[:oid,:any_4]) :bit _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
