Skip to content

test(integ-test): stabilize FIRST/LAST/TAKE across shards #5719

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mengweieric wants to merge 2 commits into
base: main
Choose a base branch
from
+420 −119
Open

test(integ-test): stabilize FIRST/LAST/TAKE across shards #5719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ff4911
test(integ-test): make first/last/take tests independent of document …
mengweieric Aug 28, 2026
2c34ab4
test(integ-test): preserve multi-document first/last coverage
mengweieric Aug 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 70 additions & 28 deletions ...-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteAliasFieldAggregationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
import static org.opensearch.sql.util.MatcherUtils.verifySchemaInOrder;

import java.io.IOException;
import java.util.List;
import java.util.HashSet;
import java.util.Set;
import org.json.JSONArray;
import org.json.JSONObject;
import org.junit.jupiter.api.Test;
import org.opensearch.client.Request;
Expand Down Expand Up @@ -111,7 +113,7 @@ public void testFirstWithAliasField() throws IOException {
executeQuery(
String.format("source=%s | sort @timestamp | stats FIRST(@timestamp)", TEST_ALIAS_BUG));
verifySchema(actual, schema("FIRST(@timestamp)", "timestamp"));
verifyDataRows(actual, rows("2024-01-01 10:00:00"));
assertTimestampMember(actual.getJSONArray("datarows").getJSONArray(0).get(0));
}

@Test
Expand All @@ -120,7 +122,7 @@ public void testLastWithAliasField() throws IOException {
executeQuery(
String.format("source=%s | sort @timestamp | stats LAST(@timestamp)", TEST_ALIAS_BUG));
verifySchema(actual, schema("LAST(@timestamp)", "timestamp"));
verifyDataRows(actual, rows("2024-01-03 10:00:00"));
assertTimestampMember(actual.getJSONArray("datarows").getJSONArray(0).get(0));
}

@Test
Expand All @@ -130,7 +132,7 @@ public void testTakeWithAliasField() throws IOException {
String.format(
"source=%s | sort @timestamp | stats TAKE(@timestamp, 2)", TEST_ALIAS_BUG));
verifySchema(actual, schema("TAKE(@timestamp, 2)", "array"));
verifyDataRows(actual, rows(List.of("2024-01-01T10:00:00.000Z", "2024-01-02T10:00:00.000Z")));
assertTimestampTakeMembers(actual.getJSONArray("datarows").getJSONArray(0).getJSONArray(0));
}

@Test
Expand Down Expand Up @@ -168,31 +170,71 @@ public void testAliasTypeWithLastFirstTakeLatestEarliestAggregation() throws IOE
+ " first(alias_text), take(original_col, 2), last(original_col),"
+ " first(original_col), take(alias_col, 2), last(alias_col), first(alias_col),"
+ " latest(original_col), earliest(original_col), latest(alias_col),"
+ " earliest(alias_col),latest(original_text), earliest(original_text),"
+ " earliest(alias_col), latest(original_text), earliest(original_text),"
+ " latest(alias_text), earliest(alias_text)",
TEST_INDEX_ALIAS));
verifyDataRows(
actual,
rows(
List.of("a b c", "d e f"),
"x y z",
"a b c",
List.of("a b c", "d e f"),
"x y z",
"a b c",
List.of(1, 2),
3,
1,
List.of(1, 2),
3,
1,
3,
1,
3,
1,
"x y z",
"a b c",
"x y z",
"a b c"));

JSONArray row = actual.getJSONArray("datarows").getJSONArray(0);
Set<String> texts = Set.of("a b c", "d e f", "x y z");
Set<Integer> numbers = Set.of(1, 2, 3);
assertTakeMembers(row.getJSONArray(0), 2, texts);
assertMember(row.get(1), texts);
assertMember(row.get(2), texts);
assertTakeMembers(row.getJSONArray(3), 2, texts);
assertMember(row.get(4), texts);
assertMember(row.get(5), texts);
assertTakeMembers(row.getJSONArray(6), 2, numbers);
assertMember(row.get(7), numbers);
assertMember(row.get(8), numbers);
assertTakeMembers(row.getJSONArray(9), 2, numbers);
assertMember(row.get(10), numbers);
assertMember(row.get(11), numbers);

assertEquals(3, row.getInt(12));
assertEquals(1, row.getInt(13));
assertEquals(3, row.getInt(14));
assertEquals(1, row.getInt(15));
assertEquals("x y z", row.getString(16));
assertEquals("a b c", row.getString(17));
assertEquals("x y z", row.getString(18));
assertEquals("a b c", row.getString(19));
}

private static void assertMember(Object actual, Set<?> expectedValues) {
assertTrue(
"Expected one of " + expectedValues + " but got " + actual,
expectedValues.contains(actual));
}

private static void assertTakeMembers(JSONArray actual, int expectedSize, Set<?> expectedValues) {
assertEquals(expectedSize, actual.length());
Set<Object> distinct = new HashSet<>();
for (int i = 0; i < actual.length(); i++) {
Object value = actual.get(i);
assertMember(value, expectedValues);
distinct.add(value);
}
assertEquals(expectedSize, distinct.size());
}

private static String normalizeTimestamp(Object value) {
return value.toString().replace('T', ' ').replace(".000Z", "").replace("Z", "");
}

private static void assertTimestampMember(Object actual) {
assertMember(
normalizeTimestamp(actual),
Set.of("2024-01-01 10:00:00", "2024-01-02 10:00:00", "2024-01-03 10:00:00"));
}

private static void assertTimestampTakeMembers(JSONArray actual) {
assertEquals(2, actual.length());
Set<String> normalized = new HashSet<>();
for (int i = 0; i < actual.length(); i++) {
String value = normalizeTimestamp(actual.get(i));
assertTimestampMember(value);
normalized.add(value);
}
assertEquals(2, normalized.size());
}
}
Loading
Loading