Skip to content
This repository has been archived by the owner on Aug 12, 2022. It is now read-only.

Fixes #47 by adding support for QueryParser options #53

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fixes #47 by adding support for QueryParser options #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
123 changes: 103 additions & 20 deletions src/main/java/com/orientechnologies/lucene/OLuceneIndexType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package com.orientechnologies.lucene;

import com.orientechnologies.lucene.collections.OFullTextCompositeKey;
import com.orientechnologies.lucene.manager.OLuceneIndexManagerAbstract;
import com.orientechnologies.orient.core.db.record.OIdentifiable;
import com.orientechnologies.orient.core.index.OCompositeKey;
Expand All @@ -29,10 +30,7 @@
import org.apache.lucene.search.*;
import org.apache.lucene.util.Version;

import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
* Created by enricorisa on 21/03/14.
Expand Down Expand Up @@ -116,38 +114,123 @@ public static Query createDeleteQuery(OIdentifiable value, List<String> fields,
return booleanQuery;
}

public static Query createFullQuery(OIndexDefinition index, Object key, Analyzer analyzer, Version version) throws ParseException {
public static Query createFullTextQuery(OIndexDefinition index, Object key, Analyzer analyzer, Version version) throws ParseException {

String query = "";
if (key instanceof OCompositeKey) {
Object params = ((OCompositeKey) key).getKeys().get(0);
if (params instanceof Map) {
Object q = ((Map) params).get("q");
if (q != null) {
query = q.toString();
}
} else {
query = params.toString();
String query;
Boolean multi = null;

if (key instanceof OFullTextCompositeKey) {
query = ((OFullTextCompositeKey) key).getParameters().get("query").toString();
Object parsertype = ((OFullTextCompositeKey) key).getParameters().get("parsertype");
if (parsertype != null) {
if (parsertype.toString().equalsIgnoreCase("MultiField")) { multi = true; }
if (parsertype.toString().equalsIgnoreCase("Class")) { multi = false; }
}
} else {
query = key.toString();
}

return getQueryParser(index, query, analyzer, version);
if (multi == null) {
multi = !(query.startsWith("(") & query.endsWith(")"));
}

return getQueryParser(index, key, multi, analyzer, version).parse(query);
}

protected static Query getQueryParser(OIndexDefinition index, String key, Analyzer analyzer, Version version)
protected static QueryParser getQueryParser(OIndexDefinition index, Object key, Boolean multi, Analyzer analyzer, Version version)
throws ParseException {
Map options;
QueryParser queryParser;
if ((key).startsWith("(")) {
queryParser = new QueryParser(version, "", analyzer);

if (key instanceof OFullTextCompositeKey) {
options = ((OFullTextCompositeKey) key).getParameters();
} else {
options = new HashMap<String, Object>();
}

if (options.containsKey("parsertype")) {
String pt = options.get("parsertype").toString();
if (pt.equalsIgnoreCase("MultiField")) { multi = true; }
if (pt.equalsIgnoreCase("Class")) { multi = false; }
}

if (multi) {
queryParser = new MultiFieldQueryParser(version, index.getFields().toArray(new String[index.getFields().size()]), analyzer);
} else {
queryParser = new QueryParser(version, "", analyzer);
}

if (options.containsKey("lowercaseexpandedterms")) {
String let = options.get("lowercaseexpandedterms").toString();
queryParser.setLowercaseExpandedTerms(Boolean.parseBoolean(let));
}

if (options.containsKey("allowleadingwildcard")) {
String alw = options.get("allowleadingwildcard").toString();
queryParser.setAllowLeadingWildcard(Boolean.parseBoolean(alw));
}

if (options.containsKey("analyzerangeterms")) {
String art = options.get("analyzerangeterms").toString();
queryParser.setAnalyzeRangeTerms(Boolean.parseBoolean(art));
}

if (options.containsKey("autogeneratephrasequeries")) {
String agpq = options.get("autogeneratephrasequeries").toString();
queryParser.setAllowLeadingWildcard(Boolean.parseBoolean(agpq));
}

if (options.containsKey("dateresolution")) {
String dr = options.get("dateresolution").toString();
queryParser.setDateResolution(DateTools.Resolution.valueOf(dr));
}

if (options.containsKey("defaultoperator")) {
String dop = options.get("defaultoperator").toString();
queryParser.setDefaultOperator(QueryParser.Operator.valueOf(dop));
}

if (options.containsKey("fuzzyminsim")) {
String fms = options.get("fuzzyminsim").toString();
queryParser.setFuzzyMinSim(Float.parseFloat(fms));
}

if (options.containsKey("fuzzyprefixlength")) {
String fpl = options.get("fuzzyprefixlength").toString();
queryParser.setFuzzyPrefixLength(Integer.parseInt(fpl));
}

if (options.containsKey("locale")) {
String l = options.get("locale").toString();
queryParser.setLocale(new Locale(l));
}

if (options.containsKey("phraseslop")) {
String pl = options.get("phraseslop").toString();
queryParser.setPhraseSlop(Integer.parseInt(pl));
}

if (options.containsKey("timezone")) {
String tl = options.get("timezone").toString();
queryParser.setTimeZone(TimeZone.getTimeZone(tl));
}

if (options.containsKey("multitermrewritemethod")) {
String mtrm = options.get("multitermrewritemethod").toString();

if (mtrm.equalsIgnoreCase("SCORING_BOOLEAN_QUERY_REWRITE")) {
queryParser.setMultiTermRewriteMethod(MultiTermQuery.SCORING_BOOLEAN_QUERY_REWRITE);
} else if (mtrm.equalsIgnoreCase("CONSTANT_SCORE_AUTO_REWRITE_DEFAULT")) {
queryParser.setMultiTermRewriteMethod(MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT);
} else if (mtrm.equalsIgnoreCase("CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE")) {
queryParser.setMultiTermRewriteMethod(MultiTermQuery.CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE);
} else if (mtrm.equalsIgnoreCase("CONSTANT_SCORE_FILTER_REWRITE")) {
queryParser.setMultiTermRewriteMethod(MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE);
}

}

return queryParser.parse(key);
return queryParser;
}

public static Sort sort(Query query, OIndexDefinition index, boolean ascSortOrder) {
Expand Down
27 changes: 27 additions & 0 deletions src/main/java/com/orientechnologies/lucene/collections/OFullTextCompositeKey.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,42 @@
import com.orientechnologies.orient.core.index.OCompositeKey;
import com.orientechnologies.orient.core.index.OIndexFullText;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
* Created by enricorisa on 16/06/14.
*/
public class OFullTextCompositeKey extends OLuceneCompositeKey {

private Map<String, Object> params = new HashMap<String, Object>();

public OFullTextCompositeKey(final List<?> keys) {
super(keys);
}

public OFullTextCompositeKey setParameters(Object params) {
if (params instanceof Map) {
for (Object key : ((Map) params).keySet()) {
if (key != null) {
this.params.put(key.toString().toLowerCase(), ((Map) params).get(key));
}
}

if (this.params.containsKey("q")) {
this.params.put("query", this.params.get("q"));
this.params.remove("q");
}
} else {
this.params.put("query", params.toString());
}

return this;
}

public Map<String, Object> getParameters() {
return params;
}

}
2 changes: 1 addition & 1 deletion src/main/java/com/orientechnologies/lucene/manager/OLuceneFullTextIndexManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public ORID getIdentity() {
public Object get(Object key) {
Query q = null;
try {
q = OLuceneIndexType.createFullQuery(index, key, mgrWriter.getIndexWriter().getAnalyzer(), getLuceneVersion(metadata));
q = OLuceneIndexType.createFullTextQuery(index, key, mgrWriter.getIndexWriter().getAnalyzer(), getLuceneVersion(metadata));
OCommandContext context = null;
if (key instanceof OFullTextCompositeKey) {
context = ((OFullTextCompositeKey) key).getContext();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/orientechnologies/lucene/operator/OLuceneTextOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public OLuceneTextOperator(String iKeyword, int iPrecedence, boolean iLogical) {
@Override
public OIndexCursor executeIndexQuery(OCommandContext iContext, OIndex<?> index, List<Object> keyParams, boolean ascSortOrder) {
OIndexCursor cursor;
Object indexResult = index.get(new OFullTextCompositeKey(keyParams).setContext(iContext));
Object indexResult = index.get(new OFullTextCompositeKey(keyParams).setParameters(keyParams.get(0)).setContext(iContext));
if (indexResult == null || indexResult instanceof OIdentifiable)
cursor = new OIndexCursorSingleValue((OIdentifiable) indexResult, new OFullTextCompositeKey(keyParams));
else
Expand Down