aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test/tst/org/eclipse
diff options
context:
space:
mode:
authorThomas Wolf <thomas.wolf@paranor.ch>2019-09-12 21:05:19 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2019-09-17 00:36:22 +0200
commite3f535cb15a75d6b2448bfadbc9839da8085f1ec (patch)
tree1b48de4667141c947625203c966a137a9f66206d /org.eclipse.jgit.test/tst/org/eclipse
parent84ac86ee61989bab441904e3e72b2b98199cccfc (diff)
downloadjgit-e3f535cb15a75d6b2448bfadbc9839da8085f1ec.tar.gz
jgit-e3f535cb15a75d6b2448bfadbc9839da8085f1ec.zip
WorkingTreeIterator: handle different timestamp resolutions
Older JGit stored only milliseconds timestamps in the index. Newer JGit may get finer timestamps from the file system. This leads to slow index diffs when a new JGit runs against an index produced by older JGit because many timestamps will differ and JGit will then do many content checks. See [1]. Handle this migration case by only comparing milliseconds if the index entry has only millisecond precision. The inverse may also occur; also compare only milliseconds if the file timestamp has only millisecond precision. Do the same also for microsecond resolution. On Windows, NTFS may provide 100ns resolution and may be used by external programs writing the index, but Java's WindowsFileAttributes may provide only microseconds. File timestamp precision in Java depends not only on the Java APIs used by different JGit versions but may also change when running the same Java code on different VMs. And of course the resolution may vary among operating and file systems. Moreover, timestamp precision in the index depends on the program that wrote the index. Canonical git may use a different resolution, maybe even different between git versions. [1] https://www.eclipse.org/forums/index.php/t/1100344/ Change-Id: Idfd08606c883cb98787b2138f9baf0cc89a57b56 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.test/tst/org/eclipse')
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/InstantComparatorTest.java182
1 files changed, 182 insertions, 0 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/InstantComparatorTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/InstantComparatorTest.java
new file mode 100644
index 0000000000..271b4ea3c8
--- /dev/null
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/InstantComparatorTest.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright (C) 2019, Thomas Wolf <thomas.wolf@paranor.ch>
+ * and other copyright owners as documented in the project's IP log.
+ *
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Distribution License v1.0 which
+ * accompanies this distribution, is reproduced below, and is
+ * available at http://www.eclipse.org/org/documents/edl-v10.php
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ *
+ * - Neither the name of the Eclipse Foundation, Inc. nor the
+ * names of its contributors may be used to endorse or promote
+ * products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.eclipse.jgit.treewalk;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.time.Instant;
+
+import org.junit.Test;
+
+public class InstantComparatorTest {
+
+ private final InstantComparator cmp = new InstantComparator();
+
+ @Test
+ public void compareNow() {
+ Instant now = Instant.now();
+ assertEquals(0, cmp.compare(now, now));
+ assertEquals(0, cmp.compare(now, now, true));
+ }
+
+ @Test
+ public void compareSeconds() {
+ Instant now = Instant.now();
+ Instant t = Instant.ofEpochSecond(now.getEpochSecond());
+ Instant s = Instant.ofEpochSecond(now.getEpochSecond(), 123456789);
+ assertEquals(0, cmp.compare(t, s));
+ assertEquals(0, cmp.compare(t, t));
+ assertEquals(0, cmp.compare(s, t));
+ }
+
+ @Test
+ public void compareSecondsOnly() {
+ Instant now = Instant.now();
+ Instant t = Instant.ofEpochSecond(now.getEpochSecond(), 987654321);
+ Instant s = Instant.ofEpochSecond(now.getEpochSecond(), 123456789);
+ assertEquals(0, cmp.compare(t, s, true));
+ assertEquals(0, cmp.compare(t, t, true));
+ assertEquals(0, cmp.compare(s, t, true));
+ }
+
+ @Test
+ public void compareSecondsUnequal() {
+ Instant now = Instant.now();
+ Instant t = Instant.ofEpochSecond(now.getEpochSecond());
+ Instant s = Instant.ofEpochSecond(now.getEpochSecond() - 1L);
+ assertTrue(cmp.compare(s, t) < 0);
+ assertTrue(cmp.compare(t, s) > 0);
+ }
+
+ @Test
+ public void compareMillisEqual() {
+ Instant now = Instant.now();
+ Instant t = Instant.ofEpochSecond(now.getEpochSecond(), 123000000);
+ Instant s = Instant.ofEpochSecond(now.getEpochSecond(), 123456789);
+ assertEquals(0, cmp.compare(s, t));
+ assertEquals(0, cmp.compare(t, t));
+ assertEquals(0, cmp.compare(t, s));
+ s = Instant.ofEpochSecond(now.getEpochSecond(), 123456000);
+ assertEquals(0, cmp.compare(s, t));
+ assertEquals(0, cmp.compare(t, s));
+ s = Instant.ofEpochSecond(now.getEpochSecond(), 123400000);
+ assertEquals(0, cmp.compare(s, t));
+ assertEquals(0, cmp.compare(t, s));
+ }
+
+ @Test
+ public void compareMillisUnequal() {
+ Instant now = Instant.now();
+ Instant t = Instant.ofEpochSecond(now.getEpochSecond(), 123000000);
+ Instant s = Instant.ofEpochSecond(now.getEpochSecond(), 122000000);
+ assertTrue(cmp.compare(s, t) < 0);
+ assertTrue(cmp.compare(t, s) > 0);
+ t = Instant.ofEpochSecond(now.getEpochSecond(), 130000000);
+ assertTrue(cmp.compare(s, t) < 0);
+ assertTrue(cmp.compare(t, s) > 0);
+ t = Instant.ofEpochSecond(now.getEpochSecond(), 200000000);
+ assertTrue(cmp.compare(s, t) < 0);
+ assertTrue(cmp.compare(t, s) > 0);
+ s = Instant.ofEpochSecond(now.getEpochSecond() - 1L, 123000000);
+ assertTrue(cmp.compare(s, t) < 0);
+ assertTrue(cmp.compare(t, s) > 0);
+ }
+
+ @Test
+ public void compareMicrosEqual() {
+ Instant now = Instant.now();
+ Instant t = Instant.ofEpochSecond(now.getEpochSecond(), 123456000);
+ Instant s = Instant.ofEpochSecond(now.getEpochSecond(), 123456789);
+ assertEquals(0, cmp.compare(s, t));
+ assertEquals(0, cmp.compare(t, s));
+ s = Instant.ofEpochSecond(now.getEpochSecond(), 123456700);
+ assertEquals(0, cmp.compare(s, t));
+ assertEquals(0, cmp.compare(t, s));
+ }
+
+ @Test
+ public void compareMicrosUnequal() {
+ Instant now = Instant.now();
+ Instant t = Instant.ofEpochSecond(now.getEpochSecond(), 123456000);
+ Instant s = Instant.ofEpochSecond(now.getEpochSecond(), 123455000);
+ assertTrue(cmp.compare(s, t) < 0);
+ assertTrue(cmp.compare(t, s) > 0);
+ t = Instant.ofEpochSecond(now.getEpochSecond(), 123460000);
+ assertTrue(cmp.compare(s, t) < 0);
+ assertTrue(cmp.compare(t, s) > 0);
+ t = Instant.ofEpochSecond(now.getEpochSecond(), 123500000);
+ assertTrue(cmp.compare(s, t) < 0);
+ assertTrue(cmp.compare(t, s) > 0);
+ s = Instant.ofEpochSecond(now.getEpochSecond() - 1L, 123456000);
+ assertTrue(cmp.compare(s, t) < 0);
+ assertTrue(cmp.compare(t, s) > 0);
+ }
+
+ @Test
+ public void compareNanosEqual() {
+ Instant now = Instant.now();
+ Instant t = Instant.ofEpochSecond(now.getEpochSecond(), 123456789);
+ Instant s = Instant.ofEpochSecond(now.getEpochSecond(), 123456789);
+ assertEquals(0, cmp.compare(s, t));
+ assertEquals(0, cmp.compare(t, s));
+ }
+
+ @Test
+ public void compareNanosUnequal() {
+ Instant now = Instant.now();
+ Instant t = Instant.ofEpochSecond(now.getEpochSecond(), 123456789);
+ Instant s = Instant.ofEpochSecond(now.getEpochSecond(), 123456700);
+ assertTrue(cmp.compare(s, t) < 0);
+ assertTrue(cmp.compare(t, s) > 0);
+ t = Instant.ofEpochSecond(now.getEpochSecond(), 123456800);
+ assertTrue(cmp.compare(s, t) < 0);
+ assertTrue(cmp.compare(t, s) > 0);
+ s = Instant.ofEpochSecond(now.getEpochSecond() - 1L, 123456789);
+ assertTrue(cmp.compare(s, t) < 0);
+ assertTrue(cmp.compare(t, s) > 0);
+ s = Instant.ofEpochSecond(now.getEpochSecond(), 123456788);
+ assertTrue(cmp.compare(s, t) < 0);
+ assertTrue(cmp.compare(t, s) > 0);
+ }
+}