tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spmalle...@apache.org
Subject [2/5] tinkerpop git commit: Merge branch 'tp32'
Date Wed, 12 Jul 2017 13:48:25 GMT
Merge branch 'tp32'

Conflicts:
	docker/Dockerfile
	pom.xml


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/facd592f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/facd592f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/facd592f

Branch: refs/heads/TINKERPOP-1552-master
Commit: facd592f2e1269543ce3df9e81a7e16cec15ccdc
Parents: 144441a 694b16e
Author: Stephen Mallette <spmva@genoprime.com>
Authored: Wed Jul 12 07:53:04 2017 -0400
Committer: Stephen Mallette <spmva@genoprime.com>
Committed: Wed Jul 12 07:53:04 2017 -0400

----------------------------------------------------------------------
 .gitignore                                      |  11 +
 .travis.yml                                     |   5 +
 CHANGELOG.asciidoc                              |   1 +
 docker/Dockerfile                               |   6 +-
 .../developer/development-environment.asciidoc  |  35 +
 docs/src/dev/developer/release.asciidoc         |  18 +-
 docs/src/reference/gremlin-variants.asciidoc    | 190 ++++
 gremlin-dotnet/Gremlin.Net.sln                  |  45 +
 gremlin-dotnet/glv/AnonymousTraversal.template  |  52 +
 gremlin-dotnet/glv/Enum.template                |  35 +
 gremlin-dotnet/glv/GraphTraversal.template      |  75 ++
 .../glv/GraphTraversalSource.template           | 132 +++
 gremlin-dotnet/glv/Gremlin.Net.csproj.template  |  64 ++
 gremlin-dotnet/glv/NamingConversions.template   |  50 +
 gremlin-dotnet/glv/P.template                   |  45 +
 gremlin-dotnet/pom.xml                          | 296 ++++++
 .../src/Gremlin.Net/Driver/Connection.cs        | 162 ++++
 .../src/Gremlin.Net/Driver/ConnectionFactory.cs |  48 +
 .../src/Gremlin.Net/Driver/ConnectionPool.cs    | 114 +++
 .../Driver/Exceptions/ResponseException.cs      |  37 +
 .../src/Gremlin.Net/Driver/GremlinClient.cs     |  95 ++
 .../Driver/GremlinClientExtensions.cs           | 140 +++
 .../src/Gremlin.Net/Driver/GremlinServer.cs     |  70 ++
 .../src/Gremlin.Net/Driver/IConnection.cs       |  35 +
 .../src/Gremlin.Net/Driver/IGremlinClient.cs    |  48 +
 .../Gremlin.Net/Driver/JsonMessageSerializer.cs |  49 +
 .../Driver/Messages/RequestMessage.cs           | 143 +++
 .../Driver/Messages/ResponseMessage.cs          |  40 +
 .../Driver/Messages/ResponseResult.cs           |  37 +
 .../Driver/Messages/ResponseStatus.cs           |  50 +
 .../Driver/Messages/ResponseStatusCode.cs       |  67 ++
 .../src/Gremlin.Net/Driver/ProxyConnection.cs   |  52 +
 .../Driver/Remote/DriverRemoteConnection.cs     |  80 ++
 .../Driver/Remote/DriverRemoteTraversal.cs      |  39 +
 .../Remote/DriverRemoteTraversalSideEffects.cs  | 126 +++
 .../ResultsAggregation/AggregatorFactory.cs     |  44 +
 .../ResultsAggregation/DefaultAggregator.cs     |  42 +
 .../ResultsAggregation/DictionaryAggregator.cs  |  44 +
 .../Driver/ResultsAggregation/IAggregator.cs    |  31 +
 .../ResultsAggregation/TraverserAggregator.cs   |  44 +
 gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs | 125 +++
 .../Gremlin.Net/Driver/WebSocketConnection.cs   |  96 ++
 .../src/Gremlin.Net/Gremlin.Net.csproj          |  64 ++
 .../Process/Remote/IRemoteConnection.cs         |  42 +
 .../Process/Remote/RemoteStrategy.cs            |  61 ++
 .../Gremlin.Net/Process/Traversal/Barrier.cs    |  35 +
 .../Gremlin.Net/Process/Traversal/Binding.cs    |  80 ++
 .../Gremlin.Net/Process/Traversal/Bindings.cs   |  42 +
 .../Gremlin.Net/Process/Traversal/Bytecode.cs   |  85 ++
 .../Process/Traversal/Cardinality.cs            |  37 +
 .../src/Gremlin.Net/Process/Traversal/Column.cs |  36 +
 .../Process/Traversal/DefaultTraversal.cs       | 198 ++++
 .../Gremlin.Net/Process/Traversal/Direction.cs  |  37 +
 .../Process/Traversal/GraphSONVersion.cs        |  36 +
 .../Process/Traversal/GraphTraversal.cs         | 948 +++++++++++++++++++
 .../Process/Traversal/GraphTraversalSource.cs   | 194 ++++
 .../Process/Traversal/GryoVersion.cs            |  35 +
 .../Gremlin.Net/Process/Traversal/ITraversal.cs | 102 ++
 .../Process/Traversal/ITraversalSideEffects.cs  |  52 +
 .../Process/Traversal/ITraversalStrategy.cs     |  46 +
 .../Process/Traversal/Instruction.cs            |  52 +
 .../Process/Traversal/NamingConversions.cs      |  91 ++
 .../Gremlin.Net/Process/Traversal/Operator.cs   |  45 +
 .../src/Gremlin.Net/Process/Traversal/Order.cs  |  41 +
 .../src/Gremlin.Net/Process/Traversal/P.cs      | 117 +++
 .../src/Gremlin.Net/Process/Traversal/Pick.cs   |  36 +
 .../src/Gremlin.Net/Process/Traversal/Pop.cs    |  37 +
 .../src/Gremlin.Net/Process/Traversal/Scope.cs  |  36 +
 .../Strategy/AbstractTraversalStrategy.cs       |  86 ++
 .../Strategy/Decoration/ConnectiveStrategy.cs   |  33 +
 .../Strategy/Decoration/ElementIdStrategy.cs    |  32 +
 .../Decoration/HaltedTraverserStrategy.cs       |  36 +
 .../Strategy/Decoration/PartitionStrategy.cs    |  56 ++
 .../Strategy/Decoration/SubgraphStrategy.cs     |  48 +
 .../Decoration/VertexProgramStrategy.cs         |  52 +
 .../Finalization/MatchAlgorithmStrategy.cs      |  36 +
 .../Optimization/AdjacentToIncidentStrategy.cs  |  32 +
 .../Optimization/FilterRankingStrategy.cs       |  32 +
 .../Optimization/GraphFilterStrategy.cs         |  31 +
 .../Optimization/IdentityRemovalStrategy.cs     |  32 +
 .../Optimization/IncidentToAdjacentStrategy.cs  |  33 +
 .../Optimization/InlineFilterStrategy.cs        |  32 +
 .../Optimization/LazyBarrierStrategy.cs         |  33 +
 .../Optimization/MatchPredicateStrategy.cs      |  32 +
 .../Strategy/Optimization/OrderLimitStrategy.cs |  31 +
 .../Optimization/PathProcessorStrategy.cs       |  32 +
 .../Optimization/PathRetractionStrategy.cs      |  31 +
 .../Optimization/RangeByIsCountStrategy.cs      |  32 +
 .../Optimization/RepeatUnrollStrategy.cs        |  31 +
 .../Verification/LambdaRestrictionStrategy.cs   |  32 +
 .../Strategy/Verification/ReadOnlyStrategy.cs   |  32 +
 .../src/Gremlin.Net/Process/Traversal/T.cs      |  38 +
 .../Process/Traversal/TraversalPredicate.cs     |  85 ++
 .../Gremlin.Net/Process/Traversal/Traverser.cs  |  75 ++
 .../src/Gremlin.Net/Process/Traversal/__.cs     | 772 +++++++++++++++
 .../src/Gremlin.Net/Structure/Edge.cs           |  61 ++
 .../src/Gremlin.Net/Structure/Element.cs        |  77 ++
 .../src/Gremlin.Net/Structure/Graph.cs          |  43 +
 .../Structure/IO/GraphSON/BindingSerializer.cs  |  42 +
 .../Structure/IO/GraphSON/BytecodeSerializer.cs |  58 ++
 .../Structure/IO/GraphSON/DateDeserializer.cs   |  43 +
 .../Structure/IO/GraphSON/DateSerializer.cs     |  43 +
 .../Structure/IO/GraphSON/DoubleConverter.cs    |  33 +
 .../Structure/IO/GraphSON/EdgeDeserializer.cs   |  43 +
 .../Structure/IO/GraphSON/EdgeSerializer.cs     |  45 +
 .../Structure/IO/GraphSON/EnumSerializer.cs     |  38 +
 .../Structure/IO/GraphSON/FloatConverter.cs     |  33 +
 .../Structure/IO/GraphSON/GraphSONReader.cs     | 123 +++
 .../Structure/IO/GraphSON/GraphSONTokens.cs     |  32 +
 .../Structure/IO/GraphSON/GraphSONUtil.cs       |  62 ++
 .../Structure/IO/GraphSON/GraphSONWriter.cs     | 146 +++
 .../IO/GraphSON/IGraphSONDeserializer.cs        |  41 +
 .../IO/GraphSON/IGraphSONSerializer.cs          |  41 +
 .../Structure/IO/GraphSON/Int32Converter.cs     |  33 +
 .../Structure/IO/GraphSON/Int64Converter.cs     |  33 +
 .../Structure/IO/GraphSON/NumberConverter.cs    |  45 +
 .../Structure/IO/GraphSON/PathDeserializer.cs   |  41 +
 .../IO/GraphSON/PropertyDeserializer.cs         |  38 +
 .../Structure/IO/GraphSON/PropertySerializer.cs |  64 ++
 .../IO/GraphSON/RequestMessageSerializer.cs     |  43 +
 .../IO/GraphSON/TraversalPredicateSerializer.cs |  45 +
 .../IO/GraphSON/TraversalSerializer.cs          |  38 +
 .../IO/GraphSON/TraversalStrategySerializer.cs  |  37 +
 .../Structure/IO/GraphSON/TraverserReader.cs    |  38 +
 .../Structure/IO/GraphSON/UuidDeserializer.cs   |  36 +
 .../Structure/IO/GraphSON/UuidSerializer.cs     |  37 +
 .../Structure/IO/GraphSON/VertexDeserializer.cs |  37 +
 .../IO/GraphSON/VertexPropertyDeserializer.cs   |  41 +
 .../IO/GraphSON/VertexPropertySerializer.cs     |  43 +
 .../Structure/IO/GraphSON/VertexSerializer.cs   |  41 +
 .../src/Gremlin.Net/Structure/Path.cs           | 193 ++++
 .../src/Gremlin.Net/Structure/Property.cs       |  96 ++
 .../src/Gremlin.Net/Structure/Vertex.cs         |  52 +
 .../src/Gremlin.Net/Structure/VertexProperty.cs |  66 ++
 gremlin-dotnet/src/pom.xml                      | 219 +++++
 .../ConfigProvider.cs                           |  47 +
 .../Driver/ConnectionPoolTests.cs               |  90 ++
 .../Driver/GremlinClientAuthenticationTests.cs  |  86 ++
 .../Driver/GremlinClientTests.cs                | 212 +++++
 .../Driver/MessagesTests.cs                     | 147 +++
 .../Gremlin.Net.IntegrationTest.csproj          |  36 +
 .../Process/Remote/RemoteStrategyTests.cs       |  85 ++
 .../BytecodeGenerationTests.cs                  |  76 ++
 .../BytecodeGeneration/StrategiesTests.cs       | 170 ++++
 .../DriverRemoteConnection/EnumTests.cs         |  59 ++
 .../GraphTraversalSourceTests.cs                |  55 ++
 .../GraphTraversalTests.cs                      | 169 ++++
 .../DriverRemoteConnection/PredicateTests.cs    |  58 ++
 .../RemoteConnectionFactory.cs                  |  41 +
 .../DriverRemoteConnection/SideEffectTests.cs   | 221 +++++
 .../DriverRemoteConnection/StrategiesTests.cs   | 193 ++++
 .../Process/Traversal/GraphSONWriterTests.cs    |  50 +
 .../Util/RequestMessageProvider.cs              |  54 ++
 .../appsettings.json                            |   5 +
 .../Driver/DriverRemoteConnectionTests.cs       |  51 +
 .../Driver/GremlinServerTests.cs                |  66 ++
 .../Driver/RequestMessageBuilderTests.cs        |  41 +
 .../Gremlin.Net.UnitTest.csproj                 |  28 +
 .../Process/Traversal/BytecodeTests.cs          |  44 +
 .../Traversal/GraphTraversalSourceTests.cs      |  68 ++
 .../Process/Traversal/PredicateTests.cs         |  50 +
 .../Process/Traversal/Strategy/StrategyTests.cs | 109 +++
 .../Process/Traversal/TestTraversal.cs          |  51 +
 .../Process/Traversal/TestTraversalStrategy.cs  |  50 +
 .../Process/Traversal/TraversalTests.cs         | 177 ++++
 .../Process/Traversal/TraverserTests.cs         |  75 ++
 .../Gremlin.Net.UnitTest/Structure/EdgeTests.cs |  57 ++
 .../GraphSON/BytecodeGraphSONSerializerTests.cs | 153 +++
 .../IO/GraphSON/GraphSONReaderTests.cs          | 308 ++++++
 .../IO/GraphSON/GraphSONWriterTests.cs          | 324 +++++++
 .../IO/GraphSON/StrategyWriterTests.cs          |  66 ++
 .../Structure/IO/GraphSON/TestClass.cs          |  30 +
 .../Structure/IO/GraphSON/TestUtils.cs          |  36 +
 .../Gremlin.Net.UnitTest/Structure/PathTests.cs | 416 ++++++++
 .../Structure/PropertyTests.cs                  | 165 ++++
 .../Structure/VertexPropertyTests.cs            |  69 ++
 .../Structure/VertexTests.cs                    |  80 ++
 gremlin-dotnet/test/pom.xml                     | 205 ++++
 pom.xml                                         |   9 +
 179 files changed, 14228 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/facd592f/.gitignore
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/facd592f/.travis.yml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/facd592f/CHANGELOG.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/facd592f/docker/Dockerfile
----------------------------------------------------------------------
diff --cc docker/Dockerfile
index ce3e62e,3e7ca42..35dd35e
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@@ -20,14 -20,13 +20,16 @@@ FROM ubuntu:trust
  MAINTAINER Daniel Kuppitz <me@gremlin.guru>
  
  RUN apt-get update \
-     && apt-get -y install software-properties-common python-software-properties
\
+     && apt-get -y install software-properties-common python-software-properties
apt-transport-https \
      && echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true
| debconf-set-selections \
      && add-apt-repository -y ppa:webupd8team/java \
+     && sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/
trusty main" > /etc/apt/sources.list.d/dotnetdev.list' \
+     && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 417A0893
\
      && apt-get update \
-     && apt-get install -y oracle-java8-installer curl gawk git maven openssh-server
subversion \
 -    && apt-get install -y oracle-java8-installer curl gawk git maven openssh-server
dotnet-dev-1.0.4 \
++    && apt-get install -y oracle-java8-installer curl gawk git maven openssh-server
dotnet-dev-1.0.4 subversion \
 +    && apt-get install -y python python-dev python-pip build-essential \
 +    && pip install virtualenv virtualenvwrapper \
 +    && pip install --upgrade pip \
      && rm -rf /var/lib/apt/lists/* /var/cache/oracle-jdk8-installer
  
  RUN sed -i 's@PermitRootLogin without-password@PermitRootLogin yes@' /etc/ssh/sshd_config

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/facd592f/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/facd592f/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/facd592f/docs/src/reference/gremlin-variants.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/facd592f/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index c60254a,327a0db..9631f6a
--- a/pom.xml
+++ b/pom.xml
@@@ -116,9 -116,12 +116,10 @@@ limitations under the License
          <module>gremlin-shaded</module>
          <module>gremlin-core</module>
          <module>gremlin-test</module>
 -        <module>gremlin-benchmark</module>
          <module>gremlin-groovy</module>
 -        <module>gremlin-groovy-test</module>
          <module>tinkergraph-gremlin</module>
          <module>gremlin-python</module>
+         <module>gremlin-dotnet</module>
          <module>hadoop-gremlin</module>
          <module>spark-gremlin</module>
          <module>giraph-gremlin</module>
@@@ -318,8 -312,14 +319,16 @@@
                          <exclude>**/.glv</exclude>
                          <exclude>bin/gremlin.sh</exclude>
                          <exclude>gremlin-console/bin/gremlin.sh</exclude>
 +                        <exclude>docs/site/home/css/**</exclude>
 +                        <exclude>docs/site/home/js/**</exclude>
+                         <exclude>**/Debug/**</exclude>
+                         <exclude>**/Release/**</exclude>
+                         <exclude>**/obj/**</exclude>
+                         <exclude>**/*.sln</exclude>
+                         <exclude>**/*.user</exclude>
+                         <exclude>**/*.csproj</exclude>
+                         <exclude>**/.vs/**</exclude>
+                         <exclude>**/NuGet.Config</exclude>
                      </excludes>
                      <licenses>
                          <license implementation="org.apache.rat.analysis.license.ApacheSoftwareLicense20"/>


Mime
View raw message