huaxingao commented on a change in pull request #3745:
URL: https://github.com/apache/iceberg/pull/3745#discussion_r769096106
##########
File path:
spark/v3.2/spark/src/main/java/org/apache/iceberg/spark/Spark3Util.java
##########
@@ -779,10 +800,54 @@ public static TableIdentifier
identifierToTableIdentifier(Identifier identifier)
Object value =
CatalystTypeConverters.convertToScala(catalystValue, field.dataType());
values.put(field.name(), value.toString());
});
- return new SparkPartition(values, partition.path().toString(),
format);
+ FileStatus fileStatus =
+
scala.collection.JavaConverters.seqAsJavaListConverter(partition.files()).asJava().get(0);
+
+ return new SparkPartition(values,
fileStatus.getPath().getParent().toString(), format);
}).collect(Collectors.toList());
}
+ private static List getPartitionFilterExpressions(StructType schema,
+ Map<String, String>
partitionFilter) {
+ List<org.apache.spark.sql.catalyst.expressions.Expression>
filterExpressions = new java.util.ArrayList<>();
+ for (Map.Entry<String, String> entry : partitionFilter.entrySet()) {
+ try {
+ // IllegalArgumentException is thrown if schema doesn't contain this
entry,
+ // which means partition filter is not on partition columns.
+ int index = schema.fieldIndex(entry.getKey());
+ org.apache.spark.sql.types.DataType dataType =
schema.fields()[index].dataType();
+ BoundReference ref = new BoundReference(index, dataType, true);
+ if (dataType.sameType(DataTypes.IntegerType) ||
dataType.sameType(DataTypes.ShortType) ||
+ dataType.sameType(DataTypes.ByteType)) {
+ filterExpressions.add(new EqualTo(ref,
+
org.apache.spark.sql.catalyst.expressions.Literal.create(Integer.parseInt(entry.getValue()),
+ DataTypes.IntegerType)));
+ } else if
(schema.fields()[index].dataType().sameType(DataTypes.StringType)) {
+ filterExpressions.add(new EqualTo(ref,
+
org.apache.spark.sql.catalyst.expressions.Literal.create(entry.getValue(),
DataTypes.StringType)));
+ } else if
(schema.fields()[index].dataType().sameType(DataTypes.LongType)) {
+ filterExpressions.add(new EqualTo(ref,
+
org.apache.spark.sql.catalyst.expressions.Literal.create(Long.parseLong(entry.getValue()),
+ DataTypes.LongType)));
+ } else if
(schema.fields()[index].dataType().sameType(DataTypes.DateType)) {
+ filterExpressions.add(new EqualTo(ref,
+
org.apache.spark.sql.catalyst.expressions.Literal.create(entry.getValue(),
DataTypes.DateType)));
+ } else if
(schema.fields()[index].dataType().sameType(DataTypes.TimestampType)) {
+ filterExpressions.add(new EqualTo(ref,
+
org.apache.spark.sql.catalyst.expressions.Literal.create(entry.getValue(),
DataTypes.TimestampType)));
+ } else if (schema.fields()[index].dataType()
+ .sameType(DataTypes.CalendarIntervalType)) {
+ filterExpressions.add(new EqualTo(ref,
+
org.apache.spark.sql.catalyst.expressions.Literal.create(entry.getValue(),
+ DataTypes.CalendarIntervalType)));
Review comment:
I only tested dataType Integer and String by using the existing test
suite `TestAddFilesProcedure`. If this PR looks OK, I will also test all the
other data types.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
