You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/02/23 11:53:51 UTC
[1/5] jena git commit: Improve permuting arrays in support of
randomized testing
Repository: jena
Updated Branches:
refs/heads/master 960a2ebce -> eaf580dac
Improve permuting arrays in support of randomized testing
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ba50b1f0
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ba50b1f0
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ba50b1f0
Branch: refs/heads/master
Commit: ba50b1f05f8f9043965829e2dde7e6829ba2d5f0
Parents: a0aa6e9
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Feb 23 10:51:42 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Feb 23 10:51:42 2015 +0000
----------------------------------------------------------------------
.../java/org/apache/jena/atlas/test/Gen.java | 20 +++++++++++++++++--
.../com/hp/hpl/jena/tdb/index/IndexTestLib.java | 2 +-
.../hpl/jena/tdb/index/ext/ExtHashTestBase.java | 21 +++++++++-----------
3 files changed, 28 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/ba50b1f0/jena-arq/src/main/java/org/apache/jena/atlas/test/Gen.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/test/Gen.java b/jena-arq/src/main/java/org/apache/jena/atlas/test/Gen.java
index a87275c..4a573a6 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/test/Gen.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/test/Gen.java
@@ -20,7 +20,9 @@ package org.apache.jena.atlas.test;
import static org.apache.jena.atlas.lib.RandomLib.random ;
+import java.util.ArrayList ;
import java.util.Arrays ;
+import java.util.List ;
/** Support for testing. May be generally useful */
public class Gen
@@ -56,8 +58,22 @@ public class Gen
return k ;
}
- /** Sort-of jumble a sequence */
- public static int[] permute(int[] x, int num) {
+ /** Pull items out of the list in a random order */
+ public static int[] permute(int[] x) {
+ int[] x2 = new int[x.length] ;
+ List<Integer> list = new ArrayList<>() ;
+
+ for ( int i : x )
+ list.add(i) ;
+ for ( int i = 0 ; i<x.length ; i++ ) {
+ int idx = random.nextInt(list.size()) ;
+ x2[i] = list.remove(idx) ;
+ }
+ return x2 ;
+ }
+
+ /** Do a number of random pair-wise swaps */
+ public static int[] shuffle(int[] x, int num) {
// Collections.shuffle.
int[] x2 = new int[x.length] ;
System.arraycopy(x, 0, x2, 0, x.length) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/ba50b1f0/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/IndexTestLib.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/IndexTestLib.java b/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/IndexTestLib.java
index fb2a71e..1329fe7 100644
--- a/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/IndexTestLib.java
+++ b/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/IndexTestLib.java
@@ -102,7 +102,7 @@ public class IndexTestLib
System.err.printf("Warning: too many keys\n") ;
int[] keys1 = rand(numKeys, 0, maxValue) ;
- int[] keys2 = permute(keys1, 4*numKeys) ;
+ int[] keys2 = permute(keys1) ;
try {
testInsert(index, keys1);
if ( true )
http://git-wip-us.apache.org/repos/asf/jena/blob/ba50b1f0/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/ext/ExtHashTestBase.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/ext/ExtHashTestBase.java b/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/ext/ExtHashTestBase.java
index f84e675..be28e78 100644
--- a/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/ext/ExtHashTestBase.java
+++ b/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/ext/ExtHashTestBase.java
@@ -23,23 +23,20 @@ import static org.apache.jena.atlas.lib.RandomLib.random ;
import static org.apache.jena.atlas.test.Gen.permute ;
import static org.apache.jena.atlas.test.Gen.rand ;
import static org.apache.jena.atlas.test.Gen.strings ;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals ;
+import static org.junit.Assert.assertFalse ;
+import static org.junit.Assert.assertNotNull ;
+import static org.junit.Assert.assertTrue ;
-import java.util.Iterator;
-import java.util.List;
+import java.util.Iterator ;
+import java.util.List ;
import org.apache.jena.atlas.lib.Bytes ;
import org.apache.jena.atlas.test.ExecGenerator ;
import org.apache.jena.atlas.test.RepeatExecution ;
-
-
-import com.hp.hpl.jena.tdb.base.record.Record;
-import com.hp.hpl.jena.tdb.base.record.RecordFactory;
-import com.hp.hpl.jena.tdb.index.ext.ExtHash;
+import com.hp.hpl.jena.tdb.base.record.Record ;
+import com.hp.hpl.jena.tdb.base.record.RecordFactory ;
public class ExtHashTestBase
{
@@ -77,7 +74,7 @@ public class ExtHashTestBase
// System.err.printf("Warning: too many keys\n") ;
int[] r1 = rand(numKeys, 0, maxValue) ;
- int[] r2 = permute(r1, 4*numKeys) ;
+ int[] r2 = permute(r1) ;
runTest(r1, r2) ;
}
[2/5] jena git commit: Must use explicit version to use the release
plugin
Posted by an...@apache.org.
Must use explicit version to use the release plugin
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f03bb5e5
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f03bb5e5
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f03bb5e5
Branch: refs/heads/master
Commit: f03bb5e5ccaaddd4e34cddb3345f5236cdf2bc0d
Parents: 13a8cd2
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Feb 23 10:44:57 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Feb 23 10:52:55 2015 +0000
----------------------------------------------------------------------
jena-extras/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/f03bb5e5/jena-extras/pom.xml
----------------------------------------------------------------------
diff --git a/jena-extras/pom.xml b/jena-extras/pom.xml
index 57c0ca0..0d7ab2f 100644
--- a/jena-extras/pom.xml
+++ b/jena-extras/pom.xml
@@ -121,7 +121,7 @@ This is the parent module for the Jena Extra modules.
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>apache-jena-libs</artifactId>
- <version>${jena-version}</version>
+ <version>2.13.0-SNAPSHOT</version>
<type>pom</type>
</dependency>
<dependency>
[3/5] jena git commit: Fix stale references to old Jena Elephas
module names
Posted by an...@apache.org.
Fix stale references to old Jena Elephas module names
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/13a8cd21
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/13a8cd21
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/13a8cd21
Branch: refs/heads/master
Commit: 13a8cd21a30ccc9f6057789c39109bf91338c8ce
Parents: ba50b1f
Author: Rob Vesse <rv...@apache.org>
Authored: Mon Feb 23 10:06:26 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Feb 23 10:52:55 2015 +0000
----------------------------------------------------------------------
jena-elephas/jena-elephas-mapreduce/pom.xml | 2 +-
jena-elephas/jena-elephas-stats/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/13a8cd21/jena-elephas/jena-elephas-mapreduce/pom.xml
----------------------------------------------------------------------
diff --git a/jena-elephas/jena-elephas-mapreduce/pom.xml b/jena-elephas/jena-elephas-mapreduce/pom.xml
index 5b18cf4..c41f0a2 100644
--- a/jena-elephas/jena-elephas-mapreduce/pom.xml
+++ b/jena-elephas/jena-elephas-mapreduce/pom.xml
@@ -30,7 +30,7 @@
<!-- Internal Project Dependencies -->
<dependency>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-hadoop-rdf-common</artifactId>
+ <artifactId>jena-elephas-common</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/jena/blob/13a8cd21/jena-elephas/jena-elephas-stats/pom.xml
----------------------------------------------------------------------
diff --git a/jena-elephas/jena-elephas-stats/pom.xml b/jena-elephas/jena-elephas-stats/pom.xml
index 4fd40d8..07eda12 100644
--- a/jena-elephas/jena-elephas-stats/pom.xml
+++ b/jena-elephas/jena-elephas-stats/pom.xml
@@ -63,7 +63,7 @@
<!-- Test Dependencies -->
<dependency>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-hadoop-rdf-mapreduce</artifactId>
+ <artifactId>jena-elephas-mapreduce</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
[5/5] jena git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/jena
Posted by an...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/jena
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/eaf580da
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/eaf580da
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/eaf580da
Branch: refs/heads/master
Commit: eaf580dacc6b2467ffd0c28288eb2bdc598a99d9
Parents: ac73198 960a2eb
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Feb 23 10:53:32 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Feb 23 10:53:32 2015 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[4/5] jena git commit: Untab
Posted by an...@apache.org.
Untab
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ac731986
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ac731986
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ac731986
Branch: refs/heads/master
Commit: ac731986c5714dc3bd6c38d5c8c4ee5a18a7ac4c
Parents: f03bb5e
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Feb 23 10:46:03 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Feb 23 10:52:55 2015 +0000
----------------------------------------------------------------------
jena-extras/pom.xml | 236 +++++++++++++++++++++++------------------------
1 file changed, 118 insertions(+), 118 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/ac731986/jena-extras/pom.xml
----------------------------------------------------------------------
diff --git a/jena-extras/pom.xml b/jena-extras/pom.xml
index 0d7ab2f..7f2c046 100644
--- a/jena-extras/pom.xml
+++ b/jena-extras/pom.xml
@@ -1,135 +1,135 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- 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
+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
+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.
+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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jena-extras</artifactId>
- <version>2.13.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Apache Jena - Extras</name>
- <description>Extra packages for Jena development.
-This is the parent module for the Jena Extra modules.
- These modules provide utiliities and larger packages that make Apache Jena development or usage
- easier but that do not fall within the standard Jena framework.</description>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jena-extras</artifactId>
+ <version>2.13.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Apache Jena - Extras</name>
+ <description>Extra packages for Jena development.
+ This is the parent module for the Jena Extra modules.
+ These modules provide utiliities and larger packages that make Apache Jena development or usage
+ easier but that do not fall within the standard Jena framework.</description>
- <parent>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>12-SNAPSHOT</version>
- <relativePath>../jena-parent</relativePath>
- </parent>
+ <parent>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-parent</artifactId>
+ <version>12-SNAPSHOT</version>
+ <relativePath>../jena-parent</relativePath>
+ </parent>
- <!-- Need if the parent is a snapshot -->
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
+ <!-- Need if the parent is a snapshot -->
+ <repositories>
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
- <modules>
- <module>jena-querybuilder</module>
- </modules>
+ <modules>
+ <module>jena-querybuilder</module>
+ </modules>
- <properties>
- <plugin.license.version>1.9.0</plugin.license.version>
- <plugin.license.headerPath>${project.basedir}</plugin.license.headerPath>
- <jena-version>${project.version}</jena-version>
- </properties>
+ <properties>
+ <plugin.license.version>1.9.0</plugin.license.version>
+ <plugin.license.headerPath>${project.basedir}</plugin.license.headerPath>
+ <jena-version>${project.version}</jena-version>
+ </properties>
- <build>
- <plugins>
- <!-- Compiler Plugin -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${jdk.version}</source>
- <target>${jdk.version}</target>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </plugin>
- <!-- License Plugin -->
- <!--
- <plugin>
- <groupId>com.mycila.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
- <version>${plugin.license.version}</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <header>${plugin.license.headerPath}/license-header.txt</header>
- <failIfMissing>true</failIfMissing>
- <aggregate>true</aggregate>
- <excludes>
- <exclude>**/*.git*</exclude>
- <exclude>**/*.md</exclude>
- <exclude>**/*.xml</exclude>
- <exclude>**/*.properties</exclude>
- <exclude>**/LICENSE</exclude>
- <exclude>**/NOTICE</exclude>
- </excludes>
- <useDefaultMapping>true</useDefaultMapping>
- <strictCheck>true</strictCheck>
- </configuration>
- </plugin>
- -->
- <!-- Sources Plugin -->
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.1.1</version>
- <executions>
- <execution>
- <id>bundle-sources</id>
- <phase>package</phase>
- <goals>
- <!-- produce source artifact for main project sources -->
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <build>
+ <plugins>
+ <!-- Compiler Plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
+ <!-- License Plugin -->
+ <!--
+ <plugin>
+ <groupId>com.mycila.maven-license-plugin</groupId>
+ <artifactId>maven-license-plugin</artifactId>
+ <version>${plugin.license.version}</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <header>${plugin.license.headerPath}/license-header.txt</header>
+ <failIfMissing>true</failIfMissing>
+ <aggregate>true</aggregate>
+ <excludes>
+ <exclude>**/*.git*</exclude>
+ <exclude>**/*.md</exclude>
+ <exclude>**/*.xml</exclude>
+ <exclude>**/*.properties</exclude>
+ <exclude>**/LICENSE</exclude>
+ <exclude>**/NOTICE</exclude>
+ </excludes>
+ <useDefaultMapping>true</useDefaultMapping>
+ <strictCheck>true</strictCheck>
+ </configuration>
+ </plugin>
+ -->
+ <!-- Sources Plugin -->
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.1</version>
+ <executions>
+ <execution>
+ <id>bundle-sources</id>
+ <phase>package</phase>
+ <goals>
+ <!-- produce source artifact for main project sources -->
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
- </plugins>
- </build>
- <dependencyManagement>
- <dependencies>
- <dependency>
+ </plugins>
+ </build>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
<groupId>org.apache.jena</groupId>
<artifactId>apache-jena-libs</artifactId>
<version>2.13.0-SNAPSHOT</version>
<type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.xenei</groupId>
- <artifactId>junit-contracts</artifactId>
- <version>0.0.5</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ </dependency>
+ <dependency>
+ <groupId>org.xenei</groupId>
+ <artifactId>junit-contracts</artifactId>
+ <version>0.0.5</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</dependencyManagement>
-</project>
\ No newline at end of file
+</project>