You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ra...@apache.org on 2017/03/24 10:07:05 UTC
[1/2] incubator-carbondata git commit: Fix pom issues and add the
correct dependency jar to build success for integration/presto
Repository: incubator-carbondata
Updated Branches:
refs/heads/master b7c636f1f -> 684dead02
Fix pom issues and add the correct dependency jar to build success for integration/presto
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/9e3818eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/9e3818eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/9e3818eb
Branch: refs/heads/master
Commit: 9e3818eb5e933707237b755653052f4df915c826
Parents: b7c636f
Author: chenliang613 <ch...@huawei.com>
Authored: Thu Mar 23 22:51:23 2017 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Fri Mar 24 15:36:23 2017 +0530
----------------------------------------------------------------------
integration/presto/pom.xml | 54 ++++++++++++++++++--
.../presto/CarbondataColumnConstraint.java | 3 +-
.../presto/CarbondataColumnHandle.java | 3 +-
.../carbondata/presto/CarbondataMetadata.java | 4 +-
.../carbondata/presto/CarbondataRecordSet.java | 7 +--
.../presto/CarbondataRecordSetProvider.java | 2 +-
.../presto/CarbondataSplitManager.java | 2 +-
.../presto/CarbondataTableLayoutHandle.java | 3 +-
8 files changed, 64 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e3818eb/integration/presto/pom.xml
----------------------------------------------------------------------
diff --git a/integration/presto/pom.xml b/integration/presto/pom.xml
index 26e7f85..5493df1 100644
--- a/integration/presto/pom.xml
+++ b/integration/presto/pom.xml
@@ -43,24 +43,32 @@
<dependency>
<groupId>org.apache.carbondata</groupId>
<artifactId>carbondata-core</artifactId>
- <version>1.0.0-incubating</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.carbondata</groupId>
<artifactId>carbondata-common</artifactId>
- <version>1.0.0-incubating</version>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.carbondata</groupId>
+ <artifactId>carbondata-processing</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.carbondata</groupId>
<artifactId>carbondata-hadoop</artifactId>
- <version>1.0.0-incubating</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.airlift</groupId>
<artifactId>bootstrap</artifactId>
+ <version>0.144</version>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -72,39 +80,48 @@
<dependency>
<groupId>io.airlift</groupId>
<artifactId>json</artifactId>
+ <version>0.144</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>io.airlift</groupId>
<artifactId>log</artifactId>
+ <version>0.144</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>io.airlift</groupId>
<artifactId>slice</artifactId>
+ <version>0.29</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.airlift</groupId>
<artifactId>units</artifactId>
+ <version>1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
+ <version>2.6.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <version>14.0.1</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
+ <version>3.0</version>
</dependency>
<!--presto intergated-->
@@ -118,12 +135,41 @@
<dependency>
<groupId>com.facebook.presto.hadoop</groupId>
<artifactId>hadoop-apache2</artifactId>
+ <version>2.7.3-1</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.18</version>
+ <!-- Note config is repeated in scalatest config -->
+ <configuration>
+ <includes>
+ <include>**/Test*.java</include>
+ <include>**/*Test.java</include>
+ <include>**/*TestCase.java</include>
+ <include>**/*Suite.java</include>
+ </includes>
+ <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
+ <argLine>-Xmx3g -XX:MaxPermSize=512m -XX:ReservedCodeCacheSize=512m</argLine>
+ <systemProperties>
+ <java.awt.headless>true</java.awt.headless>
+ </systemProperties>
+ <failIfNoTests>false</failIfNoTests>
+ </configuration>
+ </plugin>
+ <!--
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
@@ -165,7 +211,7 @@
<skip>true</skip>
</configuration>
</plugin>
- <!--
+
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e3818eb/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataColumnConstraint.java
----------------------------------------------------------------------
diff --git a/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataColumnConstraint.java b/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataColumnConstraint.java
index f2f69d9..aad378e 100755
--- a/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataColumnConstraint.java
+++ b/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataColumnConstraint.java
@@ -25,7 +25,8 @@ import com.fasterxml.jackson.annotation.JsonSetter;
import java.util.Objects;
import java.util.Optional;
-import static com.google.common.base.MoreObjects.toStringHelper;
+//import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static java.util.Objects.requireNonNull;
public class CarbondataColumnConstraint {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e3818eb/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataColumnHandle.java
----------------------------------------------------------------------
diff --git a/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataColumnHandle.java b/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataColumnHandle.java
index 252556a..2e3aef5 100755
--- a/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataColumnHandle.java
+++ b/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataColumnHandle.java
@@ -25,7 +25,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.Objects;
-import static com.google.common.base.MoreObjects.toStringHelper;
+//import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static java.util.Objects.requireNonNull;
public class CarbondataColumnHandle
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e3818eb/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataMetadata.java
----------------------------------------------------------------------
diff --git a/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataMetadata.java b/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataMetadata.java
index 90eca58..7fa96c3 100755
--- a/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataMetadata.java
+++ b/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataMetadata.java
@@ -17,7 +17,7 @@
package org.apache.carbondata.presto;
-import com.facebook.presto.carbondata.impl.CarbonTableReader;
+import org.apache.carbondata.presto.impl.CarbonTableReader;
import com.facebook.presto.spi.*;
import com.facebook.presto.spi.classloader.ThreadContextClassLoader;
import com.facebook.presto.spi.connector.ConnectorMetadata;
@@ -33,7 +33,7 @@ import org.apache.carbondata.core.metadata.schema.table.column.ColumnSchema;
import javax.inject.Inject;
import java.util.*;
-import static com.facebook.presto.carbondata.Types.checkType;
+import static org.apache.carbondata.presto.Types.checkType;
import static com.google.common.base.Preconditions.checkArgument;
import static java.util.Objects.requireNonNull;
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e3818eb/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataRecordSet.java
----------------------------------------------------------------------
diff --git a/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataRecordSet.java b/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataRecordSet.java
index 60e940b..737d2f1 100755
--- a/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataRecordSet.java
+++ b/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataRecordSet.java
@@ -32,13 +32,14 @@ import org.apache.carbondata.core.scan.model.QueryModel;
import org.apache.carbondata.core.scan.result.BatchResult;
import org.apache.carbondata.core.scan.result.iterator.ChunkRowIterator;
import org.apache.carbondata.hadoop.readsupport.CarbonReadSupport;
-import org.apache.carbondata.hadoop.readsupport.impl.DictionaryDecodedReadSupportImpl;
+import org.apache.carbondata.hadoop.readsupport.impl.DictionaryDecodeReadSupport;
+//import org.apache.carbondata.hadoop.readsupport.impl.DictionaryDecodedReadSupportImpl;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
-import static com.facebook.presto.carbondata.Types.checkType;
+import static org.apache.carbondata.presto.Types.checkType;
public class CarbondataRecordSet implements RecordSet {
@@ -65,7 +66,7 @@ public class CarbondataRecordSet implements RecordSet {
this.rebuildConstraints = this.split.getRebuildConstraints();
this.queryModel = queryModel;
this.columns = columns;
- this.readSupport = new DictionaryDecodedReadSupportImpl();
+ this.readSupport = new DictionaryDecodeReadSupport();
}
//todo support later
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e3818eb/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataRecordSetProvider.java
----------------------------------------------------------------------
diff --git a/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataRecordSetProvider.java b/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataRecordSetProvider.java
index 4d3ace5..95895fc 100755
--- a/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataRecordSetProvider.java
+++ b/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataRecordSetProvider.java
@@ -48,7 +48,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
-import static com.facebook.presto.carbondata.Types.checkType;
+import static org.apache.carbondata.presto.Types.checkType;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e3818eb/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataSplitManager.java
----------------------------------------------------------------------
diff --git a/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataSplitManager.java b/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataSplitManager.java
index 34b075e..86390e3 100755
--- a/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataSplitManager.java
+++ b/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataSplitManager.java
@@ -45,7 +45,7 @@ import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
-import static com.facebook.presto.carbondata.Types.checkType;
+import static org.apache.carbondata.presto.Types.checkType;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkState;
import static java.util.Objects.requireNonNull;
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e3818eb/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataTableLayoutHandle.java
----------------------------------------------------------------------
diff --git a/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataTableLayoutHandle.java b/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataTableLayoutHandle.java
index bddf9de..dc0506f 100755
--- a/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataTableLayoutHandle.java
+++ b/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataTableLayoutHandle.java
@@ -25,7 +25,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.Objects;
-import static com.google.common.base.MoreObjects.toStringHelper;
+//import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static java.util.Objects.requireNonNull;
public class CarbondataTableLayoutHandle
[2/2] incubator-carbondata git commit: [CARBONDATA-813] Fix all
issues to build success for integration/presto This closes #693
Posted by ra...@apache.org.
[CARBONDATA-813] Fix all issues to build success for integration/presto This closes #693
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/684dead0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/684dead0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/684dead0
Branch: refs/heads/master
Commit: 684dead028b77b8751bcc2997d580a4fa58850f5
Parents: b7c636f 9e3818e
Author: ravipesala <ra...@gmail.com>
Authored: Fri Mar 24 15:36:50 2017 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Fri Mar 24 15:36:50 2017 +0530
----------------------------------------------------------------------
integration/presto/pom.xml | 54 ++++++++++++++++++--
.../presto/CarbondataColumnConstraint.java | 3 +-
.../presto/CarbondataColumnHandle.java | 3 +-
.../carbondata/presto/CarbondataMetadata.java | 4 +-
.../carbondata/presto/CarbondataRecordSet.java | 7 +--
.../presto/CarbondataRecordSetProvider.java | 2 +-
.../presto/CarbondataSplitManager.java | 2 +-
.../presto/CarbondataTableLayoutHandle.java | 3 +-
8 files changed, 64 insertions(+), 14 deletions(-)
----------------------------------------------------------------------