Skip to content

[BugFix] Return all columns (struct and nested fields) listed when using head #5518

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
quangdutran wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −2
Open

[BugFix] Return all columns (struct and nested fields) listed when using head #5518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions core/src/main/java/org/opensearch/sql/calcite/CalciteRelNodeVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,8 +516,9 @@ private RelNode handleAllFieldsProject(Project node, CalcitePlanContext context)
"Invalid field exclusion: operation would exclude all fields from the result set");
}
AllFields allFields = (AllFields) node.getProjectList().getFirst();
if (!(allFields instanceof AllFieldsExcludeMeta)) {
// Should not remove nested fields for AllFieldsExcludeMeta.
if (!(allFields instanceof AllFieldsExcludeMeta) && !context.isProjectVisited()) {
// Should not remove nested fields for AllFieldsExcludeMeta
// and when no explicit project has already curated the schema
tryToRemoveNestedFields(context);
}
tryToRemoveMetaFields(context, allFields instanceof AllFieldsExcludeMeta);
Expand Down
9 changes: 9 additions & 0 deletions integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteEvalCommandIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BANK;
import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_TELEMETRY;
import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_DEEP_NESTED;
import static org.opensearch.sql.util.MatcherUtils.rows;
import static org.opensearch.sql.util.MatcherUtils.schema;
import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
Expand Down Expand Up @@ -233,4 +234,12 @@ public void testEvalStringConcatenationWithExistingData() throws IOException {
rows("Hattie", "Bond", "Hattie Bond"),
rows("Nanette", "Bates", "Nanette Bates"));
}

@Test
public void testStruckFieldAndSubFieldWithHead() throws IOException {
JSONObject result =
executeQuery(
String.format("source=%s | fields city.name, city | head", TEST_INDEX_DEEP_NESTED));
verifySchema(result, schema("city.name", "string"), schema("city", "struct"));
}
}
Loading