Repository: carbondata Updated Branches: refs/heads/master 2304303ca -> 29dc30280
http://git-wip-us.apache.org/repos/asf/carbondata/blob/29dc3028/processing/src/main/java/org/apache/carbondata/processing/loading/converter/impl/FieldEncoderFactory.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/loading/converter/impl/FieldEncoderFactory.java b/processing/src/main/java/org/apache/carbondata/processing/loading/converter/impl/FieldEncoderFactory.java index 4b7ce63..4cd5014 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/loading/converter/impl/FieldEncoderFactory.java +++ b/processing/src/main/java/org/apache/carbondata/processing/loading/converter/impl/FieldEncoderFactory.java @@ -89,8 +89,7 @@ public class FieldEncoderFactory { if (null == dataField.getColumn().getColumnSchema().getParentColumnTableRelations() || dataField.getColumn().getColumnSchema().getParentColumnTableRelations().isEmpty()) { identifier = new DictionaryColumnUniqueIdentifier(absoluteTableIdentifier, - dataField.getColumn().getColumnIdentifier(), dataField.getColumn().getDataType(), - CarbonStorePath.getCarbonTablePath(absoluteTableIdentifier)); + dataField.getColumn().getColumnIdentifier(), dataField.getColumn().getDataType()); return new DictionaryFieldConverterImpl(dataField, cache, absoluteTableIdentifier, nullFormat, index, client, useOnePass, localCache, isEmptyBadRecord, identifier); @@ -113,8 +112,7 @@ public class FieldEncoderFactory { CarbonUtil.getNewTablePath(carbonTablePath, parentTableIdentifier.getTableName()), parentTableIdentifier); identifier = new DictionaryColumnUniqueIdentifier(parentAbsoluteTableIdentifier, - parentColumnIdentifier, dataField.getColumn().getDataType(), - CarbonStorePath.getCarbonTablePath(parentAbsoluteTableIdentifier)); + parentColumnIdentifier, dataField.getColumn().getDataType()); return new DictionaryFieldConverterImpl(dataField, cache, parentAbsoluteTableIdentifier, nullFormat, index, null, false, null, isEmptyBadRecord, identifier); } http://git-wip-us.apache.org/repos/asf/carbondata/blob/29dc3028/processing/src/main/java/org/apache/carbondata/processing/util/CarbonLoaderUtil.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/util/CarbonLoaderUtil.java b/processing/src/main/java/org/apache/carbondata/processing/util/CarbonLoaderUtil.java index d7e9867..4275603 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/util/CarbonLoaderUtil.java +++ b/processing/src/main/java/org/apache/carbondata/processing/util/CarbonLoaderUtil.java @@ -440,8 +440,7 @@ public final class CarbonLoaderUtil { ColumnIdentifier columnIdentifier, DataType dataType) throws IOException { return getDictionary( - new DictionaryColumnUniqueIdentifier(absoluteTableIdentifier, columnIdentifier, dataType, - CarbonStorePath.getCarbonTablePath(absoluteTableIdentifier))); + new DictionaryColumnUniqueIdentifier(absoluteTableIdentifier, columnIdentifier, dataType)); } /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/29dc3028/processing/src/test/java/org/apache/carbondata/processing/StoreCreator.java ---------------------------------------------------------------------- diff --git a/processing/src/test/java/org/apache/carbondata/processing/StoreCreator.java b/processing/src/test/java/org/apache/carbondata/processing/StoreCreator.java index 78c99d6..24b7415 100644 --- a/processing/src/test/java/org/apache/carbondata/processing/StoreCreator.java +++ b/processing/src/test/java/org/apache/carbondata/processing/StoreCreator.java @@ -321,9 +321,7 @@ public class StoreCreator { new ColumnIdentifier(dims.get(i).getColumnId(), null, null); DictionaryColumnUniqueIdentifier dictionaryColumnUniqueIdentifier = new DictionaryColumnUniqueIdentifier(table.getAbsoluteTableIdentifier(), columnIdentifier, - columnIdentifier.getDataType(), CarbonStorePath - .getCarbonTablePath(table.getAbsoluteTableIdentifier().getTablePath(), - table.getCarbonTableIdentifier())); + columnIdentifier.getDataType()); CarbonDictionaryWriter writer = new CarbonDictionaryWriterImpl(dictionaryColumnUniqueIdentifier); for (String value : set[i]) { @@ -333,8 +331,7 @@ public class StoreCreator { writer.commit(); Dictionary dict = (Dictionary) dictCache.get( new DictionaryColumnUniqueIdentifier(absoluteTableIdentifier, - columnIdentifier, dims.get(i).getDataType(), - CarbonStorePath.getCarbonTablePath(absoluteTableIdentifier))); + columnIdentifier, dims.get(i).getDataType())); CarbonDictionarySortInfoPreparator preparator = new CarbonDictionarySortInfoPreparator(); List<String> newDistinctValues = new ArrayList<String>();
