Changeset: 3de392a1e09b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3de392a1e09b
Branch: default
Log Message:
Merge with Aug2024 branch.
diffs (66 lines):
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -1168,6 +1168,8 @@ log_open_output(logger *lg)
return GDK_FAIL;
}
GDKfree(filename);
+ } else {
+ new_range->output_log = NULL;
}
ATOMIC_INIT(&new_range->refcount, 1);
ATOMIC_INIT(&new_range->last_ts, 0);
@@ -3530,7 +3532,8 @@ log_printinfo(logger *lg)
lg->catalog_bid->batCount, lg->dcatalog->batCount);
for (logged_range *p = lg->pending; p; p = p->next) {
char buf[32];
- if (p->output_log == NULL ||
+ if ((lg->debug & 128 || lg->inmemory) ||
+ p->output_log == NULL ||
snprintf(buf, sizeof(buf), ", file size %"PRIu64,
(uint64_t) getfilepos(getFile(lg->current->output_log))) >= (int) sizeof(buf))
buf[0] = 0;
printf("pending range "ULLFMT": drops %"PRIu64", last_ts
%"PRIu64", flushed_ts %"PRIu64", refcount %"PRIu64"%s%s\n", p->id, (uint64_t)
ATOMIC_GET(&p->drops), (uint64_t) ATOMIC_GET(&p->last_ts), (uint64_t)
ATOMIC_GET(&p->flushed_ts), (uint64_t) ATOMIC_GET(&p->refcount), buf, p ==
lg->current ? " (current)" : "");
diff --git a/sql/backends/monet5/sql_bincopyconvert.c
b/sql/backends/monet5/sql_bincopyconvert.c
--- a/sql/backends/monet5/sql_bincopyconvert.c
+++ b/sql/backends/monet5/sql_bincopyconvert.c
@@ -368,25 +368,25 @@ load_zero_terminated_text(BAT *bat, stre
goto end;
}
if (tpe == TYPE_str) {
- if (width > 0) {
- int w = UTF8_strlen(start);
- if (w > width) {
- msg =
createException(SQL, "sql.importColumn", "string too wide for column");
- goto end;
- }
+ if (width > 0 && !strNil(start)) {
+ int w = UTF8_strlen(start);
+ if (w > width) {
+ msg = createException(SQL,
"sql.importColumn", "string too wide for column");
+ goto end;
}
- value = start;
+ }
+ value = start;
} else {
- ssize_t n = ATOMfromstr(tpe, &buffer,
&buffer_len, start, false);
- if (n <= 0) {
- msg =
createException(SQL, "sql.importColumn", GDK_EXCEPTION);
- goto end;
- }
- value = buffer;
+ ssize_t n = ATOMfromstr(tpe, &buffer,
&buffer_len, start, false);
+ if (n <= 0) {
+ msg = createException(SQL,
"sql.importColumn", GDK_EXCEPTION);
+ goto end;
+ }
+ value = buffer;
}
if (BUNappend(bat, value, false) != GDK_SUCCEED) {
- msg = createException(SQL,
"sql.importColumn", GDK_EXCEPTION);
- goto end;
+ msg = createException(SQL, "sql.importColumn",
GDK_EXCEPTION);
+ goto end;
}
}
bs->pos = start - buf_start;
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
