Changeset: 48d588c38ad4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/48d588c38ad4
Branch: samloader
Log Message:
merged with default
diffs (68 lines):
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -46,7 +46,9 @@ jobs:
if: runner.os == 'macOS'
- name: install packages
- run: sudo apt-get install -y bison libbz2-dev libpcre2-dev liblzma-dev
liblz4-dev libxml2-dev pkg-config libxxhash-dev unixodbc-dev zlib1g-dev
libssl-dev
+ run: |
+ sudo apt-get update
+ sudo apt-get install -y bison libbz2-dev libpcre2-dev liblzma-dev
liblz4-dev libxml2-dev pkg-config libxxhash-dev unixodbc-dev zlib1g-dev
libssl-dev
if: runner.os == 'Linux'
- name: Patch /etc/hosts on Unix
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -3286,7 +3286,7 @@ log_constant(logger *lg, int type, const
if (LOG_DISABLED(lg) || !nr) {
/* logging is switched off */
- if (lg_updated_set_bit(lg, id, 0) != GDK_SUCCEED)
+ if (!lg->inmemory && lg_updated_set_bit(lg, id, 0) !=
GDK_SUCCEED)
return GDK_FAIL;
if (nr) {
log_lock(lg);
@@ -3394,7 +3394,7 @@ internal_log_bat(logger *lg, BAT *b, log
if (LOG_DISABLED(lg) || !nr) {
/* logging is switched off */
- if (lg_updated_set_bit(lg, id, 0) != GDK_SUCCEED)
+ if (!lg->inmemory && lg_updated_set_bit(lg, id, 0) !=
GDK_SUCCEED)
return GDK_FAIL;
if (nr)
return la_bat_update_count(lg, id, offset + cnt,
lg->tid);
@@ -3629,7 +3629,7 @@ log_delta(logger *lg, BAT *uid, BAT *uva
if (LOG_DISABLED(lg)) {
/* logging is switched off */
- if (lg_updated_set_bit(lg, id, 0) != GDK_SUCCEED)
+ if (!lg->inmemory && lg_updated_set_bit(lg, id, 0) !=
GDK_SUCCEED)
return GDK_FAIL;
log_unlock(lg);
return GDK_SUCCEED;
@@ -3967,7 +3967,7 @@ log_del_bat(logger *lg, log_bid bid)
}
assert(lg->catalog_lid->hseqbase == 0);
- if (lg_updated_set_bit(lg, 0, p) != GDK_SUCCEED)
+ if (!lg->inmemory && lg_updated_set_bit(lg, 0, p) != GDK_SUCCEED)
return GDK_FAIL;
return BUNreplace(lg->catalog_lid, p, &lid, false);
}
diff --git a/gdk/gdk_tracer.c b/gdk/gdk_tracer.c
--- a/gdk/gdk_tracer.c
+++ b/gdk/gdk_tracer.c
@@ -190,8 +190,9 @@ GDKtracer_init_trace_file(const char *db
static gdk_return
_GDKtracer_init_basic_adptr(void)
{
- return GDKtracer_init_trace_file(GDKgetenv("gdk_dbpath"),
- GDKgetenv("gdk_dbtrace"));
+ return GDKtracer_init_trace_file(
+ GDKinmemory(0) ? NULL : GDKgetenv("gdk_dbpath"),
+ GDKgetenv("gdk_dbtrace"));
}
static void
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
