MonetDB: Dec2023 - When running 'Mtest.py -v' also print summary...
Changeset: df115bd3ea58 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/df115bd3ea58
Modified Files:
testing/Mtest.py.in
Branch: Dec2023
Log Message:
When running 'Mtest.py -v' also print summary and time information at the end
(as done when running 'Mtest.py')
diffs (12 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -4271,7 +4271,7 @@ VALUES (%s, '%s', '%s', '%s',
for f in Failure[x]:
what += "%s\n" % f
print(file=sys.stderr, end='', flush=True)
-if verbosity == 0:
+if verbosity == 0 or verbosity == 1:
if Failed or errseen:
prred('ERROR')
else:
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
monetdb-java: default - Extend testing also against Jul2021
Changeset: 3b215a009634 for monetdb-java URL: https://dev.monetdb.org/hg/monetdb-java/rev/3b215a009634 Modified Files: .github/workflows/macos.yml .github/workflows/monetdbversions.yml Branch: default Log Message: Extend testing also against Jul2021 diffs (28 lines): diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -1,5 +1,6 @@ # This workflow will build a Java project with Maven # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven +# or https://github.com/actions/checkout and https://github.com/actions/setup-java name: MacOS diff --git a/.github/workflows/monetdbversions.yml b/.github/workflows/monetdbversions.yml --- a/.github/workflows/monetdbversions.yml +++ b/.github/workflows/monetdbversions.yml @@ -1,5 +1,6 @@ # This workflow will build a Java project with Maven # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven +# or https://github.com/actions/checkout and https://github.com/actions/setup-java name: Test with various MonetDB versions @@ -13,6 +14,7 @@ jobs: fail-fast: false matrix: monetdbversion: + - "monetdb/dev-builds:Jul2021" - "monetdb/dev-builds:Jan2022" - "monetdb/dev-builds:Sep2022" - "monetdb/dev-builds:Jun2023" ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
monetdb-java: default - Update used monetdb_container
Changeset: 86417297dd9e for monetdb-java URL: https://dev.monetdb.org/hg/monetdb-java/rev/86417297dd9e Modified Files: .github/workflows/jdkversions.yml Branch: default Log Message: Update used monetdb_container diffs (22 lines): diff --git a/.github/workflows/jdkversions.yml b/.github/workflows/jdkversions.yml --- a/.github/workflows/jdkversions.yml +++ b/.github/workflows/jdkversions.yml @@ -1,7 +1,8 @@ # This workflow will build a Java project with Maven # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven +# or https://github.com/actions/checkout and https://github.com/actions/setup-java -# Note: Oracle JDK is only supported for JDK 17 and later +# Note: Oracle JDK is only supported for JDK 17, 21 and later name: Test with various JDK versions @@ -30,7 +31,7 @@ jobs: services: monetdb_container: -image: monetdb/dev-builds:Jun2023 +image: monetdb/dev-builds:Dec2023 env: MDB_DAEMON_PASS: monetdb MDB_DB_ADMIN_PASS: monetdb ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: balanced_union - Merges with default
Changeset: f121a9c0843a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f121a9c0843a
Modified Files:
gdk/ChangeLog.Dec2023
monetdb5/ChangeLog.Dec2023
sql/ChangeLog.Dec2023
sql/backends/monet5/rel_bin.c
sql/server/rel_dump.c
sql/server/rel_exp.c
sql/server/rel_optimize_others.c
sql/server/rel_optimize_sel.c
sql/server/rel_propagate.c
sql/server/rel_rel.c
sql/server/rel_rel.h
sql/server/rel_rewriter.c
sql/server/rel_select.c
sql/server/rel_statistics.c
sql/server/rel_unnest.c
sql/server/sql_partition.c
Branch: balanced_union
Log Message:
Merges with default
diffs (truncated from 169809 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -823,3 +823,4 @@ 1230526af30f40eeea30fb87c47c3e414920561f
95d8feaa1167b5ba87bd99253c3f4e62ebf528a1 Dec2023_3
dcc8c702e685a4faf21ccf663028d1bc3d1165d1 Dec2023_5
dcc8c702e685a4faf21ccf663028d1bc3d1165d1 Dec2023_SP1_release
+d656785f49ee62c19705722aa6b7c171904c64d5 Dec2023_7
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -91,7 +91,7 @@ Group: Applications/Databases
License: MPL-2.0
URL: https://www.monetdb.org/
BugURL: https://github.com/MonetDB/MonetDB/issues
-Source:
https://www.monetdb.org/downloads/sources/Dec2023-SP1/%{name}-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Dec2023-SP2/%{name}-%{version}.tar.bz2
# The Fedora packaging document says we need systemd-rpm-macros for
# the _unitdir and _tmpfilesdir macros to exist; however on RHEL 7
@@ -679,7 +679,6 @@ This package contains files needed to de
%files SQL-server5-devel
%defattr(-,root,root)
-%{_includedir}/monetdb/exception_buffer.h
%{_includedir}/monetdb/opt_backend.h
%{_includedir}/monetdb/rel_*.h
%{_includedir}/monetdb/sql*.h
@@ -922,6 +921,31 @@ fi
%endif
%changelog
+* Tue Apr 09 2024 Sjoerd Mullender - 11.49.7-20240409
+- Rebuilt.
+- GH#7469: Crash when using `CONTAINS`
+- GH#7479: MonetDB server crashes in `exp_ref`
+- GH#7490: commonTerms optimizer no longer works
+- GH#7495: Crash when simultaneously querying and updating a string column.
+
+* Thu Mar 28 2024 Sjoerd Mullender - 11.49.7-20240409
+- gdk: Threads have their own list of free bats. The list was not returned
+ to the system when a thread exited, meaning that the free bats that
+ were in the list would not be reused by any thread. This has been
+ fixed.
+
+* Tue Mar 19 2024 Sjoerd Mullender - 11.49.7-20240409
+- monetdb5: Fixed interaction between mserver5 and remote mserver5 when only
one
+ of the two has 128 bit integer support.
+
+* Tue Mar 19 2024 Sjoerd Mullender - 11.49.7-20240409
+- sql: Fixed issue where equal column aliases were created. When those
+ aliases were parsed on the remote side it could give crashes.
+
+* Mon Mar 18 2024 Sjoerd Mullender - 11.49.7-20240409
+- gdk: Fixed a couple of deadlock situations, one actually observed, one
+ never observed.
+
* Tue Mar 12 2024 Sjoerd Mullender - 11.49.5-20240312
- Rebuilt.
- GH#7390: Some MonetDB Server crashes found
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -187,7 +187,7 @@ def main():
print(r'')
print(r' ')
id = comp(extend, id, 16,
- sorted([r'include\monetdb\{}'.format(x) for x in filter(lambda
x: (x.startswith('gdk') or x.startswith('monet') or x.startswith('mal') or
x.startswith('sql') or x.startswith('rel') or x.startswith('store') or
x.startswith('exception') or x.startswith('opt_backend')) and x.endswith('.h'),
os.listdir(os.path.join(sys.argv[3], 'include', 'monetdb')))] +
+ sorted([r'include\monetdb\{}'.format(x) for x in filter(lambda
x: (x.startswith('gdk') or x.startswith('monet') or x.startswith('mal') or
x.startswith('sql') or x.startswith('rel') or x.startswith('store') or
x.startswith('opt_backend')) and x.endswith('.h'),
os.listdir(os.path.join(sys.argv[3], 'include', 'monetdb')))] +
[r'include\monetdb\copybinary.h',
r'include\monetdb\mapi.h',
r'include\monetdb\mapi_querytype.h',
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
@@ -5,51302 +5,50917 @@ select * from sys.malfunctions() order b
aggr
Collect
-command aggr.Collect(X_0:bat[:wkb]):wkb
+command aggr.Collect(X_0:bat[:wkb]):wkb
wkbCollectAggr;
TODO
aggr
MakeLine
-command aggr.MakeLine(X_0:bat[:wkb]):wkb
+command aggr.MakeLine(X_0:bat[:wkb]):wkb
wkbMakeLineAggr;
Gets a BAT with point or linestring geometries and returns a single linestring
geometry
aggr
all
-command aggr.all(X_0:bat[:any_1]):any_1
+command aggr.all(X_0:bat[:any_1]):any_1
SQLall;
if all values in b are equal return this, else nil
aggr
allnotequal
MonetDB: Dec2023 - Add test for GH issue #7496
Changeset: b266bfe8a5dd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b266bfe8a5dd
Added Files:
sql/test/BugTracker-2024/Tests/rel2bin_select-Bug-7496.test
Modified Files:
sql/test/BugTracker-2024/Tests/All
Branch: Dec2023
Log Message:
Add test for GH issue #7496
diffs (51 lines):
diff --git a/sql/test/BugTracker-2024/Tests/All
b/sql/test/BugTracker-2024/Tests/All
--- a/sql/test/BugTracker-2024/Tests/All
+++ b/sql/test/BugTracker-2024/Tests/All
@@ -49,3 +49,4 @@ rel_groupby_cse-Bug-7485
CMDgen_group-Bug-7486
sql_init_subtype-Bug-7487
orderby-max-over-rows-Bug-7488
+rel2bin_select-Bug-7496
diff --git a/sql/test/BugTracker-2024/Tests/rel2bin_select-Bug-7496.test
b/sql/test/BugTracker-2024/Tests/rel2bin_select-Bug-7496.test
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2024/Tests/rel2bin_select-Bug-7496.test
@@ -0,0 +1,38 @@
+statement ok
+create view columns_7496 as select
+ s."name" as table_schema,
+ t."name" as table_name,
+ c."name" as column_name,
+ cast(1 + c."number" as int) as ordinal_position,
+ c."default" as column_default,
+ cast(sys.ifthenelse(c."null", 'YES', 'NO') as varchar(3)) as is_nullable,
+ cast(sys."describe_type"(c."type", c."type_digits", c."type_scale") as
varchar(1024)) as data_type,
+ cast(sys.ifthenelse(seq."name" is null, 'NO', 'YES') as varchar(3)) as
is_identity,
+ seq."name" as identity_generation,
+ seq."start" as identity_start,
+ seq."increment" as identity_increment,
+ seq."maxvalue" as identity_maximum,
+ seq."minvalue" as identity_minimum,
+ cast(sys.ifthenelse(seq."cycle", 'YES', 'NO') as varchar(3)) as
identity_cycle,
+ cast(sys.ifthenelse(seq."name" is null, 'NO', 'YES') as varchar(3)) as
is_generated,
+ cast(sys.ifthenelse(seq."name" is null, null, c."default") as varchar(1024))
as generation_expression,
+ cm."remark" as comments
+ from sys."columns" c
+ inner join sys."tables" t on c."table_id" = t."id"
+ inner join sys."schemas" s on t."schema_id" = s."id"
+ left outer join sys."comments" cm on c."id" = cm."id"
+ left outer join sys."sequences" seq on ((seq."name"||'"') =
substring(c."default", 3 + sys."locate"('"."seq_',c."default",14)))
+ order by s."name", t."name", c."number"
+
+query TI nosort
+SELECT "is_generated", length("is_generated") as data_length FROM columns_7496
WHERE "identity_generation" IS NOT NULL AND length("is_generated") > 2
+
+
+-- next query causes: sql/backends/monet5/rel_bin.c:4355: rel2bin_select:
Assertion `sql->session->status == -10' failed
+skipif knownfail
+query TI nosort
+SELECT "is_generated", length("is_generated") as data_length FROM columns_7496
WHERE "is_generated" IS NOT NULL AND length("is_generated") > 2
+
+
+statement ok
+drop view columns_7496
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Dec2023 - Extend columns.test with query that produced ...
Changeset: 1300bef5365c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1300bef5365c
Modified Files:
sql/test/information-schema/Tests/columns.test
Branch: Dec2023
Log Message:
Extend columns.test with query that produced an error on an older version of
the information_schema.columns view (ref GH 7496)
diffs (16 lines):
diff --git a/sql/test/information-schema/Tests/columns.test
b/sql/test/information-schema/Tests/columns.test
--- a/sql/test/information-schema/Tests/columns.test
+++ b/sql/test/information-schema/Tests/columns.test
@@ -375,6 +375,12 @@ SELECT TABLE_SCHEMA, TABLE_NAME, COLUMN_
WHERE (IS_GENERATED) NOT IN ('NO', 'YES')
+query TTTI rowsort
+SELECT TABLE_NAME, COLUMN_NAME, "is_generated", length("is_generated") as
data_length
+ FROM "information_schema"."columns"
+ WHERE "is_generated" IS NOT NULL AND length("is_generated") > 2
+
+
-- check IS_UPDATABLE allowed values
query rowsort
SELECT TABLE_SCHEMA, TABLE_NAME, COLUMN_NAME, IS_UPDATABLE
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
monetdb-java: default - Update GH actions to v4
Changeset: df43df2ad486 for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java/rev/df43df2ad486
Modified Files:
.github/workflows/jdkversions.yml
.github/workflows/macos.yml
.github/workflows/monetdbversions.yml
Branch: default
Log Message:
Update GH actions to v4
diffs (47 lines):
diff --git a/.github/workflows/jdkversions.yml
b/.github/workflows/jdkversions.yml
--- a/.github/workflows/jdkversions.yml
+++ b/.github/workflows/jdkversions.yml
@@ -38,10 +38,10 @@ jobs:
- 5:5
steps:
-- uses: actions/checkout@v3
+- uses: actions/checkout@v4
- name: Set up JDK
- uses: actions/setup-java@v3
+ uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java_version }}
distribution: ${{ matrix.distribution }}
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -11,9 +11,9 @@ jobs:
runs-on: macos-latest
steps:
-- uses: actions/checkout@v3
+- uses: actions/checkout@v4
- name: Set up JDK 1.8
- uses: actions/setup-java@v3
+ uses: actions/setup-java@v4
with:
java-version: 8
distribution: liberica
diff --git a/.github/workflows/monetdbversions.yml
b/.github/workflows/monetdbversions.yml
--- a/.github/workflows/monetdbversions.yml
+++ b/.github/workflows/monetdbversions.yml
@@ -29,10 +29,10 @@ jobs:
- 5:5
steps:
-- uses: actions/checkout@v3
+- uses: actions/checkout@v4
- name: Set up JDK
- uses: actions/setup-java@v3
+ uses: actions/setup-java@v4
with:
java-version: 8
distribution: liberica
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Changes the table values of the union corresp...
Changeset: 29030533743e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/29030533743e
Modified Files:
sql/test/Tests/union-corresponding.test
Branch: default
Log Message:
Changes the table values of the union corresponding test
diffs (217 lines):
diff --git a/sql/test/Tests/union-corresponding.test
b/sql/test/Tests/union-corresponding.test
--- a/sql/test/Tests/union-corresponding.test
+++ b/sql/test/Tests/union-corresponding.test
@@ -4,7 +4,8 @@ create table foo (a int, b text)
statement ok
insert into foo values
(1, 'alice'),
- (2, 'bob')
+ (2, 'bob'),
+ (9, null)
statement ok
create table bar (c text, a int)
@@ -12,7 +13,8 @@ create table bar (c text, a int)
statement ok
insert into bar values
('hello', 3),
- ('world', 4)
+ ('world', 4),
+ (null,9)
statement ok
create table buz (a int, c text)
@@ -28,16 +30,6 @@ create table empty_a (a int, c text)
statement ok
create table empty_b (c int, a text)
-query I rowsort
-SELECT * FROM foo
-UNION CORRESPONDING
-SELECT * FROM bar
-
-1
-2
-3
-4
-
query IT rowsort
SELECT * FROM foo
UNION
@@ -51,6 +43,24 @@ 5
one
6
two
+9
+NULL
+
+query IT rowsort
+SELECT * FROM foo
+UNION ALL
+SELECT * FROM buz
+
+1
+alice
+2
+bob
+5
+one
+6
+two
+9
+NULL
query I rowsort
SELECT * FROM foo
@@ -61,6 +71,18 @@ 1
2
5
6
+9
+
+query I rowsort
+SELECT * FROM foo
+UNION ALL CORRESPONDING
+SELECT * FROM buz
+
+1
+2
+5
+6
+9
query I rowsort
SELECT a FROM foo
@@ -70,6 +92,7 @@ 1
2
5
6
+9
statement error
SELECT * FROM foo
@@ -91,6 +114,7 @@ 3
4
5
6
+9
statement error
SELECT * FROM buz
@@ -110,6 +134,8 @@ 5
one
6
two
+9
+NULL
query I rowsort
SELECT * FROM buz
@@ -121,6 +147,7 @@ 3
4
5
6
+9
query I rowsort
SELECT * FROM foo
@@ -131,6 +158,19 @@ 1
2
3
4
+9
+
+query I rowsort
+SELECT * FROM foo
+UNION ALL CORRESPONDING
+SELECT * FROM bar
+
+1
+2
+3
+4
+9
+9
query I rowsort
SELECT * FROM foo
@@ -142,6 +182,7 @@ 1
2
3
4
+9
statement error
SELECT * FROM foo
@@ -172,6 +213,33 @@ hello
4
NULL
world
+9
+NULL
+NULL
+
+query ITT rowsort
+SELECT * FROM foo
+OUTER UNION ALL CORRESPONDING
+SELECT * FROM bar
+
+1
+alice
+NULL
+2
+bob
+NULL
+3
+NULL
+hello
+4
+NULL
+world
+9
+NULL
+NULL
+9
+NULL
+NULL
query T rowsort
SELECT * FROM foo
@@ -191,6 +259,8 @@ SELECT * FROM bar
NULL
NULL
+NULL
+NULL
alice
bob
@@ -212,6 +282,8 @@ SELECT * FROM bar
NULL
NULL
+NULL
+NULL
hello
world
@@ -222,6 +294,8 @@ OUTER UNION
SELECT * FROM bar
NULL
+NULL
+NULL
alice
NULL
bob
@@ -237,6 +311,10 @@ OUTER UNION ALL
SELECT * FROM bar
NULL
+NULL
+NULL
+NULL
+NULL
alice
NULL
bob
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Stabalize output of test of executing a TRACE...
Changeset: 4c14a4f23013 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/4c14a4f23013
Modified Files:
clients/odbc/tests/ODBCmetadata.c
Branch: default
Log Message:
Stabalize output of test of executing a TRACE statement via ODBC. The WVARCHAR
length of the "statement" column changes (from 249 to 248 or 251 or 258) for 3
platforms. This shows as errors on testweb. We now suppress this specific
length value.
diffs (54 lines):
diff --git a/clients/odbc/tests/ODBCmetadata.c
b/clients/odbc/tests/ODBCmetadata.c
--- a/clients/odbc/tests/ODBCmetadata.c
+++ b/clients/odbc/tests/ODBCmetadata.c
@@ -186,6 +186,11 @@ compareResultOptClose(SQLHANDLE stmt, SQ
check(ret, SQL_HANDLE_STMT, stmt, "SQLRowCount()");
pos += snprintf(outp + pos, outp_len - pos, "Resultset with %"PRId64"
rows\n", (int64_t) rows);
+ /* detect if special handling of data returned by second TRACE
resultset is needed */
+ if (columns == 2 && (strncmp("TRACE(2) ", functionname, 9) == 0)) {
+ replaceTraceData = 1;
+ }
+
/* get Result Column Names and print them */
for (col = 1; col <= columns; col++) {
ret = SQLDescribeCol(stmt, col, (SQLCHAR *) buf, sizeof(buf),
@@ -214,7 +219,7 @@ compareResultOptClose(SQLHANDLE stmt, SQ
case SQL_BINARY:
case SQL_VARBINARY:
case SQL_LONGVARBINARY:
- if (columnSize != 0) {
+ if (columnSize != 0 && replaceTraceData == 0) {
if (decimalDigits != 0) {
pos += snprintf(outp + pos, outp_len -
pos,
"(%d,%d)", (int) columnSize,
(int) decimalDigits);
@@ -239,11 +244,6 @@ compareResultOptClose(SQLHANDLE stmt, SQ
}
}
- /* detect if special handling of data returned by second TRACE
resultset is needed */
- if (columns == 2 && (strncmp("TRACE(2) ", functionname, 9) == 0)) {
- replaceTraceData = 1;
- }
-
/* Loop through the rows in the result-set */
ret = SQLFetch(stmt);
check(ret, SQL_HANDLE_STMT, stmt, "SQLFetch(1)");
@@ -1594,7 +1594,7 @@ main(int argc, char **argv)
"Resultset with 2 columns\n"
"Resultset with 12 rows\n"
"usec statement\n"
- "BIGINT WVARCHAR(249)\n"
+ "BIGINT WVARCHAR\n"
"4 variable output\n"
"4 variable output\n"
"4 variable output\n"
@@ -1611,7 +1611,7 @@ main(int argc, char **argv)
"Resultset with 2 columns\n"
"Resultset with 11 rows\n"
"usec statement\n"
- "BIGINT WVARCHAR(240)\n"
+ "BIGINT WVARCHAR\n"
"4 variable output\n"
"4 variable output\n"
"4 variable output\n"
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
