Author: mreutegg
Date: Wed Jun 17 09:49:48 2015
New Revision: 1685977
URL: http://svn.apache.org/r1685977
Log:
OAK-2829: Comparing node states for external changes is too slow
Add tests for JournalEntry
Added:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalEntryTest.java
(with props)
Added:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalEntryTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalEntryTest.java?rev=1685977&view=auto
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalEntryTest.java
(added)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalEntryTest.java
Wed Jun 17 09:49:48 2015
@@ -0,0 +1,148 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.oak.plugins.document;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+import java.util.Set;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+
+import org.apache.jackrabbit.oak.commons.PathUtils;
+import org.apache.jackrabbit.oak.commons.json.JsopReader;
+import org.apache.jackrabbit.oak.commons.json.JsopTokenizer;
+import org.apache.jackrabbit.oak.commons.sort.StringSort;
+import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
+import org.junit.Test;
+
+import static org.apache.jackrabbit.oak.plugins.document.Collection.JOURNAL;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+/**
+ * Tests for {@link JournalEntry}.
+ */
+public class JournalEntryTest {
+
+ @Test
+ public void applyTo() throws Exception {
+ DiffCache cache = new MemoryDiffCache(new DocumentMK.Builder());
+ List<String> paths = Lists.newArrayList();
+ addRandomPaths(paths);
+ StringSort sort = JournalEntry.newSorter();
+ add(sort, paths);
+ Revision from = new Revision(1, 0, 1);
+ Revision to = new Revision(2, 0, 1);
+ JournalEntry.applyTo(sort, cache, from, to);
+
+ for (String p : paths) {
+ String changes = cache.getChanges(from, to, p, null);
+ assertNotNull(changes);
+ for (String c : getChildren(changes)) {
+ assertTrue(paths.contains(PathUtils.concat(p, c)));
+ }
+ }
+ sort.close();
+ }
+
+ @Test
+ public void fillExternalChanges() throws Exception {
+ DocumentStore store = new MemoryDocumentStore();
+ JournalEntry entry = JOURNAL.newDocument(store);
+ Set<String> paths = Sets.newHashSet();
+ addRandomPaths(paths);
+ entry.modified(paths);
+ Revision r1 = new Revision(1, 0, 1);
+ Revision r2 = new Revision(2, 0, 1);
+ Revision r3 = new Revision(3, 0, 1);
+ UpdateOp op = entry.asUpdateOp(r2);
+ assertTrue(store.create(JOURNAL, Collections.singletonList(op)));
+
+ StringSort sort = JournalEntry.newSorter();
+ JournalEntry.fillExternalChanges(sort, r2, r3, store);
+ assertEquals(0, sort.getSize());
+
+ JournalEntry.fillExternalChanges(sort, r1, r2, store);
+ assertEquals(paths.size(), sort.getSize());
+ sort.close();
+
+ sort = JournalEntry.newSorter();
+ JournalEntry.fillExternalChanges(sort, r1, r3, store);
+ assertEquals(paths.size(), sort.getSize());
+ sort.close();
+ }
+
+ @Test
+ public void getRevisionTimestamp() throws Exception {
+ DocumentStore store = new MemoryDocumentStore();
+ JournalEntry entry = JOURNAL.newDocument(store);
+ entry.modified("/foo");
+ Revision r = Revision.newRevision(1);
+ assertTrue(store.create(JOURNAL,
+ Collections.singletonList(entry.asUpdateOp(r))));
+ entry = store.find(JOURNAL, JournalEntry.asId(r));
+ assertEquals(r.getTimestamp(), entry.getRevisionTimestamp());
+ }
+
+ private static void addRandomPaths(java.util.Collection<String> paths)
throws IOException {
+ paths.add("/");
+ Random random = new Random(42);
+ for (int i = 0; i < 1000; i++) {
+ String path = "/";
+ int depth = random.nextInt(6);
+ for (int j = 0; j < depth; j++) {
+ char name = (char) ('a' + random.nextInt(26));
+ path = PathUtils.concat(path, String.valueOf(name));
+ paths.add(path);
+ }
+ }
+ }
+
+ private static void add(StringSort sort, List<String> paths)
+ throws IOException {
+ for (String p : paths) {
+ sort.add(p);
+ }
+ }
+
+ private static List<String> getChildren(String diff) {
+ List<String> children = Lists.newArrayList();
+ JsopTokenizer t = new JsopTokenizer(diff);
+ for (;;) {
+ int r = t.read();
+ switch (r) {
+ case '^': {
+ children.add(t.readString());
+ t.read(':');
+ t.read('{');
+ t.read('}');
+ break;
+ }
+ case JsopReader.END: {
+ return children;
+ }
+ default:
+ fail("Unexpected token: " + r);
+ }
+ }
+ }
+}
Propchange:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalEntryTest.java
------------------------------------------------------------------------------
svn:eol-style = native
