You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by GitBox <gi...@apache.org> on 2019/10/02 02:36:26 UTC
[GitHub] [spark] nvander1 commented on a change in pull request #24232:
[SPARK-27297] [SQL] Add higher order functions to scala API
nvander1 commented on a change in pull request #24232: [SPARK-27297] [SQL] Add higher order functions to scala API
URL: https://github.com/apache/spark/pull/24232#discussion_r330352005
##########
File path: sql/core/src/test/java/test/org/apache/spark/sql/JavaHigherOrderFunctionsSuite.java
##########
@@ -0,0 +1,221 @@
+/*
+ * 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;
+
+import java.util.HashMap;
+import java.util.List;
+
+import scala.collection.Seq;
+import static scala.collection.JavaConverters.mapAsScalaMap;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.apache.spark.sql.Dataset;
+import org.apache.spark.sql.Row;
+import org.apache.spark.sql.types.*;
+import static org.apache.spark.sql.types.DataTypes.*;
+import static org.apache.spark.sql.functions.*;
+import org.apache.spark.sql.test.TestSparkSession;
+import static test.org.apache.spark.sql.JavaTestUtils.*;
+import test.org.apache.spark.sql.JavaTestUtils;
+
+public class JavaHigherOrderFunctionsSuite {
+ private transient TestSparkSession spark;
+ private Dataset<Row> arrDf;
+ private Dataset<Row> mapDf;
+
+ private void setUpArrDf() {
+ List<Row> data = toRows(
+ makeArray(1, 9, 8, 7),
+ makeArray(5, 8, 9, 7, 2),
+ JavaTestUtils.<Integer>makeArray(),
+ null
+ );
+ StructType schema = new StructType()
+ .add("x", new ArrayType(IntegerType, true), true);
+ arrDf = spark.createDataFrame(data, schema);
+ }
+
+ private void setUpMapDf() {
+ List<Row> data = toRows(
+ new HashMap<Integer, Integer>() {{
+ put(1, 1);
+ put(2, 2);
+ }},
+ null
+ );
+ StructType schema = new StructType()
+ .add("x", new MapType(IntegerType, IntegerType, true));
+ mapDf = spark.createDataFrame(data, schema);
+ }
+
+ @Before
+ public void setUp() {
+ spark = new TestSparkSession();
+ setUpArrDf();
+ setUpMapDf();
+ }
+
+ @After
+ public void tearDown() {
+ spark.stop();
+ spark = null;
+ }
+
+ @Test
+ public void testTransform() {
+ checkAnswer(
+ arrDf.select(transform(col("x"), x -> x.plus(1))),
+ toRows(
+ makeArray(2, 10, 9, 8),
+ makeArray(6, 9, 10, 8, 3),
+ JavaTestUtils.<Integer>makeArray(),
+ null
+ ));
+ checkAnswer(
+ arrDf.select(transform(col("x"), (x, i) -> x.plus(i))),
+ toRows(
+ makeArray(1, 10, 10, 10),
+ makeArray(5, 9, 11, 10, 6),
+ JavaTestUtils.<Integer>makeArray(),
+ null
+ ));
+ }
+
+ @Test
+ public void testFilter() {
+ checkAnswer(
+ arrDf.select(filter(col("x"), x -> x.plus(1).equalTo(10))),
+ toRows(
+ makeArray(9),
+ makeArray(9),
+ JavaTestUtils.<Integer>makeArray(),
+ null
+ ));
+ }
+
+ @Test
+ public void testExists() {
+ checkAnswer(
+ arrDf.select(exists(col("x"), x -> x.plus(1).equalTo(10))),
+ toRows(
+ true,
+ true,
+ false,
+ null
+ ));
+ }
+
+ @Test
+ public void testForall() {
+ checkAnswer(
+ arrDf.select(forall(col("x"), x -> x.plus(1).equalTo(10))),
+ toRows(
+ false,
+ false,
+ true,
+ null
+ ));
+ }
+
+ @Test
+ public void testAggregate() {
+ checkAnswer(
+ arrDf.select(aggregate(col("x"), lit(0), (acc, x) -> acc.plus(x))),
+ toRows(
+ 25,
+ 31,
+ 0,
+ null
+ ));
+ checkAnswer(
+ arrDf.select(aggregate(col("x"), lit(0), (acc, x) -> acc.plus(x), x -> x)),
+ toRows(
+ 25,
+ 31,
+ 0,
+ null
+ ));
+ }
+
+ @Test
+ public void testZipWith() {
+ checkAnswer(
+ arrDf.select(zip_with(col("x"), col("x"), (a, b) -> lit(42))),
+ toRows(
+ makeArray(42, 42, 42, 42),
+ makeArray(42, 42, 42, 42, 42),
+ JavaTestUtils.<Integer>makeArray(),
+ null
+ ));
+ }
+
+ @Test
+ public void testTransformKeys() {
+ checkAnswer(
+ mapDf.select(transform_keys(col("x"), (k, v) -> k.plus(v))),
+ toRows(
+ mapAsScalaMap(
+ new HashMap<Integer, Integer>() {{
+ put(2, 1);
+ put(4, 2);
+ }}),
+ null
+ ));
+ }
+
+ @Test
+ public void testTransformValues() {
+ checkAnswer(
+ mapDf.select(transform_values(col("x"), (k, v) -> k.plus(v))),
+ toRows(
+ mapAsScalaMap(
+ new HashMap<Integer, Integer>() {{
+ put(1, 2);
+ put(2, 4);
+ }}),
+ null
Review comment:
```java
@Test
public void testTransformValues() {
checkAnswer(
mapDf.select(transform_values(col("x"), (k, v) -> k.plus(v))),
toRows(
mapAsScalaMap(new HashMap<Integer, Integer>() {{
put(1, 2);
put(2, 4);
}}),
null
)
);
}
```
Does this work as well? I've moved the new HashMap up a line. @ueshin
Also, what is the general preference in the codebase, each paren and brace on a new line?
Or the more "lispy" style of every close on the same line:
```java
@Test
public void testTransformValues() {
checkAnswer(
mapDf.select(transform_values(col("x"), (k, v) -> k.plus(v))),
toRows(
mapAsScalaMap(new HashMap<Integer, Integer>() {{
put(1, 2);
put(2, 4);}}),
null));
}
```
I've seen a mixture of the two to various degrees in the code, I edited this file to at least be consistent with itself (the exception here being the mapAsScalaMap / hashmap since it really is its own entity just being converted to a scala equivalent.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org