Repository: carbondata Updated Branches: refs/heads/master 2fc0ad306 -> c58eb43ba
http://git-wip-us.apache.org/repos/asf/carbondata/blob/c58eb43b/processing/src/main/java/org/apache/carbondata/processing/datamap/DataMapWriterListener.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/datamap/DataMapWriterListener.java b/processing/src/main/java/org/apache/carbondata/processing/datamap/DataMapWriterListener.java index 30a620c..6e7f2d6 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/datamap/DataMapWriterListener.java +++ b/processing/src/main/java/org/apache/carbondata/processing/datamap/DataMapWriterListener.java @@ -80,7 +80,7 @@ public class DataMapWriterListener { } List<String> columns = factory.getMeta().getIndexedColumns(); List<DataMapWriter> writers = registry.get(columns); - DataMapWriter writer = factory.createWriter(new Segment(segmentId, null), dataWritePath); + DataMapWriter writer = factory.createWriter(new Segment(segmentId, null, null), dataWritePath); if (writers != null) { writers.add(writer); } else { http://git-wip-us.apache.org/repos/asf/carbondata/blob/c58eb43b/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonDataMergerUtil.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonDataMergerUtil.java b/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonDataMergerUtil.java index 5bc85f8..2ac351c 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonDataMergerUtil.java +++ b/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonDataMergerUtil.java @@ -231,8 +231,8 @@ public final class CarbonDataMergerUtil { .setUpdateStatusFileName(CarbonUpdateUtil.getUpdateStatusFileName(timestamp)); } // Update segement file name to status file - int segmentFileIndex = - segmentFilesToBeUpdated.indexOf(Segment.toSegment(loadDetail.getLoadName())); + int segmentFileIndex = segmentFilesToBeUpdated + .indexOf(Segment.toSegment(loadDetail.getLoadName(), null)); if (segmentFileIndex > -1) { loadDetail.setSegmentFile( segmentFilesToBeUpdated.get(segmentFileIndex).getSegmentFileName()); @@ -857,9 +857,9 @@ public final class CarbonDataMergerUtil { //check if this load is an already merged load. if (null != segment.getMergedLoadName()) { - segments.add(Segment.toSegment(segment.getMergedLoadName())); + segments.add(Segment.toSegment(segment.getMergedLoadName(), null)); } else { - segments.add(Segment.toSegment(segment.getLoadName())); + segments.add(Segment.toSegment(segment.getLoadName(), null)); } } return segments; http://git-wip-us.apache.org/repos/asf/carbondata/blob/c58eb43b/processing/src/main/java/org/apache/carbondata/processing/util/CarbonLoaderUtil.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/util/CarbonLoaderUtil.java b/processing/src/main/java/org/apache/carbondata/processing/util/CarbonLoaderUtil.java index aabe91a..2b4748f 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/util/CarbonLoaderUtil.java +++ b/processing/src/main/java/org/apache/carbondata/processing/util/CarbonLoaderUtil.java @@ -295,7 +295,8 @@ public final class CarbonLoaderUtil { // if the segments is in the list of marked for delete then update the status. if (segmentsToBeDeleted.contains(new Segment(detail.getLoadName(), null))) { detail.setSegmentStatus(SegmentStatus.MARKED_FOR_DELETE); - } else if (segmentFilesTobeUpdated.contains(Segment.toSegment(detail.getLoadName()))) { + } else if (segmentFilesTobeUpdated + .contains(Segment.toSegment(detail.getLoadName(), null))) { detail.setSegmentFile( detail.getLoadName() + "_" + newMetaEntry.getUpdateStatusFileName() + CarbonTablePath.SEGMENT_EXT);
