You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/05/06 19:57:57 UTC
[1/2] incubator-tinkerpop git commit: Add a helper script to run the
driver profiling tests.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 8fbaf5b71 -> a1e634cd0
Add a helper script to run the driver profiling tests.
The gremlin-driver module now assembles a "standalone" directory but does not zip it up or anything. It's just for testing not for distribution.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/858520c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/858520c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/858520c6
Branch: refs/heads/master
Commit: 858520c621a64761d8e85bb85eb64796edf5c9ec
Parents: f2d0367
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed May 6 13:56:49 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed May 6 13:56:49 2015 -0400
----------------------------------------------------------------------
gremlin-driver/pom.xml | 22 +++++++++
gremlin-driver/src/assembly/standalone.xml | 52 ++++++++++++++++++++
gremlin-driver/src/main/bin/profile-driver.sh | 45 +++++++++++++++++
.../src/main/conf/log4j-driver.properties | 25 ++++++++++
4 files changed, 144 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/858520c6/gremlin-driver/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-driver/pom.xml b/gremlin-driver/pom.xml
index eb7eb33..ad55be3 100644
--- a/gremlin-driver/pom.xml
+++ b/gremlin-driver/pom.xml
@@ -89,6 +89,28 @@ limitations under the License.
</testResources>
<plugins>
<plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.4</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <attach>true</attach>
+ <descriptors>
+ <descriptor>src/assembly/standalone.xml</descriptor>
+ </descriptors>
+ <finalName>apache-${project.artifactId}-${project.version}</finalName>
+ <outputDirectory>target</outputDirectory>
+ <workDirectory>target/assembly/work</workDirectory>
+ <tarLongFileMode>warn</tarLongFileMode>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/858520c6/gremlin-driver/src/assembly/standalone.xml
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/assembly/standalone.xml b/gremlin-driver/src/assembly/standalone.xml
new file mode 100644
index 0000000..fb24947
--- /dev/null
+++ b/gremlin-driver/src/assembly/standalone.xml
@@ -0,0 +1,52 @@
+<!--
+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
+
+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.
+-->
+<assembly>
+ <id>standalone</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>src/main/bin</directory>
+ <outputDirectory>/bin</outputDirectory>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/conf</directory>
+ <outputDirectory>/conf</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/*.jar</directory>
+ <outputDirectory>/lib</outputDirectory>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <unpack>false</unpack>
+ <scope>compile</scope>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <unpack>false</unpack>
+ <scope>provided</scope>
+ </dependencySet>
+ </dependencySets>
+</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/858520c6/gremlin-driver/src/main/bin/profile-driver.sh
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/bin/profile-driver.sh b/gremlin-driver/src/main/bin/profile-driver.sh
new file mode 100644
index 0000000..ce747e5
--- /dev/null
+++ b/gremlin-driver/src/main/bin/profile-driver.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+#
+#
+# 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
+#
+# 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.
+#
+case `uname` in
+ CYGWIN*)
+ CP="`dirname $0`"/../config/
+ CP="$CP":$( echo `dirname $0`/../lib/*.jar . | sed 's/ /;/g')
+ ;;
+ *)
+ CP="`dirname $0`"/../config/
+ CP="$CP":$( echo `dirname $0`/../lib/*.jar . | sed 's/ /:/g')
+esac
+#echo $CP
+
+# Find Java
+if [ "$JAVA_HOME" = "" ] ; then
+ JAVA="java -server"
+else
+ JAVA="$JAVA_HOME/bin/java -server"
+fi
+
+# Set Java options
+if [ "$JAVA_OPTIONS" = "" ] ; then
+ JAVA_OPTIONS="-Xms1024m -Xmx1024m"
+fi
+
+# Execute the application and return its exit code
+exec $JAVA -Dlog4j.configuration=conf/log4j-driver.properties $JAVA_OPTIONS -cp $CP org.apache.tinkerpop.gremlin.driver.util.ProfilingApplication "$@"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/858520c6/gremlin-driver/src/main/conf/log4j-driver.properties
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/conf/log4j-driver.properties b/gremlin-driver/src/main/conf/log4j-driver.properties
new file mode 100644
index 0000000..129bf4b
--- /dev/null
+++ b/gremlin-driver/src/main/conf/log4j-driver.properties
@@ -0,0 +1,25 @@
+# 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
+#
+# 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.
+log4j.rootLogger=OFF, stdout
+log4j.logger.org.apache.tinkerpop.gremlin.driver.Connection=OFF
+log4j.logger.org.apache.tinkerpop.gremlin.driver.ConnectionPool=OFF
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+#log4j.appender.stdout=org.apache.log4j.FileAppender
+#log4j.appender.stdout.file=recless.log
+#log4j.appender.stdout.append=true
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%p] %C{1} - %m%n
[2/2] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/master'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/a1e634cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/a1e634cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/a1e634cd
Branch: refs/heads/master
Commit: a1e634cd01428ad6bcaca509c626bfa2899775dc
Parents: 858520c 8fbaf5b
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed May 6 13:57:49 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed May 6 13:57:49 2015 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../dsl/graph/DefaultGraphTraversal.java | 4 +++
.../gremlin/process/traversal/dsl/graph/__.java | 2 +-
.../lambda/AbstractLambdaTraversal.java | 5 +--
.../traversal/util/DefaultTraversal.java | 21 ++++++-----
.../strategy/decoration/EventStrategyTest.java | 37 ++++++++++----------
.../verification/ReadOnlyStrategyTest.java | 30 ++++++++--------
.../traversal/util/DefaultTraversalTest.java | 2 +-
8 files changed, 57 insertions(+), 45 deletions(-)
----------------------------------------------------------------------