CLJ-2742 Revert range to use chunking as before the IDrop changes in CLJ-2713

puredanger · puredanger · commit 1e835a9d9fb4 · 2023-03-08T09:39:53.000-06:00
diff --git a/src/jvm/clojure/lang/LongRange.java b/src/jvm/clojure/lang/LongRange.java
@@ -116,16 +116,23 @@ public ISeq next() {
     }
 }
 
+private static final int CHUNK_SIZE = 32;
+
 public IChunk chunkedFirst() {
-    return new LongChunk(start, step, count);
+    return new LongChunk(start, step, Math.min(count, CHUNK_SIZE));
 }
 
 public ISeq chunkedNext() {
-    return null;
+    return chunkedMore().seq();
 }
 
 public ISeq chunkedMore() {
-    return PersistentList.EMPTY;
+    if(count <= CHUNK_SIZE) {
+        return PersistentList.EMPTY;
+    } else {
+        return LongRange.create(start + (step * CHUNK_SIZE), end, step);
+    }
+
 }
 
 public Sequential drop(int n) {

Original file line number	Diff line number	Diff line change
`@@ -116,16 +116,23 @@ public ISeq next() {`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`
	`119`	`+private static final int CHUNK_SIZE = 32;`
	`120`	`+`
`119`	`121`	`public IChunk chunkedFirst() {`
`120`		`- return new LongChunk(start, step, count);`
	`122`	`+ return new LongChunk(start, step, Math.min(count, CHUNK_SIZE));`
`121`	`123`	`}`
`122`	`124`
`123`	`125`	`public ISeq chunkedNext() {`
`124`		`- return null;`
	`126`	`+ return chunkedMore().seq();`
`125`	`127`	`}`
`126`	`128`
`127`	`129`	`public ISeq chunkedMore() {`
`128`		`- return PersistentList.EMPTY;`
	`130`	`+ if(count <= CHUNK_SIZE) {`
	`131`	`+ return PersistentList.EMPTY;`
	`132`	`+ } else {`
	`133`	`+ return LongRange.create(start + (step * CHUNK_SIZE), end, step);`
	`134`	`+ }`
	`135`	`+`
`129`	`136`	`}`
`130`	`137`
`131`	`138`	`public Sequential drop(int n) {`