elastic#18543 use "file_count" to eliminate "incremental", "processed…

…" and "total" naming confusion
vladimirdolzhenko · May 15, 2018 · 828bb12 · 828bb12
1 parent 3ebc769
commit 828bb12
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/docs/reference/modules/snapshots.asciidoc b/docs/reference/modules/snapshots.asciidoc
@@ -571,15 +571,15 @@ Returns this:
       },
       "stats": {
         "incremental": {
-          "count": 8,
+          "file_count": 8,
           "size_in_bytes": 4704
         },
         "processed": {
-          "count": 7,
+          "file_count": 7,
           "size_in_bytes": 4254
         },
         "total": {
-          "count": 8,
+          "file_count": 8,
           "size_in_bytes": 4704
         },
         "start_time_in_millis": 1526280280355,
@@ -599,7 +599,6 @@ Returns this:
   ]
 }
 --------------------------------------------------
-// CONSOLE
 // TEST[continued]
 
 Where `stats` provides snapshot details - how many files the snapshot consists of and sizes in bytes.

diff --git a/.../src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStats.java b/.../src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStats.java
@@ -165,7 +165,7 @@ static final class Fields {
         static final String PROCESSED = "processed";
         static final String TOTAL = "total";
 
-        static final String COUNT = "count";
+        static final String FILE_COUNT = "file_count";
         static final String SIZE = "size";
         static final String SIZE_IN_BYTES = "size_in_bytes";
 
@@ -188,22 +188,22 @@ public XContentBuilder toXContent(XContentBuilder builder, ToXContent.Params par
         builder.startObject(Fields.STATS)
             //  incremental starts
             .startObject(Fields.INCREMENTAL)
-            .field(Fields.COUNT, getIncrementalFileCount())
+            .field(Fields.FILE_COUNT, getIncrementalFileCount())
             .humanReadableField(Fields.SIZE_IN_BYTES, Fields.SIZE, new ByteSizeValue(getIncrementalSize()))
             //  incremental ends
             .endObject();
 
         if (getProcessedFileCount() != getIncrementalFileCount()) {
             //  processed starts
             builder.startObject(Fields.PROCESSED)
-                .field(Fields.COUNT, getProcessedFileCount())
+                .field(Fields.FILE_COUNT, getProcessedFileCount())
                 .humanReadableField(Fields.SIZE_IN_BYTES, Fields.SIZE, new ByteSizeValue(getProcessedSize()))
                 //  processed ends
                 .endObject();
         }
         //  total starts
         return builder.startObject(Fields.TOTAL)
-            .field(Fields.COUNT, getTotalFileCount())
+            .field(Fields.FILE_COUNT, getTotalFileCount())
             .humanReadableField(Fields.SIZE_IN_BYTES, Fields.SIZE, new ByteSizeValue(getTotalSize()))
             //  all_files ends
             .endObject()

diff --git a/...est/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatusTests.java b/...est/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatusTests.java
@@ -92,11 +92,11 @@ public void testToString() throws Exception {
             "  },\n" +
             "  \"stats\" : {\n" +
             "    \"incremental\" : {\n" +
-            "      \"count\" : 0,\n" +
+            "      \"file_count\" : 0,\n" +
             "      \"size_in_bytes\" : 0\n" +
             "    },\n" +
             "    \"total\" : {\n" +
-            "      \"count\" : 0,\n" +
+            "      \"file_count\" : 0,\n" +
             "      \"size_in_bytes\" : 0\n" +
             "    },\n" +
             "    \"start_time_in_millis\" : 0,\n" +
@@ -118,11 +118,11 @@ public void testToString() throws Exception {
             "      },\n" +
             "      \"stats\" : {\n" +
             "        \"incremental\" : {\n" +
-            "          \"count\" : 0,\n" +
+            "          \"file_count\" : 0,\n" +
             "          \"size_in_bytes\" : 0\n" +
             "        },\n" +
             "        \"total\" : {\n" +
-            "          \"count\" : 0,\n" +
+            "          \"file_count\" : 0,\n" +
             "          \"size_in_bytes\" : 0\n" +
             "        },\n" +
             "        \"start_time_in_millis\" : 0,\n" +
@@ -137,11 +137,11 @@ public void testToString() throws Exception {
             "          \"stage\" : \"" + shardStage.toString() + "\",\n" +
             "          \"stats\" : {\n" +
             "            \"incremental\" : {\n" +
-            "              \"count\" : 0,\n" +
+            "              \"file_count\" : 0,\n" +
             "              \"size_in_bytes\" : 0\n" +
             "            },\n" +
             "            \"total\" : {\n" +
-            "              \"count\" : 0,\n" +
+            "              \"file_count\" : 0,\n" +
             "              \"size_in_bytes\" : 0\n" +
             "            },\n" +
             "            \"start_time_in_millis\" : 0,\n" +