Changeset: 40841b1e3dd9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/40841b1e3dd9
Branch: literal_features
Log Message:
merge with default
diffs (truncated from 2024 to 300 lines):
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -217,6 +217,7 @@ HEAPalloc(Heap *h, size_t nitems, size_t
return GDK_FAIL;
}
GDKfree(nme);
+ TRC_DEBUG(HEAP, "%s %zu %p (mmap)\n", h->filename, size,
h->base);
}
h->newstorage = h->storage;
return GDK_SUCCEED;
diff --git a/geom/monetdb5/geom_atoms.c b/geom/monetdb5/geom_atoms.c
--- a/geom/monetdb5/geom_atoms.c
+++ b/geom/monetdb5/geom_atoms.c
@@ -272,8 +272,8 @@ wkbFROMSTR_withSRID(const char *geomWKT,
{
GEOSGeom geosGeometry = NULL; /* The geometry object that is parsed
from the src string. */
GEOSWKTReader *WKT_reader;
- const char *polyhedralSurface = "POLYHEDRALSURFACE";
- const char *multiPolygon = "MULTIPOLYGON";
+ static const char polyhedralSurface[] = "POLYHEDRALSURFACE";
+ static const char multiPolygon[] = "MULTIPOLYGON";
char *geomWKT_new = NULL;
size_t parsedCharacters = 0;
diff --git a/monetdb5/modules/atoms/str.c b/monetdb5/modules/atoms/str.c
--- a/monetdb5/modules/atoms/str.c
+++ b/monetdb5/modules/atoms/str.c
@@ -111,7 +111,7 @@
*/
/* These tables were generated from the Unicode 13.0.0 spec. */
-const struct UTF8_lower_upper {
+static const struct UTF8_lower_upper {
const unsigned int from, to;
} UTF8_toUpper[] = { /* code points with non-null uppercase
conversion */
{0x0061, 0x0041,},
diff --git a/monetdb5/modules/mal/Tests/qgram.maltest
b/monetdb5/modules/mal/Tests/qgram.maltest
--- a/monetdb5/modules/mal/Tests/qgram.maltest
+++ b/monetdb5/modules/mal/Tests/qgram.maltest
@@ -36,27 +36,27 @@ query IT rowsort
io.print(b)
----
0
-##h@
+##hä
1
-#h@l
+#häl
10
-r@@$
+rłð$
11
-@@$$
+łð$$
2
-h@ll
+häll
3
-@ll@
+ällö
4
-ll@
+llö
5
-l@ w
+lö w
6
-@ w@
+ö wø
7
- w@r
+ wør
8
-w@r@
+wørł
9
-@r@@
+ørłð
diff --git a/sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_05.test
b/sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_05.test
--- a/sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_05.test
+++ b/sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_05.test
@@ -54,9 +54,6 @@ 33
33.000000
42
42.000000
-@
-@
-@
hello
hello
hello
@@ -64,6 +61,9 @@ hello
hello
hello
hello
+Ö
+Ö
+Ö
statement ok
DROP TABLE pyloader05table
diff --git a/sql/benchmarks/tpcds/Tests/one.test.in
b/sql/benchmarks/tpcds/Tests/one.test.in
--- a/sql/benchmarks/tpcds/Tests/one.test.in
+++ b/sql/benchmarks/tpcds/Tests/one.test.in
@@ -4616,7 +4616,7 @@ with customer_total_return as
,c_last_review_date,ctr_total_return
limit 100
----
-1300 values hashing to 4b80e4995150e5b42229a363bb57dd07
+1300 values hashing to 46f76e63ac60a7b540f258c4ad0fbfdb
query TIRRRR rowsort
-- query 31
diff --git
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/accents_in_strings.SF-926709.test
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/accents_in_strings.SF-926709.test
--- a/sql/test/BugDay_2005-10-06_2.9.3/Tests/accents_in_strings.SF-926709.test
+++ b/sql/test/BugDay_2005-10-06_2.9.3/Tests/accents_in_strings.SF-926709.test
@@ -14,7 +14,7 @@ query IT rowsort
SELECT * FROM bugtest
----
1
-Andr@
+André
1
test
diff --git a/sql/test/BugTracker-2009/Tests/utf8_bug.SF-2822855.test
b/sql/test/BugTracker-2009/Tests/utf8_bug.SF-2822855.test
--- a/sql/test/BugTracker-2009/Tests/utf8_bug.SF-2822855.test
+++ b/sql/test/BugTracker-2009/Tests/utf8_bug.SF-2822855.test
@@ -19,15 +19,15 @@ select a, length(a) AS len from utf8len
----
0
1
-@
+€
1
-@
+€
1
query T rowsort
select 'Liever €uro' as "Liever euro"
----
-Liever @uro
+Liever €uro
statement ok
drop table utf8len
diff --git a/sql/test/BugTracker-2014/Tests/BOM-in-string.Bug-3641.test
b/sql/test/BugTracker-2014/Tests/BOM-in-string.Bug-3641.test
--- a/sql/test/BugTracker-2014/Tests/BOM-in-string.Bug-3641.test
+++ b/sql/test/BugTracker-2014/Tests/BOM-in-string.Bug-3641.test
@@ -6,5 +6,5 @@ select ' '
query T rowsort
select ' '
----
- @
+
diff --git a/sql/test/BugTracker-2015/Tests/import-non-ascii.Bug-3864.test
b/sql/test/BugTracker-2015/Tests/import-non-ascii.Bug-3864.test
--- a/sql/test/BugTracker-2015/Tests/import-non-ascii.Bug-3864.test
+++ b/sql/test/BugTracker-2015/Tests/import-non-ascii.Bug-3864.test
@@ -16,9 +16,9 @@ query IT rowsort
select * from varcharsize5
----
1
-@@@@@
+不要让早把
1
-@@@@@
+不要让早把
statement ok
rollback
diff --git a/sql/test/BugTracker-2017/Tests/splitpart.Bug-6194.test
b/sql/test/BugTracker-2017/Tests/splitpart.Bug-6194.test
--- a/sql/test/BugTracker-2017/Tests/splitpart.Bug-6194.test
+++ b/sql/test/BugTracker-2017/Tests/splitpart.Bug-6194.test
@@ -1,5 +1,5 @@
query T rowsort
select splitpart('100-ača' , '-', 2)
----
-a@a
+ača
diff --git
a/sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.test
b/sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.test
--- a/sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.test
+++ b/sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.test
@@ -10,58 +10,58 @@ INSERT INTO debugme VALUES ('aa'), ('Aä'), ('AÄ'), ('aä'),
('aÄ'), ('oo'), ('öO'), ('ÖO'), ('öo'), ('Öo')
query T rowsort
SELECT acol FROM debugme WHERE acol ILIKE 'aä'
----
-A@
-A@
-a@
-a@
+AÄ
+Aä
+aÄ
+aä
query T rowsort
SELECT acol FROM debugme WHERE acol ILIKE '%ä'
----
-A@
-A@
-a@
-a@
+AÄ
+Aä
+aÄ
+aä
query T rowsort
SELECT acol FROM debugme WHERE acol ILIKE '%ä%'
----
-A@
-A@
-a@
-a@
+AÄ
+Aä
+aÄ
+aä
query T rowsort
SELECT acol FROM debugme WHERE acol ILIKE 'ö%'
----
-@O
-@O
-@o
-@o
+ÖO
+Öo
+öO
+öo
query T rowsort
SELECT acol FROM debugme WHERE acol ILIKE '%ö%'
----
-@O
-@O
-@o
-@o
+ÖO
+Öo
+öO
+öo
query T rowsort
SELECT acol FROM debugme WHERE acol ILIKE 'ö_'
----
-@O
-@O
-@o
-@o
+ÖO
+Öo
+öO
+öo
query T rowsort
SELECT acol FROM debugme WHERE acol ILIKE 'öo'
----
-@O
-@O
-@o
-@o
+ÖO
+Öo
+öO
+öo
statement ok
ROLLBACK
diff --git
a/sql/test/BugTracker-2019/Tests/copy-into-unicode-quote.Bug-6716.test
b/sql/test/BugTracker-2019/Tests/copy-into-unicode-quote.Bug-6716.test
--- a/sql/test/BugTracker-2019/Tests/copy-into-unicode-quote.Bug-6716.test
+++ b/sql/test/BugTracker-2019/Tests/copy-into-unicode-quote.Bug-6716.test
@@ -26,22 +26,22 @@ 1690
00i'v
2
171067
-arde@ch
+ardèch
2
182773
-a@
+afi
1
41561
-2015@
+2015
1
45804
-21@
+21π
1
51981
-24hours@
+24hours
1
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
