http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/datastore/block/SegmentTaskIndexWrapper.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/block/SegmentTaskIndexWrapper.java b/core/src/main/java/org/apache/carbondata/core/datastore/block/SegmentTaskIndexWrapper.java deleted file mode 100644 index 4fe6d1b..0000000 --- a/core/src/main/java/org/apache/carbondata/core/datastore/block/SegmentTaskIndexWrapper.java +++ /dev/null @@ -1,129 +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.datastore.block; - -import java.util.Map; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; - -import org.apache.carbondata.core.cache.Cacheable; -import org.apache.carbondata.core.datastore.SegmentTaskIndexStore; - -/** - * SegmentTaskIndexWrapper class holds the taskIdToTableSegmentMap - */ -public class SegmentTaskIndexWrapper implements Cacheable { - - /** - * task_id to table segment index map - */ - private Map<SegmentTaskIndexStore.TaskBucketHolder, AbstractIndex> taskIdToTableSegmentMap; - /** - * atomic integer to maintain the access count for a column access - */ - protected AtomicInteger accessCount = new AtomicInteger(); - - /** - * Table block meta size. - */ - protected AtomicLong memorySize = new AtomicLong(); - - private Long refreshedTimeStamp; - public SegmentTaskIndexWrapper( - Map<SegmentTaskIndexStore.TaskBucketHolder, AbstractIndex> taskIdToTableSegmentMap) { - this.taskIdToTableSegmentMap = taskIdToTableSegmentMap; - } - - public Map<SegmentTaskIndexStore.TaskBucketHolder, AbstractIndex> getTaskIdToTableSegmentMap() { - return taskIdToTableSegmentMap; - } - - public void setTaskIdToTableSegmentMap( - Map<SegmentTaskIndexStore.TaskBucketHolder, AbstractIndex> taskIdToTableSegmentMap) { - this.taskIdToTableSegmentMap = taskIdToTableSegmentMap; - } - - /** - * return segment size - * - * @param memorySize - */ - public void setMemorySize(long memorySize) { - this.memorySize.set(memorySize); - } - - /** - * returns the timestamp - * - * @return - */ - @Override public long getFileTimeStamp() { - return 0; - } - - /** - * returns the access count - * - * @return - */ - @Override public int getAccessCount() { - return accessCount.get(); - } - - /** - * returns the memory size - * - * @return - */ - @Override public long getMemorySize() { - return memorySize.get(); - } - - /** - * The method is used to set the access count - */ - public void incrementAccessCount() { - accessCount.incrementAndGet(); - } - - /** - * This method will release the objects and set default value for primitive types - */ - public void clear() { - decrementAccessCount(); - } - - /** - * This method will decrement the access count for a column by 1 - * whenever a column usage is complete - */ - private void decrementAccessCount() { - if (accessCount.get() > 0) { - accessCount.decrementAndGet(); - } - } - - public Long getRefreshedTimeStamp() { - return refreshedTimeStamp; - } - - public void setRefreshedTimeStamp(Long refreshedTimeStamp) { - this.refreshedTimeStamp = refreshedTimeStamp; - } - -}
http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/datastore/chunk/DimensionColumnPage.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/DimensionColumnPage.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/DimensionColumnPage.java index 15840bc..50fa09a 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/DimensionColumnPage.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/DimensionColumnPage.java @@ -16,7 +16,6 @@ */ package org.apache.carbondata.core.datastore.chunk; -import org.apache.carbondata.core.scan.executor.infos.KeyStructureInfo; import org.apache.carbondata.core.scan.result.vector.ColumnVectorInfo; /** @@ -31,7 +30,7 @@ public interface DimensionColumnPage { * @param data data to filed * @return how many bytes was copied */ - int fillRawData(int rowId, int offset, byte[] data, KeyStructureInfo restructuringInfo); + int fillRawData(int rowId, int offset, byte[] data); /** * It uses to convert column data to dictionary integer value @@ -39,31 +38,26 @@ public interface DimensionColumnPage { * @param rowId * @param chunkIndex * @param outputSurrogateKey - * @param restructuringInfo @return + * @return */ - int fillSurrogateKey(int rowId, int chunkIndex, int[] outputSurrogateKey, - KeyStructureInfo restructuringInfo); + int fillSurrogateKey(int rowId, int chunkIndex, int[] outputSurrogateKey); /** * Fill the data to vector * @param vectorInfo * @param chunkIndex - * @param restructuringInfo * @return next column index */ - int fillVector(ColumnVectorInfo[] vectorInfo, int chunkIndex, - KeyStructureInfo restructuringInfo); + int fillVector(ColumnVectorInfo[] vectorInfo, int chunkIndex); /** * Fill the data to vector * @param filteredRowId * @param vectorInfo * @param chunkIndex - * @param restructuringInfo * @return next column index */ - int fillVector(int[] filteredRowId, ColumnVectorInfo[] vectorInfo, int chunkIndex, - KeyStructureInfo restructuringInfo); + int fillVector(int[] filteredRowId, ColumnVectorInfo[] vectorInfo, int chunkIndex); /** * Below method to get the data based in row id http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/FixedLengthDimensionColumnPage.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/FixedLengthDimensionColumnPage.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/FixedLengthDimensionColumnPage.java index e25fcb9..c815e4d 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/FixedLengthDimensionColumnPage.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/FixedLengthDimensionColumnPage.java @@ -21,7 +21,6 @@ import org.apache.carbondata.core.datastore.chunk.store.DimensionChunkStoreFacto import org.apache.carbondata.core.datastore.chunk.store.DimensionChunkStoreFactory.DimensionStoreType; import org.apache.carbondata.core.metadata.datatype.DataType; import org.apache.carbondata.core.metadata.datatype.DataTypes; -import org.apache.carbondata.core.scan.executor.infos.KeyStructureInfo; import org.apache.carbondata.core.scan.result.vector.CarbonColumnVector; import org.apache.carbondata.core.scan.result.vector.ColumnVectorInfo; @@ -57,11 +56,9 @@ public class FixedLengthDimensionColumnPage extends AbstractDimensionColumnPage * @param rowId row id of the chunk * @param offset offset from which data need to be filed * @param data data to filed - * @param keyStructureInfo define the structure of the key * @return how many bytes was copied */ - @Override public int fillRawData(int rowId, int offset, byte[] data, - KeyStructureInfo keyStructureInfo) { + @Override public int fillRawData(int rowId, int offset, byte[] data) { dataChunkStore.fillRow(rowId, data, offset); return dataChunkStore.getColumnValueSize(); } @@ -72,11 +69,9 @@ public class FixedLengthDimensionColumnPage extends AbstractDimensionColumnPage * @param rowId * @param chunkIndex * @param outputSurrogateKey - * @param restructuringInfo * @return */ - @Override public int fillSurrogateKey(int rowId, int chunkIndex, int[] outputSurrogateKey, - KeyStructureInfo restructuringInfo) { + @Override public int fillSurrogateKey(int rowId, int chunkIndex, int[] outputSurrogateKey) { outputSurrogateKey[chunkIndex] = dataChunkStore.getSurrogate(rowId); return chunkIndex + 1; } @@ -86,11 +81,9 @@ public class FixedLengthDimensionColumnPage extends AbstractDimensionColumnPage * * @param vectorInfo * @param chunkIndex - * @param restructuringInfo * @return next column index */ - @Override public int fillVector(ColumnVectorInfo[] vectorInfo, int chunkIndex, - KeyStructureInfo restructuringInfo) { + @Override public int fillVector(ColumnVectorInfo[] vectorInfo, int chunkIndex) { ColumnVectorInfo columnVectorInfo = vectorInfo[chunkIndex]; int offset = columnVectorInfo.offset; int vectorOffset = columnVectorInfo.vectorOffset; @@ -127,11 +120,10 @@ public class FixedLengthDimensionColumnPage extends AbstractDimensionColumnPage * @param filteredRowId * @param vectorInfo * @param chunkIndex - * @param restructuringInfo * @return next column index */ @Override public int fillVector(int[] filteredRowId, ColumnVectorInfo[] vectorInfo, - int chunkIndex, KeyStructureInfo restructuringInfo) { + int chunkIndex) { ColumnVectorInfo columnVectorInfo = vectorInfo[chunkIndex]; int offset = columnVectorInfo.offset; int vectorOffset = columnVectorInfo.vectorOffset; http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/VariableLengthDimensionColumnPage.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/VariableLengthDimensionColumnPage.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/VariableLengthDimensionColumnPage.java index aea594c..a404ff7 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/VariableLengthDimensionColumnPage.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/VariableLengthDimensionColumnPage.java @@ -19,7 +19,6 @@ package org.apache.carbondata.core.datastore.chunk.impl; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.datastore.chunk.store.DimensionChunkStoreFactory; import org.apache.carbondata.core.datastore.chunk.store.DimensionChunkStoreFactory.DimensionStoreType; -import org.apache.carbondata.core.scan.executor.infos.KeyStructureInfo; import org.apache.carbondata.core.scan.result.vector.CarbonColumnVector; import org.apache.carbondata.core.scan.result.vector.CarbonDictionary; import org.apache.carbondata.core.scan.result.vector.ColumnVectorInfo; @@ -65,11 +64,9 @@ public class VariableLengthDimensionColumnPage extends AbstractDimensionColumnPa * @param rowId row id of the chunk * @param offset offset from which data need to be filed * @param data data to filed - * @param restructuringInfo define the structure of the key * @return how many bytes was copied */ - @Override public int fillRawData(int rowId, int offset, byte[] data, - KeyStructureInfo restructuringInfo) { + @Override public int fillRawData(int rowId, int offset, byte[] data) { // no required in this case because this column chunk is not the part if // mdkey return 0; @@ -81,11 +78,9 @@ public class VariableLengthDimensionColumnPage extends AbstractDimensionColumnPa * @param rowId * @param chunkIndex * @param outputSurrogateKey - * @param restructuringInfo * @return */ - @Override public int fillSurrogateKey(int rowId, int chunkIndex, int[] outputSurrogateKey, - KeyStructureInfo restructuringInfo) { + @Override public int fillSurrogateKey(int rowId, int chunkIndex, int[] outputSurrogateKey) { return chunkIndex + 1; } @@ -101,11 +96,9 @@ public class VariableLengthDimensionColumnPage extends AbstractDimensionColumnPa * * @param vectorInfo * @param chunkIndex - * @param restructuringInfo * @return next column index */ - @Override public int fillVector(ColumnVectorInfo[] vectorInfo, int chunkIndex, - KeyStructureInfo restructuringInfo) { + @Override public int fillVector(ColumnVectorInfo[] vectorInfo, int chunkIndex) { ColumnVectorInfo columnVectorInfo = vectorInfo[chunkIndex]; CarbonColumnVector vector = columnVectorInfo.vector; int offset = columnVectorInfo.offset; @@ -125,11 +118,10 @@ public class VariableLengthDimensionColumnPage extends AbstractDimensionColumnPa * @param filteredRowId * @param vectorInfo * @param chunkIndex - * @param restructuringInfo * @return next column index */ @Override public int fillVector(int[] filteredRowId, ColumnVectorInfo[] vectorInfo, - int chunkIndex, KeyStructureInfo restructuringInfo) { + int chunkIndex) { ColumnVectorInfo columnVectorInfo = vectorInfo[chunkIndex]; CarbonColumnVector vector = columnVectorInfo.vector; int offset = columnVectorInfo.offset; http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/ColumnPageWrapper.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/ColumnPageWrapper.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/ColumnPageWrapper.java index f4712ba..f95ff11 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/ColumnPageWrapper.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/ColumnPageWrapper.java @@ -24,7 +24,6 @@ import org.apache.carbondata.core.datastore.chunk.DimensionColumnPage; import org.apache.carbondata.core.datastore.page.ColumnPage; import org.apache.carbondata.core.metadata.datatype.DataType; import org.apache.carbondata.core.metadata.datatype.DataTypes; -import org.apache.carbondata.core.scan.executor.infos.KeyStructureInfo; import org.apache.carbondata.core.scan.result.vector.CarbonDictionary; import org.apache.carbondata.core.scan.result.vector.ColumnVectorInfo; import org.apache.carbondata.core.util.ByteUtil; @@ -48,25 +47,22 @@ public class ColumnPageWrapper implements DimensionColumnPage { } @Override - public int fillRawData(int rowId, int offset, byte[] data, KeyStructureInfo restructuringInfo) { + public int fillRawData(int rowId, int offset, byte[] data) { throw new UnsupportedOperationException("internal error"); } @Override - public int fillSurrogateKey(int rowId, int chunkIndex, int[] outputSurrogateKey, - KeyStructureInfo restructuringInfo) { + public int fillSurrogateKey(int rowId, int chunkIndex, int[] outputSurrogateKey) { throw new UnsupportedOperationException("internal error"); } @Override - public int fillVector(ColumnVectorInfo[] vectorInfo, int chunkIndex, - KeyStructureInfo restructuringInfo) { + public int fillVector(ColumnVectorInfo[] vectorInfo, int chunkIndex) { throw new UnsupportedOperationException("internal error"); } @Override - public int fillVector(int[] filteredRowId, ColumnVectorInfo[] vectorInfo, int chunkIndex, - KeyStructureInfo restructuringInfo) { + public int fillVector(int[] filteredRowId, ColumnVectorInfo[] vectorInfo, int chunkIndex) { throw new UnsupportedOperationException("internal error"); } http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnGroupModel.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnGroupModel.java b/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnGroupModel.java deleted file mode 100644 index e2a4161..0000000 --- a/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnGroupModel.java +++ /dev/null @@ -1,88 +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.datastore.columnar; - -public class ColumnGroupModel { - - /** - * number of columns in columnar block - */ - private int[] columnSplit; - - /** - * total number of columns - */ - private int noOfColumnsStore; - - /** - * column groups - * e.g - * {{0,1,2},3,4,{5,6}} - */ - private int[][] columnGroups; - - /** - * return columnSplit - * - * @return - */ - public int[] getColumnSplit() { - return columnSplit; - } - - /** - * set columnSplit - * - * @param split - */ - public void setColumnSplit(int[] split) { - this.columnSplit = split; - } - - /** - * @return no of columnar block - */ - public int getNoOfColumnStore() { - return this.noOfColumnsStore; - } - - /** - * set no of columnar block - * - * @param noOfColumnsStore - */ - public void setNoOfColumnStore(int noOfColumnsStore) { - this.noOfColumnsStore = noOfColumnsStore; - } - - /** - * set column groups - * - * @param columnGroups - */ - public void setColumnGroup(int[][] columnGroups) { - this.columnGroups = columnGroups; - } - - /** - * @return columngroups - */ - public int[][] getColumnGroup() { - return this.columnGroups; - } - -} http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnWithRowId.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnWithRowId.java b/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnWithRowId.java index dd5d08d..5cd8f84 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnWithRowId.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnWithRowId.java @@ -39,26 +39,12 @@ public class ColumnWithRowId<T> implements Comparable<ColumnWithRowId<T>> { } /** - * @param column the column to set - */ - public void setColumn(byte[] column) { - this.column = column; - } - - /** * @return the index */ public T getIndex() { return index; } - /** - * @param index the index to set - */ - public void setIndex(T index) { - this.index = index; - } - @Override public int compareTo(ColumnWithRowId o) { return ByteUtil.UnsafeComparer.INSTANCE.compareTo(column, o.column); } http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/datastore/page/EncodedTablePage.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/EncodedTablePage.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/EncodedTablePage.java index dc0a388..1770f72 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/page/EncodedTablePage.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/EncodedTablePage.java @@ -42,24 +42,12 @@ public class EncodedTablePage { // size in bytes of all encoded columns (including data and metadate) private int encodedSize; - public static EncodedTablePage newEmptyInstance() { - EncodedTablePage page = new EncodedTablePage(); - page.pageSize = 0; - page.encodedSize = 0; - page.dimensionPages = new EncodedColumnPage[0]; - page.measurePages = new EncodedColumnPage[0]; - return page; - } - public static EncodedTablePage newInstance(int pageSize, EncodedColumnPage[] dimensionPages, EncodedColumnPage[] measurePages, TablePageKey tablePageKey) throws IOException { return new EncodedTablePage(pageSize, dimensionPages, measurePages, tablePageKey); } - private EncodedTablePage() { - } - private EncodedTablePage(int pageSize, EncodedColumnPage[] dimensionPages, EncodedColumnPage[] measurePages, TablePageKey tablePageKey) throws IOException { http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/DefaultEncodingFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/DefaultEncodingFactory.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/DefaultEncodingFactory.java index dc79b13..fa8bfad 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/DefaultEncodingFactory.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/DefaultEncodingFactory.java @@ -253,13 +253,8 @@ public class DefaultEncodingFactory extends EncodingFactory { boolean isComplexPrimitive) { DataType srcDataType = stats.getDataType(); DataType adaptiveDataType = fitMinMax(stats.getDataType(), stats.getMax(), stats.getMin()); - DataType deltaDataType; - if (adaptiveDataType == DataTypes.LONG) { - deltaDataType = DataTypes.LONG; - } else { - deltaDataType = fitDelta(stats.getDataType(), stats.getMax(), stats.getMin()); - } + DataType deltaDataType = fitDelta(stats.getDataType(), stats.getMax(), stats.getMin()); // for complex primitive, if source and destination data type is same, use adaptive encoding. if (!isComplexPrimitive) { // in case of decimal datatype, check if the decimal converter type is Int or Long and based http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/adaptive/AdaptiveFloatingCodec.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/adaptive/AdaptiveFloatingCodec.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/adaptive/AdaptiveFloatingCodec.java index 7adeff0..7ac908f 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/adaptive/AdaptiveFloatingCodec.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/adaptive/AdaptiveFloatingCodec.java @@ -27,7 +27,6 @@ import org.apache.carbondata.core.datastore.compression.CompressorFactory; import org.apache.carbondata.core.datastore.page.ColumnPage; import org.apache.carbondata.core.datastore.page.ColumnPageValueConverter; import org.apache.carbondata.core.datastore.page.LazyColumnPage; -import org.apache.carbondata.core.datastore.page.encoding.ColumnPageCodec; import org.apache.carbondata.core.datastore.page.encoding.ColumnPageDecoder; import org.apache.carbondata.core.datastore.page.encoding.ColumnPageEncoder; import org.apache.carbondata.core.datastore.page.encoding.ColumnPageEncoderMeta; @@ -47,11 +46,6 @@ public class AdaptiveFloatingCodec extends AdaptiveCodec { private ColumnPage encodedPage; private Double factor; - public static ColumnPageCodec newInstance(DataType srcDataType, DataType targetDataType, - SimpleStatsResult stats) { - return new AdaptiveFloatingCodec(srcDataType, targetDataType, stats); - } - public AdaptiveFloatingCodec(DataType srcDataType, DataType targetDataType, SimpleStatsResult stats) { super(srcDataType, targetDataType, stats); http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/dimension/legacy/IndexStorageEncoder.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/dimension/legacy/IndexStorageEncoder.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/dimension/legacy/IndexStorageEncoder.java index edc3b64..37d9052 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/dimension/legacy/IndexStorageEncoder.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/dimension/legacy/IndexStorageEncoder.java @@ -38,11 +38,7 @@ public abstract class IndexStorageEncoder extends ColumnPageEncoder { @Override protected byte[] encodeData(ColumnPage input) throws MemoryException, IOException { - assert (indexStorage == null); - assert (compressedDataPage == null); encodeIndexStorage(input); - assert (indexStorage != null); - assert (compressedDataPage != null); ByteArrayOutputStream stream = new ByteArrayOutputStream(); DataOutputStream out = new DataOutputStream(stream); out.write(compressedDataPage); http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/datastore/page/key/TablePageKey.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/key/TablePageKey.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/key/TablePageKey.java index 244d8fc..c2b722b 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/page/key/TablePageKey.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/key/TablePageKey.java @@ -74,10 +74,6 @@ public class TablePageKey { } } - public Object getKey() { - return this; - } - /** update all keys if SORT_COLUMNS option is used when creating table */ private void finalizeKeys() { // If SORT_COLUMNS is used, may need to update start/end keys since the they may @@ -131,14 +127,6 @@ public class TablePageKey { } } - public byte[] getStartKey() { - return startKey; - } - - public byte[] getEndKey() { - return endKey; - } - public byte[] getNoDictStartKey() { return packedNoDictStartKey; } @@ -147,10 +135,6 @@ public class TablePageKey { return packedNoDictEndKey; } - public int getPageSize() { - return pageSize; - } - public byte[] serializeStartKey() { byte[] updatedNoDictionaryStartKey = updateNoDictionaryStartAndEndKey(getNoDictStartKey()); ByteBuffer buffer = ByteBuffer.allocate( http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/datastore/row/CarbonRow.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/row/CarbonRow.java b/core/src/main/java/org/apache/carbondata/core/datastore/row/CarbonRow.java index 82f004f..48775d4 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/row/CarbonRow.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/row/CarbonRow.java @@ -61,14 +61,6 @@ public class CarbonRow implements Serializable { return data[ordinal]; } - public Object[] getObjectArray(int ordinal) { - return (Object[]) data[ordinal]; - } - - public int[] getIntArray(int ordinal) { - return (int[]) data[ordinal]; - } - public void update(Object value, int ordinal) { data[ordinal] = value; } http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/devapi/DictionaryGenerationException.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/devapi/DictionaryGenerationException.java b/core/src/main/java/org/apache/carbondata/core/devapi/DictionaryGenerationException.java index fa84c0a..6de9d9c 100644 --- a/core/src/main/java/org/apache/carbondata/core/devapi/DictionaryGenerationException.java +++ b/core/src/main/java/org/apache/carbondata/core/devapi/DictionaryGenerationException.java @@ -16,8 +16,6 @@ */ package org.apache.carbondata.core.devapi; -import java.util.Locale; - public class DictionaryGenerationException extends Exception { /** * default serial version ID. @@ -25,61 +23,11 @@ public class DictionaryGenerationException extends Exception { private static final long serialVersionUID = 1L; /** - * The Error message. - */ - private String msg = ""; - - /** * Constructor * * @param msg The error message for this exception. */ public DictionaryGenerationException(String msg) { super(msg); - this.msg = msg; - } - - /** - * Constructor - * - * @param msg The error message for this exception. - */ - public DictionaryGenerationException(String msg, Throwable t) { - super(msg, t); - this.msg = msg; - } - - /** - * Constructor - * - * @param t - */ - public DictionaryGenerationException(Throwable t) { - super(t); - } - - /** - * This method is used to get the localized message. - * - * @param locale - A Locale object represents a specific geographical, - * political, or cultural region. - * @return - Localized error message. - */ - public String getLocalizedMessage(Locale locale) { - return ""; - } - - /** - * getLocalizedMessage - */ - @Override public String getLocalizedMessage() { - return super.getLocalizedMessage(); - } - - /** - * getMessage - */ - public String getMessage() { - return this.msg; } } http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/devapi/GeneratingBiDictionary.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/devapi/GeneratingBiDictionary.java b/core/src/main/java/org/apache/carbondata/core/devapi/GeneratingBiDictionary.java deleted file mode 100644 index 7d961f8..0000000 --- a/core/src/main/java/org/apache/carbondata/core/devapi/GeneratingBiDictionary.java +++ /dev/null @@ -1,48 +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.devapi; - -public abstract class GeneratingBiDictionary<K, V> implements BiDictionary<K, V> { - - private DictionaryGenerator<K, V> generator; - - public GeneratingBiDictionary(DictionaryGenerator<K, V> generator) { - this.generator = generator; - } - - @Override - public K getOrGenerateKey(V value) throws DictionaryGenerationException { - K key = getKey(value); - if (key != null) { - return key; - } else { - K newKey = generator.generateKey(value); - assert (newKey != null); - put(newKey, value); - return newKey; - } - } - - /** - * put the input key value pair into the dictionary - * @param key dictionary key - * @param value dictionary value - */ - protected abstract void put(K key, V value); - -} http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/dictionary/client/DictionaryClient.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/dictionary/client/DictionaryClient.java b/core/src/main/java/org/apache/carbondata/core/dictionary/client/DictionaryClient.java index 64e6252..fce0338 100644 --- a/core/src/main/java/org/apache/carbondata/core/dictionary/client/DictionaryClient.java +++ b/core/src/main/java/org/apache/carbondata/core/dictionary/client/DictionaryClient.java @@ -21,9 +21,9 @@ import org.apache.carbondata.core.dictionary.generator.key.DictionaryMessage; public interface DictionaryClient { - public void startClient(String secretKey, String address, int port, boolean encryptSecureServer); + void startClient(String secretKey, String address, int port, boolean encryptSecureServer); - public void shutDown(); + void shutDown(); - public DictionaryMessage getDictionary(DictionaryMessage key); + DictionaryMessage getDictionary(DictionaryMessage key); } http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/dictionary/generator/TableDictionaryGenerator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/dictionary/generator/TableDictionaryGenerator.java b/core/src/main/java/org/apache/carbondata/core/dictionary/generator/TableDictionaryGenerator.java index 7bb8259..3dbe5b0 100644 --- a/core/src/main/java/org/apache/carbondata/core/dictionary/generator/TableDictionaryGenerator.java +++ b/core/src/main/java/org/apache/carbondata/core/dictionary/generator/TableDictionaryGenerator.java @@ -122,8 +122,4 @@ public class TableDictionaryGenerator } } } - public String getTableUniqueName() { - return carbonTable.getTableUniqueName(); - } - } http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/dictionary/generator/key/DictionaryMessage.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/dictionary/generator/key/DictionaryMessage.java b/core/src/main/java/org/apache/carbondata/core/dictionary/generator/key/DictionaryMessage.java index 3b3f21a..72164a1 100644 --- a/core/src/main/java/org/apache/carbondata/core/dictionary/generator/key/DictionaryMessage.java +++ b/core/src/main/java/org/apache/carbondata/core/dictionary/generator/key/DictionaryMessage.java @@ -183,9 +183,4 @@ public class DictionaryMessage { public void setTableUniqueId(String tableUniqueId) { this.tableUniqueId = tableUniqueId; } - - @Override public String toString() { - return "DictionaryKey{ columnName='" + columnName + '\'' + ", data='" + data + '\'' - + ", dictionaryValue=" + dictionaryValue + ", type=" + type + '}'; - } } http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/dictionary/server/DictionaryServer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/dictionary/server/DictionaryServer.java b/core/src/main/java/org/apache/carbondata/core/dictionary/server/DictionaryServer.java index a23cc9b..f814281 100644 --- a/core/src/main/java/org/apache/carbondata/core/dictionary/server/DictionaryServer.java +++ b/core/src/main/java/org/apache/carbondata/core/dictionary/server/DictionaryServer.java @@ -21,21 +21,21 @@ import org.apache.carbondata.core.metadata.schema.table.CarbonTable; public interface DictionaryServer { - public void startServer(); + void startServer(); - public void bindToPort(); + void bindToPort(); - public void shutdown()throws Exception; + void shutdown()throws Exception; - public String getHost(); + String getHost(); - public int getPort(); + int getPort(); - public String getSecretKey(); + String getSecretKey(); - public boolean isEncryptSecureServer(); + boolean isEncryptSecureServer(); - public void writeTableDictionary(String uniqueTableName) throws Exception; + void writeTableDictionary(String uniqueTableName) throws Exception; - public void initializeDictionaryGenerator(CarbonTable carbonTable) throws Exception; + void initializeDictionaryGenerator(CarbonTable carbonTable) throws Exception; } http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/dictionary/service/DictionaryServiceProvider.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/dictionary/service/DictionaryServiceProvider.java b/core/src/main/java/org/apache/carbondata/core/dictionary/service/DictionaryServiceProvider.java index 4dfa1e9..5d7d813 100644 --- a/core/src/main/java/org/apache/carbondata/core/dictionary/service/DictionaryServiceProvider.java +++ b/core/src/main/java/org/apache/carbondata/core/dictionary/service/DictionaryServiceProvider.java @@ -23,5 +23,5 @@ import org.apache.carbondata.core.dictionary.client.DictionaryClient; public interface DictionaryServiceProvider extends Serializable { - public DictionaryClient getDictionaryClient(); + DictionaryClient getDictionaryClient(); } http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/exception/InvalidConfigurationException.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/exception/InvalidConfigurationException.java b/core/src/main/java/org/apache/carbondata/core/exception/InvalidConfigurationException.java index bef9576..08b03a8 100644 --- a/core/src/main/java/org/apache/carbondata/core/exception/InvalidConfigurationException.java +++ b/core/src/main/java/org/apache/carbondata/core/exception/InvalidConfigurationException.java @@ -17,8 +17,6 @@ package org.apache.carbondata.core.exception; -import java.util.Locale; - public class InvalidConfigurationException extends Exception { /** @@ -52,33 +50,6 @@ public class InvalidConfigurationException extends Exception { } /** - * Constructor - * - * @param t - */ - public InvalidConfigurationException(Throwable t) { - super(t); - } - - /** - * This method is used to get the localized message. - * - * @param locale - A Locale object represents a specific geographical, - * political, or cultural region. - * @return - Localized error message. - */ - public String getLocalizedMessage(Locale locale) { - return ""; - } - - /** - * getLocalizedMessage - */ - @Override public String getLocalizedMessage() { - return super.getLocalizedMessage(); - } - - /** * getMessage */ public String getMessage() { http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/indexstore/schema/CarbonRowSchema.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/indexstore/schema/CarbonRowSchema.java b/core/src/main/java/org/apache/carbondata/core/indexstore/schema/CarbonRowSchema.java index 971f42a..7f47c00 100644 --- a/core/src/main/java/org/apache/carbondata/core/indexstore/schema/CarbonRowSchema.java +++ b/core/src/main/java/org/apache/carbondata/core/indexstore/schema/CarbonRowSchema.java @@ -51,7 +51,9 @@ public abstract class CarbonRowSchema implements Serializable { * * @return */ - public abstract int getLength(); + public int getLength() { + return dataType.getSizeInBytes(); + } /** * schema type http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/keygenerator/KeyGenerator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/keygenerator/KeyGenerator.java b/core/src/main/java/org/apache/carbondata/core/keygenerator/KeyGenerator.java index 09e162c..b083ee0 100644 --- a/core/src/main/java/org/apache/carbondata/core/keygenerator/KeyGenerator.java +++ b/core/src/main/java/org/apache/carbondata/core/keygenerator/KeyGenerator.java @@ -80,11 +80,6 @@ public interface KeyGenerator extends Serializable, Comparator<byte[]> { long getKey(byte[] key, int index); /** - * Set any extra properties if required. - */ - void setProperty(Object key, Object value); - - /** * Gives the key size in number of bytes. */ int getKeySizeInBytes(); @@ -98,8 +93,6 @@ public interface KeyGenerator extends Serializable, Comparator<byte[]> { */ int[] getKeyByteOffsets(int index); - int compare(byte[] key1, int offset1, int length1, byte[] key2, int offset2, int length2); - /** * returns the dimension count * http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/DirectDictionaryKeyGeneratorFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/DirectDictionaryKeyGeneratorFactory.java b/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/DirectDictionaryKeyGeneratorFactory.java index 9ce6748..4092342 100644 --- a/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/DirectDictionaryKeyGeneratorFactory.java +++ b/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/DirectDictionaryKeyGeneratorFactory.java @@ -30,7 +30,6 @@ public final class DirectDictionaryKeyGeneratorFactory { * private constructor */ private DirectDictionaryKeyGeneratorFactory() { - } /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/AbstractKeyGenerator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/AbstractKeyGenerator.java b/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/AbstractKeyGenerator.java index a480595..86eb4e4 100644 --- a/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/AbstractKeyGenerator.java +++ b/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/AbstractKeyGenerator.java @@ -40,34 +40,4 @@ public abstract class AbstractKeyGenerator implements KeyGenerator { } return 0; } - - public int compare(byte[] buffer1, int offset1, int length1, byte[] buffer2, int offset2, - int length2) { - length1 += offset1; - length2 += offset2; - // Bring WritableComparator code local - for (; offset1 < length1 && offset2 < length2; offset1++, offset2++) { - int a = (buffer1[offset1] & 0xff); - int b = (buffer2[offset2] & 0xff); - if (a != b) { - return a - b; - } - } - return 0; - } - - @Override public void setProperty(Object key, Object value) { - /* - * No implementation required. - */ - } - - @Override public int getKeySizeInBytes() { - return 0; - } - - @Override public int getDimCount() { - return 0; - } - } http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/NumberCompressor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/NumberCompressor.java b/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/NumberCompressor.java index d601159..be680e9 100644 --- a/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/NumberCompressor.java +++ b/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/NumberCompressor.java @@ -103,40 +103,6 @@ public class NumberCompressor { return words; } - protected long[] get(byte[] keys, int wsize) { - long[] words = new long[wsize]; - int ll = 0; - long val = 0L; - for (int i = keys.length - 1; i >= 0; ) { - - int size = i; - val = 0L; - for (int j = i + 1; j <= size; ) { - val <<= BYTE_LENGTH; - val ^= keys[j++] & 0xFF; - i--; - } - int index = ll >> 6;// divide by 64 to get the new word index - words[index] |= (val << (ll & 0x3f)); - ll += bitsLength; - - int nextIndex = ll >> 6;// This is divide by 64 - - if (nextIndex != index) { - int consideredBits = bitsLength - ll & 0x3f; - if (consideredBits < bitsLength) // Check for spill over only if - // all the bits are not - // considered - { - // Check for spill over - words[nextIndex] |= (val >> (bitsLength - ll & 0x3f)); - } - } - - } - return words; - } - public int[] unCompress(byte[] key, int offset, int length) { int arrayLength = (length * BYTE_LENGTH) / bitsLength; long[] words = new long[getWordsSizeFromBytesSize(length)]; http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/locks/CarbonLockUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/locks/CarbonLockUtil.java b/core/src/main/java/org/apache/carbondata/core/locks/CarbonLockUtil.java index 95bc932..4d67faf 100644 --- a/core/src/main/java/org/apache/carbondata/core/locks/CarbonLockUtil.java +++ b/core/src/main/java/org/apache/carbondata/core/locks/CarbonLockUtil.java @@ -128,9 +128,7 @@ public class CarbonLockUtil { @Override public boolean accept(CarbonFile pathName) { if (CarbonTablePath.isSegmentLockFilePath(pathName.getName())) { - if ((currTime - pathName.getLastModifiedTime()) > segmentLockFilesPreservTime) { - return true; - } + return (currTime - pathName.getLastModifiedTime()) > segmentLockFilesPreservTime; } return false; } http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/locks/ZookeeperInit.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/locks/ZookeeperInit.java b/core/src/main/java/org/apache/carbondata/core/locks/ZookeeperInit.java index ecdb672..102ea4c 100644 --- a/core/src/main/java/org/apache/carbondata/core/locks/ZookeeperInit.java +++ b/core/src/main/java/org/apache/carbondata/core/locks/ZookeeperInit.java @@ -64,10 +64,6 @@ public class ZookeeperInit { } - public static ZookeeperInit getInstance() { - return zooKeeperInit; - } - public ZooKeeper getZookeeper() { return zk; } http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/memory/HeapMemoryAllocator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/memory/HeapMemoryAllocator.java b/core/src/main/java/org/apache/carbondata/core/memory/HeapMemoryAllocator.java index 242995b..d898dc9 100644 --- a/core/src/main/java/org/apache/carbondata/core/memory/HeapMemoryAllocator.java +++ b/core/src/main/java/org/apache/carbondata/core/memory/HeapMemoryAllocator.java @@ -87,7 +87,6 @@ public class HeapMemoryAllocator implements MemoryAllocator { // As an additional layer of defense against use-after-free bugs, we mutate the // MemoryBlock to null out its reference to the long[] array. long[] array = (long[]) memory.obj; - memory.setObjAndOffset(null, 0); long alignedSize = ((size + 7) / 8) * 8; if (shouldPool(alignedSize)) { http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/memory/MemoryBlock.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/memory/MemoryBlock.java b/core/src/main/java/org/apache/carbondata/core/memory/MemoryBlock.java index fd4f06c..418ef89 100644 --- a/core/src/main/java/org/apache/carbondata/core/memory/MemoryBlock.java +++ b/core/src/main/java/org/apache/carbondata/core/memory/MemoryBlock.java @@ -19,6 +19,7 @@ package org.apache.carbondata.core.memory; import javax.annotation.Nullable; + /** * Code ported from Apache Spark {org.apache.spark.unsafe.memory} package * A consecutive block of memory, starting at a {@link MemoryLocation} with a fixed size. @@ -52,5 +53,4 @@ public class MemoryBlock extends MemoryLocation { public void setFreedStatus(boolean freedStatus) { this.isFreed = freedStatus; } - } http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/memory/MemoryLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/memory/MemoryLocation.java b/core/src/main/java/org/apache/carbondata/core/memory/MemoryLocation.java index 0419e04..c059377 100644 --- a/core/src/main/java/org/apache/carbondata/core/memory/MemoryLocation.java +++ b/core/src/main/java/org/apache/carbondata/core/memory/MemoryLocation.java @@ -36,15 +36,6 @@ public class MemoryLocation { this.offset = offset; } - public MemoryLocation() { - this(null, 0); - } - - public void setObjAndOffset(Object newObj, long newOffset) { - this.obj = newObj; - this.offset = newOffset; - } - public final Object getBaseObject() { return obj; } http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/metadata/blocklet/compressor/ChunkCompressorMeta.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/blocklet/compressor/ChunkCompressorMeta.java b/core/src/main/java/org/apache/carbondata/core/metadata/blocklet/compressor/ChunkCompressorMeta.java deleted file mode 100644 index 55f7050..0000000 --- a/core/src/main/java/org/apache/carbondata/core/metadata/blocklet/compressor/ChunkCompressorMeta.java +++ /dev/null @@ -1,34 +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.metadata.blocklet.compressor; - -import java.io.Serializable; - -/** - * Represents the compression information of data of one dimension - * one dimension group in one blocklet - */ -public class ChunkCompressorMeta implements Serializable { - - /** - * serialization version - */ - private static final long serialVersionUID = -6697087170420991140L; - - -} http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/metadata/converter/ThriftWrapperSchemaConverterImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/converter/ThriftWrapperSchemaConverterImpl.java b/core/src/main/java/org/apache/carbondata/core/metadata/converter/ThriftWrapperSchemaConverterImpl.java index 8206fef..aa27a81 100644 --- a/core/src/main/java/org/apache/carbondata/core/metadata/converter/ThriftWrapperSchemaConverterImpl.java +++ b/core/src/main/java/org/apache/carbondata/core/metadata/converter/ThriftWrapperSchemaConverterImpl.java @@ -179,10 +179,10 @@ public class ThriftWrapperSchemaConverterImpl implements SchemaConverter { wrapperColumnSchema.getDataType()), wrapperColumnSchema.getColumnName(), wrapperColumnSchema.getColumnUniqueId(), - wrapperColumnSchema.isColumnar(), + true, encoders, wrapperColumnSchema.isDimensionColumn()); - thriftColumnSchema.setColumn_group_id(wrapperColumnSchema.getColumnGroupId()); + thriftColumnSchema.setColumn_group_id(-1); if (DataTypes.isDecimal(wrapperColumnSchema.getDataType())) { thriftColumnSchema.setScale(wrapperColumnSchema.getScale()); thriftColumnSchema.setPrecision(wrapperColumnSchema.getPrecision()); @@ -511,7 +511,6 @@ public class ThriftWrapperSchemaConverterImpl implements SchemaConverter { ColumnSchema wrapperColumnSchema = new ColumnSchema(); wrapperColumnSchema.setColumnUniqueId(externalColumnSchema.getColumn_id()); wrapperColumnSchema.setColumnName(externalColumnSchema.getColumn_name()); - wrapperColumnSchema.setColumnar(externalColumnSchema.isColumnar()); wrapperColumnSchema.setDataType( fromExternalToWrapperDataType( externalColumnSchema.data_type, @@ -525,7 +524,6 @@ public class ThriftWrapperSchemaConverterImpl implements SchemaConverter { wrapperColumnSchema.setEncodingList(encoders); wrapperColumnSchema.setNumberOfChild(externalColumnSchema.getNum_child()); wrapperColumnSchema.setPrecision(externalColumnSchema.getPrecision()); - wrapperColumnSchema.setColumnGroup(externalColumnSchema.getColumn_group_id()); wrapperColumnSchema.setScale(externalColumnSchema.getScale()); wrapperColumnSchema.setDefaultValue(externalColumnSchema.getDefault_value()); wrapperColumnSchema.setInvisible(externalColumnSchema.isInvisible()); http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/metadata/datatype/DecimalConverterFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/datatype/DecimalConverterFactory.java b/core/src/main/java/org/apache/carbondata/core/metadata/datatype/DecimalConverterFactory.java index e4059c8..a8da6d4 100644 --- a/core/src/main/java/org/apache/carbondata/core/metadata/datatype/DecimalConverterFactory.java +++ b/core/src/main/java/org/apache/carbondata/core/metadata/datatype/DecimalConverterFactory.java @@ -104,20 +104,6 @@ public final class DecimalConverterFactory { } } - private long getUnscaledLong(byte[] bytes) { - long unscaled = 0L; - int i = 0; - - while (i < bytes.length) { - unscaled = (unscaled << 8) | (bytes[i] & 0xff); - i += 1; - } - - int bits = 8 * bytes.length; - unscaled = (unscaled << (64 - bits)) >> (64 - bits); - return unscaled; - } - public static class DecimalLongConverter implements DecimalConverter { private int scale; http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/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 086cedd..a6936b6 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 @@ -322,8 +322,6 @@ public class CarbonTable implements Serializable { int dimensionOrdinal = 0; int measureOrdinal = 0; int keyOrdinal = 0; - int columnGroupOrdinal = -1; - int previousColumnGroupId = -1; List<ColumnSchema> listOfColumns = tableSchema.getListOfColumns(); int complexTypeOrdinal = -1; for (int i = 0; i < listOfColumns.size(); i++) { @@ -331,8 +329,8 @@ public class CarbonTable implements Serializable { if (columnSchema.isDimensionColumn()) { if (columnSchema.getNumberOfChild() > 0) { CarbonDimension complexDimension = - new CarbonDimension(columnSchema, dimensionOrdinal++, columnSchema.getSchemaOrdinal(), - -1, -1, ++complexTypeOrdinal); + new CarbonDimension(columnSchema, dimensionOrdinal++, + columnSchema.getSchemaOrdinal(), -1, ++complexTypeOrdinal); complexDimension.initializeChildDimensionsList(columnSchema.getNumberOfChild()); allDimensions.add(complexDimension); dimensionOrdinal = @@ -345,27 +343,18 @@ public class CarbonTable implements Serializable { this.numberOfSortColumns++; } if (!columnSchema.getEncodingList().contains(Encoding.DICTIONARY)) { - CarbonDimension dimension = new CarbonDimension( - columnSchema, dimensionOrdinal++, columnSchema.getSchemaOrdinal(), -1, -1, -1); + CarbonDimension dimension = + new CarbonDimension(columnSchema, dimensionOrdinal++, + columnSchema.getSchemaOrdinal(), -1, -1); if (!columnSchema.isInvisible() && columnSchema.isSortColumn()) { this.numberOfNoDictSortColumns++; } allDimensions.add(dimension); primitiveDimensions.add(dimension); - } else if (columnSchema.getEncodingList().contains(Encoding.DICTIONARY) - && columnSchema.getColumnGroupId() == -1) { - CarbonDimension dimension = new CarbonDimension( - columnSchema, dimensionOrdinal++, columnSchema.getSchemaOrdinal(), keyOrdinal++, - -1, -1); - allDimensions.add(dimension); - primitiveDimensions.add(dimension); - } else { - columnGroupOrdinal = - previousColumnGroupId == columnSchema.getColumnGroupId() ? ++columnGroupOrdinal : 0; - previousColumnGroupId = columnSchema.getColumnGroupId(); - CarbonDimension dimension = new CarbonDimension( - columnSchema, dimensionOrdinal++, columnSchema.getSchemaOrdinal(), keyOrdinal++, - columnGroupOrdinal, -1); + } else if (columnSchema.getEncodingList().contains(Encoding.DICTIONARY)) { + CarbonDimension dimension = + new CarbonDimension(columnSchema, dimensionOrdinal++, + columnSchema.getSchemaOrdinal(), keyOrdinal++, -1); allDimensions.add(dimension); primitiveDimensions.add(dimension); } @@ -425,8 +414,8 @@ public class CarbonTable implements Serializable { if (columnSchema.isDimensionColumn()) { if (columnSchema.getNumberOfChild() > 0) { CarbonDimension complexDimension = - new CarbonDimension(columnSchema, dimensionOrdinal++, columnSchema.getSchemaOrdinal(), - -1, -1, -1); + new CarbonDimension(columnSchema, dimensionOrdinal++, + columnSchema.getSchemaOrdinal(), -1, -1); complexDimension.initializeChildDimensionsList(columnSchema.getNumberOfChild()); parentDimension.getListOfChildDimensions().add(complexDimension); dimensionOrdinal = @@ -434,8 +423,8 @@ public class CarbonTable implements Serializable { listOfColumns, complexDimension, primitiveDimensions); } else { CarbonDimension carbonDimension = - new CarbonDimension(columnSchema, dimensionOrdinal++, columnSchema.getSchemaOrdinal(), - -1, -1, -1); + new CarbonDimension(columnSchema, dimensionOrdinal++, + columnSchema.getSchemaOrdinal(), -1, -1); parentDimension.getListOfChildDimensions().add(carbonDimension); primitiveDimensions.add(carbonDimension); } http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/TableSchemaBuilder.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/TableSchemaBuilder.java b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/TableSchemaBuilder.java index e760da4..4780e60 100644 --- a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/TableSchemaBuilder.java +++ b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/TableSchemaBuilder.java @@ -183,7 +183,6 @@ public class TableSchemaBuilder { // child column should not be counted for schema ordinal newColumn.setSchemaOrdinal(-1); } - newColumn.setColumnar(true); // For NonTransactionalTable, multiple sdk writer output with same column name can be placed in // single folder for query. http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/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 e19e329..809cc30 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 @@ -74,12 +74,6 @@ public class CarbonColumn implements Serializable { this.columnIdentifier = new ColumnIdentifier(getColumnId(), getColumnProperties(), getDataType()); } - /** - * @return columnar or row based - */ - public boolean isColumnar() { - return columnSchema.isColumnar(); - } /** * @return column unique id @@ -117,13 +111,6 @@ public class CarbonColumn implements Serializable { } /** - * @return row group id if it is row based - */ - public int columnGroupId() { - return columnSchema.getColumnGroupId(); - } - - /** * @return the defaultValue */ public byte[] getDefaultValue() { http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/CarbonDimension.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/CarbonDimension.java b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/CarbonDimension.java index bec9889..f0ff1c8 100644 --- a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/CarbonDimension.java +++ b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/CarbonDimension.java @@ -40,13 +40,6 @@ public class CarbonDimension extends CarbonColumn { private int keyOrdinal; /** - * column group column ordinal - * for example if column is second column in the group - * it will store 2 - */ - private int columnGroupOrdinal; - - /** * to store complex type dimension ordinal */ private int complexTypeOrdinal; @@ -57,15 +50,14 @@ public class CarbonDimension extends CarbonColumn { private CarbonDimension complexParentDimension = null; public CarbonDimension(ColumnSchema columnSchema, int ordinal, int keyOrdinal, - int columnGroupOrdinal, int complexTypeOrdinal) { - this(columnSchema, ordinal, 0, keyOrdinal, columnGroupOrdinal, complexTypeOrdinal); + int complexTypeOrdinal) { + this(columnSchema, ordinal, 0, keyOrdinal, complexTypeOrdinal); } public CarbonDimension(ColumnSchema columnSchema, int ordinal, int schemaOrdinal, int keyOrdinal, - int columnGroupOrdinal, int complexTypeOrdinal) { + int complexTypeOrdinal) { super(columnSchema, ordinal, schemaOrdinal); this.keyOrdinal = keyOrdinal; - this.columnGroupOrdinal = columnGroupOrdinal; this.complexTypeOrdinal = complexTypeOrdinal; } @@ -102,13 +94,6 @@ public class CarbonDimension extends CarbonColumn { } /** - * @return the columnGroupOrdinal - */ - public int getColumnGroupOrdinal() { - return columnGroupOrdinal; - } - - /** * @return the complexTypeOrdinal */ public int getComplexTypeOrdinal() { http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/CarbonImplicitDimension.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/CarbonImplicitDimension.java b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/CarbonImplicitDimension.java index 9e0cc22..fadbd02 100644 --- a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/CarbonImplicitDimension.java +++ b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/CarbonImplicitDimension.java @@ -47,7 +47,7 @@ public class CarbonImplicitDimension extends CarbonDimension { private String implicitDimensionName; public CarbonImplicitDimension(int ordinal, String implicitDimensionName) { - super(null, ordinal, -1, -1, -1); + super(null, ordinal, -1, -1); encodingList = new ArrayList<Encoding>(); encodingList.add(Encoding.IMPLICIT); this.implicitDimensionName = implicitDimensionName; @@ -77,13 +77,6 @@ public class CarbonImplicitDimension extends CarbonDimension { } /** - * @return row group id if it is row based - */ - @Override public int columnGroupId() { - return -1; - } - - /** * @return the list of encoder used in dimension */ @Override public List<Encoding> getEncoder() { http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/ColumnSchema.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/ColumnSchema.java b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/ColumnSchema.java index 9bb9e85..853851d 100644 --- a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/ColumnSchema.java +++ b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/ColumnSchema.java @@ -84,12 +84,6 @@ public class ColumnSchema implements Serializable, Writable { private boolean isDimensionColumn; /** - * The group ID for column used for row format columns, - * where in columns in each group are chunked together. - */ - private int columnGroupId = -1; - - /** * Used when this column contains decimal data. */ private int scale; @@ -185,20 +179,6 @@ public class ColumnSchema implements Serializable, Writable { } /** - * @return the isColumnar - */ - public boolean isColumnar() { - return isColumnar; - } - - /** - * @param isColumnar the isColumnar to set - */ - public void setColumnar(boolean isColumnar) { - this.isColumnar = isColumnar; - } - - /** * @return the isDimensionColumn */ public boolean isDimensionColumn() { @@ -235,19 +215,6 @@ public class ColumnSchema implements Serializable, Writable { } /** - * @return the columnGroup - */ - public int getColumnGroupId() { - return columnGroupId; - } - - /** - */ - public void setColumnGroup(int columnGroupId) { - this.columnGroupId = columnGroupId; - } - - /** * Set the scale if it is decimal type */ public void setScale(int scale) { http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/mutate/CarbonUpdateUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/mutate/CarbonUpdateUtil.java b/core/src/main/java/org/apache/carbondata/core/mutate/CarbonUpdateUtil.java index 8627bdb..d0a204c 100644 --- a/core/src/main/java/org/apache/carbondata/core/mutate/CarbonUpdateUtil.java +++ b/core/src/main/java/org/apache/carbondata/core/mutate/CarbonUpdateUtil.java @@ -257,7 +257,7 @@ public class CarbonUpdateUtil { } try { - segmentStatusManager + SegmentStatusManager .writeLoadDetailsIntoFile(tableStatusPath, listOfLoadFolderDetailsArray); } catch (IOException e) { return false; @@ -469,7 +469,7 @@ public class CarbonUpdateUtil { String segmentPath = CarbonTablePath.getSegmentPath( table.getAbsoluteTableIdentifier().getTablePath(), segment.getLoadName()); CarbonFile segDir = - FileFactory.getCarbonFile(segmentPath, FileFactory.getFileType(segmentPath)); + FileFactory.getCarbonFile(segmentPath, FileFactory.getFileType(segmentPath)); CarbonFile[] allSegmentFiles = segDir.listFiles(); // scan through the segment and find the carbondatafiles and index files. @@ -557,7 +557,6 @@ public class CarbonUpdateUtil { } } - } else { invalidDeleteDeltaFiles = updateStatusManager .getDeleteDeltaInvalidFilesList(block, false, @@ -594,7 +593,7 @@ public class CarbonUpdateUtil { if (null != validUpdateStatusFile && !validUpdateStatusFile.isEmpty()) { final String updateStatusTimestamp = validUpdateStatusFile - .substring(validUpdateStatusFile.lastIndexOf(CarbonCommonConstants.HYPHEN) + 1); + .substring(validUpdateStatusFile.lastIndexOf(CarbonCommonConstants.HYPHEN) + 1); String tablePath = table.getAbsoluteTableIdentifier().getTablePath(); CarbonFile metaFolder = FileFactory.getCarbonFile( @@ -607,9 +606,7 @@ public class CarbonUpdateUtil { // CHECK if this is valid or not. // we only send invalid ones to delete. - if (!file.getName().endsWith(updateStatusTimestamp)) { - return true; - } + return !file.getName().endsWith(updateStatusTimestamp); } return false; } http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/mutate/data/DeleteDeltaCacheLoaderIntf.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/mutate/data/DeleteDeltaCacheLoaderIntf.java b/core/src/main/java/org/apache/carbondata/core/mutate/data/DeleteDeltaCacheLoaderIntf.java deleted file mode 100644 index 924e03a..0000000 --- a/core/src/main/java/org/apache/carbondata/core/mutate/data/DeleteDeltaCacheLoaderIntf.java +++ /dev/null @@ -1,27 +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.mutate.data; - -/** - * This interface holds all methods required to load delete delta file data to cache - */ -public interface DeleteDeltaCacheLoaderIntf { - - void loadDeleteDeltaFileDataToCache(); - -} http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/readcommitter/ReadCommittedScope.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/readcommitter/ReadCommittedScope.java b/core/src/main/java/org/apache/carbondata/core/readcommitter/ReadCommittedScope.java index d177a00..cbcf173 100644 --- a/core/src/main/java/org/apache/carbondata/core/readcommitter/ReadCommittedScope.java +++ b/core/src/main/java/org/apache/carbondata/core/readcommitter/ReadCommittedScope.java @@ -31,22 +31,21 @@ import org.apache.carbondata.core.statusmanager.SegmentRefreshInfo; * ReadCommitted interface that defines a read scope. */ @InterfaceAudience.Internal -@InterfaceStability.Stable -public interface ReadCommittedScope extends Serializable { +@InterfaceStability.Stable public interface ReadCommittedScope extends Serializable { - public LoadMetadataDetails[] getSegmentList() throws IOException; + LoadMetadataDetails[] getSegmentList() throws IOException; /** * @param segment * @return map of Absolute path of index file as key and null as value -- without mergeIndex * map of AbsolutePath with fileName of MergeIndex parent file as key and mergeIndexFileName - * as value -- with mergeIndex + * as value -- with mergeIndex * @throws IOException */ - public Map<String, String> getCommittedIndexFile(Segment segment) throws IOException ; + Map<String, String> getCommittedIndexFile(Segment segment) throws IOException; - public SegmentRefreshInfo getCommittedSegmentRefreshInfo( - Segment segment, UpdateVO updateVo) throws IOException; + SegmentRefreshInfo getCommittedSegmentRefreshInfo(Segment segment, UpdateVO updateVo) + throws IOException; - public void takeCarbonIndexFileSnapShot() throws IOException; + void takeCarbonIndexFileSnapShot() throws IOException; } http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/scan/collector/ResultCollectorFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/collector/ResultCollectorFactory.java b/core/src/main/java/org/apache/carbondata/core/scan/collector/ResultCollectorFactory.java index 8902fc2..ea4afd1 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/collector/ResultCollectorFactory.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/collector/ResultCollectorFactory.java @@ -82,4 +82,7 @@ public class ResultCollectorFactory { } return scannerResultAggregator; } + + private ResultCollectorFactory() { + } } http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/scan/executor/exception/QueryExecutionException.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/executor/exception/QueryExecutionException.java b/core/src/main/java/org/apache/carbondata/core/scan/executor/exception/QueryExecutionException.java index 8e25ff4..1d76de6 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/executor/exception/QueryExecutionException.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/executor/exception/QueryExecutionException.java @@ -16,8 +16,6 @@ */ package org.apache.carbondata.core.scan.executor.exception; -import java.util.Locale; - /** * Exception class for query execution */ @@ -29,31 +27,6 @@ public class QueryExecutionException extends Exception { private static final long serialVersionUID = 1L; /** - * The Error message. - */ - private String msg = ""; - - /** - * Constructor - * - * @param msg The error message for this exception. - */ - public QueryExecutionException(String msg) { - super(msg); - this.msg = msg; - } - - /** - * Constructor - * - * @param msg The error message for this exception. - */ - public QueryExecutionException(String msg, Throwable t) { - super(msg, t); - this.msg = msg; - } - - /** * Constructor * * @param t @@ -63,28 +36,9 @@ public class QueryExecutionException extends Exception { } /** - * This method is used to get the localized message. - * - * @param locale - A Locale object represents a specific geographical, - * political, or cultural region. - * @return - Localized error message. - */ - public String getLocalizedMessage(Locale locale) { - return ""; - } - - /** * getLocalizedMessage */ @Override public String getLocalizedMessage() { return super.getLocalizedMessage(); } - - /** - * getMessage - */ - public String getMessage() { - return this.msg; - } - } http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/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 7e116d9..180ca4d 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 @@ -396,9 +396,6 @@ public abstract class AbstractQueryExecutor<E> implements QueryExecutor<E> { blockExecutionInfo.setStartKey(startIndexKey); //setting the end index key of the block node blockExecutionInfo.setEndKey(endIndexKey); - // expression dimensions - List<CarbonDimension> expressionDimensions = - new ArrayList<CarbonDimension>(CarbonCommonConstants.DEFAULT_COLLECTION_SIZE); // expression measure List<CarbonMeasure> expressionMeasures = new ArrayList<CarbonMeasure>(CarbonCommonConstants.DEFAULT_COLLECTION_SIZE); @@ -409,9 +406,9 @@ public abstract class AbstractQueryExecutor<E> implements QueryExecutor<E> { // create a list of filter dimensions present in the current block Set<CarbonDimension> currentBlockFilterDimensions = getCurrentBlockFilterDimensions(queryProperties.complexFilterDimension, segmentProperties); - int[] dimensionChunkIndexes = QueryUtil.getDimensionChunkIndexes( - projectDimensions, segmentProperties.getDimensionOrdinalToChunkMapping(), - expressionDimensions, currentBlockFilterDimensions, allProjectionListDimensionIdexes); + int[] dimensionChunkIndexes = QueryUtil.getDimensionChunkIndexes(projectDimensions, + segmentProperties.getDimensionOrdinalToChunkMapping(), + currentBlockFilterDimensions, allProjectionListDimensionIdexes); int numberOfColumnToBeReadInOneIO = Integer.parseInt(CarbonProperties.getInstance() .getProperty(CarbonV3DataFormatConstants.NUMBER_OF_COLUMN_TO_READ_IN_IO, CarbonV3DataFormatConstants.NUMBER_OF_COLUMN_TO_READ_IN_IO_DEFAULTVALUE)); @@ -482,16 +479,6 @@ public abstract class AbstractQueryExecutor<E> implements QueryExecutor<E> { blockExecutionInfo.setComplexColumnParentBlockIndexes( getComplexDimensionParentBlockIndexes(projectDimensions)); blockExecutionInfo.setVectorBatchCollector(queryModel.isVectorReader()); - try { - // to set column group and its key structure info which will be used - // to - // for getting the column group column data in case of final row - // and in case of dimension aggregation - blockExecutionInfo.setColumnGroupToKeyStructureInfo( - QueryUtil.getColumnGroupKeyStructureInfo(projectDimensions, segmentProperties)); - } catch (KeyGenException e) { - throw new QueryExecutionException(e); - } // set actual query dimensions and measures. It may differ in case of restructure scenarios blockExecutionInfo.setActualQueryDimensions(queryModel.getProjectionDimensions() .toArray(new ProjectionDimension[queryModel.getProjectionDimensions().size()])); http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/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 3165bfd..e737b0e 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 @@ -121,11 +121,6 @@ public class BlockExecutionInfo { private int[] eachColumnValueSize; /** - * column group block index in file to key structure info mapping - */ - private Map<Integer, KeyStructureInfo> columnGroupToKeyStructureInfo; - - /** * filter tree to execute the filter */ private FilterExecuter filterExecuterTree; @@ -425,21 +420,6 @@ public class BlockExecutionInfo { this.noDictionaryColumnChunkIndexes = noDictionaryColumnChunkIndexes; } - /** - * @return the columnGroupToKeyStructureInfo - */ - public Map<Integer, KeyStructureInfo> getColumnGroupToKeyStructureInfo() { - return columnGroupToKeyStructureInfo; - } - - /** - * @param columnGroupToKeyStructureInfo the columnGroupToKeyStructureInfo to set - */ - public void setColumnGroupToKeyStructureInfo( - Map<Integer, KeyStructureInfo> columnGroupToKeyStructureInfo) { - this.columnGroupToKeyStructureInfo = columnGroupToKeyStructureInfo; - } - public boolean isRawRecordDetailQuery() { return isRawRecordDetailQuery; } http://git-wip-us.apache.org/repos/asf/carbondata/blob/f9114036/core/src/main/java/org/apache/carbondata/core/scan/executor/infos/KeyStructureInfo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/executor/infos/KeyStructureInfo.java b/core/src/main/java/org/apache/carbondata/core/scan/executor/infos/KeyStructureInfo.java deleted file mode 100644 index 0cccee4..0000000 --- a/core/src/main/java/org/apache/carbondata/core/scan/executor/infos/KeyStructureInfo.java +++ /dev/null @@ -1,98 +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.scan.executor.infos; - -import org.apache.carbondata.core.keygenerator.KeyGenerator; - -/** - * Below class will store the structure of the key - * used during query execution - */ -public class KeyStructureInfo { - - /** - * it's actually a latest key generator - * last table block as this key generator will be used to - * to update the mdkey of the older slice with the new slice - */ - private KeyGenerator keyGenerator; - - /** - * mask bytes ranges for the query - */ - private int[] maskByteRanges; - - /** - * max key for query execution - */ - private byte[] maxKey; - - /** - * dimension ordinals inside the column group - */ - private int[] mdkeyQueryDimensionOrdinal; - - /** - * @return the keyGenerator - */ - public KeyGenerator getKeyGenerator() { - return keyGenerator; - } - - /** - * @param keyGenerator the keyGenerator to set - */ - public void setKeyGenerator(KeyGenerator keyGenerator) { - this.keyGenerator = keyGenerator; - } - - /** - * @return the maskByteRanges - */ - public int[] getMaskByteRanges() { - return maskByteRanges; - } - - /** - * @param maskByteRanges the maskByteRanges to set - */ - public void setMaskByteRanges(int[] maskByteRanges) { - this.maskByteRanges = maskByteRanges; - } - - /** - * @return the maxKey - */ - public byte[] getMaxKey() { - return maxKey; - } - - /** - * @param maxKey the maxKey to set - */ - public void setMaxKey(byte[] maxKey) { - this.maxKey = maxKey; - } - - public int[] getMdkeyQueryDimensionOrdinal() { - return mdkeyQueryDimensionOrdinal; - } - - public void setMdkeyQueryDimensionOrdinal(int[] mdkeyQueryDimensionOrdinal) { - this.mdkeyQueryDimensionOrdinal = mdkeyQueryDimensionOrdinal; - } -}
