Skip to content

CBOR implementation optimizations #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shikokuchuo merged 2 commits into from
Jan 15, 2026
Merged

CBOR implementation optimizations #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f6f0e7
Use batch allocations for vectors
shikokuchuo Jan 15, 2026
84de72c
Add news item
shikokuchuo Jan 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# secretbase (development version)

* CBOR optimizations: scalar values with attributes now encode as scalars rather than arrays.
* CBOR: performance optimizations; scalar values with attributes now encode as scalars rather than arrays.

# secretbase 1.1.0

Expand Down
7 changes: 4 additions & 3 deletions src/base3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ static inline void cbor_encode_int(nano_buf *buf, int64_t val) {
}

static inline void cbor_encode_double(nano_buf *buf, double val) {
cbor_buf_ensure(buf, 9);
buf->buf[buf->cur++] = CBOR_FLOAT64;
union {
double d;
Expand All @@ -129,7 +128,6 @@ static inline void cbor_encode_text(nano_buf *buf, const char *str, size_t len)
}

static inline void cbor_encode_undef(nano_buf *buf) {
cbor_buf_ensure(buf, 1);
buf->buf[buf->cur++] = CBOR_UNDEF;
}

Expand All @@ -142,8 +140,8 @@ static void cbor_encode_logical_vec(nano_buf *buf, SEXP x) {
if (xlen != 1)
cbor_encode_uint(buf, CBOR_ARRAY, xlen);

cbor_buf_ensure(buf, xlen);
for (R_xlen_t i = 0; i < xlen; i++) {
cbor_buf_ensure(buf, 1);
buf->buf[buf->cur++] = p[i] == NA_LOGICAL ? CBOR_UNDEF :
p[i] ? CBOR_TRUE : CBOR_FALSE;
}
Expand All @@ -156,6 +154,7 @@ static void cbor_encode_integer_vec(nano_buf *buf, SEXP x) {
if (xlen != 1)
cbor_encode_uint(buf, CBOR_ARRAY, xlen);

cbor_buf_ensure(buf, (size_t) xlen * 5);
for (R_xlen_t i = 0; i < xlen; i++) {
if (p[i] == NA_INTEGER) {
cbor_encode_undef(buf);
Expand All @@ -172,6 +171,7 @@ static void cbor_encode_double_vec(nano_buf *buf, SEXP x) {
if (xlen != 1)
cbor_encode_uint(buf, CBOR_ARRAY, xlen);

cbor_buf_ensure(buf, (size_t) xlen * 9);
for (R_xlen_t i = 0; i < xlen; i++) {
if (ISNA(p[i])) {
cbor_encode_undef(buf);
Expand All @@ -190,6 +190,7 @@ static void cbor_encode_character_vec(nano_buf *buf, SEXP x) {

for (R_xlen_t i = 0; i < xlen; i++) {
if (p[i] == NA_STRING) {
cbor_buf_ensure(buf, 1);
cbor_encode_undef(buf);
} else {
const char *s = Rf_translateCharUTF8(p[i]);
Expand Down