--- table_xt.cc.orig 2011-02-19 18:19:02.820272000 +0100 +++ table_xt.cc 2011-02-19 18:30:08.250272004 +0100 @@ -1773,7 +1773,7 @@ xtPublic void xt_create_table(XTThreadPt XTSortedListInfoRec li_undo; #ifdef TRACE_CREATE_TABLES - printf("CREATE %s\n", name->ps_path); + xt_logf(XT_NT_INFO, "CREATE %s\n", name->ps_path); #endif enter_(); if (strlen(xt_last_name_of_path(name->ps_path)) > XT_TABLE_NAME_SIZE-1) @@ -2025,7 +2025,7 @@ xtPublic void xt_drop_table(XTThreadPtr enter_(); #ifdef TRACE_CREATE_TABLES - printf("DROP %s\n", tab_name->ps_path); + xt_logf(XT_NT_INFO, "DROP %s\n", tab_name->ps_path); #endif table_pool = xt_db_lock_table_pool_by_name(self, self->st_database, tab_name, FALSE, FALSE, TRUE, &tab); @@ -2328,7 +2328,7 @@ xtPublic void xt_check_table(XTThreadPtr u_llong ext_rec_count = 0; #if defined(DUMP_CHECK_TABLE) || defined(CHECK_TABLE_STATS) - printf("\nCHECK TABLE: %s\n", tab->tab_name->ps_path); + xt_logf(XT_NT_INFO, "\nCHECK TABLE: %s\n", tab->tab_name->ps_path); #endif xt_lock_mutex(self, &tab->tab_db->db_co_ext_lock); @@ -2338,42 +2338,42 @@ xtPublic void xt_check_table(XTThreadPtr pushr_(xt_unlock_mutex, &tab->tab_rec_lock); #ifdef CHECK_TABLE_STATS - printf("Record buffer size = %lu\n", (u_long) tab->tab_dic.dic_mysql_buf_size); - printf("Fixed length rec. len. = %lu\n", (u_long) tab->tab_dic.dic_mysql_rec_size); - printf("Handle data record size = %lu\n", (u_long) tab->tab_dic.dic_rec_size); - printf("Min/max header size = %d/%d\n", (int) offsetof(XTTabRecFix, rf_data), tab->tab_dic.dic_rec_fixed ? (int) offsetof(XTTabRecFix, rf_data) : (int) offsetof(XTTabRecExtDRec, re_data)); - printf("Min/avg/max record size = %llu/%llu/%llu\n", (u_llong) tab->tab_dic.dic_min_row_size, (u_llong) tab->tab_dic.dic_ave_row_size, (u_llong) tab->tab_dic.dic_max_row_size); + xt_logf(XT_NT_INFO, "Record buffer size = %lu\n", (u_long) tab->tab_dic.dic_mysql_buf_size); + xt_logf(XT_NT_INFO, "Fixed length rec. len. = %lu\n", (u_long) tab->tab_dic.dic_mysql_rec_size); + xt_logf(XT_NT_INFO, "Handle data record size = %lu\n", (u_long) tab->tab_dic.dic_rec_size); + xt_logf(XT_NT_INFO, "Min/max header size = %d/%d\n", (int) offsetof(XTTabRecFix, rf_data), tab->tab_dic.dic_rec_fixed ? (int) offsetof(XTTabRecFix, rf_data) : (int) offsetof(XTTabRecExtDRec, re_data)); + xt_logf(XT_NT_INFO, "Min/avg/max record size = %llu/%llu/%llu\n", (u_llong) tab->tab_dic.dic_min_row_size, (u_llong) tab->tab_dic.dic_ave_row_size, (u_llong) tab->tab_dic.dic_max_row_size); if (tab->tab_dic.dic_def_ave_row_size) - printf("Avg row len set for tab = %lu\n", (u_long) tab->tab_dic.dic_def_ave_row_size); + xt_logf(XT_NT_INFO, "Avg row len set for tab = %lu\n", (u_long) tab->tab_dic.dic_def_ave_row_size); else - printf("Avg row len set for tab = not specified\n"); - printf("Rows fixed length = %s\n", tab->tab_dic.dic_rec_fixed ? "YES" : "NO"); + xt_logf(XT_NT_INFO, "Avg row len set for tab = not specified\n"); + xt_logf(XT_NT_INFO, "Rows fixed length = %s\n", tab->tab_dic.dic_rec_fixed ? "YES" : "NO"); if (tab->tab_dic.dic_tab_flags & XT_TF_MEMORY_TABLE) - printf("Table type = MEMORY\n"); + xt_logf(XT_NT_INFO, "Table type = MEMORY\n"); else if (tab->tab_dic.dic_tab_flags & XT_TF_REAL_TEMP_TABLE) - printf("Table type = TEMPORARY\n"); + xt_logf(XT_NT_INFO, "Table type = TEMPORARY\n"); else if (tab->tab_dic.dic_tab_flags & XT_TF_DDL_TEMP_TABLE) - printf("Table type = DDL-TEMPORARY\n"); + xt_logf(XT_NT_INFO, "Table type = DDL-TEMPORARY\n"); if (tab->tab_dic.dic_def_ave_row_size) - printf("Maximum fixed size = %lu\n", (u_long) XT_TAB_MAX_FIX_REC_LENGTH_SPEC); + xt_logf(XT_NT_INFO, "Maximum fixed size = %lu\n", (u_long) XT_TAB_MAX_FIX_REC_LENGTH_SPEC); else - printf("Maximum fixed size = %lu\n", (u_long) XT_TAB_MAX_FIX_REC_LENGTH); - printf("Minimum variable size = %lu\n", (u_long) XT_TAB_MIN_VAR_REC_LENGTH); - printf("Minimum auto-increment = %llu\n", (u_llong) tab->tab_dic.dic_min_auto_inc); - printf("Number of columns = %lu\n", (u_long) tab->tab_dic.dic_no_of_cols); - printf("Number of fixed columns = %lu\n", (u_long) tab->tab_dic.dic_fix_col_count); - printf("Columns req. for index = %lu\n", (u_long) tab->tab_dic.dic_ind_cols_req); + xt_logf(XT_NT_INFO, "Maximum fixed size = %lu\n", (u_long) XT_TAB_MAX_FIX_REC_LENGTH); + xt_logf(XT_NT_INFO, "Minimum variable size = %lu\n", (u_long) XT_TAB_MIN_VAR_REC_LENGTH); + xt_logf(XT_NT_INFO, "Minimum auto-increment = %llu\n", (u_llong) tab->tab_dic.dic_min_auto_inc); + xt_logf(XT_NT_INFO, "Number of columns = %lu\n", (u_long) tab->tab_dic.dic_no_of_cols); + xt_logf(XT_NT_INFO, "Number of fixed columns = %lu\n", (u_long) tab->tab_dic.dic_fix_col_count); + xt_logf(XT_NT_INFO, "Columns req. for index = %lu\n", (u_long) tab->tab_dic.dic_ind_cols_req); if (tab->tab_dic.dic_ind_rec_len) - printf("Rec len req. for index = %llu\n", (u_llong) tab->tab_dic.dic_ind_rec_len); - printf("Columns req. for blobs = %lu\n", (u_long) tab->tab_dic.dic_blob_cols_req); - printf("Number of blob columns = %lu\n", (u_long) tab->tab_dic.dic_blob_count); - printf("Number of indices = %lu\n", (u_long) tab->tab_dic.dic_key_count); + xt_logf(XT_NT_INFO, "Rec len req. for index = %llu\n", (u_llong) tab->tab_dic.dic_ind_rec_len); + xt_logf(XT_NT_INFO, "Columns req. for blobs = %lu\n", (u_long) tab->tab_dic.dic_blob_cols_req); + xt_logf(XT_NT_INFO, "Number of blob columns = %lu\n", (u_long) tab->tab_dic.dic_blob_count); + xt_logf(XT_NT_INFO, "Number of indices = %lu\n", (u_long) tab->tab_dic.dic_key_count); #endif #ifdef DUMP_CHECK_TABLE - printf("Records:-\n"); - printf("Free list: %llu (%llu)\n", (u_llong) tab->tab_rec_free_id, (u_llong) tab->tab_rec_fnum); - printf("EOF: %llu\n", (u_llong) tab->tab_rec_eof_id); + xt_logf(XT_NT_INFO, "Records:-\n"); + xt_logf(XT_NT_INFO, "Free list: %llu (%llu)\n", (u_llong) tab->tab_rec_free_id, (u_llong) tab->tab_rec_fnum); + xt_logf(XT_NT_INFO, "EOF: %llu\n", (u_llong) tab->tab_rec_eof_id); #endif rec_size = XT_REC_EXT_HEADER_SIZE; @@ -2385,24 +2385,24 @@ xtPublic void xt_check_table(XTThreadPtr xt_throw(self); #ifdef DUMP_CHECK_TABLE - printf("%-4llu ", (u_llong) rec_id); + xt_logf(XT_NT_INFO, "%-4llu ", (u_llong) rec_id); #endif switch (rec_buf->tr_rec_type_1 & XT_TAB_STATUS_MASK) { case XT_TAB_STATUS_FREED: #ifdef DUMP_CHECK_TABLE - printf("======== "); + xt_logf(XT_NT_INFO, "======== "); #endif free_rec_count++; break; case XT_TAB_STATUS_DELETE: #ifdef DUMP_CHECK_TABLE - printf("delete "); + xt_logf(XT_NT_INFO, "delete "); #endif delete_rec_count++; break; case XT_TAB_STATUS_FIXED: #ifdef DUMP_CHECK_TABLE - printf("record-F "); + xt_logf(XT_NT_INFO, "record-F "); #endif alloc_rec_count++; row_size = myxt_store_row_length(ot, (char *) ot->ot_row_rbuffer + XT_REC_FIX_HEADER_SIZE); @@ -2414,7 +2414,7 @@ xtPublic void xt_check_table(XTThreadPtr break; case XT_TAB_STATUS_VARIABLE: #ifdef DUMP_CHECK_TABLE - printf("record-V "); + xt_logf(XT_NT_INFO, "record-V "); #endif alloc_rec_count++; row_size = myxt_load_row_length(ot, tab->tab_dic.dic_rec_size, ot->ot_row_rbuffer + XT_REC_FIX_HEADER_SIZE, NULL); @@ -2426,7 +2426,7 @@ xtPublic void xt_check_table(XTThreadPtr break; case XT_TAB_STATUS_EXT_DLOG: #ifdef DUMP_CHECK_TABLE - printf("record-X "); + xt_logf(XT_NT_INFO, "record-X "); #endif alloc_rec_count++; ext_rec_count++; @@ -2441,9 +2441,9 @@ xtPublic void xt_check_table(XTThreadPtr } #ifdef DUMP_CHECK_TABLE if (rec_buf->tr_rec_type_1 & XT_TAB_STATUS_CLEANED_BIT) - printf("C"); + xt_logf(XT_NT_INFO, "C"); else - printf(" "); + xt_logf(XT_NT_INFO, " "); #endif prev_rec_id = XT_GET_DISK_4(rec_buf->tr_prev_rec_id_4); xn_id = XT_GET_DISK_4(rec_buf->tr_xact_id_4); @@ -2451,13 +2451,13 @@ xtPublic void xt_check_table(XTThreadPtr switch (rec_buf->tr_rec_type_1 & XT_TAB_STATUS_MASK) { case XT_TAB_STATUS_FREED: #ifdef DUMP_CHECK_TABLE - printf(" prev=%-3llu (xact=%-3llu row=%lu)\n", (u_llong) prev_rec_id, (u_llong) xn_id, (u_long) row_id); + xt_logf(XT_NT_INFO, " prev=%-3llu (xact=%-3llu row=%lu)\n", (u_llong) prev_rec_id, (u_llong) xn_id, (u_long) row_id); #endif break; case XT_TAB_STATUS_EXT_DLOG: #ifdef DUMP_CHECK_TABLE - printf(" prev=%-3llu xact=%-3llu row=%lu Xlog=%lu Xoff=%llu Xsiz=%lu\n", (u_llong) prev_rec_id, (u_llong) xn_id, (u_long) row_id, (u_long) XT_GET_DISK_2(rec_buf->re_log_id_2), (u_llong) XT_GET_DISK_6(rec_buf->re_log_offs_6), (u_long) XT_GET_DISK_4(rec_buf->re_log_dat_siz_4)); + xt_logf(XT_NT_INFO, " prev=%-3llu xact=%-3llu row=%lu Xlog=%lu Xoff=%llu Xsiz=%lu\n", (u_llong) prev_rec_id, (u_llong) xn_id, (u_long) row_id, (u_long) XT_GET_DISK_2(rec_buf->re_log_id_2), (u_llong) XT_GET_DISK_6(rec_buf->re_log_offs_6), (u_long) XT_GET_DISK_4(rec_buf->re_log_dat_siz_4)); #endif #ifdef CHECK_TABLE_READ_DATA_LOG @@ -2489,7 +2489,7 @@ xtPublic void xt_check_table(XTThreadPtr break; default: #ifdef DUMP_CHECK_TABLE - printf(" prev=%-3llu xact=%-3llu row=%lu\n", (u_llong) prev_rec_id, (u_llong) xn_id, (u_long) row_id); + xt_logf(XT_NT_INFO, " prev=%-3llu xact=%-3llu row=%lu\n", (u_llong) prev_rec_id, (u_llong) xn_id, (u_long) row_id); #endif break; } @@ -2506,38 +2506,38 @@ xtPublic void xt_check_table(XTThreadPtr if (tab->tab_dic.dic_tab_flags & XT_TF_MEMORY_TABLE) { if (!tab->tab_dic.dic_rec_fixed) { xt_int8_to_byte_size((xtInt8) tab->tab_mem_total, value); - printf("Ext. record memory used = %s\n", value); - printf("Extended record count = %llu\n", ext_rec_count); + xt_logf(XT_NT_INFO, "Ext. record memory used = %s\n", value); + xt_logf(XT_NT_INFO, "Extended record count = %llu\n", ext_rec_count); } xt_int8_to_byte_size((xtInt8) ind, value); - printf("Index data memory used = %s\n", value); + xt_logf(XT_NT_INFO, "Index data memory used = %s\n", value); xt_int8_to_byte_size((xtInt8) rec + row, value); - printf("Table data memory used = %s\n", value); + xt_logf(XT_NT_INFO, "Table data memory used = %s\n", value); xt_int8_to_byte_size((xtInt8) tab->tab_mem_total + rec + row + ind, value); - printf("Total memory used = %s\n", value); + xt_logf(XT_NT_INFO, "Total memory used = %s\n", value); } else { if (!tab->tab_dic.dic_rec_fixed) { xt_int8_to_byte_size((xtInt8) ext_data_len, value); - printf("Ext. record disk used = %s\n", value); - printf("Extended record count = %llu\n", ext_rec_count); + xt_logf(XT_NT_INFO, "Ext. record disk used = %s\n", value); + xt_logf(XT_NT_INFO, "Extended record count = %llu\n", ext_rec_count); } xt_int8_to_byte_size((xtInt8) ind, value); - printf("Index disk space used = %s\n", value); + xt_logf(XT_NT_INFO, "Index disk space used = %s\n", value); xt_int8_to_byte_size((xtInt8) rec + row, value); - printf("Table disk space used = %s\n", value); + xt_logf(XT_NT_INFO, "Table disk space used = %s\n", value); xt_int8_to_byte_size((xtInt8) ext_data_len + rec + row + ind, value); - printf("Total disk space used = %s\n", value); + xt_logf(XT_NT_INFO, "Total disk space used = %s\n", value); } if (alloc_rec_count) { - printf("Minumum comp. rec. len. = %llu\n", (u_llong) min_comp_rec_len); - printf("Average comp. rec. len. = %llu\n", (u_llong) ((double) alloc_rec_bytes / (double) alloc_rec_count + (double) 0.5)); - printf("Maximum comp. rec. len. = %llu\n", (u_llong) max_comp_rec_len); - } - printf("Free record count = %llu\n", (u_llong) free_rec_count); - printf("Deleted record count = %llu\n", (u_llong) delete_rec_count); - printf("Allocated record count = %llu\n", (u_llong) alloc_rec_count); + xt_logf(XT_NT_INFO, "Minumum comp. rec. len. = %llu\n", (u_llong) min_comp_rec_len); + xt_logf(XT_NT_INFO, "Average comp. rec. len. = %llu\n", (u_llong) ((double) alloc_rec_bytes / (double) alloc_rec_count + (double) 0.5)); + xt_logf(XT_NT_INFO, "Maximum comp. rec. len. = %llu\n", (u_llong) max_comp_rec_len); + } + xt_logf(XT_NT_INFO, "Free record count = %llu\n", (u_llong) free_rec_count); + xt_logf(XT_NT_INFO, "Deleted record count = %llu\n", (u_llong) delete_rec_count); + xt_logf(XT_NT_INFO, "Allocated record count = %llu\n", (u_llong) alloc_rec_count); #endif if (tab->tab_rec_fnum != free_rec_count) @@ -2576,9 +2576,9 @@ xtPublic void xt_check_table(XTThreadPtr pushr_(xt_unlock_mutex, &tab->tab_row_lock); #ifdef DUMP_CHECK_TABLE - printf("Rows:-\n"); - printf("Free list: %llu (%llu)\n", (u_llong) tab->tab_row_free_id, (u_llong) tab->tab_row_fnum); - printf("EOF: %llu\n", (u_llong) tab->tab_row_eof_id); + xt_logf(XT_NT_INFO, "Rows:-\n"); + xt_logf(XT_NT_INFO, "Free list: %llu (%llu)\n", (u_llong) tab->tab_row_free_id, (u_llong) tab->tab_row_fnum); + xt_logf(XT_NT_INFO, "EOF: %llu\n", (u_llong) tab->tab_row_eof_id); #endif rec_id = 1; @@ -2586,13 +2586,13 @@ xtPublic void xt_check_table(XTThreadPtr if (!tab->tab_rows.xt_tc_read_4(ot->ot_row_file, rec_id, &ref_id, self)) xt_throw(self); #ifdef DUMP_CHECK_TABLE - printf("%-3llu ", (u_llong) rec_id); + xt_logf(XT_NT_INFO, "%-3llu ", (u_llong) rec_id); #endif #ifdef DUMP_CHECK_TABLE if (ref_id == 0) - printf("====== 0\n"); + xt_logf(XT_NT_INFO, "====== 0\n"); else - printf("in use %llu\n", (u_llong) ref_id); + xt_logf(XT_NT_INFO, "in use %llu\n", (u_llong) ref_id); #endif rec_id++; } @@ -2647,7 +2647,7 @@ xtPublic void xt_rename_table(XTThreadPt memset(&dic, 0, sizeof(dic)); #ifdef TRACE_CREATE_TABLES - printf("RENAME %s --> %s\n", old_name->ps_path, new_name->ps_path); + xt_logf(XT_NT_INFO, "RENAME %s --> %s\n", old_name->ps_path, new_name->ps_path); #endif if (strlen(xt_last_name_of_path(new_name->ps_path)) > XT_TABLE_NAME_SIZE-1) xt_throw_taberr(XT_CONTEXT, XT_ERR_NAME_TOO_LONG, new_name); @@ -2931,7 +2931,7 @@ xtPublic xtBool xt_flush_record_row(XTOp #ifdef TRACE_FLUSH_TABLE tnow = time(NULL); - printf("FLUSH TABLE bytes=%lu %s\n", (u_long) tab->tab_bytes_to_flush, tab->tab_name->ps_path); + xt_logf(XT_NT_INFO, "FLUSH TABLE bytes=%lu %s\n", (u_long) tab->tab_bytes_to_flush, tab->tab_name->ps_path); fflush(stdout); #endif // Want to see how much was to be flushed in the debugger: @@ -2981,7 +2981,7 @@ xtPublic xtBool xt_flush_record_row(XTOp #ifdef TRACE_FLUSH_TABLE if (tnow) { - printf("flush table (%d) %s DONE\n", (int) (time(NULL) - tnow), tab->tab_name->ps_path); + xt_logf(XT_NT_INFO, "flush table (%d) %s DONE\n", (int) (time(NULL) - tnow), tab->tab_name->ps_path); fflush(stdout); } #endif @@ -2997,7 +2997,7 @@ xtPublic xtBool xt_flush_record_row(XTOp #ifdef TRACE_FLUSH_TABLE if (tnow) { - printf("flush table (%d) %s FAILED\n", (int) (time(NULL) - tnow), tab->tab_name->ps_path); + xt_logf(XT_NT_INFO, "flush table (%d) %s FAILED\n", (int) (time(NULL) - tnow), tab->tab_name->ps_path); fflush(stdout); } #endif @@ -4980,7 +4980,7 @@ xtPublic xtBool xt_tab_add_record(XTOpen else next_off_page++; if ((next_on_page % 1000) == 0) - printf("Next on: %d off: %d\n", next_on_page, next_off_page); + xt_logf(XT_NT_INFO, "Next on: %d off: %d\n", next_on_page, next_off_page); #endif if (page->tcp_free_rec == offset) {