From 66e5895eb41398542e5fcf8d4b38fbe4b9405452 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Fri, 18 Jun 2010 18:10:32 -0700 Subject: [PATCH] Remove speed tests based on mapCommit The mapCommit API is being deprecated because it doesn't run very fast. Leaving tests around to test how fast it is relative to C Git isn't instructive. Remove them, which should help aid the transition away from the mapCommit API. Change-Id: I27e1c844610d7da5b2c44b33a00602706973c9cc Signed-off-by: Shawn O. Pearce --- .../org/eclipse/jgit/lib/SpeedTestBase.java | 116 ------------------ .../jgit/lib/T0005_ShallowSpeedTest.java | 91 -------------- .../eclipse/jgit/lib/T0006_DeepSpeedTest.java | 94 -------------- 3 files changed, 301 deletions(-) delete mode 100644 org.eclipse.jgit.test/exttst/org/eclipse/jgit/lib/SpeedTestBase.java delete mode 100644 org.eclipse.jgit.test/exttst/org/eclipse/jgit/lib/T0005_ShallowSpeedTest.java delete mode 100644 org.eclipse.jgit.test/exttst/org/eclipse/jgit/lib/T0006_DeepSpeedTest.java diff --git a/org.eclipse.jgit.test/exttst/org/eclipse/jgit/lib/SpeedTestBase.java b/org.eclipse.jgit.test/exttst/org/eclipse/jgit/lib/SpeedTestBase.java deleted file mode 100644 index b53a4e430..000000000 --- a/org.eclipse.jgit.test/exttst/org/eclipse/jgit/lib/SpeedTestBase.java +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright (C) 2008, Google Inc. - * Copyright (C) 2007-2008, Robin Rosenberg - * Copyright (C) 2007, Shawn O. Pearce - * 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.lib; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.io.InputStream; - -import junit.framework.TestCase; - -/** - * Base class for performance unit test. - */ -public abstract class SpeedTestBase extends TestCase { - - /** - * The time used by native git as this is our reference. - */ - protected long nativeTime; - - /** - * Reference to the location of the Linux kernel repo. - */ - protected String kernelrepo; - - /** - * Prepare test by running a test against the Linux kernel repo first. - * - * @param refcmd - * git command to execute - * - * @throws Exception - */ - protected void prepare(String[] refcmd) throws Exception { - try { - BufferedReader bufferedReader = new BufferedReader(new FileReader("kernel.ref")); - try { - kernelrepo = bufferedReader.readLine(); - } finally { - bufferedReader.close(); - } - timeNativeGit(kernelrepo, refcmd); - nativeTime = timeNativeGit(kernelrepo, refcmd); - } catch (Exception e) { - System.out.println("Create a file named kernel.ref and put the path to the Linux kernels repository there"); - throw e; - } - } - - private static long timeNativeGit(String kernelrepo, String[] refcmd) throws IOException, - InterruptedException, Exception { - long start = System.currentTimeMillis(); - Process p = Runtime.getRuntime().exec(refcmd, null, new File(kernelrepo,"..")); - InputStream inputStream = p.getInputStream(); - InputStream errorStream = p.getErrorStream(); - byte[] buf=new byte[1024*1024]; - for (;;) - if (inputStream.read(buf) < 0) - break; - if (p.waitFor()!=0) { - int c; - while ((c=errorStream.read())!=-1) - System.err.print((char)c); - throw new Exception("git log failed"); - } - inputStream.close(); - errorStream.close(); - long stop = System.currentTimeMillis(); - return stop - start; - } -} diff --git a/org.eclipse.jgit.test/exttst/org/eclipse/jgit/lib/T0005_ShallowSpeedTest.java b/org.eclipse.jgit.test/exttst/org/eclipse/jgit/lib/T0005_ShallowSpeedTest.java deleted file mode 100644 index 97b1cf97d..000000000 --- a/org.eclipse.jgit.test/exttst/org/eclipse/jgit/lib/T0005_ShallowSpeedTest.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright (C) 2007-2008, Robin Rosenberg - * Copyright (C) 2007, Shawn O. Pearce - * 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.lib; - -import java.io.File; -import java.io.IOException; - -import junit.textui.TestRunner; - -public class T0005_ShallowSpeedTest extends SpeedTestBase { - - protected void setUp() throws Exception { - prepare(new String[] { "git", "rev-list", "365bbe0d0caaf2ba74d56556827babf0bc66965d" }); - } - - public void testShallowHistoryScan() throws IOException { - long start = System.currentTimeMillis(); - Repository db = new Repository(new File(kernelrepo)); - Commit commit = db.mapCommit("365bbe0d0caaf2ba74d56556827babf0bc66965d"); - int n = 1; - for (;;) { - ObjectId[] parents = commit.getParentIds(); - if (parents.length == 0) - break; - ObjectId parentId = parents[0]; - commit = db.mapCommit(parentId); - commit.getCommitId().name(); - ++n; - } - assertEquals(12275, n); - long stop = System.currentTimeMillis(); - long time = stop - start; - System.out.println("native="+nativeTime); - System.out.println("jgit="+time); - // ~0.750s (hot cache), ok - /* -native=1795 -jgit=722 - */ - // native git seems to run SLOWER than jgit here, at roughly half the speed - // creating the git process is not the issue here, btw. - long factor10 = (nativeTime*150/time+50)/100; - assertEquals(3, factor10); - } - - public static void main(String[] args) { - TestRunner.run(T0005_ShallowSpeedTest.class); - } -} diff --git a/org.eclipse.jgit.test/exttst/org/eclipse/jgit/lib/T0006_DeepSpeedTest.java b/org.eclipse.jgit.test/exttst/org/eclipse/jgit/lib/T0006_DeepSpeedTest.java deleted file mode 100644 index 8843ae35b..000000000 --- a/org.eclipse.jgit.test/exttst/org/eclipse/jgit/lib/T0006_DeepSpeedTest.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright (C) 2007-2008, Robin Rosenberg - * Copyright (C) 2007, Shawn O. Pearce - * 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.lib; - -import java.io.File; -import java.io.IOException; - -import junit.textui.TestRunner; - -public class T0006_DeepSpeedTest extends SpeedTestBase { - - protected void setUp() throws Exception { - prepare(new String[] { "git", "rev-list", "365bbe0d0caaf2ba74d56556827babf0bc66965d","--","net/netfilter/nf_queue.c" }); - } - - public void testDeepHistoryScan() throws IOException { - long start = System.currentTimeMillis(); - Repository db = new Repository(new File(kernelrepo)); - Commit commit = db.mapCommit("365bbe0d0caaf2ba74d56556827babf0bc66965d"); - int n = 1; - for (;;) { - ObjectId[] parents = commit.getParentIds(); - if (parents.length == 0) - break; - ObjectId parentId = parents[0]; - commit = db.mapCommit(parentId); - TreeEntry m = commit.getTree().findBlobMember("net/netfilter/nf_queue.c"); - if (m != null) - commit.getCommitId().name(); - ++n; - } - - assertEquals(12275, n); - long stop = System.currentTimeMillis(); - long time = stop - start; - System.out.println("native="+nativeTime); - System.out.println("jgit="+time); - /* - native=1355 - jgit=5449 - */ - // This is not an exact factor, but we'd expect native git to perform this - // about 4 times quicker. If for some reason we find jgit to be faster than - // this the cause should be found and secured. - long factor = (time*110/nativeTime+50)/100; - assertEquals(4, factor); - } - - public static void main(String[] args) { - TestRunner.run(T0006_DeepSpeedTest.class); - } -}