Merge branch 'main' into feature/ism_transform

tanqiuliu · Jul 1, 2023 · 10ba7c5 · 10ba7c5
2 parents 6a75695 + bdc9dad
commit 10ba7c5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
@@ -3,11 +3,10 @@ name: Publish snapshots to maven
 on:
   workflow_dispatch:
   push:
-    branches: [
-      main
-        1.*
-        2.*
-    ]
+    branches:
+      - main
+      - '[0-9]+.[0-9]+'
+      - '[0-9]+.x'
 
 jobs:
   build-and-publish-snapshots:

diff --git a/src/main/kotlin/org/opensearch/indexmanagement/transform/model/Transform.kt b/src/main/kotlin/org/opensearch/indexmanagement/transform/model/Transform.kt
@@ -363,7 +363,9 @@ data class Transform(
                             groups.add(Dimension.parse(xcp))
                         }
                     }
-                    AGGREGATIONS_FIELD -> aggregations = AggregatorFactories.parseAggregators(xcp)
+                    AGGREGATIONS_FIELD -> {
+                        AggregatorFactories.parseAggregators(xcp)?.let { aggregations = it }
+                    }
                     CONTINUOUS_FIELD -> continuous = xcp.booleanValue()
                     USER_FIELD -> {
                         user = if (xcp.currentToken() == Token.VALUE_NULL) null else User.parse(xcp)

diff --git a/src/test/kotlin/org/opensearch/indexmanagement/snapshotmanagement/TestUtils.kt b/src/test/kotlin/org/opensearch/indexmanagement/snapshotmanagement/TestUtils.kt
@@ -208,6 +208,7 @@ fun mockSnapshotInfo(
     endTime: Long = randomNonNegativeLong(),
     reason: String? = null, // reason with valid string leads to FAILED snapshot state
     policyName: String = "daily-snapshot",
+    remoteStoreIndexShallowCopy: Boolean = randomBoolean(),
 ): SnapshotInfo {
     val result = SnapshotInfo(
         SnapshotId(name, UUIDs.randomBase64UUID()),
@@ -220,6 +221,7 @@ fun mockSnapshotInfo(
         emptyList(),
         false,
         mapOf("sm_policy" to policyName),
+        remoteStoreIndexShallowCopy
     )
     return result
 }
@@ -231,6 +233,7 @@ fun mockSnapshotInfo(
  */
 fun mockInProgressSnapshotInfo(
     name: String = randomAlphaOfLength(10),
+    remoteStoreIndexShallowCopy: Boolean = randomBoolean(),
 ): SnapshotInfo {
     val entry = SnapshotsInProgress.Entry(
         Snapshot("repo", SnapshotId(name, UUIDs.randomBase64UUID())),
@@ -245,6 +248,7 @@ fun mockInProgressSnapshotInfo(
         "",
         mapOf("sm_policy" to "daily-snapshot"),
         Version.CURRENT,
+        remoteStoreIndexShallowCopy
     )
     return SnapshotInfo(entry)
 }

diff --git a/src/test/kotlin/org/opensearch/indexmanagement/transform/TransformRunnerIT.kt b/src/test/kotlin/org/opensearch/indexmanagement/transform/TransformRunnerIT.kt
@@ -321,7 +321,7 @@ class TransformRunnerIT : TransformRestTestCase() {
             assertTrue("Target transform index was not created", indexExists(transform.targetIndex))
         }
 
-        waitFor(Instant.ofEpochSecond(60)) {
+        waitFor(Instant.ofEpochSecond(180)) {
             val transformJob = getTransform(transformId = transform.id)
             assertNotNull("Transform job doesn't have metadata set", transformJob.metadataId)
             val transformMetadata = getTransformMetadata(transformJob.metadataId!!)
@@ -504,7 +504,7 @@ class TransformRunnerIT : TransformRestTestCase() {
             assertTrue("Target transform index was not created", indexExists(transform.targetIndex))
         }
 
-        waitFor(Instant.ofEpochSecond(60)) {
+        waitFor(Instant.ofEpochSecond(180)) {
             val transformJob = getTransform(transformId = transform.id)
             assertNotNull("Transform job doesn't have metadata set", transformJob.metadataId)
             val transformMetadata = getTransformMetadata(transformJob.metadataId!!)