diff --git a/src/distributed/bfs_rpc_messages.lcp b/src/distributed/bfs_rpc_messages.lcp index e61af48a2..25d3ff567 100644 --- a/src/distributed/bfs_rpc_messages.lcp +++ b/src/distributed/bfs_rpc_messages.lcp @@ -235,7 +235,7 @@ cpp<# query::LoadCapnpTypedValue(reader, &value, dba, data_manager); return value; }")) - (worker-id :int :capnp-save :dont-save)) + (worker-id :int :dont-save t)) (:serialize :capnp :load-args '((dba "database::GraphDbAccessor *") (data-manager "distributed::DataManager *")))) diff --git a/src/distributed/data_rpc_messages.lcp b/src/distributed/data_rpc_messages.lcp index a334a484e..703a6cb98 100644 --- a/src/distributed/data_rpc_messages.lcp +++ b/src/distributed/data_rpc_messages.lcp @@ -43,9 +43,8 @@ cpp<# #>cpp self->vertex_output = storage::LoadVertex(${reader}); cpp<#)) - (worker-id :int64_t :capnp-save :dont-save) - (vertex-output "std::unique_ptr" :initarg nil - :capnp-save :dont-save)))) + (worker-id :int64_t :dont-save t) + (vertex-output "std::unique_ptr" :initarg nil :dont-save t)))) (lcp:define-rpc edge (:request ((member "TxGidPair"))) @@ -65,9 +64,8 @@ cpp<# #>cpp self->edge_output = storage::LoadEdge(${reader}); cpp<#)) - (worker-id :int64_t :capnp-save :dont-save) - (edge-output "std::unique_ptr" :initarg nil - :capnp-save :dont-save)))) + (worker-id :int64_t :dont-save t) + (edge-output "std::unique_ptr" :initarg nil :dont-save t)))) (lcp:define-rpc vertex-count (:request ((member "tx::TransactionId" :capnp-type "UInt64"))) diff --git a/src/distributed/plan_rpc_messages.lcp b/src/distributed/plan_rpc_messages.lcp index 689c488ca..41b2d30e3 100644 --- a/src/distributed/plan_rpc_messages.lcp +++ b/src/distributed/plan_rpc_messages.lcp @@ -48,7 +48,7 @@ cpp<# :capnp-type "Utils.SharedPtr(Plan.LogicalOperator)" :capnp-save #'save-plan :capnp-load #'load-plan) (symbol-table "query::SymbolTable" :capnp-type "Query.SymbolTable") - (storage "query::AstStorage" :initarg nil :capnp-save :dont-save))) + (storage "query::AstStorage" :initarg nil :dont-save t))) (:response ())) (lcp:define-rpc remove-plan diff --git a/src/distributed/pull_produce_rpc_messages.lcp b/src/distributed/pull_produce_rpc_messages.lcp index 5f384444d..c27945359 100644 --- a/src/distributed/pull_produce_rpc_messages.lcp +++ b/src/distributed/pull_produce_rpc_messages.lcp @@ -101,17 +101,17 @@ the relevant parts of the response, ready for use.")) ${member}.emplace_back(current_frame); } cpp<#)) - (worker-id :int16_t :capnp-save :dont-save + (worker-id :int16_t :dont-save t :documentation "Id of the worker on which the response is created, used for serializing vertices (converting local to global addresses). Indicates which of (old, new) records of a graph element should be sent.") - (send-versions "storage::SendVersions" :capnp-save :dont-save) + (send-versions "storage::SendVersions" :dont-save t) ;; Temporary caches used between deserialization and post-processing ;; (transfering the ownership of this data to a Cache). - (vertices "std::vector>" :capnp-save :dont-save) - (edges "std::vector>" :capnp-save :dont-save) - (paths "std::vector" :capnp-save :dont-save)) + (vertices "std::vector>" :dont-save t) + (edges "std::vector>" :dont-save t) + (paths "std::vector" :dont-save t)) (:documentation "The data of the remote pull response. Post-processing is required after deserialization to initialize Vertex/Edge typed values in the frames (possibly diff --git a/src/lisp/lcp.lisp b/src/lisp/lcp.lisp index 236920ec9..48cd90f30 100644 --- a/src/lisp/lcp.lisp +++ b/src/lisp/lcp.lisp @@ -394,10 +394,6 @@ encoded as union inheritance in Cap'n Proto." (string-downcase (cpp-type-name val) :end 1) field-number))))) -(defun cpp-class-members-for-capnp-save (cpp-class) - (remove-if (lambda (m) (eq :dont-save (cpp-member-capnp-save m))) - (cpp-class-members cpp-class))) - (defun capnp-schema (cpp-class) "Generate Cap'n Proto serialiation schema for CPP-CLASS" (declare (type (or cpp-class cpp-enum symbol) cpp-class)) @@ -407,7 +403,7 @@ encoded as union inheritance in Cap'n Proto." (return-from capnp-schema (capnp-schema-for-enum cpp-class))) (let ((class-name (if (symbolp cpp-class) cpp-class (cpp-type-base-name cpp-class))) (members (when (typep cpp-class 'cpp-class) - (cpp-class-members-for-capnp-save cpp-class))) + (cpp-class-members-for-save cpp-class))) (inner-types (when (typep cpp-class 'cpp-class) (cpp-class-inner-types cpp-class))) (union-subclasses (capnp-union-subclasses cpp-class)) (type-params (when (typep cpp-class 'cpp-class) (cpp-type-type-params cpp-class))) @@ -739,7 +735,7 @@ Proto schema." (declare (type cpp-class cpp-class)) (declare (type string instance-access)) (with-output-to-string (s) - (dolist (member (cpp-class-members-for-capnp-save cpp-class)) + (dolist (member (cpp-class-members-for-save cpp-class)) (let ((member-access (concatenate 'string instance-access (if (eq :public (cpp-member-scope member)) @@ -788,7 +784,7 @@ Proto schema." ;; Initialize CPP-CLASS builder (when parents (if (or force-builder compose-parents - (cpp-class-members-for-capnp-save cpp-class)) + (cpp-class-members-for-save cpp-class)) (progn (format cpp-out "auto ~A_builder = ~A->~{get~A().~}init~A();~%" (cpp-variable-name (cpp-type-base-name cpp-class)) @@ -901,7 +897,7 @@ Proto schema." ;;; the ownership of the concrete type. (defun cpp-class-members-for-capnp-load (cpp-class) - (remove-if (lambda (m) (and (eq :dont-save (cpp-member-capnp-save m)) + (remove-if (lambda (m) (and (cpp-member-dont-save m) (not (cpp-member-capnp-load m)))) (cpp-class-members cpp-class))) diff --git a/src/query/frontend/ast/ast.lcp b/src/query/frontend/ast/ast.lcp index 302974233..eb0f8ff6e 100644 --- a/src/query/frontend/ast/ast.lcp +++ b/src/query/frontend/ast/ast.lcp @@ -792,7 +792,7 @@ cpp<# (function-name "std::string" :scope :public) (function "std::function" :scope :public :capnp-init nil - :capnp-save :dont-save + :dont-save t :capnp-load (lambda (reader member capnp-name) #>cpp ${member} = NameToFunction(self->get()->function_name_); diff --git a/src/query/plan/operator.lcp b/src/query/plan/operator.lcp index cef275265..f4cb2407d 100644 --- a/src/query/plan/operator.lcp +++ b/src/query/plan/operator.lcp @@ -651,10 +651,10 @@ property value. ( ;; info on what's getting expanded (node-symbol "Symbol" - :documentation "Symbol pointing to the node to be expanded. + :documentation "Symbol pointing to the node to be expanded. This is where the new node will be stored.") (edge-symbol "Symbol" - :documentation "Symbol for the edges to be expanded. + :documentation "Symbol for the edges to be expanded. This is where a TypedValue containing a list of expanded edges will be stored.") (direction "EdgeAtom::Direction" :documentation "EdgeAtom::Direction determining the direction of edge @@ -667,8 +667,8 @@ expansion. The direction is relative to the starting vertex for each expansion." "EdgeAtom::Direction" '(in out both))) (edge-types "std::vector" - :documentation "storage::EdgeType specifying which edges we want -to expand. If empty, all edges are valid. If not empty, only edges with one of + :documentation "storage::EdgeType specifying which edges we want +to expand. If empty, all edges are valid. If not empty, only edges with one of the given types are valid." :capnp-save (lcp:capnp-save-vector "::storage::capnp::Common" "storage::EdgeType") @@ -713,7 +713,7 @@ pulled.") #>cpp /** * Creates an expansion. All parameters except input and input_symbol are - * forwarded to @c ExpandCommon and are documented there. + * forwarded to @c ExpandCommon and are documented there. * * @param input Optional logical operator that preceeds this one. * @param input_symbol Symbol that points to a VertexAccessor in the frame @@ -2161,11 +2161,9 @@ vectors of symbols used by each of the inputs.") (:serialize :capnp)) (lcp:define-class output-table (logical-operator) - ((output-symbols "std::vector" :scope :public - :capnp-save :dont-save) + ((output-symbols "std::vector" :scope :public :dont-save t) (callback "std::function>()>" - :scope :public - :capnp-save :dont-save)) + :scope :public :dont-save t)) (:documentation "An operator that outputs a table, producing a single row on each pull") (:public #>cpp