Refactored Bench to use IPersistentSet. Extracted slices to ISortedSet

Author: tonsky

README.md

@@ -23,7 +23,7 @@ The intention with DataScript is to be a basic building block in client-side app
 
 ## Support us
 
-<a href="https://patreon.com/tonsky" target="_blank"><img src="./datascript_patreon.png"></a>
+<a href="https://patreon.com/tonsky" target="_blank"><img src="./extras/datascript_patreon.png"></a>
 
 ## Resources
 

datascript_patreon.png extras/datascript_patreon.pngdatascript_patreon.png renamed to extras/datascript_patreon.png

@@ -18,19 +18,7 @@ public ASortedSet(IPersistentMap meta, Comparator cmp) {
   // IMeta
   public IPersistentMap meta() { return _meta; }
 
-  // IObj
-  abstract public ASortedSet withMeta(IPersistentMap meta);
-
-  // Counted
-  abstract public int count();
-
-  //  Seqable
-  abstract public ISeq seq();
-
   // IPersistentCollection
-  abstract public ASortedSet empty();
-  abstract public ASortedSet cons(Object key);
-
   public boolean equiv(Object obj) {
     if (!(obj instanceof Set)) return false;
     Set s = (Set) obj;
@@ -39,8 +27,6 @@ public boolean equiv(Object obj) {
   }
 
   // IPersistentSet
-  abstract public ASortedSet disjoin(Object key);
-  abstract public boolean contains(Object o);
   public Object get(Object key) { return contains(key) ? key : null; }
 
   //  ILookup
@@ -58,9 +44,6 @@ public int hasheq() {
     return _hasheq;
   }
 
-  // Iterable
-  abstract public Iterator iterator();
-
   // Collection
   public boolean containsAll​(Collection c) {
     for (Object o: c)

repl.sh

@@ -0,0 +1,22 @@
+package datascript;
+
+import java.util.*;
+import clojure.lang.*;
+
+public interface ISortedSet extends Seqable, Reversible, Sorted {
+  ISeq slice(Object from, Object to, Comparator cmp);
+  ISeq rslice(Object from, Object to, Comparator cmp);
+
+  default ISeq slice(Object from, Object to) { return slice(from, to, comparator()); }
+  default ISeq rslice(Object from, Object to) { return rslice(from, to, comparator()); }
+
+  //  Seqable
+  default ISeq seq() { return slice(null, null, comparator()); }
+
+  // Reversible
+  default ISeq rseq() { return rslice(null, null, comparator()); }
+
+  // Sorted
+  default ISeq seq(boolean asc) { return asc ? slice(null, null, comparator()) : rslice(null, null, comparator()); }
+  default ISeq seqFrom(Object key, boolean asc) { return asc ? slice(key, null, comparator()) : rslice(key, null, comparator()); }
+}

src-java/datascript/ASortedSet.java

@@ -23,13 +23,15 @@
 */
 
 @SuppressWarnings("unchecked")
-public class SortedSet extends ASortedSet implements IEditableCollection, ITransientCollection, Reversible, Sorted, IReduce {
+public class SortedSet extends ASortedSet implements IEditableCollection, ITransientSet, Reversible, Sorted, IReduce, ISortedSet {
 
   static Leaf[] EARLY_EXIT = new Leaf[0],
                 UNCHANGED  = new Leaf[0];
 
   static int MIN_LEN = 32, MAX_LEN = 64, EXTRA_LEN = 8;
 
+  public static final SortedSet EMPTY = new SortedSet();
+
   static class Edit {
     public volatile boolean _value = false;
     Edit(boolean value) { _value = value; }
@@ -62,6 +64,7 @@ public SortedSet(IPersistentMap meta, Comparator cmp) {
     _edit  = edit;
   }
 
+  // ISortedSet
   public Seq slice(Object from, Object to) { return slice(from, to, _cmp); }
   public Seq slice(Object from, Object to, Comparator cmp) {
     assert from == null || to == null || cmp.compare(from, to) <= 0 : "From " + from + " after to " + to;
@@ -158,27 +161,19 @@ public SortedSet withMeta(IPersistentMap meta) {
   // Counted
   public int count() { return _count; }
 
-  //  Seqable
-  public Seq seq() { return slice(null, null, _cmp); }
-
-  // Reversible
-  public ISeq rseq() { return rslice(null, null, _cmp); }
-
   // Sorted
   public Comparator comparator() { return _cmp; }
   public Object entryKey(Object entry) { return entry; }
-  public ISeq seq(boolean asc) { return asc ? seq() : rseq(); }
-  public ISeq seqFrom(Object key, boolean asc) { return asc ? slice(key, null) : rslice(key, null); }
 
   // IReduce
   public Object reduce(IFn f) {
-    Seq seq = seq();
+    Seq seq = (Seq) seq();
     return seq == null ? f.invoke() : seq.reduce(f);
   }
 
   public Object reduce(IFn f, Object start) {
-    Seq seq = seq();
-    return seq == null ? start : seq().reduce(f, start);
+    Seq seq = (Seq) seq();
+    return seq == null ? start : seq.reduce(f, start);
   }
 
   // IPersistentCollection
@@ -263,7 +258,7 @@ public SortedSet persistent() {
 
   // Iterable
   public Iterator iterator() {
-    return new JavaIter(seq());
+    return new JavaIter((Seq) seq());
   }
 
 

src-java/datascript/ISortedSet.java

@@ -0,0 +1,42 @@
+package clojure.lang;
+
+import java.util.*;
+import clojure.java.api.Clojure;
+
+@SuppressWarnings("unchecked")
+public class ClojureSet extends PersistentTreeSet implements datascript.ISortedSet {
+  static public final ClojureSet EMPTY = new ClojureSet(null, PersistentTreeMap.EMPTY);
+
+  static IFn takeWhile;
+  static {
+    takeWhile = (IFn) Clojure.var("clojure.core", "take-while");
+  }
+
+  ClojureSet(IPersistentMap meta, IPersistentMap impl) {
+    super(meta, impl);
+  }
+
+  public IPersistentSet cons(Object o) {
+    if(contains(o))
+      return this;
+    return new ClojureSet(meta(), impl.assoc(o,o));
+  }
+
+  public ISeq slice(Object from, Object to, Comparator cmp) {
+    IFn pred = new AFn() {
+      public Object invoke(Object arg) {
+        return cmp.compare(arg, to) <= 0; 
+      }
+    };
+    return (ISeq) takeWhile.invoke(pred, seqFrom(from, true));
+  }
+
+  public ISeq rslice(Object from, Object to, Comparator cmp) {
+    IFn pred = new AFn() {
+      public Object invoke(Object arg) {
+        return cmp.compare(arg, to) >= 0; 
+      }
+    };
+    return (ISeq) takeWhile.invoke(pred, seqFrom(from, false));
+  }
+}