Merge remote-tracking branch 'origin/master'

This commit is contained in:
David Pilato 2015-12-01 12:46:09 +01:00
commit fb79d064d7

View File

@ -333,9 +333,9 @@ public class SimpleSearchIT extends ESIntegTestCase {
} }
public void testQueryNumericFieldWithRegex() throws Exception { public void testQueryNumericFieldWithRegex() throws Exception {
createIndex("idx"); assertAcked(prepareCreate("idx").addMapping("type", "num", "type=integer"));
indexRandom(true, client().prepareIndex("idx", "type").setSource("num", 34)); ensureGreen("idx");
try { try {
client().prepareSearch("idx").setQuery(QueryBuilders.regexpQuery("num", "34")).get(); client().prepareSearch("idx").setQuery(QueryBuilders.regexpQuery("num", "34")).get();
fail("SearchPhaseExecutionException should have been thrown"); fail("SearchPhaseExecutionException should have been thrown");