diff options
Diffstat (limited to 'src/storage/phrase_index_logger.h')
| -rw-r--r-- | src/storage/phrase_index_logger.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/storage/phrase_index_logger.h b/src/storage/phrase_index_logger.h index c961112..3cff9b8 100644 --- a/src/storage/phrase_index_logger.h +++ b/src/storage/phrase_index_logger.h @@ -87,8 +87,8 @@ public: } /* prolog: has_next_record() returned true. */ - bool next(LOG_TYPE & log_type, phrase_token_t & token, - MemoryChunk * oldone, MemoryChunk * newone){ + bool next_record(LOG_TYPE & log_type, phrase_token_t & token, + MemoryChunk * oldone, MemoryChunk * newone){ size_t offset = m_offset; m_chunk->get_content(offset, &log_type, sizeof(LOG_TYPE)); offset += sizeof(LOG_TYPE); @@ -97,8 +97,7 @@ public: switch(log_type){ case LOG_ADD_RECORD:{ - assert( NULL == oldone); - assert( NULL != newone); + oldone->set_size(0); size_t len = 0; m_chunk->get_content(offset, &len, sizeof(size_t)); offset += sizeof(size_t); @@ -107,8 +106,7 @@ public: break; } case LOG_REMOVE_RECORD:{ - assert( NULL != oldone); - assert( NULL == newone); + newone->set_size(0); size_t len = 0; m_chunk->get_content(offset, &len, sizeof(size_t)); offset += sizeof(size_t); @@ -117,8 +115,6 @@ public: break; } case LOG_MODIFY_RECORD:{ - assert( NULL != oldone); - assert( NULL != newone); size_t oldlen = 0, newlen = 0; m_chunk->get_content(offset, &oldlen, sizeof(size_t)); offset += sizeof(size_t); |