merge from master

emaxerrno · Nov 17, 2014 · 0c2d064 · 0c2d064
2 parents b5d6638 + 0b45942
commit 0c2d064
Show file tree

Hide file tree

Showing 353 changed files with 11,104 additions and 3,983 deletions.
diff --git a/common/pom.xml b/common/pom.xml
@@ -46,9 +46,8 @@
             <artifactId>commons-codec</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-dbcp</groupId>
-            <artifactId>commons-dbcp</artifactId>
-            <version>1.4</version>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-dbcp2</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-pool</groupId>

diff --git a/common/src/main/java/io/druid/common/config/ConfigManager.java b/common/src/main/java/io/druid/common/config/ConfigManager.java
@@ -27,8 +27,8 @@
 import com.metamx.common.lifecycle.LifecycleStart;
 import com.metamx.common.lifecycle.LifecycleStop;
 import com.metamx.common.logger.Logger;
-import io.druid.db.DbConnector;
-import io.druid.db.DbTablesConfig;
+import io.druid.metadata.MetadataStorageConnector;
+import io.druid.metadata.MetadataStorageTablesConfig;
 import org.joda.time.Duration;
 
 import java.util.Arrays;
@@ -48,7 +48,7 @@ public class ConfigManager
   private final Object lock = new Object();
   private boolean started = false;
 
-  private final DbConnector dbConnector;
+  private final MetadataStorageConnector dbConnector;
   private final Supplier<ConfigManagerConfig> config;
 
   private final ScheduledExecutorService exec;
@@ -58,7 +58,7 @@ public class ConfigManager
   private volatile ConfigManager.PollingCallable poller;
 
   @Inject
-  public ConfigManager(DbConnector dbConnector, Supplier<DbTablesConfig> dbTables, Supplier<ConfigManagerConfig> config)
+  public ConfigManager(MetadataStorageConnector dbConnector, Supplier<MetadataStorageTablesConfig> dbTables, Supplier<ConfigManagerConfig> config)
   {
     this.dbConnector = dbConnector;
     this.config = config;

diff --git a/common/src/main/java/io/druid/common/utils/SerializerUtils.java b/common/src/main/java/io/druid/common/utils/SerializerUtils.java
@@ -21,6 +21,7 @@
 
 import com.google.common.io.ByteStreams;
 import com.google.common.io.OutputSupplier;
+import com.google.common.primitives.Ints;
 import io.druid.collections.IntList;
 
 import java.io.IOException;
@@ -262,4 +263,9 @@ public float[] readFloats(InputStream in) throws IOException
 
     return retVal;
   }
+
+  public int getSerializedStringByteSize(String str)
+  {
+    return Ints.BYTES + str.getBytes(UTF8).length;
+  }
 }