Merge pull request #4907 from zhang2014/fix/ISSUE-4807

fixes(limit): fixes limit and offset with one block

query/src/pipelines/new/processors/transforms/transform_limit.rs

@@ -100,9 +100,20 @@ impl<const MODE: usize> TransformLimitImpl<MODE> {
             return None;
         }
 
-        let remaining = self.skip_remaining;
-        self.skip_remaining = 0;
-        Some(data_block.slice(remaining, rows - remaining))
+        match MODE {
+            OFFSET_AND_LIMIT => {
+                let offset = self.skip_remaining;
+                self.skip_remaining = 0;
+                let length = std::cmp::min(self.take_remaining, rows - offset);
+                self.take_remaining -= length;
+                Some(data_block.slice(offset, length))
+            }
+            _ => {
+                let offset = self.skip_remaining;
+                self.skip_remaining = 0;
+                Some(data_block.slice(offset, rows - offset))
+            }
+        }
     }
 }
 

tests/suites/0_stateless/01_system/01_0004_system_engines.result

@@ -0,0 +1,2 @@
+GITHUB	GITHUB Storage Engine
+MEMORY	MEMORY Storage Engine

tests/suites/0_stateless/01_system/01_0004_system_engines.sql

@@ -0,0 +1 @@
+SELECT * FROM system.engines ORDER BY Engine LIMIT 1,2;