Added missing changes

Author: jpmcmu

system/jhtree/jhblockcompressed.cpp

@@ -350,13 +350,15 @@ void CJHBlockCompressedVarNode::load(CKeyHdr *_keyHdr, const void *rawData, offs
         recArray[i] = finger + sizeof(KEYRECSIZE_T);
         KEYRECSIZE_T recsize = *(KEYRECSIZE_T *)finger;
         _WINREV(recsize);
-        finger += recsize + sizeof(KEYRECSIZE_T) + sizeof(offset_t);
+        finger += recsize + sizeof(KEYRECSIZE_T);
+        if (hasFilePosition)
+            finger += sizeof(offset_t);
     }
 }
 
 int CJHBlockCompressedVarNode::compareValueAt(const char *src, unsigned int index) const
 {
-    return memcmp(src, recArray[index] + (keyHdr->hasSpecialFileposition() ? sizeof(offset_t) : 0), keyCompareLen);
+    return memcmp(src, recArray[index], keyCompareLen);
 }
 
 bool CJHBlockCompressedVarNode::fetchPayload(unsigned int num, char *dst, PayloadReference & activePayload) const
@@ -370,8 +372,14 @@ bool CJHBlockCompressedVarNode::fetchPayload(unsigned int num, char *dst, Payloa
         _WINREV(reclen);
         if (keyHdr->hasSpecialFileposition())
         {
-            memcpy(dst+keyCompareLen, p+keyCompareLen+sizeof(offset_t), reclen-keyCompareLen);
-            memcpy(dst+reclen, p, sizeof(offset_t));
+            memcpy(dst+keyCompareLen, p+keyCompareLen, reclen-keyCompareLen);
+            if (hasFilePosition)
+                memcpy(dst+reclen, p+reclen, sizeof(offset_t));
+            else
+            {
+                offset_t zeroPos = 0;
+                memcpy(dst+reclen, &zeroPos, sizeof(offset_t));
+            }
         }
         else
             memcpy(dst+keyCompareLen, p+keyCompareLen, reclen-keyCompareLen);
@@ -389,10 +397,7 @@ bool CJHBlockCompressedVarNode::getKeyAt(unsigned int num, char *dst) const
         KEYRECSIZE_T reclen = ((KEYRECSIZE_T *) p)[-1];
         _WINREV(reclen);
         assertex(reclen >= keyCompareLen);
-        if (keyHdr->hasSpecialFileposition())
-            memcpy(dst, p + sizeof(offset_t), keyCompareLen);
-        else
-            memcpy(dst, p, keyCompareLen);
+        memcpy(dst, p, keyCompareLen);
     }
     return true;
 }
@@ -411,10 +416,13 @@ 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;
 
     const char * p = recArray[num];
+    KEYRECSIZE_T reclen = ((KEYRECSIZE_T *) p)[-1];
+    _WINREV(reclen);
     offset_t pos;
-    memcpy( &pos, p, sizeof(__int64) );
+    memcpy( &pos, p + reclen, sizeof(__int64) );
     _WINREV(pos);
     return pos;
 }