1
*/
- public static class TermFreqIteratorWrapper implements TermFreqIterator {
+ public static class TermFreqIteratorWrapper extends TermFreqIterator {
private BytesRefIterator wrapped;
/**
@@ -58,5 +85,6 @@ public interface TermFreqIterator extends BytesRefIterator {
public Comparatornull the
+ * key is used as the surface form instead.
+ * + * Note: This implementation will resort the data internally. + *
+ * */ @Override public void build(TermFreqIterator iterator) throws IOException { String prefix = getClass().getSimpleName(); @@ -330,11 +343,17 @@ public class AnalyzingSuggester extends Lookup { try { ByteArrayDataOutput output = new ByteArrayDataOutput(buffer); BytesRef surfaceForm; - while ((surfaceForm = iterator.next()) != null) { + BytesRef key; + final SurfaceFormAttribute surfaceFormAttribute = iterator.addAttribute(SurfaceFormAttribute.class); + while ((key = iterator.next()) != null) { // Analyze surface form: - TokenStream ts = indexAnalyzer.tokenStream("", new StringReader(surfaceForm.utf8ToString())); - + TokenStream ts = indexAnalyzer.tokenStream("", new StringReader(key.utf8ToString())); + surfaceForm = surfaceFormAttribute.getSurfaceForm(); + if (surfaceForm == null) { + surfaceForm = key; + } + // Create corresponding automaton: labels are bytes // from each analyzed token, with byte 0 used as // separator between tokens: @@ -445,7 +464,6 @@ public class AnalyzingSuggester extends Lookup { analyzed.bytes[analyzed.length] = 0; analyzed.bytes[analyzed.length+1] = (byte) dedup; analyzed.length += 2; - Util.toIntsRef(analyzed, scratchInts); //System.out.println("ADD: " + scratchInts + " -> " + cost + ": " + surface.utf8ToString()); builder.add(scratchInts, outputs.newPair(cost, BytesRef.deepCopyOf(surface))); @@ -530,9 +548,9 @@ public class AnalyzingSuggester extends Lookup { FST.Arcnull
+ * @see SurfaceFormAttribute#setSurfaceForm(BytesRef)
+ */
+ public BytesRef getSurfaceForm();
+
+ /**
+ * Sets this suggestions surface form.
+ * @see SurfaceFormAttribute#getSurfaceForm()
+ */
+ public void setSurfaceForm(BytesRef ref);
+}
diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/SurfaceFormAttributeImpl.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/SurfaceFormAttributeImpl.java
new file mode 100644
index 0000000..960351e
--- /dev/null
+++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/SurfaceFormAttributeImpl.java
@@ -0,0 +1,72 @@
+package org.apache.lucene.search.suggest.analyzing;
+/*
+ * 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 org.apache.lucene.util.AttributeImpl;
+import org.apache.lucene.util.BytesRef;
+
+/**
+ * Default implemenation for {@link SurfaceFormAttribute}
+ */
+public class SurfaceFormAttributeImpl extends AttributeImpl implements
+ SurfaceFormAttribute {
+
+ private BytesRef surfaceForm;
+
+ @Override
+ public BytesRef getSurfaceForm() {
+ return surfaceForm;
+ }
+
+ @Override
+ public void setSurfaceForm(BytesRef surfaceForm) {
+ this.surfaceForm = surfaceForm;
+ }
+
+ @Override
+ public void clear() {
+ surfaceForm = null;
+ }
+
+ @Override
+ public void copyTo(AttributeImpl target) {
+ SurfaceFormAttribute t = (SurfaceFormAttribute) target;
+ t.setSurfaceForm((surfaceForm == null) ? null : surfaceForm.clone());
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result
+ + ((surfaceForm == null) ? 0 : surfaceForm.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+ if (obj == null) return false;
+ if (getClass() != obj.getClass()) return false;
+ SurfaceFormAttributeImpl other = (SurfaceFormAttributeImpl) obj;
+ if (surfaceForm == null) {
+ if (other.surfaceForm != null) return false;
+ } else if (!surfaceForm.equals(other.surfaceForm)) return false;
+ return true;
+ }
+
+}
diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TermFreq.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TermFreq.java
index 2b02ac1..8ef709a 100644
--- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TermFreq.java
+++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TermFreq.java
@@ -22,13 +22,23 @@ import org.apache.lucene.util.BytesRef;
public final class TermFreq {
public final BytesRef term;
public final long v;
+ public final BytesRef surfaceForm;
public TermFreq(String term, long v) {
- this(new BytesRef(term), v);
+ this(new BytesRef(term), v, new BytesRef(term));
}
public TermFreq(BytesRef term, long v) {
+ this(term, v, term);
+ }
+
+ public TermFreq(String term, long v, String surfaceForm) {
+ this(new BytesRef(term), v, new BytesRef(surfaceForm));
+ }
+
+ public TermFreq(BytesRef term, long v, BytesRef surfaceForm) {
this.term = term;
this.v = v;
+ this.surfaceForm = surfaceForm;
}
}
\ No newline at end of file
diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TermFreqArrayIterator.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TermFreqArrayIterator.java
index 06d7301..823168c 100644
--- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TermFreqArrayIterator.java
+++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TermFreqArrayIterator.java
@@ -22,15 +22,18 @@ import java.util.Comparator;
import java.util.Iterator;
import org.apache.lucene.search.spell.TermFreqIterator;
+import org.apache.lucene.search.suggest.analyzing.SurfaceFormAttribute;
import org.apache.lucene.util.BytesRef;
/**
* A {@link TermFreqIterator} over a sequence of {@link TermFreq}s.
*/
-public final class TermFreqArrayIterator implements TermFreqIterator {
+public final class TermFreqArrayIterator extends TermFreqIterator {
private final Iterator