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.

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

fix(core): exclude relationship column and calculated field when selecting all in the analysis result #740

Merged
merged 4 commits into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 5 additions & 0 deletions wren-base/src/main/java/io/wren/base/dto/Measure.java
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@ public Map<String, String> getProperties()
return properties;
}

public Column toColumn()
{
return new Column(name, type, null, false, false, refColumn, properties);
}

@Override
public boolean equals(Object o)
{
Expand Down
6 changes: 6 additions & 0 deletions wren-base/src/main/java/io/wren/base/dto/Window.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.collect.ImmutableMap;
import io.wren.base.WrenTypes;

import java.util.Map;
import java.util.Objects;
Expand Down Expand Up @@ -95,6 +96,11 @@ public Map<String, String> getProperties()
return properties;
}

public Column toColumn()
{
return new Column(name, WrenTypes.TIMESTAMP, null, false, false, refColumn, properties);
}

@Override
public String toString()
{
Expand Down
230 changes: 0 additions & 230 deletions wren-base/src/main/java/io/wren/base/sqlrewrite/CacheRewrite.java

This file was deleted.

23 changes: 12 additions & 11 deletions wren-base/src/main/java/io/wren/base/sqlrewrite/analyzer/Field.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import io.trino.sql.tree.QualifiedName;
import io.wren.base.CatalogSchemaTableName;
import io.wren.base.dto.Column;
import io.wren.base.sqlrewrite.Utils;

import java.util.Optional;
Expand All @@ -33,7 +34,7 @@ public class Field
private final CatalogSchemaTableName tableName;
private final String columnName;
private final Optional<String> sourceDatasetName;
private final Optional<String> sourceColumnName;
private final Optional<Column> sourceColumn;
private final Optional<String> name;

private Field(
Expand All @@ -42,14 +43,14 @@ private Field(
String columnName,
String name,
String sourceDatasetName,
String sourceColumnName)
Column sourceColumn)
{
this.relationAlias = Optional.ofNullable(relationAlias);
this.tableName = requireNonNull(tableName, "modelName is null");
this.columnName = requireNonNull(columnName, "columnName is null");
this.name = Optional.ofNullable(name);
this.sourceDatasetName = Optional.ofNullable(sourceDatasetName);
this.sourceColumnName = Optional.ofNullable(sourceColumnName);
this.sourceColumn = Optional.ofNullable(sourceColumn);
}

public Optional<QualifiedName> getRelationAlias()
Expand Down Expand Up @@ -77,9 +78,9 @@ public Optional<String> getSourceDatasetName()
return sourceDatasetName;
}

public Optional<String> getSourceColumnName()
public Optional<Column> getSourceColumn()
{
return sourceColumnName;
return sourceColumn;
}

public boolean matchesPrefix(Optional<QualifiedName> prefix)
Expand Down Expand Up @@ -128,7 +129,7 @@ public String toString()
", columnName='" + columnName + '\'' +
", name=" + name +
", sourceDatasetName=" + sourceDatasetName +
", sourceColumnName=" + sourceColumnName +
", sourceColumn=" + sourceColumn +
'}';
}

Expand All @@ -144,7 +145,7 @@ public static class Builder
private String columnName;
private String name;
private String sourceModelName;
private String sourceColumnName;
private Column sourceColumn;

public Builder() {}

Expand All @@ -155,7 +156,7 @@ public Builder like(Field field)
this.columnName = field.columnName;
this.name = field.name.orElse(null);
this.sourceModelName = field.sourceDatasetName.orElse(null);
this.sourceColumnName = field.sourceColumnName.orElse(null);
this.sourceColumn = field.sourceColumn.orElse(null);
return this;
}

Expand Down Expand Up @@ -189,15 +190,15 @@ public Builder sourceModelName(String sourceModelName)
return this;
}

public Builder sourceColumnName(String sourceColumnName)
public Builder sourceColumn(Column sourceColumn)
{
this.sourceColumnName = sourceColumnName;
this.sourceColumn = sourceColumn;
return this;
}

public Field build()
{
return new Field(relationAlias, tableName, columnName, name, sourceModelName, sourceColumnName);
return new Field(relationAlias, tableName, columnName, name, sourceModelName, sourceColumn);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,15 @@ public List<Field> getFields()
public List<Field> resolveFields(QualifiedName name)
{
return fields.stream()
.filter(input -> input.getSourceColumn().stream().anyMatch(column -> column.getRelationship().isEmpty()))
.filter(input -> input.canResolve(name))
.collect(toImmutableList());
}

public Optional<Field> resolveAnyField(QualifiedName name)
{
return fields.stream()
.filter(input -> input.getSourceColumn().stream().anyMatch(column -> column.getRelationship().isEmpty()))
.filter(input -> input.canResolve(name))
.findAny();
}
Expand Down
Loading
Loading