提交 26d213e7 编写于 作者: H Hubert Zhang 提交者: Hubert Zhang

Fix storageWrite->maxLargeWriteLen name in Assert

This variable name is not renamed in commit cb447dc4
And will lead to compile error when cassert enabled.
上级 cb447dc4
......@@ -132,7 +132,7 @@ AppendOnlyStorageWrite_Init(AppendOnlyStorageWrite *storageWrite,
storageWrite->maxBufferWithCompressionOverrrunLen =
storageWrite->maxBufferLen + storageWrite->compressionOverrunLen;
storageWrite->maxLargeWriteLen = 2 * storageWrite->maxBufferLen;
Assert(storageWrite->maxBufferWithCompressionOverrrunLen <= storageWrite->largeWriteLen);
Assert(storageWrite->maxBufferWithCompressionOverrrunLen <= storageWrite->maxLargeWriteLen);
memoryLen = BufferedAppendMemoryLen
(
......
......@@ -33,14 +33,14 @@ static void BufferedAppendWrite(
* large write lengths.
*/
int32
BufferedAppendMemoryLen(int32 maxBufferLen,
BufferedAppendMemoryLen(int32 maxBufferWithCompressionOverrrunLen,
int32 maxLargeWriteLen)
{
Assert(maxBufferLen > 0);
Assert(maxLargeWriteLen >= maxBufferLen);
Assert(maxBufferWithCompressionOverrrunLen > 0);
Assert(maxLargeWriteLen >= maxBufferWithCompressionOverrrunLen);
/* Large write memory areas plus adjacent extra memory for 1 buffer. */
return (maxLargeWriteLen + maxBufferLen);
return (maxLargeWriteLen + maxBufferWithCompressionOverrrunLen);
}
/*
......@@ -59,9 +59,9 @@ BufferedAppendInit(BufferedAppend *bufferedAppend,
{
Assert(bufferedAppend != NULL);
Assert(memory != NULL);
Assert(maxBufferLen > 0);
Assert(maxLargeWriteLen >= maxBufferLen);
Assert(memoryLen >= BufferedAppendMemoryLen(maxBufferLen, maxLargeWriteLen));
Assert(maxBufferWithCompressionOverrrunLen> 0);
Assert(maxLargeWriteLen >= maxBufferWithCompressionOverrrunLen);
Assert(memoryLen >= BufferedAppendMemoryLen(maxBufferWithCompressionOverrrunLen, maxLargeWriteLen));
memset(bufferedAppend, 0, sizeof(BufferedAppend));
......@@ -271,7 +271,7 @@ BufferedAppendGetBuffer(BufferedAppend *bufferedAppend,
currentLargeWriteLen = bufferedAppend->largeWriteLen;
Assert(currentLargeWriteLen + bufferLen <=
bufferedAppend->maxLargeWriteLen +
bufferedAppend->maxBufferLen);
bufferedAppend->maxBufferWithCompressionOverrrunLen);
bufferedAppend->bufferLen = bufferLen;
......@@ -339,7 +339,7 @@ BufferedAppendFinishBuffer(BufferedAppend *bufferedAppend,
newLen = bufferedAppend->largeWriteLen + usedLen;
Assert(newLen <= bufferedAppend->maxLargeWriteLen +
bufferedAppend->maxBufferLen);
bufferedAppend->maxBufferWithCompressionOverrrunLen);
if (newLen >= bufferedAppend->maxLargeWriteLen)
{
/*
......
......@@ -87,7 +87,7 @@ typedef struct BufferedAppend
* large write lengths.
*/
extern int32 BufferedAppendMemoryLen(
int32 maxBufferLen,
int32 maxBufferWithCompressionOverrrunLen,
int32 maxLargeWriteLen);
/*
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册