Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-1040: CharArraySet rehash fixes from Mike 

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@596685 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2007-11-20 14:23:10 +00:00
parent b04703fe8f
commit 6b6464ec9c
2 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/java/org/apache/lucene/analysis/CharArraySet.java
View File

@ -119,7 +119,7 @@ public class CharArraySet extends AbstractSet {
entries[slot] = text; entries[slot] = text;
count++; count++;
if (count > entries.length + (entries.length>>2) ) { if (count + (count>>2) > entries.length) {
rehash(); rehash();
} }
@ -162,15 +162,15 @@ public class CharArraySet extends AbstractSet {
} }
private void rehash() { private void rehash() {
final int newSize = 2*count; final int newSize = 2*entries.length;
char[][] oldEntries = entries; char[][] oldEntries = entries;
char[][] entries = new char[newSize][]; entries = new char[newSize][];
for(int i=0;i<oldEntries.length;i++) { for(int i=0;i<oldEntries.length;i++) {
char[] text = oldEntries[i]; char[] text = oldEntries[i];
if (text != null) { if (text != null) {
// todo: could be faster... no need to compare strings on collision // 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;
} }
} }
} }

36
src/test/org/apache/lucene/analysis/TestCharArraySet.java Executable file
View File

@ -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]));
}
}