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

Merge branch 'master' of github.com:metamx/druid

This commit is contained in:
Fangjin Yang 2013-03-13 15:45:21 -07:00
parent 16de004fdc f1175389c4
commit 60e75d21ce
13 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/pom.xml
View File

@ -28,7 +28,7 @@
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>0.3.20-SNAPSHOT</version> <version>0.3.21-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

2
common/pom.xml
View File

@ -28,7 +28,7 @@
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>0.3.20-SNAPSHOT</version> <version>0.3.21-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

9
common/src/main/java/com/metamx/druid/config/ConfigManager.java
View File

@ -38,6 +38,7 @@ public class ConfigManager
private final ScheduledExecutorService exec; private final ScheduledExecutorService exec;
private final ConcurrentMap<String, ConfigHolder> watchedConfigs; private final ConcurrentMap<String, ConfigHolder> watchedConfigs;
private final String selectStatement; private final String selectStatement;
private final String insertStatement;
private volatile ConfigManager.PollingCallable poller; private volatile ConfigManager.PollingCallable poller;
@ -49,6 +50,10 @@ public class ConfigManager
this.exec = ScheduledExecutors.fixed(1, "config-manager-%s"); this.exec = ScheduledExecutors.fixed(1, "config-manager-%s");
this.watchedConfigs = Maps.newConcurrentMap(); this.watchedConfigs = Maps.newConcurrentMap();
this.selectStatement = String.format("SELECT payload FROM %s WHERE name = :name", config.getConfigTable()); this.selectStatement = String.format("SELECT payload FROM %s WHERE name = :name", config.getConfigTable());
insertStatement = String.format(
"INSERT INTO %s (name, payload) VALUES (:name, :payload) ON DUPLICATE KEY UPDATE payload = :payload",
config.getConfigTable()
);
} }
@LifecycleStart @LifecycleStart
@ -192,9 +197,7 @@ public class ConfigManager
@Override @Override
public Void withHandle(Handle handle) throws Exception public Void withHandle(Handle handle) throws Exception
{ {
handle.createStatement( handle.createStatement(insertStatement)
"INSERT INTO %s (name, payload) VALUES (:name, :payload) ON DUPLICATE KEY UPDATE payload = :payload"
)
.bind("name", key) .bind("name", key)
.bind("payload", newBytes) .bind("payload", newBytes)
.execute(); .execute();

4
druid-services/pom.xml
View File

@ -24,11 +24,11 @@
<artifactId>druid-services</artifactId> <artifactId>druid-services</artifactId>
<name>druid-services</name> <name>druid-services</name>
<description>druid-services</description> <description>druid-services</description>
<version>0.3.20-SNAPSHOT</version> <version>0.3.21-SNAPSHOT</version>
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>0.3.20-SNAPSHOT</version> <version>0.3.21-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

2
examples/pom.xml
View File

@ -28,7 +28,7 @@
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>0.3.20-SNAPSHOT</version> <version>0.3.21-SNAPSHOT</version>
</parent> </parent>
<modules> <modules>

2
examples/rand/pom.xml
View File

@ -9,7 +9,7 @@
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid-examples</artifactId> <artifactId>druid-examples</artifactId>
<version>0.3.20-SNAPSHOT</version> <version>0.3.21-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

2
examples/twitter/pom.xml
View File

@ -9,7 +9,7 @@
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid-examples</artifactId> <artifactId>druid-examples</artifactId>
<version>0.3.20-SNAPSHOT</version> <version>0.3.21-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

2
index-common/pom.xml
View File

@ -28,7 +28,7 @@
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>0.3.20-SNAPSHOT</version> <version>0.3.21-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

2
indexer/pom.xml
View File

@ -28,7 +28,7 @@
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>0.3.20-SNAPSHOT</version> <version>0.3.21-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

2
merger/pom.xml
View File

@ -28,7 +28,7 @@
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>0.3.20-SNAPSHOT</version> <version>0.3.21-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

2
pom.xml
View File

@ -23,7 +23,7 @@
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>0.3.20-SNAPSHOT</version> <version>0.3.21-SNAPSHOT</version>
<name>druid</name> <name>druid</name>
<description>druid</description> <description>druid</description>
<scm> <scm>

2
realtime/pom.xml
View File

@ -28,7 +28,7 @@
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>0.3.20-SNAPSHOT</version> <version>0.3.21-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>

2
server/pom.xml
View File

@ -28,7 +28,7 @@
<parent> <parent>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>0.3.20-SNAPSHOT</version> <version>0.3.21-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>