Changeset: e89be260aaa7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e89be260aaa7
Branch: nilmask
Log Message:
Merge with default branch.
diffs (91 lines):
diff --git a/sql/backends/monet5/vaults/parquet/Tests/All
b/sql/backends/monet5/vaults/parquet/Tests/All
--- a/sql/backends/monet5/vaults/parquet/Tests/All
+++ b/sql/backends/monet5/vaults/parquet/Tests/All
@@ -1,4 +1,4 @@
#invalid_parquet
HAVE_SNAPPY?test_parquet_reader
HAVE_DATA_PATH&HAVE_ZSTD&HAVE_SNAPPY?parquet_testing
-test_parquet_unsigned
+HAVE_DATA_PATH&test_parquet_unsigned
diff --git a/sql/backends/monet5/vaults/parquet/pqc_reader.c
b/sql/backends/monet5/vaults/parquet/pqc_reader.c
--- a/sql/backends/monet5/vaults/parquet/pqc_reader.c
+++ b/sql/backends/monet5/vaults/parquet/pqc_reader.c
@@ -2100,42 +2100,44 @@ pqc_read_page_chunk( pqc_reader_t *r, pq
}
}
/* convert data */
+#ifdef HAVE_HGE
if (r->pse->precision == 64 && !r->pse->isSigned) {
uint64_t *l = output;
l += nrows-1;
int128_t *r = output;
r += nrows-1;
for(uint64_t i=0; i< nrows; i++)
- r[-i] = l[-i];
- } else if (r->pse->precision == 32 && !r->pse->isSigned) {
+ *(r-i) = *(l-i);
+ } else
+#endif
+ if (r->pse->precision == 32 && !r->pse->isSigned) {
uint32_t *l = output;
l += nrows-1;
int64_t *r = output;
r += nrows-1;
for(uint64_t i=0; i< nrows; i++)
- r[-i] = l[-i];
+ *(r-i) = *(l-i);
} else if (r->pse->precision == 16 && !r->pse->isSigned) {
uint16_t *l = output;
l += nrows-1;
int32_t *r = output;
r += nrows-1;
for(uint64_t i=0; i< nrows; i++)
- r[-i] = l[-i];
+ *(r-i) = *(l-i);
} else if (r->pse->precision == 8 && !r->pse->isSigned) {
uint8_t *l = output;
l += nrows-1;
int16_t *r = output;
r += nrows-1;
for(uint64_t i=0; i< nrows; i++)
- r[-i] = l[-i];
+ *(r-i) = *(l-i);
} else if (r->pse->type == datetype) {
/* days since epoch ie 1-1-1970 */
uint32_t epoch_date = mkdate(1970, 1, 1);
if (r->pse->precision == 32) {
uint32_t *l = output;
- for(uint64_t i=0; i< nrows; i++) {
+ for(uint64_t i=0; i< nrows; i++)
l[i] = date_add_day(epoch_date, l[i]);
- }
}
} else { // todo timetype
if ((r->pse->type == timestamptype && r->pse->precision == 6) ||
diff --git a/testing/test_docker.sh b/testing/test_docker.sh
--- a/testing/test_docker.sh
+++ b/testing/test_docker.sh
@@ -1,16 +1,16 @@
TEST="python3 -m venv /monetdb/build/venv && .
/monetdb/build/venv/bin/activate && pip install --upgrade pip && pip install
pymonetdb && cmake -Bbuild -S . -DCMAKE_BUILD_TYPE=Release
-DCMAKE_INSTALL_PREFIX=/monetdb/build/install -DASSERT=OFF -DSTRICT=ON && cmake
--build build && cmake --install build && cmake --build build --target test &&
PATH=/monetdb/build/install/bin:$PATH /monetdb/build/install/bin/Mtest.py"
rm -rf build/*
-podman run -i --rm --volume $(pwd):/monetdb:z --workdir /monetdb alpine:latest
<<<"apk add --no-cache bison cmake pkgconf python3 openssl-dev bzip2-dev
libbz2 lz4-dev lz4-libs pcre2-dev readline-dev xz-dev xz-libs zlib-dev
build-base gcc py3-pip py3-cryptography && $TEST"
+podman run -i --rm --volume $(pwd):/monetdb:z --workdir /monetdb alpine:latest
<<<"apk add --no-cache bison cmake pkgconf python3 openssl-dev bzip2-dev
libbz2 lz4-dev lz4-libs pcre2-dev readline-dev xz-dev xz-libs zlib-dev
build-base gcc py3-pip py3-cryptography xxhash-dev && $TEST"
rm -rf build/*
-podman run -i --platform linux/arm64 --rm --volume $(pwd):/monetdb:z --workdir
/monetdb alpine:latest <<<"apk add --no-cache bison cmake pkgconf python3
openssl-dev bzip2-dev libbz2 lz4-dev lz4-libs pcre2-dev readline-dev xz-dev
xz-libs zlib-dev build-base gcc py3-pip py3-cryptography && $TEST"
+podman run -i --platform linux/arm64 --rm --volume $(pwd):/monetdb:z --workdir
/monetdb alpine:latest <<<"apk add --no-cache bison cmake pkgconf python3
openssl-dev bzip2-dev libbz2 lz4-dev lz4-libs pcre2-dev readline-dev xz-dev
xz-libs zlib-dev build-base gcc py3-pip py3-cryptography xxhash-dev && $TEST"
rm -rf build/*
-podman run -i --platform linux/s390x --rm --volume $(pwd):/monetdb:z --workdir
/monetdb alpine:latest <<<"apk add --no-cache bison cmake pkgconf python3
openssl-dev bzip2-dev libbz2 lz4-dev lz4-libs pcre2-dev readline-dev xz-dev
xz-libs zlib-dev build-base gcc py3-pip py3-cryptography && $TEST"
+podman run -i --platform linux/s390x --rm --volume $(pwd):/monetdb:z --workdir
/monetdb alpine:latest <<<"apk add --no-cache bison cmake pkgconf python3
openssl-dev bzip2-dev libbz2 lz4-dev lz4-libs pcre2-dev readline-dev xz-dev
xz-libs zlib-dev build-base gcc py3-pip py3-cryptography xxhash-dev && $TEST"
rm -rf build/*
-podman run -i --rm --volume $(pwd):/monetdb:z --workdir /monetdb amazonlinux:2
<<<"yum -y install bison cmake3 python3 openssl-devel bzip2-devel bzip2-libs
lz4-devel lz4-libs pcre2-devel readline-devel xz-devel xz-libs zlib-devel gcc
pip python3-cryptography make && ${TEST//cmake/cmake3}"
+podman run -i --rm --volume $(pwd):/monetdb:z --workdir /monetdb amazonlinux:2
<<<"yum -y install bison cmake3 python3 openssl-devel bzip2-devel bzip2-libs
lz4-devel lz4-libs pcre2-devel readline-devel xz-devel xz-libs zlib-devel gcc
pip python3-cryptography make xxhash-dev && ${TEST//cmake/cmake3}"
rm -rf build/*
-podman run -i --rm --volume $(pwd):/monetdb:z --workdir /monetdb
amazonlinux:latest <<<"dnf -y install bison cmake python3 openssl-devel
bzip2-devel bzip2-libs lz4-devel lz4-libs pcre2-devel readline-devel xz-devel
xz-libs zlib-devel gcc pip python3-cryptography && $TEST"
+podman run -i --rm --volume $(pwd):/monetdb:z --workdir /monetdb
amazonlinux:latest <<<"dnf -y install bison cmake python3 openssl-devel
bzip2-devel bzip2-libs lz4-devel lz4-libs pcre2-devel readline-devel xz-devel
xz-libs zlib-devel gcc pip python3-cryptography xxhash-dev && $TEST"
rm -rf build/*
-podman run -i --rm --volume $(pwd):/monetdb:z --workdir /monetdb centos
<<<"sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* && sed -i
's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g'
/etc/yum.repos.d/CentOS-* && dnf -y install bison cmake python3 openssl-devel
bzip2-devel bzip2-libs lz4-devel lz4-libs pcre2-devel readline-devel xz-devel
xz-libs zlib-devel gcc python3-pip python3-cryptography libarchive && $TEST"
+podman run -i --rm --volume $(pwd):/monetdb:z --workdir /monetdb centos
<<<"sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* && sed -i
's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g'
/etc/yum.repos.d/CentOS-* && dnf -y install bison cmake python3 openssl-devel
bzip2-devel bzip2-libs lz4-devel lz4-libs pcre2-devel readline-devel xz-devel
xz-libs zlib-devel gcc python3-pip python3-cryptography libarchive xxhash-dev
&& $TEST"
rm -rf build/*
-podman run -i --rm --volume $(pwd):/monetdb:z --workdir /monetdb fedora
<<<"dnf -y install bison cmake python3 openssl-devel bzip2-devel bzip2-libs
lz4-devel lz4-libs pcre2-devel readline-devel xz-devel xz-libs zlib-devel gcc
pip python3-cryptography && $TEST"
+podman run -i --rm --volume $(pwd):/monetdb:z --workdir /monetdb fedora
<<<"dnf -y install bison cmake python3 openssl-devel bzip2-devel bzip2-libs
lz4-devel lz4-libs pcre2-devel readline-devel xz-devel xz-libs zlib-devel gcc
pip python3-cryptography xxhash-dev && $TEST"
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
