Rename ES type "graylog_meta" to "index_range"

Graylog2 · Jul 2, 2015 · 9378436 · 9378436
1 parent 59df30b
commit 9378436
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/graylog2-server/src/main/java/org/graylog2/indexer/IndexMapping.java b/graylog2-server/src/main/java/org/graylog2/indexer/IndexMapping.java
@@ -39,7 +39,7 @@
 @Singleton
 public class IndexMapping {
     public static final String TYPE_MESSAGE = "message";
-    public static final String TYPE_META = "graylog_meta";
+    public static final String TYPE_INDEX_RANGE = "index_range";
 
     private final Client client;
 

diff --git a/graylog2-server/src/main/java/org/graylog2/indexer/indices/Indices.java b/graylog2-server/src/main/java/org/graylog2/indexer/indices/Indices.java
@@ -206,7 +206,7 @@ public boolean create(String indexName) {
                 indexMapping.createMapping(indexName, IndexMapping.TYPE_MESSAGE, messageMapping).actionGet();
         final Map<String, Object> metaMapping = indexMapping.metaMapping();
         final PutMappingResponse metaMappingResponse =
-                indexMapping.createMapping(indexName, IndexMapping.TYPE_META, metaMapping).actionGet();
+                indexMapping.createMapping(indexName, IndexMapping.TYPE_INDEX_RANGE, metaMapping).actionGet();
 
         return messageMappingResponse.isAcknowledged() && metaMappingResponse.isAcknowledged();
     }

diff --git a/graylog2-server/src/main/java/org/graylog2/indexer/ranges/EsIndexRangeService.java b/graylog2-server/src/main/java/org/graylog2/indexer/ranges/EsIndexRangeService.java
@@ -94,7 +94,7 @@ public EsIndexRangeService(Client client, ActivityWriter activityWriter, ObjectM
     @Nullable
     public IndexRange get(String index) throws NotFoundException {
         final GetRequest request = new GetRequestBuilder(client, index)
-                .setType(IndexMapping.TYPE_META)
+                .setType(IndexMapping.TYPE_INDEX_RANGE)
                 .setId(index)
                 .request();
 
@@ -139,7 +139,7 @@ public SortedSet<IndexRange> find(DateTime begin, DateTime end) {
                 .must(beginRangeQuery)
                 .must(endRangeQuery);
         final SearchRequest request = client.prepareSearch()
-                .setTypes(IndexMapping.TYPE_META)
+                .setTypes(IndexMapping.TYPE_INDEX_RANGE)
                 .setQuery(completeRangeQuery)
                 .request();
 
@@ -158,7 +158,7 @@ public SortedSet<IndexRange> find(DateTime begin, DateTime end) {
     @Override
     public SortedSet<IndexRange> findAll() {
         final SearchRequest request = client.prepareSearch()
-                .setTypes(IndexMapping.TYPE_META)
+                .setTypes(IndexMapping.TYPE_INDEX_RANGE)
                 .setQuery(QueryBuilders.matchAllQuery())
                 .request();
 
@@ -179,7 +179,7 @@ public void destroy(String index) {
         final DeleteRequest request = client.prepareDelete()
                 .setIndex(index)
                 .setId(index)
-                .setType(IndexMapping.TYPE_META)
+                .setType(IndexMapping.TYPE_INDEX_RANGE)
                 .setRefresh(true)
                 .request();
 
@@ -202,7 +202,7 @@ public void destroy(String index) {
     public void destroyAll() {
         final Scroll scroll = new Scroll(TimeValue.timeValueMinutes(1L));
         final SearchRequest searchRequest = client.prepareSearch()
-                .setTypes(IndexMapping.TYPE_META)
+                .setTypes(IndexMapping.TYPE_INDEX_RANGE)
                 .setSearchType(SearchType.SCAN)
                 .setScroll(scroll)
                 .setQuery(QueryBuilders.matchAllQuery())
@@ -304,7 +304,7 @@ public void save(IndexRange indexRange) {
 
         final IndexRequest request = client.prepareIndex()
                 .setIndex(indexName)
-                .setType(IndexMapping.TYPE_META)
+                .setType(IndexMapping.TYPE_INDEX_RANGE)
                 .setId(indexName)
                 .setRefresh(true)
                 .setSource(source)

diff --git a/graylog2-server/src/test/resources/org/graylog2/indexer/ranges/EsIndexRangeServiceTest.json b/graylog2-server/src/test/resources/org/graylog2/indexer/ranges/EsIndexRangeServiceTest.json
@@ -193,7 +193,7 @@
         {
           "index": {
             "indexName": "graylog_1",
-            "indexType": "graylog_meta",
+            "indexType": "index_range",
             "indexId": "graylog_1"
           }
         },
@@ -213,7 +213,7 @@
         {
           "index": {
             "indexName": "graylog_2",
-            "indexType": "graylog_meta",
+            "indexType": "index_range",
             "indexId": "graylog_2"
           }
         },
@@ -229,4 +229,4 @@
       ]
     }
   ]
-}
+}
diff --git a/integration-tests/src/test/resources/integration/search/searchForExistingKeyword.json b/integration-tests/src/test/resources/integration/search/searchForExistingKeyword.json
@@ -5,7 +5,7 @@
         {
           "index" : {
             "indexName": "graylog_0",
-            "indexType": "graylog_meta",
+            "indexType": "index_range",
             "indexId": "graylog_0"
           }
         },