Support for JanusGraph 0.1.1

Author: Alexander Patrikalakis

README.md

@@ -28,7 +28,7 @@ account in the same region.
 multiple-item model based on graph size and utilization.
 * Test graph locally with DynamoDB Local.
 * Integrated with JanusGraph metrics.
-* JanusGraph 0.1.0 and TinkerPop 3.2.3 compatibility.
+* JanusGraph 0.1.1 and TinkerPop 3.2.3 compatibility.
 * Upgrade compatibility from Titan 1.0.0.
 
 ## Getting Started

dynamodb-janusgraph-storage-backend-cfn.yaml

@@ -505,7 +505,7 @@ Resources:
             - "sdk install java < /dev/null && sdk install maven < /dev/null && set -x\n"
             - "export GREMLIN_SERVER_USERNAME='ec2-user'\n"
             - "export LOG_DIR=/var/log/gremlin-server\n"
-            - "export SERVER_DIRNAME=dynamodb-janusgraph010-storage-backend-1.0.0\n"
+            - "export SERVER_DIRNAME=dynamodb-janusgraph-storage-backend-1.1.0\n"
             - "export SERVER_ZIP=${SERVER_DIRNAME}.zip\n"
             - "export PACKAGES_DIR=/usr/local/packages\n"
             - "export INSTALL_DIR=${PACKAGES_DIR}/${SERVER_DIRNAME}\n"

pom.xml

@@ -1,15 +1,15 @@
 <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>
     <groupId>com.amazonaws</groupId>
-    <artifactId>dynamodb-janusgraph010-storage-backend</artifactId>
-    <version>1.0.0</version>
+    <artifactId>dynamodb-janusgraph-storage-backend</artifactId>
+    <version>1.1.0</version>
     <packaging>jar</packaging>
     <name>Amazon DynamoDB Storage Backend for JanusGraph</name>
     <url>https://github.com/awslabs/dynamodb-titan-storage-backend</url>
     <description>The Amazon DynamoDB Storage Backend for JanusGraph: Distributed Graph Database allows JanusGraph graphs to use DynamoDB as a storage backend.</description>
     <scm>
         <url>[email protected]:awslabs/dynamodb-titan-storage-backend.git</url>
-        <tag>janusgraph0.1.0-1.0.0</tag>
+        <tag>janusgraph0.1.1-1.0.0</tag>
     </scm>
     <properties>
         <default.test.jvm.opts>-Xms256m -Xmx1280m -XX:+HeapDumpOnOutOfMemoryError</default.test.jvm.opts>
@@ -19,7 +19,7 @@
         <dynamodb-local.endpoint>http://localhost:${dynamodb-local.port}</dynamodb-local.endpoint>
         <jdk.version>1.8</jdk.version>
         <aws.java.sdk.version>1.11.125</aws.java.sdk.version>
-        <janusgraph.version>0.1.0</janusgraph.version>
+        <janusgraph.version>0.1.1</janusgraph.version>
         <tinkerpop.version>3.2.3</tinkerpop.version>
         <dependency.plugin.version>2.10</dependency.plugin.version>
         <maven.assembly.plugin.version>2.5.5</maven.assembly.plugin.version>

src/main/java/com/amazon/janusgraph/diskstorage/dynamodb/AbstractDynamoDBStore.java

@@ -14,16 +14,13 @@
  */
 package com.amazon.janusgraph.diskstorage.dynamodb;
 
-import static com.amazon.janusgraph.diskstorage.dynamodb.Constants.DYNAMODB_USE_TITAN_ID_STORE;
-
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.lang3.tuple.Pair;
-import org.janusgraph.diskstorage.Backend;
 import org.janusgraph.diskstorage.BackendException;
 import org.janusgraph.diskstorage.Entry;
 import org.janusgraph.diskstorage.StaticBuffer;
@@ -75,11 +72,7 @@ public AbstractDynamoDBStore(final DynamoDBStoreManager manager, final String pr
         this.manager = manager;
         this.client = this.manager.client();
         this.storeName = storeName;
-        if (Backend.ID_STORE_NAME.equals(storeName) && manager.getStorageConfig().get(DYNAMODB_USE_TITAN_ID_STORE)) {
-            this.tableName = prefix + "_titan_ids";
-        } else {
-            this.tableName = prefix + "_" + storeName;
-        }
+        this.tableName = prefix + "_" + storeName;
         this.forceConsistentRead = client.forceConsistentRead();
 
         final CacheBuilder<Pair<StaticBuffer, StaticBuffer>, DynamoDBStoreTransaction> builder = CacheBuilder.newBuilder().concurrencyLevel(client.delegate().getMaxConcurrentUsers())

src/main/java/com/amazon/janusgraph/diskstorage/dynamodb/Client.java

@@ -29,6 +29,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.janusgraph.diskstorage.configuration.Configuration;
+import org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration;
 import org.janusgraph.util.stats.MetricManager;
 
 import com.amazonaws.ClientConfiguration;
@@ -139,7 +140,8 @@ public Client(org.janusgraph.diskstorage.configuration.Configuration config) {
         final Map<String, RateLimiter> readRateLimit = new HashMap<>();
         final Map<String, RateLimiter> writeRateLimit = new HashMap<>();
 
-        final Set<String> storeNames = new HashSet<>(config.get(Constants.DYNAMODB_USE_TITAN_ID_STORE) ? Constants.ALTERNATE_BACKEND_STORES : Constants.REQUIRED_BACKEND_STORES);
+        final Set<String> storeNames = new HashSet<>(Constants.REQUIRED_BACKEND_STORES);
+        storeNames.add(config.get(GraphDatabaseConfiguration.IDS_STORE_NAME));
         storeNames.addAll(config.getContainedNamespaces(Constants.DYNAMODB_STORES_NAMESPACE));
         storeNames.forEach(storeName -> setupStore(config, prefix, readRateLimit, writeRateLimit, storeName));
 

src/main/java/com/amazon/janusgraph/diskstorage/dynamodb/Constants.java

@@ -49,13 +49,6 @@ public class Constants {
 
     public static final List<String> REQUIRED_BACKEND_STORES = Arrays.asList(Backend.EDGESTORE_NAME, //
         Backend.INDEXSTORE_NAME,
-        Backend.ID_STORE_NAME,
-        Backend.SYSTEM_TX_LOG_NAME,
-        Backend.SYSTEM_MGMT_LOG_NAME,
-        GraphDatabaseConfiguration.SYSTEM_PROPERTIES_STORE_NAME);
-    public static final List<String> ALTERNATE_BACKEND_STORES = Arrays.asList(Backend.EDGESTORE_NAME, //
-        "titan_ids",
-        Backend.ID_STORE_NAME,
         Backend.SYSTEM_TX_LOG_NAME,
         Backend.SYSTEM_MGMT_LOG_NAME,
         GraphDatabaseConfiguration.SYSTEM_PROPERTIES_STORE_NAME);
@@ -119,10 +112,6 @@ public class Constants {
     public static final ConfigOption<Boolean> DYNAMODB_USE_NATIVE_LOCKING = new ConfigOption<>(DYNAMODB_CONFIGURATION_NAMESPACE,
         "native-locking", "Set this to false if you need to use JanusGraph's locking mechanism for remote lock expiry.",
         FIXED, true);
-    public static final ConfigOption<Boolean> DYNAMODB_USE_TITAN_ID_STORE = new ConfigOption<>(DYNAMODB_CONFIGURATION_NAMESPACE,
-        "use-titan-ids", "Set this to true if you are migrating from Titan to JanusGraph so that you do not have to "
-        + "copy your titan_ids table.",
-        LOCAL, false);
 
 //begin adaptation of the following block up until line 63
 //https://github.com/buka/titan/blob/master/src/main/java/com/thinkaurelius/titan/diskstorage/dynamodb/DynamoDBClient.java#L29

src/main/java/com/amazon/janusgraph/diskstorage/dynamodb/DynamoDBDelegate.java

@@ -201,11 +201,6 @@ static AwsClientBuilder.EndpointConfiguration getEndpointConfiguration(Optional<
         }
     }
 
-    @VisibleForTesting
-    AmazonDynamoDB client() {
-        return client;
-    }
-
     private <T extends AmazonWebServiceRequest> T setUserAgent(T request) {
         request.putCustomRequestHeader(USER_AGENT, Constants.JANUSGRAPH_USER_AGENT);
         return request;

src/test/java/com/amazon/janusgraph/TestGraphUtil.java

@@ -25,7 +25,6 @@
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.janusgraph.core.JanusGraph;
 import org.janusgraph.core.JanusGraphFactory;
-import org.janusgraph.diskstorage.Backend;
 import org.janusgraph.diskstorage.BackendException;
 import org.janusgraph.diskstorage.configuration.BasicConfiguration;
 import org.janusgraph.diskstorage.configuration.BasicConfiguration.Restriction;
@@ -111,12 +110,8 @@ public Configuration createTestGraphConfig(final BackendDataModel backendDataMod
         final Configuration properties = createTestConfig(backendDataModel);
 
         final String storesNsPrefix = "storage.dynamodb.stores.";
-        final List<String> storeList;
-        if (properties.getBoolean("storage.dynamodb.use-titan-ids", true)) {
-            storeList = Constants.ALTERNATE_BACKEND_STORES;
-        } else {
-            storeList = Constants.REQUIRED_BACKEND_STORES;
-        }
+        final List<String> storeList = new ArrayList<>(Constants.REQUIRED_BACKEND_STORES);
+        storeList.add(GraphDatabaseConfiguration.IDS_STORE_NAME.getDefaultValue());
         for (String store : storeList) {
             configureStore(dataModelName, provisionedReadAndWriteTps, properties, unlimitedIops, storesNsPrefix + store);
         }

src/test/java/com/amazon/janusgraph/graphdb/dynamodb/AbstractDynamoDBGraphTest.java

@@ -54,8 +54,8 @@ protected AbstractDynamoDBGraphTest(BackendDataModel model) {
     @Override
     public WriteConfiguration getConfiguration() {
         final String methodName = testName.getMethodName();
-        final List<String> extraStoreNames = methodName.contains("simpleLogTest") ? Collections.singletonList("ulog_test") : Collections.<String>emptyList();
-        return TestGraphUtil.instance.graphConfigWithClusterPartitionsAndExtraStores(model, extraStoreNames, 1 /*titanClusterPartitions*/);
+        final List<String> extraStoreNames = methodName.contains("simpleLogTest") ? Collections.singletonList("ulog_test") : Collections.emptyList();
+        return TestGraphUtil.instance.graphConfigWithClusterPartitionsAndExtraStores(model, extraStoreNames, 1 /*janusGraphClusterPartitions*/);
     }
 
     @AfterClass

src/test/java/com/amazon/janusgraph/graphdb/dynamodb/AbstractDynamoDBPartitionGraphTest.java

@@ -52,7 +52,7 @@ protected AbstractDynamoDBPartitionGraphTest(BackendDataModel model) {
     public WriteConfiguration getBaseConfiguration()
     {
         return TestGraphUtil.instance.graphConfigWithClusterPartitionsAndExtraStores(model,
-            Collections.<String>emptyList(), 8 /*titanClusterPartitions*/);
+            Collections.emptyList(), 8 /*janusGraphClusterPartitions*/);
     }
 
     @AfterClass