Merge branch 'develop' of https://github.com/ecmwf/fdb into develop

Author: danovaro

tests/pychunked_data_view/CMakeLists.txt

@@ -12,8 +12,8 @@ function(add_py_test test)
         #prevent findlibs in pyfdb to pickup any globally installed fdb
         "FDB5_DIR=${CMAKE_BINARY_DIR}"
         #prevent findlibs in eccodes-python to pickup any globally installed eccodes
-        "ECCODES_PYTHON_USE_FINDLIBS=1"
-        "ECCODES_DIR=${CMAKE_BINARY_DIR}"
+        "FINDLIBS_DISABLE_PACKAGE=yes"
+        "ECCODES_DIR=$<TARGET_FILE_DIR:eccodes>/.."
     )
     set_tests_properties(pychunked_data_view_${stem}
         PROPERTIES

tests/regressions/CMakeLists.txt

@@ -22,6 +22,7 @@ if (HAVE_FDB_BUILD_TOOLS) # test scripts use the fdb tools
         add_subdirectory(FDB-307)
         add_subdirectory(FDB-310)
         add_subdirectory(FDB-332)
+        add_subdirectory(FDB-533)
         add_subdirectory(FDB-535)
         add_subdirectory(FDB-541)
     endif()

tests/regressions/FDB-533/CMakeLists.txt

@@ -0,0 +1,7 @@
+ecbuild_configure_file( FDB-533.sh.in FDB-533.sh @ONLY )
+
+ecbuild_add_test(
+    TYPE     SCRIPT
+    COMMAND  FDB-533.sh
+    ENVIRONMENT "${test_environment}" )
+

tests/regressions/FDB-533/FDB-533.sh.in

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+set -eux
+
+fdbread="$<TARGET_FILE:fdb-read>"
+fdbwrite="$<TARGET_FILE:fdb-write>"
+fdblist="$<TARGET_FILE:fdb-list>"
+fdbdumptoc="$<TARGET_FILE:fdb-dump-toc>"
+
+gribls="$<TARGET_FILE:grib_ls>"
+gribset="$<TARGET_FILE:grib_set>"
+
+srcdir=@CMAKE_CURRENT_SOURCE_DIR@
+bindir=@CMAKE_CURRENT_BINARY_DIR@
+wdir=$bindir/FDB-533
+
+### cleanup and prepare test
+
+rm -rf $bindir/localroot
+mkdir localroot
+
+for f in config.yaml schema x.grib ok.req fail.req
+do
+    cp $srcdir/$f $bindir
+done
+
+export FDB5_CONFIG_FILE=config.yaml
+
+$fdbwrite x.grib
+
+! $fdbread fail.req out.grib
+
+$fdbread ok.req out.grib
+
+cmp out.grib x.grib

tests/regressions/FDB-533/config.yaml

@@ -0,0 +1,12 @@
+type: local
+engine: toc
+schema: ./schema
+spaces:
+- regex: .*
+  handler: Default
+  roots:
+  - path: ./localroot
+    wipe: true
+    archive: true
+    list: true
+    retrieve: true

tests/regressions/FDB-533/fail.req

@@ -0,0 +1,12 @@
+retrieve,
+  class=od,
+  domain=g,
+  type=fc,
+  stream=oper,
+  expver=xxxx,
+  levtype=ml,
+  levelist=0,
+  param=75/76/77,
+  step=-9,
+  date=20250614,
+  time=1200

tests/regressions/FDB-533/ok.req

@@ -0,0 +1,12 @@
+retrieve,
+  class=od,
+  domain=g,
+  type=fc,
+  stream=oper,
+  expver=xxxx,
+  levtype=ml,
+  levelist=0,
+  param=75/76/77,
+  step=9,
+  date=20250614,
+  time=1200

tests/regressions/FDB-533/schema

@@ -0,0 +1,34 @@
+# Default types
+
+param:      Param;
+step:       Step;
+date:       Date;
+hdate:      Date;
+refdate:    Date;
+latitude:   Double;
+longitude:  Double;
+levelist:   Double;
+grid:       Grid;
+expver:     Expver;
+
+time:       Time;
+fcmonth:    Integer;
+
+number:     Integer;
+frequency:  Integer;
+direction:  Integer;
+channel:    Integer;
+
+instrument: Integer;
+ident:      Integer;
+
+diagnostic: Integer;
+iteration:  Integer;
+system:     Integer;
+method:     Integer;
+
+# this schema looks odd because we need to ensure the 3rd level key is too large to fit in 32 bytes
+[ class, domain?
+       [ type
+               [ step, levelist, param, stream, expver, date, time, levtype ]]
+]

tests/regressions/FDB-533/x.grib

@@ -12,8 +12,8 @@ function(add_py_test test)
         #prevent findlibs in pyfdb to pickup any globally installed fdb
         "FDB5_DIR=${CMAKE_BINARY_DIR}"
         #prevent findlibs in eccodes-python to pickup any globally installed eccodes
-        "ECCODES_PYTHON_USE_FINDLIBS=1"
-        "ECCODES_DIR=${CMAKE_BINARY_DIR}"
+        "FINDLIBS_DISABLE_PACKAGE=yes"
+        "ECCODES_DIR=$<TARGET_FILE_DIR:eccodes>/.."
     )
     set_tests_properties(pychunked_data_view_${stem}
         PROPERTIES