Rename io.druid to org.apache.druid. (apache#6266)

* Rename io.druid to org.apache.druid.

* Fix META-INF files and remove some benchmark results.

* MonitorsConfig update for metrics package migration.

* Reorder some dimensions in inner queries for some reason.

* Fix protobuf tests.

.travis.yml

@@ -2,7 +2,7 @@ language: java
 
 # On 12-12-2017, Travis updated their trusty image, which caused integration tests to fail.
 # The group: config instructs Travis to use the previous trusty image.
-# Please see https://github.com/druid-io/druid/pull/5155 for more information.
+# Please see https://github.com/apache/incubator-druid/pull/5155 for more information.
 sudo: false
 dist: trusty
 group: deprecated-2017Q4

CONTRIBUTING.md

@@ -4,15 +4,15 @@ When submitting a pull request (PR), please use the following guidelines:
 
 - Make sure your code respects existing formatting conventions. In general, follow
   the same coding style as the code that you are modifying.
-- For Intellij you can import our code style settings xml: [druid_intellij_formatting.xml](https://github.com/druid-io/druid/raw/master/druid_intellij_formatting.xml).
-- For Eclipse you can import our code style settings xml: [eclipse_formatting.xml](https://github.com/druid-io/druid/raw/master/eclipse_formatting.xml).
+- For Intellij you can import our code style settings xml: [druid_intellij_formatting.xml](https://github.com/apache/incubator-druid/raw/master/druid_intellij_formatting.xml).
+- For Eclipse you can import our code style settings xml: [eclipse_formatting.xml](https://github.com/apache/incubator-druid/raw/master/eclipse_formatting.xml).
 - Do add/update documentation appropriately for the change you are making.
 - If you are introducing a new feature you may want to first write about your idea
   for feedback to [[email protected]](https://lists.apache.org/[email protected]).
   Non-trivial features should include unit tests covering the new functionality.
 - Bugfixes should include a unit test or integration test reproducing the issue.
 - Do not use author tags/information in the code.
-- Always include license header on each java file your create. See [this example](https://github.com/druid-io/druid/blob/master/common/src/main/java/io/druid/metadata/PasswordProvider.java)
+- Always include license header on each java file your create. See [this example](https://github.com/apache/incubator-druid/blob/master/common/src/main/java/org/apache/druid/metadata/PasswordProvider.java)
 - Try to keep pull requests short and submit separate ones for unrelated
   features, but feel free to combine simple bugfixes/tests into one pull request.
 - Keep the number of commits small and combine commits for related changes.
@@ -22,9 +22,9 @@ When submitting a pull request (PR), please use the following guidelines:
 
 ## GitHub Workflow
 
-1. Fork the druid-io/druid repository into your GitHub account
+1. Fork the apache/incubator-druid repository into your GitHub account
 
-    https://github.com/druid-io/druid/fork
+    https://github.com/apache/incubator-druid/fork
 
 1. Clone your fork of the GitHub repository
 
@@ -37,7 +37,7 @@ When submitting a pull request (PR), please use the following guidelines:
 1. Add a remote to keep up with upstream changes
 
     ```
-    git remote add upstream https://github.com/druid-io/druid.git
+    git remote add upstream https://github.com/apache/incubator-druid.git
     ```
 
     If you already have a copy, fetch upstream changes
@@ -84,7 +84,7 @@ When submitting a pull request (PR), please use the following guidelines:
     If you recently pushed your changes GitHub will automatically pop up a
     `Compare & pull request` button for any branches you recently pushed to. If you
     click that button it will automatically offer you to submit your pull-request
-    to the druid-io/druid repository.
+    to the apache/incubator-druid repository.
 
     - Give your pull-request a meaningful title.
     - In the description, explain your changes and the problem they are solving.

INTELLIJ_SETUP.md

@@ -33,7 +33,7 @@ You can configure application definitions in XML for import into IntelliJ. Below
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Historical" type="Application" factoryName="Application">
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <option name="MAIN_CLASS_NAME" value="io.druid.cli.Main" />
+    <option name="MAIN_CLASS_NAME" value="org.apache.druid.cli.Main" />
     <option name="VM_PARAMETERS" value="-server -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Xmx2G -XX:MaxJavaStackTraceDepth=9999 -XX:+UseG1GC -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintAdaptiveSizePolicy -XX:+PrintReferenceGC -verbose:gc -XX:+PrintFlagsFinal -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager -Dorg.jboss.logging.provider=slf4j -Dlog4j.configurationFile=$PROJECT_DIR$/common/src/main/resources/log4j2.debug.xml -Ddruid.host=localhost -Ddruid.service=historical -Ddruid.server.maxSize=10000000000 -Ddruid.processing.buffer.sizeBytes=100000000 -Ddruid.extensions.hadoopDependenciesDir=$PROJECT_DIR$/distribution/target/hadoop-dependencies/ -Ddruid.extensions.directory=$PROJECT_DIR$/distribution/target/extensions/ -Ddruid.extensions.loadList=[\&quot;druid-s3-extensions\&quot;,\&quot;druid-histogram\&quot;,\&quot;mysql-metadata-storage\&quot;] -Ddruid.historical.cache.useCache=false -Ddruid.historical.cache.populateCache=false -Ddruid.segmentCache.locations=&quot;[{\&quot;path\&quot;:\&quot;/tmp/druid/indexCache\&quot;,\&quot;maxSize\&quot;:10000000000}]&quot; -Ddruid.zk.service.host=localhost -Ddruid.processing.numThreads=1 -Ddruid.server.http.numThreads=50 -Ddruid.announcer.type=batch -Ddruid.emitter=logging" />
     <option name="PROGRAM_PARAMETERS" value="server historical" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
@@ -54,7 +54,7 @@ You can configure application definitions in XML for import into IntelliJ. Below
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Coordinator" type="Application" factoryName="Application">
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <option name="MAIN_CLASS_NAME" value="io.druid.cli.Main" />
+    <option name="MAIN_CLASS_NAME" value="org.apache.druid.cli.Main" />
     <option name="VM_PARAMETERS" value="-server -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Xmx256M -Xmx256M -XX:+UseG1GC -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintAdaptiveSizePolicy -XX:+PrintReferenceGC -verbose:gc -XX:+PrintFlagsFinal -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager -Dorg.jboss.logging.provider=slf4j -Ddruid.host=localhost -Ddruid.service=coordinator -Ddruid.extensions.directory=$PROJECT_DIR$/distribution/target/extensions/ -Ddruid.extensions.loadList=[\&quot;druid-s3-extensions\&quot;,\&quot;druid-histogram\&quot;,\&quot;mysql-metadata-storage\&quot;] -Ddruid.zk.service.host=localhost -Ddruid.metadata.storage.type=mysql -Ddruid.metadata.storage.connector.connectURI=&quot;jdbc:mysql://localhost:3306/druid&quot; -Ddruid.metadata.storage.connector.user=druid -Ddruid.metadata.storage.connector.password=diurd -Ddruid.announcer.type=batch -Ddruid.emitter=logging -Ddruid.coordinator.period=PT10S -Ddruid.coordinator.startDelay=PT5S" />
     <option name="PROGRAM_PARAMETERS" value="server coordinator" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/apache/incubator-druid.svg?branch=master)](https://travis-ci.org/apache/incubator-druid) [![Inspections Status](https://img.shields.io/teamcity/http/teamcity.jetbrains.com/s/OpenSourceProjects_Druid_Inspections.svg?label=TeamCity%20inspections)](https://teamcity.jetbrains.com/viewType.html?buildTypeId=OpenSourceProjects_Druid_Inspections) [![Coverage Status](https://coveralls.io/repos/druid-io/druid/badge.svg?branch=master)](https://coveralls.io/r/druid-io/druid?branch=master) [![IRC#druid-dev](https://img.shields.io/badge/IRC-druid--dev-blue.svg)](https://webchat.freenode.net?channels=druid-dev)
+[![Build Status](https://travis-ci.org/apache/incubator-druid.svg?branch=master)](https://travis-ci.org/apache/incubator-druid) [![Inspections Status](https://img.shields.io/teamcity/http/teamcity.jetbrains.com/s/OpenSourceProjects_Druid_Inspections.svg?label=TeamCity%20inspections)](https://teamcity.jetbrains.com/viewType.html?buildTypeId=OpenSourceProjects_Druid_Inspections) [![Coverage Status](https://coveralls.io/repos/apache/incubator-druid/badge.svg?branch=master)](https://coveralls.io/r/apache/incubator-druid?branch=master) [![IRC#druid-dev](https://img.shields.io/badge/IRC-druid--dev-blue.svg)](https://webchat.freenode.net?channels=druid-dev)
 
 ## Apache Druid (incubating)
 
@@ -28,7 +28,7 @@ You can get started with Druid with our [quickstart](http://druid.io/docs/latest
 
 ### Reporting Issues
 
-If you find any bugs, please file a [GitHub issue](https://github.com/druid-io/druid/issues).
+If you find any bugs, please file a [GitHub issue](https://github.com/apache/incubator-druid/issues).
 
 ### Community
 

api/pom.xml

@@ -26,14 +26,14 @@
     <description>Druid Extensions API</description>
 
     <parent>
-        <groupId>io.druid</groupId>
+        <groupId>org.apache.druid</groupId>
         <artifactId>druid</artifactId>
         <version>0.13.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
         <dependency>
-            <groupId>io.druid</groupId>
+            <groupId>org.apache.druid</groupId>
             <artifactId>java-util</artifactId>
             <version>${project.parent.version}</version>
                 <exclusions>

api/src/main/java/io/druid/cli/CliCommandCreator.java → api/src/main/java/org/apache/druid/cli/CliCommandCreator.java

@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package io.druid.cli;
+package org.apache.druid.cli;
 
 import io.airlift.airline.Cli;
-import io.druid.guice.annotations.ExtensionPoint;
+import org.apache.druid.guice.annotations.ExtensionPoint;
 
 /**
  */

api/src/main/java/io/druid/data/input/ByteBufferInputRowParser.java → api/src/main/java/org/apache/druid/data/input/ByteBufferInputRowParser.java

@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package io.druid.data.input;
+package org.apache.druid.data.input;
 
-import io.druid.data.input.impl.InputRowParser;
-import io.druid.data.input.impl.ParseSpec;
+import org.apache.druid.data.input.impl.InputRowParser;
+import org.apache.druid.data.input.impl.ParseSpec;
 
 import java.nio.ByteBuffer;
 

api/src/main/java/io/druid/data/input/Committer.java → api/src/main/java/org/apache/druid/data/input/Committer.java

@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package io.druid.data.input;
+package org.apache.druid.data.input;
 
-import io.druid.guice.annotations.ExtensionPoint;
+import org.apache.druid.guice.annotations.ExtensionPoint;
 
 /**
  * Committer includes a Runnable and a Jackson-serialized metadata object containing the offset

api/src/main/java/io/druid/data/input/FiniteFirehoseFactory.java → api/src/main/java/org/apache/druid/data/input/FiniteFirehoseFactory.java

@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package io.druid.data.input;
+package org.apache.druid.data.input;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.druid.data.input.impl.InputRowParser;
+import org.apache.druid.data.input.impl.InputRowParser;
 
 import java.io.IOException;
 import java.util.stream.Stream;

api/src/main/java/io/druid/data/input/Firehose.java → api/src/main/java/org/apache/druid/data/input/Firehose.java

@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package io.druid.data.input;
+package org.apache.druid.data.input;
 
-import io.druid.guice.annotations.ExtensionPoint;
+import org.apache.druid.guice.annotations.ExtensionPoint;
 
 import javax.annotation.Nullable;
 import java.io.Closeable;

api/src/main/java/io/druid/data/input/FirehoseFactory.java → api/src/main/java/org/apache/druid/data/input/FirehoseFactory.java

@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package io.druid.data.input;
+package org.apache.druid.data.input;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import io.druid.data.input.impl.InputRowParser;
-import io.druid.data.input.impl.prefetch.PrefetchableTextFilesFirehoseFactory;
-import io.druid.guice.annotations.ExtensionPoint;
-import io.druid.java.util.common.parsers.ParseException;
+import org.apache.druid.data.input.impl.InputRowParser;
+import org.apache.druid.data.input.impl.prefetch.PrefetchableTextFilesFirehoseFactory;
+import org.apache.druid.guice.annotations.ExtensionPoint;
+import org.apache.druid.java.util.common.parsers.ParseException;
 
 import javax.annotation.Nullable;
 import java.io.File;

api/src/main/java/io/druid/data/input/FirehoseFactoryV2.java → api/src/main/java/org/apache/druid/data/input/FirehoseFactoryV2.java

@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package io.druid.data.input;
+package org.apache.druid.data.input;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import io.druid.data.input.impl.InputRowParser;
-import io.druid.guice.annotations.ExtensionPoint;
-import io.druid.java.util.common.parsers.ParseException;
+import org.apache.druid.data.input.impl.InputRowParser;
+import org.apache.druid.guice.annotations.ExtensionPoint;
+import org.apache.druid.java.util.common.parsers.ParseException;
 
 import java.io.IOException;
 

api/src/main/java/io/druid/data/input/FirehoseV2.java → api/src/main/java/org/apache/druid/data/input/FirehoseV2.java

@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package io.druid.data.input;
+package org.apache.druid.data.input;
 
-import io.druid.guice.annotations.ExtensionPoint;
+import org.apache.druid.guice.annotations.ExtensionPoint;
 
 import java.io.Closeable;
 

api/src/main/java/io/druid/data/input/InputRow.java → api/src/main/java/org/apache/druid/data/input/InputRow.java

@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package io.druid.data.input;
+package org.apache.druid.data.input;
 
-import io.druid.guice.annotations.ExtensionPoint;
+import org.apache.druid.guice.annotations.ExtensionPoint;
 
 import java.util.List;
 

api/src/main/java/io/druid/data/input/InputSplit.java → api/src/main/java/org/apache/druid/data/input/InputSplit.java

@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package io.druid.data.input;
+package org.apache.druid.data.input;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * Input unit for distributed batch ingestion. Used in {@link FiniteFirehoseFactory}.
- * An {@link InputSplit} represents the input data processed by a {@code io.druid.indexing.common.task.Task}.
+ * An {@link InputSplit} represents the input data processed by a {@code org.apache.druid.indexing.common.task.Task}.
  */
 public class InputSplit<T>
 {

api/src/main/java/io/druid/data/input/MapBasedInputRow.java → api/src/main/java/org/apache/druid/data/input/MapBasedInputRow.java

@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package io.druid.data.input;
+package org.apache.druid.data.input;
 
-import io.druid.guice.annotations.PublicApi;
-import io.druid.java.util.common.DateTimes;
+import org.apache.druid.guice.annotations.PublicApi;
+import org.apache.druid.java.util.common.DateTimes;
 import org.joda.time.DateTime;
 
 import java.util.List;

api/src/main/java/io/druid/data/input/MapBasedRow.java → api/src/main/java/org/apache/druid/data/input/MapBasedRow.java

@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package io.druid.data.input;
+package org.apache.druid.data.input;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.druid.guice.annotations.PublicApi;
-import io.druid.java.util.common.DateTimes;
+import org.apache.druid.guice.annotations.PublicApi;
+import org.apache.druid.java.util.common.DateTimes;
 import org.joda.time.DateTime;
 
 import java.util.List;

api/src/main/java/io/druid/data/input/Row.java → api/src/main/java/org/apache/druid/data/input/Row.java

@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package io.druid.data.input;
+package org.apache.druid.data.input;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import io.druid.guice.annotations.PublicApi;
+import org.apache.druid.guice.annotations.PublicApi;
 import org.joda.time.DateTime;
 
 import java.util.List;

api/src/main/java/io/druid/data/input/Rows.java → api/src/main/java/org/apache/druid/data/input/Rows.java

@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package io.druid.data.input;
+package org.apache.druid.data.input;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.Maps;
 import com.google.common.primitives.Longs;
-import io.druid.common.config.NullHandling;
-import io.druid.java.util.common.StringUtils;
-import io.druid.java.util.common.parsers.ParseException;
+import org.apache.druid.common.config.NullHandling;
+import org.apache.druid.java.util.common.StringUtils;
+import org.apache.druid.java.util.common.parsers.ParseException;
 
 import javax.annotation.Nullable;
 import java.util.ArrayList;