Menu
▾
▴
[Perfparse-cvs] _perfparse/libpp_mysql dbms.c, 1.8, 1.9 del_policy.c, 1.4, 1.5 del_policy.h, 1.2, 1.3
|
From: Florian G. <re...@us...> - 2007-12-10 18:55:12
|
Update of /cvsroot/perfparse/_perfparse/libpp_mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2944/libpp_mysql Modified Files: dbms.c del_policy.c del_policy.h Log Message: some more work on purging data Index: dbms.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_mysql/dbms.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** dbms.c 8 Dec 2007 21:25:30 -0000 1.8 --- dbms.c 10 Dec 2007 18:55:09 -0000 1.9 *************** *** 105,109 **** { ! pp_log(__FILE__,__LINE__,LOG_DEBUG,"SQL execution: \"%s\"\n", sql); freeResult(); --- 105,109 ---- { ! pp_log(__FILE__,__LINE__,LOG_DEBUG_SQL,"SQL execution: \"%s\"\n", sql); freeResult(); *************** *** 116,120 **** ! pp_log(__FILE__,__LINE__,LOG_DEBUG,"Rows: %d\n", rows()); iSQLCount++; --- 116,120 ---- ! pp_log(__FILE__,__LINE__,LOG_DEBUG_SQL,"Rows: %d\n", rows()); iSQLCount++; *************** *** 127,135 **** MYSQL_RES *result; ! #ifdef SHOW_SQL ! printf("SQL: \"%s\"\n", sql); ! fflush(stdout); ! #endif ! if (mysql_query(&db_mysql, sql)) sql_failure(file, line, sql, mysql_error(&db_mysql)); --- 127,132 ---- MYSQL_RES *result; ! pp_log(__FILE__,__LINE__,LOG_DEBUG_SQL,"SQL execution: \"%s\"\n", sql); ! if (mysql_query(&db_mysql, sql)) sql_failure(file, line, sql, mysql_error(&db_mysql)); *************** *** 156,160 **** MYSQL_ROW row; ! pp_log(__FILE__,__LINE__,LOG_DEBUG,"SQL: \"%s\"\n", sql); if (sRet) free(sRet); --- 153,157 ---- MYSQL_ROW row; ! pp_log(__FILE__,__LINE__,LOG_DEBUG_SQL,"SQL execution: \"%s\"\n", sql); if (sRet) free(sRet); *************** *** 183,190 **** MYSQL_RES *discaud; ! #ifdef SHOW_SQL ! printf("SQL: \"%s\"\n", sql); ! fflush(stdout); ! #endif if (mysql_query(&db_mysql, sql)) --- 180,184 ---- MYSQL_RES *discaud; ! pp_log(__FILE__,__LINE__,LOG_DEBUG_SQL,"SQL execution: \"%s\"\n", sql); if (mysql_query(&db_mysql, sql)) *************** *** 247,271 **** config_get_value_as_string(CONFIG_ITEM_ID_DB_SOCKET), 0)) { ! #ifdef SHOW_SQL ! g_string_printf(s_SQL, "Could not connect to MySQL using: Database = '%s', Host = '%s', Username = '%s', Password = '%s', Port = '%d', Socket = '%s'", ! config_get_value_as_string(CONFIG_ITEM_ID_DB_DATABASE), ! config_get_value_as_string(CONFIG_ITEM_ID_DB_HOST), ! config_get_value_as_string(CONFIG_ITEM_ID_DB_USER), ! config_get_value_as_string(CONFIG_ITEM_ID_DB_PWD), ! config_get_value_as_integer(CONFIG_ITEM_ID_DB_PORT), ! config_get_value_as_string(CONFIG_ITEM_ID_DB_SOCKET)); ! #else ! g_string_printf(s_SQL, "Could not connect to MySQL using: Database = '%s', Host = '%s', Username = '%s', Port = '%d', Socket = '%s'", config_get_value_as_string(CONFIG_ITEM_ID_DB_DATABASE), config_get_value_as_string(CONFIG_ITEM_ID_DB_HOST), config_get_value_as_string(CONFIG_ITEM_ID_DB_USER), ! config_get_value_as_integer(CONFIG_ITEM_ID_DB_PORT), ! config_get_value_as_string(CONFIG_ITEM_ID_DB_SOCKET)); ! #endif mysql_close(&db_mysql); if (bTerminate) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, "Error %s: %s", s_SQL->str, mysql_error(&db_mysql)); sql_failure(__FILE__, __LINE__, s_SQL->str, mysql_error(&db_mysql)); exit(EXIT_FAILURE); --- 241,255 ---- config_get_value_as_string(CONFIG_ITEM_ID_DB_SOCKET), 0)) { ! pp_log(__FILE__,__LINE__,LOG_ERROR,_("Could not connect to MySQL using: Database = '%s', Host = '%s', Username = '%s', Port = '%d', Socket = '%s'"), config_get_value_as_string(CONFIG_ITEM_ID_DB_DATABASE), config_get_value_as_string(CONFIG_ITEM_ID_DB_HOST), config_get_value_as_string(CONFIG_ITEM_ID_DB_USER), ! config_get_value_as_integer(CONFIG_ITEM_ID_DB_PORT), ! config_get_value_as_string(CONFIG_ITEM_ID_DB_SOCKET)); mysql_close(&db_mysql); if (bTerminate) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("Error %s: %s"), s_SQL->str, mysql_error(&db_mysql)); sql_failure(__FILE__, __LINE__, s_SQL->str, mysql_error(&db_mysql)); exit(EXIT_FAILURE); Index: del_policy.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_mysql/del_policy.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** del_policy.c 26 Nov 2007 00:54:09 -0000 1.4 --- del_policy.c 10 Dec 2007 18:55:09 -0000 1.5 *************** *** 215,224 **** - int getRawHostPolicy(char *sHost) - { - g_string_printf(s_SQL, "SELECT raw_delete_policy FROM perfdata_host WHERE host_name = '%s'", - sql_escape(sHost,PERCENT_ESCAPE_CHAR)); ! return sql2pval(query_char(s_SQL->str)); } --- 215,237 ---- ! void getRawHostPolicy(t_raw_policyinfo *policyinfo) ! { ! pp_log(__FILE__,__LINE__,LOG_DEBUG_FUNCTION,_("getRawHostPolicy() called")); ! ! g_string_printf(s_SQL, "SELECT raw_delete_policy_individual,policy_name,delete_policy_seconds FROM perfdata_host h left join perfdata_delete_policy p on h.raw_delete_policy_id=p.policy_id WHERE host_id = '%d'", ! policyinfo->iHostId); ! ! query(s_SQL->str); ! result_row = mysql_fetch_row(query_result); ! if(isNull(0) && isNull(2)) { ! getRawGroupPolicy(policyinfo); ! } else { ! policyinfo->iRawDelPolicy=iData(0); ! policyinfo->sPolicyName=strdup(sData(1)); ! policyinfo->iPolicySeconds=iData(2); ! // TODO: policyinfo->iPolicySource= ! } ! } Index: del_policy.h =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_mysql/del_policy.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** del_policy.h 26 Nov 2007 00:54:09 -0000 1.2 --- del_policy.h 10 Dec 2007 18:55:09 -0000 1.3 *************** *** 9,12 **** --- 9,25 ---- #define DEFAULT_DELETE_POLICY_DAYS 30 + #define DEL_POLICY_UNDEFINED -1 + #define DEL_POLICY_INFINITY -2 + + enum { + DEL_POLICY_SOURCE_METRIC, + DEL_POLICY_SOURCE_METRIC_GROUP, + DEL_POLICY_SOURCE_SERVICE, + DEL_POLICY_SOURCE_SERVICE_GROUP, + DEL_POLICY_SOURCE_HOST, + DEL_POLICY_SOURCE_HOST_GROUP, + DEL_POLICY_SOURCE_HOSTGROUP, + DEL_POLICY_SOURCE_HOSTGROUP_GROUP}; + typedef struct { char *sName; *************** *** 16,19 **** --- 29,44 ---- + // raw del policy info + typedef struct t_raw_policyinfo { + int iServiceId; + char *sServiceDesc; + int iHostId; + char *sPolicyName; + int iPolicySource; + int iPolicySeconds; + int iRawDelPolicy; + } t_raw_policyinfo; + + /* Working with perfdata_delete_policy records */ int isPolicyDefined(char *sPolicyName); *************** *** 27,31 **** char *getPolicyDesc(int iPolicy); ! int getRawHostPolicy(char *sHost); int getBinHostPolicy(char *sHost); --- 52,56 ---- char *getPolicyDesc(int iPolicy); ! void getRawHostPolicy(t_raw_policyinfo *policyinfo); int getBinHostPolicy(char *sHost); |
