andygrove commented on code in PR #1133:
URL: https://github.com/apache/datafusion-comet/pull/1133#discussion_r1870695131
##########
native/core/src/execution/operators/scan.rs:
##########
@@ -200,6 +217,21 @@ impl ScanExec {
let mut env = JVMClasses::get_env()?;
+ let mut timer = jvm_fetch_time.timer();
+
+ let num_rows: i32 = unsafe {
+ jni_call!(&mut env,
+ comet_batch_iterator(iter).has_next() -> i32)?
+ };
+
+ timer.stop();
+
+ if num_rows == -1 {
+ return Ok(InputBatch::EOF);
+ }
Review Comment:
I have now replaced the check at 268 with an assertion
##########
spark/src/main/java/org/apache/comet/CometBatchIterator.java:
##########
@@ -47,12 +62,8 @@ public class CometBatchIterator {
* @return the number of rows of the current batch. -1 if there is no more
batch.
*/
public int next(long[] arrayAddrs, long[] schemaAddrs) {
- boolean hasBatch = input.hasNext();
-
- if (!hasBatch) {
- return -1;
- }
-
- return nativeUtil.exportBatch(arrayAddrs, schemaAddrs, input.next());
+ int numRows = nativeUtil.exportBatch(arrayAddrs, schemaAddrs,
currentBatch);
Review Comment:
fixed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscr...@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscr...@datafusion.apache.org
For additional commands, e-mail: github-h...@datafusion.apache.org
