@@ -21,7 +21,6 @@ import scala.util.Random
2121
2222import org .scalatest .Matchers .the
2323
24- import org .apache .spark .sql .catalyst .expressions .aggregate .{AnyAgg , EveryAgg }
2524import org .apache .spark .sql .execution .WholeStageCodegenExec
2625import org .apache .spark .sql .execution .aggregate .{HashAggregateExec , ObjectHashAggregateExec , SortAggregateExec }
2726import org .apache .spark .sql .execution .exchange .ShuffleExchangeExec
@@ -728,67 +727,4 @@ class DataFrameAggregateSuite extends QueryTest with SharedSQLContext {
728727 " grouping expressions: [current_date(None)], value: [key: int, value: string], " +
729728 " type: GroupBy]" ))
730729 }
731-
732- def getEveryAggColumn (columnName : String ): Column = {
733- Column (new EveryAgg (Column (columnName).expr).toAggregateExpression(false ))
734- }
735-
736- def getAnyAggColumn (columnName : String ): Column = {
737- Column (new AnyAgg (Column (columnName).expr).toAggregateExpression(false ))
738- }
739-
740- test(" every" ) {
741- val df = Seq ((1 , true ), (1 , true ), (1 , false ), (2 , true ), (2 , true ), (3 , false ), (3 , false ))
742- .toDF(" a" , " b" )
743-
744- checkAnswer(
745- df.groupBy(" a" ).agg(getEveryAggColumn(" b" )),
746- Seq (Row (1 , false ), Row (2 , true ), Row (3 , false )))
747- }
748-
749- test(" every null values" ) {
750- val df = Seq [(java.lang.Integer , java.lang.Boolean )](
751- (1 , true ), (1 , false ),
752- (2 , true ),
753- (3 , false ), (3 , null ),
754- (4 , null ), (4 , null ))
755- .toDF(" a" , " b" )
756- checkAnswer(
757- df.groupBy(" a" ).agg(getEveryAggColumn(" b" )),
758- Seq (Row (1 , false ), Row (2 , true ), Row (3 , false ), Row (4 , null )))
759- }
760-
761- test(" every empty table" ) {
762- val df = Seq .empty[(Int , Boolean )].toDF(" a" , " b" )
763- checkAnswer(
764- df.agg(getEveryAggColumn(" b" )),
765- Seq (Row (null )))
766- }
767-
768- test(" any" ) {
769- val df = Seq ((1 , true ), (1 , true ), (1 , false ), (2 , true ), (2 , true ), (3 , false ), (3 , false ))
770- .toDF(" a" , " b" )
771- checkAnswer(
772- df.groupBy(" a" ).agg(getAnyAggColumn(" b" )),
773- Seq (Row (1 , true ), Row (2 , true ), Row (3 , false )))
774- }
775-
776- test(" any empty table" ) {
777- val df = Seq .empty[(Int , Boolean )].toDF(" a" , " b" )
778- checkAnswer(
779- df.agg(getAnyAggColumn(" b" )),
780- Seq (Row (null )))
781- }
782-
783- test(" any null values" ) {
784- val df = Seq [(java.lang.Integer , java.lang.Boolean )](
785- (1 , true ), (1 , false ),
786- (2 , true ),
787- (3 , true ), (3 , false ), (3 , null ),
788- (4 , null ), (4 , null ))
789- .toDF(" a" , " b" )
790- checkAnswer(
791- df.groupBy(" a" ).agg(getAnyAggColumn(" b" )),
792- Seq (Row (1 , true ), Row (2 , true ), Row (3 , true ), Row (4 , null )))
793- }
794730}
0 commit comments