database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[fix](catalog) fix invalid getPartitionNames() methods (#39878) (#40054)

Browse Source 
bp #39878
This commit is contained in:
Mingyu Chen
2024-08-28 21:44:30 +08:00
committed by GitHub
parent 6ef1211585
commit d1c3b857cf
4 changed files with 3 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fe/fe-core/src/main/java/org/apache/doris/catalog/Table.java
View File

@ -52,7 +52,6 @@ import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.time.Instant;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@ -564,14 +563,6 @@ public abstract class Table extends MetaObject implements Writable, TableIf {
return table;
}
public boolean isHasCompoundKey() {
return hasCompoundKey;
}
public Set<String> getPartitionNames() {
return Collections.EMPTY_SET;
}
@Override
public BaseAnalysisTask createAnalysisTask(AnalysisInfo info) {
throw new NotImplementedException("createAnalysisTask not implemented");

10
fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergExternalTable.java
View File

@ -28,14 +28,11 @@ import org.apache.doris.thrift.TIcebergTable;
import org.apache.doris.thrift.TTableDescriptor;
import org.apache.doris.thrift.TTableType;
import org.apache.iceberg.PartitionField;
import org.apache.iceberg.Table;
import java.util.HashMap;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
public class IcebergExternalTable extends ExternalTable {
@ -92,11 +89,4 @@ public class IcebergExternalTable extends ExternalTable {
public Table getIcebergTable() {
return IcebergUtils.getIcebergTable(getCatalog(), getDbName(), getName());
}
@Override
public Set<String> getPartitionNames() {
getIcebergTable();
return IcebergUtils.getIcebergTable(getCatalog(), getDbName(), getName())
.spec().fields().stream().map(PartitionField::name).collect(Collectors.toSet());
}
}

12
fe/fe-core/src/main/java/org/apache/doris/datasource/maxcompute/MaxComputeExternalTable.java
View File

@ -51,7 +51,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
/**
@ -92,14 +91,6 @@ public class MaxComputeExternalTable extends ExternalTable {
.getRecordCount();
}
@Override
public Set<String> getPartitionNames() {
makeSureInitialized();
Optional<SchemaCacheValue> schemaCacheValue = getSchemaCacheValue();
return schemaCacheValue.map(value -> ((MaxComputeSchemaCacheValue) value).getPartitionColNames())
.orElse(Collections.emptySet());
}
public List<Column> getPartitionColumns() {
makeSureInitialized();
Optional<SchemaCacheValue> schemaCacheValue = getSchemaCacheValue();
@ -129,7 +120,8 @@ public class MaxComputeExternalTable extends ExternalTable {
TablePartitionValues partitionValues = new TablePartitionValues();
partitionValues.addPartitions(partitionSpecs,
partitionSpecs.stream()
.map(p -> parsePartitionValues(new ArrayList<>(getPartitionNames()), p))
.map(p -> parsePartitionValues(getPartitionColumns().stream().map(c -> c.getName()).collect(
Collectors.toList()), p))
.collect(Collectors.toList()),
partitionTypes);
return partitionValues;

2
fe/fe-core/src/main/java/org/apache/doris/datasource/maxcompute/source/MaxComputeScanNode.java
View File

@ -110,7 +110,7 @@ public class MaxComputeScanNode extends FileQueryScanNode {
return result;
}
try {
if (!table.getPartitionNames().isEmpty()) {
if (!table.getPartitionColumns().isEmpty()) {
if (conjuncts.isEmpty()) {
throw new IllegalArgumentException("Max Compute partition table need partition predicate.");
}