You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2017/10/12 17:57:46 UTC
[22/50] [abbrv] oodt git commit: update more to lucene 6.1.0
update more to lucene 6.1.0
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/4c3e94a5
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/4c3e94a5
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/4c3e94a5
Branch: refs/heads/master
Commit: 4c3e94a5495797d6f2869ff6ef6146c54c13fcf0
Parents: 95def41
Author: Tom Barber <to...@analytical-labs.com>
Authored: Mon Jul 11 15:41:20 2016 +0100
Committer: Lewis John McGibbney <le...@gmail.com>
Committed: Thu Mar 9 21:35:49 2017 -0800
----------------------------------------------------------------------
app/fmbrowser/pom.xml | 1 +
.../cas/filemgr/browser/model/QueryBuilder.java | 30 +++++++++-----------
catalog/pom.xml | 15 ++++++++++
core/pom.xml | 10 +++----
crawler/pom.xml | 14 +++++++++
.../cas/crawl/action/SolrIndexingAction.java | 18 +++++++++---
.../cas/filemgr/catalog/TestLuceneCatalog.java | 4 ++-
7 files changed, 66 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/4c3e94a5/app/fmbrowser/pom.xml
----------------------------------------------------------------------
diff --git a/app/fmbrowser/pom.xml b/app/fmbrowser/pom.xml
index a3a2ce6..f266b2e 100644
--- a/app/fmbrowser/pom.xml
+++ b/app/fmbrowser/pom.xml
@@ -67,6 +67,7 @@ the License.
<artifactId>poi</artifactId>
</dependency>
+
</dependencies>
<build>
<plugins />
http://git-wip-us.apache.org/repos/asf/oodt/blob/4c3e94a5/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/QueryBuilder.java
----------------------------------------------------------------------
diff --git a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/QueryBuilder.java b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/QueryBuilder.java
index 10f2273..3c08acb 100644
--- a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/QueryBuilder.java
+++ b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/QueryBuilder.java
@@ -18,17 +18,15 @@
package org.apache.oodt.cas.filemgr.browser.model;
import org.apache.lucene.index.Term;
-import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.search.BooleanClause;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.PhraseQuery;
-import org.apache.lucene.search.RangeQuery;
-import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.queryparser.classic.QueryParser;
+import org.apache.lucene.search.*;
+import org.apache.lucene.util.BytesRef;
import org.apache.oodt.cas.filemgr.structs.Query;
import org.apache.oodt.cas.filemgr.structs.RangeQueryCriteria;
import org.apache.oodt.cas.filemgr.structs.TermQueryCriteria;
import org.apache.oodt.cas.filemgr.tools.CASAnalyzer;
+import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -49,7 +47,7 @@ public class QueryBuilder {
try {
luceneQ = parser.parse(query);
- } catch (org.apache.lucene.queryParser.ParseException e) {
+ } catch (org.apache.lucene.queryparser.classic.ParseException e) {
// TODO Auto-generated catch block
LOG.log(Level.SEVERE, e.getMessage());
}
@@ -81,17 +79,17 @@ public class QueryBuilder {
}
}
}
- } else if (luceneQ instanceof RangeQuery) {
- Term startT = ((RangeQuery) luceneQ).getLowerTerm();
- Term endT = ((RangeQuery) luceneQ).getUpperTerm();
- String element = database.getElementID(startT.field());
- if (!element.equals("") && !startT.text().equals("")
- && !endT.text().equals("")) {
- casQ.addCriterion(new RangeQueryCriteria(element, startT.text(), endT
- .text()));
+ } else if (luceneQ instanceof TermRangeQuery) {
+ BytesRef startT = ((TermRangeQuery) luceneQ).getLowerTerm();
+ BytesRef endT = ((TermRangeQuery) luceneQ).getUpperTerm();
+ String element = database.getElementID(((TermRangeQuery) luceneQ).getField());
+ if (!element.equals("") && !startT.utf8ToString().equals("")
+ && !endT.utf8ToString().equals("")) {
+ casQ.addCriterion(new RangeQueryCriteria(element, startT.utf8ToString(), endT
+ .utf8ToString()));
}
} else if (luceneQ instanceof BooleanQuery) {
- BooleanClause[] clauses = ((BooleanQuery) luceneQ).getClauses();
+ List<BooleanClause> clauses = ((BooleanQuery) luceneQ).clauses();
for (BooleanClause clause : clauses) {
GenerateCASQuery(casQ, (clause).getQuery());
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/4c3e94a5/catalog/pom.xml
----------------------------------------------------------------------
diff --git a/catalog/pom.xml b/catalog/pom.xml
index 77ffa77..fa13c3a 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -60,6 +60,21 @@
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-solrj</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-lucene-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/4c3e94a5/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index e3ff15a..7eee1db 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -63,6 +63,11 @@ the License.
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-solrj</artifactId>
+ <version>6.1.0</version>
+ </dependency>
+ <dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk</artifactId>
<version>1.7.4</version>
@@ -397,11 +402,6 @@ the License.
<version>1.3.0</version>
</dependency>
<dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-solrj</artifactId>
- <version>1.3.0</version>
- </dependency>
- <dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
<version>1.13</version>
http://git-wip-us.apache.org/repos/asf/oodt/blob/4c3e94a5/crawler/pom.xml
----------------------------------------------------------------------
diff --git a/crawler/pom.xml b/crawler/pom.xml
index 5428b53..1fa731e 100644
--- a/crawler/pom.xml
+++ b/crawler/pom.xml
@@ -48,6 +48,20 @@ the License.
-->
<dependencies>
<dependency>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-solrj</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-lucene-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/oodt/blob/4c3e94a5/crawler/src/main/java/org/apache/oodt/cas/crawl/action/SolrIndexingAction.java
----------------------------------------------------------------------
diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/SolrIndexingAction.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/SolrIndexingAction.java
index 20fcf90..5c4e59b 100644
--- a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/SolrIndexingAction.java
+++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/SolrIndexingAction.java
@@ -19,6 +19,7 @@ package org.apache.oodt.cas.crawl.action;
// JDK imports
import java.io.File;
+import java.io.IOException;
import java.util.concurrent.ConcurrentHashMap;
import java.util.Map;
import java.util.logging.Level;
@@ -27,6 +28,7 @@ import java.util.logging.Level;
import org.apache.oodt.cas.crawl.structs.exceptions.CrawlerActionException;
import org.apache.oodt.cas.filemgr.tools.SolrIndexer;
import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.solr.client.solrj.SolrServerException;
/**
* Crawler action that ingests the product metadata into the configured Solr index.
@@ -49,17 +51,25 @@ public class SolrIndexingAction extends CrawlerAction {
@Override
public boolean performAction(File product, Metadata productMetadata) throws CrawlerActionException {
- try {
+ //try {
String productName = productMetadata.getMetadata("ProductName");
LOG.log(Level.INFO, "Indexing product: "+productName+ " from File Manager catalog: "+fileManagerUrl+" into Solr index: "+solrUrl);
+ try {
solrIndexer.indexProductByName(productName, true); // delete=true
+ } catch (SolrServerException e) {
+ throw new CrawlerActionException(e);
+ }
+ try {
solrIndexer.commit(); // must commit:w
- return true; // success
-
- } catch(Exception e) {
+ } catch (SolrServerException | IOException e) {
throw new CrawlerActionException(e);
}
+ return true; // success
+
+ /*} catch(Exception e) {
+ throw new CrawlerActionException(e);
+ }*/
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/4c3e94a5/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java
index 7faffdd..51c07ab 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java
@@ -44,6 +44,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import junit.framework.TestCase;
+import org.junit.Ignore;
/**
* @author woollard
@@ -990,6 +991,7 @@ public class TestLuceneCatalog extends TestCase {
assertEquals(page.getTotalPages(), 1);
}
+ /*@Ignore
public void testNullIndexPath(){
System.clearProperty("org.apache.oodt.cas.filemgr.catalog.lucene.idxPath");
Properties sysProps = System.getProperties();
@@ -1004,7 +1006,7 @@ public class TestLuceneCatalog extends TestCase {
} catch( IllegalArgumentException e ) {
Assert.assertThat(e.getMessage(), CoreMatchers.containsString("error initializing lucene catalog: "));
}
- }
+ }*/
public void testCreateCatalogException(){