Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Hadoop 2.3.0

This commit is contained in:
nishantmonu51 2014-03-26 11:43:31 +05:30
parent 60c204afeb
commit a9a6682a0e
6 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hdfs-storage/pom.xml
View File

@ -52,7 +52,7 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
<artifactId>hadoop-client</artifactId>
<scope>compile</scope>
</dependency>
<dependency>

2
indexing-hadoop/pom.xml
View File

@ -67,7 +67,7 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
<artifactId>hadoop-client</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>

2
indexing-service/pom.xml
View File

@ -71,7 +71,7 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
<artifactId>hadoop-client</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

2
indexing-service/src/main/java/io/druid/indexing/common/task/HadoopIndexTask.java
View File

@ -66,7 +66,7 @@ public class HadoopIndexTask extends AbstractTask
extensionsConfig = Initialization.makeStartupInjector().getInstance(ExtensionsConfig.class);
}
private static String defaultHadoopCoordinates = "org.apache.hadoop:hadoop-core:1.0.3";
private static String defaultHadoopCoordinates = "org.apache.hadoop:hadoop-client:2.3.0";
@JsonIgnore
private final HadoopDruidIndexerSchema schema;
@JsonIgnore

6
pom.xml
View File

@ -373,7 +373,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>2.4.0a</version>
<version>2.5.0</version>
</dependency>
<dependency>
<groupId>io.tesla.aether</groupId>
@ -402,8 +402,8 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
<version>1.0.3</version>
<artifactId>hadoop-client</artifactId>
<version>2.3.0</version>
<scope>provided</scope>
</dependency>

10
processing/src/test/java/io/druid/data/input/ProtoTestEventWrapper.java
View File

@ -23,6 +23,7 @@
package io.druid.data.input;
import com.google.protobuf.AbstractMessage;
import com.google.protobuf.UnknownFieldSet;
public final class ProtoTestEventWrapper {
private ProtoTestEventWrapper() {}
@ -85,7 +86,13 @@ public final class ProtoTestEventWrapper {
public ProtoTestEvent getDefaultInstanceForType() {
return defaultInstance;
}
@Override
public UnknownFieldSet getUnknownFields()
{
return UnknownFieldSet.getDefaultInstance();
}
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return ProtoTestEventWrapper.internal_static_prototest_ProtoTestEvent_descriptor;
@ -1049,6 +1056,7 @@ public final class ProtoTestEventWrapper {
new com.google.protobuf.Descriptors.FileDescriptor[] {
}, assigner);
}
// @@protoc_insertion_point(outer_class_scope)
}