Skip to content

Commit 2c68cf4

Browse files
JolanrensenJolanrensen
authored
Merge pull request #925 from Kotlin/nulls-in-framecols
Fixes nulls in framecols and improves column creation situation
2 parents a1294f1 + 8a8650a commit 2c68cf4

File tree

36 files changed

+1023
-227
lines changed

36 files changed

+1023
-227
lines changed

‎core/api/core.api

Lines changed: 51 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,10 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/DataColumn : org
249249
public final class org/jetbrains/kotlinx/dataframe/DataColumn$Companion {
250250
public final fun create (Ljava/lang/String;Ljava/util/List;Lkotlin/reflect/KType;Lorg/jetbrains/kotlinx/dataframe/api/Infer;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
251251
public static synthetic fun create$default (Lorg/jetbrains/kotlinx/dataframe/DataColumn$Companion;Ljava/lang/String;Ljava/util/List;Lkotlin/reflect/KType;Lorg/jetbrains/kotlinx/dataframe/api/Infer;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
252+
public final fun createByInference (Ljava/lang/String;Ljava/util/List;Lorg/jetbrains/kotlinx/dataframe/columns/TypeSuggestion;Ljava/lang/Boolean;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
253+
public static synthetic fun createByInference$default (Lorg/jetbrains/kotlinx/dataframe/DataColumn$Companion;Ljava/lang/String;Ljava/util/List;Lorg/jetbrains/kotlinx/dataframe/columns/TypeSuggestion;Ljava/lang/Boolean;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
254+
public final fun createByType (Ljava/lang/String;Ljava/util/List;Lkotlin/reflect/KType;Lorg/jetbrains/kotlinx/dataframe/api/Infer;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
255+
public static synthetic fun createByType$default (Lorg/jetbrains/kotlinx/dataframe/DataColumn$Companion;Ljava/lang/String;Ljava/util/List;Lkotlin/reflect/KType;Lorg/jetbrains/kotlinx/dataframe/api/Infer;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
252256
public final fun createColumnGroup (Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/DataFrame;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnGroup;
253257
public final fun createFrameColumn (Ljava/lang/String;Ljava/util/List;Lkotlin/Lazy;)Lorg/jetbrains/kotlinx/dataframe/columns/FrameColumn;
254258
public final fun createFrameColumn (Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/DataFrame;Ljava/lang/Iterable;)Lorg/jetbrains/kotlinx/dataframe/columns/FrameColumn;
@@ -4150,6 +4154,7 @@ public final class org/jetbrains/kotlinx/dataframe/api/DataColumnTypeKt {
41504154

41514155
public final class org/jetbrains/kotlinx/dataframe/api/DataFrameBuilder {
41524156
public fun <init> (Ljava/util/List;)V
4157+
public final fun fill (ILorg/jetbrains/kotlinx/dataframe/DataFrame;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
41534158
public final fun invoke (Ljava/lang/Iterable;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
41544159
public final fun invoke (Lkotlin/sequences/Sequence;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
41554160
public final fun invoke ([Ljava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
@@ -9590,6 +9595,43 @@ public final class org/jetbrains/kotlinx/dataframe/columns/SingleColumnKt {
95909595
public static final fun isSingleColumnWithGroup (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;Ljava/util/List;)Z
95919596
}
95929597

9598+
public abstract interface class org/jetbrains/kotlinx/dataframe/columns/TypeSuggestion {
9599+
public static final field Companion Lorg/jetbrains/kotlinx/dataframe/columns/TypeSuggestion$Companion;
9600+
}
9601+
9602+
public final class org/jetbrains/kotlinx/dataframe/columns/TypeSuggestion$Companion {
9603+
public final fun create (Lkotlin/reflect/KType;Z)Lorg/jetbrains/kotlinx/dataframe/columns/TypeSuggestion;
9604+
}
9605+
9606+
public final class org/jetbrains/kotlinx/dataframe/columns/TypeSuggestion$Infer : org/jetbrains/kotlinx/dataframe/columns/TypeSuggestion {
9607+
public static final field INSTANCE Lorg/jetbrains/kotlinx/dataframe/columns/TypeSuggestion$Infer;
9608+
public fun equals (Ljava/lang/Object;)Z
9609+
public fun hashCode ()I
9610+
public fun toString ()Ljava/lang/String;
9611+
}
9612+
9613+
public final class org/jetbrains/kotlinx/dataframe/columns/TypeSuggestion$InferWithUpperbound : org/jetbrains/kotlinx/dataframe/columns/TypeSuggestion {
9614+
public fun <init> (Lkotlin/reflect/KType;)V
9615+
public final fun component1 ()Lkotlin/reflect/KType;
9616+
public final fun copy (Lkotlin/reflect/KType;)Lorg/jetbrains/kotlinx/dataframe/columns/TypeSuggestion$InferWithUpperbound;
9617+
public static synthetic fun copy$default (Lorg/jetbrains/kotlinx/dataframe/columns/TypeSuggestion$InferWithUpperbound;Lkotlin/reflect/KType;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/columns/TypeSuggestion$InferWithUpperbound;
9618+
public fun equals (Ljava/lang/Object;)Z
9619+
public final fun getUpperbound ()Lkotlin/reflect/KType;
9620+
public fun hashCode ()I
9621+
public fun toString ()Ljava/lang/String;
9622+
}
9623+
9624+
public final class org/jetbrains/kotlinx/dataframe/columns/TypeSuggestion$Use : org/jetbrains/kotlinx/dataframe/columns/TypeSuggestion {
9625+
public fun <init> (Lkotlin/reflect/KType;)V
9626+
public final fun component1 ()Lkotlin/reflect/KType;
9627+
public final fun copy (Lkotlin/reflect/KType;)Lorg/jetbrains/kotlinx/dataframe/columns/TypeSuggestion$Use;
9628+
public static synthetic fun copy$default (Lorg/jetbrains/kotlinx/dataframe/columns/TypeSuggestion$Use;Lkotlin/reflect/KType;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/columns/TypeSuggestion$Use;
9629+
public fun equals (Ljava/lang/Object;)Z
9630+
public final fun getType ()Lkotlin/reflect/KType;
9631+
public fun hashCode ()I
9632+
public fun toString ()Ljava/lang/String;
9633+
}
9634+
95939635
public abstract interface class org/jetbrains/kotlinx/dataframe/columns/ValueColumn : org/jetbrains/kotlinx/dataframe/DataColumn {
95949636
public abstract fun distinct ()Lorg/jetbrains/kotlinx/dataframe/columns/ValueColumn;
95959637
public abstract fun get (Ljava/lang/Iterable;)Lorg/jetbrains/kotlinx/dataframe/columns/ValueColumn;
@@ -9913,8 +9955,10 @@ public final class org/jetbrains/kotlinx/dataframe/impl/ExceptionUtilsKt {
99139955

99149956
public final class org/jetbrains/kotlinx/dataframe/impl/TypeUtilsKt {
99159957
public static final fun getValuesType (Ljava/util/List;Lkotlin/reflect/KType;Lorg/jetbrains/kotlinx/dataframe/api/Infer;)Lkotlin/reflect/KType;
9916-
public static final fun guessValueType (Lkotlin/sequences/Sequence;Lkotlin/reflect/KType;Z)Lkotlin/reflect/KType;
9958+
public static final synthetic fun guessValueType (Lkotlin/sequences/Sequence;Lkotlin/reflect/KType;Z)Lkotlin/reflect/KType;
9959+
public static final fun guessValueType (Lkotlin/sequences/Sequence;Lkotlin/reflect/KType;ZZ)Lkotlin/reflect/KType;
99179960
public static synthetic fun guessValueType$default (Lkotlin/sequences/Sequence;Lkotlin/reflect/KType;ZILjava/lang/Object;)Lkotlin/reflect/KType;
9961+
public static synthetic fun guessValueType$default (Lkotlin/sequences/Sequence;Lkotlin/reflect/KType;ZZILjava/lang/Object;)Lkotlin/reflect/KType;
99189962
public static final fun replaceGenericTypeParametersWithUpperbound (Lkotlin/reflect/KType;)Lkotlin/reflect/KType;
99199963
}
99209964

@@ -10121,9 +10165,13 @@ public final class org/jetbrains/kotlinx/dataframe/impl/columns/ComputedColumnRe
1012110165
}
1012210166

1012310167
public final class org/jetbrains/kotlinx/dataframe/impl/columns/ConstructorsKt {
10124-
public static final fun createColumn (Ljava/lang/Iterable;Lkotlin/reflect/KType;Z)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
10168+
public static final synthetic fun createColumn (Ljava/lang/Iterable;Lkotlin/reflect/KType;Z)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
1012510169
public static synthetic fun createColumn$default (Ljava/lang/Iterable;Lkotlin/reflect/KType;ZILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
10126-
public static final fun guessColumnType (Ljava/lang/String;Ljava/util/List;Lkotlin/reflect/KType;ZLjava/lang/Object;Ljava/lang/Boolean;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
10170+
public static final fun createColumnGuessingType (Ljava/lang/Iterable;Lorg/jetbrains/kotlinx/dataframe/columns/TypeSuggestion;Ljava/lang/Object;Ljava/lang/Boolean;ZZ)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
10171+
public static final fun createColumnGuessingType (Ljava/lang/String;Ljava/lang/Iterable;Lorg/jetbrains/kotlinx/dataframe/columns/TypeSuggestion;Ljava/lang/Object;Ljava/lang/Boolean;ZZ)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
10172+
public static synthetic fun createColumnGuessingType$default (Ljava/lang/Iterable;Lorg/jetbrains/kotlinx/dataframe/columns/TypeSuggestion;Ljava/lang/Object;Ljava/lang/Boolean;ZZILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
10173+
public static synthetic fun createColumnGuessingType$default (Ljava/lang/String;Ljava/lang/Iterable;Lorg/jetbrains/kotlinx/dataframe/columns/TypeSuggestion;Ljava/lang/Object;Ljava/lang/Boolean;ZZILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
10174+
public static final synthetic fun guessColumnType (Ljava/lang/String;Ljava/util/List;Lkotlin/reflect/KType;ZLjava/lang/Object;Ljava/lang/Boolean;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
1012710175
public static synthetic fun guessColumnType$default (Ljava/lang/String;Ljava/util/List;Lkotlin/reflect/KType;ZLjava/lang/Object;Ljava/lang/Boolean;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
1012810176
public static final fun newColumn (Lorg/jetbrains/kotlinx/dataframe/ColumnsContainer;Lkotlin/reflect/KType;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/api/Infer;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
1012910177
public static synthetic fun newColumn$default (Lorg/jetbrains/kotlinx/dataframe/ColumnsContainer;Lkotlin/reflect/KType;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/api/Infer;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;

0 commit comments

Comments
 (0)