Merge pull request #1 from metamx/master

Update to latest master
apache · Oct 9, 2013 · adf6625 · adf6625
2 parents aa9aa49 + 3364b9a
commit adf6625
Show file tree

Hide file tree

Showing 375 changed files with 3,439 additions and 4,641 deletions.
diff --git a/build.sh b/build.sh
@@ -30,4 +30,4 @@ echo "For examples, see: "
 echo " "
 ls -1 examples/*/*sh
 echo " "
-echo "See also https://github.com/metamx/druid/wiki"
+echo "See also http://druid.io/docs/0.6.0/Home.html"
diff --git a/cassandra-storage/pom.xml b/cassandra-storage/pom.xml
@@ -33,15 +33,18 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.metamx.druid</groupId>
-            <artifactId>druid-server</artifactId>
-            <version>${project.parent.version}</version>
+            <groupId>io.druid</groupId>
+            <artifactId>druid-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.netflix.astyanax</groupId>
             <artifactId>astyanax</artifactId>
             <version>1.0.1</version>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
 
         <!-- Tests -->
         <dependency>

diff --git a/...cassandra/CassandraDataSegmentConfig.java → ...cassandra/CassandraDataSegmentConfig.java b/...cassandra/CassandraDataSegmentConfig.java → ...cassandra/CassandraDataSegmentConfig.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.segment.loading.cassandra;
+package io.druid.storage.cassandra;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

diff --git a/...cassandra/CassandraDataSegmentPuller.java → ...cassandra/CassandraDataSegmentPuller.java b/...cassandra/CassandraDataSegmentPuller.java → ...cassandra/CassandraDataSegmentPuller.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.segment.loading.cassandra;
+package io.druid.storage.cassandra;
 
 import com.google.common.io.Files;
 import com.google.inject.Inject;
@@ -28,10 +28,10 @@
 import com.netflix.astyanax.model.ColumnList;
 import com.netflix.astyanax.recipes.storage.ChunkedStorage;
 import com.netflix.astyanax.recipes.storage.ObjectMetadata;
-import io.druid.common.utils.CompressionUtils;
 import io.druid.segment.loading.DataSegmentPuller;
 import io.druid.segment.loading.SegmentLoadingException;
 import io.druid.timeline.DataSegment;
+import io.druid.utils.CompressionUtils;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;

diff --git a/...cassandra/CassandraDataSegmentPusher.java → ...cassandra/CassandraDataSegmentPusher.java b/...cassandra/CassandraDataSegmentPusher.java → ...cassandra/CassandraDataSegmentPusher.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.segment.loading.cassandra;
+package io.druid.storage.cassandra;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Joiner;
@@ -26,11 +26,11 @@
 import com.metamx.common.logger.Logger;
 import com.netflix.astyanax.MutationBatch;
 import com.netflix.astyanax.recipes.storage.ChunkedStorage;
-import io.druid.common.utils.CompressionUtils;
-import io.druid.segment.IndexIO;
+import io.druid.segment.SegmentUtils;
 import io.druid.segment.loading.DataSegmentPusher;
 import io.druid.segment.loading.DataSegmentPusherUtil;
 import io.druid.timeline.DataSegment;
+import io.druid.utils.CompressionUtils;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -57,7 +57,13 @@ public CassandraDataSegmentPusher(
 		this.jsonMapper=jsonMapper;
 	}
 
-	@Override
+  @Override
+  public String getPathForHadoop(String dataSource)
+  {
+    throw new UnsupportedOperationException("Cassandra storage does not support indexing via Hadoop");
+  }
+
+  @Override
 	public DataSegment push(final File indexFilesDir, DataSegment segment) throws IOException
 	{
 		log.info("Writing [%s] to C*", indexFilesDir);
@@ -71,7 +77,7 @@ public DataSegment push(final File indexFilesDir, DataSegment segment) throws IO
 		long indexSize = CompressionUtils.zip(indexFilesDir, compressedIndexFile);
 		log.info("Wrote compressed file [%s] to [%s]", compressedIndexFile.getAbsolutePath(), key);
 
-		int version = IndexIO.getVersionFromDir(indexFilesDir);
+		int version = SegmentUtils.getVersionFromDir(indexFilesDir);
 
 		try
 		{

diff --git a/...ading/cassandra/CassandraDruidModule.java → ...orage/cassandra/CassandraDruidModule.java b/...ading/cassandra/CassandraDruidModule.java → ...orage/cassandra/CassandraDruidModule.java
@@ -17,13 +17,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.segment.loading.cassandra;
+package io.druid.storage.cassandra;
 
 import com.fasterxml.jackson.databind.Module;
 import com.google.common.collect.ImmutableList;
 import com.google.inject.Binder;
 import com.google.inject.Key;
-import io.druid.guice.DruidBinders;
+import io.druid.guice.Binders;
 import io.druid.guice.JsonConfigProvider;
 import io.druid.guice.LazySingleton;
 import io.druid.guice.PolyBind;
@@ -45,7 +45,7 @@ public List<? extends Module> getJacksonModules()
   @Override
   public void configure(Binder binder)
   {
-    DruidBinders.dataSegmentPullerBinder(binder)
+    Binders.dataSegmentPullerBinder(binder)
                 .addBinding("c*")
                 .to(CassandraDataSegmentPuller.class)
                 .in(LazySingleton.class);
@@ -54,6 +54,6 @@ public void configure(Binder binder)
             .addBinding("c*")
             .to(CassandraDataSegmentPusher.class)
             .in(LazySingleton.class);
-    JsonConfigProvider.bind(binder, "druid.pusher", CassandraDataSegmentConfig.class);
+    JsonConfigProvider.bind(binder, "druid.storage", CassandraDataSegmentConfig.class);
   }
 }
diff --git a/...t/loading/cassandra/CassandraStorage.java → ...d/storage/cassandra/CassandraStorage.java b/...t/loading/cassandra/CassandraStorage.java → ...d/storage/cassandra/CassandraStorage.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.segment.loading.cassandra;
+package io.druid.storage.cassandra;
 
 import com.netflix.astyanax.AstyanaxContext;
 import com.netflix.astyanax.Keyspace;

diff --git a/cassandra-storage/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/cassandra-storage/src/main/resources/META-INF/services/io.druid.initialization.DruidModule
@@ -1 +1 @@
-io.druid.segment.loading.cassandra.CassandraDruidModule
+io.druid.storage.cassandra.CassandraDruidModule
diff --git a/common/src/main/java/io/druid/common/guava/Runnables.java b/common/src/main/java/io/druid/common/guava/Runnables.java
diff --git a/common/src/main/java/io/druid/common/utils/CompressionUtils.java b/common/src/main/java/io/druid/common/utils/CompressionUtils.java
diff --git a/common/src/main/java/io/druid/db/DbConnector.java b/common/src/main/java/io/druid/db/DbConnector.java
@@ -215,7 +215,7 @@ public void createRulesTable()
   public void createConfigTable()
   {
     if (config.get().isCreateTables()) {
-      createRuleTable(dbi, dbTables.get().getConfigTable());
+      createConfigTable(dbi, dbTables.get().getConfigTable());
     }
   }
 

diff --git a/common/src/main/java/io/druid/db/DbTablesConfig.java b/common/src/main/java/io/druid/db/DbTablesConfig.java
@@ -33,8 +33,9 @@ public static DbTablesConfig fromBase(String base)
     return new DbTablesConfig(base, null, null, null, null, null, null);
   }
 
-  @JsonProperty
-  @NotNull
+  private static String defaultBase = "druid";
+
+  @JsonProperty("base")
   private final String base;
 
   @JsonProperty("segments")
@@ -66,7 +67,7 @@ public DbTablesConfig(
       @JsonProperty("taskLock") String taskLockTable
   )
   {
-    this.base = base;
+    this.base = (base == null) ? defaultBase : base;
     this.segmentsTable = makeTableName(segmentsTable, "segments");
     this.rulesTable = makeTableName(rulesTable, "rules");
     this.configTable = makeTableName(configTable, "config");