honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-25 22:36:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove these helpers

Browse Source
This commit is contained in:
Robert Muir 2015-04-17 21:22:57 -04:00
parent a312098785
commit 52c4af6115
2 changed files with 20 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/test/java/org/elasticsearch/search/sort/SimpleSortTests.java
View File

@ -457,14 +457,14 @@ public class SimpleSortTests extends ElasticsearchIntegrationTest {
Random random = getRandom(); Random random = getRandom();
assertAcked(prepareCreate("test") assertAcked(prepareCreate("test")
.addMapping("type1", XContentFactory.jsonBuilder().startObject().startObject("type1").startObject("properties") .addMapping("type1", XContentFactory.jsonBuilder().startObject().startObject("type1").startObject("properties")
.startObject("str_value").field("type", "string").field("index", "not_analyzed").startObject("fielddata").field("format", maybeDocValues() ? "doc_values" : null).endObject().endObject() .startObject("str_value").field("type", "string").field("index", "not_analyzed").startObject("fielddata").field("format", random().nextBoolean() ? "doc_values" : null).endObject().endObject()
.startObject("boolean_value").field("type", "boolean").endObject() .startObject("boolean_value").field("type", "boolean").endObject()
.startObject("byte_value").field("type", "byte").startObject("fielddata").field("format", maybeDocValues() ? "doc_values" : null).endObject().endObject() .startObject("byte_value").field("type", "byte").startObject("fielddata").field("format", random().nextBoolean() ? "doc_values" : null).endObject().endObject()
.startObject("short_value").field("type", "short").startObject("fielddata").field("format", maybeDocValues() ? "doc_values" : null).endObject().endObject() .startObject("short_value").field("type", "short").startObject("fielddata").field("format", random().nextBoolean() ? "doc_values" : null).endObject().endObject()
.startObject("integer_value").field("type", "integer").startObject("fielddata").field("format", maybeDocValues() ? "doc_values" : null).endObject().endObject() .startObject("integer_value").field("type", "integer").startObject("fielddata").field("format", random().nextBoolean() ? "doc_values" : null).endObject().endObject()
.startObject("long_value").field("type", "long").startObject("fielddata").field("format", maybeDocValues() ? "doc_values" : null).endObject().endObject() .startObject("long_value").field("type", "long").startObject("fielddata").field("format", random().nextBoolean() ? "doc_values" : null).endObject().endObject()
.startObject("float_value").field("type", "float").startObject("fielddata").field("format", maybeDocValues() ? "doc_values" : null).endObject().endObject() .startObject("float_value").field("type", "float").startObject("fielddata").field("format", random().nextBoolean() ? "doc_values" : null).endObject().endObject()
.startObject("double_value").field("type", "double").startObject("fielddata").field("format", maybeDocValues() ? "doc_values" : null).endObject().endObject() .startObject("double_value").field("type", "double").startObject("fielddata").field("format", random().nextBoolean() ? "doc_values" : null).endObject().endObject()
.endObject().endObject().endObject())); .endObject().endObject().endObject()));
ensureGreen(); ensureGreen();
List<IndexRequestBuilder> builders = new ArrayList<>(); List<IndexRequestBuilder> builders = new ArrayList<>();
@ -858,7 +858,7 @@ public class SimpleSortTests extends ElasticsearchIntegrationTest {
// We have to specify mapping explicitly because by the time search is performed dynamic mapping might not // We have to specify mapping explicitly because by the time search is performed dynamic mapping might not
// be propagated to all nodes yet and sort operation fail when the sort field is not defined // be propagated to all nodes yet and sort operation fail when the sort field is not defined
String mapping = jsonBuilder().startObject().startObject("type1").startObject("properties") String mapping = jsonBuilder().startObject().startObject("type1").startObject("properties")
.startObject("svalue").field("type", "string").field("index", "not_analyzed").startObject("fielddata").field("format", maybeDocValues() ? "doc_values" : null).endObject().endObject() .startObject("svalue").field("type", "string").field("index", "not_analyzed").startObject("fielddata").field("format", random().nextBoolean() ? "doc_values" : null).endObject().endObject()
.endObject().endObject().endObject().string(); .endObject().endObject().endObject().string();
assertAcked(prepareCreate("test").addMapping("type1", mapping)); assertAcked(prepareCreate("test").addMapping("type1", mapping));
ensureGreen(); ensureGreen();
@ -955,11 +955,11 @@ public class SimpleSortTests extends ElasticsearchIntegrationTest {
.startObject("properties") .startObject("properties")
.startObject("i_value") .startObject("i_value")
.field("type", "integer") .field("type", "integer")
.startObject("fielddata").field("format", maybeDocValues() ? "doc_values" : null).endObject() .startObject("fielddata").field("format", random().nextBoolean() ? "doc_values" : null).endObject()
.endObject() .endObject()
.startObject("d_value") .startObject("d_value")
.field("type", "float") .field("type", "float")
.startObject("fielddata").field("format", maybeDocValues() ? "doc_values" : null).endObject() .startObject("fielddata").field("format", random().nextBoolean() ? "doc_values" : null).endObject()
.endObject() .endObject()
.endObject() .endObject()
.endObject() .endObject()
@ -1144,13 +1144,13 @@ public class SimpleSortTests extends ElasticsearchIntegrationTest {
public void testSortMVField() throws Exception { public void testSortMVField() throws Exception {
assertAcked(prepareCreate("test") assertAcked(prepareCreate("test")
.addMapping("type1", XContentFactory.jsonBuilder().startObject().startObject("type1").startObject("properties") .addMapping("type1", XContentFactory.jsonBuilder().startObject().startObject("type1").startObject("properties")
.startObject("long_values").field("type", "long").startObject("fielddata").field("format", maybeDocValues() ? "doc_values" : null).endObject().endObject() .startObject("long_values").field("type", "long").startObject("fielddata").field("format", random().nextBoolean() ? "doc_values" : null).endObject().endObject()
.startObject("int_values").field("type", "integer").startObject("fielddata").field("format", maybeDocValues() ? "doc_values" : null).endObject().endObject() .startObject("int_values").field("type", "integer").startObject("fielddata").field("format", random().nextBoolean() ? "doc_values" : null).endObject().endObject()
.startObject("short_values").field("type", "short").startObject("fielddata").field("format", maybeDocValues() ? "doc_values" : null).endObject().endObject() .startObject("short_values").field("type", "short").startObject("fielddata").field("format", random().nextBoolean() ? "doc_values" : null).endObject().endObject()
.startObject("byte_values").field("type", "byte").startObject("fielddata").field("format", maybeDocValues() ? "doc_values" : null).endObject().endObject() .startObject("byte_values").field("type", "byte").startObject("fielddata").field("format", random().nextBoolean() ? "doc_values" : null).endObject().endObject()
.startObject("float_values").field("type", "float").startObject("fielddata").field("format", maybeDocValues() ? "doc_values" : null).endObject().endObject() .startObject("float_values").field("type", "float").startObject("fielddata").field("format", random().nextBoolean() ? "doc_values" : null).endObject().endObject()
.startObject("double_values").field("type", "double").startObject("fielddata").field("format", maybeDocValues() ? "doc_values" : null).endObject().endObject() .startObject("double_values").field("type", "double").startObject("fielddata").field("format", random().nextBoolean() ? "doc_values" : null).endObject().endObject()
.startObject("string_values").field("type", "string").field("index", "not_analyzed").startObject("fielddata").field("format", maybeDocValues() ? "doc_values" : null).endObject().endObject() .startObject("string_values").field("type", "string").field("index", "not_analyzed").startObject("fielddata").field("format", random().nextBoolean() ? "doc_values" : null).endObject().endObject()
.endObject().endObject().endObject())); .endObject().endObject().endObject()));
ensureGreen(); ensureGreen();
@ -1459,7 +1459,7 @@ public class SimpleSortTests extends ElasticsearchIntegrationTest {
public void testSortOnRareField() throws ElasticsearchException, IOException { public void testSortOnRareField() throws ElasticsearchException, IOException {
assertAcked(prepareCreate("test") assertAcked(prepareCreate("test")
.addMapping("type1", XContentFactory.jsonBuilder().startObject().startObject("type1").startObject("properties") .addMapping("type1", XContentFactory.jsonBuilder().startObject().startObject("type1").startObject("properties")
.startObject("string_values").field("type", "string").field("index", "not_analyzed").startObject("fielddata").field("format", maybeDocValues() ? "doc_values" : null).endObject().endObject() .startObject("string_values").field("type", "string").field("index", "not_analyzed").startObject("fielddata").field("format", random().nextBoolean() ? "doc_values" : null).endObject().endObject()
.endObject().endObject().endObject())); .endObject().endObject().endObject()));
ensureGreen(); ensureGreen();
client().prepareIndex("test", "type1", Integer.toString(1)).setSource(jsonBuilder().startObject() client().prepareIndex("test", "type1", Integer.toString(1)).setSource(jsonBuilder().startObject()
@ -1558,8 +1558,8 @@ public class SimpleSortTests extends ElasticsearchIntegrationTest {
} }
public void testSortMetaField() throws Exception { public void testSortMetaField() throws Exception {
final boolean idDocValues = maybeDocValues(); final boolean idDocValues = random().nextBoolean();
final boolean timestampDocValues = maybeDocValues(); final boolean timestampDocValues = random().nextBoolean();
XContentBuilder mapping = XContentFactory.jsonBuilder().startObject().startObject("type") XContentBuilder mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
.startObject("_timestamp").field("enabled", true).field("store", true).field("index", !timestampDocValues || randomBoolean() ? "not_analyzed" : "no").field("doc_values", timestampDocValues).endObject() .startObject("_timestamp").field("enabled", true).field("store", true).field("index", !timestampDocValues || randomBoolean() ? "not_analyzed" : "no").field("doc_values", timestampDocValues).endObject()
.endObject().endObject(); .endObject().endObject();

13
src/test/java/org/elasticsearch/test/ElasticsearchTestCase.java
View File

@ -562,15 +562,6 @@ public abstract class ElasticsearchTestCase extends LuceneTestCase {
}); });
} }
public static boolean hasUnclosedWrapper() {
for (MockDirectoryWrapper w : MockDirectoryHelper.wrappers) {
if (w.isOpen()) {
return true;
}
}
return false;
}
@BeforeClass @BeforeClass
public static void setBeforeClass() throws Exception { public static void setBeforeClass() throws Exception {
closeAfterSuite(new Closeable() { closeAfterSuite(new Closeable() {
@ -602,10 +593,6 @@ public abstract class ElasticsearchTestCase extends LuceneTestCase {
Requests.INDEX_CONTENT_TYPE = XContentType.JSON; Requests.INDEX_CONTENT_TYPE = XContentType.JSON;
} }
public static boolean maybeDocValues() {
return random().nextBoolean();
}
private static final List<Version> SORTED_VERSIONS; private static final List<Version> SORTED_VERSIONS;
static { static {