Skip to content

improves #8 - upgrading of libraries #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# this is a java project using maven
language: java
jdk:
# oracle jdk8 and jdk9 does not work on default dist
# - oraclejdk8
# - oraclejdk9
- oraclejdk11
- openjdk8
- openjdk-ea
# switch off gpg handling, javadoc and tests
install:
- mvn install -DskipTests -Dmaven.javadoc.skip=true -Dgpg.skip=true
script:
- mvn test -Dtest=com.blazegraph.gremlin.structure.TestBasicOperations
- mvn test -Dtest=com.blazegraph.gremlin.structure.TestBulkLoad
- mvn test -Dtest=com.blazegraph.gremlin.structure.TestHistory
- mvn test -Dtest=com.blazegraph.gremlin.structure.TestSearch
- mvn test -Dtest=com.blazegraph.gremlin.structure.SampleCode
109 changes: 61 additions & 48 deletions README.md

Large diffs are not rendered by default.

32 changes: 24 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands)
<groupId>com.blazegraph</groupId>
<artifactId>blazegraph-gremlin</artifactId>
<packaging>jar</packaging>
<version>1.0.1-SNAPSHOT</version>
<version>1.0.2</version>
<name>blazegraph-gremlin</name>
<description>Welcome to the Blazegraph/TinkerPop3 project. The TP3 implementation has some significant differences from the TP2 version. The data model has been changed to use RDF*, an RDF reification framework described here: https://wiki.blazegraph.com/wiki/index.php/Reification_Done_Right.

Expand Down Expand Up @@ -65,10 +65,13 @@ The concept behind blazegraph-gremlin is that property graph (PG) data can be lo
</scm>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jetty.version>9.2.3.v20140905</jetty.version>
<tp3.version>3.1.0-incubating</tp3.version>
<blaze.version>2.0.0</blaze.version>
<jetty.version>9.4.14.v20181114</jetty.version>
<!-- https://mvnrepository.com/artifact/org.apache.tinkerpop/gremlin-test -->
<tp3.version>3.2.11</tp3.version>
<tp3.gremlin-groovy-test.version>3.2.11</tp3.gremlin-groovy-test.version>
<blaze.version>2.1.2</blaze.version>
<apache.commons_fileupload.version>1.3.1</apache.commons_fileupload.version>
<!-- https://mvnrepository.com/artifact/org.apache.zookeeper/zookeeper -->
<zookeeper.version>3.4.6</zookeeper.version>
</properties>
<developers>
Expand All @@ -94,9 +97,9 @@ The concept behind blazegraph-gremlin is that property graph (PG) data can be lo
<profiles>
<profile>
<id>maven-central</id>
<!--
Plugins for Maven Central Deployment
See: http://central.sonatype.org/pages/apache-maven.html
<!--
Plugins for Maven Central Deployment
See: http://central.sonatype.org/pages/apache-maven.html
-->
<build>
<plugins>
Expand Down Expand Up @@ -209,6 +212,19 @@ The concept behind blazegraph-gremlin is that property graph (PG) data can be lo
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
<configuration>
<includes>
<include>**/*Test*.java</include>
</includes>
<excludes>
<exclude>**/*TestSuite.java</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
Expand Down Expand Up @@ -283,7 +299,7 @@ The concept behind blazegraph-gremlin is that property graph (PG) data can be lo
<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-groovy-test</artifactId>
<version>${tp3.version}</version>
<version>${tp3.gremlin-groovy-test.version}</version>
<scope>test</scope>
</dependency>
<!-- Blaze dependency -->
Expand Down
22 changes: 22 additions & 0 deletions scripts/test
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/bin/bash
LC_NUMERIC="en_US.UTF-8"
TIMES=()
PACKAGES=()
mvn clean install -DskipTests -Dmaven.javadoc.skip=true -Dgpg.skip=true
for package in TestBasicOperations TestBulkLoad TestHistory TestListeners TestSearch SampleCode TestSearch
do
START=$(date +%s.%N)
mvn test -Dtest=com.blazegraph.gremlin.structure.$package
END=$(date +%s.%N)
DIFF=$(echo "$END - $START" | bc)
TIMES+=($DIFF)
PACKAGES+=($package)
done
# get length of an array
len=${#PACKAGES[@]}
for (( i=1; i<${len}+1; i++ ));
do
package=${PACKAGES[$i-1]}
DIFF=${TIMES[$i-1]}
printf "%2d/%2d testing %20s took %.1f secs\n" $i $len $package $DIFF
done
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,15 @@
*/
public class Tinkerpop3ExtensionFactory extends DefaultExtensionFactory {

/**
* initialize the extension factory
* @param resolver
* @param lex
* @param extensions
*/
protected void _init(final IDatatypeURIResolver resolver,
final ILexiconConfiguration<BigdataValue> lex,
final Collection<IExtension> extensions) {
final Collection<IExtension<? extends BigdataValue>> extensions) {

/*
* Add ListIndexExtension for Cardinality.list.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@
*/
package com.blazegraph.gremlin.structure;

import static java.util.stream.Collectors.toSet;
import static org.junit.Assert.assertEquals;

import java.io.File;
import java.util.LinkedList;
import java.util.List;
import java.util.stream.Collectors;

import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.T;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ public class StructureStandardSuite extends AbstractGremlinSuite {
DetachedVertexTest.class,
EdgeTest.class,
FeatureSupportTest.class,
GraphTest.class,
// takes 5 min to test
// GraphTest.class,
GraphConstructionTest.class,
ModifiedVertexPropertyTest.class,
VariablesTest.class,
Expand All @@ -106,8 +107,9 @@ public class StructureStandardSuite extends AbstractGremlinSuite {
ModifiedStarGraphTest.class,
VertexTest.class,
ModifiedTransactionTest.class,
CommunityGeneratorTest.class,
DistributionGeneratorTest.class,
// takes over 1/2 hour to test
// CommunityGeneratorTest.class,
// DistributionGeneratorTest.class,
IoCustomTest.class,
IoEdgeTest.class,
IoGraphTest.class,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import static java.util.stream.Collectors.toList;

import java.util.List;
import java.util.stream.Collectors;

import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Edge;
Expand Down
41 changes: 41 additions & 0 deletions src/test/java/com/blazegraph/gremlin/structure/TestSuite.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/**
Copyright (C) SYSTAP, LLC DBA Blazegraph 2018. All rights reserved.

Contact:
SYSTAP, LLC DBA Blazegraph
2501 Calvert ST NW #106
Washington, DC 20008
[email protected]

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
package com.blazegraph.gremlin.structure;

import org.junit.runner.RunWith;
import org.junit.runners.Suite;

@RunWith(Suite.class)
@Suite.SuiteClasses({ TestBasicOperations.class, TestBulkLoad.class,
TestHistory.class,TestSearch.class, SampleCode.class
// uncomment to run full testsuite with some 810 tests
,BlazeGraphStructureStandardTest.class
})
/**
* run test as a suite
* @author wf
*
*/
public class TestSuite {

}
5 changes: 3 additions & 2 deletions src/test/resources/log4j.properties
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,19 @@ log4j.logger.org.openrdf.query.resultio=ERROR
#log4j.logger.com.bigdata.txLog=INFO

#log4j.logger.com.blazegraph.gremlin=ALL
#og4j.logger.com.blazegraph.gremlin.structure.BlazeGraph=DEBUG
#log4j.logger.com.blazegraph.gremlin.structure.BlazeGraph=DEBUG
#log4j.logger.com.blazegraph.gremlin.structure.BlazeGraph.SparqlLog=TRACE
#log4j.logger.com.blazegraph.gremlin.structure.StructureStandardSuite=ALL
#log4j.logger.com.blazegraph.gremlin.structure.TestBasicOperations=ALL
#log4j.logger.com.blazegraph.gremlin.structure.TestHistory=ALL
#log4j.logger.com.blazegraph.gremlin.structure.TestListeners=ALL
#log4j.logger.com.blazegraph.gremlin.structure.TestSearch=ALL
#log4j.logger.com.blazegraph.gremlin.structure.BlazeGraphStructureStandardTest=INFO
log4j.logger.com.blazegraph.gremlin.structure.SampleCode=ALL


# Test suite loggers.
#log4j.logger.junit=INFO
log4j.logger.junit=INFO
#log4j.logger.com.bigdata.btree.AbstractBTreeTestCase=INFO
log4j.logger.junit.framework.TestCase2=ERROR

Expand Down