Merge pull request #361 from KNMI/optimize-getFilesAndIndicesForDimen…

…sions

Optimize getFilesAndIndicesForDimensions

.dockerignore

@@ -1,6 +1,7 @@
 *
 !compile.sh
 !runtests.sh
+!runtests_psql.sh
 !CMakeLists.txt
 !Docker/adaguc-server-config-python-postgres.xml
 !Docker/start.sh
@@ -22,3 +23,4 @@
 !tests/inspiretests/
 !tests/functional_test.py
 !tests/starttests.sh
+!tests/starttests_psql.sh

Dockerfile

@@ -6,7 +6,7 @@ USER root
 LABEL maintainer="[email protected]"
 
 # Version should be same as in Definitions.h
-LABEL version="2.26.0"
+LABEL version="2.27.0"
 
 # Try to update image packages
 RUN apt-get -q -y update \
@@ -85,16 +85,21 @@ COPY data /adaguc/adaguc-server-master/data
 COPY python /adaguc/adaguc-server-master/python
 
 ######### Third stage, test ############
+# To run the tests against a postgres db, see docs/test_postgesql.md
 FROM base AS test
 
+ENV TEST_IN_CONTAINER 1
+
 COPY requirements-dev.txt /adaguc/adaguc-server-master/requirements-dev.txt
 RUN pip install --no-cache-dir -r requirements-dev.txt
 
 COPY tests /adaguc/adaguc-server-master/tests
 COPY runtests.sh /adaguc/adaguc-server-master/runtests.sh
+COPY runtests_psql.sh /adaguc/adaguc-server-master/runtests_psql.sh
 
-# Run adaguc-server functional and regression tests
+# Run adaguc-server functional and regression tests. See also `./doc/developing/testing.md`
 RUN bash runtests.sh
+# RUN bash runtests_psql.sh
 
 # Create a file indicating that the test succeeded. This file is used in the final stage
 RUN echo "TESTSDONE" >  /adaguc/adaguc-server-master/testsdone.txt

NEWS.md

@@ -1,3 +1,7 @@
+**Version 2.27.0 2024-09-02**
+- PostgreSQL query from `getFilesAndIndicesForDimensions` has been rewritten, which fixes https://github.com/KNMI/adaguc-server/issues/341.
+- Optimized existing PostgreSQL queries and reduced number of PostgreSQL queries in general. This results in better performance, the benchmark tool runs 9% faster.
+
 **Version 2.26.0 2024-07-12**
 - Added EDR cube call for gridded datsets to ADAGUC.
 

Readme.md

@@ -23,6 +23,7 @@ Graphical representations of the data can be made using contour lines, shading,
 * [Glossary](./doc/GLOSSARY.md)
 * [Quick Tips](./doc/overview/QuickTips.md)
 * [Profiling](./doc/developing/profiling.md)
+* [Testing](./doc/developing/testing.md)
 
 
 For our detailed paper please read https://doi.org/10.5334/jors.382