Remove the usage of rollup from the rollup qa module,

which is actually only testing downsampling. Also rename a few classes / directories to be be downsample oriented.
martijnvg · Aug 11, 2023 · b5d0413 · b5d0413
1 parent bd4dcbd
commit b5d0413
Show file tree

Hide file tree

Showing 7 changed files with 129 additions and 129 deletions.
diff --git a/...csearch/xpack/rollup/v2/RollupRestIT.java → ...ch/xpack/downsample/DownsampleRestIT.java b/...csearch/xpack/rollup/v2/RollupRestIT.java → ...ch/xpack/downsample/DownsampleRestIT.java
@@ -5,16 +5,16 @@
  * 2.0.
  */
 
-package org.elasticsearch.xpack.rollup.v2;
+package org.elasticsearch.xpack.downsample;
 
 import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
 
 import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
 import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
 
-public class RollupRestIT extends ESClientYamlSuiteTestCase {
+public class DownsampleRestIT extends ESClientYamlSuiteTestCase {
 
-    public RollupRestIT(final ClientYamlTestCandidate testCandidate) {
+    public DownsampleRestIT(final ClientYamlTestCandidate testCandidate) {
         super(testCandidate);
     }
 

diff --git a/...es/rest-api-spec/test/rollup/10_basic.yml → ...est-api-spec/test/downsample/10_basic.yml b/...es/rest-api-spec/test/rollup/10_basic.yml → ...est-api-spec/test/downsample/10_basic.yml
diff --git a/...-spec/test/rollup/20_unsupported_aggs.yml → ...c/test/downsample/20_unsupported_aggs.yml b/...-spec/test/rollup/20_unsupported_aggs.yml → ...c/test/downsample/20_unsupported_aggs.yml
diff --git a/...pi-spec/test/rollup/30_date_histogram.yml → ...pec/test/downsample/30_date_histogram.yml b/...pi-spec/test/rollup/30_date_histogram.yml → ...pec/test/downsample/30_date_histogram.yml
@@ -56,7 +56,7 @@ setup:
   - do:
       indices.downsample:
         index: test
-        target_index: rollup-test
+        target_index: test-downsample
         body:  >
           {
             "fixed_interval": "1h"
@@ -66,13 +66,13 @@ setup:
 
   - do:
       search:
-        index: rollup-test
+        index: test-downsample
         body:
           sort: [ "_tsid", "@timestamp" ]
 
   - length: { hits.hits: 4 }
 
-  - match: { hits.hits.0._index: "rollup-test" }
+  - match: { hits.hits.0._index: "test-downsample" }
   - match: { hits.hits.0._source._doc_count: 1 }
   - match: { hits.hits.0._source.@timestamp: "2021-04-28T18:00:00.000Z" }
   - match: { hits.hits.0._source.uid: "001" }
@@ -81,7 +81,7 @@ setup:
   - close_to: { hits.hits.0._source.total_memory_used.sum: { value: 106780.0, error: 0.00001 } }
   - match: { hits.hits.0._source.total_memory_used.value_count: 1 }
 
-  - match: { hits.hits.1._index: "rollup-test" }
+  - match: { hits.hits.1._index: "test-downsample" }
   - match: { hits.hits.1._source._doc_count: 1 }
   - match: { hits.hits.1._source.@timestamp: "2021-04-28T18:00:00.000Z" }
   - match: { hits.hits.1._source.uid: "002" }
@@ -90,7 +90,7 @@ setup:
   - close_to: { hits.hits.1._source.total_memory_used.sum: { value: 110450.0, error: 0.00001 } }
   - match: { hits.hits.1._source.total_memory_used.value_count: 1 }
 
-  - match: { hits.hits.2._index: "rollup-test" }
+  - match: { hits.hits.2._index: "test-downsample" }
   - match: { hits.hits.2._source._doc_count: 1 }
   - match: { hits.hits.2._source.@timestamp: "2021-04-28T18:00:00.000Z" }
   - match: { hits.hits.2._source.uid: "003" }
@@ -99,7 +99,7 @@ setup:
   - close_to: { hits.hits.2._source.total_memory_used.sum: { value: 109009.0, error: 0.00001 } }
   - match: { hits.hits.2._source.total_memory_used.value_count: 1 }
 
-  - match: { hits.hits.3._index: "rollup-test" }
+  - match: { hits.hits.3._index: "test-downsample" }
   - match: { hits.hits.3._source._doc_count: 1 }
   - match: { hits.hits.3._source.@timestamp: "2021-04-28T18:00:00.000Z" }
   - match: { hits.hits.3._source.uid: "004" }
@@ -112,7 +112,7 @@ setup:
   - do:
       catch: bad_request
       search:
-        index: rollup-test
+        index: test-downsample
         body:
           size: 0
           aggs:
@@ -147,7 +147,7 @@ setup:
   - do:
       catch: bad_request
       search:
-        index: rollup-test
+        index: test-downsample
         body:
           size: 0
           aggs:
@@ -183,7 +183,7 @@ setup:
   # date histogram aggregation with fixed interval and utc timezone on rollup index supported
   - do:
       search:
-        index: rollup-test
+        index: test-downsample
         body:
           size: 0
           aggs:
@@ -223,7 +223,7 @@ setup:
   # date histogram aggregation on both indices resulting in partial results and shard failures
   - do:
       search:
-        index: test,rollup-test
+        index: test,test-downsample
         body:
           size: 0
           aggs:
@@ -234,7 +234,7 @@ setup:
                 min_doc_count: 1
 
   # NOTE: the rollup index is created with the same number of shards of the source index.
-  # As a result we have 1 shard for the 'test' index and 1 shard for the 'rollup-test' index.
+  # As a result we have 1 shard for the 'test' index and 1 shard for the 'test-downsample' index.
   - match: { _shards.total: 2 }
   - match: { _shards.successful: 1 }
   - match: { _shards.failed: 1 }
@@ -245,6 +245,6 @@ setup:
   - match: { aggregations.date_histogram.buckets.0.key: 1619632800000 }
   - match: { aggregations.date_histogram.buckets.0.doc_count: 4 }
   - length: { _shards.failures: 1 }
-  - match: { _shards.failures.0.index: "rollup-test" }
+  - match: { _shards.failures.0.index: "test-downsample" }
   - match: { _shards.failures.0.reason.type: illegal_argument_exception }
   - match: { _shards.failures.0.reason.reason: "Field [@timestamp] of type [date] is not supported for aggregation [date_histogram] with interval type [calendar_interval]" }
diff --git a/...pi-spec/test/rollup/40_runtime_fields.yml → ...pec/test/downsample/40_runtime_fields.yml b/...pi-spec/test/rollup/40_runtime_fields.yml → ...pec/test/downsample/40_runtime_fields.yml
diff --git a/...ec/test/rollup/50_auto_date_histogram.yml → ...est/downsample/50_auto_date_histogram.yml b/...ec/test/rollup/50_auto_date_histogram.yml → ...est/downsample/50_auto_date_histogram.yml
@@ -103,7 +103,7 @@ setup:
   - do:
       indices.downsample:
         index: test1-raw
-        target_index: test1-rollup
+        target_index: test1-downsample
         body: >
           {
             "fixed_interval": "1h"
@@ -113,7 +113,7 @@ setup:
 "Auto date histogram aggregation 2 buckets":
   - do:
       search:
-        index: test1-rollup,test2-raw
+        index: test1-downsample,test2-raw
         body:
           size: 0
           aggs:
@@ -134,7 +134,7 @@ setup:
 "Auto date histogram aggregation 10 buckets":
   - do:
       search:
-        index: test1-rollup,test2-raw
+        index: test1-downsample,test2-raw
         body:
           size: 0
           aggs:
@@ -169,7 +169,7 @@ setup:
 "Auto date histogram aggregation 200 buckets":
   - do:
       search:
-        index: test1-rollup,test2-raw
+        index: test1-downsample,test2-raw
         body:
           size: 0
           aggs:

diff --git a/...rest-api-spec/test/rollup/60_settings.yml → ...-api-spec/test/downsample/60_settings.yml b/...rest-api-spec/test/rollup/60_settings.yml → ...-api-spec/test/downsample/60_settings.yml
@@ -71,7 +71,7 @@
   - do:
       indices.downsample:
         index: test
-        target_index: test-rollup
+        target_index: test-downsample
         body: >
           {
             "fixed_interval": "1h"
@@ -86,10 +86,10 @@
 
   - do:
       indices.get_settings:
-        index: test-rollup
+        index: test-downsample
 
-  - match: { test-rollup.settings.index.default_pipeline: null }
-  - match: { test-rollup.settings.index.final_pipeline: null }
+  - match: { test-downsample.settings.index.default_pipeline: null }
+  - match: { test-downsample.settings.index.final_pipeline: null }
 
 ---
 "Downsample datastream with tier preference":
@@ -161,7 +161,7 @@
   - do:
       indices.downsample:
         index: $datastream-backing-index
-        target_index: rollup-index
+        target_index: downsample-index
         body: >
           {
             "fixed_interval": "1h"
@@ -170,10 +170,10 @@
 
   - do:
       indices.get_settings:
-        index: rollup-index
-  - match: { rollup-index.settings.index.routing.allocation.include._tier_preference: "data_warm" }
+        index: downsample-index
+  - match: { downsample-index.settings.index.routing.allocation.include._tier_preference: "data_warm" }
     # NOTE: copied only if index is managed through ILM
-  - match: { rollup-index.settings.index.lifecycle.name: null }
+  - match: { downsample-index.settings.index.lifecycle.name: null }
 
 ---
 teardown: