Merge pull request JanusGraph#863 from jerryjch/timestamp-provider

Issue 862 Fix preferred default timestamp provider logic in janusgraph configuration

Author: jerryjch

docs/upgrade.adoc

@@ -103,3 +103,14 @@ configuration properties.
 The legacy configuration track was not recommended in JanusGraph 0.1.z and is
 no longer supported in JanusGraph 0.2.0. Users should refer to the previous
 sections and migrate to the `REST_CLIENT`.
+
+=== Upgrading from JanusGraph 0.2.0
+
+==== HBase TTL
+
+In JanusGraph 0.2.0, time-to-live (TTL) support was added for HBase storage backend.
+In order to utilize the TTL capability on HBase, the graph timestamps need to be
+MILLI. If the `graph.timestamps` property is not explicitly set to MILLI, the default
+is MICRO in JanusGraph 0.2.0, which does not work for HBase TTL.  Since the `graph.timestamps`
+property is FIXED, a new graph needs to be created to make any change of the `graph.timestamps`
+property effective.

janusgraph-core/src/main/java/org/janusgraph/graphdb/configuration/GraphDatabaseConfiguration.java

@@ -1381,7 +1381,6 @@ public GraphDatabaseConfiguration(ReadConfiguration localConfig) {
         BasicConfiguration localbc = new BasicConfiguration(ROOT_NS,localConfig, BasicConfiguration.Restriction.NONE);
         ModifiableConfiguration overwrite = new ModifiableConfiguration(ROOT_NS,new CommonsConfiguration(), BasicConfiguration.Restriction.NONE);
 
-//        KeyColumnValueStoreManager storeManager=null;
         final KeyColumnValueStoreManager storeManager = Backend.getStorageManager(localbc);
         final StoreFeatures storeFeatures = storeManager.getFeatures();
         KCVSConfiguration kcvsConfig=Backend.getStandaloneGlobalConfiguration(storeManager,localbc);
@@ -1419,10 +1418,11 @@ public GraphDatabaseConfiguration(ReadConfiguration localConfig) {
                         globalWrite.set(TIMESTAMP_PROVIDER, backendPreference);
                         log.info("Set timestamps to {} according to storage backend preference",
                             LoggerUtil.sanitizeAndLaunder(globalWrite.get(TIMESTAMP_PROVIDER)));
+                    } else {
+                        globalWrite.set(TIMESTAMP_PROVIDER, TIMESTAMP_PROVIDER.getDefaultValue());
+                        log.info("Set default timestamp provider {}",
+                            LoggerUtil.sanitizeAndLaunder(globalWrite.get(TIMESTAMP_PROVIDER)));
                     }
-                    globalWrite.set(TIMESTAMP_PROVIDER, TIMESTAMP_PROVIDER.getDefaultValue());
-                    log.info("Set default timestamp provider {}",
-                        LoggerUtil.sanitizeAndLaunder(globalWrite.get(TIMESTAMP_PROVIDER)));
                 } else {
                     log.info("Using configured timestamp provider {}", localbc.get(TIMESTAMP_PROVIDER));
                 }

janusgraph-hbase-parent/janusgraph-hbase-core/src/test/java/org/janusgraph/HBaseStorageSetup.java

@@ -103,7 +103,6 @@ public static ModifiableConfiguration getHBaseConfiguration(String tableName, St
         if (!StringUtils.isEmpty(tableName)) config.set(HBaseStoreManager.HBASE_TABLE, tableName);
         if (!StringUtils.isEmpty(graphName)) config.set(GraphDatabaseConfiguration.GRAPH_NAME, graphName);
         config.set(GraphDatabaseConfiguration.TIMESTAMP_PROVIDER, HBaseStoreManager.PREFERRED_TIMESTAMPS);
-        config.set(GraphDatabaseConfiguration.TIMESTAMP_PROVIDER, HBaseStoreManager.PREFERRED_TIMESTAMPS);
         config.set(SimpleBulkPlacementStrategy.CONCURRENT_PARTITIONS, 1);
         config.set(GraphDatabaseConfiguration.DROP_ON_CLEAR, false);
 

janusgraph-hbase-parent/janusgraph-hbase-core/src/test/java/org/janusgraph/diskstorage/hbase/HBaseStoreManagerConfigTest.java

@@ -14,6 +14,7 @@
 
 package org.janusgraph.diskstorage.hbase;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
@@ -28,8 +29,10 @@
 import org.janusgraph.diskstorage.BackendException;
 import org.janusgraph.diskstorage.configuration.BasicConfiguration;
 import org.janusgraph.diskstorage.configuration.ConfigElement;
+import org.janusgraph.diskstorage.configuration.ModifiableConfiguration;
 import org.janusgraph.diskstorage.configuration.WriteConfiguration;
 import org.janusgraph.diskstorage.keycolumnvalue.KeyColumnValueStore;
+import org.janusgraph.diskstorage.util.time.TimestampProviders;
 import org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -81,5 +84,20 @@ public void testShortCfNames() throws Exception {
         store.close();
         manager.close();
     }
+    
+    @Test
+    // Test HBase preferred timestamp provider MILLI is set by default
+    public void testHBaseTimestampProvider() throws BackendException {
+        // Get an empty configuration
+        // GraphDatabaseConfiguration.buildGraphConfiguration() only build an empty one.
+        ModifiableConfiguration config = GraphDatabaseConfiguration.buildGraphConfiguration();
+        // Set backend to hbase
+        config.set(GraphDatabaseConfiguration.STORAGE_BACKEND, "hbase");
+        // Instantiate a GraphDatabaseConfiguration based on the above
+        GraphDatabaseConfiguration graphConfig = new GraphDatabaseConfiguration(config.getConfiguration());
+        // Check the TIMESTAMP_PROVIDER has been set to the hbase preferred MILLI
+        TimestampProviders provider = graphConfig.getConfiguration().get(GraphDatabaseConfiguration.TIMESTAMP_PROVIDER);
+        assertEquals(HBaseStoreManager.PREFERRED_TIMESTAMPS, provider);
+    }
 
 }