fix: make sure to not mark document dirty if setting a property to exactly the same simple value, issue #10514

Author: tglman

core/src/main/java/com/orientechnologies/orient/core/record/impl/ODocument.java

@@ -538,13 +538,18 @@ public void setProperty(String iPropetyName, Object iPropertyValue, OType... iFi
         try {
           if (iPropertyValue.equals(oldValue)) {
             if (fieldType == oldType) {
-              if (!(iPropertyValue instanceof ORecordElement))
+              if (!(iPropertyValue instanceof ORecordElement)
+                  && !OType.isSimpleType(iPropertyValue))
                 // SAME BUT NOT TRACKABLE: SET THE RECORD AS DIRTY TO BE SURE IT'S SAVED
                 setDirty();
 
               // SAVE VALUE: UNCHANGED
               return;
             }
+          } else if (iPropertyValue instanceof byte[]
+              && Arrays.equals((byte[]) iPropertyValue, (byte[]) oldValue)) {
+            // SAVE VALUE: UNCHANGED
+            return;
           }
         } catch (Exception e) {
           OLogManager.instance()
@@ -1681,7 +1686,8 @@ public ODocument field(String iFieldName, Object iPropertyValue, OType... iField
         try {
           if (iPropertyValue.equals(oldValue)) {
             if (fieldType == oldType) {
-              if (!(iPropertyValue instanceof ORecordElement))
+              if (!(iPropertyValue instanceof ORecordElement)
+                  && !OType.isSimpleType(iPropertyValue))
                 // SAME BUT NOT TRACKABLE: SET THE RECORD AS DIRTY TO BE SURE IT'S SAVED
                 setDirty();
 

core/src/test/java/com/orientechnologies/orient/core/record/impl/ODocumentTest.java

@@ -406,5 +406,25 @@ public void testNoDirtySameBytes() {
     doc.field("bytes", bytes.clone());
     assertFalse(doc.isDirty());
     assertNull(doc.getOriginalValue("bytes"));
+
+    doc.setProperty("bytes", bytes.clone());
+    assertFalse(doc.isDirty());
+    assertNull(doc.getOriginalValue("bytes"));
+  }
+
+  @Test
+  public void testNoDirtySameString() {
+    ODocument doc = new ODocument();
+    doc.field("string", "value");
+    ODocumentInternal.clearTrackData(doc);
+    ORecordInternal.unsetDirty(doc);
+    assertFalse(doc.isDirty());
+    assertNull(doc.getOriginalValue("string"));
+    doc.field("string", "value");
+    assertFalse(doc.isDirty());
+    assertNull(doc.getOriginalValue("string"));
+    doc.setProperty("string", "value");
+    assertFalse(doc.isDirty());
+    assertNull(doc.getOriginalValue("string"));
   }
 }