Skip to content

Commit 0219ddc

Browse files
author
Alexander Patrikalakis
committed
Implement support for JanusGraph 0.2.1
Fixes amazon-archives#275, amazon-archives#277
1 parent be51ad2 commit 0219ddc

9 files changed

+55
-60
lines changed

Diff for: ‎.travis.yml

+18-22
Original file line numberDiff line numberDiff line change
@@ -2,54 +2,50 @@ language: java
22
sudo: required
33
dist: trusty
44
jdk:
5-
- oraclejdk8
5+
- openjdk8
66
cache:
77
directories:
88
- "${HOME}/.m2"
99
env:
1010
matrix:
11-
#32 minutes
11+
#32 minutes
1212
- MODULE="MultiStoreTest" CATEGORY="MultiDynamoDBStoreTestCategory"
13-
#22 minutes
13+
#22 minutes
1414
- MODULE="MultiVertexCentricQuery" CATEGORY="IsolateMultiVertexCentricQuery"
1515
#17.5 minutes
1616
- MODULE="SingleGraphTest" CATEGORY="SingleDynamoDBGraphTestCategory"
1717
#17.3 minutes
1818
- MODULE="SingleStoreTest" CATEGORY="SingleDynamoDBStoreTestCategory"
1919
#16.5 minutes
2020
- MODULE="MultiLargeJointIndexRetrieval" CATEGORY="IsolateMultiLargeJointIndexRetrieval"
21-
#15.7 minutes
22-
- MODULE="MultiOLAPTest" CATEGORY="MultiDynamoDBOLAPTestCategory"
21+
#15.7 minutes - currently MultiOLAPTest is flaky
22+
# - MODULE="MultiOLAPTest" CATEGORY="MultiDynamoDBOLAPTestCategory"
2323
#13.5 minutes
2424
- MODULE="MultiGraphTest" CATEGORY="MultiDynamoDBGraphTestCategory"
2525
#11.8 minutes
2626
- MODULE="MultiEdgesExceedCacheSize" CATEGORY="IsolateMultiEdgesExceedCacheSize"
27-
#12 minutes
27+
#12 minutes
2828
- MODULE="SingleIdAuthorityLogStore" CATEGORY="SingleIdAuthorityLogStoreCategory"
29-
#11 minutes
29+
#11 minutes
3030
- MODULE="MultiIdAuthorityLogStore" CATEGORY="MultiIdAuthorityLogStoreCategory"
31-
#9 minutes
31+
#9 minutes
3232
- MODULE="SingleOLAPTest" CATEGORY="SingleDynamoDBOLAPTestCategory"
33-
#8.7 minutes
33+
#8.7 minutes
3434
- MODULE="MultiConcurrentGetSliceAndMutate" CATEGORY="IsolateMultiConcurrentGetSliceAndMutate"
35-
#8.5 minutes
35+
#8.5 minutes
3636
- MODULE="RemainingTestsCategory" CATEGORY="IsolateRemainingTestsCategory"
37-
#6.5 minutes
37+
#6.5 minutes
3838
- MODULE="MultiConcurrentGetSlice" CATEGORY="IsolateMultiConcurrentGetSlice"
39-
#6.4 minutes
39+
#6.4 minutes
4040
- MODULE="SingleConcurrentGetSliceAndMutate" CATEGORY="IsolateSingleConcurrentGetSliceAndMutate"
41-
#4.8 minutes
41+
#6 minutes
42+
- MODULE="GraphSimpleLogTest" CATEGORY="GraphSimpleLogTestCategory"
43+
#4.8 minutes
4244
- MODULE="SingleConcurrentGetSlice" CATEGORY="IsolateSingleConcurrentGetSlice"
43-
#3.2
45+
#3.2 minutes
4446
- MODULE="SingleMultiWriteStoreTestCategory" CATEGORY="SingleDynamoDBMultiWriteStoreTestCategory"
45-
#2.8 minutes
47+
#2.8 minutes
4648
- MODULE="MultiMultiWriteStoreTestCategory" CATEGORY="MultiDynamoDBMultiWriteStoreTestCategory"
47-
#To be added
48-
- MODULE="GraphSimpleLogTest" CATEGORY="GraphSimpleLogTestCategory"
49-
addons:
50-
apt:
51-
packages:
52-
- oracle-java8-installer
5349
branches:
5450
only:
5551
- 1.0.0
@@ -64,5 +60,5 @@ script:
6460
#- aws cloudformation validate-template --region us-west-2 --template-body `pwd | sed -e 's/\//\/\//g' -e 's/^/file:\//' -e 's/$/\/\/dynamodb-janusgraph-tables-multiple\.yaml/'`
6561
notifications:
6662
email:
67-
- [email protected]
63+
- [email protected]
6864
- [email protected]

Diff for: ‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ account in the same region.
2828
multiple-item model based on graph size and utilization.
2929
* Test graph locally with DynamoDB Local.
3030
* Integrated with JanusGraph metrics.
31-
* JanusGraph 0.2.0 and TinkerPop 3.2.6 compatibility.
31+
* JanusGraph 0.2.1 and TinkerPop 3.2.9 compatibility.
3232
* Upgrade compatibility from Titan 1.0.0.
3333

3434
## Getting Started

Diff for: ‎dynamodb-janusgraph-storage-backend-cfn.yaml

+3-5
Original file line numberDiff line numberDiff line change
@@ -565,16 +565,14 @@ Resources:
565565
- - "#!/bin/bash\n"
566566
- "export SDKMAN_DIR=/usr/local/sdkman && curl -s https://get.sdkman.io | bash && source /usr/local/sdkman/bin/sdkman-init.sh\n"
567567
- "echo 'export SDKMAN_DIR=/usr/local/sdkman; source /usr/local/sdkman/bin/sdkman-init.sh' > /etc/profile.d/sdkman.sh\n"
568-
- "yum update -y -q -e 0 && yum upgrade -y -q -e 0 && yum install -y java-1.8.0-openjdk > /home/ec2-user/yumupdates.log\n"
568+
- "yum update -y -q -e 0 && yum upgrade -y -q -e 0 && yum install -y -q java-1.8.0-openjdk-devel > /home/ec2-user/yumupdates.log\n"
569569
- "yum remove -y java-1.7.0-openjdk > /home/ec2-user/yumremovejava7.log\n"
570570
- "java -version > /home/ec2-user/java-version-before-sdkmvn.log\n"
571-
- "sdk install java < /dev/null\n"
572-
- "sdk current java > /home/ec2-user/java-version-from-sdkman.log\n"
573571
- "sdk install maven < /dev/null && set -x\n"
574572
- "mvn -version > /home/ec2-user/maven-installation-settings.log\n"
575573
- "export GREMLIN_SERVER_USERNAME='ec2-user'\n"
576574
- "export LOG_DIR=/var/log/gremlin-server\n"
577-
- "export SERVER_DIRNAME=dynamodb-janusgraph-storage-backend-1.2.0\n"
575+
- "export SERVER_DIRNAME=dynamodb-janusgraph-storage-backend-1.3.0\n"
578576
- "export SERVER_ZIP=${SERVER_DIRNAME}.zip\n"
579577
- "export PACKAGES_DIR=/usr/local/packages\n"
580578
- "export INSTALL_DIR=${PACKAGES_DIR}/${SERVER_DIRNAME}\n"
@@ -621,7 +619,7 @@ Outputs:
621619
- Fn::GetAtt:
622620
- WebServerInstance
623621
- PublicDnsName
624-
- " /usr/local/packages/dynamodb-janusgraph-storage-backend-1.2.0/bin/gremlin.sh"
622+
- " /usr/local/packages/dynamodb-janusgraph-storage-backend-1.3.0/bin/gremlin.sh"
625623
Description: Use this remote shell to interact with the graph.
626624
GremlinServerEndpoint:
627625
Value:

Diff for: ‎pom.xml

+10-9
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>com.amazonaws</groupId>
44
<artifactId>dynamodb-janusgraph-storage-backend</artifactId>
5-
<version>1.2.0</version>
5+
<version>1.3.0</version>
66
<packaging>jar</packaging>
77
<name>Amazon DynamoDB Storage Backend for JanusGraph</name>
88
<url>https://github.com/awslabs/dynamodb-janusgraph-storage-backend</url>
99
<description>The Amazon DynamoDB Storage Backend for JanusGraph: Distributed Graph Database allows JanusGraph graphs to use DynamoDB as a storage backend.</description>
1010
<scm>
1111
<url>[email protected]:awslabs/dynamodb-janusgraph-storage-backend.git</url>
12-
<tag>jg0.2.0-1.2.0</tag>
12+
<tag>jg0.2.1-1.3.0</tag>
1313
</scm>
1414
<properties>
1515
<default.test.jvm.opts>-Xms256m -Xmx1280m -XX:+HeapDumpOnOutOfMemoryError</default.test.jvm.opts>
@@ -18,18 +18,19 @@
1818
<dynamodb-local.port>4567</dynamodb-local.port>
1919
<dynamodb-local.endpoint>http://localhost:${dynamodb-local.port}</dynamodb-local.endpoint>
2020
<jdk.version>1.8</jdk.version>
21-
<aws.java.sdk.version>1.11.336</aws.java.sdk.version>
21+
<aws.java.sdk.version>1.11.369</aws.java.sdk.version>
2222
<jackson.version>2.6.6</jackson.version>
23-
<janusgraph.version>0.2.0</janusgraph.version>
24-
<tinkerpop.version>3.2.6</tinkerpop.version>
23+
<janusgraph.version>0.2.1</janusgraph.version>
24+
<tinkerpop.version>3.2.9</tinkerpop.version>
2525
<dependency.plugin.version>3.0.2</dependency.plugin.version>
2626
<maven.assembly.plugin.version>3.1.0</maven.assembly.plugin.version>
2727
<maven.compiler.plugin.version>3.6.2</maven.compiler.plugin.version>
2828
<maven.surefire.version>2.20</maven.surefire.version>
2929
<maven.failsafe.version>2.20</maven.failsafe.version>
30-
<maven.resources.plugin.version>3.0.2</maven.resources.plugin.version>
30+
<maven.resources.plugin.version>3.1.0</maven.resources.plugin.version>
3131
<exec.maven.plugin.version>1.6.0</exec.maven.plugin.version>
32-
<download.maven.plugin.version>1.2.1</download.maven.plugin.version>
32+
<download.maven.plugin.version>1.4.1</download.maven.plugin.version>
33+
<log4j.version>1.2.17</log4j.version>
3334
<slf4j.version>1.7.12</slf4j.version>
3435
<opencsv.version>3.8</opencsv.version>
3536
<metrics3.version>3.0.1</metrics3.version>
@@ -52,7 +53,7 @@
5253
<developers>
5354
<developer>
5455
<name>Alexander Patrikalakis</name>
55-
<email>[email protected]</email>
56+
<email>[email protected]</email>
5657
<url>https://www.linkedin.com/in/amcpatrix/en</url>
5758
</developer>
5859
<developer>
@@ -171,7 +172,7 @@
171172
<dependency>
172173
<groupId>log4j</groupId>
173174
<artifactId>log4j</artifactId>
174-
<version>1.2.17</version>
175+
<version>${log4j.version}</version>
175176
<scope>test</scope>
176177
</dependency>
177178
<dependency>

Diff for: ‎src/test/resources/get-recent-al-amis.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
# Copyright 2017-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License").
66
# You may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ aws ec2 describe-regions --query 'Regions[*].[RegionName]' | sed -e '/\[/d' -e '
2323
--region ${region} \
2424
--owners amazon \
2525
--filters "Name=root-device-type,Values=ebs" "Name=name,Values=amzn-ami-*" \
26-
--query 'Images[? CreationDate > `'${LATER_THAN_DATE}'` && !contains(Name, `minimal`) && !contains(Name, `nat`)].[ImageId, ImageLocation]' |\
26+
--query 'Images[? CreationDate>`'${LATER_THAN_DATE}'` && !contains(Name, `minimal`) && !contains(Name, `nat`) && !contains(Name, `ecs-optimized`) && !contains(Name, `beta`)].[ImageId, ImageLocation]' |\
2727
grep "\"" |\
2828
sed -e 's/^[ ]*\(.*\)[ ]*$/\1/' -e '/\"$/s/$/%/' |\
2929
tr "\n" "@" |\

Diff for: ‎src/test/resources/gremlin-server-service.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
# 2b) If you're running Ubuntu: update-rc.d gremlin-server defaults
6969
#
7070
# You have to SET the Gremlin Server installation directory here:
71-
SVR="/usr/local/packages/dynamodb-janusgraph-storage-backend-1.2.0"
71+
SVR="/usr/local/packages/dynamodb-janusgraph-storage-backend-1.3.0"
7272
SVR_LOG="/var/log/gremlin-server"
7373
# Specify the user to run Gremlin Server as:
7474
SVR_USER="ec2-user"

Diff for: ‎src/test/resources/install-gremlin-server.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ mvn -q -T 1C install -Dmaven.test.skip=true -DskipTests=true $MVN_OPT_PARAMS
5555
# |
5656
# -pom.xml
5757
# -server - WORKDIR
58-
# |-janusgraph-0.2.0-hadoop2 - JANUSGRAPH_VANILLA_SERVER_DIRNAME
58+
# |-janusgraph-0.2.1-hadoop2 - JANUSGRAPH_VANILLA_SERVER_DIRNAME
5959
# |-dynamodb-janusgraph-storage-backend-X.Y.Z - JANUSGRAPH_DYNAMODB_SERVER_DIRNAME
6060
# |-dynamodb-janusgraph-storage-backend-X.Y.Z.zip - JANUSGRAPH_DYNAMODB_SERVER_ZIP
6161
# |
@@ -68,7 +68,7 @@ export ARTIFACT_NAME=`mvn -q -Dexec.executable="echo" -Dexec.args='${project.art
6868
export JANUSGRAPH_DYNAMODB_HOME=${PWD}
6969
export JANUSGRAPH_DYNAMODB_TARGET=${JANUSGRAPH_DYNAMODB_HOME}/target
7070
export JANUSGRAPH_VERSION=`mvn -q -Dexec.executable="echo" -Dexec.args='${janusgraph.version}' $MVN_OPT_PARAMS --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec`
71-
#Extract the DYNAMODB version from the pom.
71+
#Extract the DynamoDB version from the pom.
7272
export DYNAMODB_PLUGIN_VERSION=`mvn -q -Dexec.executable="echo" -Dexec.args='${project.version}' $MVN_OPT_PARAMS --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec`
7373
export JANUSGRAPH_VANILLA_SERVER_DIRNAME=janusgraph-${JANUSGRAPH_VERSION}-hadoop2
7474
export JANUSGRAPH_VANILLA_SERVER_ZIP=${JANUSGRAPH_VANILLA_SERVER_DIRNAME}.zip
@@ -98,7 +98,7 @@ mvn test -q -Pdownload-janusgraph-server-zip $MVN_OPT_PARAMS > /dev/null 2>&1
9898

9999
#verify
100100
pushd target
101-
wget https://github.com/JanusGraph/janusgraph/releases/download/v0.2.0/KEYS
101+
wget https://github.com/JanusGraph/janusgraph/releases/download/v0.2.1/KEYS
102102
popd
103103
gpg --import target/KEYS
104104
gpg --verify src/test/resources/${JANUSGRAPH_VANILLA_SERVER_ZIP}.asc server/${JANUSGRAPH_VANILLA_SERVER_ZIP}

Diff for: ‎src/test/resources/janusgraph-0.2.0-hadoop2.zip.asc

-17
This file was deleted.

Diff for: ‎src/test/resources/janusgraph-0.2.1-hadoop2.zip.asc

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
-----BEGIN PGP SIGNATURE-----
2+
Version: GnuPG v1
3+
4+
iQIcBAABCgAGBQJbRBwgAAoJEGa4X/FBgCuo2g0P/22eRdKbB7WmcaobiS5YGeSp
5+
RMlvJoOpflJvJ5elpm/MjJfDj0Il1wDCmmE24BuPQX1kzk/crjIb+XC4RB8P3K6I
6+
j0xOrO+eztQ4/W+wOlqzV1bAED6JqY5hZWgkMRyQumB9155p3UCwO126JV3UpJDz
7+
Vtbn1R8mjIxVZxpP75EBfDiqQG4Xjc+y/1tsBaJaHdAwkNLXxcb4qWji4pYUF3mb
8+
AvfEB9xZlJ8T/e9u6PY4NhlsGE54YuPFDIx2t3b6DUW7dcg3V1411aA13NaYrH6N
9+
Yn3QatjwQ/Rzb4n/asojuzmfjMm2BLnWHgX9IP+Mjhcbce4+5IbRJhoe446VPFiI
10+
YLDpxWDlY3aYopTk0fTDaGClcDlUZtXeCSNN8OnGz0x97af8jragxyNG9N6jxNYt
11+
H8bHNM6kQrJvTj6YD4WXfyHlXLokb+BlVvMAYBMdzQ3JIp7eX4WXFdueEcoo1zWS
12+
7nD5lN5cDSxW/M9QAmRtmQy8AzDFEHPJQM4K3XY4/B18FyyehuMU9sklMHmGOmRm
13+
hgx99KjU5ApMZxUBlDqat56eYBanLScUen4agHV17PHwJ73Xb765uvLFWqi0BUe2
14+
5K9F+xI6n9UEAx7/sNTQJgJQJ73WguK9+4zf0pcXeU4oACLUyOmIB7AuW5EuXf5e
15+
02U5gcOFHUlxruqyTLUF
16+
=VvSg
17+
-----END PGP SIGNATURE-----

0 commit comments

Comments
 (0)