Alon Bar-Lev has uploaded a new change for review. Change subject: db: cleanup: collapse drop/refresh views/sp ......................................................................
db: cleanup: collapse drop/refresh views/sp reduce the public interface of dbfunc-common. Change-Id: Ie13ee3d4ddf899f680b592ff58fb9d09573dae59 Signed-off-by: Alon Bar-Lev <[email protected]> --- M packaging/dbscripts/dbfunc-common.sh M packaging/dbscripts/refreshStoredProcedures.sh 2 files changed, 48 insertions(+), 42 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/20/25020/1 diff --git a/packaging/dbscripts/dbfunc-common.sh b/packaging/dbscripts/dbfunc-common.sh index 26cb461..7eddc35 100644 --- a/packaging/dbscripts/dbfunc-common.sh +++ b/packaging/dbscripts/dbfunc-common.sh @@ -51,6 +51,16 @@ dbfunc_common_hook_init_insert_data } +dbfunc_upgrade_drop() { + _dbfunc_common_views_drop + _dbfunc_common_sps_drop +} + +dbfunc_upgrade_refresh() { + dbfunc_common_hook_views_refresh + _dbfunc_common_sps_refresh +} + dbfunc_common_upgrade() { local files="$(_dbfunc_common_get_files "upgrade" 1)" local CMD @@ -171,40 +181,6 @@ version='${version}' " )" -} - -#drops views before upgrade or refresh operations -dbfunc_common_views_drop() { - local file="${DBFUNC_TMPDIR}/drop_views.sql" - - # common stored procedures are executed first (for new added functions to be valid) - dbfunc_psql_die --file="${DBFUNC_COMMON_DBSCRIPTS_DIR}/common_sp.sql" > /dev/null - dbfunc_psql_statement_die "select * from generate_drop_all_views_syntax();" > "${file}" - dbfunc_psql_die --file="${file}" > /dev/null -} - -#drops sps before upgrade or refresh operations -dbfunc_common_sps_drop() { - # common stored procedures are executed first (for new added functions to be valid) - local file="${DBFUNC_TMPDIR}/drop_sps.sql" - - dbfunc_psql_die --file="${DBFUNC_COMMON_DBSCRIPTS_DIR}/common_sp.sql" > /dev/null - dbfunc_psql_statement_die "select * from generate_drop_all_functions_syntax();" > "${file}" - dbfunc_psql_die --file="${file}" > /dev/null - - # recreate generic functions - dbfunc_psql_die --file="${DBFUNC_COMMON_DBSCRIPTS_DIR}/create_functions.sql" > /dev/null -} - -#refreshes sps -dbfunc_common_sps_refresh() { - echo "Creating stored procedures..." - local file - find "${DBFUNC_COMMON_DBSCRIPTS_DIR}" -name '*sp.sql' | sort | while read file; do - echo "Creating stored procedures from ${file}..." - dbfunc_psql_die --file="${file}" > /dev/null - done || exit $? - dbfunc_psql_die --file="${DBFUNC_COMMON_DBSCRIPTS_DIR}/common_sp.sql" > /dev/null } #unlocks the given VM/Template and its disks or a given disk @@ -342,6 +318,40 @@ fi } +#drops views before upgrade or refresh operations +_dbfunc_common_views_drop() { + local file="${DBFUNC_TMPDIR}/drop_views.sql" + + # common stored procedures are executed first (for new added functions to be valid) + dbfunc_psql_die --file="${DBFUNC_COMMON_DBSCRIPTS_DIR}/common_sp.sql" > /dev/null + dbfunc_psql_statement_die "select * from generate_drop_all_views_syntax();" > "${file}" + dbfunc_psql_die --file="${file}" > /dev/null +} + +#drops sps before upgrade or refresh operations +_dbfunc_common_sps_drop() { + # common stored procedures are executed first (for new added functions to be valid) + local file="${DBFUNC_TMPDIR}/drop_sps.sql" + + dbfunc_psql_die --file="${DBFUNC_COMMON_DBSCRIPTS_DIR}/common_sp.sql" > /dev/null + dbfunc_psql_statement_die "select * from generate_drop_all_functions_syntax();" > "${file}" + dbfunc_psql_die --file="${file}" > /dev/null + + # recreate generic functions + dbfunc_psql_die --file="${DBFUNC_COMMON_DBSCRIPTS_DIR}/create_functions.sql" > /dev/null +} + +#refreshes sps +_dbfunc_common_sps_refresh() { + echo "Creating stored procedures..." + local file + find "${DBFUNC_COMMON_DBSCRIPTS_DIR}" -name '*sp.sql' | sort | while read file; do + echo "Creating stored procedures from ${file}..." + dbfunc_psql_die --file="${file}" > /dev/null + done || exit $? + dbfunc_psql_die --file="${DBFUNC_COMMON_DBSCRIPTS_DIR}/common_sp.sql" > /dev/null +} + _dbfunc_common_install_common_func() { # common stored procedures are executed first (for new added functions to be valid) dbfunc_psql_die --file="${DBFUNC_COMMON_DBSCRIPTS_DIR}/common_sp.sql" > /dev/null @@ -349,8 +359,7 @@ _dbfunc_common_run_pre_upgrade() { #Dropping all views & sps - dbfunc_common_views_drop - dbfunc_common_sps_drop + dbfunc_upgrade_drop _dbfunc_common_install_common_func #update sequence numers dbfunc_common_hook_sequence_numbers_update @@ -365,8 +374,7 @@ _dbfunc_common_run_post_upgrade() { #Refreshing all views & sps & run post-upgrade scripts - dbfunc_common_hook_views_refresh - dbfunc_common_sps_refresh + dbfunc_upgrade_refresh #Running post-upgrade scripts _dbfunc_common_psql_statements_in_dir 'post_upgrade' #run custom materialized views if exists diff --git a/packaging/dbscripts/refreshStoredProcedures.sh b/packaging/dbscripts/refreshStoredProcedures.sh index eadb043..e4a81c7 100755 --- a/packaging/dbscripts/refreshStoredProcedures.sh +++ b/packaging/dbscripts/refreshStoredProcedures.sh @@ -37,9 +37,7 @@ done #Dropping all views & sps -dbfunc_common_views_drop -dbfunc_common_sps_drop +dbfunc_upgrade_drop #Refreshing all views & sps -dbfunc_common_hook_views_refresh -dbfunc_common_sps_refresh +dbfunc_upgrade_refresh -- To view, visit http://gerrit.ovirt.org/25020 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie13ee3d4ddf899f680b592ff58fb9d09573dae59 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
