added a catalog API which can be extended by any external catalog

Author: kunal642

core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java

@@ -2876,4 +2876,7 @@ private CarbonCommonConstants() {
 
   public static final String CARBON_ENABLE_SCHEMA_ENFORCEMENT_DEFAULT = "true";
 
+  @CarbonProperty
+  public static final String CARBON_CATALOG_IMPL = "carbon.catalog.impl";
+
 }

core/src/main/java/org/apache/carbondata/core/metadata/converter/SchemaConverter.java

@@ -61,8 +61,7 @@ org.apache.carbondata.format.TableSchema fromWrapperToExternalTableSchema(
    * @param tableName
    * @return
    */
-  org.apache.carbondata.format.TableInfo fromWrapperToExternalTableInfo(TableInfo wrapperTableInfo,
-      String dbName, String tableName);
+  org.apache.carbondata.format.TableInfo fromWrapperToExternalTableInfo(TableInfo wrapperTableInfo);
 
   /**
    * @param externalSchemaEvolutionEntry

core/src/main/java/org/apache/carbondata/core/metadata/converter/ThriftWrapperSchemaConverterImpl.java

@@ -306,7 +306,7 @@ private org.apache.carbondata.format.BucketingInfo fromWrapperToExternalBucketin
    */
   @Override
   public org.apache.carbondata.format.TableInfo fromWrapperToExternalTableInfo(
-      TableInfo wrapperTableInfo, String dbName, String tableName) {
+      TableInfo wrapperTableInfo) {
     org.apache.carbondata.format.TableSchema thriftFactTable =
         fromWrapperToExternalTableSchema(wrapperTableInfo.getFactTable());
     return new org.apache.carbondata.format.TableInfo(thriftFactTable, new ArrayList<>());

core/src/test/java/org/apache/carbondata/core/metadata/converter/ThriftWrapperSchemaConverterImplTest.java

@@ -1425,7 +1425,7 @@ public List<org.apache.carbondata.format.SchemaEvolutionEntry> getSchema_evoluti
     org.apache.carbondata.format.TableSchema thriftFactTable =
         new org.apache.carbondata.format.TableSchema("tableId", thriftColumnSchemas, schemaEvol);
     org.apache.carbondata.format.TableInfo actualResult = thriftWrapperSchemaConverter
-        .fromWrapperToExternalTableInfo(wrapperTableInfo, dbName, tableName);
+        .fromWrapperToExternalTableInfo(wrapperTableInfo);
     org.apache.carbondata.format.TableInfo expectedResult =
         new org.apache.carbondata.format.TableInfo(thriftFactTable, new ArrayList<org.apache
             .carbondata.format.TableSchema>());

core/src/test/java/org/apache/carbondata/core/metadata/schema/table/TableInfoTest.java

@@ -93,8 +93,7 @@ private TableInfo getTableInfo(String databaseName, String tableName) {
     CarbonTable carbonTable = CarbonTable.buildFromTableInfo(tableInfo);
     ThriftWrapperSchemaConverterImpl schemaConverter = new ThriftWrapperSchemaConverterImpl();
     org.apache.carbondata.format.TableInfo thriftTable = schemaConverter
-        .fromWrapperToExternalTableInfo(carbonTable.getTableInfo(), carbonTable.getDatabaseName(),
-            carbonTable.getTableName());
+        .fromWrapperToExternalTableInfo(carbonTable.getTableInfo());
     assertTrue(null != thriftTable);
   }
 
@@ -135,8 +134,7 @@ private TableInfo getTableInfo(String databaseName, String tableName) {
     CarbonTable carbonTable = CarbonTable.buildFromTableInfo(tableInfo);
     ThriftWrapperSchemaConverterImpl schemaConverter = new ThriftWrapperSchemaConverterImpl();
     org.apache.carbondata.format.TableInfo thriftTable = schemaConverter
-        .fromWrapperToExternalTableInfo(carbonTable.getTableInfo(), carbonTable.getDatabaseName(),
-            carbonTable.getTableName());
+        .fromWrapperToExternalTableInfo(carbonTable.getTableInfo());
     assertTrue(null != thriftTable);
   }
 

examples/spark/pom.xml

@@ -200,9 +200,6 @@
     </profile>
     <profile>
       <id>spark-2.3</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
       <properties>
         <spark.binary.version>2.3</spark.binary.version>
       </properties>
@@ -215,6 +212,9 @@
     </profile>
     <profile>
       <id>spark-3.1</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
       <properties>
         <spark.binary.version>3.1</spark.binary.version>
         <dep.jackson.version>2.10.0</dep.jackson.version>

hadoop/src/main/java/org/apache/carbondata/hadoop/testutil/StoreCreator.java

@@ -228,10 +228,7 @@ public CarbonTable createTable(
 
     SchemaConverter schemaConverter = new ThriftWrapperSchemaConverterImpl();
     org.apache.carbondata.format.TableInfo thriftTableInfo =
-        schemaConverter.fromWrapperToExternalTableInfo(
-            tableInfo,
-            tableInfo.getDatabaseName(),
-            tableInfo.getFactTable().getTableName());
+        schemaConverter.fromWrapperToExternalTableInfo(tableInfo);
     org.apache.carbondata.format.SchemaEvolutionEntry schemaEvolutionEntry =
         new org.apache.carbondata.format.SchemaEvolutionEntry(tableInfo.getLastUpdatedTime());
     thriftTableInfo.getFact_table().getSchema_evolution().getSchema_evolution_history()

index/secondary-index/pom.xml

@@ -158,9 +158,6 @@
     </profile>
     <profile>
       <id>spark-2.3</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
       <properties>
         <spark.binary.version>2.3</spark.binary.version>
       </properties>
@@ -173,6 +170,9 @@
     </profile>
     <profile>
       <id>spark-3.1</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
       <properties>
         <spark.binary.version>3.1</spark.binary.version>
       </properties>

integration/flink/pom.xml

@@ -220,9 +220,6 @@
     <profiles>
         <profile>
             <id>spark-2.3</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
             <properties>
                 <spark.binary.version>2.3</spark.binary.version>
             </properties>
@@ -263,6 +260,9 @@
         </profile>
       <profile>
         <id>spark-3.1</id>
+          <activation>
+              <activeByDefault>true</activeByDefault>
+          </activation>
         <properties>
           <spark.binary.version>3.1</spark.binary.version>
         </properties>

integration/hive/src/main/java/org/apache/carbondata/hive/util/HiveCarbonUtil.java

@@ -255,8 +255,7 @@ private static void writeSchemaFile(TableInfo tableInfo) throws IOException {
     ThriftWriter thriftWriter = new ThriftWriter(schemaFilePath, false);
     thriftWriter.open(FileWriteOperation.OVERWRITE);
     thriftWriter.write(schemaConverter
-        .fromWrapperToExternalTableInfo(tableInfo, tableInfo.getDatabaseName(),
-            tableInfo.getFactTable().getTableName()));
+        .fromWrapperToExternalTableInfo(tableInfo));
     thriftWriter.close();
   }