You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2014/01/05 22:05:03 UTC
svn commit: r1555629 [4/7] - in /lucene/dev/branches/lucene5376: ./
dev-tools/ dev-tools/maven/solr/contrib/map-reduce/ lucene/
lucene/analysis/ lucene/analysis/common/
lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/
lucene/analysis/com...
Modified: lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/BuildSuggestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/BuildSuggestHandler.java?rev=1555629&r1=1555628&r2=1555629&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/BuildSuggestHandler.java (original)
+++ lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/BuildSuggestHandler.java Sun Jan 5 21:04:58 2014
@@ -30,16 +30,13 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import net.minidev.json.JSONObject;
-import net.minidev.json.JSONValue;
-import net.minidev.json.parser.ParseException;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.document.FieldType.NumericType;
-import org.apache.lucene.facet.search.SearcherTaxonomyManager.SearcherAndTaxonomy;
-import org.apache.lucene.facet.search.SearcherTaxonomyManager;
+import org.apache.lucene.facet.taxonomy.SearcherTaxonomyManager.SearcherAndTaxonomy;
+import org.apache.lucene.facet.taxonomy.SearcherTaxonomyManager;
import org.apache.lucene.index.FieldInfo.DocValuesType;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.suggest.DocumentDictionary;
@@ -57,6 +54,9 @@ import org.apache.lucene.server.GlobalSt
import org.apache.lucene.server.IndexState;
import org.apache.lucene.server.params.*;
import org.apache.lucene.server.params.PolyType.PolyEntry;
+import net.minidev.json.JSONObject;
+import net.minidev.json.JSONValue;
+import net.minidev.json.parser.ParseException;
import static org.apache.lucene.server.handlers.RegisterFieldHandler.ANALYZER_TYPE;
@@ -99,9 +99,7 @@ public class BuildSuggestHandler extends
new StructType(
new Param("localFile", "Local file (to the server) to read suggestions + weights from; format is weight U+001F suggestion U+001F payload, one per line, with suggestion UTF-8 encoded. If this option is used then searcher, suggestField, weightField/Expression, payloadField should not be specified.", new StringType()),
new Param("searcher", "Specific searcher version to use for searching. There are three different ways to specify a searcher version.",
- new StructType(
- new Param("indexGen", "Search a generation previously returned by an indexing operation such as #addDocument. Use this to search a non-committed (near-real-time) view of the index.", new LongType()),
- new Param("snapshot", "Search a snapshot previously created with #createSnapshot", new StringType()))),
+ SearchHandler.SEARCHER_VERSION_TYPE),
new Param("suggestField", "Field (from stored documents) containing the suggestion text", new StringType()),
new Param("weightField", "Numeric field (from stored documents) containing the weight", new StringType()),
new Param("weightExpression", "Alternative to weightField, an expression that's evaluated to the weight. Note that any fields referenced in the expression must have been indexed with sort=true.", new StringType()),
@@ -405,25 +403,10 @@ public class BuildSuggestHandler extends
// Pull suggestions from stored docs:
if (source.hasParam("searcher")) {
- long searcherVersion;
- IndexState.Gens searcherSnapshot;
-
- Request s = source.getStruct("searcher");
- if (s.hasParam("indexGen")) {
- long indexGen = s.getLong("indexGen");
- state.reopenThread.waitForGeneration(indexGen);
- searcherVersion = -1;
- searcherSnapshot = null;
- } else {
- searcherSnapshot = new IndexState.Gens(s, "snapshot");
- Long v = state.snapshotGenToVersion.get(searcherSnapshot.indexGen);
- if (v == null) {
- s.fail("snapshot", "unrecognized snapshot \"" + searcherSnapshot.id + "\"");
- }
- searcherVersion = v.longValue();
- }
- searcher = SearchHandler.getSearcherAndTaxonomy(s, state, searcherVersion, searcherSnapshot, null);
+ // Specific searcher version:
+ searcher = SearchHandler.getSearcherAndTaxonomy(source, state, null);
} else {
+ // Just use current searcher version:
searcher = state.manager.acquire();
}
String suggestField = source.getString("suggestField");
Modified: lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/BulkAddDocumentHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/BulkAddDocumentHandler.java?rev=1555629&r1=1555628&r2=1555629&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/BulkAddDocumentHandler.java (original)
+++ lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/BulkAddDocumentHandler.java Sun Jan 5 21:04:58 2014
@@ -21,6 +21,7 @@ import java.io.Reader;
import java.util.List;
import java.util.Map;
+import org.apache.lucene.document.Document;
import org.apache.lucene.server.FinishRequest;
import org.apache.lucene.server.GlobalState;
import org.apache.lucene.server.IndexState;
@@ -32,7 +33,6 @@ import net.minidev.json.JSONArray;
import net.minidev.json.JSONObject;
import static org.apache.lucene.server.IndexState.AddDocumentContext;
-import static org.apache.lucene.server.IndexState.DocumentAndFacets;
/** Reads more than one { ... } request in a single
* connection, but each request must be separated by at
@@ -106,7 +106,7 @@ public class BulkAddDocumentHandler exte
AddDocumentHandler addDocHandler = (AddDocumentHandler) globalState.getHandler("addDocument");
int count = 0;
while (true) {
- DocumentAndFacets doc = addDocHandler.parseDocument(state, parser);
+ Document doc = addDocHandler.parseDocument(state, parser);
if (doc == null) {
break;
}
Modified: lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/BulkAddDocumentsHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/BulkAddDocumentsHandler.java?rev=1555629&r1=1555628&r2=1555629&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/BulkAddDocumentsHandler.java (original)
+++ lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/BulkAddDocumentsHandler.java Sun Jan 5 21:04:58 2014
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.apache.lucene.document.Document;
import org.apache.lucene.server.FinishRequest;
import org.apache.lucene.server.GlobalState;
import org.apache.lucene.server.IndexState;
@@ -33,7 +34,6 @@ import net.minidev.json.JSONArray;
import net.minidev.json.JSONObject;
import static org.apache.lucene.server.IndexState.AddDocumentContext;
-import static org.apache.lucene.server.IndexState.DocumentAndFacets;
/** Reads more than one { ... } request in a single
* connection, but each request must be separated by at
@@ -117,8 +117,8 @@ public class BulkAddDocumentsHandler ext
// Parse as many doc blocks as there are:
while (true) {
- List<DocumentAndFacets> children = null;
- DocumentAndFacets parent = null;
+ List<Document> children = null;
+ Document parent = null;
JsonToken token = parser.nextToken();
if (token == JsonToken.END_ARRAY) {
@@ -145,11 +145,11 @@ public class BulkAddDocumentsHandler ext
throw new IllegalArgumentException("expected array for children");
}
- children = new ArrayList<DocumentAndFacets>();
+ children = new ArrayList<Document>();
// Parse each child:
while (true) {
- DocumentAndFacets doc = addDocHandler.parseDocument(state, parser);
+ Document doc = addDocHandler.parseDocument(state, parser);
if (doc == null) {
break;
}
Modified: lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/BulkUpdateDocumentHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/BulkUpdateDocumentHandler.java?rev=1555629&r1=1555628&r2=1555629&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/BulkUpdateDocumentHandler.java (original)
+++ lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/BulkUpdateDocumentHandler.java Sun Jan 5 21:04:58 2014
@@ -21,6 +21,7 @@ import java.io.Reader;
import java.util.List;
import java.util.Map;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.Term;
import org.apache.lucene.server.FinishRequest;
import org.apache.lucene.server.GlobalState;
@@ -36,7 +37,6 @@ import org.codehaus.jackson.JsonToken;
import net.minidev.json.JSONObject;
import static org.apache.lucene.server.IndexState.AddDocumentContext;
-import static org.apache.lucene.server.IndexState.DocumentAndFacets;
/** Handles {@code bulkUpdateDocument}. */
public class BulkUpdateDocumentHandler extends Handler {
@@ -133,7 +133,7 @@ public class BulkUpdateDocumentHandler e
// Parse term: and fields:
Term updateTerm = null;
- final DocumentAndFacets doc = new DocumentAndFacets();
+ final Document doc = new Document();
while (true) {
token = parser.nextToken();
Modified: lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/BulkUpdateDocumentsHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/BulkUpdateDocumentsHandler.java?rev=1555629&r1=1555628&r2=1555629&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/BulkUpdateDocumentsHandler.java (original)
+++ lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/BulkUpdateDocumentsHandler.java Sun Jan 5 21:04:58 2014
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.Term;
import org.apache.lucene.server.FinishRequest;
import org.apache.lucene.server.GlobalState;
@@ -34,7 +35,6 @@ import net.minidev.json.JSONArray;
import net.minidev.json.JSONObject;
import static org.apache.lucene.server.IndexState.AddDocumentContext;
-import static org.apache.lucene.server.IndexState.DocumentAndFacets;
/** Reads more than one { ... } request in a single
* connection, but each request must be separated by at
@@ -122,8 +122,8 @@ public class BulkUpdateDocumentsHandler
// Parse as many doc blocks as there are:
while (true) {
- List<DocumentAndFacets> children = null;
- DocumentAndFacets parent = null;
+ List<Document> children = null;
+ Document parent = null;
Term updateTerm = null;
JsonToken token = parser.nextToken();
@@ -180,11 +180,11 @@ public class BulkUpdateDocumentsHandler
throw new IllegalArgumentException("expected array for children");
}
- children = new ArrayList<DocumentAndFacets>();
+ children = new ArrayList<Document>();
// Parse each child:
while (true) {
- DocumentAndFacets doc = addDocHandler.parseDocument(state, parser);
+ Document doc = addDocHandler.parseDocument(state, parser);
if (doc == null) {
break;
}
Modified: lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/CreateSnapshotHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/CreateSnapshotHandler.java?rev=1555629&r1=1555628&r2=1555629&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/CreateSnapshotHandler.java (original)
+++ lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/CreateSnapshotHandler.java Sun Jan 5 21:04:58 2014
@@ -21,7 +21,7 @@ import java.io.IOException;
import java.util.List;
import java.util.Map;
-import org.apache.lucene.facet.search.SearcherTaxonomyManager.SearcherAndTaxonomy;
+import org.apache.lucene.facet.taxonomy.SearcherTaxonomyManager.SearcherAndTaxonomy;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexCommit;
import org.apache.lucene.index.IndexReader;
Modified: lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/RegisterFieldHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/RegisterFieldHandler.java?rev=1555629&r1=1555628&r2=1555629&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/RegisterFieldHandler.java (original)
+++ lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/RegisterFieldHandler.java Sun Jan 5 21:04:58 2014
@@ -672,6 +672,18 @@ public class RegisterFieldHandler extend
ft.freeze();
+ if (facet.equals("no") == false && facet.equals("numericRange") == false) {
+ if (facet.equals("hierarchy")) {
+ state.facetsConfig.setHierarchical(name, true);
+ }
+ if (multiValued) {
+ state.facetsConfig.setMultiValued(name, true);
+ }
+ }
+
+ // nocommit facetsConfig.setIndexFieldName
+ // nocommit facetsConfig.setRequireDimCount
+
return new FieldDef(name, ft, type, facet, pf, dvf, multiValued, sim, indexAnalyzer, searchAnalyzer, highlighted, liveValuesIDField, null, 0.0f, 0l);
}