Skip to content

Upgrade elastic search to 1.1.1 #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Upgrade elastic search to 1.1.1 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1e9de58
Upgrade to elasticsearch 1.0.1
Mar 31, 2014
277eed6
Upgrade to 1.1.0
Apr 8, 2014
c263f3a
upgrade elastic search to 1.1.1
Apr 22, 2014
ecbe298
Fox unit test
Apr 23, 2014
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</parent>

<properties>
<elasticsearch.version>0.90.3</elasticsearch.version>
<elasticsearch.version>1.1.1</elasticsearch.version>
</properties>

<repositories>
Expand Down
18 changes: 9 additions & 9 deletions src/test/java/org/elasticsearch/search/facet/script/SimpleScriptFacetTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public void testBinaryFacet() throws Exception {
.endObject()).execute().actionGet();
}

client().admin().indices().prepareFlush().setRefresh(true).execute().actionGet();
client().admin().indices().prepareFlush().execute().actionGet();

for (int i = 0; i < 5; i++) {
client().prepareIndex("test", "type1").setSource(jsonBuilder().startObject()
Expand Down Expand Up @@ -171,7 +171,7 @@ public void testUpdateFacet() throws Exception {
.endObject()).execute().actionGet();
}

client().admin().indices().prepareFlush().setRefresh(true).execute().actionGet();
client().admin().indices().prepareFlush().execute().actionGet();

for (int i = 0; i < 5; i++) {
client().prepareIndex("test1", "type1").setSource(jsonBuilder().startObject()
Expand All @@ -186,7 +186,6 @@ public void testUpdateFacet() throws Exception {
}

client().admin().indices().prepareRefresh().execute().actionGet();

SearchResponse searchResponse = client().prepareSearch()
.setSearchType(SearchType.COUNT)
.setIndices("test1", "test2")
Expand All @@ -197,8 +196,9 @@ public void testUpdateFacet() throws Exception {
.field("init_script", "index = _ctx.request().index();")
.field("map_script", "" +
"uid = doc._uid.value;" +
"id = org.elasticsearch.index.mapper.Uid.idFromUid(uid);" +
"type = org.elasticsearch.index.mapper.Uid.typeFromUid(uid);" +
"uidId = org.elasticsearch.index.mapper.Uid.createUid(uid);" +
"id = uidId.id();" +
"type = uidId.type();" +
"if (!_source.isEmpty()) {" +
" modified = true;" +
" map = _source.source();" +
Expand Down Expand Up @@ -271,7 +271,7 @@ public void testCharFrequencies() throws Exception {
.field("message", "IJKLMNOP")
.endObject()).execute().actionGet();

client().admin().indices().prepareFlush().setRefresh(true).execute().actionGet();
client().admin().indices().prepareFlush().execute().actionGet();

client().admin().indices().prepareRefresh().execute().actionGet();

Expand Down Expand Up @@ -328,7 +328,7 @@ public void testClientAccessFromScript() throws Exception {
.field("message", "foo bar")
.endObject()).execute().actionGet();

client().admin().indices().prepareFlush().setRefresh(true).execute().actionGet();
client().admin().indices().prepareFlush().execute().actionGet();

client().admin().indices().prepareRefresh().execute().actionGet();

Expand All @@ -339,7 +339,7 @@ public void testClientAccessFromScript() throws Exception {
.startObject("facets")
.startObject("facet1")
.startObject("script")
.field("map_script", "_client.prepareUpdate(\"test1\", \"type1\", org.elasticsearch.index.mapper.Uid.idFromUid(doc['_uid'].value)).setDoc(\"{\\\"message\\\": \\\"baz\\\"}\").execute().actionGet()")
.field("map_script", "_client.prepareUpdate(\"test1\", \"type1\", org.elasticsearch.index.mapper.Uid.createUid(doc['_uid'].value).id()).setDoc(\"{\\\"message\\\": \\\"baz\\\"}\").execute().actionGet()")
.endObject()
.endObject()
.endObject()
Expand Down Expand Up @@ -378,7 +378,7 @@ public void testScriptParams() throws Exception {
.field("num", i)
.endObject()).execute().actionGet();
}
client().admin().indices().prepareFlush().setRefresh(true).execute().actionGet();
client().admin().indices().prepareFlush().execute().actionGet();

client().admin().indices().prepareRefresh().execute().actionGet();

Expand Down