You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by th...@apache.org on 2023/10/17 10:12:18 UTC

[jackrabbit-oak] branch OAK-10497-a created (now 248c9dc686)

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

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


      at 248c9dc686 OAK-10497 Properties order in FFS can be different across runs: always sort

This branch includes the following new commits:

     new 248c9dc686 OAK-10497 Properties order in FFS can be different across runs: always sort

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[jackrabbit-oak] 01/01: OAK-10497 Properties order in FFS can be different across runs: always sort

Posted by th...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 248c9dc6862e03b1d782345fe4ea7d269512961d
Author: Thomas Mueller <th...@apache.org>
AuthorDate: Tue Oct 17 12:11:53 2023 +0200

    OAK-10497 Properties order in FFS can be different across runs: always sort
---
 .../oak/index/indexer/document/flatfile/NodeStateEntryWriter.java     | 4 ----
 .../oak/index/indexer/document/flatfile/SimpleFlatFileUtil.java       | 2 +-
 2 files changed, 1 insertion(+), 5 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 d0c2960c4e..eadf1159ef 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
@@ -86,10 +86,6 @@ public class NodeStateEntryWriter {
     }
 
     public String asJson(NodeState 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)));
     }
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 5c54bc6548..fa2b18da1e 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.asSortedJson(e.getNodeState());
+        String jsonText = entryWriter.asJson(e.getNodeState());
         String line = entryWriter.toString(copyOf(elements(path)), jsonText);
         writer.append(line);
         writer.append(LINE_SEPARATOR);