You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ma...@apache.org on 2024/10/06 14:43:29 UTC

(atlas) branch master updated: ATLAS-4901: updated JanusGraph to 1.0.0

This is an automated email from the ASF dual-hosted git repository.

madhan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/atlas.git


The following commit(s) were added to refs/heads/master by this push:
     new 1e66c8b24 ATLAS-4901: updated JanusGraph to 1.0.0
1e66c8b24 is described below

commit 1e66c8b243f5dc12e725642d0855fa3d3201b4f1
Author: Madhan Neethiraj <ma...@apache.org>
AuthorDate: Fri Sep 13 17:19:39 2024 -0700

    ATLAS-4901: updated JanusGraph to 1.0.0
---
 .../test/resources/atlas-application.properties    |    1 +
 .../test/resources/atlas-application.properties    |    1 +
 .../org/apache/atlas/hive/hook/HiveHookIT.java     |    6 +-
 .../test/resources/atlas-application.properties    |    3 +-
 .../test/resources/atlas-application.properties    |    1 +
 .../test/resources/atlas-application.properties    |    1 +
 .../test/resources/atlas-application.properties    |    1 +
 .../test/resources/atlas-application.properties    |    1 +
 .../test/resources/atlas-application.properties    |    1 +
 client/common/pom.xml                              |    5 +
 dev-support/atlas-docker/.env                      |    8 +-
 dev-support/atlas-docker/Dockerfile.atlas-zk       |    2 +-
 graphdb/api/pom.xml                                |    5 +
 graphdb/janus-hbase2/pom.xml                       |  132 --
 .../janusgraph/diskstorage/hbase2/AdminMask.java   |   74 --
 .../diskstorage/hbase2/ConnectionMask.java         |   55 -
 .../diskstorage/hbase2/HBaseAdmin2_0.java          |  167 ---
 .../janusgraph/diskstorage/hbase2/HBaseCompat.java |   58 -
 .../diskstorage/hbase2/HBaseCompat2_0.java         |   61 -
 .../diskstorage/hbase2/HBaseCompatLoader.java      |   90 --
 .../hbase2/HBaseKeyColumnValueStore.java           |  391 ------
 .../diskstorage/hbase2/HBaseStoreManager.java      |  988 ---------------
 .../diskstorage/hbase2/HBaseTransaction.java       |   31 -
 .../diskstorage/hbase2/HConnection2_0.java         |   58 -
 .../janusgraph/diskstorage/hbase2/HTable2_0.java   |   60 -
 .../janusgraph/diskstorage/hbase2/TableMask.java   |   45 -
 graphdb/janus/pom.xml                              |   20 +-
 .../graphdb/janus/AtlasJanusGraphDatabase.java     |    7 +-
 .../graphdb/janus/AtlasJanusIndexQuery.java        |   12 +-
 .../diskstorage/es/ElasticSearch7Index.java        | 1268 +------------------
 .../janusgraph/diskstorage/solr/Solr6Index.java    | 1285 ++------------------
 .../test/resources/atlas-application.properties    |    1 +
 graphdb/pom.xml                                    |    1 -
 .../test/resources/atlas-application.properties    |    1 +
 .../main/java/org/apache/atlas/hook/AtlasHook.java |    2 +-
 pom.xml                                            |   37 +-
 .../atlas/discovery/AtlasDiscoveryServiceTest.java |   13 +-
 .../apache/atlas/query/TraversalComposerTest.java  |    4 +-
 test-tools/pom.xml                                 |    9 +
 tools/atlas-index-repair/pom.xml                   |    4 +
 webapp/pom.xml                                     |   12 -
 .../atlas/web/service/AtlasDebugMetricsSink.java   |    3 +-
 .../atlas/web/integration/DebugMetricsIT.java      |    4 +-
 .../test/resources/atlas-application.properties    |    1 +
 44 files changed, 214 insertions(+), 4716 deletions(-)

diff --git a/addons/falcon-bridge/src/test/resources/atlas-application.properties b/addons/falcon-bridge/src/test/resources/atlas-application.properties
index 3b12e5fb3..0ce0f46c9 100644
--- a/addons/falcon-bridge/src/test/resources/atlas-application.properties
+++ b/addons/falcon-bridge/src/test/resources/atlas-application.properties
@@ -37,6 +37,7 @@ atlas.graph.index.search.backend=solr
 
 #Berkeley storage directory
 atlas.graph.storage.directory=${sys:atlas.data}/berkley
+atlas.graph.storage.transactions=true
 
 #hbase
 #For standalone mode , specify localhost
diff --git a/addons/hbase-bridge/src/test/resources/atlas-application.properties b/addons/hbase-bridge/src/test/resources/atlas-application.properties
index 3b12e5fb3..0ce0f46c9 100644
--- a/addons/hbase-bridge/src/test/resources/atlas-application.properties
+++ b/addons/hbase-bridge/src/test/resources/atlas-application.properties
@@ -37,6 +37,7 @@ atlas.graph.index.search.backend=solr
 
 #Berkeley storage directory
 atlas.graph.storage.directory=${sys:atlas.data}/berkley
+atlas.graph.storage.transactions=true
 
 #hbase
 #For standalone mode , specify localhost
diff --git a/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java b/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java
index c25755139..a787dc7fb 100755
--- a/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java
+++ b/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java
@@ -611,7 +611,7 @@ public class HiveHookIT extends HiveITBase {
     }
 
     private String createTestDFSFile(String path) throws Exception {
-        return "pfile://" + file(path);
+        return "file://" + file(path);
     }
 
     @Test
@@ -1213,7 +1213,7 @@ public class HiveHookIT extends HiveITBase {
         Assert.assertNotNull(ddlQueries);
         Assert.assertEquals(ddlQueries.size(), 1);
 
-        String filename = "pfile://" + mkdir("export");
+        String filename = "file://" + mkdir("export");
 
         query = "export table " + tableName + " to \"" + filename + "\"";
 
@@ -1272,7 +1272,7 @@ public class HiveHookIT extends HiveITBase {
         Assert.assertNotEquals(processEntity1.getGuid(), processEntity2.getGuid());
 
         //Export should update same process
-        filename = "pfile://" + mkdir("export2");
+        filename = "file://" + mkdir("export2");
         query    = "export table " + tableName + " to \"" + filename + "\"";
 
         runCommand(query);
diff --git a/addons/hive-bridge/src/test/resources/atlas-application.properties b/addons/hive-bridge/src/test/resources/atlas-application.properties
index 5d24a3014..61b3c8f24 100644
--- a/addons/hive-bridge/src/test/resources/atlas-application.properties
+++ b/addons/hive-bridge/src/test/resources/atlas-application.properties
@@ -36,6 +36,7 @@ atlas.graph.index.search.backend=solr
 
 #Berkeley storage directory
 atlas.graph.storage.directory=${sys:atlas.data}/berkley
+atlas.graph.storage.transactions=true
 
 #hbase
 #For standalone mode , specify localhost
@@ -122,4 +123,4 @@ atlas.authentication.method.file=true
 atlas.authentication.method.ldap.type=none
 atlas.authentication.method.kerberos=false
 # atlas.authentication.method.file.filename=users-credentials.properties
-atlas.hook.hive.hs2.ignore.ddl.operations=false
\ No newline at end of file
+atlas.hook.hive.hs2.ignore.ddl.operations=false
diff --git a/addons/impala-bridge/src/test/resources/atlas-application.properties b/addons/impala-bridge/src/test/resources/atlas-application.properties
index 898b69c99..aeb28ed67 100644
--- a/addons/impala-bridge/src/test/resources/atlas-application.properties
+++ b/addons/impala-bridge/src/test/resources/atlas-application.properties
@@ -36,6 +36,7 @@ atlas.graph.index.search.backend=solr
 
 #Berkeley storage directory
 atlas.graph.storage.directory=${sys:atlas.data}/berkley
+atlas.graph.storage.transactions=true
 
 #hbase
 #For standalone mode , specify localhost
diff --git a/addons/kafka-bridge/src/test/resources/atlas-application.properties b/addons/kafka-bridge/src/test/resources/atlas-application.properties
index 4a12cf6c8..631c52347 100644
--- a/addons/kafka-bridge/src/test/resources/atlas-application.properties
+++ b/addons/kafka-bridge/src/test/resources/atlas-application.properties
@@ -37,6 +37,7 @@ atlas.graph.index.search.backend=solr
 
 #Berkeley storage directory
 atlas.graph.storage.directory=${sys:atlas.data}/berkley
+atlas.graph.storage.transactions=true
 
 #hbase
 #For standalone mode , specify localhost
diff --git a/addons/sqoop-bridge/src/test/resources/atlas-application.properties b/addons/sqoop-bridge/src/test/resources/atlas-application.properties
index 898b69c99..aeb28ed67 100644
--- a/addons/sqoop-bridge/src/test/resources/atlas-application.properties
+++ b/addons/sqoop-bridge/src/test/resources/atlas-application.properties
@@ -36,6 +36,7 @@ atlas.graph.index.search.backend=solr
 
 #Berkeley storage directory
 atlas.graph.storage.directory=${sys:atlas.data}/berkley
+atlas.graph.storage.transactions=true
 
 #hbase
 #For standalone mode , specify localhost
diff --git a/addons/storm-bridge/src/test/resources/atlas-application.properties b/addons/storm-bridge/src/test/resources/atlas-application.properties
index b82257894..1338d1972 100644
--- a/addons/storm-bridge/src/test/resources/atlas-application.properties
+++ b/addons/storm-bridge/src/test/resources/atlas-application.properties
@@ -38,6 +38,7 @@ atlas.graph.index.search.backend=solr
 
 #Berkeley storage directory
 atlas.graph.storage.directory=${sys:atlas.data}/berkley
+atlas.graph.storage.transactions=true
 
 #hbase
 #For standalone mode , specify localhost
diff --git a/authorization/src/test/resources/atlas-application.properties b/authorization/src/test/resources/atlas-application.properties
index d735900f5..e908895b2 100644
--- a/authorization/src/test/resources/atlas-application.properties
+++ b/authorization/src/test/resources/atlas-application.properties
@@ -53,6 +53,7 @@ atlas.graph.index.search.backend=${graph.index.backend}
 
 #Berkeley storage directory
 atlas.graph.storage.directory=${sys:atlas.data}/berkley
+atlas.graph.storage.transactions=true
 
 #hbase
 #For standalone mode , specify localhost
diff --git a/client/common/pom.xml b/client/common/pom.xml
index c1bd024b1..9bc38c20f 100644
--- a/client/common/pom.xml
+++ b/client/common/pom.xml
@@ -44,5 +44,10 @@
             <groupId>org.apache.atlas</groupId>
             <artifactId>atlas-intg</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/dev-support/atlas-docker/.env b/dev-support/atlas-docker/.env
index 0e924b27a..cdcb7b113 100644
--- a/dev-support/atlas-docker/.env
+++ b/dev-support/atlas-docker/.env
@@ -19,8 +19,8 @@ ATLAS_SERVER_JAVA_VERSION=8
 
 ATLAS_VERSION=3.0.0-SNAPSHOT
 UBUNTU_VERSION=20.04
-HADOOP_VERSION=3.3.0
-HBASE_VERSION=2.3.3
-KAFKA_VERSION=2.8.1
-HIVE_VERSION=3.1.2
+HADOOP_VERSION=3.3.6
+HBASE_VERSION=2.6.0
+KAFKA_VERSION=2.8.2
+HIVE_VERSION=3.1.3
 HIVE_HADOOP_VERSION=3.1.1
diff --git a/dev-support/atlas-docker/Dockerfile.atlas-zk b/dev-support/atlas-docker/Dockerfile.atlas-zk
index 2855b5014..94b228cc3 100644
--- a/dev-support/atlas-docker/Dockerfile.atlas-zk
+++ b/dev-support/atlas-docker/Dockerfile.atlas-zk
@@ -14,4 +14,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM zookeeper:3.5.9
+FROM zookeeper:3.9.2
diff --git a/graphdb/api/pom.xml b/graphdb/api/pom.xml
index 4ba89b20f..84fc54499 100644
--- a/graphdb/api/pom.xml
+++ b/graphdb/api/pom.xml
@@ -61,6 +61,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.apache.tinkerpop</groupId>
+            <artifactId>gremlin-util</artifactId>
+            <version>${tinkerpop.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
diff --git a/graphdb/janus-hbase2/pom.xml b/graphdb/janus-hbase2/pom.xml
deleted file mode 100644
index 9ec087dbb..000000000
--- a/graphdb/janus-hbase2/pom.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-~ 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.
--->
-
-<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>atlas-graphdb</artifactId>
-        <groupId>org.apache.atlas</groupId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>atlas-janusgraph-hbase2</artifactId>
-    <description>Apache Atlas JanusGraph-HBase2 Module</description>
-    <name>Apache Atlas JanusGraph-HBase2 Module</name>
-    <packaging>jar</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.janusgraph</groupId>
-            <artifactId>janusgraph-core</artifactId>
-            <version>${janusgraph.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.codahale.metrics</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.noggit</groupId>
-                    <artifactId>noggit</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.tinkerpop</groupId>
-                    <artifactId>gremlin-shaded</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.tinkerpop</groupId>
-                    <artifactId>gremlin-server</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.tinkerpop</groupId>
-                    <artifactId>gremlin-groovy</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.tinkerpop</groupId>
-                    <artifactId>gremlin-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.tinkerpop</groupId>
-                    <artifactId>gremlin-driver</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.tinkerpop</groupId>
-                    <artifactId>tinkergraph-gremlin</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>commons-configuration2</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>commons-text</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.rabbitmq</groupId>
-                    <artifactId>amqp-client</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-         <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-common</artifactId>
-            <version>${hadoop.version}</version>
-            <scope>provided</scope>
-             <exclusions>
-                 <exclusion>
-                     <groupId>org.apache.commons</groupId>
-                     <artifactId>commons-configuration2</artifactId>
-                 </exclusion>
-                 <exclusion>
-                     <groupId>org.apache.commons</groupId>
-                     <artifactId>commons-text</artifactId>
-                 </exclusion>
-             </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.hbase</groupId>
-            <artifactId>hbase-shaded-client</artifactId>
-            <version>${hbase.version}</version>
-            <optional>true</optional>
-            <exclusions>
-                <exclusion>
-                    <artifactId>avro</artifactId>
-                    <groupId>org.apache.avro</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>jruby-complete</artifactId>
-                    <groupId>org.jruby</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>asm</artifactId>
-                    <groupId>asm</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-text</artifactId>
-            <version>${commons-text.version}</version>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/AdminMask.java b/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/AdminMask.java
deleted file mode 100644
index 548860bcc..000000000
--- a/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/AdminMask.java
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2017 JanusGraph Authors
-//
-// Licensed 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.
-
-/**
- * Copyright DataStax, Inc.
- * <p>
- * Please see the included license file for details.
- */
-package org.janusgraph.diskstorage.hbase2;
-
-import org.apache.hadoop.hbase.ClusterStatus;
-import org.apache.hadoop.hbase.TableNotFoundException;
-import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
-import org.apache.hadoop.hbase.client.HBaseAdmin;
-import org.apache.hadoop.hbase.client.TableDescriptor;
-
-import java.io.Closeable;
-import java.io.IOException;
-
-/**
- * This interface hides ABI/API breaking changes that HBase has made to its Admin/HBaseAdmin over the course
- * of development from 0.94 to 1.0 and beyond.
- */
-public interface AdminMask extends Closeable
-{
-
-    void clearTable(String tableName, long timestamp) throws IOException;
-
-    /**
-     * Drop given table. Table can be either enabled or disabled.
-     * @param tableName Name of the table to delete
-     * @throws IOException
-     */
-    void dropTable(String tableName) throws IOException;
-
-    TableDescriptor getTableDescriptor(String tableName) throws TableNotFoundException, IOException;
-
-    boolean tableExists(String tableName) throws IOException;
-
-    void createTable(TableDescriptor desc) throws IOException;
-
-    void createTable(TableDescriptor desc, byte[] startKey, byte[] endKey, int numRegions) throws IOException;
-
-    /**
-     * Estimate the number of regionservers in the HBase cluster.
-     *
-     * This is usually implemented by calling
-     * {@link HBaseAdmin#getClusterStatus()} and then
-     * {@link ClusterStatus#getServers()} and finally {@code size()} on the
-     * returned server list.
-     *
-     * @return the number of servers in the cluster or -1 if it could not be determined
-     */
-    int getEstimatedRegionServerCount();
-
-    void disableTable(String tableName) throws IOException;
-
-    void enableTable(String tableName) throws IOException;
-
-    boolean isTableDisabled(String tableName) throws IOException;
-
-    void addColumn(String tableName, ColumnFamilyDescriptor columnDescriptor) throws IOException;
-}
diff --git a/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/ConnectionMask.java b/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/ConnectionMask.java
deleted file mode 100644
index 05ecd532f..000000000
--- a/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/ConnectionMask.java
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2017 JanusGraph Authors
-//
-// Licensed 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.
-
-/**
- * Copyright DataStax, Inc.
- * <p>
- * Please see the included license file for details.
- */
-package org.janusgraph.diskstorage.hbase2;
-
-import org.apache.hadoop.hbase.HRegionLocation;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.List;
-
-/**
- * This interface hides ABI/API breaking changes that HBase has made to its (H)Connection class over the course
- * of development from 0.94 to 1.0 and beyond.
- */
-public interface ConnectionMask extends Closeable
-{
-
-    /**
-     * Retrieve the TableMask compatibility layer object for the supplied table name.
-     * @return The TableMask for the specified table.
-     * @throws IOException in the case of backend exceptions.
-     */
-    TableMask getTable(String name) throws IOException;
-
-    /**
-     * Retrieve the AdminMask compatibility layer object for this Connection.
-     * @return The AdminMask for this Connection
-     * @throws IOException in the case of backend exceptions.
-     */
-    AdminMask getAdmin() throws IOException;
-
-    /**
-     * Retrieve the RegionLocations for the supplied table name.
-     * @return A map of HRegionInfo to ServerName that describes the storage regions for the named table.
-     * @throws IOException in the case of backend exceptions.
-     */
-    List<HRegionLocation> getRegionLocations(String tablename) throws IOException;
-}
diff --git a/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/HBaseAdmin2_0.java b/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/HBaseAdmin2_0.java
deleted file mode 100644
index f93481e92..000000000
--- a/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/HBaseAdmin2_0.java
+++ /dev/null
@@ -1,167 +0,0 @@
-// Copyright 2017 JanusGraph Authors
-//
-// Licensed 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.
-
-package org.janusgraph.diskstorage.hbase2;
-
-import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.TableNotFoundException;
-import org.apache.hadoop.hbase.client.Admin;
-import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
-import org.apache.hadoop.hbase.client.Delete;
-import org.apache.hadoop.hbase.client.Result;
-import org.apache.hadoop.hbase.client.ResultScanner;
-import org.apache.hadoop.hbase.client.Scan;
-import org.apache.hadoop.hbase.client.Table;
-import org.apache.hadoop.hbase.client.TableDescriptor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-public class HBaseAdmin2_0 implements AdminMask
-{
-
-    private static final Logger log = LoggerFactory.getLogger(HBaseAdmin2_0.class);
-
-    private final Admin adm;
-
-    public HBaseAdmin2_0(Admin adm)
-    {
-        this.adm = adm;
-    }
-
-    /**
-     * Delete all rows from the given table. This method is intended only for development and testing use.
-     * @param tableString
-     * @param timestamp
-     * @throws IOException
-     */
-    @Override
-    public void clearTable(String tableString, long timestamp) throws IOException
-    {
-        TableName tableName = TableName.valueOf(tableString);
-
-        if (!adm.tableExists(tableName)) {
-            log.debug("Attempted to clear table {} before it exists (noop)", tableString);
-            return;
-        }
-
-        // Unfortunately, linear scanning and deleting rows is faster in HBase when running integration tests than
-        // disabling and deleting/truncating tables.
-        final Scan scan = new Scan();
-        scan.setCacheBlocks(false);
-        scan.setCaching(2000);
-        scan.setTimeRange(0, Long.MAX_VALUE);
-        scan.readVersions(1);
-
-        try (final Table table = adm.getConnection().getTable(tableName);
-             final ResultScanner scanner = table.getScanner(scan)) {
-            final Iterator<Result> iterator = scanner.iterator();
-            final int batchSize = 1000;
-            final List<Delete> deleteList = new ArrayList<>();
-            while (iterator.hasNext()) {
-                deleteList.add(new Delete(iterator.next().getRow(), timestamp));
-                if (!iterator.hasNext() || deleteList.size() == batchSize) {
-                    table.delete(deleteList);
-                    deleteList.clear();
-                }
-            }
-        }
-    }
-
-    @Override
-    public void dropTable(String tableString) throws IOException {
-        final TableName tableName = TableName.valueOf(tableString);
-
-        if (!adm.tableExists(tableName)) {
-            log.debug("Attempted to drop table {} before it exists (noop)", tableString);
-            return;
-        }
-
-        if (adm.isTableEnabled(tableName)) {
-            adm.disableTable(tableName);
-        }
-        adm.deleteTable(tableName);
-    }
-
-    @Override
-    public TableDescriptor getTableDescriptor(String tableString) throws TableNotFoundException, IOException
-    {
-        return adm.getDescriptor(TableName.valueOf(tableString));
-    }
-
-    @Override
-    public boolean tableExists(String tableString) throws IOException
-    {
-        return adm.tableExists(TableName.valueOf(tableString));
-    }
-
-    @Override
-    public void createTable(TableDescriptor desc) throws IOException
-    {
-        adm.createTable(desc);
-    }
-
-    @Override
-    public void createTable(TableDescriptor desc, byte[] startKey, byte[] endKey, int numRegions) throws IOException
-    {
-        adm.createTable(desc, startKey, endKey, numRegions);
-    }
-
-    @Override
-    public int getEstimatedRegionServerCount()
-    {
-        int serverCount = -1;
-        try {
-            serverCount = adm.getClusterStatus().getServers().size();
-            log.debug("Read {} servers from HBase ClusterStatus", serverCount);
-        } catch (IOException e) {
-            log.debug("Unable to retrieve HBase cluster status", e);
-        }
-        return serverCount;
-    }
-
-    @Override
-    public void disableTable(String tableString) throws IOException
-    {
-        adm.disableTable(TableName.valueOf(tableString));
-    }
-
-    @Override
-    public void enableTable(String tableString) throws IOException
-    {
-        adm.enableTable(TableName.valueOf(tableString));
-    }
-
-    @Override
-    public boolean isTableDisabled(String tableString) throws IOException
-    {
-        return adm.isTableDisabled(TableName.valueOf(tableString));
-    }
-
-    @Override
-    public void addColumn(String tableString, ColumnFamilyDescriptor columnDescriptor) throws IOException
-    {
-        adm.addColumnFamily(TableName.valueOf(tableString), columnDescriptor);
-    }
-
-    @Override
-    public void close() throws IOException
-    {
-        adm.close();
-    }
-}
diff --git a/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/HBaseCompat.java b/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/HBaseCompat.java
deleted file mode 100644
index 553ad4606..000000000
--- a/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/HBaseCompat.java
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2017 JanusGraph Authors
-//
-// Licensed 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.
-
-package org.janusgraph.diskstorage.hbase2;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
-import org.apache.hadoop.hbase.client.Delete;
-import org.apache.hadoop.hbase.client.TableDescriptor;
-
-import java.io.IOException;
-
-public interface HBaseCompat {
-
-    /**
-     * Configure the compression scheme {@code algo} on a column family
-     * descriptor {@code cd}. The {@code algo} parameter is a string value
-     * corresponding to one of the values of HBase's Compression enum. The
-     * Compression enum has moved between packages as HBase has evolved, which
-     * is why this method has a String argument in the signature instead of the
-     * enum itself.
-     *  @param cd
-     *            column family to configure
-     * @param algo
-     */
-    public ColumnFamilyDescriptor setCompression(ColumnFamilyDescriptor cd, String algo);
-
-    /**
-     * Create and return a HTableDescriptor instance with the given name. The
-     * constructors on this method have remained stable over HBase development
-     * so far, but the old HTableDescriptor(String) constructor & byte[] friends
-     * are now marked deprecated and may eventually be removed in favor of the
-     * HTableDescriptor(TableName) constructor. That constructor (and the
-     * TableName type) only exists in newer HBase versions. Hence this method.
-     *
-     * @param tableName
-     *            HBase table name
-     * @return a new table descriptor instance
-     */
-    public TableDescriptor newTableDescriptor(String tableName);
-
-    ConnectionMask createConnection(Configuration conf) throws IOException;
-
-    TableDescriptor addColumnFamilyToTableDescriptor(TableDescriptor tdesc, ColumnFamilyDescriptor cdesc);
-
-    void setTimestamp(Delete d, long timestamp);
-}
diff --git a/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/HBaseCompat2_0.java b/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/HBaseCompat2_0.java
deleted file mode 100644
index fdba24a3b..000000000
--- a/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/HBaseCompat2_0.java
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2017 JanusGraph Authors
-//
-// Licensed 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.
-
-package org.janusgraph.diskstorage.hbase2;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
-import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
-import org.apache.hadoop.hbase.client.ConnectionFactory;
-import org.apache.hadoop.hbase.client.Delete;
-import org.apache.hadoop.hbase.client.TableDescriptor;
-import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
-import org.apache.hadoop.hbase.io.compress.Compression;
-
-import java.io.IOException;
-
-public class HBaseCompat2_0 implements HBaseCompat {
-
-    @Override
-    public ColumnFamilyDescriptor setCompression(ColumnFamilyDescriptor cd, String algo) {
-        return ColumnFamilyDescriptorBuilder.newBuilder(cd).setCompressionType(Compression.Algorithm.valueOf(algo)).build();
-    }
-
-    @Override
-    public TableDescriptor newTableDescriptor(String tableName) {
-        TableName tn = TableName.valueOf(tableName);
-
-        return TableDescriptorBuilder.newBuilder(tn).build();
-    }
-
-    @Override
-    public ConnectionMask createConnection(Configuration conf) throws IOException
-    {
-        return new HConnection2_0(ConnectionFactory.createConnection(conf));
-    }
-
-    @Override
-    public TableDescriptor addColumnFamilyToTableDescriptor(TableDescriptor tdesc, ColumnFamilyDescriptor cdesc)
-    {
-        return TableDescriptorBuilder.newBuilder(tdesc).addColumnFamily(cdesc).build();
-    }
-
-    @Override
-    public void setTimestamp(Delete d, long timestamp)
-    {
-        d.setTimestamp(timestamp);
-    }
-
-}
diff --git a/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/HBaseCompatLoader.java b/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/HBaseCompatLoader.java
deleted file mode 100644
index d746b3db0..000000000
--- a/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/HBaseCompatLoader.java
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2017 JanusGraph Authors
-//
-// Licensed 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.
-
-package org.janusgraph.diskstorage.hbase2;
-
-import org.apache.hadoop.hbase.util.VersionInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class HBaseCompatLoader {
-
-    private static final Logger log = LoggerFactory.getLogger(HBaseCompatLoader.class);
-
-    private static final String DEFAULT_HBASE_COMPAT_VERSION = "1.2";
-
-    private static final String HBASE_VERSION_2_STRING = "2.";
-
-    private static final String DEFAULT_HBASE_COMPAT_CLASS_NAME =
-        "org.janusgraph.diskstorage.hbase2.HBaseCompat2_0";
-
-    private static final String[] HBASE_SUPPORTED_VERSIONS =
-        new String[] { "0.98", "1.0", "1.1", "1.2", "1.3", "2.0" };
-
-    private static HBaseCompat cachedCompat;
-
-    public synchronized static HBaseCompat getCompat(String classOverride) {
-
-        if (null != cachedCompat) {
-            log.debug("Returning cached HBase compatibility layer: {}", cachedCompat);
-            return cachedCompat;
-        }
-
-        HBaseCompat compat;
-        String className = null;
-        String classNameSource = null;
-
-        if (null != classOverride) {
-            className = classOverride;
-            classNameSource = "from explicit configuration";
-        } else {
-            String hbaseVersion = VersionInfo.getVersion();
-            for (String supportedVersion : HBASE_SUPPORTED_VERSIONS) {
-                if (hbaseVersion.startsWith(supportedVersion + ".")) {
-                    if (hbaseVersion.startsWith(HBASE_VERSION_2_STRING)) {
-                        // All HBase 2.x maps to HBaseCompat2_0.
-                        className = DEFAULT_HBASE_COMPAT_CLASS_NAME;
-                    }
-                    else {
-                        className = "org.janusgraph.diskstorage.hbase2.HBaseCompat" + supportedVersion.replaceAll("\\.", "_");
-                    }
-                    classNameSource = "supporting runtime HBase version " + hbaseVersion;
-                    break;
-                }
-            }
-            if (null == className) {
-                log.info("The HBase version {} is not explicitly supported by JanusGraph.  " +
-                    "Loading JanusGraph's compatibility layer for its most recent supported HBase version ({})",
-                    hbaseVersion, DEFAULT_HBASE_COMPAT_VERSION);
-                className = DEFAULT_HBASE_COMPAT_CLASS_NAME;
-                classNameSource = " by default";
-            }
-        }
-
-        final String errTemplate = " when instantiating HBase compatibility class " + className;
-
-        try {
-            compat = (HBaseCompat)Class.forName(className).newInstance();
-            log.info("Instantiated HBase compatibility layer {}: {}", classNameSource, compat.getClass().getCanonicalName());
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e.getClass().getSimpleName() + errTemplate, e);
-        } catch (InstantiationException e) {
-            throw new RuntimeException(e.getClass().getSimpleName() + errTemplate, e);
-        } catch (ClassNotFoundException e) {
-            throw new RuntimeException(e.getClass().getSimpleName() + errTemplate, e);
-        }
-
-        return cachedCompat = compat;
-    }
-}
diff --git a/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/HBaseKeyColumnValueStore.java b/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/HBaseKeyColumnValueStore.java
deleted file mode 100644
index ffafc8c4d..000000000
--- a/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/HBaseKeyColumnValueStore.java
+++ /dev/null
@@ -1,391 +0,0 @@
-// Copyright 2017 JanusGraph Authors
-//
-// Licensed 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.
-
-package org.janusgraph.diskstorage.hbase2;
-
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Iterators;
-import org.apache.hadoop.hbase.client.Get;
-import org.apache.hadoop.hbase.client.Result;
-import org.apache.hadoop.hbase.client.ResultScanner;
-import org.apache.hadoop.hbase.client.Scan;
-import org.apache.hadoop.hbase.filter.ColumnPaginationFilter;
-import org.apache.hadoop.hbase.filter.ColumnRangeFilter;
-import org.apache.hadoop.hbase.filter.Filter;
-import org.apache.hadoop.hbase.filter.FilterList;
-import org.apache.hadoop.hbase.util.Bytes;
-import org.janusgraph.diskstorage.BackendException;
-import org.janusgraph.diskstorage.Entry;
-import org.janusgraph.diskstorage.EntryList;
-import org.janusgraph.diskstorage.EntryMetaData;
-import org.janusgraph.diskstorage.PermanentBackendException;
-import org.janusgraph.diskstorage.StaticBuffer;
-import org.janusgraph.diskstorage.TemporaryBackendException;
-import org.janusgraph.diskstorage.keycolumnvalue.KCVMutation;
-import org.janusgraph.diskstorage.keycolumnvalue.KCVSUtil;
-import org.janusgraph.diskstorage.keycolumnvalue.KeyColumnValueStore;
-import org.janusgraph.diskstorage.keycolumnvalue.KeyIterator;
-import org.janusgraph.diskstorage.keycolumnvalue.KeyRangeQuery;
-import org.janusgraph.diskstorage.keycolumnvalue.KeySliceQuery;
-import org.janusgraph.diskstorage.keycolumnvalue.KeySlicesIterator;
-import org.janusgraph.diskstorage.keycolumnvalue.SliceQuery;
-import org.janusgraph.diskstorage.keycolumnvalue.MultiSlicesQuery;
-import org.janusgraph.diskstorage.keycolumnvalue.StoreTransaction;
-import org.janusgraph.diskstorage.util.RecordIterator;
-import org.janusgraph.diskstorage.util.StaticArrayBuffer;
-import org.janusgraph.diskstorage.util.StaticArrayEntry;
-import org.janusgraph.diskstorage.util.StaticArrayEntryList;
-import org.janusgraph.util.system.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.annotation.Nullable;
-import java.io.Closeable;
-import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.NavigableMap;
-
-/**
- * Here are some areas that might need work:
- * <p/>
- * - batching? (consider HTable#batch, HTable#setAutoFlush(false)
- * - tuning HTable#setWriteBufferSize (?)
- * - writing a server-side filter to replace ColumnCountGetFilter, which drops
- * all columns on the row where it reaches its limit.  This requires getSlice,
- * currently, to impose its limit on the client side.  That obviously won't
- * scale.
- * - RowMutations for combining Puts+Deletes (need a newer HBase than 0.92 for this)
- * - (maybe) fiddle with HTable#setRegionCachePrefetch and/or #prewarmRegionCache
- * <p/>
- * There may be other problem areas.  These are just the ones of which I'm aware.
- */
-public class HBaseKeyColumnValueStore implements KeyColumnValueStore {
-
-    private static final Logger logger = LoggerFactory.getLogger(HBaseKeyColumnValueStore.class);
-
-    private final String tableName;
-    private final HBaseStoreManager storeManager;
-
-    // When using shortened CF names, columnFamily is the shortname and storeName is the longname
-    // When not using shortened CF names, they are the same
-    //private final String columnFamily;
-    private final String storeName;
-    // This is columnFamily.getBytes()
-    private final byte[] columnFamilyBytes;
-    private final HBaseGetter entryGetter;
-
-    private final ConnectionMask cnx;
-
-    HBaseKeyColumnValueStore(HBaseStoreManager storeManager, ConnectionMask cnx, String tableName, String columnFamily, String storeName) {
-        this.storeManager = storeManager;
-        this.cnx = cnx;
-        this.tableName = tableName;
-        //this.columnFamily = columnFamily;
-        this.storeName = storeName;
-        this.columnFamilyBytes = Bytes.toBytes(columnFamily);
-        this.entryGetter = new HBaseGetter(storeManager.getMetaDataSchema(storeName));
-    }
-
-    @Override
-    public void close() throws BackendException {
-    }
-
-    @Override
-    public EntryList getSlice(KeySliceQuery query, StoreTransaction txh) throws BackendException {
-        Map<StaticBuffer, EntryList> result = getHelper(Arrays.asList(query.getKey()), getFilter(query));
-        return Iterables.getOnlyElement(result.values(), EntryList.EMPTY_LIST);
-    }
-
-    @Override
-    public Map<StaticBuffer,EntryList> getSlice(List<StaticBuffer> keys, SliceQuery query, StoreTransaction txh) throws BackendException {
-        return getHelper(keys, getFilter(query));
-    }
-
-    @Override
-    public void mutate(StaticBuffer key, List<Entry> additions, List<StaticBuffer> deletions, StoreTransaction txh) throws BackendException {
-        Map<StaticBuffer, KCVMutation> mutations = ImmutableMap.of(key, new KCVMutation(additions, deletions));
-        mutateMany(mutations, txh);
-    }
-
-    @Override
-    public void acquireLock(StaticBuffer key,
-                            StaticBuffer column,
-                            StaticBuffer expectedValue,
-                            StoreTransaction txh) throws BackendException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public KeyIterator getKeys(KeyRangeQuery query, StoreTransaction txh) throws BackendException {
-        return executeKeySliceQuery(query.getKeyStart().as(StaticBuffer.ARRAY_FACTORY),
-                query.getKeyEnd().as(StaticBuffer.ARRAY_FACTORY),
-                new FilterList(FilterList.Operator.MUST_PASS_ALL),
-                query);
-    }
-
-    @Override
-    public String getName() {
-        return storeName;
-    }
-
-    @Override
-    public KeyIterator getKeys(SliceQuery query, StoreTransaction txh) throws BackendException {
-        return executeKeySliceQuery(new FilterList(FilterList.Operator.MUST_PASS_ALL), query);
-    }
-
-    @Override
-    public KeySlicesIterator getKeys(MultiSlicesQuery queries, StoreTransaction txh) throws BackendException {
-        throw new UnsupportedOperationException();
-    }
-
-    public static Filter getFilter(SliceQuery query) {
-        byte[] colStartBytes = query.getSliceStart().length() > 0 ? query.getSliceStart().as(StaticBuffer.ARRAY_FACTORY) : null;
-        byte[] colEndBytes = query.getSliceEnd().length() > 0 ? query.getSliceEnd().as(StaticBuffer.ARRAY_FACTORY) : null;
-
-        Filter filter = new ColumnRangeFilter(colStartBytes, true, colEndBytes, false);
-
-        if (query.hasLimit()) {
-            filter = new FilterList(FilterList.Operator.MUST_PASS_ALL,
-                    filter,
-                    new ColumnPaginationFilter(query.getLimit(), 0));
-        }
-
-        logger.debug("Generated HBase Filter {}", filter);
-
-        return filter;
-    }
-
-    private Map<StaticBuffer,EntryList> getHelper(List<StaticBuffer> keys, Filter getFilter) throws BackendException {
-        List<Get> requests = new ArrayList<Get>(keys.size());
-        {
-            for (StaticBuffer key : keys) {
-                Get g = new Get(key.as(StaticBuffer.ARRAY_FACTORY)).addFamily(columnFamilyBytes).setFilter(getFilter);
-                try {
-                    g.setTimeRange(0, Long.MAX_VALUE);
-                } catch (IOException e) {
-                    throw new PermanentBackendException(e);
-                }
-                requests.add(g);
-            }
-        }
-
-        Map<StaticBuffer,EntryList> resultMap = new HashMap<StaticBuffer,EntryList>(keys.size());
-
-        try {
-            TableMask table = null;
-            Result[] results = null;
-
-            try {
-                table = cnx.getTable(tableName);
-                results = table.get(requests);
-            } finally {
-                IOUtils.closeQuietly(table);
-            }
-
-            if (results == null)
-                return KCVSUtil.emptyResults(keys);
-
-            assert results.length==keys.size();
-
-            for (int i = 0; i < results.length; i++) {
-                Result result = results[i];
-                NavigableMap<byte[], NavigableMap<byte[], NavigableMap<Long, byte[]>>> f = result.getMap();
-
-                if (f == null) { // no result for this key
-                    resultMap.put(keys.get(i), EntryList.EMPTY_LIST);
-                    continue;
-                }
-
-                // actual key with <timestamp, value>
-                NavigableMap<byte[], NavigableMap<Long, byte[]>> r = f.get(columnFamilyBytes);
-                resultMap.put(keys.get(i), (r == null)
-                                            ? EntryList.EMPTY_LIST
-                                            : StaticArrayEntryList.ofBytes(r.entrySet(), entryGetter));
-            }
-
-            return resultMap;
-        } catch (InterruptedIOException e) {
-            // added to support traversal interruption
-            Thread.currentThread().interrupt();
-            throw new PermanentBackendException(e);
-        } catch (IOException e) {
-            throw new TemporaryBackendException(e);
-        }
-    }
-
-    private void mutateMany(Map<StaticBuffer, KCVMutation> mutations, StoreTransaction txh) throws BackendException {
-        storeManager.mutateMany(ImmutableMap.of(storeName, mutations), txh);
-    }
-
-    private KeyIterator executeKeySliceQuery(FilterList filters, @Nullable SliceQuery columnSlice) throws BackendException {
-        return executeKeySliceQuery(null, null, filters, columnSlice);
-    }
-
-    private KeyIterator executeKeySliceQuery(@Nullable byte[] startKey,
-                                             @Nullable byte[] endKey,
-                                             FilterList filters,
-                                             @Nullable SliceQuery columnSlice) throws BackendException {
-        Scan scan = new Scan().addFamily(columnFamilyBytes);
-
-        try {
-            scan.setTimeRange(0, Long.MAX_VALUE);
-        } catch (IOException e) {
-            throw new PermanentBackendException(e);
-        }
-
-        if (startKey != null)
-            scan.withStartRow(startKey);
-
-        if (endKey != null)
-            scan.withStopRow(endKey);
-
-        if (columnSlice != null) {
-            filters.addFilter(getFilter(columnSlice));
-        }
-
-        TableMask table = null;
-
-        try {
-            table = cnx.getTable(tableName);
-            return new RowIterator(table, table.getScanner(scan.setFilter(filters)), columnFamilyBytes);
-        } catch (IOException e) {
-            IOUtils.closeQuietly(table);
-            throw new PermanentBackendException(e);
-        }
-    }
-
-    private class RowIterator implements KeyIterator {
-        private final Closeable table;
-        private final Iterator<Result> rows;
-        private final byte[] columnFamilyBytes;
-
-        private Result currentRow;
-        private boolean isClosed;
-
-        public RowIterator(Closeable table, ResultScanner rows, byte[] columnFamilyBytes) {
-            this.table = table;
-            this.columnFamilyBytes = Arrays.copyOf(columnFamilyBytes, columnFamilyBytes.length);
-            this.rows = Iterators.filter(rows.iterator(), result -> null != result && null != result.getRow());
-        }
-
-        @Override
-        public RecordIterator<Entry> getEntries() {
-            ensureOpen();
-
-            return new RecordIterator<Entry>() {
-                private final Iterator<Map.Entry<byte[], NavigableMap<Long, byte[]>>> kv;
-                {
-                    final Map<byte[], NavigableMap<byte[], NavigableMap<Long, byte[]>>> map = currentRow.getMap();
-                    Preconditions.checkNotNull(map);
-                    kv = map.get(columnFamilyBytes).entrySet().iterator();
-                }
-
-                @Override
-                public boolean hasNext() {
-                    ensureOpen();
-                    return kv.hasNext();
-                }
-
-                @Override
-                public Entry next() {
-                    ensureOpen();
-                    return StaticArrayEntry.ofBytes(kv.next(), entryGetter);
-                }
-
-                @Override
-                public void close() {
-                    isClosed = true;
-                }
-
-                @Override
-                public void remove() {
-                    throw new UnsupportedOperationException();
-                }
-            };
-        }
-
-        @Override
-        public boolean hasNext() {
-            ensureOpen();
-            return rows.hasNext();
-        }
-
-        @Override
-        public StaticBuffer next() {
-            ensureOpen();
-
-            currentRow = rows.next();
-            return StaticArrayBuffer.of(currentRow.getRow());
-        }
-
-        @Override
-        public void close() {
-            IOUtils.closeQuietly(table);
-            isClosed = true;
-            logger.debug("RowIterator closed table {}", table);
-        }
-
-        @Override
-        public void remove() {
-            throw new UnsupportedOperationException();
-        }
-
-        private void ensureOpen() {
-            if (isClosed)
-                throw new IllegalStateException("Iterator has been closed.");
-        }
-    }
-
-    private static class HBaseGetter implements StaticArrayEntry.GetColVal<Map.Entry<byte[], NavigableMap<Long, byte[]>>, byte[]> {
-
-        private final EntryMetaData[] schema;
-
-        private HBaseGetter(EntryMetaData[] schema) {
-            this.schema = schema;
-        }
-
-        @Override
-        public byte[] getColumn(Map.Entry<byte[], NavigableMap<Long, byte[]>> element) {
-            return element.getKey();
-        }
-
-        @Override
-        public byte[] getValue(Map.Entry<byte[], NavigableMap<Long, byte[]>> element) {
-            return element.getValue().lastEntry().getValue();
-        }
-
-        @Override
-        public EntryMetaData[] getMetaSchema(Map.Entry<byte[], NavigableMap<Long, byte[]>> element) {
-            return schema;
-        }
-
-        @Override
-        public Object getMetaData(Map.Entry<byte[], NavigableMap<Long, byte[]>> element, EntryMetaData meta) {
-            switch(meta) {
-                case TIMESTAMP:
-                    return element.getValue().lastEntry().getKey();
-                default:
-                    throw new UnsupportedOperationException("Unsupported meta data: " + meta);
-            }
-        }
-    }
-}
diff --git a/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/HBaseStoreManager.java b/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/HBaseStoreManager.java
deleted file mode 100644
index 5f8e31021..000000000
--- a/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/HBaseStoreManager.java
+++ /dev/null
@@ -1,988 +0,0 @@
-// Copyright 2017 JanusGraph Authors
-//
-// Licensed 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.
-
-package org.janusgraph.diskstorage.hbase2;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.ImmutableBiMap;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Sets;
-import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.HRegionInfo;
-import org.apache.hadoop.hbase.HRegionLocation;
-import org.apache.hadoop.hbase.MasterNotRunningException;
-import org.apache.hadoop.hbase.ServerName;
-import org.apache.hadoop.hbase.TableNotEnabledException;
-import org.apache.hadoop.hbase.TableNotFoundException;
-import org.apache.hadoop.hbase.ZooKeeperConnectionException;
-import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
-import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
-import org.apache.hadoop.hbase.client.Delete;
-import org.apache.hadoop.hbase.client.Mutation;
-import org.apache.hadoop.hbase.client.Put;
-import org.apache.hadoop.hbase.client.Row;
-import org.apache.hadoop.hbase.client.TableDescriptor;
-import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
-import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.hbase.util.Pair;
-import org.apache.hadoop.hbase.util.VersionInfo;
-import org.janusgraph.core.JanusGraphException;
-import org.janusgraph.diskstorage.BackendException;
-import org.janusgraph.diskstorage.BaseTransactionConfig;
-import org.janusgraph.diskstorage.Entry;
-import org.janusgraph.diskstorage.EntryMetaData;
-import org.janusgraph.diskstorage.PermanentBackendException;
-import org.janusgraph.diskstorage.StaticBuffer;
-import org.janusgraph.diskstorage.StoreMetaData;
-import org.janusgraph.diskstorage.TemporaryBackendException;
-import org.janusgraph.diskstorage.common.DistributedStoreManager;
-import org.janusgraph.diskstorage.configuration.ConfigElement;
-import org.janusgraph.diskstorage.configuration.ConfigNamespace;
-import org.janusgraph.diskstorage.configuration.ConfigOption;
-import org.janusgraph.diskstorage.configuration.Configuration;
-import org.janusgraph.diskstorage.keycolumnvalue.KCVMutation;
-import org.janusgraph.diskstorage.keycolumnvalue.KeyColumnValueStore;
-import org.janusgraph.diskstorage.keycolumnvalue.KeyColumnValueStoreManager;
-import org.janusgraph.diskstorage.keycolumnvalue.KeyRange;
-import org.janusgraph.diskstorage.keycolumnvalue.StandardStoreFeatures;
-import org.janusgraph.diskstorage.keycolumnvalue.StoreFeatures;
-import org.janusgraph.diskstorage.keycolumnvalue.StoreTransaction;
-import org.janusgraph.diskstorage.util.BufferUtil;
-import org.janusgraph.diskstorage.util.StaticArrayBuffer;
-import org.janusgraph.diskstorage.util.time.TimestampProviders;
-import org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration;
-import org.janusgraph.graphdb.configuration.PreInitializeConfigOptions;
-import org.janusgraph.util.system.IOUtils;
-import org.janusgraph.util.system.NetworkUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-import static org.janusgraph.diskstorage.Backend.EDGESTORE_NAME;
-import static org.janusgraph.diskstorage.Backend.INDEXSTORE_NAME;
-import static org.janusgraph.diskstorage.Backend.LOCK_STORE_SUFFIX;
-import static org.janusgraph.diskstorage.Backend.SYSTEM_MGMT_LOG_NAME;
-import static org.janusgraph.diskstorage.Backend.SYSTEM_TX_LOG_NAME;
-import static org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration.DROP_ON_CLEAR;
-import static org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration.GRAPH_NAME;
-import static org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration.IDS_STORE_NAME;
-import static org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration.SYSTEM_PROPERTIES_STORE_NAME;
-
-/**
- * Storage Manager for HBase
- */
-@PreInitializeConfigOptions
-public class HBaseStoreManager extends DistributedStoreManager implements KeyColumnValueStoreManager {
-
-    private static final Logger logger = LoggerFactory.getLogger(HBaseStoreManager.class);
-
-    public static final ConfigNamespace HBASE_NS =
-            new ConfigNamespace(GraphDatabaseConfiguration.STORAGE_NS, "hbase", "HBase storage options");
-
-    public static final ConfigOption<Boolean> SHORT_CF_NAMES =
-            new ConfigOption<>(HBASE_NS, "short-cf-names",
-            "Whether to shorten the names of JanusGraph's column families to one-character mnemonics " +
-            "to conserve storage space", ConfigOption.Type.FIXED, true);
-
-    public static final String COMPRESSION_DEFAULT = "-DEFAULT-";
-
-    public static final ConfigOption<String> COMPRESSION =
-            new ConfigOption<>(HBASE_NS, "compression-algorithm",
-            "An HBase Compression.Algorithm enum string which will be applied to newly created column families. " +
-            "The compression algorithm must be installed and available on the HBase cluster.  JanusGraph cannot install " +
-            "and configure new compression algorithms on the HBase cluster by itself.",
-            ConfigOption.Type.MASKABLE, "SNAPPY");
-
-    public static final ConfigOption<Boolean> SKIP_SCHEMA_CHECK =
-            new ConfigOption<>(HBASE_NS, "skip-schema-check",
-            "Assume that JanusGraph's HBase table and column families already exist. " +
-            "When this is true, JanusGraph will not check for the existence of its table/CFs, " +
-            "nor will it attempt to create them under any circumstances.  This is useful " +
-            "when running JanusGraph without HBase admin privileges.",
-            ConfigOption.Type.MASKABLE, false);
-
-    public static final ConfigOption<String> HBASE_TABLE =
-            new ConfigOption<>(HBASE_NS, "table",
-            "The name of the table JanusGraph will use.  When " + ConfigElement.getPath(SKIP_SCHEMA_CHECK) +
-            " is false, JanusGraph will automatically create this table if it does not already exist." +
-            " If this configuration option is not provided but graph.graphname is, the table will be set" +
-            " to that value.",
-            ConfigOption.Type.LOCAL, "janusgraph");
-
-    /**
-     * Related bug fixed in 0.98.0, 0.94.7, 0.95.0:
-     *
-     * https://issues.apache.org/jira/browse/HBASE-8170
-     */
-    public static final int MIN_REGION_COUNT = 3;
-
-    /**
-     * The total number of HBase regions to create with JanusGraph's table. This
-     * setting only effects table creation; this normally happens just once when
-     * JanusGraph connects to an HBase backend for the first time.
-     */
-    public static final ConfigOption<Integer> REGION_COUNT =
-            new ConfigOption<Integer>(HBASE_NS, "region-count",
-            "The number of initial regions set when creating JanusGraph's HBase table",
-            ConfigOption.Type.MASKABLE, Integer.class, input -> null != input && MIN_REGION_COUNT <= input);
-
-    /**
-     * This setting is used only when {@link #REGION_COUNT} is unset.
-     * <p/>
-     * If JanusGraph's HBase table does not exist, then it will be created with total
-     * region count = (number of servers reported by ClusterStatus) * (this
-     * value).
-     * <p/>
-     * The Apache HBase manual suggests an order-of-magnitude range of potential
-     * values for this setting:
-     *
-     * <ul>
-     *  <li>
-     *   <a href="https://hbase.apache.org/book/important_configurations.html#disable.splitting">2.5.2.7. Managed Splitting</a>:
-     *   <blockquote>
-     *    What's the optimal number of pre-split regions to create? Mileage will
-     *    vary depending upon your application. You could start low with 10
-     *    pre-split regions / server and watch as data grows over time. It's
-     *    better to err on the side of too little regions and rolling split later.
-     *   </blockquote>
-     *  </li>
-     *  <li>
-     *   <a href="https://hbase.apache.org/book/regions.arch.html">9.7 Regions</a>:
-     *   <blockquote>
-     *    In general, HBase is designed to run with a small (20-200) number of
-     *    relatively large (5-20Gb) regions per server... Typically you want to
-     *    keep your region count low on HBase for numerous reasons. Usually
-     *    right around 100 regions per RegionServer has yielded the best results.
-     *   </blockquote>
-     *  </li>
-     * </ul>
-     *
-     * These considerations may differ for other HBase implementations (e.g. MapR).
-     */
-    public static final ConfigOption<Integer> REGIONS_PER_SERVER =
-            new ConfigOption<>(HBASE_NS, "regions-per-server",
-            "The number of regions per regionserver to set when creating JanusGraph's HBase table",
-            ConfigOption.Type.MASKABLE, Integer.class);
-
-    /**
-     * If this key is present in either the JVM system properties or the process
-     * environment (checked in the listed order, first hit wins), then its value
-     * must be the full package and class name of an implementation of
-     * {@link HBaseCompat} that has a no-arg public constructor.
-     * <p>
-     * When this <b>is not</b> set, JanusGraph attempts to automatically detect the
-     * HBase runtime version by calling {@link VersionInfo#getVersion()}. JanusGraph
-     * then checks the returned version string against a hard-coded list of
-     * supported version prefixes and instantiates the associated compat layer
-     * if a match is found.
-     * <p>
-     * When this <b>is</b> set, JanusGraph will not call
-     * {@code VersionInfo.getVersion()} or read its hard-coded list of supported
-     * version prefixes. JanusGraph will instead attempt to instantiate the class
-     * specified (via the no-arg constructor which must exist) and then attempt
-     * to cast it to HBaseCompat and use it as such. JanusGraph will assume the
-     * supplied implementation is compatible with the runtime HBase version and
-     * make no attempt to verify that assumption.
-     * <p>
-     * Setting this key incorrectly could cause runtime exceptions at best or
-     * silent data corruption at worst. This setting is intended for users
-     * running exotic HBase implementations that don't support VersionInfo or
-     * implementations which return values from {@code VersionInfo.getVersion()}
-     * that are inconsistent with Apache's versioning convention. It may also be
-     * useful to users who want to run against a new release of HBase that JanusGraph
-     * doesn't yet officially support.
-     *
-     */
-    public static final ConfigOption<String> COMPAT_CLASS =
-            new ConfigOption<>(HBASE_NS, "compat-class",
-            "The package and class name of the HBaseCompat implementation. HBaseCompat masks version-specific HBase API differences. " +
-            "When this option is unset, JanusGraph calls HBase's VersionInfo.getVersion() and loads the matching compat class " +
-            "at runtime.  Setting this option forces JanusGraph to instead reflectively load and instantiate the specified class.",
-            ConfigOption.Type.MASKABLE, String.class);
-
-    public static final int PORT_DEFAULT = 9160;
-
-    public static final TimestampProviders PREFERRED_TIMESTAMPS = TimestampProviders.MICRO;
-
-    public static final ConfigNamespace HBASE_CONFIGURATION_NAMESPACE =
-            new ConfigNamespace(HBASE_NS, "ext", "Overrides for hbase-{site,default}.xml options", true);
-
-    private static final StaticBuffer FOUR_ZERO_BYTES = BufferUtil.zeroBuffer(4);
-
-    // Immutable instance fields
-    private final BiMap<String, String> shortCfNameMap;
-    private final String tableName;
-    private final String compression;
-    private final int regionCount;
-    private final int regionsPerServer;
-    private final ConnectionMask cnx;
-    private final org.apache.hadoop.conf.Configuration hconf;
-    private final boolean shortCfNames;
-    private final boolean skipSchemaCheck;
-    private final String compatClass;
-    private final HBaseCompat compat;
-    // Cached return value of getDeployment() as requesting it can be expensive.
-    private Deployment deployment = null;
-
-    private static final ConcurrentHashMap<HBaseStoreManager, Throwable> openManagers = new ConcurrentHashMap<>();
-
-    // Mutable instance state
-    private final ConcurrentMap<String, HBaseKeyColumnValueStore> openStores;
-
-    public HBaseStoreManager(org.janusgraph.diskstorage.configuration.Configuration config) throws BackendException {
-        super(config, PORT_DEFAULT);
-
-        shortCfNameMap = createShortCfMap(config);
-
-        Preconditions.checkArgument(null != shortCfNameMap);
-        Collection<String> shorts = shortCfNameMap.values();
-        Preconditions.checkArgument(Sets.newHashSet(shorts).size() == shorts.size());
-
-        checkConfigDeprecation(config);
-
-        this.tableName = determineTableName(config);
-        this.compression = config.get(COMPRESSION);
-        this.regionCount = config.has(REGION_COUNT) ? config.get(REGION_COUNT) : -1;
-        this.regionsPerServer = config.has(REGIONS_PER_SERVER) ? config.get(REGIONS_PER_SERVER) : -1;
-        this.skipSchemaCheck = config.get(SKIP_SCHEMA_CHECK);
-        this.compatClass = config.has(COMPAT_CLASS) ? config.get(COMPAT_CLASS) : null;
-        this.compat = HBaseCompatLoader.getCompat(compatClass);
-
-        /*
-         * Specifying both region count options is permitted but may be
-         * indicative of a misunderstanding, so issue a warning.
-         */
-        if (config.has(REGIONS_PER_SERVER) && config.has(REGION_COUNT)) {
-            logger.warn("Both {} and {} are set in JanusGraph's configuration, but "
-                      + "the former takes precedence and the latter will be ignored.",
-                        REGION_COUNT, REGIONS_PER_SERVER);
-        }
-
-        /* This static factory calls HBaseConfiguration.addHbaseResources(),
-         * which in turn applies the contents of hbase-default.xml and then
-         * applies the contents of hbase-site.xml.
-         */
-        this.hconf = HBaseConfiguration.create();
-
-        // Copy a subset of our commons config into a Hadoop config
-        int keysLoaded=0;
-        Map<String,Object> configSub = config.getSubset(HBASE_CONFIGURATION_NAMESPACE);
-        for (Map.Entry<String,Object> entry : configSub.entrySet()) {
-            logger.info("HBase configuration: setting {}={}", entry.getKey(), entry.getValue());
-            if (entry.getValue()==null) continue;
-            hconf.set(entry.getKey(), entry.getValue().toString());
-            keysLoaded++;
-        }
-
-        // Special case for STORAGE_HOSTS
-        if (config.has(GraphDatabaseConfiguration.STORAGE_HOSTS)) {
-            String zkQuorumKey = "hbase.zookeeper.quorum";
-            String csHostList = Joiner.on(",").join(config.get(GraphDatabaseConfiguration.STORAGE_HOSTS));
-            hconf.set(zkQuorumKey, csHostList);
-            logger.info("Copied host list from {} to {}: {}", GraphDatabaseConfiguration.STORAGE_HOSTS, zkQuorumKey, csHostList);
-        }
-
-        logger.debug("HBase configuration: set a total of {} configuration values", keysLoaded);
-
-        this.shortCfNames = config.get(SHORT_CF_NAMES);
-
-        try {
-            //this.cnx = HConnectionManager.createConnection(hconf);
-            this.cnx = compat.createConnection(hconf);
-        } catch (IOException e) {
-            throw new PermanentBackendException(e);
-        }
-
-        if (logger.isTraceEnabled()) {
-            openManagers.put(this, new Throwable("Manager Opened"));
-            dumpOpenManagers();
-        }
-
-        logger.debug("Dumping HBase config key=value pairs");
-        for (Map.Entry<String, String> entry : hconf) {
-            logger.debug("[HBaseConfig] " + entry.getKey() + "=" + entry.getValue());
-        }
-        logger.debug("End of HBase config key=value pairs");
-
-        openStores = new ConcurrentHashMap<>();
-    }
-
-    public static BiMap<String, String> createShortCfMap(Configuration config) {
-        return ImmutableBiMap.<String, String>builder()
-                .put(INDEXSTORE_NAME, "g")
-                .put(INDEXSTORE_NAME + LOCK_STORE_SUFFIX, "h")
-                .put(config.get(IDS_STORE_NAME), "i")
-                .put(EDGESTORE_NAME, "e")
-                .put(EDGESTORE_NAME + LOCK_STORE_SUFFIX, "f")
-                .put(SYSTEM_PROPERTIES_STORE_NAME, "s")
-                .put(SYSTEM_PROPERTIES_STORE_NAME + LOCK_STORE_SUFFIX, "t")
-                .put(SYSTEM_MGMT_LOG_NAME, "m")
-                .put(SYSTEM_TX_LOG_NAME, "l")
-                .build();
-    }
-
-    @Override
-    public Deployment getDeployment() {
-        if (null != deployment) {
-            return deployment;
-        }
-
-        List<KeyRange> local;
-        try {
-            local = getLocalKeyPartition();
-            deployment = null != local && !local.isEmpty() ? Deployment.LOCAL : Deployment.REMOTE;
-        } catch (BackendException e) {
-            throw new RuntimeException(e);
-        }
-        return deployment;
-    }
-
-    @Override
-    public String toString() {
-        return "hbase[" + tableName + "@" + super.toString() + "]";
-    }
-
-    public void dumpOpenManagers() {
-        int estimatedSize = openManagers.size();
-        logger.trace("---- Begin open HBase store manager list ({} managers) ----", estimatedSize);
-        for (HBaseStoreManager m : openManagers.keySet()) {
-            logger.trace("Manager {} opened at:", m, openManagers.get(m));
-        }
-        logger.trace("----   End open HBase store manager list ({} managers)  ----", estimatedSize);
-    }
-
-    @Override
-    public void close() {
-        openStores.clear();
-        if (logger.isTraceEnabled())
-            openManagers.remove(this);
-        IOUtils.closeQuietly(cnx);
-    }
-
-    @Override
-    public StoreFeatures getFeatures() {
-
-        Configuration c = GraphDatabaseConfiguration.buildGraphConfiguration();
-
-        StandardStoreFeatures.Builder fb = new StandardStoreFeatures.Builder()
-                .orderedScan(true).unorderedScan(true).batchMutation(true)
-                .multiQuery(true).distributed(true).keyOrdered(true).storeTTL(true)
-                .cellTTL(true).timestamps(true).preferredTimestamps(PREFERRED_TIMESTAMPS)
-                .optimisticLocking(true).keyConsistent(c);
-
-        try {
-            fb.localKeyPartition(getDeployment() == Deployment.LOCAL);
-        } catch (Exception e) {
-            logger.warn("Unexpected exception during getDeployment()", e);
-        }
-
-        return fb.build();
-    }
-
-    @Override
-    public void mutateMany(Map<String, Map<StaticBuffer, KCVMutation>> mutations, StoreTransaction txh) throws BackendException {
-        final MaskedTimestamp commitTime = new MaskedTimestamp(txh);
-        // In case of an addition and deletion with identical timestamps, the
-        // deletion tombstone wins.
-        // http://hbase.apache.org/book/versions.html#d244e4250
-        final Map<StaticBuffer, Pair<List<Put>, Delete>> commandsPerKey =
-                convertToCommands(
-                        mutations,
-                        commitTime.getAdditionTime(times),
-                        commitTime.getDeletionTime(times));
-
-        final List<Row> batch = new ArrayList<>(commandsPerKey.size()); // actual batch operation
-
-        // convert sorted commands into representation required for 'batch' operation
-        for (Pair<List<Put>, Delete> commands : commandsPerKey.values()) {
-            if (commands.getFirst() != null && !commands.getFirst().isEmpty())
-                batch.addAll(commands.getFirst());
-
-            if (commands.getSecond() != null)
-                batch.add(commands.getSecond());
-        }
-
-        try {
-            TableMask table = null;
-
-            try {
-                table = cnx.getTable(tableName);
-                table.batch(batch, new Object[batch.size()]);
-            } finally {
-                IOUtils.closeQuietly(table);
-            }
-        } catch (IOException e) {
-            throw new TemporaryBackendException(e);
-        } catch (InterruptedException e) {
-            throw new TemporaryBackendException(e);
-        }
-
-        this.sleepAfterWrite(commitTime);
-    }
-
-    @Override
-    public KeyColumnValueStore openDatabase(String longName, StoreMetaData.Container metaData) throws BackendException {
-        // HBase does not support retrieving cell-level TTL by the client.
-        Preconditions.checkArgument(!storageConfig.has(GraphDatabaseConfiguration.STORE_META_TTL, longName)
-            || !storageConfig.get(GraphDatabaseConfiguration.STORE_META_TTL, longName));
-
-        HBaseKeyColumnValueStore store = openStores.get(longName);
-
-        if (store == null) {
-            final String cfName = getCfNameForStoreName(longName);
-
-            HBaseKeyColumnValueStore newStore = new HBaseKeyColumnValueStore(this, cnx, tableName, cfName, longName);
-
-            store = openStores.putIfAbsent(longName, newStore); // nothing bad happens if we loose to other thread
-
-            if (store == null) {
-                if (!skipSchemaCheck) {
-                    int cfTTLInSeconds = -1;
-                    if (metaData.contains(StoreMetaData.TTL)) {
-                        cfTTLInSeconds = metaData.get(StoreMetaData.TTL);
-                    }
-                    ensureColumnFamilyExists(tableName, cfName, cfTTLInSeconds);
-                }
-
-                store = newStore;
-            }
-        }
-
-        return store;
-    }
-
-    @Override
-    public StoreTransaction beginTransaction(final BaseTransactionConfig config) throws BackendException {
-        return new HBaseTransaction(config);
-    }
-
-    @Override
-    public String getName() {
-        return tableName;
-    }
-
-    /**
-     * Deletes the specified table with all its columns.
-     * ATTENTION: Invoking this method will delete the table if it exists and therefore causes data loss.
-     */
-    @Override
-    public void clearStorage() throws BackendException {
-        try (AdminMask adm = getAdminInterface()) {
-            if (this.storageConfig.get(DROP_ON_CLEAR)) {
-                adm.dropTable(tableName);
-            } else {
-                adm.clearTable(tableName, times.getTime(times.getTime()));
-            }
-        } catch (IOException e)
-        {
-            throw new TemporaryBackendException(e);
-        }
-    }
-
-    @Override
-    public boolean exists() throws BackendException {
-        try (final AdminMask adm = getAdminInterface()) {
-            return adm.tableExists(tableName);
-        } catch (IOException e) {
-            throw new TemporaryBackendException(e);
-        }
-    }
-
-    @Override
-    public List<KeyRange> getLocalKeyPartition() throws BackendException {
-        List<KeyRange> result = new LinkedList<>();
-        try {
-            ensureTableExists(
-                tableName, getCfNameForStoreName(GraphDatabaseConfiguration.SYSTEM_PROPERTIES_STORE_NAME), 0);
-            Map<KeyRange, ServerName> normed = normalizeKeyBounds(cnx.getRegionLocations(tableName));
-
-            for (Map.Entry<KeyRange, ServerName> e : normed.entrySet()) {
-                if (NetworkUtil.isLocalConnection(e.getValue().getHostname())) {
-                    result.add(e.getKey());
-                    logger.debug("Found local key/row partition {} on host {}", e.getKey(), e.getValue());
-                } else {
-                    logger.debug("Discarding remote {}", e.getValue());
-                }
-            }
-        } catch (MasterNotRunningException e) {
-            logger.warn("Unexpected MasterNotRunningException", e);
-        } catch (ZooKeeperConnectionException e) {
-            logger.warn("Unexpected ZooKeeperConnectionException", e);
-        } catch (IOException e) {
-            logger.warn("Unexpected IOException", e);
-        }
-        return result;
-    }
-
-    /**
-     * each key from an {@link HRegionInfo} to a {@link KeyRange} expressing the
-     * region's start and end key bounds using JanusGraph-partitioning-friendly
-     * conventions (start inclusive, end exclusive, zero bytes appended where
-     * necessary to make all keys at least 4 bytes long).
-     * <p/>
-     * This method iterates over the entries in its map parameter and performs
-     * the following conditional conversions on its keys. "Require" below means
-     * either a {@link Preconditions} invocation or an assertion. HRegionInfo
-     * sometimes returns start and end keys of zero length; this method replaces
-     * zero length keys with null before doing any of the checks described
-     * below. The parameter map and the values it contains are only read and
-     * never modified.
-     *
-     * <ul>
-     * <li>If an entry's HRegionInfo has null start and end keys, then first
-     * require that the parameter map is a singleton, and then return a
-     * single-entry map whose {@code KeyRange} has start and end buffers that
-     * are both four bytes of zeros.</li>
-     * <li>If the entry has a null end key (but non-null start key), put an
-     * equivalent entry in the result map with a start key identical to the
-     * input, except that zeros are appended to values less than 4 bytes long,
-     * and an end key that is four bytes of zeros.
-     * <li>If the entry has a null start key (but non-null end key), put an
-     * equivalent entry in the result map where the start key is four bytes of
-     * zeros, and the end key has zeros appended, if necessary, to make it at
-     * least 4 bytes long, after which one is added to the padded value in
-     * unsigned 32-bit arithmetic with overflow allowed.</li>
-     * <li>Any entry which matches none of the above criteria results in an
-     * equivalent entry in the returned map, except that zeros are appended to
-     * both keys to make each at least 4 bytes long, and the end key is then
-     * incremented as described in the last bullet point.</li>
-     * </ul>
-     *
-     * After iterating over the parameter map, this method checks that it either
-     * saw no entries with null keys, one entry with a null start key and a
-     * different entry with a null end key, or one entry with both start and end
-     * keys null. If any null keys are observed besides these three cases, the
-     * method will die with a precondition failure.
-     *
-     * @param locations A list of HRegionInfo
-     * @return JanusGraph-friendly expression of each region's rowkey boundaries
-     */
-    private Map<KeyRange, ServerName> normalizeKeyBounds(List<HRegionLocation> locations) {
-
-        HRegionLocation nullStart = null;
-        HRegionLocation nullEnd = null;
-
-        ImmutableMap.Builder<KeyRange, ServerName> b = ImmutableMap.builder();
-
-        for (HRegionLocation location : locations) {
-            HRegionInfo regionInfo = location.getRegionInfo();
-            ServerName serverName = location.getServerName();
-            byte startKey[] = regionInfo.getStartKey();
-            byte endKey[]   = regionInfo.getEndKey();
-
-            if (0 == startKey.length) {
-                startKey = null;
-                logger.trace("Converted zero-length HBase startKey byte array to null");
-            }
-
-            if (0 == endKey.length) {
-                endKey = null;
-                logger.trace("Converted zero-length HBase endKey byte array to null");
-            }
-
-            if (null == startKey && null == endKey) {
-                Preconditions.checkState(1 == locations.size());
-                logger.debug("HBase table {} has a single region {}", tableName, regionInfo);
-                // Choose arbitrary shared value = startKey = endKey
-                return b.put(new KeyRange(FOUR_ZERO_BYTES, FOUR_ZERO_BYTES), serverName).build();
-            } else if (null == startKey) {
-                logger.debug("Found HRegionInfo with null startKey on server {}: {}", serverName, regionInfo);
-                Preconditions.checkState(null == nullStart);
-                nullStart = location;
-                // I thought endBuf would be inclusive from the HBase javadoc, but in practice it is exclusive
-                StaticBuffer endBuf = StaticArrayBuffer.of(zeroExtend(endKey));
-                // Replace null start key with zeroes
-                b.put(new KeyRange(FOUR_ZERO_BYTES, endBuf), serverName);
-            } else if (null == endKey) {
-                logger.debug("Found HRegionInfo with null endKey on server {}: {}", serverName, regionInfo);
-                Preconditions.checkState(null == nullEnd);
-                nullEnd = location;
-                // Replace null end key with zeroes
-                b.put(new KeyRange(StaticArrayBuffer.of(zeroExtend(startKey)), FOUR_ZERO_BYTES), serverName);
-            } else {
-                Preconditions.checkState(null != startKey);
-                Preconditions.checkState(null != endKey);
-
-                // Convert HBase's inclusive end keys into exclusive JanusGraph end keys
-                StaticBuffer startBuf = StaticArrayBuffer.of(zeroExtend(startKey));
-                StaticBuffer endBuf = StaticArrayBuffer.of(zeroExtend(endKey));
-
-                KeyRange kr = new KeyRange(startBuf, endBuf);
-                b.put(kr, serverName);
-                logger.debug("Found HRegionInfo with non-null end and start keys on server {}: {}", serverName, regionInfo);
-            }
-        }
-
-        // Require either no null key bounds or a pair of them
-        Preconditions.checkState(!(null == nullStart ^ null == nullEnd));
-
-        // Check that every key in the result is at least 4 bytes long
-        Map<KeyRange, ServerName> result = b.build();
-        for (KeyRange kr : result.keySet()) {
-            Preconditions.checkState(4 <= kr.getStart().length());
-            Preconditions.checkState(4 <= kr.getEnd().length());
-        }
-
-        return result;
-    }
-
-    /**
-     * If the parameter is shorter than 4 bytes, then create and return a new 4
-     * byte array with the input array's bytes followed by zero bytes. Otherwise
-     * return the parameter.
-     *
-     * @param dataToPad non-null but possibly zero-length byte array
-     * @return either the parameter or a new array
-     */
-    private final byte[] zeroExtend(byte[] dataToPad) {
-        assert null != dataToPad;
-
-        final int targetLength = 4;
-
-        if (targetLength <= dataToPad.length)
-            return dataToPad;
-
-        byte padded[] = new byte[targetLength];
-
-        for (int i = 0; i < dataToPad.length; i++)
-            padded[i] = dataToPad[i];
-
-        for (int i = dataToPad.length; i < padded.length; i++)
-            padded[i] = (byte)0;
-
-        return padded;
-    }
-
-    public static String shortenCfName(BiMap<String, String> shortCfNameMap, String longName) throws PermanentBackendException {
-        final String s;
-        if (shortCfNameMap.containsKey(longName)) {
-            s = shortCfNameMap.get(longName);
-            Preconditions.checkNotNull(s);
-            logger.debug("Substituted default CF name \"{}\" with short form \"{}\" to reduce HBase KeyValue size", longName, s);
-        } else {
-            if (shortCfNameMap.containsValue(longName)) {
-                String fmt = "Must use CF long-form name \"%s\" instead of the short-form name \"%s\" when configured with %s=true";
-                String msg = String.format(fmt, shortCfNameMap.inverse().get(longName), longName, SHORT_CF_NAMES.getName());
-                throw new PermanentBackendException(msg);
-            }
-            s = longName;
-            logger.debug("Kept default CF name \"{}\" because it has no associated short form", s);
-        }
-        return s;
-    }
-
-    private TableDescriptor ensureTableExists(String tableName, String initialCFName, int ttlInSeconds) throws BackendException {
-        AdminMask adm = null;
-
-        TableDescriptor desc;
-
-        try { // Create our table, if necessary
-            adm = getAdminInterface();
-            /*
-             * Some HBase versions/impls respond badly to attempts to create a
-             * table without at least one CF. See #661. Creating a CF along with
-             * the table avoids HBase carping.
-             */
-            if (adm.tableExists(tableName)) {
-                desc = adm.getTableDescriptor(tableName);
-                // Check and warn if long and short cf names are mixedly used for the same table.
-                if (shortCfNames && initialCFName.equals(shortCfNameMap.get(SYSTEM_PROPERTIES_STORE_NAME))) {
-                    String longCFName = shortCfNameMap.inverse().get(initialCFName);
-                    if (desc.getColumnFamily(Bytes.toBytes(longCFName)) != null) {
-                        logger.warn("Configuration {}=true, but the table \"{}\" already has column family with long name \"{}\".",
-                            SHORT_CF_NAMES.getName(), tableName, longCFName);
-                        logger.warn("Check {} configuration.", SHORT_CF_NAMES.getName());
-                    }
-                }
-                else if (!shortCfNames && initialCFName.equals(SYSTEM_PROPERTIES_STORE_NAME)) {
-                    String shortCFName = shortCfNameMap.get(initialCFName);
-                    if (desc.getColumnFamily(Bytes.toBytes(shortCFName)) != null) {
-                        logger.warn("Configuration {}=false, but the table \"{}\" already has column family with short name \"{}\".",
-                            SHORT_CF_NAMES.getName(), tableName, shortCFName);
-                        logger.warn("Check {} configuration.", SHORT_CF_NAMES.getName());
-                    }
-                }
-            } else {
-                desc = createTable(tableName, initialCFName, ttlInSeconds, adm);
-            }
-        } catch (IOException e) {
-            throw new TemporaryBackendException(e);
-        } finally {
-            IOUtils.closeQuietly(adm);
-        }
-
-        return desc;
-    }
-
-    private TableDescriptor createTable(String tableName, String cfName, int ttlInSeconds, AdminMask adm) throws IOException {
-        TableDescriptor desc = compat.newTableDescriptor(tableName);
-
-        ColumnFamilyDescriptor cdesc = ColumnFamilyDescriptorBuilder.of(cfName);
-        cdesc = setCFOptions(cdesc, ttlInSeconds);
-
-        desc = compat.addColumnFamilyToTableDescriptor(desc, cdesc);
-
-        int count; // total regions to create
-        String src;
-
-        if (MIN_REGION_COUNT <= (count = regionCount)) {
-            src = "region count configuration";
-        } else if (0 < regionsPerServer &&
-                   MIN_REGION_COUNT <= (count = regionsPerServer * adm.getEstimatedRegionServerCount())) {
-            src = "ClusterStatus server count";
-        } else {
-            count = -1;
-            src = "default";
-        }
-
-        if (MIN_REGION_COUNT < count) {
-            adm.createTable(desc, getStartKey(count), getEndKey(count), count);
-            logger.debug("Created table {} with region count {} from {}", tableName, count, src);
-        } else {
-            adm.createTable(desc);
-            logger.debug("Created table {} with default start key, end key, and region count", tableName);
-        }
-
-        return desc;
-    }
-
-    /**
-     * <p/>
-     * From the {@code createTable} javadoc:
-     * "The start key specified will become the end key of the first region of
-     * the table, and the end key specified will become the start key of the
-     * last region of the table (the first region has a null start key and
-     * the last region has a null end key)"
-     * <p/>
-     * To summarize, the {@code createTable} argument called "startKey" is
-     * actually the end key of the first region.
-     */
-    private byte[] getStartKey(int regionCount) {
-        ByteBuffer regionWidth = ByteBuffer.allocate(4);
-        regionWidth.putInt((int)(((1L << 32) - 1L) / regionCount)).flip();
-        return StaticArrayBuffer.of(regionWidth).getBytes(0, 4);
-    }
-
-    /**
-     * Companion to {@link #getStartKey(int)}. See its javadoc for details.
-     */
-    private byte[] getEndKey(int regionCount) {
-        ByteBuffer regionWidth = ByteBuffer.allocate(4);
-        regionWidth.putInt((int)(((1L << 32) - 1L) / regionCount * (regionCount - 1))).flip();
-        return StaticArrayBuffer.of(regionWidth).getBytes(0, 4);
-    }
-
-    private void ensureColumnFamilyExists(String tableName, String columnFamily, int ttlInSeconds) throws BackendException {
-        AdminMask adm = null;
-        try {
-            adm = getAdminInterface();
-            TableDescriptor desc = ensureTableExists(tableName, columnFamily, ttlInSeconds);
-
-            Preconditions.checkNotNull(desc);
-
-            ColumnFamilyDescriptor cf = desc.getColumnFamily(Bytes.toBytes(columnFamily));
-
-            // Create our column family, if necessary
-            if (cf == null) {
-                try {
-                    if (!adm.isTableDisabled(tableName)) {
-                        adm.disableTable(tableName);
-                    }
-                } catch (TableNotEnabledException e) {
-                    logger.debug("Table {} already disabled", tableName);
-                } catch (IOException e) {
-                    throw new TemporaryBackendException(e);
-                }
-
-                try {
-                    ColumnFamilyDescriptor cdesc = ColumnFamilyDescriptorBuilder.of(columnFamily);
-
-                    cdesc = setCFOptions(cdesc, ttlInSeconds);
-
-                    adm.addColumn(tableName, cdesc);
-
-                    try {
-                        logger.debug("Added HBase ColumnFamily {}, waiting for 1 sec. to propogate.", columnFamily);
-                        Thread.sleep(1000L);
-                    } catch (InterruptedException ie) {
-                        throw new TemporaryBackendException(ie);
-                    }
-
-                    adm.enableTable(tableName);
-                } catch (TableNotFoundException ee) {
-                    logger.error("TableNotFoundException", ee);
-                    throw new PermanentBackendException(ee);
-                } catch (org.apache.hadoop.hbase.TableExistsException ee) {
-                    logger.debug("Swallowing exception {}", ee);
-                } catch (IOException ee) {
-                    throw new TemporaryBackendException(ee);
-                }
-            }
-        } finally {
-            IOUtils.closeQuietly(adm);
-        }
-    }
-
-    private ColumnFamilyDescriptor setCFOptions(ColumnFamilyDescriptor cdesc, int ttlInSeconds) {
-        ColumnFamilyDescriptor ret = null;
-
-        if (null != compression && !compression.equals(COMPRESSION_DEFAULT)) {
-            cdesc = ColumnFamilyDescriptorBuilder.newBuilder(cdesc).setDataBlockEncoding( DataBlockEncoding.FAST_DIFF).build();
-            ret = compat.setCompression(cdesc, compression);
-        }
-
-        if (ttlInSeconds > 0) {
-            ret = ColumnFamilyDescriptorBuilder.newBuilder(cdesc).setTimeToLive(ttlInSeconds).build();
-        }
-
-        return ret;
-    }
-
-    /**
-     * Convert JanusGraph internal Mutation representation into HBase native commands.
-     *
-     * @param mutations    Mutations to convert into HBase commands.
-     * @param putTimestamp The timestamp to use for Put commands.
-     * @param delTimestamp The timestamp to use for Delete commands.
-     * @return Commands sorted by key converted from JanusGraph internal representation.
-     * @throws org.janusgraph.diskstorage.PermanentBackendException
-     */
-     @VisibleForTesting
-     Map<StaticBuffer, Pair<List<Put>, Delete>> convertToCommands(Map<String, Map<StaticBuffer, KCVMutation>> mutations,
-                                                                  final long putTimestamp,
-                                                                  final long delTimestamp) throws PermanentBackendException {
-        // A map of rowkey to commands (list of Puts, Delete)
-        final Map<StaticBuffer, Pair<List<Put>, Delete>> commandsPerKey = new HashMap<>();
-
-        for (Map.Entry<String, Map<StaticBuffer, KCVMutation>> entry : mutations.entrySet()) {
-
-            String cfString = getCfNameForStoreName(entry.getKey());
-            byte[] cfName = Bytes.toBytes(cfString);
-
-            for (Map.Entry<StaticBuffer, KCVMutation> m : entry.getValue().entrySet()) {
-                final byte[] key = m.getKey().as(StaticBuffer.ARRAY_FACTORY);
-                KCVMutation mutation = m.getValue();
-
-                Pair<List<Put>, Delete> commands = commandsPerKey.get(m.getKey());
-
-                // The firt time we go through the list of input <rowkey, KCVMutation>,
-                // create the holder for a particular rowkey
-                if (commands == null) {
-                    commands = new Pair<>();
-                    // List of all the Puts for this rowkey, including the ones without TTL and with TTL.
-                    final List<Put> putList = new ArrayList<>();
-                    commands.setFirst(putList);
-                    commandsPerKey.put(m.getKey(), commands);
-                }
-
-                if (mutation.hasDeletions()) {
-                    if (commands.getSecond() == null) {
-                        Delete d = new Delete(key);
-                        compat.setTimestamp(d, delTimestamp);
-                        commands.setSecond(d);
-                    }
-
-                    for (StaticBuffer b : mutation.getDeletions()) {
-                        // commands.getSecond() is a Delete for this rowkey.
-                        commands.getSecond().addColumns(cfName, b.as(StaticBuffer.ARRAY_FACTORY), delTimestamp);
-                    }
-                }
-
-                if (mutation.hasAdditions()) {
-                    // All the entries (column cells) with the rowkey use this one Put, except the ones with TTL.
-                    final Put putColumnsWithoutTtl = new Put(key, putTimestamp);
-                    // At the end of this loop, there will be one Put entry in the commands.getFirst() list that
-                    // contains all additions without TTL set, and possible multiple Put entries for columns
-                    // that have TTL set.
-                    for (Entry e : mutation.getAdditions()) {
-
-                        // Deal with TTL within the entry (column cell) first
-                        // HBase cell level TTL is actually set at the Mutation/Put level.
-                        // Therefore we need to construct a new Put for each entry (column cell) with TTL.
-                        // We can not combine them because column cells within the same rowkey may:
-                        // 1. have no TTL
-                        // 2. have TTL
-                        // 3. have different TTL
-                        final Integer ttl = (Integer) e.getMetaData().get(EntryMetaData.TTL);
-                        if (null != ttl && ttl > 0) {
-                            // Create a new Put
-                            Put putColumnWithTtl = new Put(key, putTimestamp);
-                            addColumnToPut(putColumnWithTtl, cfName, putTimestamp, e);
-                            // Convert ttl from second (JanusGraph TTL) to millisec (HBase TTL)
-                            // @see JanusGraphManagement#setTTL(JanusGraphSchemaType, Duration)
-                            // Cast Put to Mutation for backward compatibility with HBase 0.98.x
-                            // HBase supports cell-level TTL for versions 0.98.6 and above.
-                            ((Mutation) putColumnWithTtl).setTTL(ttl * 1000);
-                            // commands.getFirst() is the list of Puts for this rowkey. Add this
-                            // Put column with TTL to the list.
-                            commands.getFirst().add(putColumnWithTtl);
-                        } else {
-                            addColumnToPut(putColumnsWithoutTtl, cfName, putTimestamp, e);
-                        }
-                    }
-                    // If there were any mutations without TTL set, add them to commands.getFirst()
-                    if (!putColumnsWithoutTtl.isEmpty()) {
-                        commands.getFirst().add(putColumnsWithoutTtl);
-                    }
-                }
-            }
-        }
-
-        return commandsPerKey;
-    }
-
-    private void addColumnToPut(Put p, byte[] cfName, long putTimestamp, Entry e) {
-      p.addColumn(cfName, e.getColumnAs(StaticBuffer.ARRAY_FACTORY), putTimestamp,
-          e.getValueAs(StaticBuffer.ARRAY_FACTORY));
-    }
-
-    private String getCfNameForStoreName(String storeName) throws PermanentBackendException {
-        return shortCfNames ? shortenCfName(shortCfNameMap, storeName) : storeName;
-    }
-
-    private void checkConfigDeprecation(org.janusgraph.diskstorage.configuration.Configuration config) {
-        if (config.has(GraphDatabaseConfiguration.STORAGE_PORT)) {
-            logger.warn("The configuration property {} is ignored for HBase. Set hbase.zookeeper.property.clientPort in hbase-site.xml or {}.hbase.zookeeper.property.clientPort in JanusGraph's configuration file.",
-                    ConfigElement.getPath(GraphDatabaseConfiguration.STORAGE_PORT), ConfigElement.getPath(HBASE_CONFIGURATION_NAMESPACE));
-        }
-    }
-
-    private AdminMask getAdminInterface() {
-        try {
-            return cnx.getAdmin();
-        } catch (IOException e) {
-            throw new JanusGraphException(e);
-        }
-    }
-
-    private String determineTableName(org.janusgraph.diskstorage.configuration.Configuration config) {
-        if ((!config.has(HBASE_TABLE)) && (config.has(GRAPH_NAME))) {
-            return config.get(GRAPH_NAME);
-        }
-        return config.get(HBASE_TABLE);
-    }
-}
diff --git a/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/HBaseTransaction.java b/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/HBaseTransaction.java
deleted file mode 100644
index 3b0d271bb..000000000
--- a/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/HBaseTransaction.java
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2017 JanusGraph Authors
-//
-// Licensed 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.
-
-package org.janusgraph.diskstorage.hbase2;
-
-import org.janusgraph.diskstorage.BaseTransactionConfig;
-import org.janusgraph.diskstorage.common.AbstractStoreTransaction;
-
-/**
- * This class overrides and adds nothing compared with
- * {@link org.janusgraph.diskstorage.locking.consistentkey.ExpectedValueCheckingTransaction}; however, it creates a transaction type specific
- * to HBase, which lets us check for user errors like passing a Cassandra
- * transaction into a HBase method.
- */
-public class HBaseTransaction extends AbstractStoreTransaction {
-
-    public HBaseTransaction(final BaseTransactionConfig config) {
-        super(config);
-    }
-}
diff --git a/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/HConnection2_0.java b/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/HConnection2_0.java
deleted file mode 100644
index 66b8642dc..000000000
--- a/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/HConnection2_0.java
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2017 JanusGraph Authors
-//
-// Licensed 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.
-
-package org.janusgraph.diskstorage.hbase2;
-
-import org.apache.hadoop.hbase.HRegionLocation;
-import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.client.Connection;
-
-import java.io.IOException;
-import java.util.List;
-
-public class HConnection2_0 implements ConnectionMask
-{
-
-    private final Connection cnx;
-
-    public HConnection2_0(Connection cnx)
-    {
-        this.cnx = cnx;
-    }
-
-    @Override
-    public TableMask getTable(String name) throws IOException
-    {
-        return new HTable2_0(cnx.getTable(TableName.valueOf(name)));
-    }
-
-    @Override
-    public AdminMask getAdmin() throws IOException
-    {
-        return new HBaseAdmin2_0(cnx.getAdmin());
-    }
-
-    @Override
-    public void close() throws IOException
-    {
-        cnx.close();
-    }
-
-    @Override
-    public List<HRegionLocation> getRegionLocations(String tableName)
-        throws IOException
-    {
-        return this.cnx.getRegionLocator(TableName.valueOf(tableName)).getAllRegionLocations();
-    }
-}
diff --git a/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/HTable2_0.java b/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/HTable2_0.java
deleted file mode 100644
index 0b4643a4e..000000000
--- a/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/HTable2_0.java
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2017 JanusGraph Authors
-//
-// Licensed 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.
-
-package org.janusgraph.diskstorage.hbase2;
-
-import org.apache.hadoop.hbase.client.Get;
-import org.apache.hadoop.hbase.client.Result;
-import org.apache.hadoop.hbase.client.ResultScanner;
-import org.apache.hadoop.hbase.client.Row;
-import org.apache.hadoop.hbase.client.Scan;
-import org.apache.hadoop.hbase.client.Table;
-
-import java.io.IOException;
-import java.util.List;
-
-public class HTable2_0 implements TableMask
-{
-    private final Table table;
-
-    public HTable2_0(Table table)
-    {
-        this.table = table;
-    }
-
-    @Override
-    public ResultScanner getScanner(Scan filter) throws IOException
-    {
-        return table.getScanner(filter);
-    }
-
-    @Override
-    public Result[] get(List<Get> gets) throws IOException
-    {
-        return table.get(gets);
-    }
-
-    @Override
-    public void batch(List<Row> writes, Object[] results) throws IOException, InterruptedException
-    {
-        table.batch(writes, results);
-        /* table.flushCommits(); not needed anymore */
-    }
-
-    @Override
-    public void close() throws IOException
-    {
-        table.close();
-    }
-}
diff --git a/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/TableMask.java b/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/TableMask.java
deleted file mode 100644
index 0309c39b0..000000000
--- a/graphdb/janus-hbase2/src/main/java/org/janusgraph/diskstorage/hbase2/TableMask.java
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2017 JanusGraph Authors
-//
-// Licensed 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.
-
-/**
- * Copyright DataStax, Inc.
- * <p>
- * Please see the included license file for details.
- */
-package org.janusgraph.diskstorage.hbase2;
-
-import org.apache.hadoop.hbase.client.Get;
-import org.apache.hadoop.hbase.client.Result;
-import org.apache.hadoop.hbase.client.ResultScanner;
-import org.apache.hadoop.hbase.client.Row;
-import org.apache.hadoop.hbase.client.Scan;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.List;
-
-/**
- * This interface hides ABI/API breaking changes that HBase has made to its Table/HTableInterface over the course
- * of development from 0.94 to 1.0 and beyond.
- */
-public interface TableMask extends Closeable
-{
-
-    ResultScanner getScanner(Scan filter) throws IOException;
-
-    Result[] get(List<Get> gets) throws IOException;
-
-    void batch(List<Row> writes, Object[] results) throws IOException, InterruptedException;
-
-}
diff --git a/graphdb/janus/pom.xml b/graphdb/janus/pom.xml
index 80fe82bfd..1e1501346 100644
--- a/graphdb/janus/pom.xml
+++ b/graphdb/janus/pom.xml
@@ -51,12 +51,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.atlas</groupId>
-            <artifactId>atlas-janusgraph-hbase2</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.atlas</groupId>
             <artifactId>atlas-testtools</artifactId>
@@ -106,6 +100,10 @@
                     <groupId>org.apache.tinkerpop</groupId>
                     <artifactId>gremlin-driver</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.noggit</groupId>
+                    <artifactId>noggit</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -220,6 +218,10 @@
                     <groupId>org.codehaus.woodstox</groupId>
                     <artifactId>woodstox-core-asl</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.apache.zookeeper</groupId>
+                    <artifactId>zookeeper-jute</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <!-- CVE Overrides for Lucene -->
@@ -262,6 +264,12 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.tinkerpop</groupId>
+            <artifactId>gremlin-util</artifactId>
+            <version>${tinkerpop.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.tinkerpop</groupId>
             <artifactId>gremlin-groovy</artifactId>
diff --git a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphDatabase.java b/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphDatabase.java
index 115b681cc..aea2445a8 100644
--- a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphDatabase.java
+++ b/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphDatabase.java
@@ -39,6 +39,7 @@ import org.janusgraph.core.schema.JanusGraphManagement;
 import org.janusgraph.diskstorage.StandardIndexProvider;
 import org.janusgraph.diskstorage.StandardStoreManager;
 import org.janusgraph.diskstorage.es.ElasticSearch7Index;
+import org.janusgraph.diskstorage.hbase.HBaseStoreManager;
 import org.janusgraph.diskstorage.solr.Solr6Index;
 import org.janusgraph.graphdb.database.serialize.attribute.SerializableSerializer;
 import org.janusgraph.graphdb.tinkerpop.JanusGraphIoRegistry;
@@ -85,7 +86,7 @@ public class AtlasJanusGraphDatabase implements GraphDatabase<AtlasJanusVertex,
 
     public AtlasJanusGraphDatabase() {
         //update registry
-        GraphSONMapper.build().addRegistry(JanusGraphIoRegistry.getInstance()).create();
+        GraphSONMapper.build().addRegistry(JanusGraphIoRegistry.instance()).create();
     }
 
     public static Configuration getConfiguration() throws AtlasException {
@@ -136,11 +137,11 @@ public class AtlasJanusGraphDatabase implements GraphDatabase<AtlasJanusVertex,
             modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
 
             Map<String, String> customMap = new HashMap<>(StandardStoreManager.getAllManagerClasses());
-            customMap.put("hbase2", org.janusgraph.diskstorage.hbase2.HBaseStoreManager.class.getName());
+            customMap.put("hbase2", HBaseStoreManager.class.getName());
             ImmutableMap<String, String> immap = ImmutableMap.copyOf(customMap);
             field.set(null, immap);
 
-            LOG.debug("Injected HBase2 support - {}", org.janusgraph.diskstorage.hbase2.HBaseStoreManager.class.getName());
+            LOG.debug("Injected HBase2 support - {}", HBaseStoreManager.class.getName());
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
diff --git a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusIndexQuery.java b/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusIndexQuery.java
index c5b642a71..17c7a842e 100644
--- a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusIndexQuery.java
+++ b/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusIndexQuery.java
@@ -45,7 +45,7 @@ public class AtlasJanusIndexQuery implements AtlasIndexQuery<AtlasJanusVertex, A
 
     @Override
     public Iterator<Result<AtlasJanusVertex, AtlasJanusEdge>> vertices() {
-        Iterator<JanusGraphIndexQuery.Result<JanusGraphVertex>> results = query.vertices().iterator();
+        Iterator<JanusGraphIndexQuery.Result<JanusGraphVertex>> results = query.vertexStream().iterator();
 
         Function<JanusGraphIndexQuery.Result<JanusGraphVertex>, Result<AtlasJanusVertex, AtlasJanusEdge>> function =
             new Function<JanusGraphIndexQuery.Result<JanusGraphVertex>, Result<AtlasJanusVertex, AtlasJanusEdge>>() {
@@ -66,7 +66,7 @@ public class AtlasJanusIndexQuery implements AtlasIndexQuery<AtlasJanusVertex, A
         Iterator<JanusGraphIndexQuery.Result<JanusGraphVertex>> results = query
                 .offset(offset)
                 .limit(limit)
-                .vertices().iterator();
+                .vertexStream().iterator();
 
         Function<JanusGraphIndexQuery.Result<JanusGraphVertex>, Result<AtlasJanusVertex, AtlasJanusEdge>> function =
                 new Function<JanusGraphIndexQuery.Result<JanusGraphVertex>, Result<AtlasJanusVertex, AtlasJanusEdge>>() {
@@ -89,7 +89,7 @@ public class AtlasJanusIndexQuery implements AtlasIndexQuery<AtlasJanusVertex, A
                 .orderBy(sortBy, sortOrder)
                 .offset(offset)
                 .limit(limit)
-                .vertices().iterator();
+                .vertexStream().iterator();
 
         Function<JanusGraphIndexQuery.Result<JanusGraphVertex>, Result<AtlasJanusVertex, AtlasJanusEdge>> function =
                 new Function<JanusGraphIndexQuery.Result<JanusGraphVertex>, Result<AtlasJanusVertex, AtlasJanusEdge>>() {
@@ -115,7 +115,7 @@ public class AtlasJanusIndexQuery implements AtlasIndexQuery<AtlasJanusVertex, A
 
     @Override
     public Iterator<Result<AtlasJanusVertex, AtlasJanusEdge>> edges() {
-        Iterator<JanusGraphIndexQuery.Result<JanusGraphEdge>> results = query.edges().iterator();
+        Iterator<JanusGraphIndexQuery.Result<JanusGraphEdge>> results = query.edgeStream().iterator();
 
         Function<JanusGraphIndexQuery.Result<JanusGraphEdge>, Result<AtlasJanusVertex, AtlasJanusEdge>> function =
                 new Function<JanusGraphIndexQuery.Result<JanusGraphEdge>, Result<AtlasJanusVertex, AtlasJanusEdge>>() {
@@ -136,7 +136,7 @@ public class AtlasJanusIndexQuery implements AtlasIndexQuery<AtlasJanusVertex, A
         Iterator<JanusGraphIndexQuery.Result<JanusGraphEdge>> results = query
                 .offset(offset)
                 .limit(limit)
-                .edges().iterator();
+                .edgeStream().iterator();
 
         Function<JanusGraphIndexQuery.Result<JanusGraphEdge>, Result<AtlasJanusVertex, AtlasJanusEdge>> function =
                 new Function<JanusGraphIndexQuery.Result<JanusGraphEdge>, Result<AtlasJanusVertex, AtlasJanusEdge>>() {
@@ -159,7 +159,7 @@ public class AtlasJanusIndexQuery implements AtlasIndexQuery<AtlasJanusVertex, A
                 .orderBy(sortBy, sortOrder)
                 .offset(offset)
                 .limit(limit)
-                .edges().iterator();
+                .edgeStream().iterator();
 
         Function<JanusGraphIndexQuery.Result<JanusGraphEdge>, Result<AtlasJanusVertex, AtlasJanusEdge>> function =
                 new Function<JanusGraphIndexQuery.Result<JanusGraphEdge>, Result<AtlasJanusVertex, AtlasJanusEdge>>() {
diff --git a/graphdb/janus/src/main/java/org/janusgraph/diskstorage/es/ElasticSearch7Index.java b/graphdb/janus/src/main/java/org/janusgraph/diskstorage/es/ElasticSearch7Index.java
index 51a87f50a..90a2a9fe7 100644
--- a/graphdb/janus/src/main/java/org/janusgraph/diskstorage/es/ElasticSearch7Index.java
+++ b/graphdb/janus/src/main/java/org/janusgraph/diskstorage/es/ElasticSearch7Index.java
@@ -17,1283 +17,49 @@
  */
 package org.janusgraph.diskstorage.es;
 
-import static org.janusgraph.diskstorage.es.ElasticSearchIndex.*;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterators;
-import com.google.common.collect.LinkedListMultimap;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Sets;
-import org.janusgraph.core.Cardinality;
-import org.janusgraph.core.JanusGraphException;
-import org.janusgraph.core.attribute.Cmp;
-import org.janusgraph.core.attribute.Geo;
-import org.janusgraph.core.attribute.Geoshape;
-import org.janusgraph.core.attribute.Text;
-import org.janusgraph.core.schema.Mapping;
-import org.janusgraph.core.schema.Parameter;
 import org.janusgraph.diskstorage.BackendException;
-import org.janusgraph.diskstorage.BaseTransaction;
-import org.janusgraph.diskstorage.BaseTransactionConfig;
-import org.janusgraph.diskstorage.BaseTransactionConfigurable;
-import org.janusgraph.diskstorage.PermanentBackendException;
-import org.janusgraph.diskstorage.TemporaryBackendException;
-import org.janusgraph.diskstorage.configuration.ConfigOption;
 import org.janusgraph.diskstorage.configuration.Configuration;
-import org.janusgraph.diskstorage.es.compat.AbstractESCompat;
-import org.janusgraph.diskstorage.es.compat.ESCompatUtils;
-import org.janusgraph.diskstorage.es.mapping.IndexMapping;
-import org.janusgraph.diskstorage.es.script.ESScriptResponse;
-import org.janusgraph.diskstorage.indexing.IndexEntry;
-import org.janusgraph.diskstorage.indexing.IndexFeatures;
-import org.janusgraph.diskstorage.indexing.IndexMutation;
-import org.janusgraph.diskstorage.indexing.IndexProvider;
-import org.janusgraph.diskstorage.indexing.IndexQuery;
-import org.janusgraph.diskstorage.indexing.KeyInformation;
-import org.janusgraph.diskstorage.indexing.RawQuery;
-import org.janusgraph.diskstorage.util.DefaultTransaction;
 import org.janusgraph.graphdb.configuration.PreInitializeConfigOptions;
-import org.janusgraph.graphdb.database.serialize.AttributeUtils;
-import org.janusgraph.graphdb.query.JanusGraphPredicate;
-import org.janusgraph.graphdb.query.condition.And;
-import org.janusgraph.graphdb.query.condition.Condition;
-import org.janusgraph.graphdb.query.condition.Not;
-import org.janusgraph.graphdb.query.condition.Or;
-import org.janusgraph.graphdb.query.condition.PredicateCondition;
-import org.janusgraph.graphdb.types.ParameterType;
-import org.locationtech.spatial4j.shape.Rectangle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.Spliterator;
-import java.util.Spliterators;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-import static org.janusgraph.diskstorage.es.ElasticSearchConstants.ES_DOC_KEY;
-import static org.janusgraph.diskstorage.es.ElasticSearchConstants.ES_GEO_COORDS_KEY;
-import static org.janusgraph.diskstorage.es.ElasticSearchConstants.ES_LANG_KEY;
-import static org.janusgraph.diskstorage.es.ElasticSearchConstants.ES_SCRIPT_KEY;
-import static org.janusgraph.diskstorage.es.ElasticSearchConstants.ES_TYPE_KEY;
-import static org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration.INDEX_MAX_RESULT_SET_SIZE;
-import static org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration.INDEX_NAME;
+import java.lang.reflect.Field;
 
 /**
- * Do not change
- * This is a copy of ElasticSearchIndex.java from org.janusgraph.diskstorage.es
- * Added a new method to new client instance
+ * NOTE: Class to get access to ElasticSearchIndex.client
  */
 
 @PreInitializeConfigOptions
-public class ElasticSearch7Index implements IndexProvider {
-
-    private static final Logger log = LoggerFactory.getLogger(ElasticSearchIndex.class);
-
-    // add elasticsearch index instance(Singleton Pattern)
-    private static ElasticSearch7Index instance = null;
-
-    private static final String STRING_MAPPING_SUFFIX = "__STRING";
-    // add if need new instance
-    public static final ConfigOption<Boolean> CREATE_ELASTICSEARCH_CLIENT_PER_REQUEST = new ConfigOption(ELASTICSEARCH_NS, "create-client-per-request", "when false, allows the sharing of es client across other components.", org.janusgraph.diskstorage.configuration.ConfigOption.Type.LOCAL, false);
-
-    private static final String PARAMETERIZED_DELETION_SCRIPT = parameterizedScriptPrepare("",
-            "for (field in params.fields) {",
-            "    if (field.cardinality == 'SINGLE') {",
-            "        ctx._source.remove(field.name);",
-            "    } else if (ctx._source.containsKey(field.name)) {",
-            "        def fieldIndex = ctx._source[field.name].indexOf(field.value);",
-            "        if (fieldIndex >= 0 && fieldIndex < ctx._source[field.name].size()) {",
-            "            ctx._source[field.name].remove(fieldIndex);",
-            "        }",
-            "    }",
-            "}");
-
-    private static final String PARAMETERIZED_ADDITION_SCRIPT = parameterizedScriptPrepare("",
-            "for (field in params.fields) {",
-            "    if (ctx._source[field.name] == null) {",
-            "        ctx._source[field.name] = [];",
-            "    }",
-            "    if (field.cardinality != 'SET' || ctx._source[field.name].indexOf(field.value) == -1) {",
-            "        ctx._source[field.name].add(field.value);",
-            "    }",
-            "}");
-
-    static final String INDEX_NAME_SEPARATOR = "_";
-    private static final String SCRIPT_ID_SEPARATOR = "-";
+public class ElasticSearch7Index extends ElasticSearchIndex {
+    private static final Logger LOG = LoggerFactory.getLogger(ElasticSearch7Index.class);
 
-    private static final String MAX_OPEN_SCROLL_CONTEXT_PARAMETER = "search.max_open_scroll_context";
-    private static final Map<String, Object> MAX_RESULT_WINDOW = ImmutableMap.of("index.max_result_window", Integer.MAX_VALUE);
+    private static ElasticSearch7Index INSTANCE;
 
-    private static final Parameter[] NULL_PARAMETERS = null;
-
-    private static final String TRACK_TOTAL_HITS_PARAMETER = "track_total_hits";
-    private static final Parameter[] TRACK_TOTAL_HITS_DISABLED_PARAMETERS = new Parameter[]{new Parameter<>(TRACK_TOTAL_HITS_PARAMETER, false)};
-    private static final Map<String, Object> TRACK_TOTAL_HITS_DISABLED_REQUEST_BODY = ImmutableMap.of(TRACK_TOTAL_HITS_PARAMETER, false);
-
-    private final Function<String, String> generateIndexStoreNameFunction = this::generateIndexStoreName;
-    private final Map<String, String> indexStoreNamesCache = new ConcurrentHashMap<>();
-    private final boolean indexStoreNameCacheEnabled;
-
-    private final AbstractESCompat compat;
     private final ElasticSearchClient client;
-    private final Configuration configuration;
-    private final String indexName;
-    private final int batchSize;
-    private final boolean useExternalMappings;
-    private final boolean allowMappingUpdate;
-    private final Map<String, Object> indexSetting;
-    private final long createSleep;
-    private final boolean useAllField;
-    private final Map<String, Object> ingestPipelines;
-    private final boolean useMappingForES7;
-    private final String parameterizedAdditionScriptId;
-    private final String parameterizedDeletionScriptId;
-
-    private static boolean createElasticSearchClientPerRequest;
 
     public ElasticSearch7Index(Configuration config) throws BackendException {
-        // fetch configuration
-        this.configuration = config;
-        indexName = config.get(INDEX_NAME);
-        parameterizedAdditionScriptId = generateScriptId("add");
-        parameterizedDeletionScriptId = generateScriptId("del");
-        useAllField = config.get(USE_ALL_FIELD);
-        useExternalMappings = config.get(USE_EXTERNAL_MAPPINGS);
-        allowMappingUpdate = config.get(ALLOW_MAPPING_UPDATE);
-        createSleep = config.get(CREATE_SLEEP);
-        ingestPipelines = config.getSubset(ES_INGEST_PIPELINES);
-        useMappingForES7 = config.get(USE_MAPPING_FOR_ES7);
-        indexStoreNameCacheEnabled = config.get(ENABLE_INDEX_STORE_NAMES_CACHE);
-        batchSize = config.get(INDEX_MAX_RESULT_SET_SIZE);
-        log.debug("Configured ES query nb result by query to {}", batchSize);
-
-        client = createElasticSearchClient();
-        createElasticSearchClientPerRequest = config.get(CREATE_ELASTICSEARCH_CLIENT_PER_REQUEST);
-
-        checkClusterHealth(config.get(HEALTH_REQUEST_TIMEOUT));
-
-        compat = ESCompatUtils.acquireCompatForVersion(client.getMajorVersion());
-
-        indexSetting = ElasticSearchSetup.getSettingsFromJanusGraphConf(config);
-
-        setupMaxOpenScrollContextsIfNeeded(config);
-
-        setupStoredScripts();
-
-        //set instance
-        ElasticSearch7Index.instance = this;
-    }
-
-
-    //get client
-    public static ElasticSearchClient getElasticSearchClient() {
-        ElasticSearchClient ret     = null;
-        ElasticSearch7Index esIndex = ElasticSearch7Index.instance;
-
-        if (esIndex != null) {
-            if (createElasticSearchClientPerRequest) {
-                log.debug("Creating a new ElasticSearch Client.");
-
-                ret = esIndex.createElasticSearchClient();
-            } else {
-                log.debug("Returning the elasticSearch client owned by ElasticSearchIndex.");
-
-                ret = esIndex.client;
-            }
-        } else {
-            log.debug("No ElasticSearchIndex available. Will return null");
-        }
-
-        return ret;
-    }
-
-    //release client
-    public static void releaseElasticSearchClient(ElasticSearchClient elasticSearchClient) {
-        if(createElasticSearchClientPerRequest) {
-            if (elasticSearchClient != null) {
-                try {
-                    elasticSearchClient.close();
-
-                    if(log.isDebugEnabled()) {
-                        log.debug("Closed the elasticSearch client successfully.");
-                    }
-                } catch (IOException excp) {
-                    log.warn("Failed to close elasticSearchClient.", excp);
-                }
-            }
-        } else {
-            if(log.isDebugEnabled()) {
-                log.debug("Ignoring the closing of elasticSearch client as it is owned by ElasticSearchIndex.");
-            }
-        }
-    }
-
-    //create client
-    private ElasticSearchClient createElasticSearchClient() {
-        return interfaceConfiguration(configuration).getClient();
-    }
+        super(config);
 
+        ElasticSearchClient client = null;
 
-
-    private void checkClusterHealth(String healthCheck) throws BackendException {
         try {
-            client.clusterHealthRequest(healthCheck);
-        } catch (final IOException e) {
-            throw new PermanentBackendException(e.getMessage(), e);
-        }
-    }
-
-    private void setupStoredScripts() throws PermanentBackendException {
-        setupStoredScriptIfNeeded(parameterizedAdditionScriptId, PARAMETERIZED_ADDITION_SCRIPT);
-        setupStoredScriptIfNeeded(parameterizedDeletionScriptId, PARAMETERIZED_DELETION_SCRIPT);
-    }
-
-    private void setupStoredScriptIfNeeded(String storedScriptId, String source) throws PermanentBackendException {
-
-        ImmutableMap<String, Object> preparedScript = compat.prepareScript(source).build();
+            Field fld = ElasticSearchIndex.class.getDeclaredField("client");
 
-        String lang = (String) ((ImmutableMap<String, Object>) preparedScript.get(ES_SCRIPT_KEY)).get(ES_LANG_KEY);
+            fld.setAccessible(true);
 
-        try {
-            ESScriptResponse esScriptResponse = client.getStoredScript(storedScriptId);
-
-            if(Boolean.FALSE.equals(esScriptResponse.getFound()) || !Objects.equals(lang, esScriptResponse.getScript().getLang()) ||
-                    !Objects.equals(source, esScriptResponse.getScript().getSource())){
-                client.createStoredScript(storedScriptId, preparedScript);
-            }
-
-        } catch (final IOException e) {
-            throw new PermanentBackendException(e.getMessage(), e);
+            client = (ElasticSearchClient) fld.get(this);
+        } catch (Exception excp) {
+            LOG.warn("Failed to get SolrClient", excp);
         }
-    }
-
-    private void setupMaxOpenScrollContextsIfNeeded(Configuration config) throws PermanentBackendException {
-
-        if(client.getMajorVersion().getValue() > 6){
-
-            boolean setupMaxOpenScrollContexts;
-
-            if(config.has(SETUP_MAX_OPEN_SCROLL_CONTEXTS)){
-                setupMaxOpenScrollContexts = config.get(SETUP_MAX_OPEN_SCROLL_CONTEXTS);
-            } else {
-                setupMaxOpenScrollContexts = SETUP_MAX_OPEN_SCROLL_CONTEXTS.getDefaultValue();
-            }
-
-            if(setupMaxOpenScrollContexts){
-
-                Map<String, Object> settings = ImmutableMap.of("persistent",
-                        ImmutableMap.of(MAX_OPEN_SCROLL_CONTEXT_PARAMETER, Integer.MAX_VALUE));
-
-                try {
-                    client.updateClusterSettings(settings);
-                } catch (final IOException e) {
-                    throw new PermanentBackendException(e.getMessage(), e);
-                }
-            }
-        }
-    }
 
-    /**
-     * If ES already contains this instance's target index, then do nothing.
-     * Otherwise, create the index, then wait .
-     * <p>
-     * The {@code client} field must point to a live, connected client.
-     * The {@code indexName} field must be non-null and point to the name
-     * of the index to check for existence or create.
-     *
-     * @param index index name
-     * @throws IOException if the index status could not be checked or index could not be created
-     */
-    private void checkForOrCreateIndex(String index) throws IOException {
-        Objects.requireNonNull(client);
-        Objects.requireNonNull(index);
-
-        // Create index if it does not useExternalMappings and if it does not already exist
-        if (!useExternalMappings && !client.indexExists(index)) {
-            client.createIndex(index, indexSetting);
-            client.updateIndexSettings(index, MAX_RESULT_WINDOW);
-            try {
-                log.debug("Sleeping {} ms after {} index creation returned from actionGet()", createSleep, index);
-                Thread.sleep(createSleep);
-            } catch (final InterruptedException e) {
-                throw new JanusGraphException("Interrupted while waiting for index to settle in", e);
-            }
-        }
-        Preconditions.checkState(client.indexExists(index), "Could not create index: %s",index);
-        client.addAlias(indexName, index);
-    }
-
-
-    /**
-     * Configure ElasticSearchIndex's ES client. See{@link org.janusgraph.diskstorage.es.ElasticSearchSetup} for more
-     * information.
-     *
-     * @param config a config passed to ElasticSearchIndex's constructor
-     * @return a client object open and ready for use
-     */
-    private ElasticSearchSetup.Connection interfaceConfiguration(Configuration config) {
-        final ElasticSearchSetup clientMode = ConfigOption.getEnumValue(config.get(INTERFACE), ElasticSearchSetup.class);
-
-        try {
-            return clientMode.connect(config);
-        } catch (final IOException e) {
-            throw new JanusGraphException(e);
-        }
-    }
-
-    private BackendException convert(Exception esException) {
-        if (esException instanceof InterruptedException) {
-            return new TemporaryBackendException("Interrupted while waiting for response", esException);
-        } else {
-            return new PermanentBackendException("Unknown exception while executing index operation", esException);
-        }
-    }
-
-    private static String getDualMappingName(String key) {
-        return key + STRING_MAPPING_SUFFIX;
-    }
-
-    private String generateScriptId(String uniqueScriptSuffix){
-        return indexName + SCRIPT_ID_SEPARATOR + uniqueScriptSuffix;
-    }
-
-    private String generateIndexStoreName(String store){
-        return indexName + INDEX_NAME_SEPARATOR + store.toLowerCase();
-    }
-
-    private String getIndexStoreName(String store) {
-
-        if(indexStoreNameCacheEnabled){
-            return indexStoreNamesCache.computeIfAbsent(store, generateIndexStoreNameFunction);
-        }
-
-        return generateIndexStoreName(store);
-    }
-
-    @Override
-    public void register(String store, String key, KeyInformation information,
-                         BaseTransaction tx) throws BackendException {
-        final Class<?> dataType = information.getDataType();
-        final Mapping map = Mapping.getMapping(information);
-        Preconditions.checkArgument(map==Mapping.DEFAULT || AttributeUtils.isString(dataType) ||
-                        (map==Mapping.PREFIX_TREE && AttributeUtils.isGeo(dataType)),
-                "Specified illegal mapping [%s] for data type [%s]",map,dataType);
-        final String indexStoreName = getIndexStoreName(store);
-        if (useExternalMappings) {
-            try {
-                //We check if the externalMapping have the property 'key'
-                final IndexMapping mappings = client.getMapping(indexStoreName, store);
-                if (mappings == null || (!mappings.isDynamic() && !mappings.getProperties().containsKey(key))) {
-                    //Error if it is not dynamic and have not the property 'key'
-                    throw new PermanentBackendException("The external mapping for index '"+ indexStoreName + "' and type '" + store + "' do not have property '" + key + "'");
-                } else if (allowMappingUpdate && mappings.isDynamic()) {
-                    //If it is dynamic, we push the unknown property 'key'
-                    this.pushMapping(store, key, information);
-                }
-            } catch (final IOException e) {
-                throw new PermanentBackendException(e);
-            }
-        } else {
-            try {
-                checkForOrCreateIndex(indexStoreName);
-            } catch (final IOException e) {
-                throw new PermanentBackendException(e);
-            }
-            this.pushMapping(store, key, information);
-        }
-    }
-
-    /**
-     * Push mapping to ElasticSearch
-     * @param store the type in the index
-     * @param key the name of the property in the index
-     * @param information information of the key
-     */
-    private void pushMapping(String store, String key,
-                             KeyInformation information) throws AssertionError, BackendException {
-        final Class<?> dataType = information.getDataType();
-        Mapping map = Mapping.getMapping(information);
-        final Map<String,Object> properties = new HashMap<>();
-        if (AttributeUtils.isString(dataType)) {
-            if (map==Mapping.DEFAULT) map=Mapping.TEXT;
-            log.debug("Registering string type for {} with mapping {}", key, map);
-            final String stringAnalyzer
-                    = ParameterType.STRING_ANALYZER.findParameter(information.getParameters(), null);
-            final String textAnalyzer = ParameterType.TEXT_ANALYZER.findParameter(information.getParameters(), null);
-            // use keyword type for string mappings unless custom string analyzer is provided
-            final Map<String,Object> stringMapping
-                    = stringAnalyzer == null ? compat.createKeywordMapping() : compat.createTextMapping(stringAnalyzer);
-            switch (map) {
-                case STRING:
-                    properties.put(key, stringMapping);
-                    break;
-                case TEXT:
-                    properties.put(key, compat.createTextMapping(textAnalyzer));
-                    break;
-                case TEXTSTRING:
-                    properties.put(key, compat.createTextMapping(textAnalyzer));
-                    properties.put(getDualMappingName(key), stringMapping);
-                    break;
-                default: throw new AssertionError("Unexpected mapping: "+map);
-            }
-        } else if (dataType == Float.class) {
-            log.debug("Registering float type for {}", key);
-            properties.put(key, ImmutableMap.of(ES_TYPE_KEY, "float"));
-        } else if (dataType == Double.class) {
-            log.debug("Registering double type for {}", key);
-            properties.put(key, ImmutableMap.of(ES_TYPE_KEY, "double"));
-        } else if (dataType == Byte.class) {
-            log.debug("Registering byte type for {}", key);
-            properties.put(key, ImmutableMap.of(ES_TYPE_KEY, "byte"));
-        } else if (dataType == Short.class) {
-            log.debug("Registering short type for {}", key);
-            properties.put(key, ImmutableMap.of(ES_TYPE_KEY, "short"));
-        } else if (dataType == Integer.class) {
-            log.debug("Registering integer type for {}", key);
-            properties.put(key, ImmutableMap.of(ES_TYPE_KEY, "integer"));
-        } else if (dataType == Long.class) {
-            log.debug("Registering long type for {}", key);
-            properties.put(key, ImmutableMap.of(ES_TYPE_KEY, "long"));
-        } else if (dataType == Boolean.class) {
-            log.debug("Registering boolean type for {}", key);
-            properties.put(key, ImmutableMap.of(ES_TYPE_KEY, "boolean"));
-        } else if (dataType == Geoshape.class) {
-            switch (map) {
-                case PREFIX_TREE:
-                    final int maxLevels = ParameterType.INDEX_GEO_MAX_LEVELS.findParameter(information.getParameters(),
-                            DEFAULT_GEO_MAX_LEVELS);
-                    final double distErrorPct
-                            = ParameterType.INDEX_GEO_DIST_ERROR_PCT.findParameter(information.getParameters(),
-                            DEFAULT_GEO_DIST_ERROR_PCT);
-                    log.debug("Registering geo_shape type for {} with tree_levels={} and distance_error_pct={}", key,
-                            maxLevels, distErrorPct);
-                    properties.put(key, ImmutableMap.of(ES_TYPE_KEY, "geo_shape",
-                            "tree", "quadtree",
-                            "tree_levels", maxLevels,
-                            "distance_error_pct", distErrorPct));
-                    break;
-                default:
-                    log.debug("Registering geo_point type for {}", key);
-                    properties.put(key, ImmutableMap.of(ES_TYPE_KEY, "geo_point"));
-            }
-        } else if (dataType == Date.class || dataType == Instant.class) {
-            log.debug("Registering date type for {}", key);
-            properties.put(key, ImmutableMap.of(ES_TYPE_KEY, "date"));
-        } else if (dataType == UUID.class) {
-            log.debug("Registering uuid type for {}", key);
-            properties.put(key, compat.createKeywordMapping());
-        }
-
-        if (useAllField) {
-            // add custom all field mapping if it doesn't exist
-            properties.put(ElasticSearchConstants.CUSTOM_ALL_FIELD, compat.createTextMapping(null));
-
-            // add copy_to for custom all field mapping
-            if (properties.containsKey(key) && dataType != Geoshape.class) {
-                final Map<String, Object> mapping = new HashMap<>(((Map<String, Object>) properties.get(key)));
-                mapping.put("copy_to", ElasticSearchConstants.CUSTOM_ALL_FIELD);
-                properties.put(key, mapping);
-            }
-        }
-
-        final List<Parameter> customParameters = ParameterType.getCustomParameters(information.getParameters());
-
-        if (properties.containsKey(key) && !customParameters.isEmpty()) {
-            final Map<String, Object> mapping = new HashMap<>(((Map<String, Object>) properties.get(key)));
-            customParameters.forEach(p -> mapping.put(p.key(), p.value()));
-            properties.put(key, mapping);
-        }
-
-        final Map<String,Object> mapping = ImmutableMap.of("properties", properties);
-
-        try {
-            client.createMapping(getIndexStoreName(store), store, mapping);
-        } catch (final Exception e) {
-            throw convert(e);
-        }
-    }
-
-    private static Mapping getStringMapping(KeyInformation information) {
-        assert AttributeUtils.isString(information.getDataType());
-        Mapping map = Mapping.getMapping(information);
-        if (map==Mapping.DEFAULT) map = Mapping.TEXT;
-        return map;
-    }
-
-    private static boolean hasDualStringMapping(KeyInformation information) {
-        return AttributeUtils.isString(information.getDataType()) && getStringMapping(information)==Mapping.TEXTSTRING;
-    }
-
-    public Map<String, Object> getNewDocument(final List<IndexEntry> additions,
-                                              KeyInformation.StoreRetriever information) throws BackendException {
-        // JSON writes duplicate fields one after another, which forces us
-        // at this stage to make de-duplication on the IndexEntry list. We don't want to pay the
-        // price map storage on the Mutation level because none of other backends need that.
-
-        final Multimap<String, IndexEntry> unique = LinkedListMultimap.create();
-        for (final IndexEntry e : additions) {
-            unique.put(e.field, e);
-        }
-
-        final Map<String, Object> doc = new HashMap<>();
-        for (final Map.Entry<String, Collection<IndexEntry>> add : unique.asMap().entrySet()) {
-            final KeyInformation keyInformation = information.get(add.getKey());
-            final Object value;
-            switch (keyInformation.getCardinality()) {
-                case SINGLE:
-                    value = convertToEsType(Iterators.getLast(add.getValue().iterator()).value,
-                            Mapping.getMapping(keyInformation));
-                    break;
-                case SET:
-                case LIST:
-                    value = add.getValue().stream()
-                            .map(v -> convertToEsType(v.value, Mapping.getMapping(keyInformation)))
-                            .filter(v -> {
-                                Preconditions.checkArgument(!(v instanceof byte[]),
-                                        "Collections not supported for %s", add.getKey());
-                                return true;
-                            }).toArray();
-                    break;
-                default:
-                    value = null;
-                    break;
-            }
-
-            doc.put(add.getKey(), value);
-            if (hasDualStringMapping(information.get(add.getKey())) && keyInformation.getDataType() == String.class) {
-                doc.put(getDualMappingName(add.getKey()), value);
-            }
-
-
-        }
-
-        return doc;
-    }
+        this.client = client;
 
-    private static Object convertToEsType(Object value, Mapping mapping) {
-        if (value instanceof Number) {
-            if (AttributeUtils.isWholeNumber((Number) value)) {
-                return ((Number) value).longValue();
-            } else { //double or float
-                return ((Number) value).doubleValue();
-            }
-        } else if (AttributeUtils.isString(value)) {
-            return value;
-        } else if (value instanceof Geoshape) {
-            return convertGeoshape((Geoshape) value, mapping);
-        } else if (value instanceof Date) {
-            return value;
-        } else if (value instanceof  Instant) {
-            return Date.from((Instant) value);
-        } else if (value instanceof Boolean) {
-            return value;
-        } else if (value instanceof UUID) {
-            return value.toString();
-        } else throw new IllegalArgumentException("Unsupported type: " + value.getClass() + " (value: " + value + ")");
+        INSTANCE = this;
     }
 
-    @SuppressWarnings("unchecked")
-    private static Object convertGeoshape(Geoshape geoshape, Mapping mapping) {
-        if (geoshape.getType() == Geoshape.Type.POINT && Mapping.PREFIX_TREE != mapping) {
-            final Geoshape.Point p = geoshape.getPoint();
-            return new double[]{p.getLongitude(), p.getLatitude()};
-        } else if (geoshape.getType() == Geoshape.Type.BOX) {
-            final Rectangle box = geoshape.getShape().getBoundingBox();
-            final Map<String,Object> map = new HashMap<>();
-            map.put("type", "envelope");
-            map.put("coordinates", new double[][] {{box.getMinX(),box.getMaxY()},{box.getMaxX(),box.getMinY()}});
-            return map;
-        } else if (geoshape.getType() == Geoshape.Type.CIRCLE) {
-            try {
-                final Map<String,Object> map = geoshape.toMap();
-                map.put("radius", map.get("radius") + ((Map<String, String>) map.remove("properties")).get("radius_units"));
-                return map;
-            } catch (final IOException e) {
-                throw new IllegalArgumentException("Invalid geoshape: " + geoshape, e);
-            }
-        } else {
-            try {
-                return geoshape.toMap();
-            } catch (final IOException e) {
-                throw new IllegalArgumentException("Invalid geoshape: " + geoshape, e);
-            }
-        }
-    }
-
-    @Override
-    public void mutate(Map<String, Map<String, IndexMutation>> mutations, KeyInformation.IndexRetriever information,
-                       BaseTransaction tx) throws BackendException {
-        final List<ElasticSearchMutation> requests = new ArrayList<>();
-        try {
-            for (final Map.Entry<String, Map<String, IndexMutation>> stores : mutations.entrySet()) {
-                final List<ElasticSearchMutation> requestByStore = new ArrayList<>();
-                final String storeName = stores.getKey();
-                final String indexStoreName = getIndexStoreName(storeName);
-                for (final Map.Entry<String, IndexMutation> entry : stores.getValue().entrySet()) {
-                    final String documentId = entry.getKey();
-                    final IndexMutation mutation = entry.getValue();
-                    assert mutation.isConsolidated();
-                    Preconditions.checkArgument(!(mutation.isNew() && mutation.isDeleted()));
-                    Preconditions.checkArgument(!mutation.isNew() || !mutation.hasDeletions());
-                    Preconditions.checkArgument(!mutation.isDeleted() || !mutation.hasAdditions());
-                    //Deletions first
-                    if (mutation.hasDeletions()) {
-                        if (mutation.isDeleted()) {
-                            log.trace("Deleting entire document {}", documentId);
-                            requestByStore.add(ElasticSearchMutation.createDeleteRequest(indexStoreName, storeName,
-                                    documentId));
-                        } else {
-                            List<Map<String, Object>> params = getParameters(information.get(storeName),
-                                    mutation.getDeletions(), true);
-                            Map doc = compat.prepareStoredScript(parameterizedDeletionScriptId, params).build();
-                            log.trace("Deletion script {} with params {}", PARAMETERIZED_DELETION_SCRIPT, params);
-                            requestByStore.add(ElasticSearchMutation.createUpdateRequest(indexStoreName, storeName,
-                                    documentId, doc));
-                        }
-                    }
-                    if (mutation.hasAdditions()) {
-                        if (mutation.isNew()) { //Index
-                            log.trace("Adding entire document {}", documentId);
-                            final Map<String, Object> source = getNewDocument(mutation.getAdditions(),
-                                    information.get(storeName));
-                            requestByStore.add(ElasticSearchMutation.createIndexRequest(indexStoreName, storeName,
-                                    documentId, source));
-                        } else {
-                            final Map upsert;
-                            if (!mutation.hasDeletions()) {
-                                upsert = getNewDocument(mutation.getAdditions(), information.get(storeName));
-                            } else {
-                                upsert = null;
-                            }
-
-                            List<Map<String, Object>> params = getParameters(information.get(storeName),
-                                    mutation.getAdditions(), false, Cardinality.SINGLE);
-                            if (!params.isEmpty()) {
-                                ImmutableMap.Builder builder = compat.prepareStoredScript(parameterizedAdditionScriptId, params);
-                                requestByStore.add(ElasticSearchMutation.createUpdateRequest(indexStoreName, storeName,
-                                        documentId, builder, upsert));
-                                log.trace("Adding script {} with params {}", PARAMETERIZED_ADDITION_SCRIPT, params);
-                            }
-
-                            final Map<String, Object> doc = getAdditionDoc(information, storeName, mutation);
-                            if (!doc.isEmpty()) {
-                                final ImmutableMap.Builder builder = ImmutableMap.builder().put(ES_DOC_KEY, doc);
-                                requestByStore.add(ElasticSearchMutation.createUpdateRequest(indexStoreName, storeName,
-                                        documentId, builder, upsert));
-                                log.trace("Adding update {}", doc);
-                            }
-                        }
-                    }
-                }
-                if (!requestByStore.isEmpty() && ingestPipelines.containsKey(storeName)) {
-                    client.bulkRequest(requestByStore, String.valueOf(ingestPipelines.get(storeName)));
-                } else if (!requestByStore.isEmpty()) {
-                    requests.addAll(requestByStore);
-                }
-            }
-            if (!requests.isEmpty()) {
-                client.bulkRequest(requests, null);
-            }
-        } catch (final Exception e) {
-            log.error("Failed to execute bulk Elasticsearch mutation", e);
-            throw convert(e);
-        }
-    }
-
-    private List<Map<String, Object>> getParameters(KeyInformation.StoreRetriever storeRetriever,
-                                                    List<IndexEntry> entries,
-                                                    boolean deletion,
-                                                    Cardinality... cardinalitiesToSkip) {
-        Set<Cardinality> cardinalityToSkipSet = Sets.newHashSet(cardinalitiesToSkip);
-        List<Map<String, Object>> result = new ArrayList<>();
-        for (IndexEntry entry : entries) {
-            KeyInformation info = storeRetriever.get(entry.field);
-            if (cardinalityToSkipSet.contains(info.getCardinality())) {
-                continue;
-            }
-            Object jsValue = deletion && info.getCardinality() == Cardinality.SINGLE ?
-                    "" : convertToEsType(entry.value, Mapping.getMapping(info));
-            result.add(ImmutableMap.of("name", entry.field,
-                    "value", jsValue,
-                    "cardinality", info.getCardinality().name()));
-            if (hasDualStringMapping(info)) {
-                result.add(ImmutableMap.of("name", getDualMappingName(entry.field),
-                        "value", jsValue,
-                        "cardinality", info.getCardinality().name()));
-            }
-        }
-        return result;
-    }
-
-    private Map<String,Object> getAdditionDoc(KeyInformation.IndexRetriever information,
-                                              String store, IndexMutation mutation) throws PermanentBackendException {
-        final Map<String,Object> doc = new HashMap<>();
-        for (final IndexEntry e : mutation.getAdditions()) {
-            final KeyInformation keyInformation = information.get(store).get(e.field);
-            if (keyInformation.getCardinality() == Cardinality.SINGLE) {
-                doc.put(e.field, convertToEsType(e.value, Mapping.getMapping(keyInformation)));
-                if (hasDualStringMapping(keyInformation)) {
-                    doc.put(getDualMappingName(e.field), convertToEsType(e.value, Mapping.getMapping(keyInformation)));
-                }
-            }
-        }
-
-        return doc;
-    }
-
-    @Override
-    public void restore(Map<String,Map<String, List<IndexEntry>>> documents, KeyInformation.IndexRetriever information,
-                        BaseTransaction tx) throws BackendException {
-        final List<ElasticSearchMutation> requests = new ArrayList<>();
-        try {
-            for (final Map.Entry<String, Map<String, List<IndexEntry>>> stores : documents.entrySet()) {
-                final List<ElasticSearchMutation> requestByStore = new ArrayList<>();
-                final String store = stores.getKey();
-                final String indexStoreName = getIndexStoreName(store);
-                for (final Map.Entry<String, List<IndexEntry>> entry : stores.getValue().entrySet()) {
-                    final String docID = entry.getKey();
-                    final List<IndexEntry> content = entry.getValue();
-                    if (content == null || content.size() == 0) {
-                        // delete
-                        if (log.isTraceEnabled())
-                            log.trace("Deleting entire document {}", docID);
-
-                        requestByStore.add(ElasticSearchMutation.createDeleteRequest(indexStoreName, store, docID));
-                    } else {
-                        // Add
-                        if (log.isTraceEnabled())
-                            log.trace("Adding entire document {}", docID);
-                        final Map<String, Object> source = getNewDocument(content, information.get(store));
-                        requestByStore.add(ElasticSearchMutation.createIndexRequest(indexStoreName, store, docID,
-                                source));
-                    }
-                }
-                if (!requestByStore.isEmpty() && ingestPipelines.containsKey(store)) {
-                    client.bulkRequest(requestByStore, String.valueOf(ingestPipelines.get(store)));
-                } else if (!requestByStore.isEmpty()) {
-                    requests.addAll(requestByStore);
-                }
-            }
-            if (!requests.isEmpty())
-                client.bulkRequest(requests, null);
-        } catch (final Exception e) {
-            throw convert(e);
-        }
-    }
-
-    private Map<String, Object> getRelationFromCmp(final Cmp cmp, String key, final Object value) {
-        switch (cmp) {
-            case EQUAL:
-                return compat.term(key, value);
-            case NOT_EQUAL:
-                return compat.boolMustNot(compat.term(key, value));
-            case LESS_THAN:
-                return compat.lt(key, value);
-            case LESS_THAN_EQUAL:
-                return compat.lte(key, value);
-            case GREATER_THAN:
-                return compat.gt(key, value);
-            case GREATER_THAN_EQUAL:
-                return compat.gte(key, value);
-            default:
-                throw new IllegalArgumentException("Unexpected relation: " + cmp);
-        }
-    }
-
-    public Map<String,Object> getFilter(Condition<?> condition, KeyInformation.StoreRetriever information) {
-        if (condition instanceof PredicateCondition) {
-            final PredicateCondition<String, ?> atom = (PredicateCondition) condition;
-            Object value = atom.getValue();
-            final String key = atom.getKey();
-            final JanusGraphPredicate predicate = atom.getPredicate();
-            if (value == null && predicate == Cmp.NOT_EQUAL) {
-                return compat.exists(key);
-            } else if (value instanceof Number) {
-                Preconditions.checkArgument(predicate instanceof Cmp,
-                        "Relation not supported on numeric types: %s", predicate);
-                return getRelationFromCmp((Cmp) predicate, key, value);
-            } else if (value instanceof String) {
-
-                final Mapping mapping = getStringMapping(information.get(key));
-                final String fieldName;
-                if (mapping==Mapping.TEXT && !(Text.HAS_CONTAINS.contains(predicate) || predicate instanceof Cmp))
-                    throw new IllegalArgumentException("Text mapped string values only support CONTAINS and Compare queries and not: " + predicate);
-                if (mapping==Mapping.STRING && Text.HAS_CONTAINS.contains(predicate))
-                    throw new IllegalArgumentException("String mapped string values do not support CONTAINS queries: " + predicate);
-                if (mapping==Mapping.TEXTSTRING && !(Text.HAS_CONTAINS.contains(predicate) || (predicate instanceof Cmp && predicate != Cmp.EQUAL))) {
-                    fieldName = getDualMappingName(key);
-                } else {
-                    fieldName = key;
-                }
-
-                if (predicate == Text.CONTAINS || predicate == Cmp.EQUAL) {
-                    return compat.match(fieldName, value);
-                } else if (predicate == Text.NOT_CONTAINS) {
-                    return compat.boolMust(ImmutableList.of(compat.exists(fieldName),
-                            compat.boolMustNot(compat.match(fieldName, value))));
-                } else if (predicate == Text.CONTAINS_PHRASE) {
-                    return compat.matchPhrase(fieldName, value);
-                } else if (predicate == Text.NOT_CONTAINS_PHRASE) {
-                    return compat.boolMust(ImmutableList.of(compat.exists(fieldName),
-                            compat.boolMustNot(compat.matchPhrase(fieldName, value))));
-                } else if (predicate == Text.CONTAINS_PREFIX) {
-                    if (!ParameterType.TEXT_ANALYZER.hasParameter(information.get(key).getParameters()))
-                        value = ((String) value).toLowerCase();
-                    return compat.prefix(fieldName, value);
-                } else if (predicate == Text.NOT_CONTAINS_PREFIX) {
-                    if (!ParameterType.TEXT_ANALYZER.hasParameter(information.get(key).getParameters()))
-                        value = ((String) value).toLowerCase();
-                    return compat.boolMust(ImmutableList.of(compat.exists(fieldName),
-                            compat.boolMustNot(compat.prefix(fieldName, value))));
-                } else if (predicate == Text.CONTAINS_REGEX) {
-                    if (!ParameterType.TEXT_ANALYZER.hasParameter(information.get(key).getParameters()))
-                        value = ((String) value).toLowerCase();
-                    return compat.regexp(fieldName, value);
-                } else if (predicate == Text.NOT_CONTAINS_REGEX) {
-                    if (!ParameterType.TEXT_ANALYZER.hasParameter(information.get(key).getParameters()))
-                        value = ((String) value).toLowerCase();
-                    return compat.boolMust(ImmutableList.of(compat.exists(fieldName),
-                            compat.boolMustNot(compat.regexp(fieldName, value))));
-                } else if (predicate == Text.PREFIX) {
-                    return compat.prefix(fieldName, value);
-                } else if (predicate == Text.NOT_PREFIX) {
-                    return compat.boolMust(ImmutableList.of(compat.exists(fieldName),
-                            compat.boolMustNot(compat.prefix(fieldName, value))));
-                } else if (predicate == Text.REGEX) {
-                    return compat.regexp(fieldName, value);
-                } else if (predicate == Text.NOT_REGEX) {
-                    return compat.boolMust(ImmutableList.of(compat.exists(fieldName),
-                            compat.boolMustNot(compat.regexp(fieldName, value))));
-                } else if (predicate == Cmp.NOT_EQUAL) {
-                    return compat.boolMustNot(compat.match(fieldName, value));
-                } else if (predicate == Text.FUZZY || predicate == Text.CONTAINS_FUZZY) {
-                    return compat.fuzzyMatch(fieldName, value);
-                } else if (predicate == Text.NOT_FUZZY || predicate == Text.NOT_CONTAINS_FUZZY) {
-                    return compat.boolMust(ImmutableList.of(compat.exists(fieldName),
-                            compat.boolMustNot(compat.fuzzyMatch(fieldName, value))));
-                } else if (predicate == Cmp.LESS_THAN) {
-                    return compat.lt(fieldName, value);
-                } else if (predicate == Cmp.LESS_THAN_EQUAL) {
-                    return compat.lte(fieldName, value);
-                } else if (predicate == Cmp.GREATER_THAN) {
-                    return compat.gt(fieldName, value);
-                } else if (predicate == Cmp.GREATER_THAN_EQUAL) {
-                    return compat.gte(fieldName, value);
-                } else
-                    throw new IllegalArgumentException("Predicate is not supported for string value: " + predicate);
-            } else if (value instanceof Geoshape && Mapping.getMapping(information.get(key)) == Mapping.DEFAULT) {
-                // geopoint
-                final Geoshape shape = (Geoshape) value;
-                Preconditions.checkArgument(predicate instanceof Geo && predicate != Geo.CONTAINS,
-                        "Relation not supported on geopoint types: %s", predicate);
-
-                final Map<String,Object> query;
-                switch (shape.getType()) {
-                    case CIRCLE:
-                        final Geoshape.Point center = shape.getPoint();
-                        query = compat.geoDistance(key, center.getLatitude(), center.getLongitude(), shape.getRadius());
-                        break;
-                    case BOX:
-                        final Geoshape.Point southwest = shape.getPoint(0);
-                        final Geoshape.Point northeast = shape.getPoint(1);
-                        query = compat.geoBoundingBox(key, southwest.getLatitude(), southwest.getLongitude(),
-                                northeast.getLatitude(), northeast.getLongitude());
-                        break;
-                    case POLYGON:
-                        final List<List<Double>> points = IntStream.range(0, shape.size())
-                                .mapToObj(i -> ImmutableList.of(shape.getPoint(i).getLongitude(),
-                                        shape.getPoint(i).getLatitude()))
-                                .collect(Collectors.toList());
-                        query = compat.geoPolygon(key, points);
-                        break;
-                    default:
-                        throw new IllegalArgumentException("Unsupported or invalid search shape type for geopoint: "
-                                + shape.getType());
-                }
-
-                return predicate == Geo.DISJOINT ?  compat.boolMustNot(query) : query;
-            } else if (value instanceof Geoshape) {
-                Preconditions.checkArgument(predicate instanceof Geo,
-                        "Relation not supported on geoshape types: %s", predicate);
-                final Geoshape shape = (Geoshape) value;
-                final Map<String,Object> geo;
-                switch (shape.getType()) {
-                    case CIRCLE:
-                        final Geoshape.Point center = shape.getPoint();
-                        geo = ImmutableMap.of(ES_TYPE_KEY, "circle",
-                                ES_GEO_COORDS_KEY, ImmutableList.of(center.getLongitude(), center.getLatitude()),
-                                "radius", shape.getRadius() + "km");
-                        break;
-                    case BOX:
-                        final Geoshape.Point southwest = shape.getPoint(0);
-                        final Geoshape.Point northeast = shape.getPoint(1);
-                        geo = ImmutableMap.of(ES_TYPE_KEY, "envelope",
-                                ES_GEO_COORDS_KEY,
-                                ImmutableList.of(
-                                        ImmutableList.of(southwest.getLongitude(), northeast.getLatitude()),
-                                        ImmutableList.of(northeast.getLongitude(), southwest.getLatitude())));
-                        break;
-                    case LINE:
-                        final List lineCoords = IntStream.range(0, shape.size())
-                                .mapToObj(i -> ImmutableList.of(shape.getPoint(i).getLongitude(),
-                                        shape.getPoint(i).getLatitude()))
-                                .collect(Collectors.toList());
-                        geo = ImmutableMap.of(ES_TYPE_KEY, "linestring", ES_GEO_COORDS_KEY, lineCoords);
-                        break;
-                    case POLYGON:
-                        final List polyCoords = IntStream.range(0, shape.size())
-                                .mapToObj(i -> ImmutableList.of(shape.getPoint(i).getLongitude(),
-                                        shape.getPoint(i).getLatitude()))
-                                .collect(Collectors.toList());
-                        geo = ImmutableMap.of(ES_TYPE_KEY, "polygon", ES_GEO_COORDS_KEY,
-                                ImmutableList.of(polyCoords));
-                        break;
-                    case POINT:
-                        geo = ImmutableMap.of(ES_TYPE_KEY, "point",
-                                ES_GEO_COORDS_KEY, ImmutableList.of(shape.getPoint().getLongitude(),
-                                        shape.getPoint().getLatitude()));
-                        break;
-                    default:
-                        throw new IllegalArgumentException("Unsupported or invalid search shape type: "
-                                + shape.getType());
-                }
-
-                return compat.geoShape(key, geo, (Geo) predicate);
-            } else if (value instanceof Date || value instanceof Instant) {
-                Preconditions.checkArgument(predicate instanceof Cmp,
-                        "Relation not supported on date types: %s", predicate);
-
-                if (value instanceof Instant) {
-                    value = Date.from((Instant) value);
-                }
-                return getRelationFromCmp((Cmp) predicate, key, value);
-            } else if (value instanceof Boolean) {
-                final Cmp numRel = (Cmp) predicate;
-                switch (numRel) {
-                    case EQUAL:
-                        return compat.term(key, value);
-                    case NOT_EQUAL:
-                        return compat.boolMustNot(compat.term(key, value));
-                    default:
-                        throw new IllegalArgumentException("Boolean types only support EQUAL or NOT_EQUAL");
-                }
-            } else if (value instanceof UUID) {
-                if (predicate == Cmp.EQUAL) {
-                    return compat.term(key, value);
-                } else if (predicate == Cmp.NOT_EQUAL) {
-                    return compat.boolMustNot(compat.term(key, value));
-                } else {
-                    throw new IllegalArgumentException("Only equal or not equal is supported for UUIDs: "
-                            + predicate);
-                }
-            } else throw new IllegalArgumentException("Unsupported type: " + value);
-        } else if (condition instanceof Not) {
-            return compat.boolMustNot(getFilter(((Not) condition).getChild(),information));
-        } else if (condition instanceof And) {
-            final List queries = StreamSupport.stream(condition.getChildren().spliterator(), false)
-                    .map(c -> getFilter(c,information)).collect(Collectors.toList());
-            return compat.boolMust(queries);
-        } else if (condition instanceof Or) {
-            final List queries = StreamSupport.stream(condition.getChildren().spliterator(), false)
-                    .map(c -> getFilter(c,information)).collect(Collectors.toList());
-            return compat.boolShould(queries);
-        } else throw new IllegalArgumentException("Invalid condition: " + condition);
-    }
-
-    @Override
-    public Stream<String> query(IndexQuery query, KeyInformation.IndexRetriever informations,
-                                BaseTransaction tx) throws BackendException {
-        final ElasticSearchRequest sr = new ElasticSearchRequest();
-        final Map<String,Object> esQuery = getFilter(query.getCondition(), informations.get(query.getStore()));
-        sr.setQuery(compat.prepareQuery(esQuery));
-        if (!query.getOrder().isEmpty()) {
-            addOrderToQuery(informations, sr, query.getOrder(), query.getStore());
-        }
-        sr.setFrom(0);
-        if (query.hasLimit()) {
-            sr.setSize(Math.min(query.getLimit(), batchSize));
-        } else {
-            sr.setSize(batchSize);
-        }
-
-        sr.setDisableSourceRetrieval(true);
-
-        ElasticSearchResponse response;
-        try {
-            final String indexStoreName = getIndexStoreName(query.getStore());
-            final boolean useScroll = sr.getSize() >= batchSize;
-            response = client.search(indexStoreName,
-                    compat.createRequestBody(sr, useScroll? NULL_PARAMETERS : TRACK_TOTAL_HITS_DISABLED_PARAMETERS),
-                    useScroll);
-            log.debug("First Executed query [{}] in {} ms", query.getCondition(), response.getTook());
-            final Iterator<RawQuery.Result<String>> resultIterator = getResultsIterator(useScroll, response, sr.getSize());
-            final Stream<RawQuery.Result<String>> toReturn
-                    = StreamSupport.stream(Spliterators.spliteratorUnknownSize(resultIterator, Spliterator.ORDERED), false);
-            return (query.hasLimit() ? toReturn.limit(query.getLimit()) : toReturn).map(RawQuery.Result::getResult);
-        } catch (final IOException | UncheckedIOException e) {
-            throw new PermanentBackendException(e);
-        }
-    }
-
-    private Iterator<RawQuery.Result<String>> getResultsIterator(boolean useScroll, ElasticSearchResponse response, int windowSize){
-        return (useScroll)? new ElasticSearchScroll(client, response, windowSize) : response.getResults().iterator();
-    }
-
-    private String convertToEsDataType(Class<?> dataType, Mapping mapping) {
-        if(String.class.isAssignableFrom(dataType)) {
-            return "string";
-        }
-        else if (Integer.class.isAssignableFrom(dataType)) {
-            return "integer";
-        }
-        else if (Long.class.isAssignableFrom(dataType)) {
-            return "long";
-        }
-        else if (Float.class.isAssignableFrom(dataType)) {
-            return "float";
-        }
-        else if (Double.class.isAssignableFrom(dataType)) {
-            return "double";
-        }
-        else if (Boolean.class.isAssignableFrom(dataType)) {
-            return "boolean";
-        }
-        else if (Date.class.isAssignableFrom(dataType)) {
-            return "date";
-        }
-        else if (Instant.class.isAssignableFrom(dataType)) {
-            return "date";
-        }
-        else if (Geoshape.class.isAssignableFrom(dataType)) {
-            return mapping == Mapping.DEFAULT ? "geo_point" : "geo_shape";
-        }
-
-        return null;
-    }
-
-    private ElasticSearchResponse runCommonQuery(RawQuery query, KeyInformation.IndexRetriever informations, BaseTransaction tx, int size,
-                                                 boolean useScroll) throws BackendException{
-        final ElasticSearchRequest sr = new ElasticSearchRequest();
-        sr.setQuery(compat.queryString(query.getQuery()));
-        if (!query.getOrders().isEmpty()) {
-            addOrderToQuery(informations, sr, query.getOrders(), query.getStore());
-        }
-        sr.setFrom(0);
-        sr.setSize(size);
-        sr.setDisableSourceRetrieval(true);
-        try {
-            Map<String, Object> requestBody = compat.createRequestBody(sr, query.getParameters());
-            if(!useScroll) {
-                if (requestBody == null) {
-                    requestBody = TRACK_TOTAL_HITS_DISABLED_REQUEST_BODY;
-                } else {
-                    requestBody.put(TRACK_TOTAL_HITS_PARAMETER, false);
-                }
-            }
-            return client.search(
-                    getIndexStoreName(query.getStore()),
-                    requestBody,
-                    useScroll);
-        } catch (final IOException | UncheckedIOException e) {
-            throw new PermanentBackendException(e);
-        }
-    }
-
-    private long runCountQuery(RawQuery query) throws BackendException{
-        try {
-            return client.countTotal(
-                    getIndexStoreName(query.getStore()),
-                    compat.createRequestBody(compat.queryString(query.getQuery()), query.getParameters()));
-        } catch (final IOException | UncheckedIOException e) {
-            throw new PermanentBackendException(e);
-        }
-    }
-
-    private void addOrderToQuery(KeyInformation.IndexRetriever informations, ElasticSearchRequest sr, final List<IndexQuery.OrderEntry> orders,
-                                 String store) {
-        for (final IndexQuery.OrderEntry orderEntry : orders) {
-            final String order = orderEntry.getOrder().name();
-            final KeyInformation information = informations.get(store).get(orderEntry.getKey());
-            final Mapping mapping = Mapping.getMapping(information);
-            final Class<?> datatype = orderEntry.getDatatype();
-            final String key = hasDualStringMapping(information) ? getDualMappingName(orderEntry.getKey()) : orderEntry.getKey();
-            sr.addSort(key, order.toLowerCase(), convertToEsDataType(datatype, mapping));
-        }
-    }
-
-    @Override
-    public Stream<RawQuery.Result<String>> query(RawQuery query, KeyInformation.IndexRetriever information,
-                                                 BaseTransaction tx) throws BackendException {
-        final int size = query.hasLimit() ? Math.min(query.getLimit() + query.getOffset(), batchSize) : batchSize;
-        final boolean useScroll = size >= batchSize;
-        final ElasticSearchResponse response = runCommonQuery(query, information, tx, size, useScroll);
-        log.debug("First Executed query [{}] in {} ms", query.getQuery(), response.getTook());
-        final Iterator<RawQuery.Result<String>> resultIterator = getResultsIterator(useScroll, response, size);
-        final Stream<RawQuery.Result<String>> toReturn
-                = StreamSupport.stream(Spliterators.spliteratorUnknownSize(resultIterator, Spliterator.ORDERED),
-                false).skip(query.getOffset());
-        return query.hasLimit() ? toReturn.limit(query.getLimit()) : toReturn;
-    }
-
-    @Override
-    public Long queryCount(IndexQuery query, KeyInformation.IndexRetriever information, BaseTransaction tx) throws BackendException {
-        final ElasticSearchRequest sr = new ElasticSearchRequest();
-        final Map<String,Object> esQuery = getFilter(query.getCondition(), information.get(query.getStore()));
-        sr.setQuery(compat.prepareQuery(esQuery));
-        try {
-            return client.countTotal(
-                    getIndexStoreName(query.getStore()),
-                    compat.createRequestBody(sr, null));
-        } catch (final IOException | UncheckedIOException e) {
-            throw new PermanentBackendException(e);
-        }
-    }
-
-    @Override
-    public Long totals(RawQuery query, KeyInformation.IndexRetriever information,
-                       BaseTransaction tx) throws BackendException {
-        long startTime = System.currentTimeMillis();
-        long count = runCountQuery(query);
-        if(log.isDebugEnabled()){
-            log.debug("Executed count query [{}] in {} ms", query.getQuery(), System.currentTimeMillis() - startTime);
-        }
-        return count;
-    }
-
-    @Override
-    public boolean supports(KeyInformation information, JanusGraphPredicate janusgraphPredicate) {
-        final Class<?> dataType = information.getDataType();
-        final Mapping mapping = Mapping.getMapping(information);
-        if (mapping!=Mapping.DEFAULT && !AttributeUtils.isString(dataType) &&
-                !(mapping==Mapping.PREFIX_TREE && AttributeUtils.isGeo(dataType))) return false;
-
-        if (Number.class.isAssignableFrom(dataType)) {
-            return janusgraphPredicate instanceof Cmp;
-        } else if (dataType == Geoshape.class) {
-            switch(mapping) {
-                case DEFAULT:
-                    return janusgraphPredicate instanceof Geo && janusgraphPredicate != Geo.CONTAINS;
-                case PREFIX_TREE:
-                    return janusgraphPredicate instanceof Geo;
-            }
-        } else if (AttributeUtils.isString(dataType)) {
-            switch(mapping) {
-                case DEFAULT:
-                case TEXT:
-                    return janusgraphPredicate == Text.CONTAINS || janusgraphPredicate == Text.NOT_CONTAINS
-                            || janusgraphPredicate == Text.CONTAINS_FUZZY || janusgraphPredicate == Text.NOT_CONTAINS_FUZZY
-                            || janusgraphPredicate == Text.CONTAINS_PREFIX || janusgraphPredicate == Text.NOT_CONTAINS_PREFIX
-                            || janusgraphPredicate == Text.CONTAINS_REGEX || janusgraphPredicate == Text.NOT_CONTAINS_REGEX
-                            || janusgraphPredicate == Text.CONTAINS_PHRASE || janusgraphPredicate == Text.NOT_CONTAINS_PHRASE;
-                case STRING:
-                    return janusgraphPredicate instanceof Cmp
-                            || janusgraphPredicate==Text.REGEX || janusgraphPredicate==Text.NOT_REGEX
-                            || janusgraphPredicate==Text.PREFIX || janusgraphPredicate==Text.NOT_PREFIX
-                            || janusgraphPredicate == Text.FUZZY || janusgraphPredicate == Text.NOT_FUZZY;
-                case TEXTSTRING:
-                    return janusgraphPredicate instanceof Text || janusgraphPredicate instanceof Cmp;
-            }
-        } else if (dataType == Date.class || dataType == Instant.class) {
-            return janusgraphPredicate instanceof Cmp;
-        } else if (dataType == Boolean.class) {
-            return janusgraphPredicate == Cmp.EQUAL || janusgraphPredicate == Cmp.NOT_EQUAL;
-        } else if (dataType == UUID.class) {
-            return janusgraphPredicate == Cmp.EQUAL || janusgraphPredicate==Cmp.NOT_EQUAL;
-        }
-        return false;
-    }
-
-
-    @Override
-    public boolean supports(KeyInformation information) {
-        final Class<?> dataType = information.getDataType();
-        final Mapping mapping = Mapping.getMapping(information);
-        if (Number.class.isAssignableFrom(dataType) || dataType == Date.class || dataType== Instant.class
-                || dataType == Boolean.class || dataType == UUID.class) {
-            return mapping == Mapping.DEFAULT;
-        } else if (AttributeUtils.isString(dataType)) {
-            return mapping == Mapping.DEFAULT || mapping == Mapping.STRING
-                    || mapping == Mapping.TEXT || mapping == Mapping.TEXTSTRING;
-        } else if (AttributeUtils.isGeo(dataType)) {
-            return mapping == Mapping.DEFAULT || mapping == Mapping.PREFIX_TREE;
-        }
-        return false;
-    }
-
-    @Override
-    public String mapKey2Field(String key, KeyInformation information) {
-        IndexProvider.checkKeyValidity(key);
-        return key.replace(' ', IndexProvider.REPLACEMENT_CHAR);
-    }
-
-    @Override
-    public IndexFeatures getFeatures() {
-        return compat.getIndexFeatures();
-    }
-
-    @Override
-    public BaseTransactionConfigurable beginTransaction(BaseTransactionConfig config) throws BackendException {
-        return new DefaultTransaction(config);
-    }
-
-    @Override
-    public void close() throws BackendException {
-        try {
-            client.close();
-        } catch (final IOException e) {
-            throw new PermanentBackendException(e);
-        }
-
-    }
-
-    @Override
-    public void clearStorage() throws BackendException {
-        try {
-            client.deleteIndex(indexName);
-        } catch (final Exception e) {
-            throw new PermanentBackendException("Could not delete index " + indexName, e);
-        } finally {
-            close();
-        }
-    }
-
-    @Override
-    public boolean exists() throws BackendException {
-        try {
-            return client.indexExists(indexName);
-        } catch (final IOException e) {
-            throw new PermanentBackendException("Could not check if index " + indexName + " exists", e);
-        }
-    }
-
-    ElasticMajorVersion getVersion() {
-        return client.getMajorVersion();
-    }
-
-    boolean isUseMappingForES7(){
-        return useMappingForES7;
-    }
+    public static ElasticSearchClient getElasticSearchClient() {
+        ElasticSearch7Index index = INSTANCE;
 
-    private static String parameterizedScriptPrepare(String ... lines){
-        return Arrays.stream(lines).map(String::trim).collect(Collectors.joining(""));
+        return index != null ? index.client : null;
     }
 }
\ No newline at end of file
diff --git a/graphdb/janus/src/main/java/org/janusgraph/diskstorage/solr/Solr6Index.java b/graphdb/janus/src/main/java/org/janusgraph/diskstorage/solr/Solr6Index.java
index 23c11de30..30a4c3c4c 100644
--- a/graphdb/janus/src/main/java/org/janusgraph/diskstorage/solr/Solr6Index.java
+++ b/graphdb/janus/src/main/java/org/janusgraph/diskstorage/solr/Solr6Index.java
@@ -16,1276 +16,177 @@
  * limitations under the License.
  */
 package org.janusgraph.diskstorage.solr;
-
-import static org.janusgraph.diskstorage.solr.SolrIndex.*;
-import static org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration.INDEX_MAX_RESULT_SET_SIZE;
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.UncheckedIOException;
-import java.lang.reflect.Constructor;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.time.Instant;
-import java.util.AbstractMap.SimpleEntry;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Spliterator;
-import java.util.Spliterators;
-import java.util.TimeZone;
-import java.util.UUID;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpEntityEnclosingRequest;
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpRequestInterceptor;
 import org.apache.http.client.HttpClient;
-import org.apache.http.entity.BufferedHttpEntity;
-import org.apache.http.impl.auth.KerberosScheme;
-import org.apache.http.protocol.HttpContext;
-import org.apache.lucene.analysis.CachingTokenFilter;
-import org.apache.lucene.analysis.Tokenizer;
-import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
 import org.apache.solr.client.solrj.SolrClient;
-import org.apache.solr.client.solrj.SolrQuery;
-import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.impl.HttpClientUtil;
 import org.apache.solr.client.solrj.impl.HttpSolrClient;
-import org.apache.solr.client.solrj.impl.Krb5HttpClientBuilder;
 import org.apache.solr.client.solrj.impl.LBHttpSolrClient;
-import org.apache.solr.client.solrj.impl.PreemptiveAuth;
-import org.apache.solr.client.solrj.impl.SolrHttpClientBuilder;
-import org.apache.solr.client.solrj.request.CollectionAdminRequest;
-import org.apache.solr.client.solrj.request.UpdateRequest;
-import org.apache.solr.client.solrj.response.CollectionAdminResponse;
-import org.apache.solr.client.solrj.response.QueryResponse;
-import org.apache.solr.client.solrj.util.ClientUtils;
-import org.apache.solr.common.SolrDocument;
-import org.apache.solr.common.SolrInputDocument;
-import org.apache.solr.common.cloud.ClusterState;
-import org.apache.solr.common.cloud.DocCollection;
-import org.apache.solr.common.cloud.Replica;
-import org.apache.solr.common.cloud.Slice;
-import org.apache.solr.common.cloud.ZkStateReader;
-import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.params.ModifiableSolrParams;
-import org.apache.zookeeper.KeeperException;
-import org.janusgraph.core.Cardinality;
-import org.janusgraph.core.JanusGraphElement;
-import org.janusgraph.core.attribute.Cmp;
-import org.janusgraph.core.attribute.Geo;
-import org.janusgraph.core.attribute.Geoshape;
-import org.janusgraph.core.attribute.Text;
-import org.janusgraph.core.schema.Mapping;
-import org.janusgraph.core.schema.Parameter;
 import org.janusgraph.diskstorage.BackendException;
-import org.janusgraph.diskstorage.BaseTransaction;
-import org.janusgraph.diskstorage.BaseTransactionConfig;
-import org.janusgraph.diskstorage.BaseTransactionConfigurable;
-import org.janusgraph.diskstorage.PermanentBackendException;
-import org.janusgraph.diskstorage.TemporaryBackendException;
 import org.janusgraph.diskstorage.configuration.ConfigOption;
 import org.janusgraph.diskstorage.configuration.Configuration;
-import org.janusgraph.diskstorage.indexing.IndexEntry;
-import org.janusgraph.diskstorage.indexing.IndexFeatures;
-import org.janusgraph.diskstorage.indexing.IndexMutation;
-import org.janusgraph.diskstorage.indexing.IndexProvider;
-import org.janusgraph.diskstorage.indexing.IndexQuery;
-import org.janusgraph.diskstorage.indexing.KeyInformation;
-import org.janusgraph.diskstorage.indexing.RawQuery;
-import org.janusgraph.diskstorage.solr.transform.GeoToWktConverter;
-import org.janusgraph.diskstorage.util.DefaultTransaction;
 import org.janusgraph.graphdb.configuration.PreInitializeConfigOptions;
-import org.janusgraph.graphdb.database.serialize.AttributeUtils;
-import org.janusgraph.graphdb.internal.Order;
-import org.janusgraph.graphdb.query.JanusGraphPredicate;
-import org.janusgraph.graphdb.query.condition.And;
-import org.janusgraph.graphdb.query.condition.Condition;
-import org.janusgraph.graphdb.query.condition.Not;
-import org.janusgraph.graphdb.query.condition.Or;
-import org.janusgraph.graphdb.query.condition.PredicateCondition;
-import org.janusgraph.graphdb.types.ParameterType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.Optional;
 
 /**
- * NOTE: Copied from JanusGraph for supporting Kerberos and adding support for multiple zookeeper clients. Do not change
- * This is a copy of SolrIndex.java from org.janusgraph.diskstorage.solr
+ * NOTE: Class to get access to SolrIndex.solrClient
  */
 @PreInitializeConfigOptions
-public class Solr6Index implements IndexProvider {
-
-    private static final Logger logger = LoggerFactory.getLogger(Solr6Index.class);
-
-    private static final String DEFAULT_ID_FIELD  = "id";
-    private static final char   CHROOT_START_CHAR = '/';
-
-    private static Solr6Index instance = null;
-    public static final ConfigOption<Boolean> CREATE_SOLR_CLIENT_PER_REQUEST = new ConfigOption(SOLR_NS, "create-client-per-request", "when false, allows the sharing of solr client across other components.", org.janusgraph.diskstorage.configuration.ConfigOption.Type.LOCAL, false);
+public class Solr6Index extends SolrIndex {
+    private static final Logger LOG = LoggerFactory.getLogger(Solr6Index.class);
 
     public enum Mode {
         HTTP, CLOUD;
 
         public static Mode parse(String mode) {
             for (final Mode m : Mode.values()) {
-                if (m.toString().equalsIgnoreCase(mode)) return m;
+                if (m.toString().equalsIgnoreCase(mode)) {
+                    return m;
+                }
             }
+
             throw new IllegalArgumentException("Unrecognized mode: "+mode);
         }
-
     }
 
-    public static final ConfigOption<String[]> ZOOKEEPER_URLS = new ConfigOption<>(SOLR_NS,"zookeeper-urls",
-            "URL of the Zookeeper instance coordinating the SolrCloud cluster",
-            ConfigOption.Type.MASKABLE, new String[]{"localhost:2181"});
-
-    private static final IndexFeatures SOLR_FEATURES = new IndexFeatures.Builder()
-            .supportsDocumentTTL()
-            .setDefaultStringMapping(Mapping.TEXT)
-            .supportedStringMappings(Mapping.TEXT, Mapping.STRING)
-            .supportsCardinality(Cardinality.SINGLE)
-            .supportsCardinality(Cardinality.LIST)
-            .supportsCardinality(Cardinality.SET)
-            .supportsCustomAnalyzer()
-            .supportsGeoContains()
-            .build();
-
-    private static final Map<Geo, String> SPATIAL_PREDICATES = spatialPredicates();
-    private static boolean createSolrClientPerRequest;
+    public static final ConfigOption<Boolean> CREATE_SOLR_CLIENT_PER_REQUEST = new ConfigOption(SOLR_NS, "create-client-per-request", "when false, allows the sharing of solr client across other components.", org.janusgraph.diskstorage.configuration.ConfigOption.Type.LOCAL, false);
 
-    private final SolrClient solrClient;
-    private final Configuration configuration;
-    private final Mode mode;
-    private final boolean dynFields;
-    private final Map<String, String> keyFieldIds;
-    private final String ttlField;
-    private final int batchSize;
-    private final boolean waitSearcher;
-    private final boolean kerberosEnabled;
+    private static boolean    createSolrClientPerRequest = false;
+    private static Solr6Index INSTANCE                   = null;
 
-    public Solr6Index(final Configuration config) throws BackendException {
-        // Add Kerberos-enabled SolrHttpClientBuilder
-        HttpClientUtil.setHttpClientBuilder(new Krb5HttpClientBuilder().getBuilder());
+    private final Configuration config;
+    private final Mode          solrMode;
+    private final SolrClient    solrClient;
 
-        Preconditions.checkArgument(config!=null);
-        configuration = config;
-        mode = Mode.parse(config.get(SOLR_MODE));
-        kerberosEnabled = config.get(KERBEROS_ENABLED);
-        dynFields = config.get(DYNAMIC_FIELDS);
-        keyFieldIds = parseKeyFieldsForCollections(config);
-        batchSize = config.get(INDEX_MAX_RESULT_SET_SIZE);
-        ttlField = config.get(TTL_FIELD);
-        waitSearcher = config.get(WAIT_SEARCHER);
+    public Solr6Index(Configuration config) throws BackendException {
+        super(config);
 
-        if (kerberosEnabled) {
-            logger.debug("Kerberos is enabled. Configuring SOLR for Kerberos.");
-            configureSolrClientsForKerberos();
-        } else {
-            logger.debug("Kerberos is NOT enabled.");
-            logger.debug("KERBEROS_ENABLED name is " + KERBEROS_ENABLED.getName() + " and it is" + (KERBEROS_ENABLED.isOption() ? " " : " not") + " an option.");
-            logger.debug("KERBEROS_ENABLED type is " + KERBEROS_ENABLED.getType().name());
-        }
+        Mode solrMode = Mode.CLOUD;
 
-        solrClient = createSolrClient();
-        createSolrClientPerRequest = config.get(CREATE_SOLR_CLIENT_PER_REQUEST);
-        if(createSolrClientPerRequest) {
-            logger.info("A new Solr Client will be created for direct interation with SOLR.");
-        } else {
-            logger.info("Solr Client will be shared for direct interation with SOLR.");
-        }
-        Solr6Index.instance = this;
-    }
-
-    public static Mode getSolrMode() {
-        Solr6Index solr6Index = Solr6Index.instance;
-        Mode       ret        = (solr6Index != null) ? Mode.parse(solr6Index.configuration.get(SOLR_MODE)) : null;
-
-        if (ret == null) {
-            logger.warn("SolrMode is not set. Assuming {}", Mode.CLOUD);
+        try {
+            Field fld = SolrIndex.class.getDeclaredField("mode");
 
-            ret = Mode.CLOUD;
-        }
+            fld.setAccessible(true);
 
-        return ret;
-    }
+            Object val = fld.get(this);
 
-    public static SolrClient getSolrClient() {
-        if (Solr6Index.instance != null) {
-            if (createSolrClientPerRequest) {
-                logger.debug("Creating a new Solr Client.");
-                return Solr6Index.instance.createSolrClient();
+            if (val != null) {
+                solrMode = Mode.parse(val.toString());
             } else {
-                logger.debug("Returning the solr client owned by Solr6Index.");
-                return Solr6Index.instance.solrClient;
-            }
-        } else {
-            logger.debug(" No Solr6Index available. Will return null");
-            return null;
-        }
-    }
-
-    public static void releaseSolrClient(SolrClient solrClient) {
-        if(createSolrClientPerRequest) {
-            if (solrClient != null) {
-                try {
-                    solrClient.close();
-
-                    if(logger.isDebugEnabled()) {
-                        logger.debug("Closed the solr client successfully.");
-                    }
-                } catch (IOException excp) {
-                    logger.warn("Failed to close SolrClient.", excp);
-                }
-            }
-        } else {
-            if(logger.isDebugEnabled()) {
-                logger.debug("Ignoring the closing of solr client as it is owned by Solr6Index.");
+                LOG.warn("SolrMode is not set. Assuming {}", solrMode);
             }
+        } catch (Exception excp) {
+            LOG.warn("Failed to get SolrMode. Assuming {}", solrMode, excp);
         }
-    }
 
-    private SolrClient createSolrClient() {
-        if(logger.isDebugEnabled()) {
-            logger.debug("HttpClientBuilder = {}", HttpClientUtil.getHttpClientBuilder(), new Exception());
-        }
-        final ModifiableSolrParams clientParams = new ModifiableSolrParams();
         SolrClient solrClient = null;
 
-        Mode mode = Mode.parse(configuration.get(SOLR_MODE));
-        switch (mode) {
-            case CLOUD:
-                /* ATLAS-2920: Update JanusGraph Solr clients to use all zookeeper entries – start */
-                List<String> zkHosts = new ArrayList<>();
-                String       chroot  = null;
-                String[]     zkUrls  = configuration.get(ZOOKEEPER_URLS);
-
-                if (zkUrls != null) {
-                    for (int i = zkUrls.length - 1; i >= 0; i--) {
-                        String zkUrl     = zkUrls[i];
-                        int    idxChroot = zkUrl.indexOf(CHROOT_START_CHAR);
-
-                        if (idxChroot != -1) {
-                            if (chroot == null) {
-                                chroot = zkUrl.substring(idxChroot);
-                            }
-
-                            zkUrl = zkUrl.substring(0, idxChroot);
-                        }
-
-                        zkHosts.add(zkUrl);
-                    }
-                }
-                /* ATLAS-2920: - end */
-
-                final CloudSolrClient cloudServer = new CloudSolrClient.Builder().withZkHost(zkHosts).withZkChroot(chroot)
-                        .withLBHttpSolrClientBuilder(
-                                new LBHttpSolrClient.Builder()
-                                        .withHttpSolrClientBuilder(new HttpSolrClient.Builder().withInvariantParams(clientParams))
-                                        .withBaseSolrUrls(configuration.get(HTTP_URLS))
-                        )
-                        .sendUpdatesOnlyToShardLeaders()
-                        .build();
-                cloudServer.connect();
-                solrClient = cloudServer;
-                logger.info("Created solr client using Cloud based configuration.");
-                break;
-            case HTTP:
-                clientParams.add(HttpClientUtil.PROP_ALLOW_COMPRESSION, configuration.get(HTTP_ALLOW_COMPRESSION).toString());
-                clientParams.add(HttpClientUtil.PROP_CONNECTION_TIMEOUT, configuration.get(HTTP_CONNECTION_TIMEOUT).toString());
-                clientParams.add(HttpClientUtil.PROP_MAX_CONNECTIONS_PER_HOST, configuration.get(HTTP_MAX_CONNECTIONS_PER_HOST).toString());
-                clientParams.add(HttpClientUtil.PROP_MAX_CONNECTIONS, configuration.get(HTTP_GLOBAL_MAX_CONNECTIONS).toString());
-                final HttpClient client = HttpClientUtil.createClient(clientParams);
-                solrClient = new LBHttpSolrClient.Builder()
-                        .withHttpClient(client)
-                        .withBaseSolrUrls(configuration.get(HTTP_URLS))
-                        .build();
-                logger.info("Created solr client using HTTP based configuration.");
-                break;
-            default:
-                throw new IllegalArgumentException("Unsupported Solr operation mode: " + mode);
-        }
-        return solrClient;
-    }
-
-    private void configureSolrClientsForKerberos() throws PermanentBackendException {
-        String kerberosConfig = System.getProperty("java.security.auth.login.config");
-        if(kerberosConfig == null) {
-            throw new PermanentBackendException("Unable to configure kerberos for solr client. System property 'java.security.auth.login.config' is not set.");
-        }
-        logger.debug("Using kerberos configuration file located at '{}'.", kerberosConfig);
-        try(Krb5HttpClientBuilder krbBuild = new Krb5HttpClientBuilder()) {
-
-            SolrHttpClientBuilder kb = krbBuild.getBuilder();
-            HttpClientUtil.setHttpClientBuilder(kb);
-            HttpRequestInterceptor bufferedEntityInterceptor = new HttpRequestInterceptor() {
-                @Override
-                public void process(HttpRequest request, HttpContext context) throws HttpException, IOException {
-                    if(request instanceof HttpEntityEnclosingRequest) {
-                        HttpEntityEnclosingRequest enclosingRequest = ((HttpEntityEnclosingRequest) request);
-                        HttpEntity requestEntity = enclosingRequest.getEntity();
-                        enclosingRequest.setEntity(new BufferedHttpEntity(requestEntity));
-                    }
-                }
-            };
-            HttpClientUtil.addRequestInterceptor(bufferedEntityInterceptor);
-
-            HttpRequestInterceptor preemptiveAuth = new PreemptiveAuth(new KerberosScheme());
-            HttpClientUtil.addRequestInterceptor(preemptiveAuth);
-        }
-    }
-
-    private Map<String, String> parseKeyFieldsForCollections(Configuration config) throws BackendException {
-        final Map<String, String> keyFieldNames = new HashMap<>();
-        final String[] collectionFieldStatements = config.has(KEY_FIELD_NAMES) ? config.get(KEY_FIELD_NAMES) : new String[0];
-        for (final String collectionFieldStatement : collectionFieldStatements) {
-            final String[] parts = collectionFieldStatement.trim().split("=");
-            if (parts.length != 2) {
-                throw new PermanentBackendException(
-                        "Unable to parse the collection name / key field name pair. It should be of the format collection=field");
-            }
-            final String collectionName = parts[0];
-            final String keyFieldName = parts[1];
-            keyFieldNames.put(collectionName, keyFieldName);
-        }
-        return keyFieldNames;
-    }
-
-    private String getKeyFieldId(String collection) {
-        String field = keyFieldIds.get(collection);
-        if (field==null) field = DEFAULT_ID_FIELD;
-        return field;
-    }
-
-    /**
-     * Unlike the ElasticSearch Index, which is schema free, Solr requires a schema to
-     * support searching. This means that you will need to modify the solr schema with the
-     * appropriate field definitions in order to work properly.  If you have a running instance
-     * of Solr and you modify its schema with new fields, don't forget to re-index!
-     * @param store Index store
-     * @param key New key to register
-     * @param information data type to register for the key
-     * @param tx enclosing transaction
-     * @throws BackendException in case an exception is thrown when
-     * creating a collection.
-     */
-    @SuppressWarnings("unchecked")
-    @Override
-    public void register(String store, String key, KeyInformation information, BaseTransaction tx)
-            throws BackendException {
-        if (mode== Mode.CLOUD) {
-            final CloudSolrClient client = (CloudSolrClient) solrClient;
-            try {
-                createCollectionIfNotExists(client, configuration, store);
-            } catch (final IOException | SolrServerException | InterruptedException | KeeperException e) {
-                throw new PermanentBackendException(e);
-            }
-        }
-        //Since all data types must be defined in the schema.xml, pre-registering a type does not work
-        //But we check Analyse feature
-        String analyzer = ParameterType.STRING_ANALYZER.findParameter(information.getParameters(), null);
-        if (analyzer != null) {
-            //If the key have a tokenizer, we try to get it by reflection
-            // some referred classes might not be able to be found via SystemClassLoader
-            // since they might be associated with other classloader, in this situation
-            // ClassNotFound exception will be thrown. instead of using SystemClassLoader
-            // for all classes, we find its classloader first and then load the class, please
-            // call - instantiateUsingClassLoader()
-            try {
-                ((Constructor<Tokenizer>) ClassLoader.getSystemClassLoader().loadClass(analyzer)
-                        .getConstructor()).newInstance();
-            } catch (final ReflectiveOperationException e) {
-                throw new PermanentBackendException(e.getMessage(),e);
-            }
-        }
-        analyzer = ParameterType.TEXT_ANALYZER.findParameter(information.getParameters(), null);
-        if (analyzer != null) {
-            //If the key have a tokenizer, we try to get it by reflection
-            try {
-                ((Constructor<Tokenizer>) ClassLoader.getSystemClassLoader().loadClass(analyzer)
-                        .getConstructor()).newInstance();
-            } catch (final ReflectiveOperationException e) {
-                throw new PermanentBackendException(e.getMessage(),e);
-            }
-        }
-    }
-
-    private void instantiateUsingClassLoader(String analyzer) throws PermanentBackendException {
-        if (analyzer == null) return;
-        try {
-            Class analyzerClass = Class.forName(analyzer);
-            ClassLoader cl = analyzerClass.getClassLoader();
-            ((Constructor<Tokenizer>) cl.loadClass(analyzer).getConstructor()).newInstance();
-        } catch (final ReflectiveOperationException e) {
-            throw new PermanentBackendException(e.getMessage(),e);
-        }
-    }
-
-    @Override
-    public void mutate(Map<String, Map<String, IndexMutation>> mutations, KeyInformation.IndexRetriever information,
-                       BaseTransaction tx) throws BackendException {
-        logger.debug("Mutating SOLR");
         try {
-            for (final Map.Entry<String, Map<String, IndexMutation>> stores : mutations.entrySet()) {
-                final String collectionName = stores.getKey();
-                final String keyIdField = getKeyFieldId(collectionName);
-
-                final List<String> deleteIds = new ArrayList<>();
-                final Collection<SolrInputDocument> changes = new ArrayList<>();
-
-                for (final Map.Entry<String, IndexMutation> entry : stores.getValue().entrySet()) {
-                    final String docId = entry.getKey();
-                    final IndexMutation mutation = entry.getValue();
-                    Preconditions.checkArgument(!(mutation.isNew() && mutation.isDeleted()));
-                    Preconditions.checkArgument(!mutation.isNew() || !mutation.hasDeletions());
-                    Preconditions.checkArgument(!mutation.isDeleted() || !mutation.hasAdditions());
-
-                    //Handle any deletions
-                    if (mutation.hasDeletions()) {
-                        if (mutation.isDeleted()) {
-                            logger.trace("Deleting entire document {}", docId);
-                            deleteIds.add(docId);
-                        } else {
-                            final List<IndexEntry> fieldDeletions = new ArrayList<>(mutation.getDeletions());
-                            if (mutation.hasAdditions()) {
-                                for (final IndexEntry indexEntry : mutation.getAdditions()) {
-                                    fieldDeletions.remove(indexEntry);
-                                }
-                            }
-                            handleRemovalsFromIndex(collectionName, keyIdField, docId, fieldDeletions, information);
-                        }
-                    }
-
-                    if (mutation.hasAdditions()) {
-                        final int ttl = mutation.determineTTL();
-
-                        final SolrInputDocument doc = new SolrInputDocument();
-                        doc.setField(keyIdField, docId);
+            Field fld = SolrIndex.class.getDeclaredField("solrClient");
 
-                        final boolean isNewDoc = mutation.isNew();
-
-                        if (isNewDoc)
-                            logger.trace("Adding new document {}", docId);
-                        final Map<String, Object> adds = collectFieldValues(mutation.getAdditions(), collectionName,
-                                information);
-                        // If cardinality is not single then we should use the "add" operation to update
-                        // the index so we don't overwrite existing values.
-                        adds.keySet().forEach(v-> {
-                            final KeyInformation keyInformation = information.get(collectionName, v);
-                            final String solrOp = keyInformation.getCardinality() == Cardinality.SINGLE ? "set" : "add";
-                            doc.setField(v, isNewDoc ? adds.get(v) :
-                                    new HashMap<String, Object>(1) {{put(solrOp, adds.get(v));}}
-                            );
-                        });
-                        if (ttl>0) {
-                            Preconditions.checkArgument(isNewDoc,
-                                    "Solr only supports TTL on new documents [%s]", docId);
-                            doc.setField(ttlField, String.format("+%dSECONDS", ttl));
-                        }
-                        changes.add(doc);
-                    }
-                }
+            fld.setAccessible(true);
 
-                commitDeletes(collectionName, deleteIds);
-                commitChanges(collectionName, changes);
-            }
-        } catch (final IllegalArgumentException e) {
-            throw new PermanentBackendException("Unable to complete query on Solr.", e);
-        } catch (final Exception e) {
-            throw storageException(e);
-        }
-    }
-
-    private void handleRemovalsFromIndex(String collectionName, String keyIdField, String docId,
-                                         List<IndexEntry> fieldDeletions, KeyInformation.IndexRetriever information)
-            throws SolrServerException, IOException, BackendException {
-        final Map<String, String> fieldDeletes = new HashMap<>(1);
-        fieldDeletes.put("set", null);
-        final SolrInputDocument doc = new SolrInputDocument();
-        doc.addField(keyIdField, docId);
-        for(final IndexEntry v: fieldDeletions) {
-            final KeyInformation keyInformation = information.get(collectionName, v.field);
-            // If the cardinality is a Set or List, we just need to remove the individual value
-            // received in the mutation and not set the field to null, but we still consolidate the values
-            // in the event of multiple removals in one mutation.
-            final Map<String, Object> deletes = collectFieldValues(fieldDeletions, collectionName, information);
-            deletes.keySet().forEach(vertex -> {
-                final Map<String, Object> remove;
-                if (keyInformation.getCardinality() == Cardinality.SINGLE) {
-                    remove = (Map) fieldDeletes;
-                } else {
-                    remove = new HashMap<>(1);
-                    remove.put("remove", deletes.get(vertex));
-                }
-                doc.setField(vertex, remove);
-            });
+            solrClient = (SolrClient) fld.get(this);
+        } catch (Exception excp) {
+            LOG.warn("Failed to get SolrClient", excp);
         }
 
-        final UpdateRequest singleDocument = newUpdateRequest();
-        singleDocument.add(doc);
-        solrClient.request(singleDocument, collectionName);
-
-    }
+        this.config     = config;
+        this.solrMode   = solrMode;
+        this.solrClient = solrClient;
 
-    private Object convertValue(Object value) throws BackendException {
-        if (value instanceof Geoshape) {
-            return GeoToWktConverter.convertToWktString((Geoshape) value);
-        }
-        if (value instanceof UUID) {
-            return value.toString();
-        }
-        if(value instanceof Instant) {
-            if(Math.floorMod(((Instant) value).getNano(), 1000000) != 0) {
-                throw new IllegalArgumentException("Solr indexes do not support nanoseconds");
-            }
-            return new Date(((Instant) value).toEpochMilli());
-        }
-        return value;
+        createSolrClientPerRequest = config.get(CREATE_SOLR_CLIENT_PER_REQUEST);
+        INSTANCE                   = this;
     }
 
-    @Override
-    public void restore(Map<String, Map<String, List<IndexEntry>>> documents,
-                        KeyInformation.IndexRetriever information, BaseTransaction tx) throws BackendException {
-        try {
-            for (final Map.Entry<String, Map<String, List<IndexEntry>>> stores : documents.entrySet()) {
-                final String collectionName = stores.getKey();
-
-                final List<String> deleteIds = new ArrayList<>();
-                final List<SolrInputDocument> newDocuments = new ArrayList<>();
-
-                for (final Map.Entry<String, List<IndexEntry>> entry : stores.getValue().entrySet()) {
-                    final String docID = entry.getKey();
-                    final List<IndexEntry> content = entry.getValue();
-
-                    if (content == null || content.isEmpty()) {
-                        if (logger.isTraceEnabled())
-                            logger.trace("Deleting document [{}]", docID);
+    public static SolrClient getSolrClient() {
+        SolrClient ret   = null;
+        Solr6Index index = INSTANCE;
 
-                        deleteIds.add(docID);
-                        continue;
-                    }
-                    final SolrInputDocument doc = new SolrInputDocument();
-                    doc.setField(getKeyFieldId(collectionName), docID);
-                    final Map<String, Object> adds = collectFieldValues(content, collectionName, information);
-                    adds.forEach(doc::setField);
-                    newDocuments.add(doc);
-                }
-                commitDeletes(collectionName, deleteIds);
-                commitChanges(collectionName, newDocuments);
-            }
-        } catch (final Exception e) {
-            throw new TemporaryBackendException("Could not restore Solr index", e);
+        if (index != null) {
+            ret = createSolrClientPerRequest ? index.createSolrClient() : index.solrClient;
         }
-    }
 
-    // This method will create a map of field ids to values.  In the case of multiValued fields,
-    // it will consolidate all the values into one List or Set so it can be updated with a single Solr operation
-    private Map<String, Object> collectFieldValues(List<IndexEntry> content, String collectionName,
-                                                   KeyInformation.IndexRetriever information) throws BackendException {
-        final Map<String, Object> docs = new HashMap<>();
-        for (final IndexEntry addition: content) {
-            final KeyInformation keyInformation = information.get(collectionName, addition.field);
-            switch (keyInformation.getCardinality()) {
-                case SINGLE:
-                    docs.put(addition.field, convertValue(addition.value));
-                    break;
-                case SET:
-                    if (!docs.containsKey(addition.field)) {
-                        docs.put(addition.field, new HashSet<>());
-                    }
-                    ((Set<Object>) docs.get(addition.field)).add(convertValue(addition.value));
-                    break;
-                case LIST:
-                    if (!docs.containsKey(addition.field)) {
-                        docs.put(addition.field,  new ArrayList<>());
-                    }
-                    ((List<Object>) docs.get(addition.field)).add(convertValue(addition.value));
-                    break;
-            }
+        if (ret == null) {
+            LOG.warn("getSolrClient() returning null");
         }
-        return docs;
-    }
 
-    private void commitChanges(String collectionName,
-                               Collection<SolrInputDocument> documents) throws SolrServerException, IOException {
-        if (documents.size() == 0) return;
+        return ret;
+    }
 
-        try {
-            solrClient.request(newUpdateRequest().add(documents), collectionName);
-        } catch (final HttpSolrClient.RemoteSolrException rse) {
-            logger.error("Unable to save documents to Solr as one of the shape objects stored were not compatible with Solr.", rse);
-            logger.error("Details in failed document batch: ");
-            for (final SolrInputDocument d : documents) {
-                final Collection<String> fieldNames = d.getFieldNames();
-                for (final String name : fieldNames) {
-                    logger.error(name + ":" + d.getFieldValue(name));
+    public static void releaseSolrClient(SolrClient client) {
+        if (createSolrClientPerRequest) {
+            if (client != null) {
+                try {
+                    client.close();
+                } catch (IOException excp) {
+                    LOG.warn("Failed to close SolrClient.", excp);
                 }
             }
-
-            throw rse;
-        }
-    }
-
-    private void commitDeletes(String collectionName, List<String> deleteIds) throws SolrServerException, IOException {
-        if (deleteIds.size() == 0) return;
-        solrClient.request(newUpdateRequest().deleteById(deleteIds), collectionName);
-    }
-
-    @Override
-    public Stream<String> query(IndexQuery query, KeyInformation.IndexRetriever information,
-                                BaseTransaction tx) throws BackendException {
-        final String collection = query.getStore();
-        final String keyIdField = getKeyFieldId(collection);
-        final SolrQuery solrQuery = new SolrQuery("*:*");
-        solrQuery.set(CommonParams.FL, keyIdField);
-        final String queryFilter = buildQueryFilter(query.getCondition(), information.get(collection));
-        solrQuery.addFilterQuery(queryFilter);
-        if (!query.getOrder().isEmpty()) {
-            addOrderToQuery(solrQuery, query.getOrder());
-        }
-        solrQuery.setStart(0);
-        if (query.hasLimit()) {
-            solrQuery.setRows(Math.min(query.getLimit(), batchSize));
         } else {
-            solrQuery.setRows(batchSize);
+            LOG.debug("Ignoring the closing of solr client as it is owned by Solr6Index.");
         }
-        return executeQuery(query.hasLimit() ? query.getLimit() : null, 0, collection, solrQuery,
-                doc -> doc.getFieldValue(keyIdField).toString());
     }
 
-    @Override
-    public Long queryCount(IndexQuery query, KeyInformation.IndexRetriever information, BaseTransaction tx) throws BackendException {
-        try {
-            String collection = query.getStore();
-            String keyIdField = this.getKeyFieldId(collection);
-            SolrQuery solrQuery = new SolrQuery("*:*");
-            solrQuery.set("fl", new String[]{keyIdField});
-            String queryFilter = this.buildQueryFilter(query.getCondition(), information.get(collection));
-            solrQuery.addFilterQuery(new String[]{queryFilter});
-            QueryResponse response = this.solrClient.query(collection, solrQuery);
-            logger.debug("Executed query [{}] in {} ms", query, response.getElapsedTime());
-            return response.getResults().getNumFound();
-        } catch (IOException ex) {
-            logger.error("Query did not complete : ", ex);
-            throw new PermanentBackendException(ex);
-        } catch (SolrServerException ex) {
-            logger.error("Unable to query Solr index.", ex);
-            throw new PermanentBackendException(ex);
-        }
-    }
+    public static Solr6Index.Mode getSolrMode() {
+        Solr6Index index = INSTANCE;
 
-    private void addOrderToQuery(SolrQuery solrQuery, List<IndexQuery.OrderEntry> orders) {
-        for (final IndexQuery.OrderEntry order1 : orders) {
-            final String item = order1.getKey();
-            final SolrQuery.ORDER order = order1.getOrder() == Order.ASC ? SolrQuery.ORDER.asc : SolrQuery.ORDER.desc;
-            solrQuery.addSort(new SolrQuery.SortClause(item, order));
-        }
-    }
-
-    private <E> Stream<E> executeQuery(Integer limit, int offset, String collection, SolrQuery solrQuery,
-                                       Function<SolrDocument, E> function) throws PermanentBackendException {
-        try {
-            final SolrResultIterator<E> resultIterator = new SolrResultIterator<>(solrClient, limit, offset,
-                    solrQuery.getRows(), collection, solrQuery, function);
-            return StreamSupport.stream(Spliterators.spliteratorUnknownSize(resultIterator, Spliterator.ORDERED),
-                    false);
-        } catch (final IOException | UncheckedIOException e) {
-            logger.error("Query did not complete : ", e);
-            throw new PermanentBackendException(e);
-        } catch (final SolrServerException | UncheckedSolrException e) {
-            logger.error("Unable to query Solr index.", e);
-            throw new PermanentBackendException(e);
-        }
+        return index != null ? index.solrMode : Mode.CLOUD;
     }
 
-
-    private SolrQuery runCommonQuery(RawQuery query, KeyInformation.IndexRetriever information, BaseTransaction tx,
-                                     String collection, String keyIdField) throws BackendException {
-        final SolrQuery solrQuery = new SolrQuery(query.getQuery())
-                .addField(keyIdField)
-                .setIncludeScore(true)
-                .setStart(query.getOffset());
-        if (query.hasLimit()) {
-            solrQuery.setRows(Math.min(query.getLimit(), batchSize));
-        } else {
-            solrQuery.setRows(batchSize);
-        }
-        if (!query.getOrders().isEmpty()) {
-            addOrderToQuery(solrQuery, query.getOrders());
-        }
-
-        for(final Parameter parameter: query.getParameters()) {
-            if (parameter.value() instanceof String[]) {
-                solrQuery.setParam(parameter.key(), (String[]) parameter.value());
-            } else if (parameter.value() instanceof String) {
-                solrQuery.setParam(parameter.key(), (String) parameter.value());
-            }
-        }
-        return solrQuery;
-    }
-
-    @Override
-    public Stream<RawQuery.Result<String>> query(RawQuery query, KeyInformation.IndexRetriever information,
-                                                 BaseTransaction tx) throws BackendException {
-        final String collection = query.getStore();
-        final String keyIdField = getKeyFieldId(collection);
-        return executeQuery(query.hasLimit() ? query.getLimit() : null, query.getOffset(), collection,
-                runCommonQuery(query, information, tx, collection, keyIdField), doc -> {
-                    final double score = Double.parseDouble(doc.getFieldValue("score").toString());
-                    return new RawQuery.Result<>(doc.getFieldValue(keyIdField).toString(), score);
-                });
-    }
-
-    @Override
-    public Long totals(RawQuery query, KeyInformation.IndexRetriever information,
-                       BaseTransaction tx) throws BackendException {
-        try {
-            final String collection = query.getStore();
-            final String keyIdField = getKeyFieldId(collection);
-            final QueryResponse response = solrClient.query(collection, runCommonQuery(query, information, tx,
-                    collection, keyIdField));
-            logger.debug("Executed query [{}] in {} ms", query.getQuery(), response.getElapsedTime());
-            return response.getResults().getNumFound();
-        } catch (final IOException e) {
-            logger.error("Query did not complete : ", e);
-            throw new PermanentBackendException(e);
-        } catch (final SolrServerException e) {
-            logger.error("Unable to query Solr index.", e);
-            throw new PermanentBackendException(e);
+    private SolrClient createSolrClient() {
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("HttpClientBuilder = {}", HttpClientUtil.getHttpClientBuilder(), new Exception());
         }
-    }
-
-    private static String escapeValue(Object value) {
-        return ClientUtils.escapeQueryChars(value.toString());
-    }
-
-    public String buildQueryFilter(Condition<JanusGraphElement> condition, KeyInformation.StoreRetriever information) {
-        if (condition instanceof PredicateCondition) {
-            final PredicateCondition<String, JanusGraphElement> atom
-                    = (PredicateCondition<String, JanusGraphElement>) condition;
-            final Object value = atom.getValue();
-            final String key = atom.getKey();
-            final JanusGraphPredicate predicate = atom.getPredicate();
 
-            if (value == null && predicate == Cmp.NOT_EQUAL) {
-                return key + ":*";
-            } else if (value instanceof Number) {
-                final String queryValue = escapeValue(value);
-                Preconditions.checkArgument(predicate instanceof Cmp,
-                        "Relation not supported on numeric types: %s", predicate);
-                final Cmp numRel = (Cmp) predicate;
-                switch (numRel) {
-                    case EQUAL:
-                        return (key + ":" + queryValue);
-                    case NOT_EQUAL:
-                        return ("-" + key + ":" + queryValue);
-                    case LESS_THAN:
-                        //use right curly to mean up to but not including value
-                        return (key + ":[* TO " + queryValue + "}");
-                    case LESS_THAN_EQUAL:
-                        return (key + ":[* TO " + queryValue + "]");
-                    case GREATER_THAN:
-                        //use left curly to mean greater than but not including value
-                        return (key + ":{" + queryValue + " TO *]");
-                    case GREATER_THAN_EQUAL:
-                        return (key + ":[" + queryValue + " TO *]");
-                    default: throw new IllegalArgumentException("Unexpected relation: " + numRel);
-                }
-            } else if (value instanceof String) {
-                final Mapping map = getStringMapping(information.get(key));
-                assert map==Mapping.TEXT || map==Mapping.STRING;
+        final SolrClient           ret;
+        final ModifiableSolrParams clientParams = new ModifiableSolrParams();
 
-                if (map==Mapping.TEXT && !(Text.HAS_CONTAINS.contains(predicate) || predicate instanceof Cmp))
-                    throw new IllegalArgumentException("Text mapped string values only support CONTAINS and Compare queries and not: " + predicate);
-                if (map==Mapping.STRING && Text.HAS_CONTAINS.contains(predicate))
-                    throw new IllegalArgumentException("String mapped string values do not support CONTAINS queries: " + predicate);
+        switch (solrMode) {
+            case CLOUD:
+                String[]         zookeeperUrl = config.get(ZOOKEEPER_URL);
+                Optional<String> chroot       = Optional.empty();
+
+                for(int i = zookeeperUrl.length - 1; i >= 0; --i) {
+                    int chrootIndex = zookeeperUrl[i].indexOf("/");
+                    if (chrootIndex != -1) {
+                        String hostAndPort = zookeeperUrl[i].substring(0, chrootIndex);
+                        if (!chroot.isPresent()) {
+                            chroot = Optional.of(zookeeperUrl[i].substring(chrootIndex));
+                        }
 
-                //Special case
-                if (predicate == Text.CONTAINS) {
-                    return tokenize(information, value, key, predicate,
-                            ParameterType.TEXT_ANALYZER.findParameter(information.get(key).getParameters(), null));
-                } else if (predicate == Text.PREFIX || predicate == Text.CONTAINS_PREFIX) {
-                    return (key + ":" + escapeValue(value) + "*");
-                } else if (predicate == Text.REGEX || predicate == Text.CONTAINS_REGEX) {
-                    return (key + ":/" + value + "/");
-                }  else if (predicate == Cmp.EQUAL || predicate == Cmp.NOT_EQUAL) {
-                    final String tokenizer =
-                            ParameterType.STRING_ANALYZER.findParameter(information.get(key).getParameters(), null);
-                    if (tokenizer != null) {
-                        return tokenize(information, value, key, predicate, tokenizer);
-                    } else if (predicate == Cmp.EQUAL) {
-                        return (key + ":\"" + escapeValue(value) + "\"");
-                    } else { // Cmp.NOT_EQUAL case
-                        return ("-" + key + ":\"" + escapeValue(value) + "\"");
+                        zookeeperUrl[i] = hostAndPort;
                     }
-                } else if (predicate == Text.FUZZY || predicate == Text.CONTAINS_FUZZY) {
-                    return (key + ":"+escapeValue(value)+"~"+Text.getMaxEditDistance(value.toString()));
-                } else if (predicate == Cmp.LESS_THAN) {
-                    return (key + ":[* TO \"" + escapeValue(value) + "\"}");
-                } else if (predicate == Cmp.LESS_THAN_EQUAL) {
-                    return (key + ":[* TO \"" + escapeValue(value) + "\"]");
-                } else if (predicate == Cmp.GREATER_THAN) {
-                    return (key + ":{\"" + escapeValue(value) + "\" TO *]");
-                } else if (predicate == Cmp.GREATER_THAN_EQUAL) {
-                    return (key + ":[\"" + escapeValue(value) + "\" TO *]");
-                } else {
-                    throw new IllegalArgumentException("Relation is not supported for string value: " + predicate);
-                }
-            } else if (value instanceof Geoshape) {
-                final Mapping map = Mapping.getMapping(information.get(key));
-                Preconditions.checkArgument(predicate instanceof Geo && predicate != Geo.DISJOINT,
-                        "Relation not supported on geo types: %s", predicate);
-                Preconditions.checkArgument(map == Mapping.PREFIX_TREE || predicate == Geo.WITHIN || predicate == Geo.INTERSECT,
-                        "Relation not supported on geopoint types: %s", predicate);
-                final Geoshape geo = (Geoshape)value;
-                if (geo.getType() == Geoshape.Type.CIRCLE && (predicate == Geo.INTERSECT || map == Mapping.DEFAULT)) {
-                    final Geoshape.Point center = geo.getPoint();
-                    return ("{!geofilt sfield=" + key +
-                            " pt=" + center.getLatitude() + "," + center.getLongitude() +
-                            " d=" + geo.getRadius() + "} distErrPct=0"); //distance in kilometers
-                } else if (geo.getType() == Geoshape.Type.BOX && (predicate == Geo.INTERSECT || map == Mapping.DEFAULT)) {
-                    final Geoshape.Point southwest = geo.getPoint(0);
-                    final Geoshape.Point northeast = geo.getPoint(1);
-                    return (key + ":[" + southwest.getLatitude() + "," + southwest.getLongitude() +
-                            " TO " + northeast.getLatitude() + "," + northeast.getLongitude() + "]");
-                } else if (map == Mapping.PREFIX_TREE) {
-                    return key + ":\"" + SPATIAL_PREDICATES.get(predicate) + "(" + geo + ")\" distErrPct=0";
-                } else {
-                    throw new IllegalArgumentException("Unsupported or invalid search shape type: " + geo.getType());
-                }
-            } else if (value instanceof Date || value instanceof Instant) {
-                final String s = value.toString();
-                final String queryValue = escapeValue(value instanceof Date ? toIsoDate((Date) value) : value.toString());
-                Preconditions.checkArgument(predicate instanceof Cmp, "Relation not supported on date types: %s", predicate);
-                final Cmp numRel = (Cmp) predicate;
-
-                switch (numRel) {
-                    case EQUAL:
-                        return (key + ":" + queryValue);
-                    case NOT_EQUAL:
-                        return ("-" + key + ":" + queryValue);
-                    case LESS_THAN:
-                        //use right curly to mean up to but not including value
-                        return (key + ":[* TO " + queryValue + "}");
-                    case LESS_THAN_EQUAL:
-                        return (key + ":[* TO " + queryValue + "]");
-                    case GREATER_THAN:
-                        //use left curly to mean greater than but not including value
-                        return (key + ":{" + queryValue + " TO *]");
-                    case GREATER_THAN_EQUAL:
-                        return (key + ":[" + queryValue + " TO *]");
-                    default: throw new IllegalArgumentException("Unexpected relation: " + numRel);
                 }
-            } else if (value instanceof Boolean) {
-                final Cmp numRel = (Cmp) predicate;
-                final String queryValue = escapeValue(value);
-                switch (numRel) {
-                    case EQUAL:
-                        return (key + ":" + queryValue);
-                    case NOT_EQUAL:
-                        return ("-" + key + ":" + queryValue);
-                    default:
-                        throw new IllegalArgumentException("Boolean types only support EQUAL or NOT_EQUAL");
-                }
-            } else if (value instanceof UUID) {
-                if (predicate == Cmp.EQUAL) {
-                    return (key + ":\"" + escapeValue(value) + "\"");
-                } else if (predicate == Cmp.NOT_EQUAL) {
-                    return ("-" + key + ":\"" + escapeValue(value) + "\"");
-                } else {
-                    throw new IllegalArgumentException("Relation is not supported for uuid value: " + predicate);
-                }
-            } else throw new IllegalArgumentException("Unsupported type: " + value);
-        } else if (condition instanceof Not) {
-            final String sub = buildQueryFilter(((Not)condition).getChild(),information);
-            if (StringUtils.isNotBlank(sub)) return "-("+sub+")";
-            else return "";
-        } else if (condition instanceof And) {
-            final int numChildren = ((And) condition).size();
-            final StringBuilder sb = new StringBuilder();
-            for (final Condition<JanusGraphElement> c : condition.getChildren()) {
-                final String sub = buildQueryFilter(c, information);
-
-                if (StringUtils.isBlank(sub))
-                    continue;
-
-                // we don't have to add "+" which means AND iff
-                // a. it's a NOT query,
-                // b. expression is a single statement in the AND.
-                if (!sub.startsWith("-") && numChildren > 1)
-                    sb.append("+");
-
-                sb.append(sub).append(" ");
-            }
-            return sb.toString();
-        } else if (condition instanceof Or) {
-            final StringBuilder sb = new StringBuilder();
-            int element=0;
-            for (final Condition<JanusGraphElement> c : condition.getChildren()) {
-                final String sub = buildQueryFilter(c,information);
-                if (StringUtils.isBlank(sub)) continue;
-                if (element==0) sb.append("(");
-                else sb.append(" OR ");
-                sb.append(sub);
-                element++;
-            }
-            if (element>0) sb.append(")");
-            return sb.toString();
-        } else {
-            throw new IllegalArgumentException("Invalid condition: " + condition);
-        }
-    }
-
-    private String tokenize(KeyInformation.StoreRetriever information, Object value, String key,
-                            JanusGraphPredicate janusgraphPredicate, String tokenizer) {
-        List<String> terms;
-        if(tokenizer != null){
-            terms = customTokenize(tokenizer, (String) value);
-        } else {
-            terms = Text.tokenize((String) value);
-        }
-        if (terms.isEmpty()) {
-            return "";
-        } else if (terms.size() == 1) {
-            if (janusgraphPredicate == Cmp.NOT_EQUAL) {
-                return ("-" + key + ":(" + escapeValue(terms.get(0)) + ")");
-            } else {
-                return (key + ":(" + escapeValue(terms.get(0)) + ")");
-            }
-        } else {
-            final And<JanusGraphElement> andTerms = new And<>();
-            for (final String term : terms) {
-                andTerms.add(new PredicateCondition<>(key, janusgraphPredicate, term));
-            }
-            return buildQueryFilter(andTerms, information);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private List<String> customTokenize(String tokenizerClass, String value){
-        CachingTokenFilter stream = null;
-        try {
-            final List<String> terms = new ArrayList<>();
-            final Tokenizer tokenizer
-                    = ((Constructor<Tokenizer>) ClassLoader.getSystemClassLoader().loadClass(tokenizerClass)
-                    .getConstructor()).newInstance();
-            tokenizer.setReader(new StringReader(value));
-            stream = new CachingTokenFilter(tokenizer);
-            final TermToBytesRefAttribute termAtt = stream.getAttribute(TermToBytesRefAttribute.class);
-            stream.reset();
-            while (stream.incrementToken()) {
-                terms.add(termAtt.getBytesRef().utf8ToString());
-            }
-            return terms;
-        } catch ( ReflectiveOperationException | IOException e) {
-            throw new IllegalArgumentException(e.getMessage(),e);
-        } finally {
-            IOUtils.closeQuietly(stream);
-        }
-    }
-
-    private String toIsoDate(Date value) {
-        final TimeZone tz = TimeZone.getTimeZone("UTC");
-        final DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
-        df.setTimeZone(tz);
-        return df.format(value);
-    }
-
-    /**
-     * Solr handles all transactions on the server-side. That means all
-     * commit, optimize, or rollback applies since the last commit/optimize/rollback.
-     * Solr documentation recommends best way to update Solr is in one process to avoid
-     * race conditions.
-     *
-     * @return New Transaction Handle
-     */
-    @Override
-    public BaseTransactionConfigurable beginTransaction(BaseTransactionConfig config) {
-        return new DefaultTransaction(config);
-    }
 
-    @Override
-    public void close() throws BackendException {
-        logger.trace("Shutting down connection to Solr {}", solrClient);
-        try {
-            solrClient.close();
-        } catch (final IOException e) {
-            throw new TemporaryBackendException(e);
-        }
-    }
-
-    @Override
-    public void clearStorage() throws BackendException {
-        try {
-            if (mode!= Mode.CLOUD) {
-                logger.error("Operation only supported for SolrCloud. Cores must be deleted manually through the Solr API when using HTTP mode.");
-                return;
-            }
-            logger.debug("Clearing storage from Solr: {}", solrClient);
-            final ZkStateReader zkStateReader = ((CloudSolrClient) solrClient).getZkStateReader();
-            zkStateReader.forciblyRefreshAllClusterStateSlow();
-            final ClusterState clusterState = zkStateReader.getClusterState();
-            for (final String collection : clusterState.getCollectionsMap().keySet()) {
-                logger.debug("Clearing collection [{}] in Solr",collection);
-                // Collection is not dropped because it may have been created externally
-                final UpdateRequest deleteAll = newUpdateRequest();
-                deleteAll.deleteByQuery("*:*");
-                solrClient.request(deleteAll, collection);
-            }
-
-        } catch (final SolrServerException e) {
-            logger.error("Unable to clear storage from index due to server error on Solr.", e);
-            throw new PermanentBackendException(e);
-        } catch (final IOException e) {
-            logger.error("Unable to clear storage from index due to low-level I/O error.", e);
-            throw new PermanentBackendException(e);
-        } catch (final Exception e) {
-            logger.error("Unable to clear storage from index due to general error.", e);
-            throw new PermanentBackendException(e);
-        }
-    }
-
-    @Override
-    public boolean supports(KeyInformation information, JanusGraphPredicate predicate) {
-        final Class<?> dataType = information.getDataType();
-        final Mapping mapping = Mapping.getMapping(information);
-        if (mapping!=Mapping.DEFAULT && !AttributeUtils.isString(dataType) &&
-                !(mapping==Mapping.PREFIX_TREE && AttributeUtils.isGeo(dataType))) return false;
-
-        if (Number.class.isAssignableFrom(dataType)) {
-            return predicate instanceof Cmp;
-        } else if (dataType == Geoshape.class) {
-            switch(mapping) {
-                case DEFAULT:
-                    return predicate == Geo.WITHIN || predicate == Geo.INTERSECT;
-                case PREFIX_TREE:
-                    return predicate == Geo.INTERSECT || predicate == Geo.WITHIN || predicate == Geo.CONTAINS;
-            }
-        } else if (AttributeUtils.isString(dataType)) {
-            switch(mapping) {
-                case DEFAULT:
-                case TEXT:
-                    return predicate == Text.CONTAINS || predicate == Text.CONTAINS_PREFIX
-                            || predicate == Text.CONTAINS_REGEX || predicate == Text.CONTAINS_FUZZY;
-                case STRING:
-                    return predicate instanceof Cmp || predicate==Text.REGEX || predicate==Text.PREFIX  || predicate == Text.FUZZY;
-//                case TEXTSTRING:
-//                    return (janusgraphPredicate instanceof Text) || janusgraphPredicate == Cmp.EQUAL || janusgraphPredicate==Cmp.NOT_EQUAL;
-            }
-        } else if (dataType == Date.class || dataType == Instant.class) {
-            return predicate instanceof Cmp;
-        } else if (dataType == Boolean.class) {
-            return predicate == Cmp.EQUAL || predicate == Cmp.NOT_EQUAL;
-        } else if (dataType == UUID.class) {
-            return predicate == Cmp.EQUAL || predicate==Cmp.NOT_EQUAL;
-        }
-        return false;
-    }
-
-    @Override
-    public boolean supports(KeyInformation information) {
-        final Class<?> dataType = information.getDataType();
-        final Mapping mapping = Mapping.getMapping(information);
-        if (Number.class.isAssignableFrom(dataType) || dataType == Date.class || dataType == Instant.class
-                || dataType == Boolean.class || dataType == UUID.class) {
-            return mapping == Mapping.DEFAULT;
-        } else if (AttributeUtils.isString(dataType)) {
-            return mapping == Mapping.DEFAULT || mapping == Mapping.TEXT || mapping == Mapping.STRING;
-        } else if (AttributeUtils.isGeo(dataType)) {
-            return mapping == Mapping.DEFAULT || mapping == Mapping.PREFIX_TREE;
-        }
-        return false;
-    }
-
-    @Override
-    public String mapKey2Field(String key, KeyInformation keyInfo) {
-        IndexProvider.checkKeyValidity(key);
-        key = key.replace(' ', REPLACEMENT_CHAR);
-
-        if (!dynFields) return key;
-        if (ParameterType.MAPPED_NAME.hasParameter(keyInfo.getParameters())) return key;
-        String postfix;
-        final Class dataType = keyInfo.getDataType();
-        if (AttributeUtils.isString(dataType)) {
-            final Mapping map = getStringMapping(keyInfo);
-            switch (map) {
-                case TEXT: postfix = "_t"; break;
-                case STRING: postfix = "_s"; break;
-                default: throw new IllegalArgumentException("Unsupported string mapping: " + map);
-            }
-        } else if (AttributeUtils.isWholeNumber(dataType)) {
-            if (dataType.equals(Long.class)) postfix = "_l";
-            else postfix = "_i";
-        } else if (AttributeUtils.isDecimal(dataType)) {
-            if (dataType.equals(Float.class)) postfix = "_f";
-            else postfix = "_d";
-        } else if (dataType.equals(BigInteger.class)) {
-            postfix = "_bi";
-        } else if (dataType.equals(BigDecimal.class)) {
-            postfix = "_bd";
-        } else if (dataType.equals(Geoshape.class)) {
-            postfix = "_g";
-        } else if (dataType.equals(Date.class) || dataType.equals(Instant.class)) {
-            postfix = "_dt";
-        } else if (dataType.equals(Boolean.class)) {
-            postfix = "_b";
-        } else if (dataType.equals(UUID.class)) {
-            postfix = "_uuid";
-        } else throw new IllegalArgumentException("Unsupported data type ["+dataType+"] for field: " + key);
-
-        if (keyInfo.getCardinality() == Cardinality.SET || keyInfo.getCardinality() == Cardinality.LIST) {
-            postfix += "s";
-        }
-        return key+postfix;
-    }
-
-    @Override
-    public IndexFeatures getFeatures() {
-        return SOLR_FEATURES;
-    }
-
-    @Override
-    public boolean exists() throws BackendException {
-        if (mode!= Mode.CLOUD) throw new UnsupportedOperationException("Operation only supported for SolrCloud");
-        final CloudSolrClient server = (CloudSolrClient) solrClient;
-        try {
-            final ZkStateReader zkStateReader = server.getZkStateReader();
-            zkStateReader.forciblyRefreshAllClusterStateSlow();
-            final ClusterState clusterState = zkStateReader.getClusterState();
-            final Map<String, DocCollection> collections = clusterState.getCollectionsMap();
-            return collections != null && !collections.isEmpty();
-        } catch (KeeperException | InterruptedException e) {
-            throw new PermanentBackendException("Unable to check if index exists", e);
-        }
-    }
-
-    /*
-    ################# UTILITY METHODS #######################
-     */
-
-    private static Mapping getStringMapping(KeyInformation information) {
-        assert AttributeUtils.isString(information.getDataType());
-        Mapping map = Mapping.getMapping(information);
-        if (map==Mapping.DEFAULT) map = Mapping.TEXT;
-        return map;
-    }
-
-    private static Map<Geo, String> spatialPredicates() {
-        return Collections.unmodifiableMap(Stream.of(
-                new SimpleEntry<>(Geo.WITHIN, "IsWithin"),
-                new SimpleEntry<>(Geo.CONTAINS, "Contains"),
-                new SimpleEntry<>(Geo.INTERSECT, "Intersects"),
-                new SimpleEntry<>(Geo.DISJOINT, "IsDisjointTo"))
-                .collect(Collectors.toMap(SimpleEntry::getKey, SimpleEntry::getValue)));
-    }
-
-    private UpdateRequest newUpdateRequest() {
-        final UpdateRequest req = new UpdateRequest();
-        if(waitSearcher) {
-            req.setAction(UpdateRequest.ACTION.COMMIT, true, true);
-        }
-        return req;
-    }
-
-    private BackendException storageException(Exception solrException) {
-        return new TemporaryBackendException("Unable to complete query on Solr.", solrException);
-    }
-
-    private static void createCollectionIfNotExists(CloudSolrClient client, Configuration config, String collection)
-            throws IOException, SolrServerException, KeeperException, InterruptedException {
-        if (!checkIfCollectionExists(client, collection)) {
-            final Integer numShards = config.get(NUM_SHARDS);
-            final Integer maxShardsPerNode = config.get(MAX_SHARDS_PER_NODE);
-            final Integer replicationFactor = config.get(REPLICATION_FACTOR);
+                CloudSolrClient.Builder builder = (new CloudSolrClient.Builder(Arrays.asList(zookeeperUrl), chroot)).withLBHttpSolrClientBuilder((new LBHttpSolrClient.Builder()).withHttpSolrClientBuilder((new HttpSolrClient.Builder()).withInvariantParams(clientParams)).withBaseSolrUrls((String[])config.get(HTTP_URLS, new String[0]))).sendUpdatesOnlyToShardLeaders();
+                CloudSolrClient cloudServer = builder.build();
+                cloudServer.connect();
 
+                ret = cloudServer;
+                break;
 
-            // Ideally this property used so a new configset is not uploaded for every single
-            // index (collection) created in solr.
-            // if a generic configSet is not set, make the configset name the same as the collection.
-            // This was the default behavior before a default configSet could be specified
-            final String  genericConfigSet = config.has(SOLR_DEFAULT_CONFIG) ? config.get(SOLR_DEFAULT_CONFIG):collection;
+            case HTTP:
+                clientParams.add("allowCompression", new String[]{((Boolean)config.get(HTTP_ALLOW_COMPRESSION, new String[0])).toString()});
+                clientParams.add("connTimeout", new String[]{((Integer)config.get(HTTP_CONNECTION_TIMEOUT, new String[0])).toString()});
+                clientParams.add("maxConnectionsPerHost", new String[]{((Integer)config.get(HTTP_MAX_CONNECTIONS_PER_HOST, new String[0])).toString()});
+                clientParams.add("maxConnections", new String[]{((Integer)config.get(HTTP_GLOBAL_MAX_CONNECTIONS, new String[0])).toString()});
+                HttpClient client = HttpClientUtil.createClient(clientParams);
 
-            final CollectionAdminRequest.Create createRequest = CollectionAdminRequest.createCollection(collection, genericConfigSet, numShards, replicationFactor);
-            createRequest.setMaxShardsPerNode(maxShardsPerNode);
+                ret = new LBHttpSolrClient.Builder().withHttpClient(client).withBaseSolrUrls(config.get(HTTP_URLS)).build();
+                break;
 
-            final CollectionAdminResponse createResponse = createRequest.process(client);
-            if (createResponse.isSuccess()) {
-                logger.trace("Collection {} successfully created.", collection);
-            } else {
-                throw new SolrServerException(Joiner.on("\n").join(createResponse.getErrorMessages()));
-            }
+            default:
+                throw new IllegalArgumentException("Unsupported Solr operation mode: " + solrMode);
         }
 
-        waitForRecoveriesToFinish(client, collection);
-    }
-
-    /**
-     * Checks if the collection has already been created in Solr.
-     */
-    private static boolean checkIfCollectionExists(CloudSolrClient server, String collection) throws KeeperException, InterruptedException {
-        final ZkStateReader zkStateReader = server.getZkStateReader();
-        zkStateReader.forceUpdateCollection(collection);
-        final ClusterState clusterState = zkStateReader.getClusterState();
-        return clusterState.getCollectionOrNull(collection) != null;
-    }
-
-    /**
-     * Wait for all the collection shards to be ready.
-     */
-    private static void waitForRecoveriesToFinish(CloudSolrClient server, String collection) throws KeeperException, InterruptedException {
-        final ZkStateReader zkStateReader = server.getZkStateReader();
-        try {
-            boolean cont = true;
-
-            while (cont) {
-                boolean sawLiveRecovering = false;
-                zkStateReader.forceUpdateCollection(collection);
-                final ClusterState clusterState = zkStateReader.getClusterState();
-                final Map<String, Slice> slices = clusterState.getCollection(collection).getSlicesMap();
-                Preconditions.checkNotNull(slices, "Could not find collection:" + collection);
-
-                // change paths for Replica.State per Solr refactoring
-                // remove SYNC state per: http://tinyurl.com/pag6rwt
-                for (final Map.Entry<String, Slice> entry : slices.entrySet()) {
-                    final Map<String, Replica> shards = entry.getValue().getReplicasMap();
-                    for (final Map.Entry<String, Replica> shard : shards.entrySet()) {
-                        final String state = shard.getValue().getStr(ZkStateReader.STATE_PROP).toUpperCase();
-                        if ((Replica.State.RECOVERING.name().equals(state) || Replica.State.DOWN.name().equals(state))
-                                && clusterState.liveNodesContain(shard.getValue().getStr(
-                                ZkStateReader.NODE_NAME_PROP))) {
-                            sawLiveRecovering = true;
-                        }
-                    }
-                }
-
-
-                if (!sawLiveRecovering) {
-                    cont = false;
-                } else {
-                    Thread.sleep(1000);
-                }
-            }
-        } finally {
-            logger.info("Exiting solr wait");
-        }
+        return ret;
     }
 }
\ No newline at end of file
diff --git a/graphdb/janus/src/test/resources/atlas-application.properties b/graphdb/janus/src/test/resources/atlas-application.properties
index 5510a2ca9..f72edb462 100644
--- a/graphdb/janus/src/test/resources/atlas-application.properties
+++ b/graphdb/janus/src/test/resources/atlas-application.properties
@@ -32,6 +32,7 @@ atlas.graph.index.search.backend=${graph.index.backend}
 
 # Berkeley storage directory
 atlas.graph.storage.directory=${sys:atlas.data}/berkeley
+atlas.graph.storage.transactions=true
 
 # HBase
 # For standalone mode , specify localhost
diff --git a/graphdb/pom.xml b/graphdb/pom.xml
index 98806d26e..c4c85beed 100644
--- a/graphdb/pom.xml
+++ b/graphdb/pom.xml
@@ -36,7 +36,6 @@
         <module>api</module>
         <module>common</module>
         <module>graphdb-impls</module>
-        <module>janus-hbase2</module>
         <module>janus</module>
     </modules>
 
diff --git a/intg/src/test/resources/atlas-application.properties b/intg/src/test/resources/atlas-application.properties
index 1156abcca..7995a19d3 100644
--- a/intg/src/test/resources/atlas-application.properties
+++ b/intg/src/test/resources/atlas-application.properties
@@ -53,6 +53,7 @@ atlas.graph.index.search.backend=${graph.index.backend}
 
 #Berkeley storage directory
 atlas.graph.storage.directory=${sys:atlas.data}/berkley
+atlas.graph.storage.transactions=true
 
 #hbase
 #For standalone mode , specify localhost
diff --git a/notification/src/main/java/org/apache/atlas/hook/AtlasHook.java b/notification/src/main/java/org/apache/atlas/hook/AtlasHook.java
index 980d4feec..19479d0ad 100644
--- a/notification/src/main/java/org/apache/atlas/hook/AtlasHook.java
+++ b/notification/src/main/java/org/apache/atlas/hook/AtlasHook.java
@@ -100,7 +100,7 @@ public abstract class AtlasHook {
 
         String failedMessageFile = atlasProperties.getString(ATLAS_NOTIFICATION_FAILED_MESSAGES_FILENAME_KEY, ATLAS_HOOK_FAILED_MESSAGES_LOG_DEFAULT_NAME);
 
-        logFailedMessages = atlasProperties.getBoolean(ATLAS_NOTIFICATION_LOG_FAILED_MESSAGES_ENABLED_KEY, true);
+        logFailedMessages = atlasProperties.getBoolean(ATLAS_NOTIFICATION_LOG_FAILED_MESSAGES_ENABLED_KEY, false);
 
         if (logFailedMessages) {
             failedMessagesLogger = new FailedMessagesLogger(failedMessageFile);
diff --git a/pom.xml b/pom.xml
index 77eb31e9b..6e252e596 100644
--- a/pom.xml
+++ b/pom.xml
@@ -628,7 +628,7 @@
                 <entity.repository.impl>org.apache.atlas.repository.audit.HBaseBasedAuditRepository
                 </entity.repository.impl>
                 <graph.index.backend>solr</graph.index.backend>
-                <graph.storage.backend>hbase2</graph.storage.backend>
+                <graph.storage.backend>hbase</graph.storage.backend>
                 <graph.storage.hostname>localhost</graph.storage.hostname>
                 <solr.zk.address>localhost:9983</solr.zk.address>
             </properties>
@@ -730,7 +730,7 @@
         <curator.version>4.3.0</curator.version>
         <doxia.version>1.8</doxia.version>
         <dropwizard-metrics>3.2.2</dropwizard-metrics>
-        <elasticsearch.version>7.6.0</elasticsearch.version>
+        <elasticsearch.version>7.17.8</elasticsearch.version>
         <entity.repository.impl>org.apache.atlas.repository.audit.InMemoryEntityAuditRepository</entity.repository.impl>
         <enunciate-maven-plugin.version>2.13.2</enunciate-maven-plugin.version>
         <failsafe.version>2.18.1</failsafe.version>
@@ -742,17 +742,18 @@
         <guava.version>25.1-jre</guava.version>
         <guice.version>4.1.0</guice.version>
         <hadoop.hdfs-client.version>${hadoop.version}</hadoop.hdfs-client.version>
-        <hadoop.version>3.3.0</hadoop.version>
-        <hbase.version>2.3.3</hbase.version>
-        <hive.version>3.1.2</hive.version>
+        <hadoop.version>3.3.6</hadoop.version>
+        <hbase.version>2.6.0</hbase.version>
+        <hive.version>3.1.3</hive.version>
         <hppc.version>0.8.1</hppc.version>
         <httpcomponents-httpclient.version>4.5.13</httpcomponents-httpclient.version>
         <httpcomponents-httpcore.version>4.4.13</httpcomponents-httpcore.version>
         <ivy.version>2.5.2</ivy.version>
-        <jackson.databind.version>2.11.3</jackson.databind.version>
-        <jackson.version>2.11.3</jackson.version>
-        <janusgraph.version>0.6.4</janusgraph.version>
+        <jackson.databind.version>2.12.7</jackson.databind.version>
+        <jackson.version>2.12.7</jackson.version>
+        <janusgraph.version>1.0.0</janusgraph.version>
         <janusgraph.cassandra.version>0.5.3</janusgraph.cassandra.version>
+        <jaxb.api.version>2.3.1</jaxb.api.version>
         <javax-inject.version>1</javax-inject.version>
         <javax.servlet.version>3.1.0</javax.servlet.version>
         <java.version.required>1.8</java.version.required>
@@ -762,18 +763,18 @@
         <jersey.version>1.19</jersey.version>
         <jettison.version>1.5.4</jettison.version>
         <jetty-maven-plugin.stopWait>10</jetty-maven-plugin.stopWait>
-        <jetty.version>9.4.31.v20200723</jetty.version>
+        <jetty.version>9.4.53.v20231009</jetty.version>
         <joda-time.version>2.10.6</joda-time.version>
         <json.version>3.2.11</json.version>
         <json-simple.version>1.1.1</json-simple.version>
         <jsr.version>1.1</jsr.version>
         <junit.version>4.13.2</junit.version>
         <kafka.scala.binary.version>2.12</kafka.scala.binary.version>
-        <kafka.version>2.8.1</kafka.version>
+        <kafka.version>2.8.2</kafka.version>
         <keycloak.version>6.0.1</keycloak.version>
         <log4j.version>1.2.17</log4j.version>
         <log4j2.version>2.17.1</log4j2.version>
-        <lucene-solr.version>8.6.3</lucene-solr.version>
+        <lucene-solr.version>8.11.3</lucene-solr.version>
         <maven-site-plugin.version>3.7</maven-site-plugin.version>
         <MaxPermGen>512m</MaxPermGen>
         <netty.version>4.1.100.Final</netty.version>
@@ -798,8 +799,8 @@
         <skipTests>false</skipTests>
         <skipUTs>false</skipUTs>
         <slf4j.version>1.7.30</slf4j.version>
-        <solr-test-framework.version>8.6.3</solr-test-framework.version>
-        <solr.version>8.6.3</solr.version>
+        <solr-test-framework.version>8.11.3</solr-test-framework.version>
+        <solr.version>8.11.3</solr.version>
         <spray.version>1.3.1</spray.version>
         <spring.security.version>5.8.11</spring.security.version>
         <spring.version>5.3.27</spring.version>
@@ -808,9 +809,9 @@
         <surefire.forkCount>2C</surefire.forkCount>
         <surefire.version>3.0.0-M5</surefire.version>
         <testng.version>7.0.0</testng.version>
-        <tinkerpop.version>3.5.7</tinkerpop.version>
+        <tinkerpop.version>3.7.0</tinkerpop.version>
         <woodstox-core.version>5.0.3</woodstox-core.version>
-        <zookeeper.version>3.5.7</zookeeper.version>
+        <zookeeper.version>3.9.2</zookeeper.version>
     </properties>
 
     <modules>
@@ -949,6 +950,12 @@
                 <version>${slf4j.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+                <version>${jaxb.api.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
diff --git a/repository/src/test/java/org/apache/atlas/discovery/AtlasDiscoveryServiceTest.java b/repository/src/test/java/org/apache/atlas/discovery/AtlasDiscoveryServiceTest.java
index fb94aaedc..9820ebe0f 100644
--- a/repository/src/test/java/org/apache/atlas/discovery/AtlasDiscoveryServiceTest.java
+++ b/repository/src/test/java/org/apache/atlas/discovery/AtlasDiscoveryServiceTest.java
@@ -373,23 +373,26 @@ public class AtlasDiscoveryServiceTest extends BasicTestSetup {
         SearchParameters params = new SearchParameters();
         params.setTypeName(HIVE_TABLE_TYPE);
         params.setExcludeDeletedEntities(true);
+        params.setMarker(SearchContext.MarkerUtil.MARKER_START);
+
+        int totalCount = discoveryService.searchWithParameters(params).getEntities().size();
+
         params.setMarker(SearchContext.MarkerUtil.MARKER_START);
         params.setLimit(5);
-        AtlasSearchResult searchResult        = discoveryService.searchWithParameters(params);
+
+        AtlasSearchResult       searchResult  = discoveryService.searchWithParameters(params);
         List<AtlasEntityHeader> entityHeaders = searchResult.getEntities();
 
         Assert.assertTrue(CollectionUtils.isNotEmpty(entityHeaders));
         assertEquals(entityHeaders.size(), 5);
         Assert.assertTrue(StringUtils.isNotEmpty(searchResult.getNextMarker()));
 
-        long maxEntities = searchResult.getApproximateCount();
-
         //get next marker and set in marker of subsequent request
         params.setMarker(SearchContext.MarkerUtil.MARKER_START);
-        params.setLimit((int)maxEntities + 10);
+        params.setLimit(totalCount + 10);
         AtlasSearchResult nextsearchResult = discoveryService.searchWithParameters(params);
 
-        Assert.assertTrue(nextsearchResult.getNextMarker().equals("-1"));
+        Assert.assertEquals(nextsearchResult.getNextMarker(), "-1");
     }
 
 
diff --git a/repository/src/test/java/org/apache/atlas/query/TraversalComposerTest.java b/repository/src/test/java/org/apache/atlas/query/TraversalComposerTest.java
index 5950d5562..ae21f8756 100644
--- a/repository/src/test/java/org/apache/atlas/query/TraversalComposerTest.java
+++ b/repository/src/test/java/org/apache/atlas/query/TraversalComposerTest.java
@@ -53,7 +53,7 @@ public class TraversalComposerTest extends BaseDSLComposer {
                 "[JanusGraphStep([],[__typeName.eq(DB)]), DedupGlobalStep(null,null)@[d], RangeGlobalStep(0,25)]");
 
         verify("Table groupby(owner) select name, owner, clusterName orderby name",
-                "[JanusGraphStep([],[__typeName.eq(Table), Table.owner.neq]), GroupStep(value([CoalesceStep([value(Table.owner), (null)])]),[FoldStep]), DedupGlobalStep(null,null), RangeGlobalStep(0,25)]");
+                "[JanusGraphStep([],[__typeName.eq(Table), Table.owner.neq]), GroupStep(value(Table.owner),[FoldStep]), DedupGlobalStep(null,null), RangeGlobalStep(0,25)]");
 
         verify("hive_column where name = 'test'",
                 "[JanusGraphStep([],[__typeName.eq(hive_column), hive_column.name.eq(test)]), DedupGlobalStep(null,null), RangeGlobalStep(0,25)]");
@@ -71,7 +71,7 @@ public class TraversalComposerTest extends BaseDSLComposer {
                 "[JanusGraphStep([],[__typeName.eq(hive_column), hive_column.name.eq(test_limit)]), DedupGlobalStep(null,null), DedupGlobalStep(null,null), RangeGlobalStep(4,6)]");
 
         verify("hive_db where owner != 'hdfs'",
-                "[JanusGraphStep([],[__typeName.eq(hive_db)]), OrStep([[HasStep([hive_db.owner.neq(hdfs)])], [NotStep([JanusGraphPropertiesStep([hive_db.owner],property)])]]), DedupGlobalStep(null,null), RangeGlobalStep(0,25)]");
+                "[JanusGraphStep([],[__typeName.eq(hive_db)]), JanusGraphMultiQueryStep, NoOpBarrierStep(2500), OrStep([[JanusGraphHasStep([hive_db.owner.neq(hdfs)])], [NotStep([JanusGraphPropertiesStep([hive_db.owner],property)])]]), DedupGlobalStep(null,null), RangeGlobalStep(0,25)]");
     }
 
     private void verify(String dsl, String expected) {
diff --git a/test-tools/pom.xml b/test-tools/pom.xml
index 3ce47b012..45cd881e9 100644
--- a/test-tools/pom.xml
+++ b/test-tools/pom.xml
@@ -68,8 +68,17 @@
                     <groupId>org.apache.commons</groupId>
                     <artifactId>commons-configuration2</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.apache.zookeeper</groupId>
+                    <artifactId>zookeeper-jute</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.apache.zookeeper</groupId>
+            <artifactId>zookeeper-jute</artifactId>
+            <version>${zookeeper.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>com.vividsolutions</groupId>
diff --git a/tools/atlas-index-repair/pom.xml b/tools/atlas-index-repair/pom.xml
index dd9c4fcd2..c5af97071 100644
--- a/tools/atlas-index-repair/pom.xml
+++ b/tools/atlas-index-repair/pom.xml
@@ -59,6 +59,10 @@
                     <groupId>com.rabbitmq</groupId>
                     <artifactId>amqp-client</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.noggit</groupId>
+                    <artifactId>noggit</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
diff --git a/webapp/pom.xml b/webapp/pom.xml
index f90b0326e..8ab25cc6b 100755
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -151,18 +151,6 @@
             <artifactId>atlas-intg</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.atlas</groupId>
-            <artifactId>atlas-janusgraph-hbase2</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-              <exclusion>
-                <groupId>org.noggit</groupId>
-                <artifactId>noggit</artifactId>
-              </exclusion>
-            </exclusions>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-common</artifactId>
diff --git a/webapp/src/main/java/org/apache/atlas/web/service/AtlasDebugMetricsSink.java b/webapp/src/main/java/org/apache/atlas/web/service/AtlasDebugMetricsSink.java
index ef24b861e..14d99fbc8 100644
--- a/webapp/src/main/java/org/apache/atlas/web/service/AtlasDebugMetricsSink.java
+++ b/webapp/src/main/java/org/apache/atlas/web/service/AtlasDebugMetricsSink.java
@@ -19,6 +19,7 @@ package org.apache.atlas.web.service;
 
 import org.apache.atlas.web.model.DebugMetrics;
 import org.apache.commons.lang.StringUtils;
+import org.apache.hadoop.hbase.shaded.org.apache.commons.configuration2.SubsetConfiguration;
 import org.apache.hadoop.metrics2.AbstractMetric;
 import org.apache.hadoop.metrics2.MetricsRecord;
 import org.apache.hadoop.metrics2.MetricsSink;
@@ -59,7 +60,7 @@ public class AtlasDebugMetricsSink implements MetricsSink {
     }
 
     @Override
-    public void init(org.apache.commons.configuration2.SubsetConfiguration subsetConfiguration) {
+    public void init(SubsetConfiguration subsetConfiguration) {
     }
 
     @Override
diff --git a/webapp/src/test/java/org/apache/atlas/web/integration/DebugMetricsIT.java b/webapp/src/test/java/org/apache/atlas/web/integration/DebugMetricsIT.java
index 3c614d480..7c2244623 100644
--- a/webapp/src/test/java/org/apache/atlas/web/integration/DebugMetricsIT.java
+++ b/webapp/src/test/java/org/apache/atlas/web/integration/DebugMetricsIT.java
@@ -29,7 +29,7 @@ import javax.ws.rs.HttpMethod;
 import javax.ws.rs.core.Response;
 import java.util.HashMap;
 
-import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
 public class DebugMetricsIT extends BaseResourceIT {
@@ -71,7 +71,7 @@ public class DebugMetricsIT extends BaseResourceIT {
             if(newCreateOrUpdateDTO != null) {
                 newCreateOrUpdateCount = newCreateOrUpdateDTO.getNumops();
             }
-            assertEquals(newCreateOrUpdateCount, (currentCreateOrUpdateCount + 2), "Count didn't increase after making API call");
+            assertTrue(newCreateOrUpdateCount > currentCreateOrUpdateCount, "Count didn't increase after making API call: expected [" + (currentCreateOrUpdateCount + 2) + "] but found [" + newCreateOrUpdateCount + "]");
         } catch (Exception e) {
             fail("Caught exception while running the test: " + e.getMessage(), e);
         }
diff --git a/webapp/src/test/resources/atlas-application.properties b/webapp/src/test/resources/atlas-application.properties
index b863ed84b..b5c707ed1 100644
--- a/webapp/src/test/resources/atlas-application.properties
+++ b/webapp/src/test/resources/atlas-application.properties
@@ -36,6 +36,7 @@ atlas.graph.index.search.backend=solr
 
 #Berkeley storage directory
 atlas.graph.storage.directory=${sys:atlas.data}/berkley
+atlas.graph.storage.transactions=true
 
 #hbase
 #For standalone mode , specify localhost