http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonIUDMergerRDD.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonIUDMergerRDD.scala b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonIUDMergerRDD.scala index 0394d31..11eb0c8 100644 --- a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonIUDMergerRDD.scala +++ b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonIUDMergerRDD.scala @@ -27,8 +27,9 @@ import org.apache.hadoop.mapreduce.Job import org.apache.spark.{Partition, SparkContext} import org.apache.spark.sql.execution.command.CarbonMergerMapping -import org.apache.carbondata.core.{AbsoluteTableIdentifier, CarbonTableIdentifier} +import org.apache.carbondata.core.metadata.CarbonTableIdentifier import org.apache.carbondata.core.datastore.block.{Distributable, TableBlockInfo} +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, CarbonTableIdentifier} import org.apache.carbondata.hadoop.{CarbonInputFormat, CarbonInputSplit, CarbonMultiBlockSplit} import org.apache.carbondata.hadoop.util.CarbonInputFormatUtil import org.apache.carbondata.processing.model.CarbonLoadModel
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonMergerRDD.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonMergerRDD.scala b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonMergerRDD.scala index 4acef95..523ed96 100644 --- a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonMergerRDD.scala +++ b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonMergerRDD.scala @@ -34,22 +34,22 @@ import org.apache.spark.sql.execution.command.{CarbonMergerMapping, NodeInfo} import org.apache.spark.sql.hive.DistributionUtil import org.apache.carbondata.common.logging.LogServiceFactory -import org.apache.carbondata.core.{AbsoluteTableIdentifier, CarbonTableIdentifier} -import org.apache.carbondata.core.datastore.block.{Distributable, SegmentProperties, TableBlockInfo, TableTaskInfo, TaskBlockInfo} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.block._ import org.apache.carbondata.core.metadata.blocklet.DataFileFooter +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, CarbonTableIdentifier} import org.apache.carbondata.core.path.CarbonTablePath -import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.scan.result.iterator.RawResultIterator +import org.apache.carbondata.core.update.data.UpdateVO import org.apache.carbondata.core.updatestatus.SegmentUpdateStatusManager import org.apache.carbondata.core.util.{CarbonProperties, CarbonUtil} -import org.apache.carbondata.hadoop.{CarbonInputFormat, CarbonInputSplit, CarbonMultiBlockSplit} import org.apache.carbondata.hadoop.util.CarbonInputFormatUtil +import org.apache.carbondata.hadoop.{CarbonInputFormat, CarbonInputSplit, CarbonMultiBlockSplit} import org.apache.carbondata.processing.model.CarbonLoadModel import org.apache.carbondata.processing.util.CarbonDataProcessorUtil -import org.apache.carbondata.core.scan.result.iterator.RawResultIterator -import org.apache.carbondata.core.update.data.UpdateVO import org.apache.carbondata.spark.MergeResult import org.apache.carbondata.spark.load.CarbonLoaderUtil -import org.apache.carbondata.spark.merger.{CarbonCompactionExecutor, CarbonCompactionUtil, CarbonDataMergerUtil, CompactionType, RowResultMerger} +import org.apache.carbondata.spark.merger.{CarbonCompactionExecutor, CarbonCompactionUtil, CompactionType, RowResultMerger} import org.apache.carbondata.spark.splits.TableSplit class CarbonMergerRDD[K, V]( http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonScanRDD.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonScanRDD.scala b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonScanRDD.scala index 2ac8ee3..c7bbfa9 100644 --- a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonScanRDD.scala +++ b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonScanRDD.scala @@ -31,8 +31,8 @@ import org.apache.spark.sql.catalyst.InternalRow import org.apache.spark.sql.hive.DistributionUtil import org.apache.carbondata.common.logging.LogServiceFactory -import org.apache.carbondata.core.AbsoluteTableIdentifier import org.apache.carbondata.core.datastore.block.Distributable +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier import org.apache.carbondata.core.metadata.schema.table.CarbonTable import org.apache.carbondata.core.stats.{QueryStatistic, QueryStatisticsConstants, QueryStatisticsRecorder} import org.apache.carbondata.core.util.CarbonTimeStatisticsFactory http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/DataManagementFunc.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/DataManagementFunc.scala b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/DataManagementFunc.scala index 8e80ab5..de57639 100644 --- a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/DataManagementFunc.scala +++ b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/DataManagementFunc.scala @@ -27,15 +27,14 @@ import org.apache.spark.sql.SQLContext import org.apache.spark.sql.execution.command.{CompactionCallableModel, CompactionModel} import org.apache.carbondata.common.logging.LogServiceFactory -import org.apache.carbondata.core.{CarbonDataLoadSchema, CarbonTableIdentifier} -import org.apache.carbondata.core.metadata.CarbonMetadata +import org.apache.carbondata.core.metadata.{CarbonMetadata, CarbonTableIdentifier} import org.apache.carbondata.core.metadata.schema.table.CarbonTable import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.load.LoadMetadataDetails import org.apache.carbondata.core.update.CarbonUpdateUtil import org.apache.carbondata.core.updatestatus.SegmentStatusManager -import org.apache.carbondata.locks.{CarbonLockFactory, CarbonLockUtil, LockUsage} -import org.apache.carbondata.processing.model.CarbonLoadModel +import org.apache.carbondata.core.updatestatus.locks.{CarbonLockFactory, CarbonLockUtil, LockUsage} +import org.apache.carbondata.processing.model.{CarbonDataLoadSchema, CarbonLoadModel} import org.apache.carbondata.spark._ import org.apache.carbondata.spark.load._ import org.apache.carbondata.spark.merger.{CarbonDataMergerUtil, CompactionCallable, CompactionType} http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtil.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtil.scala b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtil.scala index 013cb9b..708e9b6 100644 --- a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtil.scala +++ b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtil.scala @@ -37,10 +37,8 @@ import org.apache.spark.sql.types.{StringType, StructField, StructType} import org.apache.spark.util.FileUtils import org.apache.carbondata.common.logging.LogServiceFactory -import org.apache.carbondata.core.CarbonTableIdentifier import org.apache.carbondata.core.cache.dictionary.Dictionary -import org.apache.carbondata.core.metadata.DataType -import org.apache.carbondata.core.metadata.Encoding +import org.apache.carbondata.core.metadata.{CarbonTableIdentifier, DataType, Encoding} import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension import org.apache.carbondata.core.path.CarbonStorePath import org.apache.carbondata.core.constants.CarbonCommonConstants http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark/src/main/java/org/apache/carbondata/spark/readsupport/SparkRowReadSupportImpl.java ---------------------------------------------------------------------- diff --git a/integration/spark/src/main/java/org/apache/carbondata/spark/readsupport/SparkRowReadSupportImpl.java b/integration/spark/src/main/java/org/apache/carbondata/spark/readsupport/SparkRowReadSupportImpl.java index b168ecc..180acc2 100644 --- a/integration/spark/src/main/java/org/apache/carbondata/spark/readsupport/SparkRowReadSupportImpl.java +++ b/integration/spark/src/main/java/org/apache/carbondata/spark/readsupport/SparkRowReadSupportImpl.java @@ -22,7 +22,7 @@ import java.io.IOException; import java.sql.Date; import java.sql.Timestamp; -import org.apache.carbondata.core.AbsoluteTableIdentifier; +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; import org.apache.carbondata.core.metadata.DataType; import org.apache.carbondata.core.metadata.Encoding; import org.apache.carbondata.core.metadata.schema.table.column.CarbonColumn; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala ---------------------------------------------------------------------- diff --git a/integration/spark/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala b/integration/spark/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala index d73b782..0fecaaf 100644 --- a/integration/spark/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala +++ b/integration/spark/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala @@ -30,36 +30,33 @@ import org.apache.hadoop.conf.{Configurable, Configuration} import org.apache.hadoop.fs.Path import org.apache.hadoop.mapreduce.Job import org.apache.hadoop.mapreduce.lib.input.{FileInputFormat, FileSplit} -import org.apache.spark.{SparkContext, SparkEnv, SparkException} import org.apache.spark.rdd.{DataLoadCoalescedRDD, DataLoadPartitionCoalescer, UpdateCoalescedRDD} -import org.apache.spark.sql.{CarbonEnv, DataFrame, Row, SQLContext} -import org.apache.spark.sql.execution.command.{AlterTableModel, CompactionCallableModel, CompactionModel, ExecutionErrors, UpdateTableModel} +import org.apache.spark.sql.execution.command.{AlterTableModel, CompactionModel, ExecutionErrors, UpdateTableModel} import org.apache.spark.sql.hive.DistributionUtil +import org.apache.spark.sql.{CarbonEnv, DataFrame, Row, SQLContext} import org.apache.spark.util.SparkUtil +import org.apache.spark.{SparkEnv, SparkException} import org.apache.carbondata.common.logging.LogServiceFactory -import org.apache.carbondata.core.{CarbonTableIdentifier, ColumnarFormatVersion} -import org.apache.carbondata.core.datastore.block.{Distributable, TableBlockInfo} -import org.apache.carbondata.core.metadata.CarbonMetadata -import org.apache.carbondata.core.metadata.schema.table.CarbonTable -import org.apache.carbondata.core.path.CarbonStorePath import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.block.{Distributable, TableBlockInfo} import org.apache.carbondata.core.dictionary.server.DictionaryServer import org.apache.carbondata.core.load.{BlockDetails, LoadMetadataDetails} +import org.apache.carbondata.core.metadata.schema.table.CarbonTable +import org.apache.carbondata.core.metadata.{CarbonTableIdentifier, ColumnarFormatVersion} +import org.apache.carbondata.core.path.CarbonStorePath import org.apache.carbondata.core.update.CarbonUpdateUtil -import org.apache.carbondata.core.updatestatus.SegmentStatusManager +import org.apache.carbondata.core.updatestatus.locks.{CarbonLockFactory, ICarbonLock, LockUsage} import org.apache.carbondata.core.util.CarbonProperties -import org.apache.carbondata.locks.{CarbonLockFactory, ICarbonLock, LockUsage} import org.apache.carbondata.processing.csvreaderstep.RddInpututilsForUpdate import org.apache.carbondata.processing.etl.DataLoadingException import org.apache.carbondata.processing.model.CarbonLoadModel import org.apache.carbondata.processing.newflow.exception.CarbonDataLoadingException import org.apache.carbondata.spark._ import org.apache.carbondata.spark.load._ -import org.apache.carbondata.spark.merger.{CarbonCompactionUtil, CarbonDataMergerUtil, CompactionCallable, CompactionType} -import org.apache.carbondata.spark.partition.api.Partition +import org.apache.carbondata.spark.merger.{CarbonCompactionUtil, CarbonDataMergerUtil, CompactionType} import org.apache.carbondata.spark.splits.TableSplit -import org.apache.carbondata.spark.util.{CarbonQueryUtil, CommonUtil, LoadMetadataUtil} +import org.apache.carbondata.spark.util.{CarbonQueryUtil, CommonUtil} /** * This is the factory class which can create different RDD depends on user needs. http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark/src/main/scala/org/apache/carbondata/spark/util/QueryPlanUtil.scala ---------------------------------------------------------------------- diff --git a/integration/spark/src/main/scala/org/apache/carbondata/spark/util/QueryPlanUtil.scala b/integration/spark/src/main/scala/org/apache/carbondata/spark/util/QueryPlanUtil.scala index b6fa827..2ca3b8c 100644 --- a/integration/spark/src/main/scala/org/apache/carbondata/spark/util/QueryPlanUtil.scala +++ b/integration/spark/src/main/scala/org/apache/carbondata/spark/util/QueryPlanUtil.scala @@ -25,7 +25,7 @@ import org.apache.hadoop.mapred.JobConf import org.apache.hadoop.mapreduce.Job import org.apache.hadoop.mapreduce.lib.input.FileInputFormat -import org.apache.carbondata.core.AbsoluteTableIdentifier +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier import org.apache.carbondata.hadoop.CarbonInputFormat http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark/src/main/scala/org/apache/spark/sql/CarbonDatasourceHadoopRelation.scala ---------------------------------------------------------------------- diff --git a/integration/spark/src/main/scala/org/apache/spark/sql/CarbonDatasourceHadoopRelation.scala b/integration/spark/src/main/scala/org/apache/spark/sql/CarbonDatasourceHadoopRelation.scala index 0ee44e1..eceb3a4 100644 --- a/integration/spark/src/main/scala/org/apache/spark/sql/CarbonDatasourceHadoopRelation.scala +++ b/integration/spark/src/main/scala/org/apache/spark/sql/CarbonDatasourceHadoopRelation.scala @@ -35,7 +35,7 @@ import org.apache.spark.sql.sources.{Filter, HadoopFsRelation, OutputWriterFacto import org.apache.spark.sql.types.StructType import org.apache.spark.util.SerializableConfiguration -import org.apache.carbondata.core.AbsoluteTableIdentifier +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier import org.apache.carbondata.core.path.CarbonTablePath import org.apache.carbondata.hadoop.{CarbonInputFormat, CarbonInputSplit, CarbonProjection} import org.apache.carbondata.hadoop.util.{CarbonInputFormatUtil, SchemaReader} http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark/src/main/scala/org/apache/spark/sql/CarbonDictionaryDecoder.scala ---------------------------------------------------------------------- diff --git a/integration/spark/src/main/scala/org/apache/spark/sql/CarbonDictionaryDecoder.scala b/integration/spark/src/main/scala/org/apache/spark/sql/CarbonDictionaryDecoder.scala index a779c67..476c74c 100644 --- a/integration/spark/src/main/scala/org/apache/spark/sql/CarbonDictionaryDecoder.scala +++ b/integration/spark/src/main/scala/org/apache/spark/sql/CarbonDictionaryDecoder.scala @@ -27,12 +27,10 @@ import org.apache.spark.sql.hive.{CarbonMetastore, CarbonMetastoreTypes} import org.apache.spark.sql.optimizer.CarbonDecoderRelation import org.apache.spark.sql.types._ -import org.apache.carbondata.core.{AbsoluteTableIdentifier, ColumnIdentifier} import org.apache.carbondata.core.cache.{Cache, CacheProvider, CacheType} import org.apache.carbondata.core.cache.dictionary.{Dictionary, DictionaryColumnUniqueIdentifier} -import org.apache.carbondata.core.metadata.DataType -import org.apache.carbondata.core.metadata.Encoding import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, ColumnIdentifier, DataType, Encoding} import org.apache.carbondata.core.stats.{QueryStatistic, QueryStatisticsConstants} import org.apache.carbondata.core.util.{CarbonTimeStatisticsFactory, DataTypeUtil} import org.apache.carbondata.spark.CarbonAliasDecoderRelation http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/IUDCommands.scala ---------------------------------------------------------------------- diff --git a/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/IUDCommands.scala b/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/IUDCommands.scala index b9bbe54..a0c3831 100644 --- a/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/IUDCommands.scala +++ b/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/IUDCommands.scala @@ -34,17 +34,17 @@ import org.apache.spark.storage.StorageLevel import org.apache.spark.util.FileUtils import org.apache.carbondata.common.logging.LogServiceFactory -import org.apache.carbondata.core.AbsoluteTableIdentifier import org.apache.carbondata.core.metadata.schema.table.CarbonTable import org.apache.carbondata.core.path.{CarbonStorePath, CarbonTablePath} import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.datastorage.impl.FileFactory +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier import org.apache.carbondata.core.update._ import org.apache.carbondata.core.update.data.RowCountDetailsVO import org.apache.carbondata.core.updatestatus.{SegmentStatusManager, SegmentUpdateStatusManager} import org.apache.carbondata.core.util.CarbonProperties import org.apache.carbondata.core.writer.CarbonDeleteDeltaWriterImpl -import org.apache.carbondata.locks.{CarbonLockFactory, CarbonLockUtil, LockUsage} +import org.apache.carbondata.core.updatestatus.locks.{CarbonLockFactory, CarbonLockUtil, LockUsage} import org.apache.carbondata.processing.exception.MultipleMatchingException import org.apache.carbondata.spark.load.{CarbonLoaderUtil, FailureCauses} import org.apache.carbondata.spark.merger.{CarbonDataMergerUtil, CarbonDataMergerUtilResult, CompactionType} http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala ---------------------------------------------------------------------- diff --git a/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala b/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala index b25731e..93fb660 100644 --- a/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala +++ b/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala @@ -40,8 +40,7 @@ import org.codehaus.jackson.map.ObjectMapper import org.apache.carbondata.api.CarbonStore import org.apache.carbondata.common.logging.LogServiceFactory -import org.apache.carbondata.core.{CarbonDataLoadSchema, CarbonTableIdentifier} -import org.apache.carbondata.core.metadata.Encoding +import org.apache.carbondata.core.metadata.{CarbonTableIdentifier, Encoding} import org.apache.carbondata.core.metadata.schema.table.{CarbonTable, TableInfo} import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension import org.apache.carbondata.core.path.CarbonStorePath @@ -51,10 +50,10 @@ import org.apache.carbondata.core.dictionary.server.DictionaryServer import org.apache.carbondata.core.update.CarbonUpdateUtil import org.apache.carbondata.core.update.TupleIdEnum import org.apache.carbondata.core.util.{CarbonProperties, CarbonUtil} -import org.apache.carbondata.locks.{CarbonLockFactory, LockUsage} +import org.apache.carbondata.core.updatestatus.locks.{CarbonLockFactory, LockUsage} import org.apache.carbondata.processing.constants.TableOptionConstant import org.apache.carbondata.processing.etl.DataLoadingException -import org.apache.carbondata.processing.model.CarbonLoadModel +import org.apache.carbondata.processing.model.{CarbonDataLoadSchema, CarbonLoadModel} import org.apache.carbondata.spark.exception.MalformedCarbonCommandException import org.apache.carbondata.spark.rdd.{CarbonDataRDDFactory, DataManagementFunc, DictionaryLoadModel} import org.apache.carbondata.spark.util.{CarbonScalaUtil, CommonUtil, GlobalDictionaryUtil} http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark/src/main/scala/org/apache/spark/sql/hive/CarbonMetastore.scala ---------------------------------------------------------------------- diff --git a/integration/spark/src/main/scala/org/apache/spark/sql/hive/CarbonMetastore.scala b/integration/spark/src/main/scala/org/apache/spark/sql/hive/CarbonMetastore.scala index 4c6c5be..123bef9 100644 --- a/integration/spark/src/main/scala/org/apache/spark/sql/hive/CarbonMetastore.scala +++ b/integration/spark/src/main/scala/org/apache/spark/sql/hive/CarbonMetastore.scala @@ -34,11 +34,10 @@ import org.apache.spark.sql.hive.client.ClientInterface import org.apache.spark.sql.types._ import org.apache.carbondata.common.logging.LogServiceFactory -import org.apache.carbondata.core.CarbonTableIdentifier import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.datastorage.impl.FileFactory import org.apache.carbondata.core.datastorage.impl.FileFactory.FileType -import org.apache.carbondata.core.metadata.CarbonMetadata +import org.apache.carbondata.core.metadata.{CarbonMetadata, CarbonTableIdentifier} import org.apache.carbondata.core.metadata.converter.ThriftWrapperSchemaConverterImpl import org.apache.carbondata.core.metadata.schema.table.CarbonTable import org.apache.carbondata.core.path.{CarbonStorePath, CarbonTablePath} @@ -47,7 +46,7 @@ import org.apache.carbondata.core.stats.{QueryStatistic, QueryStatisticsConstant import org.apache.carbondata.core.util.{CarbonProperties, CarbonTimeStatisticsFactory, CarbonUtil} import org.apache.carbondata.core.writer.ThriftWriter import org.apache.carbondata.format.{SchemaEvolutionEntry, TableInfo} -import org.apache.carbondata.locks.ZookeeperInit +import org.apache.carbondata.core.updatestatus.locks.ZookeeperInit import org.apache.carbondata.spark.merger.TableMeta case class MetaData(var tablesMeta: ArrayBuffer[TableMeta]) http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/CompactionSystemLockFeatureTest.scala ---------------------------------------------------------------------- diff --git a/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/CompactionSystemLockFeatureTest.scala b/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/CompactionSystemLockFeatureTest.scala index 21a627e..52999db 100644 --- a/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/CompactionSystemLockFeatureTest.scala +++ b/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/CompactionSystemLockFeatureTest.scala @@ -23,10 +23,10 @@ import scala.collection.JavaConverters._ import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll -import org.apache.carbondata.core.{AbsoluteTableIdentifier, CarbonTableIdentifier} import org.apache.carbondata.core.path.{CarbonStorePath, CarbonTablePath} import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.datastorage.impl.FileFactory +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, CarbonTableIdentifier} import org.apache.carbondata.core.updatestatus.SegmentStatusManager import org.apache.carbondata.core.util.CarbonProperties http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionMinorThresholdTest.scala ---------------------------------------------------------------------- diff --git a/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionMinorThresholdTest.scala b/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionMinorThresholdTest.scala index a320349..09cb53c 100644 --- a/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionMinorThresholdTest.scala +++ b/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionMinorThresholdTest.scala @@ -23,8 +23,8 @@ import scala.collection.JavaConverters._ import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll -import org.apache.carbondata.core.{AbsoluteTableIdentifier, CarbonTableIdentifier} import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, CarbonTableIdentifier} import org.apache.carbondata.core.updatestatus.SegmentStatusManager import org.apache.carbondata.core.util.CarbonProperties http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionNoDictionaryTest.scala ---------------------------------------------------------------------- diff --git a/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionNoDictionaryTest.scala b/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionNoDictionaryTest.scala index 8c3bcfc..c1203d7 100644 --- a/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionNoDictionaryTest.scala +++ b/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionNoDictionaryTest.scala @@ -24,8 +24,8 @@ import org.apache.spark.sql.Row import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll -import org.apache.carbondata.core.{AbsoluteTableIdentifier, CarbonTableIdentifier} import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, CarbonTableIdentifier} import org.apache.carbondata.core.updatestatus.SegmentStatusManager import org.apache.carbondata.core.util.CarbonProperties http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionTest.scala ---------------------------------------------------------------------- diff --git a/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionTest.scala b/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionTest.scala index 3ccafce..e43fd4e 100644 --- a/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionTest.scala +++ b/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionTest.scala @@ -24,14 +24,14 @@ import org.apache.spark.sql.Row import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll -import org.apache.carbondata.core.{AbsoluteTableIdentifier, CarbonTableIdentifier} import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, CarbonTableIdentifier} import org.apache.carbondata.core.updatestatus.SegmentStatusManager import org.apache.carbondata.core.util.CarbonProperties /** - * FT for data compaction scenario. - */ + * FT for data compaction scenario. + */ class DataCompactionTest extends QueryTest with BeforeAndAfterAll { override def beforeAll { http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark/src/test/scala/org/apache/carbondata/spark/util/AllDictionaryTestCase.scala ---------------------------------------------------------------------- diff --git a/integration/spark/src/test/scala/org/apache/carbondata/spark/util/AllDictionaryTestCase.scala b/integration/spark/src/test/scala/org/apache/carbondata/spark/util/AllDictionaryTestCase.scala index 6032c34..1beed08 100644 --- a/integration/spark/src/test/scala/org/apache/carbondata/spark/util/AllDictionaryTestCase.scala +++ b/integration/spark/src/test/scala/org/apache/carbondata/spark/util/AllDictionaryTestCase.scala @@ -24,11 +24,10 @@ import org.apache.spark.sql.common.util.QueryTest import org.apache.spark.sql.{CarbonEnv, CarbonRelation} import org.scalatest.BeforeAndAfterAll -import org.apache.carbondata.core.CarbonDataLoadSchema import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties import org.apache.carbondata.processing.constants.TableOptionConstant -import org.apache.carbondata.processing.model.CarbonLoadModel +import org.apache.carbondata.processing.model.{CarbonDataLoadSchema, CarbonLoadModel} /** * Test Case for org.apache.carbondata.integration.spark.util.GlobalDictionaryUtil http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark/src/test/scala/org/apache/carbondata/spark/util/AutoHighCardinalityIdentifyTestCase.scala ---------------------------------------------------------------------- diff --git a/integration/spark/src/test/scala/org/apache/carbondata/spark/util/AutoHighCardinalityIdentifyTestCase.scala b/integration/spark/src/test/scala/org/apache/carbondata/spark/util/AutoHighCardinalityIdentifyTestCase.scala index eb162ea..68710af 100644 --- a/integration/spark/src/test/scala/org/apache/carbondata/spark/util/AutoHighCardinalityIdentifyTestCase.scala +++ b/integration/spark/src/test/scala/org/apache/carbondata/spark/util/AutoHighCardinalityIdentifyTestCase.scala @@ -25,13 +25,12 @@ import org.apache.spark.sql.common.util.QueryTest import org.apache.spark.sql.{CarbonEnv, CarbonRelation} import org.scalatest.BeforeAndAfterAll -import org.apache.carbondata.core.{CarbonDataLoadSchema, CarbonTableIdentifier} -import org.apache.carbondata.core.metadata.Encoding +import org.apache.carbondata.core.metadata.{CarbonTableIdentifier, Encoding} import org.apache.carbondata.core.metadata.schema.table.CarbonTable import org.apache.carbondata.core.path.CarbonStorePath import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.{CarbonProperties, CarbonUtil} -import org.apache.carbondata.processing.model.CarbonLoadModel +import org.apache.carbondata.processing.model.{CarbonDataLoadSchema, CarbonLoadModel} /** * Test Case for org.apache.carbondata.spark.util.GlobalDictionaryUtil http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark/src/test/scala/org/apache/carbondata/spark/util/DictionaryTestCaseUtil.scala ---------------------------------------------------------------------- diff --git a/integration/spark/src/test/scala/org/apache/carbondata/spark/util/DictionaryTestCaseUtil.scala b/integration/spark/src/test/scala/org/apache/carbondata/spark/util/DictionaryTestCaseUtil.scala index bd00c7b..5567aed 100644 --- a/integration/spark/src/test/scala/org/apache/carbondata/spark/util/DictionaryTestCaseUtil.scala +++ b/integration/spark/src/test/scala/org/apache/carbondata/spark/util/DictionaryTestCaseUtil.scala @@ -20,9 +20,9 @@ package org.apache.carbondata.spark.util import org.apache.spark.sql.CarbonRelation import org.apache.spark.sql.test.TestQueryExecutor -import org.apache.carbondata.core.CarbonTableIdentifier import org.apache.carbondata.core.cache.dictionary.DictionaryColumnUniqueIdentifier import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.metadata.CarbonTableIdentifier import org.apache.carbondata.spark.load.CarbonLoaderUtil /** http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark/src/test/scala/org/apache/carbondata/spark/util/ExternalColumnDictionaryTestCase.scala ---------------------------------------------------------------------- diff --git a/integration/spark/src/test/scala/org/apache/carbondata/spark/util/ExternalColumnDictionaryTestCase.scala b/integration/spark/src/test/scala/org/apache/carbondata/spark/util/ExternalColumnDictionaryTestCase.scala index ae5b63a..361d183 100644 --- a/integration/spark/src/test/scala/org/apache/carbondata/spark/util/ExternalColumnDictionaryTestCase.scala +++ b/integration/spark/src/test/scala/org/apache/carbondata/spark/util/ExternalColumnDictionaryTestCase.scala @@ -22,12 +22,11 @@ import org.apache.spark.sql.common.util.QueryTest import org.apache.spark.sql.{CarbonEnv, CarbonRelation} import org.scalatest.BeforeAndAfterAll -import org.apache.carbondata.core.CarbonDataLoadSchema import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties import org.apache.carbondata.processing.constants.TableOptionConstant import org.apache.carbondata.processing.etl.DataLoadingException -import org.apache.carbondata.processing.model.CarbonLoadModel +import org.apache.carbondata.processing.model.{CarbonDataLoadSchema, CarbonLoadModel} import org.apache.carbondata.spark.exception.MalformedCarbonCommandException /** http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark/src/test/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtilConcurrentTestCase.scala ---------------------------------------------------------------------- diff --git a/integration/spark/src/test/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtilConcurrentTestCase.scala b/integration/spark/src/test/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtilConcurrentTestCase.scala index 21c111d..295d700 100644 --- a/integration/spark/src/test/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtilConcurrentTestCase.scala +++ b/integration/spark/src/test/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtilConcurrentTestCase.scala @@ -27,13 +27,12 @@ import org.apache.spark.sql.common.util.QueryTest import org.apache.spark.sql.{CarbonEnv, CarbonRelation} import org.scalatest.BeforeAndAfterAll -import org.apache.carbondata.core.CarbonDataLoadSchema import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.datastorage.impl.FileFactory import org.apache.carbondata.core.service.impl.PathFactory import org.apache.carbondata.core.util.CarbonProperties import org.apache.carbondata.processing.constants.TableOptionConstant -import org.apache.carbondata.processing.model.CarbonLoadModel +import org.apache.carbondata.processing.model.{CarbonDataLoadSchema, CarbonLoadModel} class GlobalDictionaryUtilConcurrentTestCase extends QueryTest with BeforeAndAfterAll { http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark/src/test/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtilTestCase.scala ---------------------------------------------------------------------- diff --git a/integration/spark/src/test/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtilTestCase.scala b/integration/spark/src/test/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtilTestCase.scala index 65fb846..7481c32 100644 --- a/integration/spark/src/test/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtilTestCase.scala +++ b/integration/spark/src/test/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtilTestCase.scala @@ -24,11 +24,10 @@ import org.apache.spark.sql.common.util.QueryTest import org.apache.spark.sql.{CarbonEnv, CarbonRelation} import org.scalatest.BeforeAndAfterAll -import org.apache.carbondata.core.CarbonDataLoadSchema import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties import org.apache.carbondata.processing.constants.TableOptionConstant -import org.apache.carbondata.processing.model.CarbonLoadModel +import org.apache.carbondata.processing.model.{CarbonDataLoadSchema, CarbonLoadModel} /** * Test Case for org.apache.carbondata.spark.util.GlobalDictionaryUtil http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark2/src/main/java/org/apache/carbondata/spark/readsupport/SparkRowReadSupportImpl.java ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/java/org/apache/carbondata/spark/readsupport/SparkRowReadSupportImpl.java b/integration/spark2/src/main/java/org/apache/carbondata/spark/readsupport/SparkRowReadSupportImpl.java index f4bb50a..3649858 100644 --- a/integration/spark2/src/main/java/org/apache/carbondata/spark/readsupport/SparkRowReadSupportImpl.java +++ b/integration/spark2/src/main/java/org/apache/carbondata/spark/readsupport/SparkRowReadSupportImpl.java @@ -20,7 +20,7 @@ package org.apache.carbondata.spark.readsupport; import java.io.IOException; -import org.apache.carbondata.core.AbsoluteTableIdentifier; +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; import org.apache.carbondata.core.metadata.DataType; import org.apache.carbondata.core.metadata.schema.table.column.CarbonColumn; import org.apache.carbondata.hadoop.readsupport.impl.AbstractDictionaryDecodedReadSupport; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark2/src/main/scala/org/apache/carbondata/spark/CarbonSparkFactory.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/scala/org/apache/carbondata/spark/CarbonSparkFactory.scala b/integration/spark2/src/main/scala/org/apache/carbondata/spark/CarbonSparkFactory.scala index 4b409ed..8922945 100644 --- a/integration/spark2/src/main/scala/org/apache/carbondata/spark/CarbonSparkFactory.scala +++ b/integration/spark2/src/main/scala/org/apache/carbondata/spark/CarbonSparkFactory.scala @@ -16,16 +16,16 @@ */ package org.apache.carbondata.spark -import org.apache.carbondata.core.{CarbonTableIdentifier, ColumnIdentifier} +import org.apache.carbondata.core.metadata.{CarbonTableIdentifier, ColumnIdentifier} import org.apache.carbondata.core.metadata.schema.table.column.{CarbonDimension, ColumnSchema} - - /** - * Column validator - */ +/** + * Column validator + */ trait ColumnValidator { def validateColumns(columns: Seq[ColumnSchema]) } + /** * Dictionary related helper service */ http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark2/src/main/scala/org/apache/carbondata/spark/DictionaryDetailHelper.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/scala/org/apache/carbondata/spark/DictionaryDetailHelper.scala b/integration/spark2/src/main/scala/org/apache/carbondata/spark/DictionaryDetailHelper.scala index 979e154..087a62c 100644 --- a/integration/spark2/src/main/scala/org/apache/carbondata/spark/DictionaryDetailHelper.scala +++ b/integration/spark2/src/main/scala/org/apache/carbondata/spark/DictionaryDetailHelper.scala @@ -20,9 +20,9 @@ import scala.collection.mutable.HashMap import org.apache.carbondata.core.datastorage.filesystem.{CarbonFile, CarbonFileFilter} import org.apache.carbondata.core.datastorage.impl.FileFactory +import org.apache.carbondata.core.metadata.{CarbonTableIdentifier, ColumnIdentifier} import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension import org.apache.carbondata.core.path.{CarbonStorePath, CarbonTablePath} -import org.apache.carbondata.core.{CarbonTableIdentifier, ColumnIdentifier} class DictionaryDetailHelper extends DictionaryDetailService { def getDictionaryDetail(dictfolderPath: String, primDimensions: Array[CarbonDimension], http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark2/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala b/integration/spark2/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala index f687589..441500b 100644 --- a/integration/spark2/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala +++ b/integration/spark2/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala @@ -30,36 +30,32 @@ import org.apache.hadoop.conf.{Configurable, Configuration} import org.apache.hadoop.fs.Path import org.apache.hadoop.mapreduce.Job import org.apache.hadoop.mapreduce.lib.input.{FileInputFormat, FileSplit} -import org.apache.spark.{SparkContext, SparkEnv, SparkException} import org.apache.spark.rdd.{DataLoadCoalescedRDD, DataLoadPartitionCoalescer, UpdateCoalescedRDD} -import org.apache.spark.sql.{CarbonEnv, DataFrame, Row, SQLContext} -import org.apache.spark.sql.execution.command.{AlterTableModel, CompactionCallableModel, CompactionModel, ExecutionErrors, UpdateTableModel} +import org.apache.spark.sql.execution.command.{AlterTableModel, CompactionModel, ExecutionErrors, UpdateTableModel} import org.apache.spark.sql.hive.DistributionUtil +import org.apache.spark.sql.{CarbonEnv, DataFrame, Row, SQLContext} import org.apache.spark.util.SparkUtil +import org.apache.spark.{SparkEnv, SparkException} import org.apache.carbondata.common.logging.LogServiceFactory -import org.apache.carbondata.core.{CarbonDataLoadSchema, CarbonTableIdentifier, ColumnarFormatVersion} +import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.datastore.block.{Distributable, TableBlockInfo} -import org.apache.carbondata.core.metadata.CarbonMetadata +import org.apache.carbondata.core.load.{BlockDetails, LoadMetadataDetails} import org.apache.carbondata.core.metadata.schema.table.CarbonTable +import org.apache.carbondata.core.metadata.{CarbonTableIdentifier, ColumnarFormatVersion} import org.apache.carbondata.core.path.CarbonStorePath -import org.apache.carbondata.core.constants.CarbonCommonConstants -import org.apache.carbondata.core.dictionary.server.DictionaryServer -import org.apache.carbondata.core.load.{BlockDetails, LoadMetadataDetails} import org.apache.carbondata.core.update.CarbonUpdateUtil -import org.apache.carbondata.core.updatestatus.SegmentStatusManager +import org.apache.carbondata.core.updatestatus.locks.{CarbonLockFactory, ICarbonLock, LockUsage} import org.apache.carbondata.core.util.CarbonProperties -import org.apache.carbondata.locks.{CarbonLockFactory, ICarbonLock, LockUsage} import org.apache.carbondata.processing.csvreaderstep.RddInpututilsForUpdate import org.apache.carbondata.processing.etl.DataLoadingException import org.apache.carbondata.processing.model.CarbonLoadModel import org.apache.carbondata.processing.newflow.exception.CarbonDataLoadingException import org.apache.carbondata.spark._ import org.apache.carbondata.spark.load._ -import org.apache.carbondata.spark.merger.{CarbonCompactionUtil, CarbonDataMergerUtil, CompactionCallable, CompactionType} -import org.apache.carbondata.spark.partition.api.Partition +import org.apache.carbondata.spark.merger.{CarbonCompactionUtil, CarbonDataMergerUtil, CompactionType} import org.apache.carbondata.spark.splits.TableSplit -import org.apache.carbondata.spark.util.{CarbonQueryUtil, CommonUtil, LoadMetadataUtil} +import org.apache.carbondata.spark.util.{CarbonQueryUtil, CommonUtil} /** * This is the factory class which can create different RDD depends on user needs. http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark2/src/main/scala/org/apache/carbondata/spark/util/QueryPlanUtil.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/scala/org/apache/carbondata/spark/util/QueryPlanUtil.scala b/integration/spark2/src/main/scala/org/apache/carbondata/spark/util/QueryPlanUtil.scala index b6fa827..2ca3b8c 100644 --- a/integration/spark2/src/main/scala/org/apache/carbondata/spark/util/QueryPlanUtil.scala +++ b/integration/spark2/src/main/scala/org/apache/carbondata/spark/util/QueryPlanUtil.scala @@ -25,7 +25,7 @@ import org.apache.hadoop.mapred.JobConf import org.apache.hadoop.mapreduce.Job import org.apache.hadoop.mapreduce.lib.input.FileInputFormat -import org.apache.carbondata.core.AbsoluteTableIdentifier +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier import org.apache.carbondata.hadoop.CarbonInputFormat http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonDatasourceHadoopRelation.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonDatasourceHadoopRelation.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonDatasourceHadoopRelation.scala index f5c99a5..7633b22 100644 --- a/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonDatasourceHadoopRelation.scala +++ b/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonDatasourceHadoopRelation.scala @@ -17,9 +17,6 @@ package org.apache.spark.sql -import org.apache.hadoop.conf.Configuration -import org.apache.hadoop.mapred.JobConf -import org.apache.hadoop.mapreduce.Job import org.apache.spark.rdd.RDD import org.apache.spark.sql.catalyst.InternalRow import org.apache.spark.sql.execution.command.LoadTableByInsert @@ -27,16 +24,15 @@ import org.apache.spark.sql.hive.CarbonRelation import org.apache.spark.sql.sources.{BaseRelation, Filter, InsertableRelation} import org.apache.spark.sql.types.StructType -import org.apache.carbondata.core.AbsoluteTableIdentifier import org.apache.carbondata.core.constants.CarbonCommonConstants -import org.apache.carbondata.hadoop.{CarbonInputFormat, CarbonProjection} -import org.apache.carbondata.hadoop.util.SchemaReader +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier import org.apache.carbondata.core.scan.expression.Expression import org.apache.carbondata.core.scan.expression.logical.AndExpression +import org.apache.carbondata.hadoop.CarbonProjection +import org.apache.carbondata.hadoop.util.SchemaReader import org.apache.carbondata.spark.CarbonFilters import org.apache.carbondata.spark.merger.TableMeta import org.apache.carbondata.spark.rdd.CarbonScanRDD -import org.apache.carbondata.spark.readsupport.SparkRowReadSupportImpl import org.apache.carbondata.spark.util.CarbonSparkUtil case class CarbonDatasourceHadoopRelation( http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonDictionaryDecoder.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonDictionaryDecoder.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonDictionaryDecoder.scala index f8c60a0..cb71a46 100644 --- a/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonDictionaryDecoder.scala +++ b/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonDictionaryDecoder.scala @@ -30,7 +30,7 @@ import org.apache.spark.sql.types._ import org.apache.carbondata.core.cache.{Cache, CacheProvider, CacheType} import org.apache.carbondata.core.cache.dictionary.{Dictionary, DictionaryColumnUniqueIdentifier} -import org.apache.carbondata.core.{AbsoluteTableIdentifier, ColumnIdentifier} +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, ColumnIdentifier} import org.apache.carbondata.core.metadata.DataType import org.apache.carbondata.core.metadata.Encoding import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala index 4894e47..e662f96 100644 --- a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala +++ b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala @@ -18,7 +18,6 @@ package org.apache.spark.sql.execution.command import java.io.File -import java.text.SimpleDateFormat import scala.collection.JavaConverters._ import scala.language.implicitConversions @@ -27,33 +26,29 @@ import org.apache.commons.lang3.StringUtils import org.apache.spark.sql._ import org.apache.spark.sql.catalyst.TableIdentifier import org.apache.spark.sql.catalyst.analysis.UnresolvedAttribute -import org.apache.spark.sql.catalyst.expressions.{Attribute, AttributeReference, Cast, Literal} +import org.apache.spark.sql.catalyst.expressions.Attribute import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan import org.apache.spark.sql.execution.SparkPlan import org.apache.spark.sql.hive.{CarbonMetastore, CarbonRelation} -import org.apache.spark.sql.types.TimestampType import org.apache.spark.util.FileUtils import org.codehaus.jackson.map.ObjectMapper import org.apache.carbondata.api.CarbonStore import org.apache.carbondata.common.logging.LogServiceFactory -import org.apache.carbondata.core.{CarbonDataLoadSchema, CarbonTableIdentifier} -import org.apache.carbondata.core.metadata.CarbonMetadata -import org.apache.carbondata.core.metadata.Encoding -import org.apache.carbondata.core.metadata.schema.table.{CarbonTable, TableInfo} -import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension -import org.apache.carbondata.core.path.CarbonStorePath import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.datastorage.impl.FileFactory -import org.apache.carbondata.core.update.CarbonUpdateUtil -import org.apache.carbondata.core.update.TupleIdEnum +import org.apache.carbondata.core.metadata.{CarbonMetadata, CarbonTableIdentifier, Encoding} +import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension +import org.apache.carbondata.core.metadata.schema.table.{CarbonTable, TableInfo} +import org.apache.carbondata.core.path.CarbonStorePath +import org.apache.carbondata.core.update.{CarbonUpdateUtil, TupleIdEnum} +import org.apache.carbondata.core.updatestatus.locks.{CarbonLockFactory, LockUsage} import org.apache.carbondata.core.util.{CarbonProperties, CarbonUtil} -import org.apache.carbondata.locks.{CarbonLockFactory, LockUsage} import org.apache.carbondata.processing.constants.TableOptionConstant import org.apache.carbondata.processing.etl.DataLoadingException -import org.apache.carbondata.processing.model.CarbonLoadModel +import org.apache.carbondata.processing.model.{CarbonDataLoadSchema, CarbonLoadModel} import org.apache.carbondata.spark.exception.MalformedCarbonCommandException -import org.apache.carbondata.spark.rdd.{CarbonDataRDDFactory, DataManagementFunc, DictionaryLoadModel} +import org.apache.carbondata.spark.rdd.{CarbonDataRDDFactory, DictionaryLoadModel} import org.apache.carbondata.spark.util.{CarbonScalaUtil, CarbonSparkUtil, CommonUtil, GlobalDictionaryUtil} object Checker { http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/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 4faa8a9..f299de9 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 @@ -35,7 +35,6 @@ import org.apache.spark.sql.types._ import org.apache.spark.sql.{RuntimeConfig, SparkSession} import org.apache.carbondata.common.logging.LogServiceFactory -import org.apache.carbondata.core.CarbonTableIdentifier import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.datastorage.filesystem.CarbonFile import org.apache.carbondata.core.datastorage.impl.FileFactory @@ -43,15 +42,15 @@ import org.apache.carbondata.core.datastorage.impl.FileFactory.FileType import org.apache.carbondata.core.metadata.converter.ThriftWrapperSchemaConverterImpl import org.apache.carbondata.core.metadata.schema.table.CarbonTable import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension -import org.apache.carbondata.core.metadata.{CarbonMetadata, DataType => CarbonDataType} +import org.apache.carbondata.core.metadata.{CarbonMetadata, CarbonTableIdentifier, DataType => CarbonDataType} import org.apache.carbondata.core.path.{CarbonStorePath, CarbonTablePath} import org.apache.carbondata.core.reader.ThriftReader import org.apache.carbondata.core.stats.{QueryStatistic, QueryStatisticsConstants} import org.apache.carbondata.core.updatestatus.SegmentStatusManager +import org.apache.carbondata.core.updatestatus.locks.ZookeeperInit import org.apache.carbondata.core.util.{CarbonProperties, CarbonTimeStatisticsFactory, CarbonUtil} import org.apache.carbondata.core.writer.ThriftWriter import org.apache.carbondata.format.{SchemaEvolutionEntry, TableInfo} -import org.apache.carbondata.locks.ZookeeperInit import org.apache.carbondata.spark.merger.TableMeta import org.apache.carbondata.spark.util.CarbonSparkUtil http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/processing/src/main/java/org/apache/carbondata/processing/csvload/DataGraphExecuter.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/csvload/DataGraphExecuter.java b/processing/src/main/java/org/apache/carbondata/processing/csvload/DataGraphExecuter.java index 1eddc32..3599256 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/csvload/DataGraphExecuter.java +++ b/processing/src/main/java/org/apache/carbondata/processing/csvload/DataGraphExecuter.java @@ -27,7 +27,7 @@ import java.util.Set; import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; -import org.apache.carbondata.core.CarbonDataLoadSchema; +import org.apache.carbondata.processing.model.CarbonDataLoadSchema; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.datastorage.filesystem.CarbonFile; import org.apache.carbondata.core.datastorage.filesystem.CarbonFileFilter; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/processing/src/main/java/org/apache/carbondata/processing/csvload/GraphExecutionUtil.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/csvload/GraphExecutionUtil.java b/processing/src/main/java/org/apache/carbondata/processing/csvload/GraphExecutionUtil.java index fbaf622..d136575 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/csvload/GraphExecutionUtil.java +++ b/processing/src/main/java/org/apache/carbondata/processing/csvload/GraphExecutionUtil.java @@ -32,8 +32,8 @@ import java.util.Set; import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; -import org.apache.carbondata.core.CarbonDataLoadSchema; -import org.apache.carbondata.core.CarbonDataLoadSchema.DimensionRelation; +import org.apache.carbondata.processing.model.CarbonDataLoadSchema; +import org.apache.carbondata.processing.model.CarbonDataLoadSchema.DimensionRelation; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.datastorage.filesystem.CarbonFile; import org.apache.carbondata.core.datastorage.filesystem.CarbonFileFilter; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/processing/src/main/java/org/apache/carbondata/processing/datatypes/PrimitiveDataType.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/datatypes/PrimitiveDataType.java b/processing/src/main/java/org/apache/carbondata/processing/datatypes/PrimitiveDataType.java index baa06bd..7abe631 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/datatypes/PrimitiveDataType.java +++ b/processing/src/main/java/org/apache/carbondata/processing/datatypes/PrimitiveDataType.java @@ -30,7 +30,7 @@ import java.util.Map; import org.apache.carbondata.core.cache.Cache; import org.apache.carbondata.core.cache.dictionary.Dictionary; import org.apache.carbondata.core.cache.dictionary.DictionaryColumnUniqueIdentifier; -import org.apache.carbondata.core.CarbonTableIdentifier; +import org.apache.carbondata.core.metadata.CarbonTableIdentifier; import org.apache.carbondata.core.metadata.Encoding; import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension; import org.apache.carbondata.core.constants.CarbonCommonConstants; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/processing/src/main/java/org/apache/carbondata/processing/graphgenerator/GraphGenerator.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/graphgenerator/GraphGenerator.java b/processing/src/main/java/org/apache/carbondata/processing/graphgenerator/GraphGenerator.java index 98bc8de..676f702 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/graphgenerator/GraphGenerator.java +++ b/processing/src/main/java/org/apache/carbondata/processing/graphgenerator/GraphGenerator.java @@ -37,7 +37,7 @@ import java.util.Set; import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; -import org.apache.carbondata.core.CarbonDataLoadSchema; +import org.apache.carbondata.processing.model.CarbonDataLoadSchema; import org.apache.carbondata.core.metadata.CarbonMetadata; import org.apache.carbondata.core.metadata.Encoding; import org.apache.carbondata.core.metadata.schema.table.CarbonTable; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/processing/src/main/java/org/apache/carbondata/processing/model/CarbonDataLoadSchema.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/model/CarbonDataLoadSchema.java b/processing/src/main/java/org/apache/carbondata/processing/model/CarbonDataLoadSchema.java new file mode 100644 index 0000000..f5db85f --- /dev/null +++ b/processing/src/main/java/org/apache/carbondata/processing/model/CarbonDataLoadSchema.java @@ -0,0 +1,184 @@ +/* + * 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. + */ +package org.apache.carbondata.processing.model; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +import org.apache.carbondata.core.metadata.schema.table.CarbonTable; + +/** + * Wrapper Data Load Schema object which will be used to + * support relation while data loading + */ +public class CarbonDataLoadSchema implements Serializable { + + /** + * default serializer + */ + private static final long serialVersionUID = 1L; + + /** + * CarbonTable info + */ + private CarbonTable carbonTable; + + /** + * dimension table and relation info + */ + private List<DimensionRelation> dimensionRelationList; + + /** + * CarbonDataLoadSchema constructor which takes CarbonTable + * + * @param carbonTable + */ + public CarbonDataLoadSchema(CarbonTable carbonTable) { + this.carbonTable = carbonTable; + this.dimensionRelationList = new ArrayList<DimensionRelation>(); + } + + /** + * get dimension relation list + * + * @return dimensionRelationList + */ + public List<DimensionRelation> getDimensionRelationList() { + return dimensionRelationList; + } + + /** + * get carbontable + * + * @return carbonTable + */ + public CarbonTable getCarbonTable() { + return carbonTable; + } + + /** + * Dimension Relation object which will be filled from + * Load DML Command to support normalized table data load + */ + public static class DimensionRelation implements Serializable { + /** + * default serializer + */ + private static final long serialVersionUID = 1L; + + /** + * dimension tableName + */ + private String tableName; + + /** + * relation with fact and dimension table + */ + private Relation relation; + + /** + * Columns to selected from dimension table. + * Hierarchy in-memory table should be prepared + * based on selected columns + */ + private List<String> columns; + + /** + * constructor + * + * @param tableName - dimension table name + * @param relation - fact foreign key with dimension primary key mapping + * @param columns - list of columns to be used from this dimension table + */ + public DimensionRelation(String tableName, Relation relation, + List<String> columns) { + this.tableName = tableName; + this.relation = relation; + this.columns = columns; + } + + /** + * @return tableName + */ + public String getTableName() { + return tableName; + } + + /** + * @return relation + */ + public Relation getRelation() { + return relation; + } + + /** + * @return columns + */ + public List<String> getColumns() { + return columns; + } + } + + /** + * Relation class to specify fact foreignkey column with + * dimension primary key column + */ + public static class Relation implements Serializable { + /** + * default serializer + */ + private static final long serialVersionUID = 1L; + + /** + * Fact foreign key column + */ + private String factForeignKeyColumn; + + /** + * dimension primary key column + */ + private String dimensionPrimaryKeyColumn; + + /** + * constructor + * + * @param factForeignKeyColumn - Fact Table Foreign key + * @param dimensionPrimaryKeyColumn - Dimension Table primary key + */ + public Relation(String factForeignKeyColumn, String dimensionPrimaryKeyColumn) { + this.factForeignKeyColumn = factForeignKeyColumn; + this.dimensionPrimaryKeyColumn = dimensionPrimaryKeyColumn; + } + + /** + * @return factForeignKeyColumn + */ + public String getFactForeignKeyColumn() { + return factForeignKeyColumn; + } + + /** + * @return dimensionPrimaryKeyColumn + */ + public String getDimensionPrimaryKeyColumn() { + return dimensionPrimaryKeyColumn; + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/processing/src/main/java/org/apache/carbondata/processing/model/CarbonLoadModel.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/model/CarbonLoadModel.java b/processing/src/main/java/org/apache/carbondata/processing/model/CarbonLoadModel.java index 9696d36..8be315e 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/model/CarbonLoadModel.java +++ b/processing/src/main/java/org/apache/carbondata/processing/model/CarbonLoadModel.java @@ -26,7 +26,6 @@ import java.io.Serializable; import java.util.HashMap; import java.util.List; -import org.apache.carbondata.core.CarbonDataLoadSchema; import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension; import org.apache.carbondata.core.load.LoadMetadataDetails; import org.apache.carbondata.core.update.SegmentUpdateDetails; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/processing/src/main/java/org/apache/carbondata/processing/newflow/CarbonDataLoadConfiguration.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/newflow/CarbonDataLoadConfiguration.java b/processing/src/main/java/org/apache/carbondata/processing/newflow/CarbonDataLoadConfiguration.java index 0d0bfc5..0eaee48 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/newflow/CarbonDataLoadConfiguration.java +++ b/processing/src/main/java/org/apache/carbondata/processing/newflow/CarbonDataLoadConfiguration.java @@ -20,7 +20,7 @@ package org.apache.carbondata.processing.newflow; import java.util.HashMap; import java.util.Map; -import org.apache.carbondata.core.AbsoluteTableIdentifier; +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; import org.apache.carbondata.core.metadata.schema.BucketingInfo; public class CarbonDataLoadConfiguration { http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/processing/src/main/java/org/apache/carbondata/processing/newflow/DataLoadExecutor.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/newflow/DataLoadExecutor.java b/processing/src/main/java/org/apache/carbondata/processing/newflow/DataLoadExecutor.java index 5e7edbd..3092bd5 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/newflow/DataLoadExecutor.java +++ b/processing/src/main/java/org/apache/carbondata/processing/newflow/DataLoadExecutor.java @@ -19,7 +19,7 @@ package org.apache.carbondata.processing.newflow; import org.apache.carbondata.common.CarbonIterator; import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; -import org.apache.carbondata.core.CarbonTableIdentifier; +import org.apache.carbondata.core.metadata.CarbonTableIdentifier; import org.apache.carbondata.processing.model.CarbonLoadModel; import org.apache.carbondata.processing.newflow.exception.BadRecordFoundException; import org.apache.carbondata.processing.newflow.exception.CarbonDataLoadingException; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/processing/src/main/java/org/apache/carbondata/processing/newflow/DataLoadProcessBuilder.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/newflow/DataLoadProcessBuilder.java b/processing/src/main/java/org/apache/carbondata/processing/newflow/DataLoadProcessBuilder.java index 7ee40bc..8099427 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/newflow/DataLoadProcessBuilder.java +++ b/processing/src/main/java/org/apache/carbondata/processing/newflow/DataLoadProcessBuilder.java @@ -24,7 +24,7 @@ import java.util.Map; import org.apache.carbondata.common.CarbonIterator; import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; -import org.apache.carbondata.core.AbsoluteTableIdentifier; +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; import org.apache.carbondata.core.metadata.CarbonMetadata; import org.apache.carbondata.core.metadata.schema.table.CarbonTable; import org.apache.carbondata.core.metadata.schema.table.column.CarbonColumn; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/processing/src/main/java/org/apache/carbondata/processing/newflow/converter/impl/DictionaryFieldConverterImpl.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/newflow/converter/impl/DictionaryFieldConverterImpl.java b/processing/src/main/java/org/apache/carbondata/processing/newflow/converter/impl/DictionaryFieldConverterImpl.java index 99f9e61..0a9e866 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/newflow/converter/impl/DictionaryFieldConverterImpl.java +++ b/processing/src/main/java/org/apache/carbondata/processing/newflow/converter/impl/DictionaryFieldConverterImpl.java @@ -27,7 +27,7 @@ import java.util.Map; import org.apache.carbondata.core.cache.Cache; import org.apache.carbondata.core.cache.dictionary.Dictionary; import org.apache.carbondata.core.cache.dictionary.DictionaryColumnUniqueIdentifier; -import org.apache.carbondata.core.CarbonTableIdentifier; +import org.apache.carbondata.core.metadata.CarbonTableIdentifier; import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.devapi.BiDictionary; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/processing/src/main/java/org/apache/carbondata/processing/newflow/converter/impl/FieldEncoderFactory.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/newflow/converter/impl/FieldEncoderFactory.java b/processing/src/main/java/org/apache/carbondata/processing/newflow/converter/impl/FieldEncoderFactory.java index ee36fd1..8dcff97 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/newflow/converter/impl/FieldEncoderFactory.java +++ b/processing/src/main/java/org/apache/carbondata/processing/newflow/converter/impl/FieldEncoderFactory.java @@ -24,7 +24,7 @@ import java.util.List; import org.apache.carbondata.core.cache.Cache; import org.apache.carbondata.core.cache.dictionary.Dictionary; import org.apache.carbondata.core.cache.dictionary.DictionaryColumnUniqueIdentifier; -import org.apache.carbondata.core.CarbonTableIdentifier; +import org.apache.carbondata.core.metadata.CarbonTableIdentifier; import org.apache.carbondata.core.metadata.Encoding; import org.apache.carbondata.core.metadata.schema.table.column.CarbonColumn; import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/processing/src/main/java/org/apache/carbondata/processing/newflow/steps/DataConverterProcessorStepImpl.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/newflow/steps/DataConverterProcessorStepImpl.java b/processing/src/main/java/org/apache/carbondata/processing/newflow/steps/DataConverterProcessorStepImpl.java index 80e6128..ff906fe 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/newflow/steps/DataConverterProcessorStepImpl.java +++ b/processing/src/main/java/org/apache/carbondata/processing/newflow/steps/DataConverterProcessorStepImpl.java @@ -24,7 +24,7 @@ import java.io.IOException; import java.util.Iterator; import org.apache.carbondata.common.CarbonIterator; -import org.apache.carbondata.core.CarbonTableIdentifier; +import org.apache.carbondata.core.metadata.CarbonTableIdentifier; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.util.CarbonProperties; import org.apache.carbondata.processing.constants.LoggerAction; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/processing/src/main/java/org/apache/carbondata/processing/newflow/steps/DataConverterProcessorWithBucketingStepImpl.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/newflow/steps/DataConverterProcessorWithBucketingStepImpl.java b/processing/src/main/java/org/apache/carbondata/processing/newflow/steps/DataConverterProcessorWithBucketingStepImpl.java index e65846c..00fad6d 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/newflow/steps/DataConverterProcessorWithBucketingStepImpl.java +++ b/processing/src/main/java/org/apache/carbondata/processing/newflow/steps/DataConverterProcessorWithBucketingStepImpl.java @@ -26,7 +26,7 @@ import java.util.Iterator; import java.util.List; import org.apache.carbondata.common.CarbonIterator; -import org.apache.carbondata.core.CarbonTableIdentifier; +import org.apache.carbondata.core.metadata.CarbonTableIdentifier; import org.apache.carbondata.core.metadata.schema.BucketingInfo; import org.apache.carbondata.core.metadata.schema.table.column.ColumnSchema; import org.apache.carbondata.core.constants.CarbonCommonConstants; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/processing/src/main/java/org/apache/carbondata/processing/newflow/steps/DataWriterProcessorStepImpl.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/newflow/steps/DataWriterProcessorStepImpl.java b/processing/src/main/java/org/apache/carbondata/processing/newflow/steps/DataWriterProcessorStepImpl.java index ca261ab..131d7c0 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/newflow/steps/DataWriterProcessorStepImpl.java +++ b/processing/src/main/java/org/apache/carbondata/processing/newflow/steps/DataWriterProcessorStepImpl.java @@ -24,7 +24,7 @@ import java.util.Iterator; import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; -import org.apache.carbondata.core.CarbonTableIdentifier; +import org.apache.carbondata.core.metadata.CarbonTableIdentifier; import org.apache.carbondata.core.datastore.block.SegmentProperties; import org.apache.carbondata.core.constants.IgnoreDictionary; import org.apache.carbondata.core.keygenerator.KeyGenerator; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/processing/src/main/java/org/apache/carbondata/processing/sortandgroupby/sortdata/SortParameters.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/sortandgroupby/sortdata/SortParameters.java b/processing/src/main/java/org/apache/carbondata/processing/sortandgroupby/sortdata/SortParameters.java index 8466aae..c6e76a4 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/sortandgroupby/sortdata/SortParameters.java +++ b/processing/src/main/java/org/apache/carbondata/processing/sortandgroupby/sortdata/SortParameters.java @@ -22,7 +22,7 @@ import java.io.File; import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; -import org.apache.carbondata.core.CarbonTableIdentifier; +import org.apache.carbondata.core.metadata.CarbonTableIdentifier; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.util.CarbonProperties; import org.apache.carbondata.processing.newflow.CarbonDataLoadConfiguration; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/processing/src/main/java/org/apache/carbondata/processing/store/CarbonDataWriterFactory.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/store/CarbonDataWriterFactory.java b/processing/src/main/java/org/apache/carbondata/processing/store/CarbonDataWriterFactory.java index 3434ed8..b745bd2 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/store/CarbonDataWriterFactory.java +++ b/processing/src/main/java/org/apache/carbondata/processing/store/CarbonDataWriterFactory.java @@ -19,7 +19,7 @@ package org.apache.carbondata.processing.store; -import org.apache.carbondata.core.ColumnarFormatVersion; +import org.apache.carbondata.core.metadata.ColumnarFormatVersion; import org.apache.carbondata.processing.store.writer.CarbonDataWriterVo; import org.apache.carbondata.processing.store.writer.CarbonFactDataWriter; import org.apache.carbondata.processing.store.writer.v1.CarbonFactDataWriterImplV1; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerColumnar.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerColumnar.java b/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerColumnar.java index 1de837c..c27190e 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerColumnar.java +++ b/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerColumnar.java @@ -41,7 +41,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; -import org.apache.carbondata.core.ColumnarFormatVersion; +import org.apache.carbondata.core.metadata.ColumnarFormatVersion; import org.apache.carbondata.core.datastore.block.SegmentProperties; import org.apache.carbondata.core.metadata.CarbonMetadata; import org.apache.carbondata.core.metadata.schema.table.CarbonTable; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerModel.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerModel.java b/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerModel.java index 8211839..801e023 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerModel.java +++ b/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerModel.java @@ -25,7 +25,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.carbondata.core.CarbonTableIdentifier; +import org.apache.carbondata.core.metadata.CarbonTableIdentifier; import org.apache.carbondata.core.datastore.block.SegmentProperties; import org.apache.carbondata.core.metadata.CarbonMetadata; import org.apache.carbondata.core.metadata.schema.table.CarbonTable; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/processing/src/main/java/org/apache/carbondata/processing/store/writer/v2/CarbonFactDataWriterImplV2.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/store/writer/v2/CarbonFactDataWriterImplV2.java b/processing/src/main/java/org/apache/carbondata/processing/store/writer/v2/CarbonFactDataWriterImplV2.java index a8a3aed..7b93d2c 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/store/writer/v2/CarbonFactDataWriterImplV2.java +++ b/processing/src/main/java/org/apache/carbondata/processing/store/writer/v2/CarbonFactDataWriterImplV2.java @@ -26,7 +26,7 @@ import java.util.List; import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; -import org.apache.carbondata.core.ColumnarFormatVersion; +import org.apache.carbondata.core.metadata.ColumnarFormatVersion; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.metadata.BlockletInfoColumnar; import org.apache.carbondata.core.util.CarbonMetadataUtil; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/processing/src/main/java/org/apache/carbondata/processing/surrogatekeysgenerator/csvbased/FileStoreSurrogateKeyGenForCSV.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/surrogatekeysgenerator/csvbased/FileStoreSurrogateKeyGenForCSV.java b/processing/src/main/java/org/apache/carbondata/processing/surrogatekeysgenerator/csvbased/FileStoreSurrogateKeyGenForCSV.java index 33e97e0..e7b9a4c 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/surrogatekeysgenerator/csvbased/FileStoreSurrogateKeyGenForCSV.java +++ b/processing/src/main/java/org/apache/carbondata/processing/surrogatekeysgenerator/csvbased/FileStoreSurrogateKeyGenForCSV.java @@ -33,8 +33,8 @@ import org.apache.carbondata.core.cache.CacheProvider; import org.apache.carbondata.core.cache.CacheType; import org.apache.carbondata.core.cache.dictionary.Dictionary; import org.apache.carbondata.core.cache.dictionary.DictionaryColumnUniqueIdentifier; -import org.apache.carbondata.core.CarbonTableIdentifier; -import org.apache.carbondata.core.ColumnIdentifier; +import org.apache.carbondata.core.metadata.CarbonTableIdentifier; +import org.apache.carbondata.core.metadata.ColumnIdentifier; import org.apache.carbondata.core.metadata.CarbonMetadata; import org.apache.carbondata.core.metadata.schema.table.CarbonTable; import org.apache.carbondata.core.constants.CarbonCommonConstants; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/processing/src/main/java/org/apache/carbondata/processing/util/CarbonDataProcessorUtil.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/util/CarbonDataProcessorUtil.java b/processing/src/main/java/org/apache/carbondata/processing/util/CarbonDataProcessorUtil.java index 326bde7..978ce56 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/util/CarbonDataProcessorUtil.java +++ b/processing/src/main/java/org/apache/carbondata/processing/util/CarbonDataProcessorUtil.java @@ -36,7 +36,7 @@ import java.util.Set; import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; -import org.apache.carbondata.core.CarbonDataLoadSchema; +import org.apache.carbondata.processing.model.CarbonDataLoadSchema; import org.apache.carbondata.core.metadata.CarbonMetadata; import org.apache.carbondata.core.metadata.DataType; import org.apache.carbondata.core.metadata.schema.table.CarbonTable; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/processing/src/main/java/org/apache/carbondata/processing/util/CarbonSchemaParser.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/util/CarbonSchemaParser.java b/processing/src/main/java/org/apache/carbondata/processing/util/CarbonSchemaParser.java index 4480ada..9b58a84 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/util/CarbonSchemaParser.java +++ b/processing/src/main/java/org/apache/carbondata/processing/util/CarbonSchemaParser.java @@ -30,8 +30,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.apache.carbondata.core.CarbonDataLoadSchema; -import org.apache.carbondata.core.CarbonDataLoadSchema.DimensionRelation; +import org.apache.carbondata.processing.model.CarbonDataLoadSchema; +import org.apache.carbondata.processing.model.CarbonDataLoadSchema.DimensionRelation; import org.apache.carbondata.core.metadata.DataType; import org.apache.carbondata.core.metadata.Encoding; import org.apache.carbondata.core.metadata.schema.table.CarbonTable; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/processing/src/test/java/org/apache/carbondata/carbon/datastore/BlockIndexStoreTest.java ---------------------------------------------------------------------- diff --git a/processing/src/test/java/org/apache/carbondata/carbon/datastore/BlockIndexStoreTest.java b/processing/src/test/java/org/apache/carbondata/carbon/datastore/BlockIndexStoreTest.java index 3a87edc..d392f67 100644 --- a/processing/src/test/java/org/apache/carbondata/carbon/datastore/BlockIndexStoreTest.java +++ b/processing/src/test/java/org/apache/carbondata/carbon/datastore/BlockIndexStoreTest.java @@ -33,9 +33,9 @@ import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.cache.CacheProvider; import org.apache.carbondata.core.cache.CacheType; -import org.apache.carbondata.core.AbsoluteTableIdentifier; -import org.apache.carbondata.core.CarbonTableIdentifier; -import org.apache.carbondata.core.ColumnarFormatVersion; +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; +import org.apache.carbondata.core.metadata.CarbonTableIdentifier; +import org.apache.carbondata.core.metadata.ColumnarFormatVersion; import org.apache.carbondata.core.datastore.BlockIndexStore; import org.apache.carbondata.core.datastore.block.AbstractIndex; import org.apache.carbondata.core.datastore.block.TableBlockInfo;
