Removed newData.ref

Author: tonsky

server/src/instant/db/cel.clj

@@ -425,12 +425,11 @@
    {:keys [data rule-params new-data linked-data linked-etype]}]
   (try
     (let [bindings (HashMap.)
-
           _ (.put bindings "auth" (AuthCelMap. ctx (CelMap. (:current-user ctx))))
           _ (.put bindings "data" (DataCelMap. ctx etype (CelMap. data)))
           _ (.put bindings "ruleParams" (CelMap. rule-params))
           _ (when new-data
-              (.put bindings "newData" (DataCelMap. ctx etype (CelMap. new-data))))
+              (.put bindings "newData" (CelMap. new-data)))
           _ (when linked-data
               (.put bindings "linkedData" (DataCelMap. ctx linked-etype (CelMap. linked-data))))
           result (.eval ^CelRuntime$Program cel-program
@@ -480,7 +479,7 @@
                                              (CelMap. rule-params))
                                "newData"    (if new-data
                                               (Optional/of
-                                               (DataCelMap. ctx etype (CelMap. new-data)))
+                                               (CelMap. new-data))
                                               (Optional/empty))
                                "linkedData" (if linked-data
                                               (Optional/of

server/src/instant/reactive/aggregator.clj

@@ -119,7 +119,7 @@
                                        ref-k (assoc! ref-k 1))
                                      (cms/add-batch sketch (persistent! triples))
                                      (cms/add-batch reverse-sketch (persistent! reverse-triples))
-                                     (+ triples-pg-size (:pg-size triple)))
+                                     (+ triples-pg-size (long (:pg-size triple))))
                               (recur (rest s)
                                      app-id
                                      attr-id
@@ -128,7 +128,7 @@
                                        ref-k (assoc! ref-k (inc (get reverse-triples ref-k 0))))
                                      sketch
                                      reverse-sketch
-                                     (+ triples-pg-size (:pg-size triple)))))
+                                     (+ triples-pg-size (long (:pg-size triple))))))
                           (let [forward-sketch (cms/add-batch sketch (persistent! triples))
                                 reverse-sketch (cms/add-batch reverse-sketch (persistent! reverse-triples))]
                             (vswap! sketch-count inc)

server/test/instant/db/transaction_test.clj

@@ -1693,26 +1693,21 @@
                         (map :handle)
                         set))))
 
-            (testing "ref works"
-              (test-util/test-matrix
-               [perm ["handle in data.ref('users.handle')"
-                      "handle in newData.ref('users.handle')"]]
-
-               (rule-model/put!
-                (aurora/conn-pool :write)
-                {:app-id app-id :code {:bookshelves {:allow {:update perm}
-                                                     :bind ["handle" "'alex'"]}}})
-               (permissioned-tx/transact!
-                (make-ctx)
-                [[:add-triple (resolvers/->uuid r "eid-short-stories") (resolvers/->uuid r :bookshelves/name) "Long Stories"]])
-               (is
-                (= #{"Long Stories" "Nonfiction"}
-                   (->>  (test-util/pretty-perm-q
-                          {:app-id app-id :current-user nil}
-                          {:bookshelves {:$ {:where {:users.handle "alex"}}}})
-                         :bookshelves
-                         (map :name)
-                         set)))))
+            (rule-model/put!
+             (aurora/conn-pool :write)
+             {:app-id app-id :code {:bookshelves {:allow {:update "handle in data.ref('users.handle')"}
+                                                  :bind ["handle" "'alex'"]}}})
+            (permissioned-tx/transact!
+             (make-ctx)
+             [[:add-triple (resolvers/->uuid r "eid-short-stories") (resolvers/->uuid r :bookshelves/name) "Long Stories"]])
+            (is
+             (= #{"Long Stories" "Nonfiction"}
+                (->>  (test-util/pretty-perm-q
+                       {:app-id app-id :current-user nil}
+                       {:bookshelves {:$ {:where {:users.handle "alex"}}}})
+                      :bookshelves
+                      (map :name)
+                      set)))
 
             (testing "invalid ref blocks"
               (rule-model/put!