Merge branch 'hotfix/1.28.2'

ecmwf · Nov 8, 2024 · e49ef1f · e49ef1f
2 parents c4a2cc5 + d63ad0b
commit e49ef1f
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 14 deletions.
diff --git a/.github/ci-config.yml b/.github/ci-config.yml
@@ -1,5 +1,6 @@
 cmake_options: -DENABLE_ECKIT_GEO=ON
 dependencies: |
   ecmwf/ecbuild
+  MathisRosenhauer/libaec@master
 dependency_branch: develop
 parallelism_factor: 8
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.28.1
+1.28.2
diff --git a/cmake/FindAEC.cmake b/cmake/FindAEC.cmake
@@ -18,14 +18,19 @@
 #
 #  AEC_DIR          - prefix path of the AEC installation
 #  AEC_PATH         - prefix path of the AEC installation
-
-find_path( AEC_INCLUDE_DIR szlib.h
-           PATHS ${AEC_DIR} ${AEC_PATH} ENV AEC_DIR ENV AEC_PATH
+#  LIBAEC_DIR
+#  libaec_DIR
+#  LIBAEC_PATH
+#  libaec_PATH
+#  libaec_ROOT
+
+find_path( AEC_INCLUDE_DIR libaec.h
+           PATHS ${AEC_DIR} ${AEC_PATH} ${LIBAEC_DIR} ${libaec_DIR} ${LIBAEC_PATH} ${libaec_PATH} ${libaec_ROOT} ENV AEC_DIR ENV AEC_PATH ENV LIBAEC_DIR ENV libaec_DIR ENV LIBAEC_PATH ENV libaec_PATH ENV libaec_ROOT
            PATH_SUFFIXES include include/aec NO_DEFAULT_PATH )
-find_path( AEC_INCLUDE_DIR szlib.h PATH_SUFFIXES include include/aec )
+find_path( AEC_INCLUDE_DIR libaec.h PATH_SUFFIXES include include/aec )
 
 find_library( AEC_LIBRARY  NAMES aec
-              PATHS ${AEC_DIR} ${AEC_PATH} ENV AEC_DIR ENV AEC_PATH
+              PATHS ${AEC_DIR} ${AEC_PATH} ${LIBAEC_DIR} ${libaec_DIR} ${LIBAEC_PATH} ${libaec_PATH} ${libaec_ROOT} ENV AEC_DIR ENV AEC_PATH ENV LIBAEC_DIR ENV libaec_DIR ENV LIBAEC_PATH ENV libaec_PATH ENV libaec_ROOT
               PATH_SUFFIXES lib lib64 lib/aec lib64/aec NO_DEFAULT_PATH )
 find_library( AEC_LIBRARY NAMES aec PATH_SUFFIXES lib lib64 lib/aec lib64/aec )
 

diff --git a/src/eckit/net/SocketOptions.cc b/src/eckit/net/SocketOptions.cc
@@ -9,20 +9,17 @@
  */
 
 #include <ostream>
+#include <sys/socket.h>
 
 #include "eckit/config/Resource.h"
 #include "eckit/net/SocketOptions.h"
 
 namespace eckit::net {
 
 static void init(SocketOptions& opts) {
-    static std::string bindAddr = Resource<std::string>("localBindingAddress", ""); /* "127.0.0.1" */
-
-    opts.bindAddress(bindAddr);
-
-    static int ListenBacklog = eckit::Resource<int>("socketOptionsListenBacklog", 5);
 
-    opts.listenBacklog(ListenBacklog);
+    static std::string bindAddr = Resource<std::string>("localBindingAddress", ""); /* "127.0.0.1" */
+    static int ListenBacklog = eckit::Resource<int>("socketOptionsListenBacklog", SOMAXCONN);
 
     static bool reusePort  = eckit::Resource<bool>("socketOptionsReusePort", false);
     static bool reuseAddr  = eckit::Resource<bool>("socketOptionsReuseAddr", false);
@@ -34,6 +31,8 @@ static void init(SocketOptions& opts) {
     static int receiveBufferSize = eckit::Resource<int>("socketOptionsReceiveBufferSize", 0);
     static int sendBufferSize    = eckit::Resource<int>("socketOptionsSendBufferSize", 0);
 
+    opts.bindAddress(bindAddr);
+    opts.listenBacklog(ListenBacklog);
     opts.reusePort(reusePort);
     opts.reuseAddr(reuseAddr);
     opts.noLinger(noLinger);

diff --git a/src/eckit/sql/expression/BitColumnExpression.h b/src/eckit/sql/expression/BitColumnExpression.h
@@ -45,7 +45,12 @@ class BitColumnExpression : public ColumnExpression {
     // -- Overridden methods
     void prepare(SQLSelect& sql) override;
     void updateType(SQLSelect& sql) override;
-    using ColumnExpression::eval;
+
+    // Use SQLExpression's eval rather than ColumnExpression's
+    void eval(double* out, bool& missing) const override {
+        SQLExpression::eval(out, missing);
+    }
+
     double eval(bool& missing) const override;
     virtual void expandStars(const std::vector<std::reference_wrapper<const SQLTable>>&,
                              expression::Expressions&) override;

diff --git a/src/eckit/system/LibraryManager.cc b/src/eckit/system/LibraryManager.cc
@@ -209,7 +209,9 @@ class LibraryRegistry {
             return plib;
         }
 
-        Log::warning() << "Failed to load library " << dynamicLibraryName << std::endl;
+        Log::warning() << "Failed to load library " << dynamicLibraryName
+                       << " dlerror: " << ::dlerror() << std::endl;
+
         return nullptr;
     }
 
@@ -234,6 +236,12 @@ class LibraryRegistry {
             // lets load since the associated library isn't registered
             void* libhandle = loadDynamicLibrary(lib);
 
+            if (!libhandle) {
+                std::ostringstream ss;
+                ss << "Failed to load library " << lib;
+                throw FailedSystemCall(ss.str().c_str(), Here());
+            }
+
             // the plugin should self-register when the library loads
             Plugin* plugin = lookupPlugin(name);
             if (plugin) {