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

Rename io.druid to org.apache.druid. (#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.
This commit is contained in:
Gian Merlino 2018-08-30 09:56:26 -07:00 committed by GitHub
parent 1fae6513e1
commit 431d3d8497
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3912 changed files with 24785 additions and 25115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/inspectionProfiles/Druid.xml
View File

@ -63,7 +63,7 @@
<inspection_tool class="JavadocReference" enabled="true" level="ERROR" enabled_by_default="true" />
<inspection_tool class="JsonStandardCompliance" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="MalformedFormatString" enabled="true" level="ERROR" enabled_by_default="true">
<option name="additionalClasses" value="io.druid.java.util.common.StringUtils,io.druid.java.util.common.logger.Logger" />
<option name="additionalClasses" value="org.apache.druid.java.util.common.StringUtils,org.apache.druid.java.util.common.logger.Logger" />
<option name="additionalMethods" value="trace,debug,info,warn,error,wtf,format,nonStrictFormat" />
</inspection_tool>
<inspection_tool class="MalformedRegex" enabled="true" level="ERROR" enabled_by_default="true" />

18
.idea/misc.xml
View File

@ -8,18 +8,18 @@
<item index="3" class="java.lang.String" itemvalue="com.google.inject.Inject" />
<item index="4" class="java.lang.String" itemvalue="com.google.inject.Provides" />
<item index="5" class="java.lang.String" itemvalue="io.airlift.airline.Command" />
<item index="6" class="java.lang.String" itemvalue="io.druid.annotations.UsedByJUnitParamsRunner" />
<item index="7" class="java.lang.String" itemvalue="io.druid.annotations.UsedInGeneratedCode" />
<item index="8" class="java.lang.String" itemvalue="io.druid.guice.annotations.ExtensionPoint" />
<item index="9" class="java.lang.String" itemvalue="io.druid.guice.annotations.PublicApi" />
<item index="10" class="java.lang.String" itemvalue="io.druid.java.util.common.lifecycle.LifecycleStart" />
<item index="11" class="java.lang.String" itemvalue="io.druid.java.util.common.lifecycle.LifecycleStop" />
<item index="6" class="java.lang.String" itemvalue="org.apache.druid.annotations.UsedByJUnitParamsRunner" />
<item index="7" class="java.lang.String" itemvalue="org.apache.druid.annotations.UsedInGeneratedCode" />
<item index="8" class="java.lang.String" itemvalue="org.apache.druid.guice.annotations.ExtensionPoint" />
<item index="9" class="java.lang.String" itemvalue="org.apache.druid.guice.annotations.PublicApi" />
<item index="10" class="java.lang.String" itemvalue="org.apache.druid.java.util.common.lifecycle.LifecycleStart" />
<item index="11" class="java.lang.String" itemvalue="org.apache.druid.java.util.common.lifecycle.LifecycleStop" />
<item index="12" class="java.lang.String" itemvalue="javax.inject.Inject" />
<item index="13" class="java.lang.String" itemvalue="org.openjdk.jmh.annotations.Benchmark" />
</list>
<pattern value="io.druid.cli.GuiceRunnable" hierarchically="true" method="run" />
<pattern value="io.druid.cli.GuiceRunnable" hierarchically="true" />
<pattern value="io.druid.initialization.DruidModule" hierarchically="true" method="getJacksonModules" />
<pattern value="org.apache.druid.cli.GuiceRunnable" hierarchically="true" method="run" />
<pattern value="org.apache.druid.cli.GuiceRunnable" hierarchically="true" />
<pattern value="org.apache.druid.initialization.DruidModule" hierarchically="true" method="getJacksonModules" />
<writeAnnotations>
<writeAnnotation name="com.fasterxml.jackson.annotation.JacksonInject" />
<writeAnnotation name="com.fasterxml.jackson.annotation.JsonProperty" />

2
.idea/scopes/NonGeneratedFiles.xml
View File

@ -1,3 +1,3 @@
<component name="DependencyValidationManager">
<scope name="NonGeneratedFiles" pattern="(src:*..*||test:*..*)&amp;&amp;!test[druid-protobuf-extensions]:io.druid.data.input.protobuf.ProtoTestEventWrapper" />
<scope name="NonGeneratedFiles" pattern="(src:*..*||test:*..*)&amp;&amp;!test[druid-protobuf-extensions]:org.apache.druid.data.input.protobuf.ProtoTestEventWrapper" />
</component>

2
.travis.yml
View File

@ -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

14
CONTRIBUTING.md
View File

@ -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 [dev@druid.apache.org](https://lists.apache.org/list.html?dev@druid.apache.org).
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.

4
INTELLIJ_SETUP.md
View File

@ -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$" />

4
README.md
View File

@ -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

4
api/pom.xml
View File

@ -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>

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

@ -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;
/**
*/

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

@ -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;

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

@ -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

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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>
{

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

12
api/src/main/java/io/druid/data/input/impl/AbstractTextFilesFirehoseFactory.java → api/src/main/java/org/apache/druid/data/input/impl/AbstractTextFilesFirehoseFactory.java
View File

@ -17,15 +17,15 @@
* under the License.
*/
package io.druid.data.input.impl;
package org.apache.druid.data.input.impl;
import com.google.common.base.Preconditions;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import io.druid.data.input.FiniteFirehoseFactory;
import io.druid.data.input.Firehose;
import io.druid.data.input.InputSplit;
import io.druid.java.util.common.logger.Logger;
import org.apache.druid.data.input.FiniteFirehoseFactory;
import org.apache.druid.data.input.Firehose;
import org.apache.druid.data.input.InputSplit;
import org.apache.druid.java.util.common.logger.Logger;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.LineIterator;
@ -118,7 +118,7 @@ public abstract class AbstractTextFilesFirehoseFactory<T>
/**
* Initialize objects to be read by this firehose. Since firehose factories are constructed whenever
* io.druid.indexing.common.task.Task objects are deserialized, actual initialization of objects is deferred
* org.apache.druid.indexing.common.task.Task objects are deserialized, actual initialization of objects is deferred
* until {@link #connect(StringInputRowParser, File)} is called.
*
* @return a collection of initialized objects.

6
api/src/main/java/io/druid/data/input/impl/CSVParseSpec.java → api/src/main/java/org/apache/druid/data/input/impl/CSVParseSpec.java
View File

@ -17,13 +17,13 @@
* under the License.
*/
package io.druid.data.input.impl;
package org.apache.druid.data.input.impl;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Preconditions;
import io.druid.java.util.common.parsers.CSVParser;
import io.druid.java.util.common.parsers.Parser;
import org.apache.druid.java.util.common.parsers.CSVParser;
import org.apache.druid.java.util.common.parsers.Parser;
import java.util.List;

6
api/src/main/java/io/druid/data/input/impl/DelimitedParseSpec.java → api/src/main/java/org/apache/druid/data/input/impl/DelimitedParseSpec.java
View File

@ -17,13 +17,13 @@
* under the License.
*/
package io.druid.data.input.impl;
package org.apache.druid.data.input.impl;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Preconditions;
import io.druid.java.util.common.parsers.DelimitedParser;
import io.druid.java.util.common.parsers.Parser;
import org.apache.druid.java.util.common.parsers.DelimitedParser;
import org.apache.druid.java.util.common.parsers.Parser;
import java.util.List;

12
api/src/main/java/io/druid/data/input/impl/DimensionSchema.java → api/src/main/java/org/apache/druid/data/input/impl/DimensionSchema.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.data.input.impl;
package org.apache.druid.data.input.impl;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;
@ -26,9 +26,9 @@ import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.annotation.JsonValue;
import com.google.common.base.Strings;
import io.druid.guice.annotations.PublicApi;
import io.druid.java.util.common.StringUtils;
import io.druid.java.util.emitter.EmittingLogger;
import org.apache.druid.guice.annotations.PublicApi;
import org.apache.druid.java.util.common.StringUtils;
import org.apache.druid.java.util.emitter.EmittingLogger;
import java.util.Objects;
@ -57,7 +57,7 @@ public abstract class DimensionSchema
// merge them when druid-api is merged back into the main repo
/**
* Should be the same as {@code io.druid.segment.column.ValueType}.
* Should be the same as {@code org.apache.druid.segment.column.ValueType}.
* TODO merge them when druid-api is merged back into the main repo
*/
public enum ValueType
@ -66,7 +66,7 @@ public abstract class DimensionSchema
LONG,
STRING,
DOUBLE,
@SuppressWarnings("unused") // used in io.druid.segment.column.ValueType
@SuppressWarnings("unused") // used in org.apache.druid.segment.column.ValueType
COMPLEX;
@JsonValue

6
api/src/main/java/io/druid/data/input/impl/DimensionsSpec.java → api/src/main/java/org/apache/druid/data/input/impl/DimensionsSpec.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.data.input.impl;
package org.apache.druid.data.input.impl;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;
@ -28,8 +28,8 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import io.druid.guice.annotations.PublicApi;
import io.druid.java.util.common.parsers.ParserUtils;
import org.apache.druid.guice.annotations.PublicApi;
import org.apache.druid.java.util.common.parsers.ParserUtils;
import javax.annotation.Nullable;
import java.util.HashMap;

2
api/src/main/java/io/druid/data/input/impl/DoubleDimensionSchema.java → api/src/main/java/org/apache/druid/data/input/impl/DoubleDimensionSchema.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.data.input.impl;
package org.apache.druid.data.input.impl;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;

8
api/src/main/java/io/druid/data/input/impl/FileIteratingFirehose.java → api/src/main/java/org/apache/druid/data/input/impl/FileIteratingFirehose.java
View File

@ -17,11 +17,11 @@
* under the License.
*/
package io.druid.data.input.impl;
package org.apache.druid.data.input.impl;
import io.druid.data.input.Firehose;
import io.druid.data.input.InputRow;
import io.druid.utils.Runnables;
import org.apache.druid.data.input.Firehose;
import org.apache.druid.data.input.InputRow;
import org.apache.druid.utils.Runnables;
import org.apache.commons.io.LineIterator;
import javax.annotation.Nullable;

2
api/src/main/java/io/druid/data/input/impl/FloatDimensionSchema.java → api/src/main/java/org/apache/druid/data/input/impl/FloatDimensionSchema.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.data.input.impl;
package org.apache.druid.data.input.impl;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;

8
api/src/main/java/io/druid/data/input/impl/InputRowParser.java → api/src/main/java/org/apache/druid/data/input/impl/InputRowParser.java
View File

@ -17,13 +17,13 @@
* under the License.
*/
package io.druid.data.input.impl;
package org.apache.druid.data.input.impl;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import io.druid.data.input.InputRow;
import io.druid.guice.annotations.ExtensionPoint;
import io.druid.java.util.common.collect.Utils;
import org.apache.druid.data.input.InputRow;
import org.apache.druid.guice.annotations.ExtensionPoint;
import org.apache.druid.java.util.common.collect.Utils;
import javax.annotation.Nullable;
import javax.validation.constraints.NotNull;

6
api/src/main/java/io/druid/data/input/impl/JSONLowercaseParseSpec.java → api/src/main/java/org/apache/druid/data/input/impl/JSONLowercaseParseSpec.java
View File

@ -17,13 +17,13 @@
* under the License.
*/
package io.druid.data.input.impl;
package org.apache.druid.data.input.impl;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.druid.java.util.common.parsers.JSONToLowerParser;
import io.druid.java.util.common.parsers.Parser;
import org.apache.druid.java.util.common.parsers.JSONToLowerParser;
import org.apache.druid.java.util.common.parsers.Parser;
import java.util.List;

8
api/src/main/java/io/druid/data/input/impl/JSONParseSpec.java → api/src/main/java/org/apache/druid/data/input/impl/JSONParseSpec.java
View File

@ -17,15 +17,15 @@
* under the License.
*/
package io.druid.data.input.impl;
package org.apache.druid.data.input.impl;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonParser.Feature;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.druid.java.util.common.parsers.JSONPathParser;
import io.druid.java.util.common.parsers.JSONPathSpec;
import io.druid.java.util.common.parsers.Parser;
import org.apache.druid.java.util.common.parsers.JSONPathParser;
import org.apache.druid.java.util.common.parsers.JSONPathSpec;
import org.apache.druid.java.util.common.parsers.Parser;
import java.util.HashMap;
import java.util.List;

8
api/src/main/java/io/druid/data/input/impl/JavaScriptParseSpec.java → api/src/main/java/org/apache/druid/data/input/impl/JavaScriptParseSpec.java
View File

@ -17,15 +17,15 @@
* under the License.
*/
package io.druid.data.input.impl;
package org.apache.druid.data.input.impl;
import com.fasterxml.jackson.annotation.JacksonInject;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Preconditions;
import io.druid.java.util.common.parsers.JavaScriptParser;
import io.druid.java.util.common.parsers.Parser;
import io.druid.js.JavaScriptConfig;
import org.apache.druid.java.util.common.parsers.JavaScriptParser;
import org.apache.druid.java.util.common.parsers.Parser;
import org.apache.druid.js.JavaScriptConfig;
import java.util.List;

2
api/src/main/java/io/druid/data/input/impl/LongDimensionSchema.java → api/src/main/java/org/apache/druid/data/input/impl/LongDimensionSchema.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.data.input.impl;
package org.apache.druid.data.input.impl;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;

10
api/src/main/java/io/druid/data/input/impl/MapInputRowParser.java → api/src/main/java/org/apache/druid/data/input/impl/MapInputRowParser.java
View File

@ -17,17 +17,17 @@
* under the License.
*/
package io.druid.data.input.impl;
package org.apache.druid.data.input.impl;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import io.druid.data.input.InputRow;
import io.druid.data.input.MapBasedInputRow;
import io.druid.java.util.common.StringUtils;
import io.druid.java.util.common.parsers.ParseException;
import org.apache.druid.data.input.InputRow;
import org.apache.druid.data.input.MapBasedInputRow;
import org.apache.druid.java.util.common.StringUtils;
import org.apache.druid.java.util.common.parsers.ParseException;
import org.joda.time.DateTime;
import java.util.List;

4
api/src/main/java/io/druid/data/input/impl/NewSpatialDimensionSchema.java → api/src/main/java/org/apache/druid/data/input/impl/NewSpatialDimensionSchema.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.data.input.impl;
package org.apache.druid.data.input.impl;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;
@ -28,7 +28,7 @@ import java.util.List;
/**
* NOTE:
* This class should be deprecated after Druid supports configurable index types on dimensions.
* When that exists, this should be the implementation: https://github.com/druid-io/druid/issues/2622
* When that exists, this should be the implementation: https://github.com/apache/incubator-druid/issues/2622
*
* This is a stop-gap solution to consolidate the dimension specs and remove the separate spatial
* section in DimensionsSpec.

4
api/src/main/java/io/druid/data/input/impl/NoopInputRowParser.java → api/src/main/java/org/apache/druid/data/input/impl/NoopInputRowParser.java
View File

@ -17,12 +17,12 @@
* under the License.
*/
package io.druid.data.input.impl;
package org.apache.druid.data.input.impl;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.collect.ImmutableList;
import io.druid.data.input.InputRow;
import org.apache.druid.data.input.InputRow;
import java.util.List;

8
api/src/main/java/io/druid/data/input/impl/ParseSpec.java → api/src/main/java/org/apache/druid/data/input/impl/ParseSpec.java
View File

@ -17,15 +17,15 @@
* under the License.
*/
package io.druid.data.input.impl;
package org.apache.druid.data.input.impl;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.google.common.base.Preconditions;
import io.druid.guice.annotations.ExtensionPoint;
import io.druid.guice.annotations.PublicApi;
import io.druid.java.util.common.parsers.Parser;
import org.apache.druid.guice.annotations.ExtensionPoint;
import org.apache.druid.guice.annotations.PublicApi;
import org.apache.druid.java.util.common.parsers.Parser;
import java.util.List;

6
api/src/main/java/io/druid/data/input/impl/RegexParseSpec.java → api/src/main/java/org/apache/druid/data/input/impl/RegexParseSpec.java
View File

@ -17,14 +17,14 @@
* under the License.
*/
package io.druid.data.input.impl;
package org.apache.druid.data.input.impl;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import io.druid.java.util.common.parsers.Parser;
import io.druid.java.util.common.parsers.RegexParser;
import org.apache.druid.java.util.common.parsers.Parser;
import org.apache.druid.java.util.common.parsers.RegexParser;
import java.util.List;

2
api/src/main/java/io/druid/data/input/impl/SpatialDimensionSchema.java → api/src/main/java/org/apache/druid/data/input/impl/SpatialDimensionSchema.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.data.input.impl;
package org.apache.druid.data.input.impl;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;

12
api/src/main/java/io/druid/data/input/impl/SqlFirehose.java → api/src/main/java/org/apache/druid/data/input/impl/SqlFirehose.java
View File

@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
package io.druid.data.input.impl;
package org.apache.druid.data.input.impl;
import com.google.common.collect.Iterators;
import io.druid.data.input.Firehose;
import io.druid.data.input.InputRow;
import io.druid.data.input.impl.prefetch.JsonIterator;
import io.druid.java.util.common.io.Closer;
import io.druid.utils.Runnables;
import org.apache.druid.data.input.Firehose;
import org.apache.druid.data.input.InputRow;
import org.apache.druid.data.input.impl.prefetch.JsonIterator;
import org.apache.druid.java.util.common.io.Closer;
import org.apache.druid.utils.Runnables;
import javax.annotation.Nullable;
import java.io.Closeable;

2
api/src/main/java/io/druid/data/input/impl/StringDimensionSchema.java → api/src/main/java/org/apache/druid/data/input/impl/StringDimensionSchema.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.data.input.impl;
package org.apache.druid.data.input.impl;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;

12
api/src/main/java/io/druid/data/input/impl/StringInputRowParser.java → api/src/main/java/org/apache/druid/data/input/impl/StringInputRowParser.java
View File

@ -17,17 +17,17 @@
* under the License.
*/
package io.druid.data.input.impl;
package org.apache.druid.data.input.impl;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Preconditions;
import com.google.common.collect.Iterators;
import io.druid.data.input.ByteBufferInputRowParser;
import io.druid.data.input.InputRow;
import io.druid.java.util.common.collect.Utils;
import io.druid.java.util.common.parsers.ParseException;
import io.druid.java.util.common.parsers.Parser;
import org.apache.druid.data.input.ByteBufferInputRowParser;
import org.apache.druid.data.input.InputRow;
import org.apache.druid.java.util.common.collect.Utils;
import org.apache.druid.java.util.common.parsers.ParseException;
import org.apache.druid.java.util.common.parsers.Parser;
import javax.annotation.Nullable;
import java.nio.ByteBuffer;

4
api/src/main/java/io/druid/data/input/impl/TimeAndDimsParseSpec.java → api/src/main/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpec.java
View File

@ -17,11 +17,11 @@
* under the License.
*/
package io.druid.data.input.impl;
package org.apache.druid.data.input.impl;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.druid.java.util.common.parsers.Parser;
import org.apache.druid.java.util.common.parsers.Parser;
import java.util.List;
import java.util.Map;

6
api/src/main/java/io/druid/data/input/impl/TimestampSpec.java → api/src/main/java/org/apache/druid/data/input/impl/TimestampSpec.java
View File

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

6
api/src/main/java/io/druid/data/input/impl/prefetch/CacheManager.java → api/src/main/java/org/apache/druid/data/input/impl/prefetch/CacheManager.java
View File

@ -17,11 +17,11 @@
* under the License.
*/
package io.druid.data.input.impl.prefetch;
package org.apache.druid.data.input.impl.prefetch;
import com.google.common.annotations.VisibleForTesting;
import io.druid.java.util.common.ISE;
import io.druid.java.util.common.logger.Logger;
import org.apache.druid.java.util.common.ISE;
import org.apache.druid.java.util.common.logger.Logger;
import java.util.ArrayList;
import java.util.List;

2
api/src/main/java/io/druid/data/input/impl/prefetch/FetchedFile.java → api/src/main/java/org/apache/druid/data/input/impl/prefetch/FetchedFile.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.data.input.impl.prefetch;
package org.apache.druid.data.input.impl.prefetch;
import java.io.Closeable;
import java.io.File;

6
api/src/main/java/io/druid/data/input/impl/prefetch/Fetcher.java → api/src/main/java/org/apache/druid/data/input/impl/prefetch/Fetcher.java
View File

@ -17,12 +17,12 @@
* under the License.
*/
package io.druid.data.input.impl.prefetch;
package org.apache.druid.data.input.impl.prefetch;
import com.google.common.base.Preconditions;
import com.google.common.base.Throwables;
import io.druid.java.util.common.ISE;
import io.druid.java.util.common.logger.Logger;
import org.apache.druid.java.util.common.ISE;
import org.apache.druid.java.util.common.logger.Logger;
import javax.annotation.Nullable;
import java.io.Closeable;

6
api/src/main/java/io/druid/data/input/impl/prefetch/FileFetcher.java → api/src/main/java/org/apache/druid/data/input/impl/prefetch/FileFetcher.java
View File

@ -17,12 +17,12 @@
* under the License.
*/
package io.druid.data.input.impl.prefetch;
package org.apache.druid.data.input.impl.prefetch;
import com.google.common.base.Predicate;
import io.druid.java.util.common.RetryUtils;
import io.druid.java.util.common.StringUtils;
import org.apache.druid.java.util.common.RetryUtils;
import org.apache.druid.java.util.common.StringUtils;
import org.apache.commons.io.IOUtils;
import javax.annotation.Nullable;

8
api/src/main/java/io/druid/data/input/impl/prefetch/JsonIterator.java → api/src/main/java/org/apache/druid/data/input/impl/prefetch/JsonIterator.java
View File

@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
package io.druid.data.input.impl.prefetch;
package org.apache.druid.data.input.impl.prefetch;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.core.ObjectCodec;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.druid.java.util.common.IAE;
import io.druid.java.util.common.guava.CloseQuietly;
import io.druid.java.util.common.io.Closer;
import org.apache.druid.java.util.common.IAE;
import org.apache.druid.java.util.common.guava.CloseQuietly;
import org.apache.druid.java.util.common.io.Closer;
import java.io.Closeable;
import java.io.IOException;

2
api/src/main/java/io/druid/data/input/impl/prefetch/ObjectOpenFunction.java → api/src/main/java/org/apache/druid/data/input/impl/prefetch/ObjectOpenFunction.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.data.input.impl.prefetch;
package org.apache.druid.data.input.impl.prefetch;
import java.io.File;
import java.io.IOException;

2
api/src/main/java/io/druid/data/input/impl/prefetch/OpenedObject.java → api/src/main/java/org/apache/druid/data/input/impl/prefetch/OpenedObject.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.data.input.impl.prefetch;
package org.apache.druid.data.input.impl.prefetch;
import org.apache.commons.io.FileUtils;

2
api/src/main/java/io/druid/data/input/impl/prefetch/PrefetchConfig.java → api/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchConfig.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package io.druid.data.input.impl.prefetch;
package org.apache.druid.data.input.impl.prefetch;
import java.util.concurrent.TimeUnit;

16
api/src/main/java/io/druid/data/input/impl/prefetch/PrefetchSqlFirehoseFactory.java → api/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchSqlFirehoseFactory.java
View File

@ -17,20 +17,20 @@
* under the License.
*/
package io.druid.data.input.impl.prefetch;
package org.apache.druid.data.input.impl.prefetch;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.type.TypeReference;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import io.druid.data.input.Firehose;
import io.druid.data.input.FirehoseFactory;
import io.druid.data.input.impl.InputRowParser;
import io.druid.data.input.impl.SqlFirehose;
import io.druid.java.util.common.ISE;
import io.druid.java.util.common.concurrent.Execs;
import io.druid.java.util.common.logger.Logger;
import org.apache.druid.data.input.Firehose;
import org.apache.druid.data.input.FirehoseFactory;
import org.apache.druid.data.input.impl.InputRowParser;
import org.apache.druid.data.input.impl.SqlFirehose;
import org.apache.druid.java.util.common.ISE;
import org.apache.druid.java.util.common.concurrent.Execs;
import org.apache.druid.java.util.common.logger.Logger;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.io.LineIterator;

16
api/src/main/java/io/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactory.java → api/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactory.java
View File

@ -17,20 +17,20 @@
* under the License.
*/
package io.druid.data.input.impl.prefetch;
package org.apache.druid.data.input.impl.prefetch;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
import io.druid.data.input.Firehose;
import io.druid.data.input.impl.AbstractTextFilesFirehoseFactory;
import io.druid.data.input.impl.FileIteratingFirehose;
import io.druid.data.input.impl.StringInputRowParser;
import io.druid.java.util.common.ISE;
import io.druid.java.util.common.concurrent.Execs;
import io.druid.java.util.common.logger.Logger;
import org.apache.druid.data.input.Firehose;
import org.apache.druid.data.input.impl.AbstractTextFilesFirehoseFactory;
import org.apache.druid.data.input.impl.FileIteratingFirehose;
import org.apache.druid.data.input.impl.StringInputRowParser;
import org.apache.druid.java.util.common.ISE;
import org.apache.druid.java.util.common.concurrent.Execs;
import org.apache.druid.java.util.common.logger.Logger;
import org.apache.commons.io.LineIterator;
import javax.annotation.Nullable;

6
api/src/main/java/io/druid/data/input/impl/prefetch/RetryingInputStream.java → api/src/main/java/org/apache/druid/data/input/impl/prefetch/RetryingInputStream.java
View File

@ -17,13 +17,13 @@
* under the License.
*/
package io.druid.data.input.impl.prefetch;
package org.apache.druid.data.input.impl.prefetch;
import com.google.common.base.Predicate;
import com.google.common.base.Throwables;
import com.google.common.io.CountingInputStream;
import io.druid.java.util.common.RetryUtils;
import io.druid.java.util.common.logger.Logger;
import org.apache.druid.java.util.common.RetryUtils;
import org.apache.druid.java.util.common.logger.Logger;
import java.io.IOException;
import java.io.InputStream;

2
api/src/main/java/io/druid/data/input/impl/prefetch/SqlFetcher.java → api/src/main/java/org/apache/druid/data/input/impl/prefetch/SqlFetcher.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.data.input.impl.prefetch;
package org.apache.druid.data.input.impl.prefetch;
import javax.annotation.Nullable;
import java.io.File;

16
api/src/main/java/io/druid/guice/Binders.java → api/src/main/java/org/apache/druid/guice/Binders.java
View File

@ -17,18 +17,18 @@
* under the License.
*/
package io.druid.guice;
package org.apache.druid.guice;
import com.google.inject.Binder;
import com.google.inject.Key;
import com.google.inject.multibindings.MapBinder;
import io.druid.guice.annotations.PublicApi;
import io.druid.segment.loading.DataSegmentArchiver;
import io.druid.segment.loading.DataSegmentFinder;
import io.druid.segment.loading.DataSegmentKiller;
import io.druid.segment.loading.DataSegmentMover;
import io.druid.segment.loading.DataSegmentPusher;
import io.druid.tasklogs.TaskLogs;
import org.apache.druid.guice.annotations.PublicApi;
import org.apache.druid.segment.loading.DataSegmentArchiver;
import org.apache.druid.segment.loading.DataSegmentFinder;
import org.apache.druid.segment.loading.DataSegmentKiller;
import org.apache.druid.segment.loading.DataSegmentMover;
import org.apache.druid.segment.loading.DataSegmentPusher;
import org.apache.druid.tasklogs.TaskLogs;
/**
*/

4
api/src/main/java/io/druid/guice/ConditionalMultibind.java → api/src/main/java/org/apache/druid/guice/ConditionalMultibind.java
View File

@ -17,13 +17,13 @@
* under the License.
*/
package io.druid.guice;
package org.apache.druid.guice;
import com.google.common.base.Predicate;
import com.google.inject.Binder;
import com.google.inject.TypeLiteral;
import com.google.inject.multibindings.Multibinder;
import io.druid.guice.annotations.PublicApi;
import org.apache.druid.guice.annotations.PublicApi;
import java.lang.annotation.Annotation;
import java.util.Properties;

4
api/src/main/java/io/druid/guice/DruidGuiceExtensions.java → api/src/main/java/org/apache/druid/guice/DruidGuiceExtensions.java
View File

@ -17,11 +17,11 @@
* under the License.
*/
package io.druid.guice;
package org.apache.druid.guice;
import com.google.inject.Binder;
import com.google.inject.Module;
import io.druid.guice.annotations.PublicApi;
import org.apache.druid.guice.annotations.PublicApi;
/**
*/

4
api/src/main/java/io/druid/guice/DruidScopes.java → api/src/main/java/org/apache/druid/guice/DruidScopes.java
View File

@ -17,13 +17,13 @@
* under the License.
*/
package io.druid.guice;
package org.apache.druid.guice;
import com.google.inject.Key;
import com.google.inject.Provider;
import com.google.inject.Scope;
import com.google.inject.Scopes;
import io.druid.guice.annotations.PublicApi;
import org.apache.druid.guice.annotations.PublicApi;
/**
*/

6
api/src/main/java/io/druid/guice/Jerseys.java → api/src/main/java/org/apache/druid/guice/Jerseys.java
View File

@ -17,13 +17,13 @@
* under the License.
*/
package io.druid.guice;
package org.apache.druid.guice;
import com.google.inject.Binder;
import com.google.inject.TypeLiteral;
import com.google.inject.multibindings.Multibinder;
import io.druid.guice.annotations.JSR311Resource;
import io.druid.guice.annotations.PublicApi;
import org.apache.druid.guice.annotations.JSR311Resource;
import org.apache.druid.guice.annotations.PublicApi;
/**
*/

4
api/src/main/java/io/druid/guice/JsonConfigProvider.java → api/src/main/java/org/apache/druid/guice/JsonConfigProvider.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.guice;
package org.apache.druid.guice;
import com.google.common.base.Supplier;
import com.google.common.base.Suppliers;
@ -26,7 +26,7 @@ import com.google.inject.Inject;
import com.google.inject.Key;
import com.google.inject.Provider;
import com.google.inject.util.Types;
import io.druid.guice.annotations.PublicApi;
import org.apache.druid.guice.annotations.PublicApi;
import java.lang.annotation.Annotation;
import java.lang.reflect.ParameterizedType;

6
api/src/main/java/io/druid/guice/JsonConfigurator.java → api/src/main/java/org/apache/druid/guice/JsonConfigurator.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.guice;
package org.apache.druid.guice;
import com.fasterxml.jackson.annotation.JacksonInject;
import com.fasterxml.jackson.annotation.JsonProperty;
@ -34,8 +34,8 @@ import com.google.common.collect.Maps;
import com.google.inject.Inject;
import com.google.inject.ProvisionException;
import com.google.inject.spi.Message;
import io.druid.java.util.common.StringUtils;
import io.druid.java.util.common.logger.Logger;
import org.apache.druid.java.util.common.StringUtils;
import org.apache.druid.java.util.common.logger.Logger;
import javax.validation.ConstraintViolation;
import javax.validation.ElementKind;

2
api/src/main/java/io/druid/guice/KeyHolder.java → api/src/main/java/org/apache/druid/guice/KeyHolder.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.guice;
package org.apache.druid.guice;
import com.google.inject.Key;

4
api/src/main/java/io/druid/guice/LazySingleton.java → api/src/main/java/org/apache/druid/guice/LazySingleton.java
View File

@ -17,10 +17,10 @@
* under the License.
*/
package io.druid.guice;
package org.apache.druid.guice;
import com.google.inject.ScopeAnnotation;
import io.druid.guice.annotations.PublicApi;
import org.apache.druid.guice.annotations.PublicApi;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

4
api/src/main/java/io/druid/guice/LifecycleModule.java → api/src/main/java/org/apache/druid/guice/LifecycleModule.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.guice;
package org.apache.druid.guice;
import com.google.inject.Binder;
import com.google.inject.Injector;
@ -27,7 +27,7 @@ import com.google.inject.Provides;
import com.google.inject.TypeLiteral;
import com.google.inject.multibindings.Multibinder;
import com.google.inject.name.Names;
import io.druid.java.util.common.lifecycle.Lifecycle;
import org.apache.druid.java.util.common.lifecycle.Lifecycle;
import java.lang.annotation.Annotation;
import java.util.Set;

6
api/src/main/java/io/druid/guice/LifecycleScope.java → api/src/main/java/org/apache/druid/guice/LifecycleScope.java
View File

@ -17,14 +17,14 @@
* under the License.
*/
package io.druid.guice;
package org.apache.druid.guice;
import com.google.common.collect.Lists;
import com.google.inject.Key;
import com.google.inject.Provider;
import com.google.inject.Scope;
import io.druid.java.util.common.lifecycle.Lifecycle;
import io.druid.java.util.common.logger.Logger;
import org.apache.druid.java.util.common.lifecycle.Lifecycle;
import org.apache.druid.java.util.common.logger.Logger;
import java.util.List;

6
api/src/main/java/io/druid/guice/ManageLifecycle.java → api/src/main/java/org/apache/druid/guice/ManageLifecycle.java
View File

@ -17,10 +17,10 @@
* under the License.
*/
package io.druid.guice;
package org.apache.druid.guice;
import com.google.inject.ScopeAnnotation;
import io.druid.guice.annotations.PublicApi;
import org.apache.druid.guice.annotations.PublicApi;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@ -28,7 +28,7 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* Marks the object to be managed by {@link io.druid.java.util.common.lifecycle.Lifecycle}
* Marks the object to be managed by {@link org.apache.druid.java.util.common.lifecycle.Lifecycle}
*
* This Scope gets defined by {@link LifecycleModule}
*/

6
api/src/main/java/io/druid/guice/ManageLifecycleLast.java → api/src/main/java/org/apache/druid/guice/ManageLifecycleLast.java
View File

@ -17,10 +17,10 @@
* under the License.
*/
package io.druid.guice;
package org.apache.druid.guice;
import com.google.inject.ScopeAnnotation;
import io.druid.guice.annotations.PublicApi;
import org.apache.druid.guice.annotations.PublicApi;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@ -28,7 +28,7 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* Marks the object to be managed by {@link io.druid.java.util.common.lifecycle.Lifecycle} and set to be on Stage.LAST
* Marks the object to be managed by {@link org.apache.druid.java.util.common.lifecycle.Lifecycle} and set to be on Stage.LAST
*
* This Scope gets defined by {@link LifecycleModule}
*/

6
api/src/main/java/io/druid/guice/PolyBind.java → api/src/main/java/org/apache/druid/guice/PolyBind.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.guice;
package org.apache.druid.guice;
import com.google.common.base.Preconditions;
import com.google.inject.Binder;
@ -30,8 +30,8 @@ import com.google.inject.TypeLiteral;
import com.google.inject.binder.ScopedBindingBuilder;
import com.google.inject.multibindings.MapBinder;
import com.google.inject.util.Types;
import io.druid.guice.annotations.PublicApi;
import io.druid.java.util.common.StringUtils;
import org.apache.druid.guice.annotations.PublicApi;
import org.apache.druid.java.util.common.StringUtils;
import javax.annotation.Nullable;
import java.lang.reflect.ParameterizedType;

2
api/src/main/java/io/druid/guice/SupplierProvider.java → api/src/main/java/org/apache/druid/guice/SupplierProvider.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.guice;
package org.apache.druid.guice;
import com.google.common.base.Supplier;
import com.google.inject.Inject;

2
api/src/main/java/io/druid/guice/annotations/EscalatedGlobal.java → api/src/main/java/org/apache/druid/guice/annotations/EscalatedGlobal.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.guice.annotations;
package org.apache.druid.guice.annotations;
import com.google.inject.BindingAnnotation;

2
api/src/main/java/io/druid/guice/annotations/Global.java → api/src/main/java/org/apache/druid/guice/annotations/Global.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.guice.annotations;
package org.apache.druid.guice.annotations;
import com.google.inject.BindingAnnotation;

2
api/src/main/java/io/druid/guice/annotations/JSR311Resource.java → api/src/main/java/org/apache/druid/guice/annotations/JSR311Resource.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.guice.annotations;
package org.apache.druid.guice.annotations;
import com.google.inject.BindingAnnotation;

2
api/src/main/java/io/druid/guice/annotations/Json.java → api/src/main/java/org/apache/druid/guice/annotations/Json.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.guice.annotations;
package org.apache.druid.guice.annotations;
import com.google.inject.BindingAnnotation;

2
api/src/main/java/io/druid/guice/annotations/Self.java → api/src/main/java/org/apache/druid/guice/annotations/Self.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.guice.annotations;
package org.apache.druid.guice.annotations;
import com.google.inject.BindingAnnotation;

2
api/src/main/java/io/druid/guice/annotations/Smile.java → api/src/main/java/org/apache/druid/guice/annotations/Smile.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.guice.annotations;
package org.apache.druid.guice.annotations;
import com.google.inject.BindingAnnotation;

2
api/src/main/java/io/druid/indexer/IngestionState.java → api/src/main/java/org/apache/druid/indexer/IngestionState.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.indexer;
package org.apache.druid.indexer;
public enum IngestionState
{

2
api/src/main/java/io/druid/indexer/RunnerTaskState.java → api/src/main/java/org/apache/druid/indexer/RunnerTaskState.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package io.druid.indexer;
package org.apache.druid.indexer;
/**
* This includes the state of a task in the task runner not covered by {@link TaskState}, this state is not stored in database
*/

2
api/src/main/java/io/druid/indexer/TaskInfo.java → api/src/main/java/org/apache/druid/indexer/TaskInfo.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package io.druid.indexer;
package org.apache.druid.indexer;
import com.google.common.base.Preconditions;
import org.joda.time.DateTime;

2
api/src/main/java/io/druid/indexer/TaskLocation.java → api/src/main/java/org/apache/druid/indexer/TaskLocation.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.indexer;
package org.apache.druid.indexer;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;

2
api/src/main/java/io/druid/indexer/TaskMetricsGetter.java → api/src/main/java/org/apache/druid/indexer/TaskMetricsGetter.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.indexer;
package org.apache.druid.indexer;
import java.util.List;
import java.util.Map;

2
api/src/main/java/io/druid/indexer/TaskMetricsUtils.java → api/src/main/java/org/apache/druid/indexer/TaskMetricsUtils.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.indexer;
package org.apache.druid.indexer;
import com.google.common.collect.Maps;

2
api/src/main/java/io/druid/indexer/TaskState.java → api/src/main/java/org/apache/druid/indexer/TaskState.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.indexer;
package org.apache.druid.indexer;
public enum TaskState
{

2
api/src/main/java/io/druid/indexer/TaskStatus.java → api/src/main/java/org/apache/druid/indexer/TaskStatus.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.indexer;
package org.apache.druid.indexer;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;

2
api/src/main/java/io/druid/indexer/TaskStatusPlus.java → api/src/main/java/org/apache/druid/indexer/TaskStatusPlus.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.indexer;
package org.apache.druid.indexer;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;

4
api/src/main/java/io/druid/initialization/DruidModule.java → api/src/main/java/org/apache/druid/initialization/DruidModule.java
View File

@ -17,10 +17,10 @@
* under the License.
*/
package io.druid.initialization;
package org.apache.druid.initialization;
import com.fasterxml.jackson.databind.Module;
import io.druid.guice.annotations.ExtensionPoint;
import org.apache.druid.guice.annotations.ExtensionPoint;
import java.util.List;

2
api/src/main/java/io/druid/jackson/CommaListJoinDeserializer.java → api/src/main/java/org/apache/druid/jackson/CommaListJoinDeserializer.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.jackson;
package org.apache.druid.jackson;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;

2
api/src/main/java/io/druid/jackson/CommaListJoinSerializer.java → api/src/main/java/org/apache/druid/jackson/CommaListJoinSerializer.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.jackson;
package org.apache.druid.jackson;
import com.fasterxml.jackson.core.JsonGenerationException;
import com.fasterxml.jackson.core.JsonGenerator;

4
api/src/main/java/io/druid/js/JavaScriptConfig.java → api/src/main/java/org/apache/druid/js/JavaScriptConfig.java
View File

@ -17,11 +17,11 @@
* under the License.
*/
package io.druid.js;
package org.apache.druid.js;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.druid.guice.annotations.PublicApi;
import org.apache.druid.guice.annotations.PublicApi;
/**
* Should be used by extension filters, aggregators, etc, that use JavaScript to determine if JavaScript is enabled

2
api/src/main/java/io/druid/query/SegmentDescriptor.java → api/src/main/java/org/apache/druid/query/SegmentDescriptor.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package io.druid.query;
package org.apache.druid.query;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;

6
api/src/main/java/io/druid/segment/SegmentUtils.java → api/src/main/java/org/apache/druid/segment/SegmentUtils.java
View File

@ -17,12 +17,12 @@
* under the License.
*/
package io.druid.segment;
package org.apache.druid.segment;
import com.google.common.io.Files;
import com.google.common.primitives.Ints;
import io.druid.guice.annotations.PublicApi;
import io.druid.java.util.common.IOE;
import org.apache.druid.guice.annotations.PublicApi;
import org.apache.druid.java.util.common.IOE;
import java.io.File;
import java.io.FileInputStream;

6
api/src/main/java/io/druid/segment/loading/DataSegmentArchiver.java → api/src/main/java/org/apache/druid/segment/loading/DataSegmentArchiver.java
View File

@ -17,10 +17,10 @@
* under the License.
*/
package io.druid.segment.loading;
package org.apache.druid.segment.loading;
import io.druid.guice.annotations.ExtensionPoint;
import io.druid.timeline.DataSegment;
import org.apache.druid.guice.annotations.ExtensionPoint;
import org.apache.druid.timeline.DataSegment;
import javax.annotation.Nullable;

10
api/src/main/java/io/druid/segment/loading/DataSegmentFinder.java → api/src/main/java/org/apache/druid/segment/loading/DataSegmentFinder.java
View File

@ -17,12 +17,12 @@
* under the License.
*/
package io.druid.segment.loading;
package org.apache.druid.segment.loading;
import io.druid.guice.annotations.ExtensionPoint;
import io.druid.java.util.common.Pair;
import io.druid.java.util.common.logger.Logger;
import io.druid.timeline.DataSegment;
import org.apache.druid.guice.annotations.ExtensionPoint;
import org.apache.druid.java.util.common.Pair;
import org.apache.druid.java.util.common.logger.Logger;
import org.apache.druid.timeline.DataSegment;
import java.util.Map;
import java.util.Set;

8
api/src/main/java/io/druid/segment/loading/DataSegmentKiller.java → api/src/main/java/org/apache/druid/segment/loading/DataSegmentKiller.java
View File

@ -17,11 +17,11 @@
* under the License.
*/
package io.druid.segment.loading;
package org.apache.druid.segment.loading;
import io.druid.guice.annotations.ExtensionPoint;
import io.druid.java.util.common.logger.Logger;
import io.druid.timeline.DataSegment;
import org.apache.druid.guice.annotations.ExtensionPoint;
import org.apache.druid.java.util.common.logger.Logger;
import org.apache.druid.timeline.DataSegment;
import java.io.IOException;

6
api/src/main/java/io/druid/segment/loading/DataSegmentMover.java → api/src/main/java/org/apache/druid/segment/loading/DataSegmentMover.java
View File

@ -17,10 +17,10 @@
* under the License.
*/
package io.druid.segment.loading;
package org.apache.druid.segment.loading;
import io.druid.guice.annotations.ExtensionPoint;
import io.druid.timeline.DataSegment;
import org.apache.druid.guice.annotations.ExtensionPoint;
import org.apache.druid.timeline.DataSegment;
import java.util.Map;

8
api/src/main/java/io/druid/segment/loading/DataSegmentPusher.java → api/src/main/java/org/apache/druid/segment/loading/DataSegmentPusher.java
View File

@ -17,12 +17,12 @@
* under the License.
*/
package io.druid.segment.loading;
package org.apache.druid.segment.loading;
import com.google.common.base.Joiner;
import io.druid.guice.annotations.ExtensionPoint;
import io.druid.java.util.common.StringUtils;
import io.druid.timeline.DataSegment;
import org.apache.druid.guice.annotations.ExtensionPoint;
import org.apache.druid.java.util.common.StringUtils;
import org.apache.druid.timeline.DataSegment;
import java.io.File;
import java.io.IOException;

4
api/src/main/java/io/druid/segment/loading/LoadSpec.java → api/src/main/java/org/apache/druid/segment/loading/LoadSpec.java
View File

@ -17,10 +17,10 @@
* under the License.
*/
package io.druid.segment.loading;
package org.apache.druid.segment.loading;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import io.druid.guice.annotations.ExtensionPoint;
import org.apache.druid.guice.annotations.ExtensionPoint;
import java.io.File;

Some files were not shown because too many files have changed in this diff Show More