Skip to content
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

Jump to bottom

Support Duplicate Column Names #238

Closed
wants to merge 3 commits into from
Closed

Support Duplicate Column Names #238

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4de9272
Added Fix
GabeFernandez310 Mar 6, 2023
c00ae94
Cleaned Implementation
GabeFernandez310 Mar 6, 2023
3b39de2
Merge branch 'opensearch-project:main' into spike-support-duplicate-c…
GabeFernandez310 Mar 8, 2023
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
25 changes: 21 additions & 4 deletions core/src/main/java/org/opensearch/sql/planner/physical/ProjectOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMap.Builder;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import lombok.EqualsAndHashCode;
import lombok.Getter;
Expand Down Expand Up @@ -52,10 +54,23 @@ public boolean hasNext() {
return input.hasNext();
}

private String handleDuplicateColumns(String newName, Set takenNames) {
if (takenNames.contains(newName)) {
int appendedNum = 1;
while (takenNames.contains(String.format("%s%d", newName, appendedNum))) {
appendedNum++;
}
newName = String.format("%s%d", newName, appendedNum);
}
takenNames.add(newName);
return newName;
}

@Override
public ExprValue next() {
ExprValue inputValue = input.next();
ImmutableMap.Builder<String, ExprValue> mapBuilder = new Builder<>();
Set<String> columns = new HashSet<>();

// ParseExpression will always override NamedExpression when identifier conflicts
// TODO needs a better implementation, see https://github.com/opensearch-project/sql/issues/458
Expand All @@ -64,25 +79,27 @@ public ExprValue next() {
Optional<NamedExpression> optionalParseExpression = namedParseExpressions.stream()
.filter(parseExpr -> parseExpr.getNameOrAlias().equals(expr.getNameOrAlias()))
.findFirst();

if (optionalParseExpression.isEmpty()) {
mapBuilder.put(expr.getNameOrAlias(), exprValue);
mapBuilder.put(handleDuplicateColumns(expr.getNameOrAlias(), columns), exprValue);
continue;
}

NamedExpression parseExpression = optionalParseExpression.get();
ExprValue sourceFieldValue = inputValue.bindingTuples()
.resolve(((ParseExpression) parseExpression.getDelegated()).getSourceField());
String columnName = handleDuplicateColumns(parseExpression.getNameOrAlias(), columns);
if (sourceFieldValue.isMissing()) {
// source field will be missing after stats command, read from inputValue if it exists
// otherwise do nothing since it should not appear as a field
ExprValue tupleValue =
ExprValueUtils.getTupleValue(inputValue).get(parseExpression.getNameOrAlias());
ExprValueUtils.getTupleValue(inputValue).get(columnName);
if (tupleValue != null) {
mapBuilder.put(parseExpression.getNameOrAlias(), tupleValue);
mapBuilder.put(columnName, tupleValue);
}
} else {
ExprValue parsedValue = parseExpression.valueOf(inputValue.bindingTuples());
mapBuilder.put(parseExpression.getNameOrAlias(), parsedValue);
mapBuilder.put(columnName, parsedValue);
}
}
return ExprTupleValue.fromExprValueMap(mapBuilder.build());
Expand Down
Loading