Skip to content

Commit 7b05885

Browse files
committed
Skip PUT+DELETE doc-fixture tests on the analytics-engine storage matrix
These 10 PPL/Calcite integration tests mutate the shared test index by issuing PUT /<idx>/_doc/<id> + DELETE /<idx>/_doc/<id> around the query under test. When the suite runs with -Dtests.analytics.parquet_indices=true, test indices are backed by DataFormatAwareEngine, whose delete() and prepareDelete() deliberately throw "delete operation not supported." — parquet/composite storage is append-only by design. The tests pass under the Lucene-backed default. Skipping them via Assume.assumeFalse(isAnalyticsParquetIndicesEnabled()) follows the precedent already established in StatsCommandIT and CalciteAnalyticsDatetimeWireFormatIT, and prevents the spurious bucket-22 "delete operation not supported" failures in the AE-storage report without changing any assertion or test behavior on the default path. Signed-off-by: Jialiang Liang <jiallian@amazon.com>
1 parent bcbbc59 commit 7b05885

4 files changed

Lines changed: 44 additions & 0 deletions

File tree

integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteExpandCommandIT.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package org.opensearch.sql.calcite.remote;
77

8+
import static org.junit.Assume.assumeFalse;
89
import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_ARRAY;
910
import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_NESTED_SIMPLE;
1011
import static org.opensearch.sql.util.MatcherUtils.rows;
@@ -295,6 +296,10 @@ public void testExpandWithEval() throws Exception {
295296

296297
@Test
297298
public void testExpandEmptyArray() throws Exception {
299+
assumeFalse(
300+
"Test mutates docs via PUT+DELETE, which DataFormatAwareEngine"
301+
+ " (analytics-engine storage path) does not support.",
302+
isAnalyticsParquetIndicesEnabled());
298303
final int docId = 6;
299304
Request insertRequest =
300305
new Request(
@@ -324,6 +329,10 @@ public void testExpandEmptyArray() throws Exception {
324329

325330
@Test
326331
public void testExpandOnNullField() throws Exception {
332+
assumeFalse(
333+
"Test mutates docs via PUT+DELETE, which DataFormatAwareEngine"
334+
+ " (analytics-engine storage path) does not support.",
335+
isAnalyticsParquetIndicesEnabled());
327336
final int docId = 6;
328337
Request insertRequest =
329338
new Request(

integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteStreamstatsCommandIT.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package org.opensearch.sql.calcite.remote;
77

8+
import static org.junit.Assume.assumeFalse;
89
import static org.opensearch.sql.legacy.TestsConstants.*;
910
import static org.opensearch.sql.util.MatcherUtils.*;
1011

@@ -507,6 +508,10 @@ public void testStreamstatsCurrentAndWindowWithNull() throws IOException {
507508

508509
@Test
509510
public void testStreamstatsGlobal() throws IOException {
511+
assumeFalse(
512+
"Test mutates docs via PUT+DELETE, which DataFormatAwareEngine"
513+
+ " (analytics-engine storage path) does not support.",
514+
isAnalyticsParquetIndicesEnabled());
510515
final int docId = 5;
511516
Request insertRequest =
512517
new Request(
@@ -666,6 +671,10 @@ public void testStreamstatsGlobalWithNullBucket() throws IOException {
666671

667672
@Test
668673
public void testStreamstatsReset() throws IOException {
674+
assumeFalse(
675+
"Test mutates docs via PUT+DELETE, which DataFormatAwareEngine"
676+
+ " (analytics-engine storage path) does not support.",
677+
isAnalyticsParquetIndicesEnabled());
669678
final int docId = 5;
670679
Request insertRequest =
671680
new Request(
@@ -934,6 +943,10 @@ public void testMultipleStreamstatsWithNull1() throws IOException {
934943

935944
@Test
936945
public void testMultipleStreamstatsWithNull2() throws IOException {
946+
assumeFalse(
947+
"Test mutates docs via PUT+DELETE, which DataFormatAwareEngine"
948+
+ " (analytics-engine storage path) does not support.",
949+
isAnalyticsParquetIndicesEnabled());
937950
final int docId = 5;
938951
Request insertRequest =
939952
new Request(

integ-test/src/test/java/org/opensearch/sql/ppl/DateTimeFunctionIT.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package org.opensearch.sql.ppl;
77

8+
import static org.junit.Assume.assumeFalse;
89
import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BANK;
910
import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_DATE;
1011
import static org.opensearch.sql.util.MatcherUtils.rows;
@@ -1565,6 +1566,10 @@ public void testExtract() throws IOException {
15651566

15661567
@Test
15671568
public void testCompareAgainstUTCDate() throws IOException {
1569+
assumeFalse(
1570+
"Test mutates docs via PUT+DELETE, which DataFormatAwareEngine"
1571+
+ " (analytics-engine storage path) does not support.",
1572+
isAnalyticsParquetIndicesEnabled());
15681573
LocalDateTime now = LocalDateTime.now(ZoneOffset.UTC);
15691574
String isoTimestamp = now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'"));
15701575
String pplTimestamp = now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));

integ-test/src/test/java/org/opensearch/sql/ppl/SearchCommandIT.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package org.opensearch.sql.ppl;
77

8+
import static org.junit.Assume.assumeFalse;
89
import static org.opensearch.sql.legacy.TestsConstants.*;
910
import static org.opensearch.sql.util.MatcherUtils.columnName;
1011
import static org.opensearch.sql.util.MatcherUtils.rows;
@@ -1053,6 +1054,10 @@ public void testSearchWithNumericTimeRange() throws IOException {
10531054

10541055
@Test
10551056
public void testSearchTimeModifierWithSnappedWeek() throws IOException {
1057+
assumeFalse(
1058+
"Test mutates docs via PUT+DELETE, which DataFormatAwareEngine"
1059+
+ " (analytics-engine storage path) does not support.",
1060+
isAnalyticsParquetIndicesEnabled());
10561061
// Test whether alignment to weekday works
10571062

10581063
final int docId = 101;
@@ -1141,6 +1146,10 @@ public void testSearchTimeModifierWithSnappedWeek() throws IOException {
11411146

11421147
@Test
11431148
public void testSearchWithRelativeTimeModifiers() throws IOException {
1149+
assumeFalse(
1150+
"Test mutates docs via PUT+DELETE, which DataFormatAwareEngine"
1151+
+ " (analytics-engine storage path) does not support.",
1152+
isAnalyticsParquetIndicesEnabled());
11441153
final int docId = 101;
11451154

11461155
LocalDateTime currentTime = LocalDateTime.now(ZoneOffset.UTC);
@@ -1189,6 +1198,10 @@ public void testSearchWithRelativeTimeModifiers() throws IOException {
11891198

11901199
@Test
11911200
public void testSearchWithTimeUnitSnapping() throws IOException {
1201+
assumeFalse(
1202+
"Test mutates docs via PUT+DELETE, which DataFormatAwareEngine"
1203+
+ " (analytics-engine storage path) does not support.",
1204+
isAnalyticsParquetIndicesEnabled());
11921205
final int docId = 101;
11931206

11941207
LocalDateTime currentHour = LocalDateTime.now(ZoneOffset.UTC).truncatedTo(ChronoUnit.HOURS);
@@ -1237,6 +1250,10 @@ public void testSearchWithTimeUnitSnapping() throws IOException {
12371250

12381251
@Test
12391252
public void testSearchWithQuarterlyModifiers() throws IOException {
1253+
assumeFalse(
1254+
"Test mutates docs via PUT+DELETE, which DataFormatAwareEngine"
1255+
+ " (analytics-engine storage path) does not support.",
1256+
isAnalyticsParquetIndicesEnabled());
12401257
final int docId = 101;
12411258

12421259
LocalDateTime currentQuarter =

0 commit comments

Comments
 (0)