Changeset: 8e2750d8ae57 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8e2750d8ae57
Branch: default
Log Message:
merged
diffs (52 lines):
diff --git a/gdk/gdk_project.c b/gdk/gdk_project.c
--- a/gdk/gdk_project.c
+++ b/gdk/gdk_project.c
@@ -776,7 +776,7 @@ BATproject2(BAT *restrict l, BAT *restri
/* handle string trick */
if (stringtrick) {
assert(r1i.vh);
- if (r1->batRestricted == BAT_READ) {
+ if (r1->batRestricted == BAT_READ || VIEWvtparent(r1)) {
/* really share string heap */
assert(r1i.vh->parentid > 0);
BBPshare(r1i.vh->parentid);
diff --git a/sql/backends/monet5/UDF/pyapi3/undef.h
b/sql/backends/monet5/UDF/pyapi3/undef.h
--- a/sql/backends/monet5/UDF/pyapi3/undef.h
+++ b/sql/backends/monet5/UDF/pyapi3/undef.h
@@ -26,7 +26,9 @@
#undef snprintf
#undef vsnprintf
+#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 10
#undef ssize_t
+#endif
#ifndef bool
#define bool unsigned char
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -5728,8 +5728,10 @@ sql_trans_create_column(sql_column **rco
}
if (tpe->type->s) {/* column depends on type */
- if ((res = sql_trans_create_dependency(tr, tpe->type->base.id,
col->base.id, TYPE_DEPENDENCY)))
+ if ((res = sql_trans_create_dependency(tr, tpe->type->base.id,
col->base.id, TYPE_DEPENDENCY))) {
+ ATOMIC_PTR_DESTROY(&col->data);
return res;
+ }
if (!isNew(tpe->type) && (res = sql_trans_add_dependency(tr,
tpe->type->base.id, ddl))) {
ATOMIC_PTR_DESTROY(&col->data);
return res;
diff --git a/sql/test/BugTracker-2021/Tests/All
b/sql/test/BugTracker-2021/Tests/All
--- a/sql/test/BugTracker-2021/Tests/All
+++ b/sql/test/BugTracker-2021/Tests/All
@@ -24,7 +24,7 @@ rollup-distinct-count.Bug-7146
sum-union.Bug-7147
distinct-union.Bug-7148
HAVE_LIBPY3?python-aggregates-empty.Bug-7158
-remote-join-idxs.Bug-7165
+HAVE_PYMONETDB?remote-join-idxs.Bug-7165
shutdown-force.Bug-7167
replace-transaction-conflict.Bug-7168
merge-table-join.Bug-7172
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
