[jackrabbit-oak] branch trunk updated: OAK-10497 Properties order in FFS can be different across runs: sort (#1175)

[thomasm]

This is an automated email from the ASF dual-hosted git repository.

thomasm pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/trunk by this push:
     new c255d16fed OAK-10497 Properties order in FFS can be different across 
runs: sort (#1175)
c255d16fed is described below

commit c255d16fedc9ae718b1afd234804bd24764acf48
Author: Thomas Mueller <thom...@apache.org>
AuthorDate: Thu Oct 19 19:17:06 2023 +0200

    OAK-10497 Properties order in FFS can be different across runs: sort (#1175)
---
 .../oak/index/indexer/document/flatfile/NodeStateEntryWriter.java | 8 ++++++--
 .../oak/index/indexer/document/flatfile/SimpleFlatFileUtil.java   | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git 
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/NodeStateEntryWriter.java
 
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/NodeStateEntryWriter.java
index 615816b2c6..d5bfe31bea 100644
--- 
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/NodeStateEntryWriter.java
+++ 
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/NodeStateEntryWriter.java
@@ -88,12 +88,16 @@ public class NodeStateEntryWriter {
 
     public String asJson(NodeState nodeState) {
         if (SORTED_PROPERTIES) {
-            return 
asJson(StreamSupport.stream(nodeState.getProperties().spliterator(), false)
-                    .sorted(Comparator.comparing(PropertyState::getName)));
+            return asSortedJson(nodeState);
         }
         return 
asJson(StreamSupport.stream(nodeState.getProperties().spliterator(), false));
     }
 
+    String asSortedJson(NodeState nodeState) {
+        return 
asJson(StreamSupport.stream(nodeState.getProperties().spliterator(), false)
+                .sorted(Comparator.comparing(PropertyState::getName)));
+    }
+
     private String asJson(Stream<? extends PropertyState> stream) {
         jw.resetWriter();
         jw.object();
diff --git 
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/SimpleFlatFileUtil.java
 
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/SimpleFlatFileUtil.java
index fa2b18da1e..5c54bc6548 100644
--- 
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/SimpleFlatFileUtil.java
+++ 
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/SimpleFlatFileUtil.java
@@ -92,7 +92,7 @@ public class SimpleFlatFileUtil {
             // skip
             return;
         }
-        String jsonText = entryWriter.asJson(e.getNodeState());
+        String jsonText = entryWriter.asSortedJson(e.getNodeState());
         String line = entryWriter.toString(copyOf(elements(path)), jsonText);
         writer.append(line);
         writer.append(LINE_SEPARATOR);