From b43f69a1efe42f8d773a9e910561b842ad5e2521 Mon Sep 17 00:00:00 2001 From: Sabrina X <213740924+SabrinaXKL@users.noreply.github.com> Date: Tue, 10 Nov 2026 21:53:14 +0000 Subject: [PATCH 1/3] added-asc-desc-null-typed-columns added the columns and added them to OrderByTests # Conflicts: # dataset/src/main/scala/frameless/TypedColumn.scala # dataset/src/test/scala/frameless/OrderByTests.scala --- dataset/src/main/scala/frameless/TypedColumn.scala | 12 ++++++++++++ dataset/src/test/scala/frameless/OrderByTests.scala | 4 ++++ 2 files changed, 16 insertions(+) diff --git a/dataset/src/main/scala/frameless/TypedColumn.scala b/dataset/src/main/scala/frameless/TypedColumn.scala index 4140cabe..4c56a3f8 100644 --- a/dataset/src/main/scala/frameless/TypedColumn.scala +++ b/dataset/src/main/scala/frameless/TypedColumn.scala @@ -605,6 +605,18 @@ abstract class AbstractTypedColumn[T, U]( ): SortedTypedColumn[T, U] = new SortedTypedColumn[T, U](untyped.asc) + def asc_nulls_first(implicit catalystOrdered: CatalystOrdered[U]): SortedTypedColumn[T, U] = + new SortedTypedColumn[T, U](untyped.asc_nulls_first) + + def asc_nulls_last(implicit catalystOrdered: CatalystOrdered[U]): SortedTypedColumn[T, U] = + new SortedTypedColumn[T, U](untyped.asc_nulls_last) + + def desc_nulls_first(implicit catalystOrdered: CatalystOrdered[U]): SortedTypedColumn[T, U] = + new SortedTypedColumn[T, U](untyped.desc_nulls_first) + + def desc_nulls_last(implicit catalystOrdered: CatalystOrdered[U]): SortedTypedColumn[T, U] = + new SortedTypedColumn[T, U](untyped.desc_nulls_last) + /** * Bitwise AND this expression and another expression. * {{{ diff --git a/dataset/src/test/scala/frameless/OrderByTests.scala b/dataset/src/test/scala/frameless/OrderByTests.scala index 20137819..d6ba6fbb 100644 --- a/dataset/src/test/scala/frameless/OrderByTests.scala +++ b/dataset/src/test/scala/frameless/OrderByTests.scala @@ -10,6 +10,10 @@ class OrderByTests extends TypedDatasetSuite with Matchers { def sortings[A: CatalystOrdered, T]: Seq[(TypedColumn[T, A] => SortedTypedColumn[T, A], Column => Column)] = Seq( (_.desc, _.desc), (_.asc, _.asc), + (_.desc_nulls_first, _.desc_nulls_first), + (_.desc_nulls_last, _.desc_nulls_last), + (_.asc_nulls_first, _.asc_nulls_first), + (_.asc_nulls_last, _.asc_nulls_last), (t => t, t => t) // default ascending ) From a66a7623155373b51202ca5297d364a64b5dfccc Mon Sep 17 00:00:00 2001 From: Sabrina X <213740924+SabrinaXKL@users.noreply.github.com> Date: Tue, 10 Nov 2026 22:56:59 +0000 Subject: [PATCH 2/3] added-asc-desc-null-typed-columns formatted two of the files --- dataset/src/test/scala/frameless/OrderByTests.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dataset/src/test/scala/frameless/OrderByTests.scala b/dataset/src/test/scala/frameless/OrderByTests.scala index d6ba6fbb..1bd55621 100644 --- a/dataset/src/test/scala/frameless/OrderByTests.scala +++ b/dataset/src/test/scala/frameless/OrderByTests.scala @@ -18,7 +18,7 @@ class OrderByTests extends TypedDatasetSuite with Matchers { ) test("single column non nullable orderBy") { - def prop[A: TypedEncoder: CatalystOrdered](data: Vector[X1[A]]): Prop = { + def prop[A: TypedEncoder : CatalystOrdered](data: Vector[X1[A]]): Prop = { val ds = TypedDataset.create(data) sortings[A, X1[A]].map { case (typ, untyp) => @@ -41,7 +41,7 @@ class OrderByTests extends TypedDatasetSuite with Matchers { } test("single column non nullable partition sorting") { - def prop[A: TypedEncoder: CatalystOrdered](data: Vector[X1[A]]): Prop = { + def prop[A: TypedEncoder : CatalystOrdered](data: Vector[X1[A]]): Prop = { val ds = TypedDataset.create(data) sortings[A, X1[A]].map { case (typ, untyp) => From da18baace226a870d1dbb7427656349aafe5b127 Mon Sep 17 00:00:00 2001 From: Sabrina X <213740924+SabrinaXKL@users.noreply.github.com> Date: Tue, 10 Nov 2026 23:08:20 +0000 Subject: [PATCH 3/3] added-asc-decs-null-typed-columns removed extra spacing --- dataset/src/test/scala/frameless/OrderByTests.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dataset/src/test/scala/frameless/OrderByTests.scala b/dataset/src/test/scala/frameless/OrderByTests.scala index 1bd55621..d6ba6fbb 100644 --- a/dataset/src/test/scala/frameless/OrderByTests.scala +++ b/dataset/src/test/scala/frameless/OrderByTests.scala @@ -18,7 +18,7 @@ class OrderByTests extends TypedDatasetSuite with Matchers { ) test("single column non nullable orderBy") { - def prop[A: TypedEncoder : CatalystOrdered](data: Vector[X1[A]]): Prop = { + def prop[A: TypedEncoder: CatalystOrdered](data: Vector[X1[A]]): Prop = { val ds = TypedDataset.create(data) sortings[A, X1[A]].map { case (typ, untyp) => @@ -41,7 +41,7 @@ class OrderByTests extends TypedDatasetSuite with Matchers { } test("single column non nullable partition sorting") { - def prop[A: TypedEncoder : CatalystOrdered](data: Vector[X1[A]]): Prop = { + def prop[A: TypedEncoder: CatalystOrdered](data: Vector[X1[A]]): Prop = { val ds = TypedDataset.create(data) sortings[A, X1[A]].map { case (typ, untyp) =>