lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yo...@apache.org
Subject svn commit: r596685 - in /lucene/java/trunk/src: java/org/apache/lucene/analysis/CharArraySet.java test/org/apache/lucene/analysis/TestCharArraySet.java
Date Tue, 20 Nov 2007 14:23:10 GMT
Author: yonik
Date: Tue Nov 20 06:23:10 2007
New Revision: 596685

URL: http://svn.apache.org/viewvc?rev=596685&view=rev
Log:
LUCENE-1040: CharArraySet rehash fixes from Mike

Added:
    lucene/java/trunk/src/test/org/apache/lucene/analysis/TestCharArraySet.java   (with props)
Modified:
    lucene/java/trunk/src/java/org/apache/lucene/analysis/CharArraySet.java

Modified: lucene/java/trunk/src/java/org/apache/lucene/analysis/CharArraySet.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/analysis/CharArraySet.java?rev=596685&r1=596684&r2=596685&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/analysis/CharArraySet.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/analysis/CharArraySet.java Tue Nov 20 06:23:10
2007
@@ -119,7 +119,7 @@
     entries[slot] = text;
     count++;
 
-    if (count > entries.length + (entries.length>>2) ) {
+    if (count + (count>>2) > entries.length) {
       rehash();
     }
 
@@ -162,15 +162,15 @@
   }
 
   private void rehash() {
-    final int newSize = 2*count;
+    final int newSize = 2*entries.length;
     char[][] oldEntries = entries;
-    char[][] entries = new char[newSize][];
+    entries = new char[newSize][];
 
     for(int i=0;i<oldEntries.length;i++) {
       char[] text = oldEntries[i];
       if (text != null) {
         // todo: could be faster... no need to compare strings on collision
-        entries[ getSlot(text,0,text.length) ] = text;
+        entries[getSlot(text,0,text.length)] = text;
       }
     }
   }

Added: lucene/java/trunk/src/test/org/apache/lucene/analysis/TestCharArraySet.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/analysis/TestCharArraySet.java?rev=596685&view=auto
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/analysis/TestCharArraySet.java (added)
+++ lucene/java/trunk/src/test/org/apache/lucene/analysis/TestCharArraySet.java Tue Nov 20
06:23:10 2007
@@ -0,0 +1,36 @@
+package org.apache.lucene.analysis;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.IOException;
+
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.analysis.StopAnalyzer;
+import org.apache.lucene.analysis.CharArraySet;
+
+public class TestCharArraySet extends LuceneTestCase
+{
+    public void testRehash() throws Exception {
+      CharArraySet cas = new CharArraySet(0, true);
+      for(int i=0;i<StopAnalyzer.ENGLISH_STOP_WORDS.length;i++)
+        cas.add(StopAnalyzer.ENGLISH_STOP_WORDS[i]);
+      assertEquals(StopAnalyzer.ENGLISH_STOP_WORDS.length, cas.size());
+      for(int i=0;i<StopAnalyzer.ENGLISH_STOP_WORDS.length;i++)
+        assertTrue(cas.contains(StopAnalyzer.ENGLISH_STOP_WORDS[i]));
+    }
+}

Propchange: lucene/java/trunk/src/test/org/apache/lucene/analysis/TestCharArraySet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: lucene/java/trunk/src/test/org/apache/lucene/analysis/TestCharArraySet.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: lucene/java/trunk/src/test/org/apache/lucene/analysis/TestCharArraySet.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL



Mime
View raw message