diff --git a/src/sf_binlog_writer.h b/src/sf_binlog_writer.h index ed4e803..8910852 100644 --- a/src/sf_binlog_writer.h +++ b/src/sf_binlog_writer.h @@ -211,6 +211,9 @@ int sf_binlog_writer_notify_exit(SFBinlogWriterInfo *writer); #define sf_binlog_writer_get_last_version(writer) \ sf_file_writer_get_last_version(&(writer)->fw) +#define sf_binlog_writer_get_last_version_silence(writer) \ + sf_file_writer_get_last_version_silence(&(writer)->fw) + #define sf_binlog_get_indexes(writer, start_index, last_index) \ sf_file_writer_get_indexes(&(writer)->fw, start_index, last_index) diff --git a/src/sf_file_writer.h b/src/sf_file_writer.h index dca7753..d5193af 100644 --- a/src/sf_file_writer.h +++ b/src/sf_file_writer.h @@ -95,10 +95,9 @@ static inline int64_t sf_file_writer_get_last_version_ex( return writer->last_versions.done; } else { if (FC_LOG_BY_LEVEL(log_level)) { - log_it_ex(&g_log_context, log_level, - "file: "__FILE__", line: %d, " + log_it_ex(&g_log_context, log_level, "file: %s, line: %d, " "writer: %s, should set writer flags to %d!", - __LINE__, writer->cfg.subdir_name, + __FILE__, __LINE__, writer->cfg.subdir_name, SF_FILE_WRITER_FLAGS_WANT_DONE_VERSION); } @@ -106,11 +105,11 @@ static inline int64_t sf_file_writer_get_last_version_ex( } } -static inline int64_t sf_file_writer_get_last_version( - SFFileWriterInfo *writer) -{ - return sf_file_writer_get_last_version_ex(writer, LOG_ERR); -} +#define sf_file_writer_get_last_version(writer) \ + sf_file_writer_get_last_version_ex(writer, LOG_ERR) + +#define sf_file_writer_get_last_version_silence(writer) \ + sf_file_writer_get_last_version_ex(writer, LOG_NOTHING) int sf_file_writer_get_binlog_indexes(const char *data_path, const char *subdir_name, int *start_index, int *last_index);