Changeset: 3dce15a5e270 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3dce15a5e270
Branch: default
Log Message:
merged
diffs (truncated from 527 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
@@ -2554,6 +2554,16 @@ command aggr.subvariancep(X_0:bat[:sht],
AGGRsubvariancepcand_dbl
Grouped variance (population/biased) aggregate with candidates list
aggr
+subxmlaggr
+command aggr.subxmlaggr(X_0:bat[:xml], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bit):bat[:xml]
+AGGRsubxml
+Grouped aggregation of XML values.
+aggr
+subxmlaggr
+command aggr.subxmlaggr(X_0:bat[:xml], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit):bat[:xml]
+AGGRsubxmlcand
+Grouped aggregation of XML values with candidates list.
+aggr
subzero_or_one
command aggr.subzero_or_one(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid],
X_3:bit):bat[:any_1]
SQLsubzero_or_one
@@ -3329,6 +3339,11 @@ command aggr.variancep(X_0:bat[:any_2]):
ALGvariancep
Gives the variance of all tail values
aggr
+xmlaggr
+command aggr.xmlaggr(X_0:bat[:xml]):xml
+BATXMLgroup
+Aggregate the XML values.
+aggr
zero_or_one
command aggr.zero_or_one(X_0:bat[:any_1]):any_1
zero_or_one
@@ -50809,11 +50824,6 @@ command uuid.uuid(X_0:str):uuid
UUIDstr2uuid
Coerce a string to a uuid, validating its format
xml
-aggr
-command xml.aggr(X_0:bat[:xml]):xml
-BATXMLgroup
-Aggregate the XML values.
-xml
attribute
command xml.attribute(X_0:str, X_1:str):xml
XMLattribute
@@ -50884,16 +50894,6 @@ command xml.str(X_0:xml):str
XMLxml2str
Cast the string to an xml compliant string
xml
-subaggr
-command xml.subaggr(X_0:bat[:xml], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bit):bat[:xml]
-AGGRsubxml
-Grouped aggregation of XML values.
-xml
-subaggr
-command xml.subaggr(X_0:bat[:xml], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit):bat[:xml]
-AGGRsubxmlcand
-Grouped aggregation of XML values with candidates list.
-xml
text
command xml.text(X_0:xml):str
XMLxmltext
diff --git a/clients/Tests/MAL-signatures.test
b/clients/Tests/MAL-signatures.test
--- a/clients/Tests/MAL-signatures.test
+++ b/clients/Tests/MAL-signatures.test
@@ -2164,6 +2164,16 @@ command aggr.subvariancep(X_0:bat[:sht],
AGGRsubvariancepcand_dbl
Grouped variance (population/biased) aggregate with candidates list
aggr
+subxmlaggr
+command aggr.subxmlaggr(X_0:bat[:xml], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bit):bat[:xml]
+AGGRsubxml
+Grouped aggregation of XML values.
+aggr
+subxmlaggr
+command aggr.subxmlaggr(X_0:bat[:xml], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit):bat[:xml]
+AGGRsubxmlcand
+Grouped aggregation of XML values with candidates list.
+aggr
subzero_or_one
command aggr.subzero_or_one(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid],
X_3:bit):bat[:any_1]
SQLsubzero_or_one
@@ -2764,6 +2774,11 @@ command aggr.variancep(X_0:bat[:any_2]):
ALGvariancep
Gives the variance of all tail values
aggr
+xmlaggr
+command aggr.xmlaggr(X_0:bat[:xml]):xml
+BATXMLgroup
+Aggregate the XML values.
+aggr
zero_or_one
command aggr.zero_or_one(X_0:bat[:any_1]):any_1
zero_or_one
@@ -39184,11 +39199,6 @@ command uuid.uuid(X_0:str):uuid
UUIDstr2uuid
Coerce a string to a uuid, validating its format
xml
-aggr
-command xml.aggr(X_0:bat[:xml]):xml
-BATXMLgroup
-Aggregate the XML values.
-xml
attribute
command xml.attribute(X_0:str, X_1:str):xml
XMLattribute
@@ -39259,16 +39269,6 @@ command xml.str(X_0:xml):str
XMLxml2str
Cast the string to an xml compliant string
xml
-subaggr
-command xml.subaggr(X_0:bat[:xml], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bit):bat[:xml]
-AGGRsubxml
-Grouped aggregation of XML values.
-xml
-subaggr
-command xml.subaggr(X_0:bat[:xml], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit):bat[:xml]
-AGGRsubxmlcand
-Grouped aggregation of XML values with candidates list.
-xml
text
command xml.text(X_0:xml):str
XMLxmltext
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -469,7 +469,7 @@ log_read_updates(logger *lg, trans *tr,
BATsetcount(*cands, (BUN) nr);
}
- size_t snr = (size_t) nr;
+ BUN snr = (BUN) nr;
BUN total = snr;
if (append && (*cands)->ttype == TYPE_void) {
@@ -477,7 +477,7 @@ log_read_updates(logger *lg, trans *tr,
*cands = COLnew(0, TYPE_oid, (BUN) nr,
TRANSIENT);
}
oid *c = append?Tloc((*cands), 0):NULL;
- while(snr) {
+ while (snr) {
if (mnstr_readLng(lg->input_log, &nr)
!= 1 ||
mnstr_readLng(lg->input_log,
&offset) != 1) {
TRC_CRITICAL(GDK, "read
failed\n");
@@ -492,9 +492,9 @@ log_read_updates(logger *lg, trans *tr,
lg->rbuf = t;
lg->rbufsize = tlen;
for (BUN p = 0; p < (BUN) nr;
p++)
- *c++ = offset++;
+ *c++ = (oid) offset++;
}
- snr -= nr;
+ snr -= (BUN) nr;
}
if (append) {
BATsetcount( *cands, total );
@@ -539,7 +539,7 @@ log_read_updates(logger *lg, trans *tr,
}
}
} else if (l->flag == LOG_UPDATE_CB) {
- size_t snr = (size_t) nr;
+ BUN snr = (BUN) nr;
uid = COLnew(0, TYPE_oid, (BUN) nr, TRANSIENT);
if (r && uid == NULL) {
@@ -549,7 +549,7 @@ log_read_updates(logger *lg, trans *tr,
}
oid *c = uid?Tloc(uid, 0):NULL;
BUN total = snr;
- while(snr) {
+ while (snr) {
if (mnstr_readLng(lg->input_log, &nr) != 1 ||
mnstr_readLng(lg->input_log, &offset) != 1)
{
if (r)
@@ -571,11 +571,11 @@ log_read_updates(logger *lg, trans *tr,
TRC_CRITICAL(GDK, "append to bat failed\n");
res = LOG_ERR;
}
- *c++ = offset++;
+ *c++ = (oid) offset++;
}
}
}
- snr -= nr;
+ snr -= (BUN) nr;
}
if (uid) {
BATsetcount( uid, total );
diff --git a/sql/backends/monet5/sql_rank.c b/sql/backends/monet5/sql_rank.c
--- a/sql/backends/monet5/sql_rank.c
+++ b/sql/backends/monet5/sql_rank.c
@@ -1143,17 +1143,21 @@ do_lead_lag(Client cntxt, MalBlkPtr mb,
goto bailout;
}
bpi = bat_iterator(d);
- p = BUNtail(bpi, 0);
- default_size = ATOMlen(tp3, p);
- default_value = GDKmalloc(default_size);
- if (default_value)
- memcpy(default_value, p, default_size);
+ if (bpi.count > 0) {
+ p = BUNtail(bpi, 0);
+ default_size = ATOMlen(tp3, p);
+ default_value = GDKmalloc(default_size);
+ if (default_value)
+ memcpy(default_value, p, default_size);
+ free_default_value = true;
+ } else {
+ default_value = (void *)ATOMnilptr(bpi.type);
+ }
bat_iterator_end(&bpi);
if (!default_value) {
msg = createException(SQL, op, SQLSTATE(HY013)
MAL_MALLOC_FAIL);
goto bailout;
}
- free_default_value = true;
} else {
ValRecord *in = &(stk)->stk[(pci)->argv[3]];
default_value = VALget(in);
diff --git
a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320-Windows.test
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320-Windows.test
--- a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320-Windows.test
+++ b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320-Windows.test
@@ -9,7 +9,7 @@ plan copy into cm_tmp from E'\\file1',E'
----
group by (
| insert(
-| | table("sys"."cm_tmp") [ "cm_tmp"."i" NOT NULL UNIQUE, "cm_tmp"."%TID%" NOT
NULL UNIQUE ]
+| | table("sys"."cm_tmp") [ "cm_tmp"."i", "cm_tmp"."%TID%" NOT NULL UNIQUE ]
| | munion (
| | | project (
| | | | table ("sys"."copyfrom"(table("cm_tmp"), varchar "|", varchar "\n",
varchar NULL, varchar "null", varchar "\\file1", bigint(1) "-1", bigint(1) "0",
int(1) "0", varchar NULL, int(1) "0", int(1) "1", varchar ".", varchar NULL),
@@ -28,7 +28,7 @@ plan copy into cm_tmp from E'a:\\file1',
----
group by (
| insert(
-| | table("sys"."cm_tmp") [ "cm_tmp"."i" NOT NULL UNIQUE, "cm_tmp"."%TID%" NOT
NULL UNIQUE ]
+| | table("sys"."cm_tmp") [ "cm_tmp"."i", "cm_tmp"."%TID%" NOT NULL UNIQUE ]
| | munion (
| | | project (
| | | | table ("sys"."copyfrom"(table("cm_tmp"), varchar "|", varchar "\n",
varchar NULL, varchar "null", varchar "a:\\file1", bigint(1) "-1", bigint(1)
"0", int(1) "0", varchar NULL, int(1) "0", int(1) "1", varchar ".", varchar
NULL),
diff --git a/sql/test/BugTracker-2021/Tests/query-too-complex.Bug-7092.test
b/sql/test/BugTracker-2021/Tests/query-too-complex.Bug-7092.test
--- a/sql/test/BugTracker-2021/Tests/query-too-complex.Bug-7092.test
+++ b/sql/test/BugTracker-2021/Tests/query-too-complex.Bug-7092.test
@@ -86990,3 +86990,4 @@ SELECT SUM(test.dkey), test.dkey
statement ok
drop table if exists test
+
diff --git a/sql/test/BugTracker-2023/Tests/misc-crashes-7390.test
b/sql/test/BugTracker-2023/Tests/misc-crashes-7390.test
--- a/sql/test/BugTracker-2023/Tests/misc-crashes-7390.test
+++ b/sql/test/BugTracker-2023/Tests/misc-crashes-7390.test
@@ -458,7 +458,7 @@ DROP TABLE v0
-- 31.sql
onlyif has-hugeint
-query I
+query I nosort
SELECT ALL ( SELECT - - - - - - - - - - - 1 - - - - - - 16 FROM ( SELECT NULL
- - - - - - - - - - - - - - - - 1 FROM ( SELECT - - - - 1 * - - - - - -
2147483648 * - - - 43 * 77745222.000000 ) AS v1 ( v1 ) GROUP BY GROUPING SETS (
GROUPING SETS ( CUBE ( v1 ) ) ) ORDER BY v1 , - - - 86 + - - 93 ^ v1 , v1 LIMIT
21 ) AS v1 UNION SELECT - - - - - - - - - - - - 93 WHERE - v1 < -
63226945.000000 - - - - - - - - - - 68 ) FROM ( VALUES ( - - - - - - - - - 40 /
- ( SELECT - - - - - - - - 0 WHERE - - - - - - - 40 = - - - - - 0 ) ) , ( - -
88 ) ) v1 ( v1 )
----
15
diff --git a/sql/test/BugTracker-2025/Tests/7635_name_propagation_missing.test
b/sql/test/BugTracker-2025/Tests/7635_name_propagation_missing.test
--- a/sql/test/BugTracker-2025/Tests/7635_name_propagation_missing.test
+++ b/sql/test/BugTracker-2025/Tests/7635_name_propagation_missing.test
@@ -4,14 +4,15 @@ CREATE TABLE t0(c0 INT)
statement ok
INSERT INTO t0 VALUES (1)
-query II
+query II nosort
SELECT * FROM t0 INNER JOIN (SELECT (1 = ANY(VALUES (1)))) AS sub ON TRUE
----
1
1
-query II
+query II nosort
SELECT * FROM t0 INNER JOIN (SELECT (1 = ANY(VALUES (1)) = TRUE)) AS sub ON
TRUE
----
1
1
+
diff --git a/sql/test/BugTracker-2025/Tests/7645_not_likeselect.test
b/sql/test/BugTracker-2025/Tests/7645_not_likeselect.test
--- a/sql/test/BugTracker-2025/Tests/7645_not_likeselect.test
+++ b/sql/test/BugTracker-2025/Tests/7645_not_likeselect.test
@@ -1,6 +1,7 @@
statement ok
CREATE TABLE IF NOT EXISTS database0_t2(c2 STRING)
-query TI
+query TT nosort
SELECT * FROM database0_t2 JOIN (VALUES (INTERVAL '18115' MONTH)) ON ((
(database0_t2.c2 NOT LIKE CAST(INTERVAL '20039' MONTH AS STRING(909))) OR
(database0_t2.c2 LIKE database0_t2.c2) ))
----
+
diff --git a/sql/test/BugTracker-2025/Tests/7648_rightjoin_crash.test
b/sql/test/BugTracker-2025/Tests/7648_rightjoin_crash.test
--- a/sql/test/BugTracker-2025/Tests/7648_rightjoin_crash.test
+++ b/sql/test/BugTracker-2025/Tests/7648_rightjoin_crash.test
@@ -1,7 +1,7 @@
statement ok
CREATE TABLE IF NOT EXISTS t0(c0 INT)
-query II
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
