Merge branch 'refs/heads/master' into new-csv-implementation

Author: Jolanrensen

core/build.gradle.kts

@@ -74,7 +74,6 @@ dependencies {
     implementation(libs.fuel)
 
     api(libs.kotlin.datetimeJvm)
-    implementation(libs.kotlin.coroutinesCore)
     implementation(libs.kotlinpoet)
     implementation(libs.sl4j)
     implementation(libs.kotlinLogging)

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/parse.kt

@@ -7,6 +7,7 @@ import org.jetbrains.kotlinx.dataframe.DataFrame
 import org.jetbrains.kotlinx.dataframe.columns.ColumnReference
 import org.jetbrains.kotlinx.dataframe.columns.toColumnSet
 import org.jetbrains.kotlinx.dataframe.impl.api.Parsers
+import org.jetbrains.kotlinx.dataframe.impl.api.StringParser
 import org.jetbrains.kotlinx.dataframe.impl.api.parseImpl
 import org.jetbrains.kotlinx.dataframe.impl.api.tryParseImpl
 import org.jetbrains.kotlinx.dataframe.typeClass
@@ -86,13 +87,29 @@ public data class ParserOptions(
         }
 }
 
+/** @include [tryParseImpl] */
 public fun DataColumn<String?>.tryParse(options: ParserOptions? = null): DataColumn<*> = tryParseImpl(options)
 
 public fun <T> DataFrame<T>.parse(options: ParserOptions? = null): DataFrame<T> =
     parse(options) {
         colsAtAnyDepth { !it.isColumnGroup() }
     }
 
+/**
+ * Tries to parse a column of strings into a column of a different type.
+ * Each parser in [Parsers] is run in order until a valid parser is found,
+ * a.k.a. that parser was able to parse all values in the column successfully. If a parser
+ * fails to parse any value, the next parser is tried.
+ *
+ * If all fail [IllegalStateException] is thrown. If you don't want this exception to be thrown,
+ * use [tryParse] instead.
+ *
+ * Parsers that are [covered by][StringParser.coveredBy] other parsers are skipped.
+ *
+ * @param options options for parsing, like providing a locale or a custom date-time formatter
+ * @throws IllegalStateException if no valid parser is found
+ * @return a new column with parsed values
+ */
 public fun DataColumn<String?>.parse(options: ParserOptions? = null): DataColumn<*> =
     tryParse(options).also { if (it.typeClass == String::class) error("Can't guess column type") }
 

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/parse.kt

@@ -1,9 +1,5 @@
 package org.jetbrains.kotlinx.dataframe.impl.api
 
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.runBlocking
 import kotlinx.datetime.Instant
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.LocalDateTime
@@ -527,44 +523,32 @@ internal fun <T> DataColumn<String?>.parse(parser: StringParser<T>, options: Par
     return DataColumn.createValueColumn(name(), parsedValues, parser.type.withNullability(hasNulls)) as DataColumn<T?>
 }
 
-internal fun <T> DataFrame<T>.parseImpl(options: ParserOptions?, columns: ColumnsSelector<T, Any?>): DataFrame<T> =
-    runBlocking { parseParallel(options, columns) }
-
-private suspend fun <T> DataFrame<T>.parseParallel(
-    options: ParserOptions?,
-    columns: ColumnsSelector<T, Any?>,
-): DataFrame<T> =
-    coroutineScope {
-        val convertedCols = getColumnsWithPaths(columns).map { col ->
-            async {
-                when {
-                    // when a frame column is requested to be parsed,
-                    // parse each value/frame column at any depth inside each DataFrame in the frame column
-                    col.isFrameColumn() ->
-                        col.values.map {
-                            async {
-                                it.parseParallel(options) {
-                                    colsAtAnyDepth { !it.isColumnGroup() }
-                                }
-                            }
-                        }.awaitAll()
-                            .toColumn(col.name)
-
-                    // when a column group is requested to be parsed,
-                    // parse each column in the group
-                    col.isColumnGroup() ->
-                        col.parseParallel(options) { all() }
-                            .asColumnGroup(col.name())
-                            .asDataColumn()
-
-                    // Base case, parse the column if it's a `String?` column
-                    col.isSubtypeOf<String?>() ->
-                        col.cast<String?>().tryParse(options)
-
-                    else -> col
-                }.let { ColumnToInsert(col.path, it) }
-            }
-        }.awaitAll()
-
-        emptyDataFrame<T>().insertImpl(convertedCols)
+internal fun <T> DataFrame<T>.parseImpl(options: ParserOptions?, columns: ColumnsSelector<T, Any?>): DataFrame<T> {
+    val convertedCols = getColumnsWithPaths(columns).map { col ->
+        when {
+            // when a frame column is requested to be parsed,
+            // parse each value/frame column at any depth inside each DataFrame in the frame column
+            col.isFrameColumn() ->
+                col.values.map {
+                    it.parseImpl(options) {
+                        colsAtAnyDepth { !it.isColumnGroup() }
+                    }
+                }.toColumn(col.name)
+
+            // when a column group is requested to be parsed,
+            // parse each column in the group
+            col.isColumnGroup() ->
+                col.parseImpl(options) { all() }
+                    .asColumnGroup(col.name())
+                    .asDataColumn()
+
+            // Base case, parse the column if it's a `String?` column
+            col.isSubtypeOf<String?>() ->
+                col.cast<String?>().tryParse(options)
+
+            else -> col
+        }.let { ColumnToInsert(col.path, it) }
     }
+
+    return emptyDataFrame<T>().insertImpl(convertedCols)
+}

gradle/libs.versions.toml

@@ -33,7 +33,6 @@ postgresql = "42.7.4"
 sqlite = "3.46.1.0"
 jtsCore = "1.19.0"
 kotlinDatetime = "0.6.1"
-coroutines = "1.9.0"
 openapi = "2.1.22"
 kotlinLogging = "7.0.0"
 sl4j = "2.0.16"
@@ -90,7 +89,6 @@ jts = { group = "org.locationtech.jts", name = "jts-core", version.ref = "jtsCor
 
 poi-ooxml = { group = "org.apache.poi", name = "poi-ooxml", version.ref = "poi" }
 kotlin-datetimeJvm = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime-jvm", version.ref = "kotlinDatetime" }
-kotlin-coroutinesCore = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" }
 
 junit = { group = "junit", name = "junit", version.ref = "junit" }