RDBC-700 Misc

Author: poissoncorp

ravendb/__init__.py

@@ -177,7 +177,7 @@
 from ravendb.documents.session.document_info import DocumentInfo
 from ravendb.documents.session.document_session import DocumentSession
 from ravendb.documents.session.entity_to_json import EntityToJson
-from ravendb.documents.session.in_memory_document_session_operations import InMemoryDocumentSessionOperations
+from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import InMemoryDocumentSessionOperations
 from ravendb.documents.session.loaders.include import IncludeBuilder, IncludeBuilderBase, QueryIncludeBuilder
 from ravendb.documents.session.loaders.loaders import (
     LoaderWithInclude,

ravendb/documents/commands/batches.py

@@ -23,7 +23,7 @@
 if TYPE_CHECKING:
     from ravendb.documents.conventions import DocumentConventions
     from ravendb.documents.operations.patch import PatchRequest
-    from ravendb.documents.session.in_memory_document_session_operations import InMemoryDocumentSessionOperations
+    from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import InMemoryDocumentSessionOperations
 
 
 class CommandType(Enum):

ravendb/documents/indexes/definitions.py

@@ -519,8 +519,11 @@ def __str__(self):
 
 
 class RollingIndex:
-    def __init__(self, active_deployments: Optional[Dict[str, RollingIndexDeployment]]):
+    def __init__(
+        self, active_deployments: Optional[Dict[str, RollingIndexDeployment]], raft_command_index: Optional[int] = None
+    ):
         self.active_deployments = active_deployments
+        self.raft_command_index = raft_command_index
 
 
 class RollingIndexDeployment:

ravendb/documents/operations/batch.py

@@ -12,7 +12,7 @@
 from ravendb.tools.utils import CaseInsensitiveDict
 
 if TYPE_CHECKING:
-    from ravendb.documents.session.in_memory_document_session_operations import InMemoryDocumentSessionOperations
+    from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import InMemoryDocumentSessionOperations
 
 
 class BatchOperation:

ravendb/documents/operations/compare_exchange/compare_exchange.py

@@ -6,6 +6,7 @@
 from ravendb import constants
 from ravendb.documents.conventions import DocumentConventions
 from ravendb.documents.commands.batches import PutCompareExchangeCommandData, DeleteCompareExchangeCommandData
+from ravendb.documents.session.document_session_operations.misc import _update_metadata_modifications
 from ravendb.exceptions.raven_exceptions import RavenException
 from ravendb.json.metadata_as_dictionary import MetadataAsDictionary
 from ravendb.documents.session.entity_to_json import EntityToJson
@@ -98,7 +99,12 @@ def get_value(
                 self.__value = value
                 return value
 
-            value = CompareExchangeValue(self._key, self._index, entity)
+            value = CompareExchangeValue(
+                self._key,
+                self._index,
+                entity,
+                self.__original_value.metadata if self.__original_value is not None else None,
+            )
             self.__value = value
 
             return value
@@ -145,15 +151,34 @@ def get_command(
             entity = EntityToJson.convert_entity_to_json_internal_static(self.__value.value, conventions, None, False)
 
             entity_json = entity if isinstance(entity, dict) else None
-            metadata = None
+            metadata = (
+                self.__original_value.value.get(constants.Documents.Metadata.KEY, None)
+                if self.__original_value is not None
+                else None
+            )
+            metadata_has_changed = False
+
             if self.__value.has_metadata and len(self.__value.metadata) != 0:
-                metadata = self.prepare_metadata_for_put(self._key, self.__value.metadata, conventions)
+                if metadata is None:
+                    metadata_has_changed = True
+                    # create new metadata (because there wasn't any metadata before)
+                    metadata = self.prepare_metadata_for_put(self._key, self.__value.metadata, conventions)
+                else:
+                    self.validate_metadata_for_put(self._key, self.__value.metadata)
+                    metadata_has_changed = _update_metadata_modifications(
+                        self.__value.metadata, metadata
+                    )
+
             entity_to_insert = None
-            if not entity_json:
+            if not entity_json or metadata_has_changed:
                 entity_json = entity_to_insert = self.__convert_entity(self._key, entity, metadata)
 
             new_value = CompareExchangeValue(self._key, self._index, entity_json)
-            has_changed = self.__original_value is None or self.has_changed(self.__original_value, new_value)
+            has_changed = (
+                self.__original_value is None
+                or metadata_has_changed
+                or self.has_changed(self.__original_value, new_value)
+            )
             self.__original_value = new_value
             if not has_changed:
                 return None
@@ -212,15 +237,17 @@ def update_value(self, value: CompareExchangeValue):
     def prepare_metadata_for_put(
         key: str, metadata_dictionary: MetadataAsDictionary, conventions: DocumentConventions
     ) -> dict:
-        if constants.Documents.Metadata.EXPIRES in metadata_dictionary:
-            obj = metadata_dictionary.get(constants.Documents.Metadata.EXPIRES)
-            if not obj:
-                raise ValueError(
-                    f"The values of {constants.Documents.Metadata.EXPIRES} metadata for compare exchange '{key}' is None"
-                )
+        CompareExchangeSessionValue.validate_metadata_for_put(key, metadata_dictionary)
+
+        return metadata_dictionary.metadata
+
+    @staticmethod
+    def validate_metadata_for_put(key: str, metadata_as_dictionary: MetadataAsDictionary) -> None:
+        if constants.Documents.Metadata.EXPIRES in metadata_as_dictionary:
+            obj = metadata_as_dictionary[constants.Documents.Metadata.EXPIRES]
+            if obj is None:
+                f"The values of {constants.Documents.Metadata.EXPIRES} metadata for compare exchange '{key}' is None"
             if not isinstance(obj, datetime.datetime) and not isinstance(obj, str):
                 raise ValueError(
                     f"The type of {constants.Documents.Metadata.EXPIRES} metadata for compare exchange '{key}' is not valid. Use the following type: datetime.datetime or string"
                 )
-
-        return metadata_dictionary.metadata

ravendb/documents/operations/executor.py

@@ -14,7 +14,7 @@
 from ravendb.serverwide.server_operation_executor import ServerOperationExecutor
 
 if TYPE_CHECKING:
-    from ravendb.documents.session.in_memory_document_session_operations import InMemoryDocumentSessionOperations
+    from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import InMemoryDocumentSessionOperations
     from ravendb.http.request_executor import RequestExecutor
     from ravendb.documents import DocumentStore
 

ravendb/documents/session/cluster_transaction_operation.py

@@ -22,10 +22,9 @@
 from ravendb.documents.operations.compare_exchange.compare_exchange_value_result_parser import (
     CompareExchangeValueResultParser,
 )
-from ravendb.util.util import StartingWithOptions
 
 if TYPE_CHECKING:
-    from ravendb.documents.session.in_memory_document_session_operations import InMemoryDocumentSessionOperations
+    from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import InMemoryDocumentSessionOperations
     from ravendb.documents.session.document_session import DocumentSession
     from ravendb import Lazy
 

ravendb/documents/session/document_session.py

@@ -16,7 +16,6 @@
 from ravendb.exceptions.exceptions import InvalidOperationException
 from ravendb.data.operation import AttachmentType
 from ravendb.data.timeseries import TimeSeriesRange
-import ravendb.documents
 from ravendb.documents.indexes.definitions import AbstractCommonApiForIndexes
 from ravendb.documents.operations.attachments import (
     GetAttachmentOperation,
@@ -31,7 +30,7 @@
     IClusterTransactionOperations,
 )
 from ravendb.documents.session.document_info import DocumentInfo
-from ravendb.documents.session.in_memory_document_session_operations import InMemoryDocumentSessionOperations
+from ravendb.documents.session.document_session_operations.in_memory_document_session_operations import InMemoryDocumentSessionOperations
 from ravendb.documents.session.loaders.include import IncludeBuilder
 from ravendb.documents.session.loaders.loaders import LoaderWithInclude, MultiLoaderWithInclude
 from ravendb.documents.session.operations.lazy import LazyLoadOperation, LazySessionOperations

ravendb/documents/session/document_session_operations/__init__.py

@@ -6,6 +6,7 @@
 from abc import abstractmethod
 
 from ravendb.documents.operations.executor import OperationExecutor
+from ravendb.documents.session.document_session_operations.misc import _update_metadata_modifications
 from ravendb.documents.session.misc import (
     SessionOptions,
     TransactionMode,
@@ -985,18 +986,6 @@ def _clear_cluster_session(self) -> None:
     def cluster_transaction(self) -> ClusterTransactionOperationsBase:
         raise RuntimeError(f"{self.__class__.__name__} must override the cluster_session property method")
 
-    @staticmethod
-    def __update_metadata_modifications(document_info: DocumentInfo) -> bool:
-        dirty = False
-        if document_info.metadata_instance is not None:
-            if document_info.metadata_instance.is_dirty:
-                dirty = True
-            for key, value in document_info.metadata_instance.items():
-                if value is None or isinstance(value, MetadataAsDictionary) and value.is_dirty is True:
-                    dirty = True
-                document_info.metadata[key] = json.loads(json.dumps(value, default=Utils.json_default))
-        return dirty
-
     def __prepare_for_creating_revisions_from_ids(self, result: SaveChangesData) -> None:
         for id_entry in self._ids_for_creating_forced_revisions:
             result.session_commands.append(ForceRevisionCommandData(id_entry))
@@ -1056,7 +1045,7 @@ def __prepare_for_entities_puts(self, result: SaveChangesData) -> None:
             if self.is_deleted(entity.value.key):
                 continue
 
-            dirty_metadata = self.__update_metadata_modifications(entity.value)
+            dirty_metadata = _update_metadata_modifications(entity.value.metadata_instance, entity.value.metadata)
 
             document = self.entity_to_json.convert_entity_to_json(entity.key, entity.value)
 
@@ -1075,7 +1064,7 @@ def __prepare_for_entities_puts(self, result: SaveChangesData) -> None:
                 self.before_store_invoke(before_store_event_args)
 
                 if before_store_event_args.is_metadata_accessed:
-                    self.__update_metadata_modifications(entity.value)
+                    _update_metadata_modifications(entity.value.metadata_instance, entity.value.metadata)
 
                 if before_store_event_args.is_metadata_accessed or self._entity_changed(document, entity.value, None):
                     document = self.entity_to_json.convert_entity_to_json(entity.key, entity.value)
@@ -1154,7 +1143,7 @@ def _what_changed(self) -> Dict[str, List[DocumentsChanges]]:
 
     def __get_all_entities_changes(self, changes: Dict[str, List[DocumentsChanges]]) -> None:
         for key, value in self._documents_by_id.items():
-            self.__update_metadata_modifications(value)
+            _update_metadata_modifications(value.metadata_instance, value.metadata)
             new_obj = self.entity_to_json.convert_entity_to_json(value.entity, value)
             self._entity_changed(new_obj, value, changes)