[Clucene-cvs] SF.net SVN: clucene:[2986] branches/lucene2_3_2/src/core/CLucene/index

[<syn...@us...>]

Revision: 2986
          http://clucene.svn.sourceforge.net/clucene/?rev=2986&view=rev
Author:   synhershko
Date:     2009-04-12 13:42:34 +0000 (Sun, 12 Apr 2009)

Log Message:
-----------
Fixes issues with previous commit

Modified Paths:
--------------
    branches/lucene2_3_2/src/core/CLucene/index/DefaultSkipListReader.cpp
    branches/lucene2_3_2/src/core/CLucene/index/MultiLevelSkipListReader.cpp
    branches/lucene2_3_2/src/core/CLucene/index/MultiLevelSkipListReader.h

Modified: branches/lucene2_3_2/src/core/CLucene/index/DefaultSkipListReader.cpp
===================================================================
--- branches/lucene2_3_2/src/core/CLucene/index/DefaultSkipListReader.cpp	2009-04-12 13:21:07 UTC (rev 2985)
+++ branches/lucene2_3_2/src/core/CLucene/index/DefaultSkipListReader.cpp	2009-04-12 13:42:34 UTC (rev 2986)
@@ -19,9 +19,9 @@
 }
 
 DefaultSkipListReader::~DefaultSkipListReader(){
-	_CLLDELETE(freqPointer);
-	_CLLDELETE(proxPointer);
-	_CLLDELETE(payloadLength);
+	_CLDELETE_LARRAY(freqPointer);
+	_CLDELETE_LARRAY(proxPointer);
+	_CLDELETE_LARRAY(payloadLength);
 }
 
 void DefaultSkipListReader::init(const int64_t _skipPointer, const int64_t freqBasePointer, const int64_t proxBasePointer, const int32_t df, const bool storesPayloads) {
@@ -48,14 +48,14 @@
 }
 
 void DefaultSkipListReader::seekChild(const int32_t level) {
-	//super.seekChild(level);
+	MultiLevelSkipListReader::seekChild(level);
 	freqPointer[level] = lastFreqPointer;
 	proxPointer[level] = lastProxPointer;
 	payloadLength[level] = lastPayloadLength;
 }
 
 void DefaultSkipListReader::setLastSkipData(const int32_t level) {
-	//super.setLastSkipData(level);
+	MultiLevelSkipListReader::setLastSkipData(level);
 	lastFreqPointer = freqPointer[level];
 	lastProxPointer = proxPointer[level];
 	lastPayloadLength = payloadLength[level];
@@ -83,4 +83,4 @@
 	return delta;
 }
 
-CL_NS_END
\ No newline at end of file
+CL_NS_END

Modified: branches/lucene2_3_2/src/core/CLucene/index/MultiLevelSkipListReader.cpp
===================================================================
--- branches/lucene2_3_2/src/core/CLucene/index/MultiLevelSkipListReader.cpp	2009-04-12 13:21:07 UTC (rev 2985)
+++ branches/lucene2_3_2/src/core/CLucene/index/MultiLevelSkipListReader.cpp	2009-04-12 13:42:34 UTC (rev 2986)
@@ -12,15 +12,14 @@
 
 MultiLevelSkipListReader::MultiLevelSkipListReader(IndexInput* _skipStream, const int32_t maxSkipLevels,
 												   const int32_t _skipInterval):
-		numberOfLevelsToBuffer(1),skipStream(NULL),skipPointer(NULL),skipInterval(NULL),
-		numSkipped(NULL),skipDoc(_CL_NEWARRAY(int32_t,maxSkipLevels)),childPointer(NULL)
+		maxNumberOfSkipLevels(maxSkipLevels),numberOfLevelsToBuffer(1),
+		skipStream(_CL_NEWARRAY(IndexInput*,maxSkipLevels)),
+		skipPointer(_CL_NEWARRAY(int64_t,maxSkipLevels)),
+		skipInterval(_CL_NEWARRAY(int32_t,maxSkipLevels)),
+		numSkipped(_CL_NEWARRAY(int32_t,maxSkipLevels)),
+		skipDoc(_CL_NEWARRAY(int32_t,maxSkipLevels)),
+		childPointer(_CL_NEWARRAY(int64_t,maxSkipLevels))
 {
-	this->skipStream = _CL_NEWARRAY(IndexInput*,maxSkipLevels);
-	this->skipPointer = _CL_NEWARRAY(int64_t,maxSkipLevels);
-	this->childPointer = _CL_NEWARRAY(int64_t,maxSkipLevels);
-	this->numSkipped = _CL_NEWARRAY(int32_t,maxSkipLevels);
-	this->maxNumberOfSkipLevels = maxSkipLevels;
-	this->skipInterval = _CL_NEWARRAY(int32_t,maxSkipLevels);
 	this->skipStream[0] = _skipStream;
 	this->inputIsBuffered = (strcmp(_skipStream->getObjectName(),"BufferedIndexInput") == 0);
 	this->skipInterval[0] = _skipInterval;
@@ -203,12 +202,12 @@
 }
 
 void MultiLevelSkipListReader::SkipBuffer::readBytes(uint8_t* b, const int32_t len) {
-	memcpy(b,data+pos,len);
+	memcpy(b,data+pos,len*sizeof(uint8_t));
 	pos += len;
 }
 
 void MultiLevelSkipListReader::SkipBuffer::seek(const int64_t _pos) {
-	this->pos = (int32_t) (_pos - pointer);
+	this->pos = static_cast<int32_t>(_pos - pointer);
 }
 
 const char* MultiLevelSkipListReader::SkipBuffer::getObjectName(){ return "SkipBuffer"; }

Modified: branches/lucene2_3_2/src/core/CLucene/index/MultiLevelSkipListReader.h
===================================================================
--- branches/lucene2_3_2/src/core/CLucene/index/MultiLevelSkipListReader.h	2009-04-12 13:21:07 UTC (rev 2985)
+++ branches/lucene2_3_2/src/core/CLucene/index/MultiLevelSkipListReader.h	2009-04-12 13:42:34 UTC (rev 2986)
@@ -118,6 +118,7 @@
 
 		uint8_t readByte();
 
+		/* Make sure b is passed after the offset has been calculated into it, if necessary! */
 		void readBytes(uint8_t* b, const int32_t len);
 
 		void seek(const int64_t _pos);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.