@@ -359,19 +359,19 @@ print_table_list(Dllist *table_list)
359359void
360360print_table_info (tbl_info * tbl )
361361{
362- sprintf (logbuffer ," table name: %s.%s" ,tbl -> dbi -> dbname ,tbl -> table_name );
362+ sprintf (logbuffer ," table name: %s.%s" ,tbl -> dbi -> dbname ,tbl -> table_name );
363363log_entry (logbuffer );
364364sprintf (logbuffer ," relid: %u; relisshared: %i" ,tbl -> relid ,tbl -> relisshared );
365365log_entry (logbuffer );
366366sprintf (logbuffer ," reltuples: %f; relpages: %u" ,tbl -> reltuples ,tbl -> relpages );
367367log_entry (logbuffer );
368- sprintf (logbuffer ," curr_analyze_count: %li;cur_delete_count: %li" ,
368+ sprintf (logbuffer ," curr_analyze_count: %li;curr_vacuum_count: %li" ,
369369tbl -> curr_analyze_count ,tbl -> curr_vacuum_count );
370370log_entry (logbuffer );
371- sprintf (logbuffer ,"ins_at_last_analyze : %li;del_at_last_vacuum : %li" ,
371+ sprintf (logbuffer ,"last_analyze_count : %li;last_vacuum_count : %li" ,
372372tbl -> CountAtLastAnalyze ,tbl -> CountAtLastVacuum );
373373log_entry (logbuffer );
374- sprintf (logbuffer ,"insert_threshold: %li;delete_threshold %li" ,
374+ sprintf (logbuffer ,"analyze_threshold: %li;vacuum_threshold: %li" ,
375375tbl -> analyze_threshold ,tbl -> vacuum_threshold );
376376log_entry (logbuffer );
377377fflush (LOGOUTPUT );
@@ -678,17 +678,29 @@ print_db_list(Dllist *db_list, int print_table_lists)
678678void
679679print_db_info (db_info * dbi ,int print_tbl_list )
680680{
681- sprintf (logbuffer ,"dbname: %s Username %s Passwd %s" ,dbi -> dbname ,
682- dbi -> username ,dbi -> password );
681+ sprintf (logbuffer ,"dbname: %s" , (dbi -> dbname ) ?dbi -> dbname :"(null)" );
683682log_entry (logbuffer );
684- sprintf ( logbuffer , " oid %u InsertThresh: %li DeleteThresh: %li" , dbi -> oid ,
685- dbi -> analyze_threshold , dbi -> vacuum_threshold );
683+
684+ sprintf ( logbuffer , " oid: %u" , dbi -> oid );
686685log_entry (logbuffer );
686+
687+ sprintf (logbuffer ," username: %s" , (dbi -> username ) ?dbi -> username :"(null)" );
688+ log_entry (logbuffer );
689+
690+ sprintf (logbuffer ," password: %s" , (dbi -> password ) ?dbi -> password :"(null)" );
691+ log_entry (logbuffer );
692+
687693if (dbi -> conn != NULL )
688- log_entry (" conn is valid,we are connected" );
694+ log_entry (" conn is valid,( connected) " );
689695else
690- log_entry (" conn is null,we are not connected. " );
696+ log_entry (" conn is null,( not connected) " );
691697
698+ sprintf (logbuffer ," default_analyze_threshold: %li" ,dbi -> analyze_threshold );
699+ log_entry (logbuffer );
700+
701+ sprintf (logbuffer ," default_vacuum_threshold: %li" ,dbi -> vacuum_threshold );
702+ log_entry (logbuffer );
703+
692704fflush (LOGOUTPUT );
693705if (print_tbl_list > 0 )
694706print_table_list (dbi -> table_list );
@@ -935,7 +947,7 @@ print_cmd_args()
935947log_entry (logbuffer );
936948sprintf (logbuffer ," args->port=%s" , (args -> port ) ?args -> port :"(null)" );
937949log_entry (logbuffer );
938- sprintf (logbuffer ," args->user =%s" , (args -> user ) ?args -> user :"(null)" );
950+ sprintf (logbuffer ," args->username =%s" , (args -> user ) ?args -> user :"(null)" );
939951log_entry (logbuffer );
940952sprintf (logbuffer ," args->password=%s" , (args -> password ) ?args -> password :"(null)" );
941953log_entry (logbuffer );
@@ -1007,7 +1019,7 @@ main(int argc, char *argv[])
10071019db_list = init_db_list ();
10081020if (db_list == NULL )
10091021return 1 ;
1010-
1022+
10111023if (check_stats_enabled (((db_info * )DLE_VAL (DLGetHead (db_list ))))!= 0 )
10121024{
10131025log_entry ("Error: GUC variable stats_row_level must be enabled." );