Merge branch 'master' into SNAP-2643

Author: Trilok Khairnar

core/src/main/java/io/snappydata/impl/SnappyHiveCatalog.java

@@ -435,8 +435,7 @@ private Object invoke() throws Exception {
               try {
                 Table table = hmc.getTable(schema, tableName);
                 Properties metadata = table.getMetadata();
-                String tblDataSourcePath = metadata.getProperty("path");
-                tblDataSourcePath = tblDataSourcePath == null ? "" : tblDataSourcePath;
+                String tblDataSourcePath = getDataSourcePath(metadata);
                 String driverClass = metadata.getProperty("driver");
                 driverClass = ((driverClass == null) || driverClass.isEmpty()) ? "" : driverClass;
                 String tableType = ExternalTableType.getTableType(table);
@@ -570,9 +569,9 @@ private Object invoke() throws Exception {
           value = parameters.get(ExternalStoreUtils.COMPRESSION_CODEC());
           String compressionCodec = value == null ? Constant.DEFAULT_CODEC() : value.toString();
           String tableType = ExternalTableType.getTableType(table);
-          String tblDataSourcePath = table.getMetadata().getProperty("path");
-          tblDataSourcePath = tblDataSourcePath == null ? "" : tblDataSourcePath;
-          String driverClass = table.getMetadata().getProperty("driver");
+          Properties metadata = table.getMetadata();
+          String tblDataSourcePath = getDataSourcePath(metadata);
+          String driverClass = metadata.getProperty("driver");
           driverClass = ((driverClass == null) || driverClass.isEmpty()) ? "" : driverClass;
           return new ExternalTableMetaData(
               fullyQualifiedName,
@@ -687,6 +686,15 @@ private Table getTable(Hive hmc, String dbName, String tableName) throws SQLExce
       }
     }
 
+    private String getDataSourcePath(Properties metadata) {
+      String dataSourcePath = metadata.getProperty("path");
+      if (dataSourcePath == null || dataSourcePath.isEmpty()) {
+        // for external connectors like GemFire
+        dataSourcePath = metadata.getProperty("region.path");
+      }
+      return dataSourcePath != null ? dataSourcePath : "";
+    }
+
     private String getType(Hive hmc) throws SQLException {
       return ExternalTableType.getTableType(getTable(hmc, this.dbName, this.tableName));
     }