Update of /cvsroot/perfparse/_perfparse/db_tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6960/db_tools
Modified Files:
perfparse-db-purge.c
Log Message:
start convert db_purge for new schema
Index: perfparse-db-purge.c
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/db_tools/perfparse-db-purge.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** perfparse-db-purge.c 31 Oct 2006 23:23:08 -0000 1.6
--- perfparse-db-purge.c 30 Jul 2007 22:32:06 -0000 1.7
***************
*** 4,7 ****
--- 4,8 ----
*
* Copyright (c) 2004 Ben Clewett (per...@cl...)
+ * Florian Gleixner
* $Id$
*
***************
*** 172,177 ****
delete_deleted_items();
- update_policy();
-
deleteBinData();
--- 173,176 ----
***************
*** 180,264 ****
}
- void update_policy(void) {
-
- #ifdef testing
- #ifdef USE_DB_POSTGRESQL
- int numberOfRows;
- #endif
- #endif
-
- query_no_return("UPDATE perfdata_host,perfdata_delete_policy "
- "SET perfdata_host.raw_delete_policy = perfdata_delete_policy.delete_policy "
- "WHERE perfdata_host.raw_delete_policy_type = 'template' "
- "AND perfdata_host.raw_delete_policy_name = perfdata_delete_policy.policy_name ");
-
- query_no_return("UPDATE perfdata_host,perfdata_delete_policy "
- "SET perfdata_host.bin_delete_policy = perfdata_delete_policy.delete_policy "
- "WHERE perfdata_host.bin_delete_policy_type = 'template' "
- "AND perfdata_host.bin_delete_policy_name = perfdata_delete_policy.policy_name ");
-
- query_no_return("UPDATE perfdata_service,perfdata_delete_policy "
- "SET perfdata_service.raw_delete_policy = perfdata_delete_policy.delete_policy "
- "WHERE perfdata_service.raw_delete_policy_type = 'template' "
- "AND perfdata_service.raw_delete_policy_name = perfdata_delete_policy.policy_name ");
-
- query_no_return("UPDATE perfdata_service,perfdata_host "
- "SET perfdata_service.raw_delete_policy = perfdata_host.raw_delete_policy "
- "WHERE perfdata_service.raw_delete_policy_type = 'host' "
- "AND perfdata_service.host_name = perfdata_host.host_name ");
- check_need_for_sleep();
-
- query_no_return("UPDATE perfdata_service_metric,perfdata_delete_policy "
- "SET perfdata_service_metric.bin_delete_policy = perfdata_delete_policy.delete_policy "
- "WHERE perfdata_service_metric.bin_delete_policy_type = 'template' "
- "AND perfdata_service_metric.bin_delete_policy_name = perfdata_delete_policy.policy_name ");
-
- query_no_return("UPDATE perfdata_service_metric,perfdata_host "
- "SET perfdata_service_metric.bin_delete_policy = perfdata_host.bin_delete_policy "
- "WHERE perfdata_service_metric.bin_delete_policy_type = 'host' "
- "AND perfdata_service_metric.host_name = perfdata_host.host_name ");
-
- #ifdef TESTING
-
- printf(_("Binary delete policies:\n"));
-
- g_string_printf(s_SQL, "SELECT host_name, service_description, metric, bin_delete_policy FROM perfdata_service_metric");
- query(s_SQL->str);
-
- #ifdef USE_DB_MYSQL
- while ((result_row = mysql_fetch_row(query_result))) {
- #elif defined USE_DB_POSTGRESQL
- numberOfRows = rows();
- for (currentRow=0;currentRow<numberOfRows;currentRow++){
- #endif
-
- printf("%-20s %-20s %-20s %s\n",
- sData(0), sData(1), sData(2),
- (sData(3)[0]) ? sData(3) : "Never");
-
- }
-
- printf(_("\nRaw delete policies:\n"));
-
- g_string_printf(s_SQL, "SELECT host_name, service_description, raw_delete_policy FROM perfdata_service");
- query(s_SQL->str);
-
- #ifdef USE_DB_MYSQL
- while ((result_row = mysql_fetch_row(query_result))) {
- #elif defined USE_DB_POSTGRESQL
- numberOfRows = rows();
- for (currentRow=0;currentRow<numberOfRows;currentRow++){
- #endif
-
- printf("%-20s %-20s %-20s %s\n",
- sData(0), sData(1), "",
- (sData(2)[0]) ? sData(2) : "Never");
-
- }
-
- #endif
-
- }
-
void delete_deleted_items(void)
--- 179,182 ----
|
