You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ct...@apache.org on 2018/10/22 23:35:07 UTC
[22/50] [abbrv] lucene-solr:jira/solr-12746: LUCENE-6572: Remove
dependency on analyzer-common from highlighing
LUCENE-6572: Remove dependency on analyzer-common from highlighing
This makes a simplifed copy of LimitTokenOffsetFilter to the highlighting
module to detach the dependency on analyzer-common.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/cd652343
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/cd652343
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/cd652343
Branch: refs/heads/jira/solr-12746
Commit: cd65234343c4d01cf5ceedbac15f6b26cca97dc8
Parents: e05b578
Author: Simon Willnauer <si...@apache.org>
Authored: Wed Oct 17 10:16:31 2018 +0200
Committer: Cassandra Targett <ct...@apache.org>
Committed: Sun Oct 21 15:46:47 2018 -0500
----------------------------------------------------------------------
lucene/highlighter/build.xml | 9 +++-
.../highlight/LimitTokenOffsetFilter.java | 52 ++++++++++++++++++++
.../lucene/search/highlight/TokenSources.java | 1 -
3 files changed, 60 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cd652343/lucene/highlighter/build.xml
----------------------------------------------------------------------
diff --git a/lucene/highlighter/build.xml b/lucene/highlighter/build.xml
index e0dfa7e..ed6cc74 100644
--- a/lucene/highlighter/build.xml
+++ b/lucene/highlighter/build.xml
@@ -32,10 +32,17 @@
<pathelement path="${memory.jar}"/>
<pathelement path="${queries.jar}"/>
<pathelement path="${join.jar}"/>
- <pathelement path="${analyzers-common.jar}"/>
<path refid="base.classpath"/>
</path>
+ <path id="test.classpath">
+ <pathelement path="${memory.jar}"/>
+ <pathelement path="${queries.jar}"/>
+ <pathelement path="${join.jar}"/>
+ <pathelement path="${analyzers-common.jar}"/>
+ <path refid="test.base.classpath"/>
+ </path>
+
<target name="compile-core" depends="jar-memory,jar-queries,jar-join,jar-analyzers-common,common.compile-core" />
<target name="javadocs" depends="javadocs-memory,compile-core,check-javadocs-uptodate"
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cd652343/lucene/highlighter/src/java/org/apache/lucene/search/highlight/LimitTokenOffsetFilter.java
----------------------------------------------------------------------
diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/LimitTokenOffsetFilter.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/LimitTokenOffsetFilter.java
new file mode 100644
index 0000000..149584e
--- /dev/null
+++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/LimitTokenOffsetFilter.java
@@ -0,0 +1,52 @@
+/*
+ * 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.
+ */
+package org.apache.lucene.search.highlight;
+
+import java.io.IOException;
+
+import org.apache.lucene.analysis.TokenFilter;
+import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
+
+/**
+ * This is a simplified version of org.apache.lucene.analysis.miscellaneous.LimitTokenOffsetFilter to prevent
+ * a dependency on analyzers-common.jar.
+ */
+final class LimitTokenOffsetFilter extends TokenFilter {
+
+ private final OffsetAttribute offsetAttrib = addAttribute(OffsetAttribute.class);
+ private int maxStartOffset;
+
+ LimitTokenOffsetFilter(TokenStream input, int maxStartOffset) {
+ super(input);
+ if (maxStartOffset < 0) {
+ throw new IllegalArgumentException("maxStartOffset must be >= zero");
+ }
+ this.maxStartOffset = maxStartOffset;
+ }
+
+ @Override
+ public boolean incrementToken() throws IOException {
+ if (!input.incrementToken()) {
+ return false;
+ }
+ if (offsetAttrib.startOffset() <= maxStartOffset) {
+ return true;
+ }
+ return false;
+ }
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cd652343/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java
----------------------------------------------------------------------
diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java
index 2730f40..0c0a63f 100644
--- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java
+++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java
@@ -23,7 +23,6 @@ import java.io.IOException;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.miscellaneous.LimitTokenOffsetFilter;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.IndexReader;