sunchao commented on code in PR #35965: URL: https://github.com/apache/spark/pull/35965#discussion_r878596697
########## sql/core/src/test/java/test/org/apache/spark/sql/connector/JavaOrderAndPartitionAwareDataSource.java: ########## @@ -0,0 +1,144 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package test.org.apache.spark.sql.connector; + +import java.util.Arrays; + +import org.apache.spark.sql.connector.catalog.Table; +import org.apache.spark.sql.connector.expressions.*; +import org.apache.spark.sql.connector.read.*; +import org.apache.spark.sql.connector.read.partitioning.KeyGroupedPartitioning; +import org.apache.spark.sql.connector.read.partitioning.Partitioning; +import org.apache.spark.sql.connector.read.partitioning.UnknownPartitioning; +import org.apache.spark.sql.util.CaseInsensitiveStringMap; + +public class JavaOrderAndPartitionAwareDataSource extends JavaPartitionAwareDataSource { + + static class MyScanBuilder extends JavaPartitionAwareDataSource.MyScanBuilder + implements SupportsReportOrdering { + + private final Partitioning partitioning; + private final SortOrder[] ordering; + + MyScanBuilder(String partitionKeys, String orderKeys) { + if (partitionKeys != null) { + String[] keys = partitionKeys.split(","); + Expression[] clustering = new Transform[keys.length]; + for (int i = 0; i < keys.length; i++) { + clustering[i] = Expressions.identity(keys[i]); + } + this.partitioning = new KeyGroupedPartitioning(clustering, 2); + } else { + this.partitioning = new UnknownPartitioning(2); + } + + if (orderKeys != null) { + String[] keys = orderKeys.split(","); + this.ordering = new SortOrder[keys.length]; + for (int i = 0; i < keys.length; i++) { + this.ordering[i] = new MySortOrder(keys[i]); + } + } else { + this.ordering = new SortOrder[0]; + } + } + + @Override + public InputPartition[] planInputPartitions() { + InputPartition[] partitions = new InputPartition[2]; + partitions[0] = new SpecificInputPartition(new int[]{1, 1, 3}, new int[]{4, 5, 5}); + partitions[1] = new SpecificInputPartition(new int[]{2, 4, 4}, new int[]{6, 1, 2}); + return partitions; + } + + @Override + public Partitioning outputPartitioning() { + return this.partitioning; + } + + @Override + public SortOrder[] outputOrdering() { + return this.ordering; + } + } + + @Override + public Table getTable(CaseInsensitiveStringMap options) { + return new JavaSimpleBatchTable() { + @Override + public Transform[] partitioning() { + String partitionKeys = options.get("partitionKeys"); + if (partitionKeys == null) { + return new Transform[0]; + } else { + return (Transform[])Arrays.stream(partitionKeys.split(",")) Review Comment: nit: space before `Arrays` ########## sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2Suite.scala: ########## @@ -886,6 +972,66 @@ class PartitionAwareDataSource extends TestingV2Source { } } +class OrderAndPartitionAwareDataSource extends PartitionAwareDataSource { + + class MyScanBuilder(val partitionKeys: Option[Seq[String]], + val orderKeys: Seq[String]) extends SimpleScanBuilder Review Comment: nit: indent ########## sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/DataSourceV2ScanExecBase.scala: ########## @@ -138,6 +138,15 @@ trait DataSourceV2ScanExecBase extends LeafExecNode { } } + override def outputOrdering: Seq[SortOrder] = scan match { + case s: SupportsReportOrdering if this.logicalLink.isDefined && Review Comment: I'm not totally sure this is the correct approach. Could we follow the existing pattern and add an optimizer rule to populate this? we can re-use existing `V2ScanPartitioning` too (and change its name). ########## sql/core/src/test/java/test/org/apache/spark/sql/connector/JavaOrderAndPartitionAwareDataSource.java: ########## @@ -0,0 +1,144 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package test.org.apache.spark.sql.connector; + +import java.util.Arrays; + +import org.apache.spark.sql.connector.catalog.Table; +import org.apache.spark.sql.connector.expressions.*; +import org.apache.spark.sql.connector.read.*; +import org.apache.spark.sql.connector.read.partitioning.KeyGroupedPartitioning; +import org.apache.spark.sql.connector.read.partitioning.Partitioning; +import org.apache.spark.sql.connector.read.partitioning.UnknownPartitioning; +import org.apache.spark.sql.util.CaseInsensitiveStringMap; + +public class JavaOrderAndPartitionAwareDataSource extends JavaPartitionAwareDataSource { + + static class MyScanBuilder extends JavaPartitionAwareDataSource.MyScanBuilder + implements SupportsReportOrdering { + + private final Partitioning partitioning; + private final SortOrder[] ordering; + + MyScanBuilder(String partitionKeys, String orderKeys) { + if (partitionKeys != null) { + String[] keys = partitionKeys.split(","); + Expression[] clustering = new Transform[keys.length]; + for (int i = 0; i < keys.length; i++) { + clustering[i] = Expressions.identity(keys[i]); + } + this.partitioning = new KeyGroupedPartitioning(clustering, 2); + } else { + this.partitioning = new UnknownPartitioning(2); + } + + if (orderKeys != null) { + String[] keys = orderKeys.split(","); + this.ordering = new SortOrder[keys.length]; + for (int i = 0; i < keys.length; i++) { + this.ordering[i] = new MySortOrder(keys[i]); + } + } else { + this.ordering = new SortOrder[0]; + } + } + + @Override + public InputPartition[] planInputPartitions() { + InputPartition[] partitions = new InputPartition[2]; + partitions[0] = new SpecificInputPartition(new int[]{1, 1, 3}, new int[]{4, 5, 5}); + partitions[1] = new SpecificInputPartition(new int[]{2, 4, 4}, new int[]{6, 1, 2}); + return partitions; + } + + @Override + public Partitioning outputPartitioning() { + return this.partitioning; + } + + @Override + public SortOrder[] outputOrdering() { + return this.ordering; + } + } + + @Override + public Table getTable(CaseInsensitiveStringMap options) { + return new JavaSimpleBatchTable() { + @Override + public Transform[] partitioning() { + String partitionKeys = options.get("partitionKeys"); + if (partitionKeys == null) { + return new Transform[0]; + } else { + return (Transform[])Arrays.stream(partitionKeys.split(",")) + .map(Expressions::identity).toArray(); + } + } + + @Override + public ScanBuilder newScanBuilder(CaseInsensitiveStringMap options) { + return new MyScanBuilder(options.get("partitionKeys"), options.get("orderKeys")); + } + }; + } + + static class MySortOrder implements SortOrder { + private final Expression expression; + + MySortOrder(String columnName) { + this.expression = new MyIdentityTransform(new MyNamedReference(columnName)); + } + + @Override + public Expression expression() { return expression; } + + @Override + public SortDirection direction() { return SortDirection.ASCENDING; } + + @Override + public NullOrdering nullOrdering() { return NullOrdering.NULLS_FIRST; } + } + + static class MyNamedReference implements NamedReference { + private final String[] parts; + + MyNamedReference(String part) { this.parts = new String[] { part }; } Review Comment: nit: break this into multiple lines: ``` MyNamedReference(String part) { this.parts = new String[] { part }; } ``` ########## sql/core/src/test/java/test/org/apache/spark/sql/connector/JavaOrderAndPartitionAwareDataSource.java: ########## @@ -0,0 +1,144 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package test.org.apache.spark.sql.connector; + +import java.util.Arrays; + +import org.apache.spark.sql.connector.catalog.Table; +import org.apache.spark.sql.connector.expressions.*; +import org.apache.spark.sql.connector.read.*; +import org.apache.spark.sql.connector.read.partitioning.KeyGroupedPartitioning; +import org.apache.spark.sql.connector.read.partitioning.Partitioning; +import org.apache.spark.sql.connector.read.partitioning.UnknownPartitioning; +import org.apache.spark.sql.util.CaseInsensitiveStringMap; + +public class JavaOrderAndPartitionAwareDataSource extends JavaPartitionAwareDataSource { + + static class MyScanBuilder extends JavaPartitionAwareDataSource.MyScanBuilder + implements SupportsReportOrdering { Review Comment: nit: indentation looks off here ########## sql/core/src/test/java/test/org/apache/spark/sql/connector/JavaOrderAndPartitionAwareDataSource.java: ########## @@ -0,0 +1,144 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package test.org.apache.spark.sql.connector; + +import java.util.Arrays; + +import org.apache.spark.sql.connector.catalog.Table; +import org.apache.spark.sql.connector.expressions.*; +import org.apache.spark.sql.connector.read.*; +import org.apache.spark.sql.connector.read.partitioning.KeyGroupedPartitioning; +import org.apache.spark.sql.connector.read.partitioning.Partitioning; +import org.apache.spark.sql.connector.read.partitioning.UnknownPartitioning; +import org.apache.spark.sql.util.CaseInsensitiveStringMap; + +public class JavaOrderAndPartitionAwareDataSource extends JavaPartitionAwareDataSource { + + static class MyScanBuilder extends JavaPartitionAwareDataSource.MyScanBuilder + implements SupportsReportOrdering { + + private final Partitioning partitioning; + private final SortOrder[] ordering; + + MyScanBuilder(String partitionKeys, String orderKeys) { + if (partitionKeys != null) { + String[] keys = partitionKeys.split(","); + Expression[] clustering = new Transform[keys.length]; + for (int i = 0; i < keys.length; i++) { + clustering[i] = Expressions.identity(keys[i]); + } + this.partitioning = new KeyGroupedPartitioning(clustering, 2); + } else { + this.partitioning = new UnknownPartitioning(2); + } + + if (orderKeys != null) { + String[] keys = orderKeys.split(","); + this.ordering = new SortOrder[keys.length]; + for (int i = 0; i < keys.length; i++) { + this.ordering[i] = new MySortOrder(keys[i]); + } + } else { + this.ordering = new SortOrder[0]; + } + } + + @Override + public InputPartition[] planInputPartitions() { + InputPartition[] partitions = new InputPartition[2]; + partitions[0] = new SpecificInputPartition(new int[]{1, 1, 3}, new int[]{4, 5, 5}); + partitions[1] = new SpecificInputPartition(new int[]{2, 4, 4}, new int[]{6, 1, 2}); + return partitions; + } + + @Override + public Partitioning outputPartitioning() { + return this.partitioning; + } + + @Override + public SortOrder[] outputOrdering() { + return this.ordering; + } + } + + @Override + public Table getTable(CaseInsensitiveStringMap options) { + return new JavaSimpleBatchTable() { + @Override + public Transform[] partitioning() { + String partitionKeys = options.get("partitionKeys"); + if (partitionKeys == null) { + return new Transform[0]; + } else { + return (Transform[])Arrays.stream(partitionKeys.split(",")) + .map(Expressions::identity).toArray(); + } + } + + @Override + public ScanBuilder newScanBuilder(CaseInsensitiveStringMap options) { + return new MyScanBuilder(options.get("partitionKeys"), options.get("orderKeys")); + } + }; + } + + static class MySortOrder implements SortOrder { + private final Expression expression; + + MySortOrder(String columnName) { + this.expression = new MyIdentityTransform(new MyNamedReference(columnName)); + } + + @Override + public Expression expression() { return expression; } + + @Override + public SortDirection direction() { return SortDirection.ASCENDING; } + + @Override + public NullOrdering nullOrdering() { return NullOrdering.NULLS_FIRST; } + } + + static class MyNamedReference implements NamedReference { + private final String[] parts; + + MyNamedReference(String part) { this.parts = new String[] { part }; } + + @Override + public String[] fieldNames() { return this.parts; } Review Comment: ditto ########## sql/core/src/test/java/test/org/apache/spark/sql/connector/JavaOrderAndPartitionAwareDataSource.java: ########## @@ -0,0 +1,144 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package test.org.apache.spark.sql.connector; + +import java.util.Arrays; + +import org.apache.spark.sql.connector.catalog.Table; +import org.apache.spark.sql.connector.expressions.*; +import org.apache.spark.sql.connector.read.*; +import org.apache.spark.sql.connector.read.partitioning.KeyGroupedPartitioning; +import org.apache.spark.sql.connector.read.partitioning.Partitioning; +import org.apache.spark.sql.connector.read.partitioning.UnknownPartitioning; +import org.apache.spark.sql.util.CaseInsensitiveStringMap; + +public class JavaOrderAndPartitionAwareDataSource extends JavaPartitionAwareDataSource { + + static class MyScanBuilder extends JavaPartitionAwareDataSource.MyScanBuilder + implements SupportsReportOrdering { + + private final Partitioning partitioning; + private final SortOrder[] ordering; + + MyScanBuilder(String partitionKeys, String orderKeys) { + if (partitionKeys != null) { + String[] keys = partitionKeys.split(","); + Expression[] clustering = new Transform[keys.length]; + for (int i = 0; i < keys.length; i++) { + clustering[i] = Expressions.identity(keys[i]); + } + this.partitioning = new KeyGroupedPartitioning(clustering, 2); + } else { + this.partitioning = new UnknownPartitioning(2); + } + + if (orderKeys != null) { + String[] keys = orderKeys.split(","); + this.ordering = new SortOrder[keys.length]; + for (int i = 0; i < keys.length; i++) { + this.ordering[i] = new MySortOrder(keys[i]); + } + } else { + this.ordering = new SortOrder[0]; + } + } + + @Override + public InputPartition[] planInputPartitions() { + InputPartition[] partitions = new InputPartition[2]; + partitions[0] = new SpecificInputPartition(new int[]{1, 1, 3}, new int[]{4, 5, 5}); + partitions[1] = new SpecificInputPartition(new int[]{2, 4, 4}, new int[]{6, 1, 2}); + return partitions; + } + + @Override + public Partitioning outputPartitioning() { + return this.partitioning; + } + + @Override + public SortOrder[] outputOrdering() { + return this.ordering; + } + } + + @Override + public Table getTable(CaseInsensitiveStringMap options) { + return new JavaSimpleBatchTable() { + @Override + public Transform[] partitioning() { + String partitionKeys = options.get("partitionKeys"); + if (partitionKeys == null) { + return new Transform[0]; + } else { + return (Transform[])Arrays.stream(partitionKeys.split(",")) + .map(Expressions::identity).toArray(); + } + } + + @Override + public ScanBuilder newScanBuilder(CaseInsensitiveStringMap options) { + return new MyScanBuilder(options.get("partitionKeys"), options.get("orderKeys")); + } + }; + } + + static class MySortOrder implements SortOrder { + private final Expression expression; + + MySortOrder(String columnName) { + this.expression = new MyIdentityTransform(new MyNamedReference(columnName)); + } + + @Override + public Expression expression() { return expression; } + + @Override + public SortDirection direction() { return SortDirection.ASCENDING; } + + @Override + public NullOrdering nullOrdering() { return NullOrdering.NULLS_FIRST; } + } + + static class MyNamedReference implements NamedReference { + private final String[] parts; + + MyNamedReference(String part) { this.parts = new String[] { part }; } Review Comment: similarly for other places ########## sql/core/src/test/java/test/org/apache/spark/sql/connector/JavaOrderAndPartitionAwareDataSource.java: ########## @@ -0,0 +1,141 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package test.org.apache.spark.sql.connector; + +import org.apache.spark.sql.connector.catalog.Table; +import org.apache.spark.sql.connector.expressions.*; +import org.apache.spark.sql.connector.read.*; +import org.apache.spark.sql.connector.read.partitioning.KeyGroupedPartitioning; +import org.apache.spark.sql.connector.read.partitioning.Partitioning; +import org.apache.spark.sql.connector.read.partitioning.UnknownPartitioning; +import org.apache.spark.sql.util.CaseInsensitiveStringMap; + +public class JavaOrderAndPartitionAwareDataSource extends JavaPartitionAwareDataSource { + + static class MyScanBuilder extends JavaSimpleScanBuilder + implements SupportsReportPartitioning, SupportsReportOrdering { + + private final Partitioning partitioning; + private final SortOrder[] ordering; + + MyScanBuilder(String partitionKeys, String orderKeys) { + if (partitionKeys != null) { + String[] keys = partitionKeys.split(","); + Expression[] clustering = new Transform[keys.length]; + for (int i=0; i< keys.length; i++) { + clustering[i] = Expressions.identity(keys[i]); + } + this.partitioning = new KeyGroupedPartitioning(clustering, 2); + } else { + this.partitioning = new UnknownPartitioning(2); + } + + if (orderKeys != null) { + String[] keys = orderKeys.split(","); + this.ordering = new SortOrder[keys.length]; + for (int i=0; i<keys.length; i++) { + this.ordering[i] = new MySortOrder(keys[i]); + } + } else { + this.ordering = new SortOrder[0]; + } + } + + @Override + public InputPartition[] planInputPartitions() { + InputPartition[] partitions = new InputPartition[2]; + partitions[0] = new SpecificInputPartition(new int[]{1, 1, 3}, new int[]{4, 5, 5}); + partitions[1] = new SpecificInputPartition(new int[]{2, 4, 4}, new int[]{6, 1, 2}); + return partitions; + } + + @Override + public PartitionReaderFactory createReaderFactory() { + return new SpecificReaderFactory(); + } + + @Override + public Partitioning outputPartitioning() { + return this.partitioning; + } + + @Override + public SortOrder[] outputOrdering() { + return this.ordering; + } + } + + @Override + public Table getTable(CaseInsensitiveStringMap options) { + return new JavaSimpleBatchTable() { + @Override + public Transform[] partitioning() { + return new Transform[] { Expressions.identity("i") }; + } + + @Override + public ScanBuilder newScanBuilder(CaseInsensitiveStringMap options) { + return new MyScanBuilder(options.get("partitionKeys"), options.get("orderKeys")); + } + }; + } + + static class MySortOrder implements SortOrder { + private final Expression expression; + + MySortOrder(String columnName) { + this.expression = new MyIdentityTransform(new MyNamedReference(columnName)); Review Comment: OK, makes sense. -- 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: reviews-unsubscr...@spark.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org
