[SKStore] Another set of minor preparatory changes

skiplang/prelude/src/skstore/Context.sk

@@ -706,11 +706,11 @@ mutable class Context private {
           | None() -> invariant_violation("Could not find parent")
           | Some(f) -> f
           };
-          EagerDir::update(
+          parent = this.unsafeGetEagerDir(parentName);
+          parent.update(
             this,
             this.dirty.maybeGet(parentName),
             this.dirtyReaders.maybeGet(parentName),
-            parentName,
             parentMaps,
             child,
           )

skiplang/prelude/src/skstore/EagerDir.sk

@@ -41,11 +41,11 @@ mutable class Writer{
 /* The signature of a function used by apply. */
 /*****************************************************************************/
 
-type MapFun = (
+type MapFun<K, F> = (
   mutable Context,
   mutable Writer,
-  Key,
-  mutable Iterator<File>,
+  K,
+  mutable Iterator<F>,
 ) ~> void;
 
 /*****************************************************************************/
@@ -679,7 +679,7 @@ class EagerDir protected {
     DirName,
     Array<
       (
-        MapFun,
+        MapFun<Key, File>,
         ?Array<KeyRange<Key>>,
         ?((mutable Context, SortedSet<Key>) ~> void),
       ),
@@ -960,7 +960,7 @@ class EagerDir protected {
     parent: EagerDir,
     childName: DirName,
     timeStack: TimeStack,
-    f: MapFun,
+    f: MapFun<Key, File>,
     acc: mutable Vector<FixedRow<Key, Array<File>>>,
     current: mutable IntRef,
   ): void {
@@ -1020,7 +1020,7 @@ class EagerDir protected {
     parent: EagerDir,
     childName: DirName,
     timeStack: TimeStack,
-    f: MapFun,
+    f: MapFun<Key, File>,
     currentStart: Int,
     currentEnd: Int,
     start: ?Boundary<Key>,
@@ -1111,7 +1111,7 @@ class EagerDir protected {
     parent: EagerDir,
     childName: DirName,
     timeStack: TimeStack,
-    f: MapFun,
+    f: MapFun<Key, File>,
     acc: mutable Vector<FixedRow<Key, Array<File>>>,
     rangeOpt: ?KeyRange<Key>,
   ): void {
@@ -1175,7 +1175,7 @@ class EagerDir protected {
     timeStack: TimeStack,
     key: Key,
     valueIter: mutable Iterator<File>,
-    f: MapFun,
+    f: MapFun<Key, File>,
   ): void {
     arrow = ArrowKey::create{parentName, childName, key};
     context.enter(arrow, timeStack);
@@ -1231,7 +1231,7 @@ class EagerDir protected {
       DirName,
       Array<
         (
-          MapFun,
+          MapFun<Key, File>,
           ?Array<KeyRange<Key>>,
           ?((mutable Context, SortedSet<Key>) ~> void),
         ),
@@ -1286,14 +1286,15 @@ class EagerDir protected {
     context: mutable Context,
     parentName: DirName,
     childName: DirName,
-    f: MapFun,
+    f: MapFun<Key, File>,
     reducerOpt: ?IReducer<File> = None(),
     rangeOpt: ?Array<KeyRange<Key>> = None(),
     onUpdate: ?((mutable Context, SortedSet<Key>) ~> void) = None(),
     unsafeSkipInit: Bool = false,
   ): void {
-    parents = FixedSingle::create(
-      mutable Vector[(parentName, Array[(f, rangeOpt, onUpdate)])],
+    parents = FixedSingle::singleton(
+      parentName,
+      Array[(f, rangeOpt, onUpdate)],
     );
     static::applyMany(context, parents, childName, reducerOpt, unsafeSkipInit);
   }
@@ -1304,7 +1305,7 @@ class EagerDir protected {
       DirName,
       Array<
         (
-          MapFun,
+          MapFun<Key, File>,
           ?Array<KeyRange<Key>>,
           ?((mutable Context, SortedSet<Key>) ~> void),
         ),
@@ -1569,21 +1570,22 @@ class EagerDir protected {
     }
   }
 
-  static fun update(
+  fun update(
+    /* this is the parent */
     context: mutable Context,
     parentDirtyOpt: ?SortedSet<Key>,
     contextDirtyReadersOpt: ?SortedMap<DirName, SortedSet<Key>>,
-    parentName: DirName,
     parentMaps: Array<
       (
-        MapFun,
+        MapFun<Key, File>,
         ?Array<KeyRange<Key>>,
         ?((mutable Context, SortedSet<Key>) ~> void),
       ),
     >,
     childRef: EagerDir,
   ): void {
-    parent = context.unsafeGetEagerDir(parentName);
+    parent = this;
+    parentName = parent.dirName;
     childName = childRef.dirName;
     timeStack = childRef.timeStack;
 

skiplang/prelude/src/skstore/FixedDir.sk

@@ -440,12 +440,20 @@ class FixedSingle<K: Orderable, +V: frozen> private (
     FixedSingle()
   }
 
+  static fun singleton(k: K, v: V): this {
+    static(Array[(k, v)])
+  }
+
+  static fun pair(kv1: (K, V), kv2: (K, V)): this {
+    static::create(mutable Vector[kv1, kv2])
+  }
+
   fun items(): mutable Iterator<(K, V)> {
     this.data.iterator()
   }
 
-  static fun createFromItems(items: Sequence<(K, V)>): this {
-    static::create(Vector::mcreateFromItems(items));
+  static fun createFromIterator(it: mutable Iterator<(K, V)>): this {
+    static::create(Vector::mcreateFromIterator(it))
   }
 
   static fun create(

skiplang/prelude/src/skstore/Handle.sk

@@ -410,10 +410,8 @@ class EHandle<K: Key, V: File> extends Handle<K, V> {
       };
       dynParents[parentName].push((dynamicMapFun, rangeOpt, None()))
     };
-    fixedParents = FixedSingle::create(
-      Vector::mcreateFromIterator(
-        dynParents.items().map(kv -> (kv.i0, kv.i1.toArray())),
-      ),
+    fixedParents = FixedSingle::createFromIterator(
+      dynParents.items().map(kv -> (kv.i0, kv.i1.toArray())),
     );
     EagerDir::applyMany(context, fixedParents, dirName, reducerOpt);
     EHandle(typeOutputKey, typeOutput, dirName)

sql/src/SqlSelect.sk

@@ -436,11 +436,9 @@ class SelectEvaluator{
 
       SKStore.EagerDir::applyMany(
         context,
-        SKStore.FixedSingle::create(
-          mutable Vector[
-            (leftHandle.dirName, Array[(noop, leftRanges, None())]),
-            (shardsDirName, Array[(noop, None(), None())]),
-          ],
+        SKStore.FixedSingle::pair(
+          (leftHandle.dirName, Array[(noop, leftRanges, None())]),
+          (shardsDirName, Array[(noop, None(), None())]),
         ),
         projLeftName,
       );
@@ -449,11 +447,9 @@ class SelectEvaluator{
 
       SKStore.EagerDir::applyMany(
         context,
-        SKStore.FixedSingle::create(
-          mutable Vector[
-            (rightHandle.dirName, Array[(noop, rightRanges, None())]),
-            (shardsDirName, Array[(noop, None(), None())]),
-          ],
+        SKStore.FixedSingle::pair(
+          (rightHandle.dirName, Array[(noop, rightRanges, None())]),
+          (shardsDirName, Array[(noop, None(), None())]),
         ),
         projRightName,
       );
@@ -494,27 +490,21 @@ class SelectEvaluator{
 
       SKStore.EagerDir::applyMany(
         context,
-        SKStore.FixedSingle::create(
-          mutable Vector[
-            (projLeftName, Array[(projLeftFun, None(), None())]),
-            (projRightName, Array[(projRightFun, None(), None())]),
-          ],
+        SKStore.FixedSingle::pair(
+          (projLeftName, Array[(projLeftFun, None(), None())]),
+          (projRightName, Array[(projRightFun, None(), None())]),
         ),
         projName,
       );
       SKStore.EagerDir::applyMany(
         context,
-        SKStore.FixedSingle::create(
-          mutable Vector[
+        SKStore.FixedSingle::singleton(
+          projName,
+          Array[
             (
-              projName,
-              Array[
-                (
-                  makeJoinReducer(shards, joinKind, kinds, onlyLeftValues),
-                  None(),
-                  None(),
-                ),
-              ],
+              makeJoinReducer(shards, joinKind, kinds, onlyLeftValues),
+              None(),
+              None(),
             ),
           ],
         ),
@@ -712,37 +702,35 @@ class SelectEvaluator{
 
         SKStore.EagerDir::applyMany(
           context,
-          SKStore.FixedSingle::create(
-            mutable Vector[
-              (
-                selectName1Empty,
-                Array[
-                  (
-                    (context, writer, key, values) ~> {
-                      dataDir = context.unsafeGetEagerDir(dataName);
-                      if (dataDir.isEmpty(context)) {
-                        writer.setArray(key, values.collect(Array))
-                      }
-                    },
-                    None(),
-                    None(),
-                  ),
-                ],
-              ),
-              (
-                dataName,
-                Array[
-                  (
-                    (_context, writer, key, values) ~> {
-                      arr = values.collect(Array);
-                      writer.setArray(key, arr)
-                    },
-                    None(),
-                    None(),
-                  ),
-                ],
-              ),
-            ],
+          SKStore.FixedSingle::pair(
+            (
+              selectName1Empty,
+              Array[
+                (
+                  (context, writer, key, values) ~> {
+                    dataDir = context.unsafeGetEagerDir(dataName);
+                    if (dataDir.isEmpty(context)) {
+                      writer.setArray(key, values.collect(Array))
+                    }
+                  },
+                  None(),
+                  None(),
+                ),
+              ],
+            ),
+            (
+              dataName,
+              Array[
+                (
+                  (_context, writer, key, values) ~> {
+                    arr = values.collect(Array);
+                    writer.setArray(key, arr)
+                  },
+                  None(),
+                  None(),
+                ),
+              ],
+            ),
           ),
           this.selectName1,
         )
@@ -1611,7 +1599,7 @@ fun makeJoinReducer(
   joinKind: P.JoinKind,
   kinds: Array<(Int, P.IKind, P.Type)>,
   onlyLeftValues: Bool,
-): SKStore.MapFun {
+): SKStore.MapFun<SKStore.Key, SKStore.File> {
   (context, writer, _, files) ~> {
     leftRows = mutable Vector[];
     rightRows = mutable Vector[];