[CARBONDATA-2213][DataMap] Fixed wrong version for module datamap-example The version of Module âcarbondata-datamap-exampleâ should be 1.4.0-snapshot instead of 1.3.0-snapshot, otherwise compilation will failed.
This closes #2011 Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/5397c05c Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/5397c05c Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/5397c05c Branch: refs/heads/master Commit: 5397c05c9bd80a0ee956046d027b6a2900475f52 Parents: 5eb476f Author: xuchuanyin <xuchuan...@hust.edu.cn> Authored: Wed Feb 28 10:31:02 2018 +0800 Committer: ravipesala <ravi.pes...@gmail.com> Committed: Thu Mar 8 22:21:11 2018 +0530 ---------------------------------------------------------------------- datamap/examples/pom.xml | 8 ++++---- .../datamap/examples/MinMaxIndexDataMapFactory.java | 1 - .../datamap/lucene/LuceneCoarseGrainDataMap.java | 3 ++- .../lucene/LuceneCoarseGrainDataMapFactory.java | 9 ++++++--- .../datamap/lucene/LuceneDataMapFactoryBase.java | 16 +++++++++++----- .../datamap/lucene/LuceneDataMapWriter.java | 5 +++-- .../datamap/lucene/LuceneFineGrainDataMap.java | 3 ++- .../lucene/LuceneFineGrainDataMapFactory.java | 9 ++++++--- 8 files changed, 34 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata/blob/5397c05c/datamap/examples/pom.xml ---------------------------------------------------------------------- diff --git a/datamap/examples/pom.xml b/datamap/examples/pom.xml index 8539a86..30e1522 100644 --- a/datamap/examples/pom.xml +++ b/datamap/examples/pom.xml @@ -22,10 +22,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.carbondata</groupId> - <artifactId>carbondata-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <groupId>org.apache.carbondata</groupId> + <artifactId>carbondata-parent</artifactId> + <version>1.4.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent> <artifactId>carbondata-datamap-examples</artifactId> http://git-wip-us.apache.org/repos/asf/carbondata/blob/5397c05c/datamap/examples/src/minmaxdatamap/main/java/org/apache/carbondata/datamap/examples/MinMaxIndexDataMapFactory.java ---------------------------------------------------------------------- diff --git a/datamap/examples/src/minmaxdatamap/main/java/org/apache/carbondata/datamap/examples/MinMaxIndexDataMapFactory.java b/datamap/examples/src/minmaxdatamap/main/java/org/apache/carbondata/datamap/examples/MinMaxIndexDataMapFactory.java index 9fea55b..45dee2a 100644 --- a/datamap/examples/src/minmaxdatamap/main/java/org/apache/carbondata/datamap/examples/MinMaxIndexDataMapFactory.java +++ b/datamap/examples/src/minmaxdatamap/main/java/org/apache/carbondata/datamap/examples/MinMaxIndexDataMapFactory.java @@ -25,7 +25,6 @@ import java.util.List; import org.apache.carbondata.core.datamap.DataMapDistributable; import org.apache.carbondata.core.datamap.DataMapMeta; import org.apache.carbondata.core.datamap.Segment; -import org.apache.carbondata.core.datamap.dev.AbstractDataMapWriter; import org.apache.carbondata.core.datamap.dev.DataMapModel; import org.apache.carbondata.core.datamap.dev.DataMapWriter; import org.apache.carbondata.core.datamap.dev.cgdatamap.CoarseGrainDataMap; http://git-wip-us.apache.org/repos/asf/carbondata/blob/5397c05c/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneCoarseGrainDataMap.java ---------------------------------------------------------------------- diff --git a/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneCoarseGrainDataMap.java b/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneCoarseGrainDataMap.java index 0b7df86..580f18b 100644 --- a/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneCoarseGrainDataMap.java +++ b/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneCoarseGrainDataMap.java @@ -33,6 +33,7 @@ import org.apache.carbondata.core.datamap.dev.cgdatamap.CoarseGrainDataMap; import org.apache.carbondata.core.datastore.block.SegmentProperties; import org.apache.carbondata.core.datastore.impl.FileFactory; import org.apache.carbondata.core.indexstore.Blocklet; +import org.apache.carbondata.core.indexstore.PartitionSpec; import org.apache.carbondata.core.memory.MemoryException; import org.apache.carbondata.core.scan.filter.resolver.FilterResolverIntf; @@ -133,7 +134,7 @@ public class LuceneCoarseGrainDataMap extends CoarseGrainDataMap { */ @Override public List<Blocklet> prune(FilterResolverIntf filterExp, SegmentProperties segmentProperties, - List<String> partitions) throws IOException { + List<PartitionSpec> partitions) throws IOException { // convert filter expr into lucene list query List<String> fields = new ArrayList<String>(); http://git-wip-us.apache.org/repos/asf/carbondata/blob/5397c05c/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneCoarseGrainDataMapFactory.java ---------------------------------------------------------------------- diff --git a/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneCoarseGrainDataMapFactory.java b/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneCoarseGrainDataMapFactory.java index 7f9cc1c..04160c0 100644 --- a/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneCoarseGrainDataMapFactory.java +++ b/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneCoarseGrainDataMapFactory.java @@ -26,6 +26,7 @@ import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.datamap.DataMapDistributable; import org.apache.carbondata.core.datamap.DataMapLevel; +import org.apache.carbondata.core.datamap.Segment; import org.apache.carbondata.core.datamap.dev.DataMapModel; import org.apache.carbondata.core.datamap.dev.cgdatamap.CoarseGrainDataMap; import org.apache.carbondata.core.memory.MemoryException; @@ -41,13 +42,14 @@ public class LuceneCoarseGrainDataMapFactory extends LuceneDataMapFactoryBase<Co /** * Get the datamap for segmentid */ - public List<CoarseGrainDataMap> getDataMaps(String segmentId) throws IOException { + @Override + public List<CoarseGrainDataMap> getDataMaps(Segment segment) throws IOException { List<CoarseGrainDataMap> lstDataMap = new ArrayList<>(); CoarseGrainDataMap dataMap = new LuceneCoarseGrainDataMap(analyzer); try { dataMap.init(new DataMapModel( LuceneDataMapWriter.genDataMapStorePath( - tableIdentifier.getTablePath(), segmentId, dataMapName))); + tableIdentifier.getTablePath(), segment.getSegmentNo(), dataMapName))); } catch (MemoryException e) { LOGGER.error("failed to get lucene datamap , detail is {}" + e.getMessage()); return lstDataMap; @@ -59,9 +61,10 @@ public class LuceneCoarseGrainDataMapFactory extends LuceneDataMapFactoryBase<Co /** * Get datamaps for distributable object. */ + @Override public List<CoarseGrainDataMap> getDataMaps(DataMapDistributable distributable) throws IOException { - return getDataMaps(distributable.getSegmentId()); + return getDataMaps(distributable.getSegment()); } @Override http://git-wip-us.apache.org/repos/asf/carbondata/blob/5397c05c/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneDataMapFactoryBase.java ---------------------------------------------------------------------- diff --git a/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneDataMapFactoryBase.java b/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneDataMapFactoryBase.java index 5eb7054..88e70d5 100644 --- a/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneDataMapFactoryBase.java +++ b/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneDataMapFactoryBase.java @@ -27,6 +27,7 @@ import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.datamap.DataMapDistributable; import org.apache.carbondata.core.datamap.DataMapMeta; +import org.apache.carbondata.core.datamap.Segment; import org.apache.carbondata.core.datamap.dev.DataMap; import org.apache.carbondata.core.datamap.dev.DataMapFactory; import org.apache.carbondata.core.datamap.dev.DataMapWriter; @@ -136,23 +137,26 @@ abstract class LuceneDataMapFactoryBase<T extends DataMap> implements DataMapFac /** * Return a new write for this datamap */ - public DataMapWriter createWriter(String segmentId, String writeDirectoryPath) { + @Override + public DataMapWriter createWriter(Segment segment, String writeDirectoryPath) { LOGGER.info("lucene data write to " + writeDirectoryPath); return new LuceneDataMapWriter( - tableIdentifier, dataMapName, segmentId, writeDirectoryPath, true); + tableIdentifier, dataMapName, segment, writeDirectoryPath, true); } /** * Get all distributable objects of a segmentid */ - public List<DataMapDistributable> toDistributable(String segmentId) { + @Override + public List<DataMapDistributable> toDistributable(Segment segment) { List<DataMapDistributable> lstDataMapDistribute = new ArrayList<DataMapDistributable>(); DataMapDistributable luceneDataMapDistributable = new LuceneDataMapDistributable( - CarbonTablePath.getSegmentPath(tableIdentifier.getTablePath(), segmentId)); + CarbonTablePath.getSegmentPath(tableIdentifier.getTablePath(), segment.getSegmentNo())); lstDataMapDistribute.add(luceneDataMapDistributable); return lstDataMapDistribute; } + @Override public void fireEvent(Event event) { } @@ -160,13 +164,15 @@ abstract class LuceneDataMapFactoryBase<T extends DataMap> implements DataMapFac /** * Clears datamap of the segment */ - public void clear(String segmentId) { + @Override + public void clear(Segment segment) { } /** * Clear all datamaps from memory */ + @Override public void clear() { } http://git-wip-us.apache.org/repos/asf/carbondata/blob/5397c05c/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneDataMapWriter.java ---------------------------------------------------------------------- diff --git a/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneDataMapWriter.java b/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneDataMapWriter.java index 849fc2e..86b2382 100644 --- a/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneDataMapWriter.java +++ b/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneDataMapWriter.java @@ -24,6 +24,7 @@ import java.io.UnsupportedEncodingException; import org.apache.carbondata.common.annotations.InterfaceAudience; import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; +import org.apache.carbondata.core.datamap.Segment; import org.apache.carbondata.core.datamap.dev.DataMapWriter; import org.apache.carbondata.core.datastore.impl.FileFactory; import org.apache.carbondata.core.datastore.page.ColumnPage; @@ -84,9 +85,9 @@ public class LuceneDataMapWriter extends DataMapWriter { private static final String ROWID_NAME = "rowId"; - LuceneDataMapWriter(AbsoluteTableIdentifier identifier, String dataMapName, String segmentId, + LuceneDataMapWriter(AbsoluteTableIdentifier identifier, String dataMapName, Segment segment, String writeDirectoryPath, boolean isFineGrain) { - super(identifier, segmentId, writeDirectoryPath); + super(identifier, segment, writeDirectoryPath); this.dataMapName = dataMapName; this.isFineGrain = isFineGrain; } http://git-wip-us.apache.org/repos/asf/carbondata/blob/5397c05c/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneFineGrainDataMap.java ---------------------------------------------------------------------- diff --git a/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneFineGrainDataMap.java b/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneFineGrainDataMap.java index c649545..faa4cbe 100644 --- a/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneFineGrainDataMap.java +++ b/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneFineGrainDataMap.java @@ -28,6 +28,7 @@ import org.apache.carbondata.core.datamap.dev.fgdatamap.FineGrainBlocklet; import org.apache.carbondata.core.datamap.dev.fgdatamap.FineGrainDataMap; import org.apache.carbondata.core.datastore.block.SegmentProperties; import org.apache.carbondata.core.datastore.impl.FileFactory; +import org.apache.carbondata.core.indexstore.PartitionSpec; import org.apache.carbondata.core.memory.MemoryException; import org.apache.carbondata.core.scan.expression.Expression; import org.apache.carbondata.core.scan.filter.intf.ExpressionType; @@ -144,7 +145,7 @@ public class LuceneFineGrainDataMap extends FineGrainDataMap { */ @Override public List<FineGrainBlocklet> prune(FilterResolverIntf filterExp, - SegmentProperties segmentProperties, List<String> partitions) throws IOException { + SegmentProperties segmentProperties, List<PartitionSpec> partitions) throws IOException { // convert filter expr into lucene list query List<String> fields = new ArrayList<String>(); http://git-wip-us.apache.org/repos/asf/carbondata/blob/5397c05c/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneFineGrainDataMapFactory.java ---------------------------------------------------------------------- diff --git a/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneFineGrainDataMapFactory.java b/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneFineGrainDataMapFactory.java index e35d5bf..a9376bc 100644 --- a/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneFineGrainDataMapFactory.java +++ b/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneFineGrainDataMapFactory.java @@ -24,6 +24,7 @@ import java.util.List; import org.apache.carbondata.common.annotations.InterfaceAudience; import org.apache.carbondata.core.datamap.DataMapDistributable; import org.apache.carbondata.core.datamap.DataMapLevel; +import org.apache.carbondata.core.datamap.Segment; import org.apache.carbondata.core.datamap.dev.DataMapModel; import org.apache.carbondata.core.datamap.dev.fgdatamap.FineGrainDataMap; import org.apache.carbondata.core.memory.MemoryException; @@ -37,13 +38,14 @@ public class LuceneFineGrainDataMapFactory extends LuceneDataMapFactoryBase<Fine /** * Get the datamap for segmentid */ - public List<FineGrainDataMap> getDataMaps(String segmentId) throws IOException { + @Override + public List<FineGrainDataMap> getDataMaps(Segment segment) throws IOException { List<FineGrainDataMap> lstDataMap = new ArrayList<>(); FineGrainDataMap dataMap = new LuceneFineGrainDataMap(analyzer); try { dataMap.init(new DataMapModel( LuceneDataMapWriter.genDataMapStorePath( - tableIdentifier.getTablePath(), segmentId, dataMapName))); + tableIdentifier.getTablePath(), segment.getSegmentNo(), dataMapName))); } catch (MemoryException e) { LOGGER.error("failed to get lucene datamap , detail is {}" + e.getMessage()); return lstDataMap; @@ -55,9 +57,10 @@ public class LuceneFineGrainDataMapFactory extends LuceneDataMapFactoryBase<Fine /** * Get datamaps for distributable object. */ + @Override public List<FineGrainDataMap> getDataMaps(DataMapDistributable distributable) throws IOException { - return getDataMaps(distributable.getSegmentId()); + return getDataMaps(distributable.getSegment()); } @Override
