You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ch...@apache.org on 2016/11/05 00:34:45 UTC
[1/2] incubator-carbondata git commit: Fixed compilation and
checkstyle issues of PR 208
Repository: incubator-carbondata
Updated Branches:
refs/heads/master c910e6fd8 -> ed3810aa4
Fixed compilation and checkstyle issues of PR 208
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/988ccd8e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/988ccd8e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/988ccd8e
Branch: refs/heads/master
Commit: 988ccd8ea5084ddf1d837a3f257dd0b388ecad1a
Parents: c910e6f
Author: ravipesala <ra...@gmail.com>
Authored: Sat Nov 5 01:26:26 2016 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Sat Nov 5 01:26:26 2016 +0530
----------------------------------------------------------------------
.../java/org/apache/carbondata/hadoop/CarbonInputSplit.java | 1 +
.../apache/carbondata/hadoop/api/CarbonTableInputFormat.java | 3 ++-
.../carbondata/hadoop/api/CarbonTableOutputCommitter.java | 1 +
.../org/apache/carbondata/hadoop/internal/CarbonInputSplit.java | 3 ++-
.../java/org/apache/carbondata/hadoop/internal/index/Index.java | 1 +
.../apache/carbondata/hadoop/internal/index/IndexLoader.java | 1 -
.../hadoop/internal/index/impl/InMemoryBTreeIndex.java | 1 +
.../hadoop/internal/index/impl/InMemoryBTreeIndexLoader.java | 4 ++--
.../org/apache/carbondata/hadoop/internal/segment/Segment.java | 5 +++--
.../carbondata/hadoop/internal/segment/SegmentManager.java | 4 ++--
.../carbondata/hadoop/internal/segment/impl/IndexedSegment.java | 4 ++--
11 files changed, 17 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/988ccd8e/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputSplit.java
----------------------------------------------------------------------
diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputSplit.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputSplit.java
index 2cdefe9..ffcd663 100644
--- a/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputSplit.java
+++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputSplit.java
@@ -25,6 +25,7 @@ import java.io.Serializable;
import java.util.List;
import org.apache.carbondata.hadoop.internal.index.Block;
+
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.mapreduce.lib.input.FileSplit;
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/988ccd8e/hadoop/src/main/java/org/apache/carbondata/hadoop/api/CarbonTableInputFormat.java
----------------------------------------------------------------------
diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/api/CarbonTableInputFormat.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/api/CarbonTableInputFormat.java
index 233a5b7..f353b55 100644
--- a/hadoop/src/main/java/org/apache/carbondata/hadoop/api/CarbonTableInputFormat.java
+++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/api/CarbonTableInputFormat.java
@@ -32,6 +32,7 @@ import org.apache.carbondata.hadoop.util.CarbonInputFormatUtil;
import org.apache.carbondata.hadoop.util.ObjectSerializationUtil;
import org.apache.carbondata.scan.expression.Expression;
import org.apache.carbondata.scan.filter.resolver.FilterResolverIntf;
+
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.mapreduce.InputSplit;
import org.apache.hadoop.mapreduce.JobContext;
@@ -58,7 +59,7 @@ public class CarbonTableInputFormat<T> extends FileInputFormat<Void, T> {
public RecordReader<Void, T> createRecordReader(InputSplit split,
TaskAttemptContext context) throws IOException, InterruptedException {
switch (((CarbonInputSplit)split).formatType()) {
- case COLUMNR:
+ case COLUMNAR:
// TODO: create record reader for columnar format
break;
default:
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/988ccd8e/hadoop/src/main/java/org/apache/carbondata/hadoop/api/CarbonTableOutputCommitter.java
----------------------------------------------------------------------
diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/api/CarbonTableOutputCommitter.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/api/CarbonTableOutputCommitter.java
index 3b4a3a2..9e61d73 100644
--- a/hadoop/src/main/java/org/apache/carbondata/hadoop/api/CarbonTableOutputCommitter.java
+++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/api/CarbonTableOutputCommitter.java
@@ -23,6 +23,7 @@ import java.io.IOException;
import org.apache.carbondata.hadoop.internal.segment.Segment;
import org.apache.carbondata.hadoop.internal.segment.SegmentManager;
+
import org.apache.hadoop.mapred.FileOutputCommitter;
import org.apache.hadoop.mapred.JobContext;
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/988ccd8e/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/CarbonInputSplit.java
----------------------------------------------------------------------
diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/CarbonInputSplit.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/CarbonInputSplit.java
index 2a982a2..0769eeb 100644
--- a/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/CarbonInputSplit.java
+++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/CarbonInputSplit.java
@@ -22,7 +22,8 @@ package org.apache.carbondata.hadoop.internal;
import org.apache.hadoop.mapreduce.InputSplit;
/**
- * Carbon input split can be different format, application should create the record reader based on format type.
+ * Carbon input split can be different format, application should create the record reader
+ * based on format type.
*/
public abstract class CarbonInputSplit extends InputSplit {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/988ccd8e/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/index/Index.java
----------------------------------------------------------------------
diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/index/Index.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/index/Index.java
index 8c4388a..49404f7 100644
--- a/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/index/Index.java
+++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/index/Index.java
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.util.List;
import org.apache.carbondata.scan.filter.resolver.FilterResolverIntf;
+
import org.apache.hadoop.mapreduce.JobContext;
/**
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/988ccd8e/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/index/IndexLoader.java
----------------------------------------------------------------------
diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/index/IndexLoader.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/index/IndexLoader.java
index c94d51c..92e5acb 100644
--- a/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/index/IndexLoader.java
+++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/index/IndexLoader.java
@@ -20,7 +20,6 @@
package org.apache.carbondata.hadoop.internal.index;
import org.apache.carbondata.hadoop.internal.segment.Segment;
-import org.apache.hadoop.conf.Configuration;
/**
* Used to load the index
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/988ccd8e/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/index/impl/InMemoryBTreeIndex.java
----------------------------------------------------------------------
diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/index/impl/InMemoryBTreeIndex.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/index/impl/InMemoryBTreeIndex.java
index e0840f7..dbc71ec 100644
--- a/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/index/impl/InMemoryBTreeIndex.java
+++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/index/impl/InMemoryBTreeIndex.java
@@ -51,6 +51,7 @@ import org.apache.carbondata.scan.executor.exception.QueryExecutionException;
import org.apache.carbondata.scan.filter.FilterExpressionProcessor;
import org.apache.carbondata.scan.filter.FilterUtil;
import org.apache.carbondata.scan.filter.resolver.FilterResolverIntf;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.fs.Path;
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/988ccd8e/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/index/impl/InMemoryBTreeIndexLoader.java
----------------------------------------------------------------------
diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/index/impl/InMemoryBTreeIndexLoader.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/index/impl/InMemoryBTreeIndexLoader.java
index 78f89e1..3759e1f 100644
--- a/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/index/impl/InMemoryBTreeIndexLoader.java
+++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/index/impl/InMemoryBTreeIndexLoader.java
@@ -21,11 +21,11 @@ package org.apache.carbondata.hadoop.internal.index.impl;
import org.apache.carbondata.hadoop.internal.index.Index;
import org.apache.carbondata.hadoop.internal.index.IndexLoader;
-import org.apache.hadoop.conf.Configuration;
+import org.apache.carbondata.hadoop.internal.segment.Segment;
public class InMemoryBTreeIndexLoader implements IndexLoader {
@Override
- public Index load(Configuration conf) {
+ public Index load(Segment segment) {
return null;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/988ccd8e/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/segment/Segment.java
----------------------------------------------------------------------
diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/segment/Segment.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/segment/Segment.java
index eb7226f..067b23f 100644
--- a/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/segment/Segment.java
+++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/segment/Segment.java
@@ -24,6 +24,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.carbondata.scan.filter.resolver.FilterResolverIntf;
+
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -31,8 +32,8 @@ import org.apache.hadoop.mapreduce.InputSplit;
import org.apache.hadoop.mapreduce.JobContext;
/**
- * Within a carbon table, each data load becomes one Segment, which stores all data files belong to this load in
- * the segment folder.
+ * Within a carbon table, each data load becomes one Segment,
+ * which stores all data files belong to this load in the segment folder.
*/
public abstract class Segment {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/988ccd8e/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/segment/SegmentManager.java
----------------------------------------------------------------------
diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/segment/SegmentManager.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/segment/SegmentManager.java
index ca596e3..fb91ff1 100644
--- a/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/segment/SegmentManager.java
+++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/segment/SegmentManager.java
@@ -22,8 +22,8 @@ package org.apache.carbondata.hadoop.internal.segment;
import java.io.IOException;
/**
- * Segment manager is used to manage all segment within one table. It manages segment state internally in a
- * transactional manner.
+ * Segment manager is used to manage all segment within one table.
+ * It manages segment state internally in a transactional manner.
*/
public interface SegmentManager {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/988ccd8e/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/segment/impl/IndexedSegment.java
----------------------------------------------------------------------
diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/segment/impl/IndexedSegment.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/segment/impl/IndexedSegment.java
index 158180f..76c1415 100644
--- a/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/segment/impl/IndexedSegment.java
+++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/segment/impl/IndexedSegment.java
@@ -23,12 +23,12 @@ import java.io.IOException;
import java.util.LinkedList;
import java.util.List;
-import org.apache.carbondata.hadoop.internal.CarbonInputSplit;
import org.apache.carbondata.hadoop.internal.index.Block;
-import org.apache.carbondata.hadoop.internal.segment.Segment;
import org.apache.carbondata.hadoop.internal.index.Index;
import org.apache.carbondata.hadoop.internal.index.IndexLoader;
+import org.apache.carbondata.hadoop.internal.segment.Segment;
import org.apache.carbondata.scan.filter.resolver.FilterResolverIntf;
+
import org.apache.hadoop.mapreduce.InputSplit;
import org.apache.hadoop.mapreduce.JobContext;
[2/2] incubator-carbondata git commit: [CARBONDATA-284]Fixed
compilation and checkstyle issues This closes #297
Posted by ch...@apache.org.
[CARBONDATA-284]Fixed compilation and checkstyle issues This closes #297
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/ed3810aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/ed3810aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/ed3810aa
Branch: refs/heads/master
Commit: ed3810aa4d681bddd4b2168136e3cffcb9e511eb
Parents: c910e6f 988ccd8
Author: chenliang613 <ch...@apache.org>
Authored: Sat Nov 5 08:34:21 2016 +0800
Committer: chenliang613 <ch...@apache.org>
Committed: Sat Nov 5 08:34:21 2016 +0800
----------------------------------------------------------------------
.../java/org/apache/carbondata/hadoop/CarbonInputSplit.java | 1 +
.../apache/carbondata/hadoop/api/CarbonTableInputFormat.java | 3 ++-
.../carbondata/hadoop/api/CarbonTableOutputCommitter.java | 1 +
.../org/apache/carbondata/hadoop/internal/CarbonInputSplit.java | 3 ++-
.../java/org/apache/carbondata/hadoop/internal/index/Index.java | 1 +
.../apache/carbondata/hadoop/internal/index/IndexLoader.java | 1 -
.../hadoop/internal/index/impl/InMemoryBTreeIndex.java | 1 +
.../hadoop/internal/index/impl/InMemoryBTreeIndexLoader.java | 4 ++--
.../org/apache/carbondata/hadoop/internal/segment/Segment.java | 5 +++--
.../carbondata/hadoop/internal/segment/SegmentManager.java | 4 ++--
.../carbondata/hadoop/internal/segment/impl/IndexedSegment.java | 4 ++--
11 files changed, 17 insertions(+), 11 deletions(-)
----------------------------------------------------------------------