exist-commits

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/storage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18976/src/org/exist/storage

Modified Files:
	NativeTextEngine.java NativeBroker.java 
Log Message:
Fixed class LRUCache. LRUCache is now used for the data pages in DOMFile + BFile. LRU seems to be a better strategy for the data pages than
LRD. It produces less page failures.

Index: NativeBroker.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/NativeBroker.java,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** NativeBroker.java	12 Aug 2004 18:54:22 -0000	1.98
--- NativeBroker.java	15 Aug 2004 20:29:09 -0000	1.99
***************
*** 198,202 ****
  				} else {
  					indexBuffers = buffers * 4;
! 					dataBuffers = buffers * 8;
  				}
  				LOG.debug("page buffer size = " + indexBuffers + "; " + dataBuffers);
--- 198,202 ----
  				} else {
  					indexBuffers = buffers * 4;
! 					dataBuffers = buffers * 4;
  				}
  				LOG.debug("page buffer size = " + indexBuffers + "; " + dataBuffers);

Index: NativeTextEngine.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/NativeTextEngine.java,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** NativeTextEngine.java	11 Aug 2004 12:47:02 -0000	1.68
--- NativeTextEngine.java	15 Aug 2004 20:29:09 -0000	1.69
***************
*** 120,124 ****
  		if ((indexBuffers = config.getInteger("db-connection.words.buffers")) < 0) {
  			indexBuffers = buffers * 14;
! 			dataBuffers = buffers * 12;
  		} else
  			dataBuffers = indexBuffers;
--- 120,124 ----
  		if ((indexBuffers = config.getInteger("db-connection.words.buffers")) < 0) {
  			indexBuffers = buffers * 14;
! 			dataBuffers = buffers * 16;
  		} else
  			dataBuffers = indexBuffers;
***************
*** 733,737 ****
  		tokenizer.setText(text.getXMLString().transformToLower());
  		TextToken token;
! 		String word;
  		final long gid = text.getGID();
  		if (onetoken == true) {
--- 733,737 ----
  		tokenizer.setText(text.getXMLString().transformToLower());
  		TextToken token;
! 		CharSequence word;
  		final long gid = text.getGID();
  		if (onetoken == true) {
***************
*** 745,749 ****
  				continue;
  			}
! 			word = token.getText();
  			if (stoplist.contains(word) || word.length() > 1024) {
  				continue;
--- 745,750 ----
  				continue;
  			}
! 			word = token.getCharSequence();
! //			word = token.getText();
  			if (stoplist.contains(word) || word.length() > 1024) {
  				continue;
***************
*** 793,802 ****
  		}
  
! 		public void addText(String word, long gid) {
  			TermFrequencyList buf = (TermFrequencyList) words[0].get(word);
  			if (buf == null) {
  				buf = new TermFrequencyList();
  				buf.add(gid);
! 				words[0].put(word, buf);
  			} else if (buf.getLast() == gid) {
  				buf.incLastTerm();
--- 794,803 ----
  		}
  
! 		public void addText(CharSequence word, long gid) {
  			TermFrequencyList buf = (TermFrequencyList) words[0].get(word);
  			if (buf == null) {
  				buf = new TermFrequencyList();
  				buf.add(gid);
! 				words[0].put(word.toString(), buf);
  			} else if (buf.getLast() == gid) {
  				buf.incLastTerm();