chunk查询方法使用lazy方法重写并优化实现

Author: liu21st

src/db/LazyCollection.php

@@ -577,4 +577,36 @@ public function whereNotBetween(string $field, $value)
     {
         return $this->where($field, 'not between', $value);
     }
+
+    /**
+     * 分块处理数据
+     * @param int $size 块大小
+     * @return static
+     */
+    public function chunk(int $size)
+    {
+        if ($size <= 0) {
+            throw new \InvalidArgumentException('Size should be greater than 0');
+        }
+
+        return new static(function () use ($size) {
+            $chunk = [];
+            $count = 0;
+
+            foreach ($this->getIterator() as $key => $value) {
+                $chunk[$key] = $value;
+                $count++;
+
+                if ($count >= $size) {
+                    yield new Collection($chunk);
+                    $chunk = [];
+                    $count = 0;
+                }
+            }
+
+            if (!empty($chunk)) {
+                yield new Collection($chunk);
+            }
+        });
+    }
 }

src/db/Query.php

@@ -14,6 +14,7 @@
 namespace think\db;
 
 use PDOStatement;
+use think\Collection;
 use think\db\exception\DbException as Exception;
 use think\model\LazyCollection as ModelLazyCollection;
 
@@ -552,51 +553,15 @@ public function stream(callable $callback, bool $unbuffered = false): int
      */
     public function chunk(int $count, callable $callback, string | array | null $column = null, string $order = 'asc'): bool
     {
-        if ($count < 1) {
-            throw new Exception('The chunk size should be at least 1');
-        }
-
-        $options = $this->getOptions();
-        $column  = $column ?: $this->getPk();
-        $bind    = $this->bind;
-
-        if ($this->getOption('order') || !is_string($column)) {
-            $times = 1;
-            $resultSet = $this->options($options)->page($times, $count)->select();
-        } else {
-            $resultSet = $this->options($options)->order($column, $order)->limit($count)->select();
-
-            if (str_contains($column, '.')) {
-                [$alias, $key] = explode('.', $column);
-            } else {
-                $key = $column;
-            }
-        }
-
-        while (true) {
-            if (false === call_user_func($callback, $resultSet)) {
+        $chunks = $this->lazy($count, $column, $order)->chunk($count);
+        
+        foreach ($chunks as $chunk) {
+            $result = $callback($chunk);
+            if ($result === false) {
                 return false;
             }
-
-            if (count($resultSet) < $count) {
-                break;
-            }
-
-            if (isset($times)) {
-                $times++;
-                $query = $this->options($options)->page($times, $count);
-            } else {
-                $end    = $resultSet->pop();
-                $lastId = is_array($end) ? $end[$key] : $end->getData($key);
-
-                $query = $this->options($options)
-                    ->limit($count)
-                    ->where($column, 'asc' == strtolower($order) ? '>' : '<', $lastId);
-            }
-
-            $resultSet = $query->bind($bind)->order($column, $order)->select();
         }
-
+        
         return true;
     }