MonetDB: default - merged with jun2023

[Niels Nes]

Changeset: 6cae651b3992 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/6cae651b3992
Modified Files:
clients/odbc/winsetup/setup.rc
Branch: default
Log Message:

merged with jun2023


diffs (truncated from 6306 to 300 lines):

diff --git a/clients/Tests/MAL-signatures-hge.test 
b/clients/Tests/MAL-signatures-hge.test
--- a/clients/Tests/MAL-signatures-hge.test
+++ b/clients/Tests/MAL-signatures-hge.test
@@ -50485,45 +50485,75 @@ STRcontains;
 Check if string chaystack contains string needle, icase flag.
 str
 containsjoin
-command str.containsjoin(X_0:bat[:str], X_1:bat[:str], X_2:bat[:bit], 
X_3:bat[:oid], X_4:bat[:oid], X_5:bit, X_6:lng, X_7:bit):bat[:oid] 
+pattern str.containsjoin(X_0:bat[:str], X_1:bat[:str], X_2:bat[:bit], 
X_3:bat[:oid], X_4:bat[:oid], X_5:bit, X_6:lng, X_7:bit):bat[:oid] 
 STRcontainsjoin1;
-The same as STRcontainsjoin, but only produce one output
+The same as STRcontainsjoin, but only produce one output + icase.
 str
 containsjoin
-command str.containsjoin(X_0:bat[:str], X_1:bat[:str], X_2:bat[:bit], 
X_3:bat[:oid], X_4:bat[:oid], X_5:bit, X_6:lng, X_7:bit) (X_8:bat[:oid], 
X_9:bat[:oid]) 
+pattern str.containsjoin(X_0:bat[:str], X_1:bat[:str], X_2:bat[:oid], 
X_3:bat[:oid], X_4:bit, X_5:lng, X_6:bit):bat[:oid] 
+STRcontainsjoin1;
+The same as STRcontainsjoin, but only produce one output.
+str
+containsjoin
+pattern str.containsjoin(X_0:bat[:str], X_1:bat[:str], X_2:bat[:bit], 
X_3:bat[:oid], X_4:bat[:oid], X_5:bit, X_6:lng, X_7:bit) (X_8:bat[:oid], 
X_9:bat[:oid]) 
+STRcontainsjoin;
+Join the string bat L with the bat R if L contains the string of R@with 
optional candidate lists SL and SR@The result is two aligned bats with oids of 
matching rows + icase.
+str
+containsjoin
+pattern str.containsjoin(X_0:bat[:str], X_1:bat[:str], X_2:bat[:oid], 
X_3:bat[:oid], X_4:bit, X_5:lng, X_6:bit) (X_7:bat[:oid], X_8:bat[:oid]) 
 STRcontainsjoin;
 Join the string bat L with the bat R if L contains the string of R@with 
optional candidate lists SL and SR@The result is two aligned bats with oids of 
matching rows.
 str
 containsselect
-command str.containsselect(X_0:bat[:str], X_1:bat[:oid], X_2:str, X_3:bit, 
X_4:bit):bat[:oid] 
+pattern str.containsselect(X_0:bat[:str], X_1:bat[:oid], X_2:str, 
X_3:bit):bat[:oid] 
 STRcontainsselect;
 Select all head values of the first input BAT for which the@tail value 
contains the given needle.
 str
-endsWith
-pattern str.endsWith(X_0:str, X_1:str):bit 
-STRendsWith;
+containsselect
+pattern str.containsselect(X_0:bat[:str], X_1:bat[:oid], X_2:str, X_3:bit, 
X_4:bit):bat[:oid] 
+STRcontainsselect;
+Select all head values of the first input BAT for which the@tail value 
contains the given needle + icase.
+str
+endswith
+pattern str.endswith(X_0:str, X_1:str):bit 
+STRendswith;
 Check if string ends with substring.
 str
-endsWith
-pattern str.endsWith(X_0:str, X_1:str, X_2:bit):bit 
-STRendsWith;
+endswith
+pattern str.endswith(X_0:str, X_1:str, X_2:bit):bit 
+STRendswith;
 Check if string ends with substring, icase flag.
 str
-endsWithjoin
-command str.endsWithjoin(X_0:bat[:str], X_1:bat[:str], X_2:bat[:bit], 
X_3:bat[:oid], X_4:bat[:oid], X_5:bit, X_6:lng, X_7:bit):bat[:oid] 
+endswithjoin
+pattern str.endswithjoin(X_0:bat[:str], X_1:bat[:str], X_2:bat[:bit], 
X_3:bat[:oid], X_4:bat[:oid], X_5:bit, X_6:lng, X_7:bit):bat[:oid] 
+STRendswithjoin1;
+The same as STRendswithjoin, but only produce one output + icase.
+str
+endswithjoin
+pattern str.endswithjoin(X_0:bat[:str], X_1:bat[:str], X_2:bat[:oid], 
X_3:bat[:oid], X_4:bit, X_5:lng, X_6:bit):bat[:oid] 
 STRendswithjoin1;
-The same as STRendswithjoin, but only produce one output
-str
-endsWithjoin
-command str.endsWithjoin(X_0:bat[:str], X_1:bat[:str], X_2:bat[:bit], 
X_3:bat[:oid], X_4:bat[:oid], X_5:bit, X_6:lng, X_7:bit) (X_8:bat[:oid], 
X_9:bat[:oid]) 
+The same as STRendswithjoin, but only produce one output.
+str
+endswithjoin
+pattern str.endswithjoin(X_0:bat[:str], X_1:bat[:str], X_2:bat[:bit], 
X_3:bat[:oid], X_4:bat[:oid], X_5:bit, X_6:lng, X_7:bit) (X_8:bat[:oid], 
X_9:bat[:oid]) 
+STRendswithjoin;
+Join the string bat L with the suffix bat R@with optional candidate lists SL 
and SR@The result is two aligned bats with oids of matching rows + icase.
+str
+endswithjoin
+pattern str.endswithjoin(X_0:bat[:str], X_1:bat[:str], X_2:bat[:oid], 
X_3:bat[:oid], X_4:bit, X_5:lng, X_6:bit) (X_7:bat[:oid], X_8:bat[:oid]) 
 STRendswithjoin;
 Join the string bat L with the suffix bat R@with optional candidate lists SL 
and SR@The result is two aligned bats with oids of matching rows.
 str
-endsWithselect
-command str.endsWithselect(X_0:bat[:str], X_1:bat[:oid], X_2:str, X_3:bit, 
X_4:bit):bat[:oid] 
+endswithselect
+pattern str.endswithselect(X_0:bat[:str], X_1:bat[:oid], X_2:str, 
X_3:bit):bat[:oid] 
 STRendswithselect;
 Select all head values of the first input BAT for which the@tail value end 
with the given suffix.
 str
+endswithselect
+pattern str.endswithselect(X_0:bat[:str], X_1:bat[:

MonetDB: Sep2022 - only mark tables as deleted once committed

[Niels Nes]

Changeset: 242a821bb18a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/242a821bb18a
Modified Files:
gdk/gdk_logger.c
sql/storage/store.c
Branch: Sep2022
Log Message:

only mark tables as deleted once committed


diffs (25 lines):

diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -668,8 +668,8 @@ la_bat_updates(logger *lg, logaction *la
if (bid < 0)
return GDK_FAIL;
if (!bid) {
-   GDKerror("la_bat_updates failed to find bid for object %d\n", 
la->cid);
-   return GDK_FAIL;
+   /* object already gone, nothing needed */
+   return GDK_SUCCEED;
}
 
if (!lg->flushing) {
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -6008,7 +6008,6 @@ sql_trans_drop_table(sql_trans *tr, sql_
if ((res = sys_drop_table(tr, t, drop_action)))
return res;
 
-   t->base.deleted = 1;
if (is_global) {
if ((res = os_del(s->tables, tr, t->base.name, 
dup_base(&t->base
return res;
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

MonetDB: Jun2023 - merged with sep2022

[Niels Nes]

Changeset: 197285790331 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/197285790331
Modified Files:
gdk/gdk_logger.c
sql/storage/store.c
Branch: Jun2023
Log Message:

merged with sep2022


diffs (26 lines):

diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -658,8 +658,8 @@ la_bat_updates(logger *lg, logaction *la
if (bid < 0)
return GDK_FAIL;
if (!bid) {
-   GDKerror("la_bat_updates failed to find bid for object %d\n", 
la->cid);
-   return GDK_FAIL;
+   /* object already gone, nothing needed */
+   return GDK_SUCCEED;
}
 
if (!lg->flushing) {
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -5976,8 +5976,6 @@ sql_trans_drop_table(sql_trans *tr, sql_
if ((res = sys_drop_table(tr, gt?gt:t, drop_action)))
return res;
 
-   t->base.deleted = 1;
-
if (gt && (res = os_del(s->tables, tr, gt->base.name, 
dup_base(>->base
return res;
if (t != gt && (res =os_del(tr->localtmps, tr, t->base.name, 
dup_base(&t->base
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org