To protect your data, the CISO officer has suggested users to enable GitLab 2FA as soon as possible.

Commit 21b62952 authored by Rui Chen's avatar Rui Chen Committed by John Zhang
Browse files

Update the downloading link for derby and h2 database and rewrite the parts...

Update the downloading link for derby and h2 database and rewrite the parts for configuration codes and fiels to ensure it could be correctly built
parent 13be5036
......@@ -17,7 +17,7 @@
<target name="bm-build" depends="junit,h2,derby">
<javac srcdir="${bm-src-dir}" destdir="${bm-build-dir}"
sourcepath="${bm-src-dir}"
source="1.5">
source="1.8">
<classpath>
<pathelement location="${derbytesting-jar}"/>
<pathelement location="${h2-jar}"/>
......
benchmark h2
class org.dacapo.harness.H2
thread-model per_cpu
jars "dacapo-h2.jar","derbyTesting.jar","junit-3.8.1.jar","h2-1.2.121.jar";
jars "dacapo-h2.jar","derbyTesting.jar","junit-3.8.1.jar","h2-1.4.196.jar";
size small args
"--total-transactions", "400",
......
......@@ -201,7 +201,7 @@ public class TPCC {
org.h2.tools.Backup.execute(new File(scratch, BACKUP_NAME).getAbsolutePath(), dbDir.getAbsolutePath(), DATABASE_NAME_DISK, true);
} else {
org.h2.tools.Restore.execute(new File(scratch, BACKUP_NAME).getAbsolutePath(), dbDir.getAbsolutePath(), DATABASE_NAME_DISK, true);
org.h2.tools.Restore.execute(new File(scratch, BACKUP_NAME).getAbsolutePath(), dbDir.getAbsolutePath(), DATABASE_NAME_DISK);
}
}
......
......@@ -85,8 +85,9 @@ public class TPCCDataSource implements DataSource {
return null;
}
public Logger getParentLogger() throws SQLFeatureNotSupportedException{
throw new UnsupportedOperationException();
public Logger getParentLogger()
throws SQLFeatureNotSupportedException {
return null;
}
private class NullWriter extends Writer {
......
......@@ -9,9 +9,10 @@
<project name="derby" default="all" basedir="../..">
<description>derby library required for h2 testing</description>
<property file="ant/dacapo.properties"/>
<property name="apache.mirror" value="http://apache.mirror.digitalpacific.com.au/"/>
<property name="lib-name" value="derby"/>
<property name="lib-version" value="10.5.3.0"/>
<property name="lib-version" value="10.14.1.0"/>
<property name="lib-url" value="${apache.dl.url}/db/derby/db-derby-${lib-version}"/>
<property name="lib-src" value="db-derby-${lib-version}-src.tar.gz"/>
......
diff -urNw derby-b/db-derby-10.5.3.0-src/java/testing/org/apache/derbyTesting/system/oe/client/Load.java derby-a/db-derby-10.5.3.0-src/java/testing/org/apache/derbyTesting/system/oe/client/Load.java
--- derby-b/db-derby-10.5.3.0-src/java/testing/org/apache/derbyTesting/system/oe/client/Load.java 2009-03-24 01:49:58.000000000 +1100
+++ derby-a/db-derby-10.5.3.0-src/java/testing/org/apache/derbyTesting/system/oe/client/Load.java 2009-12-02 15:56:26.040402810 +1100
--- derby-b/db-derby-10.14.1.0-src/java/testing/org/apache/derbyTesting/system/oe/client/Load.java 2009-03-24 01:49:58.000000000 +1100
+++ derby-a/db-derby-10.14.1.0-src/java/testing/org/apache/derbyTesting/system/oe/client/Load.java 2009-12-02 15:56:26.040402810 +1100
@@ -44,11 +44,11 @@
*
* see section 1.2.1 of TPC-C specification
......@@ -17,8 +18,8 @@ diff -urNw derby-b/db-derby-10.5.3.0-src/java/testing/org/apache/derbyTesting/sy
public static final int NEWORDERS_COUNT_W = (CUSTOMER_COUNT_W * 9) / 30;
diff -urNw derby-b/db-derby-10.5.3.0-src/java/testing/org/apache/derbyTesting/system/oe/direct/Standard.java derby-a/db-derby-10.5.3.0-src/java/testing/org/apache/derbyTesting/system/oe/direct/Standard.java
--- derby-b/db-derby-10.5.3.0-src/java/testing/org/apache/derbyTesting/system/oe/direct/Standard.java 2009-03-24 01:49:57.000000000 +1100
+++ derby-a/db-derby-10.5.3.0-src/java/testing/org/apache/derbyTesting/system/oe/direct/Standard.java 2009-12-02 15:56:26.040402810 +1100
--- derby-b/db-derby-10.14.1.0-src/java/testing/org/apache/derbyTesting/system/oe/direct/Standard.java 2009-03-24 01:49:57.000000000 +1100
+++ derby-a/db-derby-10.14.1.0-src/java/testing/org/apache/derbyTesting/system/oe/direct/Standard.java 2009-12-02 15:56:26.040402810 +1100
@@ -24,6 +24,7 @@
import java.sql.PreparedStatement;
import java.sql.ResultSet;
......@@ -202,8 +203,8 @@ diff -urNw derby-b/db-derby-10.5.3.0-src/java/testing/org/apache/derbyTesting/sy
PreparedStatement dlSetOrderCarrier = prepareStatement(
"UPDATE ORDERS SET O_CARRIER_ID = ? " +
diff -urNw derby-b/db-derby-10.5.3.0-src/java/testing/org/apache/derbyTesting/system/oe/load/SimpleInsert.java derby-a/db-derby-10.5.3.0-src/java/testing/org/apache/derbyTesting/system/oe/load/SimpleInsert.java
--- derby-b/db-derby-10.5.3.0-src/java/testing/org/apache/derbyTesting/system/oe/load/SimpleInsert.java 2009-03-24 01:49:46.000000000 +1100
+++ derby-a/db-derby-10.5.3.0-src/java/testing/org/apache/derbyTesting/system/oe/load/SimpleInsert.java 2009-12-02 15:56:26.040402810 +1100
--- derby-b/db-derby-10.14.1.0-src/java/testing/org/apache/derbyTesting/system/oe/load/SimpleInsert.java 2009-03-24 01:49:46.000000000 +1100
+++ derby-a/db-derby-10.14.1.0-src/java/testing/org/apache/derbyTesting/system/oe/load/SimpleInsert.java 2009-12-02 15:56:26.040402810 +1100
@@ -228,14 +228,16 @@
+ "(S_I_ID, S_W_ID, S_QUANTITY,S_DIST_01, S_DIST_02,"
+ " S_DIST_03,S_DIST_04,S_DIST_05,"
......@@ -297,8 +298,8 @@ diff -urNw derby-b/db-derby-10.5.3.0-src/java/testing/org/apache/derbyTesting/sy
}
psOL.setInt(8, 5);
diff -urNw derby-b/db-derby-10.5.3.0-src/java/testing/org/apache/derbyTesting/system/oe/schema/schema.sql derby-a/db-derby-10.5.3.0-src/java/testing/org/apache/derbyTesting/system/oe/schema/schema.sql
--- derby-b/db-derby-10.5.3.0-src/java/testing/org/apache/derbyTesting/system/oe/schema/schema.sql 2009-03-24 01:49:50.000000000 +1100
+++ derby-a/db-derby-10.5.3.0-src/java/testing/org/apache/derbyTesting/system/oe/schema/schema.sql 2009-12-02 15:56:26.040402810 +1100
--- derby-b/db-derby-10.14.1.0-src/java/testing/org/apache/derbyTesting/system/oe/schema/schema.sql 2009-03-24 01:49:50.000000000 +1100
+++ derby-a/db-derby-10.14.1.0-src/java/testing/org/apache/derbyTesting/system/oe/schema/schema.sql 2009-12-02 15:56:26.040402810 +1100
@@ -71,7 +71,8 @@
C_YTD_PAYMENT DECIMAL(12,2) NOT NULL,
C_PAYMENT_CNT INTEGER NOT NULL,
......@@ -360,8 +361,8 @@ diff -urNw derby-b/db-derby-10.5.3.0-src/java/testing/org/apache/derbyTesting/sy
);
\ No newline at end of file
diff -urNw derby-b/db-derby-10.5.3.0-src/java/testing/org/apache/derbyTesting/system/oe/util/OERandom.java derby-a/db-derby-10.5.3.0-src/java/testing/org/apache/derbyTesting/system/oe/util/OERandom.java
--- derby-b/db-derby-10.5.3.0-src/java/testing/org/apache/derbyTesting/system/oe/util/OERandom.java 2009-03-24 01:49:58.000000000 +1100
+++ derby-a/db-derby-10.5.3.0-src/java/testing/org/apache/derbyTesting/system/oe/util/OERandom.java 2009-12-02 15:59:13.086957464 +1100
--- derby-b/db-derby-10.14.1.0-src/java/testing/org/apache/derbyTesting/system/oe/util/OERandom.java 2009-03-24 01:49:58.000000000 +1100
+++ derby-a/db-derby-10.14.1.0-src/java/testing/org/apache/derbyTesting/system/oe/util/OERandom.java 2009-12-02 15:59:13.086957464 +1100
@@ -70,6 +70,10 @@
this(last, System.currentTimeMillis());
}
......@@ -373,11 +374,11 @@ diff -urNw derby-b/db-derby-10.5.3.0-src/java/testing/org/apache/derbyTesting/sy
private static int[] RESCALE = { 0, 10, 100, 1000, 10000, 100000, 1000000 };
private StringBuffer decimalString = new StringBuffer(12);
--- derby-b/db-derby-10.5.3.0-src/java/testing/org/apache/derbyTesting/system/oe/client/Submitter.java-orig 2009-12-19 13:18:42.000000000 +1100
+++ derby-b/db-derby-10.5.3.0-src/java/testing/org/apache/derbyTesting/system/oe/client/Submitter.java 2009-12-19 13:55:33.000000000 +1100
--- derby-b/db-derby-10.14.1.0-src/java/testing/org/apache/derbyTesting/system/oe/client/Submitter.java-orig 2009-12-19 13:18:42.000000000 +1100
+++ derby-b/db-derby-10.14.1.0-src/java/testing/org/apache/derbyTesting/system/oe/client/Submitter.java 2009-12-19 13:55:33.000000000 +1100
@@ -85,6 +85,24 @@
public static final int NEW_ORDER_ROLLBACK = 7;
/**
+ * Cumulative probability distribution (out of 1000) derived from mixType
+ * (4%, 2.4%, 1.6%, 25.8%, 17.2%, 4%, 44.5% .5%)
......@@ -406,6 +407,6 @@ diff -urNw derby-b/db-derby-10.5.3.0-src/java/testing/org/apache/derbyTesting/sy
*/
- private final int[] transactionCount;
+ public final int[] transactionCount;
/**
* Generate a new random number generator
* Generate a new random number generator
\ No newline at end of file
......@@ -11,7 +11,7 @@
<property file="ant/dacapo.properties"/>
<property name="lib-name" value="h2"/>
<property name="lib-version" value="1.2.123"/>
<property name="lib-version" value="1.4.196"/>
<property name="lib-url" value="http://repo2.maven.org/maven2/com/h2database/${lib-name}/${lib-version}"/>
<property name="lib-src" value="h2-${lib-version}.jar"/>
......
......@@ -84,7 +84,7 @@
</target>
<!-- h2-->
<property name="h2-version" value="1.2.121"/>
<property name="h2-version" value="1.4.196"/>
<property name="h2-jar" value="${lib-base}/h2/dist/jar/h2-${h2-version}.jar"/>
<target name="h2">
<ant antfile="${lib-base}/h2/build.xml"/>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment