Refactor: EXPOSED-396 fetchBatchedResults logic inside override itera…

…tor method
JetBrains · Jun 2, 2024 · 56d2dff · 56d2dff
1 parent 5df30f1
commit 56d2dff
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/Query.kt b/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/Query.kt
@@ -264,24 +264,21 @@ open class Query(override var set: FieldSet, where: Op<Boolean>?) : AbstractQuer
         limit = batchSize
         (orderByExpressions as MutableList).add(autoIncColumn to sortOrder)
         val whereOp = where ?: Op.TRUE
+        val fetchInAscendingOrder = sortOrder in listOf(SortOrder.ASC, SortOrder.ASC_NULLS_FIRST, SortOrder.ASC_NULLS_LAST)
 
         return object : Iterable<Iterable<ResultRow>> {
             override fun iterator(): Iterator<Iterable<ResultRow>> {
                 return iterator {
-                    var lastOffset: Long? = null
+                    var lastOffset = if (fetchInAscendingOrder) null else 0L
                     while (true) {
                         val query = this@Query.copy().adjustWhere {
-                            return@adjustWhere lastOffset.let {
-                                if (it == null) return@let whereOp
-
-                                return@let if (listOf(SortOrder.ASC, SortOrder.ASC_NULLS_FIRST, SortOrder.ASC_NULLS_LAST)
-                                        .contains(sortOrder)
-                                ) {
-                                    whereOp and (autoIncColumn greater it)
+                            lastOffset?.let {
+                                whereOp and if (fetchInAscendingOrder) {
+                                    (autoIncColumn greater it)
                                 } else {
-                                    whereOp and (autoIncColumn less it)
+                                    (autoIncColumn less it)
                                 }
-                            }
+                            } ?: whereOp
                         }
 
                         val results = query.iterator().asSequence().toList()