Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Adapter HDP 3.1.5.0-152 (contain spark 2.3.2, hadoop 3.1.1) #4049

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP] Adapter HDP 3.1.5.0-152 (contain spark 2.3.2, hadoop 3.1.1) #4049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions examples/spark/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,16 @@
</properties>

<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.10.0</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>28.0-jre</version>
</dependency>
<dependency>
<groupId>org.apache.carbondata</groupId>
<artifactId>carbondata-spark_${spark.binary.version}</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions ...gration/spark/src/main/spark2.3/org/apache/spark/sql/hive/CarbonSessionStateBuilder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ class CarbonHiveSessionCatalog(
parser: ParserInterface,
functionResourceLoader: FunctionResourceLoader)
extends HiveSessionCatalog (
externalCatalog,
globalTempViewManager,
() => externalCatalog,
() => globalTempViewManager,
new HiveMetastoreCatalog(sparkSession),
functionRegistry,
conf,
Expand Down Expand Up @@ -181,7 +181,7 @@ class CarbonSessionStateBuilder(sparkSession: SparkSession,
*/
override protected lazy val resourceLoader: HiveSessionResourceLoader = {
val client: HiveClient = externalCatalog.client.newSession()
new HiveSessionResourceLoader(session, client)
new HiveSessionResourceLoader(session, () => client)
}

override protected def analyzer: Analyzer =
Expand Down
4 changes: 2 additions & 2 deletions mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/TableCluster.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package org.apache.carbondata.mv.plans.util

import com.fasterxml.jackson.annotation.{JsonCreator, JsonProperty, JsonRawValue}
import com.google.common.base.Objects
import com.google.common.base.MoreObjects

class TableCluster @JsonCreator()(@JsonProperty("fact") @JsonRawValue fact: Set[String],
@JsonProperty("dimension") @JsonRawValue dimension: Set[String]) {
Expand All @@ -32,7 +32,7 @@ class TableCluster @JsonCreator()(@JsonProperty("fact") @JsonRawValue fact: Set[
}

override def toString: String = {
Objects.toStringHelper(this)
MoreObjects.toStringHelper(this)
.add("fact", fact)
.add("dimension", dimension)
.toString
Expand Down
15 changes: 12 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,13 +123,13 @@
<!-- default properties-->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<snappy.version>1.1.2.6</snappy.version>
<hadoop.version>2.7.2</hadoop.version>
<hadoop.version>3.1.1.3.1.5.0-152</hadoop.version>
<httpclient.version>4.3.4</httpclient.version>
<httpcore.version>4.3-alpha1</httpcore.version>
<scala.binary.version>2.11</scala.binary.version>
<scala.version>2.11.8</scala.version>
<hadoop.deps.scope>compile</hadoop.deps.scope>
<spark.version>2.3.4</spark.version>
<spark.version>2.3.2.3.1.5.0-152</spark.version>
<spark.binary.version>2.3</spark.binary.version>
<spark.deps.scope>compile</spark.deps.scope>
<scala.deps.scope>compile</scala.deps.scope>
Expand Down Expand Up @@ -164,6 +164,15 @@
<enabled>true</enabled>
</releases>
</repository>
<repository>
<id>hdp</id>
<!-- This should be at top, it makes maven try the central repo first and then others and hence faster dep resolution -->
<name>hdp Repository</name>
<url>https://repo.hortonworks.com/content/groups/public/</url>
<releases>
<enabled>true</enabled>
</releases>
</repository>
</repositories>

<dependencyManagement>
Expand Down Expand Up @@ -548,7 +557,7 @@
</activation>
<properties>
<spark.binary.version>2.3</spark.binary.version>
<spark.version>2.3.4</spark.version>
<spark.version>2.3.2.3.1.5.0-152</spark.version>
<scala.binary.version>2.11</scala.binary.version>
<scala.version>2.11.8</scala.version>
</properties>
Expand Down
5 changes: 5 additions & 0 deletions processing/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@
</properties>

<dependencies>
<dependency>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
<version>3.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.carbondata</groupId>
<artifactId>carbondata-core</artifactId>
Expand Down