Improve detection of index existence

Allow aliases (like _all) to be used only when reading data. fix #205 fix #233 (cherry picked from commit 7527c4a)
elastic · Aug 13, 2014 · 34c7bee · 34c7bee
1 parent ee72401
commit 34c7bee
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/mr/src/main/java/org/elasticsearch/hadoop/rest/RestRepository.java b/mr/src/main/java/org/elasticsearch/hadoop/rest/RestRepository.java
@@ -274,7 +274,14 @@ public List<Object[]> scroll(String scrollId, ScrollReader reader) throws IOExce
 
     public boolean indexExists(boolean read) throws IOException {
         Resource res = (read ? resourceR : resourceW);
-        return client.exists(res.indexAndType());
+        // cheap hit
+        boolean exists = client.exists(res.indexAndType());
+        // could be a _all or a pattern which is valid for read
+        // try again by asking the mapping - could be expensive
+        if (!exists && read) {
+        	exists = !client.getMapping(res.mapping()).isEmpty();
+        }
+        return exists;
     }
 
     public void putMapping(BytesArray mapping) throws IOException {

diff --git a/mr/src/test/java/org/elasticsearch/hadoop/rest/ResourceTest.java b/mr/src/test/java/org/elasticsearch/hadoop/rest/ResourceTest.java
@@ -29,6 +29,18 @@
 
 public class ResourceTest {
 
+    @Test
+    public void testJustIndex() throws Exception {
+        Resource res = createResource("foo/_all");
+        assertEquals("foo/_all", res.indexAndType());
+    }
+
+    @Test
+    public void testJustType() throws Exception {
+        Resource res = createResource("_all/foo");
+        assertEquals("_all/foo", res.indexAndType());
+    }
+
     @Test
     public void testIndexAndType() throws Exception {
         Resource res = createResource("foo/bar");