flok 0.0.85 → 0.0.86

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a54d7b4eb562d2e9c7ad773c6d24768b52dc5846
-  data.tar.gz: c32c892e3d2554ace4f96f820c76be6f27937a01
+  metadata.gz: 79132faeb16d0bf4de2723307d51313d97186e88
+  data.tar.gz: b3e8e4d92cf40227136cb9be54202f627041af19
 SHA512:
-  metadata.gz: 027ab89d55f7f796c6936a521037d8cbd793dec833760191873556899e891d9c701c5f0f1c36d4b207f008699cd773c54c29994bca170dba56edd15251793b95
-  data.tar.gz: e153d16196eb2370784bb1f41c48573018a380a1c7d430efe281e8732692d215262029f342cfa29d40acd38c1c0e70e26c5d324aaf2c47ba2be2ad019b430a53
+  metadata.gz: 43c7946e65a229ed70b1d6658dd93a86776385e6cd57f461a4debc97b9e82adb06899cfaac71b63608622b6381586c95a471f1ef23e2c378cacbb7403522fb0b
+  data.tar.gz: 3a6ad4ba5bbbe9bdf504f1128ac23e04751cae4431baea66f31c8890d268ffa6000018ad22708e958cccb949804e20b01dc5d04077b7d7dc262a435a98088c0b

data/app/kern/pagers/pg_sockio.js

@@ -20,7 +20,8 @@
       }
 
       //Mark page as synced if it contains no changes, we don't need to check base
-      //here because if it has base, it has __changes as well
+      //here because if it has base, it has __changes as well, we're using einfo
+      //at this point, because it was rebased
       if (einfo.page.__changes === undefined) {
         vm_pg_unmark_needs_sync(pg_sockio<%= i %>_ns, einfo.page._id)
       }
@@ -118,7 +119,13 @@
     var page = vm_cache[pg_sockio<%= i %>_ns][page_id];
     //Clone page and send a copy to the server
     var copied = vm_copy_page(page);
-    var info = {page: copied, changes: page.__changes, changes_id: page.__changes_id};
+
+    //Depending on whether the page is based, send the changes id
+    if (page.__base !== undefined) {
+      var info = {page: copied, changes: page.__base.__changes, changes_id: page.__base.__changes_id};
+    } else {
+      var info = {page: copied, changes: page.__changes, changes_id: page.__changes_id};
+    }
     SEND("net", "if_sockio_send", pg_sockio<%= i %>_bp, "write", info);
   }
 <% end %>

data/lib/flok/version.rb

@@ -1,3 +1,3 @@
 module Flok
-  VERSION = "0.0.85"
+  VERSION = "0.0.86"
 end

data/spec/kern/assets/vm/pg_sockio/write2d.rb

@@ -0,0 +1,39 @@
+controller :my_controller do
+  services :vm
+
+  on_entry %{
+    read_res_params = [];
+
+    /////////////////////////////////////////////////////////////////////////
+    //Create a page and commit it to the sockio cache (cheating)
+    //This way we know a commit should be performed when a write goes through
+    /////////////////////////////////////////////////////////////////////////
+    var page = vm_create_page("test");
+    page.entries.push(
+      {"_id": "test", "_sig": "test", "val": "test"}
+    );
+    page.__changes_id = "my_changes_id";
+    page.__changes = [];
+    vm_reindex_page(page);
+    vm_rehash_page(page);
+    vm_cache["sockio"]["test"] = page;
+    /////////////////////////////////////////////////////////////////////////
+  }
+
+  action :my_action do
+    on_entry %{
+      var page = vm_create_page("test");
+
+      var info = {
+        ns: "sockio",
+        page: page,
+      };
+
+      Request("vm", "write", info);
+    }
+
+    on "read_res", %{
+      read_res_params.push(JSON.parse(JSON.stringify(params)));
+    }
+  end
+end

data/spec/kern/vm_sockio_pager_spec.rb

@@ -854,6 +854,27 @@ RSpec.describe "kern:sockio_pager" do
     expect(res[2]["changes_id"].class).to eq(String)
   end
 
+  it "Does write to sockio interface when a page is requested to be written with changes with a page and changes (and the cached page is based)" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/pg_sockio/write2d.rb'), File.read("./spec/kern/assets/vm/pg_sockio/config.rb") 
+    dump = ctx.evald %{
+      //Call embed on main root view
+      dump.base = _embed("my_controller", 0, {}, null);
+
+      //Drain queue
+      int_dispatch([]);
+
+      dump.vm_cache = vm_cache;
+    }
+
+    #The kernel should have signaled to the driver to send a sockio request with the changes
+    @driver.ignore_up_to "if_sockio_send", 1
+    res = @driver.get "if_sockio_send", 1
+    expect(res[2]["page"]["_id"]).to eq("test")
+    expect(res[2]["changes"]).to eq([])
+    expect(res[2]["changes_id"]).to eq("my_changes_id")
+  end
+
+
   it "Does write to sockio interface when a page is requested to be written without changes with a page: and no changes: field" do
     ctx = flok_new_user File.read('./spec/kern/assets/vm/pg_sockio/write3.rb'), File.read("./spec/kern/assets/vm/pg_sockio/config.rb") 
     dump = ctx.evald %{

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flok
 version: !ruby/object:Gem::Version
-  version: 0.0.85
+  version: 0.0.86
 platform: ruby
 authors:
 - seo
@@ -1284,6 +1284,7 @@ files:
 - spec/kern/assets/vm/pg_sockio/watch3.rb
 - spec/kern/assets/vm/pg_sockio/write.rb
 - spec/kern/assets/vm/pg_sockio/write2.rb
+- spec/kern/assets/vm/pg_sockio/write2d.rb
 - spec/kern/assets/vm/pg_sockio/write3.rb
 - spec/kern/assets/vm/service0.rb
 - spec/kern/assets/vm/service_controller0.rb
@@ -2238,6 +2239,7 @@ test_files:
 - spec/kern/assets/vm/pg_sockio/watch3.rb
 - spec/kern/assets/vm/pg_sockio/write.rb
 - spec/kern/assets/vm/pg_sockio/write2.rb
+- spec/kern/assets/vm/pg_sockio/write2d.rb
 - spec/kern/assets/vm/pg_sockio/write3.rb
 - spec/kern/assets/vm/service0.rb
 - spec/kern/assets/vm/service_controller0.rb