idsync: calc Property fb attributes only on sync #25

Author: loryruta

objectbox/model/entity.py

@@ -53,6 +53,11 @@ def uid(self) -> int:
     def has_uid(self) -> bool:
         return self.iduid.uid != 0
 
+    def on_sync(self):
+        """ Method called once ID/UID are synced with the model file. """
+        for prop in self.properties:
+            prop.on_sync()
+
     def __call__(self, **properties):
         """ The constructor of the user Entity class. """
         object_ = self.user_type()
@@ -198,9 +203,7 @@ def marshal(self, object, id: int) -> bytearray:
                     val = date_value_to_int(val, 1000000000)  # convert to nanoseconds
                 builder.Prepend(prop._fb_type, val)
 
-            fb_slot = prop_id - 1
-            # fb_v_offset = 4 + 2 * fb_slot
-            builder.Slot(fb_slot)
+            builder.Slot(prop._fb_slot)
 
         builder.Finish(builder.EndObject())
         return builder.Output()
@@ -216,10 +219,7 @@ def unmarshal(self, data: bytes):
 
         # fill it with the data read from FlatBuffers
         for prop in self.properties:
-            fb_slot = prop.id - 1
-            fb_v_offset = 4 + 2 * fb_slot
-            # 4 + 2 * fb_slot
-            o = table.Offset(fb_v_offset)
+            o = table.Offset(prop._fb_v_offset)
             val = None
             ob_type = prop._ob_type
             if not o:

objectbox/model/idsync.py

@@ -285,6 +285,8 @@ def sync(self) -> bool:
             logger.info(f"Model changed, writing model.json: {self.model_filepath}")
             self._save_model_json()
 
+        self.model.on_sync()  # Notify model synced
+
         return write_json
 
 

objectbox/model/model.py

@@ -30,6 +30,11 @@ def __init__(self):
 
         self._c_model = None
 
+    def on_sync(self):
+        """ Method called once ID/UID are synced with the model file. """
+        for entity in self.entities:
+            entity.on_sync()
+
     def entity(self, entity: _Entity):
         if not isinstance(entity, _Entity):
             raise Exception(f"The given type is not an Entity: {type(entity)}. "

objectbox/model/properties.py

@@ -182,6 +182,9 @@ def __init__(self, pytype: Type, uid: int = 0, **kwargs):
         self._flags = 0
         self._set_flags()
 
+        self._fb_slot = None
+        self._fb_v_offset = None
+
     @property
     def id(self):
         return self.iduid.id
@@ -196,6 +199,11 @@ def has_uid(self):
     def is_id(self) -> bool:
         return isinstance(self, Id)
 
+    def on_sync(self):
+        """ Method called once ID/UID are synced with the model file. """
+        self._fb_slot = self.id - 1
+        self._fb_v_offset = 4 + 2 * self._fb_slot
+
     def _determine_ob_type(self) -> OBXPropertyType:
         """ Tries to infer the OBX property type from the Python type. """
         ts = self._py_type