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

cleanup to prepare for next release

This commit is contained in:
fjy 2013-11-07 15:55:51 -08:00
parent 760321c857
commit 084c90aa19
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/config/historical/runtime.properties
View File

@ -4,7 +4,7 @@ druid.port=8081
druid.zk.service.host=localhost
druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.2-SNAPSHOT"]
druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.2"]
# Dummy read only AWS account (used to download example data)
druid.s3.secretKey=QyyfVZ7llSiRg6Qcrql1eEUG7buFpAK6T6engr1b

2
examples/config/realtime/runtime.properties
View File

@ -4,7 +4,7 @@ druid.port=8083
druid.zk.service.host=localhost
druid.extensions.coordinates=["io.druid.extensions:druid-examples:0.6.2-SNAPSHOT"]
druid.extensions.coordinates=["io.druid.extensions:druid-examples:0.6.2"]
druid.db.connector.connectURI=jdbc\:mysql\://localhost\:3306/druid
druid.db.connector.user=druid

8
indexing-service/src/main/java/io/druid/indexing/common/index/EventReceiverFirehoseFactory.java
View File

@ -84,7 +84,7 @@ public class EventReceiverFirehoseFactory implements FirehoseFactory
Preconditions.checkNotNull(firehoseId, "firehoseId")
);
} else {
this.serviceName = Preconditions.checkNotNull(serviceName, "serviceName");
this.serviceName = serviceName;
}
this.config = config;
@ -120,11 +120,7 @@ public class EventReceiverFirehoseFactory implements FirehoseFactory
@JsonProperty("firehoseId")
public String getFirehoseId()
{
if (config != null) {
return serviceName.replaceFirst(String.format("%s:", config.getFirehoseIdPrefix()), "");
}
return null;
return serviceName.replaceFirst(String.format("%s:", config.getFirehoseIdPrefix()), "");
}
@JsonProperty