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/04 13:30:47 UTC
svn commit: r1555341 [2/2] - in
/lucene/dev/branches/lucene5376/lucene/server/src:
java/org/apache/lucene/server/ java/org/apache/lucene/server/handlers/
test/org/apache/lucene/server/
Modified: lucene/dev/branches/lucene5376/lucene/server/src/test/org/apache/lucene/server/TestSnapshots.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/server/src/test/org/apache/lucene/server/TestSnapshots.java?rev=1555341&r1=1555340&r2=1555341&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/server/src/test/org/apache/lucene/server/TestSnapshots.java (original)
+++ lucene/dev/branches/lucene5376/lucene/server/src/test/org/apache/lucene/server/TestSnapshots.java Sat Jan 4 12:30:46 2014
@@ -42,29 +42,29 @@ public class TestSnapshots extends Serve
}
private static void registerFields() throws Exception {
- send("registerFields", "{indexName: index, fields: {body: {type: text, analyzer: {class: EnglishAnalyzer, matchVersion: LUCENE_43}}, id: {type: atom, store: true}, facet: {type: atom, index: false, facet: flat}}}");
+ send("registerFields", "{fields: {body: {type: text, analyzer: {class: EnglishAnalyzer, matchVersion: LUCENE_43}}, id: {type: atom, store: true}, facet: {type: atom, index: false, facet: flat}}}");
}
public void testBasic() throws Exception {
deleteAllDocs();
// Add one doc:
- JSONObject o = send("addDocument", "{indexName: index, fields: {body: 'here is the body', id: '0', facet: 'facet'}}");
+ JSONObject o = send("addDocument", "{fields: {body: 'here is the body', id: '0', facet: 'facet'}}");
long indexGen = ((Number) o.get("indexGen")).longValue();
commit();
- o = send("search", "{indexName: index, queryText: 'body:body', searcher: {indexGen:" + indexGen + "}}");
+ o = send("search", "{queryText: 'body:body', searcher: {indexGen:" + indexGen + "}}");
assertEquals(1, o.get("totalHits"));
// Take snapshot before making some changes:
- JSONObject result = send("createSnapshot", "{indexName: index}");
+ JSONObject result = send("createSnapshot", "{}");
String id = getString(result, "id");
// System.out.println("GOT: " + prettyPrint(result));
// Delete first doc, register new field, add another:
- send("deleteDocuments", "{indexName: index, field: id, values: ['0']}");
- send("registerFields", "{indexName: index, fields: {field: {type: 'atom'}}}");
- send("addDocument", "{indexName: index, fields: {body: 'here is the body', id: '1', facet: 'facet2', field: 'abc'}}");
+ send("deleteDocuments", "{field: id, values: ['0']}");
+ send("registerFields", "{fields: {field: {type: 'atom'}}}");
+ send("addDocument", "{fields: {body: 'here is the body', id: '1', facet: 'facet2', field: 'abc'}}");
commit();
File backupDir = _TestUtil.getTempDir("backup");
@@ -89,14 +89,14 @@ public class TestSnapshots extends Serve
}
// Make sure we can search the snapshot and only get 1 hit:
- JSONObject searchResult = send("search", "{indexName: index, retrieveFields: [id], searcher: {snapshot: \"" + id + "\"}, query: MatchAllDocsQuery}");
+ JSONObject searchResult = send("search", "{retrieveFields: [id], searcher: {snapshot: \"" + id + "\"}, query: MatchAllDocsQuery}");
assertEquals(1, getInt(searchResult, "totalHits"));
assertEquals("0", getString(searchResult, "hits[0].fields.id"));
// Bounce the server:
shutdownServer();
startServer();
- send("startIndex", "{indexName: index}");
+ send("startIndex", "{}");
// Make sure files still exist (snapshot persisted):
for(Map.Entry<String,Object> ent : result.entrySet()) {
@@ -114,12 +114,12 @@ public class TestSnapshots extends Serve
}
// Make sure we can still search the snapshot:
- searchResult = send("search", "{indexName: index, retrieveFields: [id], searcher: {snapshot: \"" + id + "\"}, query: MatchAllDocsQuery}");
+ searchResult = send("search", "{retrieveFields: [id], searcher: {snapshot: \"" + id + "\"}, query: MatchAllDocsQuery}");
assertEquals(1, getInt(searchResult, "totalHits"));
assertEquals("0", getString(searchResult, "hits[0].fields.id"));
// Now, release the snapshot:
- send("releaseSnapshot", "{indexName: index, id: \"" + id + "\"}");
+ send("releaseSnapshot", "{id: \"" + id + "\"}");
// Make sure some files in the snapshot are now gone:
boolean someGone = false;
@@ -142,11 +142,11 @@ public class TestSnapshots extends Serve
// Restart server against the backup image:
shutdownServer();
startServer();
- send("startIndex", "{indexName: index}");
+ send("startIndex", "{}");
// Make sure seach is working, and we still see only
// one hit:
- o = send("search", "{indexName: index, queryText: 'body:body', searcher: {indexGen:" + indexGen + "}}");
+ o = send("search", "{queryText: 'body:body', searcher: {indexGen:" + indexGen + "}}");
assertEquals(1, o.get("totalHits"));
shutdownServer();
Modified: lucene/dev/branches/lucene5376/lucene/server/src/test/org/apache/lucene/server/TestSuggest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/server/src/test/org/apache/lucene/server/TestSuggest.java?rev=1555341&r1=1555340&r2=1555341&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/server/src/test/org/apache/lucene/server/TestSuggest.java (original)
+++ lucene/dev/branches/lucene5376/lucene/server/src/test/org/apache/lucene/server/TestSuggest.java Sat Jan 4 12:30:46 2014
@@ -35,9 +35,9 @@ public class TestSuggest extends ServerB
@BeforeClass
public static void initClass() throws Exception {
+ curIndexName = "index";
startServer();
createAndStartIndex();
- //registerFields();
commit();
File tempDir = _TestUtil.getTempDir("TestSuggest");
tempDir.mkdirs();
@@ -50,6 +50,12 @@ public class TestSuggest extends ServerB
tempFile = null;
}
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ curIndexName = "index";
+ }
+
public void testAnalyzingSuggest() throws Exception {
Writer fstream = new OutputStreamWriter(new FileOutputStream(tempFile), "UTF-8");
BufferedWriter out = new BufferedWriter(fstream);
@@ -60,12 +66,12 @@ public class TestSuggest extends ServerB
out.write("5\u001fthe time is now\u001ffoobar\n");
out.close();
- JSONObject result = send("buildSuggest", "{indexName: index, source: {localFile: '" + tempFile.getAbsolutePath() + "'}, class: 'AnalyzingSuggester', suggestName: 'suggest', indexAnalyzer: EnglishAnalyzer, queryAnalyzer: {tokenizer: StandardTokenizer, tokenFilters: [EnglishPossessiveFilter,LowerCaseFilter,PorterStemFilter]]}}");
+ JSONObject result = send("buildSuggest", "{source: {localFile: '" + tempFile.getAbsolutePath() + "'}, class: 'AnalyzingSuggester', suggestName: 'suggest', indexAnalyzer: EnglishAnalyzer, queryAnalyzer: {tokenizer: StandardTokenizer, tokenFilters: [EnglishPossessiveFilter,LowerCaseFilter,PorterStemFilter]]}}");
assertEquals(5, result.get("count"));
//commit();
for(int i=0;i<2;i++) {
- result = send("suggestLookup", "{indexName: index, text: 'l', suggestName: 'suggest'}");
+ result = send("suggestLookup", "{text: 'l', suggestName: 'suggest'}");
assertEquals(3, get(result, "results.length"));
assertEquals("love", get(result, "results[0].key"));
@@ -83,20 +89,20 @@ public class TestSuggest extends ServerB
// ForkLastTokenFilter allows 'the' to match
// 'theories'; without it (and StopKeywordFilter) the
// would be dropped:
- result = send("suggestLookup", "{indexName: index, text: 'the', suggestName: 'suggest'}");
+ result = send("suggestLookup", "{text: 'the', suggestName: 'suggest'}");
assertEquals(1, get(result, "results.length"));
assertEquals("theories take time", get(result, "results[0].key"));
assertEquals(5, get(result, "results[0].weight"));
assertEquals("foobar", get(result, "results[0].payload"));
- result = send("suggestLookup", "{indexName: index, text: 'the ', suggestName: 'suggest'}");
+ result = send("suggestLookup", "{text: 'the ', suggestName: 'suggest'}");
assertEquals(0, get(result, "results.length"));
// Make sure suggest survives server restart:
shutdownServer();
startServer();
- send("startIndex", "{indexName: index}");
+ send("startIndex", "{}");
}
}
@@ -106,12 +112,12 @@ public class TestSuggest extends ServerB
out.write("15\u001flove lost\u001ffoobar\n");
out.close();
- JSONObject result = send("buildSuggest", "{indexName: index, source: {localFile: '" + tempFile.getAbsolutePath() + "'}, class: 'InfixSuggester', suggestName: 'suggest2', analyzer: {tokenizer: WhitespaceTokenizer, tokenFilters: [LowerCaseFilter]}}");
+ JSONObject result = send("buildSuggest", "{source: {localFile: '" + tempFile.getAbsolutePath() + "'}, class: InfixSuggester, suggestName: suggest2, analyzer: {tokenizer: WhitespaceTokenizer, tokenFilters: [LowerCaseFilter]}}");
assertEquals(1, result.get("count"));
//commit();
for(int i=0;i<2;i++) {
- result = send("suggestLookup", "{indexName: index, text: 'lost', suggestName: 'suggest2'}");
+ result = send("suggestLookup", "{text: lost, suggestName: suggest2}");
assertEquals(15, get(result, "results[0].weight"));
assertEquals("love <font color=red>lost</font>", toString(getArray(result, "results[0].key")));
assertEquals("foobar", get(result, "results[0].payload"));
@@ -119,7 +125,7 @@ public class TestSuggest extends ServerB
// Make sure suggest survives server restart:
shutdownServer();
startServer();
- send("startIndex", "{indexName: index}");
+ send("startIndex", "{}");
}
}
@@ -144,13 +150,13 @@ public class TestSuggest extends ServerB
out.write("15\u001flove lost\u001ffoobar\n");
out.close();
- JSONObject result = send("buildSuggest", "{indexName: index, source: {localFile: '" + tempFile.getAbsolutePath() + "'}, class: 'FuzzySuggester', suggestName: 'suggest3', analyzer: {tokenizer: WhitespaceTokenizer, tokenFilters: [LowerCaseFilter]}}");
+ JSONObject result = send("buildSuggest", "{source: {localFile: '" + tempFile.getAbsolutePath() + "'}, class: 'FuzzySuggester', suggestName: 'suggest3', analyzer: {tokenizer: WhitespaceTokenizer, tokenFilters: [LowerCaseFilter]}}");
assertEquals(1, result.get("count"));
//commit();
for(int i=0;i<2;i++) {
// 1 transposition and this is prefix of "love":
- result = send("suggestLookup", "{indexName: index, text: 'lvo', suggestName: 'suggest3'}");
+ result = send("suggestLookup", "{text: 'lvo', suggestName: 'suggest3'}");
assertEquals(15, get(result, "results[0].weight"));
assertEquals("love lost", get(result, "results[0].key"));
assertEquals("foobar", get(result, "results[0].payload"));
@@ -158,31 +164,30 @@ public class TestSuggest extends ServerB
// Make sure suggest survives server restart:
shutdownServer();
startServer();
- send("startIndex", "{indexName: index}");
+ send("startIndex", "{}");
}
}
/** Build a suggest, pulling suggestions/weights/payloads from stored fields. */
public void testFromStoredFields() throws Exception {
-
+ curIndexName = "storedSuggest";
_TestUtil.rmDir(new File("storedsuggest"));
- send("createIndex", "{indexName: storedsuggest, rootDir: storedsuggest}");
- send("settings", "{indexName: storedsuggest, directory: FSDirectory, matchVersion: LUCENE_46}");
- send("startIndex", "{indexName: storedsuggest}");
+ send("createIndex", "{rootDir: storedsuggest}");
+ send("settings", "{directory: FSDirectory, matchVersion: LUCENE_46}");
+ send("startIndex", "{}");
send("registerFields",
- "{indexName: storedsuggest, " +
- "fields: {text: {type: text, store: true, index: false}," +
+ "{fields: {text: {type: text, store: true, index: false}," +
"weight: {type: float, store: true, index: false}," +
"payload: {type: text, store: true, index: false}}}");
- send("addDocument", "{indexName: storedsuggest, fields: {text: 'the cat meows', weight: 1, payload: 'payload1'}}");
- long indexGen = getLong(send("addDocument", "{indexName: storedsuggest, fields: {text: 'the dog barks', weight: 2, payload: 'payload2'}}"), "indexGen");
+ send("addDocument", "{fields: {text: 'the cat meows', weight: 1, payload: 'payload1'}}");
+ long indexGen = getLong(send("addDocument", "{fields: {text: 'the dog barks', weight: 2, payload: 'payload2'}}"), "indexGen");
- JSONObject result = send("buildSuggest", "{indexName: storedsuggest, source: {searcher: {indexGen: " + indexGen + "}, suggestField: text, weightField: weight, payloadField: payload}, class: 'AnalyzingSuggester', suggestName: 'suggest', analyzer: {tokenizer: WhitespaceTokenizer, tokenFilters: [LowerCaseFilter]}}");
+ JSONObject result = send("buildSuggest", "{source: {searcher: {indexGen: " + indexGen + "}, suggestField: text, weightField: weight, payloadField: payload}, class: 'AnalyzingSuggester', suggestName: 'suggest', analyzer: {tokenizer: WhitespaceTokenizer, tokenFilters: [LowerCaseFilter]}}");
// nocommit count isn't returned for stored fields source:
//assertEquals(2, result.get("count"));
for(int i=0;i<2;i++) {
- result = send("suggestLookup", "{indexName: storedsuggest, text: the, suggestName: suggest}");
+ result = send("suggestLookup", "{text: the, suggestName: suggest}");
assertEquals(2, getInt(result, "results[0].weight"));
assertEquals("the dog barks", get(result, "results[0].key"));
assertEquals("payload2", get(result, "results[0].payload"));
@@ -193,32 +198,32 @@ public class TestSuggest extends ServerB
// Make sure suggest survives server restart:
shutdownServer();
startServer();
- send("startIndex", "{indexName: storedsuggest}");
+ send("startIndex", "{}");
}
}
/** Build a suggest, pulling suggestions/payloads from
* stored fields, and weight from an expression */
public void testFromStoredFieldsWithWeightExpression() throws Exception {
-
+ curIndexName = "storedsuggestexpr";
_TestUtil.rmDir(new File("storedsuggestexpr"));
- send("createIndex", "{indexName: storedsuggestexpr, rootDir: storedsuggestexpr}");
- send("settings", "{indexName: storedsuggestexpr, directory: FSDirectory, matchVersion: LUCENE_46}");
- send("startIndex", "{indexName: storedsuggestexpr}");
+ send("createIndex", "{rootDir: storedsuggestexpr}");
+ send("settings", "{directory: FSDirectory, matchVersion: LUCENE_46}");
+ send("startIndex", "{}");
send("registerFields",
- "{indexName: storedsuggestexpr, " +
+ "{" +
"fields: {text: {type: text, store: true, index: false}," +
"negWeight: {type: float, sort: true}," +
"payload: {type: text, store: true, index: false}}}");
- send("addDocument", "{indexName: storedsuggestexpr, fields: {text: 'the cat meows', negWeight: -1, payload: 'payload1'}}");
- long indexGen = getLong(send("addDocument", "{indexName: storedsuggestexpr, fields: {text: 'the dog barks', negWeight: -2, payload: 'payload2'}}"), "indexGen");
+ send("addDocument", "{fields: {text: 'the cat meows', negWeight: -1, payload: 'payload1'}}");
+ long indexGen = getLong(send("addDocument", "{fields: {text: 'the dog barks', negWeight: -2, payload: 'payload2'}}"), "indexGen");
- JSONObject result = send("buildSuggest", "{indexName: storedsuggestexpr, source: {searcher: {indexGen: " + indexGen + "}, suggestField: text, weightExpression: -negWeight, payloadField: payload}, class: 'AnalyzingSuggester', suggestName: 'suggest', analyzer: {tokenizer: WhitespaceTokenizer, tokenFilters: [LowerCaseFilter]}}");
+ JSONObject result = send("buildSuggest", "{source: {searcher: {indexGen: " + indexGen + "}, suggestField: text, weightExpression: -negWeight, payloadField: payload}, class: 'AnalyzingSuggester', suggestName: 'suggest', analyzer: {tokenizer: WhitespaceTokenizer, tokenFilters: [LowerCaseFilter]}}");
// nocommit count isn't returned for stored fields source:
//assertEquals(2, result.get("count"));
for(int i=0;i<2;i++) {
- result = send("suggestLookup", "{indexName: storedsuggestexpr, text: the, suggestName: suggest}");
+ result = send("suggestLookup", "{text: the, suggestName: suggest}");
assertEquals(2, getInt(result, "results[0].weight"));
assertEquals("the dog barks", get(result, "results[0].key"));
assertEquals("payload2", get(result, "results[0].payload"));
@@ -229,7 +234,7 @@ public class TestSuggest extends ServerB
// Make sure suggest survives server restart:
shutdownServer();
startServer();
- send("startIndex", "{indexName: storedsuggestexpr}");
+ send("startIndex", "{}");
}
}
}