move identifier to metadata package
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/d0d25c9b Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/d0d25c9b Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/d0d25c9b Branch: refs/heads/movecorepackage Commit: d0d25c9bda96b783b943988725733a85be627efe Parents: 952cf51 Author: jackylk <jacky.li...@huawei.com> Authored: Fri Jan 13 15:18:44 2017 +0800 Committer: jackylk <jacky.li...@huawei.com> Committed: Fri Jan 13 15:18:44 2017 +0800 ---------------------------------------------------------------------- .../core/AbsoluteTableIdentifier.java | 141 -------------- .../carbondata/core/CarbonDataLoadSchema.java | 184 ----------------- .../carbondata/core/CarbonTableIdentifier.java | 139 ------------- .../carbondata/core/ColumnIdentifier.java | 114 ----------- .../carbondata/core/ColumnarFormatVersion.java | 52 ----- .../core/atomic/AtomicFileOperations.java | 33 ++++ .../core/atomic/AtomicFileOperationsImpl.java | 84 ++++++++ .../core/atomic/FileWriteOperation.java | 25 +++ .../cache/dictionary/DictionaryCacheLoader.java | 2 +- .../dictionary/DictionaryCacheLoaderImpl.java | 4 +- .../DictionaryColumnUniqueIdentifier.java | 4 +- .../core/datastore/BlockIndexStore.java | 4 +- .../core/datastore/SegmentTaskIndexStore.java | 2 +- .../datastore/TableSegmentUniqueIdentifier.java | 4 +- .../core/datastore/block/TableBlockInfo.java | 2 +- .../block/TableBlockUniqueIdentifier.java | 4 +- .../chunk/reader/CarbonDataReaderFactory.java | 2 +- .../IncrementalColumnDictionaryGenerator.java | 4 +- .../core/metadata/AbsoluteTableIdentifier.java | 140 +++++++++++++ .../core/metadata/CarbonTableIdentifier.java | 139 +++++++++++++ .../core/metadata/ColumnarFormatVersion.java | 52 +++++ .../core/metadata/blocklet/DataFileFooter.java | 2 +- .../core/metadata/schema/table/CarbonTable.java | 4 +- .../schema/table/column/CarbonColumn.java | 2 +- .../carbondata/core/path/CarbonStorePath.java | 4 +- .../carbondata/core/path/CarbonTablePath.java | 2 +- .../reader/CarbonDeleteDeltaFileReaderImpl.java | 4 +- .../CarbonDictionaryMetadataReaderImpl.java | 4 +- .../core/reader/CarbonDictionaryReaderImpl.java | 4 +- .../CarbonDictionarySortIndexReaderImpl.java | 4 +- .../executor/impl/AbstractQueryExecutor.java | 2 +- .../scan/executor/infos/BlockExecutionInfo.java | 2 +- .../core/scan/executor/util/QueryUtil.java | 4 +- .../scan/filter/FilterExpressionProcessor.java | 2 +- .../core/scan/filter/FilterProcessor.java | 2 +- .../carbondata/core/scan/filter/FilterUtil.java | 2 +- .../executer/RowLevelFilterExecuterImpl.java | 2 +- .../RowLevelRangeGrtThanFiterExecuterImpl.java | 2 +- ...elRangeGrtrThanEquaToFilterExecuterImpl.java | 2 +- ...velRangeLessThanEqualFilterExecuterImpl.java | 2 +- .../RowLevelRangeLessThanFiterExecuterImpl.java | 2 +- .../resolver/ConditionalFilterResolverImpl.java | 2 +- .../filter/resolver/FilterResolverIntf.java | 2 +- .../resolver/LogicalFilterResolverImpl.java | 2 +- .../resolver/RowLevelFilterResolverImpl.java | 2 +- .../RowLevelRangeFilterResolverImpl.java | 2 +- .../metadata/FilterResolverMetadata.java | 2 +- .../carbondata/core/scan/model/QueryModel.java | 2 +- .../core/service/DictionaryService.java | 4 +- .../carbondata/core/service/PathService.java | 2 +- .../core/service/impl/DictionaryFactory.java | 4 +- .../core/service/impl/PathFactory.java | 2 +- .../core/update/CarbonUpdateUtil.java | 10 +- .../data/BlockletDeleteDeltaCacheLoader.java | 2 +- .../core/updatestatus/SegmentStatusManager.java | 18 +- .../SegmentUpdateStatusManager.java | 14 +- .../updatestatus/locks/AbstractCarbonLock.java | 77 ++++++++ .../updatestatus/locks/CarbonLockFactory.java | 94 +++++++++ .../core/updatestatus/locks/CarbonLockUtil.java | 64 ++++++ .../core/updatestatus/locks/HdfsFileLock.java | 129 ++++++++++++ .../core/updatestatus/locks/ICarbonLock.java | 40 ++++ .../core/updatestatus/locks/LocalFileLock.java | 164 ++++++++++++++++ .../core/updatestatus/locks/LockUsage.java | 36 ++++ .../updatestatus/locks/ZooKeeperLocking.java | 195 +++++++++++++++++++ .../core/updatestatus/locks/ZookeeperInit.java | 82 ++++++++ .../util/AbstractDataFileFooterConverter.java | 2 +- .../core/util/CarbonMetadataUtil.java | 2 +- .../carbondata/core/util/CarbonProperties.java | 2 +- .../apache/carbondata/core/util/CarbonUtil.java | 2 +- .../core/util/DataFileFooterConverter.java | 2 +- .../core/util/DataFileFooterConverter2.java | 2 +- .../util/DataFileFooterConverterFactory.java | 2 +- .../core/writer/CarbonDictionaryWriterImpl.java | 4 +- .../CarbonDictionarySortIndexWriterImpl.java | 4 +- .../fileoperations/AtomicFileOperations.java | 33 ---- .../AtomicFileOperationsImpl.java | 87 --------- .../fileoperations/FileWriteOperation.java | 25 --- .../carbondata/locks/AbstractCarbonLock.java | 77 -------- .../carbondata/locks/CarbonLockFactory.java | 94 --------- .../apache/carbondata/locks/CarbonLockUtil.java | 64 ------ .../apache/carbondata/locks/HdfsFileLock.java | 129 ------------ .../apache/carbondata/locks/ICarbonLock.java | 40 ---- .../apache/carbondata/locks/LocalFileLock.java | 164 ---------------- .../org/apache/carbondata/locks/LockUsage.java | 36 ---- .../carbondata/locks/ZooKeeperLocking.java | 195 ------------------- .../apache/carbondata/locks/ZookeeperInit.java | 82 -------- .../core/AbsoluteTableIdentifierTest.java | 4 +- .../core/CarbonTableIdentifierTest.java | 2 +- .../carbondata/core/ColumnIdentifierTest.java | 2 +- .../dictionary/AbstractDictionaryCacheTest.java | 4 +- .../DictionaryCacheLoaderImplTest.java | 4 +- .../DictionaryColumnUniqueIdentifierTest.java | 4 +- .../dictionary/ForwardDictionaryCacheTest.java | 4 +- .../dictionary/ReverseDictionaryCacheTest.java | 4 +- .../datastore/SegmentTaskIndexStoreTest.java | 6 +- .../core/datastore/block/BlockInfoTest.java | 2 +- .../datastore/block/TableBlockInfoTest.java | 2 +- .../core/datastore/block/TableTaskInfoTest.java | 2 +- .../CarbonFormatDirectoryStructureTest.java | 5 +- .../reader/CarbonDictionaryReaderImplTest.java | 4 +- ...CarbonDictionarySortIndexReaderImplTest.java | 4 +- .../core/scan/filter/FilterUtilTest.java | 4 +- .../updatestatus/locks/LocalFileLockTest.java | 64 ++++++ .../locks/ZooKeeperLockingTest.java | 142 ++++++++++++++ .../carbondata/core/util/CarbonUtilTest.java | 2 +- .../core/util/DataFileFooterConverterTest.java | 2 +- .../writer/CarbonDictionaryWriterImplTest.java | 4 +- ...CarbonDictionarySortIndexWriterImplTest.java | 4 +- .../examples/GenerateDictionaryExample.scala | 2 +- .../carbondata/hadoop/CarbonInputFormat.java | 4 +- .../carbondata/hadoop/CarbonInputSplit.java | 2 +- .../hadoop/CarbonMultiBlockSplit.java | 2 +- .../internal/index/impl/InMemoryBTreeIndex.java | 2 +- .../hadoop/readsupport/CarbonReadSupport.java | 2 +- .../AbstractDictionaryDecodedReadSupport.java | 2 +- .../impl/ArrayWritableReadSupport.java | 2 +- .../readsupport/impl/RawDataReadSupport.java | 2 +- .../hadoop/util/CarbonInputFormatUtil.java | 2 +- .../carbondata/hadoop/util/SchemaReader.java | 2 +- .../hadoop/ft/CarbonInputMapperTest.java | 2 +- .../hadoop/test/util/StoreCreator.java | 14 +- .../complexType/TestCreateTableWithDouble.scala | 2 +- .../DataCompactionBoundaryConditionsTest.scala | 2 +- .../DataCompactionCardinalityBoundryTest.scala | 3 +- .../datacompaction/DataCompactionLockTest.scala | 5 +- .../MajorCompactionIgnoreInMinorTest.scala | 3 +- .../MajorCompactionStopsAfterCompaction.scala | 3 +- .../dataretention/DataRetentionTestCase.scala | 5 +- .../carbondata/spark/load/CarbonLoaderUtil.java | 14 +- .../spark/load/DeleteLoadFolders.java | 2 +- .../spark/merger/CarbonCompactionUtil.java | 2 +- .../spark/merger/CarbonDataMergerUtil.java | 10 +- .../spark/merger/RowResultMerger.java | 2 +- .../carbondata/spark/merger/TableMeta.java | 2 +- .../org/apache/carbondata/api/CarbonStore.scala | 3 +- .../carbondata/spark/CarbonSparkFactory.scala | 2 +- .../spark/DictionaryDetailHelper.scala | 2 +- .../spark/rdd/CarbonGlobalDictionaryRDD.scala | 5 +- .../spark/rdd/CarbonIUDMergerRDD.scala | 3 +- .../carbondata/spark/rdd/CarbonMergerRDD.scala | 14 +- .../carbondata/spark/rdd/CarbonScanRDD.scala | 2 +- .../spark/rdd/DataManagementFunc.scala | 7 +- .../spark/util/GlobalDictionaryUtil.scala | 4 +- .../readsupport/SparkRowReadSupportImpl.java | 2 +- .../spark/rdd/CarbonDataRDDFactory.scala | 23 +-- .../carbondata/spark/util/QueryPlanUtil.scala | 2 +- .../sql/CarbonDatasourceHadoopRelation.scala | 2 +- .../spark/sql/CarbonDictionaryDecoder.scala | 4 +- .../sql/execution/command/IUDCommands.scala | 4 +- .../execution/command/carbonTableSchema.scala | 7 +- .../apache/spark/sql/hive/CarbonMetastore.scala | 5 +- .../CompactionSystemLockFeatureTest.scala | 2 +- .../DataCompactionMinorThresholdTest.scala | 2 +- .../DataCompactionNoDictionaryTest.scala | 2 +- .../datacompaction/DataCompactionTest.scala | 6 +- .../spark/util/AllDictionaryTestCase.scala | 3 +- .../AutoHighCardinalityIdentifyTestCase.scala | 5 +- .../spark/util/DictionaryTestCaseUtil.scala | 2 +- .../util/ExternalColumnDictionaryTestCase.scala | 3 +- ...GlobalDictionaryUtilConcurrentTestCase.scala | 3 +- .../util/GlobalDictionaryUtilTestCase.scala | 3 +- .../readsupport/SparkRowReadSupportImpl.java | 2 +- .../carbondata/spark/CarbonSparkFactory.scala | 10 +- .../spark/DictionaryDetailHelper.scala | 2 +- .../spark/rdd/CarbonDataRDDFactory.scala | 22 +-- .../carbondata/spark/util/QueryPlanUtil.scala | 2 +- .../sql/CarbonDatasourceHadoopRelation.scala | 10 +- .../spark/sql/CarbonDictionaryDecoder.scala | 2 +- .../execution/command/carbonTableSchema.scala | 23 +-- .../apache/spark/sql/hive/CarbonMetastore.scala | 5 +- .../processing/csvload/DataGraphExecuter.java | 2 +- .../processing/csvload/GraphExecutionUtil.java | 4 +- .../processing/datatypes/PrimitiveDataType.java | 2 +- .../graphgenerator/GraphGenerator.java | 2 +- .../processing/model/CarbonDataLoadSchema.java | 184 +++++++++++++++++ .../processing/model/CarbonLoadModel.java | 1 - .../newflow/CarbonDataLoadConfiguration.java | 2 +- .../processing/newflow/DataLoadExecutor.java | 2 +- .../newflow/DataLoadProcessBuilder.java | 2 +- .../impl/DictionaryFieldConverterImpl.java | 2 +- .../converter/impl/FieldEncoderFactory.java | 2 +- .../steps/DataConverterProcessorStepImpl.java | 2 +- ...ConverterProcessorWithBucketingStepImpl.java | 2 +- .../steps/DataWriterProcessorStepImpl.java | 2 +- .../sortandgroupby/sortdata/SortParameters.java | 2 +- .../store/CarbonDataWriterFactory.java | 2 +- .../store/CarbonFactDataHandlerColumnar.java | 2 +- .../store/CarbonFactDataHandlerModel.java | 2 +- .../writer/v2/CarbonFactDataWriterImplV2.java | 2 +- .../FileStoreSurrogateKeyGenForCSV.java | 4 +- .../util/CarbonDataProcessorUtil.java | 2 +- .../processing/util/CarbonSchemaParser.java | 4 +- .../carbon/datastore/BlockIndexStoreTest.java | 6 +- .../carbondata/lcm/locks/LocalFileLockTest.java | 65 ------- .../lcm/locks/ZooKeeperLockingTest.java | 144 -------------- .../carbondata/test/util/StoreCreator.java | 14 +- 196 files changed, 2033 insertions(+), 2185 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/AbsoluteTableIdentifier.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/AbsoluteTableIdentifier.java b/core/src/main/java/org/apache/carbondata/core/AbsoluteTableIdentifier.java deleted file mode 100644 index e5823b9..0000000 --- a/core/src/main/java/org/apache/carbondata/core/AbsoluteTableIdentifier.java +++ /dev/null @@ -1,141 +0,0 @@ -/* - * 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.core; - -import java.io.File; -import java.io.Serializable; - -import org.apache.carbondata.core.constants.CarbonCommonConstants; -import org.apache.carbondata.core.datastorage.impl.FileFactory; -import org.apache.carbondata.core.util.CarbonUtil; - -/** - * identifier which will have store path and carbon table identifier - */ -public class AbsoluteTableIdentifier implements Serializable { - - /** - * serializable version - */ - private static final long serialVersionUID = 4695047103484427506L; - - /** - * path of the store - */ - private String storePath; - - /** - * carbon table identifier which will have table name and table database - * name - */ - private CarbonTableIdentifier carbonTableIdentifier; - - public AbsoluteTableIdentifier(String storePath, CarbonTableIdentifier carbonTableIdentifier) { - //TODO this should be moved to common place where path handling will be handled - this.storePath = FileFactory.getUpdatedFilePath(storePath); - this.carbonTableIdentifier = carbonTableIdentifier; - } - - /** - * @return the storePath - */ - public String getStorePath() { - return storePath; - } - - /** - * @return the carbonTableIdentifier - */ - public CarbonTableIdentifier getCarbonTableIdentifier() { - return carbonTableIdentifier; - } - - public static AbsoluteTableIdentifier from(String dbName, String tableName) { - CarbonTableIdentifier identifier = new CarbonTableIdentifier(dbName, tableName, ""); - return new AbsoluteTableIdentifier(CarbonUtil.getCarbonStorePath(), identifier); - } - - public static AbsoluteTableIdentifier fromTablePath(String tablePath) { - String formattedTablePath = tablePath.replace('\\', '/'); - String[] names = formattedTablePath.split("/"); - if (names.length < 3) { - throw new IllegalArgumentException("invalid table path: " + tablePath); - } - - String tableName = names[names.length - 1]; - String dbName = names[names.length - 2]; - String storePath = formattedTablePath.substring(0, formattedTablePath.lastIndexOf(dbName + - CarbonCommonConstants.FILE_SEPARATOR + tableName)); - - CarbonTableIdentifier identifier = - new CarbonTableIdentifier(dbName, tableName, Long.toString(System.currentTimeMillis())); - return new AbsoluteTableIdentifier(storePath, identifier); - } - - public String getTablePath() { - return getStorePath() + File.separator + getCarbonTableIdentifier().getDatabaseName() + - File.separator + getCarbonTableIdentifier().getTableName(); - } - - /** - * to get the hash code - */ - @Override public int hashCode() { - final int prime = 31; - int result = 1; - result = - prime * result + ((carbonTableIdentifier == null) ? 0 : carbonTableIdentifier.hashCode()); - result = prime * result + ((storePath == null) ? 0 : storePath.hashCode()); - return result; - } - - /** - * to check this class is equal to - * other object passed - * - * @param obj other object - */ - @Override public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (!(obj instanceof AbsoluteTableIdentifier)) { - return false; - } - AbsoluteTableIdentifier other = (AbsoluteTableIdentifier) obj; - if (carbonTableIdentifier == null) { - if (other.carbonTableIdentifier != null) { - return false; - } - } else if (!carbonTableIdentifier.equals(other.carbonTableIdentifier)) { - return false; - } - if (storePath == null) { - if (other.storePath != null) { - return false; - } - } else if (!storePath.equals(other.storePath)) { - return false; - } - return true; - } -} http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/CarbonDataLoadSchema.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/CarbonDataLoadSchema.java b/core/src/main/java/org/apache/carbondata/core/CarbonDataLoadSchema.java deleted file mode 100644 index 804cdf7..0000000 --- a/core/src/main/java/org/apache/carbondata/core/CarbonDataLoadSchema.java +++ /dev/null @@ -1,184 +0,0 @@ -/* - * 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.core; - -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/core/src/main/java/org/apache/carbondata/core/CarbonTableIdentifier.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/CarbonTableIdentifier.java b/core/src/main/java/org/apache/carbondata/core/CarbonTableIdentifier.java deleted file mode 100644 index 2789f64..0000000 --- a/core/src/main/java/org/apache/carbondata/core/CarbonTableIdentifier.java +++ /dev/null @@ -1,139 +0,0 @@ -/* - * 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.core; - -import java.io.File; -import java.io.Serializable; - -/** - * Identifier class which will hold the table qualified name - */ -public class CarbonTableIdentifier implements Serializable { - - /** - * database name - */ - private String databaseName; - - /** - * table name - */ - private String tableName; - - /** - * table id - */ - private String tableId; - - /** - * constructor - */ - public CarbonTableIdentifier(String databaseName, String tableName, String tableId) { - this.databaseName = databaseName; - this.tableName = tableName; - this.tableId = tableId; - } - - /** - * return database name - */ - public String getDatabaseName() { - return databaseName; - } - - /** - * return table name - */ - public String getTableName() { - return tableName; - } - - /** - * @return tableId - */ - public String getTableId() { - return tableId; - } - - /** - * @return table unique name - */ - public String getTableUniqueName() { - return databaseName + '_' + tableName; - } - - /** - *Creates the key for bad record lgger. - */ - public String getBadRecordLoggerKey() { - return databaseName + File.separator + tableName + '_' + tableName; - } - - @Override public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((databaseName == null) ? 0 : databaseName.hashCode()); - result = prime * result + ((tableId == null) ? 0 : tableId.hashCode()); - result = prime * result + ((tableName == null) ? 0 : tableName.hashCode()); - return result; - } - - @Override public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - CarbonTableIdentifier other = (CarbonTableIdentifier) obj; - if (databaseName == null) { - if (other.databaseName != null) { - return false; - } - } else if (!databaseName.equals(other.databaseName)) { - return false; - } - if (tableId == null) { - if (other.tableId != null) { - return false; - } - } else if (!tableId.equals(other.tableId)) { - return false; - } - if (tableName == null) { - if (other.tableName != null) { - return false; - } - } else if (!tableName.equals(other.tableName)) { - return false; - } - return true; - } - - /* - * @return table unidque name - */ - @Override public String toString() { - return databaseName + '_' + tableName; - } -} http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/ColumnIdentifier.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/ColumnIdentifier.java b/core/src/main/java/org/apache/carbondata/core/ColumnIdentifier.java deleted file mode 100644 index 4fcbca6..0000000 --- a/core/src/main/java/org/apache/carbondata/core/ColumnIdentifier.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * 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.core; - -import java.io.Serializable; -import java.util.Map; - -import org.apache.carbondata.core.metadata.DataType; - -/** - * Column unique identifier - */ -public class ColumnIdentifier implements Serializable { - - /** - * - */ - private static final long serialVersionUID = 1L; - - /** - * column id - */ - private String columnId; - - /** - * column properties - */ - private Map<String, String> columnProperties; - - private DataType dataType; - - /** - * @param columnId - * @param columnProperties - */ - public ColumnIdentifier(String columnId, Map<String, String> columnProperties, - DataType dataType) { - this.columnId = columnId; - this.columnProperties = columnProperties; - this.dataType = dataType; - } - - /** - * @return columnId - */ - public String getColumnId() { - return columnId; - } - - /** - * @param columnProperty - * @return - */ - public String getColumnProperty(String columnProperty) { - String property = null; - if (null != columnProperties) { - property = columnProperties.get(columnProperty); - } - return property; - } - - public DataType getDataType() { - return this.dataType; - } - - @Override public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((columnId == null) ? 0 : columnId.hashCode()); - return result; - } - - @Override public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - ColumnIdentifier other = (ColumnIdentifier) obj; - if (columnId == null) { - if (other.columnId != null) { - return false; - } - } else if (!columnId.equals(other.columnId)) { - return false; - } - return true; - } - - @Override public String toString() { - return "ColumnIdentifier [columnId=" + columnId + "]"; - } - -} http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/ColumnarFormatVersion.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/ColumnarFormatVersion.java b/core/src/main/java/org/apache/carbondata/core/ColumnarFormatVersion.java deleted file mode 100644 index 8fe03b4..0000000 --- a/core/src/main/java/org/apache/carbondata/core/ColumnarFormatVersion.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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.core; - -public enum ColumnarFormatVersion { - V1((short)1), - V2((short)2); - - private short version; - ColumnarFormatVersion(short version) { - this.version = version; - } - - @Override - public String toString() { - return "ColumnarFormatV" + version; - } - - public short number() { - return version; - } - - public static ColumnarFormatVersion valueOf(short version) { - switch (version) { - case 0: - // before multiple reader support, for existing carbon file, it is version 1 - return V1; - case 1: - // after multiple reader support, user can write new file with version 1 - return V1; - default: - return V2; - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/atomic/AtomicFileOperations.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/atomic/AtomicFileOperations.java b/core/src/main/java/org/apache/carbondata/core/atomic/AtomicFileOperations.java new file mode 100644 index 0000000..1061723 --- /dev/null +++ b/core/src/main/java/org/apache/carbondata/core/atomic/AtomicFileOperations.java @@ -0,0 +1,33 @@ +/* + * 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.core.atomic; + +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +public interface AtomicFileOperations { + + DataInputStream openForRead() throws IOException; + + void close() throws IOException; + + DataOutputStream openForWrite(FileWriteOperation operation) throws IOException; +} http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/atomic/AtomicFileOperationsImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/atomic/AtomicFileOperationsImpl.java b/core/src/main/java/org/apache/carbondata/core/atomic/AtomicFileOperationsImpl.java new file mode 100644 index 0000000..33eeae0 --- /dev/null +++ b/core/src/main/java/org/apache/carbondata/core/atomic/AtomicFileOperationsImpl.java @@ -0,0 +1,84 @@ +/* + * 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.core.atomic; + +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import org.apache.carbondata.core.constants.CarbonCommonConstants; +import org.apache.carbondata.core.datastorage.filesystem.CarbonFile; +import org.apache.carbondata.core.datastorage.impl.FileFactory; +import org.apache.carbondata.core.datastorage.impl.FileFactory.FileType; + +public class AtomicFileOperationsImpl implements AtomicFileOperations { + + private String filePath; + + private FileType fileType; + + private String tempWriteFilePath; + + private DataOutputStream dataOutStream; + + public AtomicFileOperationsImpl(String filePath, FileType fileType) { + this.filePath = filePath; + + this.fileType = fileType; + } + + @Override public DataInputStream openForRead() throws IOException { + return FileFactory.getDataInputStream(filePath, fileType); + } + + @Override public DataOutputStream openForWrite(FileWriteOperation operation) throws IOException { + + filePath = filePath.replace("\\", "/"); + + tempWriteFilePath = filePath + CarbonCommonConstants.TEMPWRITEFILEEXTENSION; + + if (FileFactory.isFileExist(tempWriteFilePath, fileType)) { + FileFactory.getCarbonFile(tempWriteFilePath, fileType).delete(); + } + + FileFactory.createNewFile(tempWriteFilePath, fileType); + + dataOutStream = FileFactory.getDataOutputStream(tempWriteFilePath, fileType); + + return dataOutStream; + + } + + @Override public void close() throws IOException { + + if (null != dataOutStream) { + dataOutStream.close(); + + CarbonFile tempFile = FileFactory.getCarbonFile(tempWriteFilePath, fileType); + + if (!tempFile.renameForce(filePath)) { + throw new IOException("temporary file renaming failed, src=" + + tempFile.getPath() + ", dest=" + filePath); + } + } + + } + +} http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/atomic/FileWriteOperation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/atomic/FileWriteOperation.java b/core/src/main/java/org/apache/carbondata/core/atomic/FileWriteOperation.java new file mode 100644 index 0000000..535857f --- /dev/null +++ b/core/src/main/java/org/apache/carbondata/core/atomic/FileWriteOperation.java @@ -0,0 +1,25 @@ +/* + * 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.core.atomic; + +public enum FileWriteOperation { + + APPEND, OVERWRITE +} http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryCacheLoader.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryCacheLoader.java b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryCacheLoader.java index 699a9fb..59a93f3 100644 --- a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryCacheLoader.java +++ b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryCacheLoader.java @@ -21,7 +21,7 @@ package org.apache.carbondata.core.cache.dictionary; import java.io.IOException; -import org.apache.carbondata.core.ColumnIdentifier; +import org.apache.carbondata.core.metadata.ColumnIdentifier; public interface DictionaryCacheLoader { http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryCacheLoaderImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryCacheLoaderImpl.java b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryCacheLoaderImpl.java index 7d57676..c60b911 100644 --- a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryCacheLoaderImpl.java +++ b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryCacheLoaderImpl.java @@ -25,8 +25,8 @@ import java.util.Iterator; import java.util.List; import org.apache.carbondata.core.service.CarbonCommonFactory; -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.constants.CarbonCommonConstants; import org.apache.carbondata.core.reader.CarbonDictionaryReader; import org.apache.carbondata.core.reader.sortindex.CarbonDictionarySortIndexReader; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryColumnUniqueIdentifier.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryColumnUniqueIdentifier.java b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryColumnUniqueIdentifier.java index 8c48b52..010fabe 100644 --- a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryColumnUniqueIdentifier.java +++ b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryColumnUniqueIdentifier.java @@ -19,8 +19,8 @@ package org.apache.carbondata.core.cache.dictionary; -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.DataType; /** http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/datastore/BlockIndexStore.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/BlockIndexStore.java b/core/src/main/java/org/apache/carbondata/core/datastore/BlockIndexStore.java index 68d0e95..8fe4601 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/BlockIndexStore.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/BlockIndexStore.java @@ -35,8 +35,8 @@ import java.util.concurrent.TimeUnit; import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.cache.CarbonLRUCache; -import org.apache.carbondata.core.AbsoluteTableIdentifier; -import org.apache.carbondata.core.CarbonTableIdentifier; +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; +import org.apache.carbondata.core.metadata.CarbonTableIdentifier; import org.apache.carbondata.core.datastore.block.AbstractIndex; import org.apache.carbondata.core.datastore.block.BlockIndex; import org.apache.carbondata.core.datastore.block.BlockInfo; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/datastore/SegmentTaskIndexStore.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/SegmentTaskIndexStore.java b/core/src/main/java/org/apache/carbondata/core/datastore/SegmentTaskIndexStore.java index 1ae8d28..8feae0c 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/SegmentTaskIndexStore.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/SegmentTaskIndexStore.java @@ -32,7 +32,7 @@ import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.cache.Cache; import org.apache.carbondata.core.cache.CarbonLRUCache; -import org.apache.carbondata.core.AbsoluteTableIdentifier; +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; import org.apache.carbondata.core.datastore.block.AbstractIndex; import org.apache.carbondata.core.datastore.block.SegmentTaskIndex; import org.apache.carbondata.core.datastore.block.SegmentTaskIndexWrapper; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/datastore/TableSegmentUniqueIdentifier.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/TableSegmentUniqueIdentifier.java b/core/src/main/java/org/apache/carbondata/core/datastore/TableSegmentUniqueIdentifier.java index 23db251..71b7c3f 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/TableSegmentUniqueIdentifier.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/TableSegmentUniqueIdentifier.java @@ -22,8 +22,8 @@ package org.apache.carbondata.core.datastore; import java.util.List; import java.util.Map; -import org.apache.carbondata.core.AbsoluteTableIdentifier; -import org.apache.carbondata.core.CarbonTableIdentifier; +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; +import org.apache.carbondata.core.metadata.CarbonTableIdentifier; import org.apache.carbondata.core.datastore.block.TableBlockInfo; import org.apache.carbondata.core.constants.CarbonCommonConstants; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/datastore/block/TableBlockInfo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/block/TableBlockInfo.java b/core/src/main/java/org/apache/carbondata/core/datastore/block/TableBlockInfo.java index a5061d2..4f20ceb 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/block/TableBlockInfo.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/block/TableBlockInfo.java @@ -22,7 +22,7 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import org.apache.carbondata.core.ColumnarFormatVersion; +import org.apache.carbondata.core.metadata.ColumnarFormatVersion; import org.apache.carbondata.core.path.CarbonTablePath; import org.apache.carbondata.core.path.CarbonTablePath.DataFileUtil; import org.apache.carbondata.core.constants.CarbonCommonConstants; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/datastore/block/TableBlockUniqueIdentifier.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/block/TableBlockUniqueIdentifier.java b/core/src/main/java/org/apache/carbondata/core/datastore/block/TableBlockUniqueIdentifier.java index e847227..f2fbba7 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/block/TableBlockUniqueIdentifier.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/block/TableBlockUniqueIdentifier.java @@ -1,7 +1,7 @@ package org.apache.carbondata.core.datastore.block; -import org.apache.carbondata.core.AbsoluteTableIdentifier; -import org.apache.carbondata.core.CarbonTableIdentifier; +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; +import org.apache.carbondata.core.metadata.CarbonTableIdentifier; import org.apache.carbondata.core.constants.CarbonCommonConstants; /** http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/CarbonDataReaderFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/CarbonDataReaderFactory.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/CarbonDataReaderFactory.java index af7034c..5ac5702 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/CarbonDataReaderFactory.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/CarbonDataReaderFactory.java @@ -18,7 +18,7 @@ */ package org.apache.carbondata.core.datastore.chunk.reader; -import org.apache.carbondata.core.ColumnarFormatVersion; +import org.apache.carbondata.core.metadata.ColumnarFormatVersion; import org.apache.carbondata.core.datastore.chunk.reader.dimension.v1.CompressedDimensionChunkFileBasedReaderV1; import org.apache.carbondata.core.datastore.chunk.reader.dimension.v2.CompressedDimensionChunkFileBasedReaderV2; import org.apache.carbondata.core.datastore.chunk.reader.measure.v1.CompressedMeasureChunkFileBasedReaderV1; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/dictionary/generator/IncrementalColumnDictionaryGenerator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/dictionary/generator/IncrementalColumnDictionaryGenerator.java b/core/src/main/java/org/apache/carbondata/core/dictionary/generator/IncrementalColumnDictionaryGenerator.java index 9df57b0..b95f2c9 100644 --- a/core/src/main/java/org/apache/carbondata/core/dictionary/generator/IncrementalColumnDictionaryGenerator.java +++ b/core/src/main/java/org/apache/carbondata/core/dictionary/generator/IncrementalColumnDictionaryGenerator.java @@ -30,8 +30,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.metadata.schema.table.column.CarbonDimension; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/metadata/AbsoluteTableIdentifier.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/AbsoluteTableIdentifier.java b/core/src/main/java/org/apache/carbondata/core/metadata/AbsoluteTableIdentifier.java new file mode 100644 index 0000000..59aaf53 --- /dev/null +++ b/core/src/main/java/org/apache/carbondata/core/metadata/AbsoluteTableIdentifier.java @@ -0,0 +1,140 @@ +/* + * 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.core.metadata; + +import java.io.File; +import java.io.Serializable; + +import org.apache.carbondata.core.constants.CarbonCommonConstants; +import org.apache.carbondata.core.datastorage.impl.FileFactory; +import org.apache.carbondata.core.util.CarbonUtil; + +/** + * identifier which will have store path and carbon table identifier + */ +public class AbsoluteTableIdentifier implements Serializable { + + /** + * serializable version + */ + private static final long serialVersionUID = 4695047103484427506L; + + /** + * path of the store + */ + private String storePath; + + /** + * carbon table identifier which will have table name and table database name + */ + private CarbonTableIdentifier carbonTableIdentifier; + + public AbsoluteTableIdentifier(String storePath, CarbonTableIdentifier carbonTableIdentifier) { + //TODO this should be moved to common place where path handling will be handled + this.storePath = FileFactory.getUpdatedFilePath(storePath); + this.carbonTableIdentifier = carbonTableIdentifier; + } + + /** + * @return the storePath + */ + public String getStorePath() { + return storePath; + } + + /** + * @return the carbonTableIdentifier + */ + public CarbonTableIdentifier getCarbonTableIdentifier() { + return carbonTableIdentifier; + } + + public static AbsoluteTableIdentifier from(String dbName, String tableName) { + CarbonTableIdentifier identifier = new CarbonTableIdentifier(dbName, tableName, ""); + return new AbsoluteTableIdentifier(CarbonUtil.getCarbonStorePath(), identifier); + } + + public static AbsoluteTableIdentifier fromTablePath(String tablePath) { + String formattedTablePath = tablePath.replace('\\', '/'); + String[] names = formattedTablePath.split("/"); + if (names.length < 3) { + throw new IllegalArgumentException("invalid table path: " + tablePath); + } + + String tableName = names[names.length - 1]; + String dbName = names[names.length - 2]; + String storePath = formattedTablePath.substring(0, formattedTablePath.lastIndexOf(dbName + + CarbonCommonConstants.FILE_SEPARATOR + tableName)); + + CarbonTableIdentifier identifier = + new CarbonTableIdentifier(dbName, tableName, Long.toString(System.currentTimeMillis())); + return new AbsoluteTableIdentifier(storePath, identifier); + } + + public String getTablePath() { + return getStorePath() + File.separator + getCarbonTableIdentifier().getDatabaseName() + + File.separator + getCarbonTableIdentifier().getTableName(); + } + + /** + * to get the hash code + */ + @Override public int hashCode() { + final int prime = 31; + int result = 1; + result = + prime * result + ((carbonTableIdentifier == null) ? 0 : carbonTableIdentifier.hashCode()); + result = prime * result + ((storePath == null) ? 0 : storePath.hashCode()); + return result; + } + + /** + * to check this class is equal to + * other object passed + * + * @param obj other object + */ + @Override public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (!(obj instanceof AbsoluteTableIdentifier)) { + return false; + } + AbsoluteTableIdentifier other = (AbsoluteTableIdentifier) obj; + if (carbonTableIdentifier == null) { + if (other.carbonTableIdentifier != null) { + return false; + } + } else if (!carbonTableIdentifier.equals(other.carbonTableIdentifier)) { + return false; + } + if (storePath == null) { + if (other.storePath != null) { + return false; + } + } else if (!storePath.equals(other.storePath)) { + return false; + } + return true; + } +} http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/metadata/CarbonTableIdentifier.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/CarbonTableIdentifier.java b/core/src/main/java/org/apache/carbondata/core/metadata/CarbonTableIdentifier.java new file mode 100644 index 0000000..7d2fb18 --- /dev/null +++ b/core/src/main/java/org/apache/carbondata/core/metadata/CarbonTableIdentifier.java @@ -0,0 +1,139 @@ +/* + * 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.core.metadata; + +import java.io.File; +import java.io.Serializable; + +/** + * Identifier class which will hold the table qualified name + */ +public class CarbonTableIdentifier implements Serializable { + + /** + * database name + */ + private String databaseName; + + /** + * table name + */ + private String tableName; + + /** + * table id + */ + private String tableId; + + /** + * constructor + */ + public CarbonTableIdentifier(String databaseName, String tableName, String tableId) { + this.databaseName = databaseName; + this.tableName = tableName; + this.tableId = tableId; + } + + /** + * return database name + */ + public String getDatabaseName() { + return databaseName; + } + + /** + * return table name + */ + public String getTableName() { + return tableName; + } + + /** + * @return tableId + */ + public String getTableId() { + return tableId; + } + + /** + * @return table unique name + */ + public String getTableUniqueName() { + return databaseName + '_' + tableName; + } + + /** + *Creates the key for bad record lgger. + */ + public String getBadRecordLoggerKey() { + return databaseName + File.separator + tableName + '_' + tableName; + } + + @Override public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((databaseName == null) ? 0 : databaseName.hashCode()); + result = prime * result + ((tableId == null) ? 0 : tableId.hashCode()); + result = prime * result + ((tableName == null) ? 0 : tableName.hashCode()); + return result; + } + + @Override public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + CarbonTableIdentifier other = (CarbonTableIdentifier) obj; + if (databaseName == null) { + if (other.databaseName != null) { + return false; + } + } else if (!databaseName.equals(other.databaseName)) { + return false; + } + if (tableId == null) { + if (other.tableId != null) { + return false; + } + } else if (!tableId.equals(other.tableId)) { + return false; + } + if (tableName == null) { + if (other.tableName != null) { + return false; + } + } else if (!tableName.equals(other.tableName)) { + return false; + } + return true; + } + + /* + * @return table unidque name + */ + @Override public String toString() { + return databaseName + '_' + tableName; + } +} http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/metadata/ColumnarFormatVersion.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/ColumnarFormatVersion.java b/core/src/main/java/org/apache/carbondata/core/metadata/ColumnarFormatVersion.java new file mode 100644 index 0000000..fb15cc5 --- /dev/null +++ b/core/src/main/java/org/apache/carbondata/core/metadata/ColumnarFormatVersion.java @@ -0,0 +1,52 @@ +/* + * 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.core.metadata; + +public enum ColumnarFormatVersion { + V1((short)1), + V2((short)2); + + private short version; + ColumnarFormatVersion(short version) { + this.version = version; + } + + @Override + public String toString() { + return "ColumnarFormatV" + version; + } + + public short number() { + return version; + } + + public static ColumnarFormatVersion valueOf(short version) { + switch (version) { + case 0: + // before multiple reader support, for existing carbon file, it is version 1 + return V1; + case 1: + // after multiple reader support, user can write new file with version 1 + return V1; + default: + return V2; + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/metadata/blocklet/DataFileFooter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/blocklet/DataFileFooter.java b/core/src/main/java/org/apache/carbondata/core/metadata/blocklet/DataFileFooter.java index 807b039..d064ab3 100644 --- a/core/src/main/java/org/apache/carbondata/core/metadata/blocklet/DataFileFooter.java +++ b/core/src/main/java/org/apache/carbondata/core/metadata/blocklet/DataFileFooter.java @@ -21,7 +21,7 @@ package org.apache.carbondata.core.metadata.blocklet; import java.io.Serializable; import java.util.List; -import org.apache.carbondata.core.ColumnarFormatVersion; +import org.apache.carbondata.core.metadata.ColumnarFormatVersion; import org.apache.carbondata.core.datastore.block.BlockInfo; import org.apache.carbondata.core.metadata.blocklet.index.BlockletIndex; import org.apache.carbondata.core.metadata.schema.table.column.ColumnSchema; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/CarbonTable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/CarbonTable.java b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/CarbonTable.java index b4c9f71..dae3c26 100644 --- a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/CarbonTable.java +++ b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/CarbonTable.java @@ -24,8 +24,8 @@ import java.util.*; 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.CarbonTableIdentifier; +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; +import org.apache.carbondata.core.metadata.CarbonTableIdentifier; import org.apache.carbondata.core.metadata.Encoding; import org.apache.carbondata.core.metadata.schema.BucketingInfo; import org.apache.carbondata.core.metadata.schema.table.column.CarbonColumn; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/CarbonColumn.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/CarbonColumn.java b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/CarbonColumn.java index 50c800e..511d51e 100644 --- a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/CarbonColumn.java +++ b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/CarbonColumn.java @@ -23,7 +23,7 @@ import java.io.Serializable; import java.util.List; import java.util.Map; -import org.apache.carbondata.core.ColumnIdentifier; +import org.apache.carbondata.core.metadata.ColumnIdentifier; import org.apache.carbondata.core.metadata.DataType; import org.apache.carbondata.core.metadata.Encoding; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/path/CarbonStorePath.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/path/CarbonStorePath.java b/core/src/main/java/org/apache/carbondata/core/path/CarbonStorePath.java index 833d5eb..4f95fd4 100644 --- a/core/src/main/java/org/apache/carbondata/core/path/CarbonStorePath.java +++ b/core/src/main/java/org/apache/carbondata/core/path/CarbonStorePath.java @@ -20,8 +20,8 @@ package org.apache.carbondata.core.path; import java.io.File; -import org.apache.carbondata.core.AbsoluteTableIdentifier; -import org.apache.carbondata.core.CarbonTableIdentifier; +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; +import org.apache.carbondata.core.metadata.CarbonTableIdentifier; import org.apache.hadoop.fs.Path; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/path/CarbonTablePath.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/path/CarbonTablePath.java b/core/src/main/java/org/apache/carbondata/core/path/CarbonTablePath.java index b762ca1..45c947f 100644 --- a/core/src/main/java/org/apache/carbondata/core/path/CarbonTablePath.java +++ b/core/src/main/java/org/apache/carbondata/core/path/CarbonTablePath.java @@ -20,7 +20,7 @@ package org.apache.carbondata.core.path; import java.io.File; -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.datastorage.filesystem.CarbonFile; import org.apache.carbondata.core.datastorage.filesystem.CarbonFileFilter; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/reader/CarbonDeleteDeltaFileReaderImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/reader/CarbonDeleteDeltaFileReaderImpl.java b/core/src/main/java/org/apache/carbondata/core/reader/CarbonDeleteDeltaFileReaderImpl.java index b76353c..097c25b 100644 --- a/core/src/main/java/org/apache/carbondata/core/reader/CarbonDeleteDeltaFileReaderImpl.java +++ b/core/src/main/java/org/apache/carbondata/core/reader/CarbonDeleteDeltaFileReaderImpl.java @@ -27,8 +27,8 @@ import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.datastorage.impl.FileFactory; import org.apache.carbondata.core.update.DeleteDeltaBlockDetails; import org.apache.carbondata.core.util.CarbonUtil; -import org.apache.carbondata.fileoperations.AtomicFileOperations; -import org.apache.carbondata.fileoperations.AtomicFileOperationsImpl; +import org.apache.carbondata.core.atomic.AtomicFileOperations; +import org.apache.carbondata.core.atomic.AtomicFileOperationsImpl; import com.google.gson.Gson; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/reader/CarbonDictionaryMetadataReaderImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/reader/CarbonDictionaryMetadataReaderImpl.java b/core/src/main/java/org/apache/carbondata/core/reader/CarbonDictionaryMetadataReaderImpl.java index 43ea57f..318836c 100644 --- a/core/src/main/java/org/apache/carbondata/core/reader/CarbonDictionaryMetadataReaderImpl.java +++ b/core/src/main/java/org/apache/carbondata/core/reader/CarbonDictionaryMetadataReaderImpl.java @@ -24,8 +24,8 @@ import java.util.ArrayList; import java.util.List; import org.apache.carbondata.core.service.CarbonCommonFactory; -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.path.CarbonTablePath; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.service.PathService; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/reader/CarbonDictionaryReaderImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/reader/CarbonDictionaryReaderImpl.java b/core/src/main/java/org/apache/carbondata/core/reader/CarbonDictionaryReaderImpl.java index 27b1fc3..76b22cb 100644 --- a/core/src/main/java/org/apache/carbondata/core/reader/CarbonDictionaryReaderImpl.java +++ b/core/src/main/java/org/apache/carbondata/core/reader/CarbonDictionaryReaderImpl.java @@ -27,8 +27,8 @@ import java.util.List; import org.apache.carbondata.core.service.CarbonCommonFactory; import org.apache.carbondata.core.cache.dictionary.ColumnDictionaryChunkIterator; -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.path.CarbonTablePath; import org.apache.carbondata.core.service.PathService; import org.apache.carbondata.format.ColumnDictionaryChunk; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/reader/sortindex/CarbonDictionarySortIndexReaderImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/reader/sortindex/CarbonDictionarySortIndexReaderImpl.java b/core/src/main/java/org/apache/carbondata/core/reader/sortindex/CarbonDictionarySortIndexReaderImpl.java index 1dd51d4..1b95507 100644 --- a/core/src/main/java/org/apache/carbondata/core/reader/sortindex/CarbonDictionarySortIndexReaderImpl.java +++ b/core/src/main/java/org/apache/carbondata/core/reader/sortindex/CarbonDictionarySortIndexReaderImpl.java @@ -24,8 +24,8 @@ import java.util.List; import org.apache.carbondata.core.service.CarbonCommonFactory; 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.ColumnIdentifier; +import org.apache.carbondata.core.metadata.CarbonTableIdentifier; +import org.apache.carbondata.core.metadata.ColumnIdentifier; import org.apache.carbondata.core.path.CarbonTablePath; import org.apache.carbondata.core.datastorage.impl.FileFactory; import org.apache.carbondata.core.reader.CarbonDictionaryColumnMetaChunk; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/AbstractQueryExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/AbstractQueryExecutor.java b/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/AbstractQueryExecutor.java index 05df636..d2da9d3 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/AbstractQueryExecutor.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/AbstractQueryExecutor.java @@ -33,7 +33,7 @@ import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.common.logging.impl.StandardLogService; 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.metadata.AbsoluteTableIdentifier; import org.apache.carbondata.core.datastore.BlockIndexStore; import org.apache.carbondata.core.datastore.IndexKey; import org.apache.carbondata.core.datastore.block.AbstractIndex; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/scan/executor/infos/BlockExecutionInfo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/executor/infos/BlockExecutionInfo.java b/core/src/main/java/org/apache/carbondata/core/scan/executor/infos/BlockExecutionInfo.java index 7b29c8b..6f4a37e 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/executor/infos/BlockExecutionInfo.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/executor/infos/BlockExecutionInfo.java @@ -21,7 +21,7 @@ package org.apache.carbondata.core.scan.executor.infos; import java.util.Map; import org.apache.carbondata.core.cache.dictionary.Dictionary; -import org.apache.carbondata.core.AbsoluteTableIdentifier; +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; import org.apache.carbondata.core.datastore.DataRefNode; import org.apache.carbondata.core.datastore.IndexKey; import org.apache.carbondata.core.datastore.block.AbstractIndex; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/scan/executor/util/QueryUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/executor/util/QueryUtil.java b/core/src/main/java/org/apache/carbondata/core/scan/executor/util/QueryUtil.java index 676d978..a9c6df0 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/executor/util/QueryUtil.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/executor/util/QueryUtil.java @@ -37,8 +37,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.AbsoluteTableIdentifier; -import org.apache.carbondata.core.CarbonTableIdentifier; +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; +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.DataType; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterExpressionProcessor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterExpressionProcessor.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterExpressionProcessor.java index 0b82b53..31321ec 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterExpressionProcessor.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterExpressionProcessor.java @@ -25,7 +25,7 @@ import java.util.List; 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.datastore.DataRefNode; import org.apache.carbondata.core.datastore.DataRefNodeFinder; import org.apache.carbondata.core.datastore.IndexKey; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterProcessor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterProcessor.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterProcessor.java index 4199429..038f496 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterProcessor.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterProcessor.java @@ -22,7 +22,7 @@ package org.apache.carbondata.core.scan.filter; import java.io.IOException; import java.util.List; -import org.apache.carbondata.core.AbsoluteTableIdentifier; +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; import org.apache.carbondata.core.datastore.DataRefNode; import org.apache.carbondata.core.datastore.block.AbstractIndex; import org.apache.carbondata.core.scan.expression.Expression; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterUtil.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterUtil.java index ab0c7e8..9af8d53 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterUtil.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterUtil.java @@ -46,7 +46,7 @@ import org.apache.carbondata.core.cache.dictionary.Dictionary; import org.apache.carbondata.core.cache.dictionary.DictionaryChunksWrapper; import org.apache.carbondata.core.cache.dictionary.DictionaryColumnUniqueIdentifier; import org.apache.carbondata.core.cache.dictionary.ForwardDictionary; -import org.apache.carbondata.core.AbsoluteTableIdentifier; +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; import org.apache.carbondata.core.datastore.IndexKey; import org.apache.carbondata.core.datastore.block.SegmentProperties; import org.apache.carbondata.core.metadata.DataType; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelFilterExecuterImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelFilterExecuterImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelFilterExecuterImpl.java index 0c1b1a1..a47704d 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelFilterExecuterImpl.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelFilterExecuterImpl.java @@ -31,7 +31,7 @@ import java.util.Map; import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.cache.dictionary.Dictionary; -import org.apache.carbondata.core.AbsoluteTableIdentifier; +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; import org.apache.carbondata.core.datastore.block.SegmentProperties; import org.apache.carbondata.core.datastore.chunk.impl.VariableLengthDimensionDataChunk; import org.apache.carbondata.core.metadata.DataType; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeGrtThanFiterExecuterImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeGrtThanFiterExecuterImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeGrtThanFiterExecuterImpl.java index 11ec991..dfab0b1 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeGrtThanFiterExecuterImpl.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeGrtThanFiterExecuterImpl.java @@ -22,7 +22,7 @@ import java.io.IOException; import java.util.BitSet; import java.util.List; -import org.apache.carbondata.core.AbsoluteTableIdentifier; +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; import org.apache.carbondata.core.datastore.block.SegmentProperties; import org.apache.carbondata.core.datastore.chunk.DimensionColumnDataChunk; import org.apache.carbondata.core.datastore.chunk.impl.FixedLengthDimensionDataChunk; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeGrtrThanEquaToFilterExecuterImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeGrtrThanEquaToFilterExecuterImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeGrtrThanEquaToFilterExecuterImpl.java index fb7c86d..825f59e 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeGrtrThanEquaToFilterExecuterImpl.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeGrtrThanEquaToFilterExecuterImpl.java @@ -22,7 +22,7 @@ import java.io.IOException; import java.util.BitSet; import java.util.List; -import org.apache.carbondata.core.AbsoluteTableIdentifier; +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; import org.apache.carbondata.core.datastore.block.SegmentProperties; import org.apache.carbondata.core.datastore.chunk.DimensionColumnDataChunk; import org.apache.carbondata.core.datastore.chunk.impl.FixedLengthDimensionDataChunk; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeLessThanEqualFilterExecuterImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeLessThanEqualFilterExecuterImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeLessThanEqualFilterExecuterImpl.java index 33c2e50..1eb47e6 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeLessThanEqualFilterExecuterImpl.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeLessThanEqualFilterExecuterImpl.java @@ -22,7 +22,7 @@ import java.io.IOException; import java.util.BitSet; import java.util.List; -import org.apache.carbondata.core.AbsoluteTableIdentifier; +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; import org.apache.carbondata.core.datastore.block.SegmentProperties; import org.apache.carbondata.core.datastore.chunk.DimensionColumnDataChunk; import org.apache.carbondata.core.datastore.chunk.impl.FixedLengthDimensionDataChunk; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeLessThanFiterExecuterImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeLessThanFiterExecuterImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeLessThanFiterExecuterImpl.java index 6f2d3e2..83fa050 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeLessThanFiterExecuterImpl.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeLessThanFiterExecuterImpl.java @@ -22,7 +22,7 @@ import java.io.IOException; import java.util.BitSet; import java.util.List; -import org.apache.carbondata.core.AbsoluteTableIdentifier; +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; import org.apache.carbondata.core.datastore.block.SegmentProperties; import org.apache.carbondata.core.datastore.chunk.DimensionColumnDataChunk; import org.apache.carbondata.core.datastore.chunk.impl.FixedLengthDimensionDataChunk; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/ConditionalFilterResolverImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/ConditionalFilterResolverImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/ConditionalFilterResolverImpl.java index ce18b75..69cf216 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/ConditionalFilterResolverImpl.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/ConditionalFilterResolverImpl.java @@ -22,7 +22,7 @@ import java.io.IOException; import java.util.List; import java.util.SortedMap; -import org.apache.carbondata.core.AbsoluteTableIdentifier; +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; import org.apache.carbondata.core.datastore.block.SegmentProperties; import org.apache.carbondata.core.metadata.DataType; import org.apache.carbondata.core.metadata.Encoding; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/FilterResolverIntf.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/FilterResolverIntf.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/FilterResolverIntf.java index b395e7c..9b42ecc 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/FilterResolverIntf.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/FilterResolverIntf.java @@ -23,7 +23,7 @@ import java.io.Serializable; import java.util.List; import java.util.SortedMap; -import org.apache.carbondata.core.AbsoluteTableIdentifier; +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; import org.apache.carbondata.core.datastore.block.SegmentProperties; import org.apache.carbondata.core.scan.expression.Expression; import org.apache.carbondata.core.scan.expression.exception.FilterUnsupportedException; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d0d25c9b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/LogicalFilterResolverImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/LogicalFilterResolverImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/LogicalFilterResolverImpl.java index 4ffb8ba..11f9eaa 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/LogicalFilterResolverImpl.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/LogicalFilterResolverImpl.java @@ -22,7 +22,7 @@ package org.apache.carbondata.core.scan.filter.resolver; import java.util.List; import java.util.SortedMap; -import org.apache.carbondata.core.AbsoluteTableIdentifier; +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; import org.apache.carbondata.core.datastore.block.SegmentProperties; import org.apache.carbondata.core.scan.expression.BinaryExpression; import org.apache.carbondata.core.scan.expression.Expression;
