From 68d41aa690b794cfbdd73834a4d8cda340751d3f Mon Sep 17 00:00:00 2001 From: YuQing <384681@qq.com> Date: Tue, 22 Mar 2022 08:23:03 +0800 Subject: [PATCH] rename to sf_file_writer_deal_versioned_buffer --- src/sf_binlog_writer.c | 3 ++- src/sf_file_writer.c | 2 +- src/sf_file_writer.h | 5 ++++- src/sf_ordered_writer.c | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/sf_binlog_writer.c b/src/sf_binlog_writer.c index d7c8ac2..a4e569f 100644 --- a/src/sf_binlog_writer.c +++ b/src/sf_binlog_writer.c @@ -46,7 +46,8 @@ static inline void binlog_writer_set_next_version(SFBinlogWriterInfo *writer, } #define deal_binlog_one_record(wb) \ - sf_file_writer_deal_buffer(&wb->writer->fw, &wb->bf, wb->version.last) + sf_file_writer_deal_versioned_buffer(&wb->writer->fw, \ + &wb->bf, wb->version.last) #define GET_WBUFFER_VERSION_COUNT(wb) \ (((wb)->version.last - (wb)->version.first) + 1) diff --git a/src/sf_file_writer.c b/src/sf_file_writer.c index 03a1b44..ecaafd0 100644 --- a/src/sf_file_writer.c +++ b/src/sf_file_writer.c @@ -276,7 +276,7 @@ int sf_file_writer_get_current_index(SFFileWriterInfo *writer) return writer->binlog.index; } -int sf_file_writer_deal_buffer(SFFileWriterInfo *writer, +int sf_file_writer_deal_versioned_buffer(SFFileWriterInfo *writer, BufferInfo *buffer, const int64_t version) { int result; diff --git a/src/sf_file_writer.h b/src/sf_file_writer.h index bdc4fd9..ec1de31 100644 --- a/src/sf_file_writer.h +++ b/src/sf_file_writer.h @@ -69,9 +69,12 @@ int sf_file_writer_init(SFFileWriterInfo *writer, void sf_file_writer_destroy(SFFileWriterInfo *writer); -int sf_file_writer_deal_buffer(SFFileWriterInfo *writer, +int sf_file_writer_deal_versioned_buffer(SFFileWriterInfo *writer, BufferInfo *buffer, const int64_t version); +#define sf_file_writer_deal_buffer(writer, buffer) \ + sf_file_writer_deal_versioned_buffer(writer, buffer, 0) + int sf_file_writer_flush(SFFileWriterInfo *writer); static inline void sf_file_writer_set_flags( diff --git a/src/sf_ordered_writer.c b/src/sf_ordered_writer.c index 417c16d..fac0a62 100644 --- a/src/sf_ordered_writer.c +++ b/src/sf_ordered_writer.c @@ -35,7 +35,7 @@ #include "sf_ordered_writer.h" #define deal_binlog_one_record(writer, wb) \ - sf_file_writer_deal_buffer(&(writer)->fw, &wb->bf, wb->version) + sf_file_writer_deal_versioned_buffer(&(writer)->fw, &wb->bf, wb->version) static inline int flush_writer_files(SFOrderedWriterInfo *writer) {