fix #9: do not fail on mapped tables.

dzmipt · Nov 15, 2021 · 97005b0 · 97005b0
1 parent c9c025e
commit 97005b0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/kx/c.java b/src/kx/c.java
@@ -347,9 +347,14 @@ K.KBase r() throws UnsupportedEncodingException {
         if (t == 99)
             return new K.Dict(r(), r());
         byte attr = b[j++];
-        if (t == 98)
-            return new K.Flip((K.Dict) r());
-        n = ri();
+        if (t == 98) {
+            K.Dict d = (K.Dict)r();
+            if (d.x.getType() == 11 && d.y.getType()>=0) {
+                return new K.Flip(d);
+            } else {
+                return d;
+            }
+        }        n = ri();
         switch (t) {
             case 0: {
                 K.KBase[] array = new K.KBase[n];

diff --git a/src/studio/kdb/KTableModel.java b/src/studio/kdb/KTableModel.java
@@ -14,7 +14,13 @@ public static KTableModel getModel(K.KBase obj) {
         }
 
         if (obj instanceof K.Dict) {
-            return new DictTableModel((K.Dict)obj);
+            K.Dict dict = (K.Dict) obj;
+            if ( (dict.x instanceof K.KBaseVector || dict.x instanceof K.Flip) &&
+                 (dict.y instanceof K.KBaseVector || dict.y instanceof K.Flip) ) {
+                return new DictTableModel((K.Dict) obj);
+            } else {
+                return null; // dict for memory mapped table
+            }
         }
 
         if ((obj instanceof K.KBaseVector) && obj.getType() != 10 && obj.getType() != 4) {