This is an automated email from the ASF dual-hosted git repository. thomasm pushed a commit to branch OAK-10497 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 1b68bdb9ef1e0023ecd83e2c014b7cdf2581c49a Author: Thomas Mueller <[email protected]> AuthorDate: Tue Oct 17 12:03:37 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);
