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

Jump to bottom

HIVE-23980 Shade guava from existing Hive versions #120

Open
wants to merge 1 commit into
base: branch-2.3-criteo
Choose a base branch
from
Open

HIVE-23980 Shade guava from existing Hive versions #120

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
4 changes: 2 additions & 2 deletions common/src/java/org/apache/hadoop/hive/ql/log/PerfLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,11 +207,11 @@ public Long getDuration(String method) {
}


public ImmutableMap<String, Long> getStartTimes() {
public Map<String, Long> getStartTimes() {
return ImmutableMap.copyOf(startTimes);
}

public ImmutableMap<String, Long> getEndTimes() {
public Map<String, Long> getEndTimes() {
return ImmutableMap.copyOf(endTimes);
}

Expand Down
10 changes: 2 additions & 8 deletions itests/qtest-accumulo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,6 @@
<artifactId>hive-contrib</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.apache.hive</groupId>
<artifactId>hive-exec</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
Expand Down Expand Up @@ -89,8 +83,8 @@
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.apache.hive</groupId>
<artifactId>hive-exec</artifactId>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand Down
6 changes: 6 additions & 0 deletions itests/qtest-spark/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,12 @@
<artifactId>hive-it-util</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
Expand Down
10 changes: 10 additions & 0 deletions ql/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,6 +878,8 @@
<include>org.apache.orc:orc-core</include>
<include>org.apache.orc:orc-tools</include>
<include>joda-time:joda-time</include>
<include>org.apache.calcite:*</include>
<include>org.apache.calcite.avatica:avatica</include>
</includes>
</artifactSet>
<relocations>
Expand All @@ -889,6 +891,14 @@
<pattern>org.objenesis</pattern>
<shadedPattern>org.apache.hive.org.objenesis</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.common</pattern>
<shadedPattern>org.apache.hive.com.google.common</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.thirdparty.publicsuffix</pattern>
<shadedPattern>org.apache.hive.com.google.thirdparty.publicsuffix</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
Expand Down
7 changes: 3 additions & 4 deletions ql/src/java/org/apache/hadoop/hive/ql/QueryDisplay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
*/
package org.apache.hadoop.hive.ql;

import com.google.common.collect.ImmutableMap;
import org.apache.hadoop.hive.common.LogUtils;
import org.apache.hadoop.hive.ql.exec.Task;
import org.apache.hadoop.hive.ql.exec.TaskResult;
Expand Down Expand Up @@ -308,7 +307,7 @@ public synchronized Map<String, Long> getHmsTimings(Phase phase) {
* @param phase phase of query
* @param hmsTimings map of HMS Client method-calls and duration in miliseconds, during given phase.
*/
public synchronized void setHmsTimings(Phase phase, ImmutableMap<String, Long> hmsTimings) {
public synchronized void setHmsTimings(Phase phase, Map<String, Long> hmsTimings) {
hmsTimingMap.put(phase, hmsTimings);
}

Expand All @@ -324,7 +323,7 @@ public synchronized Map<String, Long> getPerfLogStarts(Phase phase) {
* @param phase phase of query
* @param perfLogStarts map of PerfLogger call-trace name and start time in miliseconds, during given phase.
*/
public synchronized void setPerfLogStarts(Phase phase, ImmutableMap<String, Long> perfLogStarts) {
public synchronized void setPerfLogStarts(Phase phase, Map<String, Long> perfLogStarts) {
perfLogStartMap.put(phase, perfLogStarts);
}

Expand All @@ -340,7 +339,7 @@ public synchronized Map<String, Long> getPerfLogEnds(Phase phase) {
* @param phase phase of query
* @param perfLogEnds map of PerfLogger call-trace name and end time in miliseconds, during given phase.
*/
public synchronized void setPerfLogEnds(Phase phase, ImmutableMap<String, Long> perfLogEnds) {
public synchronized void setPerfLogEnds(Phase phase, Map<String, Long> perfLogEnds) {
perfLogEndMap.put(phase, perfLogEnds);
}

Expand Down