Code review changes

Author: jpmcmu

system/jhtree/jhblockcompressed.cpp

@@ -120,10 +120,10 @@ void CJHBlockCompressedSearchNode::load(CKeyHdr *_keyHdr, const void *rawData, o
     CompressionMethod compressionMethod = *(CompressionMethod*) keys;
     keys += sizeof(CompressionMethod);
 
-    hasFilePosition = *(bool*) keys;
+    zeroFilePosition = *(bool*) keys;
     keys += sizeof(bool);
 
-    keyRecLen = hasFilePosition ? (keyLen + sizeof(offset_t)) : keyLen;
+    keyRecLen = zeroFilePosition ? (keyLen + sizeof(offset_t)) : keyLen;
 
     CCycleTimer expansionTimer(true);
     keyBuf = expandBlock(keys, inMemorySize, compressionMethod);
@@ -143,7 +143,7 @@ bool CJHBlockCompressedSearchNode::fetchPayload(unsigned int index, char *dst, P
     const char * p = keyBuf + index*keyRecLen;
     if (keyHdr->hasSpecialFileposition())
     {
-        if (hasFilePosition)
+        if (zeroFilePosition)
             memcpy(dst+keyCompareLen, p+keyCompareLen, keyLen + sizeof(offset_t) - keyCompareLen);
         else
         {
@@ -173,10 +173,7 @@ size32_t CJHBlockCompressedSearchNode::getSizeAt(unsigned int index) const
 {
     if (keyHdr->hasSpecialFileposition())
     {
-        if (hasFilePosition)
-            return keyLen + sizeof(offset_t);
-        else
-            return keyLen;
+        return keyLen + sizeof(offset_t);
     }
     else
         return keyLen;
@@ -185,7 +182,7 @@ size32_t CJHBlockCompressedSearchNode::getSizeAt(unsigned int index) const
 offset_t CJHBlockCompressedSearchNode::getFPosAt(unsigned int index) const
 {
     if (index >= hdr.numKeys) return 0;
-    if (!hasFilePosition) return 0;
+    if (!zeroFilePosition) return 0;
 
     offset_t pos;
     const char * p = keyBuf + index*keyRecLen + keyLen;
@@ -294,7 +291,7 @@ void CBlockCompressedWriteNode::finalize()
 {
     compressor.close();
     if (hdr.numKeys)
-        hdr.keyBytes = compressor.buflen() + sizeof(unsigned __int64) + sizeof(CompressionMethod) + sizeof(bool); // rsequence + compressionMethod + hasFilePosition
+        hdr.keyBytes = compressor.buflen() + sizeof(unsigned __int64) + sizeof(CompressionMethod) + sizeof(bool); // rsequence + compressionMethod + zeroFilePosition
 }
 
 BlockCompressedIndexCompressor::BlockCompressedIndexCompressor(unsigned keyedSize, IHThorIndexWriteArg *helper, const char* options)
@@ -349,7 +346,7 @@ void CJHBlockCompressedVarNode::load(CKeyHdr *_keyHdr, const void *rawData, offs
         KEYRECSIZE_T recsize = *(KEYRECSIZE_T *)finger;
         _WINREV(recsize);
         finger += recsize + sizeof(KEYRECSIZE_T);
-        if (hasFilePosition)
+        if (zeroFilePosition)
             finger += sizeof(offset_t);
     }
 }
@@ -370,7 +367,7 @@ bool CJHBlockCompressedVarNode::fetchPayload(unsigned int num, char *dst, Payloa
         _WINREV(reclen);
         if (keyHdr->hasSpecialFileposition())
         {
-            if (hasFilePosition)
+            if (zeroFilePosition)
                 memcpy(dst+keyCompareLen, p+keyCompareLen, reclen + sizeof(offset_t) - keyCompareLen);
             else
             {
@@ -413,7 +410,7 @@ size32_t CJHBlockCompressedVarNode::getSizeAt(unsigned int num) const
 offset_t CJHBlockCompressedVarNode::getFPosAt(unsigned int num) const
 {
     if (num >= hdr.numKeys) return 0;
-    if (!hasFilePosition) return 0;
+    if (!zeroFilePosition) return 0;
 
     const char * p = recArray[num];
     KEYRECSIZE_T reclen = ((KEYRECSIZE_T *) p)[-1];

system/jhtree/jhblockcompressed.hpp

@@ -33,7 +33,7 @@ class CJHBlockCompressedSearchNode : public CJHSearchNode
     size32_t keyLen = 0;
     size32_t keyCompareLen = 0;
     size32_t keyRecLen = 0;
-    bool hasFilePosition = true;
+    bool zeroFilePosition = true;
 
     unsigned __int64 firstSequence = 0;