[REBASE] Solve conflict after rebasing master
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/ef812484 Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/ef812484 Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/ef812484 Branch: refs/heads/carbonstore-rebase5 Commit: ef812484f159945cd7e8921965698f67a6d53a52 Parents: 8fcde02 Author: Jacky Li <jacky.li...@qq.com> Authored: Fri Feb 9 01:39:20 2018 +0800 Committer: Jacky Li <jacky.li...@qq.com> Committed: Sun Mar 4 19:52:34 2018 +0800 ---------------------------------------------------------------------- .../filter/executer/FalseFilterExecutor.java | 10 +++++---- .../core/util/path/CarbonTablePath.java | 23 +++++++------------- .../CarbonAlterTableDataTypeChangeCommand.scala | 7 +++--- .../schema/CarbonAlterTableRenameCommand.scala | 3 ++- .../apache/spark/sql/hive/CarbonMetaStore.scala | 9 +++++--- .../processing/util/CarbonLoaderUtil.java | 4 ++-- 6 files changed, 28 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata/blob/ef812484/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/FalseFilterExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/FalseFilterExecutor.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/FalseFilterExecutor.java index 1c918bc..ee3b0fc 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/FalseFilterExecutor.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/FalseFilterExecutor.java @@ -44,17 +44,19 @@ public class FalseFilterExecutor implements FilterExecuter { return group; } - @Override public boolean applyFilter(RowIntf value, int dimOrdinalMax) + @Override + public boolean applyFilter(RowIntf value, int dimOrdinalMax) throws FilterUnsupportedException, IOException { return false; } - @Override public BitSet isScanRequired(byte[][] blockMaxValue, byte[][] blockMinValue) { - + @Override + public BitSet isScanRequired(byte[][] blockMaxValue, byte[][] blockMinValue) { return new BitSet(); } - @Override public void readColumnChunks(RawBlockletColumnChunks blockChunkHolder) { + @Override + public void readColumnChunks(RawBlockletColumnChunks blockChunkHolder) { // Do Nothing } } http://git-wip-us.apache.org/repos/asf/carbondata/blob/ef812484/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java b/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java index b7b5e43..50c5a31 100644 --- a/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java +++ b/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java @@ -36,13 +36,13 @@ public class CarbonTablePath { private static final String DICTIONARY_META_EXT = ".dictmeta"; private static final String SORT_INDEX_EXT = ".sortindex"; private static final String SCHEMA_FILE = "schema"; - public static final String TABLE_STATUS_FILE = "tablestatus"; private static final String FACT_DIR = "Fact"; private static final String SEGMENT_PREFIX = "Segment_"; private static final String PARTITION_PREFIX = "Part"; private static final String DATA_PART_PREFIX = "part-"; private static final String BATCH_PREFIX = "_batchno"; + public static final String TABLE_STATUS_FILE = "tablestatus"; public static final String CARBON_DATA_EXT = ".carbondata"; public static final String INDEX_FILE_EXT = ".carbonindex"; public static final String MERGE_INDEX_FILE_EXT = ".carbonindexmerge"; @@ -140,20 +140,6 @@ public class CarbonTablePath { } /** - * Return metadata path based on `tablePath` - */ - public static String getTableStatusPath(String tablePath) { - return getMetadataPath(tablePath) + File.separator + TABLE_STATUS_FILE; - } - - /** - * Return table status file path based on `tablePath` - */ - public static String getTableStatusFilePath(String tablePath) { - return getMetadataPath(tablePath) + CarbonCommonConstants.FILE_SEPARATOR + TABLE_STATUS_FILE; - } - - /** * Return absolute path of dictionary meta file */ public static String getExternalDictionaryMetaFilePath(String dictionaryPath, String columnId) { @@ -213,6 +199,13 @@ public class CarbonTablePath { } } + /** + * Return absolute path of table status file + */ + public static String getTableStatusFilePath(String tablePath) { + return getMetadataPath(tablePath) + File.separator + TABLE_STATUS_FILE; + } + public static String getTableStatusFilePathWithUUID(String tablePath, String uuid) { if (!uuid.isEmpty()) { return getTableStatusFilePath(tablePath) + CarbonCommonConstants.UNDERSCORE + uuid; http://git-wip-us.apache.org/repos/asf/carbondata/blob/ef812484/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/schema/CarbonAlterTableDataTypeChangeCommand.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/schema/CarbonAlterTableDataTypeChangeCommand.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/schema/CarbonAlterTableDataTypeChangeCommand.scala index 8b0d75f..4ef0df9 100644 --- a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/schema/CarbonAlterTableDataTypeChangeCommand.scala +++ b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/schema/CarbonAlterTableDataTypeChangeCommand.scala @@ -73,10 +73,11 @@ private[sql] case class CarbonAlterTableDataTypeChangeCommand( throwMetadataException(dbName, tableName, s"Invalid Column: $columnName") } // read the latest schema file - val tableInfo: TableInfo = metastore.getThriftTableInfo(carbonTable)(sparkSession) + val tableInfo: org.apache.carbondata.format.TableInfo = + metastore.getThriftTableInfo(carbonTable)(sparkSession) // maintain the added column for schema evolution history - var addColumnSchema: ColumnSchema = null - var deletedColumnSchema: ColumnSchema = null + var addColumnSchema: org.apache.carbondata.format.ColumnSchema = null + var deletedColumnSchema: org.apache.carbondata.format.ColumnSchema = null val columnSchemaList = tableInfo.fact_table.table_columns.asScala.filter(!_.isInvisible) columnSchemaList.foreach { columnSchema => if (columnSchema.column_name.equalsIgnoreCase(columnName)) { http://git-wip-us.apache.org/repos/asf/carbondata/blob/ef812484/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/schema/CarbonAlterTableRenameCommand.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/schema/CarbonAlterTableRenameCommand.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/schema/CarbonAlterTableRenameCommand.scala index 753e637..9fde675 100644 --- a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/schema/CarbonAlterTableRenameCommand.scala +++ b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/schema/CarbonAlterTableRenameCommand.scala @@ -168,7 +168,8 @@ private[sql] case class CarbonAlterTableRenameCommand( updatedParts) } - newTablePath = metastore.updateTableSchemaForAlter(newTableIdentifier, + newTablePath = metastore.updateTableSchemaForAlter( + newTableIdentifier, carbonTable.getCarbonTableIdentifier, tableInfo, schemaEvolutionEntry, http://git-wip-us.apache.org/repos/asf/carbondata/blob/ef812484/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonMetaStore.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonMetaStore.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonMetaStore.scala index 2c55e12..fc5bdac 100644 --- a/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonMetaStore.scala +++ b/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonMetaStore.scala @@ -67,7 +67,8 @@ trait CarbonMetaStore { * @param carbonStorePath * @param sparkSession */ - def updateTableSchemaForAlter(newTableIdentifier: CarbonTableIdentifier, + def updateTableSchemaForAlter( + newTableIdentifier: CarbonTableIdentifier, oldTableIdentifier: CarbonTableIdentifier, thriftTableInfo: org.apache.carbondata.format.TableInfo, schemaEvolutionEntry: SchemaEvolutionEntry, @@ -126,7 +127,8 @@ trait CarbonMetaStore { def removeTableFromMetadata(dbName: String, tableName: String): Unit def updateMetadataByThriftTable(schemaFilePath: String, - tableInfo: TableInfo, dbName: String, tableName: String, tablePath: String): Unit + tableInfo: org.apache.carbondata.format.TableInfo, + dbName: String, tableName: String, tablePath: String): Unit def isTablePathExists(tableIdentifier: TableIdentifier)(sparkSession: SparkSession): Boolean @@ -141,7 +143,8 @@ trait CarbonMetaStore { def listAllTables(sparkSession: SparkSession): Seq[CarbonTable] - def getThriftTableInfo(carbonTable: CarbonTable)(sparkSession: SparkSession): TableInfo + def getThriftTableInfo(carbonTable: CarbonTable)(sparkSession: SparkSession): + org.apache.carbondata.format.TableInfo def getTableFromMetadataCache(database: String, tableName: String): Option[CarbonTable] http://git-wip-us.apache.org/repos/asf/carbondata/blob/ef812484/processing/src/main/java/org/apache/carbondata/processing/util/CarbonLoaderUtil.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/util/CarbonLoaderUtil.java b/processing/src/main/java/org/apache/carbondata/processing/util/CarbonLoaderUtil.java index 276c3fe..3302094 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/util/CarbonLoaderUtil.java +++ b/processing/src/main/java/org/apache/carbondata/processing/util/CarbonLoaderUtil.java @@ -323,10 +323,10 @@ public final class CarbonLoaderUtil { * @return boolean which determines whether status update is done or not. * @throws IOException */ - public static boolean updateSegmentFile(String tablePath, String segmentId, String segmentFile) + private static boolean updateSegmentFile(String tablePath, String segmentId, String segmentFile) throws IOException { boolean status = false; - String tableStatusPath = CarbonTablePath.getTableStatusPath(tablePath); + String tableStatusPath = CarbonTablePath.getTableStatusFilePath(tablePath); String metadataPath = CarbonTablePath.getMetadataPath(tablePath); AbsoluteTableIdentifier absoluteTableIdentifier = AbsoluteTableIdentifier.from(tablePath, null, null);