From a30e11e445414ef5a60157afcfd2affe6dd3b838 Mon Sep 17 00:00:00 2001
From: DanEric <dan@syncad.com>
Date: Wed, 19 Mar 2025 14:34:46 +0000
Subject: [PATCH] Fix minor compile errors required for Ubuntu 24.04
---
.gitlab-ci.yml | 2 +-
src/query_supervisor/configuration.cpp | 4 ++--
.../include/hive/plugins/sql_serializer/write_ahead_log.hpp | 1 +
.../integration/state_provider/state_provider_common_run.sh | 6 +++---
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9dc82aa60..a72823a1d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ variables:
FF_ENABLE_JOB_CLEANUP: 1
GIT_STRATEGY: clone
# uses registry.gitlab.syncad.com/hive/haf/ci-base-image:ubuntu24.04-1
- BUILDER_IMAGE_TAG: "@sha256:a3793dfccca6762c33adf819588960ea45463bf00be2ba61d8040260c3e648b1"
+ BUILDER_IMAGE_TAG: "@sha256:fc149082a4ee91ed622a14d283ae7fe44d13b123f2927d2e71a2167bbe63fab0"
CI_DEBUG_SERVICES: "true"
SETUP_SCRIPTS_PATH: "$CI_PROJECT_DIR/scripts"
TEST_TOOLS_NODE_DEFAULT_WAIT_FOR_LIVE_TIMEOUT: 60
diff --git a/src/query_supervisor/configuration.cpp b/src/query_supervisor/configuration.cpp
index ed68cc077..c75c81d2e 100644
--- a/src/query_supervisor/configuration.cpp
+++ b/src/query_supervisor/configuration.cpp
@@ -1,9 +1,9 @@
+#include <boost/algorithm/string.hpp>
+
#include "configuration.hpp"
#include "psql_utils/logger.hpp"
-#include <boost/algorithm/string.hpp>
-
#include <cassert>
namespace PsqlTools::QuerySupervisor {
diff --git a/src/sql_serializer/include/hive/plugins/sql_serializer/write_ahead_log.hpp b/src/sql_serializer/include/hive/plugins/sql_serializer/write_ahead_log.hpp
index 7d8c079c5..86deadb4b 100644
--- a/src/sql_serializer/include/hive/plugins/sql_serializer/write_ahead_log.hpp
+++ b/src/sql_serializer/include/hive/plugins/sql_serializer/write_ahead_log.hpp
@@ -5,6 +5,7 @@
#include <optional>
#include <deque>
#include <atomic>
+#include <fstream>
namespace hive::plugins::sql_serializer {
namespace bfs = boost::filesystem;
diff --git a/tests/integration/state_provider/state_provider_common_run.sh b/tests/integration/state_provider/state_provider_common_run.sh
index ccd602a4b..26b66f066 100755
--- a/tests/integration/state_provider/state_provider_common_run.sh
+++ b/tests/integration/state_provider/state_provider_common_run.sh
@@ -32,19 +32,19 @@ psql -w -d $DB_NAME -v ON_ERROR_STOP=on -U $DB_ADMIN -c "SELECT hive.app_create_
psql -w -d $DB_NAME -v ON_ERROR_STOP=on -U $DB_ADMIN -c "SELECT hive.app_state_provider_import('${TYPE}', '${NAME}_live');"
echo "Replay of ${NAME}..."
-psql -w -d $DB_NAME -v ON_ERROR_STOP=on -U $DB_ADMIN -c "CALL ${NAME}_live.main('${NAME}_live', 0, 5000000, 500000);"
+psql -w -d $DB_NAME -v ON_ERROR_STOP=on -U $DB_ADMIN -c "CALL ${NAME}_live.main('${NAME}_live', 0, 5000000, 500000);"
echo "Clearing tables..."
psql -w -d $DB_NAME -v ON_ERROR_STOP=on -U $DB_ADMIN -c "TRUNCATE ${NAME}_live.${TABLE_NAME};"
psql -w -d $DB_NAME -v ON_ERROR_STOP=on -U $DB_ADMIN -c "TRUNCATE ${NAME}_live.differing_accounts;"
echo "Installing dependencies..."
-pip install psycopg2-binary
+pip install --break-system-packages psycopg2-binary
rm -f "${CURRENT_PROJECT_DIR}/account_data/accounts_dump.json"
# The line below is somewhat problematic. Gunzip by default deletes gz file after decompression,
# but the '-k' parameter, which prevents that from happening is not supported on some of its versions.
-#
+#
# Thus, depending on the OS, the line below may need to be replaced with one of the following:
# gunzip -c "${SCRIPTDIR}/accounts_dump.json.gz" > "${SCRIPTDIR}/accounts_dump.json"
# gzcat "${SCRIPTDIR}/accounts_dump.json.gz" > "${SCRIPTDIR}/accounts_dump.json"
--
GitLab