Skip to content
Snippets Groups Projects
Commit a30e11e4 authored by Dan Notestein's avatar Dan Notestein Committed by Bartek Wrona
Browse files

Fix minor compile errors required for Ubuntu 24.04

parent 171096d8
No related branches found
No related tags found
1 merge request!632Update docker images to ubuntu 24.04
...@@ -15,7 +15,7 @@ variables: ...@@ -15,7 +15,7 @@ variables:
FF_ENABLE_JOB_CLEANUP: 1 FF_ENABLE_JOB_CLEANUP: 1
GIT_STRATEGY: clone GIT_STRATEGY: clone
# uses registry.gitlab.syncad.com/hive/haf/ci-base-image:ubuntu24.04-1 # 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" CI_DEBUG_SERVICES: "true"
SETUP_SCRIPTS_PATH: "$CI_PROJECT_DIR/scripts" SETUP_SCRIPTS_PATH: "$CI_PROJECT_DIR/scripts"
TEST_TOOLS_NODE_DEFAULT_WAIT_FOR_LIVE_TIMEOUT: 60 TEST_TOOLS_NODE_DEFAULT_WAIT_FOR_LIVE_TIMEOUT: 60
......
#include <boost/algorithm/string.hpp>
#include "configuration.hpp" #include "configuration.hpp"
#include "psql_utils/logger.hpp" #include "psql_utils/logger.hpp"
#include <boost/algorithm/string.hpp>
#include <cassert> #include <cassert>
namespace PsqlTools::QuerySupervisor { namespace PsqlTools::QuerySupervisor {
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include <optional> #include <optional>
#include <deque> #include <deque>
#include <atomic> #include <atomic>
#include <fstream>
namespace hive::plugins::sql_serializer { namespace hive::plugins::sql_serializer {
namespace bfs = boost::filesystem; namespace bfs = boost::filesystem;
......
...@@ -32,19 +32,19 @@ psql -w -d $DB_NAME -v ON_ERROR_STOP=on -U $DB_ADMIN -c "SELECT hive.app_create_ ...@@ -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');" 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}..." 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..." 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.${TABLE_NAME};"
psql -w -d $DB_NAME -v ON_ERROR_STOP=on -U $DB_ADMIN -c "TRUNCATE ${NAME}_live.differing_accounts;" psql -w -d $DB_NAME -v ON_ERROR_STOP=on -U $DB_ADMIN -c "TRUNCATE ${NAME}_live.differing_accounts;"
echo "Installing dependencies..." echo "Installing dependencies..."
pip install psycopg2-binary pip install --break-system-packages psycopg2-binary
rm -f "${CURRENT_PROJECT_DIR}/account_data/accounts_dump.json" rm -f "${CURRENT_PROJECT_DIR}/account_data/accounts_dump.json"
# The line below is somewhat problematic. Gunzip by default deletes gz file after decompression, # 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. # 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: # 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" # gunzip -c "${SCRIPTDIR}/accounts_dump.json.gz" > "${SCRIPTDIR}/accounts_dump.json"
# gzcat "${SCRIPTDIR}/accounts_dump.json.gz" > "${SCRIPTDIR}/accounts_dump.json" # gzcat "${SCRIPTDIR}/accounts_dump.json.gz" > "${SCRIPTDIR}/accounts_dump.json"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment