diff --git a/dataSource/relational/src/main/java/cn/edu/tsinghua/iginx/relational/RelationalStorage.java b/dataSource/relational/src/main/java/cn/edu/tsinghua/iginx/relational/RelationalStorage.java index db3ecc325a..ddc56abf8d 100644 --- a/dataSource/relational/src/main/java/cn/edu/tsinghua/iginx/relational/RelationalStorage.java +++ b/dataSource/relational/src/main/java/cn/edu/tsinghua/iginx/relational/RelationalStorage.java @@ -1753,18 +1753,18 @@ private TaskExecuteResult executeProjectDummyWithFilter(Project project, Filter if (!filter.toString().contains("*") && !(tableNameToColumnNames.size() > 1 && filterContainsType(Arrays.asList(FilterType.Value, FilterType.Path), filter))) { - Filter expandFilter = expandFilter(filter.copy(), tableNameToColumnNames); + Filter expandFilter = + expandFilter( + cutFilterDatabaseNameForDummy(filter.copy(), databaseName), + tableNameToColumnNames); for (Map.Entry entry : splitEntry.getValue().entrySet()) { String tableName = entry.getKey(); String fullQuotColumnNames = getQuotColumnNames(entry.getValue()); List fullPathList = Arrays.asList(entry.getValue().split(", ")); - fullPathList.replaceAll( - s -> RelationSchema.getQuoteFullName(tableName, s, relationalMeta.getQuote())); + fullPathList.replaceAll(s -> RelationSchema.getFullName(tableName, s)); String filterStr = filterTransformer.toString( - dummyFilterSetTrueByColumnNames( - cutFilterDatabaseNameForDummy(expandFilter.copy(), databaseName), - fullPathList)); + dummyFilterSetTrueByColumnNames(expandFilter.copy(), fullPathList)); String concatKey = buildConcat(fullPathList); statement = String.format( diff --git a/dataSource/relational/src/main/java/cn/edu/tsinghua/iginx/relational/query/entity/RelationQueryRowStream.java b/dataSource/relational/src/main/java/cn/edu/tsinghua/iginx/relational/query/entity/RelationQueryRowStream.java index 47266c87f3..95ec11070a 100644 --- a/dataSource/relational/src/main/java/cn/edu/tsinghua/iginx/relational/query/entity/RelationQueryRowStream.java +++ b/dataSource/relational/src/main/java/cn/edu/tsinghua/iginx/relational/query/entity/RelationQueryRowStream.java @@ -148,9 +148,9 @@ public RelationQueryRowStream( this.fieldToColumnName = new HashMap<>(); this.resultSetHasColumnWithTheSameName = new ArrayList<>(); - needFilter = (!isAgg && resultSets.size() != 1); + needFilter = !isAgg && resultSets.size() != 1; Set filterTypes = FilterUtils.getFilterType(filter); - needFilter |= filterTypes.contains(FilterType.Bool) || filterTypes.contains(FilterType.Expr); + needFilter |= filterTypes.contains(FilterType.Expr); for (int i = 0; i < resultSets.size(); i++) { ResultSetMetaData resultSetMetaData = resultSets.get(i).getMetaData();