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

[Bug Fix]show partitions add absence column for filter columns check #8894

Merged
merged 3 commits into from Jul 19, 2022
Merged

[Bug Fix]show partitions add absence column for filter columns check #8894

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3037b2e
show partitions add filter columns check
zhuxt2015 Jul 19, 2022
32b52cd
replace HashSet to ImmutableSet
zhuxt2015 Jul 19, 2022
7d98f15
fix
zhuxt2015 Jul 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 15 additions & 0 deletions fe/fe-core/src/main/java/com/starrocks/analysis/ShowPartitionsStmt.java
View file
Open in desktop
Expand Up @@ -31,9 +31,12 @@
import com.starrocks.qe.ShowResultSetMetaData;
import com.starrocks.sql.ast.AstVisitor;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

public class ShowPartitionsStmt extends ShowStmt {

Expand All @@ -44,6 +47,18 @@ public class ShowPartitionsStmt extends ShowStmt {
public static final String FILTER_REPLICATION_NUM = "ReplicationNum";
public static final String FILTER_LAST_CONSISTENCY_CHECK_TIME = "LastConsistencyCheckTime";

public static final Set<String> FILTER_COLUMNS;
zhuxt2015 marked this conversation as resolved.
Show resolved Hide resolved

static {
FILTER_COLUMNS = new HashSet<>();
FILTER_COLUMNS.add(FILTER_PARTITION_ID);
FILTER_COLUMNS.add(FILTER_PARTITION_NAME);
FILTER_COLUMNS.add(FILTER_STATE);
FILTER_COLUMNS.add(FILTER_BUCKETS);
FILTER_COLUMNS.add(FILTER_REPLICATION_NUM);
FILTER_COLUMNS.add(FILTER_LAST_CONSISTENCY_CHECK_TIME);
}

private String dbName;
private String tableName;
private Expr whereClause;
Expand Down
5 changes: 2 additions & 3 deletions fe/fe-core/src/main/java/com/starrocks/sql/analyzer/ShowStmtAnalyzer.java
View file
Open in desktop
Expand Up @@ -496,9 +496,8 @@ private void binaryPredicateHandler(Expr subExpr, String leftKey, boolean filter
throw new SemanticException("expression %s cast to datetime error: %s",
subExpr.getChild(1).toString(), e.getMessage());
}
} else if (!leftKey.equalsIgnoreCase(ShowPartitionsStmt.FILTER_PARTITION_ID) &&
!leftKey.equalsIgnoreCase(ShowPartitionsStmt.FILTER_BUCKETS) &&
!leftKey.equalsIgnoreCase(ShowPartitionsStmt.FILTER_REPLICATION_NUM)) {
} else if (ShowPartitionsStmt.FILTER_COLUMNS.stream()
.noneMatch(column -> column.equalsIgnoreCase(leftKey))) {
throw new SemanticException("Only the columns of PartitionId/PartitionName/" +
"State/Buckets/ReplicationNum/LastConsistencyCheckTime are supported.");
}
Expand Down
13 changes: 13 additions & 0 deletions fe/fe-core/src/test/java/com/starrocks/analysis/ShowPartitionsStmtTest.java
View file
Open in desktop
Expand Up @@ -80,6 +80,19 @@ public void testShowPartitionsStmtWithLikePredicate() {
stmt.toString());
}

@Test
public void testShowPartitionsStmtWithEqualPredicate() {
SlotRef slotRef = new SlotRef(null, "PartitionName");
StringLiteral stringLiteral = new StringLiteral("p1");
BinaryPredicate equalPredicate = new BinaryPredicate(BinaryPredicate.Operator.EQ, slotRef, stringLiteral);
ShowPartitionsStmt stmt =
new ShowPartitionsStmt(new TableName("testDb", "testTable"), equalPredicate, null, null, false);
com.starrocks.sql.analyzer.Analyzer.analyze(stmt, ctx);
Assert.assertEquals(
"SHOW PARTITIONS FROM `default_cluster:testDb`.`testTable` WHERE `PartitionName` = 'p1'",
stmt.toString());
}

@Test
public void testShowParitionsStmtOrderByAndLimit() {
SlotRef slotRef = new SlotRef(null, "PartitionId");
Expand Down