Changeset: e1d40d8f8ecb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e1d40d8f8ecb
Modified Files:
clients/Tests/exports.stable.out
sql/storage/bat/bat_logger.c
Branch: persistent_sketches
Log Message:
also ship sketches
approved output
diffs (40 lines):
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
@@ -463,7 +463,6 @@ BAT *VIEWcreate(oid seq, BAT *b, BUN l,
size_t _MT_npages;
size_t _MT_pagesize;
char *asctime_r(const struct tm *restrict, char *restrict);
-double bat_guess_uniques(BAT *b, BATiter *bi, struct canditer *bci);
ssize_t bitFromStr(allocator *ma, const char *src, size_t *len, bit **dst,
bool external);
ssize_t bitToStr(allocator *ma, char **dst, size_t *len, const bit *src, bool
external);
size_t blobsize(size_t nitems);
@@ -597,10 +596,9 @@ const ptr ptr_nil;
ssize_t shtFromStr(allocator *ma, const char *src, size_t *len, sht **dst,
bool external);
ssize_t shtToStr(allocator *ma, char **dst, size_t *len, const sht *src, bool
external);
const sht sht_nil;
-gdk_export gdk_return sketch_update_many(BATiter *bi, uint8_t
(*sketch)[CLZ_BUCKETS], const void *values, size_t count);
-gdk_export gdk_return sketch_merge(uint8_t (*dst)[CLZ_BUCKETS], uint8_t
(*src)[CLZ_BUCKETS]);
-gdk_export double sketch_estimate(uint8_t (*sketch)[CLZ_BUCKETS]);
-gdk_return bat_sketch(BATiter *bi, struct canditer *bci, uint8_t
(*sketch)[CLZ_BUCKETS]);
+double sketch_estimate(uint8_t (*sketch)[CLZ_BUCKETS]);
+gdk_return sketch_merge(uint8_t (*dst)[CLZ_BUCKETS], uint8_t
(*src)[CLZ_BUCKETS]);
+gdk_return sketch_update_many(BATiter *bi, uint8_t (*sketch)[CLZ_BUCKETS],
const void *values, size_t count);
ssize_t sql_daytime_fromstr(allocator *ma, const char *buf, daytime *d, long
tz_sec, bool tzlocal);
ssize_t sql_timestamp_fromstr(allocator *ma, const char *buf, timestamp *d,
long tz_sec, bool tzlocal);
ssize_t strFromStr(allocator *ma, const char *restrict src, size_t *restrict
len, char **restrict dst, bool external);
diff --git a/sql/storage/bat/bat_logger.c b/sql/storage/bat/bat_logger.c
--- a/sql/storage/bat/bat_logger.c
+++ b/sql/storage/bat/bat_logger.c
@@ -1480,6 +1480,11 @@ snapshot_bats(stream *plan, BAT *bats_to
continue;
}
+ if (ATOMsketchable(b.ttype) && b.tsketch) {
+ r = snapshot_heap(plan, db_dir, b.batCacheid, filename,
"tsketch", b.tsketch->free);
+ if (r != GDK_SUCCEED)
+ goto end;
+ }
// Include the heaps in the plan
if (ATOMvarsized(b.ttype) && !b.ustr) {
r = snapshot_heap(plan, db_dir, b.batCacheid, filename,
"theap", b.tvheap->free);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
