diff --git a/.idea/inspectionProfiles/Druid.xml b/.idea/inspectionProfiles/Druid.xml index d0029e103fac..c735b2614c82 100644 --- a/.idea/inspectionProfiles/Druid.xml +++ b/.idea/inspectionProfiles/Druid.xml @@ -63,7 +63,7 @@ - diff --git a/.idea/misc.xml b/.idea/misc.xml index 846d8ad4f8c7..41f0d62b854d 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,18 +8,18 @@ - - - - - - + + + + + + - - - + + + diff --git a/.idea/scopes/NonGeneratedFiles.xml b/.idea/scopes/NonGeneratedFiles.xml index 22375373e966..5bd4a87fc464 100644 --- a/.idea/scopes/NonGeneratedFiles.xml +++ b/.idea/scopes/NonGeneratedFiles.xml @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 67afc2651e76..c0e093dab788 100644 --- a/.travis.yml +++ b/.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 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6a0247b6de75..c6973a9b451d 100644 --- a/CONTRIBUTING.md +++ b/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 [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. diff --git a/INTELLIJ_SETUP.md b/INTELLIJ_SETUP.md index fac77fb5e1bc..e1cbeb6e4304 100644 --- a/INTELLIJ_SETUP.md +++ b/INTELLIJ_SETUP.md @@ -33,7 +33,7 @@ You can configure application definitions in XML for import into IntelliJ. Below - diff --git a/distribution/src/assembly/assembly.xml b/distribution/src/assembly/assembly.xml index 92d02cd0bdfb..5bc99ee49cf5 100644 --- a/distribution/src/assembly/assembly.xml +++ b/distribution/src/assembly/assembly.xml @@ -232,13 +232,13 @@ true lib - io.druid:extensions-distribution + org.apache.druid:extensions-distribution true - io.druid:extensions-distribution + org.apache.druid:extensions-distribution diff --git a/docs/_bin/deploy-docs.sh b/docs/_bin/deploy-docs.sh index e3107be5293c..f9ed4ddec0db 100755 --- a/docs/_bin/deploy-docs.sh +++ b/docs/_bin/deploy-docs.sh @@ -67,7 +67,7 @@ src=$tmp/druid echo "Using Version [$version]" echo "Working directory [$tmp]" -git clone -q --depth 1 git@github.com:druid-io/druid-io.github.io.git "$target" +git clone -q --depth 1 git@github.com:apache/incubator-druid-io.github.io.git "$target" remote=$(git -C "$druid" config --local --get "remote.$origin.url") git clone -q --depth 1 --branch $branch $remote "$src" @@ -104,7 +104,7 @@ if [ -z "$opt_dryrun" ]; then if [ -n "$GIT_TOKEN" ]; then curl -u "$GIT_TOKEN:x-oauth-basic" -XPOST -d@- \ - https://api.github.com/repos/druid-io/druid-io.github.io/pulls <
diff --git a/docs/content/configuration/index.md b/docs/content/configuration/index.md index 5f970c032ea9..c87da2a06e93 100644 --- a/docs/content/configuration/index.md +++ b/docs/content/configuration/index.md @@ -135,7 +135,7 @@ Many of Druid's external dependencies can be plugged in as modules. Extensions c |Property|Description|Default| |--------|-----------|-------| -|`druid.modules.excludeList`|A JSON array of canonical class names (e. g. `"io.druid.somepackage.SomeModule"`) of module classes which shouldn't be loaded, even if they are found in extensions specified by `druid.extensions.loadList`, or in the list of core modules specified to be loaded on a particular Druid node type. Useful when some useful extension contains some module, which shouldn't be loaded on some Druid node type because some dependencies of that module couldn't be satisfied.|[]| +|`druid.modules.excludeList`|A JSON array of canonical class names (e. g. `"org.apache.druid.somepackage.SomeModule"`) of module classes which shouldn't be loaded, even if they are found in extensions specified by `druid.extensions.loadList`, or in the list of core modules specified to be loaded on a particular Druid node type. Useful when some useful extension contains some module, which shouldn't be loaded on some Druid node type because some dependencies of that module couldn't be satisfied.|[]| ### Zookeeper We recommend just setting the base ZK path and the ZK service host, but all ZK paths that Druid uses can be overwritten to absolute paths. @@ -292,7 +292,7 @@ All nodes that can serve queries can also log the query requests they see. |--------|-----------|-------| |`druid.request.logging.type`|Choices: noop, file, emitter, slf4j, filtered, composing. How to log every query request.|noop| -Note that, you can enable sending all the HTTP requests to log by setting "io.druid.jetty.RequestLog" to DEBUG level. See [Logging](../configuration/logging.html) +Note that, you can enable sending all the HTTP requests to log by setting "org.apache.druid.jetty.RequestLog" to DEBUG level. See [Logging](../configuration/logging.html) #### File Request Logging @@ -312,7 +312,7 @@ Every request is emitted to some external location. #### SLF4J Request Logging -Every request is logged via SLF4J. Queries are serialized into JSON in the log message regardless of the SJF4J format specification. They will be logged under the class `io.druid.server.log.LoggingRequestLogger`. +Every request is logged via SLF4J. Queries are serialized into JSON in the log message regardless of the SJF4J format specification. They will be logged under the class `org.apache.druid.server.log.LoggingRequestLogger`. |Property|Description|Default| |--------|-----------|-------| @@ -354,23 +354,23 @@ Druid nodes periodically emit metrics and different metrics monitors can be incl |Property|Description|Default| |--------|-----------|-------| |`druid.monitoring.emissionPeriod`|How often metrics are emitted.|PT1M| -|`druid.monitoring.monitors`|Sets list of Druid monitors used by a node. See below for names and more information. For example, you can specify monitors for a Broker with `druid.monitoring.monitors=["io.druid.java.util.metrics.SysMonitor","io.druid.java.util.metrics.JvmMonitor"]`.|none (no monitors)| +|`druid.monitoring.monitors`|Sets list of Druid monitors used by a node. See below for names and more information. For example, you can specify monitors for a Broker with `druid.monitoring.monitors=["org.apache.druid.java.util.metrics.SysMonitor","org.apache.druid.java.util.metrics.JvmMonitor"]`.|none (no monitors)| The following monitors are available: |Name|Description| |----|-----------| -|`io.druid.client.cache.CacheMonitor`|Emits metrics (to logs) about the segment results cache for Historical and Broker nodes. Reports typical cache statistics include hits, misses, rates, and size (bytes and number of entries), as well as timeouts and and errors.| -|`io.druid.java.util.metrics.SysMonitor`|This uses the [SIGAR library](https://github.com/hyperic/sigar) to report on various system activities and statuses.| -|`io.druid.server.metrics.HistoricalMetricsMonitor`|Reports statistics on Historical nodes.| -|`io.druid.java.util.metrics.JvmMonitor`|Reports various JVM-related statistics.| -|`io.druid.java.util.metrics.JvmCpuMonitor`|Reports statistics of CPU consumption by the JVM.| -|`io.druid.java.util.metrics.CpuAcctDeltaMonitor`|Reports consumed CPU as per the cpuacct cgroup.| -|`io.druid.java.util.metrics.JvmThreadsMonitor`|Reports Thread statistics in the JVM, like numbers of total, daemon, started, died threads.| -|`io.druid.segment.realtime.RealtimeMetricsMonitor`|Reports statistics on Realtime nodes.| -|`io.druid.server.metrics.EventReceiverFirehoseMonitor`|Reports how many events have been queued in the EventReceiverFirehose.| -|`io.druid.server.metrics.QueryCountStatsMonitor`|Reports how many queries have been successful/failed/interrupted.| -|`io.druid.server.emitter.HttpEmittingMonitor`|Reports internal metrics of `http` or `parametrized` emitter (see below). Must not be used with another emitter type. See the description of the metrics here: https://github.com/druid-io/druid/pull/4973.| +|`org.apache.druid.client.cache.CacheMonitor`|Emits metrics (to logs) about the segment results cache for Historical and Broker nodes. Reports typical cache statistics include hits, misses, rates, and size (bytes and number of entries), as well as timeouts and and errors.| +|`org.apache.druid.java.util.metrics.SysMonitor`|This uses the [SIGAR library](https://github.com/hyperic/sigar) to report on various system activities and statuses.| +|`org.apache.druid.server.metrics.HistoricalMetricsMonitor`|Reports statistics on Historical nodes.| +|`org.apache.druid.java.util.metrics.JvmMonitor`|Reports various JVM-related statistics.| +|`org.apache.druid.java.util.metrics.JvmCpuMonitor`|Reports statistics of CPU consumption by the JVM.| +|`org.apache.druid.java.util.metrics.CpuAcctDeltaMonitor`|Reports consumed CPU as per the cpuacct cgroup.| +|`org.apache.druid.java.util.metrics.JvmThreadsMonitor`|Reports Thread statistics in the JVM, like numbers of total, daemon, started, died threads.| +|`org.apache.druid.segment.realtime.RealtimeMetricsMonitor`|Reports statistics on Realtime nodes.| +|`org.apache.druid.server.metrics.EventReceiverFirehoseMonitor`|Reports how many events have been queued in the EventReceiverFirehose.| +|`org.apache.druid.server.metrics.QueryCountStatsMonitor`|Reports how many queries have been successful/failed/interrupted.| +|`org.apache.druid.server.emitter.HttpEmittingMonitor`|Reports internal metrics of `http` or `parametrized` emitter (see below). Must not be used with another emitter type. See the description of the metrics here: https://github.com/apache/incubator-druid/pull/4973.| ### Emitting Metrics @@ -1032,7 +1032,7 @@ Middle managers pass their configurations down to their child peons. The middle |Property|Description|Default| |--------|-----------|-------| -|`druid.indexer.runner.allowedPrefixes`|Whitelist of prefixes for configs that can be passed down to child peons.|"com.metamx", "druid", "io.druid", "user.timezone", "file.encoding", "java.io.tmpdir", "hadoop"| +|`druid.indexer.runner.allowedPrefixes`|Whitelist of prefixes for configs that can be passed down to child peons.|"com.metamx", "druid", "org.apache.druid", "user.timezone", "file.encoding", "java.io.tmpdir", "hadoop"| |`druid.indexer.runner.compressZnodes`|Indicates whether or not the middle managers should compress Znodes.|true| |`druid.indexer.runner.classpath`|Java classpath for the peon.|System.getProperty("java.class.path")| |`druid.indexer.runner.javaCommand`|Command required to execute java.|java| @@ -1412,7 +1412,7 @@ Below are the configuration options known to this module: Here are the possible values for `druid.cache.cacheExecutorFactory`, which controls how maintenance tasks are run -* `COMMON_FJP` (default) use the common ForkJoinPool. Should use with [JRE 8u60 or higher](https://github.com/druid-io/druid/pull/4810#issuecomment-329922810). Older versions of the JRE may have worse performance than newer JRE versions. +* `COMMON_FJP` (default) use the common ForkJoinPool. Should use with [JRE 8u60 or higher](https://github.com/apache/incubator-druid/pull/4810#issuecomment-329922810). Older versions of the JRE may have worse performance than newer JRE versions. * `SINGLE_THREAD` Use a single-threaded executor. * `SAME_THREAD` Cache maintenance is done eagerly. diff --git a/docs/content/configuration/logging.md b/docs/content/configuration/logging.md index 285681399cd8..72adb3009d4a 100644 --- a/docs/content/configuration/logging.md +++ b/docs/content/configuration/logging.md @@ -26,7 +26,7 @@ An example log4j2.xml ships with Druid under config/_common/log4j2.xml, and a sa diff --git a/docs/content/design/broker.md b/docs/content/design/broker.md index 1c3c3469857b..bc674c5475d9 100644 --- a/docs/content/design/broker.md +++ b/docs/content/design/broker.md @@ -12,7 +12,7 @@ Running ------- ``` -io.druid.cli.Main server broker +org.apache.druid.cli.Main server broker ``` Forwarding Queries diff --git a/docs/content/design/coordinator.md b/docs/content/design/coordinator.md index 462c616232ef..74bcfb3114ac 100644 --- a/docs/content/design/coordinator.md +++ b/docs/content/design/coordinator.md @@ -14,7 +14,7 @@ Before any unassigned segments are serviced by historical nodes, the available h ### Running ``` -io.druid.cli.Main server coordinator +org.apache.druid.cli.Main server coordinator ``` Rules diff --git a/docs/content/design/historical.md b/docs/content/design/historical.md index 04f99dcbe7ed..5d09f7a839dd 100644 --- a/docs/content/design/historical.md +++ b/docs/content/design/historical.md @@ -11,7 +11,7 @@ Running ------- ``` -io.druid.cli.Main server historical +org.apache.druid.cli.Main server historical ``` Loading and Serving Segments diff --git a/docs/content/design/middlemanager.md b/docs/content/design/middlemanager.md index cc1de96f4f1e..288741400abe 100644 --- a/docs/content/design/middlemanager.md +++ b/docs/content/design/middlemanager.md @@ -14,7 +14,7 @@ Running ------- ``` -io.druid.cli.Main server middleManager +org.apache.druid.cli.Main server middleManager ``` HTTP Endpoints diff --git a/docs/content/design/peons.md b/docs/content/design/peons.md index 76bbc1f9fdb8..7aeaa0712035 100644 --- a/docs/content/design/peons.md +++ b/docs/content/design/peons.md @@ -16,7 +16,7 @@ Running The peon should very rarely ever be run independent of the middle manager unless for development purposes. ``` -io.druid.cli.Main internal peon +org.apache.druid.cli.Main internal peon ``` The task file contains the task JSON object. diff --git a/docs/content/design/realtime.md b/docs/content/design/realtime.md index 6d553f846358..8b7561e3a0c9 100644 --- a/docs/content/design/realtime.md +++ b/docs/content/design/realtime.md @@ -18,7 +18,7 @@ Realtime nodes provide a realtime index. Data indexed via these nodes is immedia ### Running ``` -io.druid.cli.Main server realtime +org.apache.druid.cli.Main server realtime ``` Segment Propagation ------------------- @@ -42,8 +42,8 @@ Extending the code Realtime integration is intended to be extended in two ways: -1. Connect to data streams from varied systems ([Firehose](https://github.com/druid-io/druid-api/blob/master/src/main/java/io/druid/data/input/FirehoseFactory.java)) -2. Adjust the publishing strategy to match your needs ([Plumber](https://github.com/druid-io/druid/blob/master/server/src/main/java/io/druid/segment/realtime/plumber/PlumberSchool.java)) +1. Connect to data streams from varied systems ([Firehose](https://github.com/apache/incubator-druid-api/blob/master/src/main/java/org/apache/druid/data/input/FirehoseFactory.java)) +2. Adjust the publishing strategy to match your needs ([Plumber](https://github.com/apache/incubator-druid/blob/master/server/src/main/java/org/apache/druid/segment/realtime/plumber/PlumberSchool.java)) The expectations are that the former will be very common and something that users of Druid will do on a fairly regular basis. Most users will probably never have to deal with the latter form of customization. Indeed, we hope that all potential use cases can be packaged up as part of Druid proper without requiring proprietary customization. diff --git a/docs/content/development/build.md b/docs/content/development/build.md index 849f78285e6e..a01b3c5a587a 100644 --- a/docs/content/development/build.md +++ b/docs/content/development/build.md @@ -5,7 +5,7 @@ layout: doc_page ### Build from Source You can build Druid directly from source. Please note that these instructions are for building the latest stable of Druid. -For building the latest code in master, follow the instructions [here](https://github.com/druid-io/druid/blob/master/docs/content/development/build.md). +For building the latest code in master, follow the instructions [here](https://github.com/apache/incubator-druid/blob/master/docs/content/development/build.md). Building Druid requires the following: - [JDK 8](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html) @@ -14,7 +14,7 @@ Building Druid requires the following: To do so, run these commands: ``` -git clone git@github.com:druid-io/druid.git +git clone git@github.com:apache/incubator-druid.git cd druid mvn clean package ``` diff --git a/docs/content/development/extensions-contrib/parquet.md b/docs/content/development/extensions-contrib/parquet.md index a0856c890005..45e3262c4480 100644 --- a/docs/content/development/extensions-contrib/parquet.md +++ b/docs/content/development/extensions-contrib/parquet.md @@ -10,7 +10,7 @@ This extension enables Druid to ingest and understand the Apache Parquet data fo ## Parquet Hadoop Parser -This is for batch ingestion using the HadoopDruidIndexer. The inputFormat of `inputSpec` in `ioConfig` must be set to `"io.druid.data.input.parquet.DruidParquetInputFormat"`. +This is for batch ingestion using the HadoopDruidIndexer. The inputFormat of `inputSpec` in `ioConfig` must be set to `"org.apache.druid.data.input.parquet.DruidParquetInputFormat"`. |Field | Type | Description | Required| |----------|-------------|----------------------------------------------------------------------------------------|---------| @@ -32,7 +32,7 @@ When posting the index job to the overlord, setting the correct `inputFormat` is "type": "hadoop", "inputSpec": { "type": "static", - "inputFormat": "io.druid.data.input.parquet.DruidParquetInputFormat", + "inputFormat": "org.apache.druid.data.input.parquet.DruidParquetInputFormat", "paths": "no_metrics" } }, @@ -86,7 +86,7 @@ HADOOP_CLASS_PATH=`hadoop classpath | sed s/*.jar/*/g` java -Xmx32m -Duser.timezone=UTC -Dfile.encoding=UTF-8 \ -classpath config/overlord:config/_common:lib/*:$HADOOP_CLASS_PATH:extensions/druid-avro-extensions/* \ - io.druid.cli.Main index hadoop \ + org.apache.druid.cli.Main index hadoop \ wikipedia_hadoop_parquet_job.json ``` @@ -100,7 +100,7 @@ An example index json when using the standalone JVM: "type": "hadoop", "inputSpec": { "type": "static", - "inputFormat": "io.druid.data.input.parquet.DruidParquetInputFormat", + "inputFormat": "org.apache.druid.data.input.parquet.DruidParquetInputFormat", "paths": "no_metrics" }, "metadataUpdateSpec": { diff --git a/docs/content/development/extensions-contrib/thrift.md b/docs/content/development/extensions-contrib/thrift.md index a25355b17aa3..cae98ac36a1c 100644 --- a/docs/content/development/extensions-contrib/thrift.md +++ b/docs/content/development/extensions-contrib/thrift.md @@ -31,7 +31,7 @@ You may want to use another version of thrift, change the dependency in pom and "granularitySpec": { }, "parser": { "type": "thrift", - "thriftClass": "io.druid.data.input.thrift.Book", + "thriftClass": "org.apache.druid.data.input.thrift.Book", "protocol": "compact", "parseSpec": { "format": "json", @@ -73,7 +73,7 @@ This is for batch ingestion using the HadoopDruidIndexer. The inputFormat of inp "parser": { "type": "thrift", "jarPath": "book.jar", - "thriftClass": "io.druid.data.input.thrift.Book", + "thriftClass": "org.apache.druid.data.input.thrift.Book", "protocol": "compact", "parseSpec": { "format": "json", diff --git a/docs/content/development/extensions-core/avro.md b/docs/content/development/extensions-core/avro.md index 57d6355b6e32..129c46e12bdb 100644 --- a/docs/content/development/extensions-core/avro.md +++ b/docs/content/development/extensions-core/avro.md @@ -64,7 +64,7 @@ This decoder can be used if all the input events can be read using the same sche "type": "schema_inline", "schema": { //your schema goes here, for example - "namespace": "io.druid.data", + "namespace": "org.apache.druid.data", "name": "User", "type": "record", "fields": [ @@ -87,7 +87,7 @@ This decoder can be used if different input events can have different read schem "schemas": { //your id -> schema map goes here, for example "1": { - "namespace": "io.druid.data", + "namespace": "org.apache.druid.data", "name": "User", "type": "record", "fields": [ @@ -96,7 +96,7 @@ This decoder can be used if different input events can have different read schem ] }, "2": { - "namespace": "io.druid.otherdata", + "namespace": "org.apache.druid.otherdata", "name": "UserIdentity", "type": "record", "fields": [ @@ -118,7 +118,7 @@ Note that it is essentially a map of integer schema ID to avro schema object. Th ##### SchemaRepo Based Avro Bytes Decoder -This Avro bytes decoder first extract `subject` and `id` from input message bytes, then use them to lookup the Avro schema with which to decode Avro record from bytes. Details can be found in [schema repo](https://github.com/schema-repo/schema-repo) and [AVRO-1124](https://issues.apache.org/jira/browse/AVRO-1124). You will need an http service like schema repo to hold the avro schema. Towards schema registration on the message producer side, you can refer to `io.druid.data.input.AvroStreamInputRowParserTest#testParse()`. +This Avro bytes decoder first extract `subject` and `id` from input message bytes, then use them to lookup the Avro schema with which to decode Avro record from bytes. Details can be found in [schema repo](https://github.com/schema-repo/schema-repo) and [AVRO-1124](https://issues.apache.org/jira/browse/AVRO-1124). You will need an http service like schema repo to hold the avro schema. Towards schema registration on the message producer side, you can refer to `org.apache.druid.data.input.AvroStreamInputRowParserTest#testParse()`. | Field | Type | Description | Required | |-------|------|-------------|----------| @@ -155,7 +155,7 @@ Details can be found in Schema Registry [documentation](http://docs.confluent.io ### Avro Hadoop Parser -This is for batch ingestion using the HadoopDruidIndexer. The `inputFormat` of `inputSpec` in `ioConfig` must be set to `"io.druid.data.input.avro.AvroValueInputFormat"`. You may want to set Avro reader's schema in `jobProperties` in `tuningConfig`, eg: `"avro.schema.input.value.path": "/path/to/your/schema.avsc"` or `"avro.schema.input.value": "your_schema_JSON_object"`, if reader's schema is not set, the schema in Avro object container file will be used, see [Avro specification](http://avro.apache.org/docs/1.7.7/spec.html#Schema+Resolution). Make sure to include "io.druid.extensions:druid-avro-extensions" as an extension. +This is for batch ingestion using the HadoopDruidIndexer. The `inputFormat` of `inputSpec` in `ioConfig` must be set to `"org.apache.druid.data.input.avro.AvroValueInputFormat"`. You may want to set Avro reader's schema in `jobProperties` in `tuningConfig`, eg: `"avro.schema.input.value.path": "/path/to/your/schema.avsc"` or `"avro.schema.input.value": "your_schema_JSON_object"`, if reader's schema is not set, the schema in Avro object container file will be used, see [Avro specification](http://avro.apache.org/docs/1.7.7/spec.html#Schema+Resolution). Make sure to include "org.apache.druid.extensions:druid-avro-extensions" as an extension. | Field | Type | Description | Required | |-------|------|-------------|----------| @@ -188,7 +188,7 @@ For example, using Avro Hadoop parser with custom reader's schema file: "type" : "hadoop", "inputSpec" : { "type" : "static", - "inputFormat": "io.druid.data.input.avro.AvroValueInputFormat", + "inputFormat": "org.apache.druid.data.input.avro.AvroValueInputFormat", "paths" : "" } }, diff --git a/docs/content/development/extensions-core/kafka-ingestion.md b/docs/content/development/extensions-core/kafka-ingestion.md index ed2e594d425b..a7db8d871070 100644 --- a/docs/content/development/extensions-core/kafka-ingestion.md +++ b/docs/content/development/extensions-core/kafka-ingestion.md @@ -327,4 +327,4 @@ events for the interval 13:00 - 14:00 may be split across previous and new set o one can schedule re-indexing tasks be run to merge segments together into new segments of an ideal size (in the range of ~500-700 MB per segment). Details on how to optimize the segment size can be found on [Segment size optimization](../../operations/segment-optimization.html). There is also ongoing work to support automatic segment compaction of sharded segments as well as compaction not requiring -Hadoop (see [here](https://github.com/druid-io/druid/pull/5102)). +Hadoop (see [here](https://github.com/apache/incubator-druid/pull/5102)). diff --git a/docs/content/development/extensions.md b/docs/content/development/extensions.md index 652901b2af38..1712e0484080 100644 --- a/docs/content/development/extensions.md +++ b/docs/content/development/extensions.md @@ -49,7 +49,7 @@ Community extensions are not maintained by Druid committers, although we accept A number of community members have contributed their own extensions to Druid that are not packaged with the default Druid tarball. If you'd like to take on maintenance for a community extension, please post on [dev@druid.apache.org](https://lists.apache.org/list.html?dev@druid.apache.org) to let us know! -All of these community extensions can be downloaded using *pull-deps* with the coordinate io.druid.extensions.contrib:EXTENSION_NAME:LATEST_DRUID_STABLE_VERSION. +All of these community extensions can be downloaded using *pull-deps* with the coordinate org.apache.druid.extensions.contrib:EXTENSION_NAME:LATEST_DRUID_STABLE_VERSION. |Name|Description|Docs| |----|-----------|----| diff --git a/docs/content/development/modules.md b/docs/content/development/modules.md index db529f3029a3..e1a0d6c612e4 100644 --- a/docs/content/development/modules.md +++ b/docs/content/development/modules.md @@ -10,24 +10,24 @@ Druid uses a module system that allows for the addition of extensions at runtime Druid's extensions leverage Guice in order to add things at runtime. Basically, Guice is a framework for Dependency Injection, but we use it to hold the expected object graph of the Druid process. Extensions can make any changes they want/need to the object graph via adding Guice bindings. While the extensions actually give you the capability to change almost anything however you want, in general, we expect people to want to extend one of the things listed below. This means that we honor our [versioning strategy](./versioning.html) for changes that affect the interfaces called out on this page, but other interfaces are deemed "internal" and can be changed in an incompatible manner even between patch releases. -1. Add a new deep storage implementation by extending the `io.druid.segment.loading.DataSegment*` and - `io.druid.tasklogs.TaskLog*` classes. -1. Add a new Firehose by extending `io.druid.data.input.FirehoseFactory`. -1. Add a new input parser by extending `io.druid.data.input.impl.InputRowParser`. -1. Add a new string-based input format by extending `io.druid.data.input.impl.ParseSpec`. -1. Add Aggregators by extending `io.druid.query.aggregation.AggregatorFactory`, `io.druid.query.aggregation.Aggregator`, - and `io.druid.query.aggregation.BufferAggregator`. -1. Add PostAggregators by extending `io.druid.query.aggregation.PostAggregator`. -1. Add ExtractionFns by extending `io.druid.query.extraction.ExtractionFn`. -1. Add Complex metrics by extending `io.druid.segment.serde.ComplexMetricsSerde`. -1. Add new Query types by extending `io.druid.query.QueryRunnerFactory`, `io.druid.query.QueryToolChest`, and - `io.druid.query.Query`. +1. Add a new deep storage implementation by extending the `org.apache.druid.segment.loading.DataSegment*` and + `org.apache.druid.tasklogs.TaskLog*` classes. +1. Add a new Firehose by extending `org.apache.druid.data.input.FirehoseFactory`. +1. Add a new input parser by extending `org.apache.druid.data.input.impl.InputRowParser`. +1. Add a new string-based input format by extending `org.apache.druid.data.input.impl.ParseSpec`. +1. Add Aggregators by extending `org.apache.druid.query.aggregation.AggregatorFactory`, `org.apache.druid.query.aggregation.Aggregator`, + and `org.apache.druid.query.aggregation.BufferAggregator`. +1. Add PostAggregators by extending `org.apache.druid.query.aggregation.PostAggregator`. +1. Add ExtractionFns by extending `org.apache.druid.query.extraction.ExtractionFn`. +1. Add Complex metrics by extending `org.apache.druid.segment.serde.ComplexMetricsSerde`. +1. Add new Query types by extending `org.apache.druid.query.QueryRunnerFactory`, `org.apache.druid.query.QueryToolChest`, and + `org.apache.druid.query.Query`. 1. Add new Jersey resources by calling `Jerseys.addResource(binder, clazz)`. -1. Add new Jetty filters by extending `io.druid.server.initialization.jetty.ServletFilterHolder`. -1. Add new secret providers by extending `io.druid.metadata.PasswordProvider`. +1. Add new Jetty filters by extending `org.apache.druid.server.initialization.jetty.ServletFilterHolder`. +1. Add new secret providers by extending `org.apache.druid.metadata.PasswordProvider`. 1. Bundle your extension with all the other Druid extensions -Extensions are added to the system via an implementation of `io.druid.initialization.DruidModule`. +Extensions are added to the system via an implementation of `org.apache.druid.initialization.DruidModule`. ### Creating a Druid Module @@ -46,12 +46,12 @@ Once you have your DruidModule created, you will need to package an extra file i The file that should exist in your jar is -`META-INF/services/io.druid.initialization.DruidModule` +`META-INF/services/org.apache.druid.initialization.DruidModule` It should be a text file with a new-line delimited list of package-qualified classes that implement DruidModule like ``` -io.druid.storage.cassandra.CassandraDruidModule +org.apache.druid.storage.cassandra.CassandraDruidModule ``` If your jar has this file, then when it is added to the classpath or as an extension, Druid will notice the file and will instantiate instances of the Module. Your Module should have a default constructor, but if you need access to runtime configuration properties, it can have a method with @Inject on it to get a Properties object injected into it from Guice. @@ -103,20 +103,20 @@ After ~20 secs your ingestion task ends, you should be able to see your historic The following example was retrieved from a historical node configured to use Azure for deep storage: ``` -2015-04-14T02:42:33,450 INFO [ZkCoordinator-0] io.druid.server.coordination.ZkCoordinator - New request[LOAD: dde_2015-01-02T00:00:00.000Z_2015-01-03T00:00:00 +2015-04-14T02:42:33,450 INFO [ZkCoordinator-0] org.apache.druid.server.coordination.ZkCoordinator - New request[LOAD: dde_2015-01-02T00:00:00.000Z_2015-01-03T00:00:00 .000Z_2015-04-14T02:41:09.484Z] with zNode[/druid/dev/loadQueue/192.168.33.104:8081/dde_2015-01-02T00:00:00.000Z_2015-01-03T00:00:00.000Z_2015-04-14T02:41:09. 484Z]. -2015-04-14T02:42:33,451 INFO [ZkCoordinator-0] io.druid.server.coordination.ZkCoordinator - Loading segment dde_2015-01-02T00:00:00.000Z_2015-01-03T00:00:00.0 +2015-04-14T02:42:33,451 INFO [ZkCoordinator-0] org.apache.druid.server.coordination.ZkCoordinator - Loading segment dde_2015-01-02T00:00:00.000Z_2015-01-03T00:00:00.0 00Z_2015-04-14T02:41:09.484Z -2015-04-14T02:42:33,463 INFO [ZkCoordinator-0] io.druid.guice.JsonConfigurator - Loaded class[class io.druid.storage.azure.AzureAccountConfig] from props[drui -d.azure.] as [io.druid.storage.azure.AzureAccountConfig@759c9ad9] -2015-04-14T02:49:08,275 INFO [ZkCoordinator-0] io.druid.java.util.common.CompressionUtils - Unzipping file[/opt/druid/tmp/compressionUtilZipCache1263964429587449785.z +2015-04-14T02:42:33,463 INFO [ZkCoordinator-0] org.apache.druid.guice.JsonConfigurator - Loaded class[class org.apache.druid.storage.azure.AzureAccountConfig] from props[drui +d.azure.] as [org.apache.druid.storage.azure.AzureAccountConfig@759c9ad9] +2015-04-14T02:49:08,275 INFO [ZkCoordinator-0] org.apache.druid.java.util.common.CompressionUtils - Unzipping file[/opt/druid/tmp/compressionUtilZipCache1263964429587449785.z ip] to [/opt/druid/zk_druid/dde/2015-01-02T00:00:00.000Z_2015-01-03T00:00:00.000Z/2015-04-14T02:41:09.484Z/0] -2015-04-14T02:49:08,276 INFO [ZkCoordinator-0] io.druid.storage.azure.AzureDataSegmentPuller - Loaded 1196 bytes from [dde/2015-01-02T00:00:00.000Z_2015-01-03 +2015-04-14T02:49:08,276 INFO [ZkCoordinator-0] org.apache.druid.storage.azure.AzureDataSegmentPuller - Loaded 1196 bytes from [dde/2015-01-02T00:00:00.000Z_2015-01-03 T00:00:00.000Z/2015-04-14T02:41:09.484Z/0/index.zip] to [/opt/druid/zk_druid/dde/2015-01-02T00:00:00.000Z_2015-01-03T00:00:00.000Z/2015-04-14T02:41:09.484Z/0] -2015-04-14T02:49:08,277 WARN [ZkCoordinator-0] io.druid.segment.loading.SegmentLoaderLocalCacheManager - Segment [dde_2015-01-02T00:00:00.000Z_2015-01-03T00:00:00.000Z_2015-04-14T02:41:09.484Z] is different than expected size. Expected [0] found [1196] -2015-04-14T02:49:08,282 INFO [ZkCoordinator-0] io.druid.server.coordination.BatchDataSegmentAnnouncer - Announcing segment[dde_2015-01-02T00:00:00.000Z_2015-01-03T00:00:00.000Z_2015-04-14T02:41:09.484Z] at path[/druid/dev/segments/192.168.33.104:8081/192.168.33.104:8081_historical__default_tier_2015-04-14T02:49:08.282Z_7bb87230ebf940188511dd4a53ffd7351] -2015-04-14T02:49:08,292 INFO [ZkCoordinator-0] io.druid.server.coordination.ZkCoordinator - Completed request [LOAD: dde_2015-01-02T00:00:00.000Z_2015-01-03T00:00:00.000Z_2015-04-14T02:41:09.484Z] +2015-04-14T02:49:08,277 WARN [ZkCoordinator-0] org.apache.druid.segment.loading.SegmentLoaderLocalCacheManager - Segment [dde_2015-01-02T00:00:00.000Z_2015-01-03T00:00:00.000Z_2015-04-14T02:41:09.484Z] is different than expected size. Expected [0] found [1196] +2015-04-14T02:49:08,282 INFO [ZkCoordinator-0] org.apache.druid.server.coordination.BatchDataSegmentAnnouncer - Announcing segment[dde_2015-01-02T00:00:00.000Z_2015-01-03T00:00:00.000Z_2015-04-14T02:41:09.484Z] at path[/druid/dev/segments/192.168.33.104:8081/192.168.33.104:8081_historical__default_tier_2015-04-14T02:49:08.282Z_7bb87230ebf940188511dd4a53ffd7351] +2015-04-14T02:49:08,292 INFO [ZkCoordinator-0] org.apache.druid.server.coordination.ZkCoordinator - Completed request [LOAD: dde_2015-01-02T00:00:00.000Z_2015-01-03T00:00:00.000Z_2015-04-14T02:41:09.484Z] ``` * DataSegmentKiller @@ -161,9 +161,9 @@ Adding ComplexMetrics is a little ugly in the current version. The method of ge Adding a new Query type requires the implementation of three interfaces. -1. `io.druid.query.Query` -1. `io.druid.query.QueryToolChest` -1. `io.druid.query.QueryRunnerFactory` +1. `org.apache.druid.query.Query` +1. `org.apache.druid.query.QueryToolChest` +1. `org.apache.druid.query.QueryRunnerFactory` Registering these uses the same general strategy as a deep storage mechanism does. You do something like @@ -189,9 +189,9 @@ Jerseys.addResource(binder, NewResource.class); ### Adding a new Password Provider implementation -You will need to implement `io.druid.metadata.PasswordProvider` interface. For every place where Druid uses PasswordProvider, a new instance of the implementation will be created, +You will need to implement `org.apache.druid.metadata.PasswordProvider` interface. For every place where Druid uses PasswordProvider, a new instance of the implementation will be created, thus make sure all the necessary information required for fetching each password is supplied during object instantiation. -In your implementation of `io.druid.initialization.DruidModule`, `getJacksonModules` should look something like this - +In your implementation of `org.apache.druid.initialization.DruidModule`, `getJacksonModules` should look something like this - ``` java return ImmutableList.of( @@ -202,14 +202,14 @@ In your implementation of `io.druid.initialization.DruidModule`, `getJacksonModu ); ``` -where `SomePasswordProvider` is the implementation of `PasswordProvider` interface, you can have a look at `io.druid.metadata.EnvironmentVariablePasswordProvider` for example. +where `SomePasswordProvider` is the implementation of `PasswordProvider` interface, you can have a look at `org.apache.druid.metadata.EnvironmentVariablePasswordProvider` for example. ### Bundle your extension with all the other Druid extensions When you do `mvn install`, Druid extensions will be packaged within the Druid tarball and `extensions` directory, which are both underneath `distribution/target/`. If you want your extension to be included, you can add your extension's maven coordinate as an argument at -[distribution/pom.xml](https://github.com/druid-io/druid/blob/master/distribution/pom.xml#L95) +[distribution/pom.xml](https://github.com/apache/incubator-druid/blob/master/distribution/pom.xml#L95) During `mvn install`, maven will install your extension to the local maven repository, and then call [pull-deps](../operations/pull-deps.html) to pull your extension from there. In the end, you should see your extension underneath `distribution/target/extensions` and within Druid tarball. @@ -218,7 +218,7 @@ there. In the end, you should see your extension underneath `distribution/target Managing library collisions can be daunting for extensions which draw in commonly used libraries. Here is a list of group IDs for libraries that are suggested to be specified with a `provided` scope to prevent collision with versions used in druid: ``` -"io.druid", +"org.apache.druid", "com.metamx.druid", "asm", "org.ow2.asm", @@ -250,4 +250,4 @@ Managing library collisions can be daunting for extensions which draw in commonl "org.roaringbitmap", "net.java.dev.jets3t" ``` -See the documentation in `io.druid.cli.PullDependencies` for more information. +See the documentation in `org.apache.druid.cli.PullDependencies` for more information. diff --git a/docs/content/development/router.md b/docs/content/development/router.md index 51619776878b..1635d594e02a 100644 --- a/docs/content/development/router.md +++ b/docs/content/development/router.md @@ -11,7 +11,7 @@ Running ------- ``` -io.druid.cli.Main server router +org.apache.druid.cli.Main server router ``` Example Production Configuration diff --git a/docs/content/development/versioning.md b/docs/content/development/versioning.md index 6de74d79b351..e58230b4d548 100644 --- a/docs/content/development/versioning.md +++ b/docs/content/development/versioning.md @@ -22,4 +22,4 @@ For external deployments, we recommend running the stable release tag. Releases Tagging strategy ---------------- -Tags of the codebase are equivalent to release candidates. We tag the code every time we want to take it through our release process, which includes some QA cycles and deployments. So, it is not safe to assume that a tag is a stable release, it is a solidification of the code as it goes through our production QA cycle and deployment. Tags will never change, but we often go through a number of iterations of tags before actually getting a stable release onto production. So, it is recommended that if you are not aware of what is on a tag, to stick to the stable releases listed on the [Release](https://github.com/druid-io/druid/releases) page. +Tags of the codebase are equivalent to release candidates. We tag the code every time we want to take it through our release process, which includes some QA cycles and deployments. So, it is not safe to assume that a tag is a stable release, it is a solidification of the code as it goes through our production QA cycle and deployment. Tags will never change, but we often go through a number of iterations of tags before actually getting a stable release onto production. So, it is recommended that if you are not aware of what is on a tag, to stick to the stable releases listed on the [Release](https://github.com/apache/incubator-druid/releases) page. diff --git a/docs/content/ingestion/command-line-hadoop-indexer.md b/docs/content/ingestion/command-line-hadoop-indexer.md index 90422c53380c..7f83ec22174d 100644 --- a/docs/content/ingestion/command-line-hadoop-indexer.md +++ b/docs/content/ingestion/command-line-hadoop-indexer.md @@ -7,7 +7,7 @@ layout: doc_page To run: ``` -java -Xmx256m -Duser.timezone=UTC -Dfile.encoding=UTF-8 -classpath lib/*: io.druid.cli.Main index hadoop +java -Xmx256m -Duser.timezone=UTC -Dfile.encoding=UTF-8 -classpath lib/*: org.apache.druid.cli.Main index hadoop ``` ## Options diff --git a/docs/content/ingestion/schema-design.md b/docs/content/ingestion/schema-design.md index b768649f80a4..37dae1baeb08 100644 --- a/docs/content/ingestion/schema-design.md +++ b/docs/content/ingestion/schema-design.md @@ -83,7 +83,7 @@ You should query for the number of ingested rows with: ## Schema-less dimensions If the `dimensions` field is left empty in your ingestion spec, Druid will treat every column that is not the timestamp column, -a dimension that has been excluded, or a metric column as a dimension. It should be noted that because of [#658](https://github.com/druid-io/druid/issues/658) +a dimension that has been excluded, or a metric column as a dimension. It should be noted that because of [#658](https://github.com/apache/incubator-druid/issues/658) these segments will be slightly larger than if the list of dimensions was explicitly specified in lexicographic order. This limitation does not impact query correctness- just storage requirements. diff --git a/docs/content/ingestion/stream-pull.md b/docs/content/ingestion/stream-pull.md index a0799ee31ad9..6fbd6b52088c 100644 --- a/docs/content/ingestion/stream-pull.md +++ b/docs/content/ingestion/stream-pull.md @@ -159,7 +159,7 @@ The tuningConfig is optional and default parameters will be used if no tuningCon |dedupColumn|String|the column to judge whether this row is already in this segment, if so, throw away this row. If it is String type column, to reduce heap cost, use long type hashcode of this column's value to judge whether this row is already ingested, so there maybe very small chance to throw away a row that is not ingested before.|no (default == null)| |indexSpec|Object|Tune how data is indexed. See below for more information.|no| -Before enabling thread priority settings, users are highly encouraged to read the [original pull request](https://github.com/druid-io/druid/pull/984) and other documentation about proper use of `-XX:+UseThreadPriorities`. +Before enabling thread priority settings, users are highly encouraged to read the [original pull request](https://github.com/apache/incubator-druid/pull/984) and other documentation about proper use of `-XX:+UseThreadPriorities`. #### Rejection Policy diff --git a/docs/content/operations/dump-segment.md b/docs/content/operations/dump-segment.md index 443ed2f436b8..e8bcde9159a2 100644 --- a/docs/content/operations/dump-segment.md +++ b/docs/content/operations/dump-segment.md @@ -10,7 +10,7 @@ complex metric values may not be complete. To run the tool, point it at a segment directory and provide a file for writing output: ``` -java io.druid.cli.Main tools dump-segment \ +java org.apache.druid.cli.Main tools dump-segment \ --directory /home/druid/path/to/segment/ \ --out /home/druid/output.txt ``` diff --git a/docs/content/operations/including-extensions.md b/docs/content/operations/including-extensions.md index bd4a1a8a24f1..dbefc5cde2b5 100644 --- a/docs/content/operations/including-extensions.md +++ b/docs/content/operations/including-extensions.md @@ -42,7 +42,7 @@ java \ -cp "lib/*" \ -Ddruid.extensions.directory="extensions" \ -Ddruid.extensions.hadoopDependenciesDir="hadoop-dependencies" \ - io.druid.cli.Main tools pull-deps \ + org.apache.druid.cli.Main tools pull-deps \ --no-default-hadoop \ -c "com.example:druid-example-extension:1.0.0" ``` @@ -55,7 +55,7 @@ Please make sure all the Extensions related configuration properties listed
-The Maven groupId for almost every community extension is io.druid.extensions.contrib. The artifactId is the name +The Maven groupId for almost every community extension is org.apache.druid.extensions.contrib. The artifactId is the name of the extension, and the version is the latest Druid stable version.
diff --git a/docs/content/operations/insert-segment-to-db.md b/docs/content/operations/insert-segment-to-db.md index cd5ba2264aeb..1256acab8588 100644 --- a/docs/content/operations/insert-segment-to-db.md +++ b/docs/content/operations/insert-segment-to-db.md @@ -100,7 +100,7 @@ java -Ddruid.extensions.loadList=[\"mysql-metadata-storage\",\"druid-hdfs-storage\"] -Ddruid.storage.type=hdfs -cp $DRUID_CLASSPATH -io.druid.cli.Main tools insert-segment-to-db --workingDir hdfs://host:port//druid/storage/wikipedia --updateDescriptor true +org.apache.druid.cli.Main tools insert-segment-to-db --workingDir hdfs://host:port//druid/storage/wikipedia --updateDescriptor true ``` In this example, `mysql` and deep storage type are provided through Java JVM arguments, you can optionally put all @@ -127,7 +127,7 @@ java -Ddruid.storage.baseKey=druid/storage/wikipedia -Ddruid.storage.maxListingLength=1000 -cp $DRUID_CLASSPATH -io.druid.cli.Main tools insert-segment-to-db --workingDir "druid/storage/wikipedia" --updateDescriptor true +org.apache.druid.cli.Main tools insert-segment-to-db --workingDir "druid/storage/wikipedia" --updateDescriptor true ``` Note that you can provide the location of segments with either `druid.storage.baseKey` or `--workingDir`. If both are diff --git a/docs/content/operations/metrics.md b/docs/content/operations/metrics.md index 6dc3e0f98578..4621ac8c6c9d 100644 --- a/docs/content/operations/metrics.md +++ b/docs/content/operations/metrics.md @@ -165,7 +165,7 @@ These metrics are for the Druid coordinator and are reset each time the coordina |`segment/unavailable/count`|Number of segments (not including replicas) left to load until segments that should be loaded in the cluster are available for queries.|datasource.|0| |`segment/underReplicated/count`|Number of segments (including replicas) left to load until segments that should be loaded in the cluster are available for queries.|tier, datasource.|0| -If `emitBalancingStats` is set to `true` in the coordinator [dynamic configuration](../configuration/coordinator.html#dynamic-configuration), then [log entries](../configuration/logging.html) for class `io.druid.server.coordinator.helper.DruidCoordinatorLogger` will have extra information on balancing decisions. +If `emitBalancingStats` is set to `true` in the coordinator [dynamic configuration](../configuration/coordinator.html#dynamic-configuration), then [log entries](../configuration/logging.html) for class `org.apache.druid.server.coordinator.helper.DruidCoordinatorLogger` will have extra information on balancing decisions. ## General Health diff --git a/docs/content/operations/other-hadoop.md b/docs/content/operations/other-hadoop.md index 52c5eb4931a1..7967349fdced 100644 --- a/docs/content/operations/other-hadoop.md +++ b/docs/content/operations/other-hadoop.md @@ -195,25 +195,25 @@ If sbt is not your choice, you can also use `maven-shade-plugin` to make a fat j ```xml - io.druid.extensions + org.apache.druid.extensions druid-avro-extensions ${project.parent.version} - io.druid.extensions.contrib + org.apache.druid.extensions.contrib druid-parquet-extensions ${project.parent.version} - io.druid.extensions + org.apache.druid.extensions druid-hdfs-storage ${project.parent.version} - io.druid.extensions + org.apache.druid.extensions mysql-metadata-storage ${project.parent.version} @@ -274,6 +274,6 @@ java -Xmx32m \ -Dfile.encoding=UTF-8 -Duser.timezone=UTC \ -classpath config/hadoop:config/overlord:config/_common:$SELF_CONTAINED_JAR:$HADOOP_DISTRIBUTION/etc/hadoop \ -Djava.security.krb5.conf=$KRB5 \ - io.druid.cli.Main index hadoop \ + org.apache.druid.cli.Main index hadoop \ $config_path ``` diff --git a/docs/content/operations/performance-faq.md b/docs/content/operations/performance-faq.md index 1c27c0d3eb94..855e6674b623 100644 --- a/docs/content/operations/performance-faq.md +++ b/docs/content/operations/performance-faq.md @@ -54,17 +54,17 @@ Yes, using a `log4j2.xml` similar to the following causes some of the more chatt - + - + - + - + diff --git a/docs/content/operations/pull-deps.md b/docs/content/operations/pull-deps.md index e2444d4e7876..51070fb0ba93 100644 --- a/docs/content/operations/pull-deps.md +++ b/docs/content/operations/pull-deps.md @@ -10,7 +10,7 @@ layout: doc_page `-c` or `--coordinate` (Can be specified multiply times) -Extension coordinate to pull down, followed by a maven coordinate, e.g. io.druid.extensions:mysql-metadata-storage +Extension coordinate to pull down, followed by a maven coordinate, e.g. org.apache.druid.extensions:mysql-metadata-storage `-h` or `--hadoop-coordinate` (Can be specified multiply times) @@ -38,7 +38,7 @@ Don't use the default remote repositories, only use the repositories provided di `-d` or `--defaultVersion` -Version to use for extension coordinate that doesn't have a version information. For example, if extension coordinate is `io.druid.extensions:mysql-metadata-storage`, and default version is `#{DRUIDVERSION}`, then this coordinate will be treated as `io.druid.extensions:mysql-metadata-storage:#{DRUIDVERSION}` +Version to use for extension coordinate that doesn't have a version information. For example, if extension coordinate is `org.apache.druid.extensions:mysql-metadata-storage`, and default version is `#{DRUIDVERSION}`, then this coordinate will be treated as `org.apache.druid.extensions:mysql-metadata-storage:#{DRUIDVERSION}` `--use-proxy` @@ -72,10 +72,10 @@ To run `pull-deps`, you should Example: -Suppose you want to download ```druid-rabbitmq```, ```mysql-metadata-storage``` and ```hadoop-client```(both 2.3.0 and 2.4.0) with a specific version, you can run `pull-deps` command with `-c io.druid.extensions:druid-examples:#{DRUIDVERSION}`, `-c io.druid.extensions:mysql-metadata-storage:#{DRUIDVERSION}`, `-h org.apache.hadoop:hadoop-client:2.3.0` and `-h org.apache.hadoop:hadoop-client:2.4.0`, an example command would be: +Suppose you want to download ```druid-rabbitmq```, ```mysql-metadata-storage``` and ```hadoop-client```(both 2.3.0 and 2.4.0) with a specific version, you can run `pull-deps` command with `-c org.apache.druid.extensions:druid-examples:#{DRUIDVERSION}`, `-c org.apache.druid.extensions:mysql-metadata-storage:#{DRUIDVERSION}`, `-h org.apache.hadoop:hadoop-client:2.3.0` and `-h org.apache.hadoop:hadoop-client:2.4.0`, an example command would be: ``` -java -classpath "/my/druid/lib/*" io.druid.cli.Main tools pull-deps --clean -c io.druid.extensions:mysql-metadata-storage:#{DRUIDVERSION} -c io.druid.extensions.contrib:druid-rabbitmq:#{DRUIDVERSION} -h org.apache.hadoop:hadoop-client:2.3.0 -h org.apache.hadoop:hadoop-client:2.4.0 +java -classpath "/my/druid/lib/*" org.apache.druid.cli.Main tools pull-deps --clean -c org.apache.druid.extensions:mysql-metadata-storage:#{DRUIDVERSION} -c org.apache.druid.extensions.contrib:druid-rabbitmq:#{DRUIDVERSION} -h org.apache.hadoop:hadoop-client:2.3.0 -h org.apache.hadoop:hadoop-client:2.4.0 ``` Because `--clean` is supplied, this command will first remove the directories specified at `druid.extensions.directory` and `druid.extensions.hadoopDependenciesDir`, then recreate them and start downloading the extensions there. After finishing downloading, if you go to the extension directories you specified, you will see @@ -123,11 +123,11 @@ hadoop-dependencies/ Note that if you specify `--defaultVersion`, you don't have to put version information in the coordinate. For example, if you want both `druid-rabbitmq` and `mysql-metadata-storage` to use version `#{DRUIDVERSION}`, you can change the command above to ``` -java -classpath "/my/druid/lib/*" io.druid.cli.Main tools pull-deps --defaultVersion #{DRUIDVERSION} --clean -c io.druid.extensions:mysql-metadata-storage -c io.druid.extensions.contrib:druid-rabbitmq -h org.apache.hadoop:hadoop-client:2.3.0 -h org.apache.hadoop:hadoop-client:2.4.0 +java -classpath "/my/druid/lib/*" org.apache.druid.cli.Main tools pull-deps --defaultVersion #{DRUIDVERSION} --clean -c org.apache.druid.extensions:mysql-metadata-storage -c org.apache.druid.extensions.contrib:druid-rabbitmq -h org.apache.hadoop:hadoop-client:2.3.0 -h org.apache.hadoop:hadoop-client:2.4.0 ```
Please note to use the pull-deps tool you must know the Maven groupId, artifactId, and version of your extension. -For Druid community extensions listed here, the groupId is "io.druid.extensions.contrib" and the artifactId is the name of the extension. +For Druid community extensions listed here, the groupId is "org.apache.druid.extensions.contrib" and the artifactId is the name of the extension.
diff --git a/docs/content/operations/recommendations.md b/docs/content/operations/recommendations.md index e39cb08b3bf1..e81f3fca9f56 100644 --- a/docs/content/operations/recommendations.md +++ b/docs/content/operations/recommendations.md @@ -16,7 +16,7 @@ JVM Flags: -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager -Dorg.jboss.logging.provider=slf4j -Dnet.spy.log.LoggerImpl=net.spy.memcached.compat.log.SLF4JLogger --Dlog4j.shutdownCallbackRegistry=io.druid.common.config.Log4jShutdown +-Dlog4j.shutdownCallbackRegistry=org.apache.druid.common.config.Log4jShutdown -Dlog4j.shutdownHookEnabled=true -XX:+PrintGCDetails -XX:+PrintGCDateStamps diff --git a/docs/content/operations/reset-cluster.md b/docs/content/operations/reset-cluster.md index 5af566ac9674..2e7fc32b2097 100644 --- a/docs/content/operations/reset-cluster.md +++ b/docs/content/operations/reset-cluster.md @@ -12,20 +12,20 @@ used in the command must have all the necessary druid configuration files. It can be run in one of the following ways. ``` -java io.druid.cli.Main tools reset-cluster [--metadataStore] [--segmentFiles] [--taskLogs] [--hadoopWorkingPath] +java org.apache.druid.cli.Main tools reset-cluster [--metadataStore] [--segmentFiles] [--taskLogs] [--hadoopWorkingPath] ``` or ``` -java io.druid.cli.Main tools reset-cluster --all +java org.apache.druid.cli.Main tools reset-cluster --all ``` # Further Description Usage documentation can be printed by running following command. ``` -java io.druid.cli.Main help tools reset-cluster +java org.apache.druid.cli.Main help tools reset-cluster ``` ``` diff --git a/docs/content/operations/tls-support.md b/docs/content/operations/tls-support.md index e08f64566899..bc004b1da62b 100644 --- a/docs/content/operations/tls-support.md +++ b/docs/content/operations/tls-support.md @@ -52,7 +52,7 @@ Since, there are various ways to configure SSLContext, by default, Druid looks f while creating the HttpClient. This binding can be achieved writing a [Druid extension](../development/extensions.html) which can provide an instance of SSLContext. Druid comes with a simple extension present [here](../development/extensions-core/simple-client-sslcontext.html) which should be useful enough for most simple cases, see [this](./including-extensions.html) for how to include extensions. -If this extension does not satisfy the requirements then please follow the extension [implementation](https://github.com/druid-io/druid/tree/master/extensions-core/simple-client-sslcontext) +If this extension does not satisfy the requirements then please follow the extension [implementation](https://github.com/apache/incubator-druid/tree/master/extensions-core/simple-client-sslcontext) to create your own extension. # Upgrading Clients that interact with Overlord or Coordinator diff --git a/docs/content/operations/use_sbt_to_build_fat_jar.md b/docs/content/operations/use_sbt_to_build_fat_jar.md index 653a6ac1ef68..2a92ec359bb0 100644 --- a/docs/content/operations/use_sbt_to_build_fat_jar.md +++ b/docs/content/operations/use_sbt_to_build_fat_jar.md @@ -9,7 +9,7 @@ libraryDependencies ++= Seq( "com.amazonaws" % "aws-java-sdk" % "1.9.23" exclude("common-logging", "common-logging"), "org.joda" % "joda-convert" % "1.7", "joda-time" % "joda-time" % "2.7", - "io.druid" % "druid" % "0.8.1" excludeAll ( + "org.apache.druid" % "druid" % "0.8.1" excludeAll ( ExclusionRule("org.ow2.asm"), ExclusionRule("com.fasterxml.jackson.core"), ExclusionRule("com.fasterxml.jackson.datatype"), @@ -17,7 +17,7 @@ libraryDependencies ++= Seq( ExclusionRule("com.fasterxml.jackson.jaxrs"), ExclusionRule("com.fasterxml.jackson.module") ), - "io.druid" % "druid-services" % "0.8.1" excludeAll ( + "org.apache.druid" % "druid-services" % "0.8.1" excludeAll ( ExclusionRule("org.ow2.asm"), ExclusionRule("com.fasterxml.jackson.core"), ExclusionRule("com.fasterxml.jackson.datatype"), @@ -25,7 +25,7 @@ libraryDependencies ++= Seq( ExclusionRule("com.fasterxml.jackson.jaxrs"), ExclusionRule("com.fasterxml.jackson.module") ), - "io.druid" % "druid-indexing-service" % "0.8.1" excludeAll ( + "org.apache.druid" % "druid-indexing-service" % "0.8.1" excludeAll ( ExclusionRule("org.ow2.asm"), ExclusionRule("com.fasterxml.jackson.core"), ExclusionRule("com.fasterxml.jackson.datatype"), @@ -33,7 +33,7 @@ libraryDependencies ++= Seq( ExclusionRule("com.fasterxml.jackson.jaxrs"), ExclusionRule("com.fasterxml.jackson.module") ), - "io.druid" % "druid-indexing-hadoop" % "0.8.1" excludeAll ( + "org.apache.druid" % "druid-indexing-hadoop" % "0.8.1" excludeAll ( ExclusionRule("org.ow2.asm"), ExclusionRule("com.fasterxml.jackson.core"), ExclusionRule("com.fasterxml.jackson.datatype"), @@ -41,7 +41,7 @@ libraryDependencies ++= Seq( ExclusionRule("com.fasterxml.jackson.jaxrs"), ExclusionRule("com.fasterxml.jackson.module") ), - "io.druid.extensions" % "mysql-metadata-storage" % "0.8.1" excludeAll ( + "org.apache.druid.extensions" % "mysql-metadata-storage" % "0.8.1" excludeAll ( ExclusionRule("org.ow2.asm"), ExclusionRule("com.fasterxml.jackson.core"), ExclusionRule("com.fasterxml.jackson.datatype"), @@ -49,7 +49,7 @@ libraryDependencies ++= Seq( ExclusionRule("com.fasterxml.jackson.jaxrs"), ExclusionRule("com.fasterxml.jackson.module") ), - "io.druid.extensions" % "druid-s3-extensions" % "0.8.1" excludeAll ( + "org.apache.druid.extensions" % "druid-s3-extensions" % "0.8.1" excludeAll ( ExclusionRule("org.ow2.asm"), ExclusionRule("com.fasterxml.jackson.core"), ExclusionRule("com.fasterxml.jackson.datatype"), @@ -57,7 +57,7 @@ libraryDependencies ++= Seq( ExclusionRule("com.fasterxml.jackson.jaxrs"), ExclusionRule("com.fasterxml.jackson.module") ), - "io.druid.extensions" % "druid-histogram" % "0.8.1" excludeAll ( + "org.apache.druid.extensions" % "druid-histogram" % "0.8.1" excludeAll ( ExclusionRule("org.ow2.asm"), ExclusionRule("com.fasterxml.jackson.core"), ExclusionRule("com.fasterxml.jackson.datatype"), @@ -65,7 +65,7 @@ libraryDependencies ++= Seq( ExclusionRule("com.fasterxml.jackson.jaxrs"), ExclusionRule("com.fasterxml.jackson.module") ), - "io.druid.extensions" % "druid-hdfs-storage" % "0.8.1" excludeAll ( + "org.apache.druid.extensions" % "druid-hdfs-storage" % "0.8.1" excludeAll ( ExclusionRule("org.ow2.asm"), ExclusionRule("com.fasterxml.jackson.core"), ExclusionRule("com.fasterxml.jackson.datatype"), diff --git a/docs/content/tutorials/cluster.md b/docs/content/tutorials/cluster.md index 68037d400acf..b573433481ee 100644 --- a/docs/content/tutorials/cluster.md +++ b/docs/content/tutorials/cluster.md @@ -305,8 +305,8 @@ In production, we also recommend running a ZooKeeper cluster on its own dedicate On your coordination server, *cd* into the distribution and start up the coordination services (you should do this in different windows or pipe the log to a file): ```bash -java `cat conf/druid/coordinator/jvm.config | xargs` -cp conf/druid/_common:conf/druid/coordinator:lib/* io.druid.cli.Main server coordinator -java `cat conf/druid/overlord/jvm.config | xargs` -cp conf/druid/_common:conf/druid/overlord:lib/* io.druid.cli.Main server overlord +java `cat conf/druid/coordinator/jvm.config | xargs` -cp conf/druid/_common:conf/druid/coordinator:lib/* org.apache.druid.cli.Main server coordinator +java `cat conf/druid/overlord/jvm.config | xargs` -cp conf/druid/_common:conf/druid/overlord:lib/* org.apache.druid.cli.Main server overlord ``` You should see a log message printed out for each service that starts up. You can view detailed logs @@ -319,8 +319,8 @@ Copy the Druid distribution and your edited configurations to your servers set a On each one, *cd* into the distribution and run this command to start a Data server: ```bash -java `cat conf/druid/historical/jvm.config | xargs` -cp conf/druid/_common:conf/druid/historical:lib/* io.druid.cli.Main server historical -java `cat conf/druid/middleManager/jvm.config | xargs` -cp conf/druid/_common:conf/druid/middleManager:lib/* io.druid.cli.Main server middleManager +java `cat conf/druid/historical/jvm.config | xargs` -cp conf/druid/_common:conf/druid/historical:lib/* org.apache.druid.cli.Main server historical +java `cat conf/druid/middleManager/jvm.config | xargs` -cp conf/druid/_common:conf/druid/middleManager:lib/* org.apache.druid.cli.Main server middleManager ``` You can add more servers with Druid Historicals and MiddleManagers as needed. @@ -350,7 +350,7 @@ Copy the Druid distribution and your edited configurations to your servers set a On each one, *cd* into the distribution and run this command to start a Broker (you may want to pipe the output to a log file): ```bash -java `cat conf/druid/broker/jvm.config | xargs` -cp conf/druid/_common:conf/druid/broker:lib/* io.druid.cli.Main server broker +java `cat conf/druid/broker/jvm.config | xargs` -cp conf/druid/_common:conf/druid/broker:lib/* org.apache.druid.cli.Main server broker ``` You can add more Brokers as needed based on query load. diff --git a/examples/bin/node.sh b/examples/bin/node.sh index 32676bc94522..cb5f7a7c7a63 100644 --- a/examples/bin/node.sh +++ b/examples/bin/node.sh @@ -46,7 +46,7 @@ case $command in JAVA=$JAVA_HOME/bin/java fi - nohup $JAVA `cat $CONF_DIR/$nodeType/jvm.config | xargs` -cp $CONF_DIR/_common:$CONF_DIR/$nodeType:$LIB_DIR/*:$HADOOP_CONF_DIR io.druid.cli.Main server $nodeType >> $LOG_DIR/$nodeType.log 2>&1 & + nohup $JAVA `cat $CONF_DIR/$nodeType/jvm.config | xargs` -cp $CONF_DIR/_common:$CONF_DIR/$nodeType:$LIB_DIR/*:$HADOOP_CONF_DIR org.apache.druid.cli.Main server $nodeType >> $LOG_DIR/$nodeType.log 2>&1 & nodeType_PID=$! echo $nodeType_PID > $pid echo "Started $nodeType node ($nodeType_PID)" diff --git a/examples/conf/druid/_common/common.runtime.properties b/examples/conf/druid/_common/common.runtime.properties index b876ee61d910..95d01e11b592 100644 --- a/examples/conf/druid/_common/common.runtime.properties +++ b/examples/conf/druid/_common/common.runtime.properties @@ -112,7 +112,7 @@ druid.selectors.coordinator.serviceName=druid/coordinator # Monitoring # -druid.monitoring.monitors=["io.druid.java.util.metrics.JvmMonitor"] +druid.monitoring.monitors=["org.apache.druid.java.util.metrics.JvmMonitor"] druid.emitter=logging druid.emitter.logging.logLevel=info diff --git a/examples/pom.xml b/examples/pom.xml index 7f1e1448800b..0f4e915dd456 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,26 +21,26 @@ 4.0.0 - io.druid.extensions + org.apache.druid.extensions druid-examples druid-examples druid-examples - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT - io.druid + org.apache.druid druid-server ${project.parent.version} provided - io.druid + org.apache.druid druid-common ${project.parent.version} provided diff --git a/examples/quickstart/tutorial/conf/druid/_common/common.runtime.properties b/examples/quickstart/tutorial/conf/druid/_common/common.runtime.properties index bdff17d6cc0a..40921d40b198 100644 --- a/examples/quickstart/tutorial/conf/druid/_common/common.runtime.properties +++ b/examples/quickstart/tutorial/conf/druid/_common/common.runtime.properties @@ -119,7 +119,7 @@ druid.selectors.coordinator.serviceName=druid/coordinator # Monitoring # -druid.monitoring.monitors=["io.druid.java.util.metrics.JvmMonitor"] +druid.monitoring.monitors=["org.apache.druid.java.util.metrics.JvmMonitor"] druid.emitter=logging druid.emitter.logging.logLevel=info diff --git a/examples/quickstart/tutorial/conf/druid/broker/main.config b/examples/quickstart/tutorial/conf/druid/broker/main.config index de21e417fa16..9bc9a6ff3971 100644 --- a/examples/quickstart/tutorial/conf/druid/broker/main.config +++ b/examples/quickstart/tutorial/conf/druid/broker/main.config @@ -1 +1 @@ -io.druid.cli.Main server broker +org.apache.druid.cli.Main server broker diff --git a/examples/quickstart/tutorial/conf/druid/coordinator/main.config b/examples/quickstart/tutorial/conf/druid/coordinator/main.config index e8e6ed91e7b8..a74101f6eb15 100644 --- a/examples/quickstart/tutorial/conf/druid/coordinator/main.config +++ b/examples/quickstart/tutorial/conf/druid/coordinator/main.config @@ -1 +1 @@ -io.druid.cli.Main server coordinator +org.apache.druid.cli.Main server coordinator diff --git a/examples/quickstart/tutorial/conf/druid/historical/main.config b/examples/quickstart/tutorial/conf/druid/historical/main.config index 1a7749356c46..42be713ad5d1 100644 --- a/examples/quickstart/tutorial/conf/druid/historical/main.config +++ b/examples/quickstart/tutorial/conf/druid/historical/main.config @@ -1 +1 @@ -io.druid.cli.Main server historical +org.apache.druid.cli.Main server historical diff --git a/examples/quickstart/tutorial/conf/druid/middleManager/main.config b/examples/quickstart/tutorial/conf/druid/middleManager/main.config index aa70653e6a2b..0e6273380855 100644 --- a/examples/quickstart/tutorial/conf/druid/middleManager/main.config +++ b/examples/quickstart/tutorial/conf/druid/middleManager/main.config @@ -1 +1 @@ -io.druid.cli.Main server middleManager +org.apache.druid.cli.Main server middleManager diff --git a/examples/quickstart/tutorial/conf/druid/overlord/main.config b/examples/quickstart/tutorial/conf/druid/overlord/main.config index af7eda05b38c..dcf691a380ea 100644 --- a/examples/quickstart/tutorial/conf/druid/overlord/main.config +++ b/examples/quickstart/tutorial/conf/druid/overlord/main.config @@ -1 +1 @@ -io.druid.cli.Main server overlord +org.apache.druid.cli.Main server overlord diff --git a/examples/src/main/java/io/druid/examples/ExamplesDruidModule.java b/examples/src/main/java/org/apache/druid/examples/ExamplesDruidModule.java similarity index 90% rename from examples/src/main/java/io/druid/examples/ExamplesDruidModule.java rename to examples/src/main/java/org/apache/druid/examples/ExamplesDruidModule.java index ae53687fc013..c9321b86b903 100644 --- a/examples/src/main/java/io/druid/examples/ExamplesDruidModule.java +++ b/examples/src/main/java/org/apache/druid/examples/ExamplesDruidModule.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.examples; +package org.apache.druid.examples; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.inject.Binder; -import io.druid.examples.twitter.TwitterSpritzerFirehoseFactory; -import io.druid.initialization.DruidModule; +import org.apache.druid.examples.twitter.TwitterSpritzerFirehoseFactory; +import org.apache.druid.initialization.DruidModule; import java.util.Collections; import java.util.List; diff --git a/examples/src/main/java/io/druid/examples/twitter/TwitterSpritzerFirehoseFactory.java b/examples/src/main/java/org/apache/druid/examples/twitter/TwitterSpritzerFirehoseFactory.java similarity index 97% rename from examples/src/main/java/io/druid/examples/twitter/TwitterSpritzerFirehoseFactory.java rename to examples/src/main/java/org/apache/druid/examples/twitter/TwitterSpritzerFirehoseFactory.java index 54f111d6e6f4..dc951e81ded0 100644 --- a/examples/src/main/java/io/druid/examples/twitter/TwitterSpritzerFirehoseFactory.java +++ b/examples/src/main/java/org/apache/druid/examples/twitter/TwitterSpritzerFirehoseFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.examples.twitter; +package org.apache.druid.examples.twitter; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -25,13 +25,13 @@ import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.druid.data.input.Firehose; -import io.druid.data.input.FirehoseFactory; -import io.druid.data.input.InputRow; -import io.druid.data.input.MapBasedInputRow; -import io.druid.data.input.impl.InputRowParser; -import io.druid.java.util.common.StringUtils; -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.InputRow; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; import twitter4j.ConnectionLifeCycleListener; import twitter4j.GeoLocation; import twitter4j.HashtagEntity; diff --git a/examples/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/examples/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index 3e8743ed2ed5..000000000000 --- a/examples/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.examples.ExamplesDruidModule \ No newline at end of file diff --git a/examples/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/examples/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..60ac8cd4ea48 --- /dev/null +++ b/examples/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.examples.ExamplesDruidModule \ No newline at end of file diff --git a/extendedset/pom.xml b/extendedset/pom.xml index d453243a8302..d13e58bbbabd 100755 --- a/extendedset/pom.xml +++ b/extendedset/pom.xml @@ -30,7 +30,7 @@ - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT @@ -38,7 +38,7 @@ - io.druid + org.apache.druid java-util ${project.parent.version} diff --git a/extendedset/src/main/java/io/druid/extendedset/intset/AbstractIntSet.java b/extendedset/src/main/java/org/apache/druid/extendedset/intset/AbstractIntSet.java similarity index 94% rename from extendedset/src/main/java/io/druid/extendedset/intset/AbstractIntSet.java rename to extendedset/src/main/java/org/apache/druid/extendedset/intset/AbstractIntSet.java index 4d18d73015c1..0c83e9325709 100755 --- a/extendedset/src/main/java/io/druid/extendedset/intset/AbstractIntSet.java +++ b/extendedset/src/main/java/org/apache/druid/extendedset/intset/AbstractIntSet.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package io.druid.extendedset.intset; +package org.apache.druid.extendedset.intset; /** diff --git a/extendedset/src/main/java/io/druid/extendedset/intset/BitIterator.java b/extendedset/src/main/java/org/apache/druid/extendedset/intset/BitIterator.java similarity index 99% rename from extendedset/src/main/java/io/druid/extendedset/intset/BitIterator.java rename to extendedset/src/main/java/org/apache/druid/extendedset/intset/BitIterator.java index 7bf10a718d49..fb96e4330314 100644 --- a/extendedset/src/main/java/io/druid/extendedset/intset/BitIterator.java +++ b/extendedset/src/main/java/org/apache/druid/extendedset/intset/BitIterator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.extendedset.intset; +package org.apache.druid.extendedset.intset; import java.util.NoSuchElementException; diff --git a/extendedset/src/main/java/io/druid/extendedset/intset/ConciseSet.java b/extendedset/src/main/java/org/apache/druid/extendedset/intset/ConciseSet.java similarity index 96% rename from extendedset/src/main/java/io/druid/extendedset/intset/ConciseSet.java rename to extendedset/src/main/java/org/apache/druid/extendedset/intset/ConciseSet.java index 82d1783e969b..782f5fcff9b0 100755 --- a/extendedset/src/main/java/io/druid/extendedset/intset/ConciseSet.java +++ b/extendedset/src/main/java/org/apache/druid/extendedset/intset/ConciseSet.java @@ -17,7 +17,7 @@ */ -package io.druid.extendedset.intset; +package org.apache.druid.extendedset.intset; import java.io.IOException; diff --git a/extendedset/src/main/java/io/druid/extendedset/intset/ConciseSetUtils.java b/extendedset/src/main/java/org/apache/druid/extendedset/intset/ConciseSetUtils.java similarity index 99% rename from extendedset/src/main/java/io/druid/extendedset/intset/ConciseSetUtils.java rename to extendedset/src/main/java/org/apache/druid/extendedset/intset/ConciseSetUtils.java index dffbfcb5d476..d0c4a55ff13b 100755 --- a/extendedset/src/main/java/io/druid/extendedset/intset/ConciseSetUtils.java +++ b/extendedset/src/main/java/org/apache/druid/extendedset/intset/ConciseSetUtils.java @@ -1,4 +1,4 @@ -package io.druid.extendedset.intset; +package org.apache.druid.extendedset.intset; /** */ diff --git a/extendedset/src/main/java/io/druid/extendedset/intset/EmptyIntIterator.java b/extendedset/src/main/java/org/apache/druid/extendedset/intset/EmptyIntIterator.java similarity index 96% rename from extendedset/src/main/java/io/druid/extendedset/intset/EmptyIntIterator.java rename to extendedset/src/main/java/org/apache/druid/extendedset/intset/EmptyIntIterator.java index efcef2aa98d1..0d666a748f4c 100644 --- a/extendedset/src/main/java/io/druid/extendedset/intset/EmptyIntIterator.java +++ b/extendedset/src/main/java/org/apache/druid/extendedset/intset/EmptyIntIterator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.extendedset.intset; +package org.apache.druid.extendedset.intset; import java.util.NoSuchElementException; diff --git a/extendedset/src/main/java/io/druid/extendedset/intset/ImmutableConciseSet.java b/extendedset/src/main/java/org/apache/druid/extendedset/intset/ImmutableConciseSet.java similarity index 99% rename from extendedset/src/main/java/io/druid/extendedset/intset/ImmutableConciseSet.java rename to extendedset/src/main/java/org/apache/druid/extendedset/intset/ImmutableConciseSet.java index f4e5a0729433..a97d3c2d7d5b 100755 --- a/extendedset/src/main/java/io/druid/extendedset/intset/ImmutableConciseSet.java +++ b/extendedset/src/main/java/org/apache/druid/extendedset/intset/ImmutableConciseSet.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.extendedset.intset; +package org.apache.druid.extendedset.intset; import com.google.common.collect.Iterators; import com.google.common.collect.UnmodifiableIterator; -import io.druid.extendedset.utilities.IntList; +import org.apache.druid.extendedset.utilities.IntList; import org.roaringbitmap.IntIterator; import java.nio.ByteBuffer; diff --git a/extendedset/src/main/java/io/druid/extendedset/intset/IntSet.java b/extendedset/src/main/java/org/apache/druid/extendedset/intset/IntSet.java similarity index 94% rename from extendedset/src/main/java/io/druid/extendedset/intset/IntSet.java rename to extendedset/src/main/java/org/apache/druid/extendedset/intset/IntSet.java index 603f36602f23..1e868501bf95 100755 --- a/extendedset/src/main/java/io/druid/extendedset/intset/IntSet.java +++ b/extendedset/src/main/java/org/apache/druid/extendedset/intset/IntSet.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package io.druid.extendedset.intset; +package org.apache.druid.extendedset.intset; import java.util.Iterator; diff --git a/extendedset/src/main/java/io/druid/extendedset/utilities/IntList.java b/extendedset/src/main/java/org/apache/druid/extendedset/utilities/IntList.java similarity index 96% rename from extendedset/src/main/java/io/druid/extendedset/utilities/IntList.java rename to extendedset/src/main/java/org/apache/druid/extendedset/utilities/IntList.java index c667e6076bb5..6bdd288fe3de 100755 --- a/extendedset/src/main/java/io/druid/extendedset/utilities/IntList.java +++ b/extendedset/src/main/java/org/apache/druid/extendedset/utilities/IntList.java @@ -1,4 +1,4 @@ -package io.druid.extendedset.utilities; +package org.apache.druid.extendedset.utilities; import java.util.ArrayList; diff --git a/extendedset/src/test/java/io/druid/extendedset/intset/ImmutableConciseSetIntersectionTest.java b/extendedset/src/test/java/org/apache/druid/extendedset/intset/ImmutableConciseSetIntersectionTest.java similarity index 99% rename from extendedset/src/test/java/io/druid/extendedset/intset/ImmutableConciseSetIntersectionTest.java rename to extendedset/src/test/java/org/apache/druid/extendedset/intset/ImmutableConciseSetIntersectionTest.java index 0ebb819292fe..e270015e193a 100644 --- a/extendedset/src/test/java/io/druid/extendedset/intset/ImmutableConciseSetIntersectionTest.java +++ b/extendedset/src/test/java/org/apache/druid/extendedset/intset/ImmutableConciseSetIntersectionTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.extendedset.intset; +package org.apache.druid.extendedset.intset; import com.google.common.collect.Lists; import junit.framework.Assert; diff --git a/extendedset/src/test/java/io/druid/extendedset/intset/ImmutableConciseSetTest.java b/extendedset/src/test/java/org/apache/druid/extendedset/intset/ImmutableConciseSetTest.java similarity index 99% rename from extendedset/src/test/java/io/druid/extendedset/intset/ImmutableConciseSetTest.java rename to extendedset/src/test/java/org/apache/druid/extendedset/intset/ImmutableConciseSetTest.java index df4825735b84..1ab8bc65b21b 100755 --- a/extendedset/src/test/java/io/druid/extendedset/intset/ImmutableConciseSetTest.java +++ b/extendedset/src/test/java/org/apache/druid/extendedset/intset/ImmutableConciseSetTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.extendedset.intset; +package org.apache.druid.extendedset.intset; import com.google.common.collect.Lists; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import junit.framework.Assert; import org.junit.Test; diff --git a/extensions-contrib/ambari-metrics-emitter/pom.xml b/extensions-contrib/ambari-metrics-emitter/pom.xml index 7b0fd945bb0d..7b12df8e6c70 100644 --- a/extensions-contrib/ambari-metrics-emitter/pom.xml +++ b/extensions-contrib/ambari-metrics-emitter/pom.xml @@ -23,38 +23,38 @@ 4.0.0 - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT ../../pom.xml - io.druid.extensions.contrib + org.apache.druid.extensions.contrib ambari-metrics-emitter ambari-metrics-emitter Druid emitter extension to support ambari metrics server - io.druid + org.apache.druid druid-common ${project.parent.version} provided - io.druid + org.apache.druid druid-api ${project.parent.version} provided - io.druid + org.apache.druid java-util ${project.parent.version} provided - io.druid + org.apache.druid druid-server ${project.parent.version} test-jar diff --git a/extensions-contrib/ambari-metrics-emitter/src/main/java/io/druid/emitter/ambari/metrics/AmbariMetricsEmitter.java b/extensions-contrib/ambari-metrics-emitter/src/main/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitter.java similarity index 94% rename from extensions-contrib/ambari-metrics-emitter/src/main/java/io/druid/emitter/ambari/metrics/AmbariMetricsEmitter.java rename to extensions-contrib/ambari-metrics-emitter/src/main/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitter.java index 16b2aa080cf5..0b2e2108fc4d 100644 --- a/extensions-contrib/ambari-metrics-emitter/src/main/java/io/druid/emitter/ambari/metrics/AmbariMetricsEmitter.java +++ b/extensions-contrib/ambari-metrics-emitter/src/main/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitter.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.emitter.ambari.metrics; +package org.apache.druid.emitter.ambari.metrics; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.emitter.core.Emitter; -import io.druid.java.util.emitter.core.Event; -import io.druid.java.util.emitter.service.AlertEvent; -import io.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.core.Emitter; +import org.apache.druid.java.util.emitter.core.Event; +import org.apache.druid.java.util.emitter.service.AlertEvent; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; import org.apache.hadoop.metrics2.sink.timeline.AbstractTimelineMetricsSink; import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric; import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics; diff --git a/extensions-contrib/ambari-metrics-emitter/src/main/java/io/druid/emitter/ambari/metrics/AmbariMetricsEmitterConfig.java b/extensions-contrib/ambari-metrics-emitter/src/main/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitterConfig.java similarity index 99% rename from extensions-contrib/ambari-metrics-emitter/src/main/java/io/druid/emitter/ambari/metrics/AmbariMetricsEmitterConfig.java rename to extensions-contrib/ambari-metrics-emitter/src/main/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitterConfig.java index fdd35958ab8e..c7a503f94c69 100644 --- a/extensions-contrib/ambari-metrics-emitter/src/main/java/io/druid/emitter/ambari/metrics/AmbariMetricsEmitterConfig.java +++ b/extensions-contrib/ambari-metrics-emitter/src/main/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitterConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.emitter.ambari.metrics; +package org.apache.druid.emitter.ambari.metrics; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-contrib/ambari-metrics-emitter/src/main/java/io/druid/emitter/ambari/metrics/AmbariMetricsEmitterModule.java b/extensions-contrib/ambari-metrics-emitter/src/main/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitterModule.java similarity index 89% rename from extensions-contrib/ambari-metrics-emitter/src/main/java/io/druid/emitter/ambari/metrics/AmbariMetricsEmitterModule.java rename to extensions-contrib/ambari-metrics-emitter/src/main/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitterModule.java index baf6df5ba36d..4723c233169d 100644 --- a/extensions-contrib/ambari-metrics-emitter/src/main/java/io/druid/emitter/ambari/metrics/AmbariMetricsEmitterModule.java +++ b/extensions-contrib/ambari-metrics-emitter/src/main/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitterModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.emitter.ambari.metrics; +package org.apache.druid.emitter.ambari.metrics; import com.fasterxml.jackson.databind.Module; import com.google.common.base.Function; @@ -28,10 +28,10 @@ import com.google.inject.Provides; import com.google.inject.name.Named; import com.google.inject.name.Names; -import io.druid.java.util.emitter.core.Emitter; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.ManageLifecycle; -import io.druid.initialization.DruidModule; +import org.apache.druid.java.util.emitter.core.Emitter; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.initialization.DruidModule; import java.util.Collections; import java.util.List; diff --git a/extensions-contrib/ambari-metrics-emitter/src/main/java/io/druid/emitter/ambari/metrics/DruidToTimelineMetricConverter.java b/extensions-contrib/ambari-metrics-emitter/src/main/java/org/apache/druid/emitter/ambari/metrics/DruidToTimelineMetricConverter.java similarity index 93% rename from extensions-contrib/ambari-metrics-emitter/src/main/java/io/druid/emitter/ambari/metrics/DruidToTimelineMetricConverter.java rename to extensions-contrib/ambari-metrics-emitter/src/main/java/org/apache/druid/emitter/ambari/metrics/DruidToTimelineMetricConverter.java index fcd3d37cc46a..fe0c7747a9cc 100644 --- a/extensions-contrib/ambari-metrics-emitter/src/main/java/io/druid/emitter/ambari/metrics/DruidToTimelineMetricConverter.java +++ b/extensions-contrib/ambari-metrics-emitter/src/main/java/org/apache/druid/emitter/ambari/metrics/DruidToTimelineMetricConverter.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.emitter.ambari.metrics; +package org.apache.druid.emitter.ambari.metrics; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric; diff --git a/extensions-contrib/ambari-metrics-emitter/src/main/java/io/druid/emitter/ambari/metrics/SendAllTimelineEventConverter.java b/extensions-contrib/ambari-metrics-emitter/src/main/java/org/apache/druid/emitter/ambari/metrics/SendAllTimelineEventConverter.java similarity index 97% rename from extensions-contrib/ambari-metrics-emitter/src/main/java/io/druid/emitter/ambari/metrics/SendAllTimelineEventConverter.java rename to extensions-contrib/ambari-metrics-emitter/src/main/java/org/apache/druid/emitter/ambari/metrics/SendAllTimelineEventConverter.java index 0cddd2f6523c..6467418468b0 100644 --- a/extensions-contrib/ambari-metrics-emitter/src/main/java/io/druid/emitter/ambari/metrics/SendAllTimelineEventConverter.java +++ b/extensions-contrib/ambari-metrics-emitter/src/main/java/org/apache/druid/emitter/ambari/metrics/SendAllTimelineEventConverter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.emitter.ambari.metrics; +package org.apache.druid.emitter.ambari.metrics; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -26,7 +26,7 @@ import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSortedSet; -import io.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric; /** diff --git a/extensions-contrib/ambari-metrics-emitter/src/main/java/io/druid/emitter/ambari/metrics/WhiteListBasedDruidToTimelineEventConverter.java b/extensions-contrib/ambari-metrics-emitter/src/main/java/org/apache/druid/emitter/ambari/metrics/WhiteListBasedDruidToTimelineEventConverter.java similarity index 97% rename from extensions-contrib/ambari-metrics-emitter/src/main/java/io/druid/emitter/ambari/metrics/WhiteListBasedDruidToTimelineEventConverter.java rename to extensions-contrib/ambari-metrics-emitter/src/main/java/org/apache/druid/emitter/ambari/metrics/WhiteListBasedDruidToTimelineEventConverter.java index dd7086742d0d..12e6008adb47 100644 --- a/extensions-contrib/ambari-metrics-emitter/src/main/java/io/druid/emitter/ambari/metrics/WhiteListBasedDruidToTimelineEventConverter.java +++ b/extensions-contrib/ambari-metrics-emitter/src/main/java/org/apache/druid/emitter/ambari/metrics/WhiteListBasedDruidToTimelineEventConverter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.emitter.ambari.metrics; +package org.apache.druid.emitter.ambari.metrics; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; @@ -32,9 +32,9 @@ import com.google.common.collect.ImmutableSortedMap; import com.google.common.io.CharStreams; import com.google.common.io.Files; -import io.druid.java.util.common.ISE; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.common.logger.Logger; import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric; import java.io.File; diff --git a/extensions-contrib/ambari-metrics-emitter/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-contrib/ambari-metrics-emitter/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index 2caea5c49fb3..000000000000 --- a/extensions-contrib/ambari-metrics-emitter/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.emitter.ambari.metrics.AmbariMetricsEmitterModule diff --git a/extensions-contrib/ambari-metrics-emitter/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-contrib/ambari-metrics-emitter/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..fbc3870c81e3 --- /dev/null +++ b/extensions-contrib/ambari-metrics-emitter/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.emitter.ambari.metrics.AmbariMetricsEmitterModule diff --git a/extensions-contrib/ambari-metrics-emitter/src/test/java/io/druid/emitter/ambari/metrics/AmbariMetricsEmitterConfigTest.java b/extensions-contrib/ambari-metrics-emitter/src/test/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitterConfigTest.java similarity index 96% rename from extensions-contrib/ambari-metrics-emitter/src/test/java/io/druid/emitter/ambari/metrics/AmbariMetricsEmitterConfigTest.java rename to extensions-contrib/ambari-metrics-emitter/src/test/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitterConfigTest.java index a4a07dbda058..e67d52d691c0 100644 --- a/extensions-contrib/ambari-metrics-emitter/src/test/java/io/druid/emitter/ambari/metrics/AmbariMetricsEmitterConfigTest.java +++ b/extensions-contrib/ambari-metrics-emitter/src/test/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitterConfigTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.emitter.ambari.metrics; +package org.apache.druid.emitter.ambari.metrics; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/extensions-contrib/ambari-metrics-emitter/src/test/java/io/druid/emitter/ambari/metrics/DruidToWhiteListBasedConverterTest.java b/extensions-contrib/ambari-metrics-emitter/src/test/java/org/apache/druid/emitter/ambari/metrics/DruidToWhiteListBasedConverterTest.java similarity index 95% rename from extensions-contrib/ambari-metrics-emitter/src/test/java/io/druid/emitter/ambari/metrics/DruidToWhiteListBasedConverterTest.java rename to extensions-contrib/ambari-metrics-emitter/src/test/java/org/apache/druid/emitter/ambari/metrics/DruidToWhiteListBasedConverterTest.java index b26d39be76f0..d4fe42290f19 100644 --- a/extensions-contrib/ambari-metrics-emitter/src/test/java/io/druid/emitter/ambari/metrics/DruidToWhiteListBasedConverterTest.java +++ b/extensions-contrib/ambari-metrics-emitter/src/test/java/org/apache/druid/emitter/ambari/metrics/DruidToWhiteListBasedConverterTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.emitter.ambari.metrics; +package org.apache.druid.emitter.ambari.metrics; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-contrib/ambari-metrics-emitter/src/test/java/io/druid/emitter/ambari/metrics/WhiteListBasedDruidToTimelineEventConverterTest.java b/extensions-contrib/ambari-metrics-emitter/src/test/java/org/apache/druid/emitter/ambari/metrics/WhiteListBasedDruidToTimelineEventConverterTest.java similarity index 96% rename from extensions-contrib/ambari-metrics-emitter/src/test/java/io/druid/emitter/ambari/metrics/WhiteListBasedDruidToTimelineEventConverterTest.java rename to extensions-contrib/ambari-metrics-emitter/src/test/java/org/apache/druid/emitter/ambari/metrics/WhiteListBasedDruidToTimelineEventConverterTest.java index 9cf39c9e0c88..4ed5ab0e049d 100644 --- a/extensions-contrib/ambari-metrics-emitter/src/test/java/io/druid/emitter/ambari/metrics/WhiteListBasedDruidToTimelineEventConverterTest.java +++ b/extensions-contrib/ambari-metrics-emitter/src/test/java/org/apache/druid/emitter/ambari/metrics/WhiteListBasedDruidToTimelineEventConverterTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.emitter.ambari.metrics; +package org.apache.druid.emitter.ambari.metrics; import com.google.common.collect.Maps; -import io.druid.annotations.UsedByJUnitParamsRunner; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.annotations.UsedByJUnitParamsRunner; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; import junitparams.JUnitParamsRunner; import junitparams.Parameters; import org.apache.commons.io.IOUtils; diff --git a/extensions-contrib/azure-extensions/pom.xml b/extensions-contrib/azure-extensions/pom.xml index f7b1fb03535f..1f08c51e2017 100644 --- a/extensions-contrib/azure-extensions/pom.xml +++ b/extensions-contrib/azure-extensions/pom.xml @@ -22,13 +22,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - io.druid.extensions.contrib + org.apache.druid.extensions.contrib druid-azure-extensions druid-azure-extensions druid-azure-extensions - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT ../../pom.xml @@ -36,7 +36,7 @@ - io.druid + org.apache.druid druid-api ${project.parent.version} provided @@ -74,7 +74,7 @@ test - io.druid + org.apache.druid druid-server ${project.parent.version} test diff --git a/extensions-contrib/azure-extensions/src/main/java/io/druid/firehose/azure/AzureBlob.java b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/firehose/azure/AzureBlob.java similarity index 97% rename from extensions-contrib/azure-extensions/src/main/java/io/druid/firehose/azure/AzureBlob.java rename to extensions-contrib/azure-extensions/src/main/java/org/apache/druid/firehose/azure/AzureBlob.java index e314b5970f0c..32fc16ff5161 100644 --- a/extensions-contrib/azure-extensions/src/main/java/io/druid/firehose/azure/AzureBlob.java +++ b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/firehose/azure/AzureBlob.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.firehose.azure; +package org.apache.druid.firehose.azure; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-contrib/azure-extensions/src/main/java/io/druid/firehose/azure/StaticAzureBlobStoreFirehoseFactory.java b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/firehose/azure/StaticAzureBlobStoreFirehoseFactory.java similarity index 89% rename from extensions-contrib/azure-extensions/src/main/java/io/druid/firehose/azure/StaticAzureBlobStoreFirehoseFactory.java rename to extensions-contrib/azure-extensions/src/main/java/org/apache/druid/firehose/azure/StaticAzureBlobStoreFirehoseFactory.java index d29b15c5bf1c..82a9aad5c0dc 100644 --- a/extensions-contrib/azure-extensions/src/main/java/io/druid/firehose/azure/StaticAzureBlobStoreFirehoseFactory.java +++ b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/firehose/azure/StaticAzureBlobStoreFirehoseFactory.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.firehose.azure; +package org.apache.druid.firehose.azure; 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 com.google.common.base.Predicate; -import io.druid.data.input.FiniteFirehoseFactory; -import io.druid.data.input.InputSplit; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.data.input.impl.prefetch.PrefetchableTextFilesFirehoseFactory; -import io.druid.java.util.common.CompressionUtils; -import io.druid.storage.azure.AzureByteSource; -import io.druid.storage.azure.AzureStorage; -import io.druid.storage.azure.AzureUtils; +import org.apache.druid.data.input.FiniteFirehoseFactory; +import org.apache.druid.data.input.InputSplit; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.data.input.impl.prefetch.PrefetchableTextFilesFirehoseFactory; +import org.apache.druid.java.util.common.CompressionUtils; +import org.apache.druid.storage.azure.AzureByteSource; +import org.apache.druid.storage.azure.AzureStorage; +import org.apache.druid.storage.azure.AzureUtils; import java.io.IOException; import java.io.InputStream; @@ -41,7 +41,7 @@ import java.util.Objects; /** - * This class is heavily inspired by the StaticS3FirehoseFactory class in the io.druid.firehose.s3 package + * This class is heavily inspired by the StaticS3FirehoseFactory class in the org.apache.druid.firehose.s3 package */ public class StaticAzureBlobStoreFirehoseFactory extends PrefetchableTextFilesFirehoseFactory { diff --git a/extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureAccountConfig.java b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureAccountConfig.java similarity index 98% rename from extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureAccountConfig.java rename to extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureAccountConfig.java index f184adfab11c..6578c9773e06 100644 --- a/extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureAccountConfig.java +++ b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureAccountConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.azure; +package org.apache.druid.storage.azure; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureByteSource.java b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureByteSource.java similarity index 97% rename from extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureByteSource.java rename to extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureByteSource.java index d684ba7c7f3a..5e27f5317242 100644 --- a/extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureByteSource.java +++ b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureByteSource.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.azure; +package org.apache.druid.storage.azure; import com.google.common.base.Throwables; import com.google.common.io.ByteSource; diff --git a/extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureDataSegmentKiller.java b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureDataSegmentKiller.java similarity index 87% rename from extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureDataSegmentKiller.java rename to extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureDataSegmentKiller.java index a9d34bceb462..5d257209a464 100644 --- a/extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureDataSegmentKiller.java +++ b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureDataSegmentKiller.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.storage.azure; +package org.apache.druid.storage.azure; import com.google.inject.Inject; import com.microsoft.azure.storage.StorageException; -import io.druid.java.util.common.MapUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.loading.DataSegmentKiller; -import io.druid.segment.loading.SegmentLoadingException; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.MapUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.loading.DataSegmentKiller; +import org.apache.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.timeline.DataSegment; import java.net.URISyntaxException; import java.nio.file.Paths; diff --git a/extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureDataSegmentPuller.java b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureDataSegmentPuller.java similarity index 88% rename from extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureDataSegmentPuller.java rename to extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureDataSegmentPuller.java index e545be31592a..0eb04121329a 100644 --- a/extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureDataSegmentPuller.java +++ b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureDataSegmentPuller.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.storage.azure; +package org.apache.druid.storage.azure; import com.google.common.io.ByteSource; import com.google.inject.Inject; -import io.druid.java.util.common.CompressionUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.java.util.common.CompressionUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.loading.SegmentLoadingException; import org.apache.commons.io.FileUtils; import java.io.File; @@ -50,7 +50,7 @@ public AzureDataSegmentPuller( this.azureStorage = azureStorage; } - io.druid.java.util.common.FileUtils.FileCopyResult getSegmentFiles( + org.apache.druid.java.util.common.FileUtils.FileCopyResult getSegmentFiles( final String containerName, final String blobPath, final File outDir @@ -75,7 +75,7 @@ io.druid.java.util.common.FileUtils.FileCopyResult getSegmentFiles( } final ByteSource byteSource = new AzureByteSource(azureStorage, containerName, actualBlobPath); - final io.druid.java.util.common.FileUtils.FileCopyResult result = CompressionUtils.unzip( + final org.apache.druid.java.util.common.FileUtils.FileCopyResult result = CompressionUtils.unzip( byteSource, outDir, AzureUtils.AZURE_RETRY, diff --git a/extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureDataSegmentPusher.java b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureDataSegmentPusher.java similarity index 94% rename from extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureDataSegmentPusher.java rename to extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureDataSegmentPusher.java index 969e26788170..32d749b3642c 100644 --- a/extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureDataSegmentPusher.java +++ b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureDataSegmentPusher.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.azure; +package org.apache.druid.storage.azure; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Throwables; @@ -25,12 +25,12 @@ import com.google.common.collect.ImmutableMap; import com.google.inject.Inject; import com.microsoft.azure.storage.StorageException; -import io.druid.java.util.common.CompressionUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.SegmentUtils; -import io.druid.segment.loading.DataSegmentPusher; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.CompressionUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.SegmentUtils; +import org.apache.druid.segment.loading.DataSegmentPusher; +import org.apache.druid.timeline.DataSegment; import org.joda.time.format.ISODateTimeFormat; import java.io.File; diff --git a/extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureLoadSpec.java b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureLoadSpec.java similarity index 92% rename from extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureLoadSpec.java rename to extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureLoadSpec.java index 6f4cd6f67c21..621381d4799b 100644 --- a/extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureLoadSpec.java +++ b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureLoadSpec.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.storage.azure; +package org.apache.druid.storage.azure; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.base.Preconditions; -import io.druid.segment.loading.LoadSpec; -import io.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.segment.loading.LoadSpec; +import org.apache.druid.segment.loading.SegmentLoadingException; import java.io.File; diff --git a/extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureStorage.java b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureStorage.java similarity index 97% rename from extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureStorage.java rename to extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureStorage.java index 28f7292c0182..79ab48e793c8 100644 --- a/extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureStorage.java +++ b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureStorage.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.storage.azure; +package org.apache.druid.storage.azure; import com.microsoft.azure.storage.StorageException; import com.microsoft.azure.storage.blob.CloudBlob; import com.microsoft.azure.storage.blob.CloudBlobClient; import com.microsoft.azure.storage.blob.CloudBlobContainer; import com.microsoft.azure.storage.blob.ListBlobItem; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.logger.Logger; import java.io.File; import java.io.FileInputStream; diff --git a/extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureStorageDruidModule.java b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureStorageDruidModule.java similarity index 91% rename from extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureStorageDruidModule.java rename to extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureStorageDruidModule.java index 6c3baf0f0cf8..490b39b66a66 100644 --- a/extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureStorageDruidModule.java +++ b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureStorageDruidModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.azure; +package org.apache.druid.storage.azure; import com.fasterxml.jackson.core.Version; import com.fasterxml.jackson.databind.Module; @@ -28,12 +28,12 @@ import com.google.inject.Provides; import com.microsoft.azure.storage.CloudStorageAccount; import com.microsoft.azure.storage.blob.CloudBlobClient; -import io.druid.firehose.azure.StaticAzureBlobStoreFirehoseFactory; -import io.druid.guice.Binders; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.LazySingleton; -import io.druid.initialization.DruidModule; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.firehose.azure.StaticAzureBlobStoreFirehoseFactory; +import org.apache.druid.guice.Binders; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.java.util.common.StringUtils; import java.net.URISyntaxException; import java.security.InvalidKeyException; diff --git a/extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureTaskLogs.java b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureTaskLogs.java similarity index 95% rename from extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureTaskLogs.java rename to extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureTaskLogs.java index ba813277dc84..451b41cd3b90 100644 --- a/extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureTaskLogs.java +++ b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureTaskLogs.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.storage.azure; +package org.apache.druid.storage.azure; import com.google.common.base.Optional; import com.google.common.base.Throwables; import com.google.common.io.ByteSource; import com.google.inject.Inject; import com.microsoft.azure.storage.StorageException; -import io.druid.java.util.common.IOE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.tasklogs.TaskLogs; +import org.apache.druid.java.util.common.IOE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.tasklogs.TaskLogs; import java.io.File; import java.io.IOException; diff --git a/extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureTaskLogsConfig.java b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureTaskLogsConfig.java similarity index 97% rename from extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureTaskLogsConfig.java rename to extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureTaskLogsConfig.java index 3cf4b5518a03..f38e497fb685 100644 --- a/extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureTaskLogsConfig.java +++ b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureTaskLogsConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.azure; +package org.apache.druid.storage.azure; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureUtils.java b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureUtils.java similarity index 91% rename from extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureUtils.java rename to extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureUtils.java index 682993d54bd4..562d207d8a5c 100644 --- a/extensions-contrib/azure-extensions/src/main/java/io/druid/storage/azure/AzureUtils.java +++ b/extensions-contrib/azure-extensions/src/main/java/org/apache/druid/storage/azure/AzureUtils.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.storage.azure; +package org.apache.druid.storage.azure; import com.google.common.base.Predicate; import com.microsoft.azure.storage.StorageException; -import io.druid.java.util.common.RetryUtils; -import io.druid.java.util.common.RetryUtils.Task; +import org.apache.druid.java.util.common.RetryUtils; +import org.apache.druid.java.util.common.RetryUtils.Task; import java.io.IOException; import java.net.URISyntaxException; diff --git a/extensions-contrib/azure-extensions/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-contrib/azure-extensions/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index b58fcb22692d..000000000000 --- a/extensions-contrib/azure-extensions/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.storage.azure.AzureStorageDruidModule diff --git a/extensions-contrib/azure-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-contrib/azure-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..e9c249ce14e1 --- /dev/null +++ b/extensions-contrib/azure-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.storage.azure.AzureStorageDruidModule diff --git a/extensions-contrib/azure-extensions/src/test/java/io/druid/firehose/azure/StaticAzureBlobStoreFirehoseFactoryTest.java b/extensions-contrib/azure-extensions/src/test/java/org/apache/druid/firehose/azure/StaticAzureBlobStoreFirehoseFactoryTest.java similarity index 93% rename from extensions-contrib/azure-extensions/src/test/java/io/druid/firehose/azure/StaticAzureBlobStoreFirehoseFactoryTest.java rename to extensions-contrib/azure-extensions/src/test/java/org/apache/druid/firehose/azure/StaticAzureBlobStoreFirehoseFactoryTest.java index f2267aa6ef9e..52751e211718 100644 --- a/extensions-contrib/azure-extensions/src/test/java/io/druid/firehose/azure/StaticAzureBlobStoreFirehoseFactoryTest.java +++ b/extensions-contrib/azure-extensions/src/test/java/org/apache/druid/firehose/azure/StaticAzureBlobStoreFirehoseFactoryTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.firehose.azure; +package org.apache.druid.firehose.azure; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.ObjectMapper; @@ -28,9 +28,9 @@ import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Provides; -import io.druid.initialization.DruidModule; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.storage.azure.AzureStorage; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.storage.azure.AzureStorage; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureByteSourceTest.java b/extensions-contrib/azure-extensions/src/test/java/org/apache/druid/storage/azure/AzureByteSourceTest.java similarity index 98% rename from extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureByteSourceTest.java rename to extensions-contrib/azure-extensions/src/test/java/org/apache/druid/storage/azure/AzureByteSourceTest.java index 1117711bcb70..539d567944bf 100644 --- a/extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureByteSourceTest.java +++ b/extensions-contrib/azure-extensions/src/test/java/org/apache/druid/storage/azure/AzureByteSourceTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.azure; +package org.apache.druid.storage.azure; import com.microsoft.azure.storage.StorageException; import org.easymock.EasyMockSupport; diff --git a/extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentKillerTest.java b/extensions-contrib/azure-extensions/src/test/java/org/apache/druid/storage/azure/AzureDataSegmentKillerTest.java similarity index 91% rename from extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentKillerTest.java rename to extensions-contrib/azure-extensions/src/test/java/org/apache/druid/storage/azure/AzureDataSegmentKillerTest.java index ffce597602cf..9657836d57e9 100644 --- a/extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentKillerTest.java +++ b/extensions-contrib/azure-extensions/src/test/java/org/apache/druid/storage/azure/AzureDataSegmentKillerTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.storage.azure; +package org.apache.druid.storage.azure; import com.google.common.collect.ImmutableMap; import com.microsoft.azure.storage.StorageException; -import io.druid.java.util.common.Intervals; -import io.druid.segment.loading.SegmentLoadingException; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.easymock.EasyMockSupport; import org.junit.Before; import org.junit.Test; diff --git a/extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentPullerTest.java b/extensions-contrib/azure-extensions/src/test/java/org/apache/druid/storage/azure/AzureDataSegmentPullerTest.java similarity index 95% rename from extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentPullerTest.java rename to extensions-contrib/azure-extensions/src/test/java/org/apache/druid/storage/azure/AzureDataSegmentPullerTest.java index 97139bc8764d..5b52dca3c80b 100644 --- a/extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentPullerTest.java +++ b/extensions-contrib/azure-extensions/src/test/java/org/apache/druid/storage/azure/AzureDataSegmentPullerTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.storage.azure; +package org.apache.druid.storage.azure; import com.microsoft.azure.storage.StorageException; -import io.druid.java.util.common.FileUtils; -import io.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.java.util.common.FileUtils; +import org.apache.druid.segment.loading.SegmentLoadingException; import org.easymock.EasyMockSupport; import org.junit.Before; import org.junit.Test; diff --git a/extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentPusherTest.java b/extensions-contrib/azure-extensions/src/test/java/org/apache/druid/storage/azure/AzureDataSegmentPusherTest.java similarity index 94% rename from extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentPusherTest.java rename to extensions-contrib/azure-extensions/src/test/java/org/apache/druid/storage/azure/AzureDataSegmentPusherTest.java index ad7c4328292b..5e45c3f3a904 100644 --- a/extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentPusherTest.java +++ b/extensions-contrib/azure-extensions/src/test/java/org/apache/druid/storage/azure/AzureDataSegmentPusherTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.azure; +package org.apache.druid.storage.azure; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; @@ -25,12 +25,12 @@ import com.google.common.collect.Maps; import com.google.common.io.Files; import com.microsoft.azure.storage.StorageException; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.MapUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.MapUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.easymock.EasyMockSupport; import org.junit.Assert; import org.junit.Before; diff --git a/extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureTaskLogsTest.java b/extensions-contrib/azure-extensions/src/test/java/org/apache/druid/storage/azure/AzureTaskLogsTest.java similarity index 98% rename from extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureTaskLogsTest.java rename to extensions-contrib/azure-extensions/src/test/java/org/apache/druid/storage/azure/AzureTaskLogsTest.java index 3e6c8de815b3..fb57da385a8e 100644 --- a/extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureTaskLogsTest.java +++ b/extensions-contrib/azure-extensions/src/test/java/org/apache/druid/storage/azure/AzureTaskLogsTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.storage.azure; +package org.apache.druid.storage.azure; import com.google.common.base.Optional; import com.google.common.io.ByteSource; import com.google.common.io.Files; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.easymock.EasyMockSupport; diff --git a/extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureTestUtils.java b/extensions-contrib/azure-extensions/src/test/java/org/apache/druid/storage/azure/AzureTestUtils.java similarity index 97% rename from extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureTestUtils.java rename to extensions-contrib/azure-extensions/src/test/java/org/apache/druid/storage/azure/AzureTestUtils.java index 5159f8f621f9..d73fa3c61758 100644 --- a/extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureTestUtils.java +++ b/extensions-contrib/azure-extensions/src/test/java/org/apache/druid/storage/azure/AzureTestUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.azure; +package org.apache.druid.storage.azure; import java.io.File; import java.io.FileOutputStream; diff --git a/extensions-contrib/cassandra-storage/pom.xml b/extensions-contrib/cassandra-storage/pom.xml index c5e479c95d55..746aa89a57bf 100644 --- a/extensions-contrib/cassandra-storage/pom.xml +++ b/extensions-contrib/cassandra-storage/pom.xml @@ -21,13 +21,13 @@ 4.0.0 - io.druid.extensions.contrib + org.apache.druid.extensions.contrib druid-cassandra-storage druid-cassandra-storage druid-cassandra-storage - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT ../../pom.xml @@ -35,7 +35,7 @@ - io.druid + org.apache.druid druid-api ${project.parent.version} provided diff --git a/extensions-contrib/cassandra-storage/src/main/java/io/druid/storage/cassandra/CassandraDataSegmentConfig.java b/extensions-contrib/cassandra-storage/src/main/java/org/apache/druid/storage/cassandra/CassandraDataSegmentConfig.java similarity index 96% rename from extensions-contrib/cassandra-storage/src/main/java/io/druid/storage/cassandra/CassandraDataSegmentConfig.java rename to extensions-contrib/cassandra-storage/src/main/java/org/apache/druid/storage/cassandra/CassandraDataSegmentConfig.java index 72a56a57fa08..0b25bb3235e7 100644 --- a/extensions-contrib/cassandra-storage/src/main/java/io/druid/storage/cassandra/CassandraDataSegmentConfig.java +++ b/extensions-contrib/cassandra-storage/src/main/java/org/apache/druid/storage/cassandra/CassandraDataSegmentConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.cassandra; +package org.apache.druid.storage.cassandra; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-contrib/cassandra-storage/src/main/java/io/druid/storage/cassandra/CassandraDataSegmentPuller.java b/extensions-contrib/cassandra-storage/src/main/java/org/apache/druid/storage/cassandra/CassandraDataSegmentPuller.java similarity index 91% rename from extensions-contrib/cassandra-storage/src/main/java/io/druid/storage/cassandra/CassandraDataSegmentPuller.java rename to extensions-contrib/cassandra-storage/src/main/java/org/apache/druid/storage/cassandra/CassandraDataSegmentPuller.java index 199dc6871ca4..dbb5771db8fc 100644 --- a/extensions-contrib/cassandra-storage/src/main/java/io/druid/storage/cassandra/CassandraDataSegmentPuller.java +++ b/extensions-contrib/cassandra-storage/src/main/java/org/apache/druid/storage/cassandra/CassandraDataSegmentPuller.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.storage.cassandra; +package org.apache.druid.storage.cassandra; import com.google.common.base.Predicates; import com.google.inject.Inject; import com.netflix.astyanax.recipes.storage.ChunkedStorage; -import io.druid.java.util.common.CompressionUtils; -import io.druid.java.util.common.FileUtils; -import io.druid.java.util.common.RetryUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.java.util.common.CompressionUtils; +import org.apache.druid.java.util.common.FileUtils; +import org.apache.druid.java.util.common.RetryUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.loading.SegmentLoadingException; import java.io.File; import java.io.FileOutputStream; diff --git a/extensions-contrib/cassandra-storage/src/main/java/io/druid/storage/cassandra/CassandraDataSegmentPusher.java b/extensions-contrib/cassandra-storage/src/main/java/org/apache/druid/storage/cassandra/CassandraDataSegmentPusher.java similarity index 93% rename from extensions-contrib/cassandra-storage/src/main/java/io/druid/storage/cassandra/CassandraDataSegmentPusher.java rename to extensions-contrib/cassandra-storage/src/main/java/org/apache/druid/storage/cassandra/CassandraDataSegmentPusher.java index 023016183efd..7eac2483bee6 100644 --- a/extensions-contrib/cassandra-storage/src/main/java/io/druid/storage/cassandra/CassandraDataSegmentPusher.java +++ b/extensions-contrib/cassandra-storage/src/main/java/org/apache/druid/storage/cassandra/CassandraDataSegmentPusher.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.cassandra; +package org.apache.druid.storage.cassandra; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Joiner; @@ -27,11 +27,11 @@ import com.netflix.astyanax.connectionpool.exceptions.NotFoundException; import com.netflix.astyanax.recipes.storage.ChunkedStorage; import com.netflix.astyanax.recipes.storage.ChunkedStorageProvider; -import io.druid.java.util.common.CompressionUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.SegmentUtils; -import io.druid.segment.loading.DataSegmentPusher; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.CompressionUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.SegmentUtils; +import org.apache.druid.segment.loading.DataSegmentPusher; +import org.apache.druid.timeline.DataSegment; import java.io.File; import java.io.FileInputStream; diff --git a/extensions-contrib/cassandra-storage/src/main/java/io/druid/storage/cassandra/CassandraDruidModule.java b/extensions-contrib/cassandra-storage/src/main/java/org/apache/druid/storage/cassandra/CassandraDruidModule.java similarity index 87% rename from extensions-contrib/cassandra-storage/src/main/java/io/druid/storage/cassandra/CassandraDruidModule.java rename to extensions-contrib/cassandra-storage/src/main/java/org/apache/druid/storage/cassandra/CassandraDruidModule.java index 56bd2b316167..26a8434afc38 100644 --- a/extensions-contrib/cassandra-storage/src/main/java/io/druid/storage/cassandra/CassandraDruidModule.java +++ b/extensions-contrib/cassandra-storage/src/main/java/org/apache/druid/storage/cassandra/CassandraDruidModule.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.storage.cassandra; +package org.apache.druid.storage.cassandra; import com.fasterxml.jackson.core.Version; 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.JsonConfigProvider; -import io.druid.guice.LazySingleton; -import io.druid.guice.PolyBind; -import io.druid.initialization.DruidModule; -import io.druid.segment.loading.DataSegmentPusher; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.PolyBind; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.segment.loading.DataSegmentPusher; import java.util.List; diff --git a/extensions-contrib/cassandra-storage/src/main/java/io/druid/storage/cassandra/CassandraLoadSpec.java b/extensions-contrib/cassandra-storage/src/main/java/org/apache/druid/storage/cassandra/CassandraLoadSpec.java similarity index 91% rename from extensions-contrib/cassandra-storage/src/main/java/io/druid/storage/cassandra/CassandraLoadSpec.java rename to extensions-contrib/cassandra-storage/src/main/java/org/apache/druid/storage/cassandra/CassandraLoadSpec.java index a2100b283498..d17e5ab1f135 100644 --- a/extensions-contrib/cassandra-storage/src/main/java/io/druid/storage/cassandra/CassandraLoadSpec.java +++ b/extensions-contrib/cassandra-storage/src/main/java/org/apache/druid/storage/cassandra/CassandraLoadSpec.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.storage.cassandra; +package org.apache.druid.storage.cassandra; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.druid.segment.loading.LoadSpec; -import io.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.segment.loading.LoadSpec; +import org.apache.druid.segment.loading.SegmentLoadingException; import java.io.File; diff --git a/extensions-contrib/cassandra-storage/src/main/java/io/druid/storage/cassandra/CassandraStorage.java b/extensions-contrib/cassandra-storage/src/main/java/org/apache/druid/storage/cassandra/CassandraStorage.java similarity index 98% rename from extensions-contrib/cassandra-storage/src/main/java/io/druid/storage/cassandra/CassandraStorage.java rename to extensions-contrib/cassandra-storage/src/main/java/org/apache/druid/storage/cassandra/CassandraStorage.java index 68cf97b5a935..9588eb946fb5 100644 --- a/extensions-contrib/cassandra-storage/src/main/java/io/druid/storage/cassandra/CassandraStorage.java +++ b/extensions-contrib/cassandra-storage/src/main/java/org/apache/druid/storage/cassandra/CassandraStorage.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.cassandra; +package org.apache.druid.storage.cassandra; import com.netflix.astyanax.AstyanaxContext; import com.netflix.astyanax.Keyspace; diff --git a/extensions-contrib/cassandra-storage/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-contrib/cassandra-storage/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index 041440721777..000000000000 --- a/extensions-contrib/cassandra-storage/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.storage.cassandra.CassandraDruidModule \ No newline at end of file diff --git a/extensions-contrib/cassandra-storage/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-contrib/cassandra-storage/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..6afc50129f0c --- /dev/null +++ b/extensions-contrib/cassandra-storage/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.storage.cassandra.CassandraDruidModule \ No newline at end of file diff --git a/extensions-contrib/cloudfiles-extensions/pom.xml b/extensions-contrib/cloudfiles-extensions/pom.xml index 6d2bce80d10e..acc328c15dab 100644 --- a/extensions-contrib/cloudfiles-extensions/pom.xml +++ b/extensions-contrib/cloudfiles-extensions/pom.xml @@ -22,13 +22,13 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - io.druid.extensions.contrib + org.apache.druid.extensions.contrib druid-cloudfiles-extensions druid-cloudfiles-extensions druid-cloudfiles-extensions - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT ../../pom.xml @@ -44,7 +44,7 @@ - io.druid + org.apache.druid druid-api ${project.parent.version} provided @@ -130,7 +130,7 @@ test - io.druid + org.apache.druid druid-server ${project.parent.version} test diff --git a/extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/firehose/cloudfiles/CloudFilesBlob.java b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/firehose/cloudfiles/CloudFilesBlob.java similarity index 98% rename from extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/firehose/cloudfiles/CloudFilesBlob.java rename to extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/firehose/cloudfiles/CloudFilesBlob.java index 16d2d03df0e6..45fbdadd4560 100644 --- a/extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/firehose/cloudfiles/CloudFilesBlob.java +++ b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/firehose/cloudfiles/CloudFilesBlob.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.firehose.cloudfiles; +package org.apache.druid.firehose.cloudfiles; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/firehose/cloudfiles/CloudFilesFirehoseDruidModule.java b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/firehose/cloudfiles/CloudFilesFirehoseDruidModule.java similarity index 93% rename from extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/firehose/cloudfiles/CloudFilesFirehoseDruidModule.java rename to extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/firehose/cloudfiles/CloudFilesFirehoseDruidModule.java index c149720f4cc3..3531e7584e45 100644 --- a/extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/firehose/cloudfiles/CloudFilesFirehoseDruidModule.java +++ b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/firehose/cloudfiles/CloudFilesFirehoseDruidModule.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.firehose.cloudfiles; +package org.apache.druid.firehose.cloudfiles; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.common.collect.ImmutableList; import com.google.inject.Binder; -import io.druid.initialization.DruidModule; +import org.apache.druid.initialization.DruidModule; import java.util.List; diff --git a/extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/firehose/cloudfiles/StaticCloudFilesFirehoseFactory.java b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/firehose/cloudfiles/StaticCloudFilesFirehoseFactory.java similarity index 88% rename from extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/firehose/cloudfiles/StaticCloudFilesFirehoseFactory.java rename to extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/firehose/cloudfiles/StaticCloudFilesFirehoseFactory.java index 1a31e4b22ed5..c2b591a0857e 100644 --- a/extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/firehose/cloudfiles/StaticCloudFilesFirehoseFactory.java +++ b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/firehose/cloudfiles/StaticCloudFilesFirehoseFactory.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.firehose.cloudfiles; +package org.apache.druid.firehose.cloudfiles; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Predicate; -import io.druid.data.input.FiniteFirehoseFactory; -import io.druid.data.input.InputSplit; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.data.input.impl.prefetch.PrefetchableTextFilesFirehoseFactory; -import io.druid.java.util.common.CompressionUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.storage.cloudfiles.CloudFilesByteSource; -import io.druid.storage.cloudfiles.CloudFilesObjectApiProxy; -import io.druid.storage.cloudfiles.CloudFilesUtils; +import org.apache.druid.data.input.FiniteFirehoseFactory; +import org.apache.druid.data.input.InputSplit; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.data.input.impl.prefetch.PrefetchableTextFilesFirehoseFactory; +import org.apache.druid.java.util.common.CompressionUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.storage.cloudfiles.CloudFilesByteSource; +import org.apache.druid.storage.cloudfiles.CloudFilesObjectApiProxy; +import org.apache.druid.storage.cloudfiles.CloudFilesUtils; import org.jclouds.rackspace.cloudfiles.v1.CloudFilesApi; import java.io.IOException; diff --git a/extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/storage/cloudfiles/CloudFilesAccountConfig.java b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesAccountConfig.java similarity index 96% rename from extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/storage/cloudfiles/CloudFilesAccountConfig.java rename to extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesAccountConfig.java index 360c02f072b8..0317d6124996 100644 --- a/extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/storage/cloudfiles/CloudFilesAccountConfig.java +++ b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesAccountConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.cloudfiles; +package org.apache.druid.storage.cloudfiles; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/storage/cloudfiles/CloudFilesByteSource.java b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesByteSource.java similarity index 97% rename from extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/storage/cloudfiles/CloudFilesByteSource.java rename to extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesByteSource.java index 477d24aec9be..04287fe1a099 100644 --- a/extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/storage/cloudfiles/CloudFilesByteSource.java +++ b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesByteSource.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.cloudfiles; +package org.apache.druid.storage.cloudfiles; import com.google.common.base.Throwables; import com.google.common.io.ByteSource; diff --git a/extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/storage/cloudfiles/CloudFilesDataSegmentPuller.java b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesDataSegmentPuller.java similarity index 89% rename from extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/storage/cloudfiles/CloudFilesDataSegmentPuller.java rename to extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesDataSegmentPuller.java index ce95c8616439..47ceac57ab00 100644 --- a/extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/storage/cloudfiles/CloudFilesDataSegmentPuller.java +++ b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesDataSegmentPuller.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.storage.cloudfiles; +package org.apache.druid.storage.cloudfiles; import com.google.inject.Inject; -import io.druid.java.util.common.CompressionUtils; -import io.druid.java.util.common.FileUtils; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.java.util.common.CompressionUtils; +import org.apache.druid.java.util.common.FileUtils; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.loading.SegmentLoadingException; import org.jclouds.rackspace.cloudfiles.v1.CloudFilesApi; import java.io.File; diff --git a/extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/storage/cloudfiles/CloudFilesDataSegmentPusher.java b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesDataSegmentPusher.java similarity index 93% rename from extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/storage/cloudfiles/CloudFilesDataSegmentPusher.java rename to extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesDataSegmentPusher.java index 99052025edf4..11d5352fa4aa 100644 --- a/extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/storage/cloudfiles/CloudFilesDataSegmentPusher.java +++ b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesDataSegmentPusher.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.storage.cloudfiles; +package org.apache.druid.storage.cloudfiles; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; import com.google.inject.Inject; -import io.druid.java.util.common.CompressionUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.SegmentUtils; -import io.druid.segment.loading.DataSegmentPusher; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.CompressionUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.SegmentUtils; +import org.apache.druid.segment.loading.DataSegmentPusher; +import org.apache.druid.timeline.DataSegment; import org.jclouds.rackspace.cloudfiles.v1.CloudFilesApi; import java.io.File; diff --git a/extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/storage/cloudfiles/CloudFilesDataSegmentPusherConfig.java b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesDataSegmentPusherConfig.java similarity index 97% rename from extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/storage/cloudfiles/CloudFilesDataSegmentPusherConfig.java rename to extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesDataSegmentPusherConfig.java index f45113663702..68619737ab93 100644 --- a/extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/storage/cloudfiles/CloudFilesDataSegmentPusherConfig.java +++ b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesDataSegmentPusherConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.cloudfiles; +package org.apache.druid.storage.cloudfiles; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; diff --git a/extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/storage/cloudfiles/CloudFilesLoadSpec.java b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesLoadSpec.java similarity index 92% rename from extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/storage/cloudfiles/CloudFilesLoadSpec.java rename to extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesLoadSpec.java index 93f13b8f6d5a..d06261dd9e68 100644 --- a/extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/storage/cloudfiles/CloudFilesLoadSpec.java +++ b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesLoadSpec.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.storage.cloudfiles; +package org.apache.druid.storage.cloudfiles; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.base.Preconditions; -import io.druid.segment.loading.LoadSpec; -import io.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.segment.loading.LoadSpec; +import org.apache.druid.segment.loading.SegmentLoadingException; import java.io.File; diff --git a/extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/storage/cloudfiles/CloudFilesObject.java b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesObject.java similarity index 97% rename from extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/storage/cloudfiles/CloudFilesObject.java rename to extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesObject.java index 82a89a262f57..5f44856051c8 100644 --- a/extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/storage/cloudfiles/CloudFilesObject.java +++ b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesObject.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.cloudfiles; +package org.apache.druid.storage.cloudfiles; import com.google.common.io.ByteSource; import com.google.common.io.Files; diff --git a/extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/storage/cloudfiles/CloudFilesObjectApiProxy.java b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesObjectApiProxy.java similarity index 97% rename from extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/storage/cloudfiles/CloudFilesObjectApiProxy.java rename to extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesObjectApiProxy.java index 6caf2eea6b6b..07d8363fada9 100644 --- a/extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/storage/cloudfiles/CloudFilesObjectApiProxy.java +++ b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesObjectApiProxy.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.cloudfiles; +package org.apache.druid.storage.cloudfiles; import org.jclouds.http.options.GetOptions; import org.jclouds.io.Payload; diff --git a/extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/storage/cloudfiles/CloudFilesStorageDruidModule.java b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesStorageDruidModule.java similarity index 93% rename from extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/storage/cloudfiles/CloudFilesStorageDruidModule.java rename to extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesStorageDruidModule.java index 24ba06797b6a..9628b411c44b 100644 --- a/extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/storage/cloudfiles/CloudFilesStorageDruidModule.java +++ b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesStorageDruidModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.cloudfiles; +package org.apache.druid.storage.cloudfiles; import com.fasterxml.jackson.core.Version; import com.fasterxml.jackson.databind.Module; @@ -25,11 +25,11 @@ import com.google.common.collect.ImmutableSet; import com.google.inject.Binder; import com.google.inject.Provides; -import io.druid.guice.Binders; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.LazySingleton; -import io.druid.initialization.DruidModule; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.guice.Binders; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.java.util.common.logger.Logger; import org.jclouds.ContextBuilder; import org.jclouds.logging.slf4j.config.SLF4JLoggingModule; import org.jclouds.openstack.v2_0.config.InternalUrlModule; diff --git a/extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/storage/cloudfiles/CloudFilesUtils.java b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesUtils.java similarity index 92% rename from extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/storage/cloudfiles/CloudFilesUtils.java rename to extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesUtils.java index 30ff8377d3e3..06722ea21b57 100644 --- a/extensions-contrib/cloudfiles-extensions/src/main/java/io/druid/storage/cloudfiles/CloudFilesUtils.java +++ b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesUtils.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.storage.cloudfiles; +package org.apache.druid.storage.cloudfiles; import com.google.common.base.Predicate; -import io.druid.java.util.common.RetryUtils; -import io.druid.java.util.common.RetryUtils.Task; +import org.apache.druid.java.util.common.RetryUtils; +import org.apache.druid.java.util.common.RetryUtils.Task; import java.io.IOException; diff --git a/extensions-contrib/cloudfiles-extensions/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-contrib/cloudfiles-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule similarity index 85% rename from extensions-contrib/cloudfiles-extensions/src/main/resources/META-INF/services/io.druid.initialization.DruidModule rename to extensions-contrib/cloudfiles-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule index d01c55f9b537..81a1411f89b6 100644 --- a/extensions-contrib/cloudfiles-extensions/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ b/extensions-contrib/cloudfiles-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -15,5 +15,5 @@ # specific language governing permissions and limitations # under the License. -io.druid.storage.cloudfiles.CloudFilesStorageDruidModule -io.druid.firehose.cloudfiles.CloudFilesFirehoseDruidModule +org.apache.druid.storage.cloudfiles.CloudFilesStorageDruidModule +org.apache.druid.firehose.cloudfiles.CloudFilesFirehoseDruidModule diff --git a/extensions-contrib/cloudfiles-extensions/src/test/java/io/druid/firehose/cloudfiles/StaticCloudFilesFirehoseFactoryTest.java b/extensions-contrib/cloudfiles-extensions/src/test/java/org/apache/druid/firehose/cloudfiles/StaticCloudFilesFirehoseFactoryTest.java similarity index 95% rename from extensions-contrib/cloudfiles-extensions/src/test/java/io/druid/firehose/cloudfiles/StaticCloudFilesFirehoseFactoryTest.java rename to extensions-contrib/cloudfiles-extensions/src/test/java/org/apache/druid/firehose/cloudfiles/StaticCloudFilesFirehoseFactoryTest.java index d6f25728ff9e..48f3ca694fa3 100644 --- a/extensions-contrib/cloudfiles-extensions/src/test/java/io/druid/firehose/cloudfiles/StaticCloudFilesFirehoseFactoryTest.java +++ b/extensions-contrib/cloudfiles-extensions/src/test/java/org/apache/druid/firehose/cloudfiles/StaticCloudFilesFirehoseFactoryTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.firehose.cloudfiles; +package org.apache.druid.firehose.cloudfiles; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.ObjectMapper; @@ -28,8 +28,8 @@ import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Provides; -import io.druid.initialization.DruidModule; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.jackson.DefaultObjectMapper; import org.easymock.EasyMock; import org.jclouds.rackspace.cloudfiles.v1.CloudFilesApi; import org.junit.Assert; diff --git a/extensions-contrib/cloudfiles-extensions/src/test/java/io/druid/storage/cloudfiles/CloudFilesByteSourceTest.java b/extensions-contrib/cloudfiles-extensions/src/test/java/org/apache/druid/storage/cloudfiles/CloudFilesByteSourceTest.java similarity index 98% rename from extensions-contrib/cloudfiles-extensions/src/test/java/io/druid/storage/cloudfiles/CloudFilesByteSourceTest.java rename to extensions-contrib/cloudfiles-extensions/src/test/java/org/apache/druid/storage/cloudfiles/CloudFilesByteSourceTest.java index 1d5ae320852a..dd8b7800b334 100644 --- a/extensions-contrib/cloudfiles-extensions/src/test/java/io/druid/storage/cloudfiles/CloudFilesByteSourceTest.java +++ b/extensions-contrib/cloudfiles-extensions/src/test/java/org/apache/druid/storage/cloudfiles/CloudFilesByteSourceTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.cloudfiles; +package org.apache.druid.storage.cloudfiles; import org.easymock.EasyMockSupport; import org.jclouds.io.Payload; diff --git a/extensions-contrib/cloudfiles-extensions/src/test/java/io/druid/storage/cloudfiles/CloudFilesDataSegmentPusherTest.java b/extensions-contrib/cloudfiles-extensions/src/test/java/org/apache/druid/storage/cloudfiles/CloudFilesDataSegmentPusherTest.java similarity index 91% rename from extensions-contrib/cloudfiles-extensions/src/test/java/io/druid/storage/cloudfiles/CloudFilesDataSegmentPusherTest.java rename to extensions-contrib/cloudfiles-extensions/src/test/java/org/apache/druid/storage/cloudfiles/CloudFilesDataSegmentPusherTest.java index 3558d0f41044..cfddc6616540 100644 --- a/extensions-contrib/cloudfiles-extensions/src/test/java/io/druid/storage/cloudfiles/CloudFilesDataSegmentPusherTest.java +++ b/extensions-contrib/cloudfiles-extensions/src/test/java/org/apache/druid/storage/cloudfiles/CloudFilesDataSegmentPusherTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.storage.cloudfiles; +package org.apache.druid.storage.cloudfiles; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.io.Files; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.easymock.EasyMock; import org.jclouds.openstack.swift.v1.features.ObjectApi; import org.jclouds.rackspace.cloudfiles.v1.CloudFilesApi; diff --git a/extensions-contrib/cloudfiles-extensions/src/test/java/io/druid/storage/cloudfiles/CloudFilesObjectApiProxyTest.java b/extensions-contrib/cloudfiles-extensions/src/test/java/org/apache/druid/storage/cloudfiles/CloudFilesObjectApiProxyTest.java similarity index 98% rename from extensions-contrib/cloudfiles-extensions/src/test/java/io/druid/storage/cloudfiles/CloudFilesObjectApiProxyTest.java rename to extensions-contrib/cloudfiles-extensions/src/test/java/org/apache/druid/storage/cloudfiles/CloudFilesObjectApiProxyTest.java index 92fe580112d4..9d7036b5972a 100644 --- a/extensions-contrib/cloudfiles-extensions/src/test/java/io/druid/storage/cloudfiles/CloudFilesObjectApiProxyTest.java +++ b/extensions-contrib/cloudfiles-extensions/src/test/java/org/apache/druid/storage/cloudfiles/CloudFilesObjectApiProxyTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.cloudfiles; +package org.apache.druid.storage.cloudfiles; import org.easymock.EasyMockSupport; import org.jclouds.io.Payload; diff --git a/extensions-contrib/distinctcount/pom.xml b/extensions-contrib/distinctcount/pom.xml index acccd20c1605..65ef9cd98ab7 100644 --- a/extensions-contrib/distinctcount/pom.xml +++ b/extensions-contrib/distinctcount/pom.xml @@ -22,13 +22,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - io.druid.extensions.contrib + org.apache.druid.extensions.contrib druid-distinctcount druid-distinctcount druid-distinctcount - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT ../../pom.xml @@ -36,7 +36,7 @@ - io.druid + org.apache.druid druid-processing ${project.parent.version} provided @@ -44,14 +44,14 @@ - io.druid + org.apache.druid druid-common ${project.parent.version} test test-jar - io.druid + org.apache.druid druid-processing ${project.parent.version} test diff --git a/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/BitMapFactory.java b/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/BitMapFactory.java similarity index 92% rename from extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/BitMapFactory.java rename to extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/BitMapFactory.java index 1c71f3de6fee..5bf148d063f4 100644 --- a/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/BitMapFactory.java +++ b/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/BitMapFactory.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation.distinctcount; +package org.apache.druid.query.aggregation.distinctcount; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.druid.collections.bitmap.MutableBitmap; +import org.apache.druid.collections.bitmap.MutableBitmap; /** */ diff --git a/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/ConciseBitMapFactory.java b/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/ConciseBitMapFactory.java similarity index 85% rename from extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/ConciseBitMapFactory.java rename to extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/ConciseBitMapFactory.java index 334a86c132ae..2dcced8e0085 100644 --- a/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/ConciseBitMapFactory.java +++ b/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/ConciseBitMapFactory.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation.distinctcount; +package org.apache.druid.query.aggregation.distinctcount; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.ConciseBitmapFactory; -import io.druid.collections.bitmap.MutableBitmap; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.ConciseBitmapFactory; +import org.apache.druid.collections.bitmap.MutableBitmap; public class ConciseBitMapFactory implements BitMapFactory { diff --git a/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/DistinctCountAggregator.java b/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountAggregator.java similarity index 86% rename from extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/DistinctCountAggregator.java rename to extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountAggregator.java index d395d3651059..d7099e368914 100644 --- a/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/DistinctCountAggregator.java +++ b/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountAggregator.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.aggregation.distinctcount; +package org.apache.druid.query.aggregation.distinctcount; -import io.druid.collections.bitmap.MutableBitmap; -import io.druid.query.aggregation.Aggregator; -import io.druid.segment.DimensionSelector; -import io.druid.segment.data.IndexedInts; +import org.apache.druid.collections.bitmap.MutableBitmap; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.data.IndexedInts; public class DistinctCountAggregator implements Aggregator { diff --git a/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/DistinctCountAggregatorFactory.java b/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountAggregatorFactory.java similarity index 88% rename from extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/DistinctCountAggregatorFactory.java rename to extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountAggregatorFactory.java index c63898740a29..7b5e3c17242e 100644 --- a/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/DistinctCountAggregatorFactory.java +++ b/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountAggregatorFactory.java @@ -17,23 +17,23 @@ * under the License. */ -package io.druid.query.aggregation.distinctcount; +package org.apache.druid.query.aggregation.distinctcount; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.primitives.Longs; -import io.druid.java.util.common.StringUtils; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregateCombiner; -import io.druid.query.aggregation.AggregateCombiner; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.DimensionSelector; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregateCombiner; +import org.apache.druid.query.aggregation.AggregateCombiner; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.DimensionSelector; import java.nio.ByteBuffer; import java.util.Collections; @@ -123,7 +123,7 @@ public Object combine(Object lhs, Object rhs) @Override public AggregateCombiner makeAggregateCombiner() { - // This is likely wrong as well as combine(), see https://github.com/druid-io/druid/pull/2602#issuecomment-321224202 + // This is likely wrong as well as combine(), see https://github.com/apache/incubator-druid/pull/2602#issuecomment-321224202 return new LongSumAggregateCombiner(); } diff --git a/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/DistinctCountBufferAggregator.java b/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountBufferAggregator.java similarity index 86% rename from extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/DistinctCountBufferAggregator.java rename to extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountBufferAggregator.java index 0d3aee2728fc..1c10788a00cc 100644 --- a/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/DistinctCountBufferAggregator.java +++ b/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountBufferAggregator.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.aggregation.distinctcount; +package org.apache.druid.query.aggregation.distinctcount; -import io.druid.collections.bitmap.MutableBitmap; -import io.druid.collections.bitmap.WrappedRoaringBitmap; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.DimensionSelector; -import io.druid.segment.data.IndexedInts; +import org.apache.druid.collections.bitmap.MutableBitmap; +import org.apache.druid.collections.bitmap.WrappedRoaringBitmap; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.data.IndexedInts; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; diff --git a/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/DistinctCountDruidModule.java b/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountDruidModule.java similarity index 93% rename from extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/DistinctCountDruidModule.java rename to extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountDruidModule.java index d7af05f8d47c..4e2cb12a239c 100644 --- a/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/DistinctCountDruidModule.java +++ b/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountDruidModule.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.aggregation.distinctcount; +package org.apache.druid.query.aggregation.distinctcount; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.common.collect.ImmutableList; import com.google.inject.Binder; -import io.druid.initialization.DruidModule; +import org.apache.druid.initialization.DruidModule; import java.util.List; diff --git a/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/EmptyDistinctCountAggregator.java b/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/EmptyDistinctCountAggregator.java similarity index 91% rename from extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/EmptyDistinctCountAggregator.java rename to extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/EmptyDistinctCountAggregator.java index 8e820f897a59..1312ef940282 100644 --- a/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/EmptyDistinctCountAggregator.java +++ b/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/EmptyDistinctCountAggregator.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation.distinctcount; +package org.apache.druid.query.aggregation.distinctcount; -import io.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.Aggregator; public class EmptyDistinctCountAggregator implements Aggregator { diff --git a/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/EmptyDistinctCountBufferAggregator.java b/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/EmptyDistinctCountBufferAggregator.java similarity index 87% rename from extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/EmptyDistinctCountBufferAggregator.java rename to extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/EmptyDistinctCountBufferAggregator.java index ad6b471a149d..0636b4fb3cb9 100644 --- a/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/EmptyDistinctCountBufferAggregator.java +++ b/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/EmptyDistinctCountBufferAggregator.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.aggregation.distinctcount; +package org.apache.druid.query.aggregation.distinctcount; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; import java.nio.ByteBuffer; /** - * The difference from {@link io.druid.query.aggregation.NoopBufferAggregator} is that + * The difference from {@link org.apache.druid.query.aggregation.NoopBufferAggregator} is that * EmptyDistinctCountBufferAggregator returns 0 instead of null from {@link #get(ByteBuffer, int)}. */ public final class EmptyDistinctCountBufferAggregator implements BufferAggregator diff --git a/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/JavaBitMapFactory.java b/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/JavaBitMapFactory.java similarity index 85% rename from extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/JavaBitMapFactory.java rename to extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/JavaBitMapFactory.java index 9d29a7e5b3fd..382d1b59f371 100644 --- a/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/JavaBitMapFactory.java +++ b/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/JavaBitMapFactory.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation.distinctcount; +package org.apache.druid.query.aggregation.distinctcount; -import io.druid.collections.bitmap.BitSetBitmapFactory; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.MutableBitmap; +import org.apache.druid.collections.bitmap.BitSetBitmapFactory; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.MutableBitmap; public class JavaBitMapFactory implements BitMapFactory { diff --git a/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/RoaringBitMapFactory.java b/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/RoaringBitMapFactory.java similarity index 85% rename from extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/RoaringBitMapFactory.java rename to extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/RoaringBitMapFactory.java index 54988941fba9..a8e2d74cd56b 100644 --- a/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/RoaringBitMapFactory.java +++ b/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/RoaringBitMapFactory.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation.distinctcount; +package org.apache.druid.query.aggregation.distinctcount; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.MutableBitmap; -import io.druid.collections.bitmap.RoaringBitmapFactory; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.MutableBitmap; +import org.apache.druid.collections.bitmap.RoaringBitmapFactory; public class RoaringBitMapFactory implements BitMapFactory { diff --git a/extensions-contrib/distinctcount/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-contrib/distinctcount/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index 42447ce01348..000000000000 --- a/extensions-contrib/distinctcount/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.query.aggregation.distinctcount.DistinctCountDruidModule diff --git a/extensions-contrib/distinctcount/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-contrib/distinctcount/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..f813b998829d --- /dev/null +++ b/extensions-contrib/distinctcount/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.query.aggregation.distinctcount.DistinctCountDruidModule diff --git a/extensions-contrib/distinctcount/src/test/java/io/druid/query/aggregation/distinctcount/DistinctCountGroupByQueryTest.java b/extensions-contrib/distinctcount/src/test/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountGroupByQueryTest.java similarity index 78% rename from extensions-contrib/distinctcount/src/test/java/io/druid/query/aggregation/distinctcount/DistinctCountGroupByQueryTest.java rename to extensions-contrib/distinctcount/src/test/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountGroupByQueryTest.java index 750cdcdde6e6..886826871c56 100644 --- a/extensions-contrib/distinctcount/src/test/java/io/druid/query/aggregation/distinctcount/DistinctCountGroupByQueryTest.java +++ b/extensions-contrib/distinctcount/src/test/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountGroupByQueryTest.java @@ -17,30 +17,30 @@ * under the License. */ -package io.druid.query.aggregation.distinctcount; +package org.apache.druid.query.aggregation.distinctcount; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import io.druid.data.input.MapBasedInputRow; -import io.druid.data.input.Row; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.io.Closer; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.groupby.GroupByQuery; -import io.druid.query.groupby.GroupByQueryConfig; -import io.druid.query.groupby.GroupByQueryRunnerFactory; -import io.druid.query.groupby.GroupByQueryRunnerTest; -import io.druid.query.groupby.GroupByQueryRunnerTestHelper; -import io.druid.query.groupby.orderby.DefaultLimitSpec; -import io.druid.query.groupby.orderby.OrderByColumnSpec; -import io.druid.segment.IncrementalIndexSegment; -import io.druid.segment.Segment; -import io.druid.segment.TestHelper; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.groupby.GroupByQuery; +import org.apache.druid.query.groupby.GroupByQueryConfig; +import org.apache.druid.query.groupby.GroupByQueryRunnerFactory; +import org.apache.druid.query.groupby.GroupByQueryRunnerTest; +import org.apache.druid.query.groupby.GroupByQueryRunnerTestHelper; +import org.apache.druid.query.groupby.orderby.DefaultLimitSpec; +import org.apache.druid.query.groupby.orderby.OrderByColumnSpec; +import org.apache.druid.segment.IncrementalIndexSegment; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/extensions-contrib/distinctcount/src/test/java/io/druid/query/aggregation/distinctcount/DistinctCountTimeseriesQueryTest.java b/extensions-contrib/distinctcount/src/test/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountTimeseriesQueryTest.java similarity index 80% rename from extensions-contrib/distinctcount/src/test/java/io/druid/query/aggregation/distinctcount/DistinctCountTimeseriesQueryTest.java rename to extensions-contrib/distinctcount/src/test/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountTimeseriesQueryTest.java index 2126191cdef0..7d8fb98db953 100644 --- a/extensions-contrib/distinctcount/src/test/java/io/druid/query/aggregation/distinctcount/DistinctCountTimeseriesQueryTest.java +++ b/extensions-contrib/distinctcount/src/test/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountTimeseriesQueryTest.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.query.aggregation.distinctcount; +package org.apache.druid.query.aggregation.distinctcount; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import io.druid.data.input.MapBasedInputRow; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.Druids; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.Result; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.timeseries.TimeseriesQueryEngine; -import io.druid.query.timeseries.TimeseriesResultValue; -import io.druid.segment.TestHelper; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexSchema; -import io.druid.segment.incremental.IncrementalIndexStorageAdapter; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.Druids; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.timeseries.TimeseriesQueryEngine; +import org.apache.druid.query.timeseries.TimeseriesResultValue; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.segment.incremental.IncrementalIndexStorageAdapter; import org.joda.time.DateTime; import org.junit.Test; diff --git a/extensions-contrib/distinctcount/src/test/java/io/druid/query/aggregation/distinctcount/DistinctCountTopNQueryTest.java b/extensions-contrib/distinctcount/src/test/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountTopNQueryTest.java similarity index 83% rename from extensions-contrib/distinctcount/src/test/java/io/druid/query/aggregation/distinctcount/DistinctCountTopNQueryTest.java rename to extensions-contrib/distinctcount/src/test/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountTopNQueryTest.java index dd02784050ff..e9e4dea3ec8f 100644 --- a/extensions-contrib/distinctcount/src/test/java/io/druid/query/aggregation/distinctcount/DistinctCountTopNQueryTest.java +++ b/extensions-contrib/distinctcount/src/test/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountTopNQueryTest.java @@ -17,26 +17,26 @@ * under the License. */ -package io.druid.query.aggregation.distinctcount; +package org.apache.druid.query.aggregation.distinctcount; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import io.druid.collections.CloseableStupidPool; -import io.druid.data.input.MapBasedInputRow; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.Result; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.topn.TopNQuery; -import io.druid.query.topn.TopNQueryBuilder; -import io.druid.query.topn.TopNQueryEngine; -import io.druid.query.topn.TopNResultValue; -import io.druid.segment.TestHelper; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexSchema; -import io.druid.segment.incremental.IncrementalIndexStorageAdapter; +import org.apache.druid.collections.CloseableStupidPool; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.topn.TopNQuery; +import org.apache.druid.query.topn.TopNQueryBuilder; +import org.apache.druid.query.topn.TopNQueryEngine; +import org.apache.druid.query.topn.TopNResultValue; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.segment.incremental.IncrementalIndexStorageAdapter; import org.joda.time.DateTime; import org.junit.After; import org.junit.Before; diff --git a/extensions-contrib/druid-rocketmq/pom.xml b/extensions-contrib/druid-rocketmq/pom.xml index f40a619232cf..251961ba99ea 100644 --- a/extensions-contrib/druid-rocketmq/pom.xml +++ b/extensions-contrib/druid-rocketmq/pom.xml @@ -23,12 +23,12 @@ 4.0.0 druid - io.druid + org.apache.druid 0.13.0-SNAPSHOT ../../pom.xml - io.druid.extensions.contrib + org.apache.druid.extensions.contrib druid-rocketmq @@ -42,7 +42,7 @@ ${rocketmq.version} - io.druid + org.apache.druid druid-api ${project.parent.version} provided diff --git a/extensions-contrib/druid-rocketmq/src/main/java/io/druid/firehose/rocketmq/RocketMQDruidModule.java b/extensions-contrib/druid-rocketmq/src/main/java/org/apache/druid/firehose/rocketmq/RocketMQDruidModule.java similarity index 93% rename from extensions-contrib/druid-rocketmq/src/main/java/io/druid/firehose/rocketmq/RocketMQDruidModule.java rename to extensions-contrib/druid-rocketmq/src/main/java/org/apache/druid/firehose/rocketmq/RocketMQDruidModule.java index 4cdaff54457c..159a3770bf44 100644 --- a/extensions-contrib/druid-rocketmq/src/main/java/io/druid/firehose/rocketmq/RocketMQDruidModule.java +++ b/extensions-contrib/druid-rocketmq/src/main/java/org/apache/druid/firehose/rocketmq/RocketMQDruidModule.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.firehose.rocketmq; +package org.apache.druid.firehose.rocketmq; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.common.collect.ImmutableList; import com.google.inject.Binder; -import io.druid.initialization.DruidModule; +import org.apache.druid.initialization.DruidModule; import java.util.List; diff --git a/extensions-contrib/druid-rocketmq/src/main/java/io/druid/firehose/rocketmq/RocketMQFirehoseFactory.java b/extensions-contrib/druid-rocketmq/src/main/java/org/apache/druid/firehose/rocketmq/RocketMQFirehoseFactory.java similarity index 97% rename from extensions-contrib/druid-rocketmq/src/main/java/io/druid/firehose/rocketmq/RocketMQFirehoseFactory.java rename to extensions-contrib/druid-rocketmq/src/main/java/org/apache/druid/firehose/rocketmq/RocketMQFirehoseFactory.java index d129944ee477..945461998f78 100644 --- a/extensions-contrib/druid-rocketmq/src/main/java/io/druid/firehose/rocketmq/RocketMQFirehoseFactory.java +++ b/extensions-contrib/druid-rocketmq/src/main/java/org/apache/druid/firehose/rocketmq/RocketMQFirehoseFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.firehose.rocketmq; +package org.apache.druid.firehose.rocketmq; import com.alibaba.rocketmq.client.Validators; import com.alibaba.rocketmq.client.consumer.DefaultMQPullConsumer; @@ -34,13 +34,13 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.Sets; -import io.druid.data.input.Firehose; -import io.druid.data.input.FirehoseFactory; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.InputRowParser; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.common.parsers.ParseException; +import org.apache.druid.data.input.Firehose; +import org.apache.druid.data.input.FirehoseFactory; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.parsers.ParseException; import javax.annotation.Nullable; import java.io.File; diff --git a/extensions-contrib/google-extensions/pom.xml b/extensions-contrib/google-extensions/pom.xml index a8ff6bc6c0c6..a60712cb0b39 100644 --- a/extensions-contrib/google-extensions/pom.xml +++ b/extensions-contrib/google-extensions/pom.xml @@ -21,13 +21,13 @@ 4.0.0 - io.druid.extensions.contrib + org.apache.druid.extensions.contrib druid-google-extensions druid-google-extensions druid-google-extensions - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT ../../pom.xml @@ -35,7 +35,7 @@ - io.druid + org.apache.druid druid-api ${project.parent.version} provided @@ -59,7 +59,7 @@ - io.druid + org.apache.druid druid-processing ${project.parent.version} test-jar @@ -71,7 +71,7 @@ test - io.druid + org.apache.druid druid-server ${project.parent.version} test diff --git a/extensions-contrib/google-extensions/src/main/java/io/druid/firehose/google/GoogleBlob.java b/extensions-contrib/google-extensions/src/main/java/org/apache/druid/firehose/google/GoogleBlob.java similarity index 97% rename from extensions-contrib/google-extensions/src/main/java/io/druid/firehose/google/GoogleBlob.java rename to extensions-contrib/google-extensions/src/main/java/org/apache/druid/firehose/google/GoogleBlob.java index 2676031fb158..bc136762e9cb 100644 --- a/extensions-contrib/google-extensions/src/main/java/io/druid/firehose/google/GoogleBlob.java +++ b/extensions-contrib/google-extensions/src/main/java/org/apache/druid/firehose/google/GoogleBlob.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.firehose.google; +package org.apache.druid.firehose.google; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-contrib/google-extensions/src/main/java/io/druid/firehose/google/StaticGoogleBlobStoreFirehoseFactory.java b/extensions-contrib/google-extensions/src/main/java/org/apache/druid/firehose/google/StaticGoogleBlobStoreFirehoseFactory.java similarity index 89% rename from extensions-contrib/google-extensions/src/main/java/io/druid/firehose/google/StaticGoogleBlobStoreFirehoseFactory.java rename to extensions-contrib/google-extensions/src/main/java/org/apache/druid/firehose/google/StaticGoogleBlobStoreFirehoseFactory.java index a49ee8c93e36..07f35ce5e221 100644 --- a/extensions-contrib/google-extensions/src/main/java/io/druid/firehose/google/StaticGoogleBlobStoreFirehoseFactory.java +++ b/extensions-contrib/google-extensions/src/main/java/org/apache/druid/firehose/google/StaticGoogleBlobStoreFirehoseFactory.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.firehose.google; +package org.apache.druid.firehose.google; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Predicate; -import io.druid.data.input.FiniteFirehoseFactory; -import io.druid.data.input.InputSplit; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.data.input.impl.prefetch.PrefetchableTextFilesFirehoseFactory; -import io.druid.java.util.common.CompressionUtils; -import io.druid.storage.google.GoogleByteSource; -import io.druid.storage.google.GoogleStorage; -import io.druid.storage.google.GoogleUtils; +import org.apache.druid.data.input.FiniteFirehoseFactory; +import org.apache.druid.data.input.InputSplit; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.data.input.impl.prefetch.PrefetchableTextFilesFirehoseFactory; +import org.apache.druid.java.util.common.CompressionUtils; +import org.apache.druid.storage.google.GoogleByteSource; +import org.apache.druid.storage.google.GoogleStorage; +import org.apache.druid.storage.google.GoogleUtils; import java.io.IOException; import java.io.InputStream; diff --git a/extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleAccountConfig.java b/extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleAccountConfig.java similarity index 96% rename from extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleAccountConfig.java rename to extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleAccountConfig.java index e67ccf0f45eb..e551f65cfec2 100644 --- a/extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleAccountConfig.java +++ b/extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleAccountConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.google; +package org.apache.druid.storage.google; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleByteSource.java b/extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleByteSource.java similarity index 97% rename from extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleByteSource.java rename to extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleByteSource.java index 77481c54eab8..6066eb2c13e7 100644 --- a/extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleByteSource.java +++ b/extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleByteSource.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.google; +package org.apache.druid.storage.google; import com.google.common.io.ByteSource; diff --git a/extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleDataSegmentFinder.java b/extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleDataSegmentFinder.java similarity index 95% rename from extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleDataSegmentFinder.java rename to extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleDataSegmentFinder.java index f3a60ed75f56..888a2364bb42 100644 --- a/extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleDataSegmentFinder.java +++ b/extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleDataSegmentFinder.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.google; +package org.apache.druid.storage.google; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.api.client.http.InputStreamContent; @@ -27,10 +27,10 @@ import com.google.common.base.Throwables; import com.google.common.collect.Sets; import com.google.inject.Inject; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.loading.DataSegmentFinder; -import io.druid.segment.loading.SegmentLoadingException; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.loading.DataSegmentFinder; +import org.apache.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.timeline.DataSegment; import java.io.ByteArrayInputStream; import java.io.File; diff --git a/extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleDataSegmentKiller.java b/extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleDataSegmentKiller.java similarity index 86% rename from extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleDataSegmentKiller.java rename to extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleDataSegmentKiller.java index df0f7466436c..b3f11c481e0e 100644 --- a/extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleDataSegmentKiller.java +++ b/extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleDataSegmentKiller.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.storage.google; +package org.apache.druid.storage.google; import com.google.api.client.http.HttpResponseException; import com.google.inject.Inject; -import io.druid.java.util.common.MapUtils; -import io.druid.java.util.common.RE; -import io.druid.java.util.common.RetryUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.loading.DataSegmentKiller; -import io.druid.segment.loading.SegmentLoadingException; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.MapUtils; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.java.util.common.RetryUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.loading.DataSegmentKiller; +import org.apache.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.timeline.DataSegment; import java.io.IOException; import java.util.Map; diff --git a/extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleDataSegmentPuller.java b/extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleDataSegmentPuller.java similarity index 90% rename from extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleDataSegmentPuller.java rename to extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleDataSegmentPuller.java index 4bcf2124f2ca..67936c013304 100644 --- a/extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleDataSegmentPuller.java +++ b/extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleDataSegmentPuller.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.storage.google; +package org.apache.druid.storage.google; import com.google.common.base.Predicate; import com.google.inject.Inject; -import io.druid.java.util.common.CompressionUtils; -import io.druid.java.util.common.FileUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.loading.SegmentLoadingException; -import io.druid.segment.loading.URIDataPuller; +import org.apache.druid.java.util.common.CompressionUtils; +import org.apache.druid.java.util.common.FileUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.segment.loading.URIDataPuller; import java.io.File; import java.io.IOException; diff --git a/extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleDataSegmentPusher.java b/extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleDataSegmentPusher.java similarity index 92% rename from extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleDataSegmentPusher.java rename to extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleDataSegmentPusher.java index 0e739f568dcc..4e6050468bea 100644 --- a/extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleDataSegmentPusher.java +++ b/extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleDataSegmentPusher.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.google; +package org.apache.druid.storage.google; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.api.client.http.FileContent; @@ -27,14 +27,14 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.inject.Inject; -import io.druid.java.util.common.CompressionUtils; -import io.druid.java.util.common.RE; -import io.druid.java.util.common.RetryUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.SegmentUtils; -import io.druid.segment.loading.DataSegmentPusher; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.CompressionUtils; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.java.util.common.RetryUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.SegmentUtils; +import org.apache.druid.segment.loading.DataSegmentPusher; +import org.apache.druid.timeline.DataSegment; import java.io.File; import java.io.IOException; diff --git a/extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleLoadSpec.java b/extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleLoadSpec.java similarity index 92% rename from extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleLoadSpec.java rename to extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleLoadSpec.java index 01cf64ff5278..4629762a7ba7 100644 --- a/extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleLoadSpec.java +++ b/extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleLoadSpec.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.storage.google; +package org.apache.druid.storage.google; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.base.Preconditions; -import io.druid.segment.loading.LoadSpec; -import io.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.segment.loading.LoadSpec; +import org.apache.druid.segment.loading.SegmentLoadingException; import java.io.File; diff --git a/extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleStorage.java b/extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleStorage.java similarity index 98% rename from extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleStorage.java rename to extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleStorage.java index 85154bdb83d9..ee5796678603 100644 --- a/extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleStorage.java +++ b/extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleStorage.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.google; +package org.apache.druid.storage.google; import com.google.api.client.http.AbstractInputStreamContent; import com.google.api.services.storage.Storage; diff --git a/extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleStorageDruidModule.java b/extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleStorageDruidModule.java similarity index 92% rename from extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleStorageDruidModule.java rename to extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleStorageDruidModule.java index a3ddddea4b69..88b9bd804113 100644 --- a/extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleStorageDruidModule.java +++ b/extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleStorageDruidModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.google; +package org.apache.druid.storage.google; import com.fasterxml.jackson.core.Version; import com.fasterxml.jackson.databind.Module; @@ -33,12 +33,12 @@ import com.google.common.collect.ImmutableList; import com.google.inject.Binder; import com.google.inject.Provides; -import io.druid.firehose.google.StaticGoogleBlobStoreFirehoseFactory; -import io.druid.guice.Binders; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.LazySingleton; -import io.druid.initialization.DruidModule; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.firehose.google.StaticGoogleBlobStoreFirehoseFactory; +import org.apache.druid.guice.Binders; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.java.util.common.logger.Logger; import java.io.IOException; import java.security.GeneralSecurityException; diff --git a/extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleTaskLogs.java b/extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleTaskLogs.java similarity index 96% rename from extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleTaskLogs.java rename to extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleTaskLogs.java index ecfebbbe5824..2f747f3729cf 100644 --- a/extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleTaskLogs.java +++ b/extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleTaskLogs.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.storage.google; +package org.apache.druid.storage.google; import com.google.api.client.http.InputStreamContent; import com.google.common.base.Optional; import com.google.common.io.ByteSource; import com.google.inject.Inject; -import io.druid.java.util.common.IOE; -import io.druid.java.util.common.logger.Logger; -import io.druid.tasklogs.TaskLogs; +import org.apache.druid.java.util.common.IOE; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.tasklogs.TaskLogs; import java.io.File; import java.io.FileInputStream; diff --git a/extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleTaskLogsConfig.java b/extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleTaskLogsConfig.java similarity index 97% rename from extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleTaskLogsConfig.java rename to extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleTaskLogsConfig.java index 02ef8241cd52..cfcf8b3da506 100644 --- a/extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleTaskLogsConfig.java +++ b/extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleTaskLogsConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.google; +package org.apache.druid.storage.google; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleUtils.java b/extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleUtils.java similarity index 97% rename from extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleUtils.java rename to extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleUtils.java index bfb5269196ed..ebb47d6cf38e 100644 --- a/extensions-contrib/google-extensions/src/main/java/io/druid/storage/google/GoogleUtils.java +++ b/extensions-contrib/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.google; +package org.apache.druid.storage.google; import com.google.api.client.http.HttpResponseException; diff --git a/extensions-contrib/google-extensions/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-contrib/google-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule similarity index 93% rename from extensions-contrib/google-extensions/src/main/resources/META-INF/services/io.druid.initialization.DruidModule rename to extensions-contrib/google-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule index b27bee8f1035..56ed204ca6bb 100644 --- a/extensions-contrib/google-extensions/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ b/extensions-contrib/google-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -17,4 +17,4 @@ # under the License. # -io.druid.storage.google.GoogleStorageDruidModule +org.apache.druid.storage.google.GoogleStorageDruidModule diff --git a/extensions-contrib/google-extensions/src/test/java/io/druid/firehose/google/StaticGoogleBlobStoreFirehoseFactoryTest.java b/extensions-contrib/google-extensions/src/test/java/org/apache/druid/firehose/google/StaticGoogleBlobStoreFirehoseFactoryTest.java similarity index 93% rename from extensions-contrib/google-extensions/src/test/java/io/druid/firehose/google/StaticGoogleBlobStoreFirehoseFactoryTest.java rename to extensions-contrib/google-extensions/src/test/java/org/apache/druid/firehose/google/StaticGoogleBlobStoreFirehoseFactoryTest.java index 5d54bb707af5..5bb60d774c06 100644 --- a/extensions-contrib/google-extensions/src/test/java/io/druid/firehose/google/StaticGoogleBlobStoreFirehoseFactoryTest.java +++ b/extensions-contrib/google-extensions/src/test/java/org/apache/druid/firehose/google/StaticGoogleBlobStoreFirehoseFactoryTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.firehose.google; +package org.apache.druid.firehose.google; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.ObjectMapper; @@ -28,9 +28,9 @@ import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Provides; -import io.druid.initialization.DruidModule; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.storage.google.GoogleStorage; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.storage.google.GoogleStorage; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-contrib/google-extensions/src/test/java/io/druid/storage/google/GoogleByteSourceTest.java b/extensions-contrib/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleByteSourceTest.java similarity index 97% rename from extensions-contrib/google-extensions/src/test/java/io/druid/storage/google/GoogleByteSourceTest.java rename to extensions-contrib/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleByteSourceTest.java index b5b179ab6624..4eb55bd2dc1d 100644 --- a/extensions-contrib/google-extensions/src/test/java/io/druid/storage/google/GoogleByteSourceTest.java +++ b/extensions-contrib/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleByteSourceTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.google; +package org.apache.druid.storage.google; import org.easymock.EasyMockSupport; import org.junit.Test; diff --git a/extensions-contrib/google-extensions/src/test/java/io/druid/storage/google/GoogleDataSegmentFinderTest.java b/extensions-contrib/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleDataSegmentFinderTest.java similarity index 96% rename from extensions-contrib/google-extensions/src/test/java/io/druid/storage/google/GoogleDataSegmentFinderTest.java rename to extensions-contrib/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleDataSegmentFinderTest.java index d0f7e3dbd334..a349b7a8f8f5 100644 --- a/extensions-contrib/google-extensions/src/test/java/io/druid/storage/google/GoogleDataSegmentFinderTest.java +++ b/extensions-contrib/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleDataSegmentFinderTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.google; +package org.apache.druid.storage.google; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.jsontype.NamedType; @@ -27,11 +27,11 @@ import com.google.api.services.storage.model.StorageObject; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.Intervals; -import io.druid.segment.TestHelper; -import io.druid.segment.loading.SegmentLoadingException; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NumberedShardSpec; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NumberedShardSpec; import org.easymock.Capture; import org.easymock.EasyMock; import org.easymock.EasyMockSupport; diff --git a/extensions-contrib/google-extensions/src/test/java/io/druid/storage/google/GoogleDataSegmentKillerTest.java b/extensions-contrib/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleDataSegmentKillerTest.java similarity index 93% rename from extensions-contrib/google-extensions/src/test/java/io/druid/storage/google/GoogleDataSegmentKillerTest.java rename to extensions-contrib/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleDataSegmentKillerTest.java index b28e50cf86a1..6734cb742321 100644 --- a/extensions-contrib/google-extensions/src/test/java/io/druid/storage/google/GoogleDataSegmentKillerTest.java +++ b/extensions-contrib/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleDataSegmentKillerTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.storage.google; +package org.apache.druid.storage.google; import com.google.api.client.googleapis.json.GoogleJsonResponseException; import com.google.api.client.googleapis.testing.json.GoogleJsonResponseExceptionFactoryTesting; import com.google.api.client.json.jackson2.JacksonFactory; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.Intervals; -import io.druid.segment.loading.SegmentLoadingException; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.easymock.EasyMock; import org.easymock.EasyMockSupport; import org.junit.Before; diff --git a/extensions-contrib/google-extensions/src/test/java/io/druid/storage/google/GoogleDataSegmentPullerTest.java b/extensions-contrib/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleDataSegmentPullerTest.java similarity index 95% rename from extensions-contrib/google-extensions/src/test/java/io/druid/storage/google/GoogleDataSegmentPullerTest.java rename to extensions-contrib/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleDataSegmentPullerTest.java index 562a8b6559d1..4c193120deaf 100644 --- a/extensions-contrib/google-extensions/src/test/java/io/druid/storage/google/GoogleDataSegmentPullerTest.java +++ b/extensions-contrib/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleDataSegmentPullerTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.storage.google; +package org.apache.druid.storage.google; import com.google.api.client.googleapis.json.GoogleJsonResponseException; import com.google.api.client.googleapis.testing.json.GoogleJsonResponseExceptionFactoryTesting; import com.google.api.client.json.jackson2.JacksonFactory; -import io.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.segment.loading.SegmentLoadingException; import org.apache.commons.io.FileUtils; import org.easymock.EasyMock; import org.easymock.EasyMockSupport; diff --git a/extensions-contrib/google-extensions/src/test/java/io/druid/storage/google/GoogleDataSegmentPusherTest.java b/extensions-contrib/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleDataSegmentPusherTest.java similarity index 94% rename from extensions-contrib/google-extensions/src/test/java/io/druid/storage/google/GoogleDataSegmentPusherTest.java rename to extensions-contrib/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleDataSegmentPusherTest.java index 331df7387a7c..ba5d7be48731 100644 --- a/extensions-contrib/google-extensions/src/test/java/io/druid/storage/google/GoogleDataSegmentPusherTest.java +++ b/extensions-contrib/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleDataSegmentPusherTest.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.storage.google; +package org.apache.druid.storage.google; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.io.Files; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.easymock.EasyMock; import org.easymock.EasyMockSupport; import org.junit.Assert; diff --git a/extensions-contrib/google-extensions/src/test/java/io/druid/storage/google/GoogleTaskLogsTest.java b/extensions-contrib/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleTaskLogsTest.java similarity index 98% rename from extensions-contrib/google-extensions/src/test/java/io/druid/storage/google/GoogleTaskLogsTest.java rename to extensions-contrib/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleTaskLogsTest.java index ef83c9bc99ec..2478301b204a 100644 --- a/extensions-contrib/google-extensions/src/test/java/io/druid/storage/google/GoogleTaskLogsTest.java +++ b/extensions-contrib/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleTaskLogsTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.storage.google; +package org.apache.druid.storage.google; import com.google.api.client.http.InputStreamContent; import com.google.common.base.Optional; import com.google.common.io.ByteSource; import com.google.common.io.Files; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.easymock.EasyMock; diff --git a/extensions-contrib/google-extensions/src/test/java/io/druid/storage/google/GoogleUtilsTest.java b/extensions-contrib/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleUtilsTest.java similarity index 98% rename from extensions-contrib/google-extensions/src/test/java/io/druid/storage/google/GoogleUtilsTest.java rename to extensions-contrib/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleUtilsTest.java index eca719c0f670..aac7ab0fbf73 100644 --- a/extensions-contrib/google-extensions/src/test/java/io/druid/storage/google/GoogleUtilsTest.java +++ b/extensions-contrib/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleUtilsTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.google; +package org.apache.druid.storage.google; import com.google.api.client.googleapis.json.GoogleJsonResponseException; import com.google.api.client.http.HttpHeaders; diff --git a/extensions-contrib/graphite-emitter/pom.xml b/extensions-contrib/graphite-emitter/pom.xml index 57b14024b297..bec2d8492a42 100644 --- a/extensions-contrib/graphite-emitter/pom.xml +++ b/extensions-contrib/graphite-emitter/pom.xml @@ -23,38 +23,38 @@ 4.0.0 - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT ../../pom.xml - io.druid.extensions.contrib + org.apache.druid.extensions.contrib graphite-emitter graphite-emitter Druid emitter extension to support graphite - io.druid + org.apache.druid druid-common ${project.parent.version} provided - io.druid + org.apache.druid druid-api ${project.parent.version} provided - io.druid + org.apache.druid druid-server ${project.parent.version} provided - io.druid + org.apache.druid java-util ${project.parent.version} provided @@ -81,7 +81,7 @@ test - io.druid + org.apache.druid druid-processing ${project.parent.version} test-jar diff --git a/extensions-contrib/graphite-emitter/src/main/java/io/druid/emitter/graphite/DruidToGraphiteEventConverter.java b/extensions-contrib/graphite-emitter/src/main/java/org/apache/druid/emitter/graphite/DruidToGraphiteEventConverter.java similarity index 93% rename from extensions-contrib/graphite-emitter/src/main/java/io/druid/emitter/graphite/DruidToGraphiteEventConverter.java rename to extensions-contrib/graphite-emitter/src/main/java/org/apache/druid/emitter/graphite/DruidToGraphiteEventConverter.java index 5b02db95bd6f..35505ccc1537 100644 --- a/extensions-contrib/graphite-emitter/src/main/java/io/druid/emitter/graphite/DruidToGraphiteEventConverter.java +++ b/extensions-contrib/graphite-emitter/src/main/java/org/apache/druid/emitter/graphite/DruidToGraphiteEventConverter.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.emitter.graphite; +package org.apache.druid.emitter.graphite; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type", defaultImpl = WhiteListBasedConverter.class) diff --git a/extensions-contrib/graphite-emitter/src/main/java/io/druid/emitter/graphite/GraphiteEmitter.java b/extensions-contrib/graphite-emitter/src/main/java/org/apache/druid/emitter/graphite/GraphiteEmitter.java similarity index 95% rename from extensions-contrib/graphite-emitter/src/main/java/io/druid/emitter/graphite/GraphiteEmitter.java rename to extensions-contrib/graphite-emitter/src/main/java/org/apache/druid/emitter/graphite/GraphiteEmitter.java index e29b0cb81097..fba66e3fdaf8 100644 --- a/extensions-contrib/graphite-emitter/src/main/java/io/druid/emitter/graphite/GraphiteEmitter.java +++ b/extensions-contrib/graphite-emitter/src/main/java/org/apache/druid/emitter/graphite/GraphiteEmitter.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.emitter.graphite; +package org.apache.druid.emitter.graphite; import com.codahale.metrics.graphite.Graphite; import com.codahale.metrics.graphite.GraphiteSender; import com.codahale.metrics.graphite.PickledGraphite; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.emitter.core.Emitter; -import io.druid.java.util.emitter.core.Event; -import io.druid.java.util.emitter.service.AlertEvent; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.server.log.EmittingRequestLogger; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.core.Emitter; +import org.apache.druid.java.util.emitter.core.Event; +import org.apache.druid.java.util.emitter.service.AlertEvent; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.server.log.EmittingRequestLogger; import java.io.IOException; import java.net.SocketException; diff --git a/extensions-contrib/graphite-emitter/src/main/java/io/druid/emitter/graphite/GraphiteEmitterConfig.java b/extensions-contrib/graphite-emitter/src/main/java/org/apache/druid/emitter/graphite/GraphiteEmitterConfig.java similarity index 99% rename from extensions-contrib/graphite-emitter/src/main/java/io/druid/emitter/graphite/GraphiteEmitterConfig.java rename to extensions-contrib/graphite-emitter/src/main/java/org/apache/druid/emitter/graphite/GraphiteEmitterConfig.java index ee426a0b66d0..3a16322db187 100644 --- a/extensions-contrib/graphite-emitter/src/main/java/io/druid/emitter/graphite/GraphiteEmitterConfig.java +++ b/extensions-contrib/graphite-emitter/src/main/java/org/apache/druid/emitter/graphite/GraphiteEmitterConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.emitter.graphite; +package org.apache.druid.emitter.graphite; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-contrib/graphite-emitter/src/main/java/io/druid/emitter/graphite/GraphiteEmitterModule.java b/extensions-contrib/graphite-emitter/src/main/java/org/apache/druid/emitter/graphite/GraphiteEmitterModule.java similarity index 91% rename from extensions-contrib/graphite-emitter/src/main/java/io/druid/emitter/graphite/GraphiteEmitterModule.java rename to extensions-contrib/graphite-emitter/src/main/java/org/apache/druid/emitter/graphite/GraphiteEmitterModule.java index f5a3b5ebfd3f..cb31c1fdb63d 100644 --- a/extensions-contrib/graphite-emitter/src/main/java/io/druid/emitter/graphite/GraphiteEmitterModule.java +++ b/extensions-contrib/graphite-emitter/src/main/java/org/apache/druid/emitter/graphite/GraphiteEmitterModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.emitter.graphite; +package org.apache.druid.emitter.graphite; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.ObjectMapper; @@ -29,10 +29,10 @@ import com.google.inject.Provides; import com.google.inject.name.Named; import com.google.inject.name.Names; -import io.druid.java.util.emitter.core.Emitter; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.ManageLifecycle; -import io.druid.initialization.DruidModule; +import org.apache.druid.java.util.emitter.core.Emitter; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.initialization.DruidModule; import java.util.Collections; import java.util.List; diff --git a/extensions-contrib/graphite-emitter/src/main/java/io/druid/emitter/graphite/GraphiteEvent.java b/extensions-contrib/graphite-emitter/src/main/java/org/apache/druid/emitter/graphite/GraphiteEvent.java similarity index 97% rename from extensions-contrib/graphite-emitter/src/main/java/io/druid/emitter/graphite/GraphiteEvent.java rename to extensions-contrib/graphite-emitter/src/main/java/org/apache/druid/emitter/graphite/GraphiteEvent.java index d27617890afd..5712bb11fbde 100644 --- a/extensions-contrib/graphite-emitter/src/main/java/io/druid/emitter/graphite/GraphiteEvent.java +++ b/extensions-contrib/graphite-emitter/src/main/java/org/apache/druid/emitter/graphite/GraphiteEvent.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.emitter.graphite; +package org.apache.druid.emitter.graphite; import com.google.common.base.Preconditions; diff --git a/extensions-contrib/graphite-emitter/src/main/java/io/druid/emitter/graphite/SendAllGraphiteEventConverter.java b/extensions-contrib/graphite-emitter/src/main/java/org/apache/druid/emitter/graphite/SendAllGraphiteEventConverter.java similarity index 97% rename from extensions-contrib/graphite-emitter/src/main/java/io/druid/emitter/graphite/SendAllGraphiteEventConverter.java rename to extensions-contrib/graphite-emitter/src/main/java/org/apache/druid/emitter/graphite/SendAllGraphiteEventConverter.java index 98bc3e53ec6c..23d79ded7c5f 100644 --- a/extensions-contrib/graphite-emitter/src/main/java/io/druid/emitter/graphite/SendAllGraphiteEventConverter.java +++ b/extensions-contrib/graphite-emitter/src/main/java/org/apache/druid/emitter/graphite/SendAllGraphiteEventConverter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.emitter.graphite; +package org.apache.druid.emitter.graphite; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -26,7 +26,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSortedSet; -import io.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; import java.util.concurrent.TimeUnit; diff --git a/extensions-contrib/graphite-emitter/src/main/java/io/druid/emitter/graphite/WhiteListBasedConverter.java b/extensions-contrib/graphite-emitter/src/main/java/org/apache/druid/emitter/graphite/WhiteListBasedConverter.java similarity index 97% rename from extensions-contrib/graphite-emitter/src/main/java/io/druid/emitter/graphite/WhiteListBasedConverter.java rename to extensions-contrib/graphite-emitter/src/main/java/org/apache/druid/emitter/graphite/WhiteListBasedConverter.java index 45a60fb406a8..6d97c9e2ec39 100644 --- a/extensions-contrib/graphite-emitter/src/main/java/io/druid/emitter/graphite/WhiteListBasedConverter.java +++ b/extensions-contrib/graphite-emitter/src/main/java/org/apache/druid/emitter/graphite/WhiteListBasedConverter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.emitter.graphite; +package org.apache.druid.emitter.graphite; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; @@ -33,9 +33,9 @@ import com.google.common.collect.ImmutableSortedMap; import com.google.common.io.Files; import com.google.common.io.Resources; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; import java.io.File; import java.io.IOException; diff --git a/extensions-contrib/graphite-emitter/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-contrib/graphite-emitter/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index a184f4fdde8b..000000000000 --- a/extensions-contrib/graphite-emitter/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.emitter.graphite.GraphiteEmitterModule diff --git a/extensions-contrib/graphite-emitter/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-contrib/graphite-emitter/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..ab93c5a1dee2 --- /dev/null +++ b/extensions-contrib/graphite-emitter/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.emitter.graphite.GraphiteEmitterModule diff --git a/extensions-contrib/graphite-emitter/src/test/java/io/druid/emitter/graphite/DruidToWhiteListBasedConverterTest.java b/extensions-contrib/graphite-emitter/src/test/java/org/apache/druid/emitter/graphite/DruidToWhiteListBasedConverterTest.java similarity index 96% rename from extensions-contrib/graphite-emitter/src/test/java/io/druid/emitter/graphite/DruidToWhiteListBasedConverterTest.java rename to extensions-contrib/graphite-emitter/src/test/java/org/apache/druid/emitter/graphite/DruidToWhiteListBasedConverterTest.java index cbe3d0537b68..b634aa4928ec 100644 --- a/extensions-contrib/graphite-emitter/src/test/java/io/druid/emitter/graphite/DruidToWhiteListBasedConverterTest.java +++ b/extensions-contrib/graphite-emitter/src/test/java/org/apache/druid/emitter/graphite/DruidToWhiteListBasedConverterTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.emitter.graphite; +package org.apache.druid.emitter.graphite; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-contrib/graphite-emitter/src/test/java/io/druid/emitter/graphite/GraphiteEmitterConfigTest.java b/extensions-contrib/graphite-emitter/src/test/java/org/apache/druid/emitter/graphite/GraphiteEmitterConfigTest.java similarity index 97% rename from extensions-contrib/graphite-emitter/src/test/java/io/druid/emitter/graphite/GraphiteEmitterConfigTest.java rename to extensions-contrib/graphite-emitter/src/test/java/org/apache/druid/emitter/graphite/GraphiteEmitterConfigTest.java index ba666cd296de..4368fe1163c4 100644 --- a/extensions-contrib/graphite-emitter/src/test/java/io/druid/emitter/graphite/GraphiteEmitterConfigTest.java +++ b/extensions-contrib/graphite-emitter/src/test/java/org/apache/druid/emitter/graphite/GraphiteEmitterConfigTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.emitter.graphite; +package org.apache.druid.emitter.graphite; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/extensions-contrib/graphite-emitter/src/test/java/io/druid/emitter/graphite/WhiteListBasedConverterTest.java b/extensions-contrib/graphite-emitter/src/test/java/org/apache/druid/emitter/graphite/WhiteListBasedConverterTest.java similarity index 96% rename from extensions-contrib/graphite-emitter/src/test/java/io/druid/emitter/graphite/WhiteListBasedConverterTest.java rename to extensions-contrib/graphite-emitter/src/test/java/org/apache/druid/emitter/graphite/WhiteListBasedConverterTest.java index 6fe27d93eb5c..2bb0f3e2bfbb 100644 --- a/extensions-contrib/graphite-emitter/src/test/java/io/druid/emitter/graphite/WhiteListBasedConverterTest.java +++ b/extensions-contrib/graphite-emitter/src/test/java/org/apache/druid/emitter/graphite/WhiteListBasedConverterTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.emitter.graphite; +package org.apache.druid.emitter.graphite; import com.google.common.collect.Maps; -import io.druid.annotations.UsedByJUnitParamsRunner; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.annotations.UsedByJUnitParamsRunner; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; import junitparams.JUnitParamsRunner; import junitparams.Parameters; import org.apache.commons.io.IOUtils; diff --git a/extensions-contrib/influx-extensions/pom.xml b/extensions-contrib/influx-extensions/pom.xml index f179d676d2b2..576301574991 100644 --- a/extensions-contrib/influx-extensions/pom.xml +++ b/extensions-contrib/influx-extensions/pom.xml @@ -22,13 +22,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - io.druid.extensions + org.apache.druid.extensions druid-influx-extensions druid-influx-extensions druid-influx-extensions - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT ../../pom.xml @@ -42,7 +42,7 @@ - io.druid + org.apache.druid druid-common ${project.parent.version} provided @@ -77,7 +77,7 @@ test - io.druid + org.apache.druid druid-processing ${project.parent.version} test diff --git a/extensions-contrib/influx-extensions/src/main/antlr4/io/druid/data/input/influx/InfluxLineProtocol.g4 b/extensions-contrib/influx-extensions/src/main/antlr4/org/apache/druid/data/input/influx/InfluxLineProtocol.g4 similarity index 100% rename from extensions-contrib/influx-extensions/src/main/antlr4/io/druid/data/input/influx/InfluxLineProtocol.g4 rename to extensions-contrib/influx-extensions/src/main/antlr4/org/apache/druid/data/input/influx/InfluxLineProtocol.g4 diff --git a/extensions-contrib/influx-extensions/src/main/java/io/druid/data/input/influx/InfluxExtensionsModule.java b/extensions-contrib/influx-extensions/src/main/java/org/apache/druid/data/input/influx/InfluxExtensionsModule.java similarity index 94% rename from extensions-contrib/influx-extensions/src/main/java/io/druid/data/input/influx/InfluxExtensionsModule.java rename to extensions-contrib/influx-extensions/src/main/java/org/apache/druid/data/input/influx/InfluxExtensionsModule.java index f900c4ee5c6b..8b9ae8f1d097 100644 --- a/extensions-contrib/influx-extensions/src/main/java/io/druid/data/input/influx/InfluxExtensionsModule.java +++ b/extensions-contrib/influx-extensions/src/main/java/org/apache/druid/data/input/influx/InfluxExtensionsModule.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.data.input.influx; +package org.apache.druid.data.input.influx; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.inject.Binder; -import io.druid.initialization.DruidModule; +import org.apache.druid.initialization.DruidModule; import java.util.Collections; import java.util.List; diff --git a/extensions-contrib/influx-extensions/src/main/java/io/druid/data/input/influx/InfluxParseSpec.java b/extensions-contrib/influx-extensions/src/main/java/org/apache/druid/data/input/influx/InfluxParseSpec.java similarity index 87% rename from extensions-contrib/influx-extensions/src/main/java/io/druid/data/input/influx/InfluxParseSpec.java rename to extensions-contrib/influx-extensions/src/main/java/org/apache/druid/data/input/influx/InfluxParseSpec.java index a41276b3b985..db68fb8e4fed 100644 --- a/extensions-contrib/influx-extensions/src/main/java/io/druid/data/input/influx/InfluxParseSpec.java +++ b/extensions-contrib/influx-extensions/src/main/java/org/apache/druid/data/input/influx/InfluxParseSpec.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.data.input.influx; +package org.apache.druid.data.input.influx; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.Sets; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.ParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.parsers.Parser; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.ParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.parsers.Parser; import java.util.List; diff --git a/extensions-contrib/influx-extensions/src/main/java/io/druid/data/input/influx/InfluxParser.java b/extensions-contrib/influx-extensions/src/main/java/org/apache/druid/data/input/influx/InfluxParser.java similarity index 96% rename from extensions-contrib/influx-extensions/src/main/java/io/druid/data/input/influx/InfluxParser.java rename to extensions-contrib/influx-extensions/src/main/java/org/apache/druid/data/input/influx/InfluxParser.java index 29a1bb79fdd7..8d598028417a 100644 --- a/extensions-contrib/influx-extensions/src/main/java/io/druid/data/input/influx/InfluxParser.java +++ b/extensions-contrib/influx-extensions/src/main/java/org/apache/druid/data/input/influx/InfluxParser.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.data.input.influx; +package org.apache.druid.data.input.influx; import com.google.common.collect.ImmutableList; -import io.druid.java.util.common.parsers.ParseException; -import io.druid.java.util.common.parsers.Parser; +import org.apache.druid.java.util.common.parsers.ParseException; +import org.apache.druid.java.util.common.parsers.Parser; import org.antlr.v4.runtime.ANTLRInputStream; import org.antlr.v4.runtime.CharStream; import org.antlr.v4.runtime.CommonTokenStream; diff --git a/extensions-contrib/influx-extensions/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-contrib/influx-extensions/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index 3ff740f01a24..000000000000 --- a/extensions-contrib/influx-extensions/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.data.input.influx.InfluxExtensionsModule diff --git a/extensions-contrib/influx-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-contrib/influx-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..80aeb32f3936 --- /dev/null +++ b/extensions-contrib/influx-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.data.input.influx.InfluxExtensionsModule diff --git a/extensions-contrib/influx-extensions/src/test/java/io/druid/data/input/influx/InfluxParserTest.java b/extensions-contrib/influx-extensions/src/test/java/org/apache/druid/data/input/influx/InfluxParserTest.java similarity index 97% rename from extensions-contrib/influx-extensions/src/test/java/io/druid/data/input/influx/InfluxParserTest.java rename to extensions-contrib/influx-extensions/src/test/java/org/apache/druid/data/input/influx/InfluxParserTest.java index 3b8dd29a019d..44374243b6a0 100644 --- a/extensions-contrib/influx-extensions/src/test/java/io/druid/data/input/influx/InfluxParserTest.java +++ b/extensions-contrib/influx-extensions/src/test/java/org/apache/druid/data/input/influx/InfluxParserTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.data.input.influx; +package org.apache.druid.data.input.influx; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.parsers.ParseException; -import io.druid.java.util.common.parsers.Parser; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.parsers.ParseException; +import org.apache.druid.java.util.common.parsers.Parser; import junitparams.JUnitParamsRunner; import junitparams.Parameters; import org.junit.Assert; diff --git a/extensions-contrib/kafka-eight-simpleConsumer/pom.xml b/extensions-contrib/kafka-eight-simpleConsumer/pom.xml index fb4c601a5371..4c28705b221d 100644 --- a/extensions-contrib/kafka-eight-simpleConsumer/pom.xml +++ b/extensions-contrib/kafka-eight-simpleConsumer/pom.xml @@ -21,13 +21,13 @@ 4.0.0 - io.druid.extensions.contrib + org.apache.druid.extensions.contrib druid-kafka-eight-simple-consumer druid-kafka-eight-simple-consumer druid-kafka-eight-simple-consumer - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT ../../pom.xml @@ -35,13 +35,13 @@ - io.druid + org.apache.druid druid-api ${project.parent.version} provided - io.druid + org.apache.druid java-util ${project.parent.version} provided diff --git a/extensions-contrib/kafka-eight-simpleConsumer/src/main/java/io/druid/firehose/kafka/KafkaEightSimpleConsumerDruidModule.java b/extensions-contrib/kafka-eight-simpleConsumer/src/main/java/org/apache/druid/firehose/kafka/KafkaEightSimpleConsumerDruidModule.java similarity index 94% rename from extensions-contrib/kafka-eight-simpleConsumer/src/main/java/io/druid/firehose/kafka/KafkaEightSimpleConsumerDruidModule.java rename to extensions-contrib/kafka-eight-simpleConsumer/src/main/java/org/apache/druid/firehose/kafka/KafkaEightSimpleConsumerDruidModule.java index c95eb3e2280f..a03f3204959b 100644 --- a/extensions-contrib/kafka-eight-simpleConsumer/src/main/java/io/druid/firehose/kafka/KafkaEightSimpleConsumerDruidModule.java +++ b/extensions-contrib/kafka-eight-simpleConsumer/src/main/java/org/apache/druid/firehose/kafka/KafkaEightSimpleConsumerDruidModule.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.firehose.kafka; +package org.apache.druid.firehose.kafka; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.common.collect.ImmutableList; import com.google.inject.Binder; -import io.druid.initialization.DruidModule; +import org.apache.druid.initialization.DruidModule; import java.util.List; diff --git a/extensions-contrib/kafka-eight-simpleConsumer/src/main/java/io/druid/firehose/kafka/KafkaEightSimpleConsumerFirehoseFactory.java b/extensions-contrib/kafka-eight-simpleConsumer/src/main/java/org/apache/druid/firehose/kafka/KafkaEightSimpleConsumerFirehoseFactory.java similarity index 95% rename from extensions-contrib/kafka-eight-simpleConsumer/src/main/java/io/druid/firehose/kafka/KafkaEightSimpleConsumerFirehoseFactory.java rename to extensions-contrib/kafka-eight-simpleConsumer/src/main/java/org/apache/druid/firehose/kafka/KafkaEightSimpleConsumerFirehoseFactory.java index 4109a43a98da..b56b99f68a74 100644 --- a/extensions-contrib/kafka-eight-simpleConsumer/src/main/java/io/druid/firehose/kafka/KafkaEightSimpleConsumerFirehoseFactory.java +++ b/extensions-contrib/kafka-eight-simpleConsumer/src/main/java/org/apache/druid/firehose/kafka/KafkaEightSimpleConsumerFirehoseFactory.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.firehose.kafka; +package org.apache.druid.firehose.kafka; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.io.Closeables; -import io.druid.data.input.ByteBufferInputRowParser; -import io.druid.data.input.Committer; -import io.druid.data.input.FirehoseFactoryV2; -import io.druid.data.input.FirehoseV2; -import io.druid.data.input.InputRow; -import io.druid.firehose.kafka.KafkaSimpleConsumer.BytesMessageWithOffset; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.parsers.ParseException; -import io.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.data.input.ByteBufferInputRowParser; +import org.apache.druid.data.input.Committer; +import org.apache.druid.data.input.FirehoseFactoryV2; +import org.apache.druid.data.input.FirehoseV2; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.firehose.kafka.KafkaSimpleConsumer.BytesMessageWithOffset; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.parsers.ParseException; +import org.apache.druid.java.util.emitter.EmittingLogger; import java.io.Closeable; import java.io.IOException; diff --git a/extensions-contrib/kafka-eight-simpleConsumer/src/main/java/io/druid/firehose/kafka/KafkaSimpleConsumer.java b/extensions-contrib/kafka-eight-simpleConsumer/src/main/java/org/apache/druid/firehose/kafka/KafkaSimpleConsumer.java similarity index 98% rename from extensions-contrib/kafka-eight-simpleConsumer/src/main/java/io/druid/firehose/kafka/KafkaSimpleConsumer.java rename to extensions-contrib/kafka-eight-simpleConsumer/src/main/java/org/apache/druid/firehose/kafka/KafkaSimpleConsumer.java index 21a366463e3d..d2a063d21bdb 100644 --- a/extensions-contrib/kafka-eight-simpleConsumer/src/main/java/io/druid/firehose/kafka/KafkaSimpleConsumer.java +++ b/extensions-contrib/kafka-eight-simpleConsumer/src/main/java/org/apache/druid/firehose/kafka/KafkaSimpleConsumer.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.firehose.kafka; +package org.apache.druid.firehose.kafka; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.net.HostAndPort; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.guava.FunctionalIterable; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.guava.FunctionalIterable; +import org.apache.druid.java.util.common.logger.Logger; import kafka.api.FetchRequest; import kafka.api.FetchRequestBuilder; import kafka.api.PartitionOffsetRequestInfo; diff --git a/extensions-contrib/kafka-eight-simpleConsumer/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-contrib/kafka-eight-simpleConsumer/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..ec4c0287a451 --- /dev/null +++ b/extensions-contrib/kafka-eight-simpleConsumer/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1,20 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +org.apache.druid.firehose.kafka.KafkaEightSimpleConsumerDruidModule diff --git a/extensions-contrib/kafka-emitter/pom.xml b/extensions-contrib/kafka-emitter/pom.xml index c47c802a4b77..8853eb282660 100644 --- a/extensions-contrib/kafka-emitter/pom.xml +++ b/extensions-contrib/kafka-emitter/pom.xml @@ -23,13 +23,13 @@ 4.0.0 - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT ../../pom.xml - io.druid.extensions.contrib + org.apache.druid.extensions.contrib kafka-emitter kafka-emitter Druid emitter extension to support kafka @@ -41,19 +41,19 @@ 0.10.2.0 - io.druid + org.apache.druid druid-common ${project.parent.version} provided - io.druid + org.apache.druid druid-api ${project.parent.version} provided - io.druid + org.apache.druid java-util ${project.parent.version} provided @@ -75,14 +75,14 @@ test - io.druid + org.apache.druid druid-server ${project.parent.version} test-jar test - io.druid + org.apache.druid druid-processing ${project.parent.version} test-jar diff --git a/extensions-contrib/kafka-emitter/src/main/java/io/druid/emitter/kafka/KafkaEmitter.java b/extensions-contrib/kafka-emitter/src/main/java/org/apache/druid/emitter/kafka/KafkaEmitter.java similarity index 91% rename from extensions-contrib/kafka-emitter/src/main/java/io/druid/emitter/kafka/KafkaEmitter.java rename to extensions-contrib/kafka-emitter/src/main/java/org/apache/druid/emitter/kafka/KafkaEmitter.java index 8ba79e481988..99f97d700ef4 100644 --- a/extensions-contrib/kafka-emitter/src/main/java/io/druid/emitter/kafka/KafkaEmitter.java +++ b/extensions-contrib/kafka-emitter/src/main/java/org/apache/druid/emitter/kafka/KafkaEmitter.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.emitter.kafka; +package org.apache.druid.emitter.kafka; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import io.druid.emitter.kafka.MemoryBoundLinkedBlockingQueue.ObjectContainer; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.emitter.core.Emitter; -import io.druid.java.util.emitter.core.Event; -import io.druid.java.util.emitter.service.AlertEvent; -import io.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.emitter.kafka.MemoryBoundLinkedBlockingQueue.ObjectContainer; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.core.Emitter; +import org.apache.druid.java.util.emitter.core.Event; +import org.apache.druid.java.util.emitter.service.AlertEvent; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; import org.apache.kafka.clients.producer.Callback; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.Producer; diff --git a/extensions-contrib/kafka-emitter/src/main/java/io/druid/emitter/kafka/KafkaEmitterConfig.java b/extensions-contrib/kafka-emitter/src/main/java/org/apache/druid/emitter/kafka/KafkaEmitterConfig.java similarity index 99% rename from extensions-contrib/kafka-emitter/src/main/java/io/druid/emitter/kafka/KafkaEmitterConfig.java rename to extensions-contrib/kafka-emitter/src/main/java/org/apache/druid/emitter/kafka/KafkaEmitterConfig.java index f419aaa9070b..fe71b21c4cd9 100644 --- a/extensions-contrib/kafka-emitter/src/main/java/io/druid/emitter/kafka/KafkaEmitterConfig.java +++ b/extensions-contrib/kafka-emitter/src/main/java/org/apache/druid/emitter/kafka/KafkaEmitterConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.emitter.kafka; +package org.apache.druid.emitter.kafka; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-contrib/kafka-emitter/src/main/java/io/druid/emitter/kafka/KafkaEmitterModule.java b/extensions-contrib/kafka-emitter/src/main/java/org/apache/druid/emitter/kafka/KafkaEmitterModule.java similarity index 87% rename from extensions-contrib/kafka-emitter/src/main/java/io/druid/emitter/kafka/KafkaEmitterModule.java rename to extensions-contrib/kafka-emitter/src/main/java/org/apache/druid/emitter/kafka/KafkaEmitterModule.java index 73565ac64f39..cc484b66405f 100644 --- a/extensions-contrib/kafka-emitter/src/main/java/io/druid/emitter/kafka/KafkaEmitterModule.java +++ b/extensions-contrib/kafka-emitter/src/main/java/org/apache/druid/emitter/kafka/KafkaEmitterModule.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.emitter.kafka; +package org.apache.druid.emitter.kafka; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.inject.Binder; import com.google.inject.Provides; import com.google.inject.name.Named; -import io.druid.java.util.emitter.core.Emitter; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.ManageLifecycle; -import io.druid.initialization.DruidModule; +import org.apache.druid.java.util.emitter.core.Emitter; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.initialization.DruidModule; import java.util.Collections; import java.util.List; diff --git a/extensions-contrib/kafka-emitter/src/main/java/io/druid/emitter/kafka/MemoryBoundLinkedBlockingQueue.java b/extensions-contrib/kafka-emitter/src/main/java/org/apache/druid/emitter/kafka/MemoryBoundLinkedBlockingQueue.java similarity index 98% rename from extensions-contrib/kafka-emitter/src/main/java/io/druid/emitter/kafka/MemoryBoundLinkedBlockingQueue.java rename to extensions-contrib/kafka-emitter/src/main/java/org/apache/druid/emitter/kafka/MemoryBoundLinkedBlockingQueue.java index c52db760e096..fb6cae8ee954 100644 --- a/extensions-contrib/kafka-emitter/src/main/java/io/druid/emitter/kafka/MemoryBoundLinkedBlockingQueue.java +++ b/extensions-contrib/kafka-emitter/src/main/java/org/apache/druid/emitter/kafka/MemoryBoundLinkedBlockingQueue.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.emitter.kafka; +package org.apache.druid.emitter.kafka; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.atomic.AtomicLong; diff --git a/extensions-contrib/kafka-emitter/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-contrib/kafka-emitter/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index 7fccf54ec6c8..000000000000 --- a/extensions-contrib/kafka-emitter/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.emitter.kafka.KafkaEmitterModule \ No newline at end of file diff --git a/extensions-contrib/kafka-emitter/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-contrib/kafka-emitter/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..3173bc833093 --- /dev/null +++ b/extensions-contrib/kafka-emitter/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.emitter.kafka.KafkaEmitterModule \ No newline at end of file diff --git a/extensions-contrib/kafka-emitter/src/test/java/io/druid/emitter/kafka/KafkaEmitterConfigTest.java b/extensions-contrib/kafka-emitter/src/test/java/org/apache/druid/emitter/kafka/KafkaEmitterConfigTest.java similarity index 96% rename from extensions-contrib/kafka-emitter/src/test/java/io/druid/emitter/kafka/KafkaEmitterConfigTest.java rename to extensions-contrib/kafka-emitter/src/test/java/org/apache/druid/emitter/kafka/KafkaEmitterConfigTest.java index f4317ca81d34..40f13a299012 100644 --- a/extensions-contrib/kafka-emitter/src/test/java/io/druid/emitter/kafka/KafkaEmitterConfigTest.java +++ b/extensions-contrib/kafka-emitter/src/test/java/org/apache/druid/emitter/kafka/KafkaEmitterConfigTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.emitter.kafka; +package org.apache.druid.emitter.kafka; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/extensions-contrib/materialized-view-maintenance/pom.xml b/extensions-contrib/materialized-view-maintenance/pom.xml index 7df3ce43d2c3..de4d258004c4 100644 --- a/extensions-contrib/materialized-view-maintenance/pom.xml +++ b/extensions-contrib/materialized-view-maintenance/pom.xml @@ -23,38 +23,38 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> druid - io.druid + org.apache.druid 0.13.0-SNAPSHOT ../../pom.xml 4.0.0 - io.druid.extensions.contrib + org.apache.druid.extensions.contrib materialized-view-maintenance materialized-view-maintenance - io.druid + org.apache.druid druid-server ${project.parent.version} provided - io.druid + org.apache.druid druid-indexing-service ${project.parent.version} provided - io.druid + org.apache.druid druid-server ${project.parent.version} test test-jar - io.druid + org.apache.druid druid-processing ${project.parent.version} test diff --git a/extensions-contrib/materialized-view-maintenance/src/main/java/io/druid/indexing/materializedview/DerivativeDataSourceMetadata.java b/extensions-contrib/materialized-view-maintenance/src/main/java/org/apache/druid/indexing/materializedview/DerivativeDataSourceMetadata.java similarity index 97% rename from extensions-contrib/materialized-view-maintenance/src/main/java/io/druid/indexing/materializedview/DerivativeDataSourceMetadata.java rename to extensions-contrib/materialized-view-maintenance/src/main/java/org/apache/druid/indexing/materializedview/DerivativeDataSourceMetadata.java index 3a82672e14d7..e7318f796e52 100644 --- a/extensions-contrib/materialized-view-maintenance/src/main/java/io/druid/indexing/materializedview/DerivativeDataSourceMetadata.java +++ b/extensions-contrib/materialized-view-maintenance/src/main/java/org/apache/druid/indexing/materializedview/DerivativeDataSourceMetadata.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.indexing.materializedview; +package org.apache.druid.indexing.materializedview; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; import com.google.common.base.Strings; -import io.druid.indexing.overlord.DataSourceMetadata; +import org.apache.druid.indexing.overlord.DataSourceMetadata; import java.util.Objects; import java.util.Set; diff --git a/extensions-contrib/materialized-view-maintenance/src/main/java/io/druid/indexing/materializedview/MaterializedViewMaintenanceDruidModule.java b/extensions-contrib/materialized-view-maintenance/src/main/java/org/apache/druid/indexing/materializedview/MaterializedViewMaintenanceDruidModule.java similarity index 91% rename from extensions-contrib/materialized-view-maintenance/src/main/java/io/druid/indexing/materializedview/MaterializedViewMaintenanceDruidModule.java rename to extensions-contrib/materialized-view-maintenance/src/main/java/org/apache/druid/indexing/materializedview/MaterializedViewMaintenanceDruidModule.java index 85876fc153f2..255cf7613c34 100644 --- a/extensions-contrib/materialized-view-maintenance/src/main/java/io/druid/indexing/materializedview/MaterializedViewMaintenanceDruidModule.java +++ b/extensions-contrib/materialized-view-maintenance/src/main/java/org/apache/druid/indexing/materializedview/MaterializedViewMaintenanceDruidModule.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.indexing.materializedview; +package org.apache.druid.indexing.materializedview; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.common.collect.ImmutableList; import com.google.inject.Binder; -import io.druid.guice.JsonConfigProvider; -import io.druid.initialization.DruidModule; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.initialization.DruidModule; import java.util.List; diff --git a/extensions-contrib/materialized-view-maintenance/src/main/java/io/druid/indexing/materializedview/MaterializedViewSupervisor.java b/extensions-contrib/materialized-view-maintenance/src/main/java/org/apache/druid/indexing/materializedview/MaterializedViewSupervisor.java similarity index 93% rename from extensions-contrib/materialized-view-maintenance/src/main/java/io/druid/indexing/materializedview/MaterializedViewSupervisor.java rename to extensions-contrib/materialized-view-maintenance/src/main/java/org/apache/druid/indexing/materializedview/MaterializedViewSupervisor.java index d499b4f0e8d2..56afe3efd5ef 100644 --- a/extensions-contrib/materialized-view-maintenance/src/main/java/io/druid/indexing/materializedview/MaterializedViewSupervisor.java +++ b/extensions-contrib/materialized-view-maintenance/src/main/java/org/apache/druid/indexing/materializedview/MaterializedViewSupervisor.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.materializedview; +package org.apache.druid.indexing.materializedview; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Optional; @@ -29,27 +29,27 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningScheduledExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.task.HadoopIndexTask; -import io.druid.indexing.overlord.DataSourceMetadata; -import io.druid.indexing.overlord.IndexerMetadataStorageCoordinator; -import io.druid.indexing.overlord.TaskMaster; -import io.druid.indexing.overlord.TaskStorage; -import io.druid.indexing.overlord.supervisor.Supervisor; -import io.druid.indexing.overlord.supervisor.SupervisorReport; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.JodaUtils; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.guava.Comparators; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.metadata.EntryExistsException; -import io.druid.metadata.MetadataSupervisorManager; -import io.druid.metadata.SQLMetadataSegmentManager; -import io.druid.timeline.DataSegment; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.task.HadoopIndexTask; +import org.apache.druid.indexing.overlord.DataSourceMetadata; +import org.apache.druid.indexing.overlord.IndexerMetadataStorageCoordinator; +import org.apache.druid.indexing.overlord.TaskMaster; +import org.apache.druid.indexing.overlord.TaskStorage; +import org.apache.druid.indexing.overlord.supervisor.Supervisor; +import org.apache.druid.indexing.overlord.supervisor.SupervisorReport; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.JodaUtils; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.metadata.EntryExistsException; +import org.apache.druid.metadata.MetadataSupervisorManager; +import org.apache.druid.metadata.SQLMetadataSegmentManager; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Duration; import org.joda.time.Interval; diff --git a/extensions-contrib/materialized-view-maintenance/src/main/java/io/druid/indexing/materializedview/MaterializedViewSupervisorReport.java b/extensions-contrib/materialized-view-maintenance/src/main/java/org/apache/druid/indexing/materializedview/MaterializedViewSupervisorReport.java similarity index 92% rename from extensions-contrib/materialized-view-maintenance/src/main/java/io/druid/indexing/materializedview/MaterializedViewSupervisorReport.java rename to extensions-contrib/materialized-view-maintenance/src/main/java/org/apache/druid/indexing/materializedview/MaterializedViewSupervisorReport.java index 6fbeb03bb6cf..107354fe08f1 100644 --- a/extensions-contrib/materialized-view-maintenance/src/main/java/io/druid/indexing/materializedview/MaterializedViewSupervisorReport.java +++ b/extensions-contrib/materialized-view-maintenance/src/main/java/org/apache/druid/indexing/materializedview/MaterializedViewSupervisorReport.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.indexing.materializedview; +package org.apache.druid.indexing.materializedview; import com.google.common.collect.Sets; -import io.druid.indexing.overlord.supervisor.SupervisorReport; +import org.apache.druid.indexing.overlord.supervisor.SupervisorReport; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/extensions-contrib/materialized-view-maintenance/src/main/java/io/druid/indexing/materializedview/MaterializedViewSupervisorSpec.java b/extensions-contrib/materialized-view-maintenance/src/main/java/org/apache/druid/indexing/materializedview/MaterializedViewSupervisorSpec.java similarity index 87% rename from extensions-contrib/materialized-view-maintenance/src/main/java/io/druid/indexing/materializedview/MaterializedViewSupervisorSpec.java rename to extensions-contrib/materialized-view-maintenance/src/main/java/org/apache/druid/indexing/materializedview/MaterializedViewSupervisorSpec.java index e77fec1b1b46..b81d85e297ac 100644 --- a/extensions-contrib/materialized-view-maintenance/src/main/java/io/druid/indexing/materializedview/MaterializedViewSupervisorSpec.java +++ b/extensions-contrib/materialized-view-maintenance/src/main/java/org/apache/druid/indexing/materializedview/MaterializedViewSupervisorSpec.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.materializedview; +package org.apache.druid.indexing.materializedview; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonProperty; @@ -27,30 +27,30 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.common.base.Strings; -import io.druid.data.input.impl.DimensionSchema; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.indexer.HadoopIOConfig; -import io.druid.indexer.HadoopIngestionSpec; -import io.druid.indexer.HadoopTuningConfig; -import io.druid.indexer.hadoop.DatasourceIngestionSpec; -import io.druid.indexing.common.task.HadoopIndexTask; -import io.druid.indexing.overlord.IndexerMetadataStorageCoordinator; -import io.druid.indexing.overlord.TaskMaster; -import io.druid.indexing.overlord.TaskStorage; -import io.druid.indexing.overlord.supervisor.Supervisor; -import io.druid.indexing.overlord.supervisor.SupervisorSpec; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.metadata.MetadataSupervisorManager; -import io.druid.metadata.SQLMetadataSegmentManager; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.granularity.ArbitraryGranularitySpec; -import io.druid.segment.realtime.firehose.ChatHandlerProvider; -import io.druid.segment.transform.TransformSpec; -import io.druid.server.security.AuthorizerMapper; -import io.druid.timeline.DataSegment; +import org.apache.druid.data.input.impl.DimensionSchema; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.indexer.HadoopIOConfig; +import org.apache.druid.indexer.HadoopIngestionSpec; +import org.apache.druid.indexer.HadoopTuningConfig; +import org.apache.druid.indexer.hadoop.DatasourceIngestionSpec; +import org.apache.druid.indexing.common.task.HadoopIndexTask; +import org.apache.druid.indexing.overlord.IndexerMetadataStorageCoordinator; +import org.apache.druid.indexing.overlord.TaskMaster; +import org.apache.druid.indexing.overlord.TaskStorage; +import org.apache.druid.indexing.overlord.supervisor.Supervisor; +import org.apache.druid.indexing.overlord.supervisor.SupervisorSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.metadata.MetadataSupervisorManager; +import org.apache.druid.metadata.SQLMetadataSegmentManager; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.granularity.ArbitraryGranularitySpec; +import org.apache.druid.segment.realtime.firehose.ChatHandlerProvider; +import org.apache.druid.segment.transform.TransformSpec; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.timeline.DataSegment; import org.apache.commons.codec.digest.DigestUtils; import org.joda.time.Interval; diff --git a/extensions-contrib/materialized-view-maintenance/src/main/java/io/druid/indexing/materializedview/MaterializedViewTaskConfig.java b/extensions-contrib/materialized-view-maintenance/src/main/java/org/apache/druid/indexing/materializedview/MaterializedViewTaskConfig.java similarity index 95% rename from extensions-contrib/materialized-view-maintenance/src/main/java/io/druid/indexing/materializedview/MaterializedViewTaskConfig.java rename to extensions-contrib/materialized-view-maintenance/src/main/java/org/apache/druid/indexing/materializedview/MaterializedViewTaskConfig.java index b21b4fb7932e..1a63420523de 100644 --- a/extensions-contrib/materialized-view-maintenance/src/main/java/io/druid/indexing/materializedview/MaterializedViewTaskConfig.java +++ b/extensions-contrib/materialized-view-maintenance/src/main/java/org/apache/druid/indexing/materializedview/MaterializedViewTaskConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.materializedview; +package org.apache.druid.indexing.materializedview; import com.fasterxml.jackson.annotation.JsonProperty; import org.joda.time.Period; diff --git a/extensions-contrib/materialized-view-maintenance/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-contrib/materialized-view-maintenance/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index 1c9a63d55044..000000000000 --- a/extensions-contrib/materialized-view-maintenance/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.indexing.materializedview.MaterializedViewMaintenanceDruidModule \ No newline at end of file diff --git a/extensions-contrib/materialized-view-maintenance/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-contrib/materialized-view-maintenance/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..f931628b42c4 --- /dev/null +++ b/extensions-contrib/materialized-view-maintenance/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.indexing.materializedview.MaterializedViewMaintenanceDruidModule \ No newline at end of file diff --git a/extensions-contrib/materialized-view-maintenance/src/test/java/io/druid/indexing/materializedview/DerivativeDataSourceMetadataTest.java b/extensions-contrib/materialized-view-maintenance/src/test/java/org/apache/druid/indexing/materializedview/DerivativeDataSourceMetadataTest.java similarity index 97% rename from extensions-contrib/materialized-view-maintenance/src/test/java/io/druid/indexing/materializedview/DerivativeDataSourceMetadataTest.java rename to extensions-contrib/materialized-view-maintenance/src/test/java/org/apache/druid/indexing/materializedview/DerivativeDataSourceMetadataTest.java index d62ea385d31a..0fe67bceebb9 100644 --- a/extensions-contrib/materialized-view-maintenance/src/test/java/io/druid/indexing/materializedview/DerivativeDataSourceMetadataTest.java +++ b/extensions-contrib/materialized-view-maintenance/src/test/java/org/apache/druid/indexing/materializedview/DerivativeDataSourceMetadataTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.materializedview; +package org.apache.druid.indexing.materializedview; import com.google.common.collect.Sets; import org.hamcrest.CoreMatchers; diff --git a/extensions-contrib/materialized-view-maintenance/src/test/java/io/druid/indexing/materializedview/MaterializedViewSupervisorSpecTest.java b/extensions-contrib/materialized-view-maintenance/src/test/java/org/apache/druid/indexing/materializedview/MaterializedViewSupervisorSpecTest.java similarity index 87% rename from extensions-contrib/materialized-view-maintenance/src/test/java/io/druid/indexing/materializedview/MaterializedViewSupervisorSpecTest.java rename to extensions-contrib/materialized-view-maintenance/src/test/java/org/apache/druid/indexing/materializedview/MaterializedViewSupervisorSpecTest.java index dd3a7342055e..b9c816083f80 100644 --- a/extensions-contrib/materialized-view-maintenance/src/test/java/io/druid/indexing/materializedview/MaterializedViewSupervisorSpecTest.java +++ b/extensions-contrib/materialized-view-maintenance/src/test/java/org/apache/druid/indexing/materializedview/MaterializedViewSupervisorSpecTest.java @@ -17,29 +17,29 @@ * under the License. */ -package io.druid.indexing.materializedview; +package org.apache.druid.indexing.materializedview; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.google.common.collect.Lists; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.StringDimensionSchema; -import io.druid.indexer.HadoopTuningConfig; -import io.druid.indexing.overlord.IndexerMetadataStorageCoordinator; -import io.druid.indexing.overlord.TaskMaster; -import io.druid.indexing.overlord.TaskStorage; -import io.druid.math.expr.ExprMacroTable; -import io.druid.metadata.MetadataSupervisorManager; -import io.druid.metadata.SQLMetadataSegmentManager; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.expression.LookupEnabledTestExprMacroTable; -import io.druid.segment.TestHelper; -import io.druid.segment.realtime.firehose.ChatHandlerProvider; -import io.druid.segment.realtime.firehose.NoopChatHandlerProvider; -import io.druid.server.security.AuthorizerMapper; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.StringDimensionSchema; +import org.apache.druid.indexer.HadoopTuningConfig; +import org.apache.druid.indexing.overlord.IndexerMetadataStorageCoordinator; +import org.apache.druid.indexing.overlord.TaskMaster; +import org.apache.druid.indexing.overlord.TaskStorage; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.metadata.MetadataSupervisorManager; +import org.apache.druid.metadata.SQLMetadataSegmentManager; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.expression.LookupEnabledTestExprMacroTable; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.realtime.firehose.ChatHandlerProvider; +import org.apache.druid.segment.realtime.firehose.NoopChatHandlerProvider; +import org.apache.druid.server.security.AuthorizerMapper; import static org.easymock.EasyMock.createMock; import org.junit.Assert; import org.junit.Before; diff --git a/extensions-contrib/materialized-view-maintenance/src/test/java/io/druid/indexing/materializedview/MaterializedViewSupervisorTest.java b/extensions-contrib/materialized-view-maintenance/src/test/java/org/apache/druid/indexing/materializedview/MaterializedViewSupervisorTest.java similarity index 82% rename from extensions-contrib/materialized-view-maintenance/src/test/java/io/druid/indexing/materializedview/MaterializedViewSupervisorTest.java rename to extensions-contrib/materialized-view-maintenance/src/test/java/org/apache/druid/indexing/materializedview/MaterializedViewSupervisorTest.java index 1b3ecfc0e8cf..a48f76fa9a4f 100644 --- a/extensions-contrib/materialized-view-maintenance/src/test/java/io/druid/indexing/materializedview/MaterializedViewSupervisorTest.java +++ b/extensions-contrib/materialized-view-maintenance/src/test/java/org/apache/druid/indexing/materializedview/MaterializedViewSupervisorTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.materializedview; +package org.apache.druid.indexing.materializedview; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.jsontype.NamedType; @@ -26,26 +26,26 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.StringDimensionSchema; -import io.druid.indexer.HadoopTuningConfig; -import io.druid.indexing.overlord.IndexerMetadataStorageCoordinator; -import io.druid.indexing.overlord.TaskMaster; -import io.druid.indexing.overlord.TaskQueue; -import io.druid.indexing.overlord.TaskStorage; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.Pair; -import io.druid.metadata.IndexerSQLMetadataStorageCoordinator; -import io.druid.metadata.MetadataSupervisorManager; -import io.druid.metadata.SQLMetadataSegmentManager; -import io.druid.metadata.TestDerbyConnector; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.segment.TestHelper; -import io.druid.segment.realtime.firehose.ChatHandlerProvider; -import io.druid.server.security.AuthorizerMapper; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.HashBasedNumberedShardSpec; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.StringDimensionSchema; +import org.apache.druid.indexer.HadoopTuningConfig; +import org.apache.druid.indexing.overlord.IndexerMetadataStorageCoordinator; +import org.apache.druid.indexing.overlord.TaskMaster; +import org.apache.druid.indexing.overlord.TaskQueue; +import org.apache.druid.indexing.overlord.TaskStorage; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.metadata.IndexerSQLMetadataStorageCoordinator; +import org.apache.druid.metadata.MetadataSupervisorManager; +import org.apache.druid.metadata.SQLMetadataSegmentManager; +import org.apache.druid.metadata.TestDerbyConnector; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.realtime.firehose.ChatHandlerProvider; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.HashBasedNumberedShardSpec; import static org.easymock.EasyMock.expect; import org.joda.time.Interval; import org.junit.Assert; diff --git a/extensions-contrib/materialized-view-selection/pom.xml b/extensions-contrib/materialized-view-selection/pom.xml index 11b9bc2026cc..5788eaa6a358 100644 --- a/extensions-contrib/materialized-view-selection/pom.xml +++ b/extensions-contrib/materialized-view-selection/pom.xml @@ -23,37 +23,37 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> druid - io.druid + org.apache.druid 0.13.0-SNAPSHOT ../../pom.xml 4.0.0 - io.druid.extensions.contrib + org.apache.druid.extensions.contrib materialized-view-selection materialized-view-selection - io.druid + org.apache.druid druid-server ${project.parent.version} provided - io.druid.extensions.contrib + org.apache.druid.extensions.contrib materialized-view-maintenance ${project.parent.version} - io.druid + org.apache.druid druid-processing ${project.parent.version} test test-jar - io.druid + org.apache.druid druid-server ${project.parent.version} test diff --git a/extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/DataSourceOptimizer.java b/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/DataSourceOptimizer.java similarity index 95% rename from extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/DataSourceOptimizer.java rename to extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/DataSourceOptimizer.java index fc204769cf76..6de44792b4d4 100644 --- a/extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/DataSourceOptimizer.java +++ b/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/DataSourceOptimizer.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.materializedview; +package org.apache.druid.query.materializedview; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedSet; @@ -25,14 +25,14 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.inject.Inject; -import io.druid.client.TimelineServerView; -import io.druid.query.Query; -import io.druid.query.TableDataSource; -import io.druid.query.groupby.GroupByQuery; -import io.druid.query.spec.MultipleIntervalSegmentSpec; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.topn.TopNQuery; -import io.druid.timeline.TimelineObjectHolder; +import org.apache.druid.client.TimelineServerView; +import org.apache.druid.query.Query; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.query.groupby.GroupByQuery; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.topn.TopNQuery; +import org.apache.druid.timeline.TimelineObjectHolder; import org.joda.time.Interval; import java.util.Collections; diff --git a/extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/DataSourceOptimizerMonitor.java b/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/DataSourceOptimizerMonitor.java similarity index 91% rename from extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/DataSourceOptimizerMonitor.java rename to extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/DataSourceOptimizerMonitor.java index 806be6756c70..0720957a91bc 100644 --- a/extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/DataSourceOptimizerMonitor.java +++ b/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/DataSourceOptimizerMonitor.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.materializedview; +package org.apache.druid.query.materializedview; import com.google.inject.Inject; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.java.util.metrics.AbstractMonitor; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.metrics.AbstractMonitor; import java.util.List; import java.util.Map; diff --git a/extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/DataSourceOptimizerStats.java b/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/DataSourceOptimizerStats.java similarity index 97% rename from extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/DataSourceOptimizerStats.java rename to extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/DataSourceOptimizerStats.java index 77d246cd5ead..2c86df8fad7a 100644 --- a/extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/DataSourceOptimizerStats.java +++ b/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/DataSourceOptimizerStats.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.materializedview; +package org.apache.druid.query.materializedview; import java.util.Map; import java.util.Set; diff --git a/extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/DerivativeDataSource.java b/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/DerivativeDataSource.java similarity index 98% rename from extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/DerivativeDataSource.java rename to extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/DerivativeDataSource.java index 4ba8d4755350..be9c5f833cb6 100644 --- a/extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/DerivativeDataSource.java +++ b/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/DerivativeDataSource.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.materializedview; +package org.apache.druid.query.materializedview; import com.google.common.base.Preconditions; diff --git a/extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/DerivativeDataSourceManager.java b/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/DerivativeDataSourceManager.java similarity index 91% rename from extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/DerivativeDataSourceManager.java rename to extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/DerivativeDataSourceManager.java index 0b8ec2fdeb38..31679e96767b 100644 --- a/extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/DerivativeDataSourceManager.java +++ b/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/DerivativeDataSourceManager.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.materializedview; +package org.apache.druid.query.materializedview; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Supplier; @@ -28,20 +28,20 @@ import com.google.common.util.concurrent.ListeningScheduledExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.inject.Inject; -import io.druid.guice.ManageLifecycleLast; -import io.druid.indexing.overlord.DataSourceMetadata; -import io.druid.metadata.MetadataStorageTablesConfig; -import io.druid.metadata.SQLMetadataConnector; -import io.druid.indexing.materializedview.DerivativeDataSourceMetadata; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.timeline.DataSegment; +import org.apache.druid.guice.ManageLifecycleLast; +import org.apache.druid.indexing.overlord.DataSourceMetadata; +import org.apache.druid.metadata.MetadataStorageTablesConfig; +import org.apache.druid.metadata.SQLMetadataConnector; +import org.apache.druid.indexing.materializedview.DerivativeDataSourceMetadata; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Duration; import org.joda.time.Interval; import org.skife.jdbi.v2.Handle; diff --git a/extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/MaterializedViewConfig.java b/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/MaterializedViewConfig.java similarity index 95% rename from extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/MaterializedViewConfig.java rename to extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/MaterializedViewConfig.java index b4730a4e6161..ca58daf3c323 100644 --- a/extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/MaterializedViewConfig.java +++ b/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/MaterializedViewConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.materializedview; +package org.apache.druid.query.materializedview; import com.fasterxml.jackson.annotation.JsonProperty; import org.joda.time.Period; diff --git a/extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/MaterializedViewQuery.java b/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/MaterializedViewQuery.java similarity index 90% rename from extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/MaterializedViewQuery.java rename to extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/MaterializedViewQuery.java index b72e08f9f8b5..26a7026027b2 100644 --- a/extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/MaterializedViewQuery.java +++ b/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/MaterializedViewQuery.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.query.materializedview; +package org.apache.druid.query.materializedview; 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 com.google.common.collect.Ordering; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.query.BaseQuery; -import io.druid.query.DataSource; -import io.druid.query.Query; -import io.druid.query.QueryRunner; -import io.druid.query.QuerySegmentWalker; -import io.druid.query.filter.DimFilter; -import io.druid.query.groupby.GroupByQuery; -import io.druid.query.spec.QuerySegmentSpec; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.topn.TopNQuery; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.query.BaseQuery; +import org.apache.druid.query.DataSource; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QuerySegmentWalker; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.groupby.GroupByQuery; +import org.apache.druid.query.spec.QuerySegmentSpec; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.topn.TopNQuery; import org.joda.time.DateTimeZone; import org.joda.time.Duration; import org.joda.time.Interval; diff --git a/extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/MaterializedViewQueryQueryToolChest.java b/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/MaterializedViewQueryQueryToolChest.java similarity index 87% rename from extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/MaterializedViewQueryQueryToolChest.java rename to extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/MaterializedViewQueryQueryToolChest.java index f440b2b428e7..34b556669fba 100644 --- a/extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/MaterializedViewQueryQueryToolChest.java +++ b/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/MaterializedViewQueryQueryToolChest.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.query.materializedview; +package org.apache.druid.query.materializedview; import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.base.Function; import com.google.inject.Inject; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.Query; -import io.druid.query.QueryMetrics; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryToolChest; -import io.druid.query.QueryToolChestWarehouse; -import io.druid.query.aggregation.MetricManipulationFn; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryMetrics; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.QueryToolChestWarehouse; +import org.apache.druid.query.aggregation.MetricManipulationFn; import java.util.Map; diff --git a/extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/MaterializedViewQueryRunner.java b/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/MaterializedViewQueryRunner.java similarity index 84% rename from extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/MaterializedViewQueryRunner.java rename to extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/MaterializedViewQueryRunner.java index e32f028cd207..985688bb9191 100644 --- a/extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/MaterializedViewQueryRunner.java +++ b/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/MaterializedViewQueryRunner.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.query.materializedview; +package org.apache.druid.query.materializedview; import com.google.common.base.Function; import com.google.common.collect.Lists; -import io.druid.java.util.common.guava.MergeSequence; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.query.Query; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; +import org.apache.druid.java.util.common.guava.MergeSequence; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; import java.util.Map; diff --git a/extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/MaterializedViewSelectionDruidModule.java b/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/MaterializedViewSelectionDruidModule.java similarity index 87% rename from extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/MaterializedViewSelectionDruidModule.java rename to extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/MaterializedViewSelectionDruidModule.java index 671fd009ebf6..2527bb0b52cb 100644 --- a/extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/MaterializedViewSelectionDruidModule.java +++ b/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/MaterializedViewSelectionDruidModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.materializedview; +package org.apache.druid.query.materializedview; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.jsontype.NamedType; @@ -25,11 +25,11 @@ import com.google.common.collect.ImmutableList; import com.google.inject.Binder; import com.google.inject.Singleton; -import io.druid.guice.DruidBinders; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.LifecycleModule; -import io.druid.initialization.DruidModule; -import io.druid.server.metrics.MetricsModule; +import org.apache.druid.guice.DruidBinders; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LifecycleModule; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.server.metrics.MetricsModule; import java.util.List; diff --git a/extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/MaterializedViewUtils.java b/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/MaterializedViewUtils.java similarity index 93% rename from extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/MaterializedViewUtils.java rename to extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/MaterializedViewUtils.java index aad0d4d960a8..ea9e442c566d 100644 --- a/extensions-contrib/materialized-view-selection/src/main/java/io/druid/query/materializedview/MaterializedViewUtils.java +++ b/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/MaterializedViewUtils.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.query.materializedview; +package org.apache.druid.query.materializedview; import com.google.common.collect.Lists; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.JodaUtils; -import io.druid.query.Query; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.FilteredAggregatorFactory; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.groupby.GroupByQuery; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.topn.TopNQuery; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.JodaUtils; +import org.apache.druid.query.Query; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.FilteredAggregatorFactory; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.groupby.GroupByQuery; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.topn.TopNQuery; import org.joda.time.Interval; import java.util.HashSet; diff --git a/extensions-contrib/materialized-view-selection/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-contrib/materialized-view-selection/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index 9751d106cb93..000000000000 --- a/extensions-contrib/materialized-view-selection/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.query.materializedview.MaterializedViewSelectionDruidModule \ No newline at end of file diff --git a/extensions-contrib/materialized-view-selection/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-contrib/materialized-view-selection/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..dd848b8a2b39 --- /dev/null +++ b/extensions-contrib/materialized-view-selection/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.query.materializedview.MaterializedViewSelectionDruidModule \ No newline at end of file diff --git a/extensions-contrib/materialized-view-selection/src/test/java/io/druid/query/materializedview/DatasourceOptimizerTest.java b/extensions-contrib/materialized-view-selection/src/test/java/org/apache/druid/query/materializedview/DatasourceOptimizerTest.java similarity index 86% rename from extensions-contrib/materialized-view-selection/src/test/java/io/druid/query/materializedview/DatasourceOptimizerTest.java rename to extensions-contrib/materialized-view-selection/src/test/java/org/apache/druid/query/materializedview/DatasourceOptimizerTest.java index a479f9ce0af2..2c0786c875d9 100644 --- a/extensions-contrib/materialized-view-selection/src/test/java/io/druid/query/materializedview/DatasourceOptimizerTest.java +++ b/extensions-contrib/materialized-view-selection/src/test/java/org/apache/druid/query/materializedview/DatasourceOptimizerTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.query.materializedview; +package org.apache.druid.query.materializedview; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.jsontype.NamedType; @@ -27,34 +27,34 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import io.druid.client.BatchServerInventoryView; -import io.druid.client.BrokerSegmentWatcherConfig; -import io.druid.client.BrokerServerView; -import io.druid.client.DruidServer; -import io.druid.client.selector.HighestPriorityTierSelectorStrategy; -import io.druid.client.selector.RandomServerSelectorStrategy; -import io.druid.curator.CuratorTestBase; -import io.druid.indexing.materializedview.DerivativeDataSourceMetadata; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.http.client.HttpClient; -import io.druid.metadata.IndexerSQLMetadataStorageCoordinator; -import io.druid.metadata.TestDerbyConnector; -import io.druid.query.Query; -import static io.druid.query.QueryRunnerTestHelper.allGran; -import io.druid.query.QueryToolChestWarehouse; -import io.druid.query.QueryWatcher; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.spec.MultipleIntervalSegmentSpec; -import io.druid.query.topn.TopNQuery; -import io.druid.query.topn.TopNQueryBuilder; -import io.druid.segment.TestHelper; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.server.coordination.ServerType; -import io.druid.server.initialization.ZkPathsConfig; -import io.druid.server.metrics.NoopServiceEmitter; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.client.BatchServerInventoryView; +import org.apache.druid.client.BrokerSegmentWatcherConfig; +import org.apache.druid.client.BrokerServerView; +import org.apache.druid.client.DruidServer; +import org.apache.druid.client.selector.HighestPriorityTierSelectorStrategy; +import org.apache.druid.client.selector.RandomServerSelectorStrategy; +import org.apache.druid.curator.CuratorTestBase; +import org.apache.druid.indexing.materializedview.DerivativeDataSourceMetadata; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.metadata.IndexerSQLMetadataStorageCoordinator; +import org.apache.druid.metadata.TestDerbyConnector; +import org.apache.druid.query.Query; +import static org.apache.druid.query.QueryRunnerTestHelper.allGran; +import org.apache.druid.query.QueryToolChestWarehouse; +import org.apache.druid.query.QueryWatcher; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.query.topn.TopNQuery; +import org.apache.druid.query.topn.TopNQueryBuilder; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.server.metrics.NoopServiceEmitter; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.easymock.EasyMock; import org.junit.After; import org.junit.Assert; diff --git a/extensions-contrib/materialized-view-selection/src/test/java/io/druid/query/materializedview/MaterializedViewQueryTest.java b/extensions-contrib/materialized-view-selection/src/test/java/org/apache/druid/query/materializedview/MaterializedViewQueryTest.java similarity index 74% rename from extensions-contrib/materialized-view-selection/src/test/java/io/druid/query/materializedview/MaterializedViewQueryTest.java rename to extensions-contrib/materialized-view-selection/src/test/java/org/apache/druid/query/materializedview/MaterializedViewQueryTest.java index 848236c1f90a..39c0c8276fa2 100644 --- a/extensions-contrib/materialized-view-selection/src/test/java/io/druid/query/materializedview/MaterializedViewQueryTest.java +++ b/extensions-contrib/materialized-view-selection/src/test/java/org/apache/druid/query/materializedview/MaterializedViewQueryTest.java @@ -17,29 +17,29 @@ * under the License. */ -package io.druid.query.materializedview; +package org.apache.druid.query.materializedview; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import io.druid.math.expr.ExprMacroTable; -import io.druid.query.Query; -import static io.druid.query.QueryRunnerTestHelper.addRowsIndexConstant; -import static io.druid.query.QueryRunnerTestHelper.allGran; -import static io.druid.query.QueryRunnerTestHelper.commonDoubleAggregators; -import static io.druid.query.QueryRunnerTestHelper.dataSource; -import static io.druid.query.QueryRunnerTestHelper.fullOnInterval; -import static io.druid.query.QueryRunnerTestHelper.indexMetric; -import static io.druid.query.QueryRunnerTestHelper.marketDimension; -import io.druid.query.TableDataSource; -import io.druid.query.aggregation.DoubleMaxAggregatorFactory; -import io.druid.query.aggregation.DoubleMinAggregatorFactory; -import io.druid.query.expression.LookupEnabledTestExprMacroTable; -import io.druid.query.topn.TopNQuery; -import io.druid.query.topn.TopNQueryBuilder; -import io.druid.segment.TestHelper; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.query.Query; +import static org.apache.druid.query.QueryRunnerTestHelper.addRowsIndexConstant; +import static org.apache.druid.query.QueryRunnerTestHelper.allGran; +import static org.apache.druid.query.QueryRunnerTestHelper.commonDoubleAggregators; +import static org.apache.druid.query.QueryRunnerTestHelper.dataSource; +import static org.apache.druid.query.QueryRunnerTestHelper.fullOnInterval; +import static org.apache.druid.query.QueryRunnerTestHelper.indexMetric; +import static org.apache.druid.query.QueryRunnerTestHelper.marketDimension; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.query.aggregation.DoubleMaxAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleMinAggregatorFactory; +import org.apache.druid.query.expression.LookupEnabledTestExprMacroTable; +import org.apache.druid.query.topn.TopNQuery; +import org.apache.druid.query.topn.TopNQueryBuilder; +import org.apache.druid.segment.TestHelper; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; diff --git a/extensions-contrib/materialized-view-selection/src/test/java/io/druid/query/materializedview/MaterializedViewUtilsTest.java b/extensions-contrib/materialized-view-selection/src/test/java/org/apache/druid/query/materializedview/MaterializedViewUtilsTest.java similarity index 96% rename from extensions-contrib/materialized-view-selection/src/test/java/io/druid/query/materializedview/MaterializedViewUtilsTest.java rename to extensions-contrib/materialized-view-selection/src/test/java/org/apache/druid/query/materializedview/MaterializedViewUtilsTest.java index a4b3a618e818..c040517c8fe1 100644 --- a/extensions-contrib/materialized-view-selection/src/test/java/io/druid/query/materializedview/MaterializedViewUtilsTest.java +++ b/extensions-contrib/materialized-view-selection/src/test/java/org/apache/druid/query/materializedview/MaterializedViewUtilsTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.query.materializedview; +package org.apache.druid.query.materializedview; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import io.druid.java.util.common.Intervals; -import io.druid.query.groupby.GroupByQuery; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.topn.TopNQuery; -import io.druid.segment.TestHelper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.query.groupby.GroupByQuery; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.topn.TopNQuery; +import org.apache.druid.segment.TestHelper; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-contrib/opentsdb-emitter/pom.xml b/extensions-contrib/opentsdb-emitter/pom.xml index 964ff7b43eb7..a7218b15642a 100644 --- a/extensions-contrib/opentsdb-emitter/pom.xml +++ b/extensions-contrib/opentsdb-emitter/pom.xml @@ -24,12 +24,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.druid.extensions.contrib + org.apache.druid.extensions.contrib druid-opentsdb-emitter druid-opentsdb-emitter - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT ../../pom.xml @@ -37,13 +37,13 @@ - io.druid + org.apache.druid druid-api ${project.parent.version} provided - io.druid + org.apache.druid druid-server ${project.parent.version} provided diff --git a/extensions-contrib/opentsdb-emitter/src/main/java/io/druid/emitter/opentsdb/EventConverter.java b/extensions-contrib/opentsdb-emitter/src/main/java/org/apache/druid/emitter/opentsdb/EventConverter.java similarity index 94% rename from extensions-contrib/opentsdb-emitter/src/main/java/io/druid/emitter/opentsdb/EventConverter.java rename to extensions-contrib/opentsdb-emitter/src/main/java/org/apache/druid/emitter/opentsdb/EventConverter.java index ddc29775a113..3745dd0dee74 100644 --- a/extensions-contrib/opentsdb-emitter/src/main/java/io/druid/emitter/opentsdb/EventConverter.java +++ b/extensions-contrib/opentsdb-emitter/src/main/java/org/apache/druid/emitter/opentsdb/EventConverter.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.emitter.opentsdb; +package org.apache.druid.emitter.opentsdb; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Strings; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.logger.Logger; import java.io.File; import java.io.FileInputStream; diff --git a/extensions-contrib/opentsdb-emitter/src/main/java/io/druid/emitter/opentsdb/OpentsdbEmitter.java b/extensions-contrib/opentsdb-emitter/src/main/java/org/apache/druid/emitter/opentsdb/OpentsdbEmitter.java similarity index 88% rename from extensions-contrib/opentsdb-emitter/src/main/java/io/druid/emitter/opentsdb/OpentsdbEmitter.java rename to extensions-contrib/opentsdb-emitter/src/main/java/org/apache/druid/emitter/opentsdb/OpentsdbEmitter.java index 1542bc0622c6..0fa5e6010076 100644 --- a/extensions-contrib/opentsdb-emitter/src/main/java/io/druid/emitter/opentsdb/OpentsdbEmitter.java +++ b/extensions-contrib/opentsdb-emitter/src/main/java/org/apache/druid/emitter/opentsdb/OpentsdbEmitter.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.emitter.opentsdb; +package org.apache.druid.emitter.opentsdb; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.emitter.core.Emitter; -import io.druid.java.util.emitter.core.Event; -import io.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.core.Emitter; +import org.apache.druid.java.util.emitter.core.Event; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; public class OpentsdbEmitter implements Emitter { diff --git a/extensions-contrib/opentsdb-emitter/src/main/java/io/druid/emitter/opentsdb/OpentsdbEmitterConfig.java b/extensions-contrib/opentsdb-emitter/src/main/java/org/apache/druid/emitter/opentsdb/OpentsdbEmitterConfig.java similarity index 99% rename from extensions-contrib/opentsdb-emitter/src/main/java/io/druid/emitter/opentsdb/OpentsdbEmitterConfig.java rename to extensions-contrib/opentsdb-emitter/src/main/java/org/apache/druid/emitter/opentsdb/OpentsdbEmitterConfig.java index abdc000b83ab..f953c480aefc 100644 --- a/extensions-contrib/opentsdb-emitter/src/main/java/io/druid/emitter/opentsdb/OpentsdbEmitterConfig.java +++ b/extensions-contrib/opentsdb-emitter/src/main/java/org/apache/druid/emitter/opentsdb/OpentsdbEmitterConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.emitter.opentsdb; +package org.apache.druid.emitter.opentsdb; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-contrib/opentsdb-emitter/src/main/java/io/druid/emitter/opentsdb/OpentsdbEmitterModule.java b/extensions-contrib/opentsdb-emitter/src/main/java/org/apache/druid/emitter/opentsdb/OpentsdbEmitterModule.java similarity index 86% rename from extensions-contrib/opentsdb-emitter/src/main/java/io/druid/emitter/opentsdb/OpentsdbEmitterModule.java rename to extensions-contrib/opentsdb-emitter/src/main/java/org/apache/druid/emitter/opentsdb/OpentsdbEmitterModule.java index 6e727b71e706..7f6b017e0554 100644 --- a/extensions-contrib/opentsdb-emitter/src/main/java/io/druid/emitter/opentsdb/OpentsdbEmitterModule.java +++ b/extensions-contrib/opentsdb-emitter/src/main/java/org/apache/druid/emitter/opentsdb/OpentsdbEmitterModule.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.emitter.opentsdb; +package org.apache.druid.emitter.opentsdb; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.inject.Binder; import com.google.inject.Provides; import com.google.inject.name.Named; -import io.druid.java.util.emitter.core.Emitter; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.ManageLifecycle; -import io.druid.initialization.DruidModule; +import org.apache.druid.java.util.emitter.core.Emitter; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.initialization.DruidModule; import java.util.Collections; import java.util.List; diff --git a/extensions-contrib/opentsdb-emitter/src/main/java/io/druid/emitter/opentsdb/OpentsdbEvent.java b/extensions-contrib/opentsdb-emitter/src/main/java/org/apache/druid/emitter/opentsdb/OpentsdbEvent.java similarity index 98% rename from extensions-contrib/opentsdb-emitter/src/main/java/io/druid/emitter/opentsdb/OpentsdbEvent.java rename to extensions-contrib/opentsdb-emitter/src/main/java/org/apache/druid/emitter/opentsdb/OpentsdbEvent.java index 0f29186e4903..e0979f228a4f 100644 --- a/extensions-contrib/opentsdb-emitter/src/main/java/io/druid/emitter/opentsdb/OpentsdbEvent.java +++ b/extensions-contrib/opentsdb-emitter/src/main/java/org/apache/druid/emitter/opentsdb/OpentsdbEvent.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.emitter.opentsdb; +package org.apache.druid.emitter.opentsdb; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; diff --git a/extensions-contrib/opentsdb-emitter/src/main/java/io/druid/emitter/opentsdb/OpentsdbSender.java b/extensions-contrib/opentsdb-emitter/src/main/java/org/apache/druid/emitter/opentsdb/OpentsdbSender.java similarity index 97% rename from extensions-contrib/opentsdb-emitter/src/main/java/io/druid/emitter/opentsdb/OpentsdbSender.java rename to extensions-contrib/opentsdb-emitter/src/main/java/org/apache/druid/emitter/opentsdb/OpentsdbSender.java index 34ef996132e6..2f93d7c2d12c 100644 --- a/extensions-contrib/opentsdb-emitter/src/main/java/io/druid/emitter/opentsdb/OpentsdbSender.java +++ b/extensions-contrib/opentsdb-emitter/src/main/java/org/apache/druid/emitter/opentsdb/OpentsdbSender.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.emitter.opentsdb; +package org.apache.druid.emitter.opentsdb; import com.google.common.annotations.VisibleForTesting; import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.WebResource; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.logger.Logger; import javax.ws.rs.core.MediaType; import java.util.ArrayList; diff --git a/extensions-contrib/opentsdb-emitter/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-contrib/opentsdb-emitter/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index c092d7203431..000000000000 --- a/extensions-contrib/opentsdb-emitter/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.emitter.opentsdb.OpentsdbEmitterModule diff --git a/extensions-contrib/opentsdb-emitter/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-contrib/opentsdb-emitter/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..5505c835ba8d --- /dev/null +++ b/extensions-contrib/opentsdb-emitter/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.emitter.opentsdb.OpentsdbEmitterModule diff --git a/extensions-contrib/opentsdb-emitter/src/test/java/io/druid/emitter/opentsdb/EventConverterTest.java b/extensions-contrib/opentsdb-emitter/src/test/java/org/apache/druid/emitter/opentsdb/EventConverterTest.java similarity index 94% rename from extensions-contrib/opentsdb-emitter/src/test/java/io/druid/emitter/opentsdb/EventConverterTest.java rename to extensions-contrib/opentsdb-emitter/src/test/java/org/apache/druid/emitter/opentsdb/EventConverterTest.java index 716f5331593e..da3b37d4d41e 100644 --- a/extensions-contrib/opentsdb-emitter/src/test/java/io/druid/emitter/opentsdb/EventConverterTest.java +++ b/extensions-contrib/opentsdb-emitter/src/test/java/org/apache/druid/emitter/opentsdb/EventConverterTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.emitter.opentsdb; +package org.apache.druid.emitter.opentsdb; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; import org.joda.time.DateTime; import org.junit.Assert; import org.junit.Before; diff --git a/extensions-contrib/opentsdb-emitter/src/test/java/io/druid/emitter/opentsdb/OpentsdbEmitterConfigTest.java b/extensions-contrib/opentsdb-emitter/src/test/java/org/apache/druid/emitter/opentsdb/OpentsdbEmitterConfigTest.java similarity index 95% rename from extensions-contrib/opentsdb-emitter/src/test/java/io/druid/emitter/opentsdb/OpentsdbEmitterConfigTest.java rename to extensions-contrib/opentsdb-emitter/src/test/java/org/apache/druid/emitter/opentsdb/OpentsdbEmitterConfigTest.java index 077751e0d3ae..b26331643947 100644 --- a/extensions-contrib/opentsdb-emitter/src/test/java/io/druid/emitter/opentsdb/OpentsdbEmitterConfigTest.java +++ b/extensions-contrib/opentsdb-emitter/src/test/java/org/apache/druid/emitter/opentsdb/OpentsdbEmitterConfigTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.emitter.opentsdb; +package org.apache.druid.emitter.opentsdb; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/extensions-contrib/opentsdb-emitter/src/test/java/io/druid/emitter/opentsdb/OpentsdbEventTest.java b/extensions-contrib/opentsdb-emitter/src/test/java/org/apache/druid/emitter/opentsdb/OpentsdbEventTest.java similarity index 95% rename from extensions-contrib/opentsdb-emitter/src/test/java/io/druid/emitter/opentsdb/OpentsdbEventTest.java rename to extensions-contrib/opentsdb-emitter/src/test/java/org/apache/druid/emitter/opentsdb/OpentsdbEventTest.java index f0bf978cfadc..4b9c80ee5668 100644 --- a/extensions-contrib/opentsdb-emitter/src/test/java/io/druid/emitter/opentsdb/OpentsdbEventTest.java +++ b/extensions-contrib/opentsdb-emitter/src/test/java/org/apache/druid/emitter/opentsdb/OpentsdbEventTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.emitter.opentsdb; +package org.apache.druid.emitter.opentsdb; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/extensions-contrib/opentsdb-emitter/src/test/java/io/druid/emitter/opentsdb/OpentsdbSenderTest.java b/extensions-contrib/opentsdb-emitter/src/test/java/org/apache/druid/emitter/opentsdb/OpentsdbSenderTest.java similarity index 96% rename from extensions-contrib/opentsdb-emitter/src/test/java/io/druid/emitter/opentsdb/OpentsdbSenderTest.java rename to extensions-contrib/opentsdb-emitter/src/test/java/org/apache/druid/emitter/opentsdb/OpentsdbSenderTest.java index 12f2693d5e59..d28f04d526eb 100644 --- a/extensions-contrib/opentsdb-emitter/src/test/java/io/druid/emitter/opentsdb/OpentsdbSenderTest.java +++ b/extensions-contrib/opentsdb-emitter/src/test/java/org/apache/druid/emitter/opentsdb/OpentsdbSenderTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.emitter.opentsdb; +package org.apache.druid.emitter.opentsdb; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-contrib/orc-extensions/pom.xml b/extensions-contrib/orc-extensions/pom.xml index b8dc80d72a32..71f707cca4c8 100644 --- a/extensions-contrib/orc-extensions/pom.xml +++ b/extensions-contrib/orc-extensions/pom.xml @@ -20,14 +20,14 @@ - io.druid.extensions.contrib + org.apache.druid.extensions.contrib druid-orc-extensions druid-orc-extensions druid-orc-extensions druid - io.druid + org.apache.druid 0.13.0-SNAPSHOT ../../pom.xml @@ -35,7 +35,7 @@ - io.druid + org.apache.druid druid-indexing-hadoop ${project.parent.version} provided diff --git a/extensions-contrib/orc-extensions/src/main/java/io/druid/data/input/orc/OrcExtensionsModule.java b/extensions-contrib/orc-extensions/src/main/java/org/apache/druid/data/input/orc/OrcExtensionsModule.java similarity index 94% rename from extensions-contrib/orc-extensions/src/main/java/io/druid/data/input/orc/OrcExtensionsModule.java rename to extensions-contrib/orc-extensions/src/main/java/org/apache/druid/data/input/orc/OrcExtensionsModule.java index 05b2cb26fbbf..9efdcd365b10 100644 --- a/extensions-contrib/orc-extensions/src/main/java/io/druid/data/input/orc/OrcExtensionsModule.java +++ b/extensions-contrib/orc-extensions/src/main/java/org/apache/druid/data/input/orc/OrcExtensionsModule.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.data.input.orc; +package org.apache.druid.data.input.orc; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.inject.Binder; -import io.druid.initialization.DruidModule; +import org.apache.druid.initialization.DruidModule; import java.util.Collections; import java.util.List; diff --git a/extensions-contrib/orc-extensions/src/main/java/io/druid/data/input/orc/OrcHadoopInputRowParser.java b/extensions-contrib/orc-extensions/src/main/java/org/apache/druid/data/input/orc/OrcHadoopInputRowParser.java similarity index 96% rename from extensions-contrib/orc-extensions/src/main/java/io/druid/data/input/orc/OrcHadoopInputRowParser.java rename to extensions-contrib/orc-extensions/src/main/java/org/apache/druid/data/input/orc/OrcHadoopInputRowParser.java index eedf08c2ecdd..67a69faef9d1 100644 --- a/extensions-contrib/orc-extensions/src/main/java/io/druid/data/input/orc/OrcHadoopInputRowParser.java +++ b/extensions-contrib/orc-extensions/src/main/java/org/apache/druid/data/input/orc/OrcHadoopInputRowParser.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.data.input.orc; +package org.apache.druid.data.input.orc; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -26,12 +26,12 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.data.input.InputRow; -import io.druid.data.input.MapBasedInputRow; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.ParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.ParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.ql.io.orc.OrcSerde; import org.apache.hadoop.hive.ql.io.orc.OrcStruct; diff --git a/extensions-contrib/orc-extensions/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-contrib/orc-extensions/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100755 index 3cf68c5589b2..000000000000 --- a/extensions-contrib/orc-extensions/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.data.input.orc.OrcExtensionsModule diff --git a/extensions-contrib/orc-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-contrib/orc-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100755 index 000000000000..8778e62ef1ce --- /dev/null +++ b/extensions-contrib/orc-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.data.input.orc.OrcExtensionsModule diff --git a/extensions-contrib/orc-extensions/src/test/java/io/druid/data/input/orc/DruidOrcInputFormatTest.java b/extensions-contrib/orc-extensions/src/test/java/org/apache/druid/data/input/orc/DruidOrcInputFormatTest.java similarity index 94% rename from extensions-contrib/orc-extensions/src/test/java/io/druid/data/input/orc/DruidOrcInputFormatTest.java rename to extensions-contrib/orc-extensions/src/test/java/org/apache/druid/data/input/orc/DruidOrcInputFormatTest.java index c971a8057fe8..0b22eb754e37 100644 --- a/extensions-contrib/orc-extensions/src/test/java/io/druid/data/input/orc/DruidOrcInputFormatTest.java +++ b/extensions-contrib/orc-extensions/src/test/java/org/apache/druid/data/input/orc/DruidOrcInputFormatTest.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.data.input.orc; +package org.apache.druid.data.input.orc; -import io.druid.data.input.MapBasedInputRow; -import io.druid.data.input.impl.InputRowParser; -import io.druid.indexer.HadoopDruidIndexerConfig; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.indexer.HadoopDruidIndexerConfig; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector; diff --git a/extensions-contrib/orc-extensions/src/test/java/io/druid/data/input/orc/OrcHadoopInputRowParserTest.java b/extensions-contrib/orc-extensions/src/test/java/org/apache/druid/data/input/orc/OrcHadoopInputRowParserTest.java similarity index 91% rename from extensions-contrib/orc-extensions/src/test/java/io/druid/data/input/orc/OrcHadoopInputRowParserTest.java rename to extensions-contrib/orc-extensions/src/test/java/org/apache/druid/data/input/orc/OrcHadoopInputRowParserTest.java index d2da70c5c9f1..3b7f56928bb9 100644 --- a/extensions-contrib/orc-extensions/src/test/java/io/druid/data/input/orc/OrcHadoopInputRowParserTest.java +++ b/extensions-contrib/orc-extensions/src/test/java/org/apache/druid/data/input/orc/OrcHadoopInputRowParserTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.data.input.orc; +package org.apache.druid.data.input.orc; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; @@ -26,17 +26,17 @@ import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.name.Names; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.ParseSpec; -import io.druid.data.input.impl.StringDimensionSchema; -import io.druid.data.input.impl.TimeAndDimsParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.guice.GuiceInjectors; -import io.druid.initialization.Initialization; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.ParseSpec; +import org.apache.druid.data.input.impl.StringDimensionSchema; +import org.apache.druid.data.input.impl.TimeAndDimsParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; import org.apache.hadoop.hive.common.type.HiveDecimal; import org.apache.hadoop.hive.ql.io.orc.OrcStruct; import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable; diff --git a/extensions-contrib/orc-extensions/src/test/java/io/druid/data/input/orc/OrcIndexGeneratorJobTest.java b/extensions-contrib/orc-extensions/src/test/java/org/apache/druid/data/input/orc/OrcIndexGeneratorJobTest.java similarity index 89% rename from extensions-contrib/orc-extensions/src/test/java/io/druid/data/input/orc/OrcIndexGeneratorJobTest.java rename to extensions-contrib/orc-extensions/src/test/java/org/apache/druid/data/input/orc/OrcIndexGeneratorJobTest.java index adc839d81b23..ed59a13b8a6a 100644 --- a/extensions-contrib/orc-extensions/src/test/java/io/druid/data/input/orc/OrcIndexGeneratorJobTest.java +++ b/extensions-contrib/orc-extensions/src/test/java/org/apache/druid/data/input/orc/OrcIndexGeneratorJobTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.data.input.orc; +package org.apache.druid.data.input.orc; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.jsontype.NamedType; @@ -25,31 +25,31 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.io.Files; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.TimeAndDimsParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.indexer.HadoopDruidIndexerConfig; -import io.druid.indexer.HadoopIOConfig; -import io.druid.indexer.HadoopIngestionSpec; -import io.druid.indexer.HadoopTuningConfig; -import io.druid.indexer.HadoopyShardSpec; -import io.druid.indexer.IndexGeneratorJob; -import io.druid.indexer.JobHelper; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; -import io.druid.segment.QueryableIndex; -import io.druid.segment.QueryableIndexIndexableAdapter; -import io.druid.segment.RowIterator; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.HashBasedNumberedShardSpec; -import io.druid.timeline.partition.ShardSpec; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.TimeAndDimsParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.indexer.HadoopDruidIndexerConfig; +import org.apache.druid.indexer.HadoopIOConfig; +import org.apache.druid.indexer.HadoopIngestionSpec; +import org.apache.druid.indexer.HadoopTuningConfig; +import org.apache.druid.indexer.HadoopyShardSpec; +import org.apache.druid.indexer.IndexGeneratorJob; +import org.apache.druid.indexer.JobHelper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.QueryableIndexIndexableAdapter; +import org.apache.druid.segment.RowIterator; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.HashBasedNumberedShardSpec; +import org.apache.druid.timeline.partition.ShardSpec; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector; diff --git a/extensions-contrib/parquet-extensions/example/date_test_data_job_date.json b/extensions-contrib/parquet-extensions/example/date_test_data_job_date.json index e88935aa206f..efdedf9f4bc3 100755 --- a/extensions-contrib/parquet-extensions/example/date_test_data_job_date.json +++ b/extensions-contrib/parquet-extensions/example/date_test_data_job_date.json @@ -5,7 +5,7 @@ "type": "hadoop", "inputSpec": { "type": "static", - "inputFormat": "io.druid.data.input.parquet.DruidParquetInputFormat", + "inputFormat": "org.apache.druid.data.input.parquet.DruidParquetInputFormat", "paths": "example/test_date_data.snappy.parquet" }, "metadataUpdateSpec": { diff --git a/extensions-contrib/parquet-extensions/example/date_test_data_job_string.json b/extensions-contrib/parquet-extensions/example/date_test_data_job_string.json index d6e355f48441..6da2c081a90e 100755 --- a/extensions-contrib/parquet-extensions/example/date_test_data_job_string.json +++ b/extensions-contrib/parquet-extensions/example/date_test_data_job_string.json @@ -5,7 +5,7 @@ "type": "hadoop", "inputSpec": { "type": "static", - "inputFormat": "io.druid.data.input.parquet.DruidParquetInputFormat", + "inputFormat": "org.apache.druid.data.input.parquet.DruidParquetInputFormat", "paths": "example/test_date_data.snappy.parquet" }, "metadataUpdateSpec": { diff --git a/extensions-contrib/parquet-extensions/example/impala_hadoop_parquet_job.json b/extensions-contrib/parquet-extensions/example/impala_hadoop_parquet_job.json index 240d4b5d797b..4e2c5468a274 100644 --- a/extensions-contrib/parquet-extensions/example/impala_hadoop_parquet_job.json +++ b/extensions-contrib/parquet-extensions/example/impala_hadoop_parquet_job.json @@ -5,7 +5,7 @@ "type": "hadoop", "inputSpec": { "type": "static", - "inputFormat": "io.druid.data.input.parquet.DruidParquetInputFormat", + "inputFormat": "org.apache.druid.data.input.parquet.DruidParquetInputFormat", "paths": "example/284a0e001476716b-56d5676f53bd6e85_115466471_data.0.parq" }, "metadataUpdateSpec": { diff --git a/extensions-contrib/parquet-extensions/example/wikipedia_hadoop_parquet_job.json b/extensions-contrib/parquet-extensions/example/wikipedia_hadoop_parquet_job.json index aab4126517c5..4de52c5d0ad7 100755 --- a/extensions-contrib/parquet-extensions/example/wikipedia_hadoop_parquet_job.json +++ b/extensions-contrib/parquet-extensions/example/wikipedia_hadoop_parquet_job.json @@ -5,7 +5,7 @@ "type": "hadoop", "inputSpec": { "type": "static", - "inputFormat": "io.druid.data.input.parquet.DruidParquetInputFormat", + "inputFormat": "org.apache.druid.data.input.parquet.DruidParquetInputFormat", "paths": "example/wikipedia_list.parquet" }, "metadataUpdateSpec": { diff --git a/extensions-contrib/parquet-extensions/pom.xml b/extensions-contrib/parquet-extensions/pom.xml index f5ab2f832360..202a2e3abf79 100644 --- a/extensions-contrib/parquet-extensions/pom.xml +++ b/extensions-contrib/parquet-extensions/pom.xml @@ -21,14 +21,14 @@ - io.druid.extensions.contrib + org.apache.druid.extensions.contrib druid-parquet-extensions druid-parquet-extensions druid-parquet-extensions druid - io.druid + org.apache.druid 0.13.0-SNAPSHOT ../../pom.xml @@ -36,7 +36,7 @@ - io.druid.extensions + org.apache.druid.extensions druid-avro-extensions ${project.parent.version} provided @@ -52,7 +52,7 @@ 1.1.4 - io.druid + org.apache.druid druid-indexing-hadoop ${project.parent.version} provided diff --git a/extensions-contrib/parquet-extensions/src/main/java/io/druid/data/input/parquet/DruidParquetInputFormat.java b/extensions-contrib/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/DruidParquetInputFormat.java similarity index 96% rename from extensions-contrib/parquet-extensions/src/main/java/io/druid/data/input/parquet/DruidParquetInputFormat.java rename to extensions-contrib/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/DruidParquetInputFormat.java index 723750584304..a192893a3772 100755 --- a/extensions-contrib/parquet-extensions/src/main/java/io/druid/data/input/parquet/DruidParquetInputFormat.java +++ b/extensions-contrib/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/DruidParquetInputFormat.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.data.input.parquet; +package org.apache.druid.data.input.parquet; import org.apache.avro.generic.GenericRecord; import org.apache.parquet.avro.DruidParquetReadSupport; diff --git a/extensions-contrib/parquet-extensions/src/main/java/io/druid/data/input/parquet/GenericRecordAsMap.java b/extensions-contrib/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/GenericRecordAsMap.java similarity index 97% rename from extensions-contrib/parquet-extensions/src/main/java/io/druid/data/input/parquet/GenericRecordAsMap.java rename to extensions-contrib/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/GenericRecordAsMap.java index 7f8db28d06d6..c876349f5992 100644 --- a/extensions-contrib/parquet-extensions/src/main/java/io/druid/data/input/parquet/GenericRecordAsMap.java +++ b/extensions-contrib/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/GenericRecordAsMap.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.data.input.parquet; +package org.apache.druid.data.input.parquet; import com.google.common.base.Preconditions; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import org.apache.avro.generic.GenericRecord; import org.apache.avro.util.Utf8; diff --git a/extensions-contrib/parquet-extensions/src/main/java/io/druid/data/input/parquet/ParquetExtensionsModule.java b/extensions-contrib/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/ParquetExtensionsModule.java similarity index 93% rename from extensions-contrib/parquet-extensions/src/main/java/io/druid/data/input/parquet/ParquetExtensionsModule.java rename to extensions-contrib/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/ParquetExtensionsModule.java index fc64a97605ab..49ba6cc0fa05 100644 --- a/extensions-contrib/parquet-extensions/src/main/java/io/druid/data/input/parquet/ParquetExtensionsModule.java +++ b/extensions-contrib/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/ParquetExtensionsModule.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.data.input.parquet; +package org.apache.druid.data.input.parquet; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.inject.Binder; -import io.druid.initialization.DruidModule; +import org.apache.druid.initialization.DruidModule; import java.util.Collections; import java.util.List; diff --git a/extensions-contrib/parquet-extensions/src/main/java/io/druid/data/input/parquet/ParquetHadoopInputRowParser.java b/extensions-contrib/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/ParquetHadoopInputRowParser.java similarity index 87% rename from extensions-contrib/parquet-extensions/src/main/java/io/druid/data/input/parquet/ParquetHadoopInputRowParser.java rename to extensions-contrib/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/ParquetHadoopInputRowParser.java index 587b94de23ba..e10a19f53aa1 100755 --- a/extensions-contrib/parquet-extensions/src/main/java/io/druid/data/input/parquet/ParquetHadoopInputRowParser.java +++ b/extensions-contrib/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/ParquetHadoopInputRowParser.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.data.input.parquet; +package org.apache.druid.data.input.parquet; 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 io.druid.data.input.InputRow; -import io.druid.data.input.MapBasedInputRow; -import io.druid.data.input.impl.DimensionSchema; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.ParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.DateTimes; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.data.input.impl.DimensionSchema; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.ParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.DateTimes; import org.apache.avro.LogicalType; import org.apache.avro.LogicalTypes; import org.apache.avro.Schema; @@ -75,7 +75,7 @@ private LogicalType determineTimestampSpecLogicalType(Schema schema, String time } /** - * imitate avro extension {@link io.druid.data.input.avro.AvroParsers#parseGenericRecord} + * imitate avro extension {@link org.apache.druid.data.input.avro.AvroParsers#parseGenericRecord} */ @Override public List parseBatch(GenericRecord record) diff --git a/extensions-contrib/parquet-extensions/src/main/java/org/apache/parquet/avro/DruidParquetReadSupport.java b/extensions-contrib/parquet-extensions/src/main/java/org/apache/parquet/avro/DruidParquetReadSupport.java index 4af277ce49c6..47dba883b72a 100755 --- a/extensions-contrib/parquet-extensions/src/main/java/org/apache/parquet/avro/DruidParquetReadSupport.java +++ b/extensions-contrib/parquet-extensions/src/main/java/org/apache/parquet/avro/DruidParquetReadSupport.java @@ -21,9 +21,9 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import io.druid.data.input.impl.DimensionSchema; -import io.druid.indexer.HadoopDruidIndexerConfig; -import io.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.data.input.impl.DimensionSchema; +import org.apache.druid.indexer.HadoopDruidIndexerConfig; +import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.avro.Schema; import org.apache.avro.generic.GenericRecord; import org.apache.hadoop.conf.Configuration; diff --git a/extensions-contrib/parquet-extensions/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-contrib/parquet-extensions/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100755 index 26725119c5de..000000000000 --- a/extensions-contrib/parquet-extensions/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.data.input.parquet.ParquetExtensionsModule diff --git a/extensions-contrib/parquet-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-contrib/parquet-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100755 index 000000000000..734c9768e04b --- /dev/null +++ b/extensions-contrib/parquet-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.data.input.parquet.ParquetExtensionsModule diff --git a/extensions-contrib/parquet-extensions/src/test/java/io/druid/data/input/parquet/DruidParquetInputTest.java b/extensions-contrib/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/DruidParquetInputTest.java similarity index 95% rename from extensions-contrib/parquet-extensions/src/test/java/io/druid/data/input/parquet/DruidParquetInputTest.java rename to extensions-contrib/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/DruidParquetInputTest.java index 46a0820137f1..c7d3176a19a7 100644 --- a/extensions-contrib/parquet-extensions/src/test/java/io/druid/data/input/parquet/DruidParquetInputTest.java +++ b/extensions-contrib/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/DruidParquetInputTest.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.data.input.parquet; +package org.apache.druid.data.input.parquet; import com.google.common.collect.Lists; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.InputRowParser; -import io.druid.indexer.HadoopDruidIndexerConfig; -import io.druid.indexer.path.StaticPathSpec; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.indexer.HadoopDruidIndexerConfig; +import org.apache.druid.indexer.path.StaticPathSpec; import org.apache.avro.generic.GenericRecord; import org.apache.avro.util.Utf8; import org.apache.hadoop.conf.Configuration; diff --git a/extensions-contrib/rabbitmq/pom.xml b/extensions-contrib/rabbitmq/pom.xml index d48baa4c3103..37449325bf3a 100644 --- a/extensions-contrib/rabbitmq/pom.xml +++ b/extensions-contrib/rabbitmq/pom.xml @@ -21,13 +21,13 @@ 4.0.0 - io.druid.extensions.contrib + org.apache.druid.extensions.contrib druid-rabbitmq druid-rabbitmq druid-rabbitmq - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT ../../pom.xml @@ -35,7 +35,7 @@ - io.druid + org.apache.druid druid-api ${project.parent.version} provided @@ -73,7 +73,7 @@ test - io.druid + org.apache.druid druid-processing ${project.parent.version} test diff --git a/extensions-contrib/rabbitmq/src/main/java/io/druid/firehose/rabbitmq/JacksonifiedConnectionFactory.java b/extensions-contrib/rabbitmq/src/main/java/org/apache/druid/firehose/rabbitmq/JacksonifiedConnectionFactory.java similarity index 99% rename from extensions-contrib/rabbitmq/src/main/java/io/druid/firehose/rabbitmq/JacksonifiedConnectionFactory.java rename to extensions-contrib/rabbitmq/src/main/java/org/apache/druid/firehose/rabbitmq/JacksonifiedConnectionFactory.java index 3736fa4e7c85..14cf24524a0d 100644 --- a/extensions-contrib/rabbitmq/src/main/java/io/druid/firehose/rabbitmq/JacksonifiedConnectionFactory.java +++ b/extensions-contrib/rabbitmq/src/main/java/org/apache/druid/firehose/rabbitmq/JacksonifiedConnectionFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.firehose.rabbitmq; +package org.apache.druid.firehose.rabbitmq; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/extensions-contrib/rabbitmq/src/main/java/io/druid/firehose/rabbitmq/RabbitMQDruidModule.java b/extensions-contrib/rabbitmq/src/main/java/org/apache/druid/firehose/rabbitmq/RabbitMQDruidModule.java similarity index 93% rename from extensions-contrib/rabbitmq/src/main/java/io/druid/firehose/rabbitmq/RabbitMQDruidModule.java rename to extensions-contrib/rabbitmq/src/main/java/org/apache/druid/firehose/rabbitmq/RabbitMQDruidModule.java index e5778bbdcf8b..99565b986c2b 100644 --- a/extensions-contrib/rabbitmq/src/main/java/io/druid/firehose/rabbitmq/RabbitMQDruidModule.java +++ b/extensions-contrib/rabbitmq/src/main/java/org/apache/druid/firehose/rabbitmq/RabbitMQDruidModule.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.firehose.rabbitmq; +package org.apache.druid.firehose.rabbitmq; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.common.collect.ImmutableList; import com.google.inject.Binder; -import io.druid.initialization.DruidModule; +import org.apache.druid.initialization.DruidModule; import java.util.List; diff --git a/extensions-contrib/rabbitmq/src/main/java/io/druid/firehose/rabbitmq/RabbitMQFirehoseConfig.java b/extensions-contrib/rabbitmq/src/main/java/org/apache/druid/firehose/rabbitmq/RabbitMQFirehoseConfig.java similarity index 99% rename from extensions-contrib/rabbitmq/src/main/java/io/druid/firehose/rabbitmq/RabbitMQFirehoseConfig.java rename to extensions-contrib/rabbitmq/src/main/java/org/apache/druid/firehose/rabbitmq/RabbitMQFirehoseConfig.java index d8d62ec5a734..08dee24615ec 100644 --- a/extensions-contrib/rabbitmq/src/main/java/io/druid/firehose/rabbitmq/RabbitMQFirehoseConfig.java +++ b/extensions-contrib/rabbitmq/src/main/java/org/apache/druid/firehose/rabbitmq/RabbitMQFirehoseConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.firehose.rabbitmq; +package org.apache.druid.firehose.rabbitmq; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-contrib/rabbitmq/src/main/java/io/druid/firehose/rabbitmq/RabbitMQFirehoseFactory.java b/extensions-contrib/rabbitmq/src/main/java/org/apache/druid/firehose/rabbitmq/RabbitMQFirehoseFactory.java similarity index 97% rename from extensions-contrib/rabbitmq/src/main/java/io/druid/firehose/rabbitmq/RabbitMQFirehoseFactory.java rename to extensions-contrib/rabbitmq/src/main/java/org/apache/druid/firehose/rabbitmq/RabbitMQFirehoseFactory.java index 28218bef395d..6870fc2878de 100644 --- a/extensions-contrib/rabbitmq/src/main/java/io/druid/firehose/rabbitmq/RabbitMQFirehoseFactory.java +++ b/extensions-contrib/rabbitmq/src/main/java/org/apache/druid/firehose/rabbitmq/RabbitMQFirehoseFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.firehose.rabbitmq; +package org.apache.druid.firehose.rabbitmq; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -30,11 +30,11 @@ import com.rabbitmq.client.QueueingConsumer.Delivery; import com.rabbitmq.client.ShutdownListener; import com.rabbitmq.client.ShutdownSignalException; -import io.druid.data.input.Firehose; -import io.druid.data.input.FirehoseFactory; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.InputRowParser; -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.InputRow; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.java.util.common.logger.Logger; import net.jodah.lyra.ConnectionOptions; import net.jodah.lyra.Connections; import net.jodah.lyra.config.Config; @@ -114,7 +114,7 @@ public class RabbitMQFirehoseFactory implements FirehoseFactory 4.0.0 - io.druid.extensions.contrib + org.apache.druid.extensions.contrib druid-redis-cache druid-redis-cache - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT ../../pom.xml @@ -36,13 +36,13 @@ - io.druid + org.apache.druid druid-api ${project.parent.version} provided - io.druid + org.apache.druid druid-server ${project.parent.version} provided diff --git a/extensions-contrib/redis-cache/src/main/java/io/druid/client/cache/RedisCache.java b/extensions-contrib/redis-cache/src/main/java/org/apache/druid/client/cache/RedisCache.java similarity index 95% rename from extensions-contrib/redis-cache/src/main/java/io/druid/client/cache/RedisCache.java rename to extensions-contrib/redis-cache/src/main/java/org/apache/druid/client/cache/RedisCache.java index b78038eb6a37..33145fb86abb 100644 --- a/extensions-contrib/redis-cache/src/main/java/io/druid/client/cache/RedisCache.java +++ b/extensions-contrib/redis-cache/src/main/java/org/apache/druid/client/cache/RedisCache.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.common.logger.Logger; import redis.clients.jedis.Jedis; import redis.clients.jedis.JedisPool; import redis.clients.jedis.JedisPoolConfig; diff --git a/extensions-contrib/redis-cache/src/main/java/io/druid/client/cache/RedisCacheConfig.java b/extensions-contrib/redis-cache/src/main/java/org/apache/druid/client/cache/RedisCacheConfig.java similarity index 98% rename from extensions-contrib/redis-cache/src/main/java/io/druid/client/cache/RedisCacheConfig.java rename to extensions-contrib/redis-cache/src/main/java/org/apache/druid/client/cache/RedisCacheConfig.java index 6af79d352fd1..0db1b3a352b9 100644 --- a/extensions-contrib/redis-cache/src/main/java/io/druid/client/cache/RedisCacheConfig.java +++ b/extensions-contrib/redis-cache/src/main/java/org/apache/druid/client/cache/RedisCacheConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-contrib/redis-cache/src/main/java/io/druid/client/cache/RedisCacheProvider.java b/extensions-contrib/redis-cache/src/main/java/org/apache/druid/client/cache/RedisCacheProvider.java similarity index 96% rename from extensions-contrib/redis-cache/src/main/java/io/druid/client/cache/RedisCacheProvider.java rename to extensions-contrib/redis-cache/src/main/java/org/apache/druid/client/cache/RedisCacheProvider.java index 984b46ada17d..fc05031a033b 100644 --- a/extensions-contrib/redis-cache/src/main/java/io/druid/client/cache/RedisCacheProvider.java +++ b/extensions-contrib/redis-cache/src/main/java/org/apache/druid/client/cache/RedisCacheProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.fasterxml.jackson.annotation.JsonTypeName; diff --git a/extensions-contrib/redis-cache/src/main/java/io/druid/client/cache/RedisDruidModule.java b/extensions-contrib/redis-cache/src/main/java/org/apache/druid/client/cache/RedisDruidModule.java similarity index 93% rename from extensions-contrib/redis-cache/src/main/java/io/druid/client/cache/RedisDruidModule.java rename to extensions-contrib/redis-cache/src/main/java/org/apache/druid/client/cache/RedisDruidModule.java index 50b4a95791d1..fae1b453ed65 100644 --- a/extensions-contrib/redis-cache/src/main/java/io/druid/client/cache/RedisDruidModule.java +++ b/extensions-contrib/redis-cache/src/main/java/org/apache/druid/client/cache/RedisDruidModule.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.common.collect.ImmutableList; import com.google.inject.Binder; -import io.druid.initialization.DruidModule; +import org.apache.druid.initialization.DruidModule; import java.util.List; diff --git a/extensions-contrib/redis-cache/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-contrib/redis-cache/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index 54730c71c161..000000000000 --- a/extensions-contrib/redis-cache/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.client.cache.RedisDruidModule diff --git a/extensions-contrib/redis-cache/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-contrib/redis-cache/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..09e01195d44a --- /dev/null +++ b/extensions-contrib/redis-cache/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.client.cache.RedisDruidModule diff --git a/extensions-contrib/redis-cache/src/test/java/io/druid/client/cache/RedisCacheTest.java b/extensions-contrib/redis-cache/src/test/java/org/apache/druid/client/cache/RedisCacheTest.java similarity index 94% rename from extensions-contrib/redis-cache/src/test/java/io/druid/client/cache/RedisCacheTest.java rename to extensions-contrib/redis-cache/src/test/java/org/apache/druid/client/cache/RedisCacheTest.java index 733c0b91a13e..e5699de971b1 100644 --- a/extensions-contrib/redis-cache/src/test/java/io/druid/client/cache/RedisCacheTest.java +++ b/extensions-contrib/redis-cache/src/test/java/org/apache/druid/client/cache/RedisCacheTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.fiftyonred.mock_jedis.MockJedis; import com.fiftyonred.mock_jedis.MockJedisPool; @@ -27,12 +27,12 @@ import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.name.Names; -import io.druid.guice.GuiceInjectors; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.ManageLifecycle; -import io.druid.initialization.Initialization; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/extensions-contrib/sqlserver-metadata-storage/pom.xml b/extensions-contrib/sqlserver-metadata-storage/pom.xml index c0f5011da4e3..71bdbb11e07f 100644 --- a/extensions-contrib/sqlserver-metadata-storage/pom.xml +++ b/extensions-contrib/sqlserver-metadata-storage/pom.xml @@ -20,13 +20,13 @@ 4.0.0 - io.druid.extensions.contrib + org.apache.druid.extensions.contrib sqlserver-metadata-storage sqlserver-metadata-storage sqlserver-metadata-storage - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT ../../pom.xml @@ -35,19 +35,19 @@ - io.druid + org.apache.druid druid-api ${project.parent.version} provided - io.druid + org.apache.druid druid-common ${project.parent.version} provided - io.druid + org.apache.druid druid-server ${project.parent.version} provided diff --git a/extensions-contrib/sqlserver-metadata-storage/src/main/java/io/druid/metadata/storage/sqlserver/SQLServerConnector.java b/extensions-contrib/sqlserver-metadata-storage/src/main/java/org/apache/druid/metadata/storage/sqlserver/SQLServerConnector.java similarity index 96% rename from extensions-contrib/sqlserver-metadata-storage/src/main/java/io/druid/metadata/storage/sqlserver/SQLServerConnector.java rename to extensions-contrib/sqlserver-metadata-storage/src/main/java/org/apache/druid/metadata/storage/sqlserver/SQLServerConnector.java index cd99d8cf36f2..1a758b6fe30e 100644 --- a/extensions-contrib/sqlserver-metadata-storage/src/main/java/io/druid/metadata/storage/sqlserver/SQLServerConnector.java +++ b/extensions-contrib/sqlserver-metadata-storage/src/main/java/org/apache/druid/metadata/storage/sqlserver/SQLServerConnector.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.metadata.storage.sqlserver; +package org.apache.druid.metadata.storage.sqlserver; import com.google.common.base.Supplier; import com.google.inject.Inject; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.metadata.MetadataStorageConnectorConfig; -import io.druid.metadata.MetadataStorageTablesConfig; -import io.druid.metadata.SQLMetadataConnector; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.metadata.MetadataStorageConnectorConfig; +import org.apache.druid.metadata.MetadataStorageTablesConfig; +import org.apache.druid.metadata.SQLMetadataConnector; import org.apache.commons.dbcp2.BasicDataSource; import org.skife.jdbi.v2.Binding; import org.skife.jdbi.v2.ColonPrefixNamedParamStatementRewriter; diff --git a/extensions-contrib/sqlserver-metadata-storage/src/main/java/io/druid/metadata/storage/sqlserver/SQLServerMetadataStorageModule.java b/extensions-contrib/sqlserver-metadata-storage/src/main/java/org/apache/druid/metadata/storage/sqlserver/SQLServerMetadataStorageModule.java similarity index 77% rename from extensions-contrib/sqlserver-metadata-storage/src/main/java/io/druid/metadata/storage/sqlserver/SQLServerMetadataStorageModule.java rename to extensions-contrib/sqlserver-metadata-storage/src/main/java/org/apache/druid/metadata/storage/sqlserver/SQLServerMetadataStorageModule.java index eb656be50aed..5ba63d4b8efb 100644 --- a/extensions-contrib/sqlserver-metadata-storage/src/main/java/io/druid/metadata/storage/sqlserver/SQLServerMetadataStorageModule.java +++ b/extensions-contrib/sqlserver-metadata-storage/src/main/java/org/apache/druid/metadata/storage/sqlserver/SQLServerMetadataStorageModule.java @@ -16,22 +16,22 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.metadata.storage.sqlserver; +package org.apache.druid.metadata.storage.sqlserver; 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.LazySingleton; -import io.druid.guice.PolyBind; -import io.druid.guice.SQLMetadataStorageDruidModule; -import io.druid.initialization.DruidModule; -import io.druid.metadata.MetadataStorageActionHandlerFactory; -import io.druid.metadata.MetadataStorageConnector; -import io.druid.metadata.MetadataStorageProvider; -import io.druid.metadata.NoopMetadataStorageProvider; -import io.druid.metadata.SQLMetadataConnector; -import io.druid.metadata.SQLServerMetadataStorageActionHandlerFactory; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.PolyBind; +import org.apache.druid.guice.SQLMetadataStorageDruidModule; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.metadata.MetadataStorageActionHandlerFactory; +import org.apache.druid.metadata.MetadataStorageConnector; +import org.apache.druid.metadata.MetadataStorageProvider; +import org.apache.druid.metadata.NoopMetadataStorageProvider; +import org.apache.druid.metadata.SQLMetadataConnector; +import org.apache.druid.metadata.SQLServerMetadataStorageActionHandlerFactory; import java.util.List; diff --git a/extensions-contrib/sqlserver-metadata-storage/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-contrib/sqlserver-metadata-storage/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index 3b2d6d4d271f..000000000000 --- a/extensions-contrib/sqlserver-metadata-storage/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.metadata.storage.sqlserver.SQLServerMetadataStorageModule diff --git a/extensions-contrib/sqlserver-metadata-storage/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-contrib/sqlserver-metadata-storage/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..2f7f65e52339 --- /dev/null +++ b/extensions-contrib/sqlserver-metadata-storage/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.metadata.storage.sqlserver.SQLServerMetadataStorageModule diff --git a/extensions-contrib/sqlserver-metadata-storage/src/test/java/io/druid/metadata/storage/sqlserver/CustomStatementRewriterTest.java b/extensions-contrib/sqlserver-metadata-storage/src/test/java/org/apache/druid/metadata/storage/sqlserver/CustomStatementRewriterTest.java similarity index 93% rename from extensions-contrib/sqlserver-metadata-storage/src/test/java/io/druid/metadata/storage/sqlserver/CustomStatementRewriterTest.java rename to extensions-contrib/sqlserver-metadata-storage/src/test/java/org/apache/druid/metadata/storage/sqlserver/CustomStatementRewriterTest.java index ea9394a05034..4f5c49635a3c 100644 --- a/extensions-contrib/sqlserver-metadata-storage/src/test/java/io/druid/metadata/storage/sqlserver/CustomStatementRewriterTest.java +++ b/extensions-contrib/sqlserver-metadata-storage/src/test/java/org/apache/druid/metadata/storage/sqlserver/CustomStatementRewriterTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.metadata.storage.sqlserver; +package org.apache.druid.metadata.storage.sqlserver; import org.junit.Before; import org.junit.Test; @@ -25,7 +25,7 @@ import org.skife.jdbi.v2.exceptions.UnableToCreateStatementException; import org.skife.jdbi.v2.tweak.RewrittenStatement; -import io.druid.metadata.storage.sqlserver.SQLServerConnector.CustomStatementRewriter; +import org.apache.druid.metadata.storage.sqlserver.SQLServerConnector.CustomStatementRewriter; import junit.framework.Assert; @SuppressWarnings("nls") @@ -90,7 +90,7 @@ public void testCustomStatementRewriter() /** * - * @see io.druid.metadata.SQLMetadataConnector#createTable(String, Iterable) + * @see org.apache.druid.metadata.SQLMetadataConnector#createTable(String, Iterable) * */ @Test @@ -128,7 +128,7 @@ public void testSQLMetadataConnectorCreateTable() /** * - * @see io.druid.metadata.SQLMetadataStorageActionHandler#setStatus(String, + * @see org.apache.druid.metadata.SQLMetadataStorageActionHandler#setStatus(String, * boolean, Object) * */ diff --git a/extensions-contrib/sqlserver-metadata-storage/src/test/java/io/druid/metadata/storage/sqlserver/SQLServerConnectorTest.java b/extensions-contrib/sqlserver-metadata-storage/src/test/java/org/apache/druid/metadata/storage/sqlserver/SQLServerConnectorTest.java similarity index 92% rename from extensions-contrib/sqlserver-metadata-storage/src/test/java/io/druid/metadata/storage/sqlserver/SQLServerConnectorTest.java rename to extensions-contrib/sqlserver-metadata-storage/src/test/java/org/apache/druid/metadata/storage/sqlserver/SQLServerConnectorTest.java index f7e3a4f1874f..db7bb0757fb7 100644 --- a/extensions-contrib/sqlserver-metadata-storage/src/test/java/io/druid/metadata/storage/sqlserver/SQLServerConnectorTest.java +++ b/extensions-contrib/sqlserver-metadata-storage/src/test/java/org/apache/druid/metadata/storage/sqlserver/SQLServerConnectorTest.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.metadata.storage.sqlserver; +package org.apache.druid.metadata.storage.sqlserver; import com.google.common.base.Suppliers; -import io.druid.metadata.MetadataStorageConnectorConfig; -import io.druid.metadata.MetadataStorageTablesConfig; +import org.apache.druid.metadata.MetadataStorageConnectorConfig; +import org.apache.druid.metadata.MetadataStorageTablesConfig; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-contrib/statsd-emitter/pom.xml b/extensions-contrib/statsd-emitter/pom.xml index d08c3ae94682..a346528a0a72 100644 --- a/extensions-contrib/statsd-emitter/pom.xml +++ b/extensions-contrib/statsd-emitter/pom.xml @@ -22,32 +22,32 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> druid - io.druid + org.apache.druid 0.13.0-SNAPSHOT ../../pom.xml 4.0.0 - io.druid.extensions.contrib + org.apache.druid.extensions.contrib statsd-emitter statsd-emitter Extension support for emitting Druid metrics to StatsD - io.druid + org.apache.druid druid-common ${project.parent.version} provided - io.druid + org.apache.druid druid-api ${project.parent.version} provided - io.druid + org.apache.druid java-util ${project.parent.version} provided @@ -74,14 +74,14 @@ test - io.druid + org.apache.druid druid-server ${project.parent.version} test-jar test - io.druid + org.apache.druid druid-processing ${project.parent.version} test-jar diff --git a/extensions-contrib/statsd-emitter/src/main/java/io/druid/emitter/statsd/DimensionConverter.java b/extensions-contrib/statsd-emitter/src/main/java/org/apache/druid/emitter/statsd/DimensionConverter.java similarity index 95% rename from extensions-contrib/statsd-emitter/src/main/java/io/druid/emitter/statsd/DimensionConverter.java rename to extensions-contrib/statsd-emitter/src/main/java/org/apache/druid/emitter/statsd/DimensionConverter.java index 11a22ea809ef..5ce5c10d4f49 100644 --- a/extensions-contrib/statsd-emitter/src/main/java/io/druid/emitter/statsd/DimensionConverter.java +++ b/extensions-contrib/statsd-emitter/src/main/java/org/apache/druid/emitter/statsd/DimensionConverter.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.emitter.statsd; +package org.apache.druid.emitter.statsd; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; -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.io.File; import java.io.FileInputStream; diff --git a/extensions-contrib/statsd-emitter/src/main/java/io/druid/emitter/statsd/StatsDEmitter.java b/extensions-contrib/statsd-emitter/src/main/java/org/apache/druid/emitter/statsd/StatsDEmitter.java similarity index 93% rename from extensions-contrib/statsd-emitter/src/main/java/io/druid/emitter/statsd/StatsDEmitter.java rename to extensions-contrib/statsd-emitter/src/main/java/org/apache/druid/emitter/statsd/StatsDEmitter.java index 7e7c2505094c..5fb576ba81f7 100644 --- a/extensions-contrib/statsd-emitter/src/main/java/io/druid/emitter/statsd/StatsDEmitter.java +++ b/extensions-contrib/statsd-emitter/src/main/java/org/apache/druid/emitter/statsd/StatsDEmitter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.emitter.statsd; +package org.apache.druid.emitter.statsd; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Joiner; @@ -25,10 +25,10 @@ import com.timgroup.statsd.NonBlockingStatsDClient; import com.timgroup.statsd.StatsDClient; import com.timgroup.statsd.StatsDClientErrorHandler; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.emitter.core.Emitter; -import io.druid.java.util.emitter.core.Event; -import io.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.core.Emitter; +import org.apache.druid.java.util.emitter.core.Event; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; import java.util.Map; diff --git a/extensions-contrib/statsd-emitter/src/main/java/io/druid/emitter/statsd/StatsDEmitterConfig.java b/extensions-contrib/statsd-emitter/src/main/java/org/apache/druid/emitter/statsd/StatsDEmitterConfig.java similarity index 99% rename from extensions-contrib/statsd-emitter/src/main/java/io/druid/emitter/statsd/StatsDEmitterConfig.java rename to extensions-contrib/statsd-emitter/src/main/java/org/apache/druid/emitter/statsd/StatsDEmitterConfig.java index 255a1c202e89..8a919ff7bbd8 100644 --- a/extensions-contrib/statsd-emitter/src/main/java/io/druid/emitter/statsd/StatsDEmitterConfig.java +++ b/extensions-contrib/statsd-emitter/src/main/java/org/apache/druid/emitter/statsd/StatsDEmitterConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.emitter.statsd; +package org.apache.druid.emitter.statsd; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-contrib/statsd-emitter/src/main/java/io/druid/emitter/statsd/StatsDEmitterModule.java b/extensions-contrib/statsd-emitter/src/main/java/org/apache/druid/emitter/statsd/StatsDEmitterModule.java similarity index 86% rename from extensions-contrib/statsd-emitter/src/main/java/io/druid/emitter/statsd/StatsDEmitterModule.java rename to extensions-contrib/statsd-emitter/src/main/java/org/apache/druid/emitter/statsd/StatsDEmitterModule.java index 2ab523353091..93c4404a9499 100644 --- a/extensions-contrib/statsd-emitter/src/main/java/io/druid/emitter/statsd/StatsDEmitterModule.java +++ b/extensions-contrib/statsd-emitter/src/main/java/org/apache/druid/emitter/statsd/StatsDEmitterModule.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.emitter.statsd; +package org.apache.druid.emitter.statsd; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.inject.Binder; import com.google.inject.Provides; import com.google.inject.name.Named; -import io.druid.java.util.emitter.core.Emitter; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.ManageLifecycle; -import io.druid.initialization.DruidModule; +import org.apache.druid.java.util.emitter.core.Emitter; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.initialization.DruidModule; import java.util.Collections; import java.util.List; diff --git a/extensions-contrib/statsd-emitter/src/main/java/io/druid/emitter/statsd/StatsDMetric.java b/extensions-contrib/statsd-emitter/src/main/java/org/apache/druid/emitter/statsd/StatsDMetric.java similarity index 97% rename from extensions-contrib/statsd-emitter/src/main/java/io/druid/emitter/statsd/StatsDMetric.java rename to extensions-contrib/statsd-emitter/src/main/java/org/apache/druid/emitter/statsd/StatsDMetric.java index c67a9cc2a2a3..3036d3e1aacb 100644 --- a/extensions-contrib/statsd-emitter/src/main/java/io/druid/emitter/statsd/StatsDMetric.java +++ b/extensions-contrib/statsd-emitter/src/main/java/org/apache/druid/emitter/statsd/StatsDMetric.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.emitter.statsd; +package org.apache.druid.emitter.statsd; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-contrib/statsd-emitter/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-contrib/statsd-emitter/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index 141bbc405d7a..000000000000 --- a/extensions-contrib/statsd-emitter/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.emitter.statsd.StatsDEmitterModule diff --git a/extensions-contrib/statsd-emitter/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-contrib/statsd-emitter/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..b03a64e10e5f --- /dev/null +++ b/extensions-contrib/statsd-emitter/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.emitter.statsd.StatsDEmitterModule diff --git a/extensions-contrib/statsd-emitter/src/test/java/DimensionConverterTest.java b/extensions-contrib/statsd-emitter/src/test/java/DimensionConverterTest.java index 6ba1c6295275..0e7b0055a115 100644 --- a/extensions-contrib/statsd-emitter/src/test/java/DimensionConverterTest.java +++ b/extensions-contrib/statsd-emitter/src/test/java/DimensionConverterTest.java @@ -19,10 +19,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; -import io.druid.emitter.statsd.DimensionConverter; -import io.druid.emitter.statsd.StatsDMetric; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.emitter.statsd.DimensionConverter; +import org.apache.druid.emitter.statsd.StatsDMetric; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/extensions-contrib/statsd-emitter/src/test/java/StatsDEmitterTest.java b/extensions-contrib/statsd-emitter/src/test/java/StatsDEmitterTest.java index da5608cb5ab4..12826391006f 100644 --- a/extensions-contrib/statsd-emitter/src/test/java/StatsDEmitterTest.java +++ b/extensions-contrib/statsd-emitter/src/test/java/StatsDEmitterTest.java @@ -18,11 +18,11 @@ */ import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; import com.timgroup.statsd.StatsDClient; -import io.druid.emitter.statsd.StatsDEmitter; -import io.druid.emitter.statsd.StatsDEmitterConfig; -import io.druid.java.util.common.DateTimes; +import org.apache.druid.emitter.statsd.StatsDEmitter; +import org.apache.druid.emitter.statsd.StatsDEmitterConfig; +import org.apache.druid.java.util.common.DateTimes; import org.junit.Test; import static org.easymock.EasyMock.createMock; diff --git a/extensions-contrib/thrift-extensions/example/books.json b/extensions-contrib/thrift-extensions/example/books.json index a866524873d9..6f1dc54c00b6 100644 --- a/extensions-contrib/thrift-extensions/example/books.json +++ b/extensions-contrib/thrift-extensions/example/books.json @@ -6,7 +6,7 @@ "parser" : { "type" : "thrift", "jarPath" : "example/book.jar", - "thriftClass": "io.druid.data.input.thrift.Book", + "thriftClass": "org.apache.druid.data.input.thrift.Book", "protocol" : "compact", "parseSpec" : { "format" : "json", diff --git a/extensions-contrib/thrift-extensions/pom.xml b/extensions-contrib/thrift-extensions/pom.xml index 68f45a3d4bea..47f7a3d8600f 100644 --- a/extensions-contrib/thrift-extensions/pom.xml +++ b/extensions-contrib/thrift-extensions/pom.xml @@ -22,14 +22,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - io.druid.extensions.contrib + org.apache.druid.extensions.contrib druid-thrift-extensions druid-thrift-extensions druid-thrift-extensions druid - io.druid + org.apache.druid 0.13.0-SNAPSHOT ../../pom.xml @@ -61,7 +61,7 @@ - io.druid + org.apache.druid druid-indexing-hadoop ${project.parent.version} provided diff --git a/extensions-contrib/thrift-extensions/src/main/java/io/druid/data/input/thrift/ThriftDeserialization.java b/extensions-contrib/thrift-extensions/src/main/java/org/apache/druid/data/input/thrift/ThriftDeserialization.java similarity index 98% rename from extensions-contrib/thrift-extensions/src/main/java/io/druid/data/input/thrift/ThriftDeserialization.java rename to extensions-contrib/thrift-extensions/src/main/java/org/apache/druid/data/input/thrift/ThriftDeserialization.java index a46b7617dd26..a0c505ce4602 100644 --- a/extensions-contrib/thrift-extensions/src/main/java/io/druid/data/input/thrift/ThriftDeserialization.java +++ b/extensions-contrib/thrift-extensions/src/main/java/org/apache/druid/data/input/thrift/ThriftDeserialization.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.data.input.thrift; +package org.apache.druid.data.input.thrift; import com.google.common.base.Preconditions; import org.apache.commons.codec.binary.Base64; diff --git a/extensions-contrib/thrift-extensions/src/main/java/io/druid/data/input/thrift/ThriftExtensionsModule.java b/extensions-contrib/thrift-extensions/src/main/java/org/apache/druid/data/input/thrift/ThriftExtensionsModule.java similarity index 93% rename from extensions-contrib/thrift-extensions/src/main/java/io/druid/data/input/thrift/ThriftExtensionsModule.java rename to extensions-contrib/thrift-extensions/src/main/java/org/apache/druid/data/input/thrift/ThriftExtensionsModule.java index 93f64ca15ed7..ac83480243fb 100644 --- a/extensions-contrib/thrift-extensions/src/main/java/io/druid/data/input/thrift/ThriftExtensionsModule.java +++ b/extensions-contrib/thrift-extensions/src/main/java/org/apache/druid/data/input/thrift/ThriftExtensionsModule.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.data.input.thrift; +package org.apache.druid.data.input.thrift; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.inject.Binder; -import io.druid.initialization.DruidModule; +import org.apache.druid.initialization.DruidModule; import java.util.Collections; import java.util.List; diff --git a/extensions-contrib/thrift-extensions/src/main/java/io/druid/data/input/thrift/ThriftInputRowParser.java b/extensions-contrib/thrift-extensions/src/main/java/org/apache/druid/data/input/thrift/ThriftInputRowParser.java similarity index 93% rename from extensions-contrib/thrift-extensions/src/main/java/io/druid/data/input/thrift/ThriftInputRowParser.java rename to extensions-contrib/thrift-extensions/src/main/java/org/apache/druid/data/input/thrift/ThriftInputRowParser.java index e11574f7a710..30bea875d0e4 100644 --- a/extensions-contrib/thrift-extensions/src/main/java/io/druid/data/input/thrift/ThriftInputRowParser.java +++ b/extensions-contrib/thrift-extensions/src/main/java/org/apache/druid/data/input/thrift/ThriftInputRowParser.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.data.input.thrift; +package org.apache.druid.data.input.thrift; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import io.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.IAE; import com.twitter.elephantbird.mapreduce.io.ThriftWritable; -import io.druid.data.input.InputRow; -import io.druid.data.input.MapBasedInputRow; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.ParseSpec; -import io.druid.java.util.common.parsers.Parser; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.ParseSpec; +import org.apache.druid.java.util.common.parsers.Parser; import org.apache.hadoop.io.BytesWritable; import org.apache.thrift.TBase; import org.apache.thrift.TException; diff --git a/extensions-contrib/thrift-extensions/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-contrib/thrift-extensions/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100755 index 3b4c298d46bb..000000000000 --- a/extensions-contrib/thrift-extensions/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.data.input.thrift.ThriftExtensionsModule diff --git a/extensions-contrib/thrift-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-contrib/thrift-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100755 index 000000000000..6639b432a029 --- /dev/null +++ b/extensions-contrib/thrift-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.data.input.thrift.ThriftExtensionsModule diff --git a/extensions-contrib/thrift-extensions/src/test/java/io/druid/data/input/thrift/ThriftInputRowParserTest.java b/extensions-contrib/thrift-extensions/src/test/java/org/apache/druid/data/input/thrift/ThriftInputRowParserTest.java similarity index 81% rename from extensions-contrib/thrift-extensions/src/test/java/io/druid/data/input/thrift/ThriftInputRowParserTest.java rename to extensions-contrib/thrift-extensions/src/test/java/org/apache/druid/data/input/thrift/ThriftInputRowParserTest.java index 649e3f8ecafe..4633ff630864 100644 --- a/extensions-contrib/thrift-extensions/src/test/java/io/druid/data/input/thrift/ThriftInputRowParserTest.java +++ b/extensions-contrib/thrift-extensions/src/test/java/org/apache/druid/data/input/thrift/ThriftInputRowParserTest.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.data.input.thrift; +package org.apache.druid.data.input.thrift; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.JSONParseSpec; -import io.druid.data.input.impl.JavaScriptParseSpec; -import io.druid.data.input.impl.ParseSpec; -import io.druid.data.input.impl.StringDimensionSchema; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.parsers.JSONPathFieldSpec; -import io.druid.java.util.common.parsers.JSONPathFieldType; -import io.druid.java.util.common.parsers.JSONPathSpec; -import io.druid.js.JavaScriptConfig; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.JSONParseSpec; +import org.apache.druid.data.input.impl.JavaScriptParseSpec; +import org.apache.druid.data.input.impl.ParseSpec; +import org.apache.druid.data.input.impl.StringDimensionSchema; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.parsers.JSONPathFieldSpec; +import org.apache.druid.java.util.common.parsers.JSONPathFieldType; +import org.apache.druid.java.util.common.parsers.JSONPathSpec; +import org.apache.druid.js.JavaScriptConfig; import org.apache.commons.codec.binary.Base64; import org.apache.hadoop.io.BytesWritable; import org.apache.thrift.TSerializer; @@ -80,12 +80,12 @@ public void testGetThriftClass() throws Exception ThriftInputRowParser parser1 = new ThriftInputRowParser( parseSpec, "example/book.jar", - "io.druid.data.input.thrift.Book" + "org.apache.druid.data.input.thrift.Book" ); - assertEquals(parser1.getThriftClass().getName(), "io.druid.data.input.thrift.Book"); + assertEquals(parser1.getThriftClass().getName(), "org.apache.druid.data.input.thrift.Book"); - ThriftInputRowParser parser2 = new ThriftInputRowParser(parseSpec, null, "io.druid.data.input.thrift.Book"); - assertEquals(parser2.getThriftClass().getName(), "io.druid.data.input.thrift.Book"); + ThriftInputRowParser parser2 = new ThriftInputRowParser(parseSpec, null, "org.apache.druid.data.input.thrift.Book"); + assertEquals(parser2.getThriftClass().getName(), "org.apache.druid.data.input.thrift.Book"); } @Test @@ -94,7 +94,7 @@ public void testParse() throws Exception ThriftInputRowParser parser = new ThriftInputRowParser( parseSpec, "example/book.jar", - "io.druid.data.input.thrift.Book" + "org.apache.druid.data.input.thrift.Book" ); Book book = new Book().setDate("2016-08-29").setPrice(19.9).setTitle("title") .setAuthor(new Author().setFirstName("first").setLastName("last")); @@ -138,7 +138,7 @@ public void testDisableJavaScript() ThriftInputRowParser parser = new ThriftInputRowParser( parseSpec, "example/book.jar", - "io.druid.data.input.thrift.Book" + "org.apache.druid.data.input.thrift.Book" ); expectedException.expect(CoreMatchers.instanceOf(IllegalStateException.class)); diff --git a/extensions-contrib/thrift-extensions/src/test/thrift/book.thrift b/extensions-contrib/thrift-extensions/src/test/thrift/book.thrift index 2d090686ed97..a71a444629cc 100644 --- a/extensions-contrib/thrift-extensions/src/test/thrift/book.thrift +++ b/extensions-contrib/thrift-extensions/src/test/thrift/book.thrift @@ -1,4 +1,4 @@ -namespace java io.druid.data.input.thrift +namespace java org.apache.druid.data.input.thrift struct Author { 1: string firstName; diff --git a/extensions-contrib/time-min-max/pom.xml b/extensions-contrib/time-min-max/pom.xml index e3a3299b3d64..32e2e3687961 100644 --- a/extensions-contrib/time-min-max/pom.xml +++ b/extensions-contrib/time-min-max/pom.xml @@ -22,32 +22,32 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> druid - io.druid + org.apache.druid 0.13.0-SNAPSHOT ../../pom.xml 4.0.0 - io.druid.extensions.contrib + org.apache.druid.extensions.contrib druid-time-min-max druid-time-min-max Min/Max of timestamp - io.druid + org.apache.druid druid-api ${project.parent.version} provided - io.druid + org.apache.druid druid-processing ${project.parent.version} provided - io.druid + org.apache.druid druid-common ${project.parent.version} provided @@ -63,21 +63,21 @@ test - io.druid + org.apache.druid druid-common ${project.parent.version} test-jar test - io.druid + org.apache.druid druid-processing ${project.parent.version} test-jar test - io.druid + org.apache.druid druid-server ${project.parent.version} test diff --git a/extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampAggregator.java b/extensions-contrib/time-min-max/src/main/java/org/apache/druid/query/aggregation/TimestampAggregator.java similarity index 94% rename from extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampAggregator.java rename to extensions-contrib/time-min-max/src/main/java/org/apache/druid/query/aggregation/TimestampAggregator.java index 8d230222471a..d24741ca40d2 100644 --- a/extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampAggregator.java +++ b/extensions-contrib/time-min-max/src/main/java/org/apache/druid/query/aggregation/TimestampAggregator.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.segment.BaseObjectColumnValueSelector; import java.util.Comparator; diff --git a/extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampAggregatorFactory.java b/extensions-contrib/time-min-max/src/main/java/org/apache/druid/query/aggregation/TimestampAggregatorFactory.java similarity index 94% rename from extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampAggregatorFactory.java rename to extensions-contrib/time-min-max/src/main/java/org/apache/druid/query/aggregation/TimestampAggregatorFactory.java index df497e8729a8..baa5254aa077 100644 --- a/extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampAggregatorFactory.java +++ b/extensions-contrib/time-min-max/src/main/java/org/apache/druid/query/aggregation/TimestampAggregatorFactory.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.StringUtils; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.ObjectColumnSelector; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.ObjectColumnSelector; import org.joda.time.DateTime; import java.nio.ByteBuffer; diff --git a/extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampBufferAggregator.java b/extensions-contrib/time-min-max/src/main/java/org/apache/druid/query/aggregation/TimestampBufferAggregator.java similarity index 91% rename from extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampBufferAggregator.java rename to extensions-contrib/time-min-max/src/main/java/org/apache/druid/query/aggregation/TimestampBufferAggregator.java index 5a92495488d7..196f434720f4 100644 --- a/extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampBufferAggregator.java +++ b/extensions-contrib/time-min-max/src/main/java/org/apache/druid/query/aggregation/TimestampBufferAggregator.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseObjectColumnValueSelector; import java.nio.ByteBuffer; import java.util.Comparator; diff --git a/extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampMaxAggregatorFactory.java b/extensions-contrib/time-min-max/src/main/java/org/apache/druid/query/aggregation/TimestampMaxAggregatorFactory.java similarity index 97% rename from extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampMaxAggregatorFactory.java rename to extensions-contrib/time-min-max/src/main/java/org/apache/druid/query/aggregation/TimestampMaxAggregatorFactory.java index 9f47a8681b10..4514c28c6328 100644 --- a/extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampMaxAggregatorFactory.java +++ b/extensions-contrib/time-min-max/src/main/java/org/apache/druid/query/aggregation/TimestampMaxAggregatorFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampMinAggregatorFactory.java b/extensions-contrib/time-min-max/src/main/java/org/apache/druid/query/aggregation/TimestampMinAggregatorFactory.java similarity index 97% rename from extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampMinAggregatorFactory.java rename to extensions-contrib/time-min-max/src/main/java/org/apache/druid/query/aggregation/TimestampMinAggregatorFactory.java index 5d9a370d5d67..6e4a0ead0485 100644 --- a/extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampMinAggregatorFactory.java +++ b/extensions-contrib/time-min-max/src/main/java/org/apache/druid/query/aggregation/TimestampMinAggregatorFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampMinMaxModule.java b/extensions-contrib/time-min-max/src/main/java/org/apache/druid/query/aggregation/TimestampMinMaxModule.java similarity index 94% rename from extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampMinMaxModule.java rename to extensions-contrib/time-min-max/src/main/java/org/apache/druid/query/aggregation/TimestampMinMaxModule.java index bddce329251a..9d19299ab4b4 100644 --- a/extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampMinMaxModule.java +++ b/extensions-contrib/time-min-max/src/main/java/org/apache/druid/query/aggregation/TimestampMinMaxModule.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.inject.Binder; -import io.druid.initialization.DruidModule; +import org.apache.druid.initialization.DruidModule; import java.util.Collections; import java.util.List; diff --git a/extensions-contrib/time-min-max/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-contrib/time-min-max/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index c69a5a45813a..000000000000 --- a/extensions-contrib/time-min-max/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.query.aggregation.TimestampMinMaxModule diff --git a/extensions-contrib/time-min-max/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-contrib/time-min-max/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..d16c697e1e9f --- /dev/null +++ b/extensions-contrib/time-min-max/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.query.aggregation.TimestampMinMaxModule diff --git a/extensions-contrib/time-min-max/src/test/java/io/druid/query/aggregation/TimestampAggregationSelectTest.java b/extensions-contrib/time-min-max/src/test/java/org/apache/druid/query/aggregation/TimestampAggregationSelectTest.java similarity index 93% rename from extensions-contrib/time-min-max/src/test/java/io/druid/query/aggregation/TimestampAggregationSelectTest.java rename to extensions-contrib/time-min-max/src/test/java/org/apache/druid/query/aggregation/TimestampAggregationSelectTest.java index 422a4cb6f078..4c2951e5f673 100644 --- a/extensions-contrib/time-min-max/src/test/java/io/druid/query/aggregation/TimestampAggregationSelectTest.java +++ b/extensions-contrib/time-min-max/src/test/java/org/apache/druid/query/aggregation/TimestampAggregationSelectTest.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.io.Resources; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.Result; -import io.druid.query.select.SelectResultValue; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.Result; +import org.apache.druid.query.select.SelectResultValue; +import org.apache.druid.segment.ColumnSelectorFactory; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; diff --git a/extensions-contrib/time-min-max/src/test/java/io/druid/query/aggregation/TimestampGroupByAggregationTest.java b/extensions-contrib/time-min-max/src/test/java/org/apache/druid/query/aggregation/TimestampGroupByAggregationTest.java similarity index 92% rename from extensions-contrib/time-min-max/src/test/java/io/druid/query/aggregation/TimestampGroupByAggregationTest.java rename to extensions-contrib/time-min-max/src/test/java/org/apache/druid/query/aggregation/TimestampGroupByAggregationTest.java index d5db6cc2f5f3..0c5374680399 100644 --- a/extensions-contrib/time-min-max/src/test/java/io/druid/query/aggregation/TimestampGroupByAggregationTest.java +++ b/extensions-contrib/time-min-max/src/test/java/org/apache/druid/query/aggregation/TimestampGroupByAggregationTest.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.druid.data.input.MapBasedRow; -import io.druid.data.input.Row; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.groupby.GroupByQueryConfig; -import io.druid.query.groupby.GroupByQueryRunnerTest; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.data.input.MapBasedRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.groupby.GroupByQueryConfig; +import org.apache.druid.query.groupby.GroupByQueryRunnerTest; +import org.apache.druid.segment.ColumnSelectorFactory; import org.easymock.EasyMock; import org.joda.time.DateTime; import org.junit.After; diff --git a/extensions-contrib/time-min-max/src/test/java/io/druid/query/aggregation/TimestampMinMaxAggregatorTest.java b/extensions-contrib/time-min-max/src/test/java/org/apache/druid/query/aggregation/TimestampMinMaxAggregatorTest.java similarity index 96% rename from extensions-contrib/time-min-max/src/test/java/io/druid/query/aggregation/TimestampMinMaxAggregatorTest.java rename to extensions-contrib/time-min-max/src/test/java/org/apache/druid/query/aggregation/TimestampMinMaxAggregatorTest.java index 67644f5056cc..4aa3476098a8 100644 --- a/extensions-contrib/time-min-max/src/test/java/io/druid/query/aggregation/TimestampMinMaxAggregatorTest.java +++ b/extensions-contrib/time-min-max/src/test/java/org/apache/druid/query/aggregation/TimestampMinMaxAggregatorTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Function; @@ -27,9 +27,9 @@ import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.name.Names; -import io.druid.guice.GuiceInjectors; -import io.druid.initialization.Initialization; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.segment.ColumnSelectorFactory; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; diff --git a/extensions-contrib/virtual-columns/pom.xml b/extensions-contrib/virtual-columns/pom.xml index b2a585d24ded..6b6cfda9cc3f 100644 --- a/extensions-contrib/virtual-columns/pom.xml +++ b/extensions-contrib/virtual-columns/pom.xml @@ -21,13 +21,13 @@ 4.0.0 - io.druid.extensions.contrib + org.apache.druid.extensions.contrib druid-virtual-columns druid-virtual-columns druid-virtual-columns - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT ../../pom.xml @@ -35,19 +35,19 @@ - io.druid + org.apache.druid druid-api ${project.parent.version} provided - io.druid + org.apache.druid druid-common ${project.parent.version} provided - io.druid + org.apache.druid druid-processing ${project.parent.version} provided @@ -65,7 +65,7 @@ test - io.druid + org.apache.druid druid-processing ${project.parent.version} test-jar diff --git a/extensions-contrib/virtual-columns/src/main/java/io/druid/segment/DruidVirtualColumnsModule.java b/extensions-contrib/virtual-columns/src/main/java/org/apache/druid/segment/DruidVirtualColumnsModule.java similarity index 94% rename from extensions-contrib/virtual-columns/src/main/java/io/druid/segment/DruidVirtualColumnsModule.java rename to extensions-contrib/virtual-columns/src/main/java/org/apache/druid/segment/DruidVirtualColumnsModule.java index 1bd44ecc33dd..803387ec3237 100644 --- a/extensions-contrib/virtual-columns/src/main/java/io/druid/segment/DruidVirtualColumnsModule.java +++ b/extensions-contrib/virtual-columns/src/main/java/org/apache/druid/segment/DruidVirtualColumnsModule.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.common.collect.ImmutableList; import com.google.inject.Binder; -import io.druid.initialization.DruidModule; +import org.apache.druid.initialization.DruidModule; import java.util.List; diff --git a/extensions-contrib/virtual-columns/src/main/java/io/druid/segment/MapVirtualColumn.java b/extensions-contrib/virtual-columns/src/main/java/org/apache/druid/segment/MapVirtualColumn.java similarity index 92% rename from extensions-contrib/virtual-columns/src/main/java/io/druid/segment/MapVirtualColumn.java rename to extensions-contrib/virtual-columns/src/main/java/org/apache/druid/segment/MapVirtualColumn.java index 2b9bd99dd9e2..fdded43b053c 100644 --- a/extensions-contrib/virtual-columns/src/main/java/io/druid/segment/MapVirtualColumn.java +++ b/extensions-contrib/virtual-columns/src/main/java/org/apache/druid/segment/MapVirtualColumn.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.StringUtils; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.filter.DimFilterUtils; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.column.ColumnCapabilitiesImpl; -import io.druid.segment.column.ValueType; -import io.druid.segment.data.IndexedInts; -import io.druid.segment.virtual.VirtualColumnCacheHelper; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.filter.DimFilterUtils; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.column.ColumnCapabilitiesImpl; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.data.IndexedInts; +import org.apache.druid.segment.virtual.VirtualColumnCacheHelper; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/extensions-contrib/virtual-columns/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-contrib/virtual-columns/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index a8fa39b166a7..000000000000 --- a/extensions-contrib/virtual-columns/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.segment.DruidVirtualColumnsModule \ No newline at end of file diff --git a/extensions-contrib/virtual-columns/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-contrib/virtual-columns/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..a268c7b1aa37 --- /dev/null +++ b/extensions-contrib/virtual-columns/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.segment.DruidVirtualColumnsModule \ No newline at end of file diff --git a/extensions-contrib/virtual-columns/src/test/java/io/druid/segment/MapVirtualColumnTest.java b/extensions-contrib/virtual-columns/src/test/java/org/apache/druid/segment/MapVirtualColumnTest.java similarity index 85% rename from extensions-contrib/virtual-columns/src/test/java/io/druid/segment/MapVirtualColumnTest.java rename to extensions-contrib/virtual-columns/src/test/java/org/apache/druid/segment/MapVirtualColumnTest.java index 05c20e182637..7f7c43892996 100644 --- a/extensions-contrib/virtual-columns/src/test/java/io/druid/segment/MapVirtualColumnTest.java +++ b/extensions-contrib/virtual-columns/src/test/java/org/apache/druid/segment/MapVirtualColumnTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Supplier; @@ -25,27 +25,27 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.common.io.CharSource; -import io.druid.data.input.impl.DelimitedParseSpec; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.query.Druids; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.Result; -import io.druid.query.select.EventHolder; -import io.druid.query.select.PagingSpec; -import io.druid.query.select.SelectQuery; -import io.druid.query.select.SelectQueryConfig; -import io.druid.query.select.SelectQueryEngine; -import io.druid.query.select.SelectQueryQueryToolChest; -import io.druid.query.select.SelectQueryRunnerFactory; -import io.druid.query.select.SelectResultValue; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.data.input.impl.DelimitedParseSpec; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.query.Druids; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.Result; +import org.apache.druid.query.select.EventHolder; +import org.apache.druid.query.select.PagingSpec; +import org.apache.druid.query.select.SelectQuery; +import org.apache.druid.query.select.SelectQueryConfig; +import org.apache.druid.query.select.SelectQueryEngine; +import org.apache.druid.query.select.SelectQueryQueryToolChest; +import org.apache.druid.query.select.SelectQueryRunnerFactory; +import org.apache.druid.query.select.SelectResultValue; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/extensions-core/avro-extensions/pom.xml b/extensions-core/avro-extensions/pom.xml index d746f20d97bd..434c702ca171 100644 --- a/extensions-core/avro-extensions/pom.xml +++ b/extensions-core/avro-extensions/pom.xml @@ -22,13 +22,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - io.druid.extensions + org.apache.druid.extensions druid-avro-extensions druid-avro-extensions druid-avro-extensions - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT ../../pom.xml @@ -61,7 +61,7 @@ ${avro.version} - io.druid + org.apache.druid druid-api ${project.parent.version} provided @@ -146,7 +146,7 @@ - io.druid + org.apache.druid druid-processing ${project.parent.version} test diff --git a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/AvroHadoopInputRowParser.java b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/AvroHadoopInputRowParser.java similarity index 88% rename from extensions-core/avro-extensions/src/main/java/io/druid/data/input/AvroHadoopInputRowParser.java rename to extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/AvroHadoopInputRowParser.java index 6faf564e9529..4fb26031549d 100644 --- a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/AvroHadoopInputRowParser.java +++ b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/AvroHadoopInputRowParser.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * 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.data.input.avro.AvroParsers; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.ParseSpec; -import io.druid.java.util.common.parsers.ObjectFlattener; +import org.apache.druid.data.input.avro.AvroParsers; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.ParseSpec; +import org.apache.druid.java.util.common.parsers.ObjectFlattener; import org.apache.avro.generic.GenericRecord; import java.util.List; diff --git a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/AvroStreamInputRowParser.java b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/AvroStreamInputRowParser.java similarity index 91% rename from extensions-core/avro-extensions/src/main/java/io/druid/data/input/AvroStreamInputRowParser.java rename to extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/AvroStreamInputRowParser.java index 05e49826e8e8..90dbe95ec44d 100644 --- a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/AvroStreamInputRowParser.java +++ b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/AvroStreamInputRowParser.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * 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 com.google.common.base.Preconditions; -import io.druid.data.input.avro.AvroBytesDecoder; -import io.druid.data.input.avro.AvroParsers; -import io.druid.data.input.impl.ParseSpec; -import io.druid.java.util.common.parsers.ObjectFlattener; +import org.apache.druid.data.input.avro.AvroBytesDecoder; +import org.apache.druid.data.input.avro.AvroParsers; +import org.apache.druid.data.input.impl.ParseSpec; +import org.apache.druid.java.util.common.parsers.ObjectFlattener; import org.apache.avro.generic.GenericRecord; import java.nio.ByteBuffer; diff --git a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/AvroBytesDecoder.java b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroBytesDecoder.java similarity index 97% rename from extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/AvroBytesDecoder.java rename to extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroBytesDecoder.java index f5651e630a74..cbb6ecdca20e 100644 --- a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/AvroBytesDecoder.java +++ b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroBytesDecoder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.data.input.avro; +package org.apache.druid.data.input.avro; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/AvroExtensionsModule.java b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroExtensionsModule.java similarity index 91% rename from extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/AvroExtensionsModule.java rename to extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroExtensionsModule.java index 99d799ff1f4b..ba14cf89059d 100644 --- a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/AvroExtensionsModule.java +++ b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroExtensionsModule.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.data.input.avro; +package org.apache.druid.data.input.avro; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -26,10 +26,10 @@ import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.inject.Binder; -import io.druid.data.input.AvroHadoopInputRowParser; -import io.druid.data.input.AvroStreamInputRowParser; -import io.druid.data.input.schemarepo.Avro1124RESTRepositoryClientWrapper; -import io.druid.initialization.DruidModule; +import org.apache.druid.data.input.AvroHadoopInputRowParser; +import org.apache.druid.data.input.AvroStreamInputRowParser; +import org.apache.druid.data.input.schemarepo.Avro1124RESTRepositoryClientWrapper; +import org.apache.druid.initialization.DruidModule; import org.schemarepo.InMemoryRepository; import org.schemarepo.Repository; import org.schemarepo.ValidatorFactory; diff --git a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/AvroFlattenerMaker.java b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroFlattenerMaker.java similarity index 95% rename from extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/AvroFlattenerMaker.java rename to extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroFlattenerMaker.java index 12d5bf1cdf18..c2261f5dd896 100644 --- a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/AvroFlattenerMaker.java +++ b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroFlattenerMaker.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.data.input.avro; +package org.apache.druid.data.input.avro; import com.google.common.collect.Lists; import com.jayway.jsonpath.Configuration; import com.jayway.jsonpath.JsonPath; import com.jayway.jsonpath.Option; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.parsers.ObjectFlatteners; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.parsers.ObjectFlatteners; import org.apache.avro.Schema; import org.apache.avro.generic.GenericData; import org.apache.avro.generic.GenericRecord; diff --git a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/AvroParseSpec.java b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroParseSpec.java similarity index 89% rename from extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/AvroParseSpec.java rename to extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroParseSpec.java index b1b538bfdb4e..03dd1703d9bb 100644 --- a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/AvroParseSpec.java +++ b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroParseSpec.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.data.input.avro; +package org.apache.druid.data.input.avro; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.ParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.parsers.JSONPathSpec; -import io.druid.java.util.common.parsers.Parser; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.ParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.parsers.JSONPathSpec; +import org.apache.druid.java.util.common.parsers.Parser; import java.util.Objects; diff --git a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/AvroParsers.java b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroParsers.java similarity index 81% rename from extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/AvroParsers.java rename to extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroParsers.java index cea19b018b53..cc37efb886f5 100644 --- a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/AvroParsers.java +++ b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroParsers.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.data.input.avro; +package org.apache.druid.data.input.avro; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.MapInputRowParser; -import io.druid.data.input.impl.ParseSpec; -import io.druid.java.util.common.parsers.JSONPathSpec; -import io.druid.java.util.common.parsers.ObjectFlattener; -import io.druid.java.util.common.parsers.ObjectFlatteners; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.MapInputRowParser; +import org.apache.druid.data.input.impl.ParseSpec; +import org.apache.druid.java.util.common.parsers.JSONPathSpec; +import org.apache.druid.java.util.common.parsers.ObjectFlattener; +import org.apache.druid.java.util.common.parsers.ObjectFlatteners; import org.apache.avro.generic.GenericRecord; import java.util.List; diff --git a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/AvroValueInputFormat.java b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroValueInputFormat.java similarity index 96% rename from extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/AvroValueInputFormat.java rename to extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroValueInputFormat.java index 18ae5cb5c945..e0d5af3e843f 100644 --- a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/AvroValueInputFormat.java +++ b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroValueInputFormat.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.data.input.avro; +package org.apache.druid.data.input.avro; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.logger.Logger; import org.apache.avro.Schema; import org.apache.avro.generic.GenericRecord; import org.apache.avro.mapreduce.AvroJob; diff --git a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/AvroValueRecordReader.java b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroValueRecordReader.java similarity index 97% rename from extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/AvroValueRecordReader.java rename to extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroValueRecordReader.java index 4c8c169d6621..2b5090370a1a 100644 --- a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/AvroValueRecordReader.java +++ b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroValueRecordReader.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.data.input.avro; +package org.apache.druid.data.input.avro; import org.apache.avro.Schema; import org.apache.avro.generic.GenericRecord; diff --git a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/GenericAvroJsonProvider.java b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/GenericAvroJsonProvider.java similarity index 99% rename from extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/GenericAvroJsonProvider.java rename to extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/GenericAvroJsonProvider.java index 3cb57fbb5a27..eb41632fee88 100644 --- a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/GenericAvroJsonProvider.java +++ b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/GenericAvroJsonProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.data.input.avro; +package org.apache.druid.data.input.avro; import com.jayway.jsonpath.InvalidJsonException; import com.jayway.jsonpath.spi.json.JsonProvider; diff --git a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/GenericAvroMappingProvider.java b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/GenericAvroMappingProvider.java similarity index 97% rename from extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/GenericAvroMappingProvider.java rename to extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/GenericAvroMappingProvider.java index bfde540f0c05..a1d50c2d3a90 100644 --- a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/GenericAvroMappingProvider.java +++ b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/GenericAvroMappingProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.data.input.avro; +package org.apache.druid.data.input.avro; import com.jayway.jsonpath.Configuration; import com.jayway.jsonpath.TypeRef; diff --git a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/InlineSchemaAvroBytesDecoder.java b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/InlineSchemaAvroBytesDecoder.java similarity index 93% rename from extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/InlineSchemaAvroBytesDecoder.java rename to extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/InlineSchemaAvroBytesDecoder.java index bf5693cb6d03..c8256785f426 100644 --- a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/InlineSchemaAvroBytesDecoder.java +++ b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/InlineSchemaAvroBytesDecoder.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.data.input.avro; +package org.apache.druid.data.input.avro; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; @@ -25,9 +25,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; -import io.druid.guice.annotations.Json; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.common.parsers.ParseException; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.parsers.ParseException; import org.apache.avro.Schema; import org.apache.avro.generic.GenericDatumReader; import org.apache.avro.generic.GenericRecord; diff --git a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/InlineSchemasAvroBytesDecoder.java b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/InlineSchemasAvroBytesDecoder.java similarity index 95% rename from extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/InlineSchemasAvroBytesDecoder.java rename to extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/InlineSchemasAvroBytesDecoder.java index 799320bc9a6b..6cee9feb12b1 100644 --- a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/InlineSchemasAvroBytesDecoder.java +++ b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/InlineSchemasAvroBytesDecoder.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.data.input.avro; +package org.apache.druid.data.input.avro; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; @@ -25,9 +25,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; -import io.druid.guice.annotations.Json; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.common.parsers.ParseException; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.parsers.ParseException; import org.apache.avro.Schema; import org.apache.avro.generic.GenericDatumReader; import org.apache.avro.generic.GenericRecord; diff --git a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/SchemaRegistryBasedAvroBytesDecoder.java b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/SchemaRegistryBasedAvroBytesDecoder.java similarity index 96% rename from extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/SchemaRegistryBasedAvroBytesDecoder.java rename to extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/SchemaRegistryBasedAvroBytesDecoder.java index 541262f846b3..0c29aaf6e2c5 100644 --- a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/SchemaRegistryBasedAvroBytesDecoder.java +++ b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/SchemaRegistryBasedAvroBytesDecoder.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.data.input.avro; +package org.apache.druid.data.input.avro; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.annotations.VisibleForTesting; import io.confluent.kafka.schemaregistry.client.CachedSchemaRegistryClient; import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient; -import io.druid.java.util.common.parsers.ParseException; +import org.apache.druid.java.util.common.parsers.ParseException; import org.apache.avro.Schema; import org.apache.avro.generic.GenericDatumReader; import org.apache.avro.generic.GenericRecord; diff --git a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/SchemaRepoBasedAvroBytesDecoder.java b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/SchemaRepoBasedAvroBytesDecoder.java similarity index 94% rename from extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/SchemaRepoBasedAvroBytesDecoder.java rename to extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/SchemaRepoBasedAvroBytesDecoder.java index 44cc5d9bb861..bfaaebc617e7 100644 --- a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/avro/SchemaRepoBasedAvroBytesDecoder.java +++ b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/SchemaRepoBasedAvroBytesDecoder.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.data.input.avro; +package org.apache.druid.data.input.avro; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.data.input.schemarepo.SubjectAndIdConverter; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.parsers.ParseException; +import org.apache.druid.data.input.schemarepo.SubjectAndIdConverter; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.parsers.ParseException; import org.apache.avro.Schema; import org.apache.avro.generic.GenericDatumReader; import org.apache.avro.generic.GenericRecord; diff --git a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/schemarepo/Avro1124RESTRepositoryClientWrapper.java b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/schemarepo/Avro1124RESTRepositoryClientWrapper.java similarity index 97% rename from extensions-core/avro-extensions/src/main/java/io/druid/data/input/schemarepo/Avro1124RESTRepositoryClientWrapper.java rename to extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/schemarepo/Avro1124RESTRepositoryClientWrapper.java index 258389f26e7a..d3f32f277a5c 100644 --- a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/schemarepo/Avro1124RESTRepositoryClientWrapper.java +++ b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/schemarepo/Avro1124RESTRepositoryClientWrapper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.data.input.schemarepo; +package org.apache.druid.data.input.schemarepo; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/schemarepo/Avro1124SubjectAndIdConverter.java b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/schemarepo/Avro1124SubjectAndIdConverter.java similarity index 96% rename from extensions-core/avro-extensions/src/main/java/io/druid/data/input/schemarepo/Avro1124SubjectAndIdConverter.java rename to extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/schemarepo/Avro1124SubjectAndIdConverter.java index 5e81b7bf88f8..a18e6690fce1 100644 --- a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/schemarepo/Avro1124SubjectAndIdConverter.java +++ b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/schemarepo/Avro1124SubjectAndIdConverter.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.data.input.schemarepo; +package org.apache.druid.data.input.schemarepo; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.Pair; import org.schemarepo.api.converter.Converter; import org.schemarepo.api.converter.IdentityConverter; import org.schemarepo.api.converter.IntegerConverter; diff --git a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/schemarepo/SubjectAndIdConverter.java b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/schemarepo/SubjectAndIdConverter.java similarity index 96% rename from extensions-core/avro-extensions/src/main/java/io/druid/data/input/schemarepo/SubjectAndIdConverter.java rename to extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/schemarepo/SubjectAndIdConverter.java index c22829d312f9..9e0751733c8f 100644 --- a/extensions-core/avro-extensions/src/main/java/io/druid/data/input/schemarepo/SubjectAndIdConverter.java +++ b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/schemarepo/SubjectAndIdConverter.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.data.input.schemarepo; +package org.apache.druid.data.input.schemarepo; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.Pair; import org.schemarepo.api.converter.Converter; import java.nio.ByteBuffer; diff --git a/extensions-core/avro-extensions/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-core/avro-extensions/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index 050a1dd0727b..000000000000 --- a/extensions-core/avro-extensions/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.data.input.avro.AvroExtensionsModule diff --git a/extensions-core/avro-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-core/avro-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..57062c80c52d --- /dev/null +++ b/extensions-core/avro-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.data.input.avro.AvroExtensionsModule diff --git a/extensions-core/avro-extensions/src/test/avro/some-datum.avsc b/extensions-core/avro-extensions/src/test/avro/some-datum.avsc index 773313ae15ae..dca6ca45ff0c 100644 --- a/extensions-core/avro-extensions/src/test/avro/some-datum.avsc +++ b/extensions-core/avro-extensions/src/test/avro/some-datum.avsc @@ -1,5 +1,5 @@ [{ - "namespace": "io.druid.data.input", + "namespace": "org.apache.druid.data.input", "name": "SomeAvroDatum", "type": "record", "fields" : [ diff --git a/extensions-core/avro-extensions/src/test/java/io/druid/data/input/AvroHadoopInputRowParserTest.java b/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/AvroHadoopInputRowParserTest.java similarity index 90% rename from extensions-core/avro-extensions/src/test/java/io/druid/data/input/AvroHadoopInputRowParserTest.java rename to extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/AvroHadoopInputRowParserTest.java index 41814ba2e1eb..250c24b22aac 100644 --- a/extensions-core/avro-extensions/src/test/java/io/druid/data/input/AvroHadoopInputRowParserTest.java +++ b/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/AvroHadoopInputRowParserTest.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.data.input; +package org.apache.druid.data.input; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.io.Closeables; import com.google.common.io.Files; -import io.druid.data.input.avro.AvroExtensionsModule; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.data.input.avro.AvroExtensionsModule; +import org.apache.druid.java.util.common.StringUtils; import org.apache.avro.file.DataFileReader; import org.apache.avro.file.DataFileWriter; import org.apache.avro.file.FileReader; @@ -40,10 +40,10 @@ import java.io.File; import java.io.IOException; -import static io.druid.data.input.AvroStreamInputRowParserTest.DIMENSIONS; -import static io.druid.data.input.AvroStreamInputRowParserTest.PARSE_SPEC; -import static io.druid.data.input.AvroStreamInputRowParserTest.assertInputRowCorrect; -import static io.druid.data.input.AvroStreamInputRowParserTest.buildSomeAvroDatum; +import static org.apache.druid.data.input.AvroStreamInputRowParserTest.DIMENSIONS; +import static org.apache.druid.data.input.AvroStreamInputRowParserTest.PARSE_SPEC; +import static org.apache.druid.data.input.AvroStreamInputRowParserTest.assertInputRowCorrect; +import static org.apache.druid.data.input.AvroStreamInputRowParserTest.buildSomeAvroDatum; public class AvroHadoopInputRowParserTest { diff --git a/extensions-core/avro-extensions/src/test/java/io/druid/data/input/AvroStreamInputRowParserTest.java b/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/AvroStreamInputRowParserTest.java similarity index 95% rename from extensions-core/avro-extensions/src/test/java/io/druid/data/input/AvroStreamInputRowParserTest.java rename to extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/AvroStreamInputRowParserTest.java index 2cc80265835d..79834ca18c14 100644 --- a/extensions-core/avro-extensions/src/test/java/io/druid/data/input/AvroStreamInputRowParserTest.java +++ b/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/AvroStreamInputRowParserTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.data.input; +package org.apache.druid.data.input; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.Module; @@ -27,16 +27,16 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.data.input.avro.AvroExtensionsModule; -import io.druid.data.input.avro.AvroParseSpec; -import io.druid.data.input.avro.SchemaRepoBasedAvroBytesDecoder; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.data.input.schemarepo.Avro1124RESTRepositoryClientWrapper; -import io.druid.data.input.schemarepo.Avro1124SubjectAndIdConverter; -import io.druid.java.util.common.parsers.JSONPathFieldSpec; -import io.druid.java.util.common.parsers.JSONPathFieldType; -import io.druid.java.util.common.parsers.JSONPathSpec; +import org.apache.druid.data.input.avro.AvroExtensionsModule; +import org.apache.druid.data.input.avro.AvroParseSpec; +import org.apache.druid.data.input.avro.SchemaRepoBasedAvroBytesDecoder; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.data.input.schemarepo.Avro1124RESTRepositoryClientWrapper; +import org.apache.druid.data.input.schemarepo.Avro1124SubjectAndIdConverter; +import org.apache.druid.java.util.common.parsers.JSONPathFieldSpec; +import org.apache.druid.java.util.common.parsers.JSONPathFieldType; +import org.apache.druid.java.util.common.parsers.JSONPathSpec; import org.apache.avro.Schema; import org.apache.avro.generic.GenericRecord; import org.apache.avro.io.DatumWriter; diff --git a/extensions-core/avro-extensions/src/test/java/io/druid/data/input/avro/InlineSchemaAvroBytesDecoderTest.java b/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/avro/InlineSchemaAvroBytesDecoderTest.java similarity index 91% rename from extensions-core/avro-extensions/src/test/java/io/druid/data/input/avro/InlineSchemaAvroBytesDecoderTest.java rename to extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/avro/InlineSchemaAvroBytesDecoderTest.java index e193e92296bc..c334946b2988 100644 --- a/extensions-core/avro-extensions/src/test/java/io/druid/data/input/avro/InlineSchemaAvroBytesDecoderTest.java +++ b/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/avro/InlineSchemaAvroBytesDecoderTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.data.input.avro; +package org.apache.druid.data.input.avro; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.data.input.AvroStreamInputRowParserTest; -import io.druid.data.input.SomeAvroDatum; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.data.input.AvroStreamInputRowParserTest; +import org.apache.druid.data.input.SomeAvroDatum; +import org.apache.druid.jackson.DefaultObjectMapper; import org.apache.avro.Schema; import org.apache.avro.generic.GenericRecord; import org.apache.avro.io.DatumWriter; @@ -45,7 +45,7 @@ public void testSerde() throws Exception String jsonStr = "{\n" + " \"type\": \"schema_inline\",\n" + " \"schema\": {\n" - + " \"namespace\": \"io.druid.data.input\",\n" + + " \"namespace\": \"org.apache.druid.data.input\",\n" + " \"name\": \"SomeData\",\n" + " \"type\": \"record\",\n" + " \"fields\" : [\n" diff --git a/extensions-core/avro-extensions/src/test/java/io/druid/data/input/avro/InlineSchemasAvroBytesDecoderTest.java b/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/avro/InlineSchemasAvroBytesDecoderTest.java similarity index 91% rename from extensions-core/avro-extensions/src/test/java/io/druid/data/input/avro/InlineSchemasAvroBytesDecoderTest.java rename to extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/avro/InlineSchemasAvroBytesDecoderTest.java index fc0d091440f9..808f42fd770b 100644 --- a/extensions-core/avro-extensions/src/test/java/io/druid/data/input/avro/InlineSchemasAvroBytesDecoderTest.java +++ b/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/avro/InlineSchemasAvroBytesDecoderTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.data.input.avro; +package org.apache.druid.data.input.avro; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import io.druid.data.input.AvroStreamInputRowParserTest; -import io.druid.data.input.SomeAvroDatum; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.data.input.AvroStreamInputRowParserTest; +import org.apache.druid.data.input.SomeAvroDatum; +import org.apache.druid.jackson.DefaultObjectMapper; import org.apache.avro.Schema; import org.apache.avro.generic.GenericRecord; import org.apache.avro.io.DatumWriter; @@ -47,7 +47,7 @@ public void testSerde() throws Exception + " \"type\": \"multiple_schemas_inline\",\n" + " \"schemas\": {\n" + " \"5\": {\n" - + " \"namespace\": \"io.druid.data.input\",\n" + + " \"namespace\": \"org.apache.druid.data.input\",\n" + " \"name\": \"name5\",\n" + " \"type\": \"record\",\n" + " \"fields\" : [\n" @@ -56,7 +56,7 @@ public void testSerde() throws Exception + " ]\n" + " },\n" + " \"8\": {\n" - + " \"namespace\": \"io.druid.data.input\",\n" + + " \"namespace\": \"org.apache.druid.data.input\",\n" + " \"name\": \"name8\",\n" + " \"type\": \"record\",\n" + " \"fields\" : [\n" diff --git a/extensions-core/avro-extensions/src/test/java/io/druid/data/input/avro/SchemaRegistryBasedAvroBytesDecoderTest.java b/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/avro/SchemaRegistryBasedAvroBytesDecoderTest.java similarity index 94% rename from extensions-core/avro-extensions/src/test/java/io/druid/data/input/avro/SchemaRegistryBasedAvroBytesDecoderTest.java rename to extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/avro/SchemaRegistryBasedAvroBytesDecoderTest.java index 6fa1102c1326..8eaf793a586a 100644 --- a/extensions-core/avro-extensions/src/test/java/io/druid/data/input/avro/SchemaRegistryBasedAvroBytesDecoderTest.java +++ b/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/avro/SchemaRegistryBasedAvroBytesDecoderTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.data.input.avro; +package org.apache.druid.data.input.avro; import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient; -import io.druid.data.input.AvroStreamInputRowParserTest; -import io.druid.data.input.SomeAvroDatum; -import io.druid.java.util.common.parsers.ParseException; +import org.apache.druid.data.input.AvroStreamInputRowParserTest; +import org.apache.druid.data.input.SomeAvroDatum; +import org.apache.druid.java.util.common.parsers.ParseException; import org.apache.avro.Schema; import org.apache.avro.generic.GenericRecord; import org.apache.avro.io.DatumWriter; diff --git a/extensions-core/datasketches/pom.xml b/extensions-core/datasketches/pom.xml index ea2839de23c7..c4bd1ab05793 100644 --- a/extensions-core/datasketches/pom.xml +++ b/extensions-core/datasketches/pom.xml @@ -22,13 +22,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - io.druid.extensions + org.apache.druid.extensions druid-datasketches druid-datasketches Druid Aggregators based on datasketches lib http://datasketches.github.io/ - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT ../../pom.xml @@ -45,13 +45,13 @@ commons-math3 - io.druid + org.apache.druid druid-api ${project.parent.version} provided - io.druid + org.apache.druid druid-processing ${project.parent.version} provided @@ -118,14 +118,14 @@ test - io.druid + org.apache.druid druid-common ${project.parent.version} test-jar test - io.druid + org.apache.druid druid-processing ${project.parent.version} test-jar diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchAggregatorFactory.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchAggregatorFactory.java similarity index 91% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchAggregatorFactory.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchAggregatorFactory.java index e214a448bdfc..331cd1bb3945 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchAggregatorFactory.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchAggregatorFactory.java @@ -17,25 +17,25 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.quantiles; +package org.apache.druid.query.aggregation.datasketches.quantiles; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.IAE; import com.yahoo.sketches.Util; import com.yahoo.sketches.quantiles.DoublesSketch; import com.yahoo.sketches.quantiles.DoublesUnion; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.AggregatorFactoryNotMergeableException; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.cache.CacheKeyBuilder; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.NilColumnValueSelector; -import io.druid.segment.column.ValueType; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorFactoryNotMergeableException; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.NilColumnValueSelector; +import org.apache.druid.segment.column.ValueType; import java.util.Collections; import java.util.Comparator; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchBuildAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchBuildAggregator.java similarity index 91% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchBuildAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchBuildAggregator.java index 412b276fa18c..2f28e5dcf4fa 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchBuildAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchBuildAggregator.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.quantiles; +package org.apache.druid.query.aggregation.datasketches.quantiles; import com.yahoo.sketches.quantiles.UpdateDoublesSketch; -import io.druid.query.aggregation.Aggregator; -import io.druid.segment.ColumnValueSelector; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.segment.ColumnValueSelector; public class DoublesSketchBuildAggregator implements Aggregator { diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchBuildBufferAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchBuildBufferAggregator.java similarity index 94% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchBuildBufferAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchBuildBufferAggregator.java index 22d60918d734..27b117884e80 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchBuildBufferAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchBuildBufferAggregator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.quantiles; +package org.apache.druid.query.aggregation.datasketches.quantiles; import java.nio.ByteBuffer; import java.util.IdentityHashMap; @@ -25,9 +25,9 @@ import com.yahoo.memory.WritableMemory; import com.yahoo.sketches.quantiles.UpdateDoublesSketch; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnValueSelector; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnValueSelector; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchComplexMetricSerde.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchComplexMetricSerde.java similarity index 84% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchComplexMetricSerde.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchComplexMetricSerde.java index d5bfedd3fb9d..801cf5ba420d 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchComplexMetricSerde.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchComplexMetricSerde.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.quantiles; +package org.apache.druid.query.aggregation.datasketches.quantiles; import com.yahoo.memory.Memory; import com.yahoo.sketches.quantiles.DoublesSketch; import com.yahoo.sketches.quantiles.UpdateDoublesSketch; -import io.druid.data.input.InputRow; -import io.druid.java.util.common.IAE; -import io.druid.segment.GenericColumnSerializer; -import io.druid.segment.column.ColumnBuilder; -import io.druid.segment.data.GenericIndexed; -import io.druid.segment.data.ObjectStrategy; -import io.druid.segment.serde.ComplexColumnPartSupplier; -import io.druid.segment.serde.ComplexMetricExtractor; -import io.druid.segment.serde.ComplexMetricSerde; -import io.druid.segment.serde.LargeColumnSupportedComplexColumnSerializer; -import io.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.segment.GenericColumnSerializer; +import org.apache.druid.segment.column.ColumnBuilder; +import org.apache.druid.segment.data.GenericIndexed; +import org.apache.druid.segment.data.ObjectStrategy; +import org.apache.druid.segment.serde.ComplexColumnPartSupplier; +import org.apache.druid.segment.serde.ComplexMetricExtractor; +import org.apache.druid.segment.serde.ComplexMetricSerde; +import org.apache.druid.segment.serde.LargeColumnSupportedComplexColumnSerializer; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; import java.nio.ByteBuffer; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchJsonSerializer.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchJsonSerializer.java similarity index 95% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchJsonSerializer.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchJsonSerializer.java index 1fa4a11e9fa0..bfb4b2629b7c 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchJsonSerializer.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchJsonSerializer.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.quantiles; +package org.apache.druid.query.aggregation.datasketches.quantiles; import java.io.IOException; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchMergeAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchMergeAggregator.java similarity index 91% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchMergeAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchMergeAggregator.java index e861373b1bab..d4e5b95544a8 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchMergeAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchMergeAggregator.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.quantiles; +package org.apache.druid.query.aggregation.datasketches.quantiles; import com.yahoo.sketches.quantiles.DoublesSketch; import com.yahoo.sketches.quantiles.DoublesUnion; -import io.druid.query.aggregation.Aggregator; -import io.druid.segment.ColumnValueSelector; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.segment.ColumnValueSelector; public class DoublesSketchMergeAggregator implements Aggregator { diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchMergeAggregatorFactory.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchMergeAggregatorFactory.java similarity index 84% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchMergeAggregatorFactory.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchMergeAggregatorFactory.java index 2ecc9907d589..23c10b1a90e8 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchMergeAggregatorFactory.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchMergeAggregatorFactory.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.quantiles; +package org.apache.druid.query.aggregation.datasketches.quantiles; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.yahoo.sketches.quantiles.DoublesSketch; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.NilColumnValueSelector; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.NilColumnValueSelector; public class DoublesSketchMergeAggregatorFactory extends DoublesSketchAggregatorFactory { diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchMergeBufferAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchMergeBufferAggregator.java similarity index 94% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchMergeBufferAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchMergeBufferAggregator.java index fd1da84c861c..0b99b579733a 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchMergeBufferAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchMergeBufferAggregator.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.quantiles; +package org.apache.druid.query.aggregation.datasketches.quantiles; import com.yahoo.memory.WritableMemory; import com.yahoo.sketches.quantiles.DoublesSketch; import com.yahoo.sketches.quantiles.DoublesUnion; import com.yahoo.sketches.quantiles.DoublesUnionBuilder; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnValueSelector; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnValueSelector; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchModule.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchModule.java similarity index 94% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchModule.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchModule.java index 2bf65ea2a4ca..a3ad89e3edca 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchModule.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchModule.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.quantiles; +package org.apache.druid.query.aggregation.datasketches.quantiles; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.inject.Binder; import com.yahoo.sketches.quantiles.DoublesSketch; -import io.druid.initialization.DruidModule; -import io.druid.segment.serde.ComplexMetrics; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.segment.serde.ComplexMetrics; import java.util.Collections; import java.util.List; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchNoOpAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchNoOpAggregator.java similarity index 91% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchNoOpAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchNoOpAggregator.java index 827af82a8fa0..c2bc118462c5 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchNoOpAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchNoOpAggregator.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.quantiles; +package org.apache.druid.query.aggregation.datasketches.quantiles; -import io.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.Aggregator; public class DoublesSketchNoOpAggregator implements Aggregator { diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchNoOpBufferAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchNoOpBufferAggregator.java similarity index 89% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchNoOpBufferAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchNoOpBufferAggregator.java index 01a587a0212a..5f0eb9f29379 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchNoOpBufferAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchNoOpBufferAggregator.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.quantiles; +package org.apache.druid.query.aggregation.datasketches.quantiles; import java.nio.ByteBuffer; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; public class DoublesSketchNoOpBufferAggregator implements BufferAggregator { diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchObjectStrategy.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchObjectStrategy.java similarity index 93% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchObjectStrategy.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchObjectStrategy.java index 9e2af155a98f..0b2ee3eccab1 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchObjectStrategy.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchObjectStrategy.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.quantiles; +package org.apache.druid.query.aggregation.datasketches.quantiles; import java.nio.ByteBuffer; import com.yahoo.memory.Memory; import com.yahoo.sketches.quantiles.DoublesSketch; -import io.druid.segment.data.ObjectStrategy; +import org.apache.druid.segment.data.ObjectStrategy; public class DoublesSketchObjectStrategy implements ObjectStrategy { diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchOperations.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchOperations.java similarity index 94% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchOperations.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchOperations.java index 3366dacaa583..34d508ec21ab 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchOperations.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchOperations.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.quantiles; +package org.apache.druid.query.aggregation.datasketches.quantiles; import com.yahoo.memory.Memory; import com.yahoo.sketches.quantiles.DoublesSketch; -import io.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.ISE; import org.apache.commons.codec.binary.Base64; import java.nio.charset.StandardCharsets; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchToHistogramPostAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchToHistogramPostAggregator.java similarity index 91% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchToHistogramPostAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchToHistogramPostAggregator.java index 3579ceded33e..2ec10b595f77 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchToHistogramPostAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchToHistogramPostAggregator.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.quantiles; +package org.apache.druid.query.aggregation.datasketches.quantiles; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.yahoo.sketches.quantiles.DoublesSketch; -import io.druid.java.util.common.IAE; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.cache.CacheKeyBuilder; import java.util.Arrays; import java.util.Comparator; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchToQuantilePostAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchToQuantilePostAggregator.java similarity index 92% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchToQuantilePostAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchToQuantilePostAggregator.java index 9925ee53c2df..97edd4c46869 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchToQuantilePostAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchToQuantilePostAggregator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.quantiles; +package org.apache.druid.query.aggregation.datasketches.quantiles; import java.util.Comparator; import java.util.Map; @@ -28,10 +28,10 @@ import com.google.common.base.Preconditions; import com.google.common.primitives.Doubles; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.cache.CacheKeyBuilder; import com.yahoo.sketches.quantiles.DoublesSketch; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchToQuantilesPostAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchToQuantilesPostAggregator.java similarity index 91% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchToQuantilesPostAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchToQuantilesPostAggregator.java index a20b026acb0c..60a7064011f0 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchToQuantilesPostAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchToQuantilesPostAggregator.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.quantiles; +package org.apache.druid.query.aggregation.datasketches.quantiles; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.yahoo.sketches.quantiles.DoublesSketch; -import io.druid.java.util.common.IAE; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.cache.CacheKeyBuilder; import java.util.Arrays; import java.util.Comparator; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchToStringPostAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchToStringPostAggregator.java similarity index 90% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchToStringPostAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchToStringPostAggregator.java index 9f369580447e..6fc8b25fb319 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchToStringPostAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchToStringPostAggregator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.quantiles; +package org.apache.druid.query.aggregation.datasketches.quantiles; import java.util.Comparator; import java.util.Map; @@ -27,11 +27,11 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.java.util.common.IAE; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.cache.CacheKeyBuilder; import com.yahoo.sketches.quantiles.DoublesSketch; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchAggregator.java similarity index 93% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchAggregator.java index 09f33e87f74e..8142eb377868 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchAggregator.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.theta; +package org.apache.druid.query.aggregation.datasketches.theta; import com.yahoo.sketches.Family; import com.yahoo.sketches.theta.SetOperation; import com.yahoo.sketches.theta.Union; -import io.druid.java.util.common.ISE; -import io.druid.query.aggregation.Aggregator; -import io.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.segment.BaseObjectColumnValueSelector; import java.util.List; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchAggregatorFactory.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchAggregatorFactory.java similarity index 90% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchAggregatorFactory.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchAggregatorFactory.java index 2e6bc52e99aa..b01cf207f7fa 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchAggregatorFactory.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchAggregatorFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.theta; +package org.apache.druid.query.aggregation.datasketches.theta; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; @@ -25,15 +25,15 @@ import com.yahoo.sketches.Util; import com.yahoo.sketches.theta.SetOperation; import com.yahoo.sketches.theta.Union; -import io.druid.java.util.common.StringUtils; -import io.druid.query.aggregation.AggregateCombiner; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.ObjectAggregateCombiner; -import io.druid.segment.BaseObjectColumnValueSelector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.aggregation.AggregateCombiner; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.ObjectAggregateCombiner; +import org.apache.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchBufferAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchBufferAggregator.java similarity index 94% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchBufferAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchBufferAggregator.java index fc1a6b33594c..ecb59aaa0073 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchBufferAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchBufferAggregator.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.theta; +package org.apache.druid.query.aggregation.datasketches.theta; import com.yahoo.memory.WritableMemory; import com.yahoo.sketches.Family; import com.yahoo.sketches.theta.SetOperation; import com.yahoo.sketches.theta.Union; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseObjectColumnValueSelector; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchBuildComplexMetricSerde.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchBuildComplexMetricSerde.java similarity index 88% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchBuildComplexMetricSerde.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchBuildComplexMetricSerde.java index db31e2db2df7..ddcc8ef949a0 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchBuildComplexMetricSerde.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchBuildComplexMetricSerde.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.theta; +package org.apache.druid.query.aggregation.datasketches.theta; -import io.druid.data.input.InputRow; -import io.druid.segment.serde.ComplexMetricExtractor; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.segment.serde.ComplexMetricExtractor; /** */ diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchConstantPostAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchConstantPostAggregator.java similarity index 91% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchConstantPostAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchConstantPostAggregator.java index a1e61116db5f..a67ea96a1f48 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchConstantPostAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchConstantPostAggregator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.theta; +package org.apache.druid.query.aggregation.datasketches.theta; import java.util.Collections; import java.util.Comparator; @@ -30,10 +30,10 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.post.PostAggregatorIds; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.post.PostAggregatorIds; +import org.apache.druid.query.cache.CacheKeyBuilder; /** */ diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchEstimatePostAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchEstimatePostAggregator.java similarity index 93% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchEstimatePostAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchEstimatePostAggregator.java index 7bb01881efeb..9b3f148f0ebc 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchEstimatePostAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchEstimatePostAggregator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.theta; +package org.apache.druid.query.aggregation.datasketches.theta; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -25,10 +25,10 @@ import com.google.common.collect.Ordering; import com.google.common.collect.Sets; import com.google.common.primitives.Doubles; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.post.PostAggregatorIds; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.post.PostAggregatorIds; +import org.apache.druid.query.cache.CacheKeyBuilder; import java.util.Comparator; import java.util.Map; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchEstimateWithErrorBounds.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchEstimateWithErrorBounds.java similarity index 97% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchEstimateWithErrorBounds.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchEstimateWithErrorBounds.java index 254289b14678..41cd7c1aa49b 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchEstimateWithErrorBounds.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchEstimateWithErrorBounds.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.query.aggregation.datasketches.theta; +package org.apache.druid.query.aggregation.datasketches.theta; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchHolder.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchHolder.java similarity index 97% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchHolder.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchHolder.java index e72cbfe1c08b..536615854775 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchHolder.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchHolder.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.theta; +package org.apache.druid.query.aggregation.datasketches.theta; import com.google.common.base.Preconditions; import com.google.common.collect.Ordering; @@ -31,9 +31,9 @@ import com.yahoo.sketches.theta.Sketch; import com.yahoo.sketches.theta.Sketches; import com.yahoo.sketches.theta.Union; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; import org.apache.commons.codec.binary.Base64; import java.util.Arrays; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchHolderJsonSerializer.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchHolderJsonSerializer.java similarity index 95% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchHolderJsonSerializer.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchHolderJsonSerializer.java index 8c31720fb045..f88753c02ebc 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchHolderJsonSerializer.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchHolderJsonSerializer.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.theta; +package org.apache.druid.query.aggregation.datasketches.theta; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchMergeAggregatorFactory.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchMergeAggregatorFactory.java similarity index 95% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchMergeAggregatorFactory.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchMergeAggregatorFactory.java index 766b9d622394..4701e8fbf0b9 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchMergeAggregatorFactory.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchMergeAggregatorFactory.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.theta; +package org.apache.druid.query.aggregation.datasketches.theta; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.AggregatorFactoryNotMergeableException; -import io.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorFactoryNotMergeableException; +import org.apache.druid.query.aggregation.AggregatorUtil; import java.util.Collections; import java.util.List; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchMergeComplexMetricSerde.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchMergeComplexMetricSerde.java similarity index 77% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchMergeComplexMetricSerde.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchMergeComplexMetricSerde.java index 3594c853bbed..f53b4f744d9b 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchMergeComplexMetricSerde.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchMergeComplexMetricSerde.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.theta; +package org.apache.druid.query.aggregation.datasketches.theta; import com.yahoo.sketches.theta.Sketch; -import io.druid.data.input.InputRow; -import io.druid.segment.writeout.SegmentWriteOutMedium; -import io.druid.segment.GenericColumnSerializer; -import io.druid.segment.column.ColumnBuilder; -import io.druid.segment.data.GenericIndexed; -import io.druid.segment.data.ObjectStrategy; -import io.druid.segment.serde.ComplexColumnPartSupplier; -import io.druid.segment.serde.ComplexMetricExtractor; -import io.druid.segment.serde.ComplexMetricSerde; -import io.druid.segment.serde.LargeColumnSupportedComplexColumnSerializer; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.segment.GenericColumnSerializer; +import org.apache.druid.segment.column.ColumnBuilder; +import org.apache.druid.segment.data.GenericIndexed; +import org.apache.druid.segment.data.ObjectStrategy; +import org.apache.druid.segment.serde.ComplexColumnPartSupplier; +import org.apache.druid.segment.serde.ComplexMetricExtractor; +import org.apache.druid.segment.serde.ComplexMetricSerde; +import org.apache.druid.segment.serde.LargeColumnSupportedComplexColumnSerializer; import java.nio.ByteBuffer; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchModule.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchModule.java similarity index 94% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchModule.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchModule.java index 2164b48d383a..3bd04b43e033 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchModule.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchModule.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.theta; +package org.apache.druid.query.aggregation.datasketches.theta; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.inject.Binder; -import io.druid.initialization.DruidModule; -import io.druid.segment.serde.ComplexMetrics; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.segment.serde.ComplexMetrics; import java.util.Collections; import java.util.List; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchObjectStrategy.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchObjectStrategy.java similarity index 92% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchObjectStrategy.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchObjectStrategy.java index 79af49218fd0..c8df8cf2ad3b 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchObjectStrategy.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchObjectStrategy.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.theta; +package org.apache.druid.query.aggregation.datasketches.theta; import com.yahoo.memory.Memory; import com.yahoo.sketches.theta.Sketch; -import io.druid.java.util.common.IAE; -import io.druid.segment.data.ObjectStrategy; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.segment.data.ObjectStrategy; import java.nio.ByteBuffer; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchSetPostAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchSetPostAggregator.java similarity index 93% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchSetPostAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchSetPostAggregator.java index dd12a7bf582b..7fc604697fe2 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchSetPostAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchSetPostAggregator.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.theta; +package org.apache.druid.query.aggregation.datasketches.theta; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.Sets; import com.yahoo.sketches.Util; -import io.druid.java.util.common.IAE; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.post.PostAggregatorIds; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.post.PostAggregatorIds; +import org.apache.druid.query.cache.CacheKeyBuilder; import java.util.Comparator; import java.util.List; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SynchronizedUnion.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SynchronizedUnion.java similarity index 97% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SynchronizedUnion.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SynchronizedUnion.java index 795c149933fc..1403a9d54313 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SynchronizedUnion.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SynchronizedUnion.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.theta; +package org.apache.druid.query.aggregation.datasketches.theta; import com.yahoo.memory.Memory; import com.yahoo.memory.WritableMemory; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/oldapi/OldApiSketchModule.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/oldapi/OldApiSketchModule.java similarity index 83% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/oldapi/OldApiSketchModule.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/oldapi/OldApiSketchModule.java index 925128c8ffab..e2e04712a43b 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/oldapi/OldApiSketchModule.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/oldapi/OldApiSketchModule.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.theta.oldapi; +package org.apache.druid.query.aggregation.datasketches.theta.oldapi; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.inject.Binder; -import io.druid.initialization.DruidModule; -import io.druid.query.aggregation.datasketches.theta.SketchBuildComplexMetricSerde; -import io.druid.query.aggregation.datasketches.theta.SketchHolder; -import io.druid.query.aggregation.datasketches.theta.SketchHolderJsonSerializer; -import io.druid.query.aggregation.datasketches.theta.SketchMergeComplexMetricSerde; -import io.druid.query.aggregation.datasketches.theta.SketchModule; -import io.druid.segment.serde.ComplexMetrics; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.query.aggregation.datasketches.theta.SketchBuildComplexMetricSerde; +import org.apache.druid.query.aggregation.datasketches.theta.SketchHolder; +import org.apache.druid.query.aggregation.datasketches.theta.SketchHolderJsonSerializer; +import org.apache.druid.query.aggregation.datasketches.theta.SketchMergeComplexMetricSerde; +import org.apache.druid.query.aggregation.datasketches.theta.SketchModule; +import org.apache.druid.segment.serde.ComplexMetrics; import java.util.Collections; import java.util.List; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/oldapi/OldSketchBuildAggregatorFactory.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/oldapi/OldSketchBuildAggregatorFactory.java similarity index 88% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/oldapi/OldSketchBuildAggregatorFactory.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/oldapi/OldSketchBuildAggregatorFactory.java index c9fa43ec30b0..c428794faaaa 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/oldapi/OldSketchBuildAggregatorFactory.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/oldapi/OldSketchBuildAggregatorFactory.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.theta.oldapi; +package org.apache.druid.query.aggregation.datasketches.theta.oldapi; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.query.aggregation.datasketches.theta.SketchMergeAggregatorFactory; +import org.apache.druid.query.aggregation.datasketches.theta.SketchMergeAggregatorFactory; /** */ diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/oldapi/OldSketchEstimatePostAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/oldapi/OldSketchEstimatePostAggregator.java similarity index 84% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/oldapi/OldSketchEstimatePostAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/oldapi/OldSketchEstimatePostAggregator.java index f0d18bac591b..7925d764c225 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/oldapi/OldSketchEstimatePostAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/oldapi/OldSketchEstimatePostAggregator.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.theta.oldapi; +package org.apache.druid.query.aggregation.datasketches.theta.oldapi; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.datasketches.theta.SketchEstimatePostAggregator; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.datasketches.theta.SketchEstimatePostAggregator; /** */ diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/oldapi/OldSketchMergeAggregatorFactory.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/oldapi/OldSketchMergeAggregatorFactory.java similarity index 89% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/oldapi/OldSketchMergeAggregatorFactory.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/oldapi/OldSketchMergeAggregatorFactory.java index 3bef11c3e6e1..7241153bd936 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/oldapi/OldSketchMergeAggregatorFactory.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/oldapi/OldSketchMergeAggregatorFactory.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.theta.oldapi; +package org.apache.druid.query.aggregation.datasketches.theta.oldapi; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.query.aggregation.datasketches.theta.SketchMergeAggregatorFactory; +import org.apache.druid.query.aggregation.datasketches.theta.SketchMergeAggregatorFactory; /** */ diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/oldapi/OldSketchSetPostAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/oldapi/OldSketchSetPostAggregator.java similarity index 86% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/oldapi/OldSketchSetPostAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/oldapi/OldSketchSetPostAggregator.java index 9b77347fdd26..b854d721c065 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/oldapi/OldSketchSetPostAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/oldapi/OldSketchSetPostAggregator.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.theta.oldapi; +package org.apache.druid.query.aggregation.datasketches.theta.oldapi; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.datasketches.theta.SketchSetPostAggregator; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.datasketches.theta.SketchSetPostAggregator; import java.util.List; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregatorFactory.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregatorFactory.java similarity index 91% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregatorFactory.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregatorFactory.java index 409cc757006d..5bc90e4bddfd 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregatorFactory.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregatorFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import java.util.ArrayList; import java.util.Collections; @@ -31,22 +31,22 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.java.util.common.IAE; -import io.druid.query.aggregation.AggregateCombiner; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.ObjectAggregateCombiner; -import io.druid.query.cache.CacheKeyBuilder; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.segment.BaseDoubleColumnValueSelector; -import io.druid.segment.BaseObjectColumnValueSelector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.DimensionSelector; -import io.druid.segment.DimensionSelectorUtils; -import io.druid.segment.NilColumnValueSelector; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.query.aggregation.AggregateCombiner; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.ObjectAggregateCombiner; +import org.apache.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.segment.BaseDoubleColumnValueSelector; +import org.apache.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.DimensionSelectorUtils; +import org.apache.druid.segment.NilColumnValueSelector; import com.yahoo.sketches.Util; import com.yahoo.sketches.tuple.ArrayOfDoublesSketch; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildAggregator.java similarity index 89% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildAggregator.java index 262947fea8d2..11a306148340 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildAggregator.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import com.yahoo.sketches.tuple.ArrayOfDoublesUpdatableSketch; import com.yahoo.sketches.tuple.ArrayOfDoublesUpdatableSketchBuilder; -import io.druid.query.aggregation.Aggregator; -import io.druid.segment.BaseDoubleColumnValueSelector; -import io.druid.segment.DimensionSelector; -import io.druid.segment.data.IndexedInts; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.segment.BaseDoubleColumnValueSelector; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.data.IndexedInts; import java.util.List; @@ -57,7 +57,7 @@ public ArrayOfDoublesSketchBuildAggregator( /** * This method uses synchronization because it can be used during indexing, * and Druid can call aggregate() and get() concurrently - * https://github.com/druid-io/druid/pull/3956 + * https://github.com/apache/incubator-druid/pull/3956 */ @Override public void aggregate() @@ -77,7 +77,7 @@ public void aggregate() /** * This method uses synchronization because it can be used during indexing, * and Druid can call aggregate() and get() concurrently - * https://github.com/druid-io/druid/pull/3956 + * https://github.com/apache/incubator-druid/pull/3956 * The returned sketch is a separate instance of ArrayOfDoublesCompactSketch * representing the current state of the aggregation, and is not affected by consequent * aggregate() calls diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildBufferAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildBufferAggregator.java similarity index 92% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildBufferAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildBufferAggregator.java index a5129efe07ab..aa0cf3927907 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildBufferAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildBufferAggregator.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import com.google.common.util.concurrent.Striped; import com.yahoo.memory.WritableMemory; import com.yahoo.sketches.tuple.ArrayOfDoublesSketches; import com.yahoo.sketches.tuple.ArrayOfDoublesUpdatableSketch; import com.yahoo.sketches.tuple.ArrayOfDoublesUpdatableSketchBuilder; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseDoubleColumnValueSelector; -import io.druid.segment.DimensionSelector; -import io.druid.segment.data.IndexedInts; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseDoubleColumnValueSelector; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.data.IndexedInts; import java.nio.ByteBuffer; import java.util.List; @@ -79,7 +79,7 @@ public void init(final ByteBuffer buf, final int position) /** * This method uses locks because it can be used during indexing, * and Druid can call aggregate() and get() concurrently - * https://github.com/druid-io/druid/pull/3956 + * https://github.com/apache/incubator-druid/pull/3956 */ @Override public void aggregate(final ByteBuffer buf, final int position) @@ -110,7 +110,7 @@ public void aggregate(final ByteBuffer buf, final int position) /** * This method uses locks because it can be used during indexing, * and Druid can call aggregate() and get() concurrently - * https://github.com/druid-io/druid/pull/3956 + * https://github.com/apache/incubator-druid/pull/3956 * The returned sketch is a separate instance of ArrayOfDoublesCompactSketch * representing the current state of the aggregation, and is not affected by consequent * aggregate() calls diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildComplexMetricSerde.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildComplexMetricSerde.java similarity index 88% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildComplexMetricSerde.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildComplexMetricSerde.java index c0f697b24b90..e8b385a25e12 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildComplexMetricSerde.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildComplexMetricSerde.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; -import io.druid.data.input.InputRow; -import io.druid.segment.serde.ComplexMetricExtractor; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.segment.serde.ComplexMetricExtractor; public class ArrayOfDoublesSketchBuildComplexMetricSerde extends ArrayOfDoublesSketchMergeComplexMetricSerde { diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchJsonSerializer.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchJsonSerializer.java similarity index 95% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchJsonSerializer.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchJsonSerializer.java index 6b9bb055581c..2de36fff6a6d 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchJsonSerializer.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchJsonSerializer.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import java.io.IOException; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchMergeAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchMergeAggregator.java similarity index 90% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchMergeAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchMergeAggregator.java index 0e524a8af0f6..3f99ce958ce5 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchMergeAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchMergeAggregator.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import com.yahoo.sketches.tuple.ArrayOfDoublesSetOperationBuilder; import com.yahoo.sketches.tuple.ArrayOfDoublesSketch; import com.yahoo.sketches.tuple.ArrayOfDoublesUnion; -import io.druid.query.aggregation.Aggregator; -import io.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.segment.BaseObjectColumnValueSelector; /** * This aggregator merges existing sketches. @@ -50,7 +50,7 @@ public ArrayOfDoublesSketchMergeAggregator( /** * This method uses synchronization because it can be used during indexing, * and Druid can call aggregate() and get() concurrently - * https://github.com/druid-io/druid/pull/3956 + * https://github.com/apache/incubator-druid/pull/3956 */ @Override public void aggregate() @@ -67,7 +67,7 @@ public void aggregate() /** * This method uses synchronization because it can be used during indexing, * and Druid can call aggregate() and get() concurrently - * https://github.com/druid-io/druid/pull/3956 + * https://github.com/apache/incubator-druid/pull/3956 * The returned sketch is a separate instance of ArrayOfDoublesCompactSketch * representing the current state of the aggregation, and is not affected by consequent * aggregate() calls diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchMergeBufferAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchMergeBufferAggregator.java similarity index 93% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchMergeBufferAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchMergeBufferAggregator.java index 6f024163b4ed..af6d3c7bae25 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchMergeBufferAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchMergeBufferAggregator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import com.google.common.util.concurrent.Striped; import com.yahoo.memory.WritableMemory; @@ -25,9 +25,9 @@ import com.yahoo.sketches.tuple.ArrayOfDoublesSketch; import com.yahoo.sketches.tuple.ArrayOfDoublesSketches; import com.yahoo.sketches.tuple.ArrayOfDoublesUnion; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseObjectColumnValueSelector; import java.nio.ByteBuffer; import java.util.concurrent.locks.Lock; @@ -74,7 +74,7 @@ public void init(final ByteBuffer buf, final int position) /** * This method uses locks because it can be used during indexing, * and Druid can call aggregate() and get() concurrently - * https://github.com/druid-io/druid/pull/3956 + * https://github.com/apache/incubator-druid/pull/3956 */ @Override public void aggregate(final ByteBuffer buf, final int position) @@ -102,7 +102,7 @@ public void aggregate(final ByteBuffer buf, final int position) /** * This method uses locks because it can be used during indexing, * and Druid can call aggregate() and get() concurrently - * https://github.com/druid-io/druid/pull/3956 + * https://github.com/apache/incubator-druid/pull/3956 * The returned sketch is a separate instance of ArrayOfDoublesCompactSketch * representing the current state of the aggregation, and is not affected by consequent * aggregate() calls diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchMergeComplexMetricSerde.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchMergeComplexMetricSerde.java similarity index 78% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchMergeComplexMetricSerde.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchMergeComplexMetricSerde.java index 8cf3ccd2f21f..212befb277b6 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchMergeComplexMetricSerde.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchMergeComplexMetricSerde.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import java.nio.ByteBuffer; -import io.druid.data.input.InputRow; -import io.druid.segment.GenericColumnSerializer; -import io.druid.segment.column.ColumnBuilder; -import io.druid.segment.data.GenericIndexed; -import io.druid.segment.data.ObjectStrategy; -import io.druid.segment.serde.ComplexColumnPartSupplier; -import io.druid.segment.serde.ComplexMetricExtractor; -import io.druid.segment.serde.ComplexMetricSerde; -import io.druid.segment.serde.LargeColumnSupportedComplexColumnSerializer; -import io.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.segment.GenericColumnSerializer; +import org.apache.druid.segment.column.ColumnBuilder; +import org.apache.druid.segment.data.GenericIndexed; +import org.apache.druid.segment.data.ObjectStrategy; +import org.apache.druid.segment.serde.ComplexColumnPartSupplier; +import org.apache.druid.segment.serde.ComplexMetricExtractor; +import org.apache.druid.segment.serde.ComplexMetricSerde; +import org.apache.druid.segment.serde.LargeColumnSupportedComplexColumnSerializer; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; import com.yahoo.sketches.tuple.ArrayOfDoublesSketch; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchModule.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchModule.java similarity index 96% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchModule.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchModule.java index 4d99d6f5e178..7f4ce283c129 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchModule.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import java.util.Collections; import java.util.List; @@ -29,8 +29,8 @@ import com.yahoo.sketches.tuple.ArrayOfDoublesSketch; -import io.druid.initialization.DruidModule; -import io.druid.segment.serde.ComplexMetrics; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.segment.serde.ComplexMetrics; /** * This module is to support numeric Tuple sketches, which extend the functionality of the count-distinct diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchMultiPostAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchMultiPostAggregator.java similarity index 95% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchMultiPostAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchMultiPostAggregator.java index 78935c85d9c4..c528cde5cd4b 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchMultiPostAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchMultiPostAggregator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import java.util.List; import java.util.Objects; @@ -27,7 +27,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.Sets; -import io.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.PostAggregator; /** * Base class for post aggs taking multiple sketches as input diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchNoOpAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchNoOpAggregator.java similarity index 93% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchNoOpAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchNoOpAggregator.java index 789152abdf2b..6e533dad7cdc 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchNoOpAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchNoOpAggregator.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import com.yahoo.sketches.tuple.ArrayOfDoublesSketch; import com.yahoo.sketches.tuple.ArrayOfDoublesUpdatableSketchBuilder; -import io.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.Aggregator; public class ArrayOfDoublesSketchNoOpAggregator implements Aggregator { diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchNoOpBufferAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchNoOpBufferAggregator.java similarity index 91% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchNoOpBufferAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchNoOpBufferAggregator.java index 2a08ea386058..57eaf937f0dd 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchNoOpBufferAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchNoOpBufferAggregator.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import java.nio.ByteBuffer; import com.yahoo.sketches.tuple.ArrayOfDoublesSketch; import com.yahoo.sketches.tuple.ArrayOfDoublesUpdatableSketchBuilder; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; public class ArrayOfDoublesSketchNoOpBufferAggregator implements BufferAggregator { diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchObjectStrategy.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchObjectStrategy.java similarity index 94% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchObjectStrategy.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchObjectStrategy.java index d6be99c14f62..bc606c8f9773 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchObjectStrategy.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchObjectStrategy.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; -import io.druid.segment.data.ObjectStrategy; +import org.apache.druid.segment.data.ObjectStrategy; import java.nio.ByteBuffer; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchOperations.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchOperations.java similarity index 96% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchOperations.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchOperations.java index 932f5f89af05..7db75f39446d 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchOperations.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchOperations.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import com.yahoo.memory.Memory; @@ -32,8 +32,8 @@ import com.yahoo.sketches.tuple.ArrayOfDoublesSketches; import com.yahoo.sketches.tuple.ArrayOfDoublesUnion; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; import com.yahoo.sketches.tuple.ArrayOfDoublesSetOperationBuilder; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchPostAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchPostAggregator.java similarity index 91% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchPostAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchPostAggregator.java index 4f4013bea695..b4fc4e602d1b 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchPostAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchPostAggregator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import java.util.Collections; import java.util.Map; @@ -26,8 +26,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; /** * Base class for all post aggs diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchSetOpPostAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchSetOpPostAggregator.java similarity index 94% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchSetOpPostAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchSetOpPostAggregator.java index 6a50342d05fa..77a7840376e9 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchSetOpPostAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchSetOpPostAggregator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import java.util.Comparator; import java.util.List; @@ -31,10 +31,10 @@ import com.yahoo.sketches.Util; import com.yahoo.sketches.tuple.ArrayOfDoublesSketch; -import io.druid.java.util.common.IAE; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.cache.CacheKeyBuilder; /** * Returns a result of a specified set operation on the given array of sketches. Supported operations are: diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchTTestPostAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchTTestPostAggregator.java similarity index 93% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchTTestPostAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchTTestPostAggregator.java index f6d60b1fe8d2..2f30b23710f6 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchTTestPostAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchTTestPostAggregator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import java.util.Arrays; import java.util.Comparator; @@ -32,10 +32,10 @@ import com.yahoo.sketches.tuple.ArrayOfDoublesSketch; import com.yahoo.sketches.tuple.ArrayOfDoublesSketchIterator; -import io.druid.java.util.common.IAE; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.cache.CacheKeyBuilder; /** * Performs Student's t-test and returns a list of p-values given two instances of {@link ArrayOfDoublesSketch}. diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToEstimateAndBoundsPostAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToEstimateAndBoundsPostAggregator.java similarity index 92% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToEstimateAndBoundsPostAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToEstimateAndBoundsPostAggregator.java index 35ebda834b13..7fe4a3ad272d 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToEstimateAndBoundsPostAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToEstimateAndBoundsPostAggregator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import java.util.Comparator; import java.util.Map; @@ -29,10 +29,10 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.yahoo.sketches.tuple.ArrayOfDoublesSketch; -import io.druid.java.util.common.IAE; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.cache.CacheKeyBuilder; /** * Returns a distinct count estimate and error bounds from a given {@link ArrayOfDoublesSketch}." diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToEstimatePostAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToEstimatePostAggregator.java similarity index 89% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToEstimatePostAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToEstimatePostAggregator.java index 4c884f3f2cda..7be638fcd6b3 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToEstimatePostAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToEstimatePostAggregator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import java.util.Comparator; import java.util.Map; @@ -26,9 +26,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.yahoo.sketches.tuple.ArrayOfDoublesSketch; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.cache.CacheKeyBuilder; /** * Returns a distinct count estimate from a given {@link ArrayOfDoublesSketch}. diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToMeansPostAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToMeansPostAggregator.java similarity index 90% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToMeansPostAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToMeansPostAggregator.java index 7fad8193d9c4..2ba9fe47e1b2 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToMeansPostAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToMeansPostAggregator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import java.util.Arrays; import java.util.Comparator; @@ -30,10 +30,10 @@ import com.yahoo.sketches.tuple.ArrayOfDoublesSketch; import com.yahoo.sketches.tuple.ArrayOfDoublesSketchIterator; -import io.druid.java.util.common.IAE; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.cache.CacheKeyBuilder; /** * Returns a list of mean values from a given {@link ArrayOfDoublesSketch}. diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToNumEntriesPostAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToNumEntriesPostAggregator.java similarity index 89% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToNumEntriesPostAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToNumEntriesPostAggregator.java index 59d952200d26..8f6ea203b44a 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToNumEntriesPostAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToNumEntriesPostAggregator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import java.util.Comparator; import java.util.Map; @@ -26,9 +26,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.yahoo.sketches.tuple.ArrayOfDoublesSketch; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.cache.CacheKeyBuilder; /** * Returns the number of retained entries from a given {@link ArrayOfDoublesSketch}. diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToQuantilesSketchPostAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToQuantilesSketchPostAggregator.java similarity index 92% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToQuantilesSketchPostAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToQuantilesSketchPostAggregator.java index 1c2023969fea..2c01554e535b 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToQuantilesSketchPostAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToQuantilesSketchPostAggregator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import java.util.Comparator; import java.util.Map; @@ -28,10 +28,10 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.datasketches.quantiles.DoublesSketchAggregatorFactory; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.datasketches.quantiles.DoublesSketchAggregatorFactory; +import org.apache.druid.query.cache.CacheKeyBuilder; import com.yahoo.sketches.tuple.ArrayOfDoublesSketch; import com.yahoo.sketches.tuple.ArrayOfDoublesSketchIterator; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToStringPostAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToStringPostAggregator.java similarity index 88% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToStringPostAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToStringPostAggregator.java index d064a4d2dfe5..51f762bc700c 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToStringPostAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToStringPostAggregator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import java.util.Comparator; import java.util.Map; @@ -26,10 +26,10 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.yahoo.sketches.tuple.ArrayOfDoublesSketch; -import io.druid.java.util.common.IAE; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.cache.CacheKeyBuilder; /** * Returns a human-readable summary of a given {@link ArrayOfDoublesSketch}. diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToVariancesPostAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToVariancesPostAggregator.java similarity index 90% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToVariancesPostAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToVariancesPostAggregator.java index f8b6c15bed16..4723f7302a00 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToVariancesPostAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToVariancesPostAggregator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import java.util.Arrays; import java.util.Comparator; @@ -30,10 +30,10 @@ import com.yahoo.sketches.tuple.ArrayOfDoublesSketch; import com.yahoo.sketches.tuple.ArrayOfDoublesSketchIterator; -import io.druid.java.util.common.IAE; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.cache.CacheKeyBuilder; /** * Returns a list of variance values from a given {@link ArrayOfDoublesSketch}. diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchUnaryPostAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchUnaryPostAggregator.java similarity index 95% rename from extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchUnaryPostAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchUnaryPostAggregator.java index 9fa5a697d4b3..927ede3c4f25 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchUnaryPostAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchUnaryPostAggregator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import java.util.Objects; import java.util.Set; @@ -27,7 +27,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Sets; -import io.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.PostAggregator; /** * Base class for post aggs taking one sketch as input diff --git a/extensions-core/datasketches/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-core/datasketches/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index 319e10e0b881..000000000000 --- a/extensions-core/datasketches/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1,4 +0,0 @@ -io.druid.query.aggregation.datasketches.theta.SketchModule -io.druid.query.aggregation.datasketches.theta.oldapi.OldApiSketchModule -io.druid.query.aggregation.datasketches.quantiles.DoublesSketchModule -io.druid.query.aggregation.datasketches.tuple.ArrayOfDoublesSketchModule diff --git a/extensions-core/datasketches/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-core/datasketches/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..f108bf211ea5 --- /dev/null +++ b/extensions-core/datasketches/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1,4 @@ +org.apache.druid.query.aggregation.datasketches.theta.SketchModule +org.apache.druid.query.aggregation.datasketches.theta.oldapi.OldApiSketchModule +org.apache.druid.query.aggregation.datasketches.quantiles.DoublesSketchModule +org.apache.druid.query.aggregation.datasketches.tuple.ArrayOfDoublesSketchModule diff --git a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchAggregatorTest.java b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchAggregatorTest.java similarity index 97% rename from extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchAggregatorTest.java rename to extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchAggregatorTest.java index 3def78887ee5..6dab564d5c75 100644 --- a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchAggregatorTest.java +++ b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchAggregatorTest.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.quantiles; +package org.apache.druid.query.aggregation.datasketches.quantiles; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Lists; -import io.druid.data.input.Row; -import io.druid.initialization.DruidModule; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.aggregation.AggregationTestHelper; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.groupby.GroupByQueryConfig; -import io.druid.query.groupby.GroupByQueryRunnerTest; +import org.apache.druid.data.input.Row; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.aggregation.AggregationTestHelper; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.groupby.GroupByQueryConfig; +import org.apache.druid.query.groupby.GroupByQueryRunnerTest; import org.junit.After; import org.junit.Assert; import org.junit.Rule; diff --git a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/quantiles/GenerateTestData.java b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/quantiles/GenerateTestData.java similarity index 97% rename from extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/quantiles/GenerateTestData.java rename to extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/quantiles/GenerateTestData.java index 979e786b990e..a6455260dbd6 100644 --- a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/quantiles/GenerateTestData.java +++ b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/quantiles/GenerateTestData.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.quantiles; +package org.apache.druid.query.aggregation.datasketches.quantiles; import java.io.BufferedWriter; import java.nio.charset.StandardCharsets; diff --git a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/theta/BufferHashGrouperUsingSketchMergeAggregatorFactoryTest.java b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/theta/BufferHashGrouperUsingSketchMergeAggregatorFactoryTest.java similarity index 85% rename from extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/theta/BufferHashGrouperUsingSketchMergeAggregatorFactoryTest.java rename to extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/theta/BufferHashGrouperUsingSketchMergeAggregatorFactoryTest.java index f5978d410a54..f10ae2cac1bc 100644 --- a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/theta/BufferHashGrouperUsingSketchMergeAggregatorFactoryTest.java +++ b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/theta/BufferHashGrouperUsingSketchMergeAggregatorFactoryTest.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.theta; +package org.apache.druid.query.aggregation.datasketches.theta; import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.yahoo.sketches.theta.Sketches; import com.yahoo.sketches.theta.UpdateSketch; -import io.druid.data.input.MapBasedRow; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.groupby.epinephelinae.BufferHashGrouper; -import io.druid.query.groupby.epinephelinae.Grouper; -import io.druid.query.groupby.epinephelinae.GrouperTestUtil; -import io.druid.query.groupby.epinephelinae.TestColumnSelectorFactory; +import org.apache.druid.data.input.MapBasedRow; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.groupby.epinephelinae.BufferHashGrouper; +import org.apache.druid.query.groupby.epinephelinae.Grouper; +import org.apache.druid.query.groupby.epinephelinae.GrouperTestUtil; +import org.apache.druid.query.groupby.epinephelinae.TestColumnSelectorFactory; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/theta/SketchAggregationTest.java b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/theta/SketchAggregationTest.java similarity index 94% rename from extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/theta/SketchAggregationTest.java rename to extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/theta/SketchAggregationTest.java index 6a1526980870..b7f1abc1220c 100644 --- a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/theta/SketchAggregationTest.java +++ b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/theta/SketchAggregationTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.theta; +package org.apache.druid.query.aggregation.datasketches.theta; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -29,19 +29,19 @@ import com.yahoo.sketches.theta.Sketches; import com.yahoo.sketches.theta.Union; import com.yahoo.sketches.theta.UpdateSketch; -import io.druid.data.input.MapBasedRow; -import io.druid.data.input.Row; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.aggregation.AggregationTestHelper; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.post.FieldAccessPostAggregator; -import io.druid.query.groupby.GroupByQueryConfig; -import io.druid.query.groupby.GroupByQueryRunnerTest; -import io.druid.query.groupby.epinephelinae.GrouperTestUtil; -import io.druid.query.groupby.epinephelinae.TestColumnSelectorFactory; +import org.apache.druid.data.input.MapBasedRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.aggregation.AggregationTestHelper; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.post.FieldAccessPostAggregator; +import org.apache.druid.query.groupby.GroupByQueryConfig; +import org.apache.druid.query.groupby.GroupByQueryRunnerTest; +import org.apache.druid.query.groupby.epinephelinae.GrouperTestUtil; +import org.apache.druid.query.groupby.epinephelinae.TestColumnSelectorFactory; import org.junit.After; import org.junit.Assert; import org.junit.Rule; diff --git a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/theta/SketchAggregationWithSimpleDataTest.java b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/theta/SketchAggregationWithSimpleDataTest.java similarity index 94% rename from extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/theta/SketchAggregationWithSimpleDataTest.java rename to extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/theta/SketchAggregationWithSimpleDataTest.java index 8e48c831e1ad..ab357a5f4a0f 100644 --- a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/theta/SketchAggregationWithSimpleDataTest.java +++ b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/theta/SketchAggregationWithSimpleDataTest.java @@ -17,26 +17,26 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.theta; +package org.apache.druid.query.aggregation.datasketches.theta; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.io.Files; -import io.druid.data.input.MapBasedRow; -import io.druid.data.input.Row; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.Result; -import io.druid.query.aggregation.AggregationTestHelper; -import io.druid.query.groupby.GroupByQueryConfig; -import io.druid.query.groupby.GroupByQueryRunnerTest; -import io.druid.query.select.SelectResultValue; -import io.druid.query.timeseries.TimeseriesResultValue; -import io.druid.query.topn.DimensionAndMetricValueExtractor; -import io.druid.query.topn.TopNResultValue; +import org.apache.druid.data.input.MapBasedRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.AggregationTestHelper; +import org.apache.druid.query.groupby.GroupByQueryConfig; +import org.apache.druid.query.groupby.GroupByQueryRunnerTest; +import org.apache.druid.query.select.SelectResultValue; +import org.apache.druid.query.timeseries.TimeseriesResultValue; +import org.apache.druid.query.topn.DimensionAndMetricValueExtractor; +import org.apache.druid.query.topn.TopNResultValue; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; diff --git a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/theta/SketchEstimateWithErrorBoundsTest.java b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/theta/SketchEstimateWithErrorBoundsTest.java similarity index 92% rename from extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/theta/SketchEstimateWithErrorBoundsTest.java rename to extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/theta/SketchEstimateWithErrorBoundsTest.java index 7081d4015282..7d86d9db5bbd 100644 --- a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/theta/SketchEstimateWithErrorBoundsTest.java +++ b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/theta/SketchEstimateWithErrorBoundsTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.query.aggregation.datasketches.theta; +package org.apache.druid.query.aggregation.datasketches.theta; import org.junit.Assert; import org.junit.Test; @@ -24,7 +24,7 @@ import java.io.IOException; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.jackson.DefaultObjectMapper; public class SketchEstimateWithErrorBoundsTest { diff --git a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/theta/oldapi/OldApiSketchAggregationTest.java b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/theta/oldapi/OldApiSketchAggregationTest.java similarity index 89% rename from extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/theta/oldapi/OldApiSketchAggregationTest.java rename to extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/theta/oldapi/OldApiSketchAggregationTest.java index 07dfee29bf90..32daffb78991 100644 --- a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/theta/oldapi/OldApiSketchAggregationTest.java +++ b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/theta/oldapi/OldApiSketchAggregationTest.java @@ -17,26 +17,26 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.theta.oldapi; +package org.apache.druid.query.aggregation.datasketches.theta.oldapi; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.io.Files; import com.yahoo.sketches.theta.Sketches; import com.yahoo.sketches.theta.UpdateSketch; -import io.druid.data.input.MapBasedRow; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.aggregation.AggregationTestHelper; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.datasketches.theta.SketchHolder; -import io.druid.query.aggregation.post.FieldAccessPostAggregator; -import io.druid.query.groupby.GroupByQueryConfig; -import io.druid.query.groupby.GroupByQueryRunnerTest; -import io.druid.query.groupby.epinephelinae.GrouperTestUtil; -import io.druid.query.groupby.epinephelinae.TestColumnSelectorFactory; +import org.apache.druid.data.input.MapBasedRow; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.aggregation.AggregationTestHelper; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.datasketches.theta.SketchHolder; +import org.apache.druid.query.aggregation.post.FieldAccessPostAggregator; +import org.apache.druid.query.groupby.GroupByQueryConfig; +import org.apache.druid.query.groupby.GroupByQueryRunnerTest; +import org.apache.druid.query.groupby.epinephelinae.GrouperTestUtil; +import org.apache.druid.query.groupby.epinephelinae.TestColumnSelectorFactory; import org.junit.After; import org.junit.Assert; import org.junit.Rule; diff --git a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregationTest.java b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregationTest.java similarity index 98% rename from extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregationTest.java rename to extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregationTest.java index 7a8cdb736083..9e7d23e90b3a 100644 --- a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregationTest.java +++ b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregationTest.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import com.google.common.collect.Lists; import com.yahoo.sketches.quantiles.DoublesSketch; -import io.druid.data.input.Row; -import io.druid.initialization.DruidModule; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.aggregation.AggregationTestHelper; -import io.druid.query.groupby.GroupByQueryConfig; -import io.druid.query.groupby.GroupByQueryRunnerTest; +import org.apache.druid.data.input.Row; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.aggregation.AggregationTestHelper; +import org.apache.druid.query.groupby.GroupByQueryConfig; +import org.apache.druid.query.groupby.GroupByQueryRunnerTest; import org.junit.After; import org.junit.Assert; import org.junit.Rule; diff --git a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregatorFactoryTest.java b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregatorFactoryTest.java similarity index 89% rename from extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregatorFactoryTest.java rename to extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregatorFactoryTest.java index d11d8f0cd619..78a6e24dbd78 100644 --- a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregatorFactoryTest.java +++ b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregatorFactoryTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import org.junit.Assert; import org.junit.Test; @@ -26,9 +26,9 @@ import com.yahoo.sketches.tuple.ArrayOfDoublesUpdatableSketch; import com.yahoo.sketches.tuple.ArrayOfDoublesUpdatableSketchBuilder; -import io.druid.query.aggregation.AggregateCombiner; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.TestObjectColumnSelector; +import org.apache.druid.query.aggregation.AggregateCombiner; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.TestObjectColumnSelector; public class ArrayOfDoublesSketchAggregatorFactoryTest { diff --git a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchSetOpPostAggregatorTest.java b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchSetOpPostAggregatorTest.java similarity index 93% rename from extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchSetOpPostAggregatorTest.java rename to extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchSetOpPostAggregatorTest.java index 632cbd23a63d..8ced0aa9beca 100644 --- a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchSetOpPostAggregatorTest.java +++ b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchSetOpPostAggregatorTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import java.util.Arrays; import org.junit.Assert; import org.junit.Test; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.post.ConstantPostAggregator; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.post.ConstantPostAggregator; public class ArrayOfDoublesSketchSetOpPostAggregatorTest { diff --git a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchTTestPostAggregatorTest.java b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchTTestPostAggregatorTest.java similarity index 93% rename from extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchTTestPostAggregatorTest.java rename to extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchTTestPostAggregatorTest.java index 5dfb6c8649a9..7b58d22f1d3e 100644 --- a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchTTestPostAggregatorTest.java +++ b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchTTestPostAggregatorTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import java.util.Arrays; import org.junit.Assert; import org.junit.Test; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.post.ConstantPostAggregator; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.post.ConstantPostAggregator; public class ArrayOfDoublesSketchTTestPostAggregatorTest { diff --git a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToEstimateAndBoundsPostAggregatorTest.java b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToEstimateAndBoundsPostAggregatorTest.java similarity index 93% rename from extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToEstimateAndBoundsPostAggregatorTest.java rename to extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToEstimateAndBoundsPostAggregatorTest.java index 7afb19ce4d2b..508a10c5993f 100644 --- a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToEstimateAndBoundsPostAggregatorTest.java +++ b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToEstimateAndBoundsPostAggregatorTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import org.junit.Assert; import org.junit.Test; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.post.ConstantPostAggregator; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.post.ConstantPostAggregator; public class ArrayOfDoublesSketchToEstimateAndBoundsPostAggregatorTest { diff --git a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToEstimatePostAggregatorTest.java b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToEstimatePostAggregatorTest.java similarity index 92% rename from extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToEstimatePostAggregatorTest.java rename to extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToEstimatePostAggregatorTest.java index 16b190f19ebd..446cd4a3ac6a 100644 --- a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToEstimatePostAggregatorTest.java +++ b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToEstimatePostAggregatorTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import org.junit.Assert; import org.junit.Test; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.post.ConstantPostAggregator; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.post.ConstantPostAggregator; public class ArrayOfDoublesSketchToEstimatePostAggregatorTest { diff --git a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToMeansPostAggregatorTest.java b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToMeansPostAggregatorTest.java similarity index 92% rename from extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToMeansPostAggregatorTest.java rename to extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToMeansPostAggregatorTest.java index 0bdc1d3097c5..d2c761f3fe92 100644 --- a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToMeansPostAggregatorTest.java +++ b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToMeansPostAggregatorTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import org.junit.Assert; import org.junit.Test; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.post.ConstantPostAggregator; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.post.ConstantPostAggregator; public class ArrayOfDoublesSketchToMeansPostAggregatorTest { diff --git a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToNumEntriesPostAggregatorTest.java b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToNumEntriesPostAggregatorTest.java similarity index 92% rename from extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToNumEntriesPostAggregatorTest.java rename to extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToNumEntriesPostAggregatorTest.java index 378b1d1649d1..579b6658d601 100644 --- a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToNumEntriesPostAggregatorTest.java +++ b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToNumEntriesPostAggregatorTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import org.junit.Assert; import org.junit.Test; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.post.ConstantPostAggregator; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.post.ConstantPostAggregator; public class ArrayOfDoublesSketchToNumEntriesPostAggregatorTest { diff --git a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToQuantilesSketchPostAggregatorTest.java b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToQuantilesSketchPostAggregatorTest.java similarity index 93% rename from extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToQuantilesSketchPostAggregatorTest.java rename to extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToQuantilesSketchPostAggregatorTest.java index 67c9e48aa121..e4acc8d4135a 100644 --- a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToQuantilesSketchPostAggregatorTest.java +++ b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToQuantilesSketchPostAggregatorTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import org.junit.Assert; import org.junit.Test; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.post.ConstantPostAggregator; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.post.ConstantPostAggregator; public class ArrayOfDoublesSketchToQuantilesSketchPostAggregatorTest { diff --git a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToStringPostAggregatorTest.java b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToStringPostAggregatorTest.java similarity index 92% rename from extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToStringPostAggregatorTest.java rename to extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToStringPostAggregatorTest.java index e947009480c8..3f0c65eb7553 100644 --- a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToStringPostAggregatorTest.java +++ b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToStringPostAggregatorTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import org.junit.Assert; import org.junit.Test; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.post.ConstantPostAggregator; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.post.ConstantPostAggregator; public class ArrayOfDoublesSketchToStringPostAggregatorTest { diff --git a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToVariancesPostAggregatorTest.java b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToVariancesPostAggregatorTest.java similarity index 92% rename from extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToVariancesPostAggregatorTest.java rename to extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToVariancesPostAggregatorTest.java index 0bf5b65dfbcd..fcd8e637310c 100644 --- a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToVariancesPostAggregatorTest.java +++ b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchToVariancesPostAggregatorTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import org.junit.Assert; import org.junit.Test; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.post.ConstantPostAggregator; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.post.ConstantPostAggregator; public class ArrayOfDoublesSketchToVariancesPostAggregatorTest { diff --git a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/GenerateTestData.java b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/GenerateTestData.java similarity index 98% rename from extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/GenerateTestData.java rename to extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/GenerateTestData.java index e5a5b4f70422..dc8a9ef2a36c 100644 --- a/extensions-core/datasketches/src/test/java/io/druid/query/aggregation/datasketches/tuple/GenerateTestData.java +++ b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/GenerateTestData.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.datasketches.tuple; +package org.apache.druid.query.aggregation.datasketches.tuple; import java.io.BufferedWriter; import java.nio.charset.StandardCharsets; diff --git a/extensions-core/druid-basic-security/pom.xml b/extensions-core/druid-basic-security/pom.xml index 4358f5d75db5..49b9a3619536 100644 --- a/extensions-core/druid-basic-security/pom.xml +++ b/extensions-core/druid-basic-security/pom.xml @@ -24,13 +24,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.druid.extensions + org.apache.druid.extensions druid-basic-security druid-basic-security druid-basic-security - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT ../../pom.xml @@ -38,13 +38,13 @@ - io.druid + org.apache.druid druid-services ${project.parent.version} provided - io.druid + org.apache.druid druid-server ${project.parent.version} provided @@ -67,7 +67,7 @@ test - io.druid + org.apache.druid druid-server ${project.parent.version} test-jar diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/BasicAuthCommonCacheConfig.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicAuthCommonCacheConfig.java similarity index 98% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/BasicAuthCommonCacheConfig.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicAuthCommonCacheConfig.java index a97b84aa78c1..51520e15c368 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/BasicAuthCommonCacheConfig.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicAuthCommonCacheConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.security.basic; +package org.apache.druid.security.basic; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/BasicAuthDBConfig.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicAuthDBConfig.java similarity index 98% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/BasicAuthDBConfig.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicAuthDBConfig.java index 608b124fad97..22d078498e49 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/BasicAuthDBConfig.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicAuthDBConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.security.basic; +package org.apache.druid.security.basic; public class BasicAuthDBConfig { diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/BasicAuthUtils.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicAuthUtils.java similarity index 92% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/BasicAuthUtils.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicAuthUtils.java index b4cae8cb82a3..6677fbc4a91f 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/BasicAuthUtils.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicAuthUtils.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.security.basic; +package org.apache.druid.security.basic; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Maps; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.security.basic.authentication.entity.BasicAuthenticatorUser; -import io.druid.security.basic.authorization.entity.BasicAuthorizerRole; -import io.druid.security.basic.authorization.entity.BasicAuthorizerUser; -import io.druid.security.basic.authorization.entity.UserAndRoleMap; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.security.basic.authentication.entity.BasicAuthenticatorUser; +import org.apache.druid.security.basic.authorization.entity.BasicAuthorizerRole; +import org.apache.druid.security.basic.authorization.entity.BasicAuthorizerUser; +import org.apache.druid.security.basic.authorization.entity.UserAndRoleMap; import javax.annotation.Nullable; import javax.crypto.SecretKey; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/BasicSecurityDBResourceException.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicSecurityDBResourceException.java similarity index 93% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/BasicSecurityDBResourceException.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicSecurityDBResourceException.java index c2c8072dc44c..623617a3cdd6 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/BasicSecurityDBResourceException.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicSecurityDBResourceException.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.security.basic; +package org.apache.druid.security.basic; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; /** * Throw this for invalid resource accesses in the druid-basic-security extension that are likely a result of user error diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/BasicSecurityDruidModule.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicSecurityDruidModule.java similarity index 64% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/BasicSecurityDruidModule.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicSecurityDruidModule.java index ed8b1d895788..c921bae20bfa 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/BasicSecurityDruidModule.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicSecurityDruidModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.security.basic; +package org.apache.druid.security.basic; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.module.SimpleModule; @@ -27,36 +27,36 @@ import com.google.inject.Key; import com.google.inject.Provides; import com.google.inject.name.Names; -import io.druid.guice.Jerseys; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.LazySingleton; -import io.druid.guice.LifecycleModule; -import io.druid.initialization.DruidModule; -import io.druid.security.basic.authentication.BasicHTTPAuthenticator; -import io.druid.security.basic.authentication.BasicHTTPEscalator; -import io.druid.security.basic.authentication.db.cache.BasicAuthenticatorCacheManager; -import io.druid.security.basic.authentication.db.cache.BasicAuthenticatorCacheNotifier; -import io.druid.security.basic.authentication.db.cache.CoordinatorBasicAuthenticatorCacheNotifier; -import io.druid.security.basic.authentication.db.cache.CoordinatorPollingBasicAuthenticatorCacheManager; -import io.druid.security.basic.authentication.db.cache.MetadataStoragePollingBasicAuthenticatorCacheManager; -import io.druid.security.basic.authentication.db.updater.BasicAuthenticatorMetadataStorageUpdater; -import io.druid.security.basic.authentication.db.updater.CoordinatorBasicAuthenticatorMetadataStorageUpdater; -import io.druid.security.basic.authentication.endpoint.BasicAuthenticatorResource; -import io.druid.security.basic.authentication.endpoint.BasicAuthenticatorResourceHandler; -import io.druid.security.basic.authentication.endpoint.CoordinatorBasicAuthenticatorResourceHandler; -import io.druid.security.basic.authentication.endpoint.DefaultBasicAuthenticatorResourceHandler; -import io.druid.security.basic.authorization.BasicRoleBasedAuthorizer; -import io.druid.security.basic.authorization.db.cache.BasicAuthorizerCacheManager; -import io.druid.security.basic.authorization.db.cache.BasicAuthorizerCacheNotifier; -import io.druid.security.basic.authorization.db.cache.CoordinatorBasicAuthorizerCacheNotifier; -import io.druid.security.basic.authorization.db.cache.CoordinatorPollingBasicAuthorizerCacheManager; -import io.druid.security.basic.authorization.db.cache.MetadataStoragePollingBasicAuthorizerCacheManager; -import io.druid.security.basic.authorization.db.updater.BasicAuthorizerMetadataStorageUpdater; -import io.druid.security.basic.authorization.db.updater.CoordinatorBasicAuthorizerMetadataStorageUpdater; -import io.druid.security.basic.authorization.endpoint.BasicAuthorizerResource; -import io.druid.security.basic.authorization.endpoint.BasicAuthorizerResourceHandler; -import io.druid.security.basic.authorization.endpoint.CoordinatorBasicAuthorizerResourceHandler; -import io.druid.security.basic.authorization.endpoint.DefaultBasicAuthorizerResourceHandler; +import org.apache.druid.guice.Jerseys; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.LifecycleModule; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.security.basic.authentication.BasicHTTPAuthenticator; +import org.apache.druid.security.basic.authentication.BasicHTTPEscalator; +import org.apache.druid.security.basic.authentication.db.cache.BasicAuthenticatorCacheManager; +import org.apache.druid.security.basic.authentication.db.cache.BasicAuthenticatorCacheNotifier; +import org.apache.druid.security.basic.authentication.db.cache.CoordinatorBasicAuthenticatorCacheNotifier; +import org.apache.druid.security.basic.authentication.db.cache.CoordinatorPollingBasicAuthenticatorCacheManager; +import org.apache.druid.security.basic.authentication.db.cache.MetadataStoragePollingBasicAuthenticatorCacheManager; +import org.apache.druid.security.basic.authentication.db.updater.BasicAuthenticatorMetadataStorageUpdater; +import org.apache.druid.security.basic.authentication.db.updater.CoordinatorBasicAuthenticatorMetadataStorageUpdater; +import org.apache.druid.security.basic.authentication.endpoint.BasicAuthenticatorResource; +import org.apache.druid.security.basic.authentication.endpoint.BasicAuthenticatorResourceHandler; +import org.apache.druid.security.basic.authentication.endpoint.CoordinatorBasicAuthenticatorResourceHandler; +import org.apache.druid.security.basic.authentication.endpoint.DefaultBasicAuthenticatorResourceHandler; +import org.apache.druid.security.basic.authorization.BasicRoleBasedAuthorizer; +import org.apache.druid.security.basic.authorization.db.cache.BasicAuthorizerCacheManager; +import org.apache.druid.security.basic.authorization.db.cache.BasicAuthorizerCacheNotifier; +import org.apache.druid.security.basic.authorization.db.cache.CoordinatorBasicAuthorizerCacheNotifier; +import org.apache.druid.security.basic.authorization.db.cache.CoordinatorPollingBasicAuthorizerCacheManager; +import org.apache.druid.security.basic.authorization.db.cache.MetadataStoragePollingBasicAuthorizerCacheManager; +import org.apache.druid.security.basic.authorization.db.updater.BasicAuthorizerMetadataStorageUpdater; +import org.apache.druid.security.basic.authorization.db.updater.CoordinatorBasicAuthorizerMetadataStorageUpdater; +import org.apache.druid.security.basic.authorization.endpoint.BasicAuthorizerResource; +import org.apache.druid.security.basic.authorization.endpoint.BasicAuthorizerResourceHandler; +import org.apache.druid.security.basic.authorization.endpoint.CoordinatorBasicAuthorizerResourceHandler; +import org.apache.druid.security.basic.authorization.endpoint.DefaultBasicAuthorizerResourceHandler; import java.util.List; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/BasicSecurityResourceFilter.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicSecurityResourceFilter.java similarity index 83% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/BasicSecurityResourceFilter.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicSecurityResourceFilter.java index 0fb23edc413d..abb904c25647 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/BasicSecurityResourceFilter.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicSecurityResourceFilter.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.security.basic; +package org.apache.druid.security.basic; import com.google.common.collect.ImmutableList; import com.google.inject.Inject; import com.sun.jersey.spi.container.ContainerRequest; -import io.druid.java.util.common.StringUtils; -import io.druid.server.http.security.AbstractResourceFilter; -import io.druid.server.security.Access; -import io.druid.server.security.AuthorizationUtils; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.Resource; -import io.druid.server.security.ResourceAction; -import io.druid.server.security.ResourceType; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.server.http.security.AbstractResourceFilter; +import org.apache.druid.server.security.Access; +import org.apache.druid.server.security.AuthorizationUtils; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.Resource; +import org.apache.druid.server.security.ResourceAction; +import org.apache.druid.server.security.ResourceType; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/CommonCacheNotifier.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/CommonCacheNotifier.java similarity index 90% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/CommonCacheNotifier.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/CommonCacheNotifier.java index 78443a577b51..d38af5e47221 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/CommonCacheNotifier.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/CommonCacheNotifier.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.security.basic; +package org.apache.druid.security.basic; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.Request; -import io.druid.java.util.http.client.response.ClientResponse; -import io.druid.java.util.http.client.response.HttpResponseHandler; -import io.druid.java.util.http.client.response.StatusResponseHolder; -import io.druid.discovery.DiscoveryDruidNode; -import io.druid.discovery.DruidNodeDiscovery; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.DruidNode; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.Request; +import org.apache.druid.java.util.http.client.response.ClientResponse; +import org.apache.druid.java.util.http.client.response.HttpResponseHandler; +import org.apache.druid.java.util.http.client.response.StatusResponseHolder; +import org.apache.druid.discovery.DiscoveryDruidNode; +import org.apache.druid.discovery.DruidNodeDiscovery; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.DruidNode; import org.jboss.netty.handler.codec.http.HttpChunk; import org.jboss.netty.handler.codec.http.HttpMethod; import org.jboss.netty.handler.codec.http.HttpResponse; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/BasicHTTPAuthenticator.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/BasicHTTPAuthenticator.java similarity index 91% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/BasicHTTPAuthenticator.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/BasicHTTPAuthenticator.java index bdd0aabf9a80..7e495eb03df8 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/BasicHTTPAuthenticator.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/BasicHTTPAuthenticator.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.security.basic.authentication; +package org.apache.druid.security.basic.authentication; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.inject.Provider; -import io.druid.java.util.common.IAE; -import io.druid.security.basic.BasicAuthDBConfig; -import io.druid.security.basic.BasicAuthUtils; -import io.druid.security.basic.authentication.db.cache.BasicAuthenticatorCacheManager; -import io.druid.security.basic.authentication.entity.BasicAuthenticatorCredentials; -import io.druid.security.basic.authentication.entity.BasicAuthenticatorUser; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthenticationResult; -import io.druid.server.security.Authenticator; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.security.basic.BasicAuthDBConfig; +import org.apache.druid.security.basic.BasicAuthUtils; +import org.apache.druid.security.basic.authentication.db.cache.BasicAuthenticatorCacheManager; +import org.apache.druid.security.basic.authentication.entity.BasicAuthenticatorCredentials; +import org.apache.druid.security.basic.authentication.entity.BasicAuthenticatorUser; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthenticationResult; +import org.apache.druid.server.security.Authenticator; import javax.annotation.Nullable; import javax.servlet.DispatcherType; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/BasicHTTPEscalator.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/BasicHTTPEscalator.java similarity index 82% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/BasicHTTPEscalator.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/BasicHTTPEscalator.java index b4db46262de4..1ac3363c6c80 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/BasicHTTPEscalator.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/BasicHTTPEscalator.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.security.basic.authentication; +package org.apache.druid.security.basic.authentication; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.druid.java.util.http.client.CredentialedHttpClient; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.auth.BasicCredentials; -import io.druid.server.security.AuthenticationResult; -import io.druid.server.security.Escalator; +import org.apache.druid.java.util.http.client.CredentialedHttpClient; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.auth.BasicCredentials; +import org.apache.druid.server.security.AuthenticationResult; +import org.apache.druid.server.security.Escalator; @JsonTypeName("basic") public class BasicHTTPEscalator implements Escalator @@ -60,7 +60,7 @@ public HttpClient createEscalatedClient(HttpClient baseClient) public AuthenticationResult createEscalatedAuthenticationResult() { // if you found your self asking why the authenticatedBy field is set to null please read this: - // https://github.com/druid-io/druid/pull/5706#discussion_r185940889 + // https://github.com/apache/incubator-druid/pull/5706#discussion_r185940889 return new AuthenticationResult(internalClientUsername, authorizerName, null, null); } } diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/BytesFullResponseHandler.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/BytesFullResponseHandler.java similarity index 88% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/BytesFullResponseHandler.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/BytesFullResponseHandler.java index 204ae3711a59..fa00a92cf2e2 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/BytesFullResponseHandler.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/BytesFullResponseHandler.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.security.basic.authentication; +package org.apache.druid.security.basic.authentication; -import io.druid.java.util.http.client.response.ClientResponse; -import io.druid.java.util.http.client.response.FullResponseHolder; -import io.druid.java.util.http.client.response.HttpResponseHandler; +import org.apache.druid.java.util.http.client.response.ClientResponse; +import org.apache.druid.java.util.http.client.response.FullResponseHolder; +import org.apache.druid.java.util.http.client.response.HttpResponseHandler; import org.jboss.netty.handler.codec.http.HttpChunk; import org.jboss.netty.handler.codec.http.HttpResponse; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/BytesFullResponseHolder.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/BytesFullResponseHolder.java similarity index 92% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/BytesFullResponseHolder.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/BytesFullResponseHolder.java index d533dd74d917..ae15f624e502 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/BytesFullResponseHolder.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/BytesFullResponseHolder.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.security.basic.authentication; +package org.apache.druid.security.basic.authentication; -import io.druid.java.util.http.client.response.FullResponseHolder; +import org.apache.druid.java.util.http.client.response.FullResponseHolder; import org.jboss.netty.handler.codec.http.HttpResponse; import org.jboss.netty.handler.codec.http.HttpResponseStatus; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/db/cache/BasicAuthenticatorCacheManager.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/cache/BasicAuthenticatorCacheManager.java similarity index 92% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/db/cache/BasicAuthenticatorCacheManager.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/cache/BasicAuthenticatorCacheManager.java index 20c4db6896bf..70851058736a 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/db/cache/BasicAuthenticatorCacheManager.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/cache/BasicAuthenticatorCacheManager.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.security.basic.authentication.db.cache; +package org.apache.druid.security.basic.authentication.db.cache; -import io.druid.security.basic.authentication.entity.BasicAuthenticatorUser; +import org.apache.druid.security.basic.authentication.entity.BasicAuthenticatorUser; import java.util.Map; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/db/cache/BasicAuthenticatorCacheNotifier.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/cache/BasicAuthenticatorCacheNotifier.java similarity index 95% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/db/cache/BasicAuthenticatorCacheNotifier.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/cache/BasicAuthenticatorCacheNotifier.java index ff174f69d88b..95a631a29218 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/db/cache/BasicAuthenticatorCacheNotifier.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/cache/BasicAuthenticatorCacheNotifier.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.security.basic.authentication.db.cache; +package org.apache.druid.security.basic.authentication.db.cache; /** * Sends a notification to druid services, containing updated authenticator user map state. diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/db/cache/CoordinatorBasicAuthenticatorCacheNotifier.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/cache/CoordinatorBasicAuthenticatorCacheNotifier.java similarity index 79% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/db/cache/CoordinatorBasicAuthenticatorCacheNotifier.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/cache/CoordinatorBasicAuthenticatorCacheNotifier.java index d1b6d5cd6cc8..465b76a3e7c6 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/db/cache/CoordinatorBasicAuthenticatorCacheNotifier.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/cache/CoordinatorBasicAuthenticatorCacheNotifier.java @@ -17,23 +17,23 @@ * under the License. */ -package io.druid.security.basic.authentication.db.cache; +package org.apache.druid.security.basic.authentication.db.cache; import com.google.common.base.Preconditions; import com.google.inject.Inject; -import io.druid.concurrent.LifecycleLock; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.guice.ManageLifecycle; -import io.druid.guice.annotations.EscalatedClient; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.http.client.HttpClient; -import io.druid.security.basic.BasicAuthDBConfig; -import io.druid.security.basic.CommonCacheNotifier; -import io.druid.security.basic.authentication.BasicHTTPAuthenticator; -import io.druid.server.security.Authenticator; -import io.druid.server.security.AuthenticatorMapper; +import org.apache.druid.concurrent.LifecycleLock; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.guice.annotations.EscalatedClient; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.security.basic.BasicAuthDBConfig; +import org.apache.druid.security.basic.CommonCacheNotifier; +import org.apache.druid.security.basic.authentication.BasicHTTPAuthenticator; +import org.apache.druid.server.security.Authenticator; +import org.apache.druid.server.security.AuthenticatorMapper; import java.util.HashMap; import java.util.Map; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/db/cache/CoordinatorPollingBasicAuthenticatorCacheManager.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/cache/CoordinatorPollingBasicAuthenticatorCacheManager.java similarity index 86% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/db/cache/CoordinatorPollingBasicAuthenticatorCacheManager.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/cache/CoordinatorPollingBasicAuthenticatorCacheManager.java index 6056dad63b48..035568feb547 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/db/cache/CoordinatorPollingBasicAuthenticatorCacheManager.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/cache/CoordinatorPollingBasicAuthenticatorCacheManager.java @@ -17,35 +17,35 @@ * under the License. */ -package io.druid.security.basic.authentication.db.cache; +package org.apache.druid.security.basic.authentication.db.cache; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; import com.google.inject.Inject; import com.google.inject.Injector; -import io.druid.client.coordinator.Coordinator; -import io.druid.concurrent.LifecycleLock; -import io.druid.discovery.DruidLeaderClient; -import io.druid.guice.ManageLifecycle; -import io.druid.guice.annotations.Smile; -import io.druid.java.util.common.FileUtils; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.RetryUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.concurrent.ScheduledExecutors; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.http.client.Request; -import io.druid.security.basic.BasicAuthCommonCacheConfig; -import io.druid.security.basic.BasicAuthUtils; -import io.druid.security.basic.authentication.BasicHTTPAuthenticator; -import io.druid.security.basic.authentication.BytesFullResponseHandler; -import io.druid.security.basic.authentication.BytesFullResponseHolder; -import io.druid.security.basic.authentication.entity.BasicAuthenticatorUser; -import io.druid.server.security.Authenticator; -import io.druid.server.security.AuthenticatorMapper; +import org.apache.druid.client.coordinator.Coordinator; +import org.apache.druid.concurrent.LifecycleLock; +import org.apache.druid.discovery.DruidLeaderClient; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.guice.annotations.Smile; +import org.apache.druid.java.util.common.FileUtils; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.RetryUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.concurrent.ScheduledExecutors; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.http.client.Request; +import org.apache.druid.security.basic.BasicAuthCommonCacheConfig; +import org.apache.druid.security.basic.BasicAuthUtils; +import org.apache.druid.security.basic.authentication.BasicHTTPAuthenticator; +import org.apache.druid.security.basic.authentication.BytesFullResponseHandler; +import org.apache.druid.security.basic.authentication.BytesFullResponseHolder; +import org.apache.druid.security.basic.authentication.entity.BasicAuthenticatorUser; +import org.apache.druid.server.security.Authenticator; +import org.apache.druid.server.security.AuthenticatorMapper; import org.jboss.netty.handler.codec.http.HttpMethod; import org.joda.time.Duration; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/db/cache/MetadataStoragePollingBasicAuthenticatorCacheManager.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/cache/MetadataStoragePollingBasicAuthenticatorCacheManager.java similarity index 85% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/db/cache/MetadataStoragePollingBasicAuthenticatorCacheManager.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/cache/MetadataStoragePollingBasicAuthenticatorCacheManager.java index 0a0b731f04c8..1a9bfcc02adf 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/db/cache/MetadataStoragePollingBasicAuthenticatorCacheManager.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/cache/MetadataStoragePollingBasicAuthenticatorCacheManager.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.security.basic.authentication.db.cache; +package org.apache.druid.security.basic.authentication.db.cache; import com.google.inject.Inject; -import io.druid.java.util.common.logger.Logger; -import io.druid.security.basic.authentication.db.updater.BasicAuthenticatorMetadataStorageUpdater; -import io.druid.security.basic.authentication.entity.BasicAuthenticatorUser; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.security.basic.authentication.db.updater.BasicAuthenticatorMetadataStorageUpdater; +import org.apache.druid.security.basic.authentication.entity.BasicAuthenticatorUser; import java.util.Map; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/db/updater/BasicAuthenticatorMetadataStorageUpdater.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/updater/BasicAuthenticatorMetadataStorageUpdater.java similarity index 87% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/db/updater/BasicAuthenticatorMetadataStorageUpdater.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/updater/BasicAuthenticatorMetadataStorageUpdater.java index d54caa00a4b1..d354694458ff 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/db/updater/BasicAuthenticatorMetadataStorageUpdater.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/updater/BasicAuthenticatorMetadataStorageUpdater.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.security.basic.authentication.db.updater; +package org.apache.druid.security.basic.authentication.db.updater; -import io.druid.security.basic.authentication.entity.BasicAuthenticatorCredentialUpdate; -import io.druid.security.basic.authentication.entity.BasicAuthenticatorUser; +import org.apache.druid.security.basic.authentication.entity.BasicAuthenticatorCredentialUpdate; +import org.apache.druid.security.basic.authentication.entity.BasicAuthenticatorUser; import java.util.Map; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/db/updater/CoordinatorBasicAuthenticatorMetadataStorageUpdater.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/updater/CoordinatorBasicAuthenticatorMetadataStorageUpdater.java similarity index 89% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/db/updater/CoordinatorBasicAuthenticatorMetadataStorageUpdater.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/updater/CoordinatorBasicAuthenticatorMetadataStorageUpdater.java index 4059aae72318..442c23385e1d 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/db/updater/CoordinatorBasicAuthenticatorMetadataStorageUpdater.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/updater/CoordinatorBasicAuthenticatorMetadataStorageUpdater.java @@ -17,37 +17,37 @@ * under the License. */ -package io.druid.security.basic.authentication.db.updater; +package org.apache.druid.security.basic.authentication.db.updater; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; import com.google.inject.Inject; -import io.druid.common.config.ConfigManager; -import io.druid.concurrent.LifecycleLock; -import io.druid.guice.ManageLifecycle; -import io.druid.guice.annotations.Smile; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.concurrent.ScheduledExecutors; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.metadata.MetadataCASUpdate; -import io.druid.metadata.MetadataStorageConnector; -import io.druid.metadata.MetadataStorageTablesConfig; -import io.druid.security.basic.BasicAuthCommonCacheConfig; -import io.druid.security.basic.BasicAuthDBConfig; -import io.druid.security.basic.BasicAuthUtils; -import io.druid.security.basic.BasicSecurityDBResourceException; -import io.druid.security.basic.authentication.BasicHTTPAuthenticator; -import io.druid.security.basic.authentication.db.cache.BasicAuthenticatorCacheNotifier; -import io.druid.security.basic.authentication.entity.BasicAuthenticatorCredentialUpdate; -import io.druid.security.basic.authentication.entity.BasicAuthenticatorCredentials; -import io.druid.security.basic.authentication.entity.BasicAuthenticatorUser; -import io.druid.security.basic.authentication.entity.BasicAuthenticatorUserMapBundle; -import io.druid.server.security.Authenticator; -import io.druid.server.security.AuthenticatorMapper; +import org.apache.druid.common.config.ConfigManager; +import org.apache.druid.concurrent.LifecycleLock; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.guice.annotations.Smile; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.concurrent.ScheduledExecutors; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.metadata.MetadataCASUpdate; +import org.apache.druid.metadata.MetadataStorageConnector; +import org.apache.druid.metadata.MetadataStorageTablesConfig; +import org.apache.druid.security.basic.BasicAuthCommonCacheConfig; +import org.apache.druid.security.basic.BasicAuthDBConfig; +import org.apache.druid.security.basic.BasicAuthUtils; +import org.apache.druid.security.basic.BasicSecurityDBResourceException; +import org.apache.druid.security.basic.authentication.BasicHTTPAuthenticator; +import org.apache.druid.security.basic.authentication.db.cache.BasicAuthenticatorCacheNotifier; +import org.apache.druid.security.basic.authentication.entity.BasicAuthenticatorCredentialUpdate; +import org.apache.druid.security.basic.authentication.entity.BasicAuthenticatorCredentials; +import org.apache.druid.security.basic.authentication.entity.BasicAuthenticatorUser; +import org.apache.druid.security.basic.authentication.entity.BasicAuthenticatorUserMapBundle; +import org.apache.druid.server.security.Authenticator; +import org.apache.druid.server.security.AuthenticatorMapper; import org.joda.time.Duration; import java.util.Collections; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/endpoint/BasicAuthenticatorResource.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/endpoint/BasicAuthenticatorResource.java similarity index 96% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/endpoint/BasicAuthenticatorResource.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/endpoint/BasicAuthenticatorResource.java index ff79e486cc2d..5dc1493ac6b0 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/endpoint/BasicAuthenticatorResource.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/endpoint/BasicAuthenticatorResource.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.security.basic.authentication.endpoint; +package org.apache.druid.security.basic.authentication.endpoint; import com.fasterxml.jackson.jaxrs.smile.SmileMediaTypes; import com.google.inject.Inject; import com.sun.jersey.spi.container.ResourceFilters; -import io.druid.guice.LazySingleton; -import io.druid.security.basic.BasicSecurityResourceFilter; -import io.druid.security.basic.authentication.entity.BasicAuthenticatorCredentialUpdate; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.security.basic.BasicSecurityResourceFilter; +import org.apache.druid.security.basic.authentication.entity.BasicAuthenticatorCredentialUpdate; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/endpoint/BasicAuthenticatorResourceHandler.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/endpoint/BasicAuthenticatorResourceHandler.java similarity index 91% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/endpoint/BasicAuthenticatorResourceHandler.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/endpoint/BasicAuthenticatorResourceHandler.java index 0593fd5ebccc..35f0d4d405b3 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/endpoint/BasicAuthenticatorResourceHandler.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/endpoint/BasicAuthenticatorResourceHandler.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.security.basic.authentication.endpoint; +package org.apache.druid.security.basic.authentication.endpoint; -import io.druid.security.basic.authentication.entity.BasicAuthenticatorCredentialUpdate; +import org.apache.druid.security.basic.authentication.entity.BasicAuthenticatorCredentialUpdate; import javax.ws.rs.core.Response; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/endpoint/CoordinatorBasicAuthenticatorResourceHandler.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/endpoint/CoordinatorBasicAuthenticatorResourceHandler.java similarity index 90% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/endpoint/CoordinatorBasicAuthenticatorResourceHandler.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/endpoint/CoordinatorBasicAuthenticatorResourceHandler.java index 2f91f4a0799a..bdf2f9c94a75 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/endpoint/CoordinatorBasicAuthenticatorResourceHandler.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/endpoint/CoordinatorBasicAuthenticatorResourceHandler.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.security.basic.authentication.endpoint; +package org.apache.druid.security.basic.authentication.endpoint; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.inject.Inject; -import io.druid.guice.annotations.Smile; -import io.druid.java.util.common.StringUtils; -import io.druid.security.basic.BasicAuthUtils; -import io.druid.security.basic.BasicSecurityDBResourceException; -import io.druid.security.basic.authentication.BasicHTTPAuthenticator; -import io.druid.security.basic.authentication.db.updater.BasicAuthenticatorMetadataStorageUpdater; -import io.druid.security.basic.authentication.entity.BasicAuthenticatorCredentialUpdate; -import io.druid.security.basic.authentication.entity.BasicAuthenticatorUser; -import io.druid.server.security.Authenticator; -import io.druid.server.security.AuthenticatorMapper; +import org.apache.druid.guice.annotations.Smile; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.security.basic.BasicAuthUtils; +import org.apache.druid.security.basic.BasicSecurityDBResourceException; +import org.apache.druid.security.basic.authentication.BasicHTTPAuthenticator; +import org.apache.druid.security.basic.authentication.db.updater.BasicAuthenticatorMetadataStorageUpdater; +import org.apache.druid.security.basic.authentication.entity.BasicAuthenticatorCredentialUpdate; +import org.apache.druid.security.basic.authentication.entity.BasicAuthenticatorUser; +import org.apache.druid.server.security.Authenticator; +import org.apache.druid.server.security.AuthenticatorMapper; import javax.ws.rs.core.Response; import java.util.HashMap; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/endpoint/DefaultBasicAuthenticatorResourceHandler.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/endpoint/DefaultBasicAuthenticatorResourceHandler.java similarity index 88% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/endpoint/DefaultBasicAuthenticatorResourceHandler.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/endpoint/DefaultBasicAuthenticatorResourceHandler.java index 1a1bc5cee114..ef6b370775c0 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/endpoint/DefaultBasicAuthenticatorResourceHandler.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/endpoint/DefaultBasicAuthenticatorResourceHandler.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.security.basic.authentication.endpoint; +package org.apache.druid.security.basic.authentication.endpoint; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.inject.Inject; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.security.basic.authentication.BasicHTTPAuthenticator; -import io.druid.security.basic.authentication.db.cache.BasicAuthenticatorCacheManager; -import io.druid.security.basic.authentication.entity.BasicAuthenticatorCredentialUpdate; -import io.druid.server.security.Authenticator; -import io.druid.server.security.AuthenticatorMapper; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.security.basic.authentication.BasicHTTPAuthenticator; +import org.apache.druid.security.basic.authentication.db.cache.BasicAuthenticatorCacheManager; +import org.apache.druid.security.basic.authentication.entity.BasicAuthenticatorCredentialUpdate; +import org.apache.druid.server.security.Authenticator; +import org.apache.druid.server.security.AuthenticatorMapper; import javax.ws.rs.core.Response; import java.util.HashMap; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/entity/BasicAuthenticatorCredentialUpdate.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/entity/BasicAuthenticatorCredentialUpdate.java similarity index 96% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/entity/BasicAuthenticatorCredentialUpdate.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/entity/BasicAuthenticatorCredentialUpdate.java index 845b6020c78a..5f268ff8adc6 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/entity/BasicAuthenticatorCredentialUpdate.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/entity/BasicAuthenticatorCredentialUpdate.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.security.basic.authentication.entity; +package org.apache.druid.security.basic.authentication.entity; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/entity/BasicAuthenticatorCredentials.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/entity/BasicAuthenticatorCredentials.java similarity index 95% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/entity/BasicAuthenticatorCredentials.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/entity/BasicAuthenticatorCredentials.java index b1515254dcfb..ac231af74dee 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/entity/BasicAuthenticatorCredentials.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/entity/BasicAuthenticatorCredentials.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.security.basic.authentication.entity; +package org.apache.druid.security.basic.authentication.entity; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.security.basic.BasicAuthUtils; +import org.apache.druid.security.basic.BasicAuthUtils; import java.util.Arrays; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/entity/BasicAuthenticatorUser.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/entity/BasicAuthenticatorUser.java similarity index 97% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/entity/BasicAuthenticatorUser.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/entity/BasicAuthenticatorUser.java index 6f70f81af927..15603df7e55b 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/entity/BasicAuthenticatorUser.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/entity/BasicAuthenticatorUser.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.security.basic.authentication.entity; +package org.apache.druid.security.basic.authentication.entity; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/entity/BasicAuthenticatorUserMapBundle.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/entity/BasicAuthenticatorUserMapBundle.java similarity index 96% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/entity/BasicAuthenticatorUserMapBundle.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/entity/BasicAuthenticatorUserMapBundle.java index c81d9bbee855..2a39c5912497 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authentication/entity/BasicAuthenticatorUserMapBundle.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/entity/BasicAuthenticatorUserMapBundle.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.security.basic.authentication.entity; +package org.apache.druid.security.basic.authentication.entity; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/BasicRoleBasedAuthorizer.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/BasicRoleBasedAuthorizer.java similarity index 83% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/BasicRoleBasedAuthorizer.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/BasicRoleBasedAuthorizer.java index 89548bc6923a..d84a7489aa2e 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/BasicRoleBasedAuthorizer.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/BasicRoleBasedAuthorizer.java @@ -17,23 +17,23 @@ * under the License. */ -package io.druid.security.basic.authorization; +package org.apache.druid.security.basic.authorization; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.druid.java.util.common.IAE; -import io.druid.security.basic.BasicAuthDBConfig; -import io.druid.security.basic.authorization.db.cache.BasicAuthorizerCacheManager; -import io.druid.security.basic.authorization.entity.BasicAuthorizerPermission; -import io.druid.security.basic.authorization.entity.BasicAuthorizerRole; -import io.druid.security.basic.authorization.entity.BasicAuthorizerUser; -import io.druid.server.security.Access; -import io.druid.server.security.Action; -import io.druid.server.security.AuthenticationResult; -import io.druid.server.security.Authorizer; -import io.druid.server.security.Resource; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.security.basic.BasicAuthDBConfig; +import org.apache.druid.security.basic.authorization.db.cache.BasicAuthorizerCacheManager; +import org.apache.druid.security.basic.authorization.entity.BasicAuthorizerPermission; +import org.apache.druid.security.basic.authorization.entity.BasicAuthorizerRole; +import org.apache.druid.security.basic.authorization.entity.BasicAuthorizerUser; +import org.apache.druid.server.security.Access; +import org.apache.druid.server.security.Action; +import org.apache.druid.server.security.AuthenticationResult; +import org.apache.druid.server.security.Authorizer; +import org.apache.druid.server.security.Resource; import java.util.Map; import java.util.regex.Matcher; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/db/cache/BasicAuthorizerCacheManager.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/cache/BasicAuthorizerCacheManager.java similarity index 89% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/db/cache/BasicAuthorizerCacheManager.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/cache/BasicAuthorizerCacheManager.java index 7390ef19f2ef..ca2a0b9da7fa 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/db/cache/BasicAuthorizerCacheManager.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/cache/BasicAuthorizerCacheManager.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.security.basic.authorization.db.cache; +package org.apache.druid.security.basic.authorization.db.cache; -import io.druid.security.basic.authorization.entity.BasicAuthorizerRole; -import io.druid.security.basic.authorization.entity.BasicAuthorizerUser; +import org.apache.druid.security.basic.authorization.entity.BasicAuthorizerRole; +import org.apache.druid.security.basic.authorization.entity.BasicAuthorizerUser; import java.util.Map; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/db/cache/BasicAuthorizerCacheNotifier.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/cache/BasicAuthorizerCacheNotifier.java similarity index 95% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/db/cache/BasicAuthorizerCacheNotifier.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/cache/BasicAuthorizerCacheNotifier.java index c3dab711250e..455f636e5ba1 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/db/cache/BasicAuthorizerCacheNotifier.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/cache/BasicAuthorizerCacheNotifier.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.security.basic.authorization.db.cache; +package org.apache.druid.security.basic.authorization.db.cache; /** * Sends a notification to druid services, containing updated authorizer user/role map state. diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/db/cache/CoordinatorBasicAuthorizerCacheNotifier.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/cache/CoordinatorBasicAuthorizerCacheNotifier.java similarity index 79% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/db/cache/CoordinatorBasicAuthorizerCacheNotifier.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/cache/CoordinatorBasicAuthorizerCacheNotifier.java index c4597f4c90ee..85c1a1caedc3 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/db/cache/CoordinatorBasicAuthorizerCacheNotifier.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/cache/CoordinatorBasicAuthorizerCacheNotifier.java @@ -17,23 +17,23 @@ * under the License. */ -package io.druid.security.basic.authorization.db.cache; +package org.apache.druid.security.basic.authorization.db.cache; import com.google.common.base.Preconditions; import com.google.inject.Inject; -import io.druid.concurrent.LifecycleLock; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.guice.ManageLifecycle; -import io.druid.guice.annotations.EscalatedClient; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.http.client.HttpClient; -import io.druid.security.basic.BasicAuthDBConfig; -import io.druid.security.basic.CommonCacheNotifier; -import io.druid.security.basic.authorization.BasicRoleBasedAuthorizer; -import io.druid.server.security.Authorizer; -import io.druid.server.security.AuthorizerMapper; +import org.apache.druid.concurrent.LifecycleLock; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.guice.annotations.EscalatedClient; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.security.basic.BasicAuthDBConfig; +import org.apache.druid.security.basic.CommonCacheNotifier; +import org.apache.druid.security.basic.authorization.BasicRoleBasedAuthorizer; +import org.apache.druid.server.security.Authorizer; +import org.apache.druid.server.security.AuthorizerMapper; import java.util.HashMap; import java.util.Map; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/db/cache/CoordinatorPollingBasicAuthorizerCacheManager.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/cache/CoordinatorPollingBasicAuthorizerCacheManager.java similarity index 85% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/db/cache/CoordinatorPollingBasicAuthorizerCacheManager.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/cache/CoordinatorPollingBasicAuthorizerCacheManager.java index 8a7acb9d1014..c3115c3a24ba 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/db/cache/CoordinatorPollingBasicAuthorizerCacheManager.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/cache/CoordinatorPollingBasicAuthorizerCacheManager.java @@ -17,37 +17,37 @@ * under the License. */ -package io.druid.security.basic.authorization.db.cache; +package org.apache.druid.security.basic.authorization.db.cache; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; import com.google.inject.Inject; import com.google.inject.Injector; -import io.druid.client.coordinator.Coordinator; -import io.druid.concurrent.LifecycleLock; -import io.druid.discovery.DruidLeaderClient; -import io.druid.guice.ManageLifecycle; -import io.druid.guice.annotations.Smile; -import io.druid.java.util.common.FileUtils; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.RetryUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.concurrent.ScheduledExecutors; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.http.client.Request; -import io.druid.security.basic.BasicAuthCommonCacheConfig; -import io.druid.security.basic.BasicAuthUtils; -import io.druid.security.basic.authentication.BytesFullResponseHandler; -import io.druid.security.basic.authentication.BytesFullResponseHolder; -import io.druid.security.basic.authorization.BasicRoleBasedAuthorizer; -import io.druid.security.basic.authorization.entity.BasicAuthorizerRole; -import io.druid.security.basic.authorization.entity.BasicAuthorizerUser; -import io.druid.security.basic.authorization.entity.UserAndRoleMap; -import io.druid.server.security.Authorizer; -import io.druid.server.security.AuthorizerMapper; +import org.apache.druid.client.coordinator.Coordinator; +import org.apache.druid.concurrent.LifecycleLock; +import org.apache.druid.discovery.DruidLeaderClient; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.guice.annotations.Smile; +import org.apache.druid.java.util.common.FileUtils; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.RetryUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.concurrent.ScheduledExecutors; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.http.client.Request; +import org.apache.druid.security.basic.BasicAuthCommonCacheConfig; +import org.apache.druid.security.basic.BasicAuthUtils; +import org.apache.druid.security.basic.authentication.BytesFullResponseHandler; +import org.apache.druid.security.basic.authentication.BytesFullResponseHolder; +import org.apache.druid.security.basic.authorization.BasicRoleBasedAuthorizer; +import org.apache.druid.security.basic.authorization.entity.BasicAuthorizerRole; +import org.apache.druid.security.basic.authorization.entity.BasicAuthorizerUser; +import org.apache.druid.security.basic.authorization.entity.UserAndRoleMap; +import org.apache.druid.server.security.Authorizer; +import org.apache.druid.server.security.AuthorizerMapper; import org.jboss.netty.handler.codec.http.HttpMethod; import org.joda.time.Duration; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/db/cache/MetadataStoragePollingBasicAuthorizerCacheManager.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/cache/MetadataStoragePollingBasicAuthorizerCacheManager.java similarity index 83% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/db/cache/MetadataStoragePollingBasicAuthorizerCacheManager.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/cache/MetadataStoragePollingBasicAuthorizerCacheManager.java index d7767a61f7c8..2c2c38587077 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/db/cache/MetadataStoragePollingBasicAuthorizerCacheManager.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/cache/MetadataStoragePollingBasicAuthorizerCacheManager.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.security.basic.authorization.db.cache; +package org.apache.druid.security.basic.authorization.db.cache; import com.google.inject.Inject; -import io.druid.security.basic.authorization.db.updater.BasicAuthorizerMetadataStorageUpdater; -import io.druid.security.basic.authorization.entity.BasicAuthorizerRole; -import io.druid.security.basic.authorization.entity.BasicAuthorizerUser; +import org.apache.druid.security.basic.authorization.db.updater.BasicAuthorizerMetadataStorageUpdater; +import org.apache.druid.security.basic.authorization.entity.BasicAuthorizerRole; +import org.apache.druid.security.basic.authorization.entity.BasicAuthorizerUser; import java.util.Map; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/db/updater/BasicAuthorizerMetadataStorageUpdater.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/updater/BasicAuthorizerMetadataStorageUpdater.java similarity index 87% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/db/updater/BasicAuthorizerMetadataStorageUpdater.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/updater/BasicAuthorizerMetadataStorageUpdater.java index 72e34d59e492..0cfb394f12eb 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/db/updater/BasicAuthorizerMetadataStorageUpdater.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/updater/BasicAuthorizerMetadataStorageUpdater.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.security.basic.authorization.db.updater; +package org.apache.druid.security.basic.authorization.db.updater; -import io.druid.security.basic.authorization.entity.BasicAuthorizerRole; -import io.druid.security.basic.authorization.entity.BasicAuthorizerUser; -import io.druid.server.security.ResourceAction; +import org.apache.druid.security.basic.authorization.entity.BasicAuthorizerRole; +import org.apache.druid.security.basic.authorization.entity.BasicAuthorizerUser; +import org.apache.druid.server.security.ResourceAction; import java.util.List; import java.util.Map; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/db/updater/CoordinatorBasicAuthorizerMetadataStorageUpdater.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/updater/CoordinatorBasicAuthorizerMetadataStorageUpdater.java similarity index 92% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/db/updater/CoordinatorBasicAuthorizerMetadataStorageUpdater.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/updater/CoordinatorBasicAuthorizerMetadataStorageUpdater.java index 0c470840b79e..10b1ec99946d 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/db/updater/CoordinatorBasicAuthorizerMetadataStorageUpdater.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/updater/CoordinatorBasicAuthorizerMetadataStorageUpdater.java @@ -17,43 +17,43 @@ * under the License. */ -package io.druid.security.basic.authorization.db.updater; +package org.apache.druid.security.basic.authorization.db.updater; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.inject.Inject; -import io.druid.common.config.ConfigManager; -import io.druid.concurrent.LifecycleLock; -import io.druid.guice.ManageLifecycle; -import io.druid.guice.annotations.Smile; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.concurrent.ScheduledExecutors; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.metadata.MetadataCASUpdate; -import io.druid.metadata.MetadataStorageConnector; -import io.druid.metadata.MetadataStorageTablesConfig; -import io.druid.security.basic.BasicAuthCommonCacheConfig; -import io.druid.security.basic.BasicAuthUtils; -import io.druid.security.basic.BasicSecurityDBResourceException; -import io.druid.security.basic.authorization.BasicRoleBasedAuthorizer; -import io.druid.security.basic.authorization.db.cache.BasicAuthorizerCacheNotifier; -import io.druid.security.basic.authorization.entity.BasicAuthorizerPermission; -import io.druid.security.basic.authorization.entity.BasicAuthorizerRole; -import io.druid.security.basic.authorization.entity.BasicAuthorizerRoleMapBundle; -import io.druid.security.basic.authorization.entity.BasicAuthorizerUser; -import io.druid.security.basic.authorization.entity.BasicAuthorizerUserMapBundle; -import io.druid.security.basic.authorization.entity.UserAndRoleMap; -import io.druid.server.security.Action; -import io.druid.server.security.Authorizer; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.Resource; -import io.druid.server.security.ResourceAction; -import io.druid.server.security.ResourceType; +import org.apache.druid.common.config.ConfigManager; +import org.apache.druid.concurrent.LifecycleLock; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.guice.annotations.Smile; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.concurrent.ScheduledExecutors; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.metadata.MetadataCASUpdate; +import org.apache.druid.metadata.MetadataStorageConnector; +import org.apache.druid.metadata.MetadataStorageTablesConfig; +import org.apache.druid.security.basic.BasicAuthCommonCacheConfig; +import org.apache.druid.security.basic.BasicAuthUtils; +import org.apache.druid.security.basic.BasicSecurityDBResourceException; +import org.apache.druid.security.basic.authorization.BasicRoleBasedAuthorizer; +import org.apache.druid.security.basic.authorization.db.cache.BasicAuthorizerCacheNotifier; +import org.apache.druid.security.basic.authorization.entity.BasicAuthorizerPermission; +import org.apache.druid.security.basic.authorization.entity.BasicAuthorizerRole; +import org.apache.druid.security.basic.authorization.entity.BasicAuthorizerRoleMapBundle; +import org.apache.druid.security.basic.authorization.entity.BasicAuthorizerUser; +import org.apache.druid.security.basic.authorization.entity.BasicAuthorizerUserMapBundle; +import org.apache.druid.security.basic.authorization.entity.UserAndRoleMap; +import org.apache.druid.server.security.Action; +import org.apache.druid.server.security.Authorizer; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.Resource; +import org.apache.druid.server.security.ResourceAction; +import org.apache.druid.server.security.ResourceType; import org.joda.time.Duration; import javax.annotation.Nullable; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/endpoint/BasicAuthorizerResource.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/endpoint/BasicAuthorizerResource.java similarity index 97% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/endpoint/BasicAuthorizerResource.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/endpoint/BasicAuthorizerResource.java index d9609e626edd..eadd72a07a50 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/endpoint/BasicAuthorizerResource.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/endpoint/BasicAuthorizerResource.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.security.basic.authorization.endpoint; +package org.apache.druid.security.basic.authorization.endpoint; import com.fasterxml.jackson.jaxrs.smile.SmileMediaTypes; import com.google.inject.Inject; import com.sun.jersey.spi.container.ResourceFilters; -import io.druid.guice.LazySingleton; -import io.druid.security.basic.BasicSecurityResourceFilter; -import io.druid.server.security.ResourceAction; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.security.basic.BasicSecurityResourceFilter; +import org.apache.druid.server.security.ResourceAction; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/endpoint/BasicAuthorizerResourceHandler.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/endpoint/BasicAuthorizerResourceHandler.java similarity index 94% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/endpoint/BasicAuthorizerResourceHandler.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/endpoint/BasicAuthorizerResourceHandler.java index d8ac27b16a36..ad69d7b6c11e 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/endpoint/BasicAuthorizerResourceHandler.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/endpoint/BasicAuthorizerResourceHandler.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.security.basic.authorization.endpoint; +package org.apache.druid.security.basic.authorization.endpoint; -import io.druid.server.security.ResourceAction; +import org.apache.druid.server.security.ResourceAction; import javax.ws.rs.core.Response; import java.util.List; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/endpoint/CoordinatorBasicAuthorizerResourceHandler.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/endpoint/CoordinatorBasicAuthorizerResourceHandler.java similarity index 92% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/endpoint/CoordinatorBasicAuthorizerResourceHandler.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/endpoint/CoordinatorBasicAuthorizerResourceHandler.java index 882070508a33..7aa53d8c2762 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/endpoint/CoordinatorBasicAuthorizerResourceHandler.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/endpoint/CoordinatorBasicAuthorizerResourceHandler.java @@ -17,27 +17,27 @@ * under the License. */ -package io.druid.security.basic.authorization.endpoint; +package org.apache.druid.security.basic.authorization.endpoint; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.inject.Inject; -import io.druid.guice.annotations.Smile; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.security.basic.BasicAuthUtils; -import io.druid.security.basic.BasicSecurityDBResourceException; -import io.druid.security.basic.authorization.BasicRoleBasedAuthorizer; -import io.druid.security.basic.authorization.db.updater.BasicAuthorizerMetadataStorageUpdater; -import io.druid.security.basic.authorization.entity.BasicAuthorizerRole; -import io.druid.security.basic.authorization.entity.BasicAuthorizerRoleFull; -import io.druid.security.basic.authorization.entity.BasicAuthorizerUser; -import io.druid.security.basic.authorization.entity.BasicAuthorizerUserFull; -import io.druid.security.basic.authorization.entity.UserAndRoleMap; -import io.druid.server.security.Authorizer; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.ResourceAction; +import org.apache.druid.guice.annotations.Smile; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.security.basic.BasicAuthUtils; +import org.apache.druid.security.basic.BasicSecurityDBResourceException; +import org.apache.druid.security.basic.authorization.BasicRoleBasedAuthorizer; +import org.apache.druid.security.basic.authorization.db.updater.BasicAuthorizerMetadataStorageUpdater; +import org.apache.druid.security.basic.authorization.entity.BasicAuthorizerRole; +import org.apache.druid.security.basic.authorization.entity.BasicAuthorizerRoleFull; +import org.apache.druid.security.basic.authorization.entity.BasicAuthorizerUser; +import org.apache.druid.security.basic.authorization.entity.BasicAuthorizerUserFull; +import org.apache.druid.security.basic.authorization.entity.UserAndRoleMap; +import org.apache.druid.server.security.Authorizer; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.ResourceAction; import javax.ws.rs.core.Response; import java.util.HashMap; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/endpoint/DefaultBasicAuthorizerResourceHandler.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/endpoint/DefaultBasicAuthorizerResourceHandler.java similarity index 90% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/endpoint/DefaultBasicAuthorizerResourceHandler.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/endpoint/DefaultBasicAuthorizerResourceHandler.java index 4e2406ef92b1..ff0cac63c212 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/endpoint/DefaultBasicAuthorizerResourceHandler.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/endpoint/DefaultBasicAuthorizerResourceHandler.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.security.basic.authorization.endpoint; +package org.apache.druid.security.basic.authorization.endpoint; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.inject.Inject; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.security.basic.authorization.BasicRoleBasedAuthorizer; -import io.druid.security.basic.authorization.db.cache.BasicAuthorizerCacheManager; -import io.druid.server.security.Authorizer; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.ResourceAction; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.security.basic.authorization.BasicRoleBasedAuthorizer; +import org.apache.druid.security.basic.authorization.db.cache.BasicAuthorizerCacheManager; +import org.apache.druid.server.security.Authorizer; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.ResourceAction; import javax.ws.rs.core.Response; import java.util.HashMap; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/entity/BasicAuthorizerPermission.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/entity/BasicAuthorizerPermission.java similarity index 94% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/entity/BasicAuthorizerPermission.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/entity/BasicAuthorizerPermission.java index 2c88c70ae264..87ace84b08c7 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/entity/BasicAuthorizerPermission.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/entity/BasicAuthorizerPermission.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.security.basic.authorization.entity; +package org.apache.druid.security.basic.authorization.entity; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.security.basic.BasicSecurityDBResourceException; -import io.druid.server.security.ResourceAction; +import org.apache.druid.security.basic.BasicSecurityDBResourceException; +import org.apache.druid.server.security.ResourceAction; import java.util.ArrayList; import java.util.List; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/entity/BasicAuthorizerRole.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/entity/BasicAuthorizerRole.java similarity index 97% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/entity/BasicAuthorizerRole.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/entity/BasicAuthorizerRole.java index 5e4a1553f750..83b2d5590f94 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/entity/BasicAuthorizerRole.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/entity/BasicAuthorizerRole.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.security.basic.authorization.entity; +package org.apache.druid.security.basic.authorization.entity; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/entity/BasicAuthorizerRoleFull.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/entity/BasicAuthorizerRoleFull.java similarity index 97% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/entity/BasicAuthorizerRoleFull.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/entity/BasicAuthorizerRoleFull.java index 4c5805f71785..79ced60bb186 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/entity/BasicAuthorizerRoleFull.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/entity/BasicAuthorizerRoleFull.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.security.basic.authorization.entity; +package org.apache.druid.security.basic.authorization.entity; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/entity/BasicAuthorizerRoleMapBundle.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/entity/BasicAuthorizerRoleMapBundle.java similarity index 96% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/entity/BasicAuthorizerRoleMapBundle.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/entity/BasicAuthorizerRoleMapBundle.java index 6cff195b1c46..7308c9b0d334 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/entity/BasicAuthorizerRoleMapBundle.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/entity/BasicAuthorizerRoleMapBundle.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.security.basic.authorization.entity; +package org.apache.druid.security.basic.authorization.entity; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/entity/BasicAuthorizerUser.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/entity/BasicAuthorizerUser.java similarity index 97% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/entity/BasicAuthorizerUser.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/entity/BasicAuthorizerUser.java index 1808abc0f756..73ebac461f74 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/entity/BasicAuthorizerUser.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/entity/BasicAuthorizerUser.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.security.basic.authorization.entity; +package org.apache.druid.security.basic.authorization.entity; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/entity/BasicAuthorizerUserFull.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/entity/BasicAuthorizerUserFull.java similarity index 97% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/entity/BasicAuthorizerUserFull.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/entity/BasicAuthorizerUserFull.java index 557f157c5dfa..a772bd089d03 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/entity/BasicAuthorizerUserFull.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/entity/BasicAuthorizerUserFull.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.security.basic.authorization.entity; +package org.apache.druid.security.basic.authorization.entity; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/entity/BasicAuthorizerUserMapBundle.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/entity/BasicAuthorizerUserMapBundle.java similarity index 96% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/entity/BasicAuthorizerUserMapBundle.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/entity/BasicAuthorizerUserMapBundle.java index e044d4aae958..79ffa5e70c7c 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/entity/BasicAuthorizerUserMapBundle.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/entity/BasicAuthorizerUserMapBundle.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.security.basic.authorization.entity; +package org.apache.druid.security.basic.authorization.entity; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/entity/UserAndRoleMap.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/entity/UserAndRoleMap.java similarity index 96% rename from extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/entity/UserAndRoleMap.java rename to extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/entity/UserAndRoleMap.java index 64495f30ad1c..2b9dbef75999 100644 --- a/extensions-core/druid-basic-security/src/main/java/io/druid/security/basic/authorization/entity/UserAndRoleMap.java +++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/entity/UserAndRoleMap.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.security.basic.authorization.entity; +package org.apache.druid.security.basic.authorization.entity; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-core/druid-basic-security/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-core/druid-basic-security/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index 02de8e2e58f1..000000000000 --- a/extensions-core/druid-basic-security/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.security.basic.BasicSecurityDruidModule \ No newline at end of file diff --git a/extensions-core/druid-basic-security/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-core/druid-basic-security/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..f362c0f958dc --- /dev/null +++ b/extensions-core/druid-basic-security/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.security.basic.BasicSecurityDruidModule \ No newline at end of file diff --git a/extensions-core/druid-basic-security/src/test/java/io/druid/security/BasicAuthUtilsTest.java b/extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/BasicAuthUtilsTest.java similarity index 93% rename from extensions-core/druid-basic-security/src/test/java/io/druid/security/BasicAuthUtilsTest.java rename to extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/BasicAuthUtilsTest.java index 90644bbb84e6..142e44afb4bb 100644 --- a/extensions-core/druid-basic-security/src/test/java/io/druid/security/BasicAuthUtilsTest.java +++ b/extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/BasicAuthUtilsTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.security; +package org.apache.druid.security; -import io.druid.security.basic.BasicAuthUtils; +import org.apache.druid.security.basic.BasicAuthUtils; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-core/druid-basic-security/src/test/java/io/druid/security/authentication/BasicHTTPAuthenticatorTest.java b/extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authentication/BasicHTTPAuthenticatorTest.java similarity index 92% rename from extensions-core/druid-basic-security/src/test/java/io/druid/security/authentication/BasicHTTPAuthenticatorTest.java rename to extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authentication/BasicHTTPAuthenticatorTest.java index 251c1caf91f3..90796b394dcb 100644 --- a/extensions-core/druid-basic-security/src/test/java/io/druid/security/authentication/BasicHTTPAuthenticatorTest.java +++ b/extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authentication/BasicHTTPAuthenticatorTest.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.security.authentication; +package org.apache.druid.security.authentication; import com.google.common.collect.ImmutableMap; import com.google.inject.Provider; import com.google.inject.util.Providers; -import io.druid.java.util.common.StringUtils; -import io.druid.security.basic.authentication.BasicHTTPAuthenticator; -import io.druid.security.basic.authentication.db.cache.BasicAuthenticatorCacheManager; -import io.druid.security.basic.authentication.entity.BasicAuthenticatorCredentialUpdate; -import io.druid.security.basic.authentication.entity.BasicAuthenticatorCredentials; -import io.druid.security.basic.authentication.entity.BasicAuthenticatorUser; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthenticationResult; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.security.basic.authentication.BasicHTTPAuthenticator; +import org.apache.druid.security.basic.authentication.db.cache.BasicAuthenticatorCacheManager; +import org.apache.druid.security.basic.authentication.entity.BasicAuthenticatorCredentialUpdate; +import org.apache.druid.security.basic.authentication.entity.BasicAuthenticatorCredentials; +import org.apache.druid.security.basic.authentication.entity.BasicAuthenticatorUser; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthenticationResult; import org.asynchttpclient.util.Base64; import org.easymock.EasyMock; import org.junit.Test; diff --git a/extensions-core/druid-basic-security/src/test/java/io/druid/security/authentication/CoordinatorBasicAuthenticatorMetadataStorageUpdaterTest.java b/extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authentication/CoordinatorBasicAuthenticatorMetadataStorageUpdaterTest.java similarity index 84% rename from extensions-core/druid-basic-security/src/test/java/io/druid/security/authentication/CoordinatorBasicAuthenticatorMetadataStorageUpdaterTest.java rename to extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authentication/CoordinatorBasicAuthenticatorMetadataStorageUpdaterTest.java index 729c675f4e80..de566573a311 100644 --- a/extensions-core/druid-basic-security/src/test/java/io/druid/security/authentication/CoordinatorBasicAuthenticatorMetadataStorageUpdaterTest.java +++ b/extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authentication/CoordinatorBasicAuthenticatorMetadataStorageUpdaterTest.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.security.authentication; +package org.apache.druid.security.authentication; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.smile.SmileFactory; import com.google.common.collect.ImmutableMap; -import io.druid.metadata.MetadataStorageTablesConfig; -import io.druid.metadata.TestDerbyConnector; -import io.druid.security.basic.BasicAuthCommonCacheConfig; -import io.druid.security.basic.BasicAuthUtils; -import io.druid.security.basic.BasicSecurityDBResourceException; -import io.druid.security.basic.authentication.BasicHTTPAuthenticator; -import io.druid.security.basic.authentication.db.updater.CoordinatorBasicAuthenticatorMetadataStorageUpdater; -import io.druid.security.basic.authentication.entity.BasicAuthenticatorCredentialUpdate; -import io.druid.security.basic.authentication.entity.BasicAuthenticatorCredentials; -import io.druid.security.basic.authentication.entity.BasicAuthenticatorUser; -import io.druid.server.security.AuthenticatorMapper; +import org.apache.druid.metadata.MetadataStorageTablesConfig; +import org.apache.druid.metadata.TestDerbyConnector; +import org.apache.druid.security.basic.BasicAuthCommonCacheConfig; +import org.apache.druid.security.basic.BasicAuthUtils; +import org.apache.druid.security.basic.BasicSecurityDBResourceException; +import org.apache.druid.security.basic.authentication.BasicHTTPAuthenticator; +import org.apache.druid.security.basic.authentication.db.updater.CoordinatorBasicAuthenticatorMetadataStorageUpdater; +import org.apache.druid.security.basic.authentication.entity.BasicAuthenticatorCredentialUpdate; +import org.apache.druid.security.basic.authentication.entity.BasicAuthenticatorCredentials; +import org.apache.druid.security.basic.authentication.entity.BasicAuthenticatorUser; +import org.apache.druid.server.security.AuthenticatorMapper; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/extensions-core/druid-basic-security/src/test/java/io/druid/security/authentication/CoordinatorBasicAuthenticatorResourceTest.java b/extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authentication/CoordinatorBasicAuthenticatorResourceTest.java similarity index 90% rename from extensions-core/druid-basic-security/src/test/java/io/druid/security/authentication/CoordinatorBasicAuthenticatorResourceTest.java rename to extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authentication/CoordinatorBasicAuthenticatorResourceTest.java index 0f6be11c78b2..72f1c2fba3d3 100644 --- a/extensions-core/druid-basic-security/src/test/java/io/druid/security/authentication/CoordinatorBasicAuthenticatorResourceTest.java +++ b/extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authentication/CoordinatorBasicAuthenticatorResourceTest.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.security.authentication; +package org.apache.druid.security.authentication; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.smile.SmileFactory; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.druid.metadata.MetadataStorageTablesConfig; -import io.druid.metadata.TestDerbyConnector; -import io.druid.security.basic.BasicAuthCommonCacheConfig; -import io.druid.security.basic.BasicAuthUtils; -import io.druid.security.basic.authentication.BasicHTTPAuthenticator; -import io.druid.security.basic.authentication.db.updater.CoordinatorBasicAuthenticatorMetadataStorageUpdater; -import io.druid.security.basic.authentication.endpoint.BasicAuthenticatorResource; -import io.druid.security.basic.authentication.endpoint.CoordinatorBasicAuthenticatorResourceHandler; -import io.druid.security.basic.authentication.entity.BasicAuthenticatorCredentialUpdate; -import io.druid.security.basic.authentication.entity.BasicAuthenticatorCredentials; -import io.druid.security.basic.authentication.entity.BasicAuthenticatorUser; -import io.druid.server.security.AuthenticatorMapper; +import org.apache.druid.metadata.MetadataStorageTablesConfig; +import org.apache.druid.metadata.TestDerbyConnector; +import org.apache.druid.security.basic.BasicAuthCommonCacheConfig; +import org.apache.druid.security.basic.BasicAuthUtils; +import org.apache.druid.security.basic.authentication.BasicHTTPAuthenticator; +import org.apache.druid.security.basic.authentication.db.updater.CoordinatorBasicAuthenticatorMetadataStorageUpdater; +import org.apache.druid.security.basic.authentication.endpoint.BasicAuthenticatorResource; +import org.apache.druid.security.basic.authentication.endpoint.CoordinatorBasicAuthenticatorResourceHandler; +import org.apache.druid.security.basic.authentication.entity.BasicAuthenticatorCredentialUpdate; +import org.apache.druid.security.basic.authentication.entity.BasicAuthenticatorCredentials; +import org.apache.druid.security.basic.authentication.entity.BasicAuthenticatorUser; +import org.apache.druid.server.security.AuthenticatorMapper; import org.easymock.EasyMock; import org.junit.After; import org.junit.Assert; diff --git a/extensions-core/druid-basic-security/src/test/java/io/druid/security/authentication/NoopBasicAuthenticatorCacheNotifier.java b/extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authentication/NoopBasicAuthenticatorCacheNotifier.java similarity index 87% rename from extensions-core/druid-basic-security/src/test/java/io/druid/security/authentication/NoopBasicAuthenticatorCacheNotifier.java rename to extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authentication/NoopBasicAuthenticatorCacheNotifier.java index b17ef550fabc..7c03264bf4c0 100644 --- a/extensions-core/druid-basic-security/src/test/java/io/druid/security/authentication/NoopBasicAuthenticatorCacheNotifier.java +++ b/extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authentication/NoopBasicAuthenticatorCacheNotifier.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.security.authentication; +package org.apache.druid.security.authentication; -import io.druid.security.basic.authentication.db.cache.BasicAuthenticatorCacheNotifier; +import org.apache.druid.security.basic.authentication.db.cache.BasicAuthenticatorCacheNotifier; public class NoopBasicAuthenticatorCacheNotifier implements BasicAuthenticatorCacheNotifier { diff --git a/extensions-core/druid-basic-security/src/test/java/io/druid/security/authorization/BasicRoleBasedAuthorizerTest.java b/extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authorization/BasicRoleBasedAuthorizerTest.java similarity index 79% rename from extensions-core/druid-basic-security/src/test/java/io/druid/security/authorization/BasicRoleBasedAuthorizerTest.java rename to extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authorization/BasicRoleBasedAuthorizerTest.java index 3c0ed6909c8e..53ef10bf74d2 100644 --- a/extensions-core/druid-basic-security/src/test/java/io/druid/security/authorization/BasicRoleBasedAuthorizerTest.java +++ b/extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authorization/BasicRoleBasedAuthorizerTest.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.security.authorization; +package org.apache.druid.security.authorization; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.smile.SmileFactory; import com.google.common.collect.ImmutableMap; -import io.druid.metadata.MetadataStorageTablesConfig; -import io.druid.metadata.TestDerbyConnector; -import io.druid.security.basic.BasicAuthCommonCacheConfig; -import io.druid.security.basic.authorization.BasicRoleBasedAuthorizer; -import io.druid.security.basic.authorization.db.cache.MetadataStoragePollingBasicAuthorizerCacheManager; -import io.druid.security.basic.authorization.db.updater.CoordinatorBasicAuthorizerMetadataStorageUpdater; -import io.druid.server.security.Access; -import io.druid.server.security.Action; -import io.druid.server.security.AuthenticationResult; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.Resource; -import io.druid.server.security.ResourceAction; -import io.druid.server.security.ResourceType; +import org.apache.druid.metadata.MetadataStorageTablesConfig; +import org.apache.druid.metadata.TestDerbyConnector; +import org.apache.druid.security.basic.BasicAuthCommonCacheConfig; +import org.apache.druid.security.basic.authorization.BasicRoleBasedAuthorizer; +import org.apache.druid.security.basic.authorization.db.cache.MetadataStoragePollingBasicAuthorizerCacheManager; +import org.apache.druid.security.basic.authorization.db.updater.CoordinatorBasicAuthorizerMetadataStorageUpdater; +import org.apache.druid.server.security.Access; +import org.apache.druid.server.security.Action; +import org.apache.druid.server.security.AuthenticationResult; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.Resource; +import org.apache.druid.server.security.ResourceAction; +import org.apache.druid.server.security.ResourceType; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/extensions-core/druid-basic-security/src/test/java/io/druid/security/authorization/CoordinatorBasicAuthorizerMetadataStorageUpdaterTest.java b/extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authorization/CoordinatorBasicAuthorizerMetadataStorageUpdaterTest.java similarity index 92% rename from extensions-core/druid-basic-security/src/test/java/io/druid/security/authorization/CoordinatorBasicAuthorizerMetadataStorageUpdaterTest.java rename to extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authorization/CoordinatorBasicAuthorizerMetadataStorageUpdaterTest.java index 3b644605c6ec..c2fe5944a98a 100644 --- a/extensions-core/druid-basic-security/src/test/java/io/druid/security/authorization/CoordinatorBasicAuthorizerMetadataStorageUpdaterTest.java +++ b/extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authorization/CoordinatorBasicAuthorizerMetadataStorageUpdaterTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.security.authorization; +package org.apache.druid.security.authorization; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.smile.SmileFactory; @@ -25,21 +25,21 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; -import io.druid.metadata.MetadataStorageTablesConfig; -import io.druid.metadata.TestDerbyConnector; -import io.druid.security.basic.BasicAuthCommonCacheConfig; -import io.druid.security.basic.BasicAuthUtils; -import io.druid.security.basic.BasicSecurityDBResourceException; -import io.druid.security.basic.authorization.BasicRoleBasedAuthorizer; -import io.druid.security.basic.authorization.db.updater.CoordinatorBasicAuthorizerMetadataStorageUpdater; -import io.druid.security.basic.authorization.entity.BasicAuthorizerPermission; -import io.druid.security.basic.authorization.entity.BasicAuthorizerRole; -import io.druid.security.basic.authorization.entity.BasicAuthorizerUser; -import io.druid.server.security.Action; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.Resource; -import io.druid.server.security.ResourceAction; -import io.druid.server.security.ResourceType; +import org.apache.druid.metadata.MetadataStorageTablesConfig; +import org.apache.druid.metadata.TestDerbyConnector; +import org.apache.druid.security.basic.BasicAuthCommonCacheConfig; +import org.apache.druid.security.basic.BasicAuthUtils; +import org.apache.druid.security.basic.BasicSecurityDBResourceException; +import org.apache.druid.security.basic.authorization.BasicRoleBasedAuthorizer; +import org.apache.druid.security.basic.authorization.db.updater.CoordinatorBasicAuthorizerMetadataStorageUpdater; +import org.apache.druid.security.basic.authorization.entity.BasicAuthorizerPermission; +import org.apache.druid.security.basic.authorization.entity.BasicAuthorizerRole; +import org.apache.druid.security.basic.authorization.entity.BasicAuthorizerUser; +import org.apache.druid.server.security.Action; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.Resource; +import org.apache.druid.server.security.ResourceAction; +import org.apache.druid.server.security.ResourceType; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; diff --git a/extensions-core/druid-basic-security/src/test/java/io/druid/security/authorization/CoordinatorBasicAuthorizerResourceTest.java b/extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authorization/CoordinatorBasicAuthorizerResourceTest.java similarity index 94% rename from extensions-core/druid-basic-security/src/test/java/io/druid/security/authorization/CoordinatorBasicAuthorizerResourceTest.java rename to extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authorization/CoordinatorBasicAuthorizerResourceTest.java index 7b8aafd2357a..ef10dcc30dee 100644 --- a/extensions-core/druid-basic-security/src/test/java/io/druid/security/authorization/CoordinatorBasicAuthorizerResourceTest.java +++ b/extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authorization/CoordinatorBasicAuthorizerResourceTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.security.authorization; +package org.apache.druid.security.authorization; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.smile.SmileFactory; @@ -25,24 +25,24 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import io.druid.metadata.MetadataStorageTablesConfig; -import io.druid.metadata.TestDerbyConnector; -import io.druid.security.basic.BasicAuthCommonCacheConfig; -import io.druid.security.basic.BasicAuthUtils; -import io.druid.security.basic.authorization.BasicRoleBasedAuthorizer; -import io.druid.security.basic.authorization.db.updater.CoordinatorBasicAuthorizerMetadataStorageUpdater; -import io.druid.security.basic.authorization.endpoint.BasicAuthorizerResource; -import io.druid.security.basic.authorization.endpoint.CoordinatorBasicAuthorizerResourceHandler; -import io.druid.security.basic.authorization.entity.BasicAuthorizerPermission; -import io.druid.security.basic.authorization.entity.BasicAuthorizerRole; -import io.druid.security.basic.authorization.entity.BasicAuthorizerRoleFull; -import io.druid.security.basic.authorization.entity.BasicAuthorizerUser; -import io.druid.security.basic.authorization.entity.BasicAuthorizerUserFull; -import io.druid.server.security.Action; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.Resource; -import io.druid.server.security.ResourceAction; -import io.druid.server.security.ResourceType; +import org.apache.druid.metadata.MetadataStorageTablesConfig; +import org.apache.druid.metadata.TestDerbyConnector; +import org.apache.druid.security.basic.BasicAuthCommonCacheConfig; +import org.apache.druid.security.basic.BasicAuthUtils; +import org.apache.druid.security.basic.authorization.BasicRoleBasedAuthorizer; +import org.apache.druid.security.basic.authorization.db.updater.CoordinatorBasicAuthorizerMetadataStorageUpdater; +import org.apache.druid.security.basic.authorization.endpoint.BasicAuthorizerResource; +import org.apache.druid.security.basic.authorization.endpoint.CoordinatorBasicAuthorizerResourceHandler; +import org.apache.druid.security.basic.authorization.entity.BasicAuthorizerPermission; +import org.apache.druid.security.basic.authorization.entity.BasicAuthorizerRole; +import org.apache.druid.security.basic.authorization.entity.BasicAuthorizerRoleFull; +import org.apache.druid.security.basic.authorization.entity.BasicAuthorizerUser; +import org.apache.druid.security.basic.authorization.entity.BasicAuthorizerUserFull; +import org.apache.druid.server.security.Action; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.Resource; +import org.apache.druid.server.security.ResourceAction; +import org.apache.druid.server.security.ResourceType; import org.easymock.EasyMock; import org.junit.After; import org.junit.Assert; diff --git a/extensions-core/druid-basic-security/src/test/java/io/druid/security/authorization/NoopBasicAuthorizerCacheNotifier.java b/extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authorization/NoopBasicAuthorizerCacheNotifier.java similarity index 87% rename from extensions-core/druid-basic-security/src/test/java/io/druid/security/authorization/NoopBasicAuthorizerCacheNotifier.java rename to extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authorization/NoopBasicAuthorizerCacheNotifier.java index 7734b6d2499d..2f0ff42f67ee 100644 --- a/extensions-core/druid-basic-security/src/test/java/io/druid/security/authorization/NoopBasicAuthorizerCacheNotifier.java +++ b/extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authorization/NoopBasicAuthorizerCacheNotifier.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.security.authorization; +package org.apache.druid.security.authorization; -import io.druid.security.basic.authorization.db.cache.BasicAuthorizerCacheNotifier; +import org.apache.druid.security.basic.authorization.db.cache.BasicAuthorizerCacheNotifier; public class NoopBasicAuthorizerCacheNotifier implements BasicAuthorizerCacheNotifier { diff --git a/extensions-core/druid-kerberos/pom.xml b/extensions-core/druid-kerberos/pom.xml index bbc2396a6472..61e538c7afa9 100644 --- a/extensions-core/druid-kerberos/pom.xml +++ b/extensions-core/druid-kerberos/pom.xml @@ -22,13 +22,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - io.druid.extensions + org.apache.druid.extensions druid-kerberos druid-kerberos druid-kerberos - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT ../../pom.xml @@ -36,13 +36,13 @@ - io.druid + org.apache.druid druid-processing ${project.parent.version} provided - io.druid + org.apache.druid druid-server ${project.parent.version} provided @@ -165,7 +165,7 @@ - io.druid + org.apache.druid druid-processing ${project.parent.version} test diff --git a/extensions-core/druid-kerberos/src/main/java/io/druid/security/kerberos/DruidKerberosAuthenticationHandler.java b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/DruidKerberosAuthenticationHandler.java similarity index 98% rename from extensions-core/druid-kerberos/src/main/java/io/druid/security/kerberos/DruidKerberosAuthenticationHandler.java rename to extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/DruidKerberosAuthenticationHandler.java index a8e4cad7c002..403fa1514ef1 100644 --- a/extensions-core/druid-kerberos/src/main/java/io/druid/security/kerberos/DruidKerberosAuthenticationHandler.java +++ b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/DruidKerberosAuthenticationHandler.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.security.kerberos; +package org.apache.druid.security.kerberos; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.logger.Logger; import org.apache.commons.codec.binary.Base64; import org.apache.hadoop.security.authentication.client.AuthenticationException; import org.apache.hadoop.security.authentication.server.AuthenticationToken; diff --git a/extensions-core/druid-kerberos/src/main/java/io/druid/security/kerberos/DruidKerberosModule.java b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/DruidKerberosModule.java similarity index 93% rename from extensions-core/druid-kerberos/src/main/java/io/druid/security/kerberos/DruidKerberosModule.java rename to extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/DruidKerberosModule.java index c59b1403e548..f9dcf3ffeb47 100644 --- a/extensions-core/druid-kerberos/src/main/java/io/druid/security/kerberos/DruidKerberosModule.java +++ b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/DruidKerberosModule.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.security.kerberos; +package org.apache.druid.security.kerberos; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.common.collect.ImmutableList; import com.google.inject.Binder; -import io.druid.initialization.DruidModule; +import org.apache.druid.initialization.DruidModule; import java.util.List; diff --git a/extensions-core/druid-kerberos/src/main/java/io/druid/security/kerberos/DruidKerberosUtil.java b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/DruidKerberosUtil.java similarity index 97% rename from extensions-core/druid-kerberos/src/main/java/io/druid/security/kerberos/DruidKerberosUtil.java rename to extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/DruidKerberosUtil.java index e23d85cc668d..6ffff0f9778c 100644 --- a/extensions-core/druid-kerberos/src/main/java/io/druid/security/kerberos/DruidKerberosUtil.java +++ b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/DruidKerberosUtil.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.security.kerberos; +package org.apache.druid.security.kerberos; import com.google.common.base.Strings; -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 org.apache.commons.codec.binary.Base64; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; diff --git a/extensions-core/druid-kerberos/src/main/java/io/druid/security/kerberos/KerberosAuthenticator.java b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosAuthenticator.java similarity index 98% rename from extensions-core/druid-kerberos/src/main/java/io/druid/security/kerberos/KerberosAuthenticator.java rename to extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosAuthenticator.java index f94d445c4969..6d562a6ad055 100644 --- a/extensions-core/druid-kerberos/src/main/java/io/druid/security/kerberos/KerberosAuthenticator.java +++ b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosAuthenticator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.security.kerberos; +package org.apache.druid.security.kerberos; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; @@ -26,13 +26,13 @@ import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; -import io.druid.guice.annotations.Self; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.DruidNode; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthenticationResult; -import io.druid.server.security.Authenticator; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthenticationResult; +import org.apache.druid.server.security.Authenticator; import org.apache.commons.codec.binary.Base64; import org.apache.hadoop.security.SecurityUtil; import org.apache.hadoop.security.authentication.client.AuthenticatedURL; diff --git a/extensions-core/druid-kerberos/src/main/java/io/druid/security/kerberos/KerberosEscalator.java b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosEscalator.java similarity index 85% rename from extensions-core/druid-kerberos/src/main/java/io/druid/security/kerberos/KerberosEscalator.java rename to extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosEscalator.java index 06c2756a0a4c..87b63aed4c82 100644 --- a/extensions-core/druid-kerberos/src/main/java/io/druid/security/kerberos/KerberosEscalator.java +++ b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosEscalator.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.security.kerberos; +package org.apache.druid.security.kerberos; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.http.client.HttpClient; -import io.druid.server.security.AuthenticationResult; -import io.druid.server.security.Escalator; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.server.security.AuthenticationResult; +import org.apache.druid.server.security.Escalator; @JsonTypeName("kerberos") public class KerberosEscalator implements Escalator @@ -58,7 +58,7 @@ public HttpClient createEscalatedClient(HttpClient baseClient) public AuthenticationResult createEscalatedAuthenticationResult() { // if you found your self asking why the authenticatedBy field is set to null please read this: - // https://github.com/druid-io/druid/pull/5706#discussion_r185940889 + // https://github.com/apache/incubator-druid/pull/5706#discussion_r185940889 return new AuthenticationResult(internalClientPrincipal, authorizerName, null, null); } diff --git a/extensions-core/druid-kerberos/src/main/java/io/druid/security/kerberos/KerberosHttpClient.java b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosHttpClient.java similarity index 92% rename from extensions-core/druid-kerberos/src/main/java/io/druid/security/kerberos/KerberosHttpClient.java rename to extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosHttpClient.java index 2e97748f2275..75e46906ceb8 100644 --- a/extensions-core/druid-kerberos/src/main/java/io/druid/security/kerberos/KerberosHttpClient.java +++ b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosHttpClient.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.security.kerberos; +package org.apache.druid.security.kerberos; import com.google.common.base.Throwables; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import io.druid.java.util.http.client.AbstractHttpClient; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.Request; -import io.druid.java.util.http.client.response.HttpResponseHandler; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.http.client.AbstractHttpClient; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.Request; +import org.apache.druid.java.util.http.client.response.HttpResponseHandler; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.logger.Logger; import org.apache.hadoop.security.UserGroupInformation; import org.jboss.netty.handler.codec.http.HttpHeaders; import org.joda.time.Duration; diff --git a/extensions-core/druid-kerberos/src/main/java/io/druid/security/kerberos/ResponseCookieHandler.java b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/ResponseCookieHandler.java similarity index 91% rename from extensions-core/druid-kerberos/src/main/java/io/druid/security/kerberos/ResponseCookieHandler.java rename to extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/ResponseCookieHandler.java index 1abb9954ae4c..02212ac91fed 100644 --- a/extensions-core/druid-kerberos/src/main/java/io/druid/security/kerberos/ResponseCookieHandler.java +++ b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/ResponseCookieHandler.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.security.kerberos; +package org.apache.druid.security.kerberos; import com.google.common.base.Function; import com.google.common.collect.Maps; -import io.druid.java.util.http.client.response.ClientResponse; -import io.druid.java.util.http.client.response.HttpResponseHandler; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.http.client.response.ClientResponse; +import org.apache.druid.java.util.http.client.response.HttpResponseHandler; +import org.apache.druid.java.util.common.logger.Logger; import org.jboss.netty.handler.codec.http.HttpChunk; import org.jboss.netty.handler.codec.http.HttpHeaders; import org.jboss.netty.handler.codec.http.HttpResponse; diff --git a/extensions-core/druid-kerberos/src/main/java/io/druid/security/kerberos/RetryIfUnauthorizedResponseHandler.java b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/RetryIfUnauthorizedResponseHandler.java similarity index 93% rename from extensions-core/druid-kerberos/src/main/java/io/druid/security/kerberos/RetryIfUnauthorizedResponseHandler.java rename to extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/RetryIfUnauthorizedResponseHandler.java index a99ac86748a2..06d765123957 100644 --- a/extensions-core/druid-kerberos/src/main/java/io/druid/security/kerberos/RetryIfUnauthorizedResponseHandler.java +++ b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/RetryIfUnauthorizedResponseHandler.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.security.kerberos; +package org.apache.druid.security.kerberos; -import io.druid.java.util.http.client.response.ClientResponse; -import io.druid.java.util.http.client.response.HttpResponseHandler; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.http.client.response.ClientResponse; +import org.apache.druid.java.util.http.client.response.HttpResponseHandler; +import org.apache.druid.java.util.common.logger.Logger; import org.jboss.netty.handler.codec.http.HttpChunk; import org.jboss.netty.handler.codec.http.HttpResponse; import org.jboss.netty.handler.codec.http.HttpResponseStatus; diff --git a/extensions-core/druid-kerberos/src/main/java/io/druid/security/kerberos/RetryResponseHolder.java b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/RetryResponseHolder.java similarity index 96% rename from extensions-core/druid-kerberos/src/main/java/io/druid/security/kerberos/RetryResponseHolder.java rename to extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/RetryResponseHolder.java index 029595afa478..acfb747914ee 100644 --- a/extensions-core/druid-kerberos/src/main/java/io/druid/security/kerberos/RetryResponseHolder.java +++ b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/RetryResponseHolder.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.security.kerberos; +package org.apache.druid.security.kerberos; public class RetryResponseHolder { diff --git a/extensions-core/druid-kerberos/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-core/druid-kerberos/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index c1d9b227def1..000000000000 --- a/extensions-core/druid-kerberos/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.security.kerberos.DruidKerberosModule diff --git a/extensions-core/druid-kerberos/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-core/druid-kerberos/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..b9c6bc48b152 --- /dev/null +++ b/extensions-core/druid-kerberos/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.security.kerberos.DruidKerberosModule diff --git a/extensions-core/hdfs-storage/pom.xml b/extensions-core/hdfs-storage/pom.xml index 631248702e43..6580e475d4fa 100644 --- a/extensions-core/hdfs-storage/pom.xml +++ b/extensions-core/hdfs-storage/pom.xml @@ -21,13 +21,13 @@ 4.0.0 - io.druid.extensions + org.apache.druid.extensions druid-hdfs-storage druid-hdfs-storage druid-hdfs-storage - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT ../../pom.xml @@ -35,19 +35,19 @@ - io.druid + org.apache.druid druid-api ${project.parent.version} provided - io.druid + org.apache.druid druid-common ${project.parent.version} provided - io.druid + org.apache.druid java-util ${project.parent.version} provided @@ -162,13 +162,13 @@ test - io.druid + org.apache.druid druid-server ${project.parent.version} test - io.druid + org.apache.druid druid-processing ${project.parent.version} test-jar @@ -195,7 +195,7 @@ test - io.druid + org.apache.druid druid-indexing-hadoop ${project.parent.version} test diff --git a/extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsDataSegmentFinder.java b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentFinder.java similarity index 93% rename from extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsDataSegmentFinder.java rename to extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentFinder.java index 5ddd40368684..aaab1b5148a2 100644 --- a/extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsDataSegmentFinder.java +++ b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentFinder.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.storage.hdfs; +package org.apache.druid.storage.hdfs; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; import com.google.inject.Inject; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.loading.DataSegmentFinder; -import io.druid.segment.loading.SegmentLoadingException; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.loading.DataSegmentFinder; +import org.apache.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.timeline.DataSegment; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.LocatedFileStatus; diff --git a/extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsDataSegmentKiller.java b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentKiller.java similarity index 93% rename from extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsDataSegmentKiller.java rename to extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentKiller.java index ff8c1509cc7d..b660ea10bfdb 100644 --- a/extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsDataSegmentKiller.java +++ b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentKiller.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.storage.hdfs; +package org.apache.druid.storage.hdfs; import com.google.common.base.Preconditions; import com.google.inject.Inject; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.segment.loading.DataSegmentKiller; -import io.druid.segment.loading.SegmentLoadingException; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.segment.loading.DataSegmentKiller; +import org.apache.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.timeline.DataSegment; import org.apache.commons.lang.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; @@ -88,7 +88,7 @@ public void kill(DataSegment segment) throws SegmentLoadingException descriptorPath = new Path( segmentPath.getParent(), - io.druid.java.util.common.StringUtils.format( + org.apache.druid.java.util.common.StringUtils.format( "%s_%sdescriptor.json", zipParts[0], zipParts.length == 2 ? "" : zipParts[1] + "_" diff --git a/extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsDataSegmentPuller.java b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPuller.java similarity index 94% rename from extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsDataSegmentPuller.java rename to extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPuller.java index 5977609fe949..a3bfad6f198b 100644 --- a/extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsDataSegmentPuller.java +++ b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPuller.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.storage.hdfs; +package org.apache.druid.storage.hdfs; import com.google.common.base.Predicate; import com.google.common.base.Throwables; import com.google.common.io.ByteSource; import com.google.inject.Inject; -import io.druid.java.util.common.CompressionUtils; -import io.druid.java.util.common.FileUtils; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.RetryUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.UOE; -import io.druid.java.util.common.io.NativeIO; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.loading.SegmentLoadingException; -import io.druid.segment.loading.URIDataPuller; +import org.apache.druid.java.util.common.CompressionUtils; +import org.apache.druid.java.util.common.FileUtils; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.RetryUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.UOE; +import org.apache.druid.java.util.common.io.NativeIO; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.segment.loading.URIDataPuller; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FileSystem; diff --git a/extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsDataSegmentPusher.java b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPusher.java similarity index 94% rename from extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsDataSegmentPusher.java rename to extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPusher.java index c9656c570436..cf6ceab4dcbd 100644 --- a/extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsDataSegmentPusher.java +++ b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPusher.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.hdfs; +package org.apache.druid.storage.hdfs; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; @@ -27,14 +27,14 @@ import com.google.common.io.ByteSink; import com.google.common.io.ByteSource; import com.google.inject.Inject; -import io.druid.common.utils.UUIDUtils; -import io.druid.java.util.common.CompressionUtils; -import io.druid.java.util.common.IOE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.SegmentUtils; -import io.druid.segment.loading.DataSegmentPusher; -import io.druid.timeline.DataSegment; +import org.apache.druid.common.utils.UUIDUtils; +import org.apache.druid.java.util.common.CompressionUtils; +import org.apache.druid.java.util.common.IOE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.SegmentUtils; +import org.apache.druid.segment.loading.DataSegmentPusher; +import org.apache.druid.timeline.DataSegment; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataOutputStream; import org.apache.hadoop.fs.FileSystem; @@ -58,7 +58,7 @@ public class HdfsDataSegmentPusher implements DataSegmentPusher private final ObjectMapper jsonMapper; // We lazily initialize fullQualifiedStorageDirectory to avoid potential issues with Hadoop namenode HA. - // Please see https://github.com/druid-io/druid/pull/5684 + // Please see https://github.com/apache/incubator-druid/pull/5684 private final Supplier fullyQualifiedStorageDirectory; @Inject diff --git a/extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsDataSegmentPusherConfig.java b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPusherConfig.java similarity index 96% rename from extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsDataSegmentPusherConfig.java rename to extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPusherConfig.java index 75ca2c2e8f5f..7692be131179 100644 --- a/extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsDataSegmentPusherConfig.java +++ b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPusherConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.hdfs; +package org.apache.druid.storage.hdfs; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsFileTimestampVersionFinder.java b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsFileTimestampVersionFinder.java similarity index 95% rename from extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsFileTimestampVersionFinder.java rename to extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsFileTimestampVersionFinder.java index ecdff1184d9c..d89213a409a1 100644 --- a/extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsFileTimestampVersionFinder.java +++ b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsFileTimestampVersionFinder.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.storage.hdfs; +package org.apache.druid.storage.hdfs; import com.google.common.base.Throwables; import com.google.inject.Inject; -import io.druid.data.SearchableVersionedDataFinder; -import io.druid.java.util.common.RetryUtils; +import org.apache.druid.data.SearchableVersionedDataFinder; +import org.apache.druid.java.util.common.RetryUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; diff --git a/extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsKerberosConfig.java b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsKerberosConfig.java similarity index 98% rename from extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsKerberosConfig.java rename to extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsKerberosConfig.java index 09004bc33385..657cf77cfe3c 100644 --- a/extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsKerberosConfig.java +++ b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsKerberosConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.hdfs; +package org.apache.druid.storage.hdfs; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsLoadSpec.java b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsLoadSpec.java similarity index 92% rename from extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsLoadSpec.java rename to extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsLoadSpec.java index 1c47be50126b..e169ab23de17 100644 --- a/extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsLoadSpec.java +++ b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsLoadSpec.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.storage.hdfs; +package org.apache.druid.storage.hdfs; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.base.Preconditions; -import io.druid.segment.loading.LoadSpec; -import io.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.segment.loading.LoadSpec; +import org.apache.druid.segment.loading.SegmentLoadingException; import org.apache.hadoop.fs.Path; import java.io.File; diff --git a/extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsStorageAuthentication.java b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsStorageAuthentication.java similarity index 88% rename from extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsStorageAuthentication.java rename to extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsStorageAuthentication.java index f62b2d2caf24..b9155265a8df 100644 --- a/extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsStorageAuthentication.java +++ b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsStorageAuthentication.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.storage.hdfs; +package org.apache.druid.storage.hdfs; import com.google.common.base.Strings; import com.google.inject.Inject; -import io.druid.guice.ManageLifecycle; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.common.logger.Logger; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.security.UserGroupInformation; diff --git a/extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsStorageDruidModule.java b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsStorageDruidModule.java similarity index 88% rename from extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsStorageDruidModule.java rename to extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsStorageDruidModule.java index 94c05aaaab9f..e6f7057fa7ae 100644 --- a/extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsStorageDruidModule.java +++ b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsStorageDruidModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.hdfs; +package org.apache.druid.storage.hdfs; import com.fasterxml.jackson.core.Version; import com.fasterxml.jackson.databind.Module; @@ -26,15 +26,15 @@ import com.google.inject.Binder; import com.google.inject.Inject; import com.google.inject.multibindings.MapBinder; -import io.druid.data.SearchableVersionedDataFinder; -import io.druid.guice.Binders; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.LazySingleton; -import io.druid.guice.LifecycleModule; -import io.druid.guice.ManageLifecycle; -import io.druid.initialization.DruidModule; -import io.druid.storage.hdfs.tasklog.HdfsTaskLogs; -import io.druid.storage.hdfs.tasklog.HdfsTaskLogsConfig; +import org.apache.druid.data.SearchableVersionedDataFinder; +import org.apache.druid.guice.Binders; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.LifecycleModule; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.storage.hdfs.tasklog.HdfsTaskLogs; +import org.apache.druid.storage.hdfs.tasklog.HdfsTaskLogsConfig; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; @@ -100,7 +100,7 @@ public void configure(Binder binder) conf.setClassLoader(getClass().getClassLoader()); // Ensure that FileSystem class level initialization happens with correct CL - // See https://github.com/druid-io/druid/issues/1714 + // See https://github.com/apache/incubator-druid/issues/1714 ClassLoader currCtxCl = Thread.currentThread().getContextClassLoader(); try { Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); diff --git a/extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/tasklog/HdfsTaskLogs.java b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/tasklog/HdfsTaskLogs.java similarity index 96% rename from extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/tasklog/HdfsTaskLogs.java rename to extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/tasklog/HdfsTaskLogs.java index 10ced8992179..94cd82856ace 100644 --- a/extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/tasklog/HdfsTaskLogs.java +++ b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/tasklog/HdfsTaskLogs.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.storage.hdfs.tasklog; +package org.apache.druid.storage.hdfs.tasklog; import com.google.common.base.Optional; import com.google.common.io.ByteSource; import com.google.common.io.ByteStreams; import com.google.inject.Inject; -import io.druid.java.util.common.IOE; -import io.druid.java.util.common.logger.Logger; -import io.druid.tasklogs.TaskLogs; +import org.apache.druid.java.util.common.IOE; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.tasklogs.TaskLogs; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FileStatus; diff --git a/extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/tasklog/HdfsTaskLogsConfig.java b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/tasklog/HdfsTaskLogsConfig.java similarity index 96% rename from extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/tasklog/HdfsTaskLogsConfig.java rename to extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/tasklog/HdfsTaskLogsConfig.java index b335e09828a1..820ce2637c8a 100644 --- a/extensions-core/hdfs-storage/src/main/java/io/druid/storage/hdfs/tasklog/HdfsTaskLogsConfig.java +++ b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/tasklog/HdfsTaskLogsConfig.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.storage.hdfs.tasklog; +package org.apache.druid.storage.hdfs.tasklog; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-core/hdfs-storage/src/main/java/org/apache/hadoop/fs/HadoopFsWrapper.java b/extensions-core/hdfs-storage/src/main/java/org/apache/hadoop/fs/HadoopFsWrapper.java index db82bc5214e4..3c61aac333a9 100644 --- a/extensions-core/hdfs-storage/src/main/java/org/apache/hadoop/fs/HadoopFsWrapper.java +++ b/extensions-core/hdfs-storage/src/main/java/org/apache/hadoop/fs/HadoopFsWrapper.java @@ -20,7 +20,7 @@ package org.apache.hadoop.fs; import com.google.common.base.Throwables; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.logger.Logger; import java.io.IOException; import java.lang.reflect.InvocationTargetException; @@ -54,7 +54,7 @@ public static boolean rename(FileSystem fs, Path from, Path to) try { // Note: Using reflection instead of simpler // fs.rename(from, to, Options.Rename.NONE); - // due to the issues discussed in https://github.com/druid-io/druid/pull/3787 + // due to the issues discussed in https://github.com/apache/incubator-druid/pull/3787 Method renameMethod = findRenameMethodRecursively(fs.getClass()); renameMethod.invoke(fs, from, to, new Options.Rename[]{Options.Rename.NONE}); return true; diff --git a/extensions-core/hdfs-storage/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-core/hdfs-storage/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index f3ccd6b05ca6..000000000000 --- a/extensions-core/hdfs-storage/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.storage.hdfs.HdfsStorageDruidModule \ No newline at end of file diff --git a/extensions-core/hdfs-storage/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-core/hdfs-storage/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..6af1bd1f19e3 --- /dev/null +++ b/extensions-core/hdfs-storage/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.storage.hdfs.HdfsStorageDruidModule \ No newline at end of file diff --git a/extensions-core/hdfs-storage/src/test/java/io/druid/indexing/common/tasklogs/HdfsTaskLogsTest.java b/extensions-core/hdfs-storage/src/test/java/org/apache/druid/indexing/common/tasklogs/HdfsTaskLogsTest.java similarity index 94% rename from extensions-core/hdfs-storage/src/test/java/io/druid/indexing/common/tasklogs/HdfsTaskLogsTest.java rename to extensions-core/hdfs-storage/src/test/java/org/apache/druid/indexing/common/tasklogs/HdfsTaskLogsTest.java index 5e3bcadfad45..49de4594be48 100644 --- a/extensions-core/hdfs-storage/src/test/java/io/druid/indexing/common/tasklogs/HdfsTaskLogsTest.java +++ b/extensions-core/hdfs-storage/src/test/java/org/apache/druid/indexing/common/tasklogs/HdfsTaskLogsTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.indexing.common.tasklogs; +package org.apache.druid.indexing.common.tasklogs; import com.google.common.collect.ImmutableMap; import com.google.common.io.ByteStreams; import com.google.common.io.Files; -import io.druid.java.util.common.StringUtils; -import io.druid.storage.hdfs.tasklog.HdfsTaskLogs; -import io.druid.storage.hdfs.tasklog.HdfsTaskLogsConfig; -import io.druid.tasklogs.TaskLogs; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.storage.hdfs.tasklog.HdfsTaskLogs; +import org.apache.druid.storage.hdfs.tasklog.HdfsTaskLogsConfig; +import org.apache.druid.tasklogs.TaskLogs; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/extensions-core/hdfs-storage/src/test/java/io/druid/segment/loading/HdfsDataSegmentFinderTest.java b/extensions-core/hdfs-storage/src/test/java/org/apache/druid/segment/loading/HdfsDataSegmentFinderTest.java similarity index 96% rename from extensions-core/hdfs-storage/src/test/java/io/druid/segment/loading/HdfsDataSegmentFinderTest.java rename to extensions-core/hdfs-storage/src/test/java/org/apache/druid/segment/loading/HdfsDataSegmentFinderTest.java index 0d6cc0f283cd..a0b7c1894c37 100644 --- a/extensions-core/hdfs-storage/src/test/java/io/druid/segment/loading/HdfsDataSegmentFinderTest.java +++ b/extensions-core/hdfs-storage/src/test/java/org/apache/druid/segment/loading/HdfsDataSegmentFinderTest.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.segment.loading; +package org.apache.druid.segment.loading; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.IOE; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.segment.TestHelper; -import io.druid.storage.hdfs.HdfsDataSegmentFinder; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NumberedShardSpec; +import org.apache.druid.java.util.common.IOE; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.storage.hdfs.HdfsDataSegmentFinder; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NumberedShardSpec; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.hadoop.conf.Configuration; diff --git a/extensions-core/hdfs-storage/src/test/java/io/druid/segment/loading/HdfsFileTimestampVersionFinderTest.java b/extensions-core/hdfs-storage/src/test/java/org/apache/druid/segment/loading/HdfsFileTimestampVersionFinderTest.java similarity index 97% rename from extensions-core/hdfs-storage/src/test/java/io/druid/segment/loading/HdfsFileTimestampVersionFinderTest.java rename to extensions-core/hdfs-storage/src/test/java/org/apache/druid/segment/loading/HdfsFileTimestampVersionFinderTest.java index 524a66ac2bf3..22203250b329 100644 --- a/extensions-core/hdfs-storage/src/test/java/io/druid/segment/loading/HdfsFileTimestampVersionFinderTest.java +++ b/extensions-core/hdfs-storage/src/test/java/org/apache/druid/segment/loading/HdfsFileTimestampVersionFinderTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment.loading; +package org.apache.druid.segment.loading; import com.google.common.io.ByteStreams; -import io.druid.java.util.common.IOE; -import io.druid.java.util.common.StringUtils; -import io.druid.storage.hdfs.HdfsFileTimestampVersionFinder; +import org.apache.druid.java.util.common.IOE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.storage.hdfs.HdfsFileTimestampVersionFinder; import org.apache.commons.io.FileUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; diff --git a/extensions-core/hdfs-storage/src/test/java/io/druid/storage/hdfs/HdfsDataSegmentKillerTest.java b/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentKillerTest.java similarity index 96% rename from extensions-core/hdfs-storage/src/test/java/io/druid/storage/hdfs/HdfsDataSegmentKillerTest.java rename to extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentKillerTest.java index a64a95048310..5c0961a70cde 100644 --- a/extensions-core/hdfs-storage/src/test/java/io/druid/storage/hdfs/HdfsDataSegmentKillerTest.java +++ b/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentKillerTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.storage.hdfs; +package org.apache.druid.storage.hdfs; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/extensions-core/hdfs-storage/src/test/java/io/druid/storage/hdfs/HdfsDataSegmentPullerTest.java b/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPullerTest.java similarity index 96% rename from extensions-core/hdfs-storage/src/test/java/io/druid/storage/hdfs/HdfsDataSegmentPullerTest.java rename to extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPullerTest.java index 46907cf70e3e..7dc691fc77c3 100644 --- a/extensions-core/hdfs-storage/src/test/java/io/druid/storage/hdfs/HdfsDataSegmentPullerTest.java +++ b/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPullerTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.storage.hdfs; +package org.apache.druid.storage.hdfs; import com.google.common.io.ByteStreams; -import io.druid.java.util.common.CompressionUtils; -import io.druid.java.util.common.IOE; -import io.druid.java.util.common.StringUtils; -import io.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.java.util.common.CompressionUtils; +import org.apache.druid.java.util.common.IOE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.segment.loading.SegmentLoadingException; import org.apache.commons.io.FileUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; diff --git a/extensions-core/hdfs-storage/src/test/java/io/druid/storage/hdfs/HdfsDataSegmentPusherTest.java b/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPusherTest.java similarity index 96% rename from extensions-core/hdfs-storage/src/test/java/io/druid/storage/hdfs/HdfsDataSegmentPusherTest.java rename to extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPusherTest.java index 3a211ea77088..8b0684d173ee 100644 --- a/extensions-core/hdfs-storage/src/test/java/io/druid/storage/hdfs/HdfsDataSegmentPusherTest.java +++ b/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPusherTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.hdfs; +package org.apache.druid.storage.hdfs; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; @@ -35,19 +35,19 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.io.Files; -import io.druid.indexer.Bucket; -import io.druid.indexer.HadoopDruidIndexerConfig; -import io.druid.indexer.HadoopIngestionSpec; -import io.druid.indexer.JobHelper; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.jackson.GranularityModule; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.segment.loading.LocalDataSegmentPusher; -import io.druid.segment.loading.LocalDataSegmentPusherConfig; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; -import io.druid.timeline.partition.NumberedShardSpec; +import org.apache.druid.indexer.Bucket; +import org.apache.druid.indexer.HadoopDruidIndexerConfig; +import org.apache.druid.indexer.HadoopIngestionSpec; +import org.apache.druid.indexer.JobHelper; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.jackson.GranularityModule; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.segment.loading.LocalDataSegmentPusher; +import org.apache.druid.segment.loading.LocalDataSegmentPusherConfig; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.timeline.partition.NumberedShardSpec; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.LocalFileSystem; diff --git a/extensions-core/hdfs-storage/src/test/java/io/druid/storage/hdfs/HdfsKerberosConfigTest.java b/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsKerberosConfigTest.java similarity index 97% rename from extensions-core/hdfs-storage/src/test/java/io/druid/storage/hdfs/HdfsKerberosConfigTest.java rename to extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsKerberosConfigTest.java index 3af1f50065c2..0ad484207ef6 100644 --- a/extensions-core/hdfs-storage/src/test/java/io/druid/storage/hdfs/HdfsKerberosConfigTest.java +++ b/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsKerberosConfigTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.hdfs; +package org.apache.druid.storage.hdfs; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; diff --git a/extensions-core/histogram/pom.xml b/extensions-core/histogram/pom.xml index 2051b1b4bb04..2caa65fbfa22 100644 --- a/extensions-core/histogram/pom.xml +++ b/extensions-core/histogram/pom.xml @@ -20,13 +20,13 @@ 4.0.0 - io.druid.extensions + org.apache.druid.extensions druid-histogram druid-histogram druid-histogram - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT ../../pom.xml @@ -34,13 +34,13 @@ - io.druid + org.apache.druid druid-processing ${project.parent.version} provided - io.druid + org.apache.druid druid-sql ${project.parent.version} provided @@ -48,28 +48,28 @@ - io.druid + org.apache.druid druid-common ${project.parent.version} test test-jar - io.druid + org.apache.druid druid-processing ${project.parent.version} test test-jar - io.druid + org.apache.druid druid-sql ${project.parent.version} test-jar test - io.druid + org.apache.druid druid-server ${project.parent.version} test diff --git a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogram.java b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogram.java similarity index 99% rename from extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogram.java rename to extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogram.java index 94a52d33cb5c..0cf84ea01acc 100644 --- a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogram.java +++ b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogram.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.histogram; +package org.apache.druid.query.aggregation.histogram; import com.fasterxml.jackson.annotation.JsonValue; import com.google.common.base.Preconditions; diff --git a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregator.java b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramAggregator.java similarity index 92% rename from extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregator.java rename to extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramAggregator.java index ccd18cc9713b..1e862deac5d5 100644 --- a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregator.java +++ b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramAggregator.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.aggregation.histogram; +package org.apache.druid.query.aggregation.histogram; import com.google.common.primitives.Longs; -import io.druid.common.config.NullHandling; -import io.druid.query.aggregation.Aggregator; -import io.druid.segment.BaseFloatColumnValueSelector; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.segment.BaseFloatColumnValueSelector; import java.util.Comparator; diff --git a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregatorFactory.java b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramAggregatorFactory.java similarity index 93% rename from extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregatorFactory.java rename to extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramAggregatorFactory.java index 54716e7e7b95..919b9b77a01e 100644 --- a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregatorFactory.java +++ b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramAggregatorFactory.java @@ -17,23 +17,23 @@ * under the License. */ -package io.druid.query.aggregation.histogram; +package org.apache.druid.query.aggregation.histogram; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.base.Preconditions; -import io.druid.java.util.common.StringUtils; -import io.druid.query.aggregation.AggregateCombiner; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.AggregatorFactoryNotMergeableException; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.ObjectAggregateCombiner; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.aggregation.AggregateCombiner; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorFactoryNotMergeableException; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.ObjectAggregateCombiner; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; import org.apache.commons.codec.binary.Base64; import javax.annotation.Nullable; diff --git a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramBufferAggregator.java b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramBufferAggregator.java similarity index 92% rename from extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramBufferAggregator.java rename to extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramBufferAggregator.java index 645fb0b50f41..4390a63ac600 100644 --- a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramBufferAggregator.java +++ b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramBufferAggregator.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation.histogram; +package org.apache.druid.query.aggregation.histogram; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseFloatColumnValueSelector; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseFloatColumnValueSelector; import java.nio.ByteBuffer; diff --git a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramDruidModule.java b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramDruidModule.java similarity index 87% rename from extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramDruidModule.java rename to extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramDruidModule.java index 93dc5e64c5c7..b71e21507c70 100644 --- a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramDruidModule.java +++ b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramDruidModule.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.query.aggregation.histogram; +package org.apache.druid.query.aggregation.histogram; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.common.collect.ImmutableList; import com.google.inject.Binder; -import io.druid.initialization.DruidModule; -import io.druid.query.aggregation.histogram.sql.QuantileSqlAggregator; -import io.druid.segment.serde.ComplexMetrics; -import io.druid.sql.guice.SqlBindings; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.query.aggregation.histogram.sql.QuantileSqlAggregator; +import org.apache.druid.segment.serde.ComplexMetrics; +import org.apache.druid.sql.guice.SqlBindings; import java.util.List; diff --git a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregator.java b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregator.java similarity index 93% rename from extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregator.java rename to extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregator.java index f3ec45af56fb..fae125c39987 100644 --- a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregator.java +++ b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregator.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation.histogram; +package org.apache.druid.query.aggregation.histogram; -import io.druid.query.aggregation.Aggregator; -import io.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.segment.BaseObjectColumnValueSelector; public class ApproximateHistogramFoldingAggregator implements Aggregator { diff --git a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregatorFactory.java b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregatorFactory.java similarity index 91% rename from extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregatorFactory.java rename to extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregatorFactory.java index ca5341828f56..06459354c67f 100644 --- a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregatorFactory.java +++ b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregatorFactory.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.query.aggregation.histogram; +package org.apache.druid.query.aggregation.histogram; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.StringUtils; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; import java.nio.ByteBuffer; diff --git a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingBufferAggregator.java b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramFoldingBufferAggregator.java similarity index 93% rename from extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingBufferAggregator.java rename to extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramFoldingBufferAggregator.java index 5c26b74594cc..bd9d0cd39aab 100644 --- a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingBufferAggregator.java +++ b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramFoldingBufferAggregator.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation.histogram; +package org.apache.druid.query.aggregation.histogram; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseObjectColumnValueSelector; import java.nio.ByteBuffer; diff --git a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingSerde.java b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramFoldingSerde.java similarity index 84% rename from extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingSerde.java rename to extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramFoldingSerde.java index 3dd629aa31d9..198bed8da28c 100644 --- a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingSerde.java +++ b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramFoldingSerde.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.query.aggregation.histogram; +package org.apache.druid.query.aggregation.histogram; import com.google.common.collect.Ordering; -import io.druid.data.input.InputRow; -import io.druid.data.input.Rows; -import io.druid.segment.GenericColumnSerializer; -import io.druid.segment.column.ColumnBuilder; -import io.druid.segment.data.GenericIndexed; -import io.druid.segment.data.ObjectStrategy; -import io.druid.segment.serde.ComplexColumnPartSupplier; -import io.druid.segment.serde.ComplexMetricExtractor; -import io.druid.segment.serde.ComplexMetricSerde; -import io.druid.segment.serde.LargeColumnSupportedComplexColumnSerializer; -import io.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.Rows; +import org.apache.druid.segment.GenericColumnSerializer; +import org.apache.druid.segment.column.ColumnBuilder; +import org.apache.druid.segment.data.GenericIndexed; +import org.apache.druid.segment.data.ObjectStrategy; +import org.apache.druid.segment.serde.ComplexColumnPartSupplier; +import org.apache.druid.segment.serde.ComplexMetricExtractor; +import org.apache.druid.segment.serde.ComplexMetricSerde; +import org.apache.druid.segment.serde.LargeColumnSupportedComplexColumnSerializer; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; import java.nio.ByteBuffer; import java.util.Collection; diff --git a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramPostAggregator.java b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramPostAggregator.java similarity index 93% rename from extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramPostAggregator.java rename to extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramPostAggregator.java index 289d80f9f782..d0462324067e 100644 --- a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramPostAggregator.java +++ b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramPostAggregator.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.aggregation.histogram; +package org.apache.druid.query.aggregation.histogram; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.PostAggregator; import java.util.Comparator; import java.util.Map; diff --git a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ArrayUtils.java b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ArrayUtils.java similarity index 96% rename from extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ArrayUtils.java rename to extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ArrayUtils.java index af315d789fd5..78bcaedcd8ce 100644 --- a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ArrayUtils.java +++ b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ArrayUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.histogram; +package org.apache.druid.query.aggregation.histogram; public class ArrayUtils { diff --git a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/BucketsPostAggregator.java b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/BucketsPostAggregator.java similarity index 89% rename from extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/BucketsPostAggregator.java rename to extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/BucketsPostAggregator.java index e9e2fea1984d..94400f781bbb 100644 --- a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/BucketsPostAggregator.java +++ b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/BucketsPostAggregator.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.aggregation.histogram; +package org.apache.druid.query.aggregation.histogram; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.collect.Sets; -import io.druid.java.util.common.IAE; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.post.PostAggregatorIds; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.post.PostAggregatorIds; +import org.apache.druid.query.cache.CacheKeyBuilder; import java.util.Map; import java.util.Set; diff --git a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/CustomBucketsPostAggregator.java b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/CustomBucketsPostAggregator.java similarity index 89% rename from extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/CustomBucketsPostAggregator.java rename to extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/CustomBucketsPostAggregator.java index 8ee12d40718d..a9187beba0ee 100644 --- a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/CustomBucketsPostAggregator.java +++ b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/CustomBucketsPostAggregator.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.query.aggregation.histogram; +package org.apache.druid.query.aggregation.histogram; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.collect.Sets; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.post.PostAggregatorIds; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.post.PostAggregatorIds; +import org.apache.druid.query.cache.CacheKeyBuilder; import java.util.Arrays; import java.util.Map; diff --git a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/EqualBucketsPostAggregator.java b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/EqualBucketsPostAggregator.java similarity index 88% rename from extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/EqualBucketsPostAggregator.java rename to extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/EqualBucketsPostAggregator.java index cc769fdd9c8f..517a7cc66b62 100644 --- a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/EqualBucketsPostAggregator.java +++ b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/EqualBucketsPostAggregator.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.aggregation.histogram; +package org.apache.druid.query.aggregation.histogram; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.collect.Sets; -import io.druid.java.util.common.IAE; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.post.PostAggregatorIds; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.post.PostAggregatorIds; +import org.apache.druid.query.cache.CacheKeyBuilder; import java.util.Map; import java.util.Set; diff --git a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/Histogram.java b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/Histogram.java similarity index 97% rename from extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/Histogram.java rename to extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/Histogram.java index d13dd6bb80bf..9cdf0892a80e 100644 --- a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/Histogram.java +++ b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/Histogram.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.histogram; +package org.apache.druid.query.aggregation.histogram; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/MaxPostAggregator.java b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/MaxPostAggregator.java similarity index 89% rename from extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/MaxPostAggregator.java rename to extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/MaxPostAggregator.java index 212801ff32d0..47ff828ee5d0 100644 --- a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/MaxPostAggregator.java +++ b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/MaxPostAggregator.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.query.aggregation.histogram; +package org.apache.druid.query.aggregation.histogram; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.collect.Sets; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.post.PostAggregatorIds; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.post.PostAggregatorIds; +import org.apache.druid.query.cache.CacheKeyBuilder; import java.util.Comparator; import java.util.Map; diff --git a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/MinPostAggregator.java b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/MinPostAggregator.java similarity index 89% rename from extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/MinPostAggregator.java rename to extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/MinPostAggregator.java index 0fd5d77942f0..a209b8e0b9a9 100644 --- a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/MinPostAggregator.java +++ b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/MinPostAggregator.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.query.aggregation.histogram; +package org.apache.druid.query.aggregation.histogram; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.collect.Sets; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.post.PostAggregatorIds; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.post.PostAggregatorIds; +import org.apache.druid.query.cache.CacheKeyBuilder; import java.util.Comparator; import java.util.Map; diff --git a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/QuantilePostAggregator.java b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/QuantilePostAggregator.java similarity index 91% rename from extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/QuantilePostAggregator.java rename to extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/QuantilePostAggregator.java index f83e8545f132..0cfb7b72c530 100644 --- a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/QuantilePostAggregator.java +++ b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/QuantilePostAggregator.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.aggregation.histogram; +package org.apache.druid.query.aggregation.histogram; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.collect.Sets; -import io.druid.java.util.common.IAE; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.post.PostAggregatorIds; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.post.PostAggregatorIds; +import org.apache.druid.query.cache.CacheKeyBuilder; import java.util.Comparator; import java.util.Map; diff --git a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/Quantiles.java b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/Quantiles.java similarity index 98% rename from extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/Quantiles.java rename to extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/Quantiles.java index 38bbbde3d6b7..0f89051840ec 100644 --- a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/Quantiles.java +++ b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/Quantiles.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.histogram; +package org.apache.druid.query.aggregation.histogram; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/QuantilesPostAggregator.java b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/QuantilesPostAggregator.java similarity index 89% rename from extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/QuantilesPostAggregator.java rename to extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/QuantilesPostAggregator.java index 2023ffa20647..434eb83ed210 100644 --- a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/QuantilesPostAggregator.java +++ b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/QuantilesPostAggregator.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.aggregation.histogram; +package org.apache.druid.query.aggregation.histogram; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.collect.Sets; -import io.druid.java.util.common.IAE; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.post.PostAggregatorIds; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.post.PostAggregatorIds; +import org.apache.druid.query.cache.CacheKeyBuilder; import java.util.Arrays; import java.util.Comparator; diff --git a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/sql/QuantileSqlAggregator.java b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/sql/QuantileSqlAggregator.java similarity index 88% rename from extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/sql/QuantileSqlAggregator.java rename to extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/sql/QuantileSqlAggregator.java index af6473bac07f..6d4fd2eb470f 100644 --- a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/sql/QuantileSqlAggregator.java +++ b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/sql/QuantileSqlAggregator.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.query.aggregation.histogram.sql; +package org.apache.druid.query.aggregation.histogram.sql; import com.google.common.collect.ImmutableList; -import io.druid.java.util.common.StringUtils; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.histogram.ApproximateHistogram; -import io.druid.query.aggregation.histogram.ApproximateHistogramAggregatorFactory; -import io.druid.query.aggregation.histogram.ApproximateHistogramFoldingAggregatorFactory; -import io.druid.query.aggregation.histogram.QuantilePostAggregator; -import io.druid.segment.VirtualColumn; -import io.druid.segment.column.ValueType; -import io.druid.segment.virtual.ExpressionVirtualColumn; -import io.druid.sql.calcite.aggregation.Aggregation; -import io.druid.sql.calcite.aggregation.SqlAggregator; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.expression.Expressions; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.histogram.ApproximateHistogram; +import org.apache.druid.query.aggregation.histogram.ApproximateHistogramAggregatorFactory; +import org.apache.druid.query.aggregation.histogram.ApproximateHistogramFoldingAggregatorFactory; +import org.apache.druid.query.aggregation.histogram.QuantilePostAggregator; +import org.apache.druid.segment.VirtualColumn; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.virtual.ExpressionVirtualColumn; +import org.apache.druid.sql.calcite.aggregation.Aggregation; +import org.apache.druid.sql.calcite.aggregation.SqlAggregator; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.expression.Expressions; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rel.core.AggregateCall; import org.apache.calcite.rel.core.Project; import org.apache.calcite.rex.RexBuilder; diff --git a/extensions-core/histogram/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-core/histogram/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index d39951f0cd89..000000000000 --- a/extensions-core/histogram/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.query.aggregation.histogram.ApproximateHistogramDruidModule \ No newline at end of file diff --git a/extensions-core/histogram/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-core/histogram/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..ad0c02fb4f78 --- /dev/null +++ b/extensions-core/histogram/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.query.aggregation.histogram.ApproximateHistogramDruidModule \ No newline at end of file diff --git a/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregationTest.java b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramAggregationTest.java similarity index 92% rename from extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregationTest.java rename to extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramAggregationTest.java index 0836acf855a9..9c845fad623d 100644 --- a/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregationTest.java +++ b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramAggregationTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.query.aggregation.histogram; +package org.apache.druid.query.aggregation.histogram; import com.google.common.collect.Lists; -import io.druid.common.config.NullHandling; -import io.druid.data.input.MapBasedRow; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.aggregation.AggregationTestHelper; -import io.druid.query.groupby.GroupByQueryConfig; -import io.druid.query.groupby.GroupByQueryRunnerTest; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.data.input.MapBasedRow; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.aggregation.AggregationTestHelper; +import org.apache.druid.query.groupby.GroupByQueryConfig; +import org.apache.druid.query.groupby.GroupByQueryRunnerTest; import org.junit.After; import org.junit.Assert; import org.junit.Rule; diff --git a/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregatorTest.java b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramAggregatorTest.java similarity index 93% rename from extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregatorTest.java rename to extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramAggregatorTest.java index c2569bf7bc21..3afda89089ca 100644 --- a/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregatorTest.java +++ b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramAggregatorTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.aggregation.histogram; +package org.apache.druid.query.aggregation.histogram; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.TestFloatColumnSelector; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.TestFloatColumnSelector; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramErrorBenchmark.java b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramErrorBenchmark.java similarity index 98% rename from extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramErrorBenchmark.java rename to extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramErrorBenchmark.java index 3ddd9252d899..5f12e6089aea 100644 --- a/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramErrorBenchmark.java +++ b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramErrorBenchmark.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.aggregation.histogram; +package org.apache.druid.query.aggregation.histogram; import com.google.common.primitives.Floats; -import io.druid.query.aggregation.Histogram; +import org.apache.druid.query.aggregation.Histogram; import java.util.Arrays; import java.util.Locale; diff --git a/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingSerdeTest.java b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramFoldingSerdeTest.java similarity index 93% rename from extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingSerdeTest.java rename to extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramFoldingSerdeTest.java index 75edca91ddea..d25b17485a37 100644 --- a/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingSerdeTest.java +++ b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramFoldingSerdeTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation.histogram; +package org.apache.druid.query.aggregation.histogram; import com.google.common.collect.ImmutableList; -import io.druid.data.input.MapBasedInputRow; -import io.druid.segment.serde.ComplexMetricExtractor; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.segment.serde.ComplexMetricExtractor; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramGroupByQueryTest.java b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramGroupByQueryTest.java similarity index 88% rename from extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramGroupByQueryTest.java rename to extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramGroupByQueryTest.java index f10ee8d0bb13..ff81674a77a8 100644 --- a/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramGroupByQueryTest.java +++ b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramGroupByQueryTest.java @@ -17,26 +17,26 @@ * under the License. */ -package io.druid.query.aggregation.histogram; +package org.apache.druid.query.aggregation.histogram; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.druid.data.input.Row; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.io.Closer; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.groupby.GroupByQuery; -import io.druid.query.groupby.GroupByQueryConfig; -import io.druid.query.groupby.GroupByQueryRunnerFactory; -import io.druid.query.groupby.GroupByQueryRunnerTest; -import io.druid.query.groupby.GroupByQueryRunnerTestHelper; -import io.druid.query.groupby.orderby.DefaultLimitSpec; -import io.druid.query.groupby.orderby.OrderByColumnSpec; -import io.druid.query.groupby.strategy.GroupByStrategySelector; -import io.druid.segment.TestHelper; +import org.apache.druid.data.input.Row; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.groupby.GroupByQuery; +import org.apache.druid.query.groupby.GroupByQueryConfig; +import org.apache.druid.query.groupby.GroupByQueryRunnerFactory; +import org.apache.druid.query.groupby.GroupByQueryRunnerTest; +import org.apache.druid.query.groupby.GroupByQueryRunnerTestHelper; +import org.apache.druid.query.groupby.orderby.DefaultLimitSpec; +import org.apache.druid.query.groupby.orderby.OrderByColumnSpec; +import org.apache.druid.query.groupby.strategy.GroupByStrategySelector; +import org.apache.druid.segment.TestHelper; import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramPostAggregatorTest.java b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramPostAggregatorTest.java similarity index 94% rename from extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramPostAggregatorTest.java rename to extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramPostAggregatorTest.java index 1c6f46f35e4e..bf0eff876c06 100644 --- a/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramPostAggregatorTest.java +++ b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramPostAggregatorTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation.histogram; +package org.apache.druid.query.aggregation.histogram; -import io.druid.query.aggregation.TestFloatColumnSelector; +import org.apache.druid.query.aggregation.TestFloatColumnSelector; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramTest.java b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramTest.java similarity index 99% rename from extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramTest.java rename to extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramTest.java index bb2acdd220ee..411466c1a6f9 100644 --- a/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramTest.java +++ b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation.histogram; +package org.apache.druid.query.aggregation.histogram; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramTopNQueryTest.java b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramTopNQueryTest.java similarity index 91% rename from extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramTopNQueryTest.java rename to extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramTopNQueryTest.java index 71d9cbffd025..f0bd1de94a21 100644 --- a/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramTopNQueryTest.java +++ b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramTopNQueryTest.java @@ -17,28 +17,28 @@ * under the License. */ -package io.druid.query.aggregation.histogram; +package org.apache.druid.query.aggregation.histogram; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import io.druid.collections.CloseableStupidPool; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.io.Closer; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.Result; -import io.druid.query.TestQueryRunners; -import io.druid.query.aggregation.DoubleMaxAggregatorFactory; -import io.druid.query.aggregation.DoubleMinAggregatorFactory; -import io.druid.query.topn.TopNQuery; -import io.druid.query.topn.TopNQueryBuilder; -import io.druid.query.topn.TopNQueryConfig; -import io.druid.query.topn.TopNQueryQueryToolChest; -import io.druid.query.topn.TopNQueryRunnerFactory; -import io.druid.query.topn.TopNResultValue; -import io.druid.segment.TestHelper; +import org.apache.druid.collections.CloseableStupidPool; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.Result; +import org.apache.druid.query.TestQueryRunners; +import org.apache.druid.query.aggregation.DoubleMaxAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleMinAggregatorFactory; +import org.apache.druid.query.topn.TopNQuery; +import org.apache.druid.query.topn.TopNQueryBuilder; +import org.apache.druid.query.topn.TopNQueryConfig; +import org.apache.druid.query.topn.TopNQueryQueryToolChest; +import org.apache.druid.query.topn.TopNQueryRunnerFactory; +import org.apache.druid.query.topn.TopNResultValue; +import org.apache.druid.segment.TestHelper; import org.junit.AfterClass; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/QuantilesTest.java b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/QuantilesTest.java similarity index 96% rename from extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/QuantilesTest.java rename to extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/QuantilesTest.java index 2672089476f1..dd93f5f0db63 100644 --- a/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/QuantilesTest.java +++ b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/QuantilesTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.aggregation.histogram; +package org.apache.druid.query.aggregation.histogram; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.jackson.DefaultObjectMapper; import org.hamcrest.CoreMatchers; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/sql/QuantileSqlAggregatorTest.java b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/sql/QuantileSqlAggregatorTest.java similarity index 85% rename from extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/sql/QuantileSqlAggregatorTest.java rename to extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/sql/QuantileSqlAggregatorTest.java index e17dbf041c17..3ae2fbc7c49b 100644 --- a/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/sql/QuantileSqlAggregatorTest.java +++ b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/sql/QuantileSqlAggregatorTest.java @@ -17,55 +17,55 @@ * under the License. */ -package io.druid.query.aggregation.histogram.sql; +package org.apache.druid.query.aggregation.histogram.sql; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.io.Closer; -import io.druid.query.Druids; -import io.druid.query.QueryDataSource; -import io.druid.query.QueryRunnerFactoryConglomerate; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.DoubleSumAggregatorFactory; -import io.druid.query.aggregation.FilteredAggregatorFactory; -import io.druid.query.aggregation.histogram.ApproximateHistogramAggregatorFactory; -import io.druid.query.aggregation.histogram.ApproximateHistogramDruidModule; -import io.druid.query.aggregation.histogram.ApproximateHistogramFoldingAggregatorFactory; -import io.druid.query.aggregation.histogram.QuantilePostAggregator; -import io.druid.query.aggregation.post.ArithmeticPostAggregator; -import io.druid.query.aggregation.post.FieldAccessPostAggregator; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.expression.TestExprMacroTable; -import io.druid.query.filter.NotDimFilter; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.query.groupby.GroupByQuery; -import io.druid.query.spec.MultipleIntervalSegmentSpec; -import io.druid.segment.IndexBuilder; -import io.druid.segment.QueryableIndex; -import io.druid.segment.column.ValueType; -import io.druid.segment.incremental.IncrementalIndexSchema; -import io.druid.segment.virtual.ExpressionVirtualColumn; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; -import io.druid.server.security.AuthTestUtils; -import io.druid.server.security.NoopEscalator; -import io.druid.sql.calcite.filtration.Filtration; -import io.druid.sql.calcite.planner.DruidOperatorTable; -import io.druid.sql.calcite.planner.DruidPlanner; -import io.druid.sql.calcite.planner.PlannerConfig; -import io.druid.sql.calcite.planner.PlannerFactory; -import io.druid.sql.calcite.planner.PlannerResult; -import io.druid.sql.calcite.schema.DruidSchema; -import io.druid.sql.calcite.util.CalciteTestBase; -import io.druid.sql.calcite.util.CalciteTests; -import io.druid.sql.calcite.util.QueryLogHook; -import io.druid.sql.calcite.util.SpecificSegmentsQuerySegmentWalker; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.LinearShardSpec; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.query.Druids; +import org.apache.druid.query.QueryDataSource; +import org.apache.druid.query.QueryRunnerFactoryConglomerate; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; +import org.apache.druid.query.aggregation.FilteredAggregatorFactory; +import org.apache.druid.query.aggregation.histogram.ApproximateHistogramAggregatorFactory; +import org.apache.druid.query.aggregation.histogram.ApproximateHistogramDruidModule; +import org.apache.druid.query.aggregation.histogram.ApproximateHistogramFoldingAggregatorFactory; +import org.apache.druid.query.aggregation.histogram.QuantilePostAggregator; +import org.apache.druid.query.aggregation.post.ArithmeticPostAggregator; +import org.apache.druid.query.aggregation.post.FieldAccessPostAggregator; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.expression.TestExprMacroTable; +import org.apache.druid.query.filter.NotDimFilter; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.query.groupby.GroupByQuery; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.segment.IndexBuilder; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.segment.virtual.ExpressionVirtualColumn; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; +import org.apache.druid.server.security.AuthTestUtils; +import org.apache.druid.server.security.NoopEscalator; +import org.apache.druid.sql.calcite.filtration.Filtration; +import org.apache.druid.sql.calcite.planner.DruidOperatorTable; +import org.apache.druid.sql.calcite.planner.DruidPlanner; +import org.apache.druid.sql.calcite.planner.PlannerConfig; +import org.apache.druid.sql.calcite.planner.PlannerFactory; +import org.apache.druid.sql.calcite.planner.PlannerResult; +import org.apache.druid.sql.calcite.schema.DruidSchema; +import org.apache.druid.sql.calcite.util.CalciteTestBase; +import org.apache.druid.sql.calcite.util.CalciteTests; +import org.apache.druid.sql.calcite.util.QueryLogHook; +import org.apache.druid.sql.calcite.util.SpecificSegmentsQuerySegmentWalker; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.LinearShardSpec; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; diff --git a/extensions-core/kafka-eight/pom.xml b/extensions-core/kafka-eight/pom.xml index 6b367c6028d6..1d9e3c57989d 100644 --- a/extensions-core/kafka-eight/pom.xml +++ b/extensions-core/kafka-eight/pom.xml @@ -21,13 +21,13 @@ 4.0.0 - io.druid.extensions + org.apache.druid.extensions druid-kafka-eight druid-kafka-eight druid-kafka-eight - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT ../../pom.xml @@ -35,7 +35,7 @@ - io.druid + org.apache.druid druid-api ${project.parent.version} provided diff --git a/extensions-core/kafka-eight/src/main/java/io/druid/firehose/kafka/KafkaEightDruidModule.java b/extensions-core/kafka-eight/src/main/java/org/apache/druid/firehose/kafka/KafkaEightDruidModule.java similarity index 94% rename from extensions-core/kafka-eight/src/main/java/io/druid/firehose/kafka/KafkaEightDruidModule.java rename to extensions-core/kafka-eight/src/main/java/org/apache/druid/firehose/kafka/KafkaEightDruidModule.java index 7b82916c66bd..4fe379a48830 100644 --- a/extensions-core/kafka-eight/src/main/java/io/druid/firehose/kafka/KafkaEightDruidModule.java +++ b/extensions-core/kafka-eight/src/main/java/org/apache/druid/firehose/kafka/KafkaEightDruidModule.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.firehose.kafka; +package org.apache.druid.firehose.kafka; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.common.collect.ImmutableList; import com.google.inject.Binder; -import io.druid.initialization.DruidModule; +import org.apache.druid.initialization.DruidModule; import java.util.List; diff --git a/extensions-core/kafka-eight/src/main/java/io/druid/firehose/kafka/KafkaEightFirehoseFactory.java b/extensions-core/kafka-eight/src/main/java/org/apache/druid/firehose/kafka/KafkaEightFirehoseFactory.java similarity index 94% rename from extensions-core/kafka-eight/src/main/java/io/druid/firehose/kafka/KafkaEightFirehoseFactory.java rename to extensions-core/kafka-eight/src/main/java/org/apache/druid/firehose/kafka/KafkaEightFirehoseFactory.java index 462db747f3df..7f5e0e5f5b1c 100644 --- a/extensions-core/kafka-eight/src/main/java/io/druid/firehose/kafka/KafkaEightFirehoseFactory.java +++ b/extensions-core/kafka-eight/src/main/java/org/apache/druid/firehose/kafka/KafkaEightFirehoseFactory.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.firehose.kafka; +package org.apache.druid.firehose.kafka; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; -import io.druid.data.input.Firehose; -import io.druid.data.input.FirehoseFactory; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.InputRowParser; -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.InputRow; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.java.util.common.logger.Logger; import kafka.consumer.Consumer; import kafka.consumer.ConsumerConfig; import kafka.consumer.ConsumerIterator; diff --git a/extensions-core/kafka-eight/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-core/kafka-eight/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index f56f6152eba4..000000000000 --- a/extensions-core/kafka-eight/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.firehose.kafka.KafkaEightDruidModule \ No newline at end of file diff --git a/extensions-core/kafka-eight/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-core/kafka-eight/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..6de4b53fefd7 --- /dev/null +++ b/extensions-core/kafka-eight/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.firehose.kafka.KafkaEightDruidModule \ No newline at end of file diff --git a/extensions-core/kafka-extraction-namespace/pom.xml b/extensions-core/kafka-extraction-namespace/pom.xml index 974b2fdb3212..6879a31bf8d3 100644 --- a/extensions-core/kafka-extraction-namespace/pom.xml +++ b/extensions-core/kafka-extraction-namespace/pom.xml @@ -21,13 +21,13 @@ 4.0.0 - io.druid.extensions + org.apache.druid.extensions druid-kafka-extraction-namespace druid-kafka-extraction-namespace Extension to rename Druid dimension values using Kafka8 - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT ../../pom.xml @@ -35,24 +35,24 @@ - io.druid + org.apache.druid druid-api ${project.parent.version} provided - io.druid + org.apache.druid druid-processing ${project.parent.version} provided - io.druid.extensions + org.apache.druid.extensions druid-lookups-cached-global ${project.parent.version} - io.druid + org.apache.druid druid-server ${project.parent.version} provided diff --git a/extensions-core/kafka-extraction-namespace/src/main/java/io/druid/query/lookup/KafkaExtractionNamespaceModule.java b/extensions-core/kafka-extraction-namespace/src/main/java/org/apache/druid/query/lookup/KafkaExtractionNamespaceModule.java similarity index 93% rename from extensions-core/kafka-extraction-namespace/src/main/java/io/druid/query/lookup/KafkaExtractionNamespaceModule.java rename to extensions-core/kafka-extraction-namespace/src/main/java/org/apache/druid/query/lookup/KafkaExtractionNamespaceModule.java index 5f388291d1bd..fa943005a64f 100644 --- a/extensions-core/kafka-extraction-namespace/src/main/java/io/druid/query/lookup/KafkaExtractionNamespaceModule.java +++ b/extensions-core/kafka-extraction-namespace/src/main/java/org/apache/druid/query/lookup/KafkaExtractionNamespaceModule.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.common.collect.ImmutableList; import com.google.inject.Binder; -import io.druid.initialization.DruidModule; +import org.apache.druid.initialization.DruidModule; import java.util.List; diff --git a/extensions-core/kafka-extraction-namespace/src/main/java/io/druid/query/lookup/KafkaLookupExtractorFactory.java b/extensions-core/kafka-extraction-namespace/src/main/java/org/apache/druid/query/lookup/KafkaLookupExtractorFactory.java similarity index 96% rename from extensions-core/kafka-extraction-namespace/src/main/java/io/druid/query/lookup/KafkaLookupExtractorFactory.java rename to extensions-core/kafka-extraction-namespace/src/main/java/org/apache/druid/query/lookup/KafkaLookupExtractorFactory.java index ef82b39a17f6..63b3860e8f6a 100644 --- a/extensions-core/kafka-extraction-namespace/src/main/java/io/druid/query/lookup/KafkaLookupExtractorFactory.java +++ b/extensions-core/kafka-extraction-namespace/src/main/java/org/apache/druid/query/lookup/KafkaLookupExtractorFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; @@ -30,14 +30,14 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.extraction.MapLookupExtractor; -import io.druid.server.lookup.namespace.cache.CacheHandler; -import io.druid.server.lookup.namespace.cache.NamespaceExtractionCacheManager; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.extraction.MapLookupExtractor; +import org.apache.druid.server.lookup.namespace.cache.CacheHandler; +import org.apache.druid.server.lookup.namespace.cache.NamespaceExtractionCacheManager; import kafka.consumer.ConsumerConfig; import kafka.consumer.KafkaStream; import kafka.consumer.Whitelist; diff --git a/extensions-core/kafka-extraction-namespace/src/main/java/io/druid/query/lookup/KafkaLookupExtractorIntrospectionHandler.java b/extensions-core/kafka-extraction-namespace/src/main/java/org/apache/druid/query/lookup/KafkaLookupExtractorIntrospectionHandler.java similarity index 97% rename from extensions-core/kafka-extraction-namespace/src/main/java/io/druid/query/lookup/KafkaLookupExtractorIntrospectionHandler.java rename to extensions-core/kafka-extraction-namespace/src/main/java/org/apache/druid/query/lookup/KafkaLookupExtractorIntrospectionHandler.java index 1f942a69d499..abce867d58c3 100644 --- a/extensions-core/kafka-extraction-namespace/src/main/java/io/druid/query/lookup/KafkaLookupExtractorIntrospectionHandler.java +++ b/extensions-core/kafka-extraction-namespace/src/main/java/org/apache/druid/query/lookup/KafkaLookupExtractorIntrospectionHandler.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.google.common.util.concurrent.ListenableFuture; diff --git a/extensions-core/kafka-extraction-namespace/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-core/kafka-extraction-namespace/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index 6ec1c2fd923f..000000000000 --- a/extensions-core/kafka-extraction-namespace/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1,19 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -io.druid.query.lookup.KafkaExtractionNamespaceModule diff --git a/extensions-core/lookups-cached-global/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-core/kafka-extraction-namespace/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule similarity index 92% rename from extensions-core/lookups-cached-global/src/main/resources/META-INF/services/io.druid.initialization.DruidModule rename to extensions-core/kafka-extraction-namespace/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule index d7020d39e26c..929bd62d9403 100644 --- a/extensions-core/lookups-cached-global/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ b/extensions-core/kafka-extraction-namespace/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -16,5 +16,4 @@ # specific language governing permissions and limitations # under the License. # - -io.druid.server.lookup.namespace.NamespaceExtractionModule +org.apache.druid.query.lookup.KafkaExtractionNamespaceModule diff --git a/extensions-core/kafka-extraction-namespace/src/test/java/io/druid/query/lookup/KafkaLookupExtractorFactoryTest.java b/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/KafkaLookupExtractorFactoryTest.java similarity index 97% rename from extensions-core/kafka-extraction-namespace/src/test/java/io/druid/query/lookup/KafkaLookupExtractorFactoryTest.java rename to extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/KafkaLookupExtractorFactoryTest.java index bd580cc1d67c..a5d1dd205110 100644 --- a/extensions-core/kafka-extraction-namespace/src/test/java/io/druid/query/lookup/KafkaLookupExtractorFactoryTest.java +++ b/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/KafkaLookupExtractorFactoryTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.fasterxml.jackson.databind.BeanProperty; import com.fasterxml.jackson.databind.DeserializationContext; @@ -27,10 +27,10 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.primitives.Bytes; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.StringUtils; -import io.druid.server.lookup.namespace.cache.CacheHandler; -import io.druid.server.lookup.namespace.cache.NamespaceExtractionCacheManager; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.server.lookup.namespace.cache.CacheHandler; +import org.apache.druid.server.lookup.namespace.cache.NamespaceExtractionCacheManager; import kafka.consumer.ConsumerIterator; import kafka.consumer.KafkaStream; import kafka.consumer.TopicFilter; @@ -58,7 +58,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; -import static io.druid.query.lookup.KafkaLookupExtractorFactory.DEFAULT_STRING_DECODER; +import static org.apache.druid.query.lookup.KafkaLookupExtractorFactory.DEFAULT_STRING_DECODER; @RunWith(PowerMockRunner.class) @PrepareForTest({ @@ -98,7 +98,7 @@ public Object findInjectableValue( Object valueId, DeserializationContext ctxt, BeanProperty forProperty, Object beanInstance ) { - if ("io.druid.server.lookup.namespace.cache.NamespaceExtractionCacheManager".equals(valueId)) { + if ("org.apache.druid.server.lookup.namespace.cache.NamespaceExtractionCacheManager".equals(valueId)) { return cacheManager; } else { return null; diff --git a/extensions-core/kafka-extraction-namespace/src/test/java/io/druid/query/lookup/TestKafkaExtractionCluster.java b/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/TestKafkaExtractionCluster.java similarity index 96% rename from extensions-core/kafka-extraction-namespace/src/test/java/io/druid/query/lookup/TestKafkaExtractionCluster.java rename to extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/TestKafkaExtractionCluster.java index 4fcf9176bd18..4569c5c9a444 100644 --- a/extensions-core/kafka-extraction-namespace/src/test/java/io/druid/query/lookup/TestKafkaExtractionCluster.java +++ b/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/TestKafkaExtractionCluster.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Throwables; @@ -26,14 +26,14 @@ import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.name.Names; -import io.druid.guice.GuiceInjectors; -import io.druid.initialization.Initialization; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.lookup.namespace.NamespaceExtractionModule; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.lookup.namespace.NamespaceExtractionModule; import kafka.admin.AdminUtils; import kafka.javaapi.producer.Producer; import kafka.producer.KeyedMessage; diff --git a/extensions-core/kafka-extraction-namespace/src/test/resources/log4j2.xml b/extensions-core/kafka-extraction-namespace/src/test/resources/log4j2.xml index 52655a4cfe06..224ceb13438f 100644 --- a/extensions-core/kafka-extraction-namespace/src/test/resources/log4j2.xml +++ b/extensions-core/kafka-extraction-namespace/src/test/resources/log4j2.xml @@ -28,7 +28,7 @@ - + diff --git a/extensions-core/kafka-indexing-service/pom.xml b/extensions-core/kafka-indexing-service/pom.xml index 4f6ce968ba48..dec632464e4f 100644 --- a/extensions-core/kafka-indexing-service/pom.xml +++ b/extensions-core/kafka-indexing-service/pom.xml @@ -21,13 +21,13 @@ 4.0.0 - io.druid.extensions + org.apache.druid.extensions druid-kafka-indexing-service druid-kafka-indexing-service druid-kafka-indexing-service - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT ../../pom.xml @@ -39,13 +39,13 @@ - io.druid + org.apache.druid druid-api ${project.parent.version} provided - io.druid + org.apache.druid druid-indexing-service ${project.parent.version} provided @@ -85,21 +85,21 @@ test - io.druid + org.apache.druid druid-processing ${project.parent.version} test-jar test - io.druid + org.apache.druid druid-server ${project.parent.version} test-jar test - io.druid + org.apache.druid druid-indexing-service ${project.parent.version} test-jar diff --git a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/IncrementalPublishingKafkaIndexTaskRunner.java b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/IncrementalPublishingKafkaIndexTaskRunner.java similarity index 96% rename from extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/IncrementalPublishingKafkaIndexTaskRunner.java rename to extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/IncrementalPublishingKafkaIndexTaskRunner.java index 660ee016edb0..7e4ed13b3ee8 100644 --- a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/IncrementalPublishingKafkaIndexTaskRunner.java +++ b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/IncrementalPublishingKafkaIndexTaskRunner.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.indexing.kafka; +package org.apache.druid.indexing.kafka; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -36,47 +36,47 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import io.druid.data.input.Committer; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.InputRowParser; -import io.druid.discovery.DiscoveryDruidNode; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.discovery.LookupNodeService; -import io.druid.indexer.IngestionState; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.IngestionStatsAndErrorsTaskReport; -import io.druid.indexing.common.IngestionStatsAndErrorsTaskReportData; -import io.druid.indexing.common.TaskRealtimeMetricsMonitorBuilder; -import io.druid.indexing.common.TaskReport; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.actions.CheckPointDataSourceMetadataAction; -import io.druid.indexing.common.actions.ResetDataSourceMetadataAction; -import io.druid.indexing.common.actions.SegmentTransactionalInsertAction; -import io.druid.indexing.common.stats.RowIngestionMeters; -import io.druid.indexing.common.stats.RowIngestionMetersFactory; -import io.druid.indexing.common.task.IndexTaskUtils; -import io.druid.indexing.common.task.RealtimeIndexTask; -import io.druid.indexing.kafka.KafkaIndexTask.Status; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.collect.Utils; -import io.druid.java.util.common.parsers.ParseException; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.segment.indexing.RealtimeIOConfig; -import io.druid.segment.realtime.FireDepartment; -import io.druid.segment.realtime.FireDepartmentMetrics; -import io.druid.segment.realtime.appenderator.Appenderator; -import io.druid.segment.realtime.appenderator.AppenderatorDriverAddResult; -import io.druid.segment.realtime.appenderator.SegmentsAndMetadata; -import io.druid.segment.realtime.appenderator.StreamAppenderatorDriver; -import io.druid.segment.realtime.appenderator.TransactionalSegmentPublisher; -import io.druid.segment.realtime.firehose.ChatHandlerProvider; -import io.druid.server.security.Access; -import io.druid.server.security.Action; -import io.druid.server.security.AuthorizerMapper; -import io.druid.timeline.DataSegment; -import io.druid.utils.CircularBuffer; +import org.apache.druid.data.input.Committer; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.discovery.DiscoveryDruidNode; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.discovery.LookupNodeService; +import org.apache.druid.indexer.IngestionState; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.IngestionStatsAndErrorsTaskReport; +import org.apache.druid.indexing.common.IngestionStatsAndErrorsTaskReportData; +import org.apache.druid.indexing.common.TaskRealtimeMetricsMonitorBuilder; +import org.apache.druid.indexing.common.TaskReport; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.actions.CheckPointDataSourceMetadataAction; +import org.apache.druid.indexing.common.actions.ResetDataSourceMetadataAction; +import org.apache.druid.indexing.common.actions.SegmentTransactionalInsertAction; +import org.apache.druid.indexing.common.stats.RowIngestionMeters; +import org.apache.druid.indexing.common.stats.RowIngestionMetersFactory; +import org.apache.druid.indexing.common.task.IndexTaskUtils; +import org.apache.druid.indexing.common.task.RealtimeIndexTask; +import org.apache.druid.indexing.kafka.KafkaIndexTask.Status; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.collect.Utils; +import org.apache.druid.java.util.common.parsers.ParseException; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.segment.indexing.RealtimeIOConfig; +import org.apache.druid.segment.realtime.FireDepartment; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.segment.realtime.appenderator.Appenderator; +import org.apache.druid.segment.realtime.appenderator.AppenderatorDriverAddResult; +import org.apache.druid.segment.realtime.appenderator.SegmentsAndMetadata; +import org.apache.druid.segment.realtime.appenderator.StreamAppenderatorDriver; +import org.apache.druid.segment.realtime.appenderator.TransactionalSegmentPublisher; +import org.apache.druid.segment.realtime.firehose.ChatHandlerProvider; +import org.apache.druid.server.security.Access; +import org.apache.druid.server.security.Action; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.utils.CircularBuffer; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.consumer.KafkaConsumer; diff --git a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaDataSourceMetadata.java b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaDataSourceMetadata.java similarity index 96% rename from extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaDataSourceMetadata.java rename to extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaDataSourceMetadata.java index 138079bbfe69..5bd2d5bc36e2 100644 --- a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaDataSourceMetadata.java +++ b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaDataSourceMetadata.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.indexing.kafka; +package org.apache.druid.indexing.kafka; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.Maps; -import io.druid.indexing.overlord.DataSourceMetadata; -import io.druid.java.util.common.IAE; +import org.apache.druid.indexing.overlord.DataSourceMetadata; +import org.apache.druid.java.util.common.IAE; import java.util.Map; import java.util.Objects; diff --git a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaIOConfig.java b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaIOConfig.java similarity index 98% rename from extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaIOConfig.java rename to extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaIOConfig.java index b6c1d765c958..3c60449e4104 100644 --- a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaIOConfig.java +++ b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaIOConfig.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.indexing.kafka; +package org.apache.druid.indexing.kafka; 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.segment.indexing.IOConfig; +import org.apache.druid.segment.indexing.IOConfig; import org.joda.time.DateTime; import javax.annotation.Nullable; diff --git a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaIndexTask.java b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaIndexTask.java similarity index 85% rename from extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaIndexTask.java rename to extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaIndexTask.java index 0e7ebcb0816d..94dab9e69472 100644 --- a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaIndexTask.java +++ b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaIndexTask.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.kafka; +package org.apache.druid.indexing.kafka; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; @@ -27,35 +27,35 @@ import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.InputRowParser; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.appenderator.ActionBasedSegmentAllocator; -import io.druid.indexing.appenderator.ActionBasedUsedSegmentChecker; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.actions.SegmentAllocateAction; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.indexing.common.stats.RowIngestionMetersFactory; -import io.druid.indexing.common.task.AbstractTask; -import io.druid.indexing.common.task.TaskResource; -import io.druid.indexing.common.task.Tasks; -import io.druid.indexing.kafka.supervisor.KafkaSupervisor; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.parsers.ParseException; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.query.NoopQueryRunner; -import io.druid.query.Query; -import io.druid.query.QueryRunner; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.realtime.FireDepartmentMetrics; -import io.druid.segment.realtime.appenderator.Appenderator; -import io.druid.segment.realtime.appenderator.Appenderators; -import io.druid.segment.realtime.appenderator.StreamAppenderatorDriver; -import io.druid.segment.realtime.firehose.ChatHandler; -import io.druid.segment.realtime.firehose.ChatHandlerProvider; -import io.druid.server.security.AuthorizerMapper; -import io.druid.utils.CircularBuffer; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.appenderator.ActionBasedSegmentAllocator; +import org.apache.druid.indexing.appenderator.ActionBasedUsedSegmentChecker; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.actions.SegmentAllocateAction; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.indexing.common.stats.RowIngestionMetersFactory; +import org.apache.druid.indexing.common.task.AbstractTask; +import org.apache.druid.indexing.common.task.TaskResource; +import org.apache.druid.indexing.common.task.Tasks; +import org.apache.druid.indexing.kafka.supervisor.KafkaSupervisor; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.parsers.ParseException; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.query.NoopQueryRunner; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.segment.realtime.appenderator.Appenderator; +import org.apache.druid.segment.realtime.appenderator.Appenderators; +import org.apache.druid.segment.realtime.appenderator.StreamAppenderatorDriver; +import org.apache.druid.segment.realtime.firehose.ChatHandler; +import org.apache.druid.segment.realtime.firehose.ChatHandlerProvider; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.utils.CircularBuffer; import org.apache.kafka.clients.consumer.KafkaConsumer; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.serialization.ByteArrayDeserializer; diff --git a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaIndexTaskClient.java b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaIndexTaskClient.java similarity index 95% rename from extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaIndexTaskClient.java rename to extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaIndexTaskClient.java index 7e65d7fea040..c81b1be038a6 100644 --- a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaIndexTaskClient.java +++ b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaIndexTaskClient.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.indexing.kafka; +package org.apache.druid.indexing.kafka; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.indexing.common.IndexTaskClient; -import io.druid.indexing.common.TaskInfoProvider; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.jackson.JacksonUtils; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.response.FullResponseHolder; +import org.apache.druid.indexing.common.IndexTaskClient; +import org.apache.druid.indexing.common.TaskInfoProvider; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.response.FullResponseHolder; import org.jboss.netty.handler.codec.http.HttpMethod; import org.jboss.netty.handler.codec.http.HttpResponseStatus; import org.joda.time.DateTime; diff --git a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaIndexTaskClientFactory.java b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaIndexTaskClientFactory.java similarity index 83% rename from extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaIndexTaskClientFactory.java rename to extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaIndexTaskClientFactory.java index 72f8b13bd545..d7f7f61be4c9 100644 --- a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaIndexTaskClientFactory.java +++ b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaIndexTaskClientFactory.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.indexing.kafka; +package org.apache.druid.indexing.kafka; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.inject.Inject; -import io.druid.guice.annotations.EscalatedGlobal; -import io.druid.guice.annotations.Json; -import io.druid.indexing.common.TaskInfoProvider; -import io.druid.indexing.common.task.IndexTaskClientFactory; -import io.druid.java.util.http.client.HttpClient; +import org.apache.druid.guice.annotations.EscalatedGlobal; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.indexing.common.TaskInfoProvider; +import org.apache.druid.indexing.common.task.IndexTaskClientFactory; +import org.apache.druid.java.util.http.client.HttpClient; import org.joda.time.Duration; public class KafkaIndexTaskClientFactory implements IndexTaskClientFactory diff --git a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaIndexTaskModule.java b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaIndexTaskModule.java similarity index 84% rename from extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaIndexTaskModule.java rename to extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaIndexTaskModule.java index 3771d9291483..751421057ab0 100644 --- a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaIndexTaskModule.java +++ b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaIndexTaskModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.kafka; +package org.apache.druid.indexing.kafka; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.jsontype.NamedType; @@ -25,11 +25,11 @@ import com.google.common.collect.ImmutableList; import com.google.inject.Binder; import com.google.inject.TypeLiteral; -import io.druid.guice.LazySingleton; -import io.druid.indexing.common.task.IndexTaskClientFactory; -import io.druid.indexing.kafka.supervisor.KafkaSupervisorSpec; -import io.druid.indexing.kafka.supervisor.KafkaSupervisorTuningConfig; -import io.druid.initialization.DruidModule; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.indexing.common.task.IndexTaskClientFactory; +import org.apache.druid.indexing.kafka.supervisor.KafkaSupervisorSpec; +import org.apache.druid.indexing.kafka.supervisor.KafkaSupervisorTuningConfig; +import org.apache.druid.initialization.DruidModule; import java.util.List; diff --git a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaIndexTaskRunner.java b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaIndexTaskRunner.java similarity index 85% rename from extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaIndexTaskRunner.java rename to extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaIndexTaskRunner.java index 2cc7583f1ad5..fd978a59387d 100644 --- a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaIndexTaskRunner.java +++ b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaIndexTaskRunner.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.indexing.kafka; +package org.apache.druid.indexing.kafka; import com.google.common.annotations.VisibleForTesting; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.stats.RowIngestionMeters; -import io.druid.indexing.kafka.KafkaIndexTask.Status; -import io.druid.segment.realtime.appenderator.Appenderator; -import io.druid.segment.realtime.firehose.ChatHandler; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.stats.RowIngestionMeters; +import org.apache.druid.indexing.kafka.KafkaIndexTask.Status; +import org.apache.druid.segment.realtime.appenderator.Appenderator; +import org.apache.druid.segment.realtime.firehose.ChatHandler; import javax.ws.rs.core.Response; import java.util.Map; diff --git a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaPartitions.java b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaPartitions.java similarity index 96% rename from extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaPartitions.java rename to extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaPartitions.java index 4004606a8d63..a5b36e9e8e7e 100644 --- a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaPartitions.java +++ b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaPartitions.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.indexing.kafka; +package org.apache.druid.indexing.kafka; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import java.util.Map; import java.util.Objects; diff --git a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaTuningConfig.java b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaTuningConfig.java similarity index 96% rename from extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaTuningConfig.java rename to extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaTuningConfig.java index dc679cbd8161..f28413c44538 100644 --- a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaTuningConfig.java +++ b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaTuningConfig.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.indexing.kafka; +package org.apache.druid.indexing.kafka; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.segment.IndexSpec; -import io.druid.segment.indexing.RealtimeTuningConfig; -import io.druid.segment.indexing.TuningConfig; -import io.druid.segment.realtime.appenderator.AppenderatorConfig; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.indexing.RealtimeTuningConfig; +import org.apache.druid.segment.indexing.TuningConfig; +import org.apache.druid.segment.realtime.appenderator.AppenderatorConfig; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; import org.joda.time.Period; import javax.annotation.Nullable; @@ -83,7 +83,7 @@ public KafkaTuningConfig( this.maxRowsInMemory = maxRowsInMemory == null ? defaults.getMaxRowsInMemory() : maxRowsInMemory; this.maxRowsPerSegment = maxRowsPerSegment == null ? DEFAULT_MAX_ROWS_PER_SEGMENT : maxRowsPerSegment; // initializing this to 0, it will be lazily initialized to a value - // @see server.src.main.java.io.druid.segment.indexing.TuningConfigs#getMaxBytesInMemoryOrDefault(long) + // @see server.src.main.java.org.apache.druid.segment.indexing.TuningConfigs#getMaxBytesInMemoryOrDefault(long) this.maxBytesInMemory = maxBytesInMemory == null ? 0 : maxBytesInMemory; this.intermediatePersistPeriod = intermediatePersistPeriod == null ? defaults.getIntermediatePersistPeriod() diff --git a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/LegacyKafkaIndexTaskRunner.java b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/LegacyKafkaIndexTaskRunner.java similarity index 93% rename from extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/LegacyKafkaIndexTaskRunner.java rename to extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/LegacyKafkaIndexTaskRunner.java index a8016a15e29b..aa50e687d438 100644 --- a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/LegacyKafkaIndexTaskRunner.java +++ b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/LegacyKafkaIndexTaskRunner.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.indexing.kafka; +package org.apache.druid.indexing.kafka; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -27,47 +27,47 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import io.druid.data.input.Committer; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.InputRowParser; -import io.druid.discovery.DiscoveryDruidNode; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.discovery.LookupNodeService; -import io.druid.indexer.IngestionState; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.IngestionStatsAndErrorsTaskReport; -import io.druid.indexing.common.IngestionStatsAndErrorsTaskReportData; -import io.druid.indexing.common.TaskRealtimeMetricsMonitorBuilder; -import io.druid.indexing.common.TaskReport; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.actions.ResetDataSourceMetadataAction; -import io.druid.indexing.common.actions.SegmentTransactionalInsertAction; -import io.druid.indexing.common.stats.RowIngestionMeters; -import io.druid.indexing.common.stats.RowIngestionMetersFactory; -import io.druid.indexing.common.task.IndexTaskUtils; -import io.druid.indexing.common.task.RealtimeIndexTask; -import io.druid.indexing.kafka.KafkaIndexTask.Status; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.collect.Utils; -import io.druid.java.util.common.parsers.ParseException; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.segment.indexing.RealtimeIOConfig; -import io.druid.segment.realtime.FireDepartment; -import io.druid.segment.realtime.FireDepartmentMetrics; -import io.druid.segment.realtime.appenderator.Appenderator; -import io.druid.segment.realtime.appenderator.AppenderatorDriverAddResult; -import io.druid.segment.realtime.appenderator.SegmentIdentifier; -import io.druid.segment.realtime.appenderator.SegmentsAndMetadata; -import io.druid.segment.realtime.appenderator.StreamAppenderatorDriver; -import io.druid.segment.realtime.appenderator.TransactionalSegmentPublisher; -import io.druid.segment.realtime.firehose.ChatHandlerProvider; -import io.druid.server.security.Access; -import io.druid.server.security.Action; -import io.druid.server.security.AuthorizerMapper; -import io.druid.timeline.DataSegment; -import io.druid.utils.CircularBuffer; +import org.apache.druid.data.input.Committer; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.discovery.DiscoveryDruidNode; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.discovery.LookupNodeService; +import org.apache.druid.indexer.IngestionState; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.IngestionStatsAndErrorsTaskReport; +import org.apache.druid.indexing.common.IngestionStatsAndErrorsTaskReportData; +import org.apache.druid.indexing.common.TaskRealtimeMetricsMonitorBuilder; +import org.apache.druid.indexing.common.TaskReport; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.actions.ResetDataSourceMetadataAction; +import org.apache.druid.indexing.common.actions.SegmentTransactionalInsertAction; +import org.apache.druid.indexing.common.stats.RowIngestionMeters; +import org.apache.druid.indexing.common.stats.RowIngestionMetersFactory; +import org.apache.druid.indexing.common.task.IndexTaskUtils; +import org.apache.druid.indexing.common.task.RealtimeIndexTask; +import org.apache.druid.indexing.kafka.KafkaIndexTask.Status; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.collect.Utils; +import org.apache.druid.java.util.common.parsers.ParseException; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.segment.indexing.RealtimeIOConfig; +import org.apache.druid.segment.realtime.FireDepartment; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.segment.realtime.appenderator.Appenderator; +import org.apache.druid.segment.realtime.appenderator.AppenderatorDriverAddResult; +import org.apache.druid.segment.realtime.appenderator.SegmentIdentifier; +import org.apache.druid.segment.realtime.appenderator.SegmentsAndMetadata; +import org.apache.druid.segment.realtime.appenderator.StreamAppenderatorDriver; +import org.apache.druid.segment.realtime.appenderator.TransactionalSegmentPublisher; +import org.apache.druid.segment.realtime.firehose.ChatHandlerProvider; +import org.apache.druid.server.security.Access; +import org.apache.druid.server.security.Action; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.utils.CircularBuffer; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.consumer.KafkaConsumer; diff --git a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/supervisor/KafkaSupervisor.java b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisor.java similarity index 97% rename from extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/supervisor/KafkaSupervisor.java rename to extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisor.java index 8e12f591461a..78652a70b919 100644 --- a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/supervisor/KafkaSupervisor.java +++ b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisor.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.kafka.supervisor; +package org.apache.druid.indexing.kafka.supervisor; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; @@ -42,40 +42,40 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.indexer.TaskLocation; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskInfoProvider; -import io.druid.indexing.common.stats.RowIngestionMetersFactory; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.common.task.TaskResource; -import io.druid.indexing.kafka.KafkaDataSourceMetadata; -import io.druid.indexing.kafka.KafkaIOConfig; -import io.druid.indexing.kafka.KafkaIndexTask; -import io.druid.indexing.kafka.KafkaIndexTaskClient; -import io.druid.indexing.kafka.KafkaIndexTaskClientFactory; -import io.druid.indexing.kafka.KafkaPartitions; -import io.druid.indexing.kafka.KafkaTuningConfig; -import io.druid.indexing.overlord.DataSourceMetadata; -import io.druid.indexing.overlord.IndexerMetadataStorageCoordinator; -import io.druid.indexing.overlord.TaskMaster; -import io.druid.indexing.overlord.TaskQueue; -import io.druid.indexing.overlord.TaskRunner; -import io.druid.indexing.overlord.TaskRunnerListener; -import io.druid.indexing.overlord.TaskRunnerWorkItem; -import io.druid.indexing.overlord.TaskStorage; -import io.druid.indexing.overlord.supervisor.Supervisor; -import io.druid.indexing.overlord.supervisor.SupervisorReport; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.metadata.EntryExistsException; -import io.druid.server.metrics.DruidMonitorSchedulerConfig; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskInfoProvider; +import org.apache.druid.indexing.common.stats.RowIngestionMetersFactory; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.common.task.TaskResource; +import org.apache.druid.indexing.kafka.KafkaDataSourceMetadata; +import org.apache.druid.indexing.kafka.KafkaIOConfig; +import org.apache.druid.indexing.kafka.KafkaIndexTask; +import org.apache.druid.indexing.kafka.KafkaIndexTaskClient; +import org.apache.druid.indexing.kafka.KafkaIndexTaskClientFactory; +import org.apache.druid.indexing.kafka.KafkaPartitions; +import org.apache.druid.indexing.kafka.KafkaTuningConfig; +import org.apache.druid.indexing.overlord.DataSourceMetadata; +import org.apache.druid.indexing.overlord.IndexerMetadataStorageCoordinator; +import org.apache.druid.indexing.overlord.TaskMaster; +import org.apache.druid.indexing.overlord.TaskQueue; +import org.apache.druid.indexing.overlord.TaskRunner; +import org.apache.druid.indexing.overlord.TaskRunnerListener; +import org.apache.druid.indexing.overlord.TaskRunnerWorkItem; +import org.apache.druid.indexing.overlord.TaskStorage; +import org.apache.druid.indexing.overlord.supervisor.Supervisor; +import org.apache.druid.indexing.overlord.supervisor.SupervisorReport; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.metadata.EntryExistsException; +import org.apache.druid.server.metrics.DruidMonitorSchedulerConfig; import org.apache.commons.codec.digest.DigestUtils; import org.apache.kafka.clients.consumer.KafkaConsumer; import org.apache.kafka.common.PartitionInfo; diff --git a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/supervisor/KafkaSupervisorIOConfig.java b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorIOConfig.java similarity index 98% rename from extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/supervisor/KafkaSupervisorIOConfig.java rename to extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorIOConfig.java index ce2b55df4a95..b02458fd9d4e 100644 --- a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/supervisor/KafkaSupervisorIOConfig.java +++ b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorIOConfig.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.indexing.kafka.supervisor; +package org.apache.druid.indexing.kafka.supervisor; 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.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import org.joda.time.Duration; import org.joda.time.Period; diff --git a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/supervisor/KafkaSupervisorReportPayload.java b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorReportPayload.java similarity index 97% rename from extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/supervisor/KafkaSupervisorReportPayload.java rename to extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorReportPayload.java index b727d972d3e5..2a5a4829b5ac 100644 --- a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/supervisor/KafkaSupervisorReportPayload.java +++ b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorReportPayload.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.indexing.kafka.supervisor; +package org.apache.druid.indexing.kafka.supervisor; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.IAE; import org.joda.time.DateTime; import javax.annotation.Nullable; diff --git a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/supervisor/KafkaSupervisorSpec.java b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorSpec.java similarity index 87% rename from extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/supervisor/KafkaSupervisorSpec.java rename to extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorSpec.java index 87708a86cc98..160ed4bad17d 100644 --- a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/supervisor/KafkaSupervisorSpec.java +++ b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorSpec.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.kafka.supervisor; +package org.apache.druid.indexing.kafka.supervisor; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; @@ -25,17 +25,17 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import io.druid.guice.annotations.Json; -import io.druid.indexing.common.stats.RowIngestionMetersFactory; -import io.druid.indexing.kafka.KafkaIndexTaskClientFactory; -import io.druid.indexing.overlord.IndexerMetadataStorageCoordinator; -import io.druid.indexing.overlord.TaskMaster; -import io.druid.indexing.overlord.TaskStorage; -import io.druid.indexing.overlord.supervisor.Supervisor; -import io.druid.indexing.overlord.supervisor.SupervisorSpec; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.segment.indexing.DataSchema; -import io.druid.server.metrics.DruidMonitorSchedulerConfig; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.indexing.common.stats.RowIngestionMetersFactory; +import org.apache.druid.indexing.kafka.KafkaIndexTaskClientFactory; +import org.apache.druid.indexing.overlord.IndexerMetadataStorageCoordinator; +import org.apache.druid.indexing.overlord.TaskMaster; +import org.apache.druid.indexing.overlord.TaskStorage; +import org.apache.druid.indexing.overlord.supervisor.Supervisor; +import org.apache.druid.indexing.overlord.supervisor.SupervisorSpec; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.server.metrics.DruidMonitorSchedulerConfig; import java.util.List; import java.util.Map; diff --git a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/supervisor/KafkaSupervisorTuningConfig.java b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTuningConfig.java similarity index 95% rename from extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/supervisor/KafkaSupervisorTuningConfig.java rename to extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTuningConfig.java index 4dd6b92fbcef..6ff590f809b5 100644 --- a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/supervisor/KafkaSupervisorTuningConfig.java +++ b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTuningConfig.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.indexing.kafka.supervisor; +package org.apache.druid.indexing.kafka.supervisor; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.indexing.kafka.KafkaTuningConfig; -import io.druid.segment.indexing.TuningConfigs; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; -import io.druid.segment.IndexSpec; +import org.apache.druid.indexing.kafka.KafkaTuningConfig; +import org.apache.druid.segment.indexing.TuningConfigs; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.segment.IndexSpec; import org.joda.time.Duration; import org.joda.time.Period; diff --git a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/supervisor/TaskReportData.java b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/TaskReportData.java similarity index 98% rename from extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/supervisor/TaskReportData.java rename to extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/TaskReportData.java index 6abc3b02f6a3..85b05c7a5f0d 100644 --- a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/supervisor/TaskReportData.java +++ b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/TaskReportData.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.kafka.supervisor; +package org.apache.druid.indexing.kafka.supervisor; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-core/kafka-indexing-service/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-core/kafka-indexing-service/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index 16aec94a8dfe..000000000000 --- a/extensions-core/kafka-indexing-service/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.indexing.kafka.KafkaIndexTaskModule diff --git a/extensions-core/kafka-indexing-service/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-core/kafka-indexing-service/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..3f9904f105bb --- /dev/null +++ b/extensions-core/kafka-indexing-service/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.indexing.kafka.KafkaIndexTaskModule diff --git a/extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/KafkaDataSourceMetadataTest.java b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaDataSourceMetadataTest.java similarity index 98% rename from extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/KafkaDataSourceMetadataTest.java rename to extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaDataSourceMetadataTest.java index 41e242d61c6e..51afdeb8ea40 100644 --- a/extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/KafkaDataSourceMetadataTest.java +++ b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaDataSourceMetadataTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.kafka; +package org.apache.druid.indexing.kafka; import com.google.common.collect.ImmutableMap; import org.junit.Assert; diff --git a/extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/KafkaIOConfigTest.java b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIOConfigTest.java similarity index 98% rename from extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/KafkaIOConfigTest.java rename to extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIOConfigTest.java index 050dba753b8e..2321974ff383 100644 --- a/extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/KafkaIOConfigTest.java +++ b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIOConfigTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.indexing.kafka; +package org.apache.druid.indexing.kafka; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.segment.indexing.IOConfig; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.segment.indexing.IOConfig; import org.hamcrest.CoreMatchers; import org.junit.Assert; import org.junit.Rule; diff --git a/extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/KafkaIndexTaskClientTest.java b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIndexTaskClientTest.java similarity index 97% rename from extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/KafkaIndexTaskClientTest.java rename to extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIndexTaskClientTest.java index bfa0d89aa987..4940ec8a9c71 100644 --- a/extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/KafkaIndexTaskClientTest.java +++ b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIndexTaskClientTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.kafka; +package org.apache.druid.indexing.kafka; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Optional; @@ -27,18 +27,18 @@ import com.google.common.collect.Maps; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.indexer.TaskLocation; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.IndexTaskClient; -import io.druid.indexing.common.TaskInfoProvider; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.Request; -import io.druid.java.util.http.client.response.FullResponseHandler; -import io.druid.java.util.http.client.response.FullResponseHolder; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.IndexTaskClient; +import org.apache.druid.indexing.common.TaskInfoProvider; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.Request; +import org.apache.druid.java.util.http.client.response.FullResponseHandler; +import org.apache.druid.java.util.http.client.response.FullResponseHolder; import org.easymock.Capture; import org.easymock.CaptureType; import org.easymock.EasyMockSupport; @@ -177,7 +177,7 @@ public void testTaskNotRunnableException() public void testInternalServerError() { expectedException.expect(RuntimeException.class); - expectedException.expectMessage("io.druid.java.util.common.IOE: Received status [500]"); + expectedException.expectMessage("org.apache.druid.java.util.common.IOE: Received status [500]"); expect(responseHolder.getStatus()).andReturn(HttpResponseStatus.INTERNAL_SERVER_ERROR).times(2); expect( @@ -314,7 +314,7 @@ public void testGetCurrentOffsetsWithRetry() throws Exception public void testGetCurrentOffsetsWithExhaustedRetries() { expectedException.expect(RuntimeException.class); - expectedException.expectMessage("io.druid.java.util.common.IOE: Received status [404]"); + expectedException.expectMessage("org.apache.druid.java.util.common.IOE: Received status [404]"); client = new TestableKafkaIndexTaskClient(httpClient, objectMapper, taskInfoProvider, 2); diff --git a/extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/KafkaIndexTaskTest.java b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIndexTaskTest.java similarity index 92% rename from extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/KafkaIndexTaskTest.java rename to extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIndexTaskTest.java index c3cf1153671b..a5d450fc656a 100644 --- a/extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/KafkaIndexTaskTest.java +++ b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIndexTaskTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.kafka; +package org.apache.druid.indexing.kafka; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.Module; @@ -36,109 +36,109 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.client.cache.CacheConfig; -import io.druid.client.cache.CachePopulatorStats; -import io.druid.client.cache.MapCache; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.FloatDimensionSchema; -import io.druid.data.input.impl.JSONParseSpec; -import io.druid.data.input.impl.LongDimensionSchema; -import io.druid.data.input.impl.StringDimensionSchema; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.discovery.DataNodeService; -import io.druid.discovery.DruidNodeAnnouncer; -import io.druid.discovery.LookupNodeService; -import io.druid.indexer.TaskState; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.Counters; -import io.druid.indexing.common.IngestionStatsAndErrorsTaskReportData; -import io.druid.indexing.common.SegmentLoaderFactory; -import io.druid.indexing.common.TaskLock; -import io.druid.indexing.common.TaskReport; -import io.druid.indexing.common.TaskReportFileWriter; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.TaskToolboxFactory; -import io.druid.indexing.common.TestUtils; -import io.druid.indexing.common.actions.LocalTaskActionClientFactory; -import io.druid.indexing.common.actions.TaskActionClientFactory; -import io.druid.indexing.common.actions.TaskActionToolbox; -import io.druid.indexing.common.config.TaskConfig; -import io.druid.indexing.common.config.TaskStorageConfig; -import io.druid.indexing.common.stats.RowIngestionMeters; -import io.druid.indexing.common.stats.RowIngestionMetersFactory; -import io.druid.indexing.common.task.IndexTaskTest; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.kafka.supervisor.KafkaSupervisor; -import io.druid.indexing.kafka.test.TestBroker; -import io.druid.indexing.overlord.DataSourceMetadata; -import io.druid.indexing.overlord.IndexerMetadataStorageCoordinator; -import io.druid.indexing.overlord.MetadataTaskStorage; -import io.druid.indexing.overlord.TaskLockbox; -import io.druid.indexing.overlord.TaskStorage; -import io.druid.indexing.overlord.supervisor.SupervisorManager; -import io.druid.indexing.test.TestDataSegmentAnnouncer; -import io.druid.indexing.test.TestDataSegmentKiller; -import io.druid.java.util.common.CompressionUtils; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.common.parsers.JSONPathSpec; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.core.NoopEmitter; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.metrics.MonitorScheduler; -import io.druid.math.expr.ExprMacroTable; -import io.druid.metadata.DerbyMetadataStorageActionHandlerFactory; -import io.druid.metadata.EntryExistsException; -import io.druid.metadata.IndexerSQLMetadataStorageCoordinator; -import io.druid.metadata.TestDerbyConnector; -import io.druid.query.DefaultQueryRunnerFactoryConglomerate; -import io.druid.query.Druids; -import io.druid.query.IntervalChunkingQueryRunnerDecorator; -import io.druid.query.Query; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactoryConglomerate; -import io.druid.query.QueryToolChest; -import io.druid.query.QueryWatcher; -import io.druid.query.Result; -import io.druid.query.SegmentDescriptor; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.DoubleSumAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.timeseries.TimeseriesQueryEngine; -import io.druid.query.timeseries.TimeseriesQueryQueryToolChest; -import io.druid.query.timeseries.TimeseriesQueryRunnerFactory; -import io.druid.query.timeseries.TimeseriesResultValue; -import io.druid.segment.DimensionHandlerUtils; -import io.druid.segment.IndexIO; -import io.druid.segment.QueryableIndex; -import io.druid.segment.TestHelper; -import io.druid.segment.column.DictionaryEncodedColumn; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; -import io.druid.segment.loading.DataSegmentPusher; -import io.druid.segment.loading.LocalDataSegmentPusher; -import io.druid.segment.loading.LocalDataSegmentPusherConfig; -import io.druid.segment.loading.SegmentLoaderConfig; -import io.druid.segment.loading.SegmentLoaderLocalCacheManager; -import io.druid.segment.loading.StorageLocationConfig; -import io.druid.segment.realtime.appenderator.AppenderatorImpl; -import io.druid.segment.realtime.plumber.SegmentHandoffNotifier; -import io.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; -import io.druid.segment.transform.ExpressionTransform; -import io.druid.segment.transform.TransformSpec; -import io.druid.server.DruidNode; -import io.druid.server.coordination.DataSegmentServerAnnouncer; -import io.druid.server.coordination.ServerType; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.client.cache.CachePopulatorStats; +import org.apache.druid.client.cache.MapCache; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.FloatDimensionSchema; +import org.apache.druid.data.input.impl.JSONParseSpec; +import org.apache.druid.data.input.impl.LongDimensionSchema; +import org.apache.druid.data.input.impl.StringDimensionSchema; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.discovery.DataNodeService; +import org.apache.druid.discovery.DruidNodeAnnouncer; +import org.apache.druid.discovery.LookupNodeService; +import org.apache.druid.indexer.TaskState; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.Counters; +import org.apache.druid.indexing.common.IngestionStatsAndErrorsTaskReportData; +import org.apache.druid.indexing.common.SegmentLoaderFactory; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexing.common.TaskReport; +import org.apache.druid.indexing.common.TaskReportFileWriter; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.TaskToolboxFactory; +import org.apache.druid.indexing.common.TestUtils; +import org.apache.druid.indexing.common.actions.LocalTaskActionClientFactory; +import org.apache.druid.indexing.common.actions.TaskActionClientFactory; +import org.apache.druid.indexing.common.actions.TaskActionToolbox; +import org.apache.druid.indexing.common.config.TaskConfig; +import org.apache.druid.indexing.common.config.TaskStorageConfig; +import org.apache.druid.indexing.common.stats.RowIngestionMeters; +import org.apache.druid.indexing.common.stats.RowIngestionMetersFactory; +import org.apache.druid.indexing.common.task.IndexTaskTest; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.kafka.supervisor.KafkaSupervisor; +import org.apache.druid.indexing.kafka.test.TestBroker; +import org.apache.druid.indexing.overlord.DataSourceMetadata; +import org.apache.druid.indexing.overlord.IndexerMetadataStorageCoordinator; +import org.apache.druid.indexing.overlord.MetadataTaskStorage; +import org.apache.druid.indexing.overlord.TaskLockbox; +import org.apache.druid.indexing.overlord.TaskStorage; +import org.apache.druid.indexing.overlord.supervisor.SupervisorManager; +import org.apache.druid.indexing.test.TestDataSegmentAnnouncer; +import org.apache.druid.indexing.test.TestDataSegmentKiller; +import org.apache.druid.java.util.common.CompressionUtils; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.parsers.JSONPathSpec; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.core.NoopEmitter; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.metrics.MonitorScheduler; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.metadata.DerbyMetadataStorageActionHandlerFactory; +import org.apache.druid.metadata.EntryExistsException; +import org.apache.druid.metadata.IndexerSQLMetadataStorageCoordinator; +import org.apache.druid.metadata.TestDerbyConnector; +import org.apache.druid.query.DefaultQueryRunnerFactoryConglomerate; +import org.apache.druid.query.Druids; +import org.apache.druid.query.IntervalChunkingQueryRunnerDecorator; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactoryConglomerate; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.QueryWatcher; +import org.apache.druid.query.Result; +import org.apache.druid.query.SegmentDescriptor; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.timeseries.TimeseriesQueryEngine; +import org.apache.druid.query.timeseries.TimeseriesQueryQueryToolChest; +import org.apache.druid.query.timeseries.TimeseriesQueryRunnerFactory; +import org.apache.druid.query.timeseries.TimeseriesResultValue; +import org.apache.druid.segment.DimensionHandlerUtils; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.column.DictionaryEncodedColumn; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.segment.loading.DataSegmentPusher; +import org.apache.druid.segment.loading.LocalDataSegmentPusher; +import org.apache.druid.segment.loading.LocalDataSegmentPusherConfig; +import org.apache.druid.segment.loading.SegmentLoaderConfig; +import org.apache.druid.segment.loading.SegmentLoaderLocalCacheManager; +import org.apache.druid.segment.loading.StorageLocationConfig; +import org.apache.druid.segment.realtime.appenderator.AppenderatorImpl; +import org.apache.druid.segment.realtime.plumber.SegmentHandoffNotifier; +import org.apache.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; +import org.apache.druid.segment.transform.ExpressionTransform; +import org.apache.druid.segment.transform.TransformSpec; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.coordination.DataSegmentServerAnnouncer; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.timeline.DataSegment; import org.apache.curator.test.TestingCluster; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.ProducerRecord; @@ -175,7 +175,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import static io.druid.query.QueryPlus.wrap; +import static org.apache.druid.query.QueryPlus.wrap; @RunWith(Parameterized.class) public class KafkaIndexTaskTest diff --git a/extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/KafkaTuningConfigTest.java b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaTuningConfigTest.java similarity index 95% rename from extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/KafkaTuningConfigTest.java rename to extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaTuningConfigTest.java index 8a6e3d283c08..5dff8e4a41c8 100644 --- a/extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/KafkaTuningConfigTest.java +++ b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaTuningConfigTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.indexing.kafka; +package org.apache.druid.indexing.kafka; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.segment.IndexSpec; -import io.druid.segment.indexing.TuningConfig; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.indexing.TuningConfig; import org.joda.time.Period; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/supervisor/KafkaSupervisorIOConfigTest.java b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorIOConfigTest.java similarity index 97% rename from extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/supervisor/KafkaSupervisorIOConfigTest.java rename to extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorIOConfigTest.java index fd897722f788..5a7df1c9509f 100644 --- a/extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/supervisor/KafkaSupervisorIOConfigTest.java +++ b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorIOConfigTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.indexing.kafka.supervisor; +package org.apache.druid.indexing.kafka.supervisor; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import io.druid.indexing.kafka.KafkaIndexTaskModule; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.indexing.kafka.KafkaIndexTaskModule; +import org.apache.druid.jackson.DefaultObjectMapper; import org.hamcrest.CoreMatchers; import org.joda.time.Duration; import org.junit.Assert; diff --git a/extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/supervisor/KafkaSupervisorTest.java b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTest.java similarity index 97% rename from extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/supervisor/KafkaSupervisorTest.java rename to extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTest.java index 8937f6079511..5d773db661d0 100644 --- a/extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/supervisor/KafkaSupervisorTest.java +++ b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.kafka.supervisor; +package org.apache.druid.indexing.kafka.supervisor; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -26,52 +26,52 @@ import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.data.input.impl.DimensionSchema; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.JSONParseSpec; -import io.druid.data.input.impl.StringDimensionSchema; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.indexer.TaskLocation; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskInfoProvider; -import io.druid.indexing.common.TestUtils; -import io.druid.indexing.common.stats.RowIngestionMetersFactory; -import io.druid.indexing.common.task.RealtimeIndexTask; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.kafka.KafkaDataSourceMetadata; -import io.druid.indexing.kafka.KafkaIOConfig; -import io.druid.indexing.kafka.KafkaIndexTask; -import io.druid.indexing.kafka.KafkaIndexTaskClient; -import io.druid.indexing.kafka.KafkaIndexTaskClientFactory; -import io.druid.indexing.kafka.KafkaPartitions; -import io.druid.indexing.kafka.KafkaTuningConfig; -import io.druid.indexing.kafka.test.TestBroker; -import io.druid.indexing.overlord.DataSourceMetadata; -import io.druid.indexing.overlord.IndexerMetadataStorageCoordinator; -import io.druid.indexing.overlord.TaskMaster; -import io.druid.indexing.overlord.TaskQueue; -import io.druid.indexing.overlord.TaskRunner; -import io.druid.indexing.overlord.TaskRunnerListener; -import io.druid.indexing.overlord.TaskRunnerWorkItem; -import io.druid.indexing.overlord.TaskStorage; -import io.druid.indexing.overlord.supervisor.SupervisorReport; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.parsers.JSONPathSpec; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.segment.TestHelper; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.RealtimeIOConfig; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; -import io.druid.segment.realtime.FireDepartment; -import io.druid.server.metrics.DruidMonitorSchedulerConfig; -import io.druid.server.metrics.ExceptionCapturingServiceEmitter; -import io.druid.server.metrics.NoopServiceEmitter; +import org.apache.druid.data.input.impl.DimensionSchema; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.JSONParseSpec; +import org.apache.druid.data.input.impl.StringDimensionSchema; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskInfoProvider; +import org.apache.druid.indexing.common.TestUtils; +import org.apache.druid.indexing.common.stats.RowIngestionMetersFactory; +import org.apache.druid.indexing.common.task.RealtimeIndexTask; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.kafka.KafkaDataSourceMetadata; +import org.apache.druid.indexing.kafka.KafkaIOConfig; +import org.apache.druid.indexing.kafka.KafkaIndexTask; +import org.apache.druid.indexing.kafka.KafkaIndexTaskClient; +import org.apache.druid.indexing.kafka.KafkaIndexTaskClientFactory; +import org.apache.druid.indexing.kafka.KafkaPartitions; +import org.apache.druid.indexing.kafka.KafkaTuningConfig; +import org.apache.druid.indexing.kafka.test.TestBroker; +import org.apache.druid.indexing.overlord.DataSourceMetadata; +import org.apache.druid.indexing.overlord.IndexerMetadataStorageCoordinator; +import org.apache.druid.indexing.overlord.TaskMaster; +import org.apache.druid.indexing.overlord.TaskQueue; +import org.apache.druid.indexing.overlord.TaskRunner; +import org.apache.druid.indexing.overlord.TaskRunnerListener; +import org.apache.druid.indexing.overlord.TaskRunnerWorkItem; +import org.apache.druid.indexing.overlord.TaskStorage; +import org.apache.druid.indexing.overlord.supervisor.SupervisorReport; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.parsers.JSONPathSpec; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.RealtimeIOConfig; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.segment.realtime.FireDepartment; +import org.apache.druid.server.metrics.DruidMonitorSchedulerConfig; +import org.apache.druid.server.metrics.ExceptionCapturingServiceEmitter; +import org.apache.druid.server.metrics.NoopServiceEmitter; import org.apache.curator.test.TestingCluster; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.ProducerRecord; @@ -2197,7 +2197,7 @@ public void testCheckpointForUnknownTaskGroup() throws InterruptedException Thread.sleep(100); } - Assert.assertTrue(serviceEmitter.getStackTrace().startsWith("io.druid.java.util.common.ISE: WTH?! cannot find")); + Assert.assertTrue(serviceEmitter.getStackTrace().startsWith("org.apache.druid.java.util.common.ISE: WTH?! cannot find")); Assert.assertEquals( "WTH?! cannot find taskGroup [0] among all taskGroups [{}]", serviceEmitter.getExceptionMessage() diff --git a/extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/supervisor/KafkaSupervisorTuningConfigTest.java b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTuningConfigTest.java similarity index 94% rename from extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/supervisor/KafkaSupervisorTuningConfigTest.java rename to extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTuningConfigTest.java index 8fff060f8111..0a3ea95fea54 100644 --- a/extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/supervisor/KafkaSupervisorTuningConfigTest.java +++ b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTuningConfigTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.indexing.kafka.supervisor; +package org.apache.druid.indexing.kafka.supervisor; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.indexing.kafka.KafkaIndexTaskModule; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.segment.IndexSpec; -import io.druid.segment.indexing.TuningConfig; +import org.apache.druid.indexing.kafka.KafkaIndexTaskModule; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.indexing.TuningConfig; import org.joda.time.Duration; import org.joda.time.Period; import org.junit.Assert; diff --git a/extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/test/TestBroker.java b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/test/TestBroker.java similarity index 97% rename from extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/test/TestBroker.java rename to extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/test/TestBroker.java index 2c22d126eba0..a6ef74f25cf0 100644 --- a/extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/test/TestBroker.java +++ b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/test/TestBroker.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.indexing.kafka.test; +package org.apache.druid.indexing.kafka.test; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.common.io.Files; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import kafka.server.KafkaConfig; import kafka.server.KafkaServer; import org.apache.commons.io.FileUtils; diff --git a/extensions-core/lookups-cached-global/pom.xml b/extensions-core/lookups-cached-global/pom.xml index 65065f5c8a3f..68d9bacd84ea 100644 --- a/extensions-core/lookups-cached-global/pom.xml +++ b/extensions-core/lookups-cached-global/pom.xml @@ -21,13 +21,13 @@ 4.0.0 - io.druid.extensions + org.apache.druid.extensions druid-lookups-cached-global druid-lookups-cached-global Extension to rename Druid dimension values using namespaces - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT ../../pom.xml @@ -35,19 +35,19 @@ - io.druid + org.apache.druid druid-api ${project.parent.version} provided - io.druid + org.apache.druid druid-processing ${project.parent.version} provided - io.druid + org.apache.druid druid-server ${project.parent.version} provided @@ -60,7 +60,7 @@ test - io.druid + org.apache.druid druid-server ${project.parent.version} test-jar diff --git a/extensions-core/lookups-cached-global/src/main/java/io/druid/data/input/MapPopulator.java b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/data/input/MapPopulator.java similarity index 95% rename from extensions-core/lookups-cached-global/src/main/java/io/druid/data/input/MapPopulator.java rename to extensions-core/lookups-cached-global/src/main/java/org/apache/druid/data/input/MapPopulator.java index fa6d86220c4b..53cf9e662b4c 100644 --- a/extensions-core/lookups-cached-global/src/main/java/io/druid/data/input/MapPopulator.java +++ b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/data/input/MapPopulator.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.data.input; +package org.apache.druid.data.input; import com.google.common.io.ByteSource; import com.google.common.io.LineProcessor; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.parsers.Parser; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.parsers.Parser; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/extensions-core/lookups-cached-global/src/main/java/io/druid/query/lookup/NamespaceLookupExtractorFactory.java b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/NamespaceLookupExtractorFactory.java similarity index 95% rename from extensions-core/lookups-cached-global/src/main/java/io/druid/query/lookup/NamespaceLookupExtractorFactory.java rename to extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/NamespaceLookupExtractorFactory.java index 3de250732d15..a9fa5b166312 100644 --- a/extensions-core/lookups-cached-global/src/main/java/io/druid/query/lookup/NamespaceLookupExtractorFactory.java +++ b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/NamespaceLookupExtractorFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; @@ -27,12 +27,12 @@ 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.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.extraction.MapLookupExtractor; -import io.druid.query.lookup.namespace.ExtractionNamespace; -import io.druid.server.lookup.namespace.cache.CacheScheduler; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.extraction.MapLookupExtractor; +import org.apache.druid.query.lookup.namespace.ExtractionNamespace; +import org.apache.druid.server.lookup.namespace.cache.CacheScheduler; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/extensions-core/lookups-cached-global/src/main/java/io/druid/query/lookup/NamespaceLookupIntrospectHandler.java b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/NamespaceLookupIntrospectHandler.java similarity index 91% rename from extensions-core/lookups-cached-global/src/main/java/io/druid/query/lookup/NamespaceLookupIntrospectHandler.java rename to extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/NamespaceLookupIntrospectHandler.java index 0b8d6667d64c..63732bfc9916 100644 --- a/extensions-core/lookups-cached-global/src/main/java/io/druid/query/lookup/NamespaceLookupIntrospectHandler.java +++ b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/NamespaceLookupIntrospectHandler.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.google.common.collect.ImmutableMap; -import io.druid.common.utils.ServletResourceUtils; -import io.druid.java.util.common.ISE; -import io.druid.query.extraction.MapLookupExtractor; -import io.druid.server.lookup.namespace.cache.CacheScheduler; +import org.apache.druid.common.utils.ServletResourceUtils; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.query.extraction.MapLookupExtractor; +import org.apache.druid.server.lookup.namespace.cache.CacheScheduler; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/extensions-core/lookups-cached-global/src/main/java/io/druid/query/lookup/namespace/CacheGenerator.java b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/namespace/CacheGenerator.java similarity index 95% rename from extensions-core/lookups-cached-global/src/main/java/io/druid/query/lookup/namespace/CacheGenerator.java rename to extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/namespace/CacheGenerator.java index 4e3756de0ad7..243d990b2094 100644 --- a/extensions-core/lookups-cached-global/src/main/java/io/druid/query/lookup/namespace/CacheGenerator.java +++ b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/namespace/CacheGenerator.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.lookup.namespace; +package org.apache.druid.query.lookup.namespace; -import io.druid.server.lookup.namespace.cache.CacheScheduler; +import org.apache.druid.server.lookup.namespace.cache.CacheScheduler; import javax.annotation.Nullable; diff --git a/extensions-core/lookups-cached-global/src/main/java/io/druid/query/lookup/namespace/ExtractionNamespace.java b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/namespace/ExtractionNamespace.java similarity index 96% rename from extensions-core/lookups-cached-global/src/main/java/io/druid/query/lookup/namespace/ExtractionNamespace.java rename to extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/namespace/ExtractionNamespace.java index 80ee25636864..5e82ea585d1d 100644 --- a/extensions-core/lookups-cached-global/src/main/java/io/druid/query/lookup/namespace/ExtractionNamespace.java +++ b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/namespace/ExtractionNamespace.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.lookup.namespace; +package org.apache.druid.query.lookup.namespace; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/extensions-core/lookups-cached-global/src/main/java/io/druid/query/lookup/namespace/JdbcExtractionNamespace.java b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/namespace/JdbcExtractionNamespace.java similarity index 97% rename from extensions-core/lookups-cached-global/src/main/java/io/druid/query/lookup/namespace/JdbcExtractionNamespace.java rename to extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/namespace/JdbcExtractionNamespace.java index 0088f1cb0bb6..314cd72c1257 100644 --- a/extensions-core/lookups-cached-global/src/main/java/io/druid/query/lookup/namespace/JdbcExtractionNamespace.java +++ b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/namespace/JdbcExtractionNamespace.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.lookup.namespace; +package org.apache.druid.query.lookup.namespace; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.base.Preconditions; -import io.druid.metadata.MetadataStorageConnectorConfig; +import org.apache.druid.metadata.MetadataStorageConnectorConfig; import org.joda.time.Period; import javax.annotation.Nullable; diff --git a/extensions-core/lookups-cached-global/src/main/java/io/druid/query/lookup/namespace/StaticMapExtractionNamespace.java b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/namespace/StaticMapExtractionNamespace.java similarity index 95% rename from extensions-core/lookups-cached-global/src/main/java/io/druid/query/lookup/namespace/StaticMapExtractionNamespace.java rename to extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/namespace/StaticMapExtractionNamespace.java index 249f50a3bec3..99006d709739 100644 --- a/extensions-core/lookups-cached-global/src/main/java/io/druid/query/lookup/namespace/StaticMapExtractionNamespace.java +++ b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/namespace/StaticMapExtractionNamespace.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.lookup.namespace; +package org.apache.druid.query.lookup.namespace; import com.fasterxml.jackson.annotation.JsonCreator; @@ -29,7 +29,7 @@ /** * This class is intended to be used in general cluster testing, and not as a serious lookup. - * Any desire to use a static map in a lookup in *general* should use `io.druid.query.extraction.MapLookupExtractor` + * Any desire to use a static map in a lookup in *general* should use `org.apache.druid.query.extraction.MapLookupExtractor` * Any desire to test the *caching mechanisms in this extension* can use this class. */ @JsonTypeName(StaticMapExtractionNamespace.TYPE_NAME) diff --git a/extensions-core/lookups-cached-global/src/main/java/io/druid/query/lookup/namespace/UriExtractionNamespace.java b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/namespace/UriExtractionNamespace.java similarity index 96% rename from extensions-core/lookups-cached-global/src/main/java/io/druid/query/lookup/namespace/UriExtractionNamespace.java rename to extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/namespace/UriExtractionNamespace.java index 6dfaef68ce83..ab577ee4aec0 100644 --- a/extensions-core/lookups-cached-global/src/main/java/io/druid/query/lookup/namespace/UriExtractionNamespace.java +++ b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/namespace/UriExtractionNamespace.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.lookup.namespace; +package org.apache.druid.query.lookup.namespace; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; @@ -33,18 +33,18 @@ import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.guice.annotations.Json; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.UOE; -import io.druid.java.util.common.jackson.JacksonUtils; -import io.druid.java.util.common.parsers.CSVParser; -import io.druid.java.util.common.parsers.DelimitedParser; -import io.druid.java.util.common.parsers.JSONPathFieldSpec; -import io.druid.java.util.common.parsers.JSONPathFieldType; -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.guice.annotations.Json; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.UOE; +import org.apache.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.java.util.common.parsers.CSVParser; +import org.apache.druid.java.util.common.parsers.DelimitedParser; +import org.apache.druid.java.util.common.parsers.JSONPathFieldSpec; +import org.apache.druid.java.util.common.parsers.JSONPathFieldType; +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 org.joda.time.Period; import javax.annotation.Nullable; diff --git a/extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/JdbcCacheGenerator.java b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/JdbcCacheGenerator.java similarity index 93% rename from extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/JdbcCacheGenerator.java rename to extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/JdbcCacheGenerator.java index 2656b8125662..7cc38b13774d 100644 --- a/extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/JdbcCacheGenerator.java +++ b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/JdbcCacheGenerator.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.server.lookup.namespace; +package org.apache.druid.server.lookup.namespace; import com.google.common.base.Strings; -import io.druid.java.util.common.JodaUtils; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.lookup.namespace.CacheGenerator; -import io.druid.query.lookup.namespace.JdbcExtractionNamespace; -import io.druid.server.lookup.namespace.cache.CacheScheduler; +import org.apache.druid.java.util.common.JodaUtils; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.lookup.namespace.CacheGenerator; +import org.apache.druid.query.lookup.namespace.JdbcExtractionNamespace; +import org.apache.druid.server.lookup.namespace.cache.CacheScheduler; import org.skife.jdbi.v2.DBI; import org.skife.jdbi.v2.Handle; import org.skife.jdbi.v2.StatementContext; diff --git a/extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/NamespaceExtractionConfig.java b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/NamespaceExtractionConfig.java similarity index 97% rename from extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/NamespaceExtractionConfig.java rename to extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/NamespaceExtractionConfig.java index 20810ce0a7ac..a2bd844d88db 100644 --- a/extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/NamespaceExtractionConfig.java +++ b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/NamespaceExtractionConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.lookup.namespace; +package org.apache.druid.server.lookup.namespace; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/NamespaceExtractionModule.java b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/NamespaceExtractionModule.java similarity index 77% rename from extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/NamespaceExtractionModule.java rename to extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/NamespaceExtractionModule.java index 4e764092bdde..3aa087a4a1bb 100644 --- a/extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/NamespaceExtractionModule.java +++ b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/NamespaceExtractionModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.lookup.namespace; +package org.apache.druid.server.lookup.namespace; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.module.SimpleModule; @@ -26,19 +26,19 @@ import com.google.inject.Key; import com.google.inject.TypeLiteral; import com.google.inject.multibindings.MapBinder; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.LazySingleton; -import io.druid.guice.PolyBind; -import io.druid.initialization.DruidModule; -import io.druid.query.lookup.NamespaceLookupExtractorFactory; -import io.druid.query.lookup.namespace.CacheGenerator; -import io.druid.query.lookup.namespace.ExtractionNamespace; -import io.druid.query.lookup.namespace.JdbcExtractionNamespace; -import io.druid.query.lookup.namespace.StaticMapExtractionNamespace; -import io.druid.query.lookup.namespace.UriExtractionNamespace; -import io.druid.server.lookup.namespace.cache.NamespaceExtractionCacheManager; -import io.druid.server.lookup.namespace.cache.OffHeapNamespaceExtractionCacheManager; -import io.druid.server.lookup.namespace.cache.OnHeapNamespaceExtractionCacheManager; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.PolyBind; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.query.lookup.NamespaceLookupExtractorFactory; +import org.apache.druid.query.lookup.namespace.CacheGenerator; +import org.apache.druid.query.lookup.namespace.ExtractionNamespace; +import org.apache.druid.query.lookup.namespace.JdbcExtractionNamespace; +import org.apache.druid.query.lookup.namespace.StaticMapExtractionNamespace; +import org.apache.druid.query.lookup.namespace.UriExtractionNamespace; +import org.apache.druid.server.lookup.namespace.cache.NamespaceExtractionCacheManager; +import org.apache.druid.server.lookup.namespace.cache.OffHeapNamespaceExtractionCacheManager; +import org.apache.druid.server.lookup.namespace.cache.OnHeapNamespaceExtractionCacheManager; import java.util.List; diff --git a/extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/StaticMapCacheGenerator.java b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/StaticMapCacheGenerator.java similarity index 89% rename from extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/StaticMapCacheGenerator.java rename to extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/StaticMapCacheGenerator.java index 85f476c42db9..f291ae907182 100644 --- a/extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/StaticMapCacheGenerator.java +++ b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/StaticMapCacheGenerator.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.server.lookup.namespace; +package org.apache.druid.server.lookup.namespace; -import io.druid.query.lookup.namespace.CacheGenerator; -import io.druid.query.lookup.namespace.StaticMapExtractionNamespace; -import io.druid.server.lookup.namespace.cache.CacheScheduler; +import org.apache.druid.query.lookup.namespace.CacheGenerator; +import org.apache.druid.query.lookup.namespace.StaticMapExtractionNamespace; +import org.apache.druid.server.lookup.namespace.cache.CacheScheduler; import javax.annotation.Nullable; import java.util.UUID; diff --git a/extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/UriCacheGenerator.java b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/UriCacheGenerator.java similarity index 88% rename from extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/UriCacheGenerator.java rename to extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/UriCacheGenerator.java index a24660f40cc1..eaa8c052e051 100644 --- a/extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/UriCacheGenerator.java +++ b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/UriCacheGenerator.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.server.lookup.namespace; +package org.apache.druid.server.lookup.namespace; import com.google.common.io.ByteSource; import com.google.inject.Inject; -import io.druid.data.SearchableVersionedDataFinder; -import io.druid.data.input.MapPopulator; -import io.druid.java.util.common.CompressionUtils; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.RetryUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.lookup.namespace.CacheGenerator; -import io.druid.query.lookup.namespace.UriExtractionNamespace; -import io.druid.segment.loading.URIDataPuller; -import io.druid.server.lookup.namespace.cache.CacheScheduler; +import org.apache.druid.data.SearchableVersionedDataFinder; +import org.apache.druid.data.input.MapPopulator; +import org.apache.druid.java.util.common.CompressionUtils; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.RetryUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.lookup.namespace.CacheGenerator; +import org.apache.druid.query.lookup.namespace.UriExtractionNamespace; +import org.apache.druid.segment.loading.URIDataPuller; +import org.apache.druid.server.lookup.namespace.cache.CacheScheduler; import javax.annotation.Nullable; import java.io.FileNotFoundException; diff --git a/extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/cache/CacheHandler.java b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/cache/CacheHandler.java similarity index 93% rename from extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/cache/CacheHandler.java rename to extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/cache/CacheHandler.java index 8f33b0481002..567a9449c576 100644 --- a/extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/cache/CacheHandler.java +++ b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/cache/CacheHandler.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.server.lookup.namespace.cache; +package org.apache.druid.server.lookup.namespace.cache; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.logger.Logger; import java.util.concurrent.ConcurrentMap; diff --git a/extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/cache/CacheProxy.java b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/cache/CacheProxy.java similarity index 95% rename from extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/cache/CacheProxy.java rename to extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/cache/CacheProxy.java index 5afce2769fc9..de23853b4679 100644 --- a/extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/cache/CacheProxy.java +++ b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/cache/CacheProxy.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.lookup.namespace.cache; +package org.apache.druid.server.lookup.namespace.cache; import com.google.common.collect.ForwardingConcurrentMap; diff --git a/extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/cache/CacheScheduler.java b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/cache/CacheScheduler.java similarity index 96% rename from extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/cache/CacheScheduler.java rename to extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/cache/CacheScheduler.java index a09ae1380fc6..c0accb65391c 100644 --- a/extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/cache/CacheScheduler.java +++ b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/cache/CacheScheduler.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.server.lookup.namespace.cache; +package org.apache.druid.server.lookup.namespace.cache; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Throwables; import com.google.inject.Inject; -import io.druid.concurrent.ConcurrentAwaitableCounter; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.guice.LazySingleton; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.lookup.namespace.CacheGenerator; -import io.druid.query.lookup.namespace.ExtractionNamespace; +import org.apache.druid.concurrent.ConcurrentAwaitableCounter; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.lookup.namespace.CacheGenerator; +import org.apache.druid.query.lookup.namespace.ExtractionNamespace; import sun.misc.Cleaner; import javax.annotation.Nullable; diff --git a/extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/cache/NamespaceExtractionCacheManager.java b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/cache/NamespaceExtractionCacheManager.java similarity index 89% rename from extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/cache/NamespaceExtractionCacheManager.java rename to extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/cache/NamespaceExtractionCacheManager.java index 59c589ee30d4..69ea89c05cd6 100644 --- a/extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/cache/NamespaceExtractionCacheManager.java +++ b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/cache/NamespaceExtractionCacheManager.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.server.lookup.namespace.cache; +package org.apache.druid.server.lookup.namespace.cache; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Throwables; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.common.concurrent.ExecutorServices; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.lookup.namespace.NamespaceExtractionConfig; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.common.concurrent.ExecutorServices; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.lookup.namespace.NamespaceExtractionConfig; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; diff --git a/extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/cache/OffHeapNamespaceExtractionCacheManager.java b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/cache/OffHeapNamespaceExtractionCacheManager.java similarity index 95% rename from extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/cache/OffHeapNamespaceExtractionCacheManager.java rename to extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/cache/OffHeapNamespaceExtractionCacheManager.java index 81f25ee254a7..0488aea09406 100644 --- a/extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/cache/OffHeapNamespaceExtractionCacheManager.java +++ b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/cache/OffHeapNamespaceExtractionCacheManager.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.server.lookup.namespace.cache; +package org.apache.druid.server.lookup.namespace.cache; import com.google.common.base.Throwables; import com.google.inject.Inject; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.server.lookup.namespace.NamespaceExtractionConfig; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.server.lookup.namespace.NamespaceExtractionConfig; import org.mapdb.DB; import org.mapdb.DBMaker; import org.mapdb.HTreeMap; diff --git a/extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/cache/OnHeapNamespaceExtractionCacheManager.java b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/cache/OnHeapNamespaceExtractionCacheManager.java similarity index 91% rename from extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/cache/OnHeapNamespaceExtractionCacheManager.java rename to extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/cache/OnHeapNamespaceExtractionCacheManager.java index 09908661131c..3612ce54565d 100644 --- a/extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/cache/OnHeapNamespaceExtractionCacheManager.java +++ b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/cache/OnHeapNamespaceExtractionCacheManager.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.server.lookup.namespace.cache; +package org.apache.druid.server.lookup.namespace.cache; import com.google.inject.Inject; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.server.lookup.namespace.NamespaceExtractionConfig; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.server.lookup.namespace.NamespaceExtractionConfig; import java.lang.ref.WeakReference; import java.util.Collections; diff --git a/extensions-contrib/kafka-eight-simpleConsumer/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-core/lookups-cached-global/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule similarity index 92% rename from extensions-contrib/kafka-eight-simpleConsumer/src/main/resources/META-INF/services/io.druid.initialization.DruidModule rename to extensions-core/lookups-cached-global/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule index 304cbfce1557..efc051724771 100644 --- a/extensions-contrib/kafka-eight-simpleConsumer/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ b/extensions-core/lookups-cached-global/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -17,4 +17,4 @@ # under the License. # -io.druid.firehose.kafka.KafkaEightSimpleConsumerDruidModule +org.apache.druid.server.lookup.namespace.NamespaceExtractionModule diff --git a/extensions-core/lookups-cached-global/src/test/java/io/druid/query/lookup/NamespaceLookupExtractorFactoryTest.java b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/NamespaceLookupExtractorFactoryTest.java similarity index 96% rename from extensions-core/lookups-cached-global/src/test/java/io/druid/query/lookup/NamespaceLookupExtractorFactoryTest.java rename to extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/NamespaceLookupExtractorFactoryTest.java index c7c2caec0077..9c108185dc5e 100644 --- a/extensions-core/lookups-cached-global/src/test/java/io/druid/query/lookup/NamespaceLookupExtractorFactoryTest.java +++ b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/NamespaceLookupExtractorFactoryTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.fasterxml.jackson.databind.BeanProperty; import com.fasterxml.jackson.databind.DeserializationContext; @@ -30,19 +30,19 @@ import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Module; -import io.druid.guice.GuiceInjectors; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.annotations.Json; -import io.druid.guice.annotations.Self; -import io.druid.initialization.Initialization; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.jackson.JacksonUtils; -import io.druid.query.lookup.namespace.ExtractionNamespace; -import io.druid.query.lookup.namespace.UriExtractionNamespace; -import io.druid.server.DruidNode; -import io.druid.server.lookup.namespace.cache.CacheScheduler; -import io.druid.server.lookup.namespace.cache.NamespaceExtractionCacheManager; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.query.lookup.namespace.ExtractionNamespace; +import org.apache.druid.query.lookup.namespace.UriExtractionNamespace; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.lookup.namespace.cache.CacheScheduler; +import org.apache.druid.server.lookup.namespace.cache.NamespaceExtractionCacheManager; import org.easymock.EasyMock; import org.easymock.IExpectationSetters; import org.joda.time.Period; diff --git a/extensions-core/lookups-cached-global/src/test/java/io/druid/query/lookup/namespace/JSONFlatDataParserTest.java b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/namespace/JSONFlatDataParserTest.java similarity index 97% rename from extensions-core/lookups-cached-global/src/test/java/io/druid/query/lookup/namespace/JSONFlatDataParserTest.java rename to extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/namespace/JSONFlatDataParserTest.java index ca638b5a9100..6e42a35e8fa1 100644 --- a/extensions-core/lookups-cached-global/src/test/java/io/druid/query/lookup/namespace/JSONFlatDataParserTest.java +++ b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/namespace/JSONFlatDataParserTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.lookup.namespace; +package org.apache.druid.query.lookup.namespace; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Function; @@ -27,8 +27,8 @@ import com.google.common.collect.Iterables; import com.google.common.io.CharSink; import com.google.common.io.Files; -import io.druid.data.input.MapPopulator; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.data.input.MapPopulator; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; diff --git a/extensions-core/lookups-cached-global/src/test/java/io/druid/query/lookup/namespace/StaticMapExtractionNamespaceTest.java b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/namespace/StaticMapExtractionNamespaceTest.java similarity index 95% rename from extensions-core/lookups-cached-global/src/test/java/io/druid/query/lookup/namespace/StaticMapExtractionNamespaceTest.java rename to extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/namespace/StaticMapExtractionNamespaceTest.java index c60971b98f8d..b1e62287acdf 100644 --- a/extensions-core/lookups-cached-global/src/test/java/io/druid/query/lookup/namespace/StaticMapExtractionNamespaceTest.java +++ b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/namespace/StaticMapExtractionNamespaceTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.lookup.namespace; +package org.apache.druid.query.lookup.namespace; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/extensions-core/lookups-cached-global/src/test/java/io/druid/query/lookup/namespace/UriExtractionNamespaceTest.java b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/namespace/UriExtractionNamespaceTest.java similarity index 97% rename from extensions-core/lookups-cached-global/src/test/java/io/druid/query/lookup/namespace/UriExtractionNamespaceTest.java rename to extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/namespace/UriExtractionNamespaceTest.java index c6a863e1f807..26e7e5c1f731 100644 --- a/extensions-core/lookups-cached-global/src/test/java/io/druid/query/lookup/namespace/UriExtractionNamespaceTest.java +++ b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/namespace/UriExtractionNamespaceTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.lookup.namespace; +package org.apache.druid.query.lookup.namespace; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -27,11 +27,11 @@ import com.google.inject.Binder; import com.google.inject.Guice; import com.google.inject.Module; -import io.druid.guice.GuiceAnnotationIntrospector; -import io.druid.guice.GuiceInjectableValues; -import io.druid.guice.annotations.Json; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.guice.GuiceAnnotationIntrospector; +import org.apache.druid.guice.GuiceInjectableValues; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.StringUtils; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/NamespacedExtractorModuleTest.java b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/NamespacedExtractorModuleTest.java similarity index 87% rename from extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/NamespacedExtractorModuleTest.java rename to extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/NamespacedExtractorModuleTest.java index 780f2ac46b4c..9b55a462bd49 100644 --- a/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/NamespacedExtractorModuleTest.java +++ b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/NamespacedExtractorModuleTest.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.server.lookup.namespace; +package org.apache.druid.server.lookup.namespace; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import com.google.common.io.Files; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.query.lookup.namespace.CacheGenerator; -import io.druid.query.lookup.namespace.ExtractionNamespace; -import io.druid.query.lookup.namespace.JdbcExtractionNamespace; -import io.druid.query.lookup.namespace.UriExtractionNamespace; -import io.druid.query.lookup.namespace.UriExtractionNamespaceTest; -import io.druid.segment.loading.LocalFileTimestampVersionFinder; -import io.druid.server.lookup.namespace.cache.CacheScheduler; -import io.druid.server.lookup.namespace.cache.OnHeapNamespaceExtractionCacheManager; -import io.druid.server.metrics.NoopServiceEmitter; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.query.lookup.namespace.CacheGenerator; +import org.apache.druid.query.lookup.namespace.ExtractionNamespace; +import org.apache.druid.query.lookup.namespace.JdbcExtractionNamespace; +import org.apache.druid.query.lookup.namespace.UriExtractionNamespace; +import org.apache.druid.query.lookup.namespace.UriExtractionNamespaceTest; +import org.apache.druid.segment.loading.LocalFileTimestampVersionFinder; +import org.apache.druid.server.lookup.namespace.cache.CacheScheduler; +import org.apache.druid.server.lookup.namespace.cache.OnHeapNamespaceExtractionCacheManager; +import org.apache.druid.server.metrics.NoopServiceEmitter; import org.joda.time.Period; import org.junit.After; import org.junit.Assert; diff --git a/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/StaticMapCacheGeneratorTest.java b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/StaticMapCacheGeneratorTest.java similarity index 86% rename from extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/StaticMapCacheGeneratorTest.java rename to extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/StaticMapCacheGeneratorTest.java index 562d3506bef4..bd88d4cb6b7d 100644 --- a/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/StaticMapCacheGeneratorTest.java +++ b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/StaticMapCacheGeneratorTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.server.lookup.namespace; +package org.apache.druid.server.lookup.namespace; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.query.lookup.namespace.StaticMapExtractionNamespace; -import io.druid.server.lookup.namespace.cache.CacheScheduler; -import io.druid.server.lookup.namespace.cache.OnHeapNamespaceExtractionCacheManager; -import io.druid.server.metrics.NoopServiceEmitter; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.query.lookup.namespace.StaticMapExtractionNamespace; +import org.apache.druid.server.lookup.namespace.cache.CacheScheduler; +import org.apache.druid.server.lookup.namespace.cache.OnHeapNamespaceExtractionCacheManager; +import org.apache.druid.server.metrics.NoopServiceEmitter; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/UriCacheGeneratorTest.java b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/UriCacheGeneratorTest.java similarity index 93% rename from extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/UriCacheGeneratorTest.java rename to extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/UriCacheGeneratorTest.java index 1c5c7b625928..2f2e23a2bed8 100644 --- a/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/UriCacheGeneratorTest.java +++ b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/UriCacheGeneratorTest.java @@ -17,29 +17,29 @@ * under the License. */ -package io.druid.server.lookup.namespace; +package org.apache.druid.server.lookup.namespace; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Function; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.data.SearchableVersionedDataFinder; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.UOE; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.query.lookup.namespace.CacheGenerator; -import io.druid.query.lookup.namespace.ExtractionNamespace; -import io.druid.query.lookup.namespace.UriExtractionNamespace; -import io.druid.query.lookup.namespace.UriExtractionNamespaceTest; -import io.druid.segment.loading.LocalFileTimestampVersionFinder; -import io.druid.server.lookup.namespace.cache.CacheScheduler; -import io.druid.server.lookup.namespace.cache.CacheSchedulerTest; -import io.druid.server.lookup.namespace.cache.NamespaceExtractionCacheManager; -import io.druid.server.lookup.namespace.cache.OffHeapNamespaceExtractionCacheManager; -import io.druid.server.lookup.namespace.cache.OnHeapNamespaceExtractionCacheManager; -import io.druid.server.metrics.NoopServiceEmitter; +import org.apache.druid.data.SearchableVersionedDataFinder; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.UOE; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.query.lookup.namespace.CacheGenerator; +import org.apache.druid.query.lookup.namespace.ExtractionNamespace; +import org.apache.druid.query.lookup.namespace.UriExtractionNamespace; +import org.apache.druid.query.lookup.namespace.UriExtractionNamespaceTest; +import org.apache.druid.segment.loading.LocalFileTimestampVersionFinder; +import org.apache.druid.server.lookup.namespace.cache.CacheScheduler; +import org.apache.druid.server.lookup.namespace.cache.CacheSchedulerTest; +import org.apache.druid.server.lookup.namespace.cache.NamespaceExtractionCacheManager; +import org.apache.druid.server.lookup.namespace.cache.OffHeapNamespaceExtractionCacheManager; +import org.apache.druid.server.lookup.namespace.cache.OnHeapNamespaceExtractionCacheManager; +import org.apache.druid.server.metrics.NoopServiceEmitter; import org.joda.time.Period; import org.junit.After; import org.junit.Assert; diff --git a/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/CacheSchedulerTest.java b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/CacheSchedulerTest.java similarity index 96% rename from extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/CacheSchedulerTest.java rename to extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/CacheSchedulerTest.java index 9eb8fe34f8bc..d22ce75f09d9 100644 --- a/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/CacheSchedulerTest.java +++ b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/CacheSchedulerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.lookup.namespace.cache; +package org.apache.druid.server.lookup.namespace.cache; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Function; @@ -26,14 +26,14 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.query.lookup.namespace.CacheGenerator; -import io.druid.query.lookup.namespace.UriExtractionNamespace; -import io.druid.query.lookup.namespace.UriExtractionNamespaceTest; -import io.druid.server.lookup.namespace.NamespaceExtractionConfig; -import io.druid.server.metrics.NoopServiceEmitter; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.query.lookup.namespace.CacheGenerator; +import org.apache.druid.query.lookup.namespace.UriExtractionNamespace; +import org.apache.druid.query.lookup.namespace.UriExtractionNamespaceTest; +import org.apache.druid.server.lookup.namespace.NamespaceExtractionConfig; +import org.apache.druid.server.metrics.NoopServiceEmitter; import org.joda.time.Period; import org.junit.After; import org.junit.Assert; diff --git a/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/JdbcExtractionNamespaceTest.java b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/JdbcExtractionNamespaceTest.java similarity index 95% rename from extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/JdbcExtractionNamespaceTest.java rename to extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/JdbcExtractionNamespaceTest.java index 007ba07a3007..139c8a017a8f 100644 --- a/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/JdbcExtractionNamespaceTest.java +++ b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/JdbcExtractionNamespaceTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.lookup.namespace.cache; +package org.apache.druid.server.lookup.namespace.cache; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; @@ -25,20 +25,20 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.common.logger.Logger; -import io.druid.metadata.TestDerbyConnector; -import io.druid.query.lookup.namespace.CacheGenerator; -import io.druid.query.lookup.namespace.ExtractionNamespace; -import io.druid.query.lookup.namespace.JdbcExtractionNamespace; -import io.druid.server.ServerTestHelper; -import io.druid.server.lookup.namespace.JdbcCacheGenerator; -import io.druid.server.lookup.namespace.NamespaceExtractionConfig; -import io.druid.server.metrics.NoopServiceEmitter; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.metadata.TestDerbyConnector; +import org.apache.druid.query.lookup.namespace.CacheGenerator; +import org.apache.druid.query.lookup.namespace.ExtractionNamespace; +import org.apache.druid.query.lookup.namespace.JdbcExtractionNamespace; +import org.apache.druid.server.ServerTestHelper; +import org.apache.druid.server.lookup.namespace.JdbcCacheGenerator; +import org.apache.druid.server.lookup.namespace.NamespaceExtractionConfig; +import org.apache.druid.server.metrics.NoopServiceEmitter; import org.joda.time.Period; import org.junit.After; import org.junit.Assert; diff --git a/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/NamespaceExtractionCacheManagersTest.java b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/NamespaceExtractionCacheManagersTest.java similarity index 95% rename from extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/NamespaceExtractionCacheManagersTest.java rename to extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/NamespaceExtractionCacheManagersTest.java index 4416ff0395ea..c22bb45172fe 100644 --- a/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/NamespaceExtractionCacheManagersTest.java +++ b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/NamespaceExtractionCacheManagersTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.lookup.namespace.cache; +package org.apache.druid.server.lookup.namespace.cache; import com.google.common.base.Function; import com.google.common.base.Throwables; @@ -25,8 +25,8 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/OffHeapNamespaceExtractionCacheManagerTest.java b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/OffHeapNamespaceExtractionCacheManagerTest.java similarity index 84% rename from extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/OffHeapNamespaceExtractionCacheManagerTest.java rename to extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/OffHeapNamespaceExtractionCacheManagerTest.java index d33c25dbcc2d..9c9e4cecbc93 100644 --- a/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/OffHeapNamespaceExtractionCacheManagerTest.java +++ b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/OffHeapNamespaceExtractionCacheManagerTest.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.server.lookup.namespace.cache; +package org.apache.druid.server.lookup.namespace.cache; import com.google.common.collect.ImmutableList; import com.google.inject.Binder; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Module; -import io.druid.guice.GuiceInjectors; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.annotations.Self; -import io.druid.initialization.Initialization; -import io.druid.server.DruidNode; -import io.druid.server.lookup.namespace.NamespaceExtractionModule; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.lookup.namespace.NamespaceExtractionModule; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/OnHeapNamespaceExtractionCacheManagerTest.java b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/OnHeapNamespaceExtractionCacheManagerTest.java similarity index 84% rename from extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/OnHeapNamespaceExtractionCacheManagerTest.java rename to extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/OnHeapNamespaceExtractionCacheManagerTest.java index 28c54c80bacd..de1c7425d10b 100644 --- a/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/OnHeapNamespaceExtractionCacheManagerTest.java +++ b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/OnHeapNamespaceExtractionCacheManagerTest.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.server.lookup.namespace.cache; +package org.apache.druid.server.lookup.namespace.cache; import com.google.common.collect.ImmutableList; import com.google.inject.Binder; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Module; -import io.druid.guice.GuiceInjectors; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.annotations.Self; -import io.druid.initialization.Initialization; -import io.druid.server.DruidNode; -import io.druid.server.lookup.namespace.NamespaceExtractionModule; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.lookup.namespace.NamespaceExtractionModule; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-core/lookups-cached-single/pom.xml b/extensions-core/lookups-cached-single/pom.xml index ccec1516920c..7fe2353a0b94 100644 --- a/extensions-core/lookups-cached-single/pom.xml +++ b/extensions-core/lookups-cached-single/pom.xml @@ -21,13 +21,13 @@ 4.0.0 - io.druid.extensions + org.apache.druid.extensions druid-lookups-cached-single druid-lookups-cached-single Extension to rename Druid dimension values using lookups - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT ../../pom.xml @@ -35,19 +35,19 @@ - io.druid + org.apache.druid druid-api ${project.parent.version} provided - io.druid + org.apache.druid druid-processing ${project.parent.version} provided - io.druid + org.apache.druid druid-server ${project.parent.version} provided @@ -68,7 +68,7 @@ test - io.druid + org.apache.druid druid-server ${project.parent.version} test-jar @@ -80,7 +80,7 @@ test - io.druid + org.apache.druid druid-processing ${project.parent.version} test-jar diff --git a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/DataFetcher.java b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/DataFetcher.java similarity index 93% rename from extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/DataFetcher.java rename to extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/DataFetcher.java index 1c6394aa9b3f..1d831d37d53e 100644 --- a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/DataFetcher.java +++ b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/DataFetcher.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.server.lookup; +package org.apache.druid.server.lookup; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.druid.server.lookup.jdbc.JdbcDataFetcher; +import org.apache.druid.server.lookup.jdbc.JdbcDataFetcher; import javax.annotation.Nullable; import java.util.List; @@ -43,7 +43,7 @@ public interface DataFetcher { /** * Function used to fetch all the pair of key-values from the lookup - * One use case of this method is to populate a polling cache {@link io.druid.server.lookup.cache.polling.PollingCache} + * One use case of this method is to populate a polling cache {@link org.apache.druid.server.lookup.cache.polling.PollingCache} * * @return Returns an {@link Iterable} of key-value pairs. */ diff --git a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/LoadingLookup.java b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/LoadingLookup.java similarity index 90% rename from extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/LoadingLookup.java rename to extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/LoadingLookup.java index 08f229aea7a0..14045a5564cf 100644 --- a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/LoadingLookup.java +++ b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/LoadingLookup.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.server.lookup; +package org.apache.druid.server.lookup; import com.google.common.base.Preconditions; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.lookup.LookupExtractor; -import io.druid.server.lookup.cache.loading.LoadingCache; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.lookup.LookupExtractor; +import org.apache.druid.server.lookup.cache.loading.LoadingCache; import javax.annotation.Nullable; import java.util.Collections; @@ -36,7 +36,7 @@ /** * Loading lookup will load the key\value pair upon request on the key it self, the general algorithm is load key if absent. * Once the key/value pair is loaded eviction will occur according to the cache eviction policy. - * This module comes with two loading cache implementations, the first {@link io.druid.server.lookup.cache.loading.OnHeapLoadingCache}is onheap backed by a Guava cache implementation, the second {@link io.druid.server.lookup.cache.loading.OffHeapLoadingCache}is MapDB offheap implementation. + * This module comes with two loading cache implementations, the first {@link org.apache.druid.server.lookup.cache.loading.OnHeapLoadingCache}is onheap backed by a Guava cache implementation, the second {@link org.apache.druid.server.lookup.cache.loading.OffHeapLoadingCache}is MapDB offheap implementation. * Both implementations offer various eviction strategies. */ public class LoadingLookup extends LookupExtractor diff --git a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/LoadingLookupFactory.java b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/LoadingLookupFactory.java similarity index 93% rename from extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/LoadingLookupFactory.java rename to extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/LoadingLookupFactory.java index 8be67db16ab0..5f85cec42ee7 100644 --- a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/LoadingLookupFactory.java +++ b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/LoadingLookupFactory.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.server.lookup; +package org.apache.druid.server.lookup; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.base.Preconditions; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.lookup.LookupExtractorFactory; -import io.druid.query.lookup.LookupIntrospectHandler; -import io.druid.server.lookup.cache.loading.LoadingCache; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.lookup.LookupExtractorFactory; +import org.apache.druid.query.lookup.LookupIntrospectHandler; +import org.apache.druid.server.lookup.cache.loading.LoadingCache; import javax.annotation.Nullable; import java.util.List; diff --git a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/LookupExtractionModule.java b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/LookupExtractionModule.java similarity index 92% rename from extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/LookupExtractionModule.java rename to extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/LookupExtractionModule.java index 45c392ab8525..2aa5b1fed5fe 100644 --- a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/LookupExtractionModule.java +++ b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/LookupExtractionModule.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.server.lookup; +package org.apache.druid.server.lookup; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.common.collect.ImmutableList; import com.google.inject.Binder; -import io.druid.initialization.DruidModule; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.java.util.common.StringUtils; import java.util.List; import java.util.UUID; diff --git a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/PollingLookup.java b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/PollingLookup.java similarity index 93% rename from extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/PollingLookup.java rename to extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/PollingLookup.java index 4dd1a3d38db2..35e9c3cb3cbd 100644 --- a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/PollingLookup.java +++ b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/PollingLookup.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.server.lookup; +package org.apache.druid.server.lookup; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningScheduledExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.lookup.LookupExtractor; -import io.druid.server.lookup.cache.polling.OnHeapPollingCache; -import io.druid.server.lookup.cache.polling.PollingCache; -import io.druid.server.lookup.cache.polling.PollingCacheFactory; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.lookup.LookupExtractor; +import org.apache.druid.server.lookup.cache.polling.OnHeapPollingCache; +import org.apache.druid.server.lookup.cache.polling.PollingCache; +import org.apache.druid.server.lookup.cache.polling.PollingCacheFactory; import javax.annotation.Nullable; import java.util.Collections; diff --git a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/PollingLookupFactory.java b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/PollingLookupFactory.java similarity index 93% rename from extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/PollingLookupFactory.java rename to extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/PollingLookupFactory.java index 0ad7cb126137..6c04086515a8 100644 --- a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/PollingLookupFactory.java +++ b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/PollingLookupFactory.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.server.lookup; +package org.apache.druid.server.lookup; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.annotations.VisibleForTesting; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.lookup.LookupExtractorFactory; -import io.druid.query.lookup.LookupIntrospectHandler; -import io.druid.server.lookup.cache.polling.PollingCacheFactory; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.lookup.LookupExtractorFactory; +import org.apache.druid.query.lookup.LookupIntrospectHandler; +import org.apache.druid.server.lookup.cache.polling.PollingCacheFactory; import org.joda.time.Period; import javax.annotation.Nullable; diff --git a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/cache/loading/LoadingCache.java b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/loading/LoadingCache.java similarity index 98% rename from extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/cache/loading/LoadingCache.java rename to extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/loading/LoadingCache.java index 1f4749db6d5e..f8a143bb79e2 100644 --- a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/cache/loading/LoadingCache.java +++ b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/loading/LoadingCache.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.lookup.cache.loading; +package org.apache.druid.server.lookup.cache.loading; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/cache/loading/LookupCacheStats.java b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/loading/LookupCacheStats.java similarity index 99% rename from extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/cache/loading/LookupCacheStats.java rename to extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/loading/LookupCacheStats.java index bdb3f76ca3b1..27ec53d91d97 100644 --- a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/cache/loading/LookupCacheStats.java +++ b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/loading/LookupCacheStats.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.lookup.cache.loading; +package org.apache.druid.server.lookup.cache.loading; import com.google.common.base.Preconditions; diff --git a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/cache/loading/OffHeapLoadingCache.java b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/loading/OffHeapLoadingCache.java similarity index 98% rename from extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/cache/loading/OffHeapLoadingCache.java rename to extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/loading/OffHeapLoadingCache.java index ae8a6f318cbc..e20cf77495bc 100644 --- a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/cache/loading/OffHeapLoadingCache.java +++ b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/loading/OffHeapLoadingCache.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.server.lookup.cache.loading; +package org.apache.druid.server.lookup.cache.loading; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.ISE; import org.mapdb.Bind; import org.mapdb.DB; import org.mapdb.DBMaker; diff --git a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/cache/loading/OnHeapLoadingCache.java b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/loading/OnHeapLoadingCache.java similarity index 98% rename from extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/cache/loading/OnHeapLoadingCache.java rename to extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/loading/OnHeapLoadingCache.java index f9b64cce062a..016e57d3ad43 100644 --- a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/cache/loading/OnHeapLoadingCache.java +++ b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/loading/OnHeapLoadingCache.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.lookup.cache.loading; +package org.apache.druid.server.lookup.cache.loading; import com.fasterxml.jackson.annotation.JsonCreator; @@ -25,7 +25,7 @@ import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.logger.Logger; import java.util.Map; import java.util.concurrent.Callable; diff --git a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/cache/polling/OffHeapPollingCache.java b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/polling/OffHeapPollingCache.java similarity index 97% rename from extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/cache/polling/OffHeapPollingCache.java rename to extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/polling/OffHeapPollingCache.java index 32524f311613..d2c6174c1df0 100644 --- a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/cache/polling/OffHeapPollingCache.java +++ b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/polling/OffHeapPollingCache.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.server.lookup.cache.polling; +package org.apache.druid.server.lookup.cache.polling; import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import org.mapdb.DB; import org.mapdb.DBMaker; import org.mapdb.HTreeMap; diff --git a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/cache/polling/OnHeapPollingCache.java b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/polling/OnHeapPollingCache.java similarity index 98% rename from extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/cache/polling/OnHeapPollingCache.java rename to extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/polling/OnHeapPollingCache.java index a2caee916d68..daa697c63763 100644 --- a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/cache/polling/OnHeapPollingCache.java +++ b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/polling/OnHeapPollingCache.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.lookup.cache.polling; +package org.apache.druid.server.lookup.cache.polling; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/cache/polling/PollingCache.java b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/polling/PollingCache.java similarity index 96% rename from extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/cache/polling/PollingCache.java rename to extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/polling/PollingCache.java index f3313c1fced4..01c91d08f8b6 100644 --- a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/cache/polling/PollingCache.java +++ b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/polling/PollingCache.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.lookup.cache.polling; +package org.apache.druid.server.lookup.cache.polling; import java.util.List; diff --git a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/cache/polling/PollingCacheFactory.java b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/polling/PollingCacheFactory.java similarity index 96% rename from extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/cache/polling/PollingCacheFactory.java rename to extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/polling/PollingCacheFactory.java index ebef78785b48..e8640f280b7e 100644 --- a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/cache/polling/PollingCacheFactory.java +++ b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/polling/PollingCacheFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.lookup.cache.polling; +package org.apache.druid.server.lookup.cache.polling; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/jdbc/JdbcDataFetcher.java b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/jdbc/JdbcDataFetcher.java similarity index 95% rename from extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/jdbc/JdbcDataFetcher.java rename to extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/jdbc/JdbcDataFetcher.java index 5ec4aafa59ce..58955067c962 100644 --- a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/jdbc/JdbcDataFetcher.java +++ b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/jdbc/JdbcDataFetcher.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.server.lookup.jdbc; +package org.apache.druid.server.lookup.jdbc; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.metadata.MetadataStorageConnectorConfig; -import io.druid.server.lookup.DataFetcher; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.metadata.MetadataStorageConnectorConfig; +import org.apache.druid.server.lookup.DataFetcher; import org.skife.jdbi.v2.DBI; import org.skife.jdbi.v2.Handle; import org.skife.jdbi.v2.TransactionCallback; diff --git a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/jdbc/KeyValueResultSetMapper.java b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/jdbc/KeyValueResultSetMapper.java similarity index 97% rename from extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/jdbc/KeyValueResultSetMapper.java rename to extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/jdbc/KeyValueResultSetMapper.java index f1330fb2bbe3..6581a6492bac 100644 --- a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/jdbc/KeyValueResultSetMapper.java +++ b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/jdbc/KeyValueResultSetMapper.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.lookup.jdbc; +package org.apache.druid.server.lookup.jdbc; import org.skife.jdbi.v2.StatementContext; import org.skife.jdbi.v2.tweak.ResultSetMapper; diff --git a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/jdbc/QueryKeys.java b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/jdbc/QueryKeys.java similarity index 98% rename from extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/jdbc/QueryKeys.java rename to extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/jdbc/QueryKeys.java index 8c937f1bb562..ca90fa668569 100644 --- a/extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/jdbc/QueryKeys.java +++ b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/jdbc/QueryKeys.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.lookup.jdbc; +package org.apache.druid.server.lookup.jdbc; import com.google.common.collect.ImmutableSet; diff --git a/services/src/main/resources/META-INF/services/io.druid.cli.PropertyChecker b/extensions-core/lookups-cached-single/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule similarity index 93% rename from services/src/main/resources/META-INF/services/io.druid.cli.PropertyChecker rename to extensions-core/lookups-cached-single/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule index 0b5eef1a00bf..0a9cfc49bb97 100644 --- a/services/src/main/resources/META-INF/services/io.druid.cli.PropertyChecker +++ b/extensions-core/lookups-cached-single/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -17,4 +17,4 @@ # under the License. # -io.druid.cli.Log4JShutdownPropertyChecker +org.apache.druid.server.lookup.LookupExtractionModule diff --git a/extensions-core/lookups-cached-single/src/test/java/io/druid/server/lookup/CacheRefKeeperTest.java b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/CacheRefKeeperTest.java similarity index 95% rename from extensions-core/lookups-cached-single/src/test/java/io/druid/server/lookup/CacheRefKeeperTest.java rename to extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/CacheRefKeeperTest.java index 63d294ac67bc..c6879b8c0f54 100644 --- a/extensions-core/lookups-cached-single/src/test/java/io/druid/server/lookup/CacheRefKeeperTest.java +++ b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/CacheRefKeeperTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.server.lookup; +package org.apache.druid.server.lookup; -import io.druid.server.lookup.cache.polling.PollingCache; +import org.apache.druid.server.lookup.cache.polling.PollingCache; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-core/lookups-cached-single/src/test/java/io/druid/server/lookup/LoadingLookupFactoryTest.java b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/LoadingLookupFactoryTest.java similarity index 92% rename from extensions-core/lookups-cached-single/src/test/java/io/druid/server/lookup/LoadingLookupFactoryTest.java rename to extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/LoadingLookupFactoryTest.java index 67cf5c84a690..e920c8bb998c 100644 --- a/extensions-core/lookups-cached-single/src/test/java/io/druid/server/lookup/LoadingLookupFactoryTest.java +++ b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/LoadingLookupFactoryTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.server.lookup; +package org.apache.druid.server.lookup; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.query.lookup.LookupExtractorFactory; -import io.druid.segment.TestHelper; -import io.druid.server.lookup.cache.loading.LoadingCache; -import io.druid.server.lookup.cache.loading.OffHeapLoadingCache; -import io.druid.server.lookup.cache.loading.OnHeapLoadingCache; +import org.apache.druid.query.lookup.LookupExtractorFactory; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.server.lookup.cache.loading.LoadingCache; +import org.apache.druid.server.lookup.cache.loading.OffHeapLoadingCache; +import org.apache.druid.server.lookup.cache.loading.OnHeapLoadingCache; import org.codehaus.jackson.annotate.JsonCreator; import org.easymock.EasyMock; import org.junit.Assert; diff --git a/extensions-core/lookups-cached-single/src/test/java/io/druid/server/lookup/LoadingLookupTest.java b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/LoadingLookupTest.java similarity index 96% rename from extensions-core/lookups-cached-single/src/test/java/io/druid/server/lookup/LoadingLookupTest.java rename to extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/LoadingLookupTest.java index f98b03f13efc..9e451782acb2 100644 --- a/extensions-core/lookups-cached-single/src/test/java/io/druid/server/lookup/LoadingLookupTest.java +++ b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/LoadingLookupTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.server.lookup; +package org.apache.druid.server.lookup; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.druid.common.config.NullHandling; -import io.druid.server.lookup.cache.loading.LoadingCache; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.server.lookup.cache.loading.LoadingCache; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-core/lookups-cached-single/src/test/java/io/druid/server/lookup/PollingLookupFactoryTest.java b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/PollingLookupFactoryTest.java similarity index 97% rename from extensions-core/lookups-cached-single/src/test/java/io/druid/server/lookup/PollingLookupFactoryTest.java rename to extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/PollingLookupFactoryTest.java index 42550b341340..39bfc41a6195 100644 --- a/extensions-core/lookups-cached-single/src/test/java/io/druid/server/lookup/PollingLookupFactoryTest.java +++ b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/PollingLookupFactoryTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.lookup; +package org.apache.druid.server.lookup; import org.easymock.EasyMock; import org.joda.time.Period; diff --git a/extensions-core/lookups-cached-single/src/test/java/io/druid/server/lookup/PollingLookupSerDeserTest.java b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/PollingLookupSerDeserTest.java similarity index 88% rename from extensions-core/lookups-cached-single/src/test/java/io/druid/server/lookup/PollingLookupSerDeserTest.java rename to extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/PollingLookupSerDeserTest.java index fffaac07e5a1..937ac4de338f 100644 --- a/extensions-core/lookups-cached-single/src/test/java/io/druid/server/lookup/PollingLookupSerDeserTest.java +++ b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/PollingLookupSerDeserTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.server.lookup; +package org.apache.druid.server.lookup; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.query.lookup.LookupExtractorFactory; -import io.druid.server.lookup.cache.polling.OffHeapPollingCache; -import io.druid.server.lookup.cache.polling.OnHeapPollingCache; -import io.druid.server.lookup.cache.polling.PollingCacheFactory; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.query.lookup.LookupExtractorFactory; +import org.apache.druid.server.lookup.cache.polling.OffHeapPollingCache; +import org.apache.druid.server.lookup.cache.polling.OnHeapPollingCache; +import org.apache.druid.server.lookup.cache.polling.PollingCacheFactory; import org.codehaus.jackson.annotate.JsonCreator; import org.joda.time.Period; import org.junit.Assert; diff --git a/extensions-core/lookups-cached-single/src/test/java/io/druid/server/lookup/PollingLookupTest.java b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/PollingLookupTest.java similarity index 93% rename from extensions-core/lookups-cached-single/src/test/java/io/druid/server/lookup/PollingLookupTest.java rename to extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/PollingLookupTest.java index bbe696450e28..18bb8b759248 100644 --- a/extensions-core/lookups-cached-single/src/test/java/io/druid/server/lookup/PollingLookupTest.java +++ b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/PollingLookupTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.lookup; +package org.apache.druid.server.lookup; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.base.Function; @@ -25,12 +25,12 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.ISE; -import io.druid.query.lookup.LookupExtractor; -import io.druid.server.lookup.cache.polling.OffHeapPollingCache; -import io.druid.server.lookup.cache.polling.OnHeapPollingCache; -import io.druid.server.lookup.cache.polling.PollingCacheFactory; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.query.lookup.LookupExtractor; +import org.apache.druid.server.lookup.cache.polling.OffHeapPollingCache; +import org.apache.druid.server.lookup.cache.polling.OnHeapPollingCache; +import org.apache.druid.server.lookup.cache.polling.PollingCacheFactory; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/extensions-core/lookups-cached-single/src/test/java/io/druid/server/lookup/cache/loading/LoadingCacheTest.java b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/cache/loading/LoadingCacheTest.java similarity index 97% rename from extensions-core/lookups-cached-single/src/test/java/io/druid/server/lookup/cache/loading/LoadingCacheTest.java rename to extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/cache/loading/LoadingCacheTest.java index a0dbf64cc44e..49a89593a3ae 100644 --- a/extensions-core/lookups-cached-single/src/test/java/io/druid/server/lookup/cache/loading/LoadingCacheTest.java +++ b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/cache/loading/LoadingCacheTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.server.lookup.cache.loading; +package org.apache.druid.server.lookup.cache.loading; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/extensions-core/lookups-cached-single/src/test/java/io/druid/server/lookup/cache/loading/OffHeapLoadingCacheTest.java b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/cache/loading/OffHeapLoadingCacheTest.java similarity index 95% rename from extensions-core/lookups-cached-single/src/test/java/io/druid/server/lookup/cache/loading/OffHeapLoadingCacheTest.java rename to extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/cache/loading/OffHeapLoadingCacheTest.java index a6755117d6b9..ad1053953559 100644 --- a/extensions-core/lookups-cached-single/src/test/java/io/druid/server/lookup/cache/loading/OffHeapLoadingCacheTest.java +++ b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/cache/loading/OffHeapLoadingCacheTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.lookup.cache.loading; +package org.apache.druid.server.lookup.cache.loading; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-core/lookups-cached-single/src/test/java/io/druid/server/lookup/cache/loading/OnHeapLoadingCacheTest.java b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/cache/loading/OnHeapLoadingCacheTest.java similarity index 95% rename from extensions-core/lookups-cached-single/src/test/java/io/druid/server/lookup/cache/loading/OnHeapLoadingCacheTest.java rename to extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/cache/loading/OnHeapLoadingCacheTest.java index bfac4fe72c3c..a424470f5e65 100644 --- a/extensions-core/lookups-cached-single/src/test/java/io/druid/server/lookup/cache/loading/OnHeapLoadingCacheTest.java +++ b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/cache/loading/OnHeapLoadingCacheTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.lookup.cache.loading; +package org.apache.druid.server.lookup.cache.loading; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-core/lookups-cached-single/src/test/java/io/druid/server/lookup/jdbc/JdbcDataFetcherTest.java b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/jdbc/JdbcDataFetcherTest.java similarity index 94% rename from extensions-core/lookups-cached-single/src/test/java/io/druid/server/lookup/jdbc/JdbcDataFetcherTest.java rename to extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/jdbc/JdbcDataFetcherTest.java index 2b37ee22428f..8154b1cff849 100644 --- a/extensions-core/lookups-cached-single/src/test/java/io/druid/server/lookup/jdbc/JdbcDataFetcherTest.java +++ b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/jdbc/JdbcDataFetcherTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.server.lookup.jdbc; +package org.apache.druid.server.lookup.jdbc; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.StringUtils; -import io.druid.metadata.MetadataStorageConnectorConfig; -import io.druid.metadata.TestDerbyConnector; -import io.druid.server.lookup.DataFetcher; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.metadata.MetadataStorageConnectorConfig; +import org.apache.druid.metadata.TestDerbyConnector; +import org.apache.druid.server.lookup.DataFetcher; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/extensions-core/mysql-metadata-storage/pom.xml b/extensions-core/mysql-metadata-storage/pom.xml index e78d00f2e03f..2ad8d82ea61e 100644 --- a/extensions-core/mysql-metadata-storage/pom.xml +++ b/extensions-core/mysql-metadata-storage/pom.xml @@ -22,13 +22,13 @@ 4.0.0 - io.druid.extensions + org.apache.druid.extensions mysql-metadata-storage mysql-metadata-storage mysql-metadata-storage - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT ../../pom.xml @@ -36,19 +36,19 @@ - io.druid + org.apache.druid druid-api ${project.parent.version} provided - io.druid + org.apache.druid druid-common ${project.parent.version} provided - io.druid + org.apache.druid druid-server ${project.parent.version} provided diff --git a/extensions-core/mysql-metadata-storage/src/main/java/io/druid/firehose/sql/MySQLFirehoseDatabaseConnector.java b/extensions-core/mysql-metadata-storage/src/main/java/org/apache/druid/firehose/sql/MySQLFirehoseDatabaseConnector.java similarity index 91% rename from extensions-core/mysql-metadata-storage/src/main/java/io/druid/firehose/sql/MySQLFirehoseDatabaseConnector.java rename to extensions-core/mysql-metadata-storage/src/main/java/org/apache/druid/firehose/sql/MySQLFirehoseDatabaseConnector.java index b1bd91042275..2096d1030b56 100644 --- a/extensions-core/mysql-metadata-storage/src/main/java/io/druid/firehose/sql/MySQLFirehoseDatabaseConnector.java +++ b/extensions-core/mysql-metadata-storage/src/main/java/org/apache/druid/firehose/sql/MySQLFirehoseDatabaseConnector.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.firehose.sql; +package org.apache.druid.firehose.sql; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.druid.metadata.MetadataStorageConnectorConfig; -import io.druid.metadata.SQLFirehoseDatabaseConnector; +import org.apache.druid.metadata.MetadataStorageConnectorConfig; +import org.apache.druid.metadata.SQLFirehoseDatabaseConnector; import org.apache.commons.dbcp2.BasicDataSource; import org.skife.jdbi.v2.DBI; diff --git a/extensions-core/mysql-metadata-storage/src/main/java/io/druid/metadata/storage/mysql/MySQLConnector.java b/extensions-core/mysql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/mysql/MySQLConnector.java similarity index 95% rename from extensions-core/mysql-metadata-storage/src/main/java/io/druid/metadata/storage/mysql/MySQLConnector.java rename to extensions-core/mysql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/mysql/MySQLConnector.java index 539b93f6d3ff..8c709032caff 100644 --- a/extensions-core/mysql-metadata-storage/src/main/java/io/druid/metadata/storage/mysql/MySQLConnector.java +++ b/extensions-core/mysql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/mysql/MySQLConnector.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.metadata.storage.mysql; +package org.apache.druid.metadata.storage.mysql; import com.google.common.base.Joiner; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableList; import com.google.inject.Inject; import com.mysql.jdbc.exceptions.MySQLTransientException; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.metadata.MetadataStorageConnectorConfig; -import io.druid.metadata.MetadataStorageTablesConfig; -import io.druid.metadata.SQLMetadataConnector; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.metadata.MetadataStorageConnectorConfig; +import org.apache.druid.metadata.MetadataStorageTablesConfig; +import org.apache.druid.metadata.SQLMetadataConnector; import org.apache.commons.dbcp2.BasicDataSource; import org.skife.jdbi.v2.DBI; import org.skife.jdbi.v2.Handle; diff --git a/extensions-core/mysql-metadata-storage/src/main/java/io/druid/metadata/storage/mysql/MySQLConnectorConfig.java b/extensions-core/mysql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/mysql/MySQLConnectorConfig.java similarity index 97% rename from extensions-core/mysql-metadata-storage/src/main/java/io/druid/metadata/storage/mysql/MySQLConnectorConfig.java rename to extensions-core/mysql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/mysql/MySQLConnectorConfig.java index 3caf717f862a..7b6bf9ac8cdb 100644 --- a/extensions-core/mysql-metadata-storage/src/main/java/io/druid/metadata/storage/mysql/MySQLConnectorConfig.java +++ b/extensions-core/mysql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/mysql/MySQLConnectorConfig.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.metadata.storage.mysql; +package org.apache.druid.metadata.storage.mysql; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.metadata.PasswordProvider; +import org.apache.druid.metadata.PasswordProvider; import java.util.List; diff --git a/extensions-core/mysql-metadata-storage/src/main/java/io/druid/metadata/storage/mysql/MySQLMetadataStorageModule.java b/extensions-core/mysql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/mysql/MySQLMetadataStorageModule.java similarity index 77% rename from extensions-core/mysql-metadata-storage/src/main/java/io/druid/metadata/storage/mysql/MySQLMetadataStorageModule.java rename to extensions-core/mysql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/mysql/MySQLMetadataStorageModule.java index e1a308adc201..9a378883f515 100644 --- a/extensions-core/mysql-metadata-storage/src/main/java/io/druid/metadata/storage/mysql/MySQLMetadataStorageModule.java +++ b/extensions-core/mysql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/mysql/MySQLMetadataStorageModule.java @@ -17,25 +17,25 @@ * under the License. */ -package io.druid.metadata.storage.mysql; +package org.apache.druid.metadata.storage.mysql; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.inject.Binder; import com.google.inject.Key; -import io.druid.firehose.sql.MySQLFirehoseDatabaseConnector; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.LazySingleton; -import io.druid.guice.PolyBind; -import io.druid.guice.SQLMetadataStorageDruidModule; -import io.druid.initialization.DruidModule; -import io.druid.metadata.MetadataStorageActionHandlerFactory; -import io.druid.metadata.MetadataStorageConnector; -import io.druid.metadata.MetadataStorageProvider; -import io.druid.metadata.MySQLMetadataStorageActionHandlerFactory; -import io.druid.metadata.NoopMetadataStorageProvider; -import io.druid.metadata.SQLMetadataConnector; +import org.apache.druid.firehose.sql.MySQLFirehoseDatabaseConnector; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.PolyBind; +import org.apache.druid.guice.SQLMetadataStorageDruidModule; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.metadata.MetadataStorageActionHandlerFactory; +import org.apache.druid.metadata.MetadataStorageConnector; +import org.apache.druid.metadata.MetadataStorageProvider; +import org.apache.druid.metadata.MySQLMetadataStorageActionHandlerFactory; +import org.apache.druid.metadata.NoopMetadataStorageProvider; +import org.apache.druid.metadata.SQLMetadataConnector; import java.util.Collections; import java.util.List; diff --git a/extensions-core/mysql-metadata-storage/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-core/mysql-metadata-storage/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index cf8371810e4f..000000000000 --- a/extensions-core/mysql-metadata-storage/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.metadata.storage.mysql.MySQLMetadataStorageModule diff --git a/extensions-core/mysql-metadata-storage/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-core/mysql-metadata-storage/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..f59e8a7fa1c1 --- /dev/null +++ b/extensions-core/mysql-metadata-storage/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.metadata.storage.mysql.MySQLMetadataStorageModule diff --git a/extensions-core/postgresql-metadata-storage/pom.xml b/extensions-core/postgresql-metadata-storage/pom.xml index 5a54403eb0f1..22c1506597dc 100644 --- a/extensions-core/postgresql-metadata-storage/pom.xml +++ b/extensions-core/postgresql-metadata-storage/pom.xml @@ -22,13 +22,13 @@ 4.0.0 - io.druid.extensions + org.apache.druid.extensions postgresql-metadata-storage postgresql-metadata-storage postgresql-metadata-storage - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT ../../pom.xml @@ -36,19 +36,19 @@ - io.druid + org.apache.druid druid-api ${project.parent.version} provided - io.druid + org.apache.druid druid-common ${project.parent.version} provided - io.druid + org.apache.druid druid-server ${project.parent.version} provided diff --git a/extensions-core/postgresql-metadata-storage/src/main/java/io/druid/metadata/storage/postgresql/PostgreSQLConnector.java b/extensions-core/postgresql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/postgresql/PostgreSQLConnector.java similarity index 95% rename from extensions-core/postgresql-metadata-storage/src/main/java/io/druid/metadata/storage/postgresql/PostgreSQLConnector.java rename to extensions-core/postgresql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/postgresql/PostgreSQLConnector.java index b05cdf0caa8b..21fcbf596563 100644 --- a/extensions-core/postgresql-metadata-storage/src/main/java/io/druid/metadata/storage/postgresql/PostgreSQLConnector.java +++ b/extensions-core/postgresql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/postgresql/PostgreSQLConnector.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.metadata.storage.postgresql; +package org.apache.druid.metadata.storage.postgresql; import com.google.common.base.Supplier; import com.google.inject.Inject; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.metadata.MetadataStorageConnectorConfig; -import io.druid.metadata.MetadataStorageTablesConfig; -import io.druid.metadata.SQLMetadataConnector; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.metadata.MetadataStorageConnectorConfig; +import org.apache.druid.metadata.MetadataStorageTablesConfig; +import org.apache.druid.metadata.SQLMetadataConnector; import org.apache.commons.dbcp2.BasicDataSource; import org.postgresql.PGProperty; import org.skife.jdbi.v2.DBI; diff --git a/extensions-core/postgresql-metadata-storage/src/main/java/io/druid/metadata/storage/postgresql/PostgreSQLConnectorConfig.java b/extensions-core/postgresql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/postgresql/PostgreSQLConnectorConfig.java similarity index 96% rename from extensions-core/postgresql-metadata-storage/src/main/java/io/druid/metadata/storage/postgresql/PostgreSQLConnectorConfig.java rename to extensions-core/postgresql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/postgresql/PostgreSQLConnectorConfig.java index aedd8f1fb347..df5fb6f453d5 100644 --- a/extensions-core/postgresql-metadata-storage/src/main/java/io/druid/metadata/storage/postgresql/PostgreSQLConnectorConfig.java +++ b/extensions-core/postgresql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/postgresql/PostgreSQLConnectorConfig.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.metadata.storage.postgresql; +package org.apache.druid.metadata.storage.postgresql; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.metadata.PasswordProvider; +import org.apache.druid.metadata.PasswordProvider; public class PostgreSQLConnectorConfig { diff --git a/extensions-core/postgresql-metadata-storage/src/main/java/io/druid/metadata/storage/postgresql/PostgreSQLMetadataStorageModule.java b/extensions-core/postgresql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/postgresql/PostgreSQLMetadataStorageModule.java similarity index 76% rename from extensions-core/postgresql-metadata-storage/src/main/java/io/druid/metadata/storage/postgresql/PostgreSQLMetadataStorageModule.java rename to extensions-core/postgresql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/postgresql/PostgreSQLMetadataStorageModule.java index b8a38d65ca27..6eaca55fd38f 100644 --- a/extensions-core/postgresql-metadata-storage/src/main/java/io/druid/metadata/storage/postgresql/PostgreSQLMetadataStorageModule.java +++ b/extensions-core/postgresql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/postgresql/PostgreSQLMetadataStorageModule.java @@ -17,23 +17,23 @@ * under the License. */ -package io.druid.metadata.storage.postgresql; +package org.apache.druid.metadata.storage.postgresql; 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.JsonConfigProvider; -import io.druid.guice.LazySingleton; -import io.druid.guice.PolyBind; -import io.druid.guice.SQLMetadataStorageDruidModule; -import io.druid.initialization.DruidModule; -import io.druid.metadata.MetadataStorageActionHandlerFactory; -import io.druid.metadata.MetadataStorageConnector; -import io.druid.metadata.MetadataStorageProvider; -import io.druid.metadata.NoopMetadataStorageProvider; -import io.druid.metadata.PostgreSQLMetadataStorageActionHandlerFactory; -import io.druid.metadata.SQLMetadataConnector; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.PolyBind; +import org.apache.druid.guice.SQLMetadataStorageDruidModule; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.metadata.MetadataStorageActionHandlerFactory; +import org.apache.druid.metadata.MetadataStorageConnector; +import org.apache.druid.metadata.MetadataStorageProvider; +import org.apache.druid.metadata.NoopMetadataStorageProvider; +import org.apache.druid.metadata.PostgreSQLMetadataStorageActionHandlerFactory; +import org.apache.druid.metadata.SQLMetadataConnector; import java.util.List; diff --git a/extensions-core/postgresql-metadata-storage/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-core/postgresql-metadata-storage/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index 45e62cfc192e..000000000000 --- a/extensions-core/postgresql-metadata-storage/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.metadata.storage.postgresql.PostgreSQLMetadataStorageModule diff --git a/extensions-core/postgresql-metadata-storage/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-core/postgresql-metadata-storage/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..af82bc18d8d8 --- /dev/null +++ b/extensions-core/postgresql-metadata-storage/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.metadata.storage.postgresql.PostgreSQLMetadataStorageModule diff --git a/extensions-core/postgresql-metadata-storage/src/test/java/io/druid/metadata/storage/postgresql/PostgreSQLConnectorTest.java b/extensions-core/postgresql-metadata-storage/src/test/java/org/apache/druid/metadata/storage/postgresql/PostgreSQLConnectorTest.java similarity index 92% rename from extensions-core/postgresql-metadata-storage/src/test/java/io/druid/metadata/storage/postgresql/PostgreSQLConnectorTest.java rename to extensions-core/postgresql-metadata-storage/src/test/java/org/apache/druid/metadata/storage/postgresql/PostgreSQLConnectorTest.java index 833e9a86a6ab..222e5d53b90d 100644 --- a/extensions-core/postgresql-metadata-storage/src/test/java/io/druid/metadata/storage/postgresql/PostgreSQLConnectorTest.java +++ b/extensions-core/postgresql-metadata-storage/src/test/java/org/apache/druid/metadata/storage/postgresql/PostgreSQLConnectorTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.metadata.storage.postgresql; +package org.apache.druid.metadata.storage.postgresql; import com.google.common.base.Suppliers; -import io.druid.metadata.MetadataStorageConnectorConfig; -import io.druid.metadata.MetadataStorageTablesConfig; +import org.apache.druid.metadata.MetadataStorageConnectorConfig; +import org.apache.druid.metadata.MetadataStorageTablesConfig; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-core/protobuf-extensions/pom.xml b/extensions-core/protobuf-extensions/pom.xml index 07ac4fec09a4..5c9fd743025e 100644 --- a/extensions-core/protobuf-extensions/pom.xml +++ b/extensions-core/protobuf-extensions/pom.xml @@ -23,14 +23,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.druid.extensions + org.apache.druid.extensions druid-protobuf-extensions druid-protobuf-extensions druid-protobuf-extensions druid - io.druid + org.apache.druid 0.13.0-SNAPSHOT ../../pom.xml @@ -41,7 +41,7 @@ - io.druid + org.apache.druid druid-common ${project.parent.version} provided diff --git a/extensions-core/protobuf-extensions/src/main/java/io/druid/data/input/protobuf/ProtobufExtensionsModule.java b/extensions-core/protobuf-extensions/src/main/java/org/apache/druid/data/input/protobuf/ProtobufExtensionsModule.java similarity index 93% rename from extensions-core/protobuf-extensions/src/main/java/io/druid/data/input/protobuf/ProtobufExtensionsModule.java rename to extensions-core/protobuf-extensions/src/main/java/org/apache/druid/data/input/protobuf/ProtobufExtensionsModule.java index ed972952d5b8..774bac5760f9 100644 --- a/extensions-core/protobuf-extensions/src/main/java/io/druid/data/input/protobuf/ProtobufExtensionsModule.java +++ b/extensions-core/protobuf-extensions/src/main/java/org/apache/druid/data/input/protobuf/ProtobufExtensionsModule.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.data.input.protobuf; +package org.apache.druid.data.input.protobuf; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.inject.Binder; -import io.druid.initialization.DruidModule; +import org.apache.druid.initialization.DruidModule; import java.util.Collections; import java.util.List; diff --git a/extensions-core/protobuf-extensions/src/main/java/io/druid/data/input/protobuf/ProtobufInputRowParser.java b/extensions-core/protobuf-extensions/src/main/java/org/apache/druid/data/input/protobuf/ProtobufInputRowParser.java similarity index 92% rename from extensions-core/protobuf-extensions/src/main/java/io/druid/data/input/protobuf/ProtobufInputRowParser.java rename to extensions-core/protobuf-extensions/src/main/java/org/apache/druid/data/input/protobuf/ProtobufInputRowParser.java index 37191d36b7c8..25eedc4b1747 100644 --- a/extensions-core/protobuf-extensions/src/main/java/io/druid/data/input/protobuf/ProtobufInputRowParser.java +++ b/extensions-core/protobuf-extensions/src/main/java/org/apache/druid/data/input/protobuf/ProtobufInputRowParser.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.data.input.protobuf; +package org.apache.druid.data.input.protobuf; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -29,13 +29,13 @@ import com.google.protobuf.DynamicMessage; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.util.JsonFormat; -import io.druid.data.input.ByteBufferInputRowParser; -import io.druid.data.input.InputRow; -import io.druid.data.input.MapBasedInputRow; -import io.druid.data.input.impl.ParseSpec; -import io.druid.java.util.common.StringUtils; -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.data.input.MapBasedInputRow; +import org.apache.druid.data.input.impl.ParseSpec; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.parsers.ParseException; +import org.apache.druid.java.util.common.parsers.Parser; import java.io.IOException; import java.io.InputStream; diff --git a/extensions-core/protobuf-extensions/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-core/protobuf-extensions/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100755 index 0a86169f8122..000000000000 --- a/extensions-core/protobuf-extensions/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.data.input.protobuf.ProtobufExtensionsModule diff --git a/extensions-core/protobuf-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-core/protobuf-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100755 index 000000000000..1398983556dd --- /dev/null +++ b/extensions-core/protobuf-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.data.input.protobuf.ProtobufExtensionsModule diff --git a/extensions-core/protobuf-extensions/src/test/java/io/druid/data/input/protobuf/ProtoTestEventWrapper.java b/extensions-core/protobuf-extensions/src/test/java/org/apache/druid/data/input/protobuf/ProtoTestEventWrapper.java similarity index 81% rename from extensions-core/protobuf-extensions/src/test/java/io/druid/data/input/protobuf/ProtoTestEventWrapper.java rename to extensions-core/protobuf-extensions/src/test/java/org/apache/druid/data/input/protobuf/ProtoTestEventWrapper.java index b8a5895e8e8a..561e3a591126 100644 --- a/extensions-core/protobuf-extensions/src/test/java/io/druid/data/input/protobuf/ProtoTestEventWrapper.java +++ b/extensions-core/protobuf-extensions/src/test/java/org/apache/druid/data/input/protobuf/ProtoTestEventWrapper.java @@ -20,7 +20,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: ProtoTest.proto -package io.druid.data.input.protobuf; +package org.apache.druid.data.input.protobuf; @SuppressWarnings("ALL") public final class ProtoTestEventWrapper @@ -54,7 +54,7 @@ public interface ProtoTestEventOrBuilder extends /** * required .prototest.ProtoTestEvent.EventCategory eventType = 1; */ - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.EventCategory getEventType(); + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.EventCategory getEventType(); /** * required uint64 id = 2; @@ -156,23 +156,23 @@ public interface ProtoTestEventOrBuilder extends /** * optional .prototest.ProtoTestEvent.Foo foo = 10; */ - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo getFoo(); + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo getFoo(); /** * optional .prototest.ProtoTestEvent.Foo foo = 10; */ - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.FooOrBuilder getFooOrBuilder(); + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.FooOrBuilder getFooOrBuilder(); /** * repeated .prototest.ProtoTestEvent.Foo bar = 11; */ - java.util.List + java.util.List getBarList(); /** * repeated .prototest.ProtoTestEvent.Foo bar = 11; */ - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo getBar(int index); + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo getBar(int index); /** * repeated .prototest.ProtoTestEvent.Foo bar = 11; @@ -182,13 +182,13 @@ public interface ProtoTestEventOrBuilder extends /** * repeated .prototest.ProtoTestEvent.Foo bar = 11; */ - java.util.List + java.util.List getBarOrBuilderList(); /** * repeated .prototest.ProtoTestEvent.Foo bar = 11; */ - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.FooOrBuilder getBarOrBuilder( + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.FooOrBuilder getBarOrBuilder( int index ); } @@ -256,7 +256,7 @@ private ProtoTestEvent( } case 8: { int rawValue = input.readEnum(); - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.EventCategory value = io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.EventCategory + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.EventCategory value = org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.EventCategory .valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(1, rawValue); @@ -309,12 +309,12 @@ private ProtoTestEvent( break; } case 82: { - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder subBuilder = null; + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder subBuilder = null; if (((bitField0_ & 0x00000200) == 0x00000200)) { subBuilder = foo_.toBuilder(); } foo_ = input.readMessage( - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.PARSER, + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.PARSER, extensionRegistry ); if (subBuilder != null) { @@ -326,12 +326,12 @@ private ProtoTestEvent( } case 90: { if (!((mutable_bitField0_ & 0x00000400) == 0x00000400)) { - bar_ = new java.util.ArrayList(); + bar_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000400; } bar_.add( input.readMessage( - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.PARSER, + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.PARSER, extensionRegistry )); break; @@ -358,16 +358,16 @@ private ProtoTestEvent( public static com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return io.druid.data.input.protobuf.ProtoTestEventWrapper.internal_static_prototest_ProtoTestEvent_descriptor; + return org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.internal_static_prototest_ProtoTestEvent_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return io.druid.data.input.protobuf.ProtoTestEventWrapper.internal_static_prototest_ProtoTestEvent_fieldAccessorTable + return org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.internal_static_prototest_ProtoTestEvent_fieldAccessorTable .ensureFieldAccessorsInitialized( - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.class, - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Builder.class + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.class, + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Builder.class ); } @@ -463,7 +463,7 @@ public EventCategory findValueByNumber(int number) public static com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.getDescriptor().getEnumTypes().get(0); + return org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.getDescriptor().getEnumTypes().get(0); } private static final EventCategory[] VALUES = values(); @@ -588,16 +588,16 @@ private Foo( public static com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return io.druid.data.input.protobuf.ProtoTestEventWrapper.internal_static_prototest_ProtoTestEvent_Foo_descriptor; + return org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.internal_static_prototest_ProtoTestEvent_Foo_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return io.druid.data.input.protobuf.ProtoTestEventWrapper.internal_static_prototest_ProtoTestEvent_Foo_fieldAccessorTable + return org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.internal_static_prototest_ProtoTestEvent_Foo_fieldAccessorTable .ensureFieldAccessorsInitialized( - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.class, - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder.class + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.class, + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder.class ); } @@ -703,10 +703,10 @@ public boolean equals(final java.lang.Object obj) if (obj == this) { return true; } - if (!(obj instanceof io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo)) { + if (!(obj instanceof org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo)) { return super.equals(obj); } - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo other = (io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo) obj; + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo other = (org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo) obj; boolean result = true; result = result && (hasBar() == other.hasBar()); @@ -735,7 +735,7 @@ public int hashCode() return hash; } - public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo parseFrom( + public static org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo parseFrom( com.google.protobuf.ByteString data ) throws com.google.protobuf.InvalidProtocolBufferException @@ -743,7 +743,7 @@ public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent. return PARSER.parseFrom(data); } - public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo parseFrom( + public static org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry ) @@ -752,13 +752,13 @@ public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent. return PARSER.parseFrom(data, extensionRegistry); } - public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo parseFrom(byte[] data) + public static org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo parseFrom( + public static org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry ) @@ -767,14 +767,14 @@ public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent. return PARSER.parseFrom(data, extensionRegistry); } - public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo parseFrom(java.io.InputStream input) + public static org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo parseFrom( + public static org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry ) @@ -784,14 +784,14 @@ public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent. .parseWithIOException(PARSER, input, extensionRegistry); } - public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo parseDelimitedFrom(java.io.InputStream input) + public static org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo parseDelimitedFrom( + public static org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry ) @@ -801,7 +801,7 @@ public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent. .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo parseFrom( + public static org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo parseFrom( com.google.protobuf.CodedInputStream input ) throws java.io.IOException @@ -810,7 +810,7 @@ public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent. .parseWithIOException(PARSER, input); } - public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo parseFrom( + public static org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry ) @@ -830,7 +830,7 @@ public static Builder newBuilder() return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo prototype) + public static Builder newBuilder(org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @@ -856,25 +856,25 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:prototest.ProtoTestEvent.Foo) - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.FooOrBuilder + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.FooOrBuilder { public static com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return io.druid.data.input.protobuf.ProtoTestEventWrapper.internal_static_prototest_ProtoTestEvent_Foo_descriptor; + return org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.internal_static_prototest_ProtoTestEvent_Foo_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return io.druid.data.input.protobuf.ProtoTestEventWrapper.internal_static_prototest_ProtoTestEvent_Foo_fieldAccessorTable + return org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.internal_static_prototest_ProtoTestEvent_Foo_fieldAccessorTable .ensureFieldAccessorsInitialized( - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.class, - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder.class + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.class, + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder.class ); } - // Construct using io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.newBuilder() + // Construct using org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.newBuilder() private Builder() { maybeForceBuilderInitialization(); @@ -906,26 +906,26 @@ public Builder clear() public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return io.druid.data.input.protobuf.ProtoTestEventWrapper.internal_static_prototest_ProtoTestEvent_Foo_descriptor; + return org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.internal_static_prototest_ProtoTestEvent_Foo_descriptor; } - public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo getDefaultInstanceForType() + public org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo getDefaultInstanceForType() { - return io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.getDefaultInstance(); + return org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.getDefaultInstance(); } - public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo build() + public org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo build() { - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo result = buildPartial(); + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo buildPartial() + public org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo buildPartial() { - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo result = new io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo( + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo result = new org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo( this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; @@ -983,17 +983,17 @@ public Builder addRepeatedField( public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo) { - return mergeFrom((io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo) other); + if (other instanceof org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo) { + return mergeFrom((org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo) other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo other) + public Builder mergeFrom(org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo other) { - if (other == io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.getDefaultInstance()) { + if (other == org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.getDefaultInstance()) { return this; } if (other.hasBar()) { @@ -1020,12 +1020,12 @@ public Builder mergeFrom( ) throws java.io.IOException { - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo parsedMessage = null; + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo) e.getUnfinishedMessage(); + parsedMessage = (org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { @@ -1147,13 +1147,13 @@ public Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:prototest.ProtoTestEvent.Foo) - private static final io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo DEFAULT_INSTANCE; + private static final org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo(); + DEFAULT_INSTANCE = new org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo(); } - public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo getDefaultInstance() + public static org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -1183,7 +1183,7 @@ public com.google.protobuf.Parser getParserForType() return PARSER; } - public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo getDefaultInstanceForType() + public org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -1205,12 +1205,12 @@ public boolean hasEventType() /** * required .prototest.ProtoTestEvent.EventCategory eventType = 1; */ - public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.EventCategory getEventType() + public org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.EventCategory getEventType() { - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.EventCategory result = io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.EventCategory + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.EventCategory result = org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.EventCategory .valueOf(eventType_); return result == null - ? io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.EventCategory.CATEGORY_ZERO + ? org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.EventCategory.CATEGORY_ZERO : result; } @@ -1425,7 +1425,7 @@ public long getSomeLongColumn() } public static final int FOO_FIELD_NUMBER = 10; - private io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo foo_; + private org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo foo_; /** * optional .prototest.ProtoTestEvent.Foo foo = 10; @@ -1438,30 +1438,30 @@ public boolean hasFoo() /** * optional .prototest.ProtoTestEvent.Foo foo = 10; */ - public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo getFoo() + public org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo getFoo() { return foo_ == null - ? io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.getDefaultInstance() + ? org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.getDefaultInstance() : foo_; } /** * optional .prototest.ProtoTestEvent.Foo foo = 10; */ - public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.FooOrBuilder getFooOrBuilder() + public org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.FooOrBuilder getFooOrBuilder() { return foo_ == null - ? io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.getDefaultInstance() + ? org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.getDefaultInstance() : foo_; } public static final int BAR_FIELD_NUMBER = 11; - private java.util.List bar_; + private java.util.List bar_; /** * repeated .prototest.ProtoTestEvent.Foo bar = 11; */ - public java.util.List getBarList() + public java.util.List getBarList() { return bar_; } @@ -1469,7 +1469,7 @@ public java.util.Listrepeated .prototest.ProtoTestEvent.Foo bar = 11; */ - public java.util.List + public java.util.List getBarOrBuilderList() { return bar_; @@ -1486,7 +1486,7 @@ public int getBarCount() /** * repeated .prototest.ProtoTestEvent.Foo bar = 11; */ - public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo getBar(int index) + public org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo getBar(int index) { return bar_.get(index); } @@ -1494,7 +1494,7 @@ public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo get /** * repeated .prototest.ProtoTestEvent.Foo bar = 11; */ - public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.FooOrBuilder getBarOrBuilder( + public org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.FooOrBuilder getBarOrBuilder( int index ) { @@ -1643,10 +1643,10 @@ public boolean equals(final java.lang.Object obj) if (obj == this) { return true; } - if (!(obj instanceof io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent)) { + if (!(obj instanceof org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent)) { return super.equals(obj); } - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent other = (io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent) obj; + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent other = (org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent) obj; boolean result = true; result = result && (hasEventType() == other.hasEventType()); @@ -1767,7 +1767,7 @@ public int hashCode() return hash; } - public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent parseFrom( + public static org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent parseFrom( com.google.protobuf.ByteString data ) throws com.google.protobuf.InvalidProtocolBufferException @@ -1775,7 +1775,7 @@ public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent return PARSER.parseFrom(data); } - public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent parseFrom( + public static org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry ) @@ -1784,13 +1784,13 @@ public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent return PARSER.parseFrom(data, extensionRegistry); } - public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent parseFrom(byte[] data) + public static org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent parseFrom( + public static org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry ) @@ -1799,14 +1799,14 @@ public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent return PARSER.parseFrom(data, extensionRegistry); } - public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent parseFrom(java.io.InputStream input) + public static org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent parseFrom( + public static org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry ) @@ -1816,14 +1816,14 @@ public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent .parseWithIOException(PARSER, input, extensionRegistry); } - public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent parseDelimitedFrom(java.io.InputStream input) + public static org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent parseDelimitedFrom( + public static org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry ) @@ -1833,7 +1833,7 @@ public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent parseFrom( + public static org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent parseFrom( com.google.protobuf.CodedInputStream input ) throws java.io.IOException @@ -1842,7 +1842,7 @@ public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent .parseWithIOException(PARSER, input); } - public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent parseFrom( + public static org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry ) @@ -1862,7 +1862,7 @@ public static Builder newBuilder() return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent prototype) + public static Builder newBuilder(org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @@ -1888,25 +1888,25 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:prototest.ProtoTestEvent) - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEventOrBuilder + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEventOrBuilder { public static com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return io.druid.data.input.protobuf.ProtoTestEventWrapper.internal_static_prototest_ProtoTestEvent_descriptor; + return org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.internal_static_prototest_ProtoTestEvent_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return io.druid.data.input.protobuf.ProtoTestEventWrapper.internal_static_prototest_ProtoTestEvent_fieldAccessorTable + return org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.internal_static_prototest_ProtoTestEvent_fieldAccessorTable .ensureFieldAccessorsInitialized( - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.class, - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Builder.class + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.class, + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Builder.class ); } - // Construct using io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.newBuilder() + // Construct using org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.newBuilder() private Builder() { maybeForceBuilderInitialization(); @@ -1968,26 +1968,26 @@ public Builder clear() public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return io.druid.data.input.protobuf.ProtoTestEventWrapper.internal_static_prototest_ProtoTestEvent_descriptor; + return org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.internal_static_prototest_ProtoTestEvent_descriptor; } - public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent getDefaultInstanceForType() + public org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent getDefaultInstanceForType() { - return io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.getDefaultInstance(); + return org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.getDefaultInstance(); } - public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent build() + public org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent build() { - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent result = buildPartial(); + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent buildPartial() + public org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent buildPartial() { - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent result = new io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent( + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent result = new org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent( this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; @@ -2094,17 +2094,17 @@ public Builder addRepeatedField( public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent) { - return mergeFrom((io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent) other); + if (other instanceof org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent) { + return mergeFrom((org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent) other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent other) + public Builder mergeFrom(org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent other) { - if (other == io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.getDefaultInstance()) { + if (other == org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.getDefaultInstance()) { return this; } if (other.hasEventType()) { @@ -2202,12 +2202,12 @@ public Builder mergeFrom( ) throws java.io.IOException { - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent parsedMessage = null; + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent) e.getUnfinishedMessage(); + parsedMessage = (org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { @@ -2233,19 +2233,19 @@ public boolean hasEventType() /** * required .prototest.ProtoTestEvent.EventCategory eventType = 1; */ - public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.EventCategory getEventType() + public org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.EventCategory getEventType() { - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.EventCategory result = io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.EventCategory + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.EventCategory result = org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.EventCategory .valueOf(eventType_); return result == null - ? io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.EventCategory.CATEGORY_ZERO + ? org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.EventCategory.CATEGORY_ZERO : result; } /** * required .prototest.ProtoTestEvent.EventCategory eventType = 1; */ - public Builder setEventType(io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.EventCategory value) + public Builder setEventType(org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.EventCategory value) { if (value == null) { throw new NullPointerException(); @@ -2687,9 +2687,9 @@ public Builder clearSomeLongColumn() return this; } - private io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo foo_ = null; + private org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo foo_ = null; private com.google.protobuf.SingleFieldBuilderV3< - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo, io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder, io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.FooOrBuilder> fooBuilder_; + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo, org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder, org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.FooOrBuilder> fooBuilder_; /** * optional .prototest.ProtoTestEvent.Foo foo = 10; @@ -2702,11 +2702,11 @@ public boolean hasFoo() /** * optional .prototest.ProtoTestEvent.Foo foo = 10; */ - public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo getFoo() + public org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo getFoo() { if (fooBuilder_ == null) { return foo_ == null - ? io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.getDefaultInstance() + ? org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.getDefaultInstance() : foo_; } else { return fooBuilder_.getMessage(); @@ -2716,7 +2716,7 @@ public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo get /** * optional .prototest.ProtoTestEvent.Foo foo = 10; */ - public Builder setFoo(io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo value) + public Builder setFoo(org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo value) { if (fooBuilder_ == null) { if (value == null) { @@ -2735,7 +2735,7 @@ public Builder setFoo(io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTe * optional .prototest.ProtoTestEvent.Foo foo = 10; */ public Builder setFoo( - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder builderForValue + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder builderForValue ) { if (fooBuilder_ == null) { @@ -2751,14 +2751,14 @@ public Builder setFoo( /** * optional .prototest.ProtoTestEvent.Foo foo = 10; */ - public Builder mergeFoo(io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo value) + public Builder mergeFoo(org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo value) { if (fooBuilder_ == null) { if (((bitField0_ & 0x00000200) == 0x00000200) && foo_ != null && - foo_ != io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.getDefaultInstance()) { + foo_ != org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.getDefaultInstance()) { foo_ = - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.newBuilder(foo_) + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.newBuilder(foo_) .mergeFrom(value) .buildPartial(); } else { @@ -2790,7 +2790,7 @@ public Builder clearFoo() /** * optional .prototest.ProtoTestEvent.Foo foo = 10; */ - public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder getFooBuilder() + public org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder getFooBuilder() { bitField0_ |= 0x00000200; onChanged(); @@ -2800,13 +2800,13 @@ public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Bui /** * optional .prototest.ProtoTestEvent.Foo foo = 10; */ - public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.FooOrBuilder getFooOrBuilder() + public org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.FooOrBuilder getFooOrBuilder() { if (fooBuilder_ != null) { return fooBuilder_.getMessageOrBuilder(); } else { return foo_ == null ? - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.getDefaultInstance() : foo_; + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.getDefaultInstance() : foo_; } } @@ -2814,12 +2814,12 @@ public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.FooOrBu * optional .prototest.ProtoTestEvent.Foo foo = 10; */ private com.google.protobuf.SingleFieldBuilderV3< - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo, io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder, io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.FooOrBuilder> + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo, org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder, org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.FooOrBuilder> getFooFieldBuilder() { if (fooBuilder_ == null) { fooBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo, io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder, io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.FooOrBuilder>( + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo, org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder, org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.FooOrBuilder>( getFoo(), getParentForChildren(), isClean() @@ -2829,24 +2829,24 @@ public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.FooOrBu return fooBuilder_; } - private java.util.List bar_ = + private java.util.List bar_ = java.util.Collections.emptyList(); private void ensureBarIsMutable() { if (!((bitField0_ & 0x00000400) == 0x00000400)) { - bar_ = new java.util.ArrayList(bar_); + bar_ = new java.util.ArrayList(bar_); bitField0_ |= 0x00000400; } } private com.google.protobuf.RepeatedFieldBuilderV3< - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo, io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder, io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.FooOrBuilder> barBuilder_; + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo, org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder, org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.FooOrBuilder> barBuilder_; /** * repeated .prototest.ProtoTestEvent.Foo bar = 11; */ - public java.util.List getBarList() + public java.util.List getBarList() { if (barBuilder_ == null) { return java.util.Collections.unmodifiableList(bar_); @@ -2870,7 +2870,7 @@ public int getBarCount() /** * repeated .prototest.ProtoTestEvent.Foo bar = 11; */ - public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo getBar(int index) + public org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo getBar(int index) { if (barBuilder_ == null) { return bar_.get(index); @@ -2883,7 +2883,7 @@ public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo get * repeated .prototest.ProtoTestEvent.Foo bar = 11; */ public Builder setBar( - int index, io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo value + int index, org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo value ) { if (barBuilder_ == null) { @@ -2903,7 +2903,7 @@ public Builder setBar( * repeated .prototest.ProtoTestEvent.Foo bar = 11; */ public Builder setBar( - int index, io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder builderForValue + int index, org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder builderForValue ) { if (barBuilder_ == null) { @@ -2919,7 +2919,7 @@ public Builder setBar( /** * repeated .prototest.ProtoTestEvent.Foo bar = 11; */ - public Builder addBar(io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo value) + public Builder addBar(org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo value) { if (barBuilder_ == null) { if (value == null) { @@ -2938,7 +2938,7 @@ public Builder addBar(io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTe * repeated .prototest.ProtoTestEvent.Foo bar = 11; */ public Builder addBar( - int index, io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo value + int index, org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo value ) { if (barBuilder_ == null) { @@ -2958,7 +2958,7 @@ public Builder addBar( * repeated .prototest.ProtoTestEvent.Foo bar = 11; */ public Builder addBar( - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder builderForValue + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder builderForValue ) { if (barBuilder_ == null) { @@ -2975,7 +2975,7 @@ public Builder addBar( * repeated .prototest.ProtoTestEvent.Foo bar = 11; */ public Builder addBar( - int index, io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder builderForValue + int index, org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder builderForValue ) { if (barBuilder_ == null) { @@ -2992,7 +2992,7 @@ public Builder addBar( * repeated .prototest.ProtoTestEvent.Foo bar = 11; */ public Builder addAllBar( - java.lang.Iterable values + java.lang.Iterable values ) { if (barBuilder_ == null) { @@ -3039,7 +3039,7 @@ public Builder removeBar(int index) /** * repeated .prototest.ProtoTestEvent.Foo bar = 11; */ - public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder getBarBuilder( + public org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder getBarBuilder( int index ) { @@ -3049,7 +3049,7 @@ public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Bui /** * repeated .prototest.ProtoTestEvent.Foo bar = 11; */ - public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.FooOrBuilder getBarOrBuilder( + public org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.FooOrBuilder getBarOrBuilder( int index ) { @@ -3063,7 +3063,7 @@ public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.FooOrBu /** * repeated .prototest.ProtoTestEvent.Foo bar = 11; */ - public java.util.List + public java.util.List getBarOrBuilderList() { if (barBuilder_ != null) { @@ -3076,39 +3076,39 @@ public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.FooOrBu /** * repeated .prototest.ProtoTestEvent.Foo bar = 11; */ - public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder addBarBuilder() + public org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder addBarBuilder() { return getBarFieldBuilder().addBuilder( - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.getDefaultInstance()); + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.getDefaultInstance()); } /** * repeated .prototest.ProtoTestEvent.Foo bar = 11; */ - public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder addBarBuilder( + public org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder addBarBuilder( int index ) { return getBarFieldBuilder().addBuilder( - index, io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.getDefaultInstance()); + index, org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.getDefaultInstance()); } /** * repeated .prototest.ProtoTestEvent.Foo bar = 11; */ - public java.util.List + public java.util.List getBarBuilderList() { return getBarFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilderV3< - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo, io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder, io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.FooOrBuilder> + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo, org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder, org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.FooOrBuilder> getBarFieldBuilder() { if (barBuilder_ == null) { barBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo, io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder, io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.FooOrBuilder>( + org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo, org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.Foo.Builder, org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent.FooOrBuilder>( bar_, ((bitField0_ & 0x00000400) == 0x00000400), getParentForChildren(), @@ -3138,13 +3138,13 @@ public Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:prototest.ProtoTestEvent) - private static final io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent DEFAULT_INSTANCE; + private static final org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent(); + DEFAULT_INSTANCE = new org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent(); } - public static io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent getDefaultInstance() + public static org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -3174,7 +3174,7 @@ public com.google.protobuf.Parser getParserForType() return PARSER; } - public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent getDefaultInstanceForType() + public org.apache.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -3214,7 +3214,7 @@ public io.druid.data.input.protobuf.ProtoTestEventWrapper.ProtoTestEvent getDefa "\030\013 \003(\0132\035.prototest.ProtoTestEvent.Foo\032\022\n" + "\003Foo\022\013\n\003bar\030\001 \002(\t\"F\n\rEventCategory\022\021\n\rCA", "TEGORY_ZERO\020\000\022\020\n\014CATEGORY_ONE\020\001\022\020\n\014CATEG" + - "ORY_TWO\020\002B5\n\034io.druid.data.input.protobu" + + "ORY_TWO\020\002B5\n\034org.apache.druid.data.input.protobu" + "fB\025ProtoTestEventWrapper" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = diff --git a/extensions-core/protobuf-extensions/src/test/java/io/druid/data/input/protobuf/ProtobufInputRowParserTest.java b/extensions-core/protobuf-extensions/src/test/java/org/apache/druid/data/input/protobuf/ProtobufInputRowParserTest.java similarity index 91% rename from extensions-core/protobuf-extensions/src/test/java/io/druid/data/input/protobuf/ProtobufInputRowParserTest.java rename to extensions-core/protobuf-extensions/src/test/java/org/apache/druid/data/input/protobuf/ProtobufInputRowParserTest.java index 93d6e956d00e..92cefd34f17e 100644 --- a/extensions-core/protobuf-extensions/src/test/java/io/druid/data/input/protobuf/ProtobufInputRowParserTest.java +++ b/extensions-core/protobuf-extensions/src/test/java/org/apache/druid/data/input/protobuf/ProtobufInputRowParserTest.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.data.input.protobuf; +package org.apache.druid.data.input.protobuf; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.JSONParseSpec; -import io.druid.data.input.impl.JavaScriptParseSpec; -import io.druid.data.input.impl.ParseSpec; -import io.druid.data.input.impl.StringDimensionSchema; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.parsers.JSONPathFieldSpec; -import io.druid.java.util.common.parsers.JSONPathFieldType; -import io.druid.java.util.common.parsers.JSONPathSpec; -import io.druid.java.util.common.parsers.ParseException; -import io.druid.js.JavaScriptConfig; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.JSONParseSpec; +import org.apache.druid.data.input.impl.JavaScriptParseSpec; +import org.apache.druid.data.input.impl.ParseSpec; +import org.apache.druid.data.input.impl.StringDimensionSchema; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.parsers.JSONPathFieldSpec; +import org.apache.druid.java.util.common.parsers.JSONPathFieldType; +import org.apache.druid.java.util.common.parsers.JSONPathSpec; +import org.apache.druid.java.util.common.parsers.ParseException; +import org.apache.druid.js.JavaScriptConfig; import org.hamcrest.CoreMatchers; import org.joda.time.DateTime; import org.joda.time.chrono.ISOChronology; diff --git a/extensions-core/protobuf-extensions/src/test/resources/ProtoTest.proto b/extensions-core/protobuf-extensions/src/test/resources/ProtoTest.proto index 1a68ab09fe72..e3b389098e26 100644 --- a/extensions-core/protobuf-extensions/src/test/resources/ProtoTest.proto +++ b/extensions-core/protobuf-extensions/src/test/resources/ProtoTest.proto @@ -1,6 +1,6 @@ syntax = "proto2"; package prototest; -option java_package = "io.druid.data.input.protobuf"; +option java_package = "org.apache.druid.data.input.protobuf"; option java_outer_classname = "ProtoTestEventWrapper"; diff --git a/extensions-core/protobuf-extensions/src/test/resources/prototest.desc b/extensions-core/protobuf-extensions/src/test/resources/prototest.desc index af7d67d102ca..d1226c81f363 100644 Binary files a/extensions-core/protobuf-extensions/src/test/resources/prototest.desc and b/extensions-core/protobuf-extensions/src/test/resources/prototest.desc differ diff --git a/extensions-core/s3-extensions/pom.xml b/extensions-core/s3-extensions/pom.xml index 2267b28e781d..fc7dffab6e64 100644 --- a/extensions-core/s3-extensions/pom.xml +++ b/extensions-core/s3-extensions/pom.xml @@ -22,13 +22,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - io.druid.extensions + org.apache.druid.extensions druid-s3-extensions druid-s3-extensions druid-s3-extensions - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT ../../pom.xml @@ -36,19 +36,19 @@ - io.druid + org.apache.druid druid-api ${project.parent.version} provided - io.druid + org.apache.druid druid-aws-common ${project.parent.version} provided - io.druid + org.apache.druid java-util ${project.parent.version} provided @@ -67,13 +67,13 @@ - io.druid + org.apache.druid druid-server ${project.parent.version} test - io.druid + org.apache.druid druid-processing ${project.parent.version} test-jar diff --git a/extensions-core/s3-extensions/src/main/java/io/druid/firehose/s3/S3FirehoseDruidModule.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/firehose/s3/S3FirehoseDruidModule.java similarity index 94% rename from extensions-core/s3-extensions/src/main/java/io/druid/firehose/s3/S3FirehoseDruidModule.java rename to extensions-core/s3-extensions/src/main/java/org/apache/druid/firehose/s3/S3FirehoseDruidModule.java index 3f10b1cd5556..6cb5ac5c1d84 100644 --- a/extensions-core/s3-extensions/src/main/java/io/druid/firehose/s3/S3FirehoseDruidModule.java +++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/firehose/s3/S3FirehoseDruidModule.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.firehose.s3; +package org.apache.druid.firehose.s3; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.common.collect.ImmutableList; import com.google.inject.Binder; -import io.druid.initialization.DruidModule; +import org.apache.druid.initialization.DruidModule; import java.util.List; diff --git a/extensions-core/s3-extensions/src/main/java/io/druid/firehose/s3/StaticS3FirehoseFactory.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/firehose/s3/StaticS3FirehoseFactory.java similarity index 93% rename from extensions-core/s3-extensions/src/main/java/io/druid/firehose/s3/StaticS3FirehoseFactory.java rename to extensions-core/s3-extensions/src/main/java/org/apache/druid/firehose/s3/StaticS3FirehoseFactory.java index 00fa357c2b4c..e167abd454a3 100644 --- a/extensions-core/s3-extensions/src/main/java/io/druid/firehose/s3/StaticS3FirehoseFactory.java +++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/firehose/s3/StaticS3FirehoseFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.firehose.s3; +package org.apache.druid.firehose.s3; import com.amazonaws.services.s3.model.AmazonS3Exception; import com.amazonaws.services.s3.model.GetObjectRequest; @@ -30,18 +30,18 @@ import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.collect.Lists; -import io.druid.data.input.FiniteFirehoseFactory; -import io.druid.data.input.InputSplit; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.data.input.impl.prefetch.PrefetchableTextFilesFirehoseFactory; -import io.druid.java.util.common.CompressionUtils; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.IOE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.storage.s3.ServerSideEncryptingAmazonS3; -import io.druid.storage.s3.S3Utils; +import org.apache.druid.data.input.FiniteFirehoseFactory; +import org.apache.druid.data.input.InputSplit; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.data.input.impl.prefetch.PrefetchableTextFilesFirehoseFactory; +import org.apache.druid.java.util.common.CompressionUtils; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.IOE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.storage.s3.ServerSideEncryptingAmazonS3; +import org.apache.druid.storage.s3.S3Utils; import java.io.IOException; import java.io.InputStream; diff --git a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/CustomServerSideEncryption.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/CustomServerSideEncryption.java similarity index 98% rename from extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/CustomServerSideEncryption.java rename to extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/CustomServerSideEncryption.java index ab02f73df0ef..d00c138b432f 100644 --- a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/CustomServerSideEncryption.java +++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/CustomServerSideEncryption.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.amazonaws.services.s3.model.CopyObjectRequest; import com.amazonaws.services.s3.model.GetObjectMetadataRequest; diff --git a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/KmsServerSideEncryption.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/KmsServerSideEncryption.java similarity index 98% rename from extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/KmsServerSideEncryption.java rename to extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/KmsServerSideEncryption.java index aaa88d8bea18..cfd2eaf3d7b8 100644 --- a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/KmsServerSideEncryption.java +++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/KmsServerSideEncryption.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.amazonaws.services.s3.model.CopyObjectRequest; import com.amazonaws.services.s3.model.PutObjectRequest; diff --git a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/NoopServerSideEncryption.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/NoopServerSideEncryption.java similarity index 95% rename from extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/NoopServerSideEncryption.java rename to extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/NoopServerSideEncryption.java index d607d74ea081..0a30d8d54aa4 100644 --- a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/NoopServerSideEncryption.java +++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/NoopServerSideEncryption.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; public class NoopServerSideEncryption implements ServerSideEncryption { diff --git a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentArchiver.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentArchiver.java similarity index 90% rename from extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentArchiver.java rename to extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentArchiver.java index 21db3773c642..185969cc342f 100644 --- a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentArchiver.java +++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentArchiver.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; import com.google.inject.Inject; -import io.druid.guice.annotations.Json; -import io.druid.segment.loading.DataSegmentArchiver; -import io.druid.segment.loading.LoadSpec; -import io.druid.segment.loading.SegmentLoadingException; -import io.druid.timeline.DataSegment; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.segment.loading.DataSegmentArchiver; +import org.apache.druid.segment.loading.LoadSpec; +import org.apache.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.timeline.DataSegment; public class S3DataSegmentArchiver extends S3DataSegmentMover implements DataSegmentArchiver diff --git a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentArchiverConfig.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentArchiverConfig.java similarity index 96% rename from extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentArchiverConfig.java rename to extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentArchiverConfig.java index e500966aaa21..f758c20c9ea1 100644 --- a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentArchiverConfig.java +++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentArchiverConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentFinder.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentFinder.java similarity index 93% rename from extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentFinder.java rename to extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentFinder.java index 600167868404..9c6815d25e98 100644 --- a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentFinder.java +++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentFinder.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.amazonaws.AmazonServiceException; import com.amazonaws.services.s3.model.ObjectMetadata; @@ -27,12 +27,12 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Throwables; import com.google.inject.Inject; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.loading.DataSegmentFinder; -import io.druid.segment.loading.SegmentLoadingException; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.loading.DataSegmentFinder; +import org.apache.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.timeline.DataSegment; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentKiller.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentKiller.java similarity index 87% rename from extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentKiller.java rename to extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentKiller.java index d6c8eb2264e7..512b0c5b4750 100644 --- a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentKiller.java +++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentKiller.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.amazonaws.AmazonServiceException; import com.google.inject.Inject; -import io.druid.java.util.common.MapUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.loading.DataSegmentKiller; -import io.druid.segment.loading.SegmentLoadingException; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.MapUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.loading.DataSegmentKiller; +import org.apache.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.timeline.DataSegment; import java.util.Map; diff --git a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentMover.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentMover.java similarity index 93% rename from extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentMover.java rename to extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentMover.java index f3fb37b098d8..ebf8792c3215 100644 --- a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentMover.java +++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentMover.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.amazonaws.AmazonServiceException; import com.amazonaws.services.s3.model.CopyObjectRequest; @@ -30,16 +30,16 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.inject.Inject; -import io.druid.java.util.common.IOE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.MapUtils; -import io.druid.java.util.common.RetryUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.loading.DataSegmentMover; -import io.druid.segment.loading.DataSegmentPusher; -import io.druid.segment.loading.SegmentLoadingException; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.IOE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.MapUtils; +import org.apache.druid.java.util.common.RetryUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.loading.DataSegmentMover; +import org.apache.druid.segment.loading.DataSegmentPusher; +import org.apache.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.timeline.DataSegment; import java.io.IOException; import java.util.Map; diff --git a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentPuller.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentPuller.java similarity index 94% rename from extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentPuller.java rename to extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentPuller.java index d6eb22696d18..d3ddc6a069d7 100644 --- a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentPuller.java +++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentPuller.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.amazonaws.AmazonServiceException; import com.amazonaws.services.s3.model.AmazonS3Exception; @@ -29,17 +29,17 @@ import com.google.common.io.ByteSource; import com.google.common.io.Files; import com.google.inject.Inject; -import io.druid.java.util.common.CompressionUtils; -import io.druid.java.util.common.FileUtils; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.IOE; -import io.druid.java.util.common.RE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.UOE; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.loading.SegmentLoadingException; -import io.druid.segment.loading.URIDataPuller; +import org.apache.druid.java.util.common.CompressionUtils; +import org.apache.druid.java.util.common.FileUtils; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.IOE; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.UOE; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.segment.loading.URIDataPuller; import javax.tools.FileObject; import java.io.File; diff --git a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentPusher.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentPusher.java similarity index 91% rename from extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentPusher.java rename to extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentPusher.java index c2a44311e9d0..ac773e11c8c3 100644 --- a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentPusher.java +++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentPusher.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.amazonaws.AmazonServiceException; import com.amazonaws.services.s3.model.PutObjectRequest; @@ -26,12 +26,12 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.inject.Inject; -import io.druid.java.util.common.CompressionUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.segment.SegmentUtils; -import io.druid.segment.loading.DataSegmentPusher; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.CompressionUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.segment.SegmentUtils; +import org.apache.druid.segment.loading.DataSegmentPusher; +import org.apache.druid.timeline.DataSegment; import java.io.File; import java.io.IOException; @@ -140,7 +140,7 @@ public Map makeLoadSpec(URI finalIndexZipFilePath) } /** - * Any change in loadSpec need to be reflected {@link io.druid.indexer.JobHelper#getURIFromSegment()} + * Any change in loadSpec need to be reflected {@link org.apache.druid.indexer.JobHelper#getURIFromSegment()} */ @SuppressWarnings("JavadocReference") private Map makeLoadSpec(String bucket, String key) diff --git a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentPusherConfig.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentPusherConfig.java similarity index 98% rename from extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentPusherConfig.java rename to extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentPusherConfig.java index 10c62f72988a..687fea664a4d 100644 --- a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentPusherConfig.java +++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentPusherConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3LoadSpec.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3LoadSpec.java similarity index 93% rename from extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3LoadSpec.java rename to extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3LoadSpec.java index f3c5c6a7ddd8..19e3b69ea242 100644 --- a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3LoadSpec.java +++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3LoadSpec.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.base.Preconditions; -import io.druid.segment.loading.LoadSpec; -import io.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.segment.loading.LoadSpec; +import org.apache.druid.segment.loading.SegmentLoadingException; import java.io.File; diff --git a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3SSECustomConfig.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3SSECustomConfig.java similarity index 96% rename from extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3SSECustomConfig.java rename to extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3SSECustomConfig.java index 8260a84710a8..00c95488f081 100644 --- a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3SSECustomConfig.java +++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3SSECustomConfig.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3SSEKmsConfig.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3SSEKmsConfig.java similarity index 96% rename from extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3SSEKmsConfig.java rename to extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3SSEKmsConfig.java index 816e9357e7fd..91d1b20c6aad 100644 --- a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3SSEKmsConfig.java +++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3SSEKmsConfig.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3ServerSideEncryption.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3ServerSideEncryption.java similarity index 98% rename from extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3ServerSideEncryption.java rename to extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3ServerSideEncryption.java index 90354be24374..6ca6c5e66f9a 100644 --- a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3ServerSideEncryption.java +++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3ServerSideEncryption.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.amazonaws.services.s3.model.CopyObjectRequest; import com.amazonaws.services.s3.model.ObjectMetadata; diff --git a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3StorageConfig.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3StorageConfig.java similarity index 97% rename from extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3StorageConfig.java rename to extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3StorageConfig.java index d02dfb15e200..9881551703af 100644 --- a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3StorageConfig.java +++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3StorageConfig.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3StorageDruidModule.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3StorageDruidModule.java similarity index 92% rename from extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3StorageDruidModule.java rename to extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3StorageDruidModule.java index 03384a08b0e9..543e58b476d1 100644 --- a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3StorageDruidModule.java +++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3StorageDruidModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.amazonaws.ClientConfiguration; import com.amazonaws.ClientConfigurationFactory; @@ -31,15 +31,15 @@ import com.google.inject.Binder; import com.google.inject.Provides; import com.google.inject.multibindings.MapBinder; -import io.druid.common.aws.AWSClientConfig; -import io.druid.common.aws.AWSCredentialsConfig; -import io.druid.common.aws.AWSEndpointConfig; -import io.druid.common.aws.AWSProxyConfig; -import io.druid.data.SearchableVersionedDataFinder; -import io.druid.guice.Binders; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.LazySingleton; -import io.druid.initialization.DruidModule; +import org.apache.druid.common.aws.AWSClientConfig; +import org.apache.druid.common.aws.AWSCredentialsConfig; +import org.apache.druid.common.aws.AWSEndpointConfig; +import org.apache.druid.common.aws.AWSProxyConfig; +import org.apache.druid.data.SearchableVersionedDataFinder; +import org.apache.druid.guice.Binders; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.initialization.DruidModule; import org.apache.commons.lang.StringUtils; import java.util.List; diff --git a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3TaskLogs.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3TaskLogs.java similarity index 95% rename from extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3TaskLogs.java rename to extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3TaskLogs.java index 09fd7c2638fc..67ff682269e5 100644 --- a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3TaskLogs.java +++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3TaskLogs.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.amazonaws.AmazonServiceException; import com.amazonaws.services.s3.model.AmazonS3Exception; @@ -27,10 +27,10 @@ import com.google.common.base.Throwables; import com.google.common.io.ByteSource; import com.google.inject.Inject; -import io.druid.java.util.common.IOE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.tasklogs.TaskLogs; +import org.apache.druid.java.util.common.IOE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.tasklogs.TaskLogs; import java.io.File; import java.io.IOException; diff --git a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3TaskLogsConfig.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3TaskLogsConfig.java similarity index 96% rename from extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3TaskLogsConfig.java rename to extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3TaskLogsConfig.java index 167c52c6746c..30f8e87e0b45 100644 --- a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3TaskLogsConfig.java +++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3TaskLogsConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3TimestampVersionedDataFinder.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3TimestampVersionedDataFinder.java similarity index 95% rename from extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3TimestampVersionedDataFinder.java rename to extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3TimestampVersionedDataFinder.java index 899dfc82cb3d..b26e4dcd357b 100644 --- a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3TimestampVersionedDataFinder.java +++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3TimestampVersionedDataFinder.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.amazonaws.services.s3.model.S3ObjectSummary; import com.google.common.base.Throwables; import com.google.inject.Inject; -import io.druid.data.SearchableVersionedDataFinder; -import io.druid.java.util.common.RetryUtils; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.data.SearchableVersionedDataFinder; +import org.apache.druid.java.util.common.RetryUtils; +import org.apache.druid.java.util.common.StringUtils; import javax.annotation.Nullable; import java.net.URI; diff --git a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3Utils.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3Utils.java similarity index 97% rename from extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3Utils.java rename to extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3Utils.java index 339d5880889d..ad13973f1b9f 100644 --- a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/S3Utils.java +++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3Utils.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.amazonaws.AmazonServiceException; import com.amazonaws.services.s3.model.AccessControlList; @@ -31,9 +31,9 @@ import com.amazonaws.services.s3.model.S3ObjectSummary; import com.google.common.base.Joiner; import com.google.common.base.Predicate; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.RetryUtils; -import io.druid.java.util.common.RetryUtils.Task; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.RetryUtils; +import org.apache.druid.java.util.common.RetryUtils.Task; import java.io.IOException; import java.net.URI; diff --git a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/ServerSideEncryptingAmazonS3.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/ServerSideEncryptingAmazonS3.java similarity index 97% rename from extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/ServerSideEncryptingAmazonS3.java rename to extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/ServerSideEncryptingAmazonS3.java index 7efd61bf8df6..577c99dfc34e 100644 --- a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/ServerSideEncryptingAmazonS3.java +++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/ServerSideEncryptingAmazonS3.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.model.AccessControlList; @@ -30,7 +30,7 @@ import com.amazonaws.services.s3.model.PutObjectRequest; import com.amazonaws.services.s3.model.PutObjectResult; import com.amazonaws.services.s3.model.S3Object; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import java.io.ByteArrayInputStream; import java.io.File; diff --git a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/ServerSideEncryption.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/ServerSideEncryption.java similarity index 98% rename from extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/ServerSideEncryption.java rename to extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/ServerSideEncryption.java index b61890519b14..b9a8ae8c7446 100644 --- a/extensions-core/s3-extensions/src/main/java/io/druid/storage/s3/ServerSideEncryption.java +++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/ServerSideEncryption.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.amazonaws.services.s3.model.CopyObjectRequest; import com.amazonaws.services.s3.model.GetObjectMetadataRequest; diff --git a/extensions-core/s3-extensions/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-core/s3-extensions/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index 2900ba1cbf36..000000000000 --- a/extensions-core/s3-extensions/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1,2 +0,0 @@ -io.druid.storage.s3.S3StorageDruidModule -io.druid.firehose.s3.S3FirehoseDruidModule \ No newline at end of file diff --git a/extensions-core/s3-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-core/s3-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..e48afca502f7 --- /dev/null +++ b/extensions-core/s3-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1,2 @@ +org.apache.druid.storage.s3.S3StorageDruidModule +org.apache.druid.firehose.s3.S3FirehoseDruidModule \ No newline at end of file diff --git a/extensions-core/s3-extensions/src/test/java/io/druid/firehose/s3/StaticS3FirehoseFactoryTest.java b/extensions-core/s3-extensions/src/test/java/org/apache/druid/firehose/s3/StaticS3FirehoseFactoryTest.java similarity index 94% rename from extensions-core/s3-extensions/src/test/java/io/druid/firehose/s3/StaticS3FirehoseFactoryTest.java rename to extensions-core/s3-extensions/src/test/java/org/apache/druid/firehose/s3/StaticS3FirehoseFactoryTest.java index c3097ad122b4..cb2b02c84a9b 100644 --- a/extensions-core/s3-extensions/src/test/java/io/druid/firehose/s3/StaticS3FirehoseFactoryTest.java +++ b/extensions-core/s3-extensions/src/test/java/org/apache/druid/firehose/s3/StaticS3FirehoseFactoryTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.firehose.s3; +package org.apache.druid.firehose.s3; import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.AmazonS3Client; @@ -36,13 +36,13 @@ import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Provides; -import io.druid.data.input.FiniteFirehoseFactory; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.initialization.DruidModule; -import io.druid.storage.s3.S3Utils; +import org.apache.druid.data.input.FiniteFirehoseFactory; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.storage.s3.S3Utils; import org.easymock.EasyMock; -import io.druid.storage.s3.ServerSideEncryptingAmazonS3; -import io.druid.storage.s3.NoopServerSideEncryption; +import org.apache.druid.storage.s3.ServerSideEncryptingAmazonS3; +import org.apache.druid.storage.s3.NoopServerSideEncryption; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/S3DataSegmentArchiverTest.java b/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3DataSegmentArchiverTest.java similarity index 96% rename from extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/S3DataSegmentArchiverTest.java rename to extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3DataSegmentArchiverTest.java index 0cb28513b296..8e21f254f949 100644 --- a/extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/S3DataSegmentArchiverTest.java +++ b/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3DataSegmentArchiverTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.amazonaws.services.s3.AmazonS3Client; import com.fasterxml.jackson.databind.BeanProperty; @@ -27,9 +27,9 @@ import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; -import io.druid.timeline.DataSegment; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.timeline.DataSegment; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/S3DataSegmentFinderTest.java b/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3DataSegmentFinderTest.java similarity index 97% rename from extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/S3DataSegmentFinderTest.java rename to extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3DataSegmentFinderTest.java index 73cc1095ce0c..0902a878485d 100644 --- a/extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/S3DataSegmentFinderTest.java +++ b/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3DataSegmentFinderTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.amazonaws.AmazonServiceException; import com.amazonaws.services.s3.AmazonS3Client; @@ -38,13 +38,13 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.collect.Ordering; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.segment.TestHelper; -import io.druid.segment.loading.SegmentLoadingException; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NumberedShardSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NumberedShardSpec; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.junit.Assert; diff --git a/extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/S3DataSegmentMoverTest.java b/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3DataSegmentMoverTest.java similarity index 96% rename from extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/S3DataSegmentMoverTest.java rename to extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3DataSegmentMoverTest.java index 5ee83094dd1a..c1319633e94a 100644 --- a/extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/S3DataSegmentMoverTest.java +++ b/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3DataSegmentMoverTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.amazonaws.services.s3.AmazonS3Client; import com.amazonaws.services.s3.model.AccessControlList; @@ -37,11 +37,11 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.MapUtils; -import io.druid.segment.loading.SegmentLoadingException; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.MapUtils; +import org.apache.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/S3DataSegmentPullerTest.java b/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3DataSegmentPullerTest.java similarity index 97% rename from extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/S3DataSegmentPullerTest.java rename to extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3DataSegmentPullerTest.java index 6b2d103aed11..a4306d12b97d 100644 --- a/extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/S3DataSegmentPullerTest.java +++ b/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3DataSegmentPullerTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.amazonaws.services.s3.model.AmazonS3Exception; import com.amazonaws.services.s3.model.ListObjectsV2Request; import com.amazonaws.services.s3.model.ListObjectsV2Result; import com.amazonaws.services.s3.model.S3Object; import com.amazonaws.services.s3.model.S3ObjectSummary; -import io.druid.java.util.common.FileUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.java.util.common.FileUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.segment.loading.SegmentLoadingException; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Rule; diff --git a/extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/S3DataSegmentPusherConfigTest.java b/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3DataSegmentPusherConfigTest.java similarity index 97% rename from extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/S3DataSegmentPusherConfigTest.java rename to extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3DataSegmentPusherConfigTest.java index 11c7e8dc0013..b369b7a181b0 100644 --- a/extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/S3DataSegmentPusherConfigTest.java +++ b/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3DataSegmentPusherConfigTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Iterators; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/S3DataSegmentPusherTest.java b/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3DataSegmentPusherTest.java similarity index 95% rename from extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/S3DataSegmentPusherTest.java rename to extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3DataSegmentPusherTest.java index eabac57c1139..a4dd9dd94c7c 100644 --- a/extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/S3DataSegmentPusherTest.java +++ b/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3DataSegmentPusherTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.amazonaws.services.s3.model.AccessControlList; import com.amazonaws.services.s3.model.CanonicalGrantee; @@ -30,10 +30,10 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.io.Files; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.apache.commons.io.IOUtils; import org.easymock.Capture; import org.easymock.EasyMock; diff --git a/extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/S3TimestampVersionedDataFinderTest.java b/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3TimestampVersionedDataFinderTest.java similarity index 98% rename from extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/S3TimestampVersionedDataFinderTest.java rename to extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3TimestampVersionedDataFinderTest.java index 1f274b32408a..8e144c2340f2 100644 --- a/extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/S3TimestampVersionedDataFinderTest.java +++ b/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3TimestampVersionedDataFinderTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.amazonaws.services.s3.model.ListObjectsV2Request; import com.amazonaws.services.s3.model.ListObjectsV2Result; import com.amazonaws.services.s3.model.S3ObjectSummary; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/TestAWSCredentialsProvider.java b/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/TestAWSCredentialsProvider.java similarity index 91% rename from extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/TestAWSCredentialsProvider.java rename to extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/TestAWSCredentialsProvider.java index 64168faaee84..27534a498c69 100644 --- a/extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/TestAWSCredentialsProvider.java +++ b/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/TestAWSCredentialsProvider.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.amazonaws.auth.AWSCredentials; import com.amazonaws.auth.AWSCredentialsProvider; import com.amazonaws.auth.AWSSessionCredentials; import com.google.common.io.Files; -import io.druid.common.aws.AWSClientConfig; -import io.druid.common.aws.AWSCredentialsConfig; -import io.druid.common.aws.AWSEndpointConfig; -import io.druid.common.aws.AWSProxyConfig; -import io.druid.guice.AWSModule; -import io.druid.metadata.DefaultPasswordProvider; +import org.apache.druid.common.aws.AWSClientConfig; +import org.apache.druid.common.aws.AWSCredentialsConfig; +import org.apache.druid.common.aws.AWSEndpointConfig; +import org.apache.druid.common.aws.AWSProxyConfig; +import org.apache.druid.guice.AWSModule; +import org.apache.druid.metadata.DefaultPasswordProvider; import org.easymock.EasyMock; import org.junit.Rule; import org.junit.Test; diff --git a/extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/TestFileSessionCredentialsProvider.java b/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/TestFileSessionCredentialsProvider.java similarity index 95% rename from extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/TestFileSessionCredentialsProvider.java rename to extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/TestFileSessionCredentialsProvider.java index c904bbe75b36..cfa94188b8d8 100644 --- a/extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/TestFileSessionCredentialsProvider.java +++ b/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/TestFileSessionCredentialsProvider.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.storage.s3; +package org.apache.druid.storage.s3; import com.amazonaws.auth.AWSSessionCredentials; import com.google.common.io.Files; -import io.druid.common.aws.FileSessionCredentialsProvider; +import org.apache.druid.common.aws.FileSessionCredentialsProvider; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; diff --git a/extensions-core/simple-client-sslcontext/pom.xml b/extensions-core/simple-client-sslcontext/pom.xml index 0931e1486f20..a51a3c5d2906 100644 --- a/extensions-core/simple-client-sslcontext/pom.xml +++ b/extensions-core/simple-client-sslcontext/pom.xml @@ -23,38 +23,38 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> druid - io.druid + org.apache.druid 0.13.0-SNAPSHOT ../../pom.xml 4.0.0 - io.druid.extensions + org.apache.druid.extensions simple-client-sslcontext simple-client-sslcontext simple-client-sslcontext - io.druid + org.apache.druid druid-api ${project.parent.version} provided - io.druid + org.apache.druid druid-common ${project.parent.version} provided - io.druid + org.apache.druid druid-server ${project.parent.version} provided - io.druid + org.apache.druid java-util ${project.parent.version} provided diff --git a/extensions-core/simple-client-sslcontext/src/main/java/io/druid/https/SSLClientConfig.java b/extensions-core/simple-client-sslcontext/src/main/java/org/apache/druid/https/SSLClientConfig.java similarity index 95% rename from extensions-core/simple-client-sslcontext/src/main/java/io/druid/https/SSLClientConfig.java rename to extensions-core/simple-client-sslcontext/src/main/java/org/apache/druid/https/SSLClientConfig.java index 3674f929d23d..27761effb12d 100644 --- a/extensions-core/simple-client-sslcontext/src/main/java/io/druid/https/SSLClientConfig.java +++ b/extensions-core/simple-client-sslcontext/src/main/java/org/apache/druid/https/SSLClientConfig.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.https; +package org.apache.druid.https; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.metadata.PasswordProvider; +import org.apache.druid.metadata.PasswordProvider; public class SSLClientConfig { diff --git a/extensions-core/simple-client-sslcontext/src/main/java/io/druid/https/SSLContextModule.java b/extensions-core/simple-client-sslcontext/src/main/java/org/apache/druid/https/SSLContextModule.java similarity index 82% rename from extensions-core/simple-client-sslcontext/src/main/java/io/druid/https/SSLContextModule.java rename to extensions-core/simple-client-sslcontext/src/main/java/org/apache/druid/https/SSLContextModule.java index b444b0de1700..e58f483e4c4c 100644 --- a/extensions-core/simple-client-sslcontext/src/main/java/io/druid/https/SSLContextModule.java +++ b/extensions-core/simple-client-sslcontext/src/main/java/org/apache/druid/https/SSLContextModule.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.https; +package org.apache.druid.https; import com.fasterxml.jackson.databind.Module; import com.google.common.collect.ImmutableList; import com.google.inject.Binder; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.annotations.Client; -import io.druid.guice.annotations.EscalatedClient; -import io.druid.guice.annotations.EscalatedGlobal; -import io.druid.guice.annotations.Global; -import io.druid.initialization.DruidModule; -import io.druid.server.router.Router; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.annotations.Client; +import org.apache.druid.guice.annotations.EscalatedClient; +import org.apache.druid.guice.annotations.EscalatedGlobal; +import org.apache.druid.guice.annotations.Global; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.server.router.Router; import javax.net.ssl.SSLContext; import java.util.List; diff --git a/extensions-core/simple-client-sslcontext/src/main/java/io/druid/https/SSLContextProvider.java b/extensions-core/simple-client-sslcontext/src/main/java/org/apache/druid/https/SSLContextProvider.java similarity index 91% rename from extensions-core/simple-client-sslcontext/src/main/java/io/druid/https/SSLContextProvider.java rename to extensions-core/simple-client-sslcontext/src/main/java/org/apache/druid/https/SSLContextProvider.java index eb17ea9456ed..fc5dba4af12b 100644 --- a/extensions-core/simple-client-sslcontext/src/main/java/io/druid/https/SSLContextProvider.java +++ b/extensions-core/simple-client-sslcontext/src/main/java/org/apache/druid/https/SSLContextProvider.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.https; +package org.apache.druid.https; import com.google.inject.Inject; import com.google.inject.Provider; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.server.security.TLSUtils; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.server.security.TLSUtils; import javax.net.ssl.SSLContext; diff --git a/extensions-core/simple-client-sslcontext/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-core/simple-client-sslcontext/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index 600c7b87254a..000000000000 --- a/extensions-core/simple-client-sslcontext/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.https.SSLContextModule \ No newline at end of file diff --git a/extensions-core/simple-client-sslcontext/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-core/simple-client-sslcontext/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..bc56a917ec25 --- /dev/null +++ b/extensions-core/simple-client-sslcontext/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.https.SSLContextModule \ No newline at end of file diff --git a/extensions-core/stats/pom.xml b/extensions-core/stats/pom.xml index 0958d5524e18..93570837aec3 100644 --- a/extensions-core/stats/pom.xml +++ b/extensions-core/stats/pom.xml @@ -21,13 +21,13 @@ 4.0.0 - io.druid.extensions + org.apache.druid.extensions druid-stats druid-stats druid-stats - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT ../../pom.xml @@ -35,7 +35,7 @@ - io.druid + org.apache.druid druid-processing ${project.parent.version} provided @@ -47,14 +47,14 @@ - io.druid + org.apache.druid druid-common ${project.parent.version} test test-jar - io.druid + org.apache.druid druid-processing ${project.parent.version} test diff --git a/extensions-core/stats/src/main/java/io/druid/query/aggregation/stats/DruidStatsModule.java b/extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/stats/DruidStatsModule.java similarity index 72% rename from extensions-core/stats/src/main/java/io/druid/query/aggregation/stats/DruidStatsModule.java rename to extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/stats/DruidStatsModule.java index 74c5ada1b633..d23c5247530e 100644 --- a/extensions-core/stats/src/main/java/io/druid/query/aggregation/stats/DruidStatsModule.java +++ b/extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/stats/DruidStatsModule.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.query.aggregation.stats; +package org.apache.druid.query.aggregation.stats; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.common.collect.ImmutableList; import com.google.inject.Binder; -import io.druid.initialization.DruidModule; -import io.druid.query.aggregation.teststats.PvaluefromZscorePostAggregator; -import io.druid.query.aggregation.teststats.ZtestPostAggregator; -import io.druid.query.aggregation.variance.StandardDeviationPostAggregator; -import io.druid.query.aggregation.variance.VarianceAggregatorFactory; -import io.druid.query.aggregation.variance.VarianceFoldingAggregatorFactory; -import io.druid.query.aggregation.variance.VarianceSerde; -import io.druid.segment.serde.ComplexMetrics; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.query.aggregation.teststats.PvaluefromZscorePostAggregator; +import org.apache.druid.query.aggregation.teststats.ZtestPostAggregator; +import org.apache.druid.query.aggregation.variance.StandardDeviationPostAggregator; +import org.apache.druid.query.aggregation.variance.VarianceAggregatorFactory; +import org.apache.druid.query.aggregation.variance.VarianceFoldingAggregatorFactory; +import org.apache.druid.query.aggregation.variance.VarianceSerde; +import org.apache.druid.segment.serde.ComplexMetrics; import java.util.List; diff --git a/extensions-core/stats/src/main/java/io/druid/query/aggregation/teststats/PvaluefromZscorePostAggregator.java b/extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/teststats/PvaluefromZscorePostAggregator.java similarity index 90% rename from extensions-core/stats/src/main/java/io/druid/query/aggregation/teststats/PvaluefromZscorePostAggregator.java rename to extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/teststats/PvaluefromZscorePostAggregator.java index 971bc7aad364..3d65d2327cbc 100644 --- a/extensions-core/stats/src/main/java/io/druid/query/aggregation/teststats/PvaluefromZscorePostAggregator.java +++ b/extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/teststats/PvaluefromZscorePostAggregator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.teststats; +package org.apache.druid.query.aggregation.teststats; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -25,12 +25,12 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; -import io.druid.query.Queries; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.post.ArithmeticPostAggregator; -import io.druid.query.aggregation.post.PostAggregatorIds; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.query.Queries; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.post.ArithmeticPostAggregator; +import org.apache.druid.query.aggregation.post.PostAggregatorIds; +import org.apache.druid.query.cache.CacheKeyBuilder; import org.apache.commons.math3.distribution.NormalDistribution; import java.util.Collections; diff --git a/extensions-core/stats/src/main/java/io/druid/query/aggregation/teststats/ZtestPostAggregator.java b/extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/teststats/ZtestPostAggregator.java similarity index 95% rename from extensions-core/stats/src/main/java/io/druid/query/aggregation/teststats/ZtestPostAggregator.java rename to extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/teststats/ZtestPostAggregator.java index 9109ce0be650..39c74ddd19c2 100644 --- a/extensions-core/stats/src/main/java/io/druid/query/aggregation/teststats/ZtestPostAggregator.java +++ b/extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/teststats/ZtestPostAggregator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.teststats; +package org.apache.druid.query.aggregation.teststats; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -25,12 +25,12 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; -import io.druid.query.Queries; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.post.ArithmeticPostAggregator; -import io.druid.query.aggregation.post.PostAggregatorIds; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.query.Queries; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.post.ArithmeticPostAggregator; +import org.apache.druid.query.aggregation.post.PostAggregatorIds; +import org.apache.druid.query.cache.CacheKeyBuilder; import java.util.Collections; import java.util.Comparator; diff --git a/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/StandardDeviationPostAggregator.java b/extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/variance/StandardDeviationPostAggregator.java similarity index 89% rename from extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/StandardDeviationPostAggregator.java rename to extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/variance/StandardDeviationPostAggregator.java index 8409addf3546..ed1aa21dc001 100644 --- a/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/StandardDeviationPostAggregator.java +++ b/extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/variance/StandardDeviationPostAggregator.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.query.aggregation.variance; +package org.apache.druid.query.aggregation.variance; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.post.ArithmeticPostAggregator; -import io.druid.query.aggregation.post.PostAggregatorIds; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.post.ArithmeticPostAggregator; +import org.apache.druid.query.aggregation.post.PostAggregatorIds; +import org.apache.druid.query.cache.CacheKeyBuilder; import java.util.Comparator; import java.util.Map; diff --git a/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceAggregator.java b/extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/variance/VarianceAggregator.java similarity index 90% rename from extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceAggregator.java rename to extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/variance/VarianceAggregator.java index e19020379c2b..438ee1fd0971 100644 --- a/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceAggregator.java +++ b/extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/variance/VarianceAggregator.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.aggregation.variance; +package org.apache.druid.query.aggregation.variance; -import io.druid.query.aggregation.Aggregator; -import io.druid.segment.BaseFloatColumnValueSelector; -import io.druid.segment.BaseLongColumnValueSelector; -import io.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.segment.BaseFloatColumnValueSelector; +import org.apache.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.segment.BaseObjectColumnValueSelector; /** */ diff --git a/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceAggregatorCollector.java b/extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/variance/VarianceAggregatorCollector.java similarity index 99% rename from extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceAggregatorCollector.java rename to extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/variance/VarianceAggregatorCollector.java index 021adcb26513..6077057e59a7 100644 --- a/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceAggregatorCollector.java +++ b/extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/variance/VarianceAggregatorCollector.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.variance; +package org.apache.druid.query.aggregation.variance; import com.fasterxml.jackson.annotation.JsonValue; import com.google.common.annotations.VisibleForTesting; diff --git a/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceAggregatorFactory.java b/extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/variance/VarianceAggregatorFactory.java similarity index 90% rename from extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceAggregatorFactory.java rename to extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/variance/VarianceAggregatorFactory.java index c1c748a7727c..167b090d050c 100644 --- a/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceAggregatorFactory.java +++ b/extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/variance/VarianceAggregatorFactory.java @@ -17,27 +17,27 @@ * under the License. */ -package io.druid.query.aggregation.variance; +package org.apache.druid.query.aggregation.variance; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.base.Preconditions; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.StringUtils; -import io.druid.query.aggregation.AggregateCombiner; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.AggregatorFactoryNotMergeableException; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.NoopAggregator; -import io.druid.query.aggregation.NoopBufferAggregator; -import io.druid.query.aggregation.ObjectAggregateCombiner; -import io.druid.query.cache.CacheKeyBuilder; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.NilColumnValueSelector; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.aggregation.AggregateCombiner; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorFactoryNotMergeableException; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.NoopAggregator; +import org.apache.druid.query.aggregation.NoopBufferAggregator; +import org.apache.druid.query.aggregation.ObjectAggregateCombiner; +import org.apache.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.NilColumnValueSelector; import org.apache.commons.codec.binary.Base64; import java.nio.ByteBuffer; diff --git a/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceBufferAggregator.java b/extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/variance/VarianceBufferAggregator.java similarity index 93% rename from extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceBufferAggregator.java rename to extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/variance/VarianceBufferAggregator.java index 71d7654f7459..8c871ec231e8 100644 --- a/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceBufferAggregator.java +++ b/extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/variance/VarianceBufferAggregator.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.aggregation.variance; +package org.apache.druid.query.aggregation.variance; import com.google.common.base.Preconditions; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseFloatColumnValueSelector; -import io.druid.segment.BaseLongColumnValueSelector; -import io.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseFloatColumnValueSelector; +import org.apache.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.segment.BaseObjectColumnValueSelector; import java.nio.ByteBuffer; diff --git a/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceFoldingAggregatorFactory.java b/extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/variance/VarianceFoldingAggregatorFactory.java similarity index 96% rename from extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceFoldingAggregatorFactory.java rename to extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/variance/VarianceFoldingAggregatorFactory.java index 7791c10db14f..a61921cc5b63 100644 --- a/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceFoldingAggregatorFactory.java +++ b/extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/variance/VarianceFoldingAggregatorFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.variance; +package org.apache.druid.query.aggregation.variance; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; diff --git a/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceSerde.java b/extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/variance/VarianceSerde.java similarity index 84% rename from extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceSerde.java rename to extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/variance/VarianceSerde.java index 5a57cf7fb8c6..b24fe5a5773e 100644 --- a/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceSerde.java +++ b/extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/variance/VarianceSerde.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.query.aggregation.variance; +package org.apache.druid.query.aggregation.variance; import com.google.common.collect.Ordering; -import io.druid.data.input.InputRow; -import io.druid.segment.writeout.SegmentWriteOutMedium; -import io.druid.segment.GenericColumnSerializer; -import io.druid.segment.column.ColumnBuilder; -import io.druid.segment.data.GenericIndexed; -import io.druid.segment.data.ObjectStrategy; -import io.druid.segment.serde.ComplexColumnPartSupplier; -import io.druid.segment.serde.ComplexMetricExtractor; -import io.druid.segment.serde.ComplexMetricSerde; -import io.druid.segment.serde.LargeColumnSupportedComplexColumnSerializer; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.segment.GenericColumnSerializer; +import org.apache.druid.segment.column.ColumnBuilder; +import org.apache.druid.segment.data.GenericIndexed; +import org.apache.druid.segment.data.ObjectStrategy; +import org.apache.druid.segment.serde.ComplexColumnPartSupplier; +import org.apache.druid.segment.serde.ComplexMetricExtractor; +import org.apache.druid.segment.serde.ComplexMetricSerde; +import org.apache.druid.segment.serde.LargeColumnSupportedComplexColumnSerializer; import java.nio.ByteBuffer; import java.util.List; diff --git a/extensions-core/stats/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/extensions-core/stats/src/main/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index 823ccffd31d2..000000000000 --- a/extensions-core/stats/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.query.aggregation.stats.DruidStatsModule diff --git a/extensions-core/stats/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-core/stats/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..a60ddca9216e --- /dev/null +++ b/extensions-core/stats/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.query.aggregation.stats.DruidStatsModule diff --git a/extensions-core/stats/src/test/java/io/druid/query/aggregation/teststats/PvaluefromZscorePostAggregatorTest.java b/extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/teststats/PvaluefromZscorePostAggregatorTest.java similarity index 91% rename from extensions-core/stats/src/test/java/io/druid/query/aggregation/teststats/PvaluefromZscorePostAggregatorTest.java rename to extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/teststats/PvaluefromZscorePostAggregatorTest.java index 2ee726219a02..7841625764d4 100644 --- a/extensions-core/stats/src/test/java/io/druid/query/aggregation/teststats/PvaluefromZscorePostAggregatorTest.java +++ b/extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/teststats/PvaluefromZscorePostAggregatorTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation.teststats; +package org.apache.druid.query.aggregation.teststats; import com.google.common.collect.ImmutableMap; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.query.aggregation.post.ConstantPostAggregator; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.query.aggregation.post.ConstantPostAggregator; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-core/stats/src/test/java/io/druid/query/aggregation/teststats/ZtestPostAggregatorTest.java b/extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/teststats/ZtestPostAggregatorTest.java similarity index 91% rename from extensions-core/stats/src/test/java/io/druid/query/aggregation/teststats/ZtestPostAggregatorTest.java rename to extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/teststats/ZtestPostAggregatorTest.java index 58e9832c1c3f..db98596fe641 100644 --- a/extensions-core/stats/src/test/java/io/druid/query/aggregation/teststats/ZtestPostAggregatorTest.java +++ b/extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/teststats/ZtestPostAggregatorTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.aggregation.teststats; +package org.apache.druid.query.aggregation.teststats; import com.google.common.collect.Lists; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.post.ConstantPostAggregator; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.post.ConstantPostAggregator; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceAggregatorCollectorTest.java b/extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceAggregatorCollectorTest.java similarity index 97% rename from extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceAggregatorCollectorTest.java rename to extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceAggregatorCollectorTest.java index b3fd3cb057ad..642ad85206c0 100644 --- a/extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceAggregatorCollectorTest.java +++ b/extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceAggregatorCollectorTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.aggregation.variance; +package org.apache.druid.query.aggregation.variance; import com.google.common.collect.Lists; -import io.druid.java.util.common.Pair; -import io.druid.segment.TestFloatColumnSelector; -import io.druid.segment.TestObjectColumnSelector; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.segment.TestFloatColumnSelector; +import org.apache.druid.segment.TestObjectColumnSelector; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceAggregatorTest.java b/extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceAggregatorTest.java similarity index 96% rename from extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceAggregatorTest.java rename to extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceAggregatorTest.java index f496b16e80f7..bb4bad493f66 100644 --- a/extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceAggregatorTest.java +++ b/extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceAggregatorTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation.variance; +package org.apache.druid.query.aggregation.variance; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.query.aggregation.TestFloatColumnSelector; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.query.aggregation.TestFloatColumnSelector; +import org.apache.druid.segment.ColumnSelectorFactory; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; diff --git a/extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceGroupByQueryTest.java b/extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceGroupByQueryTest.java similarity index 89% rename from extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceGroupByQueryTest.java rename to extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceGroupByQueryTest.java index ef3ca6f6f2ac..4f327e75793d 100644 --- a/extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceGroupByQueryTest.java +++ b/extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceGroupByQueryTest.java @@ -17,26 +17,26 @@ * under the License. */ -package io.druid.query.aggregation.variance; +package org.apache.druid.query.aggregation.variance; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.data.input.Row; -import io.druid.java.util.common.granularity.PeriodGranularity; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.groupby.GroupByQuery; -import io.druid.query.groupby.GroupByQueryConfig; -import io.druid.query.groupby.GroupByQueryRunnerFactory; -import io.druid.query.groupby.GroupByQueryRunnerTest; -import io.druid.query.groupby.GroupByQueryRunnerTestHelper; -import io.druid.query.groupby.having.GreaterThanHavingSpec; -import io.druid.query.groupby.having.OrHavingSpec; -import io.druid.query.groupby.orderby.DefaultLimitSpec; -import io.druid.query.groupby.orderby.OrderByColumnSpec; -import io.druid.segment.TestHelper; +import org.apache.druid.data.input.Row; +import org.apache.druid.java.util.common.granularity.PeriodGranularity; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.groupby.GroupByQuery; +import org.apache.druid.query.groupby.GroupByQueryConfig; +import org.apache.druid.query.groupby.GroupByQueryRunnerFactory; +import org.apache.druid.query.groupby.GroupByQueryRunnerTest; +import org.apache.druid.query.groupby.GroupByQueryRunnerTestHelper; +import org.apache.druid.query.groupby.having.GreaterThanHavingSpec; +import org.apache.druid.query.groupby.having.OrHavingSpec; +import org.apache.druid.query.groupby.orderby.DefaultLimitSpec; +import org.apache.druid.query.groupby.orderby.OrderByColumnSpec; +import org.apache.druid.segment.TestHelper; import org.joda.time.Period; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceSerdeTest.java b/extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceSerdeTest.java similarity index 93% rename from extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceSerdeTest.java rename to extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceSerdeTest.java index 5abdd5d01487..b900fe7e1515 100644 --- a/extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceSerdeTest.java +++ b/extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceSerdeTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation.variance; +package org.apache.druid.query.aggregation.variance; -import io.druid.segment.data.ObjectStrategy; +import org.apache.druid.segment.data.ObjectStrategy; import org.junit.Assert; import org.junit.Test; diff --git a/extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceTestHelper.java b/extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceTestHelper.java similarity index 86% rename from extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceTestHelper.java rename to extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceTestHelper.java index 0ebebec7d1c3..de786113e864 100644 --- a/extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceTestHelper.java +++ b/extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceTestHelper.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.query.aggregation.variance; +package org.apache.druid.query.aggregation.variance; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.data.input.MapBasedRow; -import io.druid.data.input.Row; -import io.druid.java.util.common.DateTimes; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.stats.DruidStatsModule; +import org.apache.druid.data.input.MapBasedRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.stats.DruidStatsModule; import org.joda.time.DateTime; import java.util.Arrays; diff --git a/extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceTimeseriesQueryTest.java b/extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceTimeseriesQueryTest.java similarity index 87% rename from extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceTimeseriesQueryTest.java rename to extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceTimeseriesQueryTest.java index 190464a61107..c1a98d0984c0 100644 --- a/extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceTimeseriesQueryTest.java +++ b/extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceTimeseriesQueryTest.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.query.aggregation.variance; +package org.apache.druid.query.aggregation.variance; -import io.druid.java.util.common.DateTimes; -import io.druid.query.Druids; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.Result; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.timeseries.TimeseriesQueryRunnerTest; -import io.druid.query.timeseries.TimeseriesResultValue; -import io.druid.segment.TestHelper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.query.Druids; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.timeseries.TimeseriesQueryRunnerTest; +import org.apache.druid.query.timeseries.TimeseriesResultValue; +import org.apache.druid.segment.TestHelper; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceTopNQueryTest.java b/extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceTopNQueryTest.java similarity index 86% rename from extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceTopNQueryTest.java rename to extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceTopNQueryTest.java index 0ff49eec49a6..a8c43969c815 100644 --- a/extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceTopNQueryTest.java +++ b/extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceTopNQueryTest.java @@ -17,26 +17,26 @@ * under the License. */ -package io.druid.query.aggregation.variance; +package org.apache.druid.query.aggregation.variance; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.Result; -import io.druid.query.aggregation.DoubleMaxAggregatorFactory; -import io.druid.query.aggregation.DoubleMinAggregatorFactory; -import io.druid.query.topn.TopNQuery; -import io.druid.query.topn.TopNQueryBuilder; -import io.druid.query.topn.TopNQueryConfig; -import io.druid.query.topn.TopNQueryQueryToolChest; -import io.druid.query.topn.TopNQueryRunnerTest; -import io.druid.query.topn.TopNResultValue; -import io.druid.segment.TestHelper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.DoubleMaxAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleMinAggregatorFactory; +import org.apache.druid.query.topn.TopNQuery; +import org.apache.druid.query.topn.TopNQueryBuilder; +import org.apache.druid.query.topn.TopNQueryConfig; +import org.apache.druid.query.topn.TopNQueryQueryToolChest; +import org.apache.druid.query.topn.TopNQueryRunnerTest; +import org.apache.druid.query.topn.TopNResultValue; +import org.apache.druid.segment.TestHelper; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/hll/pom.xml b/hll/pom.xml index 061610ebccd5..07ab149c8616 100644 --- a/hll/pom.xml +++ b/hll/pom.xml @@ -22,7 +22,7 @@ 4.0.0 - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT @@ -40,7 +40,7 @@ - io.druid + org.apache.druid java-util ${project.parent.version} diff --git a/hll/src/main/java/io/druid/hll/ByteBitLookup.java b/hll/src/main/java/org/apache/druid/hll/ByteBitLookup.java similarity index 99% rename from hll/src/main/java/io/druid/hll/ByteBitLookup.java rename to hll/src/main/java/org/apache/druid/hll/ByteBitLookup.java index a196f3b1e0ea..f8a236563a03 100644 --- a/hll/src/main/java/io/druid/hll/ByteBitLookup.java +++ b/hll/src/main/java/org/apache/druid/hll/ByteBitLookup.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.hll; +package org.apache.druid.hll; /** */ diff --git a/hll/src/main/java/io/druid/hll/HLLCV0.java b/hll/src/main/java/org/apache/druid/hll/HLLCV0.java similarity index 99% rename from hll/src/main/java/io/druid/hll/HLLCV0.java rename to hll/src/main/java/org/apache/druid/hll/HLLCV0.java index f95c25435675..51c20b7aab4e 100644 --- a/hll/src/main/java/io/druid/hll/HLLCV0.java +++ b/hll/src/main/java/org/apache/druid/hll/HLLCV0.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.hll; +package org.apache.druid.hll; import java.nio.ByteBuffer; diff --git a/hll/src/main/java/io/druid/hll/HLLCV1.java b/hll/src/main/java/org/apache/druid/hll/HLLCV1.java similarity index 99% rename from hll/src/main/java/io/druid/hll/HLLCV1.java rename to hll/src/main/java/org/apache/druid/hll/HLLCV1.java index bb0f7aa3fd29..bab8d3a7095a 100644 --- a/hll/src/main/java/io/druid/hll/HLLCV1.java +++ b/hll/src/main/java/org/apache/druid/hll/HLLCV1.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.hll; +package org.apache.druid.hll; import java.nio.ByteBuffer; diff --git a/hll/src/main/java/io/druid/hll/HyperLogLogCollector.java b/hll/src/main/java/org/apache/druid/hll/HyperLogLogCollector.java similarity index 99% rename from hll/src/main/java/io/druid/hll/HyperLogLogCollector.java rename to hll/src/main/java/org/apache/druid/hll/HyperLogLogCollector.java index d409d7bafc6d..51a7649408dc 100644 --- a/hll/src/main/java/io/druid/hll/HyperLogLogCollector.java +++ b/hll/src/main/java/org/apache/druid/hll/HyperLogLogCollector.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.hll; +package org.apache.druid.hll; import com.fasterxml.jackson.annotation.JsonValue; import com.google.common.primitives.UnsignedBytes; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/hll/src/main/java/io/druid/hll/HyperLogLogHash.java b/hll/src/main/java/org/apache/druid/hll/HyperLogLogHash.java similarity index 95% rename from hll/src/main/java/io/druid/hll/HyperLogLogHash.java rename to hll/src/main/java/org/apache/druid/hll/HyperLogLogHash.java index 5d97d06818f5..b49ad43dc0f0 100644 --- a/hll/src/main/java/io/druid/hll/HyperLogLogHash.java +++ b/hll/src/main/java/org/apache/druid/hll/HyperLogLogHash.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.hll; +package org.apache.druid.hll; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; /** * Contains data hashing methods used before applying Hyper Log Log. diff --git a/hll/src/test/java/io/druid/hll/HyperLogLogCollectorBenchmark.java b/hll/src/test/java/org/apache/druid/hll/HyperLogLogCollectorBenchmark.java similarity index 99% rename from hll/src/test/java/io/druid/hll/HyperLogLogCollectorBenchmark.java rename to hll/src/test/java/org/apache/druid/hll/HyperLogLogCollectorBenchmark.java index 4acc65cac82c..2b18e8810319 100644 --- a/hll/src/test/java/io/druid/hll/HyperLogLogCollectorBenchmark.java +++ b/hll/src/test/java/org/apache/druid/hll/HyperLogLogCollectorBenchmark.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.hll; +package org.apache.druid.hll; import com.google.caliper.Param; import com.google.caliper.Runner; diff --git a/hll/src/test/java/io/druid/hll/HyperLogLogCollectorTest.java b/hll/src/test/java/org/apache/druid/hll/HyperLogLogCollectorTest.java similarity index 99% rename from hll/src/test/java/io/druid/hll/HyperLogLogCollectorTest.java rename to hll/src/test/java/org/apache/druid/hll/HyperLogLogCollectorTest.java index 29a0c05706b0..d338222f61ae 100644 --- a/hll/src/test/java/io/druid/hll/HyperLogLogCollectorTest.java +++ b/hll/src/test/java/org/apache/druid/hll/HyperLogLogCollectorTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.hll; +package org.apache.druid.hll; import com.google.common.base.Function; import com.google.common.collect.Collections2; import com.google.common.collect.Lists; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; -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 org.apache.commons.codec.binary.Base64; import org.junit.Assert; import org.junit.Ignore; diff --git a/hll/src/test/java/io/druid/hll/HyperLogLogSerdeBenchmarkTest.java b/hll/src/test/java/org/apache/druid/hll/HyperLogLogSerdeBenchmarkTest.java similarity index 99% rename from hll/src/test/java/io/druid/hll/HyperLogLogSerdeBenchmarkTest.java rename to hll/src/test/java/org/apache/druid/hll/HyperLogLogSerdeBenchmarkTest.java index 7cce157e076d..fc02a9fc3569 100644 --- a/hll/src/test/java/io/druid/hll/HyperLogLogSerdeBenchmarkTest.java +++ b/hll/src/test/java/org/apache/druid/hll/HyperLogLogSerdeBenchmarkTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.hll; +package org.apache.druid.hll; import com.carrotsearch.junitbenchmarks.AbstractBenchmark; import com.carrotsearch.junitbenchmarks.BenchmarkOptions; diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 8bed5c78a722..9e5d256e3a07 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -26,20 +26,20 @@ Druid Indexing Hadoop - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT - io.druid + org.apache.druid druid-server ${project.parent.version} - io.druid + org.apache.druid java-util ${project.parent.version} @@ -136,14 +136,14 @@ test - io.druid + org.apache.druid druid-server ${project.parent.version} test-jar test - io.druid + org.apache.druid druid-processing ${project.parent.version} test-jar diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/Bucket.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/Bucket.java similarity index 96% rename from indexing-hadoop/src/main/java/io/druid/indexer/Bucket.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/Bucket.java index 4fff8d984cf8..d63ea092ad70 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/Bucket.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/Bucket.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.google.common.annotations.VisibleForTesting; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Pair; import org.joda.time.DateTime; import java.nio.ByteBuffer; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/DetermineHashedPartitionsJob.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/DetermineHashedPartitionsJob.java similarity index 96% rename from indexing-hadoop/src/main/java/io/druid/indexer/DetermineHashedPartitionsJob.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/DetermineHashedPartitionsJob.java index eb319692e3b9..6fb8a81bf128 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/DetermineHashedPartitionsJob.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/DetermineHashedPartitionsJob.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.base.Optional; @@ -28,17 +28,17 @@ import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; import com.google.common.io.Closeables; -import io.druid.data.input.InputRow; -import io.druid.data.input.Rows; -import io.druid.hll.HyperLogLogCollector; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; -import io.druid.timeline.partition.HashBasedNumberedShardSpec; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.Rows; +import org.apache.druid.hll.HyperLogLogCollector; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.timeline.partition.HashBasedNumberedShardSpec; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/DeterminePartitionsJob.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/DeterminePartitionsJob.java similarity index 97% rename from indexing-hadoop/src/main/java/io/druid/indexer/DeterminePartitionsJob.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/DeterminePartitionsJob.java index fc4dde52e010..ec1039dde39d 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/DeterminePartitionsJob.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/DeterminePartitionsJob.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.base.Function; @@ -33,19 +33,19 @@ import com.google.common.collect.Maps; import com.google.common.collect.PeekingIterator; import com.google.common.io.Closeables; -import io.druid.collections.CombiningIterable; -import io.druid.data.input.InputRow; -import io.druid.data.input.Rows; -import io.druid.indexer.partitions.SingleDimensionPartitionsSpec; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.nary.BinaryFn; -import io.druid.java.util.common.logger.Logger; -import io.druid.timeline.partition.NoneShardSpec; -import io.druid.timeline.partition.ShardSpec; -import io.druid.timeline.partition.SingleDimensionShardSpec; +import org.apache.druid.collections.CombiningIterable; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.Rows; +import org.apache.druid.indexer.partitions.SingleDimensionPartitionsSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.nary.BinaryFn; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.timeline.partition.ShardSpec; +import org.apache.druid.timeline.partition.SingleDimensionShardSpec; import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidDetermineConfigurationJob.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidDetermineConfigurationJob.java similarity index 93% rename from indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidDetermineConfigurationJob.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidDetermineConfigurationJob.java index 1725b719ac7b..1254e460cee2 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidDetermineConfigurationJob.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidDetermineConfigurationJob.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.inject.Inject; -import io.druid.java.util.common.logger.Logger; -import io.druid.timeline.partition.HashBasedNumberedShardSpec; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.timeline.partition.HashBasedNumberedShardSpec; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfig.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java similarity index 93% rename from indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfig.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java index d4fcdbf944fb..2c41a3fc07e9 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfig.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java @@ -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; @@ -36,30 +36,30 @@ import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Module; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.InputRowParser; -import io.druid.guice.GuiceInjectors; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.annotations.Self; -import io.druid.indexer.partitions.PartitionsSpec; -import io.druid.indexer.path.PathSpec; -import io.druid.initialization.Initialization; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.JodaUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.FunctionalIterable; -import io.druid.java.util.common.jackson.JacksonUtils; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMerger; -import io.druid.segment.IndexMergerV9; -import io.druid.segment.IndexSpec; -import io.druid.segment.indexing.granularity.GranularitySpec; -import io.druid.segment.loading.DataSegmentPusher; -import io.druid.server.DruidNode; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.ShardSpec; -import io.druid.timeline.partition.ShardSpecLookup; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.indexer.partitions.PartitionsSpec; +import org.apache.druid.indexer.path.PathSpec; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.JodaUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.FunctionalIterable; +import org.apache.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMerger; +import org.apache.druid.segment.IndexMergerV9; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.segment.loading.DataSegmentPusher; +import org.apache.druid.server.DruidNode; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.ShardSpec; +import org.apache.druid.timeline.partition.ShardSpecLookup; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerJob.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerJob.java similarity index 96% rename from indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerJob.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerJob.java index 99741d6a75a7..8d6149fd304c 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerJob.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerJob.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.inject.Inject; -import io.druid.java.util.common.logger.Logger; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.timeline.DataSegment; import javax.annotation.Nullable; import java.util.List; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerMapper.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerMapper.java similarity index 89% rename from indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerMapper.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerMapper.java index 78c1fc81918f..48f6b1da4e09 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerMapper.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerMapper.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.google.common.collect.ImmutableList; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.RE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.collect.Utils; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.common.parsers.ParseException; -import io.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.collect.Utils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.parsers.ParseException; +import org.apache.druid.segment.indexing.granularity.GranularitySpec; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapreduce.Counter; import org.apache.hadoop.mapreduce.Mapper; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopIOConfig.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopIOConfig.java similarity index 93% rename from indexing-hadoop/src/main/java/io/druid/indexer/HadoopIOConfig.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopIOConfig.java index 0d1e03fdf4b1..02c3668ccacc 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopIOConfig.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopIOConfig.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.druid.indexer.updater.MetadataStorageUpdaterJobSpec; -import io.druid.segment.indexing.IOConfig; +import org.apache.druid.indexer.updater.MetadataStorageUpdaterJobSpec; +import org.apache.druid.segment.indexing.IOConfig; import java.util.Map; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopIngestionSpec.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopIngestionSpec.java similarity index 91% rename from indexing-hadoop/src/main/java/io/druid/indexer/HadoopIngestionSpec.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopIngestionSpec.java index 71d5fc44101b..1f631fd6e17c 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopIngestionSpec.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopIngestionSpec.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Lists; -import io.druid.common.utils.UUIDUtils; -import io.druid.indexer.hadoop.DatasourceIngestionSpec; -import io.druid.indexer.hadoop.WindowedDataSegment; -import io.druid.indexer.path.UsedSegmentLister; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.IngestionSpec; -import io.druid.timeline.DataSegment; -import io.druid.timeline.TimelineObjectHolder; -import io.druid.timeline.VersionedIntervalTimeline; -import io.druid.timeline.partition.PartitionChunk; +import org.apache.druid.common.utils.UUIDUtils; +import org.apache.druid.indexer.hadoop.DatasourceIngestionSpec; +import org.apache.druid.indexer.hadoop.WindowedDataSegment; +import org.apache.druid.indexer.path.UsedSegmentLister; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.IngestionSpec; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.TimelineObjectHolder; +import org.apache.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.timeline.partition.PartitionChunk; import org.joda.time.Interval; import java.io.IOException; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopKerberosConfig.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopKerberosConfig.java similarity index 98% rename from indexing-hadoop/src/main/java/io/druid/indexer/HadoopKerberosConfig.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopKerberosConfig.java index 6bab885f4843..05c51ff5c085 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopKerberosConfig.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopKerberosConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopTuningConfig.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopTuningConfig.java similarity index 95% rename from indexing-hadoop/src/main/java/io/druid/indexer/HadoopTuningConfig.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopTuningConfig.java index 35dbcc71d7bc..1f17fb89fe86 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopTuningConfig.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopTuningConfig.java @@ -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; @@ -25,11 +25,11 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.indexer.partitions.HashedPartitionsSpec; -import io.druid.indexer.partitions.PartitionsSpec; -import io.druid.java.util.common.DateTimes; -import io.druid.segment.IndexSpec; -import io.druid.segment.indexing.TuningConfig; +import org.apache.druid.indexer.partitions.HashedPartitionsSpec; +import org.apache.druid.indexer.partitions.PartitionsSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.indexing.TuningConfig; import javax.annotation.Nullable; import java.util.List; @@ -112,7 +112,7 @@ public HadoopTuningConfig( final @JsonProperty("jobProperties") Map jobProperties, final @JsonProperty("combineText") boolean combineText, final @JsonProperty("useCombiner") Boolean useCombiner, - // See https://github.com/druid-io/druid/pull/1922 + // See https://github.com/apache/incubator-druid/pull/1922 final @JsonProperty("rowFlushBoundary") Integer maxRowsInMemoryCOMPAT, // This parameter is left for compatibility when reading existing configs, to be removed in Druid 0.12. final @JsonProperty("buildV9Directly") Boolean buildV9Directly, @@ -133,7 +133,7 @@ public HadoopTuningConfig( ? DEFAULT_ROW_FLUSH_BOUNDARY : maxRowsInMemoryCOMPAT : maxRowsInMemory; // initializing this to 0, it will be lazily initialized to a value - // @see server.src.main.java.io.druid.segment.indexing.TuningConfigs#getMaxBytesInMemoryOrDefault(long) + // @see server.src.main.java.org.apache.druid.segment.indexing.TuningConfigs#getMaxBytesInMemoryOrDefault(long) this.maxBytesInMemory = maxBytesInMemory == null ? 0 : maxBytesInMemory; this.leaveIntermediate = leaveIntermediate; this.cleanupOnFailure = cleanupOnFailure == null ? true : cleanupOnFailure; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopWorkingDirCleaner.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopWorkingDirCleaner.java similarity index 94% rename from indexing-hadoop/src/main/java/io/druid/indexer/HadoopWorkingDirCleaner.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopWorkingDirCleaner.java index 5d959cf8769f..740f97ba270e 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopWorkingDirCleaner.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopWorkingDirCleaner.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.logger.Logger; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopyShardSpec.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopyShardSpec.java similarity index 95% rename from indexing-hadoop/src/main/java/io/druid/indexer/HadoopyShardSpec.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopyShardSpec.java index b9a77e062d0e..3caeafcf75ff 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopyShardSpec.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopyShardSpec.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.timeline.partition.ShardSpec; +import org.apache.druid.timeline.partition.ShardSpec; /** * ShardSpec + a shard ID that is unique across this run. The shard ID is used for grouping and partitioning. diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopyStringInputRowParser.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopyStringInputRowParser.java similarity index 87% rename from indexing-hadoop/src/main/java/io/druid/indexer/HadoopyStringInputRowParser.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopyStringInputRowParser.java index 473b37d6d3c3..d54227f1d337 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopyStringInputRowParser.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopyStringInputRowParser.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.ParseSpec; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.java.util.common.IAE; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.ParseSpec; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.java.util.common.IAE; import org.apache.hadoop.io.BytesWritable; import org.apache.hadoop.io.Text; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/IndexGeneratorJob.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/IndexGeneratorJob.java similarity index 96% rename from indexing-hadoop/src/main/java/io/druid/indexer/IndexGeneratorJob.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/IndexGeneratorJob.java index 0b596b379886..ac34c755ae95 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/IndexGeneratorJob.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/IndexGeneratorJob.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Optional; @@ -32,29 +32,29 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.common.guava.ThreadRenamingRunnable; -import io.druid.data.input.InputRow; -import io.druid.data.input.Row; -import io.druid.data.input.Rows; -import io.druid.indexer.hadoop.SegmentInputRow; -import io.druid.indexer.path.DatasourcePathSpec; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.common.parsers.ParseException; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.segment.BaseProgressIndicator; -import io.druid.segment.ProgressIndicator; -import io.druid.segment.QueryableIndex; -import io.druid.segment.column.ColumnCapabilitiesImpl; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexSchema; -import io.druid.segment.indexing.TuningConfigs; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NumberedShardSpec; -import io.druid.timeline.partition.ShardSpec; +import org.apache.druid.common.guava.ThreadRenamingRunnable; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.data.input.Rows; +import org.apache.druid.indexer.hadoop.SegmentInputRow; +import org.apache.druid.indexer.path.DatasourcePathSpec; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.parsers.ParseException; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.segment.BaseProgressIndicator; +import org.apache.druid.segment.ProgressIndicator; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.column.ColumnCapabilitiesImpl; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.segment.indexing.TuningConfigs; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NumberedShardSpec; +import org.apache.druid.timeline.partition.ShardSpec; import org.apache.commons.io.FileUtils; import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.conf.Configuration; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/IndexingHadoopModule.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/IndexingHadoopModule.java similarity index 94% rename from indexing-hadoop/src/main/java/io/druid/indexer/IndexingHadoopModule.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/IndexingHadoopModule.java index c9d62e7e17df..9e0d29cc7136 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/IndexingHadoopModule.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/IndexingHadoopModule.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.inject.Binder; -import io.druid.initialization.DruidModule; +import org.apache.druid.initialization.DruidModule; import java.util.Collections; import java.util.List; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/InputRowSerde.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/InputRowSerde.java similarity index 92% rename from indexing-hadoop/src/main/java/io/druid/indexer/InputRowSerde.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/InputRowSerde.java index f25c2a60d521..45b86424ab72 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/InputRowSerde.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/InputRowSerde.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.google.common.base.Supplier; import com.google.common.collect.Lists; @@ -26,24 +26,24 @@ import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; -import io.druid.common.config.NullHandling; -import io.druid.data.input.InputRow; -import io.druid.data.input.MapBasedInputRow; -import io.druid.data.input.Rows; -import io.druid.data.input.impl.DimensionSchema; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.common.parsers.ParseException; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.segment.DimensionHandlerUtils; -import io.druid.segment.VirtualColumns; -import io.druid.segment.column.ValueType; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.serde.ComplexMetricSerde; -import io.druid.segment.serde.ComplexMetrics; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.data.input.Rows; +import org.apache.druid.data.input.impl.DimensionSchema; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.parsers.ParseException; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.segment.DimensionHandlerUtils; +import org.apache.druid.segment.VirtualColumns; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.serde.ComplexMetricSerde; +import org.apache.druid.segment.serde.ComplexMetrics; import org.apache.hadoop.io.WritableUtils; import javax.annotation.Nullable; @@ -177,7 +177,7 @@ public void serialize(ByteArrayDataOutput out, Object value) } if (ret == null) { - // remove null -> zero conversion when https://github.com/druid-io/druid/pull/5278 series of patches is merged + // remove null -> zero conversion when https://github.com/apache/incubator-druid/pull/5278 series of patches is merged // we'll also need to change the serialized encoding so that it can represent numeric nulls ret = DimensionHandlerUtils.ZERO_LONG; } @@ -216,7 +216,7 @@ public void serialize(ByteArrayDataOutput out, Object value) } if (ret == null) { - // remove null -> zero conversion when https://github.com/druid-io/druid/pull/5278 series of patches is merged + // remove null -> zero conversion when https://github.com/apache/incubator-druid/pull/5278 series of patches is merged // we'll also need to change the serialized encoding so that it can represent numeric nulls ret = DimensionHandlerUtils.ZERO_FLOAT; } @@ -255,7 +255,7 @@ public void serialize(ByteArrayDataOutput out, Object value) } if (ret == null) { - // remove null -> zero conversion when https://github.com/druid-io/druid/pull/5278 series of patches is merged + // remove null -> zero conversion when https://github.com/apache/incubator-druid/pull/5278 series of patches is merged // we'll also need to change the serialized encoding so that it can represent numeric nulls ret = DimensionHandlerUtils.ZERO_DOUBLE; } diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/JobHelper.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/JobHelper.java similarity index 97% rename from indexing-hadoop/src/main/java/io/druid/indexer/JobHelper.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/JobHelper.java index 756385a1d269..25f695a1cadd 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/JobHelper.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/JobHelper.java @@ -17,27 +17,27 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.fasterxml.jackson.core.JsonProcessingException; import com.google.common.base.Predicate; import com.google.common.base.Strings; import com.google.common.base.Throwables; import com.google.common.io.Files; -import io.druid.indexer.updater.HadoopDruidConverterConfig; -import io.druid.java.util.common.CompressionUtils; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.FileUtils; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.IOE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.RetryUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.ProgressIndicator; -import io.druid.segment.SegmentUtils; -import io.druid.segment.loading.DataSegmentPusher; -import io.druid.timeline.DataSegment; +import org.apache.druid.indexer.updater.HadoopDruidConverterConfig; +import org.apache.druid.java.util.common.CompressionUtils; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.FileUtils; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.IOE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.RetryUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.ProgressIndicator; +import org.apache.druid.segment.SegmentUtils; +import org.apache.druid.segment.loading.DataSegmentPusher; +import org.apache.druid.timeline.DataSegment; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/MetadataStorageUpdaterJob.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/MetadataStorageUpdaterJob.java similarity index 95% rename from indexing-hadoop/src/main/java/io/druid/indexer/MetadataStorageUpdaterJob.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/MetadataStorageUpdaterJob.java index 0774d185d56e..b7eb60bf0931 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/MetadataStorageUpdaterJob.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/MetadataStorageUpdaterJob.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import java.util.List; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/SortableBytes.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/SortableBytes.java similarity index 97% rename from indexing-hadoop/src/main/java/io/druid/indexer/SortableBytes.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/SortableBytes.java index ae438ff38521..5772da8a51cb 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/SortableBytes.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/SortableBytes.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import org.apache.hadoop.io.BytesWritable; import org.apache.hadoop.io.WritableComparator; import org.apache.hadoop.mapreduce.Job; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/Utils.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/Utils.java similarity index 95% rename from indexing-hadoop/src/main/java/io/druid/indexer/Utils.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/Utils.java index a2d12ee80dbf..1a2ce04ca19a 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/Utils.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/Utils.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Maps; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.jackson.JacksonUtils; -import io.druid.java.util.common.ISE; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.java.util.common.ISE; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.logger.Logger; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.compress.CompressionCodec; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/hadoop/DatasourceIngestionSpec.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceIngestionSpec.java similarity index 95% rename from indexing-hadoop/src/main/java/io/druid/indexer/hadoop/DatasourceIngestionSpec.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceIngestionSpec.java index 4a11359e4c03..20a8eb3be0d7 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/hadoop/DatasourceIngestionSpec.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceIngestionSpec.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.indexer.hadoop; +package org.apache.druid.indexer.hadoop; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import io.druid.java.util.common.JodaUtils; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.query.filter.DimFilter; -import io.druid.segment.transform.TransformSpec; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.JodaUtils; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.segment.transform.TransformSpec; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import java.util.List; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/hadoop/DatasourceInputFormat.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceInputFormat.java similarity index 96% rename from indexing-hadoop/src/main/java/io/druid/indexer/hadoop/DatasourceInputFormat.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceInputFormat.java index 36bb08e0952e..1f578e7de631 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/hadoop/DatasourceInputFormat.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceInputFormat.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.indexer.hadoop; +package org.apache.druid.indexer.hadoop; import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Supplier; -import io.druid.data.input.InputRow; -import io.druid.indexer.HadoopDruidIndexerConfig; -import io.druid.indexer.JobHelper; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.indexer.HadoopDruidIndexerConfig; +import org.apache.druid.indexer.JobHelper; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/hadoop/DatasourceInputSplit.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceInputSplit.java similarity index 96% rename from indexing-hadoop/src/main/java/io/druid/indexer/hadoop/DatasourceInputSplit.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceInputSplit.java index a4d2b2bcacc2..e842adeed1a7 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/hadoop/DatasourceInputSplit.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceInputSplit.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.indexer.hadoop; +package org.apache.druid.indexer.hadoop; import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.base.Preconditions; -import io.druid.indexer.HadoopDruidIndexerConfig; +import org.apache.druid.indexer.HadoopDruidIndexerConfig; import org.apache.hadoop.io.Writable; import org.apache.hadoop.mapreduce.InputSplit; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/hadoop/DatasourceRecordReader.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceRecordReader.java similarity index 89% rename from indexing-hadoop/src/main/java/io/druid/indexer/hadoop/DatasourceRecordReader.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceRecordReader.java index b3dde787ea73..3ec6a71d2166 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/hadoop/DatasourceRecordReader.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceRecordReader.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexer.hadoop; +package org.apache.druid.indexer.hadoop; import com.google.common.base.Function; import com.google.common.base.Throwables; @@ -25,15 +25,15 @@ import com.google.common.collect.Lists; import com.google.common.io.Closeables; import com.google.common.io.Files; -import io.druid.data.input.InputRow; -import io.druid.data.input.Row; -import io.druid.indexer.HadoopDruidIndexerConfig; -import io.druid.indexer.JobHelper; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.QueryableIndex; -import io.druid.segment.QueryableIndexStorageAdapter; -import io.druid.segment.realtime.firehose.IngestSegmentFirehose; -import io.druid.segment.realtime.firehose.WindowedStorageAdapter; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.indexer.HadoopDruidIndexerConfig; +import org.apache.druid.indexer.JobHelper; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.QueryableIndexStorageAdapter; +import org.apache.druid.segment.realtime.firehose.IngestSegmentFirehose; +import org.apache.druid.segment.realtime.firehose.WindowedStorageAdapter; import org.apache.commons.io.FileUtils; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.NullWritable; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/hadoop/FSSpideringIterator.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/FSSpideringIterator.java similarity index 98% rename from indexing-hadoop/src/main/java/io/druid/indexer/hadoop/FSSpideringIterator.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/FSSpideringIterator.java index cf3ad9853769..a07d46b6f2fe 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/hadoop/FSSpideringIterator.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/FSSpideringIterator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexer.hadoop; +package org.apache.druid.indexer.hadoop; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/hadoop/SegmentInputRow.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/SegmentInputRow.java similarity index 94% rename from indexing-hadoop/src/main/java/io/druid/indexer/hadoop/SegmentInputRow.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/SegmentInputRow.java index 66f704cf76fe..7e694792b229 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/hadoop/SegmentInputRow.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/SegmentInputRow.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.indexer.hadoop; +package org.apache.druid.indexer.hadoop; -import io.druid.data.input.InputRow; -import io.druid.data.input.Row; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.Row; import org.joda.time.DateTime; import java.util.List; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/hadoop/WindowedDataSegment.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/WindowedDataSegment.java similarity index 96% rename from indexing-hadoop/src/main/java/io/druid/indexer/hadoop/WindowedDataSegment.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/WindowedDataSegment.java index f8521d5cff55..394d9e3f5c4b 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/hadoop/WindowedDataSegment.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/WindowedDataSegment.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.indexer.hadoop; +package org.apache.druid.indexer.hadoop; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import java.util.Objects; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/partitions/AbstractPartitionsSpec.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/partitions/AbstractPartitionsSpec.java similarity index 98% rename from indexing-hadoop/src/main/java/io/druid/indexer/partitions/AbstractPartitionsSpec.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/partitions/AbstractPartitionsSpec.java index 2fe3bc1c6946..28812797dd6f 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/partitions/AbstractPartitionsSpec.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/partitions/AbstractPartitionsSpec.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexer.partitions; +package org.apache.druid.indexer.partitions; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/partitions/HashedPartitionsSpec.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/partitions/HashedPartitionsSpec.java similarity index 91% rename from indexing-hadoop/src/main/java/io/druid/indexer/partitions/HashedPartitionsSpec.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/partitions/HashedPartitionsSpec.java index 3417ed362f33..31905e420e5f 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/partitions/HashedPartitionsSpec.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/partitions/HashedPartitionsSpec.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.indexer.partitions; +package org.apache.druid.indexer.partitions; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; -import io.druid.indexer.DetermineHashedPartitionsJob; -import io.druid.indexer.HadoopDruidIndexerConfig; -import io.druid.indexer.Jobby; +import org.apache.druid.indexer.DetermineHashedPartitionsJob; +import org.apache.druid.indexer.HadoopDruidIndexerConfig; +import org.apache.druid.indexer.Jobby; import javax.annotation.Nullable; import java.util.List; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/partitions/PartitionsSpec.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/partitions/PartitionsSpec.java similarity index 92% rename from indexing-hadoop/src/main/java/io/druid/indexer/partitions/PartitionsSpec.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/partitions/PartitionsSpec.java index a3a77d32838d..44268e2a4c2b 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/partitions/PartitionsSpec.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/partitions/PartitionsSpec.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.indexer.partitions; +package org.apache.druid.indexer.partitions; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.druid.indexer.HadoopDruidIndexerConfig; -import io.druid.indexer.Jobby; +import org.apache.druid.indexer.HadoopDruidIndexerConfig; +import org.apache.druid.indexer.Jobby; import java.util.List; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/partitions/SingleDimensionPartitionsSpec.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/partitions/SingleDimensionPartitionsSpec.java similarity index 91% rename from indexing-hadoop/src/main/java/io/druid/indexer/partitions/SingleDimensionPartitionsSpec.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/partitions/SingleDimensionPartitionsSpec.java index b9219240804f..5013044b1de5 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/partitions/SingleDimensionPartitionsSpec.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/partitions/SingleDimensionPartitionsSpec.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.indexer.partitions; +package org.apache.druid.indexer.partitions; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; -import io.druid.indexer.DeterminePartitionsJob; -import io.druid.indexer.HadoopDruidIndexerConfig; -import io.druid.indexer.Jobby; +import org.apache.druid.indexer.DeterminePartitionsJob; +import org.apache.druid.indexer.HadoopDruidIndexerConfig; +import org.apache.druid.indexer.Jobby; import javax.annotation.Nullable; import java.util.List; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/path/DatasourcePathSpec.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/path/DatasourcePathSpec.java similarity index 94% rename from indexing-hadoop/src/main/java/io/druid/indexer/path/DatasourcePathSpec.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/path/DatasourcePathSpec.java index 806e4edec146..4049f764bdb3 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/path/DatasourcePathSpec.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/path/DatasourcePathSpec.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexer.path; +package org.apache.druid.indexer.path; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; @@ -28,13 +28,13 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import io.druid.indexer.HadoopDruidIndexerConfig; -import io.druid.indexer.hadoop.DatasourceIngestionSpec; -import io.druid.indexer.hadoop.DatasourceInputFormat; -import io.druid.indexer.hadoop.WindowedDataSegment; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.indexer.HadoopDruidIndexerConfig; +import org.apache.druid.indexer.hadoop.DatasourceIngestionSpec; +import org.apache.druid.indexer.hadoop.DatasourceInputFormat; +import org.apache.druid.indexer.hadoop.WindowedDataSegment; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.lib.input.MultipleInputs; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/path/GranularUnprocessedPathSpec.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/path/GranularUnprocessedPathSpec.java similarity index 89% rename from indexing-hadoop/src/main/java/io/druid/indexer/path/GranularUnprocessedPathSpec.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/path/GranularUnprocessedPathSpec.java index 9421e5035ded..f39d288e1c97 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/path/GranularUnprocessedPathSpec.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/path/GranularUnprocessedPathSpec.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.indexer.path; +package org.apache.druid.indexer.path; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Ordering; import com.google.common.collect.Sets; -import io.druid.indexer.HadoopDruidIndexerConfig; -import io.druid.indexer.hadoop.FSSpideringIterator; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.Comparators; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.HadoopDruidIndexerConfig; +import org.apache.druid.indexer.hadoop.FSSpideringIterator; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/path/GranularityPathSpec.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/path/GranularityPathSpec.java similarity index 93% rename from indexing-hadoop/src/main/java/io/druid/indexer/path/GranularityPathSpec.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/path/GranularityPathSpec.java index 2c0f59b67aaf..beb7c7c57ca0 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/path/GranularityPathSpec.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/path/GranularityPathSpec.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.indexer.path; +package org.apache.druid.indexer.path; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.Sets; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.indexer.HadoopDruidIndexerConfig; -import io.druid.indexer.hadoop.FSSpideringIterator; -import io.druid.java.util.common.guava.Comparators; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.indexer.HadoopDruidIndexerConfig; +import org.apache.druid.indexer.hadoop.FSSpideringIterator; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.java.util.common.logger.Logger; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/path/HadoopGlobPathSplitter.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/path/HadoopGlobPathSplitter.java similarity index 98% rename from indexing-hadoop/src/main/java/io/druid/indexer/path/HadoopGlobPathSplitter.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/path/HadoopGlobPathSplitter.java index efba3b2bbc0a..71a32fa9988e 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/path/HadoopGlobPathSplitter.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/path/HadoopGlobPathSplitter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexer.path; +package org.apache.druid.indexer.path; import com.google.common.base.Functions; import com.google.common.collect.Iterables; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/path/MetadataStoreBasedUsedSegmentLister.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/path/MetadataStoreBasedUsedSegmentLister.java similarity index 91% rename from indexing-hadoop/src/main/java/io/druid/indexer/path/MetadataStoreBasedUsedSegmentLister.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/path/MetadataStoreBasedUsedSegmentLister.java index 354609bdbb88..2980c431ec20 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/path/MetadataStoreBasedUsedSegmentLister.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/path/MetadataStoreBasedUsedSegmentLister.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.indexer.path; +package org.apache.druid.indexer.path; import com.google.common.base.Preconditions; import com.google.inject.Inject; -import io.druid.indexing.overlord.IndexerMetadataStorageCoordinator; -import io.druid.timeline.DataSegment; +import org.apache.druid.indexing.overlord.IndexerMetadataStorageCoordinator; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import java.util.List; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/path/MultiplePathSpec.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/path/MultiplePathSpec.java similarity index 95% rename from indexing-hadoop/src/main/java/io/druid/indexer/path/MultiplePathSpec.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/path/MultiplePathSpec.java index b2489ab6c3ac..22612fb6fe8e 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/path/MultiplePathSpec.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/path/MultiplePathSpec.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.indexer.path; +package org.apache.druid.indexer.path; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.indexer.HadoopDruidIndexerConfig; +import org.apache.druid.indexer.HadoopDruidIndexerConfig; import org.apache.hadoop.mapreduce.Job; import java.io.IOException; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/path/PathSpec.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/path/PathSpec.java similarity index 94% rename from indexing-hadoop/src/main/java/io/druid/indexer/path/PathSpec.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/path/PathSpec.java index fe968aeff817..d2f3866f1d8c 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/path/PathSpec.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/path/PathSpec.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.indexer.path; +package org.apache.druid.indexer.path; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.druid.indexer.HadoopDruidIndexerConfig; +import org.apache.druid.indexer.HadoopDruidIndexerConfig; import org.apache.hadoop.mapreduce.Job; import java.io.IOException; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/path/StaticPathSpec.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/path/StaticPathSpec.java similarity index 96% rename from indexing-hadoop/src/main/java/io/druid/indexer/path/StaticPathSpec.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/path/StaticPathSpec.java index 17fe2e478afe..811c5f181891 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/path/StaticPathSpec.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/path/StaticPathSpec.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.indexer.path; +package org.apache.druid.indexer.path; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; -import io.druid.indexer.HadoopDruidIndexerConfig; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.indexer.HadoopDruidIndexerConfig; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapreduce.InputFormat; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/path/UsedSegmentLister.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/path/UsedSegmentLister.java similarity index 94% rename from indexing-hadoop/src/main/java/io/druid/indexer/path/UsedSegmentLister.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/path/UsedSegmentLister.java index 99d93b5eb677..bc8733289266 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/path/UsedSegmentLister.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/path/UsedSegmentLister.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.indexer.path; +package org.apache.druid.indexer.path; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import java.io.IOException; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/updater/HadoopConverterJob.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/updater/HadoopConverterJob.java similarity index 96% rename from indexing-hadoop/src/main/java/io/druid/indexer/updater/HadoopConverterJob.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/updater/HadoopConverterJob.java index df3ba047387e..c61e4ca0b406 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/updater/HadoopConverterJob.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/updater/HadoopConverterJob.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexer.updater; +package org.apache.druid.indexer.updater; import com.fasterxml.jackson.core.JsonProcessingException; import com.google.common.base.Function; @@ -28,14 +28,14 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.common.io.Files; -import io.druid.indexer.JobHelper; -import io.druid.indexer.hadoop.DatasourceInputSplit; -import io.druid.indexer.hadoop.WindowedDataSegment; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.timeline.DataSegment; +import org.apache.druid.indexer.JobHelper; +import org.apache.druid.indexer.hadoop.DatasourceInputSplit; +import org.apache.druid.indexer.hadoop.WindowedDataSegment; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.timeline.DataSegment; import org.apache.commons.io.FileUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; @@ -379,7 +379,7 @@ public static class ConvertingOutputFormat extends OutputFormat { protected static final String DATA_FILE_KEY = "result"; protected static final String DATA_SUCCESS_KEY = "_SUCCESS"; - protected static final String PUBLISHED_SEGMENT_KEY = "io.druid.indexer.updater.converter.publishedSegment"; + protected static final String PUBLISHED_SEGMENT_KEY = "org.apache.druid.indexer.updater.converter.publishedSegment"; private static final Logger log = new Logger(ConvertingOutputFormat.class); @Override @@ -483,7 +483,7 @@ public void abortTask(TaskAttemptContext taskContext) public static class ConvertingMapper extends Mapper { private static final Logger log = new Logger(ConvertingMapper.class); - private static final String TMP_FILE_LOC_KEY = "io.druid.indexer.updater.converter.reducer.tmpDir"; + private static final String TMP_FILE_LOC_KEY = "org.apache.druid.indexer.updater.converter.reducer.tmpDir"; @Override protected void map( diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/updater/HadoopDruidConverterConfig.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/updater/HadoopDruidConverterConfig.java similarity index 89% rename from indexing-hadoop/src/main/java/io/druid/indexer/updater/HadoopDruidConverterConfig.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/updater/HadoopDruidConverterConfig.java index 0ae18357b294..9d25dce5fae8 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/updater/HadoopDruidConverterConfig.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/updater/HadoopDruidConverterConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexer.updater; +package org.apache.druid.indexer.updater; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -29,17 +29,17 @@ import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Module; -import io.druid.guice.GuiceInjectors; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.annotations.Self; -import io.druid.initialization.Initialization; -import io.druid.java.util.common.jackson.JacksonUtils; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMerger; -import io.druid.segment.IndexSpec; -import io.druid.segment.loading.DataSegmentPusher; -import io.druid.server.DruidNode; -import io.druid.timeline.DataSegment; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMerger; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.loading.DataSegmentPusher; +import org.apache.druid.server.DruidNode; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import java.io.IOException; @@ -49,7 +49,7 @@ public class HadoopDruidConverterConfig { - public static final String CONFIG_PROPERTY = "io.druid.indexer.updater.converter"; + public static final String CONFIG_PROPERTY = "org.apache.druid.indexer.updater.converter"; public static final ObjectMapper jsonMapper; public static final IndexIO INDEX_IO; public static final IndexMerger INDEX_MERGER; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/updater/MetadataStorageUpdaterJobSpec.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/updater/MetadataStorageUpdaterJobSpec.java similarity index 91% rename from indexing-hadoop/src/main/java/io/druid/indexer/updater/MetadataStorageUpdaterJobSpec.java rename to indexing-hadoop/src/main/java/org/apache/druid/indexer/updater/MetadataStorageUpdaterJobSpec.java index 73353fd59824..baa9631ceca3 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/updater/MetadataStorageUpdaterJobSpec.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/updater/MetadataStorageUpdaterJobSpec.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.indexer.updater; +package org.apache.druid.indexer.updater; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Supplier; -import io.druid.metadata.MetadataStorageConnectorConfig; -import io.druid.metadata.MetadataStorageTablesConfig; -import io.druid.metadata.PasswordProvider; +import org.apache.druid.metadata.MetadataStorageConnectorConfig; +import org.apache.druid.metadata.MetadataStorageTablesConfig; +import org.apache.druid.metadata.PasswordProvider; import javax.validation.constraints.NotNull; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/BatchDeltaIngestionTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/BatchDeltaIngestionTest.java similarity index 90% rename from indexing-hadoop/src/test/java/io/druid/indexer/BatchDeltaIngestionTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/BatchDeltaIngestionTest.java index 2251008cd0c0..70b2abf5df00 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/BatchDeltaIngestionTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/BatchDeltaIngestionTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; @@ -27,34 +27,34 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import io.druid.data.input.Firehose; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.CSVParseSpec; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.hll.HyperLogLogCollector; -import io.druid.indexer.hadoop.WindowedDataSegment; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; -import io.druid.segment.IndexIO; -import io.druid.segment.QueryableIndex; -import io.druid.segment.QueryableIndexStorageAdapter; -import io.druid.segment.StorageAdapter; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; -import io.druid.segment.loading.LocalDataSegmentPuller; -import io.druid.segment.realtime.firehose.IngestSegmentFirehose; -import io.druid.segment.realtime.firehose.WindowedStorageAdapter; -import io.druid.segment.transform.TransformSpec; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.HashBasedNumberedShardSpec; +import org.apache.druid.data.input.Firehose; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.CSVParseSpec; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.hll.HyperLogLogCollector; +import org.apache.druid.indexer.hadoop.WindowedDataSegment; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.QueryableIndexStorageAdapter; +import org.apache.druid.segment.StorageAdapter; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.segment.loading.LocalDataSegmentPuller; +import org.apache.druid.segment.realtime.firehose.IngestSegmentFirehose; +import org.apache.druid.segment.realtime.firehose.WindowedStorageAdapter; +import org.apache.druid.segment.transform.TransformSpec; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.HashBasedNumberedShardSpec; import org.apache.commons.io.FileUtils; import org.joda.time.Interval; import org.junit.Assert; @@ -162,7 +162,7 @@ public void testReindexing() throws Exception /** * By default re-indexing expects same aggregators as used by original indexing job. But, with additional flag * "useNewAggs" in DatasourcePathSpec, user can optionally have any set of aggregators. - * See https://github.com/druid-io/druid/issues/5277 . + * See https://github.com/apache/incubator-druid/issues/5277 . */ @Test public void testReindexingWithNewAggregators() throws Exception diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/BucketTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/BucketTest.java similarity index 96% rename from indexing-hadoop/src/test/java/io/druid/indexer/BucketTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/BucketTest.java index 0853468f3f62..9eedd80f8ad7 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/BucketTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/BucketTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.google.common.primitives.Bytes; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Pair; import org.hamcrest.number.OrderingComparison; import org.joda.time.DateTime; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/DetermineHashedPartitionsJobTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/DetermineHashedPartitionsJobTest.java similarity index 88% rename from indexing-hadoop/src/test/java/io/druid/indexer/DetermineHashedPartitionsJobTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/DetermineHashedPartitionsJobTest.java index e6984536febb..208e24ed1e76 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/DetermineHashedPartitionsJobTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/DetermineHashedPartitionsJobTest.java @@ -17,25 +17,25 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.io.Files; -import io.druid.data.input.impl.DelimitedParseSpec; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.indexer.partitions.HashedPartitionsSpec; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.granularity.PeriodGranularity; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.DoubleSumAggregatorFactory; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.data.input.impl.DelimitedParseSpec; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.indexer.partitions.HashedPartitionsSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.granularity.PeriodGranularity; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; import org.joda.time.Interval; import org.joda.time.Period; import org.junit.Assert; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/DeterminePartitionsJobTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/DeterminePartitionsJobTest.java similarity index 93% rename from indexing-hadoop/src/test/java/io/druid/indexer/DeterminePartitionsJobTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/DeterminePartitionsJobTest.java index 548cbdfd2632..320467b5882a 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/DeterminePartitionsJobTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/DeterminePartitionsJobTest.java @@ -17,23 +17,23 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.io.Files; -import io.druid.data.input.impl.CSVParseSpec; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.indexer.partitions.SingleDimensionPartitionsSpec; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; -import io.druid.timeline.partition.SingleDimensionShardSpec; +import org.apache.druid.data.input.impl.CSVParseSpec; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.indexer.partitions.SingleDimensionPartitionsSpec; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.timeline.partition.SingleDimensionShardSpec; import org.apache.commons.io.FileUtils; import org.junit.After; import org.junit.Assert; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/HadoopDruidIndexerConfigTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopDruidIndexerConfigTest.java similarity index 90% rename from indexing-hadoop/src/test/java/io/druid/indexer/HadoopDruidIndexerConfigTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopDruidIndexerConfigTest.java index 2135ae778052..aa388261678a 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/HadoopDruidIndexerConfigTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopDruidIndexerConfigTest.java @@ -17,23 +17,23 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import io.druid.data.input.MapBasedInputRow; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; -import io.druid.timeline.partition.HashBasedNumberedShardSpec; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.timeline.partition.HashBasedNumberedShardSpec; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/HadoopDruidIndexerMapperTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopDruidIndexerMapperTest.java similarity index 88% rename from indexing-hadoop/src/test/java/io/druid/indexer/HadoopDruidIndexerMapperTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopDruidIndexerMapperTest.java index c52bd8b813e8..8630d13bdcac 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/HadoopDruidIndexerMapperTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopDruidIndexerMapperTest.java @@ -17,28 +17,28 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.JSONParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.indexer.path.StaticPathSpec; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.jackson.JacksonUtils; -import io.druid.java.util.common.parsers.JSONPathSpec; -import io.druid.math.expr.ExprMacroTable; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.segment.TestHelper; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; -import io.druid.segment.transform.ExpressionTransform; -import io.druid.segment.transform.TransformSpec; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.JSONParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.indexer.path.StaticPathSpec; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.java.util.common.parsers.JSONPathSpec; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.segment.transform.ExpressionTransform; +import org.apache.druid.segment.transform.TransformSpec; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.io.Text; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/HadoopIngestionSpecTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopIngestionSpecTest.java similarity index 92% rename from indexing-hadoop/src/test/java/io/druid/indexer/HadoopIngestionSpecTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopIngestionSpecTest.java index 5fdf167a7d69..a7c6ef1cf60f 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/HadoopIngestionSpecTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopIngestionSpecTest.java @@ -17,23 +17,23 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Strings; import com.google.common.base.Throwables; -import io.druid.indexer.partitions.HashedPartitionsSpec; -import io.druid.indexer.partitions.PartitionsSpec; -import io.druid.indexer.partitions.SingleDimensionPartitionsSpec; -import io.druid.indexer.updater.MetadataStorageUpdaterJobSpec; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.PeriodGranularity; -import io.druid.metadata.MetadataStorageConnectorConfig; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.partitions.HashedPartitionsSpec; +import org.apache.druid.indexer.partitions.PartitionsSpec; +import org.apache.druid.indexer.partitions.SingleDimensionPartitionsSpec; +import org.apache.druid.indexer.updater.MetadataStorageUpdaterJobSpec; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.PeriodGranularity; +import org.apache.druid.metadata.MetadataStorageConnectorConfig; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; import org.joda.time.Period; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/HadoopIngestionSpecUpdateDatasourcePathSpecSegmentsTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopIngestionSpecUpdateDatasourcePathSpecSegmentsTest.java similarity index 91% rename from indexing-hadoop/src/test/java/io/druid/indexer/HadoopIngestionSpecUpdateDatasourcePathSpecSegmentsTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopIngestionSpecUpdateDatasourcePathSpecSegmentsTest.java index 830a1127e432..09d5b663d221 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/HadoopIngestionSpecUpdateDatasourcePathSpecSegmentsTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopIngestionSpecUpdateDatasourcePathSpecSegmentsTest.java @@ -17,27 +17,27 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.indexer.hadoop.DatasourceIngestionSpec; -import io.druid.indexer.hadoop.WindowedDataSegment; -import io.druid.indexer.path.DatasourcePathSpec; -import io.druid.indexer.path.MultiplePathSpec; -import io.druid.indexer.path.PathSpec; -import io.druid.indexer.path.StaticPathSpec; -import io.druid.indexer.path.UsedSegmentLister; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.indexer.hadoop.DatasourceIngestionSpec; +import org.apache.druid.indexer.hadoop.WindowedDataSegment; +import org.apache.druid.indexer.path.DatasourcePathSpec; +import org.apache.druid.indexer.path.MultiplePathSpec; +import org.apache.druid.indexer.path.PathSpec; +import org.apache.druid.indexer.path.StaticPathSpec; +import org.apache.druid.indexer.path.UsedSegmentLister; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.easymock.EasyMock; import org.joda.time.Interval; import org.junit.Assert; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/HadoopKerberosConfigTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopKerberosConfigTest.java similarity index 97% rename from indexing-hadoop/src/test/java/io/druid/indexer/HadoopKerberosConfigTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopKerberosConfigTest.java index f228e5abf2a7..157feaca7e65 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/HadoopKerberosConfigTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopKerberosConfigTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/HadoopTuningConfigTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopTuningConfigTest.java similarity index 95% rename from indexing-hadoop/src/test/java/io/druid/indexer/HadoopTuningConfigTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopTuningConfigTest.java index 21ae3da978ed..d5fa7d2051ba 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/HadoopTuningConfigTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopTuningConfigTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.segment.IndexSpec; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.segment.IndexSpec; import org.joda.time.DateTime; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/HadoopyStringInputRowParserTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopyStringInputRowParserTest.java similarity index 94% rename from indexing-hadoop/src/test/java/io/druid/indexer/HadoopyStringInputRowParserTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopyStringInputRowParserTest.java index a9e5da8ea9d5..4e29642f7aab 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/HadoopyStringInputRowParserTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopyStringInputRowParserTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.InputRowParser; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/HdfsClasspathSetupTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HdfsClasspathSetupTest.java similarity index 97% rename from indexing-hadoop/src/test/java/io/druid/indexer/HdfsClasspathSetupTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/HdfsClasspathSetupTest.java index e49f99e91f4f..a25b6c95bdd9 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/HdfsClasspathSetupTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HdfsClasspathSetupTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.common.utils.UUIDUtils; -import io.druid.java.util.common.IOE; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.common.utils.UUIDUtils; +import org.apache.druid.java.util.common.IOE; +import org.apache.druid.java.util.common.StringUtils; import junit.framework.Assert; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/IndexGeneratorCombinerTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/IndexGeneratorCombinerTest.java similarity index 91% rename from indexing-hadoop/src/test/java/io/druid/indexer/IndexGeneratorCombinerTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/IndexGeneratorCombinerTest.java index ba1a0f01dc83..0929e1181146 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/IndexGeneratorCombinerTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/IndexGeneratorCombinerTest.java @@ -17,27 +17,27 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import io.druid.data.input.InputRow; -import io.druid.data.input.MapBasedInputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.StringDimensionSchema; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.data.input.impl.TimeAndDimsParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.StringDimensionSchema; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.data.input.impl.TimeAndDimsParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.BytesWritable; import org.apache.hadoop.mapreduce.Reducer; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/IndexGeneratorJobTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/IndexGeneratorJobTest.java similarity index 95% rename from indexing-hadoop/src/test/java/io/druid/indexer/IndexGeneratorJobTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/IndexGeneratorJobTest.java index 05421b47622e..125ce2fde8ca 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/IndexGeneratorJobTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/IndexGeneratorJobTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.jsontype.NamedType; @@ -25,27 +25,27 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.data.input.impl.CSVParseSpec; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.JSONParseSpec; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.RE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.HashBasedNumberedShardSpec; -import io.druid.timeline.partition.NumberedShardSpec; -import io.druid.timeline.partition.ShardSpec; -import io.druid.timeline.partition.SingleDimensionShardSpec; +import org.apache.druid.data.input.impl.CSVParseSpec; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.JSONParseSpec; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.HashBasedNumberedShardSpec; +import org.apache.druid.timeline.partition.NumberedShardSpec; +import org.apache.druid.timeline.partition.ShardSpec; +import org.apache.druid.timeline.partition.SingleDimensionShardSpec; import org.apache.commons.io.FileUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/InputRowSerdeTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/InputRowSerdeTest.java similarity index 89% rename from indexing-hadoop/src/test/java/io/druid/indexer/InputRowSerdeTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/InputRowSerdeTest.java index 0f3753cd7ff2..f6c6d5e60493 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/InputRowSerdeTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/InputRowSerdeTest.java @@ -17,27 +17,27 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; -import io.druid.common.config.NullHandling; -import io.druid.data.input.InputRow; -import io.druid.data.input.MapBasedInputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.DoubleDimensionSchema; -import io.druid.data.input.impl.FloatDimensionSchema; -import io.druid.data.input.impl.LongDimensionSchema; -import io.druid.data.input.impl.StringDimensionSchema; -import io.druid.hll.HyperLogLogCollector; -import io.druid.jackson.AggregatorsModule; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.DoubleSumAggregator; -import io.druid.query.aggregation.DoubleSumAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.DoubleDimensionSchema; +import org.apache.druid.data.input.impl.FloatDimensionSchema; +import org.apache.druid.data.input.impl.LongDimensionSchema; +import org.apache.druid.data.input.impl.StringDimensionSchema; +import org.apache.druid.hll.HyperLogLogCollector; +import org.apache.druid.jackson.AggregatorsModule; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.DoubleSumAggregator; +import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; +import org.apache.druid.segment.ColumnSelectorFactory; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Rule; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/JobHelperTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/JobHelperTest.java similarity index 89% rename from indexing-hadoop/src/test/java/io/druid/indexer/JobHelperTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/JobHelperTest.java index ec45edb6d194..6abdac0eda4e 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/JobHelperTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/JobHelperTest.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.data.input.impl.CSVParseSpec; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.CompressionUtils; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.data.input.impl.CSVParseSpec; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.CompressionUtils; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.retry.RetryPolicies; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/SortableBytesTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/SortableBytesTest.java similarity index 98% rename from indexing-hadoop/src/test/java/io/druid/indexer/SortableBytesTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/SortableBytesTest.java index 40d6d8d46868..b384ff904649 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/SortableBytesTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/SortableBytesTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import org.apache.hadoop.io.WritableComparator; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/UtilsCompressionTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/UtilsCompressionTest.java similarity index 98% rename from indexing-hadoop/src/test/java/io/druid/indexer/UtilsCompressionTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/UtilsCompressionTest.java index c83d1b900413..89afab218eca 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/UtilsCompressionTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/UtilsCompressionTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.google.common.io.ByteStreams; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/UtilsTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/UtilsTest.java similarity index 96% rename from indexing-hadoop/src/test/java/io/druid/indexer/UtilsTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/UtilsTest.java index 6f879dc9353d..987b65d76215 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/UtilsTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/UtilsTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.google.common.base.Function; import com.google.common.collect.Maps; import com.google.common.io.ByteStreams; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; import org.apache.commons.io.FileUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/hadoop/DatasourceIngestionSpecTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/DatasourceIngestionSpecTest.java similarity index 95% rename from indexing-hadoop/src/test/java/io/druid/indexer/hadoop/DatasourceIngestionSpecTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/DatasourceIngestionSpecTest.java index 1c2bfb0a04a8..98da95fc77b0 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/hadoop/DatasourceIngestionSpecTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/DatasourceIngestionSpecTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.indexer.hadoop; +package org.apache.druid.indexer.hadoop; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.druid.java.util.common.Intervals; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.segment.TestHelper; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/hadoop/DatasourceInputFormatTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/DatasourceInputFormatTest.java similarity index 98% rename from indexing-hadoop/src/test/java/io/druid/indexer/hadoop/DatasourceInputFormatTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/DatasourceInputFormatTest.java index 0beb63995b0c..8496e86fa0b9 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/hadoop/DatasourceInputFormatTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/DatasourceInputFormatTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexer.hadoop; +package org.apache.druid.indexer.hadoop; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableList; @@ -27,11 +27,11 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.common.io.Files; -import io.druid.indexer.JobHelper; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.JodaUtils; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.indexer.JobHelper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.JodaUtils; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.BlockLocation; import org.apache.hadoop.fs.FileStatus; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/hadoop/DatasourceInputSplitTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/DatasourceInputSplitTest.java similarity index 92% rename from indexing-hadoop/src/test/java/io/druid/indexer/hadoop/DatasourceInputSplitTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/DatasourceInputSplitTest.java index 9d75dca9de2f..bb9803db94a2 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/hadoop/DatasourceInputSplitTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/DatasourceInputSplitTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.indexer.hadoop; +package org.apache.druid.indexer.hadoop; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; -import io.druid.java.util.common.Intervals; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/hadoop/DatasourceRecordReaderTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/DatasourceRecordReaderTest.java similarity index 93% rename from indexing-hadoop/src/test/java/io/druid/indexer/hadoop/DatasourceRecordReaderTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/DatasourceRecordReaderTest.java index 9cfe1da06be6..466a94f3a1f2 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/hadoop/DatasourceRecordReaderTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/DatasourceRecordReaderTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.indexer.hadoop; +package org.apache.druid.indexer.hadoop; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import io.druid.data.input.InputRow; -import io.druid.indexer.HadoopDruidIndexerConfig; -import io.druid.java.util.common.DateTimes; -import io.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; -import io.druid.timeline.DataSegment; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.indexer.HadoopDruidIndexerConfig; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; +import org.apache.druid.timeline.DataSegment; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.InputSplit; import org.apache.hadoop.mapreduce.TaskAttemptContext; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/hadoop/FSSpideringIteratorTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/FSSpideringIteratorTest.java similarity index 98% rename from indexing-hadoop/src/test/java/io/druid/indexer/hadoop/FSSpideringIteratorTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/FSSpideringIteratorTest.java index 1510554e50f1..bb61938b9499 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/hadoop/FSSpideringIteratorTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/FSSpideringIteratorTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexer.hadoop; +package org.apache.druid.indexer.hadoop; import com.google.common.base.Function; import com.google.common.base.Throwables; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/hadoop/WindowedDataSegmentTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/WindowedDataSegmentTest.java similarity index 91% rename from indexing-hadoop/src/test/java/io/druid/indexer/hadoop/WindowedDataSegmentTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/WindowedDataSegmentTest.java index 5274b41d79d5..f08046972544 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/hadoop/WindowedDataSegmentTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/WindowedDataSegmentTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.indexer.hadoop; +package org.apache.druid.indexer.hadoop; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.Intervals; -import io.druid.segment.TestHelper; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/partitions/HashedPartitionsSpecTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/partitions/HashedPartitionsSpecTest.java similarity index 97% rename from indexing-hadoop/src/test/java/io/druid/indexer/partitions/HashedPartitionsSpecTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/partitions/HashedPartitionsSpecTest.java index d9a5ecb26ce3..cebcfbaac7e7 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/partitions/HashedPartitionsSpecTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/partitions/HashedPartitionsSpecTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.indexer.partitions; +package org.apache.druid.indexer.partitions; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/path/DatasourcePathSpecTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/path/DatasourcePathSpecTest.java similarity index 86% rename from indexing-hadoop/src/test/java/io/druid/indexer/path/DatasourcePathSpecTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/path/DatasourcePathSpecTest.java index ecc3e998d932..3d0922e68016 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/path/DatasourcePathSpecTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/path/DatasourcePathSpecTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexer.path; +package org.apache.druid.indexer.path; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; @@ -26,33 +26,33 @@ import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Module; -import io.druid.data.input.impl.CSVParseSpec; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.guice.GuiceInjectors; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.annotations.Self; -import io.druid.indexer.HadoopDruidIndexerConfig; -import io.druid.indexer.HadoopIOConfig; -import io.druid.indexer.HadoopIngestionSpec; -import io.druid.indexer.HadoopTuningConfig; -import io.druid.indexer.hadoop.DatasourceIngestionSpec; -import io.druid.indexer.hadoop.DatasourceInputFormat; -import io.druid.indexer.hadoop.WindowedDataSegment; -import io.druid.initialization.Initialization; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.segment.TestHelper; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; -import io.druid.server.DruidNode; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.data.input.impl.CSVParseSpec; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.indexer.HadoopDruidIndexerConfig; +import org.apache.druid.indexer.HadoopIOConfig; +import org.apache.druid.indexer.HadoopIngestionSpec; +import org.apache.druid.indexer.HadoopTuningConfig; +import org.apache.druid.indexer.hadoop.DatasourceIngestionSpec; +import org.apache.druid.indexer.hadoop.DatasourceInputFormat; +import org.apache.druid.indexer.hadoop.WindowedDataSegment; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.server.DruidNode; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.Job; import org.easymock.EasyMock; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/path/GranularUnprocessedPathSpecTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/path/GranularUnprocessedPathSpecTest.java similarity index 96% rename from indexing-hadoop/src/test/java/io/druid/indexer/path/GranularUnprocessedPathSpecTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/path/GranularUnprocessedPathSpecTest.java index 991bd793f9c0..660787a599a0 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/path/GranularUnprocessedPathSpecTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/path/GranularUnprocessedPathSpecTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexer.path; +package org.apache.druid.indexer.path; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/path/GranularityPathSpecTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/path/GranularityPathSpecTest.java similarity index 92% rename from indexing-hadoop/src/test/java/io/druid/indexer/path/GranularityPathSpecTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/path/GranularityPathSpecTest.java index 17ef92d85ebf..c6721424d485 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/path/GranularityPathSpecTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/path/GranularityPathSpecTest.java @@ -17,26 +17,26 @@ * under the License. */ -package io.druid.indexer.path; +package org.apache.druid.indexer.path; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.druid.indexer.HadoopDruidIndexerConfig; -import io.druid.indexer.HadoopIOConfig; -import io.druid.indexer.HadoopIngestionSpec; -import io.druid.indexer.HadoopTuningConfig; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.granularity.PeriodGranularity; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.HadoopDruidIndexerConfig; +import org.apache.druid.indexer.HadoopIOConfig; +import org.apache.druid.indexer.HadoopIngestionSpec; +import org.apache.druid.indexer.HadoopTuningConfig; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.granularity.PeriodGranularity; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.lib.input.TextInputFormat; import org.apache.hadoop.security.UserGroupInformation; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/path/HadoopGlobPathSplitterTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/path/HadoopGlobPathSplitterTest.java similarity index 98% rename from indexing-hadoop/src/test/java/io/druid/indexer/path/HadoopGlobPathSplitterTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/path/HadoopGlobPathSplitterTest.java index bc3e9322c524..bd072d8cfbb0 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/path/HadoopGlobPathSplitterTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/path/HadoopGlobPathSplitterTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexer.path; +package org.apache.druid.indexer.path; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/path/MultiplePathSpecTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/path/MultiplePathSpecTest.java similarity index 95% rename from indexing-hadoop/src/test/java/io/druid/indexer/path/MultiplePathSpecTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/path/MultiplePathSpecTest.java index 44908a4df7d4..fe898908e988 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/path/MultiplePathSpecTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/path/MultiplePathSpecTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.indexer.path; +package org.apache.druid.indexer.path; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Lists; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.jackson.DefaultObjectMapper; import org.apache.hadoop.mapreduce.lib.input.TextInputFormat; import org.easymock.EasyMock; import org.junit.Assert; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/path/StaticPathSpecTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/path/StaticPathSpecTest.java similarity index 89% rename from indexing-hadoop/src/test/java/io/druid/indexer/path/StaticPathSpecTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/path/StaticPathSpecTest.java index 937f1974f485..b0c8a8c04ef6 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/path/StaticPathSpecTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/path/StaticPathSpecTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.indexer.path; +package org.apache.druid.indexer.path; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.indexer.HadoopDruidIndexerConfig; -import io.druid.indexer.HadoopIOConfig; -import io.druid.indexer.HadoopIngestionSpec; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.segment.indexing.DataSchema; +import org.apache.druid.indexer.HadoopDruidIndexerConfig; +import org.apache.druid.indexer.HadoopIOConfig; +import org.apache.druid.indexer.HadoopIngestionSpec; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.segment.indexing.DataSchema; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.lib.input.MultipleInputs; import org.apache.hadoop.mapreduce.lib.input.TextInputFormat; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/updater/HadoopConverterJobTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/updater/HadoopConverterJobTest.java similarity index 86% rename from indexing-hadoop/src/test/java/io/druid/indexer/updater/HadoopConverterJobTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/updater/HadoopConverterJobTest.java index 95fa0480b4d7..52d20afbe6ef 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/updater/HadoopConverterJobTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/updater/HadoopConverterJobTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexer.updater; +package org.apache.druid.indexer.updater; import com.google.common.base.Preconditions; import com.google.common.base.Supplier; @@ -27,41 +27,41 @@ import com.google.common.collect.Sets; import com.google.common.io.ByteSource; import com.google.common.io.Files; -import io.druid.client.ImmutableDruidDataSource; -import io.druid.data.input.impl.DelimitedParseSpec; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.indexer.HadoopDruidDetermineConfigurationJob; -import io.druid.indexer.HadoopDruidIndexerConfig; -import io.druid.indexer.HadoopDruidIndexerJob; -import io.druid.indexer.HadoopIOConfig; -import io.druid.indexer.HadoopIngestionSpec; -import io.druid.indexer.HadoopTuningConfig; -import io.druid.indexer.JobHelper; -import io.druid.indexer.Jobby; -import io.druid.indexer.SQLMetadataStorageUpdaterJobHandler; -import io.druid.java.util.common.FileUtils; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.metadata.MetadataSegmentManagerConfig; -import io.druid.metadata.MetadataStorageConnectorConfig; -import io.druid.metadata.MetadataStorageTablesConfig; -import io.druid.metadata.SQLMetadataSegmentManager; -import io.druid.metadata.TestDerbyConnector; -import io.druid.metadata.storage.derby.DerbyConnector; -import io.druid.query.Query; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.DoubleSumAggregatorFactory; -import io.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; -import io.druid.segment.IndexSpec; -import io.druid.segment.TestIndex; -import io.druid.segment.data.CompressionFactory; -import io.druid.segment.data.CompressionStrategy; -import io.druid.segment.data.RoaringBitmapSerdeFactory; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.ImmutableDruidDataSource; +import org.apache.druid.data.input.impl.DelimitedParseSpec; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.indexer.HadoopDruidDetermineConfigurationJob; +import org.apache.druid.indexer.HadoopDruidIndexerConfig; +import org.apache.druid.indexer.HadoopDruidIndexerJob; +import org.apache.druid.indexer.HadoopIOConfig; +import org.apache.druid.indexer.HadoopIngestionSpec; +import org.apache.druid.indexer.HadoopTuningConfig; +import org.apache.druid.indexer.JobHelper; +import org.apache.druid.indexer.Jobby; +import org.apache.druid.indexer.SQLMetadataStorageUpdaterJobHandler; +import org.apache.druid.java.util.common.FileUtils; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.metadata.MetadataSegmentManagerConfig; +import org.apache.druid.metadata.MetadataStorageConnectorConfig; +import org.apache.druid.metadata.MetadataStorageTablesConfig; +import org.apache.druid.metadata.SQLMetadataSegmentManager; +import org.apache.druid.metadata.TestDerbyConnector; +import org.apache.druid.metadata.storage.derby.DerbyConnector; +import org.apache.druid.query.Query; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.TestIndex; +import org.apache.druid.segment.data.CompressionFactory; +import org.apache.druid.segment.data.CompressionStrategy; +import org.apache.druid.segment.data.RoaringBitmapSerdeFactory; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import org.junit.After; import org.junit.Assert; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/updater/HadoopDruidConverterConfigTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/updater/HadoopDruidConverterConfigTest.java similarity index 91% rename from indexing-hadoop/src/test/java/io/druid/indexer/updater/HadoopDruidConverterConfigTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/updater/HadoopDruidConverterConfigTest.java index b6ca3fa55c04..2bd8513269c1 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/updater/HadoopDruidConverterConfigTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/updater/HadoopDruidConverterConfigTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.indexer.updater; +package org.apache.druid.indexer.updater; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; -import io.druid.segment.IndexSpec; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.segment.IndexSpec; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/updater/MetadataStorageUpdaterJobSpecTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/updater/MetadataStorageUpdaterJobSpecTest.java similarity index 98% rename from indexing-hadoop/src/test/java/io/druid/indexer/updater/MetadataStorageUpdaterJobSpecTest.java rename to indexing-hadoop/src/test/java/org/apache/druid/indexer/updater/MetadataStorageUpdaterJobSpecTest.java index d8b090ce022f..5172c62d25a8 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/updater/MetadataStorageUpdaterJobSpecTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/updater/MetadataStorageUpdaterJobSpecTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexer.updater; +package org.apache.druid.indexer.updater; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 75e1f775d068..b77a09a9109e 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -26,24 +26,24 @@ druid-indexing-service - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT - io.druid + org.apache.druid druid-common ${project.parent.version} - io.druid + org.apache.druid druid-server ${project.parent.version} - io.druid + org.apache.druid druid-indexing-hadoop ${project.parent.version} @@ -70,21 +70,21 @@ test - io.druid + org.apache.druid druid-processing ${project.parent.version} test-jar test - io.druid + org.apache.druid druid-server ${project.parent.version} test-jar test - io.druid + org.apache.druid druid-api ${project.parent.version} test-jar diff --git a/indexing-service/src/main/java/io/druid/guice/IndexingServiceFirehoseModule.java b/indexing-service/src/main/java/org/apache/druid/guice/IndexingServiceFirehoseModule.java similarity index 87% rename from indexing-service/src/main/java/io/druid/guice/IndexingServiceFirehoseModule.java rename to indexing-service/src/main/java/org/apache/druid/guice/IndexingServiceFirehoseModule.java index ae39827955c3..83d9825d14f4 100644 --- a/indexing-service/src/main/java/io/druid/guice/IndexingServiceFirehoseModule.java +++ b/indexing-service/src/main/java/org/apache/druid/guice/IndexingServiceFirehoseModule.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.common.collect.ImmutableList; import com.google.inject.Binder; -import io.druid.indexing.firehose.IngestSegmentFirehoseFactory; -import io.druid.initialization.DruidModule; -import io.druid.segment.realtime.firehose.EventReceiverFirehoseFactory; +import org.apache.druid.indexing.firehose.IngestSegmentFirehoseFactory; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.segment.realtime.firehose.EventReceiverFirehoseFactory; import java.util.List; diff --git a/indexing-service/src/main/java/io/druid/guice/IndexingServiceModuleHelper.java b/indexing-service/src/main/java/org/apache/druid/guice/IndexingServiceModuleHelper.java similarity index 84% rename from indexing-service/src/main/java/io/druid/guice/IndexingServiceModuleHelper.java rename to indexing-service/src/main/java/org/apache/druid/guice/IndexingServiceModuleHelper.java index b765ca171a2b..be3666a3cc98 100644 --- a/indexing-service/src/main/java/io/druid/guice/IndexingServiceModuleHelper.java +++ b/indexing-service/src/main/java/org/apache/druid/guice/IndexingServiceModuleHelper.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.google.inject.Binder; -import io.druid.indexing.overlord.config.ForkingTaskRunnerConfig; -import io.druid.indexing.overlord.config.RemoteTaskRunnerConfig; -import io.druid.server.initialization.IndexerZkConfig; +import org.apache.druid.indexing.overlord.config.ForkingTaskRunnerConfig; +import org.apache.druid.indexing.overlord.config.RemoteTaskRunnerConfig; +import org.apache.druid.server.initialization.IndexerZkConfig; /** */ diff --git a/indexing-service/src/main/java/io/druid/guice/IndexingServiceTaskLogsModule.java b/indexing-service/src/main/java/org/apache/druid/guice/IndexingServiceTaskLogsModule.java similarity index 83% rename from indexing-service/src/main/java/io/druid/guice/IndexingServiceTaskLogsModule.java rename to indexing-service/src/main/java/org/apache/druid/guice/IndexingServiceTaskLogsModule.java index f43886a4ffee..be2c62540e08 100644 --- a/indexing-service/src/main/java/io/druid/guice/IndexingServiceTaskLogsModule.java +++ b/indexing-service/src/main/java/org/apache/druid/guice/IndexingServiceTaskLogsModule.java @@ -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.Module; import com.google.inject.multibindings.MapBinder; -import io.druid.indexing.common.config.FileTaskLogsConfig; -import io.druid.indexing.common.tasklogs.FileTaskLogs; -import io.druid.tasklogs.NoopTaskLogs; -import io.druid.tasklogs.TaskLogKiller; -import io.druid.tasklogs.TaskLogPusher; -import io.druid.tasklogs.TaskLogs; +import org.apache.druid.indexing.common.config.FileTaskLogsConfig; +import org.apache.druid.indexing.common.tasklogs.FileTaskLogs; +import org.apache.druid.tasklogs.NoopTaskLogs; +import org.apache.druid.tasklogs.TaskLogKiller; +import org.apache.druid.tasklogs.TaskLogPusher; +import org.apache.druid.tasklogs.TaskLogs; /** */ diff --git a/indexing-service/src/main/java/io/druid/indexing/appenderator/ActionBasedSegmentAllocator.java b/indexing-service/src/main/java/org/apache/druid/indexing/appenderator/ActionBasedSegmentAllocator.java similarity index 82% rename from indexing-service/src/main/java/io/druid/indexing/appenderator/ActionBasedSegmentAllocator.java rename to indexing-service/src/main/java/org/apache/druid/indexing/appenderator/ActionBasedSegmentAllocator.java index 53cd6993101b..369de529d355 100644 --- a/indexing-service/src/main/java/io/druid/indexing/appenderator/ActionBasedSegmentAllocator.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/appenderator/ActionBasedSegmentAllocator.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.indexing.appenderator; +package org.apache.druid.indexing.appenderator; -import io.druid.data.input.InputRow; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.realtime.appenderator.SegmentAllocator; -import io.druid.segment.realtime.appenderator.SegmentIdentifier; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.realtime.appenderator.SegmentAllocator; +import org.apache.druid.segment.realtime.appenderator.SegmentIdentifier; import java.io.IOException; diff --git a/indexing-service/src/main/java/io/druid/indexing/appenderator/ActionBasedUsedSegmentChecker.java b/indexing-service/src/main/java/org/apache/druid/indexing/appenderator/ActionBasedUsedSegmentChecker.java similarity index 86% rename from indexing-service/src/main/java/io/druid/indexing/appenderator/ActionBasedUsedSegmentChecker.java rename to indexing-service/src/main/java/org/apache/druid/indexing/appenderator/ActionBasedUsedSegmentChecker.java index 75dcc3992ae4..2d725f6d7d14 100644 --- a/indexing-service/src/main/java/io/druid/indexing/appenderator/ActionBasedUsedSegmentChecker.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/appenderator/ActionBasedUsedSegmentChecker.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.indexing.appenderator; +package org.apache.druid.indexing.appenderator; import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import io.druid.java.util.common.JodaUtils; -import io.druid.indexing.common.actions.SegmentListUsedAction; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.segment.realtime.appenderator.SegmentIdentifier; -import io.druid.segment.realtime.appenderator.UsedSegmentChecker; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.JodaUtils; +import org.apache.druid.indexing.common.actions.SegmentListUsedAction; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.segment.realtime.appenderator.SegmentIdentifier; +import org.apache.druid.segment.realtime.appenderator.UsedSegmentChecker; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import java.io.IOException; diff --git a/indexing-service/src/main/java/io/druid/indexing/appenderator/SegmentAllocateActionGenerator.java b/indexing-service/src/main/java/org/apache/druid/indexing/appenderator/SegmentAllocateActionGenerator.java similarity index 76% rename from indexing-service/src/main/java/io/druid/indexing/appenderator/SegmentAllocateActionGenerator.java rename to indexing-service/src/main/java/org/apache/druid/indexing/appenderator/SegmentAllocateActionGenerator.java index 4a0352f9b8d0..033dddb4871b 100644 --- a/indexing-service/src/main/java/io/druid/indexing/appenderator/SegmentAllocateActionGenerator.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/appenderator/SegmentAllocateActionGenerator.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.indexing.appenderator; +package org.apache.druid.indexing.appenderator; -import io.druid.data.input.InputRow; -import io.druid.indexing.common.actions.TaskAction; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.realtime.appenderator.SegmentIdentifier; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.indexing.common.actions.TaskAction; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.realtime.appenderator.SegmentIdentifier; /** * This class is used in {@link ActionBasedSegmentAllocator} and expected to generate a * {@link TaskAction} which is submitted to overlords to allocate a new segment. * The {@link #generate} method can return any implementation of {@link TaskAction}. * - * @see io.druid.indexing.common.actions.SegmentAllocateAction - * @see io.druid.indexing.common.actions.SurrogateAction + * @see org.apache.druid.indexing.common.actions.SegmentAllocateAction + * @see org.apache.druid.indexing.common.actions.SurrogateAction */ public interface SegmentAllocateActionGenerator { diff --git a/indexing-service/src/main/java/io/druid/indexing/common/Counters.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/Counters.java similarity index 98% rename from indexing-service/src/main/java/io/druid/indexing/common/Counters.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/Counters.java index 6563c7db9af5..3cf4ac8ba788 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/Counters.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/Counters.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common; +package org.apache.druid.indexing.common; import com.google.common.util.concurrent.AtomicDouble; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/IndexTaskClient.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/IndexTaskClient.java similarity index 94% rename from indexing-service/src/main/java/io/druid/indexing/common/IndexTaskClient.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/IndexTaskClient.java index 631d4b46d231..1ef152b31136 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/IndexTaskClient.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/IndexTaskClient.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common; +package org.apache.druid.indexing.common; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; @@ -29,18 +29,18 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.indexer.TaskLocation; -import io.druid.indexer.TaskStatus; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.IOE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.Request; -import io.druid.java.util.http.client.response.FullResponseHandler; -import io.druid.java.util.http.client.response.FullResponseHolder; -import io.druid.segment.realtime.firehose.ChatHandlerResource; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.IOE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.Request; +import org.apache.druid.java.util.http.client.response.FullResponseHandler; +import org.apache.druid.java.util.http.client.response.FullResponseHolder; +import org.apache.druid.segment.realtime.firehose.ChatHandlerResource; import org.jboss.netty.channel.ChannelException; import org.jboss.netty.handler.codec.http.HttpMethod; import org.jboss.netty.handler.codec.http.HttpResponseStatus; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/IngestionStatsAndErrorsTaskReport.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/IngestionStatsAndErrorsTaskReport.java similarity index 98% rename from indexing-service/src/main/java/io/druid/indexing/common/IngestionStatsAndErrorsTaskReport.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/IngestionStatsAndErrorsTaskReport.java index ab791e81ce84..02b20aa63005 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/IngestionStatsAndErrorsTaskReport.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/IngestionStatsAndErrorsTaskReport.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common; +package org.apache.druid.indexing.common; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/IngestionStatsAndErrorsTaskReportData.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/IngestionStatsAndErrorsTaskReportData.java similarity index 97% rename from indexing-service/src/main/java/io/druid/indexing/common/IngestionStatsAndErrorsTaskReportData.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/IngestionStatsAndErrorsTaskReportData.java index a36f39a11e50..3b7b780561ef 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/IngestionStatsAndErrorsTaskReportData.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/IngestionStatsAndErrorsTaskReportData.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.indexing.common; +package org.apache.druid.indexing.common; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.indexer.IngestionState; +import org.apache.druid.indexer.IngestionState; import javax.annotation.Nullable; import java.util.Map; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/RetryPolicy.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/RetryPolicy.java similarity index 97% rename from indexing-service/src/main/java/io/druid/indexing/common/RetryPolicy.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/RetryPolicy.java index a0ba4c1762da..49c43b3c385c 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/RetryPolicy.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/RetryPolicy.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common; +package org.apache.druid.indexing.common; import org.joda.time.Duration; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/RetryPolicyConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/RetryPolicyConfig.java similarity index 97% rename from indexing-service/src/main/java/io/druid/indexing/common/RetryPolicyConfig.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/RetryPolicyConfig.java index 724df5affc57..22b033562567 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/RetryPolicyConfig.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/RetryPolicyConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common; +package org.apache.druid.indexing.common; import com.fasterxml.jackson.annotation.JsonProperty; import org.joda.time.Period; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/RetryPolicyFactory.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/RetryPolicyFactory.java similarity index 96% rename from indexing-service/src/main/java/io/druid/indexing/common/RetryPolicyFactory.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/RetryPolicyFactory.java index 22bdb672ddf7..15856e6373f5 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/RetryPolicyFactory.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/RetryPolicyFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common; +package org.apache.druid.indexing.common; import com.google.inject.Inject; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/SegmentLoaderFactory.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/SegmentLoaderFactory.java similarity index 82% rename from indexing-service/src/main/java/io/druid/indexing/common/SegmentLoaderFactory.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/SegmentLoaderFactory.java index 6ad7479d8c92..b15d3dfc4bdd 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/SegmentLoaderFactory.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/SegmentLoaderFactory.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.indexing.common; +package org.apache.druid.indexing.common; import com.google.inject.Inject; -import io.druid.segment.loading.SegmentLoader; -import io.druid.segment.loading.SegmentLoaderConfig; -import io.druid.segment.loading.SegmentLoaderLocalCacheManager; -import io.druid.segment.loading.StorageLocationConfig; +import org.apache.druid.segment.loading.SegmentLoader; +import org.apache.druid.segment.loading.SegmentLoaderConfig; +import org.apache.druid.segment.loading.SegmentLoaderLocalCacheManager; +import org.apache.druid.segment.loading.StorageLocationConfig; import java.io.File; import java.util.Collections; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/TaskInfoProvider.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/TaskInfoProvider.java similarity index 90% rename from indexing-service/src/main/java/io/druid/indexing/common/TaskInfoProvider.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/TaskInfoProvider.java index 520b42cbc6fb..748cbd560dec 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/TaskInfoProvider.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/TaskInfoProvider.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.indexing.common; +package org.apache.druid.indexing.common; import com.google.common.base.Optional; -import io.druid.indexer.TaskLocation; -import io.druid.indexer.TaskStatus; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexer.TaskStatus; public interface TaskInfoProvider { diff --git a/indexing-service/src/main/java/io/druid/indexing/common/TaskLock.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/TaskLock.java similarity index 99% rename from indexing-service/src/main/java/io/druid/indexing/common/TaskLock.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/TaskLock.java index 2ad8fae335f1..865b053b95c4 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/TaskLock.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/TaskLock.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common; +package org.apache.druid.indexing.common; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/TaskLockType.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/TaskLockType.java similarity index 95% rename from indexing-service/src/main/java/io/druid/indexing/common/TaskLockType.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/TaskLockType.java index afff396e20b7..e1f3f4e062dc 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/TaskLockType.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/TaskLockType.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common; +package org.apache.druid.indexing.common; public enum TaskLockType { diff --git a/indexing-service/src/main/java/io/druid/indexing/common/TaskRealtimeMetricsMonitorBuilder.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/TaskRealtimeMetricsMonitorBuilder.java similarity index 81% rename from indexing-service/src/main/java/io/druid/indexing/common/TaskRealtimeMetricsMonitorBuilder.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/TaskRealtimeMetricsMonitorBuilder.java index 3742a38a997e..954c33ccec0f 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/TaskRealtimeMetricsMonitorBuilder.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/TaskRealtimeMetricsMonitorBuilder.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.indexing.common; +package org.apache.druid.indexing.common; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.indexing.common.stats.RowIngestionMeters; -import io.druid.indexing.common.stats.TaskRealtimeMetricsMonitor; -import io.druid.indexing.common.task.Task; -import io.druid.query.DruidMetrics; -import io.druid.segment.realtime.FireDepartment; -import io.druid.segment.realtime.RealtimeMetricsMonitor; +import org.apache.druid.indexing.common.stats.RowIngestionMeters; +import org.apache.druid.indexing.common.stats.TaskRealtimeMetricsMonitor; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.query.DruidMetrics; +import org.apache.druid.segment.realtime.FireDepartment; +import org.apache.druid.segment.realtime.RealtimeMetricsMonitor; public class TaskRealtimeMetricsMonitorBuilder { diff --git a/indexing-service/src/main/java/io/druid/indexing/common/TaskReport.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/TaskReport.java similarity index 97% rename from indexing-service/src/main/java/io/druid/indexing/common/TaskReport.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/TaskReport.java index 0c1076fe1442..6c37cfaf108f 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/TaskReport.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/TaskReport.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common; +package org.apache.druid.indexing.common; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/TaskReportFileWriter.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/TaskReportFileWriter.java similarity index 94% rename from indexing-service/src/main/java/io/druid/indexing/common/TaskReportFileWriter.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/TaskReportFileWriter.java index 34877136a485..ce126f49cc2e 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/TaskReportFileWriter.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/TaskReportFileWriter.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.indexing.common; +package org.apache.druid.indexing.common; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.logger.Logger; import org.apache.commons.io.FileUtils; import java.io.File; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/TaskToolbox.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/TaskToolbox.java similarity index 84% rename from indexing-service/src/main/java/io/druid/indexing/common/TaskToolbox.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/TaskToolbox.java index e31969e2baee..0bb96a885257 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/TaskToolbox.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/TaskToolbox.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common; +package org.apache.druid.indexing.common; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Function; @@ -27,31 +27,31 @@ import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; import com.google.inject.Provider; -import io.druid.client.cache.CachePopulatorStats; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.metrics.MonitorScheduler; -import io.druid.client.cache.Cache; -import io.druid.client.cache.CacheConfig; -import io.druid.discovery.DataNodeService; -import io.druid.discovery.DruidNodeAnnouncer; -import io.druid.discovery.LookupNodeService; -import io.druid.indexing.common.actions.SegmentInsertAction; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.indexing.common.config.TaskConfig; -import io.druid.query.QueryRunnerFactoryConglomerate; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMergerV9; -import io.druid.segment.loading.DataSegmentArchiver; -import io.druid.segment.loading.DataSegmentKiller; -import io.druid.segment.loading.DataSegmentMover; -import io.druid.segment.loading.DataSegmentPusher; -import io.druid.segment.loading.SegmentLoader; -import io.druid.segment.loading.SegmentLoadingException; -import io.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; -import io.druid.server.DruidNode; -import io.druid.server.coordination.DataSegmentAnnouncer; -import io.druid.server.coordination.DataSegmentServerAnnouncer; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.cache.CachePopulatorStats; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.metrics.MonitorScheduler; +import org.apache.druid.client.cache.Cache; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.discovery.DataNodeService; +import org.apache.druid.discovery.DruidNodeAnnouncer; +import org.apache.druid.discovery.LookupNodeService; +import org.apache.druid.indexing.common.actions.SegmentInsertAction; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.indexing.common.config.TaskConfig; +import org.apache.druid.query.QueryRunnerFactoryConglomerate; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMergerV9; +import org.apache.druid.segment.loading.DataSegmentArchiver; +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.segment.loading.SegmentLoader; +import org.apache.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.coordination.DataSegmentAnnouncer; +import org.apache.druid.server.coordination.DataSegmentServerAnnouncer; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import java.io.File; @@ -78,7 +78,7 @@ public class TaskToolbox private final SegmentHandoffNotifierFactory handoffNotifierFactory; /** * Using Provider, not {@link QueryRunnerFactoryConglomerate} directly, to not require {@link - * io.druid.indexing.overlord.TaskRunner} implementations that create TaskToolboxes to inject query stuff eagerly, + * org.apache.druid.indexing.overlord.TaskRunner} implementations that create TaskToolboxes to inject query stuff eagerly, * because it may be unavailable, e. g. for batch tasks running in Spark or Hadoop. */ private final Provider queryRunnerFactoryConglomerateProvider; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/TaskToolboxFactory.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/TaskToolboxFactory.java similarity index 79% rename from indexing-service/src/main/java/io/druid/indexing/common/TaskToolboxFactory.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/TaskToolboxFactory.java index f858761ad40b..316136df7443 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/TaskToolboxFactory.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/TaskToolboxFactory.java @@ -17,36 +17,36 @@ * under the License. */ -package io.druid.indexing.common; +package org.apache.druid.indexing.common; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; import com.google.inject.Inject; import com.google.inject.Provider; -import io.druid.client.cache.Cache; -import io.druid.client.cache.CacheConfig; -import io.druid.client.cache.CachePopulatorStats; -import io.druid.discovery.DataNodeService; -import io.druid.discovery.DruidNodeAnnouncer; -import io.druid.discovery.LookupNodeService; -import io.druid.guice.annotations.Processing; -import io.druid.guice.annotations.RemoteChatHandler; -import io.druid.indexing.common.actions.TaskActionClientFactory; -import io.druid.indexing.common.config.TaskConfig; -import io.druid.indexing.common.task.Task; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.metrics.MonitorScheduler; -import io.druid.query.QueryRunnerFactoryConglomerate; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMergerV9; -import io.druid.segment.loading.DataSegmentArchiver; -import io.druid.segment.loading.DataSegmentKiller; -import io.druid.segment.loading.DataSegmentMover; -import io.druid.segment.loading.DataSegmentPusher; -import io.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; -import io.druid.server.DruidNode; -import io.druid.server.coordination.DataSegmentAnnouncer; -import io.druid.server.coordination.DataSegmentServerAnnouncer; +import org.apache.druid.client.cache.Cache; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.client.cache.CachePopulatorStats; +import org.apache.druid.discovery.DataNodeService; +import org.apache.druid.discovery.DruidNodeAnnouncer; +import org.apache.druid.discovery.LookupNodeService; +import org.apache.druid.guice.annotations.Processing; +import org.apache.druid.guice.annotations.RemoteChatHandler; +import org.apache.druid.indexing.common.actions.TaskActionClientFactory; +import org.apache.druid.indexing.common.config.TaskConfig; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.metrics.MonitorScheduler; +import org.apache.druid.query.QueryRunnerFactoryConglomerate; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMergerV9; +import org.apache.druid.segment.loading.DataSegmentArchiver; +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.segment.realtime.plumber.SegmentHandoffNotifierFactory; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.coordination.DataSegmentAnnouncer; +import org.apache.druid.server.coordination.DataSegmentServerAnnouncer; import java.io.File; import java.util.concurrent.ExecutorService; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/actions/CheckPointDataSourceMetadataAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/CheckPointDataSourceMetadataAction.java similarity index 95% rename from indexing-service/src/main/java/io/druid/indexing/common/actions/CheckPointDataSourceMetadataAction.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/actions/CheckPointDataSourceMetadataAction.java index 433af987be3b..769322f083c6 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/actions/CheckPointDataSourceMetadataAction.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/CheckPointDataSourceMetadataAction.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.base.Preconditions; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.DataSourceMetadata; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.DataSourceMetadata; import javax.annotation.Nullable; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/actions/LocalTaskActionClient.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LocalTaskActionClient.java similarity index 86% rename from indexing-service/src/main/java/io/druid/indexing/common/actions/LocalTaskActionClient.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LocalTaskActionClient.java index d4dcac7c2507..e4fd239e1eb2 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/actions/LocalTaskActionClient.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LocalTaskActionClient.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; -import io.druid.indexing.common.task.IndexTaskUtils; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.TaskStorage; -import io.druid.java.util.common.ISE; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.indexing.common.task.IndexTaskUtils; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.TaskStorage; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; public class LocalTaskActionClient implements TaskActionClient { diff --git a/indexing-service/src/main/java/io/druid/indexing/common/actions/LocalTaskActionClientFactory.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LocalTaskActionClientFactory.java similarity index 89% rename from indexing-service/src/main/java/io/druid/indexing/common/actions/LocalTaskActionClientFactory.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LocalTaskActionClientFactory.java index f15b92efb3f8..1af8e9e91f55 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/actions/LocalTaskActionClientFactory.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LocalTaskActionClientFactory.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.google.inject.Inject; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.TaskStorage; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.TaskStorage; /** */ diff --git a/indexing-service/src/main/java/io/druid/indexing/common/actions/LockAcquireAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockAcquireAction.java similarity index 91% rename from indexing-service/src/main/java/io/druid/indexing/common/actions/LockAcquireAction.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockAcquireAction.java index fa075e3f8b6f..d77b6efc5e48 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/actions/LockAcquireAction.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockAcquireAction.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -25,10 +25,10 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; -import io.druid.indexing.common.TaskLock; -import io.druid.indexing.common.TaskLockType; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.LockResult; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexing.common.TaskLockType; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.LockResult; import org.joda.time.Interval; import javax.annotation.Nullable; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/actions/LockListAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockListAction.java similarity index 90% rename from indexing-service/src/main/java/io/druid/indexing/common/actions/LockListAction.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockListAction.java index 16b4d075b811..22af74f26b54 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/actions/LockListAction.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockListAction.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.fasterxml.jackson.core.type.TypeReference; -import io.druid.indexing.common.TaskLock; -import io.druid.indexing.common.task.Task; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexing.common.task.Task; import java.util.List; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/actions/LockReleaseAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockReleaseAction.java similarity index 94% rename from indexing-service/src/main/java/io/druid/indexing/common/actions/LockReleaseAction.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockReleaseAction.java index af22dd2b7cd3..12e4ba16322a 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/actions/LockReleaseAction.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockReleaseAction.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import io.druid.indexing.common.task.Task; +import org.apache.druid.indexing.common.task.Task; import org.joda.time.Interval; public class LockReleaseAction implements TaskAction diff --git a/indexing-service/src/main/java/io/druid/indexing/common/actions/LockTryAcquireAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockTryAcquireAction.java similarity index 89% rename from indexing-service/src/main/java/io/druid/indexing/common/actions/LockTryAcquireAction.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockTryAcquireAction.java index 0758ad131c36..f24266ba4b9a 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/actions/LockTryAcquireAction.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockTryAcquireAction.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import io.druid.indexing.common.TaskLock; -import io.druid.indexing.common.TaskLockType; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.LockResult; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexing.common.TaskLockType; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.LockResult; import org.joda.time.Interval; import javax.annotation.Nullable; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/actions/RemoteTaskActionClient.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RemoteTaskActionClient.java similarity index 89% rename from indexing-service/src/main/java/io/druid/indexing/common/actions/RemoteTaskActionClient.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RemoteTaskActionClient.java index 9c0b5495ff78..e8b1d03f41af 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/actions/RemoteTaskActionClient.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RemoteTaskActionClient.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Throwables; -import io.druid.java.util.http.client.response.FullResponseHolder; -import io.druid.discovery.DruidLeaderClient; -import io.druid.indexing.common.RetryPolicy; -import io.druid.indexing.common.RetryPolicyFactory; -import io.druid.indexing.common.task.Task; -import io.druid.java.util.common.IOE; -import io.druid.java.util.common.jackson.JacksonUtils; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.http.client.response.FullResponseHolder; +import org.apache.druid.discovery.DruidLeaderClient; +import org.apache.druid.indexing.common.RetryPolicy; +import org.apache.druid.indexing.common.RetryPolicyFactory; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.java.util.common.IOE; +import org.apache.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.java.util.common.logger.Logger; import org.jboss.netty.channel.ChannelException; import org.jboss.netty.handler.codec.http.HttpMethod; import org.joda.time.Duration; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/actions/RemoteTaskActionClientFactory.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RemoteTaskActionClientFactory.java similarity index 85% rename from indexing-service/src/main/java/io/druid/indexing/common/actions/RemoteTaskActionClientFactory.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RemoteTaskActionClientFactory.java index 2f8638bfbc46..f4b3ad209060 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/actions/RemoteTaskActionClientFactory.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RemoteTaskActionClientFactory.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.inject.Inject; -import io.druid.client.indexing.IndexingService; -import io.druid.discovery.DruidLeaderClient; -import io.druid.indexing.common.RetryPolicyFactory; -import io.druid.indexing.common.task.Task; +import org.apache.druid.client.indexing.IndexingService; +import org.apache.druid.discovery.DruidLeaderClient; +import org.apache.druid.indexing.common.RetryPolicyFactory; +import org.apache.druid.indexing.common.task.Task; /** */ diff --git a/indexing-service/src/main/java/io/druid/indexing/common/actions/ResetDataSourceMetadataAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/ResetDataSourceMetadataAction.java similarity index 92% rename from indexing-service/src/main/java/io/druid/indexing/common/actions/ResetDataSourceMetadataAction.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/actions/ResetDataSourceMetadataAction.java index 274ced7fdd43..3a46356213eb 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/actions/ResetDataSourceMetadataAction.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/ResetDataSourceMetadataAction.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.DataSourceMetadata; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.DataSourceMetadata; public class ResetDataSourceMetadataAction implements TaskAction { diff --git a/indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentAllocateAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentAllocateAction.java similarity index 94% rename from indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentAllocateAction.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentAllocateAction.java index 0da87b70fdf2..26c7bb74f1d3 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentAllocateAction.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentAllocateAction.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableSet; -import io.druid.indexing.common.TaskLockType; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.IndexerMetadataStorageCoordinator; -import io.druid.indexing.overlord.LockResult; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.realtime.appenderator.SegmentIdentifier; -import io.druid.timeline.DataSegment; +import org.apache.druid.indexing.common.TaskLockType; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.IndexerMetadataStorageCoordinator; +import org.apache.druid.indexing.overlord.LockResult; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.realtime.appenderator.SegmentIdentifier; +import org.apache.druid.timeline.DataSegment; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentInsertAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentInsertAction.java similarity index 90% rename from indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentInsertAction.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentInsertAction.java index 8c8a1520a6a4..c78aefe58df3 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentInsertAction.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentInsertAction.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.collect.ImmutableSet; -import io.druid.indexing.common.task.Task; -import io.druid.timeline.DataSegment; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.timeline.DataSegment; import java.util.Set; @@ -64,7 +64,7 @@ public TypeReference> getReturnTypeReference() /** * Behaves similarly to - * {@link io.druid.indexing.overlord.IndexerMetadataStorageCoordinator#announceHistoricalSegments}, + * {@link org.apache.druid.indexing.overlord.IndexerMetadataStorageCoordinator#announceHistoricalSegments}, * with startMetadata and endMetadata both null. */ @Override diff --git a/indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentListUnusedAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentListUnusedAction.java similarity index 93% rename from indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentListUnusedAction.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentListUnusedAction.java index 8da366ae32f7..70c0dc5ef5c3 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentListUnusedAction.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentListUnusedAction.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import io.druid.indexing.common.task.Task; -import io.druid.timeline.DataSegment; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import java.util.List; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentListUsedAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentListUsedAction.java similarity index 94% rename from indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentListUsedAction.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentListUsedAction.java index 96e7e73fe491..50c22d33d2af 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentListUsedAction.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentListUsedAction.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -25,9 +25,9 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import io.druid.indexing.common.task.Task; -import io.druid.java.util.common.JodaUtils; -import io.druid.timeline.DataSegment; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.java.util.common.JodaUtils; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import java.util.List; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentMetadataUpdateAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentMetadataUpdateAction.java similarity index 88% rename from indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentMetadataUpdateAction.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentMetadataUpdateAction.java index 50e6e749d3cf..80a134de8c47 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentMetadataUpdateAction.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentMetadataUpdateAction.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.collect.ImmutableSet; -import io.druid.indexing.common.task.IndexTaskUtils; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.CriticalAction; -import io.druid.java.util.common.ISE; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.query.DruidMetrics; -import io.druid.timeline.DataSegment; +import org.apache.druid.indexing.common.task.IndexTaskUtils; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.CriticalAction; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.query.DruidMetrics; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import java.util.List; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentNukeAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentNukeAction.java similarity index 88% rename from indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentNukeAction.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentNukeAction.java index e171d38a4334..ac5c286c7fc8 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentNukeAction.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentNukeAction.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.collect.ImmutableSet; -import io.druid.indexing.common.task.IndexTaskUtils; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.CriticalAction; -import io.druid.java.util.common.ISE; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.query.DruidMetrics; -import io.druid.timeline.DataSegment; +import org.apache.druid.indexing.common.task.IndexTaskUtils; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.CriticalAction; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.query.DruidMetrics; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import java.util.List; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentTransactionalInsertAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalInsertAction.java similarity index 87% rename from indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentTransactionalInsertAction.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalInsertAction.java index f4a0fa7aa800..ffc799befd94 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentTransactionalInsertAction.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalInsertAction.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.collect.ImmutableSet; -import io.druid.indexing.common.task.IndexTaskUtils; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.CriticalAction; -import io.druid.indexing.overlord.DataSourceMetadata; -import io.druid.indexing.overlord.SegmentPublishResult; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.query.DruidMetrics; -import io.druid.timeline.DataSegment; +import org.apache.druid.indexing.common.task.IndexTaskUtils; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.CriticalAction; +import org.apache.druid.indexing.overlord.DataSourceMetadata; +import org.apache.druid.indexing.overlord.SegmentPublishResult; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.query.DruidMetrics; +import org.apache.druid.timeline.DataSegment; import java.util.Set; import java.util.stream.Collectors; @@ -97,7 +97,7 @@ public TypeReference getReturnTypeReference() /** * Behaves similarly to - * {@link io.druid.indexing.overlord.IndexerMetadataStorageCoordinator#announceHistoricalSegments(Set, DataSourceMetadata, DataSourceMetadata)}. + * {@link org.apache.druid.indexing.overlord.IndexerMetadataStorageCoordinator#announceHistoricalSegments(Set, DataSourceMetadata, DataSourceMetadata)}. */ @Override public SegmentPublishResult perform(Task task, TaskActionToolbox toolbox) diff --git a/indexing-service/src/main/java/io/druid/indexing/common/actions/SurrogateAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SurrogateAction.java similarity index 94% rename from indexing-service/src/main/java/io/druid/indexing/common/actions/SurrogateAction.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SurrogateAction.java index 8befeb0e5cea..700220bde3a7 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/actions/SurrogateAction.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SurrogateAction.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.base.Optional; -import io.druid.indexing.common.task.Task; -import io.druid.java.util.common.ISE; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.java.util.common.ISE; /** * Perform the given action using {@link #surrogateId} on behalf of the caller task. diff --git a/indexing-service/src/main/java/io/druid/indexing/common/actions/TaskAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TaskAction.java similarity index 96% rename from indexing-service/src/main/java/io/druid/indexing/common/actions/TaskAction.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TaskAction.java index fe1ae7967930..206fd5fde7be 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/actions/TaskAction.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TaskAction.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.core.type.TypeReference; -import io.druid.indexing.common.task.Task; +import org.apache.druid.indexing.common.task.Task; @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type") @JsonSubTypes(value = { diff --git a/indexing-service/src/main/java/io/druid/indexing/common/actions/TaskActionClient.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TaskActionClient.java similarity index 95% rename from indexing-service/src/main/java/io/druid/indexing/common/actions/TaskActionClient.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TaskActionClient.java index 8f24fa904117..fb0e8c514000 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/actions/TaskActionClient.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TaskActionClient.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import java.io.IOException; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/actions/TaskActionClientFactory.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TaskActionClientFactory.java similarity index 89% rename from indexing-service/src/main/java/io/druid/indexing/common/actions/TaskActionClientFactory.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TaskActionClientFactory.java index 265aaf8fa658..5dcf3a6337a2 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/actions/TaskActionClientFactory.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TaskActionClientFactory.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; -import io.druid.indexing.common.task.Task; +import org.apache.druid.indexing.common.task.Task; /** */ diff --git a/indexing-service/src/main/java/io/druid/indexing/common/actions/TaskActionHolder.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TaskActionHolder.java similarity index 93% rename from indexing-service/src/main/java/io/druid/indexing/common/actions/TaskActionHolder.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TaskActionHolder.java index 403e965b322c..107a4bc7a404 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/actions/TaskActionHolder.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TaskActionHolder.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.indexing.common.task.Task; +import org.apache.druid.indexing.common.task.Task; /** */ diff --git a/indexing-service/src/main/java/io/druid/indexing/common/actions/TaskActionPreconditions.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TaskActionPreconditions.java similarity index 91% rename from indexing-service/src/main/java/io/druid/indexing/common/actions/TaskActionPreconditions.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TaskActionPreconditions.java index 586a97923163..6db8d8e2ab5b 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/actions/TaskActionPreconditions.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TaskActionPreconditions.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.google.common.annotations.VisibleForTesting; -import io.druid.indexing.common.TaskLock; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.TaskLockbox; -import io.druid.java.util.common.ISE; -import io.druid.timeline.DataSegment; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.TaskLockbox; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.timeline.DataSegment; import org.joda.time.DateTime; import java.util.Collection; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/actions/TaskActionToolbox.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TaskActionToolbox.java similarity index 83% rename from indexing-service/src/main/java/io/druid/indexing/common/actions/TaskActionToolbox.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TaskActionToolbox.java index a547a9d409b4..bb04d8dffcdb 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/actions/TaskActionToolbox.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TaskActionToolbox.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.google.inject.Inject; -import io.druid.indexing.common.Counters; -import io.druid.indexing.overlord.IndexerMetadataStorageCoordinator; -import io.druid.indexing.overlord.TaskLockbox; -import io.druid.indexing.overlord.TaskStorage; -import io.druid.indexing.overlord.supervisor.SupervisorManager; -import io.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.indexing.common.Counters; +import org.apache.druid.indexing.overlord.IndexerMetadataStorageCoordinator; +import org.apache.druid.indexing.overlord.TaskLockbox; +import org.apache.druid.indexing.overlord.TaskStorage; +import org.apache.druid.indexing.overlord.supervisor.SupervisorManager; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; public class TaskActionToolbox { diff --git a/indexing-service/src/main/java/io/druid/indexing/common/config/FileTaskLogsConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/config/FileTaskLogsConfig.java similarity index 96% rename from indexing-service/src/main/java/io/druid/indexing/common/config/FileTaskLogsConfig.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/config/FileTaskLogsConfig.java index 90c107aff7af..d6619b810c5c 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/config/FileTaskLogsConfig.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/config/FileTaskLogsConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common.config; +package org.apache.druid.indexing.common.config; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/config/TaskConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/config/TaskConfig.java similarity index 99% rename from indexing-service/src/main/java/io/druid/indexing/common/config/TaskConfig.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/config/TaskConfig.java index 9f1646e4f6f1..94a7c7d75724 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/config/TaskConfig.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/config/TaskConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common.config; +package org.apache.druid.indexing.common.config; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/config/TaskStorageConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/config/TaskStorageConfig.java similarity index 96% rename from indexing-service/src/main/java/io/druid/indexing/common/config/TaskStorageConfig.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/config/TaskStorageConfig.java index cd96f666405c..6e56dd26eb06 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/config/TaskStorageConfig.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/config/TaskStorageConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common.config; +package org.apache.druid.indexing.common.config; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/index/RealtimeAppenderatorIngestionSpec.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/index/RealtimeAppenderatorIngestionSpec.java similarity index 86% rename from indexing-service/src/main/java/io/druid/indexing/common/index/RealtimeAppenderatorIngestionSpec.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/index/RealtimeAppenderatorIngestionSpec.java index 1aa5d491bb64..9e64e1a9839c 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/index/RealtimeAppenderatorIngestionSpec.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/index/RealtimeAppenderatorIngestionSpec.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.indexing.common.index; +package org.apache.druid.indexing.common.index; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.IngestionSpec; -import io.druid.segment.indexing.RealtimeIOConfig; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.IngestionSpec; +import org.apache.druid.segment.indexing.RealtimeIOConfig; public class RealtimeAppenderatorIngestionSpec extends IngestionSpec { diff --git a/indexing-service/src/main/java/io/druid/indexing/common/index/RealtimeAppenderatorTuningConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/index/RealtimeAppenderatorTuningConfig.java similarity index 94% rename from indexing-service/src/main/java/io/druid/indexing/common/index/RealtimeAppenderatorTuningConfig.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/index/RealtimeAppenderatorTuningConfig.java index e8be825e8ed2..500f21f13e34 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/index/RealtimeAppenderatorTuningConfig.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/index/RealtimeAppenderatorTuningConfig.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.indexing.common.index; +package org.apache.druid.indexing.common.index; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.base.Preconditions; import com.google.common.io.Files; -import io.druid.segment.IndexSpec; -import io.druid.segment.indexing.TuningConfig; -import io.druid.segment.realtime.appenderator.AppenderatorConfig; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; -import io.druid.timeline.partition.NoneShardSpec; -import io.druid.timeline.partition.ShardSpec; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.indexing.TuningConfig; +import org.apache.druid.segment.realtime.appenderator.AppenderatorConfig; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.timeline.partition.ShardSpec; import org.joda.time.Period; import javax.annotation.Nullable; @@ -92,7 +92,7 @@ public RealtimeAppenderatorTuningConfig( this.maxRowsInMemory = maxRowsInMemory == null ? defaultMaxRowsInMemory : maxRowsInMemory; this.maxRowsPerSegment = maxRowsPerSegment == null ? defaultMaxRowsPerSegment : maxRowsPerSegment; // initializing this to 0, it will be lazily intialized to a value - // @see server.src.main.java.io.druid.segment.indexing.TuningConfigs#getMaxBytesInMemoryOrDefault(long) + // @see server.src.main.java.org.apache.druid.segment.indexing.TuningConfigs#getMaxBytesInMemoryOrDefault(long) this.maxBytesInMemory = maxBytesInMemory == null ? 0 : maxBytesInMemory; this.intermediatePersistPeriod = intermediatePersistPeriod == null ? defaultIntermediatePersistPeriod diff --git a/indexing-service/src/main/java/io/druid/indexing/common/index/YeOldePlumberSchool.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/index/YeOldePlumberSchool.java similarity index 86% rename from indexing-service/src/main/java/io/druid/indexing/common/index/YeOldePlumberSchool.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/index/YeOldePlumberSchool.java index f9aa34cf870b..8841cf3833c0 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/index/YeOldePlumberSchool.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/index/YeOldePlumberSchool.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common.index; +package org.apache.druid.indexing.common.index; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; @@ -30,28 +30,28 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import io.druid.data.input.Committer; -import io.druid.data.input.InputRow; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.Query; -import io.druid.query.QueryRunner; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMergerV9; -import io.druid.segment.QueryableIndex; -import io.druid.segment.SegmentUtils; -import io.druid.segment.incremental.IncrementalIndexAddResult; -import io.druid.segment.incremental.IndexSizeExceededException; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.RealtimeTuningConfig; -import io.druid.segment.indexing.TuningConfigs; -import io.druid.segment.loading.DataSegmentPusher; -import io.druid.segment.realtime.FireDepartmentMetrics; -import io.druid.segment.realtime.FireHydrant; -import io.druid.segment.realtime.plumber.Plumber; -import io.druid.segment.realtime.plumber.PlumberSchool; -import io.druid.segment.realtime.plumber.Sink; -import io.druid.timeline.DataSegment; +import org.apache.druid.data.input.Committer; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMergerV9; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.SegmentUtils; +import org.apache.druid.segment.incremental.IncrementalIndexAddResult; +import org.apache.druid.segment.incremental.IndexSizeExceededException; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.RealtimeTuningConfig; +import org.apache.druid.segment.indexing.TuningConfigs; +import org.apache.druid.segment.loading.DataSegmentPusher; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.segment.realtime.FireHydrant; +import org.apache.druid.segment.realtime.plumber.Plumber; +import org.apache.druid.segment.realtime.plumber.PlumberSchool; +import org.apache.druid.segment.realtime.plumber.Sink; +import org.apache.druid.timeline.DataSegment; import org.apache.commons.io.FileUtils; import org.joda.time.Interval; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/stats/DropwizardRowIngestionMeters.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/stats/DropwizardRowIngestionMeters.java similarity index 98% rename from indexing-service/src/main/java/io/druid/indexing/common/stats/DropwizardRowIngestionMeters.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/stats/DropwizardRowIngestionMeters.java index ad06578f2dae..ca541cce4ddc 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/stats/DropwizardRowIngestionMeters.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/stats/DropwizardRowIngestionMeters.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common.stats; +package org.apache.druid.indexing.common.stats; import com.codahale.metrics.Meter; import com.codahale.metrics.MetricRegistry; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/stats/DropwizardRowIngestionMetersFactory.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/stats/DropwizardRowIngestionMetersFactory.java similarity index 95% rename from indexing-service/src/main/java/io/druid/indexing/common/stats/DropwizardRowIngestionMetersFactory.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/stats/DropwizardRowIngestionMetersFactory.java index b057fedabd32..d6b9928990d3 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/stats/DropwizardRowIngestionMetersFactory.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/stats/DropwizardRowIngestionMetersFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common.stats; +package org.apache.druid.indexing.common.stats; public class DropwizardRowIngestionMetersFactory implements RowIngestionMetersFactory { diff --git a/indexing-service/src/main/java/io/druid/indexing/common/stats/RowIngestionMeters.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/stats/RowIngestionMeters.java similarity index 94% rename from indexing-service/src/main/java/io/druid/indexing/common/stats/RowIngestionMeters.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/stats/RowIngestionMeters.java index 9e25004d7c17..725a5a2a28d8 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/stats/RowIngestionMeters.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/stats/RowIngestionMeters.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.indexing.common.stats; +package org.apache.druid.indexing.common.stats; -import io.druid.guice.annotations.ExtensionPoint; +import org.apache.druid.guice.annotations.ExtensionPoint; import java.util.Map; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/stats/RowIngestionMetersFactory.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/stats/RowIngestionMetersFactory.java similarity index 94% rename from indexing-service/src/main/java/io/druid/indexing/common/stats/RowIngestionMetersFactory.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/stats/RowIngestionMetersFactory.java index 7ab0f069bded..4035dbe15668 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/stats/RowIngestionMetersFactory.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/stats/RowIngestionMetersFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common.stats; +package org.apache.druid.indexing.common.stats; public interface RowIngestionMetersFactory { diff --git a/indexing-service/src/main/java/io/druid/indexing/common/stats/RowIngestionMetersTotals.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/stats/RowIngestionMetersTotals.java similarity index 97% rename from indexing-service/src/main/java/io/druid/indexing/common/stats/RowIngestionMetersTotals.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/stats/RowIngestionMetersTotals.java index 48980c6e3e8f..e7c8f5c3e823 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/stats/RowIngestionMetersTotals.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/stats/RowIngestionMetersTotals.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common.stats; +package org.apache.druid.indexing.common.stats; import com.amazonaws.thirdparty.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/stats/TaskRealtimeMetricsMonitor.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/stats/TaskRealtimeMetricsMonitor.java similarity index 91% rename from indexing-service/src/main/java/io/druid/indexing/common/stats/TaskRealtimeMetricsMonitor.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/stats/TaskRealtimeMetricsMonitor.java index b7a11e351f51..77fc462f4df2 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/stats/TaskRealtimeMetricsMonitor.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/stats/TaskRealtimeMetricsMonitor.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.indexing.common.stats; +package org.apache.druid.indexing.common.stats; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.java.util.metrics.AbstractMonitor; -import io.druid.java.util.metrics.MonitorUtils; -import io.druid.query.DruidMetrics; -import io.druid.segment.realtime.FireDepartment; -import io.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.metrics.AbstractMonitor; +import org.apache.druid.java.util.metrics.MonitorUtils; +import org.apache.druid.query.DruidMetrics; +import org.apache.druid.segment.realtime.FireDepartment; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; import java.util.Map; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/AbstractFixedIntervalTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractFixedIntervalTask.java similarity index 90% rename from indexing-service/src/main/java/io/druid/indexing/common/task/AbstractFixedIntervalTask.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractFixedIntervalTask.java index 257f3c31ca9d..6959677e7812 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/AbstractFixedIntervalTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractFixedIntervalTask.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.indexing.common.TaskLockType; -import io.druid.indexing.common.actions.LockTryAcquireAction; -import io.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.indexing.common.TaskLockType; +import org.apache.druid.indexing.common.actions.LockTryAcquireAction; +import org.apache.druid.indexing.common.actions.TaskActionClient; import org.joda.time.Interval; import java.util.Map; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/AbstractTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractTask.java similarity index 92% rename from indexing-service/src/main/java/io/druid/indexing/common/task/AbstractTask.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractTask.java index e5f9eb379a39..cac4e5ab4afa 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/AbstractTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractTask.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Joiner; import com.google.common.base.Objects; import com.google.common.base.Preconditions; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskLock; -import io.druid.indexing.common.actions.LockListAction; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.java.util.common.DateTimes; -import io.druid.query.Query; -import io.druid.query.QueryRunner; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexing.common.actions.LockListAction; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryRunner; import org.joda.time.Interval; import javax.annotation.Nullable; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/AppendTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AppendTask.java similarity index 86% rename from indexing-service/src/main/java/io/druid/indexing/common/task/AppendTask.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/AppendTask.java index af3bfd8f540b..a243d5c9798f 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/AppendTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AppendTask.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -25,20 +25,20 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import io.druid.indexing.common.TaskToolbox; -import io.druid.java.util.common.Intervals; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.segment.IndexMerger; -import io.druid.segment.IndexSpec; -import io.druid.segment.IndexableAdapter; -import io.druid.segment.QueryableIndexIndexableAdapter; -import io.druid.segment.RowFilteringIndexAdapter; -import io.druid.segment.RowPointer; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; -import io.druid.timeline.DataSegment; -import io.druid.timeline.TimelineObjectHolder; -import io.druid.timeline.VersionedIntervalTimeline; -import io.druid.timeline.partition.PartitionChunk; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.segment.IndexMerger; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.IndexableAdapter; +import org.apache.druid.segment.QueryableIndexIndexableAdapter; +import org.apache.druid.segment.RowFilteringIndexAdapter; +import org.apache.druid.segment.RowPointer; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.TimelineObjectHolder; +import org.apache.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.timeline.partition.PartitionChunk; import org.joda.time.Interval; import javax.annotation.Nullable; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/AppenderatorDriverRealtimeIndexTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AppenderatorDriverRealtimeIndexTask.java similarity index 86% rename from indexing-service/src/main/java/io/druid/indexing/common/task/AppenderatorDriverRealtimeIndexTask.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/AppenderatorDriverRealtimeIndexTask.java index c04d7df646b3..49a9333567ee 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/AppenderatorDriverRealtimeIndexTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AppenderatorDriverRealtimeIndexTask.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; @@ -31,59 +31,59 @@ import com.google.common.collect.Maps; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.data.input.Committer; -import io.druid.data.input.Firehose; -import io.druid.data.input.FirehoseFactory; -import io.druid.data.input.InputRow; -import io.druid.discovery.DiscoveryDruidNode; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.discovery.LookupNodeService; -import io.druid.indexer.IngestionState; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.appenderator.ActionBasedSegmentAllocator; -import io.druid.indexing.appenderator.ActionBasedUsedSegmentChecker; -import io.druid.indexing.common.IngestionStatsAndErrorsTaskReport; -import io.druid.indexing.common.IngestionStatsAndErrorsTaskReportData; -import io.druid.indexing.common.TaskRealtimeMetricsMonitorBuilder; -import io.druid.indexing.common.TaskReport; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.actions.SegmentAllocateAction; -import io.druid.indexing.common.actions.SegmentTransactionalInsertAction; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.indexing.common.index.RealtimeAppenderatorIngestionSpec; -import io.druid.indexing.common.index.RealtimeAppenderatorTuningConfig; -import io.druid.indexing.common.stats.RowIngestionMeters; -import io.druid.indexing.common.stats.RowIngestionMetersFactory; -import io.druid.indexing.common.stats.TaskRealtimeMetricsMonitor; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.ListenableFutures; -import io.druid.java.util.common.guava.CloseQuietly; -import io.druid.java.util.common.parsers.ParseException; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.query.NoopQueryRunner; -import io.druid.query.Query; -import io.druid.query.QueryRunner; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.RealtimeIOConfig; -import io.druid.segment.realtime.FireDepartment; -import io.druid.segment.realtime.FireDepartmentMetrics; -import io.druid.segment.realtime.appenderator.Appenderator; -import io.druid.segment.realtime.appenderator.AppenderatorDriverAddResult; -import io.druid.segment.realtime.appenderator.Appenderators; -import io.druid.segment.realtime.appenderator.SegmentsAndMetadata; -import io.druid.segment.realtime.appenderator.StreamAppenderatorDriver; -import io.druid.segment.realtime.appenderator.TransactionalSegmentPublisher; -import io.druid.segment.realtime.firehose.ChatHandler; -import io.druid.segment.realtime.firehose.ChatHandlerProvider; -import io.druid.segment.realtime.firehose.ClippedFirehoseFactory; -import io.druid.segment.realtime.firehose.EventReceiverFirehoseFactory; -import io.druid.segment.realtime.firehose.TimedShutoffFirehoseFactory; -import io.druid.segment.realtime.plumber.Committers; -import io.druid.server.security.Action; -import io.druid.server.security.AuthorizerMapper; -import io.druid.utils.CircularBuffer; +import org.apache.druid.data.input.Committer; +import org.apache.druid.data.input.Firehose; +import org.apache.druid.data.input.FirehoseFactory; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.discovery.DiscoveryDruidNode; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.discovery.LookupNodeService; +import org.apache.druid.indexer.IngestionState; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.appenderator.ActionBasedSegmentAllocator; +import org.apache.druid.indexing.appenderator.ActionBasedUsedSegmentChecker; +import org.apache.druid.indexing.common.IngestionStatsAndErrorsTaskReport; +import org.apache.druid.indexing.common.IngestionStatsAndErrorsTaskReportData; +import org.apache.druid.indexing.common.TaskRealtimeMetricsMonitorBuilder; +import org.apache.druid.indexing.common.TaskReport; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.actions.SegmentAllocateAction; +import org.apache.druid.indexing.common.actions.SegmentTransactionalInsertAction; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.indexing.common.index.RealtimeAppenderatorIngestionSpec; +import org.apache.druid.indexing.common.index.RealtimeAppenderatorTuningConfig; +import org.apache.druid.indexing.common.stats.RowIngestionMeters; +import org.apache.druid.indexing.common.stats.RowIngestionMetersFactory; +import org.apache.druid.indexing.common.stats.TaskRealtimeMetricsMonitor; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.ListenableFutures; +import org.apache.druid.java.util.common.guava.CloseQuietly; +import org.apache.druid.java.util.common.parsers.ParseException; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.query.NoopQueryRunner; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.RealtimeIOConfig; +import org.apache.druid.segment.realtime.FireDepartment; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.segment.realtime.appenderator.Appenderator; +import org.apache.druid.segment.realtime.appenderator.AppenderatorDriverAddResult; +import org.apache.druid.segment.realtime.appenderator.Appenderators; +import org.apache.druid.segment.realtime.appenderator.SegmentsAndMetadata; +import org.apache.druid.segment.realtime.appenderator.StreamAppenderatorDriver; +import org.apache.druid.segment.realtime.appenderator.TransactionalSegmentPublisher; +import org.apache.druid.segment.realtime.firehose.ChatHandler; +import org.apache.druid.segment.realtime.firehose.ChatHandlerProvider; +import org.apache.druid.segment.realtime.firehose.ClippedFirehoseFactory; +import org.apache.druid.segment.realtime.firehose.EventReceiverFirehoseFactory; +import org.apache.druid.segment.realtime.firehose.TimedShutoffFirehoseFactory; +import org.apache.druid.segment.realtime.plumber.Committers; +import org.apache.druid.server.security.Action; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.utils.CircularBuffer; import org.apache.commons.io.FileUtils; import javax.servlet.http.HttpServletRequest; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/ArchiveTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/ArchiveTask.java similarity index 87% rename from indexing-service/src/main/java/io/druid/indexing/common/task/ArchiveTask.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/ArchiveTask.java index 149a7a1591c1..1196c7fa4847 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/ArchiveTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/ArchiveTask.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; -import io.druid.indexing.common.TaskLock; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.actions.SegmentListUnusedAction; -import io.druid.indexing.common.actions.SegmentMetadataUpdateAction; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.logger.Logger; -import io.druid.timeline.DataSegment; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.actions.SegmentListUnusedAction; +import org.apache.druid.indexing.common.actions.SegmentMetadataUpdateAction; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import java.util.List; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/ClientBasedTaskInfoProvider.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/ClientBasedTaskInfoProvider.java similarity index 83% rename from indexing-service/src/main/java/io/druid/indexing/common/task/ClientBasedTaskInfoProvider.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/ClientBasedTaskInfoProvider.java index 243a7ad06d40..f80163037fa4 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/ClientBasedTaskInfoProvider.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/ClientBasedTaskInfoProvider.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.google.common.base.Optional; import com.google.inject.Inject; -import io.druid.client.indexing.IndexingServiceClient; -import io.druid.client.indexing.TaskStatusResponse; -import io.druid.indexer.TaskLocation; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskInfoProvider; +import org.apache.druid.client.indexing.IndexingServiceClient; +import org.apache.druid.client.indexing.TaskStatusResponse; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskInfoProvider; public class ClientBasedTaskInfoProvider implements TaskInfoProvider { diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/CompactionTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/CompactionTask.java similarity index 88% rename from indexing-service/src/main/java/io/druid/indexing/common/task/CompactionTask.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/CompactionTask.java index 9f1fb5671305..ea1186aa3a76 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/CompactionTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/CompactionTask.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; @@ -29,51 +29,51 @@ import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import com.google.common.collect.Lists; -import io.druid.data.input.impl.DimensionSchema; -import io.druid.data.input.impl.DimensionSchema.MultiValueHandling; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.DoubleDimensionSchema; -import io.druid.data.input.impl.FloatDimensionSchema; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.LongDimensionSchema; -import io.druid.data.input.impl.NoopInputRowParser; -import io.druid.data.input.impl.StringDimensionSchema; -import io.druid.data.input.impl.TimeAndDimsParseSpec; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.actions.SegmentListUsedAction; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.indexing.common.stats.RowIngestionMetersFactory; -import io.druid.indexing.common.task.IndexTask.IndexIOConfig; -import io.druid.indexing.common.task.IndexTask.IndexIngestionSpec; -import io.druid.indexing.common.task.IndexTask.IndexTuningConfig; -import io.druid.indexing.firehose.IngestSegmentFirehoseFactory; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.JodaUtils; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.RE; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.Comparators; -import io.druid.java.util.common.jackson.JacksonUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.segment.DimensionHandler; -import io.druid.segment.IndexIO; -import io.druid.segment.QueryableIndex; -import io.druid.segment.column.Column; -import io.druid.segment.column.ValueType; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.granularity.ArbitraryGranularitySpec; -import io.druid.segment.indexing.granularity.GranularitySpec; -import io.druid.segment.loading.SegmentLoadingException; -import io.druid.segment.realtime.firehose.ChatHandlerProvider; -import io.druid.server.security.AuthorizerMapper; -import io.druid.timeline.DataSegment; -import io.druid.timeline.TimelineObjectHolder; -import io.druid.timeline.VersionedIntervalTimeline; -import io.druid.timeline.partition.PartitionChunk; -import io.druid.timeline.partition.PartitionHolder; +import org.apache.druid.data.input.impl.DimensionSchema; +import org.apache.druid.data.input.impl.DimensionSchema.MultiValueHandling; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.DoubleDimensionSchema; +import org.apache.druid.data.input.impl.FloatDimensionSchema; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.LongDimensionSchema; +import org.apache.druid.data.input.impl.NoopInputRowParser; +import org.apache.druid.data.input.impl.StringDimensionSchema; +import org.apache.druid.data.input.impl.TimeAndDimsParseSpec; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.actions.SegmentListUsedAction; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.indexing.common.stats.RowIngestionMetersFactory; +import org.apache.druid.indexing.common.task.IndexTask.IndexIOConfig; +import org.apache.druid.indexing.common.task.IndexTask.IndexIngestionSpec; +import org.apache.druid.indexing.common.task.IndexTask.IndexTuningConfig; +import org.apache.druid.indexing.firehose.IngestSegmentFirehoseFactory; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.JodaUtils; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.segment.DimensionHandler; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.granularity.ArbitraryGranularitySpec; +import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.segment.realtime.firehose.ChatHandlerProvider; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.TimelineObjectHolder; +import org.apache.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.timeline.partition.PartitionChunk; +import org.apache.druid.timeline.partition.PartitionHolder; import org.joda.time.Interval; import javax.annotation.Nullable; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/ConvertSegmentBackwardsCompatibleTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/ConvertSegmentBackwardsCompatibleTask.java similarity index 92% rename from indexing-service/src/main/java/io/druid/indexing/common/task/ConvertSegmentBackwardsCompatibleTask.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/ConvertSegmentBackwardsCompatibleTask.java index c8bfda9a54d0..7a506e2c5c56 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/ConvertSegmentBackwardsCompatibleTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/ConvertSegmentBackwardsCompatibleTask.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; -import io.druid.segment.IndexSpec; -import io.druid.timeline.DataSegment; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import javax.annotation.Nullable; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/ConvertSegmentTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/ConvertSegmentTask.java similarity index 94% rename from indexing-service/src/main/java/io/druid/indexing/common/task/ConvertSegmentTask.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/ConvertSegmentTask.java index d515854eb60e..f9dfeeaf0a8e 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/ConvertSegmentTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/ConvertSegmentTask.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -27,20 +27,20 @@ import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.actions.SegmentInsertAction; -import io.druid.indexing.common.actions.SegmentListUsedAction; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.guava.FunctionalIterable; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexSpec; -import io.druid.segment.loading.SegmentLoadingException; -import io.druid.timeline.DataSegment; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.actions.SegmentInsertAction; +import org.apache.druid.indexing.common.actions.SegmentListUsedAction; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.guava.FunctionalIterable; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import javax.annotation.Nullable; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/HadoopConverterTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopConverterTask.java similarity index 92% rename from indexing-service/src/main/java/io/druid/indexing/common/task/HadoopConverterTask.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopConverterTask.java index a53c6d4cf483..7fd5dd1dbdc0 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/HadoopConverterTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopConverterTask.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -26,16 +26,16 @@ import com.google.common.base.Preconditions; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; -import io.druid.indexer.updater.HadoopConverterJob; -import io.druid.indexer.updater.HadoopDruidConverterConfig; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.java.util.common.UOE; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.IndexSpec; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; -import io.druid.timeline.DataSegment; +import org.apache.druid.indexer.updater.HadoopConverterJob; +import org.apache.druid.indexer.updater.HadoopDruidConverterConfig; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.java.util.common.UOE; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import javax.annotation.Nullable; @@ -239,7 +239,7 @@ public TaskStatus run(TaskToolbox toolbox) throws Exception ); final String finishedSegmentString = invokeForeignLoader( - "io.druid.indexing.common.task.HadoopConverterTask$JobInvoker", + "org.apache.druid.indexing.common.task.HadoopConverterTask$JobInvoker", new String[]{HadoopDruidConverterConfig.jsonMapper.writeValueAsString(config)}, loader ); diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/HadoopIndexTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopIndexTask.java similarity index 92% rename from indexing-service/src/main/java/io/druid/indexing/common/task/HadoopIndexTask.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopIndexTask.java index 3982806cc7f2..96861a94c2ad 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/HadoopIndexTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopIndexTask.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; @@ -31,35 +31,35 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; -import io.druid.indexer.HadoopDruidDetermineConfigurationJob; -import io.druid.indexer.HadoopDruidIndexerConfig; -import io.druid.indexer.HadoopDruidIndexerJob; -import io.druid.indexer.HadoopIngestionSpec; -import io.druid.indexer.IngestionState; -import io.druid.indexer.MetadataStorageUpdaterJobHandler; -import io.druid.indexer.TaskMetricsGetter; -import io.druid.indexer.TaskMetricsUtils; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.IngestionStatsAndErrorsTaskReport; -import io.druid.indexing.common.IngestionStatsAndErrorsTaskReportData; -import io.druid.indexing.common.TaskLock; -import io.druid.indexing.common.TaskLockType; -import io.druid.indexing.common.TaskReport; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.actions.LockAcquireAction; -import io.druid.indexing.common.actions.LockTryAcquireAction; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.indexing.common.stats.RowIngestionMeters; -import io.druid.indexing.hadoop.OverlordActionBasedUsedSegmentLister; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.JodaUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.realtime.firehose.ChatHandler; -import io.druid.segment.realtime.firehose.ChatHandlerProvider; -import io.druid.server.security.Action; -import io.druid.server.security.AuthorizerMapper; -import io.druid.timeline.DataSegment; +import org.apache.druid.indexer.HadoopDruidDetermineConfigurationJob; +import org.apache.druid.indexer.HadoopDruidIndexerConfig; +import org.apache.druid.indexer.HadoopDruidIndexerJob; +import org.apache.druid.indexer.HadoopIngestionSpec; +import org.apache.druid.indexer.IngestionState; +import org.apache.druid.indexer.MetadataStorageUpdaterJobHandler; +import org.apache.druid.indexer.TaskMetricsGetter; +import org.apache.druid.indexer.TaskMetricsUtils; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.IngestionStatsAndErrorsTaskReport; +import org.apache.druid.indexing.common.IngestionStatsAndErrorsTaskReportData; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexing.common.TaskLockType; +import org.apache.druid.indexing.common.TaskReport; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.actions.LockAcquireAction; +import org.apache.druid.indexing.common.actions.LockTryAcquireAction; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.indexing.common.stats.RowIngestionMeters; +import org.apache.druid.indexing.hadoop.OverlordActionBasedUsedSegmentLister; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.JodaUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.realtime.firehose.ChatHandler; +import org.apache.druid.segment.realtime.firehose.ChatHandlerProvider; +import org.apache.druid.server.security.Action; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import javax.servlet.http.HttpServletRequest; @@ -269,7 +269,7 @@ private TaskStatus runInternal(TaskToolbox toolbox) throws Exception ); Object determinePartitionsInnerProcessingRunner = getForeignClassloaderObject( - "io.druid.indexing.common.task.HadoopIndexTask$HadoopDetermineConfigInnerProcessingRunner", + "org.apache.druid.indexing.common.task.HadoopIndexTask$HadoopDetermineConfigInnerProcessingRunner", loader ); determinePartitionsStatsGetter = new InnerProcessingStatsGetter(determinePartitionsInnerProcessingRunner); @@ -360,7 +360,7 @@ private TaskStatus runInternal(TaskToolbox toolbox) throws Exception log.info("Setting version to: %s", version); Object innerProcessingRunner = getForeignClassloaderObject( - "io.druid.indexing.common.task.HadoopIndexTask$HadoopIndexGeneratorInnerProcessingRunner", + "org.apache.druid.indexing.common.task.HadoopIndexTask$HadoopIndexGeneratorInnerProcessingRunner", loader ); buildSegmentsStatsGetter = new InnerProcessingStatsGetter(innerProcessingRunner); diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/HadoopTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopTask.java similarity index 95% rename from indexing-service/src/main/java/io/druid/indexing/common/task/HadoopTask.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopTask.java index 0d5b57fd6835..3e9de7ff2bc8 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/HadoopTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopTask.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.google.common.base.Joiner; import com.google.common.base.Predicate; @@ -25,11 +25,11 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.inject.Injector; -import io.druid.guice.ExtensionsConfig; -import io.druid.guice.GuiceInjectors; -import io.druid.indexing.common.TaskToolbox; -import io.druid.initialization.Initialization; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.guice.ExtensionsConfig; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.java.util.common.logger.Logger; import javax.annotation.Nullable; import java.io.File; @@ -120,7 +120,7 @@ public boolean apply(@Nullable URL input) * * As such, the current approach is to make a list of URLs for a URLClassLoader based on the priority above, and use * THAT ClassLoader with a null parent as the isolated loader for running hadoop or hadoop-like driver tasks. - * Such an approach combined with reasonable exclusions in io.druid.cli.PullDependencies#exclusions tries to maintain + * Such an approach combined with reasonable exclusions in org.apache.druid.cli.PullDependencies#exclusions tries to maintain * sanity in a ClassLoader where all jars (which are isolated by extension ClassLoaders in the Druid framework) are * jumbled together into one ClassLoader for Hadoop and Hadoop-like tasks (Spark for example). * diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/IndexTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTask.java similarity index 93% rename from indexing-service/src/main/java/io/druid/indexing/common/task/IndexTask.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTask.java index 4b14f68e461f..788dc852a4a5 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/IndexTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTask.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; @@ -35,67 +35,67 @@ import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.data.input.Firehose; -import io.druid.data.input.FirehoseFactory; -import io.druid.data.input.InputRow; -import io.druid.data.input.Rows; -import io.druid.hll.HyperLogLogCollector; -import io.druid.indexer.IngestionState; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.appenderator.ActionBasedSegmentAllocator; -import io.druid.indexing.appenderator.ActionBasedUsedSegmentChecker; -import io.druid.indexing.common.IngestionStatsAndErrorsTaskReport; -import io.druid.indexing.common.IngestionStatsAndErrorsTaskReportData; -import io.druid.indexing.common.TaskLock; -import io.druid.indexing.common.TaskRealtimeMetricsMonitorBuilder; -import io.druid.indexing.common.TaskReport; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.actions.SegmentAllocateAction; -import io.druid.indexing.common.actions.SegmentTransactionalInsertAction; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.indexing.common.stats.RowIngestionMeters; -import io.druid.indexing.common.stats.RowIngestionMetersFactory; -import io.druid.indexing.common.stats.TaskRealtimeMetricsMonitor; -import io.druid.indexing.firehose.IngestSegmentFirehoseFactory; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.JodaUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.Comparators; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.common.parsers.ParseException; -import io.druid.segment.IndexSpec; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.IOConfig; -import io.druid.segment.indexing.IngestionSpec; -import io.druid.segment.indexing.RealtimeIOConfig; -import io.druid.segment.indexing.TuningConfig; -import io.druid.segment.indexing.granularity.GranularitySpec; -import io.druid.segment.realtime.FireDepartment; -import io.druid.segment.realtime.FireDepartmentMetrics; -import io.druid.segment.realtime.appenderator.Appenderator; -import io.druid.segment.realtime.appenderator.AppenderatorConfig; -import io.druid.segment.realtime.appenderator.AppenderatorDriverAddResult; -import io.druid.segment.realtime.appenderator.Appenderators; -import io.druid.segment.realtime.appenderator.BaseAppenderatorDriver; -import io.druid.segment.realtime.appenderator.BatchAppenderatorDriver; -import io.druid.segment.realtime.appenderator.SegmentAllocator; -import io.druid.segment.realtime.appenderator.SegmentIdentifier; -import io.druid.segment.realtime.appenderator.SegmentsAndMetadata; -import io.druid.segment.realtime.appenderator.TransactionalSegmentPublisher; -import io.druid.segment.realtime.firehose.ChatHandler; -import io.druid.segment.realtime.firehose.ChatHandlerProvider; -import io.druid.segment.realtime.firehose.CombiningFirehoseFactory; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; -import io.druid.server.security.Action; -import io.druid.server.security.AuthorizerMapper; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.HashBasedNumberedShardSpec; -import io.druid.timeline.partition.NoneShardSpec; -import io.druid.timeline.partition.NumberedShardSpec; -import io.druid.timeline.partition.ShardSpec; -import io.druid.utils.CircularBuffer; +import org.apache.druid.data.input.Firehose; +import org.apache.druid.data.input.FirehoseFactory; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.Rows; +import org.apache.druid.hll.HyperLogLogCollector; +import org.apache.druid.indexer.IngestionState; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.appenderator.ActionBasedSegmentAllocator; +import org.apache.druid.indexing.appenderator.ActionBasedUsedSegmentChecker; +import org.apache.druid.indexing.common.IngestionStatsAndErrorsTaskReport; +import org.apache.druid.indexing.common.IngestionStatsAndErrorsTaskReportData; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexing.common.TaskRealtimeMetricsMonitorBuilder; +import org.apache.druid.indexing.common.TaskReport; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.actions.SegmentAllocateAction; +import org.apache.druid.indexing.common.actions.SegmentTransactionalInsertAction; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.indexing.common.stats.RowIngestionMeters; +import org.apache.druid.indexing.common.stats.RowIngestionMetersFactory; +import org.apache.druid.indexing.common.stats.TaskRealtimeMetricsMonitor; +import org.apache.druid.indexing.firehose.IngestSegmentFirehoseFactory; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.JodaUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.parsers.ParseException; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.IOConfig; +import org.apache.druid.segment.indexing.IngestionSpec; +import org.apache.druid.segment.indexing.RealtimeIOConfig; +import org.apache.druid.segment.indexing.TuningConfig; +import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.segment.realtime.FireDepartment; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.segment.realtime.appenderator.Appenderator; +import org.apache.druid.segment.realtime.appenderator.AppenderatorConfig; +import org.apache.druid.segment.realtime.appenderator.AppenderatorDriverAddResult; +import org.apache.druid.segment.realtime.appenderator.Appenderators; +import org.apache.druid.segment.realtime.appenderator.BaseAppenderatorDriver; +import org.apache.druid.segment.realtime.appenderator.BatchAppenderatorDriver; +import org.apache.druid.segment.realtime.appenderator.SegmentAllocator; +import org.apache.druid.segment.realtime.appenderator.SegmentIdentifier; +import org.apache.druid.segment.realtime.appenderator.SegmentsAndMetadata; +import org.apache.druid.segment.realtime.appenderator.TransactionalSegmentPublisher; +import org.apache.druid.segment.realtime.firehose.ChatHandler; +import org.apache.druid.segment.realtime.firehose.ChatHandlerProvider; +import org.apache.druid.segment.realtime.firehose.CombiningFirehoseFactory; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.server.security.Action; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.HashBasedNumberedShardSpec; +import org.apache.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.timeline.partition.NumberedShardSpec; +import org.apache.druid.timeline.partition.ShardSpec; +import org.apache.druid.utils.CircularBuffer; import org.codehaus.plexus.util.FileUtils; import org.joda.time.DateTime; import org.joda.time.Interval; @@ -1388,7 +1388,7 @@ private IndexTuningConfig( this.targetPartitionSize = initializeTargetPartitionSize(numShards, targetPartitionSize); this.maxRowsInMemory = maxRowsInMemory == null ? TuningConfig.DEFAULT_MAX_ROWS_IN_MEMORY : maxRowsInMemory; // initializing this to 0, it will be lazily initialized to a value - // @see server.src.main.java.io.druid.segment.indexing.TuningConfigs#getMaxBytesInMemoryOrDefault(long) + // @see server.src.main.java.org.apache.druid.segment.indexing.TuningConfigs#getMaxBytesInMemoryOrDefault(long) this.maxBytesInMemory = maxBytesInMemory == null ? 0 : maxBytesInMemory; this.maxTotalRows = initializeMaxTotalRows(numShards, maxTotalRows); this.numShards = numShards == null || numShards.equals(-1) ? null : numShards; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/IndexTaskClientFactory.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTaskClientFactory.java similarity index 86% rename from indexing-service/src/main/java/io/druid/indexing/common/task/IndexTaskClientFactory.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTaskClientFactory.java index 54b0c3272268..5dbad6c4e27c 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/IndexTaskClientFactory.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTaskClientFactory.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; -import io.druid.indexing.common.IndexTaskClient; -import io.druid.indexing.common.TaskInfoProvider; +import org.apache.druid.indexing.common.IndexTaskClient; +import org.apache.druid.indexing.common.TaskInfoProvider; import org.joda.time.Duration; public interface IndexTaskClientFactory diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/IndexTaskUtils.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTaskUtils.java similarity index 79% rename from indexing-service/src/main/java/io/druid/indexing/common/task/IndexTaskUtils.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTaskUtils.java index 41273724f7fa..740ca20368b0 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/IndexTaskUtils.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTaskUtils.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; -import io.druid.indexer.TaskStatus; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.query.DruidMetrics; -import io.druid.server.security.Access; -import io.druid.server.security.Action; -import io.druid.server.security.AuthorizationUtils; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.ForbiddenException; -import io.druid.server.security.Resource; -import io.druid.server.security.ResourceAction; -import io.druid.server.security.ResourceType; -import io.druid.utils.CircularBuffer; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.query.DruidMetrics; +import org.apache.druid.server.security.Access; +import org.apache.druid.server.security.Action; +import org.apache.druid.server.security.AuthorizationUtils; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.ForbiddenException; +import org.apache.druid.server.security.Resource; +import org.apache.druid.server.security.ResourceAction; +import org.apache.druid.server.security.ResourceType; +import org.apache.druid.utils.CircularBuffer; import javax.annotation.Nullable; import javax.servlet.http.HttpServletRequest; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/KillTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/KillTask.java similarity index 87% rename from indexing-service/src/main/java/io/druid/indexing/common/task/KillTask.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/KillTask.java index fb11792feff8..cb723800d22b 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/KillTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/KillTask.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; -import io.druid.indexing.common.TaskLock; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.actions.SegmentListUnusedAction; -import io.druid.indexing.common.actions.SegmentNukeAction; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.logger.Logger; -import io.druid.timeline.DataSegment; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.actions.SegmentListUnusedAction; +import org.apache.druid.indexing.common.actions.SegmentNukeAction; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import java.util.List; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/MergeTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/MergeTask.java similarity index 90% rename from indexing-service/src/main/java/io/druid/indexing/common/task/MergeTask.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/MergeTask.java index 0741e1d3bea5..c57f16f27ee9 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/MergeTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/MergeTask.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -27,13 +27,13 @@ import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.druid.indexing.common.TaskToolbox; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.segment.IndexMerger; -import io.druid.segment.IndexSpec; -import io.druid.segment.QueryableIndex; -import io.druid.timeline.DataSegment; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.segment.IndexMerger; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.timeline.DataSegment; import javax.annotation.Nullable; import java.io.File; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/MergeTaskBase.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/MergeTaskBase.java similarity index 92% rename from indexing-service/src/main/java/io/druid/indexing/common/task/MergeTaskBase.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/MergeTaskBase.java index b1f386c0bc91..be15b4d42aaa 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/MergeTaskBase.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/MergeTaskBase.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; @@ -33,21 +33,21 @@ import com.google.common.collect.Ordering; import com.google.common.collect.Sets; import com.google.common.hash.Hashing; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskLock; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.actions.SegmentListUsedAction; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.segment.IndexIO; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.actions.SegmentListUsedAction; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/MoveTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/MoveTask.java similarity index 86% rename from indexing-service/src/main/java/io/druid/indexing/common/task/MoveTask.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/MoveTask.java index 3cb264a22ec7..ccb1dc07253b 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/MoveTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/MoveTask.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; -import io.druid.indexing.common.TaskLock; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.actions.SegmentListUnusedAction; -import io.druid.indexing.common.actions.SegmentMetadataUpdateAction; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.logger.Logger; -import io.druid.timeline.DataSegment; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.actions.SegmentListUnusedAction; +import org.apache.druid.indexing.common.actions.SegmentMetadataUpdateAction; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import java.util.List; @@ -50,7 +50,7 @@ public MoveTask( @JsonProperty("interval") Interval interval, @JsonProperty("target") Map targetLoadSpec, @JsonProperty("context") Map context, - // See https://github.com/druid-io/druid/pull/1922 + // See https://github.com/apache/incubator-druid/pull/1922 @JsonProperty("targetLoadSpec") Map targetLoadSpecCOMPAT ) { diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/NoopTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/NoopTask.java similarity index 90% rename from indexing-service/src/main/java/io/druid/indexing/common/task/NoopTask.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/NoopTask.java index e704d6aa0662..cc9ed629be31 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/NoopTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/NoopTask.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; -import io.druid.data.input.Firehose; -import io.druid.data.input.FirehoseFactory; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -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.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; import java.util.Map; import java.util.UUID; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/RealtimeIndexTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/RealtimeIndexTask.java similarity index 88% rename from indexing-service/src/main/java/io/druid/indexing/common/task/RealtimeIndexTask.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/RealtimeIndexTask.java index c3746049e14b..05770b41be69 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/RealtimeIndexTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/RealtimeIndexTask.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -27,48 +27,48 @@ import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.data.input.Committer; -import io.druid.data.input.Firehose; -import io.druid.data.input.FirehoseFactory; -import io.druid.discovery.DiscoveryDruidNode; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.discovery.LookupNodeService; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskLock; -import io.druid.indexing.common.TaskLockType; -import io.druid.indexing.common.TaskRealtimeMetricsMonitorBuilder; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.actions.LockAcquireAction; -import io.druid.indexing.common.actions.LockReleaseAction; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.guava.CloseQuietly; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.query.FinalizeResultsQueryRunner; -import io.druid.query.Query; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryRunnerFactoryConglomerate; -import io.druid.query.QueryToolChest; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.RealtimeIOConfig; -import io.druid.segment.indexing.RealtimeTuningConfig; -import io.druid.segment.realtime.FireDepartment; -import io.druid.segment.realtime.FireDepartmentMetrics; -import io.druid.segment.realtime.RealtimeMetricsMonitor; -import io.druid.segment.realtime.SegmentPublisher; -import io.druid.segment.realtime.firehose.ClippedFirehoseFactory; -import io.druid.segment.realtime.firehose.EventReceiverFirehoseFactory; -import io.druid.segment.realtime.firehose.TimedShutoffFirehoseFactory; -import io.druid.segment.realtime.plumber.Committers; -import io.druid.segment.realtime.plumber.Plumber; -import io.druid.segment.realtime.plumber.PlumberSchool; -import io.druid.segment.realtime.plumber.Plumbers; -import io.druid.segment.realtime.plumber.RealtimePlumberSchool; -import io.druid.segment.realtime.plumber.VersioningPolicy; -import io.druid.server.coordination.DataSegmentAnnouncer; -import io.druid.timeline.DataSegment; +import org.apache.druid.data.input.Committer; +import org.apache.druid.data.input.Firehose; +import org.apache.druid.data.input.FirehoseFactory; +import org.apache.druid.discovery.DiscoveryDruidNode; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.discovery.LookupNodeService; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexing.common.TaskLockType; +import org.apache.druid.indexing.common.TaskRealtimeMetricsMonitorBuilder; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.actions.LockAcquireAction; +import org.apache.druid.indexing.common.actions.LockReleaseAction; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.guava.CloseQuietly; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.query.FinalizeResultsQueryRunner; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryRunnerFactoryConglomerate; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.RealtimeIOConfig; +import org.apache.druid.segment.indexing.RealtimeTuningConfig; +import org.apache.druid.segment.realtime.FireDepartment; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.segment.realtime.RealtimeMetricsMonitor; +import org.apache.druid.segment.realtime.SegmentPublisher; +import org.apache.druid.segment.realtime.firehose.ClippedFirehoseFactory; +import org.apache.druid.segment.realtime.firehose.EventReceiverFirehoseFactory; +import org.apache.druid.segment.realtime.firehose.TimedShutoffFirehoseFactory; +import org.apache.druid.segment.realtime.plumber.Committers; +import org.apache.druid.segment.realtime.plumber.Plumber; +import org.apache.druid.segment.realtime.plumber.PlumberSchool; +import org.apache.druid.segment.realtime.plumber.Plumbers; +import org.apache.druid.segment.realtime.plumber.RealtimePlumberSchool; +import org.apache.druid.segment.realtime.plumber.VersioningPolicy; +import org.apache.druid.server.coordination.DataSegmentAnnouncer; +import org.apache.druid.timeline.DataSegment; import org.apache.commons.io.FileUtils; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/RestoreTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/RestoreTask.java similarity index 88% rename from indexing-service/src/main/java/io/druid/indexing/common/task/RestoreTask.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/RestoreTask.java index 0e81646e26e1..292a309e8a6b 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/RestoreTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/RestoreTask.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; -import io.druid.indexing.common.TaskLock; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.actions.SegmentListUnusedAction; -import io.druid.indexing.common.actions.SegmentMetadataUpdateAction; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.logger.Logger; -import io.druid.timeline.DataSegment; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.actions.SegmentListUnusedAction; +import org.apache.druid.indexing.common.actions.SegmentMetadataUpdateAction; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import java.util.ArrayList; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/SameIntervalMergeTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/SameIntervalMergeTask.java similarity index 90% rename from indexing-service/src/main/java/io/druid/indexing/common/task/SameIntervalMergeTask.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/SameIntervalMergeTask.java index c2366ef920d3..f065f3b8be84 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/SameIntervalMergeTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/SameIntervalMergeTask.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.actions.SegmentListUsedAction; -import io.druid.java.util.common.DateTimes; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.segment.IndexSpec; -import io.druid.timeline.DataSegment; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.actions.SegmentListUsedAction; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import javax.annotation.Nullable; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/Task.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/Task.java similarity index 93% rename from indexing-service/src/main/java/io/druid/indexing/common/task/Task.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/Task.java index 0c6dfcd9c6ed..793f64212f1c 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/Task.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/Task.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.indexing.common.task.batch.parallel.ParallelIndexSubTask; -import io.druid.indexing.common.task.batch.parallel.ParallelIndexSupervisorTask; -import io.druid.query.Query; -import io.druid.query.QueryRunner; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.indexing.common.task.batch.parallel.ParallelIndexSubTask; +import org.apache.druid.indexing.common.task.batch.parallel.ParallelIndexSupervisorTask; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryRunner; import java.util.Map; @@ -95,7 +95,7 @@ public interface Task * @return task priority * * @see Tasks for default task priorities - * @see io.druid.indexing.overlord.http.OverlordResource#taskPost + * @see org.apache.druid.indexing.overlord.http.OverlordResource#taskPost */ default int getPriority() { diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/TaskResource.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/TaskResource.java similarity index 97% rename from indexing-service/src/main/java/io/druid/indexing/common/task/TaskResource.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/TaskResource.java index b21704f02634..e74c4d038300 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/TaskResource.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/TaskResource.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/Tasks.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/Tasks.java similarity index 88% rename from indexing-service/src/main/java/io/druid/indexing/common/task/Tasks.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/Tasks.java index c9bf0aa5c1b3..deebf3b38af5 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/Tasks.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/Tasks.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.google.common.base.Preconditions; -import io.druid.indexing.common.TaskLock; -import io.druid.indexing.common.TaskLockType; -import io.druid.indexing.common.actions.LockTryAcquireAction; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.java.util.common.JodaUtils; -import io.druid.java.util.common.guava.Comparators; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexing.common.TaskLockType; +import org.apache.druid.indexing.common.actions.LockTryAcquireAction; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.java.util.common.JodaUtils; +import org.apache.druid.java.util.common.guava.Comparators; import org.joda.time.Interval; import java.io.IOException; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexIOConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexIOConfig.java similarity index 87% rename from indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexIOConfig.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexIOConfig.java index 9af967201111..3c07cd6540f4 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexIOConfig.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexIOConfig.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.indexing.common.task.batch.parallel; +package org.apache.druid.indexing.common.task.batch.parallel; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.druid.data.input.FirehoseFactory; -import io.druid.indexing.common.task.IndexTask.IndexIOConfig; +import org.apache.druid.data.input.FirehoseFactory; +import org.apache.druid.indexing.common.task.IndexTask.IndexIOConfig; import javax.annotation.Nullable; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexIngestionSpec.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexIngestionSpec.java similarity index 92% rename from indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexIngestionSpec.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexIngestionSpec.java index 9912eb10a307..22354ed4106f 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexIngestionSpec.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexIngestionSpec.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.indexing.common.task.batch.parallel; +package org.apache.druid.indexing.common.task.batch.parallel; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.IngestionSpec; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.IngestionSpec; public class ParallelIndexIngestionSpec extends IngestionSpec { diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexSubTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSubTask.java similarity index 85% rename from indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexSubTask.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSubTask.java index a9c7e78e1392..46cf03e65e81 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexSubTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSubTask.java @@ -17,53 +17,53 @@ * under the License. */ -package io.druid.indexing.common.task.batch.parallel; +package org.apache.druid.indexing.common.task.batch.parallel; import com.fasterxml.jackson.annotation.JacksonInject; 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.client.indexing.IndexingServiceClient; -import io.druid.data.input.Firehose; -import io.druid.data.input.FirehoseFactory; -import io.druid.data.input.InputRow; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.appenderator.ActionBasedSegmentAllocator; -import io.druid.indexing.appenderator.ActionBasedUsedSegmentChecker; -import io.druid.indexing.common.TaskLockType; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.actions.LockTryAcquireAction; -import io.druid.indexing.common.actions.SegmentAllocateAction; -import io.druid.indexing.common.actions.SurrogateAction; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.indexing.common.task.AbstractTask; -import io.druid.indexing.common.task.ClientBasedTaskInfoProvider; -import io.druid.indexing.common.task.IndexTask; -import io.druid.indexing.common.task.IndexTaskClientFactory; -import io.druid.indexing.common.task.TaskResource; -import io.druid.indexing.common.task.Tasks; -import io.druid.indexing.firehose.IngestSegmentFirehoseFactory; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.common.parsers.ParseException; -import io.druid.query.DruidMetrics; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.RealtimeIOConfig; -import io.druid.segment.indexing.granularity.GranularitySpec; -import io.druid.segment.realtime.FireDepartment; -import io.druid.segment.realtime.FireDepartmentMetrics; -import io.druid.segment.realtime.RealtimeMetricsMonitor; -import io.druid.segment.realtime.appenderator.Appenderator; -import io.druid.segment.realtime.appenderator.AppenderatorDriverAddResult; -import io.druid.segment.realtime.appenderator.Appenderators; -import io.druid.segment.realtime.appenderator.BaseAppenderatorDriver; -import io.druid.segment.realtime.appenderator.BatchAppenderatorDriver; -import io.druid.segment.realtime.appenderator.SegmentAllocator; -import io.druid.segment.realtime.appenderator.SegmentsAndMetadata; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.indexing.IndexingServiceClient; +import org.apache.druid.data.input.Firehose; +import org.apache.druid.data.input.FirehoseFactory; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.appenderator.ActionBasedSegmentAllocator; +import org.apache.druid.indexing.appenderator.ActionBasedUsedSegmentChecker; +import org.apache.druid.indexing.common.TaskLockType; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.actions.LockTryAcquireAction; +import org.apache.druid.indexing.common.actions.SegmentAllocateAction; +import org.apache.druid.indexing.common.actions.SurrogateAction; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.indexing.common.task.AbstractTask; +import org.apache.druid.indexing.common.task.ClientBasedTaskInfoProvider; +import org.apache.druid.indexing.common.task.IndexTask; +import org.apache.druid.indexing.common.task.IndexTaskClientFactory; +import org.apache.druid.indexing.common.task.TaskResource; +import org.apache.druid.indexing.common.task.Tasks; +import org.apache.druid.indexing.firehose.IngestSegmentFirehoseFactory; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.parsers.ParseException; +import org.apache.druid.query.DruidMetrics; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.RealtimeIOConfig; +import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.segment.realtime.FireDepartment; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.segment.realtime.RealtimeMetricsMonitor; +import org.apache.druid.segment.realtime.appenderator.Appenderator; +import org.apache.druid.segment.realtime.appenderator.AppenderatorDriverAddResult; +import org.apache.druid.segment.realtime.appenderator.Appenderators; +import org.apache.druid.segment.realtime.appenderator.BaseAppenderatorDriver; +import org.apache.druid.segment.realtime.appenderator.BatchAppenderatorDriver; +import org.apache.druid.segment.realtime.appenderator.SegmentAllocator; +import org.apache.druid.segment.realtime.appenderator.SegmentsAndMetadata; +import org.apache.druid.timeline.DataSegment; import org.apache.commons.io.FileUtils; import org.joda.time.Interval; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexSubTaskSpec.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSubTaskSpec.java similarity index 94% rename from indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexSubTaskSpec.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSubTaskSpec.java index c1ee841825d9..ee64f78483ad 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexSubTaskSpec.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSubTaskSpec.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.indexing.common.task.batch.parallel; +package org.apache.druid.indexing.common.task.batch.parallel; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.data.input.InputSplit; +import org.apache.druid.data.input.InputSplit; import java.util.Map; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTask.java similarity index 91% rename from indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTask.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTask.java index b0e0ed247145..b640c56ceb10 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTask.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common.task.batch.parallel; +package org.apache.druid.indexing.common.task.batch.parallel; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; @@ -27,35 +27,35 @@ import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; -import io.druid.client.indexing.IndexingServiceClient; -import io.druid.data.input.FiniteFirehoseFactory; -import io.druid.data.input.FirehoseFactory; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.Counters; -import io.druid.indexing.common.TaskLock; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.actions.LockListAction; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.indexing.common.stats.RowIngestionMetersFactory; -import io.druid.indexing.common.task.AbstractTask; -import io.druid.indexing.common.task.IndexTask; -import io.druid.indexing.common.task.IndexTask.IndexIngestionSpec; -import io.druid.indexing.common.task.IndexTask.IndexTuningConfig; -import io.druid.indexing.common.task.IndexTaskUtils; -import io.druid.indexing.common.task.TaskResource; -import io.druid.indexing.common.task.Tasks; -import io.druid.indexing.common.task.batch.parallel.ParallelIndexTaskRunner.SubTaskSpecStatus; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.indexing.granularity.GranularitySpec; -import io.druid.segment.realtime.appenderator.SegmentIdentifier; -import io.druid.segment.realtime.firehose.ChatHandler; -import io.druid.segment.realtime.firehose.ChatHandlerProvider; -import io.druid.segment.realtime.firehose.ChatHandlers; -import io.druid.server.security.Action; -import io.druid.server.security.AuthorizerMapper; -import io.druid.timeline.partition.NumberedShardSpec; +import org.apache.druid.client.indexing.IndexingServiceClient; +import org.apache.druid.data.input.FiniteFirehoseFactory; +import org.apache.druid.data.input.FirehoseFactory; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.Counters; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.actions.LockListAction; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.indexing.common.stats.RowIngestionMetersFactory; +import org.apache.druid.indexing.common.task.AbstractTask; +import org.apache.druid.indexing.common.task.IndexTask; +import org.apache.druid.indexing.common.task.IndexTask.IndexIngestionSpec; +import org.apache.druid.indexing.common.task.IndexTask.IndexTuningConfig; +import org.apache.druid.indexing.common.task.IndexTaskUtils; +import org.apache.druid.indexing.common.task.TaskResource; +import org.apache.druid.indexing.common.task.Tasks; +import org.apache.druid.indexing.common.task.batch.parallel.ParallelIndexTaskRunner.SubTaskSpecStatus; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.segment.realtime.appenderator.SegmentIdentifier; +import org.apache.druid.segment.realtime.firehose.ChatHandler; +import org.apache.druid.segment.realtime.firehose.ChatHandlerProvider; +import org.apache.druid.segment.realtime.firehose.ChatHandlers; +import org.apache.druid.server.security.Action; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.timeline.partition.NumberedShardSpec; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexTaskClient.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexTaskClient.java similarity index 86% rename from indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexTaskClient.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexTaskClient.java index 6e111607b973..eb9df2941eca 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexTaskClient.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexTaskClient.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.indexing.common.task.batch.parallel; +package org.apache.druid.indexing.common.task.batch.parallel; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.indexing.common.IndexTaskClient; -import io.druid.indexing.common.TaskInfoProvider; -import io.druid.java.util.common.ISE; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.response.FullResponseHolder; -import io.druid.segment.realtime.appenderator.SegmentIdentifier; -import io.druid.timeline.DataSegment; +import org.apache.druid.indexing.common.IndexTaskClient; +import org.apache.druid.indexing.common.TaskInfoProvider; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.response.FullResponseHolder; +import org.apache.druid.segment.realtime.appenderator.SegmentIdentifier; +import org.apache.druid.timeline.DataSegment; import org.jboss.netty.handler.codec.http.HttpMethod; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexTaskClientFactory.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexTaskClientFactory.java similarity index 83% rename from indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexTaskClientFactory.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexTaskClientFactory.java index 645011fb1c74..eb6a714cf62e 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexTaskClientFactory.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexTaskClientFactory.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.indexing.common.task.batch.parallel; +package org.apache.druid.indexing.common.task.batch.parallel; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; import com.google.inject.Inject; -import io.druid.guice.annotations.EscalatedGlobal; -import io.druid.guice.annotations.Smile; -import io.druid.indexing.common.TaskInfoProvider; -import io.druid.indexing.common.task.IndexTaskClientFactory; -import io.druid.java.util.http.client.HttpClient; +import org.apache.druid.guice.annotations.EscalatedGlobal; +import org.apache.druid.guice.annotations.Smile; +import org.apache.druid.indexing.common.TaskInfoProvider; +import org.apache.druid.indexing.common.task.IndexTaskClientFactory; +import org.apache.druid.java.util.http.client.HttpClient; import org.joda.time.Duration; public class ParallelIndexTaskClientFactory implements IndexTaskClientFactory diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexTaskRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexTaskRunner.java similarity index 95% rename from indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexTaskRunner.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexTaskRunner.java index a8077411d61b..085d2f119b2a 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexTaskRunner.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexTaskRunner.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.indexing.common.task.batch.parallel; +package org.apache.druid.indexing.common.task.batch.parallel; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.indexer.TaskState; -import io.druid.indexer.TaskStatusPlus; -import io.druid.indexing.common.task.Task; +import org.apache.druid.indexer.TaskState; +import org.apache.druid.indexer.TaskStatusPlus; +import org.apache.druid.indexing.common.task.Task; import javax.annotation.Nullable; import java.util.List; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexTuningConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexTuningConfig.java similarity index 96% rename from indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexTuningConfig.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexTuningConfig.java index b9a57e20fd13..e09055948a70 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexTuningConfig.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexTuningConfig.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.indexing.common.task.batch.parallel; +package org.apache.druid.indexing.common.task.batch.parallel; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.druid.indexing.common.task.IndexTask.IndexTuningConfig; -import io.druid.segment.IndexSpec; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.indexing.common.task.IndexTask.IndexTuningConfig; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; import org.joda.time.Duration; import org.joda.time.Period; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexingProgress.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexingProgress.java similarity index 94% rename from indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexingProgress.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexingProgress.java index bb813c741d6b..edcc59507977 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexingProgress.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexingProgress.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.indexing.common.task.batch.parallel; +package org.apache.druid.indexing.common.task.batch.parallel; /** * Represents the current progress of {@link ParallelIndexSupervisorTask}. Implementations can be different depending on diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/PushedSegmentsReport.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PushedSegmentsReport.java similarity index 94% rename from indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/PushedSegmentsReport.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PushedSegmentsReport.java index 548d187c5742..ddb1b48c386a 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/PushedSegmentsReport.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PushedSegmentsReport.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.indexing.common.task.batch.parallel; +package org.apache.druid.indexing.common.task.batch.parallel; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import java.util.List; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/SinglePhaseParallelIndexTaskRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseParallelIndexTaskRunner.java similarity index 93% rename from indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/SinglePhaseParallelIndexTaskRunner.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseParallelIndexTaskRunner.java index 8ad4ec28f00a..a6b6951809c8 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/SinglePhaseParallelIndexTaskRunner.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseParallelIndexTaskRunner.java @@ -17,30 +17,30 @@ * under the License. */ -package io.druid.indexing.common.task.batch.parallel; +package org.apache.druid.indexing.common.task.batch.parallel; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.client.indexing.IndexingServiceClient; -import io.druid.data.input.FiniteFirehoseFactory; -import io.druid.data.input.FirehoseFactory; -import io.druid.data.input.InputSplit; -import io.druid.indexer.TaskState; -import io.druid.indexer.TaskStatusPlus; -import io.druid.indexing.appenderator.ActionBasedUsedSegmentChecker; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.actions.SegmentTransactionalInsertAction; -import io.druid.indexing.common.task.batch.parallel.TaskMonitor.MonitorEntry; -import io.druid.indexing.common.task.batch.parallel.TaskMonitor.SubTaskCompleteEvent; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.realtime.appenderator.SegmentIdentifier; -import io.druid.segment.realtime.appenderator.TransactionalSegmentPublisher; -import io.druid.segment.realtime.appenderator.UsedSegmentChecker; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.indexing.IndexingServiceClient; +import org.apache.druid.data.input.FiniteFirehoseFactory; +import org.apache.druid.data.input.FirehoseFactory; +import org.apache.druid.data.input.InputSplit; +import org.apache.druid.indexer.TaskState; +import org.apache.druid.indexer.TaskStatusPlus; +import org.apache.druid.indexing.appenderator.ActionBasedUsedSegmentChecker; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.actions.SegmentTransactionalInsertAction; +import org.apache.druid.indexing.common.task.batch.parallel.TaskMonitor.MonitorEntry; +import org.apache.druid.indexing.common.task.batch.parallel.TaskMonitor.SubTaskCompleteEvent; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.realtime.appenderator.SegmentIdentifier; +import org.apache.druid.segment.realtime.appenderator.TransactionalSegmentPublisher; +import org.apache.druid.segment.realtime.appenderator.UsedSegmentChecker; +import org.apache.druid.timeline.DataSegment; import javax.annotation.Nullable; import java.io.IOException; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/SinglePhaseParallelIndexingProgress.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseParallelIndexingProgress.java similarity index 97% rename from indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/SinglePhaseParallelIndexingProgress.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseParallelIndexingProgress.java index aa21735c2998..aa27767c054b 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/SinglePhaseParallelIndexingProgress.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseParallelIndexingProgress.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.indexing.common.task.batch.parallel; +package org.apache.druid.indexing.common.task.batch.parallel; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/SubTaskSpec.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/SubTaskSpec.java similarity index 92% rename from indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/SubTaskSpec.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/SubTaskSpec.java index aca5164c0152..c11552e4a152 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/SubTaskSpec.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/SubTaskSpec.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.indexing.common.task.batch.parallel; +package org.apache.druid.indexing.common.task.batch.parallel; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.data.input.InputSplit; -import io.druid.indexing.common.task.Task; +import org.apache.druid.data.input.InputSplit; +import org.apache.druid.indexing.common.task.Task; import java.util.Map; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/TaskHistory.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/TaskHistory.java similarity index 90% rename from indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/TaskHistory.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/TaskHistory.java index cb42315b1af3..9bce07327594 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/TaskHistory.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/TaskHistory.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.indexing.common.task.batch.parallel; +package org.apache.druid.indexing.common.task.batch.parallel; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import io.druid.indexer.TaskState; -import io.druid.indexer.TaskStatusPlus; -import io.druid.indexing.common.task.Task; +import org.apache.druid.indexer.TaskState; +import org.apache.druid.indexer.TaskStatusPlus; +import org.apache.druid.indexing.common.task.Task; import java.util.List; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/TaskMonitor.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/TaskMonitor.java similarity index 96% rename from indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/TaskMonitor.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/TaskMonitor.java index f0b2e3b33e02..91c9957787c9 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/batch/parallel/TaskMonitor.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/TaskMonitor.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.indexing.common.task.batch.parallel; +package org.apache.druid.indexing.common.task.batch.parallel; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import io.druid.client.indexing.IndexingServiceClient; -import io.druid.client.indexing.TaskStatusResponse; -import io.druid.indexer.TaskState; -import io.druid.indexer.TaskStatusPlus; -import io.druid.indexing.common.task.Task; -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.client.indexing.IndexingServiceClient; +import org.apache.druid.client.indexing.TaskStatusResponse; +import org.apache.druid.indexer.TaskState; +import org.apache.druid.indexer.TaskStatusPlus; +import org.apache.druid.indexing.common.task.Task; +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 javax.annotation.Nullable; import java.util.Iterator; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/tasklogs/FileTaskLogs.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/tasklogs/FileTaskLogs.java similarity index 93% rename from indexing-service/src/main/java/io/druid/indexing/common/tasklogs/FileTaskLogs.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/tasklogs/FileTaskLogs.java index 5f0efcb92852..c690c9a0eba7 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/tasklogs/FileTaskLogs.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/tasklogs/FileTaskLogs.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.indexing.common.tasklogs; +package org.apache.druid.indexing.common.tasklogs; import com.google.common.base.Optional; import com.google.common.io.ByteSource; import com.google.common.io.Files; import com.google.inject.Inject; -import io.druid.indexing.common.config.FileTaskLogsConfig; -import io.druid.java.util.common.IOE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.tasklogs.TaskLogs; +import org.apache.druid.indexing.common.config.FileTaskLogsConfig; +import org.apache.druid.java.util.common.IOE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.tasklogs.TaskLogs; import org.apache.commons.io.FileUtils; import java.io.File; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/tasklogs/LogUtils.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/tasklogs/LogUtils.java similarity index 97% rename from indexing-service/src/main/java/io/druid/indexing/common/tasklogs/LogUtils.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/tasklogs/LogUtils.java index 77de3ba7a9be..1453cf6a34e5 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/tasklogs/LogUtils.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/tasklogs/LogUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common.tasklogs; +package org.apache.druid.indexing.common.tasklogs; import java.io.File; import java.io.IOException; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/tasklogs/SwitchingTaskLogStreamer.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/tasklogs/SwitchingTaskLogStreamer.java similarity index 95% rename from indexing-service/src/main/java/io/druid/indexing/common/tasklogs/SwitchingTaskLogStreamer.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/tasklogs/SwitchingTaskLogStreamer.java index 44c62ccea405..78806d6eef5c 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/tasklogs/SwitchingTaskLogStreamer.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/tasklogs/SwitchingTaskLogStreamer.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.indexing.common.tasklogs; +package org.apache.druid.indexing.common.tasklogs; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.io.ByteSource; import com.google.inject.Inject; -import io.druid.tasklogs.TaskLogStreamer; +import org.apache.druid.tasklogs.TaskLogStreamer; import java.io.IOException; import java.util.List; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/tasklogs/TaskRunnerTaskLogStreamer.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/tasklogs/TaskRunnerTaskLogStreamer.java similarity index 87% rename from indexing-service/src/main/java/io/druid/indexing/common/tasklogs/TaskRunnerTaskLogStreamer.java rename to indexing-service/src/main/java/org/apache/druid/indexing/common/tasklogs/TaskRunnerTaskLogStreamer.java index dcbb6e1250af..564d1d8fa209 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/tasklogs/TaskRunnerTaskLogStreamer.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/tasklogs/TaskRunnerTaskLogStreamer.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.indexing.common.tasklogs; +package org.apache.druid.indexing.common.tasklogs; import com.google.common.base.Optional; import com.google.common.io.ByteSource; import com.google.inject.Inject; -import io.druid.indexing.overlord.TaskMaster; -import io.druid.indexing.overlord.TaskRunner; -import io.druid.tasklogs.TaskLogStreamer; +import org.apache.druid.indexing.overlord.TaskMaster; +import org.apache.druid.indexing.overlord.TaskRunner; +import org.apache.druid.tasklogs.TaskLogStreamer; import java.io.IOException; diff --git a/indexing-service/src/main/java/io/druid/indexing/firehose/IngestSegmentFirehoseFactory.java b/indexing-service/src/main/java/org/apache/druid/indexing/firehose/IngestSegmentFirehoseFactory.java similarity index 89% rename from indexing-service/src/main/java/io/druid/indexing/firehose/IngestSegmentFirehoseFactory.java rename to indexing-service/src/main/java/org/apache/druid/indexing/firehose/IngestSegmentFirehoseFactory.java index 957b988c0757..779ebe0b308a 100644 --- a/indexing-service/src/main/java/io/druid/indexing/firehose/IngestSegmentFirehoseFactory.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/firehose/IngestSegmentFirehoseFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.firehose; +package org.apache.druid.indexing.firehose; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; @@ -30,24 +30,24 @@ import com.google.common.collect.HashBiMap; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import io.druid.data.input.Firehose; -import io.druid.data.input.FirehoseFactory; -import io.druid.data.input.impl.InputRowParser; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.actions.SegmentListUsedAction; -import io.druid.java.util.common.parsers.ParseException; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.query.filter.DimFilter; -import io.druid.segment.IndexIO; -import io.druid.segment.QueryableIndexStorageAdapter; -import io.druid.segment.loading.SegmentLoadingException; -import io.druid.segment.realtime.firehose.IngestSegmentFirehose; -import io.druid.segment.realtime.firehose.WindowedStorageAdapter; -import io.druid.segment.transform.TransformSpec; -import io.druid.timeline.DataSegment; -import io.druid.timeline.TimelineObjectHolder; -import io.druid.timeline.VersionedIntervalTimeline; -import io.druid.timeline.partition.PartitionChunk; +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.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.actions.SegmentListUsedAction; +import org.apache.druid.java.util.common.parsers.ParseException; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.QueryableIndexStorageAdapter; +import org.apache.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.segment.realtime.firehose.IngestSegmentFirehose; +import org.apache.druid.segment.realtime.firehose.WindowedStorageAdapter; +import org.apache.druid.segment.transform.TransformSpec; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.TimelineObjectHolder; +import org.apache.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.timeline.partition.PartitionChunk; import org.joda.time.Interval; import javax.annotation.Nullable; diff --git a/indexing-service/src/main/java/io/druid/indexing/hadoop/OverlordActionBasedUsedSegmentLister.java b/indexing-service/src/main/java/org/apache/druid/indexing/hadoop/OverlordActionBasedUsedSegmentLister.java similarity index 85% rename from indexing-service/src/main/java/io/druid/indexing/hadoop/OverlordActionBasedUsedSegmentLister.java rename to indexing-service/src/main/java/org/apache/druid/indexing/hadoop/OverlordActionBasedUsedSegmentLister.java index 3a8b3a3b2c2d..d97bf1bc9f37 100644 --- a/indexing-service/src/main/java/io/druid/indexing/hadoop/OverlordActionBasedUsedSegmentLister.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/hadoop/OverlordActionBasedUsedSegmentLister.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.indexing.hadoop; +package org.apache.druid.indexing.hadoop; import com.google.common.base.Preconditions; import com.google.inject.Inject; -import io.druid.indexer.path.UsedSegmentLister; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.actions.SegmentListUsedAction; -import io.druid.timeline.DataSegment; +import org.apache.druid.indexer.path.UsedSegmentLister; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.actions.SegmentListUsedAction; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import java.io.IOException; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/CriticalAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/CriticalAction.java similarity index 94% rename from indexing-service/src/main/java/io/druid/indexing/overlord/CriticalAction.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/CriticalAction.java index 7ef12ae9a2f1..9b06a4febc8c 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/CriticalAction.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/CriticalAction.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.google.common.base.Preconditions; -import io.druid.indexing.common.TaskLockType; -import io.druid.indexing.common.task.Task; +import org.apache.druid.indexing.common.TaskLockType; +import org.apache.druid.indexing.common.task.Task; import org.joda.time.Interval; /** diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/ForkingTaskRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ForkingTaskRunner.java similarity index 95% rename from indexing-service/src/main/java/io/druid/indexing/overlord/ForkingTaskRunner.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/ForkingTaskRunner.java index cf4fcdb7c118..05bf2a198c03 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/ForkingTaskRunner.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ForkingTaskRunner.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -41,30 +41,30 @@ import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.inject.Inject; -import io.druid.guice.annotations.Self; -import io.druid.indexer.RunnerTaskState; -import io.druid.indexer.TaskLocation; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.config.TaskConfig; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.common.tasklogs.LogUtils; -import io.druid.indexing.overlord.autoscaling.ScalingStats; -import io.druid.indexing.overlord.config.ForkingTaskRunnerConfig; -import io.druid.indexing.worker.config.WorkerConfig; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.IOE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.query.DruidMetrics; -import io.druid.server.DruidNode; -import io.druid.server.metrics.MonitorsConfig; -import io.druid.tasklogs.TaskLogPusher; -import io.druid.tasklogs.TaskLogStreamer; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.indexer.RunnerTaskState; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.config.TaskConfig; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.common.tasklogs.LogUtils; +import org.apache.druid.indexing.overlord.autoscaling.ScalingStats; +import org.apache.druid.indexing.overlord.config.ForkingTaskRunnerConfig; +import org.apache.druid.indexing.worker.config.WorkerConfig; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.IOE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.query.DruidMetrics; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.metrics.MonitorsConfig; +import org.apache.druid.tasklogs.TaskLogPusher; +import org.apache.druid.tasklogs.TaskLogStreamer; import org.apache.commons.io.FileUtils; import org.joda.time.DateTime; import org.joda.time.Interval; @@ -313,7 +313,7 @@ public TaskStatus call() for (String propName : props.stringPropertyNames()) { for (String allowedPrefix : config.getAllowedPrefixes()) { - // See https://github.com/druid-io/druid/issues/1841 + // See https://github.com/apache/incubator-druid/issues/1841 if (propName.startsWith(allowedPrefix) && !ForkingTaskRunnerConfig.JAVA_OPTS_PROPERTY.equals(propName) && !ForkingTaskRunnerConfig.JAVA_OPTS_ARRAY_PROPERTY.equals(propName) @@ -390,7 +390,7 @@ public TaskStatus call() /** * These are not enabled per default to allow the user to either set or not set them * Users are highly suggested to be set in druid.indexer.runner.javaOpts - * See io.druid.concurrent.TaskThreadPriority#getThreadPriorityFromTaskPriority(int) + * See org.apache.druid.concurrent.TaskThreadPriority#getThreadPriorityFromTaskPriority(int) * for more information command.add("-XX:+UseThreadPriorities"); command.add("-XX:ThreadPriorityPolicy=42"); @@ -412,7 +412,7 @@ public TaskStatus call() // if set then peon task will fail to start } - command.add("io.druid.cli.Main"); + command.add("org.apache.druid.cli.Main"); command.add("internal"); command.add("peon"); command.add(taskFile.toString()); diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/ForkingTaskRunnerFactory.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ForkingTaskRunnerFactory.java similarity index 84% rename from indexing-service/src/main/java/io/druid/indexing/overlord/ForkingTaskRunnerFactory.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/ForkingTaskRunnerFactory.java index 66d613242a35..c1a719f14573 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/ForkingTaskRunnerFactory.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ForkingTaskRunnerFactory.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.inject.Inject; -import io.druid.guice.annotations.Self; -import io.druid.indexing.common.config.TaskConfig; -import io.druid.indexing.overlord.config.ForkingTaskRunnerConfig; -import io.druid.indexing.worker.config.WorkerConfig; -import io.druid.server.DruidNode; -import io.druid.tasklogs.TaskLogPusher; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.indexing.common.config.TaskConfig; +import org.apache.druid.indexing.overlord.config.ForkingTaskRunnerConfig; +import org.apache.druid.indexing.worker.config.WorkerConfig; +import org.apache.druid.server.DruidNode; +import org.apache.druid.tasklogs.TaskLogPusher; import java.util.Properties; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/HeapMemoryTaskStorage.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/HeapMemoryTaskStorage.java similarity index 95% rename from indexing-service/src/main/java/io/druid/indexing/overlord/HeapMemoryTaskStorage.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/HeapMemoryTaskStorage.java index 3493ab7de9b9..6046de4b9ba7 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/HeapMemoryTaskStorage.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/HeapMemoryTaskStorage.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.google.common.base.Optional; import com.google.common.base.Preconditions; @@ -28,15 +28,15 @@ import com.google.common.collect.Multimap; import com.google.common.collect.Ordering; import com.google.inject.Inject; -import io.druid.indexer.TaskInfo; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskLock; -import io.druid.indexing.common.actions.TaskAction; -import io.druid.indexing.common.config.TaskStorageConfig; -import io.druid.indexing.common.task.Task; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.logger.Logger; -import io.druid.metadata.EntryExistsException; +import org.apache.druid.indexer.TaskInfo; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexing.common.actions.TaskAction; +import org.apache.druid.indexing.common.config.TaskStorageConfig; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.metadata.EntryExistsException; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/ImmutableWorkerInfo.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ImmutableWorkerInfo.java similarity index 96% rename from indexing-service/src/main/java/io/druid/indexing/overlord/ImmutableWorkerInfo.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/ImmutableWorkerInfo.java index 4a74930d9bd0..11da1f6733ee 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/ImmutableWorkerInfo.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ImmutableWorkerInfo.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableSet; -import io.druid.guice.annotations.PublicApi; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.worker.Worker; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.worker.Worker; import org.joda.time.DateTime; import javax.annotation.Nullable; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/IndexerMetadataStorageAdapter.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/IndexerMetadataStorageAdapter.java similarity index 94% rename from indexing-service/src/main/java/io/druid/indexing/overlord/IndexerMetadataStorageAdapter.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/IndexerMetadataStorageAdapter.java index a90434012782..cd550c2ad7bf 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/IndexerMetadataStorageAdapter.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/IndexerMetadataStorageAdapter.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.google.common.base.Preconditions; import com.google.inject.Inject; -import io.druid.indexer.TaskInfo; -import io.druid.java.util.common.DateTimes; +import org.apache.druid.indexer.TaskInfo; +import org.apache.druid.java.util.common.DateTimes; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/LockResult.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/LockResult.java similarity index 92% rename from indexing-service/src/main/java/io/druid/indexing/overlord/LockResult.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/LockResult.java index 622aa1a5b424..6372642b8fb6 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/LockResult.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/LockResult.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.indexing.common.TaskLock; -import io.druid.indexing.common.TaskLockType; -import io.druid.indexing.common.task.Task; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexing.common.TaskLockType; +import org.apache.druid.indexing.common.task.Task; import org.joda.time.Interval; import javax.annotation.Nullable; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/MetadataTaskStorage.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/MetadataTaskStorage.java similarity index 88% rename from indexing-service/src/main/java/io/druid/indexing/overlord/MetadataTaskStorage.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/MetadataTaskStorage.java index 77a4c4aefa69..e0dfa6cb4e2f 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/MetadataTaskStorage.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/MetadataTaskStorage.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.base.Function; @@ -27,23 +27,23 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.inject.Inject; -import io.druid.indexer.TaskInfo; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskLock; -import io.druid.indexing.common.actions.TaskAction; -import io.druid.indexing.common.config.TaskStorageConfig; -import io.druid.indexing.common.task.Task; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.metadata.EntryExistsException; -import io.druid.metadata.MetadataStorageActionHandler; -import io.druid.metadata.MetadataStorageActionHandlerFactory; -import io.druid.metadata.MetadataStorageActionHandlerTypes; -import io.druid.metadata.MetadataStorageConnector; -import io.druid.metadata.MetadataStorageTablesConfig; +import org.apache.druid.indexer.TaskInfo; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexing.common.actions.TaskAction; +import org.apache.druid.indexing.common.config.TaskStorageConfig; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.metadata.EntryExistsException; +import org.apache.druid.metadata.MetadataStorageActionHandler; +import org.apache.druid.metadata.MetadataStorageActionHandlerFactory; +import org.apache.druid.metadata.MetadataStorageActionHandlerTypes; +import org.apache.druid.metadata.MetadataStorageConnector; +import org.apache.druid.metadata.MetadataStorageTablesConfig; import org.joda.time.Duration; import javax.annotation.Nullable; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/PortFinder.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/PortFinder.java similarity index 94% rename from indexing-service/src/main/java/io/druid/indexing/overlord/PortFinder.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/PortFinder.java index 7a34ee49e8ee..79b5b0cc5f91 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/PortFinder.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/PortFinder.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.google.common.collect.Sets; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Pair; import java.io.IOException; import java.net.ServerSocket; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/RemoteTaskRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/RemoteTaskRunner.java similarity index 96% rename from indexing-service/src/main/java/io/druid/indexing/overlord/RemoteTaskRunner.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/RemoteTaskRunner.java index e8587f619b98..736cab6e3b7a 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/RemoteTaskRunner.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/RemoteTaskRunner.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; @@ -42,39 +42,39 @@ import com.google.common.util.concurrent.ListeningScheduledExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; -import io.druid.concurrent.LifecycleLock; -import io.druid.curator.CuratorUtils; -import io.druid.curator.cache.PathChildrenCacheFactory; -import io.druid.indexer.RunnerTaskState; -import io.druid.indexer.TaskLocation; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.autoscaling.ProvisioningService; -import io.druid.indexing.overlord.autoscaling.ProvisioningStrategy; -import io.druid.indexing.overlord.autoscaling.ScalingStats; -import io.druid.indexing.overlord.config.RemoteTaskRunnerConfig; -import io.druid.indexing.overlord.setup.WorkerBehaviorConfig; -import io.druid.indexing.overlord.setup.WorkerSelectStrategy; -import io.druid.indexing.worker.TaskAnnouncement; -import io.druid.indexing.worker.Worker; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.RE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.concurrent.ScheduledExecutors; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.Request; -import io.druid.java.util.http.client.response.InputStreamResponseHandler; -import io.druid.java.util.http.client.response.StatusResponseHandler; -import io.druid.java.util.http.client.response.StatusResponseHolder; -import io.druid.server.initialization.IndexerZkConfig; -import io.druid.tasklogs.TaskLogStreamer; +import org.apache.druid.concurrent.LifecycleLock; +import org.apache.druid.curator.CuratorUtils; +import org.apache.druid.curator.cache.PathChildrenCacheFactory; +import org.apache.druid.indexer.RunnerTaskState; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.autoscaling.ProvisioningService; +import org.apache.druid.indexing.overlord.autoscaling.ProvisioningStrategy; +import org.apache.druid.indexing.overlord.autoscaling.ScalingStats; +import org.apache.druid.indexing.overlord.config.RemoteTaskRunnerConfig; +import org.apache.druid.indexing.overlord.setup.WorkerBehaviorConfig; +import org.apache.druid.indexing.overlord.setup.WorkerSelectStrategy; +import org.apache.druid.indexing.worker.TaskAnnouncement; +import org.apache.druid.indexing.worker.Worker; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.concurrent.ScheduledExecutors; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.Request; +import org.apache.druid.java.util.http.client.response.InputStreamResponseHandler; +import org.apache.druid.java.util.http.client.response.StatusResponseHandler; +import org.apache.druid.java.util.http.client.response.StatusResponseHolder; +import org.apache.druid.server.initialization.IndexerZkConfig; +import org.apache.druid.tasklogs.TaskLogStreamer; import org.apache.commons.lang.mutable.MutableInt; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.recipes.cache.PathChildrenCache; @@ -681,7 +681,7 @@ public Void call() try { //this can still be null due to race from explicit task shutdown request //or if another thread steals and completes this task right after this thread makes copy - //of pending tasks. See https://github.com/druid-io/druid/issues/2842 . + //of pending tasks. See https://github.com/apache/incubator-druid/issues/2842 . Task task = pendingTaskPayloads.get(taskId); if (task != null && tryAssignTask(task, taskRunnerWorkItem)) { pendingTaskPayloads.remove(taskId); diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/RemoteTaskRunnerFactory.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/RemoteTaskRunnerFactory.java similarity index 80% rename from indexing-service/src/main/java/io/druid/indexing/overlord/RemoteTaskRunnerFactory.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/RemoteTaskRunnerFactory.java index 3020612ae1e3..c0ed65898b22 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/RemoteTaskRunnerFactory.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/RemoteTaskRunnerFactory.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Supplier; import com.google.inject.Inject; -import io.druid.java.util.http.client.HttpClient; -import io.druid.curator.cache.PathChildrenCacheFactory; -import io.druid.guice.annotations.EscalatedGlobal; -import io.druid.indexing.overlord.autoscaling.NoopProvisioningStrategy; -import io.druid.indexing.overlord.autoscaling.ProvisioningSchedulerConfig; -import io.druid.indexing.overlord.autoscaling.ProvisioningStrategy; -import io.druid.indexing.overlord.config.RemoteTaskRunnerConfig; -import io.druid.indexing.overlord.setup.WorkerBehaviorConfig; -import io.druid.server.initialization.IndexerZkConfig; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.curator.cache.PathChildrenCacheFactory; +import org.apache.druid.guice.annotations.EscalatedGlobal; +import org.apache.druid.indexing.overlord.autoscaling.NoopProvisioningStrategy; +import org.apache.druid.indexing.overlord.autoscaling.ProvisioningSchedulerConfig; +import org.apache.druid.indexing.overlord.autoscaling.ProvisioningStrategy; +import org.apache.druid.indexing.overlord.config.RemoteTaskRunnerConfig; +import org.apache.druid.indexing.overlord.setup.WorkerBehaviorConfig; +import org.apache.druid.server.initialization.IndexerZkConfig; import org.apache.curator.framework.CuratorFramework; /** diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/RemoteTaskRunnerWorkItem.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/RemoteTaskRunnerWorkItem.java similarity index 95% rename from indexing-service/src/main/java/io/druid/indexing/overlord/RemoteTaskRunnerWorkItem.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/RemoteTaskRunnerWorkItem.java index 48136074cc83..37ea8725636d 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/RemoteTaskRunnerWorkItem.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/RemoteTaskRunnerWorkItem.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.google.common.util.concurrent.SettableFuture; -import io.druid.indexer.TaskLocation; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.worker.Worker; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.worker.Worker; import org.joda.time.DateTime; /** diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/RemoteTaskRunnerWorkQueue.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/RemoteTaskRunnerWorkQueue.java similarity index 92% rename from indexing-service/src/main/java/io/druid/indexing/overlord/RemoteTaskRunnerWorkQueue.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/RemoteTaskRunnerWorkQueue.java index 8185df03cd88..bc67019b5faa 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/RemoteTaskRunnerWorkQueue.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/RemoteTaskRunnerWorkQueue.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; -import io.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.DateTimes; import java.util.concurrent.ConcurrentSkipListMap; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/SingleTaskBackgroundRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/SingleTaskBackgroundRunner.java similarity index 89% rename from indexing-service/src/main/java/io/druid/indexing/overlord/SingleTaskBackgroundRunner.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/SingleTaskBackgroundRunner.java index 53ced2b89fea..a0fb43ab7d20 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/SingleTaskBackgroundRunner.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/SingleTaskBackgroundRunner.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.google.common.base.Optional; import com.google.common.base.Preconditions; @@ -27,33 +27,33 @@ import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.inject.Inject; -import io.druid.concurrent.TaskThreadPriority; -import io.druid.guice.annotations.Self; -import io.druid.indexer.TaskLocation; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.TaskToolboxFactory; -import io.druid.indexing.common.config.TaskConfig; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.autoscaling.ScalingStats; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Numbers; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.query.NoopQueryRunner; -import io.druid.query.Query; -import io.druid.query.QueryRunner; -import io.druid.query.QuerySegmentWalker; -import io.druid.query.SegmentDescriptor; -import io.druid.server.DruidNode; -import io.druid.server.SetAndVerifyContextQueryRunner; -import io.druid.server.initialization.ServerConfig; +import org.apache.druid.concurrent.TaskThreadPriority; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.TaskToolboxFactory; +import org.apache.druid.indexing.common.config.TaskConfig; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.autoscaling.ScalingStats; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Numbers; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.query.NoopQueryRunner; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QuerySegmentWalker; +import org.apache.druid.query.SegmentDescriptor; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.SetAndVerifyContextQueryRunner; +import org.apache.druid.server.initialization.ServerConfig; import org.joda.time.Interval; import java.util.Collection; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/TaskLockbox.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskLockbox.java similarity index 98% rename from indexing-service/src/main/java/io/druid/indexing/overlord/TaskLockbox.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskLockbox.java index 3ed6cfd83520..04ee705628a2 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/TaskLockbox.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskLockbox.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; @@ -31,15 +31,15 @@ import com.google.common.collect.Ordering; import com.google.common.collect.Sets; import com.google.inject.Inject; -import io.druid.indexing.common.TaskLock; -import io.druid.indexing.common.TaskLockType; -import io.druid.indexing.common.task.Task; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.guava.Comparators; -import io.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexing.common.TaskLockType; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.java.util.emitter.EmittingLogger; import org.joda.time.Interval; import javax.annotation.Nullable; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/TaskMaster.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskMaster.java similarity index 85% rename from indexing-service/src/main/java/io/druid/indexing/overlord/TaskMaster.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskMaster.java index f3665861ad7e..4c6d5ec8a3c2 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/TaskMaster.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskMaster.java @@ -17,29 +17,29 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.google.common.base.Optional; import com.google.common.base.Throwables; import com.google.inject.Inject; -import io.druid.client.indexing.IndexingService; -import io.druid.curator.discovery.ServiceAnnouncer; -import io.druid.discovery.DruidLeaderSelector; -import io.druid.guice.annotations.Self; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.indexing.common.actions.TaskActionClientFactory; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.autoscaling.ScalingStats; -import io.druid.indexing.overlord.config.TaskQueueConfig; -import io.druid.indexing.overlord.helpers.OverlordHelperManager; -import io.druid.indexing.overlord.supervisor.SupervisorManager; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.server.DruidNode; -import io.druid.server.coordinator.CoordinatorOverlordServiceConfig; +import org.apache.druid.client.indexing.IndexingService; +import org.apache.druid.curator.discovery.ServiceAnnouncer; +import org.apache.druid.discovery.DruidLeaderSelector; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.indexing.common.actions.TaskActionClientFactory; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.autoscaling.ScalingStats; +import org.apache.druid.indexing.overlord.config.TaskQueueConfig; +import org.apache.druid.indexing.overlord.helpers.OverlordHelperManager; +import org.apache.druid.indexing.overlord.supervisor.SupervisorManager; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.coordinator.CoordinatorOverlordServiceConfig; import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.ReentrantLock; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/TaskQueue.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskQueue.java similarity index 95% rename from indexing-service/src/main/java/io/druid/indexing/overlord/TaskQueue.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskQueue.java index a14b7ad0c198..b6da853761da 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/TaskQueue.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskQueue.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -33,18 +33,18 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.google.inject.Inject; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.actions.TaskActionClientFactory; -import io.druid.indexing.common.task.IndexTaskUtils; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.config.TaskQueueConfig; -import io.druid.java.util.common.concurrent.ScheduledExecutors; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.metadata.EntryExistsException; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.actions.TaskActionClientFactory; +import org.apache.druid.indexing.common.task.IndexTaskUtils; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.config.TaskQueueConfig; +import org.apache.druid.java.util.common.concurrent.ScheduledExecutors; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.metadata.EntryExistsException; import java.util.Collection; import java.util.List; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/TaskRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskRunner.java similarity index 90% rename from indexing-service/src/main/java/io/druid/indexing/overlord/TaskRunner.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskRunner.java index 3a63f063d777..6d4c867727aa 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/TaskRunner.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskRunner.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.google.common.base.Optional; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.guice.annotations.PublicApi; -import io.druid.indexer.RunnerTaskState; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.autoscaling.ScalingStats; -import io.druid.java.util.common.Pair; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.indexer.RunnerTaskState; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.autoscaling.ScalingStats; +import org.apache.druid.java.util.common.Pair; import javax.annotation.Nullable; import java.util.Collection; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/TaskRunnerFactory.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskRunnerFactory.java similarity index 95% rename from indexing-service/src/main/java/io/druid/indexing/overlord/TaskRunnerFactory.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskRunnerFactory.java index f59d166196ad..68a9ca2e3b78 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/TaskRunnerFactory.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskRunnerFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; public interface TaskRunnerFactory { diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/TaskRunnerListener.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskRunnerListener.java similarity index 91% rename from indexing-service/src/main/java/io/druid/indexing/overlord/TaskRunnerListener.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskRunnerListener.java index 0eea24df31d3..23d11eaa0df7 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/TaskRunnerListener.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskRunnerListener.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; -import io.druid.indexer.TaskLocation; -import io.druid.indexer.TaskStatus; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexer.TaskStatus; import java.util.concurrent.Executor; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/TaskRunnerUtils.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskRunnerUtils.java similarity index 91% rename from indexing-service/src/main/java/io/druid/indexing/overlord/TaskRunnerUtils.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskRunnerUtils.java index 86c4c89ff254..63a571f97fcd 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/TaskRunnerUtils.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskRunnerUtils.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.indexer.TaskLocation; -import io.druid.indexer.TaskStatus; -import io.druid.java.util.common.Pair; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.java.util.common.Pair; import java.util.concurrent.Executor; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/TaskRunnerWorkItem.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskRunnerWorkItem.java similarity index 93% rename from indexing-service/src/main/java/io/druid/indexing/overlord/TaskRunnerWorkItem.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskRunnerWorkItem.java index d270d85e410d..e10f25007e65 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/TaskRunnerWorkItem.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskRunnerWorkItem.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.indexer.TaskLocation; -import io.druid.indexer.TaskStatus; -import io.druid.java.util.common.DateTimes; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.java.util.common.DateTimes; import org.joda.time.DateTime; import javax.annotation.Nullable; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/TaskStorage.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskStorage.java similarity index 93% rename from indexing-service/src/main/java/io/druid/indexing/overlord/TaskStorage.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskStorage.java index 521fe38dfc50..d50b4b58f8b3 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/TaskStorage.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskStorage.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.google.common.base.Optional; -import io.druid.indexer.TaskInfo; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskLock; -import io.druid.indexing.common.actions.TaskAction; -import io.druid.indexing.common.task.Task; -import io.druid.metadata.EntryExistsException; +import org.apache.druid.indexer.TaskInfo; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexing.common.actions.TaskAction; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.metadata.EntryExistsException; import org.joda.time.Duration; import javax.annotation.Nullable; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/TaskStorageQueryAdapter.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskStorageQueryAdapter.java similarity index 87% rename from indexing-service/src/main/java/io/druid/indexing/overlord/TaskStorageQueryAdapter.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskStorageQueryAdapter.java index d67d4eafa738..bc76a941a798 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/TaskStorageQueryAdapter.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskStorageQueryAdapter.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.google.common.base.Optional; import com.google.common.collect.Sets; import com.google.inject.Inject; -import io.druid.indexer.TaskInfo; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.actions.SegmentInsertAction; -import io.druid.indexing.common.actions.SegmentTransactionalInsertAction; -import io.druid.indexing.common.actions.TaskAction; -import io.druid.indexing.common.task.Task; -import io.druid.timeline.DataSegment; +import org.apache.druid.indexer.TaskInfo; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.actions.SegmentInsertAction; +import org.apache.druid.indexing.common.actions.SegmentTransactionalInsertAction; +import org.apache.druid.indexing.common.actions.TaskAction; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Duration; import javax.annotation.Nullable; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/WorkerTaskRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/WorkerTaskRunner.java similarity index 84% rename from indexing-service/src/main/java/io/druid/indexing/overlord/WorkerTaskRunner.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/WorkerTaskRunner.java index b8083f6f89fc..5948cbac0b7a 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/WorkerTaskRunner.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/WorkerTaskRunner.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.google.common.base.Predicate; -import io.druid.guice.annotations.PublicApi; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.config.WorkerTaskRunnerConfig; -import io.druid.indexing.worker.Worker; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.config.WorkerTaskRunnerConfig; +import org.apache.druid.indexing.worker.Worker; import java.util.Collection; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/ZkWorker.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ZkWorker.java similarity index 95% rename from indexing-service/src/main/java/io/druid/indexing/overlord/ZkWorker.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/ZkWorker.java index d64d9f2c37d4..967f0e50e718 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/ZkWorker.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ZkWorker.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.ObjectMapper; @@ -27,10 +27,10 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import io.druid.annotations.UsedInGeneratedCode; -import io.druid.indexing.worker.TaskAnnouncement; -import io.druid.indexing.worker.Worker; -import io.druid.java.util.common.DateTimes; +import org.apache.druid.annotations.UsedInGeneratedCode; +import org.apache.druid.indexing.worker.TaskAnnouncement; +import org.apache.druid.indexing.worker.Worker; +import org.apache.druid.java.util.common.DateTimes; import org.apache.curator.framework.recipes.cache.ChildData; import org.apache.curator.framework.recipes.cache.PathChildrenCache; import org.apache.curator.framework.recipes.cache.PathChildrenCacheListener; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/AbstractWorkerProvisioningStrategy.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/AbstractWorkerProvisioningStrategy.java similarity index 92% rename from indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/AbstractWorkerProvisioningStrategy.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/AbstractWorkerProvisioningStrategy.java index 0690ec247626..e3197e330691 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/AbstractWorkerProvisioningStrategy.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/AbstractWorkerProvisioningStrategy.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.indexing.overlord.autoscaling; +package org.apache.druid.indexing.overlord.autoscaling; import com.google.common.base.Supplier; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.indexing.overlord.WorkerTaskRunner; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.granularity.PeriodGranularity; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.indexing.overlord.WorkerTaskRunner; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.granularity.PeriodGranularity; import org.joda.time.Duration; import org.joda.time.Period; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/AutoScaler.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/AutoScaler.java similarity index 92% rename from indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/AutoScaler.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/AutoScaler.java index 37c5232b2a1a..1bbaf8b955a8 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/AutoScaler.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/AutoScaler.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.indexing.overlord.autoscaling; +package org.apache.druid.indexing.overlord.autoscaling; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.druid.guice.annotations.ExtensionPoint; -import io.druid.indexing.overlord.autoscaling.ec2.EC2AutoScaler; +import org.apache.druid.guice.annotations.ExtensionPoint; +import org.apache.druid.indexing.overlord.autoscaling.ec2.EC2AutoScaler; import javax.annotation.Nullable; import java.util.List; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/AutoScalingData.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/AutoScalingData.java similarity index 95% rename from indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/AutoScalingData.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/AutoScalingData.java index 178156698ba2..8fe54a120574 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/AutoScalingData.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/AutoScalingData.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.autoscaling; +package org.apache.druid.indexing.overlord.autoscaling; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/NoopAutoScaler.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/NoopAutoScaler.java similarity index 92% rename from indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/NoopAutoScaler.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/NoopAutoScaler.java index d68b2279af59..8b992098f297 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/NoopAutoScaler.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/NoopAutoScaler.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.indexing.overlord.autoscaling; +package org.apache.druid.indexing.overlord.autoscaling; -import io.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.common.UOE; +import org.apache.druid.java.util.common.UOE; import java.util.List; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/NoopProvisioningStrategy.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/NoopProvisioningStrategy.java similarity index 91% rename from indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/NoopProvisioningStrategy.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/NoopProvisioningStrategy.java index 3f0d3d32e509..8aea9a5387c4 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/NoopProvisioningStrategy.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/NoopProvisioningStrategy.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.indexing.overlord.autoscaling; +package org.apache.druid.indexing.overlord.autoscaling; -import io.druid.indexing.overlord.TaskRunner; +import org.apache.druid.indexing.overlord.TaskRunner; public class NoopProvisioningStrategy implements ProvisioningStrategy { diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/PendingTaskBasedWorkerProvisioningConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/PendingTaskBasedWorkerProvisioningConfig.java similarity index 97% rename from indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/PendingTaskBasedWorkerProvisioningConfig.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/PendingTaskBasedWorkerProvisioningConfig.java index b382a25e196d..3ef70e936788 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/PendingTaskBasedWorkerProvisioningConfig.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/PendingTaskBasedWorkerProvisioningConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.autoscaling; +package org.apache.druid.indexing.overlord.autoscaling; import com.fasterxml.jackson.annotation.JsonProperty; import org.joda.time.Period; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/PendingTaskBasedWorkerProvisioningStrategy.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/PendingTaskBasedWorkerProvisioningStrategy.java similarity index 96% rename from indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/PendingTaskBasedWorkerProvisioningStrategy.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/PendingTaskBasedWorkerProvisioningStrategy.java index 26326c101284..a0f7e91cfd44 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/PendingTaskBasedWorkerProvisioningStrategy.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/PendingTaskBasedWorkerProvisioningStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.autoscaling; +package org.apache.druid.indexing.overlord.autoscaling; import com.google.common.base.Function; import com.google.common.base.Joiner; @@ -30,17 +30,17 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.inject.Inject; -import io.druid.java.util.common.concurrent.ScheduledExecutors; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.ImmutableWorkerInfo; -import io.druid.indexing.overlord.WorkerTaskRunner; -import io.druid.indexing.overlord.config.WorkerTaskRunnerConfig; -import io.druid.indexing.overlord.setup.DefaultWorkerBehaviorConfig; -import io.druid.indexing.overlord.setup.WorkerBehaviorConfig; -import io.druid.indexing.overlord.setup.WorkerSelectStrategy; -import io.druid.indexing.worker.Worker; -import io.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.concurrent.ScheduledExecutors; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.ImmutableWorkerInfo; +import org.apache.druid.indexing.overlord.WorkerTaskRunner; +import org.apache.druid.indexing.overlord.config.WorkerTaskRunnerConfig; +import org.apache.druid.indexing.overlord.setup.DefaultWorkerBehaviorConfig; +import org.apache.druid.indexing.overlord.setup.WorkerBehaviorConfig; +import org.apache.druid.indexing.overlord.setup.WorkerSelectStrategy; +import org.apache.druid.indexing.worker.Worker; +import org.apache.druid.java.util.common.DateTimes; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/Provisioner.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/Provisioner.java similarity index 89% rename from indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/Provisioner.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/Provisioner.java index 5141a49f70a6..1c87fa4e4ee5 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/Provisioner.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/Provisioner.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.indexing.overlord.autoscaling; +package org.apache.druid.indexing.overlord.autoscaling; -import io.druid.guice.annotations.PublicApi; +import org.apache.druid.guice.annotations.PublicApi; @PublicApi public interface Provisioner diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ProvisioningSchedulerConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ProvisioningSchedulerConfig.java similarity index 93% rename from indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ProvisioningSchedulerConfig.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ProvisioningSchedulerConfig.java index 25f29f099653..8f7ec18d06f1 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ProvisioningSchedulerConfig.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ProvisioningSchedulerConfig.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.indexing.overlord.autoscaling; +package org.apache.druid.indexing.overlord.autoscaling; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.DateTimes; import org.joda.time.DateTime; import org.joda.time.Period; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ProvisioningService.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ProvisioningService.java similarity index 93% rename from indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ProvisioningService.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ProvisioningService.java index 1675eaa3f77f..b59dbbaf80d2 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ProvisioningService.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ProvisioningService.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.indexing.overlord.autoscaling; +package org.apache.druid.indexing.overlord.autoscaling; -import io.druid.guice.annotations.PublicApi; +import org.apache.druid.guice.annotations.PublicApi; import java.io.Closeable; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ProvisioningStrategy.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ProvisioningStrategy.java similarity index 88% rename from indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ProvisioningStrategy.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ProvisioningStrategy.java index 399533f49e48..1f940fd2e442 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ProvisioningStrategy.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ProvisioningStrategy.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.indexing.overlord.autoscaling; +package org.apache.druid.indexing.overlord.autoscaling; -import io.druid.guice.annotations.ExtensionPoint; -import io.druid.indexing.overlord.TaskRunner; +import org.apache.druid.guice.annotations.ExtensionPoint; +import org.apache.druid.indexing.overlord.TaskRunner; /** * In general, the resource management is tied to the runner. diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ProvisioningUtil.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ProvisioningUtil.java similarity index 92% rename from indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ProvisioningUtil.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ProvisioningUtil.java index e9ae04a2077a..399abf46bbed 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ProvisioningUtil.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ProvisioningUtil.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.indexing.overlord.autoscaling; +package org.apache.druid.indexing.overlord.autoscaling; import com.google.common.base.Predicate; -import io.druid.indexing.overlord.ImmutableWorkerInfo; -import io.druid.java.util.common.ISE; +import org.apache.druid.indexing.overlord.ImmutableWorkerInfo; +import org.apache.druid.java.util.common.ISE; public class ProvisioningUtil { diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ScalingStats.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ScalingStats.java similarity index 95% rename from indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ScalingStats.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ScalingStats.java index db16054652bf..d04f8e0c2efe 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ScalingStats.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ScalingStats.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.indexing.overlord.autoscaling; +package org.apache.druid.indexing.overlord.autoscaling; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; import com.google.common.collect.Lists; import com.google.common.collect.MinMaxPriorityQueue; import com.google.common.collect.Ordering; -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.Collections; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/SimpleWorkerProvisioningConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/SimpleWorkerProvisioningConfig.java similarity index 97% rename from indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/SimpleWorkerProvisioningConfig.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/SimpleWorkerProvisioningConfig.java index fdd2d123790e..c395ea735929 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/SimpleWorkerProvisioningConfig.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/SimpleWorkerProvisioningConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.autoscaling; +package org.apache.druid.indexing.overlord.autoscaling; import com.fasterxml.jackson.annotation.JsonProperty; import org.joda.time.Period; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/SimpleWorkerProvisioningStrategy.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/SimpleWorkerProvisioningStrategy.java similarity index 95% rename from indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/SimpleWorkerProvisioningStrategy.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/SimpleWorkerProvisioningStrategy.java index e19377df56d2..690795404802 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/SimpleWorkerProvisioningStrategy.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/SimpleWorkerProvisioningStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.autoscaling; +package org.apache.druid.indexing.overlord.autoscaling; import com.google.common.base.Function; import com.google.common.base.Joiner; @@ -29,15 +29,15 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.inject.Inject; -import io.druid.java.util.common.concurrent.ScheduledExecutors; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.indexing.overlord.ImmutableWorkerInfo; -import io.druid.indexing.overlord.TaskRunnerWorkItem; -import io.druid.indexing.overlord.WorkerTaskRunner; -import io.druid.indexing.overlord.setup.WorkerBehaviorConfig; -import io.druid.indexing.overlord.setup.DefaultWorkerBehaviorConfig; -import io.druid.indexing.worker.Worker; -import io.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.concurrent.ScheduledExecutors; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.indexing.overlord.ImmutableWorkerInfo; +import org.apache.druid.indexing.overlord.TaskRunnerWorkItem; +import org.apache.druid.indexing.overlord.WorkerTaskRunner; +import org.apache.druid.indexing.overlord.setup.WorkerBehaviorConfig; +import org.apache.druid.indexing.overlord.setup.DefaultWorkerBehaviorConfig; +import org.apache.druid.indexing.worker.Worker; +import org.apache.druid.java.util.common.DateTimes; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/EC2AutoScaler.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/EC2AutoScaler.java similarity index 96% rename from indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/EC2AutoScaler.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/EC2AutoScaler.java index b438ec690303..e69399ac9643 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/EC2AutoScaler.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/EC2AutoScaler.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.autoscaling.ec2; +package org.apache.druid.indexing.overlord.autoscaling.ec2; import com.amazonaws.services.ec2.AmazonEC2; import com.amazonaws.services.ec2.model.DescribeInstancesRequest; @@ -36,10 +36,10 @@ import com.google.common.base.Function; import com.google.common.collect.FluentIterable; import com.google.common.collect.Lists; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.indexing.overlord.autoscaling.AutoScaler; -import io.druid.indexing.overlord.autoscaling.AutoScalingData; -import io.druid.indexing.overlord.autoscaling.SimpleWorkerProvisioningConfig; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.indexing.overlord.autoscaling.AutoScaler; +import org.apache.druid.indexing.overlord.autoscaling.AutoScalingData; +import org.apache.druid.indexing.overlord.autoscaling.SimpleWorkerProvisioningConfig; import java.util.List; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/EC2EnvironmentConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/EC2EnvironmentConfig.java similarity index 97% rename from indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/EC2EnvironmentConfig.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/EC2EnvironmentConfig.java index a7b2dbe4f844..663a737bfd9f 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/EC2EnvironmentConfig.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/EC2EnvironmentConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.autoscaling.ec2; +package org.apache.druid.indexing.overlord.autoscaling.ec2; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/EC2IamProfileData.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/EC2IamProfileData.java similarity index 97% rename from indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/EC2IamProfileData.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/EC2IamProfileData.java index 433e2c0218da..14d2b91f0d74 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/EC2IamProfileData.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/EC2IamProfileData.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.autoscaling.ec2; +package org.apache.druid.indexing.overlord.autoscaling.ec2; import com.amazonaws.services.ec2.model.IamInstanceProfileSpecification; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/EC2NodeData.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/EC2NodeData.java similarity index 98% rename from indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/EC2NodeData.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/EC2NodeData.java index 8152643cfc04..2e5c63415f3d 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/EC2NodeData.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/EC2NodeData.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.autoscaling.ec2; +package org.apache.druid.indexing.overlord.autoscaling.ec2; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/EC2UserData.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/EC2UserData.java similarity index 96% rename from indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/EC2UserData.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/EC2UserData.java index 4945e2a0240b..1e31274a8734 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/EC2UserData.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/EC2UserData.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.autoscaling.ec2; +package org.apache.druid.indexing.overlord.autoscaling.ec2; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/GalaxyEC2UserData.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/GalaxyEC2UserData.java similarity index 96% rename from indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/GalaxyEC2UserData.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/GalaxyEC2UserData.java index 59746ad7f7fa..a57971b91608 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/GalaxyEC2UserData.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/GalaxyEC2UserData.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.indexing.overlord.autoscaling.ec2; +package org.apache.druid.indexing.overlord.autoscaling.ec2; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Throwables; -import io.druid.guice.annotations.Json; +import org.apache.druid.guice.annotations.Json; import org.apache.commons.codec.binary.Base64; /** diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/StringEC2UserData.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/StringEC2UserData.java similarity index 96% rename from indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/StringEC2UserData.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/StringEC2UserData.java index 460c22e2852b..e1863751375f 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/StringEC2UserData.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/StringEC2UserData.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.indexing.overlord.autoscaling.ec2; +package org.apache.druid.indexing.overlord.autoscaling.ec2; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import org.apache.commons.codec.binary.Base64; public class StringEC2UserData implements EC2UserData diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/config/ForkingTaskRunnerConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/config/ForkingTaskRunnerConfig.java similarity index 95% rename from indexing-service/src/main/java/io/druid/indexing/overlord/config/ForkingTaskRunnerConfig.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/config/ForkingTaskRunnerConfig.java index 4c1bfd1391a3..a8355cfd2c7b 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/config/ForkingTaskRunnerConfig.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/config/ForkingTaskRunnerConfig.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.indexing.overlord.config; +package org.apache.druid.indexing.overlord.config; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.druid.guice.IndexingServiceModuleHelper; +import org.apache.druid.guice.IndexingServiceModuleHelper; import javax.validation.constraints.Max; import javax.validation.constraints.Min; @@ -67,7 +67,7 @@ public class ForkingTaskRunnerConfig List allowedPrefixes = Lists.newArrayList( "com.metamx", "druid", - "io.druid", + "org.apache.druid", "user.timezone", "file.encoding", "java.io.tmpdir", diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/config/HttpRemoteTaskRunnerConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/config/HttpRemoteTaskRunnerConfig.java similarity index 97% rename from indexing-service/src/main/java/io/druid/indexing/overlord/config/HttpRemoteTaskRunnerConfig.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/config/HttpRemoteTaskRunnerConfig.java index 47e435793ae8..b0d91bc511f2 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/config/HttpRemoteTaskRunnerConfig.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/config/HttpRemoteTaskRunnerConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.config; +package org.apache.druid.indexing.overlord.config; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/config/RemoteTaskRunnerConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/config/RemoteTaskRunnerConfig.java similarity index 98% rename from indexing-service/src/main/java/io/druid/indexing/overlord/config/RemoteTaskRunnerConfig.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/config/RemoteTaskRunnerConfig.java index cb3b606104c6..9d6ad7919783 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/config/RemoteTaskRunnerConfig.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/config/RemoteTaskRunnerConfig.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.indexing.overlord.config; +package org.apache.druid.indexing.overlord.config; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.curator.CuratorUtils; +import org.apache.druid.curator.CuratorUtils; import org.joda.time.Period; import javax.validation.constraints.Max; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/config/TaskQueueConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/config/TaskQueueConfig.java similarity index 97% rename from indexing-service/src/main/java/io/druid/indexing/overlord/config/TaskQueueConfig.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/config/TaskQueueConfig.java index 4d5a3655803a..27f50d4937cf 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/config/TaskQueueConfig.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/config/TaskQueueConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.config; +package org.apache.druid.indexing.overlord.config; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/config/WorkerTaskRunnerConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/config/WorkerTaskRunnerConfig.java similarity index 95% rename from indexing-service/src/main/java/io/druid/indexing/overlord/config/WorkerTaskRunnerConfig.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/config/WorkerTaskRunnerConfig.java index b4fd04b5169b..c7f13454f068 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/config/WorkerTaskRunnerConfig.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/config/WorkerTaskRunnerConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.config; +package org.apache.druid.indexing.overlord.config; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/helpers/OverlordHelper.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/helpers/OverlordHelper.java similarity index 94% rename from indexing-service/src/main/java/io/druid/indexing/overlord/helpers/OverlordHelper.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/helpers/OverlordHelper.java index 77dcd2e69c42..b86e02db390e 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/helpers/OverlordHelper.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/helpers/OverlordHelper.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.helpers; +package org.apache.druid.indexing.overlord.helpers; import java.util.concurrent.ScheduledExecutorService; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/helpers/OverlordHelperManager.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/helpers/OverlordHelperManager.java similarity index 88% rename from indexing-service/src/main/java/io/druid/indexing/overlord/helpers/OverlordHelperManager.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/helpers/OverlordHelperManager.java index b456d69a83ca..e6e08befe441 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/helpers/OverlordHelperManager.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/helpers/OverlordHelperManager.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.indexing.overlord.helpers; +package org.apache.druid.indexing.overlord.helpers; import com.google.inject.Inject; -import io.druid.java.util.common.concurrent.ScheduledExecutorFactory; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.concurrent.ScheduledExecutorFactory; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.common.logger.Logger; import java.util.Set; import java.util.concurrent.ScheduledExecutorService; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/helpers/TaskLogAutoCleaner.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/helpers/TaskLogAutoCleaner.java similarity index 90% rename from indexing-service/src/main/java/io/druid/indexing/overlord/helpers/TaskLogAutoCleaner.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/helpers/TaskLogAutoCleaner.java index c86b34d96c8c..18da374fae71 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/helpers/TaskLogAutoCleaner.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/helpers/TaskLogAutoCleaner.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.indexing.overlord.helpers; +package org.apache.druid.indexing.overlord.helpers; import com.google.inject.Inject; -import io.druid.java.util.common.concurrent.ScheduledExecutors; -import io.druid.java.util.common.logger.Logger; -import io.druid.tasklogs.TaskLogKiller; +import org.apache.druid.java.util.common.concurrent.ScheduledExecutors; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.tasklogs.TaskLogKiller; import org.joda.time.Duration; import java.util.concurrent.ScheduledExecutorService; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/helpers/TaskLogAutoCleanerConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/helpers/TaskLogAutoCleanerConfig.java similarity index 98% rename from indexing-service/src/main/java/io/druid/indexing/overlord/helpers/TaskLogAutoCleanerConfig.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/helpers/TaskLogAutoCleanerConfig.java index 6a2af2565d7a..a9a990db9bbc 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/helpers/TaskLogAutoCleanerConfig.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/helpers/TaskLogAutoCleanerConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.helpers; +package org.apache.druid.indexing.overlord.helpers; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/hrtr/HttpRemoteTaskRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/hrtr/HttpRemoteTaskRunner.java similarity index 95% rename from indexing-service/src/main/java/io/druid/indexing/overlord/hrtr/HttpRemoteTaskRunner.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/hrtr/HttpRemoteTaskRunner.java index 42f8d5c22e36..ae8cd0ddd86c 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/hrtr/HttpRemoteTaskRunner.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/hrtr/HttpRemoteTaskRunner.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.hrtr; +package org.apache.druid.indexing.overlord.hrtr; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Joiner; @@ -36,45 +36,45 @@ import com.google.common.util.concurrent.ListenableScheduledFuture; import com.google.common.util.concurrent.ListeningScheduledExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.concurrent.LifecycleLock; -import io.druid.discovery.DiscoveryDruidNode; -import io.druid.discovery.DruidNodeDiscovery; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.discovery.WorkerNodeService; -import io.druid.indexer.RunnerTaskState; -import io.druid.indexer.TaskLocation; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.ImmutableWorkerInfo; -import io.druid.indexing.overlord.RemoteTaskRunnerWorkItem; -import io.druid.indexing.overlord.TaskRunnerListener; -import io.druid.indexing.overlord.TaskRunnerUtils; -import io.druid.indexing.overlord.TaskRunnerWorkItem; -import io.druid.indexing.overlord.TaskStorage; -import io.druid.indexing.overlord.WorkerTaskRunner; -import io.druid.indexing.overlord.autoscaling.ProvisioningService; -import io.druid.indexing.overlord.autoscaling.ProvisioningStrategy; -import io.druid.indexing.overlord.autoscaling.ScalingStats; -import io.druid.indexing.overlord.config.HttpRemoteTaskRunnerConfig; -import io.druid.indexing.overlord.config.WorkerTaskRunnerConfig; -import io.druid.indexing.overlord.setup.WorkerBehaviorConfig; -import io.druid.indexing.overlord.setup.WorkerSelectStrategy; -import io.druid.indexing.worker.TaskAnnouncement; -import io.druid.indexing.worker.Worker; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.concurrent.ScheduledExecutors; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.Request; -import io.druid.java.util.http.client.response.InputStreamResponseHandler; -import io.druid.server.initialization.IndexerZkConfig; -import io.druid.tasklogs.TaskLogStreamer; +import org.apache.druid.concurrent.LifecycleLock; +import org.apache.druid.discovery.DiscoveryDruidNode; +import org.apache.druid.discovery.DruidNodeDiscovery; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.discovery.WorkerNodeService; +import org.apache.druid.indexer.RunnerTaskState; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.ImmutableWorkerInfo; +import org.apache.druid.indexing.overlord.RemoteTaskRunnerWorkItem; +import org.apache.druid.indexing.overlord.TaskRunnerListener; +import org.apache.druid.indexing.overlord.TaskRunnerUtils; +import org.apache.druid.indexing.overlord.TaskRunnerWorkItem; +import org.apache.druid.indexing.overlord.TaskStorage; +import org.apache.druid.indexing.overlord.WorkerTaskRunner; +import org.apache.druid.indexing.overlord.autoscaling.ProvisioningService; +import org.apache.druid.indexing.overlord.autoscaling.ProvisioningStrategy; +import org.apache.druid.indexing.overlord.autoscaling.ScalingStats; +import org.apache.druid.indexing.overlord.config.HttpRemoteTaskRunnerConfig; +import org.apache.druid.indexing.overlord.config.WorkerTaskRunnerConfig; +import org.apache.druid.indexing.overlord.setup.WorkerBehaviorConfig; +import org.apache.druid.indexing.overlord.setup.WorkerSelectStrategy; +import org.apache.druid.indexing.worker.TaskAnnouncement; +import org.apache.druid.indexing.worker.Worker; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.concurrent.ScheduledExecutors; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.Request; +import org.apache.druid.java.util.http.client.response.InputStreamResponseHandler; +import org.apache.druid.server.initialization.IndexerZkConfig; +import org.apache.druid.tasklogs.TaskLogStreamer; import org.apache.curator.framework.CuratorFramework; import org.apache.zookeeper.KeeperException; import org.jboss.netty.handler.codec.http.HttpMethod; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/hrtr/HttpRemoteTaskRunnerFactory.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/hrtr/HttpRemoteTaskRunnerFactory.java similarity index 79% rename from indexing-service/src/main/java/io/druid/indexing/overlord/hrtr/HttpRemoteTaskRunnerFactory.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/hrtr/HttpRemoteTaskRunnerFactory.java index 7e043c259729..70c1e1080073 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/hrtr/HttpRemoteTaskRunnerFactory.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/hrtr/HttpRemoteTaskRunnerFactory.java @@ -17,23 +17,23 @@ * under the License. */ -package io.druid.indexing.overlord.hrtr; +package org.apache.druid.indexing.overlord.hrtr; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Supplier; import com.google.inject.Inject; -import io.druid.java.util.http.client.HttpClient; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.guice.annotations.EscalatedGlobal; -import io.druid.guice.annotations.Smile; -import io.druid.indexing.overlord.TaskRunnerFactory; -import io.druid.indexing.overlord.TaskStorage; -import io.druid.indexing.overlord.autoscaling.NoopProvisioningStrategy; -import io.druid.indexing.overlord.autoscaling.ProvisioningSchedulerConfig; -import io.druid.indexing.overlord.autoscaling.ProvisioningStrategy; -import io.druid.indexing.overlord.config.HttpRemoteTaskRunnerConfig; -import io.druid.indexing.overlord.setup.WorkerBehaviorConfig; -import io.druid.server.initialization.IndexerZkConfig; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.guice.annotations.EscalatedGlobal; +import org.apache.druid.guice.annotations.Smile; +import org.apache.druid.indexing.overlord.TaskRunnerFactory; +import org.apache.druid.indexing.overlord.TaskStorage; +import org.apache.druid.indexing.overlord.autoscaling.NoopProvisioningStrategy; +import org.apache.druid.indexing.overlord.autoscaling.ProvisioningSchedulerConfig; +import org.apache.druid.indexing.overlord.autoscaling.ProvisioningStrategy; +import org.apache.druid.indexing.overlord.config.HttpRemoteTaskRunnerConfig; +import org.apache.druid.indexing.overlord.setup.WorkerBehaviorConfig; +import org.apache.druid.server.initialization.IndexerZkConfig; import org.apache.curator.framework.CuratorFramework; /** diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/hrtr/HttpRemoteTaskRunnerResource.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/hrtr/HttpRemoteTaskRunnerResource.java similarity index 92% rename from indexing-service/src/main/java/io/druid/indexing/overlord/hrtr/HttpRemoteTaskRunnerResource.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/hrtr/HttpRemoteTaskRunnerResource.java index 7181950b29c3..0266ba4beb21 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/hrtr/HttpRemoteTaskRunnerResource.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/hrtr/HttpRemoteTaskRunnerResource.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.indexing.overlord.hrtr; +package org.apache.druid.indexing.overlord.hrtr; import com.google.common.base.Optional; import com.google.inject.Inject; import com.sun.jersey.spi.container.ResourceFilters; -import io.druid.indexing.overlord.TaskMaster; -import io.druid.indexing.overlord.TaskRunner; -import io.druid.server.http.security.StateResourceFilter; +import org.apache.druid.indexing.overlord.TaskMaster; +import org.apache.druid.indexing.overlord.TaskRunner; +import org.apache.druid.server.http.security.StateResourceFilter; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/hrtr/WorkerHolder.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/hrtr/WorkerHolder.java similarity index 93% rename from indexing-service/src/main/java/io/druid/indexing/overlord/hrtr/WorkerHolder.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/hrtr/WorkerHolder.java index aef6c2a0e418..c289a7c8563e 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/hrtr/WorkerHolder.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/hrtr/WorkerHolder.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.hrtr; +package org.apache.druid.indexing.overlord.hrtr; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -25,24 +25,24 @@ import com.google.common.base.Preconditions; import com.google.common.base.Throwables; import com.google.common.collect.Sets; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.ImmutableWorkerInfo; -import io.druid.indexing.overlord.config.HttpRemoteTaskRunnerConfig; -import io.druid.indexing.worker.TaskAnnouncement; -import io.druid.indexing.worker.Worker; -import io.druid.indexing.worker.WorkerHistoryItem; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.RE; -import io.druid.java.util.common.RetryUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.Request; -import io.druid.java.util.http.client.response.StatusResponseHandler; -import io.druid.java.util.http.client.response.StatusResponseHolder; -import io.druid.server.coordination.ChangeRequestHttpSyncer; -import io.druid.server.coordination.ChangeRequestsSnapshot; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.ImmutableWorkerInfo; +import org.apache.druid.indexing.overlord.config.HttpRemoteTaskRunnerConfig; +import org.apache.druid.indexing.worker.TaskAnnouncement; +import org.apache.druid.indexing.worker.Worker; +import org.apache.druid.indexing.worker.WorkerHistoryItem; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.java.util.common.RetryUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.Request; +import org.apache.druid.java.util.http.client.response.StatusResponseHandler; +import org.apache.druid.java.util.http.client.response.StatusResponseHolder; +import org.apache.druid.server.coordination.ChangeRequestHttpSyncer; +import org.apache.druid.server.coordination.ChangeRequestsSnapshot; import org.jboss.netty.handler.codec.http.HttpHeaders; import org.jboss.netty.handler.codec.http.HttpMethod; import org.joda.time.DateTime; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/http/OverlordRedirectInfo.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/OverlordRedirectInfo.java similarity index 90% rename from indexing-service/src/main/java/io/druid/indexing/overlord/http/OverlordRedirectInfo.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/OverlordRedirectInfo.java index a6bb8a3e869e..d112cb5b85e8 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/http/OverlordRedirectInfo.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/OverlordRedirectInfo.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.indexing.overlord.http; +package org.apache.druid.indexing.overlord.http; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableSet; import com.google.inject.Inject; -import io.druid.indexing.overlord.TaskMaster; -import io.druid.java.util.common.StringUtils; -import io.druid.server.http.RedirectInfo; +import org.apache.druid.indexing.overlord.TaskMaster; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.server.http.RedirectInfo; import java.net.URL; import java.util.Set; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/http/OverlordResource.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/OverlordResource.java similarity index 93% rename from indexing-service/src/main/java/io/druid/indexing/overlord/http/OverlordResource.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/OverlordResource.java index 3425a87b35a1..7d5b3141588d 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/http/OverlordResource.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/OverlordResource.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.http; +package org.apache.druid.indexing.overlord.http; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -30,47 +30,47 @@ import com.google.common.util.concurrent.SettableFuture; import com.google.inject.Inject; import com.sun.jersey.spi.container.ResourceFilters; -import io.druid.audit.AuditEntry; -import io.druid.audit.AuditInfo; -import io.druid.audit.AuditManager; -import io.druid.common.config.ConfigManager.SetResult; -import io.druid.common.config.JacksonConfigManager; -import io.druid.indexer.RunnerTaskState; -import io.druid.indexer.TaskInfo; -import io.druid.indexer.TaskLocation; -import io.druid.indexer.TaskState; -import io.druid.indexer.TaskStatus; -import io.druid.indexer.TaskStatusPlus; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.indexing.common.actions.TaskActionHolder; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.IndexerMetadataStorageAdapter; -import io.druid.indexing.overlord.TaskMaster; -import io.druid.indexing.overlord.TaskQueue; -import io.druid.indexing.overlord.TaskRunner; -import io.druid.indexing.overlord.TaskRunnerWorkItem; -import io.druid.indexing.overlord.TaskStorageQueryAdapter; -import io.druid.indexing.overlord.WorkerTaskRunner; -import io.druid.indexing.overlord.autoscaling.ScalingStats; -import io.druid.indexing.overlord.http.security.TaskResourceFilter; -import io.druid.indexing.overlord.setup.WorkerBehaviorConfig; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.metadata.EntryExistsException; -import io.druid.server.http.security.ConfigResourceFilter; -import io.druid.server.http.security.StateResourceFilter; -import io.druid.server.security.Access; -import io.druid.server.security.Action; -import io.druid.server.security.AuthorizationUtils; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.ForbiddenException; -import io.druid.server.security.Resource; -import io.druid.server.security.ResourceAction; -import io.druid.server.security.ResourceType; -import io.druid.tasklogs.TaskLogStreamer; -import io.druid.timeline.DataSegment; +import org.apache.druid.audit.AuditEntry; +import org.apache.druid.audit.AuditInfo; +import org.apache.druid.audit.AuditManager; +import org.apache.druid.common.config.ConfigManager.SetResult; +import org.apache.druid.common.config.JacksonConfigManager; +import org.apache.druid.indexer.RunnerTaskState; +import org.apache.druid.indexer.TaskInfo; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexer.TaskState; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexer.TaskStatusPlus; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.indexing.common.actions.TaskActionHolder; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.IndexerMetadataStorageAdapter; +import org.apache.druid.indexing.overlord.TaskMaster; +import org.apache.druid.indexing.overlord.TaskQueue; +import org.apache.druid.indexing.overlord.TaskRunner; +import org.apache.druid.indexing.overlord.TaskRunnerWorkItem; +import org.apache.druid.indexing.overlord.TaskStorageQueryAdapter; +import org.apache.druid.indexing.overlord.WorkerTaskRunner; +import org.apache.druid.indexing.overlord.autoscaling.ScalingStats; +import org.apache.druid.indexing.overlord.http.security.TaskResourceFilter; +import org.apache.druid.indexing.overlord.setup.WorkerBehaviorConfig; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.metadata.EntryExistsException; +import org.apache.druid.server.http.security.ConfigResourceFilter; +import org.apache.druid.server.http.security.StateResourceFilter; +import org.apache.druid.server.security.Access; +import org.apache.druid.server.security.Action; +import org.apache.druid.server.security.AuthorizationUtils; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.ForbiddenException; +import org.apache.druid.server.security.Resource; +import org.apache.druid.server.security.ResourceAction; +import org.apache.druid.server.security.ResourceType; +import org.apache.druid.tasklogs.TaskLogStreamer; +import org.apache.druid.timeline.DataSegment; import org.joda.time.DateTime; import org.joda.time.Duration; import org.joda.time.Interval; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/http/TaskPayloadResponse.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/TaskPayloadResponse.java similarity index 95% rename from indexing-service/src/main/java/io/druid/indexing/overlord/http/TaskPayloadResponse.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/TaskPayloadResponse.java index 6115a6ab1220..b73f9d9f2e5e 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/http/TaskPayloadResponse.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/TaskPayloadResponse.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.indexing.overlord.http; +package org.apache.druid.indexing.overlord.http; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.indexing.common.task.Task; +import org.apache.druid.indexing.common.task.Task; import java.util.Objects; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/http/TaskStatusResponse.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/TaskStatusResponse.java similarity index 95% rename from indexing-service/src/main/java/io/druid/indexing/overlord/http/TaskStatusResponse.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/TaskStatusResponse.java index 6ce9ef680f82..82e3335c7e26 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/http/TaskStatusResponse.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/TaskStatusResponse.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.indexing.overlord.http; +package org.apache.druid.indexing.overlord.http; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.indexer.TaskStatusPlus; +import org.apache.druid.indexer.TaskStatusPlus; import javax.annotation.Nullable; import java.util.Objects; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/http/security/SupervisorResourceFilter.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/security/SupervisorResourceFilter.java similarity index 85% rename from indexing-service/src/main/java/io/druid/indexing/overlord/http/security/SupervisorResourceFilter.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/security/SupervisorResourceFilter.java index 23f2cac38a36..1c2fb9386a99 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/http/security/SupervisorResourceFilter.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/security/SupervisorResourceFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.http.security; +package org.apache.druid.indexing.overlord.http.security; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -27,16 +27,16 @@ import com.google.common.collect.Iterables; import com.google.inject.Inject; import com.sun.jersey.spi.container.ContainerRequest; -import io.druid.indexing.overlord.supervisor.SupervisorManager; -import io.druid.indexing.overlord.supervisor.SupervisorSpec; -import io.druid.java.util.common.StringUtils; -import io.druid.server.http.security.AbstractResourceFilter; -import io.druid.server.security.Access; -import io.druid.server.security.Action; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.AuthorizationUtils; -import io.druid.server.security.ForbiddenException; -import io.druid.server.security.ResourceAction; +import org.apache.druid.indexing.overlord.supervisor.SupervisorManager; +import org.apache.druid.indexing.overlord.supervisor.SupervisorSpec; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.server.http.security.AbstractResourceFilter; +import org.apache.druid.server.security.Access; +import org.apache.druid.server.security.Action; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.AuthorizationUtils; +import org.apache.druid.server.security.ForbiddenException; +import org.apache.druid.server.security.ResourceAction; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.PathSegment; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/http/security/TaskResourceFilter.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/security/TaskResourceFilter.java similarity index 84% rename from indexing-service/src/main/java/io/druid/indexing/overlord/http/security/TaskResourceFilter.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/security/TaskResourceFilter.java index c5d937da725a..12ef0b7b6bde 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/http/security/TaskResourceFilter.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/security/TaskResourceFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.http.security; +package org.apache.druid.indexing.overlord.http.security; import com.google.common.base.Optional; import com.google.common.base.Preconditions; @@ -26,17 +26,17 @@ import com.google.common.collect.Iterables; import com.google.inject.Inject; import com.sun.jersey.spi.container.ContainerRequest; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.TaskStorageQueryAdapter; -import io.druid.java.util.common.StringUtils; -import io.druid.server.http.security.AbstractResourceFilter; -import io.druid.server.security.Access; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.AuthorizationUtils; -import io.druid.server.security.ForbiddenException; -import io.druid.server.security.Resource; -import io.druid.server.security.ResourceAction; -import io.druid.server.security.ResourceType; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.TaskStorageQueryAdapter; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.server.http.security.AbstractResourceFilter; +import org.apache.druid.server.security.Access; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.AuthorizationUtils; +import org.apache.druid.server.security.ForbiddenException; +import org.apache.druid.server.security.Resource; +import org.apache.druid.server.security.ResourceAction; +import org.apache.druid.server.security.ResourceType; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.PathSegment; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/setup/AffinityConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/AffinityConfig.java similarity index 98% rename from indexing-service/src/main/java/io/druid/indexing/overlord/setup/AffinityConfig.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/AffinityConfig.java index 8acc300cc372..226b853f1580 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/setup/AffinityConfig.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/AffinityConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.setup; +package org.apache.druid.indexing.overlord.setup; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/setup/DefaultWorkerBehaviorConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/DefaultWorkerBehaviorConfig.java similarity index 93% rename from indexing-service/src/main/java/io/druid/indexing/overlord/setup/DefaultWorkerBehaviorConfig.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/DefaultWorkerBehaviorConfig.java index 7934b2df22f6..99bf90ff18f9 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/setup/DefaultWorkerBehaviorConfig.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/DefaultWorkerBehaviorConfig.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.indexing.overlord.setup; +package org.apache.druid.indexing.overlord.setup; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.indexing.overlord.autoscaling.AutoScaler; -import io.druid.indexing.overlord.autoscaling.NoopAutoScaler; +import org.apache.druid.indexing.overlord.autoscaling.AutoScaler; +import org.apache.druid.indexing.overlord.autoscaling.NoopAutoScaler; /** */ diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/setup/EqualDistributionWithAffinityWorkerSelectStrategy.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/EqualDistributionWithAffinityWorkerSelectStrategy.java similarity index 96% rename from indexing-service/src/main/java/io/druid/indexing/overlord/setup/EqualDistributionWithAffinityWorkerSelectStrategy.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/EqualDistributionWithAffinityWorkerSelectStrategy.java index 1bc50bc68452..6d28ae78fd04 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/setup/EqualDistributionWithAffinityWorkerSelectStrategy.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/EqualDistributionWithAffinityWorkerSelectStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.setup; +package org.apache.druid.indexing.overlord.setup; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/setup/EqualDistributionWorkerSelectStrategy.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/EqualDistributionWorkerSelectStrategy.java similarity index 92% rename from indexing-service/src/main/java/io/druid/indexing/overlord/setup/EqualDistributionWorkerSelectStrategy.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/EqualDistributionWorkerSelectStrategy.java index 56c8e945473e..eb9a3c57909c 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/setup/EqualDistributionWorkerSelectStrategy.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/EqualDistributionWorkerSelectStrategy.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.indexing.overlord.setup; +package org.apache.druid.indexing.overlord.setup; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableMap; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.ImmutableWorkerInfo; -import io.druid.indexing.overlord.config.WorkerTaskRunnerConfig; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.ImmutableWorkerInfo; +import org.apache.druid.indexing.overlord.config.WorkerTaskRunnerConfig; import java.util.Comparator; import java.util.Map; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/setup/FillCapacityWithAffinityWorkerSelectStrategy.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/FillCapacityWithAffinityWorkerSelectStrategy.java similarity index 96% rename from indexing-service/src/main/java/io/druid/indexing/overlord/setup/FillCapacityWithAffinityWorkerSelectStrategy.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/FillCapacityWithAffinityWorkerSelectStrategy.java index 0d7bfe6b852d..46c303f90481 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/setup/FillCapacityWithAffinityWorkerSelectStrategy.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/FillCapacityWithAffinityWorkerSelectStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.setup; +package org.apache.druid.indexing.overlord.setup; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/setup/FillCapacityWorkerSelectStrategy.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/FillCapacityWorkerSelectStrategy.java similarity index 91% rename from indexing-service/src/main/java/io/druid/indexing/overlord/setup/FillCapacityWorkerSelectStrategy.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/FillCapacityWorkerSelectStrategy.java index 41d59d0bdba1..2c82215abff0 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/setup/FillCapacityWorkerSelectStrategy.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/FillCapacityWorkerSelectStrategy.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.indexing.overlord.setup; +package org.apache.druid.indexing.overlord.setup; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableMap; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.ImmutableWorkerInfo; -import io.druid.indexing.overlord.config.WorkerTaskRunnerConfig; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.ImmutableWorkerInfo; +import org.apache.druid.indexing.overlord.config.WorkerTaskRunnerConfig; import java.util.Comparator; import java.util.Map; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/setup/JavaScriptWorkerSelectStrategy.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/JavaScriptWorkerSelectStrategy.java similarity index 92% rename from indexing-service/src/main/java/io/druid/indexing/overlord/setup/JavaScriptWorkerSelectStrategy.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/JavaScriptWorkerSelectStrategy.java index 3f878d289e97..0802c489d153 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/setup/JavaScriptWorkerSelectStrategy.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/JavaScriptWorkerSelectStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.setup; +package org.apache.druid.indexing.overlord.setup; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; @@ -25,10 +25,10 @@ import com.google.common.base.Preconditions; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.ImmutableWorkerInfo; -import io.druid.indexing.overlord.config.WorkerTaskRunnerConfig; -import io.druid.js.JavaScriptConfig; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.ImmutableWorkerInfo; +import org.apache.druid.indexing.overlord.config.WorkerTaskRunnerConfig; +import org.apache.druid.js.JavaScriptConfig; import javax.script.Compilable; import javax.script.Invocable; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/setup/WorkerBehaviorConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/WorkerBehaviorConfig.java similarity index 75% rename from indexing-service/src/main/java/io/druid/indexing/overlord/setup/WorkerBehaviorConfig.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/WorkerBehaviorConfig.java index c0a6c269cb7e..ffc30f55e648 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/setup/WorkerBehaviorConfig.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/WorkerBehaviorConfig.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.indexing.overlord.setup; +package org.apache.druid.indexing.overlord.setup; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.druid.guice.annotations.ExtensionPoint; +import org.apache.druid.guice.annotations.ExtensionPoint; /** - * Outside of {@link io.druid.indexing.overlord.autoscaling.PendingTaskBasedWorkerProvisioningStrategy} and - * {@link io.druid.indexing.overlord.autoscaling.SimpleWorkerProvisioningStrategy}, WorkerBehaviorConfig is used only - * in {@link io.druid.indexing.overlord.TaskRunner}, and only {@link #getSelectStrategy()} method is used. That is why + * Outside of {@link org.apache.druid.indexing.overlord.autoscaling.PendingTaskBasedWorkerProvisioningStrategy} and + * {@link org.apache.druid.indexing.overlord.autoscaling.SimpleWorkerProvisioningStrategy}, WorkerBehaviorConfig is used only + * in {@link org.apache.druid.indexing.overlord.TaskRunner}, and only {@link #getSelectStrategy()} method is used. That is why * the WorkerBehaviorConfig's interface is minimized to just this method. PendingTaskBasedWorkerProvisioningStrategy and * SimpleWorkerProvisioningStrategy are written to work only with {@link DefaultWorkerBehaviorConfig}. Extension-defined * WorkerBehaviorConfig implementations should likely be used with different extension-defined {@link - * io.druid.indexing.overlord.autoscaling.ProvisioningStrategy} implementations as well. + * org.apache.druid.indexing.overlord.autoscaling.ProvisioningStrategy} implementations as well. */ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type", defaultImpl = DefaultWorkerBehaviorConfig.class) @JsonSubTypes(value = { diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/setup/WorkerSelectStrategy.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/WorkerSelectStrategy.java similarity index 84% rename from indexing-service/src/main/java/io/druid/indexing/overlord/setup/WorkerSelectStrategy.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/WorkerSelectStrategy.java index e63d15b2fcd8..fbb8638907d6 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/setup/WorkerSelectStrategy.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/WorkerSelectStrategy.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.indexing.overlord.setup; +package org.apache.druid.indexing.overlord.setup; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.google.common.collect.ImmutableMap; -import io.druid.guice.annotations.PublicApi; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.ImmutableWorkerInfo; -import io.druid.indexing.overlord.config.WorkerTaskRunnerConfig; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.ImmutableWorkerInfo; +import org.apache.druid.indexing.overlord.config.WorkerTaskRunnerConfig; import javax.annotation.Nullable; /** - * The {@link io.druid.indexing.overlord.RemoteTaskRunner} uses this class to select a worker to assign tasks to. + * The {@link org.apache.druid.indexing.overlord.RemoteTaskRunner} uses this class to select a worker to assign tasks to. */ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type", defaultImpl = EqualDistributionWorkerSelectStrategy.class) @JsonSubTypes(value = { diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/setup/WorkerSelectUtils.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/WorkerSelectUtils.java similarity index 94% rename from indexing-service/src/main/java/io/druid/indexing/overlord/setup/WorkerSelectUtils.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/WorkerSelectUtils.java index dc538aee6ccb..c5ccd15bebe7 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/setup/WorkerSelectUtils.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/setup/WorkerSelectUtils.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.indexing.overlord.setup; +package org.apache.druid.indexing.overlord.setup; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.ImmutableWorkerInfo; -import io.druid.indexing.overlord.config.WorkerTaskRunnerConfig; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.ImmutableWorkerInfo; +import org.apache.druid.indexing.overlord.config.WorkerTaskRunnerConfig; import javax.annotation.Nullable; import java.util.Map; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/supervisor/SupervisorManager.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/supervisor/SupervisorManager.java similarity index 95% rename from indexing-service/src/main/java/io/druid/indexing/overlord/supervisor/SupervisorManager.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/supervisor/SupervisorManager.java index 03cc96f5b0b2..b5c24ef913fe 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/supervisor/SupervisorManager.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/supervisor/SupervisorManager.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.indexing.overlord.supervisor; +package org.apache.druid.indexing.overlord.supervisor; import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; import com.google.inject.Inject; -import io.druid.indexing.overlord.DataSourceMetadata; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.metadata.MetadataSupervisorManager; +import org.apache.druid.indexing.overlord.DataSourceMetadata; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.metadata.MetadataSupervisorManager; import javax.annotation.Nullable; import java.util.List; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/supervisor/SupervisorResource.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/supervisor/SupervisorResource.java similarity index 95% rename from indexing-service/src/main/java/io/druid/indexing/overlord/supervisor/SupervisorResource.java rename to indexing-service/src/main/java/org/apache/druid/indexing/overlord/supervisor/SupervisorResource.java index 86083dd507e5..9be9c9fb3b57 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/supervisor/SupervisorResource.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/supervisor/SupervisorResource.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.supervisor; +package org.apache.druid.indexing.overlord.supervisor; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -28,14 +28,14 @@ import com.google.common.collect.Sets; import com.google.inject.Inject; import com.sun.jersey.spi.container.ResourceFilters; -import io.druid.indexing.overlord.TaskMaster; -import io.druid.indexing.overlord.http.security.SupervisorResourceFilter; -import io.druid.java.util.common.StringUtils; -import io.druid.server.security.Access; -import io.druid.server.security.AuthorizationUtils; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.ForbiddenException; -import io.druid.server.security.ResourceAction; +import org.apache.druid.indexing.overlord.TaskMaster; +import org.apache.druid.indexing.overlord.http.security.SupervisorResourceFilter; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.server.security.Access; +import org.apache.druid.server.security.AuthorizationUtils; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.ForbiddenException; +import org.apache.druid.server.security.ResourceAction; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; diff --git a/indexing-service/src/main/java/io/druid/indexing/worker/TaskAnnouncement.java b/indexing-service/src/main/java/org/apache/druid/indexing/worker/TaskAnnouncement.java similarity index 93% rename from indexing-service/src/main/java/io/druid/indexing/worker/TaskAnnouncement.java rename to indexing-service/src/main/java/org/apache/druid/indexing/worker/TaskAnnouncement.java index 7dddfad55030..f99fce8b587a 100644 --- a/indexing-service/src/main/java/io/druid/indexing/worker/TaskAnnouncement.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/worker/TaskAnnouncement.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.indexing.worker; +package org.apache.druid.indexing.worker; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.indexer.TaskLocation; -import io.druid.indexer.TaskState; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.common.task.TaskResource; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexer.TaskState; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.common.task.TaskResource; import javax.annotation.Nullable; diff --git a/indexing-service/src/main/java/io/druid/indexing/worker/Worker.java b/indexing-service/src/main/java/org/apache/druid/indexing/worker/Worker.java similarity index 96% rename from indexing-service/src/main/java/io/druid/indexing/worker/Worker.java rename to indexing-service/src/main/java/org/apache/druid/indexing/worker/Worker.java index 05408ca3fd47..fd141daf2668 100644 --- a/indexing-service/src/main/java/io/druid/indexing/worker/Worker.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/worker/Worker.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.indexing.worker; +package org.apache.druid.indexing.worker; 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; /** * A container for worker metadata. diff --git a/indexing-service/src/main/java/io/druid/indexing/worker/WorkerCuratorCoordinator.java b/indexing-service/src/main/java/org/apache/druid/indexing/worker/WorkerCuratorCoordinator.java similarity index 91% rename from indexing-service/src/main/java/io/druid/indexing/worker/WorkerCuratorCoordinator.java rename to indexing-service/src/main/java/org/apache/druid/indexing/worker/WorkerCuratorCoordinator.java index 06ad11d50ea1..b7c724db0260 100644 --- a/indexing-service/src/main/java/io/druid/indexing/worker/WorkerCuratorCoordinator.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/worker/WorkerCuratorCoordinator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.worker; +package org.apache.druid.indexing.worker; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Joiner; @@ -25,15 +25,15 @@ import com.google.common.collect.Lists; import com.google.common.util.concurrent.MoreExecutors; import com.google.inject.Inject; -import io.druid.curator.CuratorUtils; -import io.druid.curator.announcement.Announcer; -import io.druid.indexing.overlord.config.RemoteTaskRunnerConfig; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.initialization.IndexerZkConfig; +import org.apache.druid.curator.CuratorUtils; +import org.apache.druid.curator.announcement.Announcer; +import org.apache.druid.indexing.overlord.config.RemoteTaskRunnerConfig; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.initialization.IndexerZkConfig; import org.apache.curator.framework.CuratorFramework; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.KeeperException; diff --git a/indexing-service/src/main/java/io/druid/indexing/worker/WorkerHistoryItem.java b/indexing-service/src/main/java/org/apache/druid/indexing/worker/WorkerHistoryItem.java similarity index 98% rename from indexing-service/src/main/java/io/druid/indexing/worker/WorkerHistoryItem.java rename to indexing-service/src/main/java/org/apache/druid/indexing/worker/WorkerHistoryItem.java index 432ba3d53ca9..895056660b40 100644 --- a/indexing-service/src/main/java/io/druid/indexing/worker/WorkerHistoryItem.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/worker/WorkerHistoryItem.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.worker; +package org.apache.druid.indexing.worker; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/indexing-service/src/main/java/io/druid/indexing/worker/WorkerTaskManager.java b/indexing-service/src/main/java/org/apache/druid/indexing/worker/WorkerTaskManager.java similarity index 95% rename from indexing-service/src/main/java/io/druid/indexing/worker/WorkerTaskManager.java rename to indexing-service/src/main/java/org/apache/druid/indexing/worker/WorkerTaskManager.java index e5aced7b726e..a858f88fd7e1 100644 --- a/indexing-service/src/main/java/io/druid/indexing/worker/WorkerTaskManager.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/worker/WorkerTaskManager.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.worker; +package org.apache.druid.indexing.worker; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -31,24 +31,24 @@ import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; import com.google.inject.Inject; -import io.druid.client.indexing.IndexingService; -import io.druid.concurrent.LifecycleLock; -import io.druid.discovery.DruidLeaderClient; -import io.druid.indexer.TaskLocation; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.config.TaskConfig; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.TaskRunner; -import io.druid.indexing.overlord.TaskRunnerListener; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.http.client.response.FullResponseHolder; -import io.druid.server.coordination.ChangeRequestHistory; -import io.druid.server.coordination.ChangeRequestsSnapshot; +import org.apache.druid.client.indexing.IndexingService; +import org.apache.druid.concurrent.LifecycleLock; +import org.apache.druid.discovery.DruidLeaderClient; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.config.TaskConfig; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.TaskRunner; +import org.apache.druid.indexing.overlord.TaskRunnerListener; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.http.client.response.FullResponseHolder; +import org.apache.druid.server.coordination.ChangeRequestHistory; +import org.apache.druid.server.coordination.ChangeRequestsSnapshot; import org.jboss.netty.handler.codec.http.HttpHeaders; import org.jboss.netty.handler.codec.http.HttpMethod; diff --git a/indexing-service/src/main/java/io/druid/indexing/worker/WorkerTaskMonitor.java b/indexing-service/src/main/java/org/apache/druid/indexing/worker/WorkerTaskMonitor.java similarity index 89% rename from indexing-service/src/main/java/io/druid/indexing/worker/WorkerTaskMonitor.java rename to indexing-service/src/main/java/org/apache/druid/indexing/worker/WorkerTaskMonitor.java index 048e75a80b55..1760d1ff8664 100644 --- a/indexing-service/src/main/java/io/druid/indexing/worker/WorkerTaskMonitor.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/worker/WorkerTaskMonitor.java @@ -17,30 +17,30 @@ * under the License. */ -package io.druid.indexing.worker; +package org.apache.druid.indexing.worker; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; import com.google.inject.Inject; -import io.druid.client.indexing.IndexingService; -import io.druid.discovery.DruidLeaderClient; -import io.druid.indexer.TaskLocation; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.config.TaskConfig; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.TaskRunner; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.client.indexing.IndexingService; +import org.apache.druid.discovery.DruidLeaderClient; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.config.TaskConfig; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.TaskRunner; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.emitter.EmittingLogger; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.recipes.cache.PathChildrenCache; import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent; import org.apache.curator.framework.recipes.cache.PathChildrenCacheListener; /** - * This class is deprecated and required only to support {@link io.druid.indexing.overlord.RemoteTaskRunner}. - * {@link io.druid.indexing.overlord.hrtr.HttpRemoteTaskRunner} should be used instead. + * This class is deprecated and required only to support {@link org.apache.druid.indexing.overlord.RemoteTaskRunner}. + * {@link org.apache.druid.indexing.overlord.hrtr.HttpRemoteTaskRunner} should be used instead. * * The monitor watches ZK at a specified path for new tasks to appear. Upon starting the monitor, a listener will be * created that waits for new tasks. Tasks are executed as soon as they are seen. diff --git a/indexing-service/src/main/java/io/druid/indexing/worker/config/WorkerConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/worker/config/WorkerConfig.java similarity index 93% rename from indexing-service/src/main/java/io/druid/indexing/worker/config/WorkerConfig.java rename to indexing-service/src/main/java/org/apache/druid/indexing/worker/config/WorkerConfig.java index 2e41f205f1cc..11a346926a0b 100644 --- a/indexing-service/src/main/java/io/druid/indexing/worker/config/WorkerConfig.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/worker/config/WorkerConfig.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.indexing.worker.config; +package org.apache.druid.indexing.worker.config; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.server.DruidNode; +import org.apache.druid.server.DruidNode; import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; diff --git a/indexing-service/src/main/java/io/druid/indexing/worker/executor/ExecutorLifecycle.java b/indexing-service/src/main/java/org/apache/druid/indexing/worker/executor/ExecutorLifecycle.java similarity index 91% rename from indexing-service/src/main/java/io/druid/indexing/worker/executor/ExecutorLifecycle.java rename to indexing-service/src/main/java/org/apache/druid/indexing/worker/executor/ExecutorLifecycle.java index b9e310cb005e..a0d4e394f1f4 100644 --- a/indexing-service/src/main/java/io/druid/indexing/worker/executor/ExecutorLifecycle.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/worker/executor/ExecutorLifecycle.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.worker.executor; +package org.apache.druid.indexing.worker.executor; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Function; @@ -26,17 +26,17 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.inject.Inject; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.actions.TaskActionClientFactory; -import io.druid.indexing.common.config.TaskConfig; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.TaskRunner; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.actions.TaskActionClientFactory; +import org.apache.druid.indexing.common.config.TaskConfig; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.TaskRunner; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; import org.apache.commons.io.FileUtils; import java.io.File; diff --git a/indexing-service/src/main/java/io/druid/indexing/worker/executor/ExecutorLifecycleConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/worker/executor/ExecutorLifecycleConfig.java similarity index 95% rename from indexing-service/src/main/java/io/druid/indexing/worker/executor/ExecutorLifecycleConfig.java rename to indexing-service/src/main/java/org/apache/druid/indexing/worker/executor/ExecutorLifecycleConfig.java index f562bc8a4532..15d29f30ff7a 100644 --- a/indexing-service/src/main/java/io/druid/indexing/worker/executor/ExecutorLifecycleConfig.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/worker/executor/ExecutorLifecycleConfig.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.indexing.worker.executor; +package org.apache.druid.indexing.worker.executor; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.ISE; import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; diff --git a/indexing-service/src/main/java/io/druid/indexing/worker/http/TaskManagementResource.java b/indexing-service/src/main/java/org/apache/druid/indexing/worker/http/TaskManagementResource.java similarity index 91% rename from indexing-service/src/main/java/io/druid/indexing/worker/http/TaskManagementResource.java rename to indexing-service/src/main/java/org/apache/druid/indexing/worker/http/TaskManagementResource.java index 249e1f7c6d7a..85f661095989 100644 --- a/indexing-service/src/main/java/io/druid/indexing/worker/http/TaskManagementResource.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/worker/http/TaskManagementResource.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.worker.http; +package org.apache.druid.indexing.worker.http; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.jaxrs.smile.SmileMediaTypes; @@ -26,17 +26,17 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.inject.Inject; import com.sun.jersey.spi.container.ResourceFilters; -import io.druid.guice.annotations.Json; -import io.druid.guice.annotations.Smile; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.hrtr.WorkerHolder; -import io.druid.indexing.worker.WorkerHistoryItem; -import io.druid.indexing.worker.WorkerTaskMonitor; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.server.coordination.ChangeRequestHistory; -import io.druid.server.coordination.ChangeRequestsSnapshot; -import io.druid.server.http.SegmentListerResource; -import io.druid.server.http.security.StateResourceFilter; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.guice.annotations.Smile; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.hrtr.WorkerHolder; +import org.apache.druid.indexing.worker.WorkerHistoryItem; +import org.apache.druid.indexing.worker.WorkerTaskMonitor; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.server.coordination.ChangeRequestHistory; +import org.apache.druid.server.coordination.ChangeRequestsSnapshot; +import org.apache.druid.server.http.SegmentListerResource; +import org.apache.druid.server.http.security.StateResourceFilter; import javax.servlet.AsyncContext; import javax.servlet.AsyncEvent; diff --git a/indexing-service/src/main/java/io/druid/indexing/worker/http/WorkerResource.java b/indexing-service/src/main/java/org/apache/druid/indexing/worker/http/WorkerResource.java similarity index 90% rename from indexing-service/src/main/java/io/druid/indexing/worker/http/WorkerResource.java rename to indexing-service/src/main/java/org/apache/druid/indexing/worker/http/WorkerResource.java index dd834466e453..d37b2bf06f25 100644 --- a/indexing-service/src/main/java/io/druid/indexing/worker/http/WorkerResource.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/worker/http/WorkerResource.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.worker.http; +package org.apache.druid.indexing.worker.http; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -27,16 +27,16 @@ import com.google.common.io.ByteSource; import com.google.inject.Inject; import com.sun.jersey.spi.container.ResourceFilters; -import io.druid.indexing.overlord.TaskRunner; -import io.druid.indexing.overlord.TaskRunnerWorkItem; -import io.druid.indexing.worker.Worker; -import io.druid.indexing.worker.WorkerCuratorCoordinator; -import io.druid.indexing.worker.WorkerTaskMonitor; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.http.security.ConfigResourceFilter; -import io.druid.server.http.security.StateResourceFilter; -import io.druid.tasklogs.TaskLogStreamer; +import org.apache.druid.indexing.overlord.TaskRunner; +import org.apache.druid.indexing.overlord.TaskRunnerWorkItem; +import org.apache.druid.indexing.worker.Worker; +import org.apache.druid.indexing.worker.WorkerCuratorCoordinator; +import org.apache.druid.indexing.worker.WorkerTaskMonitor; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.http.security.ConfigResourceFilter; +import org.apache.druid.server.http.security.StateResourceFilter; +import org.apache.druid.tasklogs.TaskLogStreamer; import javax.ws.rs.DefaultValue; import javax.ws.rs.GET; diff --git a/indexing-service/src/main/java/io/druid/server/initialization/IndexerZkConfig.java b/indexing-service/src/main/java/org/apache/druid/server/initialization/IndexerZkConfig.java similarity index 98% rename from indexing-service/src/main/java/io/druid/server/initialization/IndexerZkConfig.java rename to indexing-service/src/main/java/org/apache/druid/server/initialization/IndexerZkConfig.java index 61d3722678ba..41f245e106ff 100644 --- a/indexing-service/src/main/java/io/druid/server/initialization/IndexerZkConfig.java +++ b/indexing-service/src/main/java/org/apache/druid/server/initialization/IndexerZkConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.initialization; +package org.apache.druid.server.initialization; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/indexing-service/src/test/java/io/druid/indexing/appenderator/ActionBasedUsedSegmentCheckerTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/appenderator/ActionBasedUsedSegmentCheckerTest.java similarity index 90% rename from indexing-service/src/test/java/io/druid/indexing/appenderator/ActionBasedUsedSegmentCheckerTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/appenderator/ActionBasedUsedSegmentCheckerTest.java index 368cbf3768cd..1cb44061197f 100644 --- a/indexing-service/src/test/java/io/druid/indexing/appenderator/ActionBasedUsedSegmentCheckerTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/appenderator/ActionBasedUsedSegmentCheckerTest.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.indexing.appenderator; +package org.apache.druid.indexing.appenderator; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import io.druid.indexing.common.actions.SegmentListUsedAction; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.java.util.common.Intervals; -import io.druid.segment.realtime.appenderator.SegmentIdentifier; -import io.druid.segment.realtime.appenderator.UsedSegmentChecker; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.LinearShardSpec; +import org.apache.druid.indexing.common.actions.SegmentListUsedAction; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.segment.realtime.appenderator.SegmentIdentifier; +import org.apache.druid.segment.realtime.appenderator.UsedSegmentChecker; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.LinearShardSpec; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/IndexingServiceCondition.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/IndexingServiceCondition.java similarity index 95% rename from indexing-service/src/test/java/io/druid/indexing/common/IndexingServiceCondition.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/IndexingServiceCondition.java index d2a2eaf4b072..ec3f732eda2e 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/IndexingServiceCondition.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/IndexingServiceCondition.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common; +package org.apache.druid.indexing.common; /** */ diff --git a/indexing-service/src/test/java/io/druid/indexing/common/RetryPolicyFactoryTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/RetryPolicyFactoryTest.java similarity index 97% rename from indexing-service/src/test/java/io/druid/indexing/common/RetryPolicyFactoryTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/RetryPolicyFactoryTest.java index 043c86e00fab..9ba37fa22d92 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/RetryPolicyFactoryTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/RetryPolicyFactoryTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common; +package org.apache.druid.indexing.common; import org.joda.time.Duration; import org.joda.time.Period; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/RetryPolicyTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/RetryPolicyTest.java similarity index 97% rename from indexing-service/src/test/java/io/druid/indexing/common/RetryPolicyTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/RetryPolicyTest.java index f227e40922bb..f9d69c930bfa 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/RetryPolicyTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/RetryPolicyTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common; +package org.apache.druid.indexing.common; import org.joda.time.Duration; import org.joda.time.Period; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/TaskToolboxTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/TaskToolboxTest.java similarity index 82% rename from indexing-service/src/test/java/io/druid/indexing/common/TaskToolboxTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/TaskToolboxTest.java index abd088f1400e..d9acfd6bd833 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/TaskToolboxTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/TaskToolboxTest.java @@ -17,33 +17,33 @@ * under the License. */ -package io.druid.indexing.common; +package org.apache.druid.indexing.common; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; -import io.druid.client.cache.Cache; -import io.druid.client.cache.CacheConfig; -import io.druid.client.cache.CachePopulatorStats; -import io.druid.indexing.common.actions.TaskActionClientFactory; -import io.druid.indexing.common.config.TaskConfig; -import io.druid.indexing.common.task.NoopTestTaskFileWriter; -import io.druid.indexing.common.task.Task; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.metrics.MonitorScheduler; -import io.druid.query.QueryRunnerFactoryConglomerate; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMergerV9; -import io.druid.segment.loading.DataSegmentArchiver; -import io.druid.segment.loading.DataSegmentKiller; -import io.druid.segment.loading.DataSegmentMover; -import io.druid.segment.loading.DataSegmentPusher; -import io.druid.segment.loading.SegmentLoaderLocalCacheManager; -import io.druid.segment.loading.SegmentLoadingException; -import io.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; -import io.druid.server.coordination.DataSegmentAnnouncer; -import io.druid.server.coordination.DataSegmentServerAnnouncer; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.cache.Cache; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.client.cache.CachePopulatorStats; +import org.apache.druid.indexing.common.actions.TaskActionClientFactory; +import org.apache.druid.indexing.common.config.TaskConfig; +import org.apache.druid.indexing.common.task.NoopTestTaskFileWriter; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.metrics.MonitorScheduler; +import org.apache.druid.query.QueryRunnerFactoryConglomerate; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMergerV9; +import org.apache.druid.segment.loading.DataSegmentArchiver; +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.segment.loading.SegmentLoaderLocalCacheManager; +import org.apache.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; +import org.apache.druid.server.coordination.DataSegmentAnnouncer; +import org.apache.druid.server.coordination.DataSegmentServerAnnouncer; +import org.apache.druid.timeline.DataSegment; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/TestRealtimeTask.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/TestRealtimeTask.java similarity index 80% rename from indexing-service/src/test/java/io/druid/indexing/common/TestRealtimeTask.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/TestRealtimeTask.java index e2cf6678109f..3d8b8901af9e 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/TestRealtimeTask.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/TestRealtimeTask.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.indexing.common; +package org.apache.druid.indexing.common; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.task.RealtimeIndexTask; -import io.druid.indexing.common.task.TaskResource; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.RealtimeIOConfig; -import io.druid.segment.realtime.FireDepartment; -import io.druid.segment.realtime.firehose.LocalFirehoseFactory; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.task.RealtimeIndexTask; +import org.apache.druid.indexing.common.task.TaskResource; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.RealtimeIOConfig; +import org.apache.druid.segment.realtime.FireDepartment; +import org.apache.druid.segment.realtime.firehose.LocalFirehoseFactory; import java.io.File; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/TestTasks.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/TestTasks.java similarity index 90% rename from indexing-service/src/test/java/io/druid/indexing/common/TestTasks.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/TestTasks.java index 2bcc47b8da44..7879d8753569 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/TestTasks.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/TestTasks.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.indexing.common; +package org.apache.druid.indexing.common; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.indexing.common.task.AbstractTask; -import io.druid.indexing.common.task.Task; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.indexing.common.task.AbstractTask; +import org.apache.druid.indexing.common.task.Task; public class TestTasks { diff --git a/indexing-service/src/test/java/io/druid/indexing/common/TestUtils.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/TestUtils.java similarity index 76% rename from indexing-service/src/test/java/io/druid/indexing/common/TestUtils.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/TestUtils.java index 975fcb9f1652..fbe1d0274fce 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/TestUtils.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/TestUtils.java @@ -17,32 +17,32 @@ * under the License. */ -package io.druid.indexing.common; +package org.apache.druid.indexing.common; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Stopwatch; import com.google.common.collect.ImmutableMap; -import io.druid.client.indexing.IndexingServiceClient; -import io.druid.client.indexing.NoopIndexingServiceClient; -import io.druid.guice.ServerModule; -import io.druid.indexing.common.stats.DropwizardRowIngestionMetersFactory; -import io.druid.indexing.common.stats.RowIngestionMetersFactory; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.logger.Logger; -import io.druid.math.expr.ExprMacroTable; -import io.druid.query.expression.LookupEnabledTestExprMacroTable; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMergerV9; -import io.druid.segment.column.ColumnConfig; -import io.druid.segment.realtime.firehose.ChatHandlerProvider; -import io.druid.segment.realtime.firehose.NoopChatHandlerProvider; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthorizerMapper; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.indexing.IndexingServiceClient; +import org.apache.druid.client.indexing.NoopIndexingServiceClient; +import org.apache.druid.guice.ServerModule; +import org.apache.druid.indexing.common.stats.DropwizardRowIngestionMetersFactory; +import org.apache.druid.indexing.common.stats.RowIngestionMetersFactory; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.query.expression.LookupEnabledTestExprMacroTable; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMergerV9; +import org.apache.druid.segment.column.ColumnConfig; +import org.apache.druid.segment.realtime.firehose.ChatHandlerProvider; +import org.apache.druid.segment.realtime.firehose.NoopChatHandlerProvider; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.timeline.DataSegment; import java.util.List; import java.util.concurrent.TimeUnit; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/actions/LockAcquireActionTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/actions/LockAcquireActionTest.java similarity index 89% rename from indexing-service/src/test/java/io/druid/indexing/common/actions/LockAcquireActionTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/actions/LockAcquireActionTest.java index f6398eeb18c3..4f64f384840f 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/actions/LockAcquireActionTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/actions/LockAcquireActionTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.indexing.common.TaskLock; -import io.druid.indexing.common.TaskLockType; -import io.druid.indexing.common.task.NoopTask; -import io.druid.indexing.common.task.Task; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexing.common.TaskLockType; +import org.apache.druid.indexing.common.task.NoopTask; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/actions/LockTryAcquireActionTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/actions/LockTryAcquireActionTest.java similarity index 89% rename from indexing-service/src/test/java/io/druid/indexing/common/actions/LockTryAcquireActionTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/actions/LockTryAcquireActionTest.java index 330e0de49f02..9b1077a9346a 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/actions/LockTryAcquireActionTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/actions/LockTryAcquireActionTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.indexing.common.TaskLock; -import io.druid.indexing.common.TaskLockType; -import io.druid.indexing.common.task.NoopTask; -import io.druid.indexing.common.task.Task; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexing.common.TaskLockType; +import org.apache.druid.indexing.common.task.NoopTask; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/actions/RemoteTaskActionClientTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/actions/RemoteTaskActionClientTest.java similarity index 87% rename from indexing-service/src/test/java/io/druid/indexing/common/actions/RemoteTaskActionClientTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/actions/RemoteTaskActionClientTest.java index 37f0aa703376..a9f53d7cda4f 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/actions/RemoteTaskActionClientTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/actions/RemoteTaskActionClientTest.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.java.util.http.client.Request; -import io.druid.java.util.http.client.response.FullResponseHolder; -import io.druid.discovery.DruidLeaderClient; -import io.druid.indexing.common.RetryPolicyConfig; -import io.druid.indexing.common.RetryPolicyFactory; -import io.druid.indexing.common.TaskLock; -import io.druid.indexing.common.TaskLockType; -import io.druid.indexing.common.task.NoopTask; -import io.druid.indexing.common.task.Task; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; +import org.apache.druid.java.util.http.client.Request; +import org.apache.druid.java.util.http.client.response.FullResponseHolder; +import org.apache.druid.discovery.DruidLeaderClient; +import org.apache.druid.indexing.common.RetryPolicyConfig; +import org.apache.druid.indexing.common.RetryPolicyFactory; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexing.common.TaskLockType; +import org.apache.druid.indexing.common.task.NoopTask; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; import org.easymock.EasyMock; import org.jboss.netty.handler.codec.http.HttpMethod; import org.jboss.netty.handler.codec.http.HttpResponse; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/actions/SegmentAllocateActionTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/actions/SegmentAllocateActionTest.java similarity index 96% rename from indexing-service/src/test/java/io/druid/indexing/common/actions/SegmentAllocateActionTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/actions/SegmentAllocateActionTest.java index 831979f264a1..64bb9a86049d 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/actions/SegmentAllocateActionTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/actions/SegmentAllocateActionTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Predicate; @@ -25,21 +25,21 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; -import io.druid.indexing.common.TaskLock; -import io.druid.indexing.common.task.NoopTask; -import io.druid.indexing.common.task.Task; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.segment.realtime.appenderator.SegmentIdentifier; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.LinearShardSpec; -import io.druid.timeline.partition.NumberedShardSpec; -import io.druid.timeline.partition.SingleDimensionShardSpec; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexing.common.task.NoopTask; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.segment.realtime.appenderator.SegmentIdentifier; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.LinearShardSpec; +import org.apache.druid.timeline.partition.NumberedShardSpec; +import org.apache.druid.timeline.partition.SingleDimensionShardSpec; import org.easymock.EasyMock; import org.joda.time.DateTime; import org.junit.Assert; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/actions/SegmentInsertActionTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/actions/SegmentInsertActionTest.java similarity index 91% rename from indexing-service/src/test/java/io/druid/indexing/common/actions/SegmentInsertActionTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/actions/SegmentInsertActionTest.java index 8309d954ef7f..abd43d986ed7 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/actions/SegmentInsertActionTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/actions/SegmentInsertActionTest.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.druid.indexing.common.TaskLockType; -import io.druid.indexing.common.task.NoopTask; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.CriticalAction; -import io.druid.java.util.common.Intervals; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.LinearShardSpec; +import org.apache.druid.indexing.common.TaskLockType; +import org.apache.druid.indexing.common.task.NoopTask; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.CriticalAction; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.LinearShardSpec; import org.hamcrest.CoreMatchers; import org.joda.time.Interval; import org.junit.Assert; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/actions/SegmentListActionsTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/actions/SegmentListActionsTest.java similarity index 92% rename from indexing-service/src/test/java/io/druid/indexing/common/actions/SegmentListActionsTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/actions/SegmentListActionsTest.java index c1f22b975d42..2e4503f4ac2d 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/actions/SegmentListActionsTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/actions/SegmentListActionsTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.google.common.collect.ImmutableList; -import io.druid.indexing.common.task.NoopTask; -import io.druid.indexing.common.task.Task; -import io.druid.java.util.common.Intervals; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.indexing.common.task.NoopTask; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Before; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/actions/SegmentListUsedActionSerdeTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/actions/SegmentListUsedActionSerdeTest.java similarity index 94% rename from indexing-service/src/test/java/io/druid/indexing/common/actions/SegmentListUsedActionSerdeTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/actions/SegmentListUsedActionSerdeTest.java index fa1007be4c19..3aa8319c30a1 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/actions/SegmentListUsedActionSerdeTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/actions/SegmentListUsedActionSerdeTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; -import io.druid.java.util.common.Intervals; -import io.druid.segment.TestHelper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.segment.TestHelper; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/actions/SegmentTransactionalInsertActionTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/actions/SegmentTransactionalInsertActionTest.java similarity index 91% rename from indexing-service/src/test/java/io/druid/indexing/common/actions/SegmentTransactionalInsertActionTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/actions/SegmentTransactionalInsertActionTest.java index c0a79df04e5a..e152995cc91a 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/actions/SegmentTransactionalInsertActionTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/actions/SegmentTransactionalInsertActionTest.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.druid.indexing.common.TaskLockType; -import io.druid.indexing.common.task.NoopTask; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.ObjectMetadata; -import io.druid.indexing.overlord.SegmentPublishResult; -import io.druid.java.util.common.Intervals; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.LinearShardSpec; +import org.apache.druid.indexing.common.TaskLockType; +import org.apache.druid.indexing.common.task.NoopTask; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.ObjectMetadata; +import org.apache.druid.indexing.overlord.SegmentPublishResult; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.LinearShardSpec; import org.hamcrest.CoreMatchers; import org.joda.time.Interval; import org.junit.Assert; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/actions/SurrogateActionTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/actions/SurrogateActionTest.java similarity index 85% rename from indexing-service/src/test/java/io/druid/indexing/common/actions/SurrogateActionTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/actions/SurrogateActionTest.java index b21a82b76e5f..31bc77392fc8 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/actions/SurrogateActionTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/actions/SurrogateActionTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.indexing.common.TaskLock; -import io.druid.indexing.common.TaskLockType; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexing.common.TaskLockType; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/actions/TaskActionPreconditionsTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/actions/TaskActionPreconditionsTest.java similarity index 87% rename from indexing-service/src/test/java/io/druid/indexing/common/actions/TaskActionPreconditionsTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/actions/TaskActionPreconditionsTest.java index 4fe395656f02..175417cb845b 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/actions/TaskActionPreconditionsTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/actions/TaskActionPreconditionsTest.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import io.druid.indexing.common.TaskLock; -import io.druid.indexing.common.TaskLockType; -import io.druid.indexing.common.config.TaskStorageConfig; -import io.druid.indexing.common.task.NoopTask; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.HeapMemoryTaskStorage; -import io.druid.indexing.overlord.TaskLockbox; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.LinearShardSpec; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexing.common.TaskLockType; +import org.apache.druid.indexing.common.config.TaskStorageConfig; +import org.apache.druid.indexing.common.task.NoopTask; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.HeapMemoryTaskStorage; +import org.apache.druid.indexing.overlord.TaskLockbox; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.LinearShardSpec; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Before; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/actions/TaskActionTestKit.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/actions/TaskActionTestKit.java similarity index 77% rename from indexing-service/src/test/java/io/druid/indexing/common/actions/TaskActionTestKit.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/actions/TaskActionTestKit.java index 3194863d0bb7..98a3e65f7138 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/actions/TaskActionTestKit.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/actions/TaskActionTestKit.java @@ -17,26 +17,26 @@ * under the License. */ -package io.druid.indexing.common.actions; +package org.apache.druid.indexing.common.actions; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Suppliers; -import io.druid.indexing.common.Counters; -import io.druid.indexing.common.TestUtils; -import io.druid.indexing.common.config.TaskStorageConfig; -import io.druid.indexing.overlord.HeapMemoryTaskStorage; -import io.druid.indexing.overlord.IndexerMetadataStorageCoordinator; -import io.druid.indexing.overlord.TaskLockbox; -import io.druid.indexing.overlord.TaskStorage; -import io.druid.indexing.overlord.supervisor.SupervisorManager; -import io.druid.metadata.IndexerSQLMetadataStorageCoordinator; -import io.druid.metadata.MetadataSegmentManager; -import io.druid.metadata.MetadataSegmentManagerConfig; -import io.druid.metadata.MetadataStorageConnectorConfig; -import io.druid.metadata.MetadataStorageTablesConfig; -import io.druid.metadata.SQLMetadataSegmentManager; -import io.druid.metadata.TestDerbyConnector; -import io.druid.server.metrics.NoopServiceEmitter; +import org.apache.druid.indexing.common.Counters; +import org.apache.druid.indexing.common.TestUtils; +import org.apache.druid.indexing.common.config.TaskStorageConfig; +import org.apache.druid.indexing.overlord.HeapMemoryTaskStorage; +import org.apache.druid.indexing.overlord.IndexerMetadataStorageCoordinator; +import org.apache.druid.indexing.overlord.TaskLockbox; +import org.apache.druid.indexing.overlord.TaskStorage; +import org.apache.druid.indexing.overlord.supervisor.SupervisorManager; +import org.apache.druid.metadata.IndexerSQLMetadataStorageCoordinator; +import org.apache.druid.metadata.MetadataSegmentManager; +import org.apache.druid.metadata.MetadataSegmentManagerConfig; +import org.apache.druid.metadata.MetadataStorageConnectorConfig; +import org.apache.druid.metadata.MetadataStorageTablesConfig; +import org.apache.druid.metadata.SQLMetadataSegmentManager; +import org.apache.druid.metadata.TestDerbyConnector; +import org.apache.druid.server.metrics.NoopServiceEmitter; import org.easymock.EasyMock; import org.joda.time.Period; import org.junit.rules.ExternalResource; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/config/TaskStorageConfigTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/config/TaskStorageConfigTest.java similarity index 94% rename from indexing-service/src/test/java/io/druid/indexing/common/config/TaskStorageConfigTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/config/TaskStorageConfigTest.java index 7742034e09ac..7442c943f36e 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/config/TaskStorageConfigTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/config/TaskStorageConfigTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.indexing.common.config; +package org.apache.druid.indexing.common.config; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.jackson.DefaultObjectMapper; import org.joda.time.Period; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/task/AppenderatorDriverRealtimeIndexTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/AppenderatorDriverRealtimeIndexTaskTest.java similarity index 88% rename from indexing-service/src/test/java/io/druid/indexing/common/task/AppenderatorDriverRealtimeIndexTaskTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/task/AppenderatorDriverRealtimeIndexTaskTest.java index 9166265398e9..1efcd94da19d 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/task/AppenderatorDriverRealtimeIndexTaskTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/AppenderatorDriverRealtimeIndexTaskTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -29,111 +29,111 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.client.cache.CacheConfig; -import io.druid.client.cache.CachePopulatorStats; -import io.druid.client.cache.MapCache; -import io.druid.common.config.NullHandling; -import io.druid.data.input.Firehose; -import io.druid.data.input.FirehoseFactory; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.FloatDimensionSchema; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.LongDimensionSchema; -import io.druid.data.input.impl.MapInputRowParser; -import io.druid.data.input.impl.StringDimensionSchema; -import io.druid.data.input.impl.TimeAndDimsParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.discovery.DataNodeService; -import io.druid.discovery.DruidNodeAnnouncer; -import io.druid.discovery.LookupNodeService; -import io.druid.indexer.IngestionState; -import io.druid.indexer.TaskState; -import io.druid.indexing.common.Counters; -import io.druid.indexing.common.IngestionStatsAndErrorsTaskReportData; -import io.druid.indexing.common.SegmentLoaderFactory; -import io.druid.indexing.common.TaskReport; -import io.druid.indexing.common.TaskReportFileWriter; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.TaskToolboxFactory; -import io.druid.indexing.common.TestUtils; -import io.druid.indexing.common.actions.LocalTaskActionClientFactory; -import io.druid.indexing.common.actions.TaskActionClientFactory; -import io.druid.indexing.common.actions.TaskActionToolbox; -import io.druid.indexing.common.config.TaskConfig; -import io.druid.indexing.common.config.TaskStorageConfig; -import io.druid.indexing.common.index.RealtimeAppenderatorIngestionSpec; -import io.druid.indexing.common.index.RealtimeAppenderatorTuningConfig; -import io.druid.indexing.common.stats.RowIngestionMeters; -import io.druid.indexing.common.stats.RowIngestionMetersFactory; -import io.druid.indexing.overlord.DataSourceMetadata; -import io.druid.indexing.overlord.HeapMemoryTaskStorage; -import io.druid.indexing.overlord.SegmentPublishResult; -import io.druid.indexing.overlord.TaskLockbox; -import io.druid.indexing.overlord.TaskStorage; -import io.druid.indexing.overlord.supervisor.SupervisorManager; -import io.druid.indexing.test.TestDataSegmentAnnouncer; -import io.druid.indexing.test.TestDataSegmentKiller; -import io.druid.indexing.test.TestDataSegmentPusher; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.jackson.JacksonUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.common.parsers.ParseException; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.core.NoopEmitter; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.metrics.MonitorScheduler; -import io.druid.math.expr.ExprMacroTable; -import io.druid.metadata.EntryExistsException; -import io.druid.metadata.IndexerSQLMetadataStorageCoordinator; -import io.druid.metadata.TestDerbyConnector; -import io.druid.query.DefaultQueryRunnerFactoryConglomerate; -import io.druid.query.Druids; -import io.druid.query.IntervalChunkingQueryRunnerDecorator; -import io.druid.query.Query; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactoryConglomerate; -import io.druid.query.QueryToolChest; -import io.druid.query.QueryWatcher; -import io.druid.query.Result; -import io.druid.query.SegmentDescriptor; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.filter.DimFilter; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.timeseries.TimeseriesQueryEngine; -import io.druid.query.timeseries.TimeseriesQueryQueryToolChest; -import io.druid.query.timeseries.TimeseriesQueryRunnerFactory; -import io.druid.query.timeseries.TimeseriesResultValue; -import io.druid.segment.TestHelper; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.RealtimeIOConfig; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; -import io.druid.segment.loading.SegmentLoaderConfig; -import io.druid.segment.loading.SegmentLoaderLocalCacheManager; -import io.druid.segment.loading.StorageLocationConfig; -import io.druid.segment.realtime.plumber.SegmentHandoffNotifier; -import io.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; -import io.druid.segment.transform.ExpressionTransform; -import io.druid.segment.transform.TransformSpec; -import io.druid.server.DruidNode; -import io.druid.server.coordination.DataSegmentServerAnnouncer; -import io.druid.server.coordination.ServerType; -import io.druid.server.security.AuthTestUtils; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.LinearShardSpec; -import io.druid.timeline.partition.NumberedShardSpec; -import io.druid.utils.Runnables; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.client.cache.CachePopulatorStats; +import org.apache.druid.client.cache.MapCache; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.data.input.Firehose; +import org.apache.druid.data.input.FirehoseFactory; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.FloatDimensionSchema; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.LongDimensionSchema; +import org.apache.druid.data.input.impl.MapInputRowParser; +import org.apache.druid.data.input.impl.StringDimensionSchema; +import org.apache.druid.data.input.impl.TimeAndDimsParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.discovery.DataNodeService; +import org.apache.druid.discovery.DruidNodeAnnouncer; +import org.apache.druid.discovery.LookupNodeService; +import org.apache.druid.indexer.IngestionState; +import org.apache.druid.indexer.TaskState; +import org.apache.druid.indexing.common.Counters; +import org.apache.druid.indexing.common.IngestionStatsAndErrorsTaskReportData; +import org.apache.druid.indexing.common.SegmentLoaderFactory; +import org.apache.druid.indexing.common.TaskReport; +import org.apache.druid.indexing.common.TaskReportFileWriter; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.TaskToolboxFactory; +import org.apache.druid.indexing.common.TestUtils; +import org.apache.druid.indexing.common.actions.LocalTaskActionClientFactory; +import org.apache.druid.indexing.common.actions.TaskActionClientFactory; +import org.apache.druid.indexing.common.actions.TaskActionToolbox; +import org.apache.druid.indexing.common.config.TaskConfig; +import org.apache.druid.indexing.common.config.TaskStorageConfig; +import org.apache.druid.indexing.common.index.RealtimeAppenderatorIngestionSpec; +import org.apache.druid.indexing.common.index.RealtimeAppenderatorTuningConfig; +import org.apache.druid.indexing.common.stats.RowIngestionMeters; +import org.apache.druid.indexing.common.stats.RowIngestionMetersFactory; +import org.apache.druid.indexing.overlord.DataSourceMetadata; +import org.apache.druid.indexing.overlord.HeapMemoryTaskStorage; +import org.apache.druid.indexing.overlord.SegmentPublishResult; +import org.apache.druid.indexing.overlord.TaskLockbox; +import org.apache.druid.indexing.overlord.TaskStorage; +import org.apache.druid.indexing.overlord.supervisor.SupervisorManager; +import org.apache.druid.indexing.test.TestDataSegmentAnnouncer; +import org.apache.druid.indexing.test.TestDataSegmentKiller; +import org.apache.druid.indexing.test.TestDataSegmentPusher; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.parsers.ParseException; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.core.NoopEmitter; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.metrics.MonitorScheduler; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.metadata.EntryExistsException; +import org.apache.druid.metadata.IndexerSQLMetadataStorageCoordinator; +import org.apache.druid.metadata.TestDerbyConnector; +import org.apache.druid.query.DefaultQueryRunnerFactoryConglomerate; +import org.apache.druid.query.Druids; +import org.apache.druid.query.IntervalChunkingQueryRunnerDecorator; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactoryConglomerate; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.QueryWatcher; +import org.apache.druid.query.Result; +import org.apache.druid.query.SegmentDescriptor; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.timeseries.TimeseriesQueryEngine; +import org.apache.druid.query.timeseries.TimeseriesQueryQueryToolChest; +import org.apache.druid.query.timeseries.TimeseriesQueryRunnerFactory; +import org.apache.druid.query.timeseries.TimeseriesResultValue; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.RealtimeIOConfig; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.segment.loading.SegmentLoaderConfig; +import org.apache.druid.segment.loading.SegmentLoaderLocalCacheManager; +import org.apache.druid.segment.loading.StorageLocationConfig; +import org.apache.druid.segment.realtime.plumber.SegmentHandoffNotifier; +import org.apache.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; +import org.apache.druid.segment.transform.ExpressionTransform; +import org.apache.druid.segment.transform.TransformSpec; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.coordination.DataSegmentServerAnnouncer; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.server.security.AuthTestUtils; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.LinearShardSpec; +import org.apache.druid.timeline.partition.NumberedShardSpec; +import org.apache.druid.utils.Runnables; import org.apache.commons.io.FileUtils; import org.easymock.EasyMock; import org.joda.time.DateTime; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/task/CompactionTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskTest.java similarity index 88% rename from indexing-service/src/test/java/io/druid/indexing/common/task/CompactionTaskTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskTest.java index 6277a9e8f11e..381b51c549a8 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/task/CompactionTaskTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair; @@ -30,66 +30,66 @@ import com.google.common.collect.Lists; import com.google.inject.Binder; import com.google.inject.Module; -import io.druid.data.input.FirehoseFactory; -import io.druid.data.input.impl.DimensionSchema; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.DoubleDimensionSchema; -import io.druid.data.input.impl.FloatDimensionSchema; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.LongDimensionSchema; -import io.druid.data.input.impl.NoopInputRowParser; -import io.druid.data.input.impl.StringDimensionSchema; -import io.druid.data.input.impl.TimeAndDimsParseSpec; -import io.druid.guice.GuiceAnnotationIntrospector; -import io.druid.guice.GuiceInjectableValues; -import io.druid.guice.GuiceInjectors; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.TestUtils; -import io.druid.indexing.common.actions.SegmentListUsedAction; -import io.druid.indexing.common.actions.TaskAction; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.indexing.common.stats.RowIngestionMetersFactory; -import io.druid.indexing.common.task.CompactionTask.SegmentProvider; -import io.druid.indexing.common.task.IndexTask.IndexIOConfig; -import io.druid.indexing.common.task.IndexTask.IndexIngestionSpec; -import io.druid.indexing.common.task.IndexTask.IndexTuningConfig; -import io.druid.indexing.firehose.IngestSegmentFirehoseFactory; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.LongMaxAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.aggregation.first.FloatFirstAggregatorFactory; -import io.druid.query.aggregation.last.DoubleLastAggregatorFactory; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMergerV9; -import io.druid.segment.IndexSpec; -import io.druid.segment.Metadata; -import io.druid.segment.QueryableIndex; -import io.druid.segment.SimpleQueryableIndex; -import io.druid.segment.column.Column; -import io.druid.segment.column.ColumnBuilder; -import io.druid.segment.column.ValueType; -import io.druid.segment.data.CompressionFactory.LongEncodingStrategy; -import io.druid.segment.data.CompressionStrategy; -import io.druid.segment.data.ListIndexed; -import io.druid.segment.data.RoaringBitmapSerdeFactory; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.granularity.ArbitraryGranularitySpec; -import io.druid.segment.loading.SegmentLoadingException; -import io.druid.segment.realtime.firehose.ChatHandlerProvider; -import io.druid.segment.realtime.firehose.NoopChatHandlerProvider; -import io.druid.segment.transform.TransformingInputRowParser; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; -import io.druid.server.security.AuthTestUtils; -import io.druid.server.security.AuthorizerMapper; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NumberedShardSpec; +import org.apache.druid.data.input.FirehoseFactory; +import org.apache.druid.data.input.impl.DimensionSchema; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.DoubleDimensionSchema; +import org.apache.druid.data.input.impl.FloatDimensionSchema; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.LongDimensionSchema; +import org.apache.druid.data.input.impl.NoopInputRowParser; +import org.apache.druid.data.input.impl.StringDimensionSchema; +import org.apache.druid.data.input.impl.TimeAndDimsParseSpec; +import org.apache.druid.guice.GuiceAnnotationIntrospector; +import org.apache.druid.guice.GuiceInjectableValues; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.TestUtils; +import org.apache.druid.indexing.common.actions.SegmentListUsedAction; +import org.apache.druid.indexing.common.actions.TaskAction; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.indexing.common.stats.RowIngestionMetersFactory; +import org.apache.druid.indexing.common.task.CompactionTask.SegmentProvider; +import org.apache.druid.indexing.common.task.IndexTask.IndexIOConfig; +import org.apache.druid.indexing.common.task.IndexTask.IndexIngestionSpec; +import org.apache.druid.indexing.common.task.IndexTask.IndexTuningConfig; +import org.apache.druid.indexing.firehose.IngestSegmentFirehoseFactory; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.LongMaxAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.aggregation.first.FloatFirstAggregatorFactory; +import org.apache.druid.query.aggregation.last.DoubleLastAggregatorFactory; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMergerV9; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.Metadata; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.SimpleQueryableIndex; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ColumnBuilder; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.data.CompressionFactory.LongEncodingStrategy; +import org.apache.druid.segment.data.CompressionStrategy; +import org.apache.druid.segment.data.ListIndexed; +import org.apache.druid.segment.data.RoaringBitmapSerdeFactory; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.granularity.ArbitraryGranularitySpec; +import org.apache.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.segment.realtime.firehose.ChatHandlerProvider; +import org.apache.druid.segment.realtime.firehose.NoopChatHandlerProvider; +import org.apache.druid.segment.transform.TransformingInputRowParser; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; +import org.apache.druid.server.security.AuthTestUtils; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NumberedShardSpec; import org.hamcrest.CoreMatchers; import org.joda.time.Interval; import org.junit.Assert; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/task/ConvertSegmentTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/ConvertSegmentTaskTest.java similarity index 91% rename from indexing-service/src/test/java/io/druid/indexing/common/task/ConvertSegmentTaskTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/task/ConvertSegmentTaskTest.java index 12765063b29e..de99f22fefb2 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/task/ConvertSegmentTaskTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/ConvertSegmentTaskTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.indexing.common.TestUtils; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.indexing.common.TestUtils; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.joda.time.DateTime; import org.joda.time.Interval; import org.junit.Assert; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/task/HadoopConverterTaskSerDeTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/HadoopConverterTaskSerDeTest.java similarity index 94% rename from indexing-service/src/test/java/io/druid/indexing/common/task/HadoopConverterTaskSerDeTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/task/HadoopConverterTaskSerDeTest.java index 5d4052b9f37a..ebeb3b7082ac 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/task/HadoopConverterTaskSerDeTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/HadoopConverterTaskSerDeTest.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.indexing.common.TestUtils; -import io.druid.java.util.common.Intervals; -import io.druid.segment.IndexSpec; -import io.druid.segment.data.CompressionFactory; -import io.druid.segment.data.CompressionStrategy; -import io.druid.segment.data.ConciseBitmapSerdeFactory; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; -import io.druid.timeline.partition.ShardSpec; +import org.apache.druid.indexing.common.TestUtils; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.data.CompressionFactory; +import org.apache.druid.segment.data.CompressionStrategy; +import org.apache.druid.segment.data.ConciseBitmapSerdeFactory; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.timeline.partition.ShardSpec; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/task/HadoopTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/HadoopTaskTest.java similarity index 85% rename from indexing-service/src/test/java/io/druid/indexing/common/task/HadoopTaskTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/task/HadoopTaskTest.java index 73d757168148..d692f5fe5e46 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/task/HadoopTaskTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/HadoopTaskTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.indexer.updater.HadoopDruidConverterConfig; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.indexing.common.config.TaskConfig; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.indexer.updater.HadoopDruidConverterConfig; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.indexing.common.config.TaskConfig; +import org.apache.druid.java.util.common.StringUtils; import org.apache.hadoop.yarn.util.ApplicationClassLoader; import org.easymock.EasyMock; import org.junit.Assert; @@ -88,7 +88,7 @@ public TaskStatus run(TaskToolbox toolbox) final Class hadoopClazz = Class.forName("org.apache.hadoop.fs.FSDataInputStream", false, classLoader); assertClassLoaderIsSingular(hadoopClazz.getClassLoader()); - final Class druidHadoopConfigClazz = Class.forName("io.druid.indexer.HadoopDruidIndexerConfig", false, classLoader); + final Class druidHadoopConfigClazz = Class.forName("org.apache.druid.indexer.HadoopDruidIndexerConfig", false, classLoader); assertClassLoaderIsSingular(druidHadoopConfigClazz.getClassLoader()); } public static void assertClassLoaderIsSingular(ClassLoader classLoader) diff --git a/indexing-service/src/test/java/io/druid/indexing/common/task/IndexTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IndexTaskTest.java similarity index 93% rename from indexing-service/src/test/java/io/druid/indexing/common/task/IndexTaskTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/task/IndexTaskTest.java index b15261c9eeed..3e288c5d2f77 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/task/IndexTaskTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IndexTaskTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -26,64 +26,64 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.common.io.Files; -import io.druid.data.input.impl.CSVParseSpec; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.FloatDimensionSchema; -import io.druid.data.input.impl.JSONParseSpec; -import io.druid.data.input.impl.LongDimensionSchema; -import io.druid.data.input.impl.ParseSpec; -import io.druid.data.input.impl.StringDimensionSchema; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.indexer.TaskState; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.IngestionStatsAndErrorsTaskReportData; -import io.druid.indexing.common.TaskLock; -import io.druid.indexing.common.TaskLockType; -import io.druid.indexing.common.TaskReport; -import io.druid.indexing.common.TaskReportFileWriter; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.TestUtils; -import io.druid.indexing.common.actions.LockAcquireAction; -import io.druid.indexing.common.actions.LockListAction; -import io.druid.indexing.common.actions.LockTryAcquireAction; -import io.druid.indexing.common.actions.SegmentAllocateAction; -import io.druid.indexing.common.actions.SegmentTransactionalInsertAction; -import io.druid.indexing.common.actions.TaskAction; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.indexing.common.stats.RowIngestionMeters; -import io.druid.indexing.common.stats.RowIngestionMetersFactory; -import io.druid.indexing.common.task.IndexTask.IndexIngestionSpec; -import io.druid.indexing.common.task.IndexTask.IndexTuningConfig; -import io.druid.indexing.overlord.SegmentPublishResult; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.math.expr.ExprMacroTable; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMergerV9; -import io.druid.segment.IndexSpec; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.granularity.ArbitraryGranularitySpec; -import io.druid.segment.indexing.granularity.GranularitySpec; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; -import io.druid.segment.loading.DataSegmentKiller; -import io.druid.segment.loading.DataSegmentPusher; -import io.druid.segment.realtime.appenderator.SegmentIdentifier; -import io.druid.segment.realtime.firehose.LocalFirehoseFactory; -import io.druid.segment.transform.ExpressionTransform; -import io.druid.segment.transform.TransformSpec; -import io.druid.server.security.AuthTestUtils; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.HashBasedNumberedShardSpec; -import io.druid.timeline.partition.NoneShardSpec; -import io.druid.timeline.partition.NumberedShardSpec; -import io.druid.timeline.partition.ShardSpec; +import org.apache.druid.data.input.impl.CSVParseSpec; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.FloatDimensionSchema; +import org.apache.druid.data.input.impl.JSONParseSpec; +import org.apache.druid.data.input.impl.LongDimensionSchema; +import org.apache.druid.data.input.impl.ParseSpec; +import org.apache.druid.data.input.impl.StringDimensionSchema; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.indexer.TaskState; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.IngestionStatsAndErrorsTaskReportData; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexing.common.TaskLockType; +import org.apache.druid.indexing.common.TaskReport; +import org.apache.druid.indexing.common.TaskReportFileWriter; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.TestUtils; +import org.apache.druid.indexing.common.actions.LockAcquireAction; +import org.apache.druid.indexing.common.actions.LockListAction; +import org.apache.druid.indexing.common.actions.LockTryAcquireAction; +import org.apache.druid.indexing.common.actions.SegmentAllocateAction; +import org.apache.druid.indexing.common.actions.SegmentTransactionalInsertAction; +import org.apache.druid.indexing.common.actions.TaskAction; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.indexing.common.stats.RowIngestionMeters; +import org.apache.druid.indexing.common.stats.RowIngestionMetersFactory; +import org.apache.druid.indexing.common.task.IndexTask.IndexIngestionSpec; +import org.apache.druid.indexing.common.task.IndexTask.IndexTuningConfig; +import org.apache.druid.indexing.overlord.SegmentPublishResult; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMergerV9; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.granularity.ArbitraryGranularitySpec; +import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.segment.loading.DataSegmentKiller; +import org.apache.druid.segment.loading.DataSegmentPusher; +import org.apache.druid.segment.realtime.appenderator.SegmentIdentifier; +import org.apache.druid.segment.realtime.firehose.LocalFirehoseFactory; +import org.apache.druid.segment.transform.ExpressionTransform; +import org.apache.druid.segment.transform.TransformSpec; +import org.apache.druid.server.security.AuthTestUtils; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.HashBasedNumberedShardSpec; +import org.apache.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.timeline.partition.NumberedShardSpec; +import org.apache.druid.timeline.partition.ShardSpec; import org.joda.time.Interval; import org.junit.After; import org.junit.Assert; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/task/IngestionTestBase.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IngestionTestBase.java similarity index 73% rename from indexing-service/src/test/java/io/druid/indexing/common/task/IngestionTestBase.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/task/IngestionTestBase.java index c9071fca5b76..75e9587ace63 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/task/IngestionTestBase.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IngestionTestBase.java @@ -17,25 +17,25 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.Counters; -import io.druid.indexing.common.TestUtils; -import io.druid.indexing.common.actions.LocalTaskActionClient; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.indexing.common.actions.TaskActionToolbox; -import io.druid.indexing.common.config.TaskStorageConfig; -import io.druid.indexing.overlord.HeapMemoryTaskStorage; -import io.druid.indexing.overlord.TaskLockbox; -import io.druid.indexing.overlord.TaskStorage; -import io.druid.metadata.EntryExistsException; -import io.druid.metadata.IndexerSQLMetadataStorageCoordinator; -import io.druid.metadata.TestDerbyConnector; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMergerV9; -import io.druid.server.metrics.NoopServiceEmitter; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.Counters; +import org.apache.druid.indexing.common.TestUtils; +import org.apache.druid.indexing.common.actions.LocalTaskActionClient; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.indexing.common.actions.TaskActionToolbox; +import org.apache.druid.indexing.common.config.TaskStorageConfig; +import org.apache.druid.indexing.overlord.HeapMemoryTaskStorage; +import org.apache.druid.indexing.overlord.TaskLockbox; +import org.apache.druid.indexing.overlord.TaskStorage; +import org.apache.druid.metadata.EntryExistsException; +import org.apache.druid.metadata.IndexerSQLMetadataStorageCoordinator; +import org.apache.druid.metadata.TestDerbyConnector; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMergerV9; +import org.apache.druid.server.metrics.NoopServiceEmitter; import org.junit.Rule; public abstract class IngestionTestBase diff --git a/indexing-service/src/test/java/io/druid/indexing/common/task/MergeTaskBaseTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/MergeTaskBaseTest.java similarity index 93% rename from indexing-service/src/test/java/io/druid/indexing/common/task/MergeTaskBaseTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/task/MergeTaskBaseTest.java index c21a1cbe339f..03275139c6a1 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/task/MergeTaskBaseTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/MergeTaskBaseTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.google.common.collect.ImmutableList; import com.google.common.hash.Hashing; -import io.druid.indexing.common.TaskToolbox; -import io.druid.java.util.common.Intervals; -import io.druid.timeline.DataSegment; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.timeline.DataSegment; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/task/NoopTestTaskFileWriter.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/NoopTestTaskFileWriter.java similarity index 86% rename from indexing-service/src/test/java/io/druid/indexing/common/task/NoopTestTaskFileWriter.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/task/NoopTestTaskFileWriter.java index c468b690e11c..3e7b8fdc3726 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/task/NoopTestTaskFileWriter.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/NoopTestTaskFileWriter.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; -import io.druid.indexing.common.TaskReport; -import io.druid.indexing.common.TaskReportFileWriter; +import org.apache.druid.indexing.common.TaskReport; +import org.apache.druid.indexing.common.TaskReportFileWriter; import java.util.Map; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/task/RealtimeIndexTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/RealtimeIndexTaskTest.java similarity index 86% rename from indexing-service/src/test/java/io/druid/indexing/common/task/RealtimeIndexTaskTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/task/RealtimeIndexTaskTest.java index 36fe3a3a63d8..88a5a43ac634 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/task/RealtimeIndexTaskTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/RealtimeIndexTaskTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Throwables; @@ -30,98 +30,98 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.client.cache.CacheConfig; -import io.druid.client.cache.CachePopulatorStats; -import io.druid.client.cache.MapCache; -import io.druid.common.config.NullHandling; -import io.druid.data.input.Firehose; -import io.druid.data.input.FirehoseFactory; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.MapInputRowParser; -import io.druid.data.input.impl.TimeAndDimsParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.discovery.DataNodeService; -import io.druid.discovery.DruidNodeAnnouncer; -import io.druid.discovery.LookupNodeService; -import io.druid.indexer.TaskState; -import io.druid.indexing.common.Counters; -import io.druid.indexing.common.SegmentLoaderFactory; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.TaskToolboxFactory; -import io.druid.indexing.common.TestUtils; -import io.druid.indexing.common.actions.LocalTaskActionClientFactory; -import io.druid.indexing.common.actions.TaskActionClientFactory; -import io.druid.indexing.common.actions.TaskActionToolbox; -import io.druid.indexing.common.config.TaskConfig; -import io.druid.indexing.common.config.TaskStorageConfig; -import io.druid.indexing.overlord.HeapMemoryTaskStorage; -import io.druid.indexing.overlord.IndexerMetadataStorageCoordinator; -import io.druid.indexing.overlord.TaskLockbox; -import io.druid.indexing.overlord.TaskStorage; -import io.druid.indexing.overlord.supervisor.SupervisorManager; -import io.druid.indexing.test.TestDataSegmentAnnouncer; -import io.druid.indexing.test.TestDataSegmentKiller; -import io.druid.indexing.test.TestDataSegmentPusher; -import io.druid.indexing.test.TestIndexerMetadataStorageCoordinator; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.jackson.JacksonUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.common.parsers.ParseException; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.core.NoopEmitter; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.metrics.MonitorScheduler; -import io.druid.math.expr.ExprMacroTable; -import io.druid.metadata.EntryExistsException; -import io.druid.query.DefaultQueryRunnerFactoryConglomerate; -import io.druid.query.Druids; -import io.druid.query.IntervalChunkingQueryRunnerDecorator; -import io.druid.query.Query; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactoryConglomerate; -import io.druid.query.QueryToolChest; -import io.druid.query.QueryWatcher; -import io.druid.query.Result; -import io.druid.query.SegmentDescriptor; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.filter.DimFilter; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.timeseries.TimeseriesQueryEngine; -import io.druid.query.timeseries.TimeseriesQueryQueryToolChest; -import io.druid.query.timeseries.TimeseriesQueryRunnerFactory; -import io.druid.query.timeseries.TimeseriesResultValue; -import io.druid.segment.TestHelper; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.RealtimeIOConfig; -import io.druid.segment.indexing.RealtimeTuningConfig; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; -import io.druid.segment.loading.SegmentLoaderConfig; -import io.druid.segment.loading.SegmentLoaderLocalCacheManager; -import io.druid.segment.loading.StorageLocationConfig; -import io.druid.segment.realtime.FireDepartment; -import io.druid.segment.realtime.plumber.SegmentHandoffNotifier; -import io.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; -import io.druid.segment.realtime.plumber.ServerTimeRejectionPolicyFactory; -import io.druid.segment.transform.ExpressionTransform; -import io.druid.segment.transform.TransformSpec; -import io.druid.server.DruidNode; -import io.druid.server.coordination.DataSegmentServerAnnouncer; -import io.druid.server.coordination.ServerType; -import io.druid.timeline.DataSegment; -import io.druid.utils.Runnables; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.client.cache.CachePopulatorStats; +import org.apache.druid.client.cache.MapCache; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.data.input.Firehose; +import org.apache.druid.data.input.FirehoseFactory; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.MapInputRowParser; +import org.apache.druid.data.input.impl.TimeAndDimsParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.discovery.DataNodeService; +import org.apache.druid.discovery.DruidNodeAnnouncer; +import org.apache.druid.discovery.LookupNodeService; +import org.apache.druid.indexer.TaskState; +import org.apache.druid.indexing.common.Counters; +import org.apache.druid.indexing.common.SegmentLoaderFactory; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.TaskToolboxFactory; +import org.apache.druid.indexing.common.TestUtils; +import org.apache.druid.indexing.common.actions.LocalTaskActionClientFactory; +import org.apache.druid.indexing.common.actions.TaskActionClientFactory; +import org.apache.druid.indexing.common.actions.TaskActionToolbox; +import org.apache.druid.indexing.common.config.TaskConfig; +import org.apache.druid.indexing.common.config.TaskStorageConfig; +import org.apache.druid.indexing.overlord.HeapMemoryTaskStorage; +import org.apache.druid.indexing.overlord.IndexerMetadataStorageCoordinator; +import org.apache.druid.indexing.overlord.TaskLockbox; +import org.apache.druid.indexing.overlord.TaskStorage; +import org.apache.druid.indexing.overlord.supervisor.SupervisorManager; +import org.apache.druid.indexing.test.TestDataSegmentAnnouncer; +import org.apache.druid.indexing.test.TestDataSegmentKiller; +import org.apache.druid.indexing.test.TestDataSegmentPusher; +import org.apache.druid.indexing.test.TestIndexerMetadataStorageCoordinator; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.parsers.ParseException; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.core.NoopEmitter; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.metrics.MonitorScheduler; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.metadata.EntryExistsException; +import org.apache.druid.query.DefaultQueryRunnerFactoryConglomerate; +import org.apache.druid.query.Druids; +import org.apache.druid.query.IntervalChunkingQueryRunnerDecorator; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactoryConglomerate; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.QueryWatcher; +import org.apache.druid.query.Result; +import org.apache.druid.query.SegmentDescriptor; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.timeseries.TimeseriesQueryEngine; +import org.apache.druid.query.timeseries.TimeseriesQueryQueryToolChest; +import org.apache.druid.query.timeseries.TimeseriesQueryRunnerFactory; +import org.apache.druid.query.timeseries.TimeseriesResultValue; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.RealtimeIOConfig; +import org.apache.druid.segment.indexing.RealtimeTuningConfig; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.segment.loading.SegmentLoaderConfig; +import org.apache.druid.segment.loading.SegmentLoaderLocalCacheManager; +import org.apache.druid.segment.loading.StorageLocationConfig; +import org.apache.druid.segment.realtime.FireDepartment; +import org.apache.druid.segment.realtime.plumber.SegmentHandoffNotifier; +import org.apache.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; +import org.apache.druid.segment.realtime.plumber.ServerTimeRejectionPolicyFactory; +import org.apache.druid.segment.transform.ExpressionTransform; +import org.apache.druid.segment.transform.TransformSpec; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.coordination.DataSegmentServerAnnouncer; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.utils.Runnables; import org.easymock.EasyMock; import org.hamcrest.CoreMatchers; import org.joda.time.DateTime; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/task/SameIntervalMergeTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/SameIntervalMergeTaskTest.java similarity index 85% rename from indexing-service/src/test/java/io/druid/indexing/common/task/SameIntervalMergeTaskTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/task/SameIntervalMergeTaskTest.java index 900f48e5164a..d8ab412ec3ae 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/task/SameIntervalMergeTaskTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/SameIntervalMergeTaskTest.java @@ -17,34 +17,34 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.druid.indexing.common.TaskLock; -import io.druid.indexing.common.TaskLockType; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.TestUtils; -import io.druid.indexing.common.actions.LockListAction; -import io.druid.indexing.common.actions.LockTryAcquireAction; -import io.druid.indexing.common.actions.SegmentInsertAction; -import io.druid.indexing.common.actions.SegmentListUsedAction; -import io.druid.indexing.common.actions.TaskAction; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.java.util.common.Intervals; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMergerV9; -import io.druid.segment.IndexSpec; -import io.druid.segment.Segment; -import io.druid.segment.loading.DataSegmentPusher; -import io.druid.segment.loading.SegmentLoader; -import io.druid.server.metrics.NoopServiceEmitter; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.LinearShardSpec; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexing.common.TaskLockType; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.TestUtils; +import org.apache.druid.indexing.common.actions.LockListAction; +import org.apache.druid.indexing.common.actions.LockTryAcquireAction; +import org.apache.druid.indexing.common.actions.SegmentInsertAction; +import org.apache.druid.indexing.common.actions.SegmentListUsedAction; +import org.apache.druid.indexing.common.actions.TaskAction; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMergerV9; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.loading.DataSegmentPusher; +import org.apache.druid.segment.loading.SegmentLoader; +import org.apache.druid.server.metrics.NoopServiceEmitter; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.LinearShardSpec; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Rule; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/task/TaskReportSerdeTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/TaskReportSerdeTest.java similarity index 86% rename from indexing-service/src/test/java/io/druid/indexing/common/task/TaskReportSerdeTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/task/TaskReportSerdeTest.java index 248f076c1163..4e97374f7c52 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/task/TaskReportSerdeTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/TaskReportSerdeTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import io.druid.indexer.IngestionState; -import io.druid.indexing.common.IngestionStatsAndErrorsTaskReport; -import io.druid.indexing.common.IngestionStatsAndErrorsTaskReportData; -import io.druid.indexing.common.TaskReport; -import io.druid.indexing.common.TestUtils; +import org.apache.druid.indexer.IngestionState; +import org.apache.druid.indexing.common.IngestionStatsAndErrorsTaskReport; +import org.apache.druid.indexing.common.IngestionStatsAndErrorsTaskReportData; +import org.apache.druid.indexing.common.TaskReport; +import org.apache.druid.indexing.common.TestUtils; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/task/TaskSerdeTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/TaskSerdeTest.java similarity index 93% rename from indexing-service/src/test/java/io/druid/indexing/common/task/TaskSerdeTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/task/TaskSerdeTest.java index 1a844ce43601..a2c742e84f19 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/task/TaskSerdeTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/TaskSerdeTest.java @@ -17,45 +17,45 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.client.indexing.ClientAppendQuery; -import io.druid.client.indexing.ClientKillQuery; -import io.druid.client.indexing.ClientMergeQuery; -import io.druid.guice.FirehoseModule; -import io.druid.indexer.HadoopIOConfig; -import io.druid.indexer.HadoopIngestionSpec; -import io.druid.indexing.common.TestUtils; -import io.druid.indexing.common.stats.RowIngestionMetersFactory; -import io.druid.indexing.common.task.IndexTask.IndexIOConfig; -import io.druid.indexing.common.task.IndexTask.IndexIngestionSpec; -import io.druid.indexing.common.task.IndexTask.IndexTuningConfig; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.DoubleSumAggregatorFactory; -import io.druid.segment.IndexSpec; -import io.druid.segment.data.CompressionFactory; -import io.druid.segment.data.CompressionStrategy; -import io.druid.segment.data.RoaringBitmapSerdeFactory; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.RealtimeIOConfig; -import io.druid.segment.indexing.RealtimeTuningConfig; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; -import io.druid.segment.realtime.FireDepartment; -import io.druid.segment.realtime.FireDepartmentMetrics; -import io.druid.segment.realtime.firehose.LocalFirehoseFactory; -import io.druid.segment.realtime.plumber.Plumber; -import io.druid.segment.realtime.plumber.PlumberSchool; -import io.druid.segment.writeout.TmpFileSegmentWriteOutMediumFactory; -import io.druid.server.security.AuthTestUtils; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.client.indexing.ClientAppendQuery; +import org.apache.druid.client.indexing.ClientKillQuery; +import org.apache.druid.client.indexing.ClientMergeQuery; +import org.apache.druid.guice.FirehoseModule; +import org.apache.druid.indexer.HadoopIOConfig; +import org.apache.druid.indexer.HadoopIngestionSpec; +import org.apache.druid.indexing.common.TestUtils; +import org.apache.druid.indexing.common.stats.RowIngestionMetersFactory; +import org.apache.druid.indexing.common.task.IndexTask.IndexIOConfig; +import org.apache.druid.indexing.common.task.IndexTask.IndexIngestionSpec; +import org.apache.druid.indexing.common.task.IndexTask.IndexTuningConfig; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.data.CompressionFactory; +import org.apache.druid.segment.data.CompressionStrategy; +import org.apache.druid.segment.data.RoaringBitmapSerdeFactory; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.RealtimeIOConfig; +import org.apache.druid.segment.indexing.RealtimeTuningConfig; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.segment.realtime.FireDepartment; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.segment.realtime.firehose.LocalFirehoseFactory; +import org.apache.druid.segment.realtime.plumber.Plumber; +import org.apache.druid.segment.realtime.plumber.PlumberSchool; +import org.apache.druid.segment.writeout.TmpFileSegmentWriteOutMediumFactory; +import org.apache.druid.server.security.AuthTestUtils; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.hamcrest.CoreMatchers; import org.joda.time.Period; import org.junit.Assert; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/task/TasksTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/TasksTest.java similarity index 93% rename from indexing-service/src/test/java/io/druid/indexing/common/task/TasksTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/task/TasksTest.java index 5a1fff4369a5..2bbad51392db 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/task/TasksTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/TasksTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.indexing.common.task; +package org.apache.druid.indexing.common.task; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.guava.Comparators; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.guava.Comparators; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/task/batch/parallel/AbstractParallelIndexSupervisorTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/AbstractParallelIndexSupervisorTaskTest.java similarity index 83% rename from indexing-service/src/test/java/io/druid/indexing/common/task/batch/parallel/AbstractParallelIndexSupervisorTaskTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/AbstractParallelIndexSupervisorTaskTest.java index ed70ecaaf7a1..024a5b7e2221 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/task/batch/parallel/AbstractParallelIndexSupervisorTaskTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/AbstractParallelIndexSupervisorTaskTest.java @@ -17,48 +17,48 @@ * under the License. */ -package io.druid.indexing.common.task.batch.parallel; +package org.apache.druid.indexing.common.task.batch.parallel; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.client.indexing.IndexingServiceClient; -import io.druid.client.indexing.NoopIndexingServiceClient; -import io.druid.client.indexing.TaskStatusResponse; -import io.druid.data.input.FiniteFirehoseFactory; -import io.druid.data.input.InputSplit; -import io.druid.data.input.impl.CSVParseSpec; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.ParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.indexer.RunnerTaskState; -import io.druid.indexer.TaskLocation; -import io.druid.indexer.TaskState; -import io.druid.indexer.TaskStatus; -import io.druid.indexer.TaskStatusPlus; -import io.druid.indexing.common.TaskInfoProvider; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.indexing.common.stats.DropwizardRowIngestionMetersFactory; -import io.druid.indexing.common.task.IndexTaskClientFactory; -import io.druid.indexing.common.task.IngestionTestBase; -import io.druid.indexing.common.task.NoopTestTaskFileWriter; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.common.task.TaskResource; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.segment.loading.DataSegmentKiller; -import io.druid.segment.loading.LocalDataSegmentPusher; -import io.druid.segment.loading.LocalDataSegmentPusherConfig; -import io.druid.segment.realtime.appenderator.SegmentIdentifier; -import io.druid.segment.realtime.firehose.NoopChatHandlerProvider; -import io.druid.server.security.AllowAllAuthorizer; -import io.druid.server.security.Authorizer; -import io.druid.server.security.AuthorizerMapper; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.indexing.IndexingServiceClient; +import org.apache.druid.client.indexing.NoopIndexingServiceClient; +import org.apache.druid.client.indexing.TaskStatusResponse; +import org.apache.druid.data.input.FiniteFirehoseFactory; +import org.apache.druid.data.input.InputSplit; +import org.apache.druid.data.input.impl.CSVParseSpec; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.ParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.indexer.RunnerTaskState; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexer.TaskState; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexer.TaskStatusPlus; +import org.apache.druid.indexing.common.TaskInfoProvider; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.indexing.common.stats.DropwizardRowIngestionMetersFactory; +import org.apache.druid.indexing.common.task.IndexTaskClientFactory; +import org.apache.druid.indexing.common.task.IngestionTestBase; +import org.apache.druid.indexing.common.task.NoopTestTaskFileWriter; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.common.task.TaskResource; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.segment.loading.DataSegmentKiller; +import org.apache.druid.segment.loading.LocalDataSegmentPusher; +import org.apache.druid.segment.loading.LocalDataSegmentPusherConfig; +import org.apache.druid.segment.realtime.appenderator.SegmentIdentifier; +import org.apache.druid.segment.realtime.firehose.NoopChatHandlerProvider; +import org.apache.druid.server.security.AllowAllAuthorizer; +import org.apache.druid.server.security.Authorizer; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.timeline.DataSegment; import org.joda.time.DateTime; import org.joda.time.Duration; import org.junit.Rule; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskResourceTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskResourceTest.java similarity index 92% rename from indexing-service/src/test/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskResourceTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskResourceTest.java index 0891a902dc05..8a7503b837b9 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskResourceTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskResourceTest.java @@ -17,41 +17,41 @@ * under the License. */ -package io.druid.indexing.common.task.batch.parallel; +package org.apache.druid.indexing.common.task.batch.parallel; import com.google.common.base.Function; import com.google.common.base.Preconditions; -import io.druid.client.indexing.IndexingServiceClient; -import io.druid.data.input.FiniteFirehoseFactory; -import io.druid.data.input.InputSplit; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.indexer.RunnerTaskState; -import io.druid.indexer.TaskLocation; -import io.druid.indexer.TaskState; -import io.druid.indexer.TaskStatus; -import io.druid.indexer.TaskStatusPlus; -import io.druid.indexing.common.TaskLock; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.actions.LockListAction; -import io.druid.indexing.common.actions.SurrogateAction; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.indexing.common.task.AbstractTask; -import io.druid.indexing.common.task.IndexTaskClientFactory; -import io.druid.indexing.common.task.TaskResource; -import io.druid.indexing.common.task.batch.parallel.ParallelIndexTaskRunner.SubTaskSpecStatus; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthenticationResult; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NumberedShardSpec; +import org.apache.druid.client.indexing.IndexingServiceClient; +import org.apache.druid.data.input.FiniteFirehoseFactory; +import org.apache.druid.data.input.InputSplit; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.indexer.RunnerTaskState; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexer.TaskState; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexer.TaskStatusPlus; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.actions.LockListAction; +import org.apache.druid.indexing.common.actions.SurrogateAction; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.indexing.common.task.AbstractTask; +import org.apache.druid.indexing.common.task.IndexTaskClientFactory; +import org.apache.druid.indexing.common.task.TaskResource; +import org.apache.druid.indexing.common.task.batch.parallel.ParallelIndexTaskRunner.SubTaskSpecStatus; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthenticationResult; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NumberedShardSpec; import org.easymock.EasyMock; import org.joda.time.Interval; import org.junit.After; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskSerdeTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskSerdeTest.java similarity index 76% rename from indexing-service/src/test/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskSerdeTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskSerdeTest.java index 9ace49797e1c..3cbf152be2a1 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskSerdeTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskSerdeTest.java @@ -17,30 +17,30 @@ * under the License. */ -package io.druid.indexing.common.task.batch.parallel; +package org.apache.druid.indexing.common.task.batch.parallel; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.google.common.collect.Lists; -import io.druid.client.indexing.NoopIndexingServiceClient; -import io.druid.data.input.impl.CSVParseSpec; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.ParseSpec; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.indexing.common.TestUtils; -import io.druid.indexing.common.stats.DropwizardRowIngestionMetersFactory; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.common.task.TaskResource; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; -import io.druid.segment.realtime.firehose.LocalFirehoseFactory; -import io.druid.segment.realtime.firehose.NoopChatHandlerProvider; -import io.druid.server.security.AuthorizerMapper; +import org.apache.druid.client.indexing.NoopIndexingServiceClient; +import org.apache.druid.data.input.impl.CSVParseSpec; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.ParseSpec; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.indexing.common.TestUtils; +import org.apache.druid.indexing.common.stats.DropwizardRowIngestionMetersFactory; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.common.task.TaskResource; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.segment.realtime.firehose.LocalFirehoseFactory; +import org.apache.druid.segment.realtime.firehose.NoopChatHandlerProvider; +import org.apache.druid.server.security.AuthorizerMapper; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Rule; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskTest.java similarity index 90% rename from indexing-service/src/test/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskTest.java index b20436a158a1..ba5254db5ce7 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskTest.java @@ -17,25 +17,25 @@ * under the License. */ -package io.druid.indexing.common.task.batch.parallel; +package org.apache.druid.indexing.common.task.batch.parallel; -import io.druid.client.indexing.IndexingServiceClient; -import io.druid.data.input.FiniteFirehoseFactory; -import io.druid.data.input.InputSplit; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.indexer.TaskState; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.indexing.common.task.TaskResource; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; -import io.druid.segment.realtime.firehose.LocalFirehoseFactory; +import org.apache.druid.client.indexing.IndexingServiceClient; +import org.apache.druid.data.input.FiniteFirehoseFactory; +import org.apache.druid.data.input.InputSplit; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.indexer.TaskState; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.indexing.common.task.TaskResource; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.segment.realtime.firehose.LocalFirehoseFactory; import org.joda.time.Interval; import org.junit.After; import org.junit.Assert; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/task/batch/parallel/TaskMonitorTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/TaskMonitorTest.java similarity index 89% rename from indexing-service/src/test/java/io/druid/indexing/common/task/batch/parallel/TaskMonitorTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/TaskMonitorTest.java index 33173b35feac..80cbe816a639 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/task/batch/parallel/TaskMonitorTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/TaskMonitorTest.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.indexing.common.task.batch.parallel; +package org.apache.druid.indexing.common.task.batch.parallel; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.client.indexing.NoopIndexingServiceClient; -import io.druid.client.indexing.TaskStatusResponse; -import io.druid.data.input.InputSplit; -import io.druid.indexer.RunnerTaskState; -import io.druid.indexer.TaskLocation; -import io.druid.indexer.TaskState; -import io.druid.indexer.TaskStatus; -import io.druid.indexer.TaskStatusPlus; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.task.NoopTask; -import io.druid.indexing.common.task.batch.parallel.TaskMonitor.SubTaskCompleteEvent; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.concurrent.Execs; +import org.apache.druid.client.indexing.NoopIndexingServiceClient; +import org.apache.druid.client.indexing.TaskStatusResponse; +import org.apache.druid.data.input.InputSplit; +import org.apache.druid.indexer.RunnerTaskState; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexer.TaskState; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexer.TaskStatusPlus; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.task.NoopTask; +import org.apache.druid.indexing.common.task.batch.parallel.TaskMonitor.SubTaskCompleteEvent; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.concurrent.Execs; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/tasklogs/FileTaskLogsTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/tasklogs/FileTaskLogsTest.java similarity index 95% rename from indexing-service/src/test/java/io/druid/indexing/common/tasklogs/FileTaskLogsTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/common/tasklogs/FileTaskLogsTest.java index dd438a6a8468..112c5cfd572d 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/tasklogs/FileTaskLogsTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/tasklogs/FileTaskLogsTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.indexing.common.tasklogs; +package org.apache.druid.indexing.common.tasklogs; import com.google.common.collect.ImmutableMap; import com.google.common.io.ByteStreams; import com.google.common.io.Files; -import io.druid.indexing.common.config.FileTaskLogsConfig; -import io.druid.java.util.common.StringUtils; -import io.druid.tasklogs.TaskLogs; +import org.apache.druid.indexing.common.config.FileTaskLogsConfig; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.tasklogs.TaskLogs; import org.apache.commons.io.FileUtils; import org.junit.Assert; import org.junit.Rule; diff --git a/indexing-service/src/test/java/io/druid/indexing/firehose/IngestSegmentFirehoseFactoryTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/firehose/IngestSegmentFirehoseFactoryTest.java similarity index 84% rename from indexing-service/src/test/java/io/druid/indexing/firehose/IngestSegmentFirehoseFactoryTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/firehose/IngestSegmentFirehoseFactoryTest.java index 60ef6932740e..bbfb25ffb518 100644 --- a/indexing-service/src/test/java/io/druid/indexing/firehose/IngestSegmentFirehoseFactoryTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/firehose/IngestSegmentFirehoseFactoryTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.firehose; +package org.apache.druid.indexing.firehose; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair; @@ -31,69 +31,69 @@ import com.google.common.io.Files; import com.google.inject.Binder; import com.google.inject.Module; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.JSONParseSpec; -import io.druid.data.input.impl.MapInputRowParser; -import io.druid.data.input.impl.TimeAndDimsParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.guice.GuiceAnnotationIntrospector; -import io.druid.guice.GuiceInjectableValues; -import io.druid.guice.GuiceInjectors; -import io.druid.indexing.common.Counters; -import io.druid.indexing.common.SegmentLoaderFactory; -import io.druid.indexing.common.TaskToolboxFactory; -import io.druid.indexing.common.TestUtils; -import io.druid.indexing.common.actions.LocalTaskActionClientFactory; -import io.druid.indexing.common.actions.TaskActionToolbox; -import io.druid.indexing.common.config.TaskConfig; -import io.druid.indexing.common.config.TaskStorageConfig; -import io.druid.indexing.common.task.NoopTask; -import io.druid.indexing.common.task.NoopTestTaskFileWriter; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.HeapMemoryTaskStorage; -import io.druid.indexing.overlord.TaskLockbox; -import io.druid.indexing.overlord.TaskStorage; -import io.druid.indexing.overlord.supervisor.SupervisorManager; -import io.druid.java.util.common.IOE; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.JodaUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.math.expr.ExprMacroTable; -import io.druid.metadata.IndexerSQLMetadataStorageCoordinator; -import io.druid.query.aggregation.DoubleSumAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMergerV9; -import io.druid.segment.IndexSpec; -import io.druid.segment.TestHelper; -import io.druid.segment.column.Column; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexSchema; -import io.druid.segment.loading.DataSegmentArchiver; -import io.druid.segment.loading.DataSegmentKiller; -import io.druid.segment.loading.DataSegmentMover; -import io.druid.segment.loading.DataSegmentPusher; -import io.druid.segment.loading.LocalDataSegmentPuller; -import io.druid.segment.loading.LocalLoadSpec; -import io.druid.segment.loading.SegmentLoaderConfig; -import io.druid.segment.loading.SegmentLoaderLocalCacheManager; -import io.druid.segment.loading.StorageLocationConfig; -import io.druid.segment.realtime.firehose.IngestSegmentFirehose; -import io.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; -import io.druid.segment.transform.ExpressionTransform; -import io.druid.segment.transform.TransformSpec; -import io.druid.server.metrics.NoopServiceEmitter; -import io.druid.timeline.DataSegment; -import io.druid.timeline.TimelineObjectHolder; -import io.druid.timeline.partition.NumberedPartitionChunk; -import io.druid.timeline.partition.NumberedShardSpec; -import io.druid.timeline.partition.PartitionChunk; -import io.druid.timeline.partition.PartitionHolder; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.JSONParseSpec; +import org.apache.druid.data.input.impl.MapInputRowParser; +import org.apache.druid.data.input.impl.TimeAndDimsParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.guice.GuiceAnnotationIntrospector; +import org.apache.druid.guice.GuiceInjectableValues; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.indexing.common.Counters; +import org.apache.druid.indexing.common.SegmentLoaderFactory; +import org.apache.druid.indexing.common.TaskToolboxFactory; +import org.apache.druid.indexing.common.TestUtils; +import org.apache.druid.indexing.common.actions.LocalTaskActionClientFactory; +import org.apache.druid.indexing.common.actions.TaskActionToolbox; +import org.apache.druid.indexing.common.config.TaskConfig; +import org.apache.druid.indexing.common.config.TaskStorageConfig; +import org.apache.druid.indexing.common.task.NoopTask; +import org.apache.druid.indexing.common.task.NoopTestTaskFileWriter; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.HeapMemoryTaskStorage; +import org.apache.druid.indexing.overlord.TaskLockbox; +import org.apache.druid.indexing.overlord.TaskStorage; +import org.apache.druid.indexing.overlord.supervisor.SupervisorManager; +import org.apache.druid.java.util.common.IOE; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.JodaUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.metadata.IndexerSQLMetadataStorageCoordinator; +import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMergerV9; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.segment.loading.DataSegmentArchiver; +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.segment.loading.LocalDataSegmentPuller; +import org.apache.druid.segment.loading.LocalLoadSpec; +import org.apache.druid.segment.loading.SegmentLoaderConfig; +import org.apache.druid.segment.loading.SegmentLoaderLocalCacheManager; +import org.apache.druid.segment.loading.StorageLocationConfig; +import org.apache.druid.segment.realtime.firehose.IngestSegmentFirehose; +import org.apache.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; +import org.apache.druid.segment.transform.ExpressionTransform; +import org.apache.druid.segment.transform.TransformSpec; +import org.apache.druid.server.metrics.NoopServiceEmitter; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.TimelineObjectHolder; +import org.apache.druid.timeline.partition.NumberedPartitionChunk; +import org.apache.druid.timeline.partition.NumberedShardSpec; +import org.apache.druid.timeline.partition.PartitionChunk; +import org.apache.druid.timeline.partition.PartitionHolder; import org.easymock.EasyMock; import org.joda.time.Interval; import org.junit.AfterClass; diff --git a/indexing-service/src/test/java/io/druid/indexing/firehose/IngestSegmentFirehoseFactoryTimelineTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/firehose/IngestSegmentFirehoseFactoryTimelineTest.java similarity index 84% rename from indexing-service/src/test/java/io/druid/indexing/firehose/IngestSegmentFirehoseFactoryTimelineTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/firehose/IngestSegmentFirehoseFactoryTimelineTest.java index 469d4a867e4b..bc42c876db7f 100644 --- a/indexing-service/src/test/java/io/druid/indexing/firehose/IngestSegmentFirehoseFactoryTimelineTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/firehose/IngestSegmentFirehoseFactoryTimelineTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.firehose; +package org.apache.druid.indexing.firehose; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Throwables; @@ -27,47 +27,47 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.common.io.Files; -import io.druid.data.input.Firehose; -import io.druid.data.input.InputRow; -import io.druid.data.input.MapBasedInputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.JSONParseSpec; -import io.druid.data.input.impl.MapInputRowParser; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.indexing.common.SegmentLoaderFactory; -import io.druid.indexing.common.TaskLock; -import io.druid.indexing.common.TaskLockType; -import io.druid.indexing.common.TaskToolboxFactory; -import io.druid.indexing.common.TestUtils; -import io.druid.indexing.common.actions.LockAcquireAction; -import io.druid.indexing.common.actions.SegmentListUsedAction; -import io.druid.indexing.common.actions.TaskAction; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.indexing.common.actions.TaskActionClientFactory; -import io.druid.indexing.common.config.TaskConfig; -import io.druid.indexing.common.task.NoopTask; -import io.druid.indexing.common.task.NoopTestTaskFileWriter; -import io.druid.indexing.common.task.Task; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.JodaUtils; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.filter.TrueDimFilter; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMergerV9; -import io.druid.segment.IndexSpec; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexSchema; -import io.druid.segment.incremental.IndexSizeExceededException; -import io.druid.segment.loading.SegmentLoaderConfig; -import io.druid.segment.loading.SegmentLoaderLocalCacheManager; -import io.druid.segment.loading.StorageLocationConfig; -import io.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; -import io.druid.segment.transform.TransformSpec; -import io.druid.server.metrics.NoopServiceEmitter; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.LinearShardSpec; +import org.apache.druid.data.input.Firehose; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.JSONParseSpec; +import org.apache.druid.data.input.impl.MapInputRowParser; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.indexing.common.SegmentLoaderFactory; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexing.common.TaskLockType; +import org.apache.druid.indexing.common.TaskToolboxFactory; +import org.apache.druid.indexing.common.TestUtils; +import org.apache.druid.indexing.common.actions.LockAcquireAction; +import org.apache.druid.indexing.common.actions.SegmentListUsedAction; +import org.apache.druid.indexing.common.actions.TaskAction; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.indexing.common.actions.TaskActionClientFactory; +import org.apache.druid.indexing.common.config.TaskConfig; +import org.apache.druid.indexing.common.task.NoopTask; +import org.apache.druid.indexing.common.task.NoopTestTaskFileWriter; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.JodaUtils; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.filter.TrueDimFilter; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMergerV9; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.segment.incremental.IndexSizeExceededException; +import org.apache.druid.segment.loading.SegmentLoaderConfig; +import org.apache.druid.segment.loading.SegmentLoaderLocalCacheManager; +import org.apache.druid.segment.loading.StorageLocationConfig; +import org.apache.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; +import org.apache.druid.segment.transform.TransformSpec; +import org.apache.druid.server.metrics.NoopServiceEmitter; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.LinearShardSpec; import org.apache.commons.io.FileUtils; import org.easymock.EasyMock; import org.joda.time.Interval; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/ForkingTaskRunnerTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/ForkingTaskRunnerTest.java similarity index 98% rename from indexing-service/src/test/java/io/druid/indexing/overlord/ForkingTaskRunnerTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/ForkingTaskRunnerTest.java index e9d832bc5bd1..7ad8f5458eed 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/ForkingTaskRunnerTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/ForkingTaskRunnerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/ImmutableWorkerInfoTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/ImmutableWorkerInfoTest.java similarity index 96% rename from indexing-service/src/test/java/io/druid/indexing/overlord/ImmutableWorkerInfoTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/ImmutableWorkerInfoTest.java index 5e6e023a7079..3c1530d3f6d0 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/ImmutableWorkerInfoTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/ImmutableWorkerInfoTest.java @@ -18,13 +18,13 @@ */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableSet; -import io.druid.indexing.worker.Worker; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; +import org.apache.druid.indexing.worker.Worker; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/IndexerMetadataStorageAdapterTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/IndexerMetadataStorageAdapterTest.java similarity index 92% rename from indexing-service/src/test/java/io/druid/indexing/overlord/IndexerMetadataStorageAdapterTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/IndexerMetadataStorageAdapterTest.java index 0d42c6000fd4..8cb45ade0f09 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/IndexerMetadataStorageAdapterTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/IndexerMetadataStorageAdapterTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.google.common.collect.ImmutableList; -import io.druid.indexer.TaskInfo; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.task.NoopTask; -import io.druid.indexing.common.task.Task; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; +import org.apache.druid.indexer.TaskInfo; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.task.NoopTask; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; import org.easymock.EasyMock; import org.hamcrest.CoreMatchers; import org.joda.time.Interval; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/OverlordBlinkLeadershipTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/OverlordBlinkLeadershipTest.java similarity index 86% rename from indexing-service/src/test/java/io/druid/indexing/overlord/OverlordBlinkLeadershipTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/OverlordBlinkLeadershipTest.java index caf5080474e1..8be822695cc5 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/OverlordBlinkLeadershipTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/OverlordBlinkLeadershipTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.google.common.base.Supplier; -import io.druid.indexing.overlord.autoscaling.ProvisioningSchedulerConfig; -import io.druid.indexing.overlord.autoscaling.SimpleWorkerProvisioningConfig; -import io.druid.indexing.overlord.autoscaling.SimpleWorkerProvisioningStrategy; -import io.druid.indexing.overlord.setup.DefaultWorkerBehaviorConfig; -import io.druid.indexing.overlord.setup.WorkerBehaviorConfig; +import org.apache.druid.indexing.overlord.autoscaling.ProvisioningSchedulerConfig; +import org.apache.druid.indexing.overlord.autoscaling.SimpleWorkerProvisioningConfig; +import org.apache.druid.indexing.overlord.autoscaling.SimpleWorkerProvisioningStrategy; +import org.apache.druid.indexing.overlord.setup.DefaultWorkerBehaviorConfig; +import org.apache.druid.indexing.overlord.setup.WorkerBehaviorConfig; import org.joda.time.Period; import org.junit.After; import org.junit.Assert; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/PortFinderTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/PortFinderTest.java similarity index 97% rename from indexing-service/src/test/java/io/druid/indexing/overlord/PortFinderTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/PortFinderTest.java index b6215ea0b1b8..b2db791bcf45 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/PortFinderTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/PortFinderTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/RealtimeishTask.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/RealtimeishTask.java similarity index 83% rename from indexing-service/src/test/java/io/druid/indexing/overlord/RealtimeishTask.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/RealtimeishTask.java index cad714512120..e60de63b463e 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/RealtimeishTask.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/RealtimeishTask.java @@ -17,23 +17,23 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import io.druid.indexing.common.TaskLock; -import io.druid.indexing.common.TaskLockType; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.actions.LockAcquireAction; -import io.druid.indexing.common.actions.LockListAction; -import io.druid.indexing.common.actions.LockReleaseAction; -import io.druid.indexing.common.actions.SegmentInsertAction; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.indexing.common.task.AbstractTask; -import io.druid.indexing.common.task.TaskResource; -import io.druid.java.util.common.Intervals; -import io.druid.timeline.DataSegment; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexing.common.TaskLockType; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.actions.LockAcquireAction; +import org.apache.druid.indexing.common.actions.LockListAction; +import org.apache.druid.indexing.common.actions.LockReleaseAction; +import org.apache.druid.indexing.common.actions.SegmentInsertAction; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.indexing.common.task.AbstractTask; +import org.apache.druid.indexing.common.task.TaskResource; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import org.junit.Assert; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/RemoteTaskRunnerRunPendingTasksConcurrencyTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/RemoteTaskRunnerRunPendingTasksConcurrencyTest.java similarity index 95% rename from indexing-service/src/test/java/io/druid/indexing/overlord/RemoteTaskRunnerRunPendingTasksConcurrencyTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/RemoteTaskRunnerRunPendingTasksConcurrencyTest.java index 28793456a2c8..d3146bb0a81f 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/RemoteTaskRunnerRunPendingTasksConcurrencyTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/RemoteTaskRunnerRunPendingTasksConcurrencyTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.indexer.TaskState; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TestTasks; -import io.druid.indexing.common.task.Task; -import io.druid.java.util.common.ISE; +import org.apache.druid.indexer.TaskState; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TestTasks; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.java.util.common.ISE; import org.apache.zookeeper.ZooKeeper; import org.joda.time.Period; @@ -56,7 +56,7 @@ public void tearDown() throws Exception rtrTestUtils.tearDown(); } - // This task reproduces the races described in https://github.com/druid-io/druid/issues/2842 + // This task reproduces the races described in https://github.com/apache/incubator-druid/issues/2842 @Test(timeout = 60_000L) public void testConcurrency() throws Exception { diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/RemoteTaskRunnerTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/RemoteTaskRunnerTest.java similarity index 97% rename from indexing-service/src/test/java/io/druid/indexing/overlord/RemoteTaskRunnerTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/RemoteTaskRunnerTest.java index ef07415fce2a..920d401ee5a4 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/RemoteTaskRunnerTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/RemoteTaskRunnerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Function; @@ -28,20 +28,20 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.indexer.TaskState; -import io.druid.indexing.common.IndexingServiceCondition; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TestRealtimeTask; -import io.druid.indexing.common.TestTasks; -import io.druid.indexing.common.TestUtils; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.common.task.TaskResource; -import io.druid.indexing.overlord.config.RemoteTaskRunnerConfig; -import io.druid.indexing.worker.Worker; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.indexer.TaskState; +import org.apache.druid.indexing.common.IndexingServiceCondition; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TestRealtimeTask; +import org.apache.druid.indexing.common.TestTasks; +import org.apache.druid.indexing.common.TestUtils; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.common.task.TaskResource; +import org.apache.druid.indexing.overlord.config.RemoteTaskRunnerConfig; +import org.apache.druid.indexing.worker.Worker; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; import org.apache.curator.framework.CuratorFramework; import org.easymock.EasyMock; import org.joda.time.Period; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/RemoteTaskRunnerTestUtils.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/RemoteTaskRunnerTestUtils.java similarity index 86% rename from indexing-service/src/test/java/io/druid/indexing/overlord/RemoteTaskRunnerTestUtils.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/RemoteTaskRunnerTestUtils.java index e229ea2c0e56..8995c9fd6e09 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/RemoteTaskRunnerTestUtils.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/RemoteTaskRunnerTestUtils.java @@ -17,32 +17,32 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.base.Supplier; import com.google.common.base.Throwables; -import io.druid.common.guava.DSuppliers; -import io.druid.curator.PotentiallyGzippedCompressionProvider; -import io.druid.curator.cache.PathChildrenCacheFactory; -import io.druid.indexer.TaskLocation; -import io.druid.indexing.common.IndexingServiceCondition; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TestUtils; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.autoscaling.NoopProvisioningStrategy; -import io.druid.indexing.overlord.autoscaling.ProvisioningStrategy; -import io.druid.indexing.overlord.config.RemoteTaskRunnerConfig; -import io.druid.indexing.overlord.setup.DefaultWorkerBehaviorConfig; -import io.druid.indexing.overlord.setup.WorkerBehaviorConfig; -import io.druid.indexing.worker.TaskAnnouncement; -import io.druid.indexing.worker.Worker; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.http.client.HttpClient; -import io.druid.server.initialization.IndexerZkConfig; -import io.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.common.guava.DSuppliers; +import org.apache.druid.curator.PotentiallyGzippedCompressionProvider; +import org.apache.druid.curator.cache.PathChildrenCacheFactory; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexing.common.IndexingServiceCondition; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TestUtils; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.autoscaling.NoopProvisioningStrategy; +import org.apache.druid.indexing.overlord.autoscaling.ProvisioningStrategy; +import org.apache.druid.indexing.overlord.config.RemoteTaskRunnerConfig; +import org.apache.druid.indexing.overlord.setup.DefaultWorkerBehaviorConfig; +import org.apache.druid.indexing.overlord.setup.WorkerBehaviorConfig; +import org.apache.druid.indexing.worker.TaskAnnouncement; +import org.apache.druid.indexing.worker.Worker; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.server.initialization.IndexerZkConfig; +import org.apache.druid.server.initialization.ZkPathsConfig; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.retry.ExponentialBackoffRetry; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/SingleTaskBackgroundRunnerTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/SingleTaskBackgroundRunnerTest.java similarity index 78% rename from indexing-service/src/test/java/io/druid/indexing/overlord/SingleTaskBackgroundRunnerTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/SingleTaskBackgroundRunnerTest.java index a5cd12512132..74dd1d2eaae2 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/SingleTaskBackgroundRunnerTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/SingleTaskBackgroundRunnerTest.java @@ -17,31 +17,31 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.indexer.TaskState; -import io.druid.indexing.common.SegmentLoaderFactory; -import io.druid.indexing.common.TaskReportFileWriter; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.TaskToolboxFactory; -import io.druid.indexing.common.TestUtils; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.indexing.common.actions.TaskActionClientFactory; -import io.druid.indexing.common.config.TaskConfig; -import io.druid.indexing.common.task.AbstractTask; -import io.druid.indexing.common.task.NoopTask; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.segment.loading.NoopDataSegmentArchiver; -import io.druid.segment.loading.NoopDataSegmentKiller; -import io.druid.segment.loading.NoopDataSegmentMover; -import io.druid.segment.loading.NoopDataSegmentPusher; -import io.druid.segment.loading.SegmentLoaderLocalCacheManager; -import io.druid.server.DruidNode; -import io.druid.server.coordination.NoopDataSegmentAnnouncer; -import io.druid.server.initialization.ServerConfig; -import io.druid.server.metrics.NoopServiceEmitter; +import org.apache.druid.indexer.TaskState; +import org.apache.druid.indexing.common.SegmentLoaderFactory; +import org.apache.druid.indexing.common.TaskReportFileWriter; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.TaskToolboxFactory; +import org.apache.druid.indexing.common.TestUtils; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.indexing.common.actions.TaskActionClientFactory; +import org.apache.druid.indexing.common.config.TaskConfig; +import org.apache.druid.indexing.common.task.AbstractTask; +import org.apache.druid.indexing.common.task.NoopTask; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.segment.loading.NoopDataSegmentArchiver; +import org.apache.druid.segment.loading.NoopDataSegmentKiller; +import org.apache.druid.segment.loading.NoopDataSegmentMover; +import org.apache.druid.segment.loading.NoopDataSegmentPusher; +import org.apache.druid.segment.loading.SegmentLoaderLocalCacheManager; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.coordination.NoopDataSegmentAnnouncer; +import org.apache.druid.server.initialization.ServerConfig; +import org.apache.druid.server.metrics.NoopServiceEmitter; import org.easymock.EasyMock; import org.junit.After; import org.junit.Assert; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/TaskLifecycleTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLifecycleTest.java similarity index 88% rename from indexing-service/src/test/java/io/druid/indexing/overlord/TaskLifecycleTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLifecycleTest.java index dc41b869e371..0de8debf718c 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/TaskLifecycleTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLifecycleTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -34,93 +34,93 @@ import com.google.common.collect.Lists; import com.google.common.collect.Ordering; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.client.cache.CachePopulatorStats; -import io.druid.client.cache.MapCache; -import io.druid.data.input.Firehose; -import io.druid.data.input.FirehoseFactory; -import io.druid.data.input.InputRow; -import io.druid.data.input.MapBasedInputRow; -import io.druid.data.input.impl.InputRowParser; -import io.druid.discovery.DataNodeService; -import io.druid.discovery.DruidNodeAnnouncer; -import io.druid.discovery.LookupNodeService; -import io.druid.indexer.TaskState; -import io.druid.indexing.common.Counters; -import io.druid.indexing.common.SegmentLoaderFactory; -import io.druid.indexing.common.TaskLock; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.TaskToolboxFactory; -import io.druid.indexing.common.TestUtils; -import io.druid.indexing.common.actions.LocalTaskActionClientFactory; -import io.druid.indexing.common.actions.LockListAction; -import io.druid.indexing.common.actions.SegmentInsertAction; -import io.druid.indexing.common.actions.TaskActionClientFactory; -import io.druid.indexing.common.actions.TaskActionToolbox; -import io.druid.indexing.common.config.TaskConfig; -import io.druid.indexing.common.config.TaskStorageConfig; -import io.druid.indexing.common.stats.RowIngestionMetersFactory; -import io.druid.indexing.common.task.AbstractFixedIntervalTask; -import io.druid.indexing.common.task.IndexTask; -import io.druid.indexing.common.task.IndexTask.IndexIOConfig; -import io.druid.indexing.common.task.IndexTask.IndexIngestionSpec; -import io.druid.indexing.common.task.IndexTask.IndexTuningConfig; -import io.druid.indexing.common.task.KillTask; -import io.druid.indexing.common.task.NoopTestTaskFileWriter; -import io.druid.indexing.common.task.RealtimeIndexTask; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.common.task.TaskResource; -import io.druid.indexing.overlord.config.TaskQueueConfig; -import io.druid.indexing.overlord.supervisor.SupervisorManager; -import io.druid.indexing.test.TestIndexerMetadataStorageCoordinator; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.RE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.Comparators; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.metrics.Monitor; -import io.druid.java.util.metrics.MonitorScheduler; -import io.druid.metadata.DerbyMetadataStorageActionHandlerFactory; -import io.druid.metadata.TestDerbyConnector; -import io.druid.query.QueryRunnerFactoryConglomerate; -import io.druid.query.SegmentDescriptor; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.DoubleSumAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMergerV9; -import io.druid.segment.IndexSpec; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.RealtimeIOConfig; -import io.druid.segment.indexing.RealtimeTuningConfig; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; -import io.druid.segment.loading.DataSegmentArchiver; -import io.druid.segment.loading.DataSegmentMover; -import io.druid.segment.loading.DataSegmentPusher; -import io.druid.segment.loading.LocalDataSegmentKiller; -import io.druid.segment.loading.LocalDataSegmentPusherConfig; -import io.druid.segment.loading.SegmentLoaderConfig; -import io.druid.segment.loading.SegmentLoaderLocalCacheManager; -import io.druid.segment.loading.StorageLocationConfig; -import io.druid.segment.realtime.FireDepartment; -import io.druid.segment.realtime.FireDepartmentTest; -import io.druid.segment.realtime.plumber.SegmentHandoffNotifier; -import io.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; -import io.druid.server.DruidNode; -import io.druid.server.coordination.DataSegmentAnnouncer; -import io.druid.server.coordination.DataSegmentServerAnnouncer; -import io.druid.server.coordination.ServerType; -import io.druid.server.initialization.ServerConfig; -import io.druid.server.metrics.NoopServiceEmitter; -import io.druid.server.security.AuthTestUtils; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.client.cache.CachePopulatorStats; +import org.apache.druid.client.cache.MapCache; +import org.apache.druid.data.input.Firehose; +import org.apache.druid.data.input.FirehoseFactory; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.discovery.DataNodeService; +import org.apache.druid.discovery.DruidNodeAnnouncer; +import org.apache.druid.discovery.LookupNodeService; +import org.apache.druid.indexer.TaskState; +import org.apache.druid.indexing.common.Counters; +import org.apache.druid.indexing.common.SegmentLoaderFactory; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.TaskToolboxFactory; +import org.apache.druid.indexing.common.TestUtils; +import org.apache.druid.indexing.common.actions.LocalTaskActionClientFactory; +import org.apache.druid.indexing.common.actions.LockListAction; +import org.apache.druid.indexing.common.actions.SegmentInsertAction; +import org.apache.druid.indexing.common.actions.TaskActionClientFactory; +import org.apache.druid.indexing.common.actions.TaskActionToolbox; +import org.apache.druid.indexing.common.config.TaskConfig; +import org.apache.druid.indexing.common.config.TaskStorageConfig; +import org.apache.druid.indexing.common.stats.RowIngestionMetersFactory; +import org.apache.druid.indexing.common.task.AbstractFixedIntervalTask; +import org.apache.druid.indexing.common.task.IndexTask; +import org.apache.druid.indexing.common.task.IndexTask.IndexIOConfig; +import org.apache.druid.indexing.common.task.IndexTask.IndexIngestionSpec; +import org.apache.druid.indexing.common.task.IndexTask.IndexTuningConfig; +import org.apache.druid.indexing.common.task.KillTask; +import org.apache.druid.indexing.common.task.NoopTestTaskFileWriter; +import org.apache.druid.indexing.common.task.RealtimeIndexTask; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.common.task.TaskResource; +import org.apache.druid.indexing.overlord.config.TaskQueueConfig; +import org.apache.druid.indexing.overlord.supervisor.SupervisorManager; +import org.apache.druid.indexing.test.TestIndexerMetadataStorageCoordinator; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.metrics.Monitor; +import org.apache.druid.java.util.metrics.MonitorScheduler; +import org.apache.druid.metadata.DerbyMetadataStorageActionHandlerFactory; +import org.apache.druid.metadata.TestDerbyConnector; +import org.apache.druid.query.QueryRunnerFactoryConglomerate; +import org.apache.druid.query.SegmentDescriptor; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMergerV9; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.RealtimeIOConfig; +import org.apache.druid.segment.indexing.RealtimeTuningConfig; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.segment.loading.DataSegmentArchiver; +import org.apache.druid.segment.loading.DataSegmentMover; +import org.apache.druid.segment.loading.DataSegmentPusher; +import org.apache.druid.segment.loading.LocalDataSegmentKiller; +import org.apache.druid.segment.loading.LocalDataSegmentPusherConfig; +import org.apache.druid.segment.loading.SegmentLoaderConfig; +import org.apache.druid.segment.loading.SegmentLoaderLocalCacheManager; +import org.apache.druid.segment.loading.StorageLocationConfig; +import org.apache.druid.segment.realtime.FireDepartment; +import org.apache.druid.segment.realtime.FireDepartmentTest; +import org.apache.druid.segment.realtime.plumber.SegmentHandoffNotifier; +import org.apache.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.coordination.DataSegmentAnnouncer; +import org.apache.druid.server.coordination.DataSegmentServerAnnouncer; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.server.initialization.ServerConfig; +import org.apache.druid.server.metrics.NoopServiceEmitter; +import org.apache.druid.server.security.AuthTestUtils; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.easymock.EasyMock; import org.joda.time.DateTime; import org.joda.time.Hours; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/TaskLockBoxConcurrencyTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLockBoxConcurrencyTest.java similarity index 92% rename from indexing-service/src/test/java/io/druid/indexing/overlord/TaskLockBoxConcurrencyTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLockBoxConcurrencyTest.java index 86f93edf6990..770a27922210 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/TaskLockBoxConcurrencyTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLockBoxConcurrencyTest.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; -import io.druid.common.guava.SettableSupplier; -import io.druid.indexing.common.TaskLockType; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.config.TaskStorageConfig; -import io.druid.indexing.common.task.NoopTask; -import io.druid.indexing.common.task.Task; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; -import io.druid.metadata.DerbyMetadataStorageActionHandlerFactory; -import io.druid.metadata.EntryExistsException; -import io.druid.metadata.TestDerbyConnector; +import org.apache.druid.common.guava.SettableSupplier; +import org.apache.druid.indexing.common.TaskLockType; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.config.TaskStorageConfig; +import org.apache.druid.indexing.common.task.NoopTask; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.metadata.DerbyMetadataStorageActionHandlerFactory; +import org.apache.druid.metadata.EntryExistsException; +import org.apache.druid.metadata.TestDerbyConnector; import org.joda.time.Interval; import org.junit.After; import org.junit.Assert; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/TaskLockboxTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLockboxTest.java similarity index 96% rename from indexing-service/src/test/java/io/druid/indexing/overlord/TaskLockboxTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLockboxTest.java index 442f304dc27b..e20df5a7a7c4 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/TaskLockboxTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLockboxTest.java @@ -17,28 +17,28 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Iterables; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskLock; -import io.druid.indexing.common.TaskLockType; -import io.druid.indexing.common.config.TaskStorageConfig; -import io.druid.indexing.common.task.NoopTask; -import io.druid.indexing.common.task.Task; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.metadata.DerbyMetadataStorageActionHandlerFactory; -import io.druid.metadata.EntryExistsException; -import io.druid.metadata.TestDerbyConnector; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskLock; +import org.apache.druid.indexing.common.TaskLockType; +import org.apache.druid.indexing.common.config.TaskStorageConfig; +import org.apache.druid.indexing.common.task.NoopTask; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.metadata.DerbyMetadataStorageActionHandlerFactory; +import org.apache.druid.metadata.EntryExistsException; +import org.apache.druid.metadata.TestDerbyConnector; import org.easymock.EasyMock; import org.joda.time.Interval; import org.junit.Assert; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/TestRemoteTaskRunnerConfig.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TestRemoteTaskRunnerConfig.java similarity index 93% rename from indexing-service/src/test/java/io/druid/indexing/overlord/TestRemoteTaskRunnerConfig.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/TestRemoteTaskRunnerConfig.java index 5b23b12dc768..a634294637c7 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/TestRemoteTaskRunnerConfig.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TestRemoteTaskRunnerConfig.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; -import io.druid.indexing.overlord.config.RemoteTaskRunnerConfig; +import org.apache.druid.indexing.overlord.config.RemoteTaskRunnerConfig; import org.joda.time.Period; /** diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/TestTaskRunner.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TestTaskRunner.java similarity index 92% rename from indexing-service/src/test/java/io/druid/indexing/overlord/TestTaskRunner.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/TestTaskRunner.java index 418f0a9a3d2c..fbc5b2408ab6 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/TestTaskRunner.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TestTaskRunner.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.google.common.base.Optional; import com.google.common.base.Preconditions; @@ -27,25 +27,25 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.concurrent.TaskThreadPriority; -import io.druid.indexer.TaskLocation; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.TaskToolboxFactory; -import io.druid.indexing.common.config.TaskConfig; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.autoscaling.ScalingStats; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Numbers; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.RE; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.query.Query; -import io.druid.query.QueryRunner; -import io.druid.query.QuerySegmentWalker; -import io.druid.query.SegmentDescriptor; +import org.apache.druid.concurrent.TaskThreadPriority; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.TaskToolboxFactory; +import org.apache.druid.indexing.common.config.TaskConfig; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.autoscaling.ScalingStats; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Numbers; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QuerySegmentWalker; +import org.apache.druid.query.SegmentDescriptor; import org.joda.time.Interval; import java.util.Collection; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/autoscaling/EC2AutoScalerSerdeTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/EC2AutoScalerSerdeTest.java similarity index 95% rename from indexing-service/src/test/java/io/druid/indexing/overlord/autoscaling/EC2AutoScalerSerdeTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/EC2AutoScalerSerdeTest.java index 76e913214bfc..e97351311c01 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/autoscaling/EC2AutoScalerSerdeTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/EC2AutoScalerSerdeTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.indexing.overlord.autoscaling; +package org.apache.druid.indexing.overlord.autoscaling; import com.fasterxml.jackson.databind.BeanProperty; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.io.BaseEncoding; -import io.druid.indexing.overlord.autoscaling.ec2.EC2AutoScaler; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.indexing.overlord.autoscaling.ec2.EC2AutoScaler; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.StringUtils; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/autoscaling/EC2AutoScalerTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/EC2AutoScalerTest.java similarity index 95% rename from indexing-service/src/test/java/io/druid/indexing/overlord/autoscaling/EC2AutoScalerTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/EC2AutoScalerTest.java index 68daf7f762b1..e81804c4afed 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/autoscaling/EC2AutoScalerTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/EC2AutoScalerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.autoscaling; +package org.apache.druid.indexing.overlord.autoscaling; import com.amazonaws.services.ec2.AmazonEC2Client; import com.amazonaws.services.ec2.model.DescribeInstancesRequest; @@ -33,11 +33,11 @@ import com.google.common.collect.DiscreteDomain; import com.google.common.collect.Lists; import com.google.common.collect.Range; -import io.druid.indexing.overlord.autoscaling.ec2.EC2AutoScaler; -import io.druid.indexing.overlord.autoscaling.ec2.EC2EnvironmentConfig; -import io.druid.indexing.overlord.autoscaling.ec2.EC2NodeData; -import io.druid.indexing.overlord.autoscaling.ec2.GalaxyEC2UserData; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.indexing.overlord.autoscaling.ec2.EC2AutoScaler; +import org.apache.druid.indexing.overlord.autoscaling.ec2.EC2EnvironmentConfig; +import org.apache.druid.indexing.overlord.autoscaling.ec2.EC2NodeData; +import org.apache.druid.indexing.overlord.autoscaling.ec2.GalaxyEC2UserData; +import org.apache.druid.jackson.DefaultObjectMapper; import org.easymock.EasyMock; import org.junit.After; import org.junit.Assert; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/autoscaling/PendingTaskBasedProvisioningStrategyTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/PendingTaskBasedProvisioningStrategyTest.java similarity index 94% rename from indexing-service/src/test/java/io/druid/indexing/overlord/autoscaling/PendingTaskBasedProvisioningStrategyTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/PendingTaskBasedProvisioningStrategyTest.java index f4f734c418fa..1476016a0641 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/autoscaling/PendingTaskBasedProvisioningStrategyTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/PendingTaskBasedProvisioningStrategyTest.java @@ -17,33 +17,33 @@ * under the License. */ -package io.druid.indexing.overlord.autoscaling; +package org.apache.druid.indexing.overlord.autoscaling; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.common.guava.DSuppliers; -import io.druid.indexer.TaskLocation; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TestTasks; -import io.druid.indexing.common.task.NoopTask; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.RemoteTaskRunner; -import io.druid.indexing.overlord.RemoteTaskRunnerWorkItem; -import io.druid.indexing.overlord.ZkWorker; -import io.druid.indexing.overlord.config.RemoteTaskRunnerConfig; -import io.druid.indexing.overlord.setup.DefaultWorkerBehaviorConfig; -import io.druid.indexing.overlord.setup.FillCapacityWorkerSelectStrategy; -import io.druid.indexing.overlord.setup.WorkerBehaviorConfig; -import io.druid.indexing.worker.TaskAnnouncement; -import io.druid.indexing.worker.Worker; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceEventBuilder; +import org.apache.druid.common.guava.DSuppliers; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TestTasks; +import org.apache.druid.indexing.common.task.NoopTask; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.RemoteTaskRunner; +import org.apache.druid.indexing.overlord.RemoteTaskRunnerWorkItem; +import org.apache.druid.indexing.overlord.ZkWorker; +import org.apache.druid.indexing.overlord.config.RemoteTaskRunnerConfig; +import org.apache.druid.indexing.overlord.setup.DefaultWorkerBehaviorConfig; +import org.apache.druid.indexing.overlord.setup.FillCapacityWorkerSelectStrategy; +import org.apache.druid.indexing.overlord.setup.WorkerBehaviorConfig; +import org.apache.druid.indexing.worker.TaskAnnouncement; +import org.apache.druid.indexing.worker.Worker; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceEventBuilder; import org.easymock.EasyMock; import org.joda.time.DateTime; import org.joda.time.Period; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/autoscaling/SimpleProvisioningStrategyTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/SimpleProvisioningStrategyTest.java similarity index 94% rename from indexing-service/src/test/java/io/druid/indexing/overlord/autoscaling/SimpleProvisioningStrategyTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/SimpleProvisioningStrategyTest.java index d0a120c29e0f..7dbd5fe6f90c 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/autoscaling/SimpleProvisioningStrategyTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/SimpleProvisioningStrategyTest.java @@ -17,31 +17,31 @@ * under the License. */ -package io.druid.indexing.overlord.autoscaling; +package org.apache.druid.indexing.overlord.autoscaling; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.common.guava.DSuppliers; -import io.druid.indexer.TaskLocation; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TestTasks; -import io.druid.indexing.common.task.NoopTask; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.RemoteTaskRunner; -import io.druid.indexing.overlord.RemoteTaskRunnerWorkItem; -import io.druid.indexing.overlord.ZkWorker; -import io.druid.indexing.overlord.setup.DefaultWorkerBehaviorConfig; -import io.druid.indexing.overlord.setup.WorkerBehaviorConfig; -import io.druid.indexing.worker.TaskAnnouncement; -import io.druid.indexing.worker.Worker; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceEventBuilder; +import org.apache.druid.common.guava.DSuppliers; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TestTasks; +import org.apache.druid.indexing.common.task.NoopTask; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.RemoteTaskRunner; +import org.apache.druid.indexing.overlord.RemoteTaskRunnerWorkItem; +import org.apache.druid.indexing.overlord.ZkWorker; +import org.apache.druid.indexing.overlord.setup.DefaultWorkerBehaviorConfig; +import org.apache.druid.indexing.overlord.setup.WorkerBehaviorConfig; +import org.apache.druid.indexing.worker.TaskAnnouncement; +import org.apache.druid.indexing.worker.Worker; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceEventBuilder; import org.easymock.EasyMock; import org.joda.time.DateTime; import org.joda.time.Period; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/autoscaling/ec2/EC2NodeDataTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/ec2/EC2NodeDataTest.java similarity index 95% rename from indexing-service/src/test/java/io/druid/indexing/overlord/autoscaling/ec2/EC2NodeDataTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/ec2/EC2NodeDataTest.java index dc42b330b09d..3692f38784b8 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/autoscaling/ec2/EC2NodeDataTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/ec2/EC2NodeDataTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.indexing.overlord.autoscaling.ec2; +package org.apache.druid.indexing.overlord.autoscaling.ec2; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/config/ForkingTaskRunnerConfigTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/config/ForkingTaskRunnerConfigTest.java similarity index 95% rename from indexing-service/src/test/java/io/druid/indexing/overlord/config/ForkingTaskRunnerConfigTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/config/ForkingTaskRunnerConfigTest.java index 58deb48889b2..1a7abc46c08b 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/config/ForkingTaskRunnerConfigTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/config/ForkingTaskRunnerConfigTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.config; +package org.apache.druid.indexing.overlord.config; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -28,11 +28,11 @@ import com.google.inject.Module; import com.google.inject.ProvisionException; import com.google.inject.name.Names; -import io.druid.guice.GuiceInjectors; -import io.druid.guice.IndexingServiceModuleHelper; -import io.druid.guice.JsonConfigurator; -import io.druid.initialization.Initialization; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.guice.IndexingServiceModuleHelper; +import org.apache.druid.guice.JsonConfigurator; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/config/RemoteTaskRunnerConfigTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/config/RemoteTaskRunnerConfigTest.java similarity index 99% rename from indexing-service/src/test/java/io/druid/indexing/overlord/config/RemoteTaskRunnerConfigTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/config/RemoteTaskRunnerConfigTest.java index b11832e488d7..b577d5ac3ab2 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/config/RemoteTaskRunnerConfigTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/config/RemoteTaskRunnerConfigTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.indexing.overlord.config; +package org.apache.druid.indexing.overlord.config; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.guice.JsonConfigurator; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.guice.JsonConfigurator; +import org.apache.druid.jackson.DefaultObjectMapper; import org.joda.time.Period; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/helpers/TaskLogAutoCleanerConfigTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/helpers/TaskLogAutoCleanerConfigTest.java similarity index 96% rename from indexing-service/src/test/java/io/druid/indexing/overlord/helpers/TaskLogAutoCleanerConfigTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/helpers/TaskLogAutoCleanerConfigTest.java index 74904ffbdd0a..ecbb003618b7 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/helpers/TaskLogAutoCleanerConfigTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/helpers/TaskLogAutoCleanerConfigTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.indexing.overlord.helpers; +package org.apache.druid.indexing.overlord.helpers; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.segment.TestHelper; +import org.apache.druid.segment.TestHelper; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/hrtr/HttpRemoteTaskRunnerTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/hrtr/HttpRemoteTaskRunnerTest.java similarity index 97% rename from indexing-service/src/test/java/io/druid/indexing/overlord/hrtr/HttpRemoteTaskRunnerTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/hrtr/HttpRemoteTaskRunnerTest.java index 8b15eb6396fc..7309452adaa0 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/hrtr/HttpRemoteTaskRunnerTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/hrtr/HttpRemoteTaskRunnerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.hrtr; +package org.apache.druid.indexing.overlord.hrtr; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Optional; @@ -28,30 +28,30 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.common.guava.DSuppliers; -import io.druid.discovery.DiscoveryDruidNode; -import io.druid.discovery.DruidNodeDiscovery; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.discovery.WorkerNodeService; -import io.druid.indexer.TaskLocation; -import io.druid.indexer.TaskState; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.task.NoopTask; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.TaskRunnerListener; -import io.druid.indexing.overlord.TaskRunnerWorkItem; -import io.druid.indexing.overlord.TaskStorage; -import io.druid.indexing.overlord.autoscaling.NoopProvisioningStrategy; -import io.druid.indexing.overlord.config.HttpRemoteTaskRunnerConfig; -import io.druid.indexing.overlord.setup.DefaultWorkerBehaviorConfig; -import io.druid.indexing.worker.TaskAnnouncement; -import io.druid.indexing.worker.Worker; -import io.druid.java.util.common.ISE; -import io.druid.java.util.http.client.HttpClient; -import io.druid.segment.TestHelper; -import io.druid.server.DruidNode; -import io.druid.server.initialization.IndexerZkConfig; -import io.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.common.guava.DSuppliers; +import org.apache.druid.discovery.DiscoveryDruidNode; +import org.apache.druid.discovery.DruidNodeDiscovery; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.discovery.WorkerNodeService; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexer.TaskState; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.task.NoopTask; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.TaskRunnerListener; +import org.apache.druid.indexing.overlord.TaskRunnerWorkItem; +import org.apache.druid.indexing.overlord.TaskStorage; +import org.apache.druid.indexing.overlord.autoscaling.NoopProvisioningStrategy; +import org.apache.druid.indexing.overlord.config.HttpRemoteTaskRunnerConfig; +import org.apache.druid.indexing.overlord.setup.DefaultWorkerBehaviorConfig; +import org.apache.druid.indexing.worker.TaskAnnouncement; +import org.apache.druid.indexing.worker.Worker; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.initialization.IndexerZkConfig; +import org.apache.druid.server.initialization.ZkPathsConfig; import org.apache.curator.framework.CuratorFramework; import org.easymock.EasyMock; import org.eclipse.jetty.util.ConcurrentHashSet; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/hrtr/WorkerHolderTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/hrtr/WorkerHolderTest.java similarity index 89% rename from indexing-service/src/test/java/io/druid/indexing/overlord/hrtr/WorkerHolderTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/hrtr/WorkerHolderTest.java index ef9ce40e891d..f82ed7a5d0c6 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/hrtr/WorkerHolderTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/hrtr/WorkerHolderTest.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.indexing.overlord.hrtr; +package org.apache.druid.indexing.overlord.hrtr; import com.google.common.collect.ImmutableList; -import io.druid.java.util.http.client.HttpClient; -import io.druid.indexer.TaskLocation; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.task.NoopTask; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.config.HttpRemoteTaskRunnerConfig; -import io.druid.indexing.worker.TaskAnnouncement; -import io.druid.indexing.worker.Worker; -import io.druid.indexing.worker.WorkerHistoryItem; -import io.druid.segment.TestHelper; -import io.druid.server.coordination.ChangeRequestHttpSyncer; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.task.NoopTask; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.config.HttpRemoteTaskRunnerConfig; +import org.apache.druid.indexing.worker.TaskAnnouncement; +import org.apache.druid.indexing.worker.Worker; +import org.apache.druid.indexing.worker.WorkerHistoryItem; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.server.coordination.ChangeRequestHttpSyncer; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/http/OverlordRedirectInfoTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordRedirectInfoTest.java similarity index 97% rename from indexing-service/src/test/java/io/druid/indexing/overlord/http/OverlordRedirectInfoTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordRedirectInfoTest.java index 2e8d665d8045..33ea5e75c7f0 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/http/OverlordRedirectInfoTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordRedirectInfoTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.indexing.overlord.http; +package org.apache.druid.indexing.overlord.http; -import io.druid.indexing.overlord.TaskMaster; +import org.apache.druid.indexing.overlord.TaskMaster; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/http/OverlordResourceTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordResourceTest.java similarity index 96% rename from indexing-service/src/test/java/io/druid/indexing/overlord/http/OverlordResourceTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordResourceTest.java index 40588cea9b4e..85302bda5fea 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/http/OverlordResourceTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordResourceTest.java @@ -17,38 +17,38 @@ * under the License. */ -package io.druid.indexing.overlord.http; +package org.apache.druid.indexing.overlord.http; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.indexer.RunnerTaskState; -import io.druid.indexer.TaskInfo; -import io.druid.indexer.TaskLocation; -import io.druid.indexer.TaskState; -import io.druid.indexer.TaskStatus; -import io.druid.indexer.TaskStatusPlus; -import io.druid.indexing.common.TaskToolbox; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.indexing.common.task.AbstractTask; -import io.druid.indexing.common.task.NoopTask; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.IndexerMetadataStorageAdapter; -import io.druid.indexing.overlord.TaskMaster; -import io.druid.indexing.overlord.TaskRunner; -import io.druid.indexing.overlord.TaskRunnerWorkItem; -import io.druid.indexing.overlord.TaskStorageQueryAdapter; -import io.druid.java.util.common.DateTimes; -import io.druid.segment.TestHelper; -import io.druid.server.security.Access; -import io.druid.server.security.Action; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthenticationResult; -import io.druid.server.security.Authorizer; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.ForbiddenException; -import io.druid.server.security.Resource; +import org.apache.druid.indexer.RunnerTaskState; +import org.apache.druid.indexer.TaskInfo; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexer.TaskState; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexer.TaskStatusPlus; +import org.apache.druid.indexing.common.TaskToolbox; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.indexing.common.task.AbstractTask; +import org.apache.druid.indexing.common.task.NoopTask; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.IndexerMetadataStorageAdapter; +import org.apache.druid.indexing.overlord.TaskMaster; +import org.apache.druid.indexing.overlord.TaskRunner; +import org.apache.druid.indexing.overlord.TaskRunnerWorkItem; +import org.apache.druid.indexing.overlord.TaskStorageQueryAdapter; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.server.security.Access; +import org.apache.druid.server.security.Action; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthenticationResult; +import org.apache.druid.server.security.Authorizer; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.ForbiddenException; +import org.apache.druid.server.security.Resource; import org.easymock.EasyMock; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/http/OverlordTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordTest.java similarity index 87% rename from indexing-service/src/test/java/io/druid/indexing/overlord/http/OverlordTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordTest.java index 3b4d6a7bb10a..1ff113c04bfc 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/http/OverlordTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.http; +package org.apache.druid.indexing.overlord.http; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -26,42 +26,42 @@ import com.google.common.collect.Lists; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.curator.PotentiallyGzippedCompressionProvider; -import io.druid.curator.discovery.NoopServiceAnnouncer; -import io.druid.discovery.DruidLeaderSelector; -import io.druid.indexer.TaskLocation; -import io.druid.indexer.TaskState; -import io.druid.indexer.TaskStatus; -import io.druid.indexer.TaskStatusPlus; -import io.druid.indexing.common.actions.TaskActionClientFactory; -import io.druid.indexing.common.config.TaskStorageConfig; -import io.druid.indexing.common.task.NoopTask; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.HeapMemoryTaskStorage; -import io.druid.indexing.overlord.IndexerMetadataStorageAdapter; -import io.druid.indexing.overlord.TaskLockbox; -import io.druid.indexing.overlord.TaskMaster; -import io.druid.indexing.overlord.TaskRunner; -import io.druid.indexing.overlord.TaskRunnerFactory; -import io.druid.indexing.overlord.TaskRunnerListener; -import io.druid.indexing.overlord.TaskRunnerWorkItem; -import io.druid.indexing.overlord.TaskStorage; -import io.druid.indexing.overlord.TaskStorageQueryAdapter; -import io.druid.indexing.overlord.autoscaling.ScalingStats; -import io.druid.indexing.overlord.config.TaskQueueConfig; -import io.druid.indexing.overlord.helpers.OverlordHelperManager; -import io.druid.indexing.overlord.supervisor.SupervisorManager; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.guava.CloseQuietly; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.server.DruidNode; -import io.druid.server.coordinator.CoordinatorOverlordServiceConfig; -import io.druid.server.metrics.NoopServiceEmitter; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthTestUtils; -import io.druid.server.security.AuthenticationResult; +import org.apache.druid.curator.PotentiallyGzippedCompressionProvider; +import org.apache.druid.curator.discovery.NoopServiceAnnouncer; +import org.apache.druid.discovery.DruidLeaderSelector; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexer.TaskState; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexer.TaskStatusPlus; +import org.apache.druid.indexing.common.actions.TaskActionClientFactory; +import org.apache.druid.indexing.common.config.TaskStorageConfig; +import org.apache.druid.indexing.common.task.NoopTask; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.HeapMemoryTaskStorage; +import org.apache.druid.indexing.overlord.IndexerMetadataStorageAdapter; +import org.apache.druid.indexing.overlord.TaskLockbox; +import org.apache.druid.indexing.overlord.TaskMaster; +import org.apache.druid.indexing.overlord.TaskRunner; +import org.apache.druid.indexing.overlord.TaskRunnerFactory; +import org.apache.druid.indexing.overlord.TaskRunnerListener; +import org.apache.druid.indexing.overlord.TaskRunnerWorkItem; +import org.apache.druid.indexing.overlord.TaskStorage; +import org.apache.druid.indexing.overlord.TaskStorageQueryAdapter; +import org.apache.druid.indexing.overlord.autoscaling.ScalingStats; +import org.apache.druid.indexing.overlord.config.TaskQueueConfig; +import org.apache.druid.indexing.overlord.helpers.OverlordHelperManager; +import org.apache.druid.indexing.overlord.supervisor.SupervisorManager; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.guava.CloseQuietly; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.coordinator.CoordinatorOverlordServiceConfig; +import org.apache.druid.server.metrics.NoopServiceEmitter; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthTestUtils; +import org.apache.druid.server.security.AuthenticationResult; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.retry.RetryOneTime; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/http/security/OverlordSecurityResourceFilterTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/security/OverlordSecurityResourceFilterTest.java similarity index 87% rename from indexing-service/src/test/java/io/druid/indexing/overlord/http/security/OverlordSecurityResourceFilterTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/security/OverlordSecurityResourceFilterTest.java index 7f587a973d64..abdd60a9dcde 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/http/security/OverlordSecurityResourceFilterTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/security/OverlordSecurityResourceFilterTest.java @@ -17,26 +17,26 @@ * under the License. */ -package io.druid.indexing.overlord.http.security; +package org.apache.druid.indexing.overlord.http.security; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.inject.Injector; import com.sun.jersey.spi.container.ResourceFilter; -import io.druid.indexing.common.task.NoopTask; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.TaskStorageQueryAdapter; -import io.druid.indexing.overlord.http.OverlordResource; -import io.druid.indexing.overlord.supervisor.Supervisor; -import io.druid.indexing.overlord.supervisor.SupervisorManager; -import io.druid.indexing.overlord.supervisor.SupervisorResource; -import io.druid.indexing.overlord.supervisor.SupervisorSpec; -import io.druid.indexing.worker.http.WorkerResource; -import io.druid.server.http.security.AbstractResourceFilter; -import io.druid.server.http.security.ResourceFilterTestHelper; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.ForbiddenException; +import org.apache.druid.indexing.common.task.NoopTask; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.TaskStorageQueryAdapter; +import org.apache.druid.indexing.overlord.http.OverlordResource; +import org.apache.druid.indexing.overlord.supervisor.Supervisor; +import org.apache.druid.indexing.overlord.supervisor.SupervisorManager; +import org.apache.druid.indexing.overlord.supervisor.SupervisorResource; +import org.apache.druid.indexing.overlord.supervisor.SupervisorSpec; +import org.apache.druid.indexing.worker.http.WorkerResource; +import org.apache.druid.server.http.security.AbstractResourceFilter; +import org.apache.druid.server.http.security.ResourceFilterTestHelper; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.ForbiddenException; import org.easymock.EasyMock; import org.junit.After; import org.junit.Assert; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/setup/EqualDistributionWithAffinityWorkerSelectStrategyTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/setup/EqualDistributionWithAffinityWorkerSelectStrategyTest.java similarity index 93% rename from indexing-service/src/test/java/io/druid/indexing/overlord/setup/EqualDistributionWithAffinityWorkerSelectStrategyTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/setup/EqualDistributionWithAffinityWorkerSelectStrategyTest.java index 76fa66e5e51e..7652d1f807ef 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/setup/EqualDistributionWithAffinityWorkerSelectStrategyTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/setup/EqualDistributionWithAffinityWorkerSelectStrategyTest.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.indexing.overlord.setup; +package org.apache.druid.indexing.overlord.setup; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import io.druid.indexing.common.task.NoopTask; -import io.druid.indexing.overlord.ImmutableWorkerInfo; -import io.druid.indexing.overlord.config.RemoteTaskRunnerConfig; -import io.druid.indexing.worker.Worker; -import io.druid.java.util.common.DateTimes; -import io.druid.segment.TestHelper; +import org.apache.druid.indexing.common.task.NoopTask; +import org.apache.druid.indexing.overlord.ImmutableWorkerInfo; +import org.apache.druid.indexing.overlord.config.RemoteTaskRunnerConfig; +import org.apache.druid.indexing.worker.Worker; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.segment.TestHelper; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/setup/EqualDistributionWorkerSelectStrategyTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/setup/EqualDistributionWorkerSelectStrategyTest.java similarity index 96% rename from indexing-service/src/test/java/io/druid/indexing/overlord/setup/EqualDistributionWorkerSelectStrategyTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/setup/EqualDistributionWorkerSelectStrategyTest.java index a23b8f16fe02..0c1f8b3034c3 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/setup/EqualDistributionWorkerSelectStrategyTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/setup/EqualDistributionWorkerSelectStrategyTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.indexing.overlord.setup; +package org.apache.druid.indexing.overlord.setup; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import io.druid.indexing.common.task.NoopTask; -import io.druid.indexing.overlord.ImmutableWorkerInfo; -import io.druid.indexing.overlord.config.RemoteTaskRunnerConfig; -import io.druid.indexing.worker.Worker; -import io.druid.java.util.common.DateTimes; +import org.apache.druid.indexing.common.task.NoopTask; +import org.apache.druid.indexing.overlord.ImmutableWorkerInfo; +import org.apache.druid.indexing.overlord.config.RemoteTaskRunnerConfig; +import org.apache.druid.indexing.worker.Worker; +import org.apache.druid.java.util.common.DateTimes; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/setup/FillCapacityWithAffinityWorkerSelectStrategyTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/setup/FillCapacityWithAffinityWorkerSelectStrategyTest.java similarity index 92% rename from indexing-service/src/test/java/io/druid/indexing/overlord/setup/FillCapacityWithAffinityWorkerSelectStrategyTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/setup/FillCapacityWithAffinityWorkerSelectStrategyTest.java index 31ba7b92afde..a4abdfcddac2 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/setup/FillCapacityWithAffinityWorkerSelectStrategyTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/setup/FillCapacityWithAffinityWorkerSelectStrategyTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.indexing.overlord.setup; +package org.apache.druid.indexing.overlord.setup; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import io.druid.indexing.common.task.NoopTask; -import io.druid.indexing.overlord.ImmutableWorkerInfo; -import io.druid.indexing.overlord.config.RemoteTaskRunnerConfig; -import io.druid.indexing.worker.Worker; -import io.druid.java.util.common.DateTimes; +import org.apache.druid.indexing.common.task.NoopTask; +import org.apache.druid.indexing.overlord.ImmutableWorkerInfo; +import org.apache.druid.indexing.overlord.config.RemoteTaskRunnerConfig; +import org.apache.druid.indexing.worker.Worker; +import org.apache.druid.java.util.common.DateTimes; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/setup/JavaScriptWorkerSelectStrategyTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/setup/JavaScriptWorkerSelectStrategyTest.java similarity index 96% rename from indexing-service/src/test/java/io/druid/indexing/overlord/setup/JavaScriptWorkerSelectStrategyTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/setup/JavaScriptWorkerSelectStrategyTest.java index b67be28d69b8..cac81d1438fc 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/setup/JavaScriptWorkerSelectStrategyTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/setup/JavaScriptWorkerSelectStrategyTest.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.indexing.overlord.setup; +package org.apache.druid.indexing.overlord.setup; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.ImmutableWorkerInfo; -import io.druid.indexing.overlord.TestRemoteTaskRunnerConfig; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.js.JavaScriptConfig; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.ImmutableWorkerInfo; +import org.apache.druid.indexing.overlord.TestRemoteTaskRunnerConfig; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.js.JavaScriptConfig; import org.easymock.EasyMock; import org.hamcrest.CoreMatchers; import org.joda.time.Period; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/setup/WorkerBehaviorConfigTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/setup/WorkerBehaviorConfigTest.java similarity index 87% rename from indexing-service/src/test/java/io/druid/indexing/overlord/setup/WorkerBehaviorConfigTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/setup/WorkerBehaviorConfigTest.java index 118127588b6c..da6d2668db77 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/setup/WorkerBehaviorConfigTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/setup/WorkerBehaviorConfigTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.setup; +package org.apache.druid.indexing.overlord.setup; import com.fasterxml.jackson.databind.BeanProperty; import com.fasterxml.jackson.databind.DeserializationContext; @@ -25,11 +25,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.druid.indexing.overlord.autoscaling.ec2.EC2AutoScaler; -import io.druid.indexing.overlord.autoscaling.ec2.EC2EnvironmentConfig; -import io.druid.indexing.overlord.autoscaling.ec2.EC2NodeData; -import io.druid.indexing.overlord.autoscaling.ec2.StringEC2UserData; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.indexing.overlord.autoscaling.ec2.EC2AutoScaler; +import org.apache.druid.indexing.overlord.autoscaling.ec2.EC2EnvironmentConfig; +import org.apache.druid.indexing.overlord.autoscaling.ec2.EC2NodeData; +import org.apache.druid.indexing.overlord.autoscaling.ec2.StringEC2UserData; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/supervisor/SupervisorManagerTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/supervisor/SupervisorManagerTest.java similarity index 97% rename from indexing-service/src/test/java/io/druid/indexing/overlord/supervisor/SupervisorManagerTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/supervisor/SupervisorManagerTest.java index 9e957690f434..f91dc1adfcb8 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/supervisor/SupervisorManagerTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/supervisor/SupervisorManagerTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.indexing.overlord.supervisor; +package org.apache.druid.indexing.overlord.supervisor; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; -import io.druid.indexing.overlord.DataSourceMetadata; -import io.druid.java.util.common.DateTimes; -import io.druid.metadata.MetadataSupervisorManager; +import org.apache.druid.indexing.overlord.DataSourceMetadata; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.metadata.MetadataSupervisorManager; import org.easymock.EasyMock; import org.easymock.EasyMockRunner; import org.easymock.EasyMockSupport; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/supervisor/SupervisorResourceTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/supervisor/SupervisorResourceTest.java similarity index 98% rename from indexing-service/src/test/java/io/druid/indexing/overlord/supervisor/SupervisorResourceTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/overlord/supervisor/SupervisorResourceTest.java index 3c37691f1075..a3434bc45181 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/supervisor/SupervisorResourceTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/supervisor/SupervisorResourceTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.supervisor; +package org.apache.druid.indexing.overlord.supervisor; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Optional; @@ -25,16 +25,16 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; -import io.druid.indexing.overlord.DataSourceMetadata; -import io.druid.indexing.overlord.TaskMaster; -import io.druid.java.util.common.DateTimes; -import io.druid.server.security.Access; -import io.druid.server.security.Action; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthenticationResult; -import io.druid.server.security.Authorizer; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.Resource; +import org.apache.druid.indexing.overlord.DataSourceMetadata; +import org.apache.druid.indexing.overlord.TaskMaster; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.server.security.Access; +import org.apache.druid.server.security.Action; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthenticationResult; +import org.apache.druid.server.security.Authorizer; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.Resource; import org.easymock.Capture; import org.easymock.EasyMock; import org.easymock.EasyMockRunner; diff --git a/indexing-service/src/test/java/io/druid/indexing/test/TestDataSegmentAnnouncer.java b/indexing-service/src/test/java/org/apache/druid/indexing/test/TestDataSegmentAnnouncer.java similarity index 91% rename from indexing-service/src/test/java/io/druid/indexing/test/TestDataSegmentAnnouncer.java rename to indexing-service/src/test/java/org/apache/druid/indexing/test/TestDataSegmentAnnouncer.java index a30316e4e294..6874ae79a91a 100644 --- a/indexing-service/src/test/java/io/druid/indexing/test/TestDataSegmentAnnouncer.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/test/TestDataSegmentAnnouncer.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.indexing.test; +package org.apache.druid.indexing.test; import com.google.common.collect.Sets; -import io.druid.server.coordination.DataSegmentAnnouncer; -import io.druid.timeline.DataSegment; +import org.apache.druid.server.coordination.DataSegmentAnnouncer; +import org.apache.druid.timeline.DataSegment; import java.util.Set; diff --git a/indexing-service/src/test/java/io/druid/indexing/test/TestDataSegmentKiller.java b/indexing-service/src/test/java/org/apache/druid/indexing/test/TestDataSegmentKiller.java similarity index 89% rename from indexing-service/src/test/java/io/druid/indexing/test/TestDataSegmentKiller.java rename to indexing-service/src/test/java/org/apache/druid/indexing/test/TestDataSegmentKiller.java index 39f519c35ae3..515db19dff78 100644 --- a/indexing-service/src/test/java/io/druid/indexing/test/TestDataSegmentKiller.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/test/TestDataSegmentKiller.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.indexing.test; +package org.apache.druid.indexing.test; import com.google.common.collect.Sets; -import io.druid.segment.loading.DataSegmentKiller; -import io.druid.timeline.DataSegment; +import org.apache.druid.segment.loading.DataSegmentKiller; +import org.apache.druid.timeline.DataSegment; import java.util.Set; diff --git a/indexing-service/src/test/java/io/druid/indexing/test/TestDataSegmentPusher.java b/indexing-service/src/test/java/org/apache/druid/indexing/test/TestDataSegmentPusher.java similarity index 91% rename from indexing-service/src/test/java/io/druid/indexing/test/TestDataSegmentPusher.java rename to indexing-service/src/test/java/org/apache/druid/indexing/test/TestDataSegmentPusher.java index 50b8aa7d36bf..8a47742cdb93 100644 --- a/indexing-service/src/test/java/io/druid/indexing/test/TestDataSegmentPusher.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/test/TestDataSegmentPusher.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.indexing.test; +package org.apache.druid.indexing.test; import com.google.common.collect.Sets; -import io.druid.segment.loading.DataSegmentPusher; -import io.druid.timeline.DataSegment; +import org.apache.druid.segment.loading.DataSegmentPusher; +import org.apache.druid.timeline.DataSegment; import java.io.File; import java.net.URI; diff --git a/indexing-service/src/test/java/io/druid/indexing/test/TestIndexerMetadataStorageCoordinator.java b/indexing-service/src/test/java/org/apache/druid/indexing/test/TestIndexerMetadataStorageCoordinator.java similarity index 91% rename from indexing-service/src/test/java/io/druid/indexing/test/TestIndexerMetadataStorageCoordinator.java rename to indexing-service/src/test/java/org/apache/druid/indexing/test/TestIndexerMetadataStorageCoordinator.java index 0d4d0ddddb90..381170742ac0 100644 --- a/indexing-service/src/test/java/io/druid/indexing/test/TestIndexerMetadataStorageCoordinator.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/test/TestIndexerMetadataStorageCoordinator.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.indexing.test; +package org.apache.druid.indexing.test; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import io.druid.indexing.overlord.DataSourceMetadata; -import io.druid.indexing.overlord.IndexerMetadataStorageCoordinator; -import io.druid.indexing.overlord.SegmentPublishResult; -import io.druid.java.util.common.Pair; -import io.druid.segment.realtime.appenderator.SegmentIdentifier; -import io.druid.timeline.DataSegment; +import org.apache.druid.indexing.overlord.DataSourceMetadata; +import org.apache.druid.indexing.overlord.IndexerMetadataStorageCoordinator; +import org.apache.druid.indexing.overlord.SegmentPublishResult; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.segment.realtime.appenderator.SegmentIdentifier; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import java.util.List; diff --git a/indexing-service/src/test/java/io/druid/indexing/worker/TaskAnnouncementTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/worker/TaskAnnouncementTest.java similarity index 78% rename from indexing-service/src/test/java/io/druid/indexing/worker/TaskAnnouncementTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/worker/TaskAnnouncementTest.java index 4ba69763d5fd..843f2b133ba8 100644 --- a/indexing-service/src/test/java/io/druid/indexing/worker/TaskAnnouncementTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/worker/TaskAnnouncementTest.java @@ -17,25 +17,25 @@ * under the License. */ -package io.druid.indexing.worker; +package org.apache.druid.indexing.worker; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.indexer.TaskLocation; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TestUtils; -import io.druid.indexing.common.task.RealtimeIndexTask; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.common.task.TaskResource; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.RealtimeIOConfig; -import io.druid.segment.indexing.RealtimeTuningConfig; -import io.druid.segment.realtime.FireDepartment; -import io.druid.segment.realtime.FireDepartmentMetrics; -import io.druid.segment.realtime.firehose.LocalFirehoseFactory; -import io.druid.segment.realtime.plumber.Plumber; -import io.druid.segment.realtime.plumber.PlumberSchool; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TestUtils; +import org.apache.druid.indexing.common.task.RealtimeIndexTask; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.common.task.TaskResource; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.RealtimeIOConfig; +import org.apache.druid.segment.indexing.RealtimeTuningConfig; +import org.apache.druid.segment.realtime.FireDepartment; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.segment.realtime.firehose.LocalFirehoseFactory; +import org.apache.druid.segment.realtime.plumber.Plumber; +import org.apache.druid.segment.realtime.plumber.PlumberSchool; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-service/src/test/java/io/druid/indexing/worker/WorkerTaskManagerTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/worker/WorkerTaskManagerTest.java similarity index 86% rename from indexing-service/src/test/java/io/druid/indexing/worker/WorkerTaskManagerTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/worker/WorkerTaskManagerTest.java index ff528ea8d82b..5caa70b1cabe 100644 --- a/indexing-service/src/test/java/io/druid/indexing/worker/WorkerTaskManagerTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/worker/WorkerTaskManagerTest.java @@ -17,35 +17,35 @@ * under the License. */ -package io.druid.indexing.worker; +package org.apache.druid.indexing.worker; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.io.Files; -import io.druid.discovery.DruidLeaderClient; -import io.druid.indexer.TaskLocation; -import io.druid.indexing.common.SegmentLoaderFactory; -import io.druid.indexer.TaskStatus; -import io.druid.indexing.common.TaskToolboxFactory; -import io.druid.indexing.common.TestTasks; -import io.druid.indexing.common.TestUtils; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.indexing.common.actions.TaskActionClientFactory; -import io.druid.indexing.common.config.TaskConfig; -import io.druid.indexing.common.task.NoopTask; -import io.druid.indexing.common.task.NoopTestTaskFileWriter; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.common.task.Tasks; -import io.druid.indexing.overlord.TestTaskRunner; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMergerV9; -import io.druid.segment.loading.SegmentLoaderConfig; -import io.druid.segment.loading.SegmentLoaderLocalCacheManager; -import io.druid.segment.loading.StorageLocationConfig; -import io.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; -import io.druid.server.coordination.ChangeRequestHistory; -import io.druid.server.coordination.ChangeRequestsSnapshot; +import org.apache.druid.discovery.DruidLeaderClient; +import org.apache.druid.indexer.TaskLocation; +import org.apache.druid.indexing.common.SegmentLoaderFactory; +import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexing.common.TaskToolboxFactory; +import org.apache.druid.indexing.common.TestTasks; +import org.apache.druid.indexing.common.TestUtils; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.indexing.common.actions.TaskActionClientFactory; +import org.apache.druid.indexing.common.config.TaskConfig; +import org.apache.druid.indexing.common.task.NoopTask; +import org.apache.druid.indexing.common.task.NoopTestTaskFileWriter; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.common.task.Tasks; +import org.apache.druid.indexing.overlord.TestTaskRunner; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMergerV9; +import org.apache.druid.segment.loading.SegmentLoaderConfig; +import org.apache.druid.segment.loading.SegmentLoaderLocalCacheManager; +import org.apache.druid.segment.loading.StorageLocationConfig; +import org.apache.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; +import org.apache.druid.server.coordination.ChangeRequestHistory; +import org.apache.druid.server.coordination.ChangeRequestsSnapshot; import org.easymock.EasyMock; import org.junit.After; import org.junit.Assert; diff --git a/indexing-service/src/test/java/io/druid/indexing/worker/WorkerTaskMonitorTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/worker/WorkerTaskMonitorTest.java similarity index 86% rename from indexing-service/src/test/java/io/druid/indexing/worker/WorkerTaskMonitorTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/worker/WorkerTaskMonitorTest.java index 1af92ada5c6b..eac46c572920 100644 --- a/indexing-service/src/test/java/io/druid/indexing/worker/WorkerTaskMonitorTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/worker/WorkerTaskMonitorTest.java @@ -17,41 +17,41 @@ * under the License. */ -package io.druid.indexing.worker; +package org.apache.druid.indexing.worker; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.io.Files; -import io.druid.curator.PotentiallyGzippedCompressionProvider; -import io.druid.indexer.TaskState; -import io.druid.discovery.DruidLeaderClient; -import io.druid.indexing.common.IndexingServiceCondition; -import io.druid.indexing.common.SegmentLoaderFactory; -import io.druid.indexing.common.TaskToolboxFactory; -import io.druid.indexing.common.TestRealtimeTask; -import io.druid.indexing.common.TestTasks; -import io.druid.indexing.common.TestUtils; -import io.druid.indexing.common.actions.TaskActionClient; -import io.druid.indexing.common.actions.TaskActionClientFactory; -import io.druid.indexing.common.config.TaskConfig; -import io.druid.indexing.common.task.NoopTestTaskFileWriter; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.TestRemoteTaskRunnerConfig; -import io.druid.indexing.overlord.SingleTaskBackgroundRunner; -import io.druid.java.util.common.StringUtils; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMergerV9; -import io.druid.segment.loading.SegmentLoaderConfig; -import io.druid.segment.loading.SegmentLoaderLocalCacheManager; -import io.druid.segment.loading.StorageLocationConfig; -import io.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; -import io.druid.server.DruidNode; -import io.druid.server.initialization.IndexerZkConfig; -import io.druid.server.initialization.ServerConfig; -import io.druid.server.initialization.ZkPathsConfig; -import io.druid.server.metrics.NoopServiceEmitter; +import org.apache.druid.curator.PotentiallyGzippedCompressionProvider; +import org.apache.druid.indexer.TaskState; +import org.apache.druid.discovery.DruidLeaderClient; +import org.apache.druid.indexing.common.IndexingServiceCondition; +import org.apache.druid.indexing.common.SegmentLoaderFactory; +import org.apache.druid.indexing.common.TaskToolboxFactory; +import org.apache.druid.indexing.common.TestRealtimeTask; +import org.apache.druid.indexing.common.TestTasks; +import org.apache.druid.indexing.common.TestUtils; +import org.apache.druid.indexing.common.actions.TaskActionClient; +import org.apache.druid.indexing.common.actions.TaskActionClientFactory; +import org.apache.druid.indexing.common.config.TaskConfig; +import org.apache.druid.indexing.common.task.NoopTestTaskFileWriter; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.TestRemoteTaskRunnerConfig; +import org.apache.druid.indexing.overlord.SingleTaskBackgroundRunner; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMergerV9; +import org.apache.druid.segment.loading.SegmentLoaderConfig; +import org.apache.druid.segment.loading.SegmentLoaderLocalCacheManager; +import org.apache.druid.segment.loading.StorageLocationConfig; +import org.apache.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.initialization.IndexerZkConfig; +import org.apache.druid.server.initialization.ServerConfig; +import org.apache.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.server.metrics.NoopServiceEmitter; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.retry.ExponentialBackoffRetry; diff --git a/indexing-service/src/test/java/io/druid/indexing/worker/http/WorkerResourceTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/worker/http/WorkerResourceTest.java similarity index 87% rename from indexing-service/src/test/java/io/druid/indexing/worker/http/WorkerResourceTest.java rename to indexing-service/src/test/java/org/apache/druid/indexing/worker/http/WorkerResourceTest.java index b259f8dd26ca..bed3ce68575a 100644 --- a/indexing-service/src/test/java/io/druid/indexing/worker/http/WorkerResourceTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/worker/http/WorkerResourceTest.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.indexing.worker.http; +package org.apache.druid.indexing.worker.http; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.curator.PotentiallyGzippedCompressionProvider; -import io.druid.indexing.overlord.config.RemoteTaskRunnerConfig; -import io.druid.indexing.worker.Worker; -import io.druid.indexing.worker.WorkerCuratorCoordinator; -import io.druid.indexing.worker.WorkerTaskMonitor; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.StringUtils; -import io.druid.server.initialization.IndexerZkConfig; -import io.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.curator.PotentiallyGzippedCompressionProvider; +import org.apache.druid.indexing.overlord.config.RemoteTaskRunnerConfig; +import org.apache.druid.indexing.worker.Worker; +import org.apache.druid.indexing.worker.WorkerCuratorCoordinator; +import org.apache.druid.indexing.worker.WorkerTaskMonitor; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.server.initialization.IndexerZkConfig; +import org.apache.druid.server.initialization.ZkPathsConfig; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.retry.ExponentialBackoffRetry; diff --git a/indexing-service/src/test/java/io/druid/server/initialization/IndexerZkConfigTest.java b/indexing-service/src/test/java/org/apache/druid/server/initialization/IndexerZkConfigTest.java similarity index 95% rename from indexing-service/src/test/java/io/druid/server/initialization/IndexerZkConfigTest.java rename to indexing-service/src/test/java/org/apache/druid/server/initialization/IndexerZkConfigTest.java index a5d4b207d675..e33ed787f04e 100644 --- a/indexing-service/src/test/java/io/druid/server/initialization/IndexerZkConfigTest.java +++ b/indexing-service/src/test/java/org/apache/druid/server/initialization/IndexerZkConfigTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.initialization; +package org.apache.druid.server.initialization; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; @@ -25,13 +25,13 @@ import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.name.Names; -import io.druid.guice.GuiceInjectors; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.JsonConfigurator; -import io.druid.initialization.Initialization; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.JsonConfigurator; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.jackson.JacksonUtils; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; diff --git a/integration-tests/README.md b/integration-tests/README.md index 182f281b99e0..886fbc0b0a56 100644 --- a/integration-tests/README.md +++ b/integration-tests/README.md @@ -150,7 +150,7 @@ export CLASSPATH=$TDIR/dependency/*:$TDIR/druid-integration-tests-$VER.jar:$TDIR ### Run the test ``` -java -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Ddruid.test.config.type=configFile -Ddruid.test.config.configFile= org.testng.TestNG -testrunfactory org.testng.DruidTestRunnerFactory -testclass io.druid.tests.hadoop.ITHadoopIndexTest +java -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Ddruid.test.config.type=configFile -Ddruid.test.config.configFile= org.testng.TestNG -testrunfactory org.testng.DruidTestRunnerFactory -testclass org.apache.druid.tests.hadoop.ITHadoopIndexTest ``` Writing a New Test diff --git a/integration-tests/docker/Dockerfile b/integration-tests/docker/Dockerfile index bf0cdf5b7073..c66ecfdf5bbc 100644 --- a/integration-tests/docker/Dockerfile +++ b/integration-tests/docker/Dockerfile @@ -13,7 +13,7 @@ ADD lib/* /usr/local/druid/lib/ # Add sample data # touch is needed because OverlayFS's copy-up operation breaks POSIX standards. See https://github.com/docker/for-linux/issues/72. RUN find /var/lib/mysql -type f -exec touch {} \; && service mysql start \ - && java -cp "/usr/local/druid/lib/*" -Ddruid.metadata.storage.type=mysql io.druid.cli.Main tools metadata-init --connectURI="jdbc:mysql://localhost:3306/druid" --user=druid --password=diurd \ + && java -cp "/usr/local/druid/lib/*" -Ddruid.metadata.storage.type=mysql org.apache.druid.cli.Main tools metadata-init --connectURI="jdbc:mysql://localhost:3306/druid" --user=druid --password=diurd \ && /etc/init.d/mysql stop ADD sample-data.sql sample-data.sql # touch is needed because OverlayFS's copy-up operation breaks POSIX standards. See https://github.com/docker/for-linux/issues/72. diff --git a/integration-tests/docker/broker.conf b/integration-tests/docker/broker.conf index 73ad35bda074..4510c6ec6924 100644 --- a/integration-tests/docker/broker.conf +++ b/integration-tests/docker/broker.conf @@ -37,7 +37,7 @@ command=java -Ddruid.sql.enable=true -Ddruid.sql.avatica.enable=true -cp /shared/docker/lib/* - io.druid.cli.Main server broker + org.apache.druid.cli.Main server broker redirect_stderr=true autorestart=false priority=100 diff --git a/integration-tests/docker/coordinator.conf b/integration-tests/docker/coordinator.conf index c6979432e752..099abf528386 100644 --- a/integration-tests/docker/coordinator.conf +++ b/integration-tests/docker/coordinator.conf @@ -30,7 +30,7 @@ command=java -Ddruid.auth.authorizer.basic.type=basic -Ddruid.auth.unsecuredPaths="[\"/druid/coordinator/v1/loadqueue\"]" -cp /shared/docker/lib/* - io.druid.cli.Main server coordinator + org.apache.druid.cli.Main server coordinator redirect_stderr=true priority=100 autorestart=false diff --git a/integration-tests/docker/historical.conf b/integration-tests/docker/historical.conf index af6fbca023ec..6ff564c13060 100644 --- a/integration-tests/docker/historical.conf +++ b/integration-tests/docker/historical.conf @@ -33,7 +33,7 @@ command=java -Ddruid.auth.authorizers="[\"basic\"]" -Ddruid.auth.authorizer.basic.type=basic -cp /shared/docker/lib/* - io.druid.cli.Main server historical + org.apache.druid.cli.Main server historical redirect_stderr=true priority=100 autorestart=false diff --git a/integration-tests/docker/middlemanager.conf b/integration-tests/docker/middlemanager.conf index 25052cbc7ca2..e2f4f06ebb5e 100644 --- a/integration-tests/docker/middlemanager.conf +++ b/integration-tests/docker/middlemanager.conf @@ -36,7 +36,7 @@ command=java -Ddruid.auth.authorizers="[\"basic\"]" -Ddruid.auth.authorizer.basic.type=basic -cp /shared/docker/lib/* - io.druid.cli.Main server middleManager + org.apache.druid.cli.Main server middleManager redirect_stderr=true priority=100 autorestart=false diff --git a/integration-tests/docker/overlord.conf b/integration-tests/docker/overlord.conf index 1b15400170fd..97a48ccaeb4b 100644 --- a/integration-tests/docker/overlord.conf +++ b/integration-tests/docker/overlord.conf @@ -31,7 +31,7 @@ command=java -Ddruid.auth.authorizers="[\"basic\"]" -Ddruid.auth.authorizer.basic.type=basic -cp /shared/docker/lib/* - io.druid.cli.Main server overlord + org.apache.druid.cli.Main server overlord redirect_stderr=true priority=100 autorestart=false diff --git a/integration-tests/docker/router.conf b/integration-tests/docker/router.conf index 6e22f65c6602..39923d9a8d2f 100644 --- a/integration-tests/docker/router.conf +++ b/integration-tests/docker/router.conf @@ -26,7 +26,7 @@ command=java -Ddruid.sql.enable=true -Ddruid.sql.avatica.enable=true -cp /shared/docker/lib/* - io.druid.cli.Main server router + org.apache.druid.cli.Main server router redirect_stderr=true priority=100 autorestart=false diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 312b9227d958..9c67b3ec1477 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -26,7 +26,7 @@ druid-integration-tests - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT @@ -37,22 +37,22 @@ - io.druid + org.apache.druid druid-common ${project.parent.version} - io.druid.extensions + org.apache.druid.extensions druid-s3-extensions ${project.parent.version} - io.druid.extensions + org.apache.druid.extensions druid-datasketches ${project.parent.version} - io.druid.extensions + org.apache.druid.extensions druid-kafka-eight ${project.parent.version} @@ -63,17 +63,17 @@ - io.druid.extensions + org.apache.druid.extensions druid-histogram ${project.parent.version} - io.druid.extensions + org.apache.druid.extensions mysql-metadata-storage ${project.parent.version} - io.druid.extensions + org.apache.druid.extensions druid-kafka-indexing-service ${project.parent.version} @@ -84,17 +84,17 @@ - io.druid.extensions + org.apache.druid.extensions druid-basic-security ${project.parent.version} - io.druid + org.apache.druid druid-services ${project.parent.version} - io.druid + org.apache.druid druid-server ${project.parent.version} diff --git a/integration-tests/src/main/java/io/druid/testing/ConfigFileConfigProvider.java b/integration-tests/src/main/java/org/apache/druid/testing/ConfigFileConfigProvider.java similarity index 96% rename from integration-tests/src/main/java/io/druid/testing/ConfigFileConfigProvider.java rename to integration-tests/src/main/java/org/apache/druid/testing/ConfigFileConfigProvider.java index 289955a4888e..584e11898425 100644 --- a/integration-tests/src/main/java/io/druid/testing/ConfigFileConfigProvider.java +++ b/integration-tests/src/main/java/org/apache/druid/testing/ConfigFileConfigProvider.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.testing; +package org.apache.druid.testing; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.jackson.JacksonUtils; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.java.util.common.logger.Logger; import java.io.File; import java.io.IOException; diff --git a/integration-tests/src/main/java/io/druid/testing/DockerConfigProvider.java b/integration-tests/src/main/java/org/apache/druid/testing/DockerConfigProvider.java similarity index 98% rename from integration-tests/src/main/java/io/druid/testing/DockerConfigProvider.java rename to integration-tests/src/main/java/org/apache/druid/testing/DockerConfigProvider.java index c63c2e504ec6..3cb333f1b04d 100644 --- a/integration-tests/src/main/java/io/druid/testing/DockerConfigProvider.java +++ b/integration-tests/src/main/java/org/apache/druid/testing/DockerConfigProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.testing; +package org.apache.druid.testing; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/integration-tests/src/main/java/io/druid/testing/IntegrationTestingConfig.java b/integration-tests/src/main/java/org/apache/druid/testing/IntegrationTestingConfig.java similarity index 97% rename from integration-tests/src/main/java/io/druid/testing/IntegrationTestingConfig.java rename to integration-tests/src/main/java/org/apache/druid/testing/IntegrationTestingConfig.java index 911630e1c959..de05013a36f5 100644 --- a/integration-tests/src/main/java/io/druid/testing/IntegrationTestingConfig.java +++ b/integration-tests/src/main/java/org/apache/druid/testing/IntegrationTestingConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.testing; +package org.apache.druid.testing; import java.util.Map; diff --git a/integration-tests/src/main/java/io/druid/testing/IntegrationTestingConfigProvider.java b/integration-tests/src/main/java/org/apache/druid/testing/IntegrationTestingConfigProvider.java similarity index 97% rename from integration-tests/src/main/java/io/druid/testing/IntegrationTestingConfigProvider.java rename to integration-tests/src/main/java/org/apache/druid/testing/IntegrationTestingConfigProvider.java index ace6dfdf6afe..3ce1dd21f68c 100644 --- a/integration-tests/src/main/java/io/druid/testing/IntegrationTestingConfigProvider.java +++ b/integration-tests/src/main/java/org/apache/druid/testing/IntegrationTestingConfigProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.testing; +package org.apache.druid.testing; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/integration-tests/src/main/java/io/druid/testing/IntegrationTestingCuratorConfig.java b/integration-tests/src/main/java/org/apache/druid/testing/IntegrationTestingCuratorConfig.java similarity index 94% rename from integration-tests/src/main/java/io/druid/testing/IntegrationTestingCuratorConfig.java rename to integration-tests/src/main/java/org/apache/druid/testing/IntegrationTestingCuratorConfig.java index 69aa6a6fc688..e9982ea6ae39 100644 --- a/integration-tests/src/main/java/io/druid/testing/IntegrationTestingCuratorConfig.java +++ b/integration-tests/src/main/java/org/apache/druid/testing/IntegrationTestingCuratorConfig.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.testing; +package org.apache.druid.testing; import com.google.inject.Inject; -import io.druid.curator.CuratorConfig; +import org.apache.druid.curator.CuratorConfig; /** * We will use this instead of druid server's CuratorConfig, because CuratorConfig in diff --git a/integration-tests/src/main/java/io/druid/testing/clients/ClientInfoResourceTestClient.java b/integration-tests/src/main/java/org/apache/druid/testing/clients/ClientInfoResourceTestClient.java similarity index 84% rename from integration-tests/src/main/java/io/druid/testing/clients/ClientInfoResourceTestClient.java rename to integration-tests/src/main/java/org/apache/druid/testing/clients/ClientInfoResourceTestClient.java index 4dbc176153a6..63858d3eb35b 100644 --- a/integration-tests/src/main/java/io/druid/testing/clients/ClientInfoResourceTestClient.java +++ b/integration-tests/src/main/java/org/apache/druid/testing/clients/ClientInfoResourceTestClient.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.testing.clients; +package org.apache.druid.testing.clients; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Throwables; import com.google.inject.Inject; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.Request; -import io.druid.java.util.http.client.response.StatusResponseHandler; -import io.druid.java.util.http.client.response.StatusResponseHolder; -import io.druid.testing.IntegrationTestingConfig; -import io.druid.testing.guice.TestClient; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.Request; +import org.apache.druid.java.util.http.client.response.StatusResponseHandler; +import org.apache.druid.java.util.http.client.response.StatusResponseHolder; +import org.apache.druid.testing.IntegrationTestingConfig; +import org.apache.druid.testing.guice.TestClient; import org.jboss.netty.handler.codec.http.HttpMethod; import org.jboss.netty.handler.codec.http.HttpResponseStatus; diff --git a/integration-tests/src/main/java/io/druid/testing/clients/CoordinatorResourceTestClient.java b/integration-tests/src/main/java/org/apache/druid/testing/clients/CoordinatorResourceTestClient.java similarity index 90% rename from integration-tests/src/main/java/io/druid/testing/clients/CoordinatorResourceTestClient.java rename to integration-tests/src/main/java/org/apache/druid/testing/clients/CoordinatorResourceTestClient.java index 500f709d828b..667febc6be48 100644 --- a/integration-tests/src/main/java/io/druid/testing/clients/CoordinatorResourceTestClient.java +++ b/integration-tests/src/main/java/org/apache/druid/testing/clients/CoordinatorResourceTestClient.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.testing.clients; +package org.apache.druid.testing.clients; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Throwables; import com.google.inject.Inject; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.RE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.Request; -import io.druid.java.util.http.client.response.StatusResponseHandler; -import io.druid.java.util.http.client.response.StatusResponseHolder; -import io.druid.testing.IntegrationTestingConfig; -import io.druid.testing.guice.TestClient; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.Request; +import org.apache.druid.java.util.http.client.response.StatusResponseHandler; +import org.apache.druid.java.util.http.client.response.StatusResponseHolder; +import org.apache.druid.testing.IntegrationTestingConfig; +import org.apache.druid.testing.guice.TestClient; import org.jboss.netty.handler.codec.http.HttpMethod; import org.jboss.netty.handler.codec.http.HttpResponseStatus; import org.joda.time.Interval; diff --git a/integration-tests/src/main/java/io/druid/testing/clients/EventReceiverFirehoseTestClient.java b/integration-tests/src/main/java/org/apache/druid/testing/clients/EventReceiverFirehoseTestClient.java similarity index 90% rename from integration-tests/src/main/java/io/druid/testing/clients/EventReceiverFirehoseTestClient.java rename to integration-tests/src/main/java/org/apache/druid/testing/clients/EventReceiverFirehoseTestClient.java index f9be63a362c7..a7b4d9abc443 100644 --- a/integration-tests/src/main/java/io/druid/testing/clients/EventReceiverFirehoseTestClient.java +++ b/integration-tests/src/main/java/org/apache/druid/testing/clients/EventReceiverFirehoseTestClient.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.testing.clients; +package org.apache.druid.testing.clients; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.jaxrs.smile.SmileMediaTypes; import com.google.common.base.Throwables; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.jackson.JacksonUtils; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.Request; -import io.druid.java.util.http.client.response.StatusResponseHandler; -import io.druid.java.util.http.client.response.StatusResponseHolder; -import io.druid.testing.guice.TestClient; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.Request; +import org.apache.druid.java.util.http.client.response.StatusResponseHandler; +import org.apache.druid.java.util.http.client.response.StatusResponseHolder; +import org.apache.druid.testing.guice.TestClient; import org.jboss.netty.handler.codec.http.HttpMethod; import org.jboss.netty.handler.codec.http.HttpResponseStatus; diff --git a/integration-tests/src/main/java/io/druid/testing/clients/OverlordResourceTestClient.java b/integration-tests/src/main/java/org/apache/druid/testing/clients/OverlordResourceTestClient.java similarity index 90% rename from integration-tests/src/main/java/io/druid/testing/clients/OverlordResourceTestClient.java rename to integration-tests/src/main/java/org/apache/druid/testing/clients/OverlordResourceTestClient.java index c3df10e166df..1f5d8888032f 100644 --- a/integration-tests/src/main/java/io/druid/testing/clients/OverlordResourceTestClient.java +++ b/integration-tests/src/main/java/org/apache/druid/testing/clients/OverlordResourceTestClient.java @@ -17,27 +17,27 @@ * under the License. */ -package io.druid.testing.clients; +package org.apache.druid.testing.clients; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Predicates; import com.google.common.base.Throwables; import com.google.inject.Inject; -import io.druid.client.indexing.TaskStatusResponse; -import io.druid.indexer.TaskState; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.RetryUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.jackson.JacksonUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.Request; -import io.druid.java.util.http.client.response.StatusResponseHandler; -import io.druid.java.util.http.client.response.StatusResponseHolder; -import io.druid.testing.IntegrationTestingConfig; -import io.druid.testing.guice.TestClient; -import io.druid.testing.utils.RetryUtil; +import org.apache.druid.client.indexing.TaskStatusResponse; +import org.apache.druid.indexer.TaskState; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.RetryUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.Request; +import org.apache.druid.java.util.http.client.response.StatusResponseHandler; +import org.apache.druid.java.util.http.client.response.StatusResponseHolder; +import org.apache.druid.testing.IntegrationTestingConfig; +import org.apache.druid.testing.guice.TestClient; +import org.apache.druid.testing.utils.RetryUtil; import org.jboss.netty.handler.codec.http.HttpMethod; import org.jboss.netty.handler.codec.http.HttpResponseStatus; diff --git a/integration-tests/src/main/java/io/druid/testing/clients/QueryResourceTestClient.java b/integration-tests/src/main/java/org/apache/druid/testing/clients/QueryResourceTestClient.java similarity index 83% rename from integration-tests/src/main/java/io/druid/testing/clients/QueryResourceTestClient.java rename to integration-tests/src/main/java/org/apache/druid/testing/clients/QueryResourceTestClient.java index 333ccec4cebd..1db718e7d1d5 100644 --- a/integration-tests/src/main/java/io/druid/testing/clients/QueryResourceTestClient.java +++ b/integration-tests/src/main/java/org/apache/druid/testing/clients/QueryResourceTestClient.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.testing.clients; +package org.apache.druid.testing.clients; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Throwables; import com.google.inject.Inject; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.Request; -import io.druid.java.util.http.client.response.StatusResponseHandler; -import io.druid.java.util.http.client.response.StatusResponseHolder; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.query.Query; -import io.druid.testing.IntegrationTestingConfig; -import io.druid.testing.guice.TestClient; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.Request; +import org.apache.druid.java.util.http.client.response.StatusResponseHandler; +import org.apache.druid.java.util.http.client.response.StatusResponseHolder; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.Query; +import org.apache.druid.testing.IntegrationTestingConfig; +import org.apache.druid.testing.guice.TestClient; import org.jboss.netty.handler.codec.http.HttpMethod; import org.jboss.netty.handler.codec.http.HttpResponseStatus; diff --git a/integration-tests/src/main/java/io/druid/testing/clients/TaskResponseObject.java b/integration-tests/src/main/java/org/apache/druid/testing/clients/TaskResponseObject.java similarity index 95% rename from integration-tests/src/main/java/io/druid/testing/clients/TaskResponseObject.java rename to integration-tests/src/main/java/org/apache/druid/testing/clients/TaskResponseObject.java index 04bcdb3210f1..1d275f7feac3 100644 --- a/integration-tests/src/main/java/io/druid/testing/clients/TaskResponseObject.java +++ b/integration-tests/src/main/java/org/apache/druid/testing/clients/TaskResponseObject.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.testing.clients; +package org.apache.druid.testing.clients; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.indexer.TaskStatus; +import org.apache.druid.indexer.TaskStatus; import org.joda.time.DateTime; public class TaskResponseObject diff --git a/integration-tests/src/main/java/io/druid/testing/guice/DruidTestModule.java b/integration-tests/src/main/java/org/apache/druid/testing/guice/DruidTestModule.java similarity index 70% rename from integration-tests/src/main/java/io/druid/testing/guice/DruidTestModule.java rename to integration-tests/src/main/java/org/apache/druid/testing/guice/DruidTestModule.java index af7606b49c1c..d849f91844f0 100644 --- a/integration-tests/src/main/java/io/druid/testing/guice/DruidTestModule.java +++ b/integration-tests/src/main/java/org/apache/druid/testing/guice/DruidTestModule.java @@ -17,29 +17,29 @@ * under the License. */ -package io.druid.testing.guice; +package org.apache.druid.testing.guice; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Supplier; import com.google.inject.Binder; import com.google.inject.Module; import com.google.inject.Provides; -import io.druid.curator.CuratorConfig; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.ManageLifecycle; -import io.druid.guice.annotations.EscalatedClient; -import io.druid.guice.annotations.Self; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.emitter.core.LoggingEmitter; -import io.druid.java.util.emitter.core.LoggingEmitterConfig; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.http.client.CredentialedHttpClient; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.auth.BasicCredentials; -import io.druid.server.DruidNode; -import io.druid.testing.IntegrationTestingConfig; -import io.druid.testing.IntegrationTestingConfigProvider; -import io.druid.testing.IntegrationTestingCuratorConfig; +import org.apache.druid.curator.CuratorConfig; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.guice.annotations.EscalatedClient; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.emitter.core.LoggingEmitter; +import org.apache.druid.java.util.emitter.core.LoggingEmitterConfig; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.http.client.CredentialedHttpClient; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.auth.BasicCredentials; +import org.apache.druid.server.DruidNode; +import org.apache.druid.testing.IntegrationTestingConfig; +import org.apache.druid.testing.IntegrationTestingConfigProvider; +import org.apache.druid.testing.IntegrationTestingCuratorConfig; /** */ diff --git a/integration-tests/src/main/java/io/druid/testing/guice/DruidTestModuleFactory.java b/integration-tests/src/main/java/org/apache/druid/testing/guice/DruidTestModuleFactory.java similarity index 89% rename from integration-tests/src/main/java/io/druid/testing/guice/DruidTestModuleFactory.java rename to integration-tests/src/main/java/org/apache/druid/testing/guice/DruidTestModuleFactory.java index 7a23b6e6312d..471ba4791000 100644 --- a/integration-tests/src/main/java/io/druid/testing/guice/DruidTestModuleFactory.java +++ b/integration-tests/src/main/java/org/apache/druid/testing/guice/DruidTestModuleFactory.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.testing.guice; +package org.apache.druid.testing.guice; import com.google.common.collect.ImmutableList; import com.google.inject.Injector; import com.google.inject.Module; -import io.druid.guice.GuiceInjectors; -import io.druid.guice.IndexingServiceFirehoseModule; -import io.druid.initialization.Initialization; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.guice.IndexingServiceFirehoseModule; +import org.apache.druid.initialization.Initialization; import org.testng.IModuleFactory; import org.testng.ITestContext; diff --git a/integration-tests/src/main/java/io/druid/testing/guice/TestClient.java b/integration-tests/src/main/java/org/apache/druid/testing/guice/TestClient.java similarity index 96% rename from integration-tests/src/main/java/io/druid/testing/guice/TestClient.java rename to integration-tests/src/main/java/org/apache/druid/testing/guice/TestClient.java index d4b63c5ae3d5..1820c5604f88 100644 --- a/integration-tests/src/main/java/io/druid/testing/guice/TestClient.java +++ b/integration-tests/src/main/java/org/apache/druid/testing/guice/TestClient.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.testing.guice; +package org.apache.druid.testing.guice; import com.google.inject.BindingAnnotation; diff --git a/integration-tests/src/main/java/io/druid/testing/utils/LoggerListener.java b/integration-tests/src/main/java/org/apache/druid/testing/utils/LoggerListener.java similarity index 93% rename from integration-tests/src/main/java/io/druid/testing/utils/LoggerListener.java rename to integration-tests/src/main/java/org/apache/druid/testing/utils/LoggerListener.java index 118cc57e487d..ca79a285e6ec 100644 --- a/integration-tests/src/main/java/io/druid/testing/utils/LoggerListener.java +++ b/integration-tests/src/main/java/org/apache/druid/testing/utils/LoggerListener.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.testing.utils; +package org.apache.druid.testing.utils; import org.testng.ITestResult; import org.testng.TestListenerAdapter; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.logger.Logger; public class LoggerListener extends TestListenerAdapter { diff --git a/integration-tests/src/main/java/io/druid/testing/utils/QueryResultVerifier.java b/integration-tests/src/main/java/org/apache/druid/testing/utils/QueryResultVerifier.java similarity index 97% rename from integration-tests/src/main/java/io/druid/testing/utils/QueryResultVerifier.java rename to integration-tests/src/main/java/org/apache/druid/testing/utils/QueryResultVerifier.java index 95ff3a2cebe9..6aa0638c4e1a 100644 --- a/integration-tests/src/main/java/io/druid/testing/utils/QueryResultVerifier.java +++ b/integration-tests/src/main/java/org/apache/druid/testing/utils/QueryResultVerifier.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.testing.utils; +package org.apache.druid.testing.utils; import java.util.Iterator; import java.util.Map; diff --git a/integration-tests/src/main/java/io/druid/testing/utils/QueryWithResults.java b/integration-tests/src/main/java/org/apache/druid/testing/utils/QueryWithResults.java similarity index 95% rename from integration-tests/src/main/java/io/druid/testing/utils/QueryWithResults.java rename to integration-tests/src/main/java/org/apache/druid/testing/utils/QueryWithResults.java index c612af04ba6c..7677815156f9 100644 --- a/integration-tests/src/main/java/io/druid/testing/utils/QueryWithResults.java +++ b/integration-tests/src/main/java/org/apache/druid/testing/utils/QueryWithResults.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.testing.utils; +package org.apache.druid.testing.utils; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.query.Query; +import org.apache.druid.query.Query; import java.util.List; import java.util.Map; diff --git a/integration-tests/src/main/java/io/druid/testing/utils/RetryUtil.java b/integration-tests/src/main/java/org/apache/druid/testing/utils/RetryUtil.java similarity index 93% rename from integration-tests/src/main/java/io/druid/testing/utils/RetryUtil.java rename to integration-tests/src/main/java/org/apache/druid/testing/utils/RetryUtil.java index a23dbdc39b4f..6f3d70a68c97 100644 --- a/integration-tests/src/main/java/io/druid/testing/utils/RetryUtil.java +++ b/integration-tests/src/main/java/org/apache/druid/testing/utils/RetryUtil.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.testing.utils; +package org.apache.druid.testing.utils; 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 java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; diff --git a/integration-tests/src/main/java/io/druid/testing/utils/ServerDiscoveryUtil.java b/integration-tests/src/main/java/org/apache/druid/testing/utils/ServerDiscoveryUtil.java similarity index 86% rename from integration-tests/src/main/java/io/druid/testing/utils/ServerDiscoveryUtil.java rename to integration-tests/src/main/java/org/apache/druid/testing/utils/ServerDiscoveryUtil.java index d4f0cd963e30..ea43f8e3071a 100644 --- a/integration-tests/src/main/java/io/druid/testing/utils/ServerDiscoveryUtil.java +++ b/integration-tests/src/main/java/org/apache/druid/testing/utils/ServerDiscoveryUtil.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.testing.utils; +package org.apache.druid.testing.utils; -import io.druid.client.selector.Server; -import io.druid.curator.discovery.ServerDiscoverySelector; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.client.selector.Server; +import org.apache.druid.curator.discovery.ServerDiscoverySelector; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; import java.util.concurrent.Callable; diff --git a/integration-tests/src/main/java/io/druid/testing/utils/TestQueryHelper.java b/integration-tests/src/main/java/org/apache/druid/testing/utils/TestQueryHelper.java similarity index 89% rename from integration-tests/src/main/java/io/druid/testing/utils/TestQueryHelper.java rename to integration-tests/src/main/java/org/apache/druid/testing/utils/TestQueryHelper.java index 688719f98b59..93692e4c04d9 100644 --- a/integration-tests/src/main/java/io/druid/testing/utils/TestQueryHelper.java +++ b/integration-tests/src/main/java/org/apache/druid/testing/utils/TestQueryHelper.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.testing.utils; +package org.apache.druid.testing.utils; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.inject.Inject; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.Druids; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.testing.IntegrationTestingConfig; -import io.druid.testing.clients.QueryResourceTestClient; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.Druids; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.testing.IntegrationTestingConfig; +import org.apache.druid.testing.clients.QueryResourceTestClient; import java.util.List; import java.util.Map; diff --git a/integration-tests/src/main/java/org/testng/DruidTestRunnerFactory.java b/integration-tests/src/main/java/org/testng/DruidTestRunnerFactory.java index 2d179c4ff22f..8df4010736cb 100644 --- a/integration-tests/src/main/java/org/testng/DruidTestRunnerFactory.java +++ b/integration-tests/src/main/java/org/testng/DruidTestRunnerFactory.java @@ -22,17 +22,17 @@ import com.google.common.base.Throwables; import com.google.inject.Injector; import com.google.inject.Key; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.Request; -import io.druid.java.util.http.client.response.StatusResponseHandler; -import io.druid.java.util.http.client.response.StatusResponseHolder; -import io.druid.testing.IntegrationTestingConfig; -import io.druid.testing.guice.DruidTestModuleFactory; -import io.druid.testing.guice.TestClient; -import io.druid.testing.utils.RetryUtil; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.Request; +import org.apache.druid.java.util.http.client.response.StatusResponseHandler; +import org.apache.druid.java.util.http.client.response.StatusResponseHolder; +import org.apache.druid.testing.IntegrationTestingConfig; +import org.apache.druid.testing.guice.DruidTestModuleFactory; +import org.apache.druid.testing.guice.TestClient; +import org.apache.druid.testing.utils.RetryUtil; import org.jboss.netty.handler.codec.http.HttpMethod; import org.jboss.netty.handler.codec.http.HttpResponseStatus; import org.testng.internal.IConfiguration; diff --git a/integration-tests/src/test/java/io/druid/tests/hadoop/ITHadoopIndexTest.java b/integration-tests/src/test/java/org/apache/druid/tests/hadoop/ITHadoopIndexTest.java similarity index 90% rename from integration-tests/src/test/java/io/druid/tests/hadoop/ITHadoopIndexTest.java rename to integration-tests/src/test/java/org/apache/druid/tests/hadoop/ITHadoopIndexTest.java index 9c6431024067..5a8124e689fe 100644 --- a/integration-tests/src/test/java/io/druid/tests/hadoop/ITHadoopIndexTest.java +++ b/integration-tests/src/test/java/org/apache/druid/tests/hadoop/ITHadoopIndexTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.tests.hadoop; +package org.apache.druid.tests.hadoop; import com.google.common.base.Throwables; import com.google.inject.Inject; -import io.druid.java.util.common.logger.Logger; -import io.druid.testing.IntegrationTestingConfig; -import io.druid.testing.guice.DruidTestModuleFactory; -import io.druid.testing.utils.RetryUtil; -import io.druid.tests.indexer.AbstractIndexerTest; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.testing.IntegrationTestingConfig; +import org.apache.druid.testing.guice.DruidTestModuleFactory; +import org.apache.druid.testing.utils.RetryUtil; +import org.apache.druid.tests.indexer.AbstractIndexerTest; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Guice; diff --git a/integration-tests/src/test/java/io/druid/tests/indexer/AbstractITBatchIndexTest.java b/integration-tests/src/test/java/org/apache/druid/tests/indexer/AbstractITBatchIndexTest.java similarity index 90% rename from integration-tests/src/test/java/io/druid/tests/indexer/AbstractITBatchIndexTest.java rename to integration-tests/src/test/java/org/apache/druid/tests/indexer/AbstractITBatchIndexTest.java index 74cfb7e3ac34..f417c149d062 100644 --- a/integration-tests/src/test/java/io/druid/tests/indexer/AbstractITBatchIndexTest.java +++ b/integration-tests/src/test/java/org/apache/druid/tests/indexer/AbstractITBatchIndexTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.tests.indexer; +package org.apache.druid.tests.indexer; import com.google.inject.Inject; -import io.druid.java.util.common.logger.Logger; -import io.druid.testing.IntegrationTestingConfig; -import io.druid.testing.clients.ClientInfoResourceTestClient; -import io.druid.testing.utils.RetryUtil; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.testing.IntegrationTestingConfig; +import org.apache.druid.testing.clients.ClientInfoResourceTestClient; +import org.apache.druid.testing.utils.RetryUtil; import org.junit.Assert; import java.io.IOException; diff --git a/integration-tests/src/test/java/io/druid/tests/indexer/AbstractITRealtimeIndexTaskTest.java b/integration-tests/src/test/java/org/apache/druid/tests/indexer/AbstractITRealtimeIndexTaskTest.java similarity index 92% rename from integration-tests/src/test/java/io/druid/tests/indexer/AbstractITRealtimeIndexTaskTest.java rename to integration-tests/src/test/java/org/apache/druid/tests/indexer/AbstractITRealtimeIndexTaskTest.java index 096b2d46ebac..eb728396101d 100644 --- a/integration-tests/src/test/java/io/druid/tests/indexer/AbstractITRealtimeIndexTaskTest.java +++ b/integration-tests/src/test/java/org/apache/druid/tests/indexer/AbstractITRealtimeIndexTaskTest.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.tests.indexer; +package org.apache.druid.tests.indexer; import com.google.common.base.Throwables; import com.google.inject.Inject; -import io.druid.curator.discovery.ServerDiscoveryFactory; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.http.client.HttpClient; -import io.druid.testing.IntegrationTestingConfig; -import io.druid.testing.guice.TestClient; -import io.druid.testing.utils.RetryUtil; +import org.apache.druid.curator.discovery.ServerDiscoveryFactory; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.testing.IntegrationTestingConfig; +import org.apache.druid.testing.guice.TestClient; +import org.apache.druid.testing.utils.RetryUtil; import org.apache.commons.io.IOUtils; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormat; diff --git a/integration-tests/src/test/java/io/druid/tests/indexer/AbstractIndexerTest.java b/integration-tests/src/test/java/org/apache/druid/tests/indexer/AbstractIndexerTest.java similarity index 87% rename from integration-tests/src/test/java/io/druid/tests/indexer/AbstractIndexerTest.java rename to integration-tests/src/test/java/org/apache/druid/tests/indexer/AbstractIndexerTest.java index f742ce2e3107..a689567cdd16 100644 --- a/integration-tests/src/test/java/io/druid/tests/indexer/AbstractIndexerTest.java +++ b/integration-tests/src/test/java/org/apache/druid/tests/indexer/AbstractIndexerTest.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.tests.indexer; +package org.apache.druid.tests.indexer; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.inject.Inject; -import io.druid.guice.annotations.Json; -import io.druid.guice.annotations.Smile; -import io.druid.java.util.common.Intervals; -import io.druid.testing.clients.CoordinatorResourceTestClient; -import io.druid.testing.clients.OverlordResourceTestClient; -import io.druid.testing.utils.RetryUtil; -import io.druid.testing.utils.TestQueryHelper; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.guice.annotations.Smile; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.testing.clients.CoordinatorResourceTestClient; +import org.apache.druid.testing.clients.OverlordResourceTestClient; +import org.apache.druid.testing.utils.RetryUtil; +import org.apache.druid.testing.utils.TestQueryHelper; import org.apache.commons.io.IOUtils; import org.joda.time.Interval; @@ -71,7 +71,7 @@ protected void unloadAndKillData(final String dataSource) protected void unloadAndKillData(final String dataSource, String start, String end) { // Wait for any existing index tasks to complete before disabling the datasource otherwise - // realtime tasks can get stuck waiting for handoff. https://github.com/druid-io/druid/issues/1729 + // realtime tasks can get stuck waiting for handoff. https://github.com/apache/incubator-druid/issues/1729 waitForAllTasksToComplete(); Interval interval = Intervals.of(start + "/" + end); coordinator.unloadSegmentsForDataSource(dataSource); diff --git a/integration-tests/src/test/java/io/druid/tests/indexer/ITAppenderatorDriverRealtimeIndexTaskTest.java b/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITAppenderatorDriverRealtimeIndexTaskTest.java similarity index 90% rename from integration-tests/src/test/java/io/druid/tests/indexer/ITAppenderatorDriverRealtimeIndexTaskTest.java rename to integration-tests/src/test/java/org/apache/druid/tests/indexer/ITAppenderatorDriverRealtimeIndexTaskTest.java index 3cb6b7c2ecfd..4ec554da7e88 100644 --- a/integration-tests/src/test/java/io/druid/tests/indexer/ITAppenderatorDriverRealtimeIndexTaskTest.java +++ b/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITAppenderatorDriverRealtimeIndexTaskTest.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.tests.indexer; +package org.apache.druid.tests.indexer; import com.google.common.base.Throwables; -import io.druid.curator.discovery.ServerDiscoverySelector; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.jackson.JacksonUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.testing.clients.EventReceiverFirehoseTestClient; -import io.druid.testing.guice.DruidTestModuleFactory; -import io.druid.testing.utils.ServerDiscoveryUtil; +import org.apache.druid.curator.discovery.ServerDiscoverySelector; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.testing.clients.EventReceiverFirehoseTestClient; +import org.apache.druid.testing.guice.DruidTestModuleFactory; +import org.apache.druid.testing.utils.ServerDiscoveryUtil; import org.joda.time.DateTime; import org.testng.annotations.Guice; import org.testng.annotations.Test; diff --git a/integration-tests/src/test/java/io/druid/tests/indexer/ITCompactionTaskTest.java b/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITCompactionTaskTest.java similarity index 94% rename from integration-tests/src/test/java/io/druid/tests/indexer/ITCompactionTaskTest.java rename to integration-tests/src/test/java/org/apache/druid/tests/indexer/ITCompactionTaskTest.java index 1a951b2977a1..8ea14edda261 100644 --- a/integration-tests/src/test/java/io/druid/tests/indexer/ITCompactionTaskTest.java +++ b/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITCompactionTaskTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.tests.indexer; +package org.apache.druid.tests.indexer; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.logger.Logger; -import io.druid.testing.guice.DruidTestModuleFactory; -import io.druid.testing.utils.RetryUtil; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.testing.guice.DruidTestModuleFactory; +import org.apache.druid.testing.utils.RetryUtil; import org.testng.annotations.Guice; import org.testng.annotations.Test; diff --git a/integration-tests/src/test/java/io/druid/tests/indexer/ITIndexerTest.java b/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITIndexerTest.java similarity index 94% rename from integration-tests/src/test/java/io/druid/tests/indexer/ITIndexerTest.java rename to integration-tests/src/test/java/org/apache/druid/tests/indexer/ITIndexerTest.java index 5195a6c04aa9..2a7bc64fa361 100644 --- a/integration-tests/src/test/java/io/druid/tests/indexer/ITIndexerTest.java +++ b/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITIndexerTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.tests.indexer; +package org.apache.druid.tests.indexer; -import io.druid.testing.guice.DruidTestModuleFactory; +import org.apache.druid.testing.guice.DruidTestModuleFactory; import org.testng.annotations.Guice; import org.testng.annotations.Test; diff --git a/integration-tests/src/test/java/io/druid/tests/indexer/ITKafkaIndexingServiceTest.java b/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITKafkaIndexingServiceTest.java similarity index 95% rename from integration-tests/src/test/java/io/druid/tests/indexer/ITKafkaIndexingServiceTest.java rename to integration-tests/src/test/java/org/apache/druid/tests/indexer/ITKafkaIndexingServiceTest.java index bd1f27dee221..38b508c45394 100644 --- a/integration-tests/src/test/java/io/druid/tests/indexer/ITKafkaIndexingServiceTest.java +++ b/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITKafkaIndexingServiceTest.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.tests.indexer; +package org.apache.druid.tests.indexer; import com.google.common.base.Throwables; import com.google.inject.Inject; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.testing.IntegrationTestingConfig; -import io.druid.testing.guice.DruidTestModuleFactory; -import io.druid.testing.utils.RetryUtil; -import io.druid.testing.utils.TestQueryHelper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.testing.IntegrationTestingConfig; +import org.apache.druid.testing.guice.DruidTestModuleFactory; +import org.apache.druid.testing.utils.RetryUtil; +import org.apache.druid.testing.utils.TestQueryHelper; import kafka.admin.AdminUtils; import kafka.admin.RackAwareMode; import kafka.utils.ZKStringSerializer$; diff --git a/integration-tests/src/test/java/io/druid/tests/indexer/ITKafkaTest.java b/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITKafkaTest.java similarity index 95% rename from integration-tests/src/test/java/io/druid/tests/indexer/ITKafkaTest.java rename to integration-tests/src/test/java/org/apache/druid/tests/indexer/ITKafkaTest.java index d6cff5a516ca..efbf2c29592a 100644 --- a/integration-tests/src/test/java/io/druid/tests/indexer/ITKafkaTest.java +++ b/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITKafkaTest.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.tests.indexer; +package org.apache.druid.tests.indexer; import com.google.common.base.Throwables; import com.google.inject.Inject; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.testing.IntegrationTestingConfig; -import io.druid.testing.guice.DruidTestModuleFactory; -import io.druid.testing.utils.RetryUtil; -import io.druid.testing.utils.TestQueryHelper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.testing.IntegrationTestingConfig; +import org.apache.druid.testing.guice.DruidTestModuleFactory; +import org.apache.druid.testing.utils.RetryUtil; +import org.apache.druid.testing.utils.TestQueryHelper; import kafka.admin.AdminUtils; import kafka.admin.RackAwareMode; import kafka.utils.ZKStringSerializer$; diff --git a/integration-tests/src/test/java/io/druid/tests/indexer/ITParallelIndexTest.java b/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITParallelIndexTest.java similarity index 93% rename from integration-tests/src/test/java/io/druid/tests/indexer/ITParallelIndexTest.java rename to integration-tests/src/test/java/org/apache/druid/tests/indexer/ITParallelIndexTest.java index 0dff81e4cc91..618084d9b101 100644 --- a/integration-tests/src/test/java/io/druid/tests/indexer/ITParallelIndexTest.java +++ b/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITParallelIndexTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.tests.indexer; +package org.apache.druid.tests.indexer; -import io.druid.testing.guice.DruidTestModuleFactory; +import org.apache.druid.testing.guice.DruidTestModuleFactory; import org.testng.annotations.Guice; import org.testng.annotations.Test; diff --git a/integration-tests/src/test/java/io/druid/tests/indexer/ITRealtimeIndexTaskTest.java b/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITRealtimeIndexTaskTest.java similarity index 90% rename from integration-tests/src/test/java/io/druid/tests/indexer/ITRealtimeIndexTaskTest.java rename to integration-tests/src/test/java/org/apache/druid/tests/indexer/ITRealtimeIndexTaskTest.java index ac64ba55f538..c6dd0221c2d2 100644 --- a/integration-tests/src/test/java/io/druid/tests/indexer/ITRealtimeIndexTaskTest.java +++ b/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITRealtimeIndexTaskTest.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.tests.indexer; +package org.apache.druid.tests.indexer; import com.google.common.base.Throwables; -import io.druid.curator.discovery.ServerDiscoverySelector; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.jackson.JacksonUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.testing.clients.EventReceiverFirehoseTestClient; -import io.druid.testing.guice.DruidTestModuleFactory; -import io.druid.testing.utils.ServerDiscoveryUtil; +import org.apache.druid.curator.discovery.ServerDiscoverySelector; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.testing.clients.EventReceiverFirehoseTestClient; +import org.apache.druid.testing.guice.DruidTestModuleFactory; +import org.apache.druid.testing.utils.ServerDiscoveryUtil; import org.joda.time.DateTime; import org.testng.annotations.Guice; import org.testng.annotations.Test; diff --git a/integration-tests/src/test/java/io/druid/tests/indexer/ITUnionQueryTest.java b/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITUnionQueryTest.java similarity index 89% rename from integration-tests/src/test/java/io/druid/tests/indexer/ITUnionQueryTest.java rename to integration-tests/src/test/java/org/apache/druid/tests/indexer/ITUnionQueryTest.java index 11fe9cafcca7..748da882ee28 100644 --- a/integration-tests/src/test/java/io/druid/tests/indexer/ITUnionQueryTest.java +++ b/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITUnionQueryTest.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.tests.indexer; +package org.apache.druid.tests.indexer; import com.beust.jcommander.internal.Lists; import com.google.common.base.Throwables; import com.google.inject.Inject; -import io.druid.curator.discovery.ServerDiscoveryFactory; -import io.druid.curator.discovery.ServerDiscoverySelector; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.http.client.HttpClient; -import io.druid.testing.IntegrationTestingConfig; -import io.druid.testing.clients.EventReceiverFirehoseTestClient; -import io.druid.testing.guice.DruidTestModuleFactory; -import io.druid.testing.guice.TestClient; -import io.druid.testing.utils.RetryUtil; -import io.druid.testing.utils.ServerDiscoveryUtil; +import org.apache.druid.curator.discovery.ServerDiscoveryFactory; +import org.apache.druid.curator.discovery.ServerDiscoverySelector; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.testing.IntegrationTestingConfig; +import org.apache.druid.testing.clients.EventReceiverFirehoseTestClient; +import org.apache.druid.testing.guice.DruidTestModuleFactory; +import org.apache.druid.testing.guice.TestClient; +import org.apache.druid.testing.utils.RetryUtil; +import org.apache.druid.testing.utils.ServerDiscoveryUtil; import org.joda.time.DateTime; import org.testng.annotations.Guice; import org.testng.annotations.Test; diff --git a/integration-tests/src/test/java/io/druid/tests/query/ITTwitterQueryTest.java b/integration-tests/src/test/java/org/apache/druid/tests/query/ITTwitterQueryTest.java similarity index 87% rename from integration-tests/src/test/java/io/druid/tests/query/ITTwitterQueryTest.java rename to integration-tests/src/test/java/org/apache/druid/tests/query/ITTwitterQueryTest.java index c54e3e69c143..d43378e8f503 100644 --- a/integration-tests/src/test/java/io/druid/tests/query/ITTwitterQueryTest.java +++ b/integration-tests/src/test/java/org/apache/druid/tests/query/ITTwitterQueryTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.tests.query; +package org.apache.druid.tests.query; import com.google.inject.Inject; -import io.druid.testing.clients.CoordinatorResourceTestClient; -import io.druid.testing.guice.DruidTestModuleFactory; -import io.druid.testing.utils.RetryUtil; -import io.druid.testing.utils.TestQueryHelper; +import org.apache.druid.testing.clients.CoordinatorResourceTestClient; +import org.apache.druid.testing.guice.DruidTestModuleFactory; +import org.apache.druid.testing.utils.RetryUtil; +import org.apache.druid.testing.utils.TestQueryHelper; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Guice; import org.testng.annotations.Test; diff --git a/integration-tests/src/test/java/io/druid/tests/query/ITWikipediaQueryTest.java b/integration-tests/src/test/java/org/apache/druid/tests/query/ITWikipediaQueryTest.java similarity index 87% rename from integration-tests/src/test/java/io/druid/tests/query/ITWikipediaQueryTest.java rename to integration-tests/src/test/java/org/apache/druid/tests/query/ITWikipediaQueryTest.java index d185a6a6e447..637cf6ca4d2b 100644 --- a/integration-tests/src/test/java/io/druid/tests/query/ITWikipediaQueryTest.java +++ b/integration-tests/src/test/java/org/apache/druid/tests/query/ITWikipediaQueryTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.tests.query; +package org.apache.druid.tests.query; import com.google.inject.Inject; -import io.druid.testing.clients.CoordinatorResourceTestClient; -import io.druid.testing.guice.DruidTestModuleFactory; -import io.druid.testing.utils.RetryUtil; -import io.druid.testing.utils.TestQueryHelper; +import org.apache.druid.testing.clients.CoordinatorResourceTestClient; +import org.apache.druid.testing.guice.DruidTestModuleFactory; +import org.apache.druid.testing.utils.RetryUtil; +import org.apache.druid.testing.utils.TestQueryHelper; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Guice; import org.testng.annotations.Test; diff --git a/integration-tests/src/test/java/io/druid/tests/security/ITBasicAuthConfigurationTest.java b/integration-tests/src/test/java/org/apache/druid/tests/security/ITBasicAuthConfigurationTest.java similarity index 91% rename from integration-tests/src/test/java/io/druid/tests/security/ITBasicAuthConfigurationTest.java rename to integration-tests/src/test/java/org/apache/druid/tests/security/ITBasicAuthConfigurationTest.java index ff8a97fe1a05..4e2d092d216b 100644 --- a/integration-tests/src/test/java/io/druid/tests/security/ITBasicAuthConfigurationTest.java +++ b/integration-tests/src/test/java/org/apache/druid/tests/security/ITBasicAuthConfigurationTest.java @@ -17,30 +17,30 @@ * under the License. */ -package io.druid.tests.security; +package org.apache.druid.tests.security; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Throwables; import com.google.inject.Inject; -import io.druid.guice.annotations.Client; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.http.client.CredentialedHttpClient; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.Request; -import io.druid.java.util.http.client.auth.BasicCredentials; -import io.druid.java.util.http.client.response.StatusResponseHandler; -import io.druid.java.util.http.client.response.StatusResponseHolder; -import io.druid.security.basic.authentication.entity.BasicAuthenticatorCredentialUpdate; -import io.druid.server.security.Action; -import io.druid.server.security.Resource; -import io.druid.server.security.ResourceAction; -import io.druid.server.security.ResourceType; -import io.druid.sql.avatica.DruidAvaticaHandler; -import io.druid.testing.IntegrationTestingConfig; -import io.druid.testing.guice.DruidTestModuleFactory; +import org.apache.druid.guice.annotations.Client; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.http.client.CredentialedHttpClient; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.Request; +import org.apache.druid.java.util.http.client.auth.BasicCredentials; +import org.apache.druid.java.util.http.client.response.StatusResponseHandler; +import org.apache.druid.java.util.http.client.response.StatusResponseHolder; +import org.apache.druid.security.basic.authentication.entity.BasicAuthenticatorCredentialUpdate; +import org.apache.druid.server.security.Action; +import org.apache.druid.server.security.Resource; +import org.apache.druid.server.security.ResourceAction; +import org.apache.druid.server.security.ResourceType; +import org.apache.druid.sql.avatica.DruidAvaticaHandler; +import org.apache.druid.testing.IntegrationTestingConfig; +import org.apache.druid.testing.guice.DruidTestModuleFactory; import org.apache.calcite.avatica.AvaticaSqlException; import org.jboss.netty.handler.codec.http.HttpMethod; import org.jboss.netty.handler.codec.http.HttpResponseStatus; diff --git a/integration-tests/src/test/java/io/druid/tests/security/ITCoordinatorOverlordProxyAuthTest.java b/integration-tests/src/test/java/org/apache/druid/tests/security/ITCoordinatorOverlordProxyAuthTest.java similarity index 88% rename from integration-tests/src/test/java/io/druid/tests/security/ITCoordinatorOverlordProxyAuthTest.java rename to integration-tests/src/test/java/org/apache/druid/tests/security/ITCoordinatorOverlordProxyAuthTest.java index 69f3a022cc6f..5ce4ede59f66 100644 --- a/integration-tests/src/test/java/io/druid/tests/security/ITCoordinatorOverlordProxyAuthTest.java +++ b/integration-tests/src/test/java/org/apache/druid/tests/security/ITCoordinatorOverlordProxyAuthTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.tests.security; +package org.apache.druid.tests.security; import com.google.inject.Inject; -import io.druid.testing.clients.CoordinatorResourceTestClient; -import io.druid.testing.guice.DruidTestModuleFactory; +import org.apache.druid.testing.clients.CoordinatorResourceTestClient; +import org.apache.druid.testing.guice.DruidTestModuleFactory; import org.jboss.netty.handler.codec.http.HttpResponseStatus; import org.testng.Assert; import org.testng.annotations.Guice; diff --git a/integration-tests/src/test/resources/indexer/union_select_query.json b/integration-tests/src/test/resources/indexer/union_select_query.json index f35e682c313a..e2af57cf2373 100644 --- a/integration-tests/src/test/resources/indexer/union_select_query.json +++ b/integration-tests/src/test/resources/indexer/union_select_query.json @@ -75,7 +75,7 @@ } }, { - "segmentId": "wikipedia_index_test0_2013-08-31T0io.druid.java.util.common.ISE: one or more twitter queries failed0:00:00.000Z_2013-09-01T00:00:00.000Z_2014-05-01T15:27:43.993Z", + "segmentId": "wikipedia_index_test0_2013-08-31T0org.apache.druid.java.util.common.ISE: one or more twitter queries failed0:00:00.000Z_2013-09-01T00:00:00.000Z_2014-05-01T15:27:43.993Z", "offset": 0, "event": { "timestamp": "2013-08-31T03:32:45.000Z", diff --git a/integration-tests/src/test/resources/testng.xml b/integration-tests/src/test/resources/testng.xml index a55cbce5d501..333029c363c3 100644 --- a/integration-tests/src/test/resources/testng.xml +++ b/integration-tests/src/test/resources/testng.xml @@ -22,12 +22,12 @@ - + - - + + diff --git a/java-util/pom.xml b/java-util/pom.xml index 4486c79a550d..7d9c56d43626 100644 --- a/java-util/pom.xml +++ b/java-util/pom.xml @@ -22,7 +22,7 @@ 4.0.0 - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT diff --git a/java-util/src/main/java/io/druid/common/config/NullHandling.java b/java-util/src/main/java/org/apache/druid/common/config/NullHandling.java similarity index 94% rename from java-util/src/main/java/io/druid/common/config/NullHandling.java rename to java-util/src/main/java/org/apache/druid/common/config/NullHandling.java index 018e300d36fb..dd74c1faf8b4 100644 --- a/java-util/src/main/java/io/druid/common/config/NullHandling.java +++ b/java-util/src/main/java/org/apache/druid/common/config/NullHandling.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.common.config; +package org.apache.druid.common.config; import com.google.common.base.Strings; import com.google.inject.Inject; @@ -26,7 +26,7 @@ /** * Helper class for NullHandling. This class is used to switch between SQL compatible Null Handling behavior - * introduced as part of https://github.com/druid-io/druid/issues/4349 and the old druid behavior + * introduced as part of https://github.com/apache/incubator-druid/issues/4349 and the old druid behavior * where null values are replaced with default values e.g Null Strings are replaced with empty values. */ public class NullHandling @@ -46,7 +46,7 @@ public class NullHandling /** * INSTANCE is injected using static injection to avoid adding JacksonInject annotations all over the code. - * See io.druid.guice.NullHandlingModule for details. + * See org.apache.druid.guice.NullHandlingModule for details. * It does not take effect in all unit tests since we don't use Guice Injection. */ @Inject diff --git a/java-util/src/main/java/io/druid/common/config/NullValueHandlingConfig.java b/java-util/src/main/java/org/apache/druid/common/config/NullValueHandlingConfig.java similarity index 97% rename from java-util/src/main/java/io/druid/common/config/NullValueHandlingConfig.java rename to java-util/src/main/java/org/apache/druid/common/config/NullValueHandlingConfig.java index 2c49446f1a5b..b9e0670584f4 100644 --- a/java-util/src/main/java/io/druid/common/config/NullValueHandlingConfig.java +++ b/java-util/src/main/java/org/apache/druid/common/config/NullValueHandlingConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.common.config; +package org.apache.druid.common.config; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/java-util/src/main/java/io/druid/concurrent/ConcurrentAwaitableCounter.java b/java-util/src/main/java/org/apache/druid/concurrent/ConcurrentAwaitableCounter.java similarity index 99% rename from java-util/src/main/java/io/druid/concurrent/ConcurrentAwaitableCounter.java rename to java-util/src/main/java/org/apache/druid/concurrent/ConcurrentAwaitableCounter.java index 104130e57801..b084e3dcf302 100644 --- a/java-util/src/main/java/io/druid/concurrent/ConcurrentAwaitableCounter.java +++ b/java-util/src/main/java/org/apache/druid/concurrent/ConcurrentAwaitableCounter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.concurrent; +package org.apache.druid.concurrent; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; diff --git a/java-util/src/main/java/io/druid/guice/annotations/ExtensionPoint.java b/java-util/src/main/java/org/apache/druid/guice/annotations/ExtensionPoint.java similarity index 98% rename from java-util/src/main/java/io/druid/guice/annotations/ExtensionPoint.java rename to java-util/src/main/java/org/apache/druid/guice/annotations/ExtensionPoint.java index 6cdd8d3e9cf6..e0c71e3b8637 100644 --- a/java-util/src/main/java/io/druid/guice/annotations/ExtensionPoint.java +++ b/java-util/src/main/java/org/apache/druid/guice/annotations/ExtensionPoint.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.guice.annotations; +package org.apache.druid.guice.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/java-util/src/main/java/io/druid/guice/annotations/PublicApi.java b/java-util/src/main/java/org/apache/druid/guice/annotations/PublicApi.java similarity index 98% rename from java-util/src/main/java/io/druid/guice/annotations/PublicApi.java rename to java-util/src/main/java/org/apache/druid/guice/annotations/PublicApi.java index 39a5c8f8a029..9a4987197801 100644 --- a/java-util/src/main/java/io/druid/guice/annotations/PublicApi.java +++ b/java-util/src/main/java/org/apache/druid/guice/annotations/PublicApi.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.guice.annotations; +package org.apache.druid.guice.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/java-util/src/main/java/io/druid/java/util/common/ByteBufferUtils.java b/java-util/src/main/java/org/apache/druid/java/util/common/ByteBufferUtils.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/ByteBufferUtils.java rename to java-util/src/main/java/org/apache/druid/java/util/common/ByteBufferUtils.java index 40e699c2f281..2018334a32d5 100644 --- a/java-util/src/main/java/io/druid/java/util/common/ByteBufferUtils.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/ByteBufferUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common; +package org.apache.druid.java.util.common; import sun.misc.Cleaner; import sun.nio.ch.DirectBuffer; diff --git a/java-util/src/main/java/io/druid/java/util/common/Cacheable.java b/java-util/src/main/java/org/apache/druid/java/util/common/Cacheable.java similarity index 95% rename from java-util/src/main/java/io/druid/java/util/common/Cacheable.java rename to java-util/src/main/java/org/apache/druid/java/util/common/Cacheable.java index d013b48cede5..48b0ded0fd07 100644 --- a/java-util/src/main/java/io/druid/java/util/common/Cacheable.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/Cacheable.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common; +package org.apache.druid.java.util.common; public interface Cacheable { diff --git a/java-util/src/main/java/io/druid/java/util/common/CloseableIterators.java b/java-util/src/main/java/org/apache/druid/java/util/common/CloseableIterators.java similarity index 94% rename from java-util/src/main/java/io/druid/java/util/common/CloseableIterators.java rename to java-util/src/main/java/org/apache/druid/java/util/common/CloseableIterators.java index 75963e9d19fd..b82b1b94ea9c 100644 --- a/java-util/src/main/java/io/druid/java/util/common/CloseableIterators.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/CloseableIterators.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.java.util.common; +package org.apache.druid.java.util.common; import com.google.common.base.Preconditions; import com.google.common.collect.Iterators; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.common.parsers.CloseableIterator; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.parsers.CloseableIterator; import javax.annotation.Nullable; import java.io.Closeable; diff --git a/java-util/src/main/java/io/druid/java/util/common/CompressionUtils.java b/java-util/src/main/java/org/apache/druid/java/util/common/CompressionUtils.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/common/CompressionUtils.java rename to java-util/src/main/java/org/apache/druid/java/util/common/CompressionUtils.java index 77ef23a358c3..d5cd535d3085 100644 --- a/java-util/src/main/java/io/druid/java/util/common/CompressionUtils.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/CompressionUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common; +package org.apache.druid.java.util.common; import com.google.common.base.Predicate; import com.google.common.base.Strings; @@ -26,8 +26,8 @@ import com.google.common.io.ByteSource; import com.google.common.io.ByteStreams; import com.google.common.io.Files; -import io.druid.java.util.common.io.NativeIO; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.io.NativeIO; +import org.apache.druid.java.util.common.logger.Logger; import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; import org.apache.commons.compress.compressors.snappy.FramedSnappyCompressorInputStream; import org.apache.commons.compress.compressors.xz.XZCompressorInputStream; @@ -82,7 +82,7 @@ public static long zip(File directory, File outputZipFile, boolean fsync) throws long bytes = zip(directory, out); // For explanation of why fsyncing here is a good practice: - // https://github.com/druid-io/druid/pull/5187#pullrequestreview-85188984 + // https://github.com/apache/incubator-druid/pull/5187#pullrequestreview-85188984 if (fsync) { out.getChannel().force(true); } diff --git a/java-util/src/main/java/io/druid/java/util/common/DateTimes.java b/java-util/src/main/java/org/apache/druid/java/util/common/DateTimes.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/common/DateTimes.java rename to java-util/src/main/java/org/apache/druid/java/util/common/DateTimes.java index a3be06426b32..74e221cb9a25 100644 --- a/java-util/src/main/java/io/druid/java/util/common/DateTimes.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/DateTimes.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common; +package org.apache.druid.java.util.common; import org.joda.time.Chronology; import org.joda.time.DateTime; diff --git a/java-util/src/main/java/io/druid/java/util/common/FileUtils.java b/java-util/src/main/java/org/apache/druid/java/util/common/FileUtils.java similarity index 99% rename from java-util/src/main/java/io/druid/java/util/common/FileUtils.java rename to java-util/src/main/java/org/apache/druid/java/util/common/FileUtils.java index 7f137972105e..dca41e4261b0 100644 --- a/java-util/src/main/java/io/druid/java/util/common/FileUtils.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/FileUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.java.util.common; +package org.apache.druid.java.util.common; import com.google.common.base.Predicate; import com.google.common.base.Throwables; diff --git a/java-util/src/main/java/io/druid/java/util/common/IAE.java b/java-util/src/main/java/org/apache/druid/java/util/common/IAE.java similarity index 96% rename from java-util/src/main/java/io/druid/java/util/common/IAE.java rename to java-util/src/main/java/org/apache/druid/java/util/common/IAE.java index b71c3332150a..4384d5a41067 100644 --- a/java-util/src/main/java/io/druid/java/util/common/IAE.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/IAE.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common; +package org.apache.druid.java.util.common; /** */ diff --git a/java-util/src/main/java/io/druid/java/util/common/IOE.java b/java-util/src/main/java/org/apache/druid/java/util/common/IOE.java similarity index 96% rename from java-util/src/main/java/io/druid/java/util/common/IOE.java rename to java-util/src/main/java/org/apache/druid/java/util/common/IOE.java index e1494fce9bd9..340693a53840 100644 --- a/java-util/src/main/java/io/druid/java/util/common/IOE.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/IOE.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common; +package org.apache.druid.java.util.common; import java.io.IOException; diff --git a/java-util/src/main/java/io/druid/java/util/common/ISE.java b/java-util/src/main/java/org/apache/druid/java/util/common/ISE.java similarity index 96% rename from java-util/src/main/java/io/druid/java/util/common/ISE.java rename to java-util/src/main/java/org/apache/druid/java/util/common/ISE.java index a2e762df9b14..512e7b594c6b 100644 --- a/java-util/src/main/java/io/druid/java/util/common/ISE.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/ISE.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common; +package org.apache.druid.java.util.common; /** */ diff --git a/java-util/src/main/java/io/druid/java/util/common/Intervals.java b/java-util/src/main/java/org/apache/druid/java/util/common/Intervals.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/Intervals.java rename to java-util/src/main/java/org/apache/druid/java/util/common/Intervals.java index 3e6efb8bd780..5502ff7b6eca 100644 --- a/java-util/src/main/java/io/druid/java/util/common/Intervals.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/Intervals.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common; +package org.apache.druid.java.util.common; import com.google.common.collect.ImmutableList; import org.joda.time.Interval; diff --git a/java-util/src/main/java/io/druid/java/util/common/JodaUtils.java b/java-util/src/main/java/org/apache/druid/java/util/common/JodaUtils.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/JodaUtils.java rename to java-util/src/main/java/org/apache/druid/java/util/common/JodaUtils.java index 01c04a30f08d..75998cd7d35e 100644 --- a/java-util/src/main/java/io/druid/java/util/common/JodaUtils.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/JodaUtils.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.java.util.common; +package org.apache.druid.java.util.common; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import io.druid.java.util.common.guava.Comparators; +import org.apache.druid.java.util.common.guava.Comparators; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/java-util/src/main/java/io/druid/java/util/common/MapUtils.java b/java-util/src/main/java/org/apache/druid/java/util/common/MapUtils.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/common/MapUtils.java rename to java-util/src/main/java/org/apache/druid/java/util/common/MapUtils.java index 335c944a82d5..7463744853fc 100644 --- a/java-util/src/main/java/io/druid/java/util/common/MapUtils.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/MapUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common; +package org.apache.druid.java.util.common; import java.util.Map; diff --git a/java-util/src/main/java/io/druid/java/util/common/MappedByteBufferHandler.java b/java-util/src/main/java/org/apache/druid/java/util/common/MappedByteBufferHandler.java similarity index 91% rename from java-util/src/main/java/io/druid/java/util/common/MappedByteBufferHandler.java rename to java-util/src/main/java/org/apache/druid/java/util/common/MappedByteBufferHandler.java index d41852c8592b..0b7be00b1e83 100644 --- a/java-util/src/main/java/io/druid/java/util/common/MappedByteBufferHandler.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/MappedByteBufferHandler.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.java.util.common; +package org.apache.druid.java.util.common; import java.nio.MappedByteBuffer; /** * Facilitates using try-with-resources with {@link MappedByteBuffer}s which don't implement {@link AutoCloseable}. * - *

This interface is a specialization of {@code io.druid.collections.ResourceHandler}. + *

This interface is a specialization of {@code org.apache.druid.collections.ResourceHandler}. * * @see FileUtils#map */ diff --git a/java-util/src/main/java/io/druid/java/util/common/Numbers.java b/java-util/src/main/java/org/apache/druid/java/util/common/Numbers.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/common/Numbers.java rename to java-util/src/main/java/org/apache/druid/java/util/common/Numbers.java index c6af8078ebfc..d3ccf267225e 100644 --- a/java-util/src/main/java/io/druid/java/util/common/Numbers.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/Numbers.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common; +package org.apache.druid.java.util.common; public final class Numbers { diff --git a/java-util/src/main/java/io/druid/java/util/common/Pair.java b/java-util/src/main/java/org/apache/druid/java/util/common/Pair.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/Pair.java rename to java-util/src/main/java/org/apache/druid/java/util/common/Pair.java index 213d84a88e1f..4b2acad6f1b9 100644 --- a/java-util/src/main/java/io/druid/java/util/common/Pair.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/Pair.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common; +package org.apache.druid.java.util.common; import javax.annotation.Nullable; import java.util.Objects; diff --git a/java-util/src/main/java/io/druid/java/util/common/RE.java b/java-util/src/main/java/org/apache/druid/java/util/common/RE.java similarity index 96% rename from java-util/src/main/java/io/druid/java/util/common/RE.java rename to java-util/src/main/java/org/apache/druid/java/util/common/RE.java index 54e6b9c2653b..f7a52a65c0b1 100644 --- a/java-util/src/main/java/io/druid/java/util/common/RE.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/RE.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common; +package org.apache.druid.java.util.common; /** */ diff --git a/java-util/src/main/java/io/druid/java/util/common/RetryUtils.java b/java-util/src/main/java/org/apache/druid/java/util/common/RetryUtils.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/common/RetryUtils.java rename to java-util/src/main/java/org/apache/druid/java/util/common/RetryUtils.java index bd8b4426d180..659835200a32 100644 --- a/java-util/src/main/java/io/druid/java/util/common/RetryUtils.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/RetryUtils.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.java.util.common; +package org.apache.druid.java.util.common; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.base.Throwables; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.logger.Logger; import javax.annotation.Nullable; import java.util.concurrent.ThreadLocalRandom; diff --git a/java-util/src/main/java/io/druid/java/util/common/StreamUtils.java b/java-util/src/main/java/org/apache/druid/java/util/common/StreamUtils.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/common/StreamUtils.java rename to java-util/src/main/java/org/apache/druid/java/util/common/StreamUtils.java index 89c7f1c9f869..3e4c08e91301 100644 --- a/java-util/src/main/java/io/druid/java/util/common/StreamUtils.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/StreamUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common; +package org.apache.druid.java.util.common; import com.google.common.base.Predicate; import com.google.common.base.Throwables; diff --git a/java-util/src/main/java/io/druid/java/util/common/StringUtils.java b/java-util/src/main/java/org/apache/druid/java/util/common/StringUtils.java similarity index 99% rename from java-util/src/main/java/io/druid/java/util/common/StringUtils.java rename to java-util/src/main/java/org/apache/druid/java/util/common/StringUtils.java index 7277aa7c7260..12a47ab79219 100644 --- a/java-util/src/main/java/io/druid/java/util/common/StringUtils.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/StringUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common; +package org.apache.druid.java.util.common; import com.google.common.base.Strings; import com.google.common.base.Throwables; diff --git a/java-util/src/main/java/io/druid/java/util/common/UOE.java b/java-util/src/main/java/org/apache/druid/java/util/common/UOE.java similarity index 95% rename from java-util/src/main/java/io/druid/java/util/common/UOE.java rename to java-util/src/main/java/org/apache/druid/java/util/common/UOE.java index 2e0cde23037f..c50db548a146 100644 --- a/java-util/src/main/java/io/druid/java/util/common/UOE.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/UOE.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common; +package org.apache.druid.java.util.common; /** */ diff --git a/java-util/src/main/java/io/druid/java/util/common/collect/Utils.java b/java-util/src/main/java/org/apache/druid/java/util/common/collect/Utils.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/collect/Utils.java rename to java-util/src/main/java/org/apache/druid/java/util/common/collect/Utils.java index 74f99e7a6ca8..bd5444aa78bb 100644 --- a/java-util/src/main/java/io/druid/java/util/common/collect/Utils.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/collect/Utils.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.collect; +package org.apache.druid.java.util.common.collect; import javax.annotation.Nullable; diff --git a/java-util/src/main/java/io/druid/java/util/common/concurrent/DummyExecutorService.java b/java-util/src/main/java/org/apache/druid/java/util/common/concurrent/DummyExecutorService.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/common/concurrent/DummyExecutorService.java rename to java-util/src/main/java/org/apache/druid/java/util/common/concurrent/DummyExecutorService.java index b9aca2cda0c9..adc64118a0d7 100644 --- a/java-util/src/main/java/io/druid/java/util/common/concurrent/DummyExecutorService.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/concurrent/DummyExecutorService.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.concurrent; +package org.apache.druid.java.util.common.concurrent; import java.util.Collection; import java.util.Collections; diff --git a/java-util/src/main/java/io/druid/java/util/common/concurrent/Execs.java b/java-util/src/main/java/org/apache/druid/java/util/common/concurrent/Execs.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/common/concurrent/Execs.java rename to java-util/src/main/java/org/apache/druid/java/util/common/concurrent/Execs.java index 3e0ef2effbfa..e69e661108ec 100644 --- a/java-util/src/main/java/io/druid/java/util/common/concurrent/Execs.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/concurrent/Execs.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.concurrent; +package org.apache.druid.java.util.common.concurrent; import com.google.common.base.Preconditions; import com.google.common.base.Strings; diff --git a/java-util/src/main/java/io/druid/java/util/common/concurrent/ExecutorServiceConfig.java b/java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ExecutorServiceConfig.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/concurrent/ExecutorServiceConfig.java rename to java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ExecutorServiceConfig.java index c05c959a2774..acfe8ca29f5b 100644 --- a/java-util/src/main/java/io/druid/java/util/common/concurrent/ExecutorServiceConfig.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ExecutorServiceConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.concurrent; +package org.apache.druid.java.util.common.concurrent; import org.skife.config.Config; import org.skife.config.Default; diff --git a/java-util/src/main/java/io/druid/java/util/common/concurrent/ExecutorServices.java b/java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ExecutorServices.java similarity index 92% rename from java-util/src/main/java/io/druid/java/util/common/concurrent/ExecutorServices.java rename to java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ExecutorServices.java index b82a8d9067a3..ced354e7aaa9 100644 --- a/java-util/src/main/java/io/druid/java/util/common/concurrent/ExecutorServices.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ExecutorServices.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.java.util.common.concurrent; +package org.apache.druid.java.util.common.concurrent; import com.google.common.base.Throwables; -import io.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; import java.util.concurrent.ExecutorService; diff --git a/java-util/src/main/java/io/druid/java/util/common/concurrent/ListenableFutures.java b/java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ListenableFutures.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/concurrent/ListenableFutures.java rename to java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ListenableFutures.java index 5a151dc4213a..1722e4a9c663 100644 --- a/java-util/src/main/java/io/druid/java/util/common/concurrent/ListenableFutures.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ListenableFutures.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.concurrent; +package org.apache.druid.java.util.common.concurrent; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; diff --git a/java-util/src/main/java/io/druid/java/util/common/concurrent/ScheduledExecutorFactory.java b/java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutorFactory.java similarity index 94% rename from java-util/src/main/java/io/druid/java/util/common/concurrent/ScheduledExecutorFactory.java rename to java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutorFactory.java index 002e25893328..c0f56d359ad0 100644 --- a/java-util/src/main/java/io/druid/java/util/common/concurrent/ScheduledExecutorFactory.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutorFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.concurrent; +package org.apache.druid.java.util.common.concurrent; import java.util.concurrent.ScheduledExecutorService; diff --git a/java-util/src/main/java/io/druid/java/util/common/concurrent/ScheduledExecutors.java b/java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutors.java similarity index 96% rename from java-util/src/main/java/io/druid/java/util/common/concurrent/ScheduledExecutors.java rename to java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutors.java index b2436fde2e81..5368faa699d4 100644 --- a/java-util/src/main/java/io/druid/java/util/common/concurrent/ScheduledExecutors.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutors.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.java.util.common.concurrent; +package org.apache.druid.java.util.common.concurrent; import com.google.common.util.concurrent.ThreadFactoryBuilder; -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 org.joda.time.Duration; import java.util.concurrent.Callable; diff --git a/java-util/src/main/java/io/druid/java/util/common/config/Config.java b/java-util/src/main/java/org/apache/druid/java/util/common/config/Config.java similarity index 95% rename from java-util/src/main/java/io/druid/java/util/common/config/Config.java rename to java-util/src/main/java/org/apache/druid/java/util/common/config/Config.java index ae9eb58f6652..e5a7c96275f0 100644 --- a/java-util/src/main/java/io/druid/java/util/common/config/Config.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/config/Config.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.config; +package org.apache.druid.java.util.common.config; import org.skife.config.ConfigurationObjectFactory; diff --git a/java-util/src/main/java/io/druid/java/util/common/config/DurationCoercible.java b/java-util/src/main/java/org/apache/druid/java/util/common/config/DurationCoercible.java similarity index 96% rename from java-util/src/main/java/io/druid/java/util/common/config/DurationCoercible.java rename to java-util/src/main/java/org/apache/druid/java/util/common/config/DurationCoercible.java index 4b779674667e..cea559f055a7 100644 --- a/java-util/src/main/java/io/druid/java/util/common/config/DurationCoercible.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/config/DurationCoercible.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.config; +package org.apache.druid.java.util.common.config; import org.joda.time.Duration; import org.joda.time.Period; diff --git a/java-util/src/main/java/io/druid/java/util/common/granularity/AllGranularity.java b/java-util/src/main/java/org/apache/druid/java/util/common/granularity/AllGranularity.java similarity index 95% rename from java-util/src/main/java/io/druid/java/util/common/granularity/AllGranularity.java rename to java-util/src/main/java/org/apache/druid/java/util/common/granularity/AllGranularity.java index 7fbf1004afa3..ce6a7966b3ac 100644 --- a/java-util/src/main/java/io/druid/java/util/common/granularity/AllGranularity.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/granularity/AllGranularity.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.java.util.common.granularity; +package org.apache.druid.java.util.common.granularity; import com.google.common.collect.ImmutableList; -import io.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.DateTimes; import org.joda.time.DateTime; import org.joda.time.Interval; import org.joda.time.format.DateTimeFormatter; diff --git a/java-util/src/main/java/io/druid/java/util/common/granularity/DurationGranularity.java b/java-util/src/main/java/org/apache/druid/java/util/common/granularity/DurationGranularity.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/granularity/DurationGranularity.java rename to java-util/src/main/java/org/apache/druid/java/util/common/granularity/DurationGranularity.java index 7d9552950d29..a48c071b5d22 100644 --- a/java-util/src/main/java/io/druid/java/util/common/granularity/DurationGranularity.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/granularity/DurationGranularity.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.java.util.common.granularity; +package org.apache.druid.java.util.common.granularity; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.DateTimes; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormatter; diff --git a/java-util/src/main/java/io/druid/java/util/common/granularity/Granularities.java b/java-util/src/main/java/org/apache/druid/java/util/common/granularity/Granularities.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/granularity/Granularities.java rename to java-util/src/main/java/org/apache/druid/java/util/common/granularity/Granularities.java index 60aa88053d49..fcc4afffa762 100644 --- a/java-util/src/main/java/io/druid/java/util/common/granularity/Granularities.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/granularity/Granularities.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.granularity; +package org.apache.druid.java.util.common.granularity; /** * This class was created b/c sometimes static initializers of a class that use a subclass can deadlock. diff --git a/java-util/src/main/java/io/druid/java/util/common/granularity/Granularity.java b/java-util/src/main/java/org/apache/druid/java/util/common/granularity/Granularity.java similarity index 96% rename from java-util/src/main/java/io/druid/java/util/common/granularity/Granularity.java rename to java-util/src/main/java/org/apache/druid/java/util/common/granularity/Granularity.java index 128f80d7dd27..419ceae67e1d 100644 --- a/java-util/src/main/java/io/druid/java/util/common/granularity/Granularity.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/granularity/Granularity.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.java.util.common.granularity; +package org.apache.druid.java.util.common.granularity; import com.fasterxml.jackson.annotation.JsonCreator; import com.google.common.collect.Lists; import com.google.common.primitives.Longs; -import io.druid.java.util.common.Cacheable; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.Cacheable; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.StringUtils; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.Interval; diff --git a/java-util/src/main/java/io/druid/java/util/common/granularity/GranularityType.java b/java-util/src/main/java/org/apache/druid/java/util/common/granularity/GranularityType.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/common/granularity/GranularityType.java rename to java-util/src/main/java/org/apache/druid/java/util/common/granularity/GranularityType.java index 897d988710b9..ae3a277fa00e 100644 --- a/java-util/src/main/java/io/druid/java/util/common/granularity/GranularityType.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/granularity/GranularityType.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.java.util.common.granularity; +package org.apache.druid.java.util.common.granularity; -import io.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.IAE; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.Period; diff --git a/java-util/src/main/java/io/druid/java/util/common/granularity/NoneGranularity.java b/java-util/src/main/java/org/apache/druid/java/util/common/granularity/NoneGranularity.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/granularity/NoneGranularity.java rename to java-util/src/main/java/org/apache/druid/java/util/common/granularity/NoneGranularity.java index 37bfaaa43cc9..f38241383c10 100644 --- a/java-util/src/main/java/io/druid/java/util/common/granularity/NoneGranularity.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/granularity/NoneGranularity.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.granularity; +package org.apache.druid.java.util.common.granularity; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormatter; diff --git a/java-util/src/main/java/io/druid/java/util/common/granularity/PeriodGranularity.java b/java-util/src/main/java/org/apache/druid/java/util/common/granularity/PeriodGranularity.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/common/granularity/PeriodGranularity.java rename to java-util/src/main/java/org/apache/druid/java/util/common/granularity/PeriodGranularity.java index 63cc7c298470..58741ef08b8d 100644 --- a/java-util/src/main/java/io/druid/java/util/common/granularity/PeriodGranularity.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/granularity/PeriodGranularity.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.granularity; +package org.apache.druid.java.util.common.granularity; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -27,9 +27,9 @@ import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.jsontype.TypeSerializer; import com.google.common.base.Preconditions; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.StringUtils; import org.joda.time.Chronology; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/Accumulator.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/Accumulator.java similarity index 95% rename from java-util/src/main/java/io/druid/java/util/common/guava/Accumulator.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/Accumulator.java index b3f4f8bc49cf..7e3578481050 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/Accumulator.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/Accumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; /** */ diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/Accumulators.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/Accumulators.java similarity index 95% rename from java-util/src/main/java/io/druid/java/util/common/guava/Accumulators.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/Accumulators.java index 4bc288bb29f8..8a47398c4917 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/Accumulators.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/Accumulators.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import java.util.List; diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/BaseSequence.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/BaseSequence.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/common/guava/BaseSequence.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/BaseSequence.java index 33e71e917326..a11d742342f0 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/BaseSequence.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/BaseSequence.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import java.io.Closeable; import java.util.Iterator; diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/CloseQuietly.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/CloseQuietly.java similarity index 92% rename from java-util/src/main/java/io/druid/java/util/common/guava/CloseQuietly.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/CloseQuietly.java index 46bc686a06f4..8b4807b90455 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/CloseQuietly.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/CloseQuietly.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.logger.Logger; import java.io.Closeable; import java.io.IOException; diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/Comparators.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/Comparators.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/common/guava/Comparators.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/Comparators.java index 02ac326a1631..500d5046bf11 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/Comparators.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/Comparators.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import com.google.common.collect.Ordering; import com.google.common.primitives.Longs; diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/ConcatSequence.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/ConcatSequence.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/common/guava/ConcatSequence.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/ConcatSequence.java index 0049860a171f..62f9f99eda3d 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/ConcatSequence.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/ConcatSequence.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import com.google.common.base.Throwables; diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/DelegatingYieldingAccumulator.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/DelegatingYieldingAccumulator.java similarity index 96% rename from java-util/src/main/java/io/druid/java/util/common/guava/DelegatingYieldingAccumulator.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/DelegatingYieldingAccumulator.java index 6c600639aa08..2f21e97b5b33 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/DelegatingYieldingAccumulator.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/DelegatingYieldingAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; /** */ diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/DroppingIterable.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/DroppingIterable.java similarity index 96% rename from java-util/src/main/java/io/druid/java/util/common/guava/DroppingIterable.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/DroppingIterable.java index 39d5fbba0c82..172036bc2f73 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/DroppingIterable.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/DroppingIterable.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import java.util.Iterator; diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/DroppingIterator.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/DroppingIterator.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/guava/DroppingIterator.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/DroppingIterator.java index 842dacc95067..ffc1b12058f8 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/DroppingIterator.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/DroppingIterator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import java.util.Iterator; diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/ExecuteWhenDoneYielder.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/ExecuteWhenDoneYielder.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/guava/ExecuteWhenDoneYielder.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/ExecuteWhenDoneYielder.java index 25a0af2380ca..dd6d7cad0814 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/ExecuteWhenDoneYielder.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/ExecuteWhenDoneYielder.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import java.io.IOException; import java.util.concurrent.Executor; diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/FilteredSequence.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/FilteredSequence.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/common/guava/FilteredSequence.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/FilteredSequence.java index 1e7e1a92ee13..3b004c03861b 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/FilteredSequence.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/FilteredSequence.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import com.google.common.base.Predicate; diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/FilteringAccumulator.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/FilteringAccumulator.java similarity index 96% rename from java-util/src/main/java/io/druid/java/util/common/guava/FilteringAccumulator.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/FilteringAccumulator.java index afc5d6cbffd9..87b5b274510a 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/FilteringAccumulator.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/FilteringAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import com.google.common.base.Predicate; diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/FilteringYieldingAccumulator.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/FilteringYieldingAccumulator.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/guava/FilteringYieldingAccumulator.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/FilteringYieldingAccumulator.java index 17be269e4849..164af6528236 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/FilteringYieldingAccumulator.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/FilteringYieldingAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import com.google.common.base.Predicate; /** diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/FunctionalIterable.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/FunctionalIterable.java similarity index 93% rename from java-util/src/main/java/io/druid/java/util/common/guava/FunctionalIterable.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/FunctionalIterable.java index aa2b036c5fc5..606ac29f3604 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/FunctionalIterable.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/FunctionalIterable.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; -import io.druid.java.util.common.guava.nary.TrinaryFn; -import io.druid.java.util.common.guava.nary.TrinaryTransformIterable; +import org.apache.druid.java.util.common.guava.nary.TrinaryFn; +import org.apache.druid.java.util.common.guava.nary.TrinaryTransformIterable; import java.util.Iterator; diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/FunctionalIterator.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/FunctionalIterator.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/guava/FunctionalIterator.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/FunctionalIterator.java index 1f90d9d3f85a..fa06f25ac1bc 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/FunctionalIterator.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/FunctionalIterator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import com.google.common.base.Function; import com.google.common.base.Predicate; diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/LazySequence.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/LazySequence.java similarity index 96% rename from java-util/src/main/java/io/druid/java/util/common/guava/LazySequence.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/LazySequence.java index d275e3f27940..6529d139a367 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/LazySequence.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/LazySequence.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import com.google.common.base.Supplier; diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/LimitedSequence.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/LimitedSequence.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/common/guava/LimitedSequence.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/LimitedSequence.java index 4b8f8272ed6a..9f76e46c8d31 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/LimitedSequence.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/LimitedSequence.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import com.google.common.base.Preconditions; diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/MappedSequence.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/MappedSequence.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/guava/MappedSequence.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/MappedSequence.java index 3209c61d4076..dfc0494706f4 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/MappedSequence.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/MappedSequence.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import java.util.function.Function; diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/MappingAccumulator.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/MappingAccumulator.java similarity index 96% rename from java-util/src/main/java/io/druid/java/util/common/guava/MappingAccumulator.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/MappingAccumulator.java index 8a5ac80673e1..0acb74a7c243 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/MappingAccumulator.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/MappingAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import java.util.function.Function; diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/MappingYieldingAccumulator.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/MappingYieldingAccumulator.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/guava/MappingYieldingAccumulator.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/MappingYieldingAccumulator.java index 75e5cf65a51b..428dc3dfab43 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/MappingYieldingAccumulator.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/MappingYieldingAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import java.util.function.Function; diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/MergeIterable.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/MergeIterable.java similarity index 96% rename from java-util/src/main/java/io/druid/java/util/common/guava/MergeIterable.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/MergeIterable.java index 8e0439305af6..f57d31b1849b 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/MergeIterable.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/MergeIterable.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import com.google.common.collect.Lists; diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/MergeIterator.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/MergeIterator.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/guava/MergeIterator.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/MergeIterator.java index b7f4b4201382..c12ada1fc4b4 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/MergeIterator.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/MergeIterator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import com.google.common.collect.Iterators; import com.google.common.collect.PeekingIterator; diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/MergeSequence.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/MergeSequence.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/guava/MergeSequence.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/MergeSequence.java index 9e86f5464713..287fc62e289c 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/MergeSequence.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/MergeSequence.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import com.google.common.base.Function; import com.google.common.base.Throwables; import com.google.common.collect.Ordering; -import io.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.io.Closer; import java.io.IOException; import java.util.PriorityQueue; diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/Sequence.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/Sequence.java similarity index 95% rename from java-util/src/main/java/io/druid/java/util/common/guava/Sequence.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/Sequence.java index 3910a215c282..69fe1909970d 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/Sequence.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/Sequence.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import com.google.common.collect.Ordering; @@ -36,7 +36,7 @@ * methods get called and other resources get cleaned up whenever processing is complete. Without this inversion * it is very easy to unintentionally leak resources when iterating over something that is backed by a resource. *

- * Sequences also expose {#see io.druid.java.util.common.guava.Yielder} Yielder objects which allow you to implement a + * Sequences also expose {#see org.apache.druid.java.util.common.guava.Yielder} Yielder objects which allow you to implement a * continuation over the Sequence. Yielder do not offer the same guarantees of automatic resource management * as the accumulate method, but they are Closeable and will do the proper cleanup when close() is called on them. */ diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/SequenceWrapper.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/SequenceWrapper.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/common/guava/SequenceWrapper.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/SequenceWrapper.java index 9eaabb5edae4..8c2a72a2b6e6 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/SequenceWrapper.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/SequenceWrapper.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import com.google.common.base.Supplier; diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/Sequences.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/Sequences.java similarity index 99% rename from java-util/src/main/java/io/druid/java/util/common/guava/Sequences.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/Sequences.java index 491fffb179aa..2bab97141d5d 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/Sequences.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/Sequences.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import com.google.common.base.Function; import com.google.common.base.Preconditions; diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/WrappingSequence.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/WrappingSequence.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/common/guava/WrappingSequence.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/WrappingSequence.java index de41cc0e39d5..2fe43bfa6785 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/WrappingSequence.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/WrappingSequence.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import com.google.common.base.Preconditions; import com.google.common.base.Supplier; diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/WrappingYielder.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/WrappingYielder.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/common/guava/WrappingYielder.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/WrappingYielder.java index ad91e038051a..ed442db7ca97 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/WrappingYielder.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/WrappingYielder.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import com.google.common.base.Supplier; import com.google.common.base.Throwables; diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/Yielder.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/Yielder.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/common/guava/Yielder.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/Yielder.java index 61004295b672..6a684cdd0c86 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/Yielder.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/Yielder.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import java.io.Closeable; diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/Yielders.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/Yielders.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/guava/Yielders.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/Yielders.java index 00f859eb06d6..1d7e2cd915be 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/Yielders.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/Yielders.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import com.google.common.base.Throwables; diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/YieldingAccumulator.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulator.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/guava/YieldingAccumulator.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulator.java index ca0a08942522..dbdf5f1d7832 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/YieldingAccumulator.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; /** * A YieldingAccumulator is used along with a Yielder in order to replicate continuations in Java. I'm still not sure diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/YieldingAccumulators.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulators.java similarity index 96% rename from java-util/src/main/java/io/druid/java/util/common/guava/YieldingAccumulators.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulators.java index 0e2d9d5b2e49..a00562d9909b 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/YieldingAccumulators.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulators.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; /** */ diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/YieldingSequenceBase.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/YieldingSequenceBase.java similarity index 96% rename from java-util/src/main/java/io/druid/java/util/common/guava/YieldingSequenceBase.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/YieldingSequenceBase.java index b719e438f497..27e085763b5d 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/YieldingSequenceBase.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/YieldingSequenceBase.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; /** * A Sequence that is based entirely on the Yielder implementation. diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/nary/BinaryFn.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/BinaryFn.java similarity index 94% rename from java-util/src/main/java/io/druid/java/util/common/guava/nary/BinaryFn.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/BinaryFn.java index 31c7a467678d..a89125a948a8 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/nary/BinaryFn.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/BinaryFn.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava.nary; +package org.apache.druid.java.util.common.guava.nary; /** */ diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/nary/SortedMergeIterator.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/SortedMergeIterator.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/common/guava/nary/SortedMergeIterator.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/SortedMergeIterator.java index f53f4c2e9b8a..7c840f079b7c 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/nary/SortedMergeIterator.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/SortedMergeIterator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava.nary; +package org.apache.druid.java.util.common.guava.nary; import com.google.common.collect.Iterators; import com.google.common.collect.PeekingIterator; diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/nary/TrinaryFn.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryFn.java similarity index 94% rename from java-util/src/main/java/io/druid/java/util/common/guava/nary/TrinaryFn.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryFn.java index 2c910d6a15a5..4abce6c256b3 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/nary/TrinaryFn.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryFn.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava.nary; +package org.apache.druid.java.util.common.guava.nary; /** */ diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/nary/TrinaryTransformIterable.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryTransformIterable.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/guava/nary/TrinaryTransformIterable.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryTransformIterable.java index bb99f22e1a2d..9d45f785e602 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/nary/TrinaryTransformIterable.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryTransformIterable.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava.nary; +package org.apache.druid.java.util.common.guava.nary; import java.util.Iterator; diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/nary/TrinaryTransformIterator.java b/java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryTransformIterator.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/guava/nary/TrinaryTransformIterator.java rename to java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryTransformIterator.java index 2f5f54f0b2d4..f46303478dc6 100644 --- a/java-util/src/main/java/io/druid/java/util/common/guava/nary/TrinaryTransformIterator.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryTransformIterator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava.nary; +package org.apache.druid.java.util.common.guava.nary; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/java-util/src/main/java/io/druid/java/util/common/io/Closer.java b/java-util/src/main/java/org/apache/druid/java/util/common/io/Closer.java similarity index 99% rename from java-util/src/main/java/io/druid/java/util/common/io/Closer.java rename to java-util/src/main/java/org/apache/druid/java/util/common/io/Closer.java index 4794bcd1ba47..5bba0dbd1877 100644 --- a/java-util/src/main/java/io/druid/java/util/common/io/Closer.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/io/Closer.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.io; +package org.apache.druid.java.util.common.io; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; diff --git a/java-util/src/main/java/io/druid/java/util/common/io/NativeIO.java b/java-util/src/main/java/org/apache/druid/java/util/common/io/NativeIO.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/common/io/NativeIO.java rename to java-util/src/main/java/org/apache/druid/java/util/common/io/NativeIO.java index 7be6899bbbf1..a9816df542e7 100644 --- a/java-util/src/main/java/io/druid/java/util/common/io/NativeIO.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/io/NativeIO.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.io; +package org.apache.druid.java.util.common.io; import java.io.File; import java.io.FileDescriptor; @@ -30,7 +30,7 @@ import com.sun.jna.LastErrorException; import com.sun.jna.Native; import com.sun.jna.Platform; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.logger.Logger; /** * Native I/O operations in order to minimize cache impact. diff --git a/java-util/src/main/java/io/druid/java/util/common/io/smoosh/FileSmoosher.java b/java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/FileSmoosher.java similarity index 96% rename from java-util/src/main/java/io/druid/java/util/common/io/smoosh/FileSmoosher.java rename to java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/FileSmoosher.java index dbb47d444e13..887bf9e47eda 100644 --- a/java-util/src/main/java/io/druid/java/util/common/io/smoosh/FileSmoosher.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/FileSmoosher.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.java.util.common.io.smoosh; +package org.apache.druid.java.util.common.io.smoosh; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.primitives.Ints; -import io.druid.java.util.common.FileUtils; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.IOE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.MappedByteBufferHandler; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.FileUtils; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.IOE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.MappedByteBufferHandler; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.logger.Logger; import java.io.BufferedWriter; import java.io.Closeable; diff --git a/java-util/src/main/java/io/druid/java/util/common/io/smoosh/Metadata.java b/java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/Metadata.java similarity index 96% rename from java-util/src/main/java/io/druid/java/util/common/io/smoosh/Metadata.java rename to java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/Metadata.java index 2ce672f209e0..4f395319ea40 100644 --- a/java-util/src/main/java/io/druid/java/util/common/io/smoosh/Metadata.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/Metadata.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.io.smoosh; +package org.apache.druid.java.util.common.io.smoosh; /** */ diff --git a/java-util/src/main/java/io/druid/java/util/common/io/smoosh/Smoosh.java b/java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/Smoosh.java similarity index 95% rename from java-util/src/main/java/io/druid/java/util/common/io/smoosh/Smoosh.java rename to java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/Smoosh.java index b12472aa3852..749d360cc9af 100644 --- a/java-util/src/main/java/io/druid/java/util/common/io/smoosh/Smoosh.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/Smoosh.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.io.smoosh; +package org.apache.druid.java.util.common.io.smoosh; import java.io.File; import java.io.IOException; diff --git a/java-util/src/main/java/io/druid/java/util/common/io/smoosh/SmooshedFileMapper.java b/java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/SmooshedFileMapper.java similarity index 96% rename from java-util/src/main/java/io/druid/java/util/common/io/smoosh/SmooshedFileMapper.java rename to java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/SmooshedFileMapper.java index b91778f29869..763734798f60 100644 --- a/java-util/src/main/java/io/druid/java/util/common/io/smoosh/SmooshedFileMapper.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/SmooshedFileMapper.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.java.util.common.io.smoosh; +package org.apache.druid.java.util.common.io.smoosh; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.io.Closeables; import com.google.common.io.Files; -import io.druid.java.util.common.ByteBufferUtils; -import io.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.ByteBufferUtils; +import org.apache.druid.java.util.common.ISE; import java.io.BufferedReader; import java.io.Closeable; diff --git a/java-util/src/main/java/io/druid/java/util/common/io/smoosh/SmooshedWriter.java b/java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/SmooshedWriter.java similarity index 94% rename from java-util/src/main/java/io/druid/java/util/common/io/smoosh/SmooshedWriter.java rename to java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/SmooshedWriter.java index 348a35c559b7..f7411cfca5cd 100644 --- a/java-util/src/main/java/io/druid/java/util/common/io/smoosh/SmooshedWriter.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/SmooshedWriter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.io.smoosh; +package org.apache.druid.java.util.common.io.smoosh; import java.io.Closeable; import java.nio.channels.GatheringByteChannel; diff --git a/java-util/src/main/java/io/druid/java/util/common/jackson/JacksonUtils.java b/java-util/src/main/java/org/apache/druid/java/util/common/jackson/JacksonUtils.java similarity index 95% rename from java-util/src/main/java/io/druid/java/util/common/jackson/JacksonUtils.java rename to java-util/src/main/java/org/apache/druid/java/util/common/jackson/JacksonUtils.java index 7f823eba18dc..ee8bf660bd27 100644 --- a/java-util/src/main/java/io/druid/java/util/common/jackson/JacksonUtils.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/jackson/JacksonUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.jackson; +package org.apache.druid.java.util.common.jackson; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/java-util/src/main/java/io/druid/java/util/common/lifecycle/Lifecycle.java b/java-util/src/main/java/org/apache/druid/java/util/common/lifecycle/Lifecycle.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/lifecycle/Lifecycle.java rename to java-util/src/main/java/org/apache/druid/java/util/common/lifecycle/Lifecycle.java index 419da8254c5d..3cb76fa0e279 100644 --- a/java-util/src/main/java/io/druid/java/util/common/lifecycle/Lifecycle.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/lifecycle/Lifecycle.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.java.util.common.lifecycle; +package org.apache.druid.java.util.common.lifecycle; import com.google.common.collect.Lists; -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.io.Closeable; import java.lang.annotation.Annotation; @@ -273,7 +273,7 @@ public void addMaybeStartHandler(Handler handler, Stage stage) throws Exception { if (!startStopLock.tryLock()) { // (*) This check is why the state should be changed before startStopLock.lock() in stop(). This check allows to - // spot wrong use of Lifecycle instead of entering deadlock, like https://github.com/druid-io/druid/issues/3579. + // spot wrong use of Lifecycle instead of entering deadlock, like https://github.com/apache/incubator-druid/issues/3579. if (state.get().equals(State.STOP)) { throw new ISE("Cannot add a handler in the process of Lifecycle stopping"); } @@ -401,7 +401,7 @@ public void start() throws Exception for (Method method : o.getClass().getMethods()) { boolean doStart = false; for (Annotation annotation : method.getAnnotations()) { - if ("io.druid.java.util.common.lifecycle.LifecycleStart".equals(annotation.annotationType() + if ("org.apache.druid.java.util.common.lifecycle.LifecycleStart".equals(annotation.annotationType() .getCanonicalName())) { doStart = true; break; @@ -420,7 +420,7 @@ public void stop() for (Method method : o.getClass().getMethods()) { boolean doStop = false; for (Annotation annotation : method.getAnnotations()) { - if ("io.druid.java.util.common.lifecycle.LifecycleStop".equals(annotation.annotationType() + if ("org.apache.druid.java.util.common.lifecycle.LifecycleStop".equals(annotation.annotationType() .getCanonicalName())) { doStop = true; break; diff --git a/java-util/src/main/java/io/druid/java/util/common/lifecycle/LifecycleStart.java b/java-util/src/main/java/org/apache/druid/java/util/common/lifecycle/LifecycleStart.java similarity index 95% rename from java-util/src/main/java/io/druid/java/util/common/lifecycle/LifecycleStart.java rename to java-util/src/main/java/org/apache/druid/java/util/common/lifecycle/LifecycleStart.java index f1a6d67278b3..2fe26d535c17 100644 --- a/java-util/src/main/java/io/druid/java/util/common/lifecycle/LifecycleStart.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/lifecycle/LifecycleStart.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.lifecycle; +package org.apache.druid.java.util.common.lifecycle; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/java-util/src/main/java/io/druid/java/util/common/lifecycle/LifecycleStop.java b/java-util/src/main/java/org/apache/druid/java/util/common/lifecycle/LifecycleStop.java similarity index 95% rename from java-util/src/main/java/io/druid/java/util/common/lifecycle/LifecycleStop.java rename to java-util/src/main/java/org/apache/druid/java/util/common/lifecycle/LifecycleStop.java index 065ac978c001..23bbb224a4ed 100644 --- a/java-util/src/main/java/io/druid/java/util/common/lifecycle/LifecycleStop.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/lifecycle/LifecycleStop.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.lifecycle; +package org.apache.druid.java.util.common.lifecycle; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/java-util/src/main/java/io/druid/java/util/common/logger/Logger.java b/java-util/src/main/java/org/apache/druid/java/util/common/logger/Logger.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/logger/Logger.java rename to java-util/src/main/java/org/apache/druid/java/util/common/logger/Logger.java index 36263737cec4..d5aa17ada9c5 100644 --- a/java-util/src/main/java/io/druid/java/util/common/logger/Logger.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/logger/Logger.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.java.util.common.logger; +package org.apache.druid.java.util.common.logger; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import org.slf4j.LoggerFactory; /** diff --git a/java-util/src/main/java/io/druid/java/util/common/parsers/AbstractFlatTextFormatParser.java b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/AbstractFlatTextFormatParser.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/parsers/AbstractFlatTextFormatParser.java rename to java-util/src/main/java/org/apache/druid/java/util/common/parsers/AbstractFlatTextFormatParser.java index 673981afce79..9039106ff9d6 100644 --- a/java-util/src/main/java/io/druid/java/util/common/parsers/AbstractFlatTextFormatParser.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/AbstractFlatTextFormatParser.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.java.util.common.parsers; +package org.apache.druid.java.util.common.parsers; import com.google.common.base.Function; import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import io.druid.java.util.common.collect.Utils; +import org.apache.druid.java.util.common.collect.Utils; import javax.annotation.Nullable; import java.io.IOException; diff --git a/java-util/src/main/java/io/druid/java/util/common/parsers/CSVParser.java b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/CSVParser.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/parsers/CSVParser.java rename to java-util/src/main/java/org/apache/druid/java/util/common/parsers/CSVParser.java index 3fd85b8611d3..41c2d18226b9 100644 --- a/java-util/src/main/java/io/druid/java/util/common/parsers/CSVParser.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/CSVParser.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.parsers; +package org.apache.druid.java.util.common.parsers; import com.google.common.annotations.VisibleForTesting; diff --git a/java-util/src/main/java/io/druid/java/util/common/parsers/CloseableIterator.java b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/CloseableIterator.java similarity index 94% rename from java-util/src/main/java/io/druid/java/util/common/parsers/CloseableIterator.java rename to java-util/src/main/java/org/apache/druid/java/util/common/parsers/CloseableIterator.java index 02063c0edec2..b9164b2b3d4e 100644 --- a/java-util/src/main/java/io/druid/java/util/common/parsers/CloseableIterator.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/CloseableIterator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.parsers; +package org.apache.druid.java.util.common.parsers; import java.io.Closeable; import java.util.Iterator; diff --git a/java-util/src/main/java/io/druid/java/util/common/parsers/DelimitedParser.java b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/DelimitedParser.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/parsers/DelimitedParser.java rename to java-util/src/main/java/org/apache/druid/java/util/common/parsers/DelimitedParser.java index 640a390bd732..0953fdc27536 100644 --- a/java-util/src/main/java/io/druid/java/util/common/parsers/DelimitedParser.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/DelimitedParser.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.parsers; +package org.apache.druid.java.util.common.parsers; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; diff --git a/java-util/src/main/java/io/druid/java/util/common/parsers/JSONFlattenerMaker.java b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONFlattenerMaker.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/parsers/JSONFlattenerMaker.java rename to java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONFlattenerMaker.java index 08a98e7fe4be..805dc540b1da 100644 --- a/java-util/src/main/java/io/druid/java/util/common/parsers/JSONFlattenerMaker.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONFlattenerMaker.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.parsers; +package org.apache.druid.java.util.common.parsers; import com.fasterxml.jackson.databind.JsonNode; import com.google.common.collect.FluentIterable; @@ -26,7 +26,7 @@ import com.jayway.jsonpath.Option; import com.jayway.jsonpath.spi.json.JacksonJsonNodeJsonProvider; import com.jayway.jsonpath.spi.mapper.JacksonMappingProvider; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import net.thisptr.jackson.jq.JsonQuery; import net.thisptr.jackson.jq.exception.JsonQueryException; diff --git a/java-util/src/main/java/io/druid/java/util/common/parsers/JSONPathFieldSpec.java b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldSpec.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/common/parsers/JSONPathFieldSpec.java rename to java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldSpec.java index 6978ac218494..3173be73666e 100644 --- a/java-util/src/main/java/io/druid/java/util/common/parsers/JSONPathFieldSpec.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldSpec.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.parsers; +package org.apache.druid.java.util.common.parsers; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/java-util/src/main/java/io/druid/java/util/common/parsers/JSONPathFieldType.java b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldType.java similarity index 92% rename from java-util/src/main/java/io/druid/java/util/common/parsers/JSONPathFieldType.java rename to java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldType.java index b8be4d7118db..de504c97af44 100644 --- a/java-util/src/main/java/io/druid/java/util/common/parsers/JSONPathFieldType.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldType.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.java.util.common.parsers; +package org.apache.druid.java.util.common.parsers; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; public enum JSONPathFieldType { diff --git a/java-util/src/main/java/io/druid/java/util/common/parsers/JSONPathParser.java b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathParser.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/parsers/JSONPathParser.java rename to java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathParser.java index ea2e4718dfc0..1adfda7ed4a2 100644 --- a/java-util/src/main/java/io/druid/java/util/common/parsers/JSONPathParser.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathParser.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.parsers; +package org.apache.druid.java.util.common.parsers; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/java-util/src/main/java/io/druid/java/util/common/parsers/JSONPathSpec.java b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathSpec.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/parsers/JSONPathSpec.java rename to java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathSpec.java index d757ab182589..d6289c32a513 100644 --- a/java-util/src/main/java/io/druid/java/util/common/parsers/JSONPathSpec.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathSpec.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.parsers; +package org.apache.druid.java.util.common.parsers; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/java-util/src/main/java/io/druid/java/util/common/parsers/JSONToLowerParser.java b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONToLowerParser.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/parsers/JSONToLowerParser.java rename to java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONToLowerParser.java index faedc86433ed..a3d8f6776175 100644 --- a/java-util/src/main/java/io/druid/java/util/common/parsers/JSONToLowerParser.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONToLowerParser.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.parsers; +package org.apache.druid.java.util.common.parsers; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -25,7 +25,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import java.nio.charset.CharsetEncoder; import java.nio.charset.StandardCharsets; diff --git a/java-util/src/main/java/io/druid/java/util/common/parsers/JavaScriptParser.java b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/JavaScriptParser.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/common/parsers/JavaScriptParser.java rename to java-util/src/main/java/org/apache/druid/java/util/common/parsers/JavaScriptParser.java index e2bbeaaf372c..ada4ba4250e2 100644 --- a/java-util/src/main/java/io/druid/java/util/common/parsers/JavaScriptParser.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/JavaScriptParser.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.parsers; +package org.apache.druid.java.util.common.parsers; import com.google.common.base.Function; import org.mozilla.javascript.Context; diff --git a/java-util/src/main/java/io/druid/java/util/common/parsers/ObjectFlattener.java b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlattener.java similarity index 94% rename from java-util/src/main/java/io/druid/java/util/common/parsers/ObjectFlattener.java rename to java-util/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlattener.java index 88de5071f55c..ae674c84e95e 100644 --- a/java-util/src/main/java/io/druid/java/util/common/parsers/ObjectFlattener.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlattener.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.parsers; +package org.apache.druid.java.util.common.parsers; import java.util.Map; diff --git a/java-util/src/main/java/io/druid/java/util/common/parsers/ObjectFlatteners.java b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlatteners.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/parsers/ObjectFlatteners.java rename to java-util/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlatteners.java index 2e58f67c8b4b..0c722932597c 100644 --- a/java-util/src/main/java/io/druid/java/util/common/parsers/ObjectFlatteners.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlatteners.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.java.util.common.parsers; +package org.apache.druid.java.util.common.parsers; import com.google.common.collect.Iterables; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.UOE; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.UOE; import java.util.AbstractMap; import java.util.Collection; diff --git a/java-util/src/main/java/io/druid/java/util/common/parsers/ParseException.java b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/ParseException.java similarity index 93% rename from java-util/src/main/java/io/druid/java/util/common/parsers/ParseException.java rename to java-util/src/main/java/org/apache/druid/java/util/common/parsers/ParseException.java index e0484f202898..e71121e1b400 100644 --- a/java-util/src/main/java/io/druid/java/util/common/parsers/ParseException.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/ParseException.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.java.util.common.parsers; +package org.apache.druid.java.util.common.parsers; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; /** */ diff --git a/java-util/src/main/java/io/druid/java/util/common/parsers/Parser.java b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/Parser.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/parsers/Parser.java rename to java-util/src/main/java/org/apache/druid/java/util/common/parsers/Parser.java index 663b722f00bf..62c4e496153d 100644 --- a/java-util/src/main/java/io/druid/java/util/common/parsers/Parser.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/Parser.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.parsers; +package org.apache.druid.java.util.common.parsers; import javax.annotation.Nullable; import java.util.List; diff --git a/java-util/src/main/java/io/druid/java/util/common/parsers/ParserUtils.java b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/ParserUtils.java similarity index 96% rename from java-util/src/main/java/io/druid/java/util/common/parsers/ParserUtils.java rename to java-util/src/main/java/org/apache/druid/java/util/common/parsers/ParserUtils.java index 1284765045bd..48cbfe49f241 100644 --- a/java-util/src/main/java/io/druid/java/util/common/parsers/ParserUtils.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/ParserUtils.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.java.util.common.parsers; +package org.apache.druid.java.util.common.parsers; import com.google.common.base.Function; import com.google.common.base.Splitter; import com.google.common.collect.Sets; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.StringUtils; import org.joda.time.DateTimeZone; import javax.annotation.Nullable; diff --git a/java-util/src/main/java/io/druid/java/util/common/parsers/Parsers.java b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/Parsers.java similarity index 94% rename from java-util/src/main/java/io/druid/java/util/common/parsers/Parsers.java rename to java-util/src/main/java/org/apache/druid/java/util/common/parsers/Parsers.java index 17fec2c1fd62..88172bb63896 100644 --- a/java-util/src/main/java/io/druid/java/util/common/parsers/Parsers.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/Parsers.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.parsers; +package org.apache.druid.java.util.common.parsers; public class Parsers diff --git a/java-util/src/main/java/io/druid/java/util/common/parsers/RegexParser.java b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/RegexParser.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/parsers/RegexParser.java rename to java-util/src/main/java/org/apache/druid/java/util/common/parsers/RegexParser.java index 0e522991cf37..e5371e89d618 100644 --- a/java-util/src/main/java/io/druid/java/util/common/parsers/RegexParser.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/RegexParser.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.parsers; +package org.apache.druid.java.util.common.parsers; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -25,7 +25,7 @@ import com.google.common.base.Strings; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import io.druid.java.util.common.collect.Utils; +import org.apache.druid.java.util.common.collect.Utils; import java.util.List; import java.util.Map; diff --git a/java-util/src/main/java/io/druid/java/util/common/parsers/TimestampParser.java b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/TimestampParser.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/common/parsers/TimestampParser.java rename to java-util/src/main/java/org/apache/druid/java/util/common/parsers/TimestampParser.java index 14de994aedad..38f120609421 100644 --- a/java-util/src/main/java/io/druid/java/util/common/parsers/TimestampParser.java +++ b/java-util/src/main/java/org/apache/druid/java/util/common/parsers/TimestampParser.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.java.util.common.parsers; +package org.apache.druid.java.util.common.parsers; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.base.Strings; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.IAE; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.format.DateTimeFormat; diff --git a/java-util/src/main/java/io/druid/java/util/emitter/EmittingLogger.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/EmittingLogger.java similarity index 91% rename from java-util/src/main/java/io/druid/java/util/emitter/EmittingLogger.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/EmittingLogger.java index 661ed17d3b94..8e685c696117 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/EmittingLogger.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/EmittingLogger.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.java.util.emitter; +package org.apache.druid.java.util.emitter; import com.google.common.base.Preconditions; import com.google.common.base.Predicates; import com.google.common.collect.Maps; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.emitter.service.AlertBuilder; -import io.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.service.AlertBuilder; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/java-util/src/main/java/io/druid/java/util/emitter/core/BaseHttpEmittingConfig.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/BaseHttpEmittingConfig.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/emitter/core/BaseHttpEmittingConfig.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/core/BaseHttpEmittingConfig.java index 7642f45dc926..76e3a90e3ff0 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/core/BaseHttpEmittingConfig.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/BaseHttpEmittingConfig.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.Pair; import javax.validation.constraints.Min; diff --git a/java-util/src/main/java/io/druid/java/util/emitter/core/Batch.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/Batch.java similarity index 99% rename from java-util/src/main/java/io/druid/java/util/emitter/core/Batch.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/core/Batch.java index b9869a628bfb..5bc598a724de 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/core/Batch.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/Batch.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; import com.google.common.base.Preconditions; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.logger.Logger; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.AbstractQueuedLongSynchronizer; diff --git a/java-util/src/main/java/io/druid/java/util/emitter/core/BatchingStrategy.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/BatchingStrategy.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/emitter/core/BatchingStrategy.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/core/BatchingStrategy.java index f951d6fdfe3d..268d6a468dba 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/core/BatchingStrategy.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/BatchingStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; public enum BatchingStrategy { diff --git a/java-util/src/main/java/io/druid/java/util/emitter/core/ComposingEmitter.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/ComposingEmitter.java similarity index 91% rename from java-util/src/main/java/io/druid/java/util/emitter/core/ComposingEmitter.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/core/ComposingEmitter.java index 36734d34c823..f22b8bc60b2e 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/core/ComposingEmitter.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/ComposingEmitter.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; import com.google.common.base.Preconditions; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.common.logger.Logger; import java.io.IOException; import java.util.List; diff --git a/java-util/src/main/java/io/druid/java/util/emitter/core/ConcurrentTimeCounter.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/ConcurrentTimeCounter.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/emitter/core/ConcurrentTimeCounter.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/core/ConcurrentTimeCounter.java index a9251ece5cc7..d4c5435236d1 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/core/ConcurrentTimeCounter.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/ConcurrentTimeCounter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; import com.google.common.primitives.UnsignedInts; diff --git a/java-util/src/main/java/io/druid/java/util/emitter/core/ContentEncoding.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/ContentEncoding.java similarity index 94% rename from java-util/src/main/java/io/druid/java/util/emitter/core/ContentEncoding.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/core/ContentEncoding.java index b6afd2d81c36..e8ee2025f7ae 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/core/ContentEncoding.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/ContentEncoding.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; public enum ContentEncoding { diff --git a/java-util/src/main/java/io/druid/java/util/emitter/core/Emitter.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/Emitter.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/emitter/core/Emitter.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/core/Emitter.java index 95c3a40ed317..17e1952cae37 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/core/Emitter.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/Emitter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; import java.io.Closeable; import java.io.Flushable; diff --git a/java-util/src/main/java/io/druid/java/util/emitter/core/Emitters.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/Emitters.java similarity index 62% rename from java-util/src/main/java/io/druid/java/util/emitter/core/Emitters.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/core/Emitters.java index 77539080d6fb..093550334edf 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/core/Emitters.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/Emitters.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Maps; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.emitter.factory.EmitterFactory; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.emitter.factory.EmitterFactory; import org.asynchttpclient.AsyncHttpClient; import java.util.HashMap; @@ -35,9 +35,9 @@ public class Emitters { - private static final String LOG_EMITTER_PROP = "io.druid.java.util.emitter.logging"; - private static final String HTTP_EMITTER_PROP = "io.druid.java.util.emitter.http"; - private static final String CUSTOM_EMITTER_TYPE_PROP = "io.druid.java.util.emitter.type"; + private static final String LOG_EMITTER_PROP = "org.apache.druid.java.util.emitter.logging"; + private static final String HTTP_EMITTER_PROP = "org.apache.druid.java.util.emitter.http"; + private static final String CUSTOM_EMITTER_TYPE_PROP = "org.apache.druid.java.util.emitter.type"; public static Emitter create(Properties props, AsyncHttpClient httpClient, Lifecycle lifecycle) { @@ -62,7 +62,7 @@ public static Emitter create( jsonified = makeCustomFactoryMap(props); } else { throw new ISE( - "Unknown type of emitter. Please set [%s], [%s] or provide registered subtype of io.druid.java.util.emitter.core.factory.EmitterFactory via [%s]", + "Unknown type of emitter. Please set [%s], [%s] or provide registered subtype of org.apache.druid.java.util.emitter.core.factory.EmitterFactory via [%s]", LOG_EMITTER_PROP, HTTP_EMITTER_PROP, CUSTOM_EMITTER_TYPE_PROP @@ -77,7 +77,7 @@ static Map makeHttpMap(Properties props) { Map httpMap = Maps.newHashMap(); - final String urlProperty = "io.druid.java.util.emitter.http.url"; + final String urlProperty = "org.apache.druid.java.util.emitter.http.url"; final String baseUrl = props.getProperty(urlProperty); if (baseUrl == null) { @@ -85,46 +85,46 @@ static Map makeHttpMap(Properties props) } httpMap.put("recipientBaseUrl", baseUrl); - httpMap.put("flushMillis", Long.parseLong(props.getProperty("io.druid.java.util.emitter.flushMillis", "60000"))); - httpMap.put("flushCount", Integer.parseInt(props.getProperty("io.druid.java.util.emitter.flushCount", "300"))); + httpMap.put("flushMillis", Long.parseLong(props.getProperty("org.apache.druid.java.util.emitter.flushMillis", "60000"))); + httpMap.put("flushCount", Integer.parseInt(props.getProperty("org.apache.druid.java.util.emitter.flushCount", "300"))); /** - * The defaultValue for "io.druid.java.util.emitter.http.flushTimeOut" must be same as {@link HttpEmitterConfig.DEFAULT_FLUSH_TIME_OUT} + * The defaultValue for "org.apache.druid.java.util.emitter.http.flushTimeOut" must be same as {@link HttpEmitterConfig.DEFAULT_FLUSH_TIME_OUT} * */ httpMap.put( "flushTimeOut", Long.parseLong(props.getProperty( - "io.druid.java.util.emitter.http.flushTimeOut", + "org.apache.druid.java.util.emitter.http.flushTimeOut", String.valueOf(Long.MAX_VALUE) )) ); - if (props.containsKey("io.druid.java.util.emitter.http.basicAuthentication")) { - httpMap.put("basicAuthentication", props.getProperty("io.druid.java.util.emitter.http.basicAuthentication")); + if (props.containsKey("org.apache.druid.java.util.emitter.http.basicAuthentication")) { + httpMap.put("basicAuthentication", props.getProperty("org.apache.druid.java.util.emitter.http.basicAuthentication")); } - if (props.containsKey("io.druid.java.util.emitter.http.batchingStrategy")) { + if (props.containsKey("org.apache.druid.java.util.emitter.http.batchingStrategy")) { httpMap.put( "batchingStrategy", - StringUtils.toUpperCase(props.getProperty("io.druid.java.util.emitter.http.batchingStrategy")) + StringUtils.toUpperCase(props.getProperty("org.apache.druid.java.util.emitter.http.batchingStrategy")) ); } - if (props.containsKey("io.druid.java.util.emitter.http.maxBatchSize")) { - httpMap.put("maxBatchSize", Integer.parseInt(props.getProperty("io.druid.java.util.emitter.http.maxBatchSize"))); + if (props.containsKey("org.apache.druid.java.util.emitter.http.maxBatchSize")) { + httpMap.put("maxBatchSize", Integer.parseInt(props.getProperty("org.apache.druid.java.util.emitter.http.maxBatchSize"))); } - if (props.containsKey("io.druid.java.util.emitter.http.batchQueueSizeLimit")) { + if (props.containsKey("org.apache.druid.java.util.emitter.http.batchQueueSizeLimit")) { httpMap.put( "batchQueueSizeLimit", - Integer.parseInt(props.getProperty("io.druid.java.util.emitter.http.batchQueueSizeLimit")) + Integer.parseInt(props.getProperty("org.apache.druid.java.util.emitter.http.batchQueueSizeLimit")) ); } - if (props.containsKey("io.druid.java.util.emitter.http.httpTimeoutAllowanceFactor")) { + if (props.containsKey("org.apache.druid.java.util.emitter.http.httpTimeoutAllowanceFactor")) { httpMap.put( "httpTimeoutAllowanceFactor", - Float.parseFloat(props.getProperty("io.druid.java.util.emitter.http.httpTimeoutAllowanceFactor")) + Float.parseFloat(props.getProperty("org.apache.druid.java.util.emitter.http.httpTimeoutAllowanceFactor")) ); } - if (props.containsKey("io.druid.java.util.emitter.http.minHttpTimeoutMillis")) { + if (props.containsKey("org.apache.druid.java.util.emitter.http.minHttpTimeoutMillis")) { httpMap.put( "minHttpTimeoutMillis", - Float.parseFloat(props.getProperty("io.druid.java.util.emitter.http.minHttpTimeoutMillis")) + Float.parseFloat(props.getProperty("org.apache.druid.java.util.emitter.http.minHttpTimeoutMillis")) ); } return httpMap; @@ -136,10 +136,10 @@ static Map makeLoggingMap(Properties props) Map loggingMap = Maps.newHashMap(); loggingMap.put( - "loggerClass", props.getProperty("io.druid.java.util.emitter.logging.class", LoggingEmitter.class.getName()) + "loggerClass", props.getProperty("org.apache.druid.java.util.emitter.logging.class", LoggingEmitter.class.getName()) ); loggingMap.put( - "logLevel", props.getProperty("io.druid.java.util.emitter.logging.level", "debug") + "logLevel", props.getProperty("org.apache.druid.java.util.emitter.logging.level", "debug") ); return loggingMap; } @@ -147,7 +147,7 @@ static Map makeLoggingMap(Properties props) static Map makeCustomFactoryMap(Properties props) { Map factoryMap = Maps.newHashMap(); - String prefix = "io.druid.java.util.emitter."; + String prefix = "org.apache.druid.java.util.emitter."; for (Map.Entry entry : props.entrySet()) { String key = entry.getKey().toString(); diff --git a/java-util/src/main/java/io/druid/java/util/emitter/core/Event.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/Event.java similarity index 94% rename from java-util/src/main/java/io/druid/java/util/emitter/core/Event.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/core/Event.java index 05030923b34c..37e6e57bf5f4 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/core/Event.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/Event.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; import java.util.Map; diff --git a/java-util/src/main/java/io/druid/java/util/emitter/core/FeedUriExtractor.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/FeedUriExtractor.java similarity index 92% rename from java-util/src/main/java/io/druid/java/util/emitter/core/FeedUriExtractor.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/core/FeedUriExtractor.java index aca08c7829e0..69cde1031ea1 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/core/FeedUriExtractor.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/FeedUriExtractor.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import java.net.URI; import java.net.URISyntaxException; diff --git a/java-util/src/main/java/io/druid/java/util/emitter/core/HttpEmitterConfig.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/HttpEmitterConfig.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/emitter/core/HttpEmitterConfig.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/core/HttpEmitterConfig.java index b634883bba28..98b20966bdcc 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/core/HttpEmitterConfig.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/HttpEmitterConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/java-util/src/main/java/io/druid/java/util/emitter/core/HttpPostEmitter.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/emitter/core/HttpPostEmitter.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java index bd8b941f8a9b..57f9cf2bfd15 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/core/HttpPostEmitter.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; @@ -25,13 +25,13 @@ import com.google.common.base.Predicate; import com.google.common.base.Throwables; import com.google.common.primitives.Ints; -import io.druid.concurrent.ConcurrentAwaitableCounter; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.RetryUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.concurrent.ConcurrentAwaitableCounter; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.RetryUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.common.logger.Logger; import io.netty.handler.codec.http.HttpHeaders; import org.asynchttpclient.AsyncHttpClient; import org.asynchttpclient.ListenableFuture; diff --git a/java-util/src/main/java/io/druid/java/util/emitter/core/LoggingEmitter.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/LoggingEmitter.java similarity index 93% rename from java-util/src/main/java/io/druid/java/util/emitter/core/LoggingEmitter.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/core/LoggingEmitter.java index 46385b790b55..0fc9f83b15d7 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/core/LoggingEmitter.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/LoggingEmitter.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; /** */ import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.common.logger.Logger; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/java-util/src/main/java/io/druid/java/util/emitter/core/LoggingEmitterConfig.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/LoggingEmitterConfig.java similarity index 96% rename from java-util/src/main/java/io/druid/java/util/emitter/core/LoggingEmitterConfig.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/core/LoggingEmitterConfig.java index 7027bee01ec2..39b85126f773 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/core/LoggingEmitterConfig.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/LoggingEmitterConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/java-util/src/main/java/io/druid/java/util/emitter/core/NoopEmitter.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/NoopEmitter.java similarity index 95% rename from java-util/src/main/java/io/druid/java/util/emitter/core/NoopEmitter.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/core/NoopEmitter.java index bca8d9dd8b17..1564eb2b0588 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/core/NoopEmitter.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/NoopEmitter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; /** */ diff --git a/java-util/src/main/java/io/druid/java/util/emitter/core/ParametrizedUriEmitter.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitter.java similarity index 95% rename from java-util/src/main/java/io/druid/java/util/emitter/core/ParametrizedUriEmitter.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitter.java index 2524480729a2..bcdf887b95e7 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/core/ParametrizedUriEmitter.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitter.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableSet; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.common.logger.Logger; import org.asynchttpclient.AsyncHttpClient; import javax.annotation.concurrent.GuardedBy; diff --git a/java-util/src/main/java/io/druid/java/util/emitter/core/ParametrizedUriEmitterConfig.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterConfig.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/emitter/core/ParametrizedUriEmitterConfig.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterConfig.java index cc45c16a0575..9982f134dbc6 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/core/ParametrizedUriEmitterConfig.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/java-util/src/main/java/io/druid/java/util/emitter/core/ParametrizedUriExtractor.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriExtractor.java similarity index 95% rename from java-util/src/main/java/io/druid/java/util/emitter/core/ParametrizedUriExtractor.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriExtractor.java index 1eb6e4be7e77..68baeff86645 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/core/ParametrizedUriExtractor.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriExtractor.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import java.net.URI; import java.net.URISyntaxException; diff --git a/java-util/src/main/java/io/druid/java/util/emitter/core/UriExtractor.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/UriExtractor.java similarity index 95% rename from java-util/src/main/java/io/druid/java/util/emitter/core/UriExtractor.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/core/UriExtractor.java index 4c76917f759b..20107ae074a3 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/core/UriExtractor.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/UriExtractor.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; import java.net.URI; import java.net.URISyntaxException; diff --git a/java-util/src/main/java/io/druid/java/util/emitter/core/ZeroCopyByteArrayOutputStream.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/ZeroCopyByteArrayOutputStream.java similarity index 95% rename from java-util/src/main/java/io/druid/java/util/emitter/core/ZeroCopyByteArrayOutputStream.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/core/ZeroCopyByteArrayOutputStream.java index acf83ecb5bb5..bc46d3cea325 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/core/ZeroCopyByteArrayOutputStream.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/core/ZeroCopyByteArrayOutputStream.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; import java.io.ByteArrayOutputStream; diff --git a/java-util/src/main/java/io/druid/java/util/emitter/factory/EmitterFactory.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/factory/EmitterFactory.java similarity index 90% rename from java-util/src/main/java/io/druid/java/util/emitter/factory/EmitterFactory.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/factory/EmitterFactory.java index 28300a4fede3..9e0090e3de22 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/factory/EmitterFactory.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/factory/EmitterFactory.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.java.util.emitter.factory; +package org.apache.druid.java.util.emitter.factory; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.emitter.core.Emitter; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.emitter.core.Emitter; import org.asynchttpclient.AsyncHttpClient; @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type") diff --git a/java-util/src/main/java/io/druid/java/util/emitter/factory/HttpEmitterFactory.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/factory/HttpEmitterFactory.java similarity index 80% rename from java-util/src/main/java/io/druid/java/util/emitter/factory/HttpEmitterFactory.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/factory/HttpEmitterFactory.java index 7ae2fd834b1d..53f5b7a9d687 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/factory/HttpEmitterFactory.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/factory/HttpEmitterFactory.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.java.util.emitter.factory; +package org.apache.druid.java.util.emitter.factory; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.emitter.core.Emitter; -import io.druid.java.util.emitter.core.HttpEmitterConfig; -import io.druid.java.util.emitter.core.HttpPostEmitter; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.emitter.core.Emitter; +import org.apache.druid.java.util.emitter.core.HttpEmitterConfig; +import org.apache.druid.java.util.emitter.core.HttpPostEmitter; import org.asynchttpclient.AsyncHttpClient; public class HttpEmitterFactory extends HttpEmitterConfig implements EmitterFactory diff --git a/java-util/src/main/java/io/druid/java/util/emitter/factory/LoggingEmitterFactory.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/factory/LoggingEmitterFactory.java similarity index 82% rename from java-util/src/main/java/io/druid/java/util/emitter/factory/LoggingEmitterFactory.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/factory/LoggingEmitterFactory.java index 65feea0aa8d8..753d208251de 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/factory/LoggingEmitterFactory.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/factory/LoggingEmitterFactory.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.java.util.emitter.factory; +package org.apache.druid.java.util.emitter.factory; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.emitter.core.Emitter; -import io.druid.java.util.emitter.core.LoggingEmitter; -import io.druid.java.util.emitter.core.LoggingEmitterConfig; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.emitter.core.Emitter; +import org.apache.druid.java.util.emitter.core.LoggingEmitter; +import org.apache.druid.java.util.emitter.core.LoggingEmitterConfig; import org.asynchttpclient.AsyncHttpClient; public class LoggingEmitterFactory extends LoggingEmitterConfig implements EmitterFactory diff --git a/java-util/src/main/java/io/druid/java/util/emitter/factory/NoopEmitterFactory.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/factory/NoopEmitterFactory.java similarity index 84% rename from java-util/src/main/java/io/druid/java/util/emitter/factory/NoopEmitterFactory.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/factory/NoopEmitterFactory.java index a3af501f813a..db9bf6035097 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/factory/NoopEmitterFactory.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/factory/NoopEmitterFactory.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.java.util.emitter.factory; +package org.apache.druid.java.util.emitter.factory; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.emitter.core.Emitter; -import io.druid.java.util.emitter.core.NoopEmitter; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.emitter.core.Emitter; +import org.apache.druid.java.util.emitter.core.NoopEmitter; import org.asynchttpclient.AsyncHttpClient; public class NoopEmitterFactory implements EmitterFactory diff --git a/java-util/src/main/java/io/druid/java/util/emitter/factory/ParametrizedUriEmitterFactory.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/factory/ParametrizedUriEmitterFactory.java similarity index 80% rename from java-util/src/main/java/io/druid/java/util/emitter/factory/ParametrizedUriEmitterFactory.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/factory/ParametrizedUriEmitterFactory.java index 0218975e4913..5f5670586eff 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/factory/ParametrizedUriEmitterFactory.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/factory/ParametrizedUriEmitterFactory.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.java.util.emitter.factory; +package org.apache.druid.java.util.emitter.factory; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.emitter.core.Emitter; -import io.druid.java.util.emitter.core.ParametrizedUriEmitter; -import io.druid.java.util.emitter.core.ParametrizedUriEmitterConfig; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.emitter.core.Emitter; +import org.apache.druid.java.util.emitter.core.ParametrizedUriEmitter; +import org.apache.druid.java.util.emitter.core.ParametrizedUriEmitterConfig; import org.asynchttpclient.AsyncHttpClient; public class ParametrizedUriEmitterFactory extends ParametrizedUriEmitterConfig implements EmitterFactory diff --git a/java-util/src/main/java/io/druid/java/util/emitter/service/AlertBuilder.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/service/AlertBuilder.java similarity index 93% rename from java-util/src/main/java/io/druid/java/util/emitter/service/AlertBuilder.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/service/AlertBuilder.java index e79373143e50..9938e7cb7ae3 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/service/AlertBuilder.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/service/AlertBuilder.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.java.util.emitter.service; +package org.apache.druid.java.util.emitter.service; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.StringUtils; import java.util.Map; diff --git a/java-util/src/main/java/io/druid/java/util/emitter/service/AlertEvent.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/service/AlertEvent.java similarity index 95% rename from java-util/src/main/java/io/druid/java/util/emitter/service/AlertEvent.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/service/AlertEvent.java index 9b19a1ad2d0c..a5d805dc14fb 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/service/AlertEvent.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/service/AlertEvent.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.java.util.emitter.service; +package org.apache.druid.java.util.emitter.service; import com.fasterxml.jackson.annotation.JsonValue; import com.google.common.collect.ImmutableMap; -import io.druid.guice.annotations.PublicApi; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.emitter.core.Event; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.emitter.core.Event; import org.joda.time.DateTime; import java.util.Collections; diff --git a/java-util/src/main/java/io/druid/java/util/emitter/service/ServiceEmitter.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/service/ServiceEmitter.java similarity index 88% rename from java-util/src/main/java/io/druid/java/util/emitter/service/ServiceEmitter.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/service/ServiceEmitter.java index 33b8715674cd..ad007f33ec69 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/service/ServiceEmitter.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/service/ServiceEmitter.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.java.util.emitter.service; +package org.apache.druid.java.util.emitter.service; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.emitter.core.Emitter; -import io.druid.java.util.emitter.core.Event; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.emitter.core.Emitter; +import org.apache.druid.java.util.emitter.core.Event; import java.io.IOException; diff --git a/java-util/src/main/java/io/druid/java/util/emitter/service/ServiceEventBuilder.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/service/ServiceEventBuilder.java similarity index 91% rename from java-util/src/main/java/io/druid/java/util/emitter/service/ServiceEventBuilder.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/service/ServiceEventBuilder.java index 3e9b9f5da867..b572eb801b0c 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/service/ServiceEventBuilder.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/service/ServiceEventBuilder.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.java.util.emitter.service; +package org.apache.druid.java.util.emitter.service; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.emitter.core.Event; +import org.apache.druid.java.util.emitter.core.Event; public abstract class ServiceEventBuilder { diff --git a/java-util/src/main/java/io/druid/java/util/emitter/service/ServiceMetricEvent.java b/java-util/src/main/java/org/apache/druid/java/util/emitter/service/ServiceMetricEvent.java similarity index 95% rename from java-util/src/main/java/io/druid/java/util/emitter/service/ServiceMetricEvent.java rename to java-util/src/main/java/org/apache/druid/java/util/emitter/service/ServiceMetricEvent.java index ac9e163d67b6..896330e0aafb 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/service/ServiceMetricEvent.java +++ b/java-util/src/main/java/org/apache/druid/java/util/emitter/service/ServiceMetricEvent.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.java.util.emitter.service; +package org.apache.druid.java.util.emitter.service; import com.fasterxml.jackson.annotation.JsonValue; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import io.druid.guice.annotations.PublicApi; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.emitter.core.Event; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.emitter.core.Event; import org.joda.time.DateTime; import java.util.Arrays; diff --git a/java-util/src/main/java/io/druid/java/util/http/client/AbstractHttpClient.java b/java-util/src/main/java/org/apache/druid/java/util/http/client/AbstractHttpClient.java similarity index 90% rename from java-util/src/main/java/io/druid/java/util/http/client/AbstractHttpClient.java rename to java-util/src/main/java/org/apache/druid/java/util/http/client/AbstractHttpClient.java index 1c9bd3e897ec..f28dc04f3f74 100644 --- a/java-util/src/main/java/io/druid/java/util/http/client/AbstractHttpClient.java +++ b/java-util/src/main/java/org/apache/druid/java/util/http/client/AbstractHttpClient.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.java.util.http.client; +package org.apache.druid.java.util.http.client; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.java.util.http.client.response.HttpResponseHandler; +import org.apache.druid.java.util.http.client.response.HttpResponseHandler; public abstract class AbstractHttpClient implements HttpClient { diff --git a/java-util/src/main/java/io/druid/java/util/http/client/CredentialedHttpClient.java b/java-util/src/main/java/org/apache/druid/java/util/http/client/CredentialedHttpClient.java similarity index 88% rename from java-util/src/main/java/io/druid/java/util/http/client/CredentialedHttpClient.java rename to java-util/src/main/java/org/apache/druid/java/util/http/client/CredentialedHttpClient.java index a6eebcee9c4f..1100bac4e9b8 100644 --- a/java-util/src/main/java/io/druid/java/util/http/client/CredentialedHttpClient.java +++ b/java-util/src/main/java/org/apache/druid/java/util/http/client/CredentialedHttpClient.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.java.util.http.client; +package org.apache.druid.java.util.http.client; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.java.util.http.client.auth.Credentials; -import io.druid.java.util.http.client.response.HttpResponseHandler; +import org.apache.druid.java.util.http.client.auth.Credentials; +import org.apache.druid.java.util.http.client.response.HttpResponseHandler; import org.joda.time.Duration; /** diff --git a/java-util/src/main/java/io/druid/java/util/http/client/HttpClient.java b/java-util/src/main/java/org/apache/druid/java/util/http/client/HttpClient.java similarity index 96% rename from java-util/src/main/java/io/druid/java/util/http/client/HttpClient.java rename to java-util/src/main/java/org/apache/druid/java/util/http/client/HttpClient.java index bb22aef40b7a..9d850b5b0759 100644 --- a/java-util/src/main/java/io/druid/java/util/http/client/HttpClient.java +++ b/java-util/src/main/java/org/apache/druid/java/util/http/client/HttpClient.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.java.util.http.client; +package org.apache.druid.java.util.http.client; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.java.util.http.client.response.HttpResponseHandler; +import org.apache.druid.java.util.http.client.response.HttpResponseHandler; import org.joda.time.Duration; /** diff --git a/java-util/src/main/java/io/druid/java/util/http/client/HttpClientConfig.java b/java-util/src/main/java/org/apache/druid/java/util/http/client/HttpClientConfig.java similarity index 99% rename from java-util/src/main/java/io/druid/java/util/http/client/HttpClientConfig.java rename to java-util/src/main/java/org/apache/druid/java/util/http/client/HttpClientConfig.java index 61286b22bfbf..158c21660a28 100644 --- a/java-util/src/main/java/io/druid/java/util/http/client/HttpClientConfig.java +++ b/java-util/src/main/java/org/apache/druid/java/util/http/client/HttpClientConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.http.client; +package org.apache.druid.java.util.http.client; import org.joda.time.Duration; import org.joda.time.Period; diff --git a/java-util/src/main/java/io/druid/java/util/http/client/HttpClientInit.java b/java-util/src/main/java/org/apache/druid/java/util/http/client/HttpClientInit.java similarity index 94% rename from java-util/src/main/java/io/druid/java/util/http/client/HttpClientInit.java rename to java-util/src/main/java/org/apache/druid/java/util/http/client/HttpClientInit.java index fe43848636a0..0fa536191494 100644 --- a/java-util/src/main/java/io/druid/java/util/http/client/HttpClientInit.java +++ b/java-util/src/main/java/org/apache/druid/java/util/http/client/HttpClientInit.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.java.util.http.client; +package org.apache.druid.java.util.http.client; import com.google.common.base.Throwables; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import io.druid.java.util.common.guava.CloseQuietly; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.http.client.netty.HttpClientPipelineFactory; -import io.druid.java.util.http.client.pool.ChannelResourceFactory; -import io.druid.java.util.http.client.pool.ResourcePool; -import io.druid.java.util.http.client.pool.ResourcePoolConfig; +import org.apache.druid.java.util.common.guava.CloseQuietly; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.http.client.netty.HttpClientPipelineFactory; +import org.apache.druid.java.util.http.client.pool.ChannelResourceFactory; +import org.apache.druid.java.util.http.client.pool.ResourcePool; +import org.apache.druid.java.util.http.client.pool.ResourcePoolConfig; import org.jboss.netty.bootstrap.ClientBootstrap; import org.jboss.netty.channel.socket.nio.NioClientBossPool; import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory; diff --git a/java-util/src/main/java/io/druid/java/util/http/client/NettyHttpClient.java b/java-util/src/main/java/org/apache/druid/java/util/http/client/NettyHttpClient.java similarity index 95% rename from java-util/src/main/java/io/druid/java/util/http/client/NettyHttpClient.java rename to java-util/src/main/java/org/apache/druid/java/util/http/client/NettyHttpClient.java index c436cb5fe4da..78439a64aeb9 100644 --- a/java-util/src/main/java/io/druid/java/util/http/client/NettyHttpClient.java +++ b/java-util/src/main/java/org/apache/druid/java/util/http/client/NettyHttpClient.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.java.util.http.client; +package org.apache.druid.java.util.http.client; import com.google.common.base.Preconditions; import com.google.common.collect.Multimap; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.http.client.pool.ResourceContainer; -import io.druid.java.util.http.client.pool.ResourcePool; -import io.druid.java.util.http.client.response.ClientResponse; -import io.druid.java.util.http.client.response.HttpResponseHandler; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.http.client.pool.ResourceContainer; +import org.apache.druid.java.util.http.client.pool.ResourcePool; +import org.apache.druid.java.util.http.client.response.ClientResponse; +import org.apache.druid.java.util.http.client.response.HttpResponseHandler; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelException; import org.jboss.netty.channel.ChannelFuture; diff --git a/java-util/src/main/java/io/druid/java/util/http/client/Request.java b/java-util/src/main/java/org/apache/druid/java/util/http/client/Request.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/http/client/Request.java rename to java-util/src/main/java/org/apache/druid/java/util/http/client/Request.java index 7393673a4f54..1084110cb526 100644 --- a/java-util/src/main/java/io/druid/java/util/http/client/Request.java +++ b/java-util/src/main/java/org/apache/druid/java/util/http/client/Request.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.java.util.http.client; +package org.apache.druid.java.util.http.client; import com.google.common.base.Supplier; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBufferFactory; import org.jboss.netty.buffer.HeapChannelBufferFactory; diff --git a/java-util/src/main/java/io/druid/java/util/http/client/auth/BasicCredentials.java b/java-util/src/main/java/org/apache/druid/java/util/http/client/auth/BasicCredentials.java similarity index 91% rename from java-util/src/main/java/io/druid/java/util/http/client/auth/BasicCredentials.java rename to java-util/src/main/java/org/apache/druid/java/util/http/client/auth/BasicCredentials.java index bb91a6d0ecda..5567a80aea2a 100644 --- a/java-util/src/main/java/io/druid/java/util/http/client/auth/BasicCredentials.java +++ b/java-util/src/main/java/org/apache/druid/java/util/http/client/auth/BasicCredentials.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.java.util.http.client.auth; +package org.apache.druid.java.util.http.client.auth; -import io.druid.java.util.http.client.Request; +import org.apache.druid.java.util.http.client.Request; /** */ diff --git a/java-util/src/main/java/io/druid/java/util/http/client/auth/Credentials.java b/java-util/src/main/java/org/apache/druid/java/util/http/client/auth/Credentials.java similarity index 89% rename from java-util/src/main/java/io/druid/java/util/http/client/auth/Credentials.java rename to java-util/src/main/java/org/apache/druid/java/util/http/client/auth/Credentials.java index 82d17b4ed16b..3344a3646490 100644 --- a/java-util/src/main/java/io/druid/java/util/http/client/auth/Credentials.java +++ b/java-util/src/main/java/org/apache/druid/java/util/http/client/auth/Credentials.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.java.util.http.client.auth; +package org.apache.druid.java.util.http.client.auth; -import io.druid.java.util.http.client.Request; +import org.apache.druid.java.util.http.client.Request; /** */ diff --git a/java-util/src/main/java/io/druid/java/util/http/client/io/AppendableByteArrayInputStream.java b/java-util/src/main/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStream.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/http/client/io/AppendableByteArrayInputStream.java rename to java-util/src/main/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStream.java index aee61bf6874b..10fb06b97ffa 100644 --- a/java-util/src/main/java/io/druid/java/util/http/client/io/AppendableByteArrayInputStream.java +++ b/java-util/src/main/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStream.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.java.util.http.client.io; +package org.apache.druid.java.util.http.client.io; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.logger.Logger; import java.io.IOException; import java.io.InputStream; diff --git a/java-util/src/main/java/io/druid/java/util/http/client/netty/HttpClientPipelineFactory.java b/java-util/src/main/java/org/apache/druid/java/util/http/client/netty/HttpClientPipelineFactory.java similarity index 96% rename from java-util/src/main/java/io/druid/java/util/http/client/netty/HttpClientPipelineFactory.java rename to java-util/src/main/java/org/apache/druid/java/util/http/client/netty/HttpClientPipelineFactory.java index f3819d76ae9a..72d9ebd19ef9 100644 --- a/java-util/src/main/java/io/druid/java/util/http/client/netty/HttpClientPipelineFactory.java +++ b/java-util/src/main/java/org/apache/druid/java/util/http/client/netty/HttpClientPipelineFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.http.client.netty; +package org.apache.druid.java.util.http.client.netty; import org.jboss.netty.channel.ChannelPipeline; import org.jboss.netty.channel.ChannelPipelineFactory; diff --git a/java-util/src/main/java/io/druid/java/util/http/client/pool/ChannelResourceFactory.java b/java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ChannelResourceFactory.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/http/client/pool/ChannelResourceFactory.java rename to java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ChannelResourceFactory.java index be04e722576a..b52b55d682eb 100644 --- a/java-util/src/main/java/io/druid/java/util/http/client/pool/ChannelResourceFactory.java +++ b/java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ChannelResourceFactory.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.java.util.http.client.pool; +package org.apache.druid.java.util.http.client.pool; import com.google.common.base.Preconditions; -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 org.jboss.netty.bootstrap.ClientBootstrap; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelException; diff --git a/java-util/src/main/java/io/druid/java/util/http/client/pool/ResourceContainer.java b/java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ResourceContainer.java similarity index 94% rename from java-util/src/main/java/io/druid/java/util/http/client/pool/ResourceContainer.java rename to java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ResourceContainer.java index 75013e238312..37fc23ea5cec 100644 --- a/java-util/src/main/java/io/druid/java/util/http/client/pool/ResourceContainer.java +++ b/java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ResourceContainer.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.http.client.pool; +package org.apache.druid.java.util.http.client.pool; /** */ diff --git a/java-util/src/main/java/io/druid/java/util/http/client/pool/ResourceFactory.java b/java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ResourceFactory.java similarity index 94% rename from java-util/src/main/java/io/druid/java/util/http/client/pool/ResourceFactory.java rename to java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ResourceFactory.java index fa5b72bfcef4..f6db8a717867 100644 --- a/java-util/src/main/java/io/druid/java/util/http/client/pool/ResourceFactory.java +++ b/java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ResourceFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.http.client.pool; +package org.apache.druid.java.util.http.client.pool; /** */ diff --git a/java-util/src/main/java/io/druid/java/util/http/client/pool/ResourcePool.java b/java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePool.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/http/client/pool/ResourcePool.java rename to java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePool.java index f94788df7017..bd8d5e8e5e1f 100644 --- a/java-util/src/main/java/io/druid/java/util/http/client/pool/ResourcePool.java +++ b/java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePool.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.http.client.pool; +package org.apache.druid.java.util.http.client.pool; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; @@ -25,8 +25,8 @@ import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableSet; -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 java.io.Closeable; import java.util.ArrayDeque; diff --git a/java-util/src/main/java/io/druid/java/util/http/client/pool/ResourcePoolConfig.java b/java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePoolConfig.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/http/client/pool/ResourcePoolConfig.java rename to java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePoolConfig.java index 4555d71b9f47..81ce018bd6f9 100644 --- a/java-util/src/main/java/io/druid/java/util/http/client/pool/ResourcePoolConfig.java +++ b/java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePoolConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.http.client.pool; +package org.apache.druid.java.util.http.client.pool; /** */ diff --git a/java-util/src/main/java/io/druid/java/util/http/client/response/ClientResponse.java b/java-util/src/main/java/org/apache/druid/java/util/http/client/response/ClientResponse.java similarity index 95% rename from java-util/src/main/java/io/druid/java/util/http/client/response/ClientResponse.java rename to java-util/src/main/java/org/apache/druid/java/util/http/client/response/ClientResponse.java index 925ef33adda3..9528480a6c46 100644 --- a/java-util/src/main/java/io/druid/java/util/http/client/response/ClientResponse.java +++ b/java-util/src/main/java/org/apache/druid/java/util/http/client/response/ClientResponse.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.http.client.response; +package org.apache.druid.java.util.http.client.response; /** */ diff --git a/java-util/src/main/java/io/druid/java/util/http/client/response/FullResponseHandler.java b/java-util/src/main/java/org/apache/druid/java/util/http/client/response/FullResponseHandler.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/http/client/response/FullResponseHandler.java rename to java-util/src/main/java/org/apache/druid/java/util/http/client/response/FullResponseHandler.java index dedcf18891ce..7c11eb7ba003 100644 --- a/java-util/src/main/java/io/druid/java/util/http/client/response/FullResponseHandler.java +++ b/java-util/src/main/java/org/apache/druid/java/util/http/client/response/FullResponseHandler.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.http.client.response; +package org.apache.druid.java.util.http.client.response; import org.jboss.netty.handler.codec.http.HttpChunk; import org.jboss.netty.handler.codec.http.HttpResponse; diff --git a/java-util/src/main/java/io/druid/java/util/http/client/response/FullResponseHolder.java b/java-util/src/main/java/org/apache/druid/java/util/http/client/response/FullResponseHolder.java similarity index 96% rename from java-util/src/main/java/io/druid/java/util/http/client/response/FullResponseHolder.java rename to java-util/src/main/java/org/apache/druid/java/util/http/client/response/FullResponseHolder.java index 97ee2befa8ac..241ca96f2776 100644 --- a/java-util/src/main/java/io/druid/java/util/http/client/response/FullResponseHolder.java +++ b/java-util/src/main/java/org/apache/druid/java/util/http/client/response/FullResponseHolder.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.http.client.response; +package org.apache.druid.java.util.http.client.response; import org.jboss.netty.handler.codec.http.HttpResponse; import org.jboss.netty.handler.codec.http.HttpResponseStatus; diff --git a/java-util/src/main/java/io/druid/java/util/http/client/response/HttpResponseHandler.java b/java-util/src/main/java/org/apache/druid/java/util/http/client/response/HttpResponseHandler.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/http/client/response/HttpResponseHandler.java rename to java-util/src/main/java/org/apache/druid/java/util/http/client/response/HttpResponseHandler.java index 134806396695..32fcb6035751 100644 --- a/java-util/src/main/java/io/druid/java/util/http/client/response/HttpResponseHandler.java +++ b/java-util/src/main/java/org/apache/druid/java/util/http/client/response/HttpResponseHandler.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.http.client.response; +package org.apache.druid.java.util.http.client.response; import org.jboss.netty.handler.codec.http.HttpChunk; import org.jboss.netty.handler.codec.http.HttpResponse; diff --git a/java-util/src/main/java/io/druid/java/util/http/client/response/InputStreamResponseHandler.java b/java-util/src/main/java/org/apache/druid/java/util/http/client/response/InputStreamResponseHandler.java similarity index 94% rename from java-util/src/main/java/io/druid/java/util/http/client/response/InputStreamResponseHandler.java rename to java-util/src/main/java/org/apache/druid/java/util/http/client/response/InputStreamResponseHandler.java index 75c5bd55a18c..e3a17b9ca3e2 100644 --- a/java-util/src/main/java/io/druid/java/util/http/client/response/InputStreamResponseHandler.java +++ b/java-util/src/main/java/org/apache/druid/java/util/http/client/response/InputStreamResponseHandler.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.java.util.http.client.response; +package org.apache.druid.java.util.http.client.response; -import io.druid.java.util.http.client.io.AppendableByteArrayInputStream; +import org.apache.druid.java.util.http.client.io.AppendableByteArrayInputStream; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.handler.codec.http.HttpChunk; import org.jboss.netty.handler.codec.http.HttpResponse; diff --git a/java-util/src/main/java/io/druid/java/util/http/client/response/SequenceInputStreamResponseHandler.java b/java-util/src/main/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandler.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/http/client/response/SequenceInputStreamResponseHandler.java rename to java-util/src/main/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandler.java index 8330432a5d48..cf8995fb7030 100644 --- a/java-util/src/main/java/io/druid/java/util/http/client/response/SequenceInputStreamResponseHandler.java +++ b/java-util/src/main/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandler.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.java.util.http.client.response; +package org.apache.druid.java.util.http.client.response; import com.google.common.base.Throwables; import com.google.common.io.ByteSource; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.logger.Logger; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBufferInputStream; import org.jboss.netty.handler.codec.http.HttpChunk; diff --git a/java-util/src/main/java/io/druid/java/util/http/client/response/StatusResponseHandler.java b/java-util/src/main/java/org/apache/druid/java/util/http/client/response/StatusResponseHandler.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/http/client/response/StatusResponseHandler.java rename to java-util/src/main/java/org/apache/druid/java/util/http/client/response/StatusResponseHandler.java index 14fa5dcf1500..603cd7bddd0e 100644 --- a/java-util/src/main/java/io/druid/java/util/http/client/response/StatusResponseHandler.java +++ b/java-util/src/main/java/org/apache/druid/java/util/http/client/response/StatusResponseHandler.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.http.client.response; +package org.apache.druid.java.util.http.client.response; import org.jboss.netty.handler.codec.http.HttpChunk; import org.jboss.netty.handler.codec.http.HttpResponse; diff --git a/java-util/src/main/java/io/druid/java/util/http/client/response/StatusResponseHolder.java b/java-util/src/main/java/org/apache/druid/java/util/http/client/response/StatusResponseHolder.java similarity index 95% rename from java-util/src/main/java/io/druid/java/util/http/client/response/StatusResponseHolder.java rename to java-util/src/main/java/org/apache/druid/java/util/http/client/response/StatusResponseHolder.java index c2ee2219ff1f..a8bf8a384621 100644 --- a/java-util/src/main/java/io/druid/java/util/http/client/response/StatusResponseHolder.java +++ b/java-util/src/main/java/org/apache/druid/java/util/http/client/response/StatusResponseHolder.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.http.client.response; +package org.apache.druid.java.util.http.client.response; import org.jboss.netty.handler.codec.http.HttpResponseStatus; diff --git a/java-util/src/main/java/io/druid/java/util/metrics/AbstractMonitor.java b/java-util/src/main/java/org/apache/druid/java/util/metrics/AbstractMonitor.java similarity index 91% rename from java-util/src/main/java/io/druid/java/util/metrics/AbstractMonitor.java rename to java-util/src/main/java/org/apache/druid/java/util/metrics/AbstractMonitor.java index d359f8838958..029dd4780002 100644 --- a/java-util/src/main/java/io/druid/java/util/metrics/AbstractMonitor.java +++ b/java-util/src/main/java/org/apache/druid/java/util/metrics/AbstractMonitor.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; -import io.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; /** */ diff --git a/java-util/src/main/java/io/druid/java/util/metrics/CgroupMemoryMonitor.java b/java-util/src/main/java/org/apache/druid/java/util/metrics/CgroupMemoryMonitor.java similarity index 87% rename from java-util/src/main/java/io/druid/java/util/metrics/CgroupMemoryMonitor.java rename to java-util/src/main/java/org/apache/druid/java/util/metrics/CgroupMemoryMonitor.java index b125e4797e9f..7e7c9c52b4be 100644 --- a/java-util/src/main/java/io/druid/java/util/metrics/CgroupMemoryMonitor.java +++ b/java-util/src/main/java/org/apache/druid/java/util/metrics/CgroupMemoryMonitor.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.java.util.metrics.cgroups.CgroupDiscoverer; -import io.druid.java.util.metrics.cgroups.Memory; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.metrics.cgroups.CgroupDiscoverer; +import org.apache.druid.java.util.metrics.cgroups.Memory; import java.util.Map; diff --git a/java-util/src/main/java/io/druid/java/util/metrics/CgroupUtil.java b/java-util/src/main/java/org/apache/druid/java/util/metrics/CgroupUtil.java similarity index 95% rename from java-util/src/main/java/io/druid/java/util/metrics/CgroupUtil.java rename to java-util/src/main/java/org/apache/druid/java/util/metrics/CgroupUtil.java index b1dcf4346ec3..b9b29cdbdfcb 100644 --- a/java-util/src/main/java/io/druid/java/util/metrics/CgroupUtil.java +++ b/java-util/src/main/java/org/apache/druid/java/util/metrics/CgroupUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; import java.util.regex.Pattern; diff --git a/java-util/src/main/java/io/druid/java/util/metrics/CompoundMonitor.java b/java-util/src/main/java/org/apache/druid/java/util/metrics/CompoundMonitor.java similarity index 93% rename from java-util/src/main/java/io/druid/java/util/metrics/CompoundMonitor.java rename to java-util/src/main/java/org/apache/druid/java/util/metrics/CompoundMonitor.java index ef29afa3a3fb..9811f584bc0e 100644 --- a/java-util/src/main/java/io/druid/java/util/metrics/CompoundMonitor.java +++ b/java-util/src/main/java/org/apache/druid/java/util/metrics/CompoundMonitor.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; import com.google.common.collect.Lists; -import io.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; import java.util.Arrays; import java.util.List; diff --git a/java-util/src/main/java/io/druid/java/util/metrics/CpuAcctDeltaMonitor.java b/java-util/src/main/java/org/apache/druid/java/util/metrics/CpuAcctDeltaMonitor.java similarity index 90% rename from java-util/src/main/java/io/druid/java/util/metrics/CpuAcctDeltaMonitor.java rename to java-util/src/main/java/org/apache/druid/java/util/metrics/CpuAcctDeltaMonitor.java index 623b7c500fbd..f9a30b1bffd5 100644 --- a/java-util/src/main/java/io/druid/java/util/metrics/CpuAcctDeltaMonitor.java +++ b/java-util/src/main/java/org/apache/druid/java/util/metrics/CpuAcctDeltaMonitor.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.java.util.metrics.cgroups.CgroupDiscoverer; -import io.druid.java.util.metrics.cgroups.CpuAcct; -import io.druid.java.util.metrics.cgroups.ProcSelfCgroupDiscoverer; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.metrics.cgroups.CgroupDiscoverer; +import org.apache.druid.java.util.metrics.cgroups.CpuAcct; +import org.apache.druid.java.util.metrics.cgroups.ProcSelfCgroupDiscoverer; import org.joda.time.DateTime; import java.util.Map; diff --git a/java-util/src/main/java/io/druid/java/util/metrics/FeedDefiningMonitor.java b/java-util/src/main/java/org/apache/druid/java/util/metrics/FeedDefiningMonitor.java similarity index 91% rename from java-util/src/main/java/io/druid/java/util/metrics/FeedDefiningMonitor.java rename to java-util/src/main/java/org/apache/druid/java/util/metrics/FeedDefiningMonitor.java index 87d16e2b5248..c43112ab9767 100644 --- a/java-util/src/main/java/io/druid/java/util/metrics/FeedDefiningMonitor.java +++ b/java-util/src/main/java/org/apache/druid/java/util/metrics/FeedDefiningMonitor.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; import com.google.common.base.Preconditions; -import io.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; public abstract class FeedDefiningMonitor extends AbstractMonitor { diff --git a/java-util/src/main/java/io/druid/java/util/metrics/HttpPostEmitterMonitor.java b/java-util/src/main/java/org/apache/druid/java/util/metrics/HttpPostEmitterMonitor.java similarity index 92% rename from java-util/src/main/java/io/druid/java/util/metrics/HttpPostEmitterMonitor.java rename to java-util/src/main/java/org/apache/druid/java/util/metrics/HttpPostEmitterMonitor.java index 085fb76f0445..de40f0ec6523 100644 --- a/java-util/src/main/java/io/druid/java/util/metrics/HttpPostEmitterMonitor.java +++ b/java-util/src/main/java/org/apache/druid/java/util/metrics/HttpPostEmitterMonitor.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.emitter.core.ConcurrentTimeCounter; -import io.druid.java.util.emitter.core.HttpPostEmitter; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.emitter.core.ConcurrentTimeCounter; +import org.apache.druid.java.util.emitter.core.HttpPostEmitter; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; public class HttpPostEmitterMonitor extends FeedDefiningMonitor { diff --git a/java-util/src/main/java/io/druid/java/util/metrics/JvmCpuMonitor.java b/java-util/src/main/java/org/apache/druid/java/util/metrics/JvmCpuMonitor.java similarity index 91% rename from java-util/src/main/java/io/druid/java/util/metrics/JvmCpuMonitor.java rename to java-util/src/main/java/org/apache/druid/java/util/metrics/JvmCpuMonitor.java index 5d4dd5bc39f5..eb3028c02e93 100644 --- a/java-util/src/main/java/io/druid/java/util/metrics/JvmCpuMonitor.java +++ b/java-util/src/main/java/org/apache/druid/java/util/metrics/JvmCpuMonitor.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; import org.hyperic.sigar.ProcCpu; import org.hyperic.sigar.Sigar; import org.hyperic.sigar.SigarException; diff --git a/java-util/src/main/java/io/druid/java/util/metrics/JvmMonitor.java b/java-util/src/main/java/org/apache/druid/java/util/metrics/JvmMonitor.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/metrics/JvmMonitor.java rename to java-util/src/main/java/org/apache/druid/java/util/metrics/JvmMonitor.java index dcc8fb7fb661..ea47e34f995b 100644 --- a/java-util/src/main/java/io/druid/java/util/metrics/JvmMonitor.java +++ b/java-util/src/main/java/org/apache/druid/java/util/metrics/JvmMonitor.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; import org.gridkit.lab.jvm.perfdata.JStatData; import org.gridkit.lab.jvm.perfdata.JStatData.LongCounter; import org.gridkit.lab.jvm.perfdata.JStatData.StringCounter; diff --git a/java-util/src/main/java/io/druid/java/util/metrics/JvmPidDiscoverer.java b/java-util/src/main/java/org/apache/druid/java/util/metrics/JvmPidDiscoverer.java similarity index 93% rename from java-util/src/main/java/io/druid/java/util/metrics/JvmPidDiscoverer.java rename to java-util/src/main/java/org/apache/druid/java/util/metrics/JvmPidDiscoverer.java index 41571d9294cf..dedcfea1168e 100644 --- a/java-util/src/main/java/io/druid/java/util/metrics/JvmPidDiscoverer.java +++ b/java-util/src/main/java/org/apache/druid/java/util/metrics/JvmPidDiscoverer.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; -import io.druid.java.util.common.RE; +import org.apache.druid.java.util.common.RE; import java.lang.management.ManagementFactory; import java.util.regex.Pattern; /** - * For systems that for whatever reason cannot use Sigar (through io.druid.java.util.metrics.SigarPidDiscoverer ), + * For systems that for whatever reason cannot use Sigar (through org.apache.druid.java.util.metrics.SigarPidDiscoverer ), * this attempts to get the PID from the JVM "name". */ public class JvmPidDiscoverer implements PidDiscoverer diff --git a/java-util/src/main/java/io/druid/java/util/metrics/JvmThreadsMonitor.java b/java-util/src/main/java/org/apache/druid/java/util/metrics/JvmThreadsMonitor.java similarity index 93% rename from java-util/src/main/java/io/druid/java/util/metrics/JvmThreadsMonitor.java rename to java-util/src/main/java/org/apache/druid/java/util/metrics/JvmThreadsMonitor.java index ac2d29d042fa..acb7783d066b 100644 --- a/java-util/src/main/java/io/druid/java/util/metrics/JvmThreadsMonitor.java +++ b/java-util/src/main/java/org/apache/druid/java/util/metrics/JvmThreadsMonitor.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; import java.lang.management.ManagementFactory; import java.lang.management.ThreadMXBean; diff --git a/java-util/src/main/java/io/druid/java/util/metrics/KeyedDiff.java b/java-util/src/main/java/org/apache/druid/java/util/metrics/KeyedDiff.java similarity index 94% rename from java-util/src/main/java/io/druid/java/util/metrics/KeyedDiff.java rename to java-util/src/main/java/org/apache/druid/java/util/metrics/KeyedDiff.java index f95c3953e453..e4bfd041419d 100644 --- a/java-util/src/main/java/io/druid/java/util/metrics/KeyedDiff.java +++ b/java-util/src/main/java/org/apache/druid/java/util/metrics/KeyedDiff.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.logger.Logger; import java.util.HashMap; import java.util.Map; diff --git a/java-util/src/main/java/io/druid/java/util/metrics/Monitor.java b/java-util/src/main/java/org/apache/druid/java/util/metrics/Monitor.java similarity index 89% rename from java-util/src/main/java/io/druid/java/util/metrics/Monitor.java rename to java-util/src/main/java/org/apache/druid/java/util/metrics/Monitor.java index 5e4efc7d3bcb..ac926bee749d 100644 --- a/java-util/src/main/java/io/druid/java/util/metrics/Monitor.java +++ b/java-util/src/main/java/org/apache/druid/java/util/metrics/Monitor.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; -import io.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; /** */ diff --git a/java-util/src/main/java/io/druid/java/util/metrics/MonitorScheduler.java b/java-util/src/main/java/org/apache/druid/java/util/metrics/MonitorScheduler.java similarity index 90% rename from java-util/src/main/java/io/druid/java/util/metrics/MonitorScheduler.java rename to java-util/src/main/java/org/apache/druid/java/util/metrics/MonitorScheduler.java index 713d82f9d29d..118f283ac2c3 100644 --- a/java-util/src/main/java/io/druid/java/util/metrics/MonitorScheduler.java +++ b/java-util/src/main/java/org/apache/druid/java/util/metrics/MonitorScheduler.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; import com.google.common.collect.Sets; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.concurrent.ScheduledExecutors; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.concurrent.ScheduledExecutors; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; import java.util.List; import java.util.Set; diff --git a/java-util/src/main/java/io/druid/java/util/metrics/MonitorSchedulerConfig.java b/java-util/src/main/java/org/apache/druid/java/util/metrics/MonitorSchedulerConfig.java similarity index 87% rename from java-util/src/main/java/io/druid/java/util/metrics/MonitorSchedulerConfig.java rename to java-util/src/main/java/org/apache/druid/java/util/metrics/MonitorSchedulerConfig.java index 32e14475c1e4..8d0e165e2add 100644 --- a/java-util/src/main/java/io/druid/java/util/metrics/MonitorSchedulerConfig.java +++ b/java-util/src/main/java/org/apache/druid/java/util/metrics/MonitorSchedulerConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; import org.joda.time.Duration; import org.skife.config.Config; @@ -27,7 +27,7 @@ */ public abstract class MonitorSchedulerConfig { - @Config({"io.druid.java.util.metrics.emitter.period", "com.metamx.druid.emitter.period"}) + @Config({"org.apache.druid.java.util.metrics.emitter.period", "com.metamx.druid.emitter.period"}) @Default("PT60s") public abstract Duration getEmitterPeriod(); } diff --git a/java-util/src/main/java/io/druid/java/util/metrics/MonitorUtils.java b/java-util/src/main/java/org/apache/druid/java/util/metrics/MonitorUtils.java similarity index 90% rename from java-util/src/main/java/io/druid/java/util/metrics/MonitorUtils.java rename to java-util/src/main/java/org/apache/druid/java/util/metrics/MonitorUtils.java index eb901c1459aa..03ad62438545 100644 --- a/java-util/src/main/java/io/druid/java/util/metrics/MonitorUtils.java +++ b/java-util/src/main/java/org/apache/druid/java/util/metrics/MonitorUtils.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; -import io.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; import java.util.Map; diff --git a/java-util/src/main/java/io/druid/java/util/metrics/Monitors.java b/java-util/src/main/java/org/apache/druid/java/util/metrics/Monitors.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/metrics/Monitors.java rename to java-util/src/main/java/org/apache/druid/java/util/metrics/Monitors.java index c040fbbedb16..3893f1a6feb3 100644 --- a/java-util/src/main/java/io/druid/java/util/metrics/Monitors.java +++ b/java-util/src/main/java/org/apache/druid/java/util/metrics/Monitors.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; import java.util.List; import java.util.Map; diff --git a/java-util/src/main/java/io/druid/java/util/metrics/ParametrizedUriEmitterMonitor.java b/java-util/src/main/java/org/apache/druid/java/util/metrics/ParametrizedUriEmitterMonitor.java similarity index 92% rename from java-util/src/main/java/io/druid/java/util/metrics/ParametrizedUriEmitterMonitor.java rename to java-util/src/main/java/org/apache/druid/java/util/metrics/ParametrizedUriEmitterMonitor.java index 9fed44ceb726..06af8813d5cf 100644 --- a/java-util/src/main/java/io/druid/java/util/metrics/ParametrizedUriEmitterMonitor.java +++ b/java-util/src/main/java/org/apache/druid/java/util/metrics/ParametrizedUriEmitterMonitor.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.emitter.core.ParametrizedUriEmitter; -import io.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.core.ParametrizedUriEmitter; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; import java.net.URI; import java.util.HashMap; diff --git a/java-util/src/main/java/io/druid/java/util/metrics/PidDiscoverer.java b/java-util/src/main/java/org/apache/druid/java/util/metrics/PidDiscoverer.java similarity index 95% rename from java-util/src/main/java/io/druid/java/util/metrics/PidDiscoverer.java rename to java-util/src/main/java/org/apache/druid/java/util/metrics/PidDiscoverer.java index 54904435bb8b..7a2153105864 100644 --- a/java-util/src/main/java/io/druid/java/util/metrics/PidDiscoverer.java +++ b/java-util/src/main/java/org/apache/druid/java/util/metrics/PidDiscoverer.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; public interface PidDiscoverer { diff --git a/java-util/src/main/java/io/druid/java/util/metrics/SigarPidDiscoverer.java b/java-util/src/main/java/org/apache/druid/java/util/metrics/SigarPidDiscoverer.java similarity index 96% rename from java-util/src/main/java/io/druid/java/util/metrics/SigarPidDiscoverer.java rename to java-util/src/main/java/org/apache/druid/java/util/metrics/SigarPidDiscoverer.java index 08510e995b9c..e129cfbb8108 100644 --- a/java-util/src/main/java/io/druid/java/util/metrics/SigarPidDiscoverer.java +++ b/java-util/src/main/java/org/apache/druid/java/util/metrics/SigarPidDiscoverer.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; public class SigarPidDiscoverer implements PidDiscoverer { diff --git a/java-util/src/main/java/io/druid/java/util/metrics/SigarUtil.java b/java-util/src/main/java/org/apache/druid/java/util/metrics/SigarUtil.java similarity index 95% rename from java-util/src/main/java/io/druid/java/util/metrics/SigarUtil.java rename to java-util/src/main/java/org/apache/druid/java/util/metrics/SigarUtil.java index 68ba4174c79c..5dbf767f997c 100644 --- a/java-util/src/main/java/io/druid/java/util/metrics/SigarUtil.java +++ b/java-util/src/main/java/org/apache/druid/java/util/metrics/SigarUtil.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; import com.google.common.base.Throwables; -import io.druid.java.util.common.StreamUtils; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.StreamUtils; +import org.apache.druid.java.util.common.logger.Logger; import org.hyperic.jni.ArchLoaderException; import org.hyperic.jni.ArchNotSupportedException; import org.hyperic.sigar.Sigar; diff --git a/java-util/src/main/java/io/druid/java/util/metrics/SysMonitor.java b/java-util/src/main/java/org/apache/druid/java/util/metrics/SysMonitor.java similarity index 98% rename from java-util/src/main/java/io/druid/java/util/metrics/SysMonitor.java rename to java-util/src/main/java/org/apache/druid/java/util/metrics/SysMonitor.java index 940430ab796e..3651be1779fe 100644 --- a/java-util/src/main/java/io/druid/java/util/metrics/SysMonitor.java +++ b/java-util/src/main/java/org/apache/druid/java/util/metrics/SysMonitor.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; import org.hyperic.sigar.Cpu; import org.hyperic.sigar.DirUsage; import org.hyperic.sigar.DiskUsage; diff --git a/java-util/src/main/java/io/druid/java/util/metrics/cgroups/CgroupDiscoverer.java b/java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/CgroupDiscoverer.java similarity index 95% rename from java-util/src/main/java/io/druid/java/util/metrics/cgroups/CgroupDiscoverer.java rename to java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/CgroupDiscoverer.java index 9e9a14f16f69..bb3bf9166b72 100644 --- a/java-util/src/main/java/io/druid/java/util/metrics/cgroups/CgroupDiscoverer.java +++ b/java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/CgroupDiscoverer.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.metrics.cgroups; +package org.apache.druid.java.util.metrics.cgroups; import java.nio.file.Path; diff --git a/java-util/src/main/java/io/druid/java/util/metrics/cgroups/CpuAcct.java b/java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/CpuAcct.java similarity index 95% rename from java-util/src/main/java/io/druid/java/util/metrics/cgroups/CpuAcct.java rename to java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/CpuAcct.java index 1ee3d532eb61..f5c4899093e4 100644 --- a/java-util/src/main/java/io/druid/java/util/metrics/cgroups/CpuAcct.java +++ b/java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/CpuAcct.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.java.util.metrics.cgroups; +package org.apache.druid.java.util.metrics.cgroups; import com.google.common.base.Preconditions; -import io.druid.java.util.common.RE; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.metrics.CgroupUtil; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.metrics.CgroupUtil; import java.io.File; import java.io.IOException; diff --git a/java-util/src/main/java/io/druid/java/util/metrics/cgroups/Memory.java b/java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/Memory.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/metrics/cgroups/Memory.java rename to java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/Memory.java index f8b5ebe57116..bc4487bb478d 100644 --- a/java-util/src/main/java/io/druid/java/util/metrics/cgroups/Memory.java +++ b/java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/Memory.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.java.util.metrics.cgroups; +package org.apache.druid.java.util.metrics.cgroups; import com.google.common.collect.ImmutableMap; import com.google.common.primitives.Longs; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.logger.Logger; import java.io.BufferedReader; import java.io.IOException; diff --git a/java-util/src/main/java/io/druid/java/util/metrics/cgroups/ProcCgroupDiscoverer.java b/java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/ProcCgroupDiscoverer.java similarity index 97% rename from java-util/src/main/java/io/druid/java/util/metrics/cgroups/ProcCgroupDiscoverer.java rename to java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/ProcCgroupDiscoverer.java index 0a0483a1f9b3..bb532ba09df0 100644 --- a/java-util/src/main/java/io/druid/java/util/metrics/cgroups/ProcCgroupDiscoverer.java +++ b/java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/ProcCgroupDiscoverer.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.java.util.metrics.cgroups; +package org.apache.druid.java.util.metrics.cgroups; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import com.google.common.io.Files; -import io.druid.java.util.common.RE; -import io.druid.java.util.metrics.CgroupUtil; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.java.util.metrics.CgroupUtil; import java.io.File; import java.io.IOException; diff --git a/java-util/src/main/java/io/druid/java/util/metrics/cgroups/ProcSelfCgroupDiscoverer.java b/java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/ProcSelfCgroupDiscoverer.java similarity index 95% rename from java-util/src/main/java/io/druid/java/util/metrics/cgroups/ProcSelfCgroupDiscoverer.java rename to java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/ProcSelfCgroupDiscoverer.java index c26e594b4777..2fb44fc0ae75 100644 --- a/java-util/src/main/java/io/druid/java/util/metrics/cgroups/ProcSelfCgroupDiscoverer.java +++ b/java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/ProcSelfCgroupDiscoverer.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.metrics.cgroups; +package org.apache.druid.java.util.metrics.cgroups; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/java-util/src/test/java/io/druid/concurrent/ConcurrentAwaitableCounterTest.java b/java-util/src/test/java/org/apache/druid/concurrent/ConcurrentAwaitableCounterTest.java similarity index 98% rename from java-util/src/test/java/io/druid/concurrent/ConcurrentAwaitableCounterTest.java rename to java-util/src/test/java/org/apache/druid/concurrent/ConcurrentAwaitableCounterTest.java index 3191b1b9f559..1a5bb4a5d061 100644 --- a/java-util/src/test/java/io/druid/concurrent/ConcurrentAwaitableCounterTest.java +++ b/java-util/src/test/java/org/apache/druid/concurrent/ConcurrentAwaitableCounterTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.concurrent; +package org.apache.druid.concurrent; import org.junit.Assert; import org.junit.Test; diff --git a/java-util/src/test/java/io/druid/java/util/common/BufferUtils.java b/java-util/src/test/java/org/apache/druid/java/util/common/BufferUtils.java similarity index 96% rename from java-util/src/test/java/io/druid/java/util/common/BufferUtils.java rename to java-util/src/test/java/org/apache/druid/java/util/common/BufferUtils.java index 0870f3df8ebb..bcbc1e229057 100644 --- a/java-util/src/test/java/io/druid/java/util/common/BufferUtils.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/BufferUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common; +package org.apache.druid.java.util.common; import java.lang.management.BufferPoolMXBean; import java.lang.management.ManagementFactory; diff --git a/java-util/src/test/java/io/druid/java/util/common/ByteBufferUtilsTest.java b/java-util/src/test/java/org/apache/druid/java/util/common/ByteBufferUtilsTest.java similarity index 98% rename from java-util/src/test/java/io/druid/java/util/common/ByteBufferUtilsTest.java rename to java-util/src/test/java/org/apache/druid/java/util/common/ByteBufferUtilsTest.java index fb0855110034..74622396bbd1 100644 --- a/java-util/src/test/java/io/druid/java/util/common/ByteBufferUtilsTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/ByteBufferUtilsTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common; +package org.apache.druid.java.util.common; import com.google.common.io.Files; import junit.framework.Assert; diff --git a/java-util/src/test/java/io/druid/java/util/common/CompressionUtilsTest.java b/java-util/src/test/java/org/apache/druid/java/util/common/CompressionUtilsTest.java similarity index 99% rename from java-util/src/test/java/io/druid/java/util/common/CompressionUtilsTest.java rename to java-util/src/test/java/org/apache/druid/java/util/common/CompressionUtilsTest.java index 2e02c770ea83..f3fd03a310c7 100644 --- a/java-util/src/test/java/io/druid/java/util/common/CompressionUtilsTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/CompressionUtilsTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common; +package org.apache.druid.java.util.common; import com.google.common.base.Predicates; import com.google.common.base.Throwables; diff --git a/java-util/src/test/java/io/druid/java/util/common/FileUtilsTest.java b/java-util/src/test/java/org/apache/druid/java/util/common/FileUtilsTest.java similarity index 98% rename from java-util/src/test/java/io/druid/java/util/common/FileUtilsTest.java rename to java-util/src/test/java/org/apache/druid/java/util/common/FileUtilsTest.java index 96fd35e38c13..ca8432cec318 100644 --- a/java-util/src/test/java/io/druid/java/util/common/FileUtilsTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/FileUtilsTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common; +package org.apache.druid.java.util.common; import org.junit.Assert; import org.junit.Rule; diff --git a/java-util/src/test/java/io/druid/java/util/common/GranularityTest.java b/java-util/src/test/java/org/apache/druid/java/util/common/GranularityTest.java similarity index 98% rename from java-util/src/test/java/io/druid/java/util/common/GranularityTest.java rename to java-util/src/test/java/org/apache/druid/java/util/common/GranularityTest.java index 3006c5e4c0bd..9e48a34920bb 100644 --- a/java-util/src/test/java/io/druid/java/util/common/GranularityTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/GranularityTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.java.util.common; +package org.apache.druid.java.util.common; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.granularity.GranularityType; -import io.druid.java.util.common.granularity.PeriodGranularity; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.granularity.GranularityType; +import org.apache.druid.java.util.common.granularity.PeriodGranularity; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.IllegalFieldValueException; diff --git a/java-util/src/test/java/io/druid/java/util/common/NumbersTest.java b/java-util/src/test/java/org/apache/druid/java/util/common/NumbersTest.java similarity index 98% rename from java-util/src/test/java/io/druid/java/util/common/NumbersTest.java rename to java-util/src/test/java/org/apache/druid/java/util/common/NumbersTest.java index e2b8e519e2b0..dae51dbdd52f 100644 --- a/java-util/src/test/java/io/druid/java/util/common/NumbersTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/NumbersTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common; +package org.apache.druid.java.util.common; import org.hamcrest.CoreMatchers; import org.junit.Assert; diff --git a/java-util/src/test/java/io/druid/java/util/common/RetryUtilsTest.java b/java-util/src/test/java/org/apache/druid/java/util/common/RetryUtilsTest.java similarity index 98% rename from java-util/src/test/java/io/druid/java/util/common/RetryUtilsTest.java rename to java-util/src/test/java/org/apache/druid/java/util/common/RetryUtilsTest.java index fecf95207111..a9114d87ca83 100644 --- a/java-util/src/test/java/io/druid/java/util/common/RetryUtilsTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/RetryUtilsTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common; +package org.apache.druid.java.util.common; import com.google.common.base.Predicate; import org.junit.Assert; diff --git a/java-util/src/test/java/io/druid/java/util/common/StreamUtilsTest.java b/java-util/src/test/java/org/apache/druid/java/util/common/StreamUtilsTest.java similarity index 98% rename from java-util/src/test/java/io/druid/java/util/common/StreamUtilsTest.java rename to java-util/src/test/java/org/apache/druid/java/util/common/StreamUtilsTest.java index ae03f9245c86..86c9235ae8e3 100644 --- a/java-util/src/test/java/io/druid/java/util/common/StreamUtilsTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/StreamUtilsTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common; +package org.apache.druid.java.util.common; import com.google.common.io.ByteSink; import com.google.common.io.ByteSource; diff --git a/java-util/src/test/java/io/druid/java/util/common/StringUtilsTest.java b/java-util/src/test/java/org/apache/druid/java/util/common/StringUtilsTest.java similarity index 98% rename from java-util/src/test/java/io/druid/java/util/common/StringUtilsTest.java rename to java-util/src/test/java/org/apache/druid/java/util/common/StringUtilsTest.java index 44db96dcfa27..87f7afad3f6d 100644 --- a/java-util/src/test/java/io/druid/java/util/common/StringUtilsTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/StringUtilsTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common; +package org.apache.druid.java.util.common; import org.junit.Assert; import org.junit.Test; diff --git a/java-util/src/test/java/io/druid/java/util/common/guava/BaseSequenceTest.java b/java-util/src/test/java/org/apache/druid/java/util/common/guava/BaseSequenceTest.java similarity index 98% rename from java-util/src/test/java/io/druid/java/util/common/guava/BaseSequenceTest.java rename to java-util/src/test/java/org/apache/druid/java/util/common/guava/BaseSequenceTest.java index 6786d684a430..9e41faf3c962 100644 --- a/java-util/src/test/java/io/druid/java/util/common/guava/BaseSequenceTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/guava/BaseSequenceTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import org.junit.Test; diff --git a/java-util/src/test/java/io/druid/java/util/common/guava/ComparatorsTest.java b/java-util/src/test/java/org/apache/druid/java/util/common/guava/ComparatorsTest.java similarity index 98% rename from java-util/src/test/java/io/druid/java/util/common/guava/ComparatorsTest.java rename to java-util/src/test/java/org/apache/druid/java/util/common/guava/ComparatorsTest.java index 898598b3009a..61ab1e4577da 100644 --- a/java-util/src/test/java/io/druid/java/util/common/guava/ComparatorsTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/guava/ComparatorsTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; -import io.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Intervals; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Test; diff --git a/java-util/src/test/java/io/druid/java/util/common/guava/ConcatSequenceTest.java b/java-util/src/test/java/org/apache/druid/java/util/common/guava/ConcatSequenceTest.java similarity index 99% rename from java-util/src/test/java/io/druid/java/util/common/guava/ConcatSequenceTest.java rename to java-util/src/test/java/org/apache/druid/java/util/common/guava/ConcatSequenceTest.java index b14c16fd1826..481d1d11c321 100644 --- a/java-util/src/test/java/io/druid/java/util/common/guava/ConcatSequenceTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/guava/ConcatSequenceTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; diff --git a/java-util/src/test/java/io/druid/java/util/common/guava/FilteredSequenceTest.java b/java-util/src/test/java/org/apache/druid/java/util/common/guava/FilteredSequenceTest.java similarity index 94% rename from java-util/src/test/java/io/druid/java/util/common/guava/FilteredSequenceTest.java rename to java-util/src/test/java/org/apache/druid/java/util/common/guava/FilteredSequenceTest.java index 8b5f8f0f20bc..09be6fca8492 100644 --- a/java-util/src/test/java/io/druid/java/util/common/guava/FilteredSequenceTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/guava/FilteredSequenceTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import org.junit.Test; import java.util.List; diff --git a/java-util/src/test/java/io/druid/java/util/common/guava/FunctionalIterableTest.java b/java-util/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIterableTest.java similarity index 98% rename from java-util/src/test/java/io/druid/java/util/common/guava/FunctionalIterableTest.java rename to java-util/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIterableTest.java index 139cc78f36b0..1c866f18488f 100644 --- a/java-util/src/test/java/io/druid/java/util/common/guava/FunctionalIterableTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIterableTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import com.google.common.base.Function; import com.google.common.base.Predicate; diff --git a/java-util/src/test/java/io/druid/java/util/common/guava/FunctionalIteratorTest.java b/java-util/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIteratorTest.java similarity index 98% rename from java-util/src/test/java/io/druid/java/util/common/guava/FunctionalIteratorTest.java rename to java-util/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIteratorTest.java index 4b439b78916d..d32bc014240e 100644 --- a/java-util/src/test/java/io/druid/java/util/common/guava/FunctionalIteratorTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIteratorTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import com.google.common.base.Function; import com.google.common.base.Predicate; diff --git a/java-util/src/test/java/io/druid/java/util/common/guava/LimitedSequenceTest.java b/java-util/src/test/java/org/apache/druid/java/util/common/guava/LimitedSequenceTest.java similarity index 98% rename from java-util/src/test/java/io/druid/java/util/common/guava/LimitedSequenceTest.java rename to java-util/src/test/java/org/apache/druid/java/util/common/guava/LimitedSequenceTest.java index 6c18990c05e1..6cbd97445464 100644 --- a/java-util/src/test/java/io/druid/java/util/common/guava/LimitedSequenceTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/guava/LimitedSequenceTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; diff --git a/java-util/src/test/java/io/druid/java/util/common/guava/MappedSequenceTest.java b/java-util/src/test/java/org/apache/druid/java/util/common/guava/MappedSequenceTest.java similarity index 93% rename from java-util/src/test/java/io/druid/java/util/common/guava/MappedSequenceTest.java rename to java-util/src/test/java/org/apache/druid/java/util/common/guava/MappedSequenceTest.java index cf11445778d0..14f31c4bbfb5 100644 --- a/java-util/src/test/java/io/druid/java/util/common/guava/MappedSequenceTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/guava/MappedSequenceTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import com.google.common.collect.Lists; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import org.junit.Test; import java.util.List; diff --git a/java-util/src/test/java/io/druid/java/util/common/guava/MergeIteratorTest.java b/java-util/src/test/java/org/apache/druid/java/util/common/guava/MergeIteratorTest.java similarity index 97% rename from java-util/src/test/java/io/druid/java/util/common/guava/MergeIteratorTest.java rename to java-util/src/test/java/org/apache/druid/java/util/common/guava/MergeIteratorTest.java index dce461813ca3..87d6dfb9b22d 100644 --- a/java-util/src/test/java/io/druid/java/util/common/guava/MergeIteratorTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/guava/MergeIteratorTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import com.google.common.collect.Lists; import com.google.common.collect.Ordering; diff --git a/java-util/src/test/java/io/druid/java/util/common/guava/MergeSequenceTest.java b/java-util/src/test/java/org/apache/druid/java/util/common/guava/MergeSequenceTest.java similarity index 99% rename from java-util/src/test/java/io/druid/java/util/common/guava/MergeSequenceTest.java rename to java-util/src/test/java/org/apache/druid/java/util/common/guava/MergeSequenceTest.java index 55ee2073ec85..61af63869487 100644 --- a/java-util/src/test/java/io/druid/java/util/common/guava/MergeSequenceTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/guava/MergeSequenceTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import com.google.common.collect.Lists; import com.google.common.collect.Ordering; diff --git a/java-util/src/test/java/io/druid/java/util/common/guava/SequenceTestHelper.java b/java-util/src/test/java/org/apache/druid/java/util/common/guava/SequenceTestHelper.java similarity index 98% rename from java-util/src/test/java/io/druid/java/util/common/guava/SequenceTestHelper.java rename to java-util/src/test/java/org/apache/druid/java/util/common/guava/SequenceTestHelper.java index abc14abb249b..e4450210ae24 100644 --- a/java-util/src/test/java/io/druid/java/util/common/guava/SequenceTestHelper.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/guava/SequenceTestHelper.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import junit.framework.Assert; diff --git a/java-util/src/test/java/io/druid/java/util/common/guava/TestSequence.java b/java-util/src/test/java/org/apache/druid/java/util/common/guava/TestSequence.java similarity index 97% rename from java-util/src/test/java/io/druid/java/util/common/guava/TestSequence.java rename to java-util/src/test/java/org/apache/druid/java/util/common/guava/TestSequence.java index 876f201fea95..6e2c3b13da62 100644 --- a/java-util/src/test/java/io/druid/java/util/common/guava/TestSequence.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/guava/TestSequence.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import java.io.Closeable; import java.util.Arrays; diff --git a/java-util/src/test/java/io/druid/java/util/common/guava/UnsupportedSequence.java b/java-util/src/test/java/org/apache/druid/java/util/common/guava/UnsupportedSequence.java similarity index 96% rename from java-util/src/test/java/io/druid/java/util/common/guava/UnsupportedSequence.java rename to java-util/src/test/java/org/apache/druid/java/util/common/guava/UnsupportedSequence.java index 73722766fd3e..18cc457284cb 100644 --- a/java-util/src/test/java/io/druid/java/util/common/guava/UnsupportedSequence.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/guava/UnsupportedSequence.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; /** */ diff --git a/java-util/src/test/java/io/druid/java/util/common/guava/WithEffectSequenceTest.java b/java-util/src/test/java/org/apache/druid/java/util/common/guava/WithEffectSequenceTest.java similarity index 98% rename from java-util/src/test/java/io/druid/java/util/common/guava/WithEffectSequenceTest.java rename to java-util/src/test/java/org/apache/druid/java/util/common/guava/WithEffectSequenceTest.java index 245969a73c7b..d90e6a138823 100644 --- a/java-util/src/test/java/io/druid/java/util/common/guava/WithEffectSequenceTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/guava/WithEffectSequenceTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import com.google.common.util.concurrent.MoreExecutors; import org.junit.Assert; diff --git a/java-util/src/test/java/io/druid/java/util/common/guava/WrappingSequenceTest.java b/java-util/src/test/java/org/apache/druid/java/util/common/guava/WrappingSequenceTest.java similarity index 97% rename from java-util/src/test/java/io/druid/java/util/common/guava/WrappingSequenceTest.java rename to java-util/src/test/java/org/apache/druid/java/util/common/guava/WrappingSequenceTest.java index 70572214fb6c..518aae77473f 100644 --- a/java-util/src/test/java/io/druid/java/util/common/guava/WrappingSequenceTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/guava/WrappingSequenceTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.guava; +package org.apache.druid.java.util.common.guava; import org.junit.Assert; import org.junit.Test; diff --git a/java-util/src/test/java/io/druid/java/util/common/guava/nary/SortedMergeIteratorTest.java b/java-util/src/test/java/org/apache/druid/java/util/common/guava/nary/SortedMergeIteratorTest.java similarity index 93% rename from java-util/src/test/java/io/druid/java/util/common/guava/nary/SortedMergeIteratorTest.java rename to java-util/src/test/java/org/apache/druid/java/util/common/guava/nary/SortedMergeIteratorTest.java index c5e800febdcf..a17a75e656d8 100644 --- a/java-util/src/test/java/io/druid/java/util/common/guava/nary/SortedMergeIteratorTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/guava/nary/SortedMergeIteratorTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.java.util.common.guava.nary; +package org.apache.druid.java.util.common.guava.nary; import com.google.common.collect.Lists; -import io.druid.java.util.common.guava.Comparators; +import org.apache.druid.java.util.common.guava.Comparators; import org.junit.Assert; import org.junit.Test; diff --git a/java-util/src/test/java/io/druid/java/util/common/io/NativeIOTest.java b/java-util/src/test/java/org/apache/druid/java/util/common/io/NativeIOTest.java similarity index 98% rename from java-util/src/test/java/io/druid/java/util/common/io/NativeIOTest.java rename to java-util/src/test/java/org/apache/druid/java/util/common/io/NativeIOTest.java index 6352d2f9f397..5e89278d47f5 100644 --- a/java-util/src/test/java/io/druid/java/util/common/io/NativeIOTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/io/NativeIOTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.io; +package org.apache.druid.java.util.common.io; import org.junit.Assert; import org.junit.Rule; diff --git a/java-util/src/test/java/io/druid/java/util/common/io/smoosh/SmooshedFileMapperTest.java b/java-util/src/test/java/org/apache/druid/java/util/common/io/smoosh/SmooshedFileMapperTest.java similarity index 97% rename from java-util/src/test/java/io/druid/java/util/common/io/smoosh/SmooshedFileMapperTest.java rename to java-util/src/test/java/org/apache/druid/java/util/common/io/smoosh/SmooshedFileMapperTest.java index fc26992019d8..38510f87eaca 100644 --- a/java-util/src/test/java/io/druid/java/util/common/io/smoosh/SmooshedFileMapperTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/io/smoosh/SmooshedFileMapperTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.java.util.common.io.smoosh; +package org.apache.druid.java.util.common.io.smoosh; import com.google.common.io.Files; import com.google.common.primitives.Ints; -import io.druid.java.util.common.BufferUtils; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.BufferUtils; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; import junit.framework.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/java-util/src/test/java/io/druid/java/util/common/lifecycle/LifecycleTest.java b/java-util/src/test/java/org/apache/druid/java/util/common/lifecycle/LifecycleTest.java similarity index 99% rename from java-util/src/test/java/io/druid/java/util/common/lifecycle/LifecycleTest.java rename to java-util/src/test/java/org/apache/druid/java/util/common/lifecycle/LifecycleTest.java index 1f217f517ea2..454909a44db7 100644 --- a/java-util/src/test/java/io/druid/java/util/common/lifecycle/LifecycleTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/lifecycle/LifecycleTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.java.util.common.lifecycle; +package org.apache.druid.java.util.common.lifecycle; import com.google.common.collect.Lists; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.ISE; import org.junit.Assert; import org.junit.Test; diff --git a/java-util/src/test/java/io/druid/java/util/common/logger/LoggerTest.java b/java-util/src/test/java/org/apache/druid/java/util/common/logger/LoggerTest.java similarity index 96% rename from java-util/src/test/java/io/druid/java/util/common/logger/LoggerTest.java rename to java-util/src/test/java/org/apache/druid/java/util/common/logger/LoggerTest.java index 51b28593c1f9..d5d55d98a420 100644 --- a/java-util/src/test/java/io/druid/java/util/common/logger/LoggerTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/logger/LoggerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.logger; +package org.apache.druid.java.util.common.logger; import org.junit.Test; diff --git a/java-util/src/test/java/io/druid/java/util/common/parsers/FlatTextFormatParserTest.java b/java-util/src/test/java/org/apache/druid/java/util/common/parsers/FlatTextFormatParserTest.java similarity index 97% rename from java-util/src/test/java/io/druid/java/util/common/parsers/FlatTextFormatParserTest.java rename to java-util/src/test/java/org/apache/druid/java/util/common/parsers/FlatTextFormatParserTest.java index 1dfde3f3693c..503bac79cdf5 100644 --- a/java-util/src/test/java/io/druid/java/util/common/parsers/FlatTextFormatParserTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/parsers/FlatTextFormatParserTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.java.util.common.parsers; +package org.apache.druid.java.util.common.parsers; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.parsers.AbstractFlatTextFormatParser.FlatTextFormat; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.parsers.AbstractFlatTextFormatParser.FlatTextFormat; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/java-util/src/test/java/io/druid/java/util/common/parsers/JSONPathParserTest.java b/java-util/src/test/java/org/apache/druid/java/util/common/parsers/JSONPathParserTest.java similarity index 99% rename from java-util/src/test/java/io/druid/java/util/common/parsers/JSONPathParserTest.java rename to java-util/src/test/java/org/apache/druid/java/util/common/parsers/JSONPathParserTest.java index b61ee72c1402..b4ee2849daac 100644 --- a/java-util/src/test/java/io/druid/java/util/common/parsers/JSONPathParserTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/parsers/JSONPathParserTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.parsers; +package org.apache.druid.java.util.common.parsers; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/java-util/src/test/java/io/druid/java/util/common/parsers/JavaScriptParserTest.java b/java-util/src/test/java/org/apache/druid/java/util/common/parsers/JavaScriptParserTest.java similarity index 97% rename from java-util/src/test/java/io/druid/java/util/common/parsers/JavaScriptParserTest.java rename to java-util/src/test/java/org/apache/druid/java/util/common/parsers/JavaScriptParserTest.java index dd66f1bd4b43..e0a6a9cf2def 100644 --- a/java-util/src/test/java/io/druid/java/util/common/parsers/JavaScriptParserTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/parsers/JavaScriptParserTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.parsers; +package org.apache.druid.java.util.common.parsers; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; diff --git a/java-util/src/test/java/io/druid/java/util/common/parsers/RegexParserTest.java b/java-util/src/test/java/org/apache/druid/java/util/common/parsers/RegexParserTest.java similarity index 99% rename from java-util/src/test/java/io/druid/java/util/common/parsers/RegexParserTest.java rename to java-util/src/test/java/org/apache/druid/java/util/common/parsers/RegexParserTest.java index 090c64db99cc..28060325e5bb 100644 --- a/java-util/src/test/java/io/druid/java/util/common/parsers/RegexParserTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/parsers/RegexParserTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.common.parsers; +package org.apache.druid.java.util.common.parsers; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; diff --git a/java-util/src/test/java/io/druid/java/util/common/parsers/TimestampParserTest.java b/java-util/src/test/java/org/apache/druid/java/util/common/parsers/TimestampParserTest.java similarity index 98% rename from java-util/src/test/java/io/druid/java/util/common/parsers/TimestampParserTest.java rename to java-util/src/test/java/org/apache/druid/java/util/common/parsers/TimestampParserTest.java index ef6960d67293..9c0e66e10d22 100644 --- a/java-util/src/test/java/io/druid/java/util/common/parsers/TimestampParserTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/common/parsers/TimestampParserTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.java.util.common.parsers; +package org.apache.druid.java.util.common.parsers; import com.google.common.base.Function; -import io.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.DateTimes; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.junit.Assert; diff --git a/java-util/src/test/java/io/druid/java/util/emitter/core/ComposingEmitterTest.java b/java-util/src/test/java/org/apache/druid/java/util/emitter/core/ComposingEmitterTest.java similarity index 97% rename from java-util/src/test/java/io/druid/java/util/emitter/core/ComposingEmitterTest.java rename to java-util/src/test/java/org/apache/druid/java/util/emitter/core/ComposingEmitterTest.java index 8f3426d8bc49..2058c8f87041 100644 --- a/java-util/src/test/java/io/druid/java/util/emitter/core/ComposingEmitterTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/emitter/core/ComposingEmitterTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; import com.google.common.collect.ImmutableList; import org.easymock.EasyMock; diff --git a/java-util/src/test/java/io/druid/java/util/emitter/core/CustomEmitterFactoryTest.java b/java-util/src/test/java/org/apache/druid/java/util/emitter/core/CustomEmitterFactoryTest.java similarity index 87% rename from java-util/src/test/java/io/druid/java/util/emitter/core/CustomEmitterFactoryTest.java rename to java-util/src/test/java/org/apache/druid/java/util/emitter/core/CustomEmitterFactoryTest.java index c3d854950e22..96ffacf5f92e 100644 --- a/java-util/src/test/java/io/druid/java/util/emitter/core/CustomEmitterFactoryTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/emitter/core/CustomEmitterFactoryTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.emitter.factory.EmitterFactory; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.emitter.factory.EmitterFactory; import org.asynchttpclient.AsyncHttpClient; import org.junit.Assert; import org.junit.Test; @@ -85,9 +85,9 @@ public void close() {} public void testCustomEmitter() { final Properties props = new Properties(); - props.put("io.druid.java.util.emitter.stringProperty", "http://example.com/"); - props.put("io.druid.java.util.emitter.intProperty", "1"); - props.put("io.druid.java.util.emitter.type", "test"); + props.put("org.apache.druid.java.util.emitter.stringProperty", "http://example.com/"); + props.put("org.apache.druid.java.util.emitter.intProperty", "1"); + props.put("org.apache.druid.java.util.emitter.type", "test"); final ObjectMapper objectMapper = new ObjectMapper(); objectMapper.registerSubtypes(TestEmitterConfig.class); diff --git a/java-util/src/test/java/io/druid/java/util/emitter/core/EmitterTest.java b/java-util/src/test/java/org/apache/druid/java/util/emitter/core/EmitterTest.java similarity index 96% rename from java-util/src/test/java/io/druid/java/util/emitter/core/EmitterTest.java rename to java-util/src/test/java/org/apache/druid/java/util/emitter/core/EmitterTest.java index 4870037d192f..fe961bbf54a5 100644 --- a/java-util/src/test/java/io/druid/java/util/emitter/core/EmitterTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/emitter/core/EmitterTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.io.BaseEncoding; -import io.druid.java.util.common.CompressionUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.emitter.service.UnitEvent; +import org.apache.druid.java.util.common.CompressionUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.emitter.service.UnitEvent; import io.netty.buffer.Unpooled; import io.netty.handler.codec.http.DefaultHttpResponse; import io.netty.handler.codec.http.HttpHeaders; @@ -137,10 +137,10 @@ private HttpPostEmitter sizeBasedEmitter(int size) private HttpPostEmitter sizeBasedEmitterGeneralizedCreation(int size) { Properties props = new Properties(); - props.setProperty("io.druid.java.util.emitter.type", "http"); - props.setProperty("io.druid.java.util.emitter.recipientBaseUrl", TARGET_URL); - props.setProperty("io.druid.java.util.emitter.flushMillis", String.valueOf(Long.MAX_VALUE)); - props.setProperty("io.druid.java.util.emitter.flushCount", String.valueOf(size)); + props.setProperty("org.apache.druid.java.util.emitter.type", "http"); + props.setProperty("org.apache.druid.java.util.emitter.recipientBaseUrl", TARGET_URL); + props.setProperty("org.apache.druid.java.util.emitter.flushMillis", String.valueOf(Long.MAX_VALUE)); + props.setProperty("org.apache.druid.java.util.emitter.flushCount", String.valueOf(size)); Lifecycle lifecycle = new Lifecycle(); Emitter emitter = Emitters.create(props, httpClient, jsonMapper, lifecycle); diff --git a/java-util/src/test/java/io/druid/java/util/emitter/core/GoHandler.java b/java-util/src/test/java/org/apache/druid/java/util/emitter/core/GoHandler.java similarity index 95% rename from java-util/src/test/java/io/druid/java/util/emitter/core/GoHandler.java rename to java-util/src/test/java/org/apache/druid/java/util/emitter/core/GoHandler.java index 8a85e3b4f9d6..411b592964f1 100644 --- a/java-util/src/test/java/io/druid/java/util/emitter/core/GoHandler.java +++ b/java-util/src/test/java/org/apache/druid/java/util/emitter/core/GoHandler.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; import com.google.common.base.Throwables; -import io.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.ISE; import org.asynchttpclient.ListenableFuture; import org.asynchttpclient.Request; import org.asynchttpclient.Response; diff --git a/java-util/src/test/java/io/druid/java/util/emitter/core/GoHandlers.java b/java-util/src/test/java/org/apache/druid/java/util/emitter/core/GoHandlers.java similarity index 96% rename from java-util/src/test/java/io/druid/java/util/emitter/core/GoHandlers.java rename to java-util/src/test/java/org/apache/druid/java/util/emitter/core/GoHandlers.java index c9eba18ff154..961a7226544d 100644 --- a/java-util/src/test/java/io/druid/java/util/emitter/core/GoHandlers.java +++ b/java-util/src/test/java/org/apache/druid/java/util/emitter/core/GoHandlers.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; -import io.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.ISE; import org.asynchttpclient.ListenableFuture; import org.asynchttpclient.Request; import org.asynchttpclient.Response; diff --git a/java-util/src/test/java/io/druid/java/util/emitter/core/HttpEmitterConfigTest.java b/java-util/src/test/java/org/apache/druid/java/util/emitter/core/HttpEmitterConfigTest.java similarity index 75% rename from java-util/src/test/java/io/druid/java/util/emitter/core/HttpEmitterConfigTest.java rename to java-util/src/test/java/org/apache/druid/java/util/emitter/core/HttpEmitterConfigTest.java index ee0284a13f0a..66e8645a189e 100644 --- a/java-util/src/test/java/io/druid/java/util/emitter/core/HttpEmitterConfigTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/emitter/core/HttpEmitterConfigTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.Pair; import org.junit.Assert; import org.junit.Test; @@ -32,7 +32,7 @@ public class HttpEmitterConfigTest public void testDefaults() { final Properties props = new Properties(); - props.put("io.druid.java.util.emitter.recipientBaseUrl", "http://example.com/"); + props.put("org.apache.druid.java.util.emitter.recipientBaseUrl", "http://example.com/"); final ObjectMapper objectMapper = new ObjectMapper(); final HttpEmitterConfig config = objectMapper.convertValue( @@ -59,7 +59,7 @@ public void testDefaults() public void testDefaultsLegacy() { final Properties props = new Properties(); - props.put("io.druid.java.util.emitter.http.url", "http://example.com/"); + props.put("org.apache.druid.java.util.emitter.http.url", "http://example.com/"); final ObjectMapper objectMapper = new ObjectMapper(); final HttpEmitterConfig config = objectMapper.convertValue(Emitters.makeHttpMap(props), HttpEmitterConfig.class); @@ -83,16 +83,16 @@ public void testDefaultsLegacy() public void testSettingEverything() { final Properties props = new Properties(); - props.setProperty("io.druid.java.util.emitter.flushMillis", "1"); - props.setProperty("io.druid.java.util.emitter.flushCount", "2"); - props.setProperty("io.druid.java.util.emitter.recipientBaseUrl", "http://example.com/"); - props.setProperty("io.druid.java.util.emitter.basicAuthentication", "a:b"); - props.setProperty("io.druid.java.util.emitter.batchingStrategy", "NEWLINES"); - props.setProperty("io.druid.java.util.emitter.maxBatchSize", "4"); - props.setProperty("io.druid.java.util.emitter.flushTimeOut", "1000"); - props.setProperty("io.druid.java.util.emitter.batchQueueSizeLimit", "2500"); - props.setProperty("io.druid.java.util.emitter.httpTimeoutAllowanceFactor", "3.0"); - props.setProperty("io.druid.java.util.emitter.minHttpTimeoutMillis", "100"); + props.setProperty("org.apache.druid.java.util.emitter.flushMillis", "1"); + props.setProperty("org.apache.druid.java.util.emitter.flushCount", "2"); + props.setProperty("org.apache.druid.java.util.emitter.recipientBaseUrl", "http://example.com/"); + props.setProperty("org.apache.druid.java.util.emitter.basicAuthentication", "a:b"); + props.setProperty("org.apache.druid.java.util.emitter.batchingStrategy", "NEWLINES"); + props.setProperty("org.apache.druid.java.util.emitter.maxBatchSize", "4"); + props.setProperty("org.apache.druid.java.util.emitter.flushTimeOut", "1000"); + props.setProperty("org.apache.druid.java.util.emitter.batchQueueSizeLimit", "2500"); + props.setProperty("org.apache.druid.java.util.emitter.httpTimeoutAllowanceFactor", "3.0"); + props.setProperty("org.apache.druid.java.util.emitter.minHttpTimeoutMillis", "100"); final ObjectMapper objectMapper = new ObjectMapper(); final HttpEmitterConfig config = objectMapper.convertValue( @@ -116,16 +116,16 @@ public void testSettingEverything() public void testSettingEverythingLegacy() { final Properties props = new Properties(); - props.setProperty("io.druid.java.util.emitter.flushMillis", "1"); - props.setProperty("io.druid.java.util.emitter.flushCount", "2"); - props.setProperty("io.druid.java.util.emitter.http.url", "http://example.com/"); - props.setProperty("io.druid.java.util.emitter.http.basicAuthentication", "a:b"); - props.setProperty("io.druid.java.util.emitter.http.batchingStrategy", "newlines"); - props.setProperty("io.druid.java.util.emitter.http.maxBatchSize", "4"); - props.setProperty("io.druid.java.util.emitter.http.flushTimeOut", "1000"); - props.setProperty("io.druid.java.util.emitter.http.batchQueueSizeLimit", "2500"); - props.setProperty("io.druid.java.util.emitter.http.httpTimeoutAllowanceFactor", "3.0"); - props.setProperty("io.druid.java.util.emitter.http.minHttpTimeoutMillis", "100"); + props.setProperty("org.apache.druid.java.util.emitter.flushMillis", "1"); + props.setProperty("org.apache.druid.java.util.emitter.flushCount", "2"); + props.setProperty("org.apache.druid.java.util.emitter.http.url", "http://example.com/"); + props.setProperty("org.apache.druid.java.util.emitter.http.basicAuthentication", "a:b"); + props.setProperty("org.apache.druid.java.util.emitter.http.batchingStrategy", "newlines"); + props.setProperty("org.apache.druid.java.util.emitter.http.maxBatchSize", "4"); + props.setProperty("org.apache.druid.java.util.emitter.http.flushTimeOut", "1000"); + props.setProperty("org.apache.druid.java.util.emitter.http.batchQueueSizeLimit", "2500"); + props.setProperty("org.apache.druid.java.util.emitter.http.httpTimeoutAllowanceFactor", "3.0"); + props.setProperty("org.apache.druid.java.util.emitter.http.minHttpTimeoutMillis", "100"); final ObjectMapper objectMapper = new ObjectMapper(); final HttpEmitterConfig config = objectMapper.convertValue(Emitters.makeHttpMap(props), HttpEmitterConfig.class); diff --git a/java-util/src/test/java/io/druid/java/util/emitter/core/HttpEmitterTest.java b/java-util/src/test/java/org/apache/druid/java/util/emitter/core/HttpEmitterTest.java similarity index 98% rename from java-util/src/test/java/io/druid/java/util/emitter/core/HttpEmitterTest.java rename to java-util/src/test/java/org/apache/druid/java/util/emitter/core/HttpEmitterTest.java index 1923575bd42e..812e6659cbd0 100644 --- a/java-util/src/test/java/io/druid/java/util/emitter/core/HttpEmitterTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/emitter/core/HttpEmitterTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.primitives.Ints; diff --git a/java-util/src/test/java/io/druid/java/util/emitter/core/HttpPostEmitterStressTest.java b/java-util/src/test/java/org/apache/druid/java/util/emitter/core/HttpPostEmitterStressTest.java similarity index 98% rename from java-util/src/test/java/io/druid/java/util/emitter/core/HttpPostEmitterStressTest.java rename to java-util/src/test/java/org/apache/druid/java/util/emitter/core/HttpPostEmitterStressTest.java index a020e31069bc..0030ef96e983 100644 --- a/java-util/src/test/java/io/druid/java/util/emitter/core/HttpPostEmitterStressTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/emitter/core/HttpPostEmitterStressTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.primitives.Ints; -import io.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntList; import org.asynchttpclient.ListenableFuture; diff --git a/java-util/src/test/java/io/druid/java/util/emitter/core/IntEvent.java b/java-util/src/test/java/org/apache/druid/java/util/emitter/core/IntEvent.java similarity index 95% rename from java-util/src/test/java/io/druid/java/util/emitter/core/IntEvent.java rename to java-util/src/test/java/org/apache/druid/java/util/emitter/core/IntEvent.java index 97e2b97eb140..3fae083e155e 100644 --- a/java-util/src/test/java/io/druid/java/util/emitter/core/IntEvent.java +++ b/java-util/src/test/java/org/apache/druid/java/util/emitter/core/IntEvent.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; import java.util.Map; diff --git a/java-util/src/test/java/io/druid/java/util/emitter/core/LoggingEmitterConfigTest.java b/java-util/src/test/java/org/apache/druid/java/util/emitter/core/LoggingEmitterConfigTest.java similarity index 88% rename from java-util/src/test/java/io/druid/java/util/emitter/core/LoggingEmitterConfigTest.java rename to java-util/src/test/java/org/apache/druid/java/util/emitter/core/LoggingEmitterConfigTest.java index 644d592958fa..9aa93d5d0f5a 100644 --- a/java-util/src/test/java/io/druid/java/util/emitter/core/LoggingEmitterConfigTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/emitter/core/LoggingEmitterConfigTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; @@ -58,8 +58,8 @@ public void testDefaultsLegacy() public void testSettingEverything() { final Properties props = new Properties(); - props.setProperty("io.druid.java.util.emitter.loggerClass", "Foo"); - props.setProperty("io.druid.java.util.emitter.logLevel", "INFO"); + props.setProperty("org.apache.druid.java.util.emitter.loggerClass", "Foo"); + props.setProperty("org.apache.druid.java.util.emitter.logLevel", "INFO"); final ObjectMapper objectMapper = new ObjectMapper(); final LoggingEmitterConfig config = objectMapper.convertValue( @@ -75,8 +75,8 @@ public void testSettingEverything() public void testSettingEverythingLegacy() { final Properties props = new Properties(); - props.setProperty("io.druid.java.util.emitter.logging.class", "Foo"); - props.setProperty("io.druid.java.util.emitter.logging.level", "INFO"); + props.setProperty("org.apache.druid.java.util.emitter.logging.class", "Foo"); + props.setProperty("org.apache.druid.java.util.emitter.logging.level", "INFO"); final ObjectMapper objectMapper = new ObjectMapper(); final LoggingEmitterConfig config = objectMapper.convertValue( diff --git a/java-util/src/test/java/io/druid/java/util/emitter/core/MockHttpClient.java b/java-util/src/test/java/org/apache/druid/java/util/emitter/core/MockHttpClient.java similarity index 96% rename from java-util/src/test/java/io/druid/java/util/emitter/core/MockHttpClient.java rename to java-util/src/test/java/org/apache/druid/java/util/emitter/core/MockHttpClient.java index 37a3b1057732..95fceb92e96b 100644 --- a/java-util/src/test/java/io/druid/java/util/emitter/core/MockHttpClient.java +++ b/java-util/src/test/java/org/apache/druid/java/util/emitter/core/MockHttpClient.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; import org.asynchttpclient.DefaultAsyncHttpClient; import org.asynchttpclient.ListenableFuture; diff --git a/java-util/src/test/java/io/druid/java/util/emitter/core/ParametrizedUriEmitterConfigTest.java b/java-util/src/test/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterConfigTest.java similarity index 81% rename from java-util/src/test/java/io/druid/java/util/emitter/core/ParametrizedUriEmitterConfigTest.java rename to java-util/src/test/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterConfigTest.java index fab2a6c4b6cc..c901ea5424e1 100644 --- a/java-util/src/test/java/io/druid/java/util/emitter/core/ParametrizedUriEmitterConfigTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterConfigTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.Pair; import org.junit.Assert; import org.junit.Test; @@ -54,12 +54,12 @@ public void testDefaults() public void testSettingEverything() { final Properties props = new Properties(); - props.setProperty("io.druid.java.util.emitter.httpEmitting.flushMillis", "1"); - props.setProperty("io.druid.java.util.emitter.httpEmitting.flushCount", "2"); - props.setProperty("io.druid.java.util.emitter.httpEmitting.basicAuthentication", "a:b"); - props.setProperty("io.druid.java.util.emitter.httpEmitting.batchingStrategy", "NEWLINES"); - props.setProperty("io.druid.java.util.emitter.httpEmitting.maxBatchSize", "4"); - props.setProperty("io.druid.java.util.emitter.httpEmitting.flushTimeOut", "1000"); + props.setProperty("org.apache.druid.java.util.emitter.httpEmitting.flushMillis", "1"); + props.setProperty("org.apache.druid.java.util.emitter.httpEmitting.flushCount", "2"); + props.setProperty("org.apache.druid.java.util.emitter.httpEmitting.basicAuthentication", "a:b"); + props.setProperty("org.apache.druid.java.util.emitter.httpEmitting.batchingStrategy", "NEWLINES"); + props.setProperty("org.apache.druid.java.util.emitter.httpEmitting.maxBatchSize", "4"); + props.setProperty("org.apache.druid.java.util.emitter.httpEmitting.flushTimeOut", "1000"); final ObjectMapper objectMapper = new ObjectMapper(); final ParametrizedUriEmitterConfig paramConfig = objectMapper.convertValue(Emitters.makeCustomFactoryMap(props), ParametrizedUriEmitterConfig.class); diff --git a/java-util/src/test/java/io/druid/java/util/emitter/core/ParametrizedUriEmitterTest.java b/java-util/src/test/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterTest.java similarity index 93% rename from java-util/src/test/java/io/druid/java/util/emitter/core/ParametrizedUriEmitterTest.java rename to java-util/src/test/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterTest.java index e34bb19c792e..64d0eed1f8eb 100644 --- a/java-util/src/test/java/io/druid/java/util/emitter/core/ParametrizedUriEmitterTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.java.util.emitter.core; +package org.apache.druid.java.util.emitter.core; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.emitter.service.UnitEvent; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.emitter.service.UnitEvent; import org.asynchttpclient.ListenableFuture; import org.asynchttpclient.Request; import org.asynchttpclient.Response; @@ -40,7 +40,7 @@ import java.util.Map; import java.util.Properties; -import static io.druid.java.util.emitter.core.EmitterTest.okResponse; +import static org.apache.druid.java.util.emitter.core.EmitterTest.okResponse; import static org.junit.Assert.assertEquals; public class ParametrizedUriEmitterTest @@ -67,8 +67,8 @@ public void tearDown() private Emitter parametrizedEmmiter(String uriPattern) throws Exception { final Properties props = new Properties(); - props.setProperty("io.druid.java.util.emitter.type", "parametrized"); - props.setProperty("io.druid.java.util.emitter.recipientBaseUrlPattern", uriPattern); + props.setProperty("org.apache.druid.java.util.emitter.type", "parametrized"); + props.setProperty("org.apache.druid.java.util.emitter.recipientBaseUrlPattern", uriPattern); lifecycle = new Lifecycle(); Emitter emitter = Emitters.create(props, httpClient, lifecycle); assertEquals(ParametrizedUriEmitter.class, emitter.getClass()); diff --git a/java-util/src/test/java/io/druid/java/util/emitter/service/AlertEventTest.java b/java-util/src/test/java/org/apache/druid/java/util/emitter/service/AlertEventTest.java similarity index 98% rename from java-util/src/test/java/io/druid/java/util/emitter/service/AlertEventTest.java rename to java-util/src/test/java/org/apache/druid/java/util/emitter/service/AlertEventTest.java index c112dac81af1..a8f1b196353c 100644 --- a/java-util/src/test/java/io/druid/java/util/emitter/service/AlertEventTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/emitter/service/AlertEventTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.java.util.emitter.service; +package org.apache.druid.java.util.emitter.service; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import io.druid.java.util.emitter.service.AlertEvent.Severity; +import org.apache.druid.java.util.emitter.service.AlertEvent.Severity; import org.junit.Assert; import org.junit.Test; diff --git a/java-util/src/test/java/io/druid/java/util/emitter/service/ServiceMetricEventTest.java b/java-util/src/test/java/org/apache/druid/java/util/emitter/service/ServiceMetricEventTest.java similarity index 99% rename from java-util/src/test/java/io/druid/java/util/emitter/service/ServiceMetricEventTest.java rename to java-util/src/test/java/org/apache/druid/java/util/emitter/service/ServiceMetricEventTest.java index c851830b576d..d713a016b010 100644 --- a/java-util/src/test/java/io/druid/java/util/emitter/service/ServiceMetricEventTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/emitter/service/ServiceMetricEventTest.java @@ -18,10 +18,10 @@ */ -package io.druid.java.util.emitter.service; +package org.apache.druid.java.util.emitter.service; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.DateTimes; import org.junit.Assert; import org.junit.Test; diff --git a/java-util/src/test/java/io/druid/java/util/emitter/service/UnitEvent.java b/java-util/src/test/java/org/apache/druid/java/util/emitter/service/UnitEvent.java similarity index 94% rename from java-util/src/test/java/io/druid/java/util/emitter/service/UnitEvent.java rename to java-util/src/test/java/org/apache/druid/java/util/emitter/service/UnitEvent.java index b5b3bd26fa9b..d65769d9f470 100644 --- a/java-util/src/test/java/io/druid/java/util/emitter/service/UnitEvent.java +++ b/java-util/src/test/java/org/apache/druid/java/util/emitter/service/UnitEvent.java @@ -18,11 +18,11 @@ */ -package io.druid.java.util.emitter.service; +package org.apache.druid.java.util.emitter.service; import com.fasterxml.jackson.annotation.JsonValue; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.emitter.core.Event; +import org.apache.druid.java.util.emitter.core.Event; import java.util.Collections; import java.util.HashMap; diff --git a/java-util/src/test/java/io/druid/java/util/http/client/AsyncHttpClientTest.java b/java-util/src/test/java/org/apache/druid/java/util/http/client/AsyncHttpClientTest.java similarity index 97% rename from java-util/src/test/java/io/druid/java/util/http/client/AsyncHttpClientTest.java rename to java-util/src/test/java/org/apache/druid/java/util/http/client/AsyncHttpClientTest.java index 419e68e05106..aa20c0eaf84e 100644 --- a/java-util/src/test/java/io/druid/java/util/http/client/AsyncHttpClientTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/http/client/AsyncHttpClientTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.java.util.http.client; +package org.apache.druid.java.util.http.client; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import org.asynchttpclient.DefaultAsyncHttpClient; import org.junit.Assert; import org.junit.Test; diff --git a/java-util/src/test/java/io/druid/java/util/http/client/FriendlyServersTest.java b/java-util/src/test/java/org/apache/druid/java/util/http/client/FriendlyServersTest.java similarity index 97% rename from java-util/src/test/java/io/druid/java/util/http/client/FriendlyServersTest.java rename to java-util/src/test/java/org/apache/druid/java/util/http/client/FriendlyServersTest.java index e6ce9a1060e0..12b3e5f2ddb7 100644 --- a/java-util/src/test/java/io/druid/java/util/http/client/FriendlyServersTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/http/client/FriendlyServersTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.java.util.http.client; +package org.apache.druid.java.util.http.client; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.http.client.response.StatusResponseHandler; -import io.druid.java.util.http.client.response.StatusResponseHolder; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.http.client.response.StatusResponseHandler; +import org.apache.druid.java.util.http.client.response.StatusResponseHolder; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; diff --git a/java-util/src/test/java/io/druid/java/util/http/client/JankyServersTest.java b/java-util/src/test/java/org/apache/druid/java/util/http/client/JankyServersTest.java similarity index 97% rename from java-util/src/test/java/io/druid/java/util/http/client/JankyServersTest.java rename to java-util/src/test/java/org/apache/druid/java/util/http/client/JankyServersTest.java index 0700e85c98bb..417245485435 100644 --- a/java-util/src/test/java/io/druid/java/util/http/client/JankyServersTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/http/client/JankyServersTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.java.util.http.client; +package org.apache.druid.java.util.http.client; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.http.client.response.StatusResponseHandler; -import io.druid.java.util.http.client.response.StatusResponseHolder; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.http.client.response.StatusResponseHandler; +import org.apache.druid.java.util.http.client.response.StatusResponseHolder; import org.jboss.netty.channel.ChannelException; import org.jboss.netty.handler.codec.http.HttpMethod; import org.jboss.netty.handler.timeout.ReadTimeoutException; diff --git a/java-util/src/test/java/io/druid/java/util/http/client/io/AppendableByteArrayInputStreamTest.java b/java-util/src/test/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStreamTest.java similarity index 98% rename from java-util/src/test/java/io/druid/java/util/http/client/io/AppendableByteArrayInputStreamTest.java rename to java-util/src/test/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStreamTest.java index b00d467b6123..a0d3bec190b2 100644 --- a/java-util/src/test/java/io/druid/java/util/http/client/io/AppendableByteArrayInputStreamTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStreamTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.java.util.http.client.io; +package org.apache.druid.java.util.http.client.io; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import org.junit.Assert; import org.junit.Test; diff --git a/java-util/src/test/java/io/druid/java/util/http/client/pool/ResourcePoolTest.java b/java-util/src/test/java/org/apache/druid/java/util/http/client/pool/ResourcePoolTest.java similarity index 99% rename from java-util/src/test/java/io/druid/java/util/http/client/pool/ResourcePoolTest.java rename to java-util/src/test/java/org/apache/druid/java/util/http/client/pool/ResourcePoolTest.java index ecac5ab87321..2a0b4a595da1 100644 --- a/java-util/src/test/java/io/druid/java/util/http/client/pool/ResourcePoolTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/http/client/pool/ResourcePoolTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.java.util.http.client.pool; +package org.apache.druid.java.util.http.client.pool; -import io.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.ISE; import org.easymock.EasyMock; import org.easymock.IAnswer; import org.junit.Assert; diff --git a/java-util/src/test/java/io/druid/java/util/http/client/response/SequenceInputStreamResponseHandlerTest.java b/java-util/src/test/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandlerTest.java similarity index 99% rename from java-util/src/test/java/io/druid/java/util/http/client/response/SequenceInputStreamResponseHandlerTest.java rename to java-util/src/test/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandlerTest.java index 71fbd449d013..45c626d88074 100644 --- a/java-util/src/test/java/io/druid/java/util/http/client/response/SequenceInputStreamResponseHandlerTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandlerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.http.client.response; +package org.apache.druid.java.util.http.client.response; import org.jboss.netty.buffer.BigEndianHeapChannelBuffer; import org.jboss.netty.handler.codec.http.DefaultHttpChunk; diff --git a/java-util/src/test/java/io/druid/java/util/metrics/CgroupMemoryMonitorTest.java b/java-util/src/test/java/org/apache/druid/java/util/metrics/CgroupMemoryMonitorTest.java similarity index 88% rename from java-util/src/test/java/io/druid/java/util/metrics/CgroupMemoryMonitorTest.java rename to java-util/src/test/java/org/apache/druid/java/util/metrics/CgroupMemoryMonitorTest.java index 99e46c668f17..058e09449dc2 100644 --- a/java-util/src/test/java/io/druid/java/util/metrics/CgroupMemoryMonitorTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/metrics/CgroupMemoryMonitorTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.emitter.core.Event; -import io.druid.java.util.metrics.cgroups.CgroupDiscoverer; -import io.druid.java.util.metrics.cgroups.ProcCgroupDiscoverer; -import io.druid.java.util.metrics.cgroups.TestUtils; +import org.apache.druid.java.util.emitter.core.Event; +import org.apache.druid.java.util.metrics.cgroups.CgroupDiscoverer; +import org.apache.druid.java.util.metrics.cgroups.ProcCgroupDiscoverer; +import org.apache.druid.java.util.metrics.cgroups.TestUtils; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; diff --git a/java-util/src/test/java/io/druid/java/util/metrics/CpuAcctDeltaMonitorTest.java b/java-util/src/test/java/org/apache/druid/java/util/metrics/CpuAcctDeltaMonitorTest.java similarity index 95% rename from java-util/src/test/java/io/druid/java/util/metrics/CpuAcctDeltaMonitorTest.java rename to java-util/src/test/java/org/apache/druid/java/util/metrics/CpuAcctDeltaMonitorTest.java index 1490c06532ed..9db54a4b2f75 100644 --- a/java-util/src/test/java/io/druid/java/util/metrics/CpuAcctDeltaMonitorTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/metrics/CpuAcctDeltaMonitorTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.metrics.cgroups.TestUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.metrics.cgroups.TestUtils; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; diff --git a/java-util/src/test/java/io/druid/java/util/metrics/GcNameTest.java b/java-util/src/test/java/org/apache/druid/java/util/metrics/GcNameTest.java similarity index 96% rename from java-util/src/test/java/io/druid/java/util/metrics/GcNameTest.java rename to java-util/src/test/java/org/apache/druid/java/util/metrics/GcNameTest.java index d32bbd7f0f8f..7574b9c8175b 100644 --- a/java-util/src/test/java/io/druid/java/util/metrics/GcNameTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/metrics/GcNameTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; import org.gridkit.lab.jvm.perfdata.JStatData; diff --git a/java-util/src/test/java/io/druid/java/util/metrics/JvmMonitorTest.java b/java-util/src/test/java/org/apache/druid/java/util/metrics/JvmMonitorTest.java similarity index 93% rename from java-util/src/test/java/io/druid/java/util/metrics/JvmMonitorTest.java rename to java-util/src/test/java/org/apache/druid/java/util/metrics/JvmMonitorTest.java index c2ac983a5c3f..a1dead94edc2 100644 --- a/java-util/src/test/java/io/druid/java/util/metrics/JvmMonitorTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/metrics/JvmMonitorTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; -import io.druid.java.util.emitter.core.Emitter; -import io.druid.java.util.emitter.core.Event; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.emitter.core.Emitter; +import org.apache.druid.java.util.emitter.core.Event; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; import org.junit.Assert; import org.junit.Test; diff --git a/java-util/src/test/java/io/druid/java/util/metrics/JvmPidDiscovererTest.java b/java-util/src/test/java/org/apache/druid/java/util/metrics/JvmPidDiscovererTest.java similarity index 95% rename from java-util/src/test/java/io/druid/java/util/metrics/JvmPidDiscovererTest.java rename to java-util/src/test/java/org/apache/druid/java/util/metrics/JvmPidDiscovererTest.java index a09ecba01a7f..f692705e15ee 100644 --- a/java-util/src/test/java/io/druid/java/util/metrics/JvmPidDiscovererTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/metrics/JvmPidDiscovererTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; import org.junit.Assert; import org.junit.Test; diff --git a/java-util/src/test/java/io/druid/java/util/metrics/MonitorUtilsTest.java b/java-util/src/test/java/org/apache/druid/java/util/metrics/MonitorUtilsTest.java similarity index 93% rename from java-util/src/test/java/io/druid/java/util/metrics/MonitorUtilsTest.java rename to java-util/src/test/java/org/apache/druid/java/util/metrics/MonitorUtilsTest.java index a5ec2cdff30e..809d0670f597 100644 --- a/java-util/src/test/java/io/druid/java/util/metrics/MonitorUtilsTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/metrics/MonitorUtilsTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; import org.junit.Assert; import org.junit.Test; diff --git a/java-util/src/test/java/io/druid/java/util/metrics/MonitorsTest.java b/java-util/src/test/java/org/apache/druid/java/util/metrics/MonitorsTest.java similarity index 92% rename from java-util/src/test/java/io/druid/java/util/metrics/MonitorsTest.java rename to java-util/src/test/java/org/apache/druid/java/util/metrics/MonitorsTest.java index ebbd725010c3..872af3dca22a 100644 --- a/java-util/src/test/java/io/druid/java/util/metrics/MonitorsTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/metrics/MonitorsTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.emitter.core.Event; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.emitter.core.Event; import org.junit.Assert; import org.junit.Test; diff --git a/java-util/src/test/java/io/druid/java/util/metrics/SigarLoadTest.java b/java-util/src/test/java/org/apache/druid/java/util/metrics/SigarLoadTest.java similarity index 96% rename from java-util/src/test/java/io/druid/java/util/metrics/SigarLoadTest.java rename to java-util/src/test/java/org/apache/druid/java/util/metrics/SigarLoadTest.java index f8a3b3e97712..42e1003dd475 100644 --- a/java-util/src/test/java/io/druid/java/util/metrics/SigarLoadTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/metrics/SigarLoadTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; import junit.framework.Assert; import org.hyperic.sigar.Sigar; diff --git a/java-util/src/test/java/io/druid/java/util/metrics/SigarPidDiscovererTest.java b/java-util/src/test/java/org/apache/druid/java/util/metrics/SigarPidDiscovererTest.java similarity index 95% rename from java-util/src/test/java/io/druid/java/util/metrics/SigarPidDiscovererTest.java rename to java-util/src/test/java/org/apache/druid/java/util/metrics/SigarPidDiscovererTest.java index bb14d9a5bdf2..26357f8dc9a7 100644 --- a/java-util/src/test/java/io/druid/java/util/metrics/SigarPidDiscovererTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/metrics/SigarPidDiscovererTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; import org.junit.Test; diff --git a/java-util/src/test/java/io/druid/java/util/metrics/StubServiceEmitter.java b/java-util/src/test/java/org/apache/druid/java/util/metrics/StubServiceEmitter.java similarity index 89% rename from java-util/src/test/java/io/druid/java/util/metrics/StubServiceEmitter.java rename to java-util/src/test/java/org/apache/druid/java/util/metrics/StubServiceEmitter.java index be6fdc8dd25d..8a41db527bab 100644 --- a/java-util/src/test/java/io/druid/java/util/metrics/StubServiceEmitter.java +++ b/java-util/src/test/java/org/apache/druid/java/util/metrics/StubServiceEmitter.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.java.util.metrics; +package org.apache.druid.java.util.metrics; -import io.druid.java.util.emitter.core.Event; -import io.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.core.Event; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; import java.util.ArrayList; import java.util.List; diff --git a/java-util/src/test/java/io/druid/java/util/metrics/cgroups/CpuAcctTest.java b/java-util/src/test/java/org/apache/druid/java/util/metrics/cgroups/CpuAcctTest.java similarity index 99% rename from java-util/src/test/java/io/druid/java/util/metrics/cgroups/CpuAcctTest.java rename to java-util/src/test/java/org/apache/druid/java/util/metrics/cgroups/CpuAcctTest.java index 0f67f42d2410..76f1922fe657 100644 --- a/java-util/src/test/java/io/druid/java/util/metrics/cgroups/CpuAcctTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/metrics/cgroups/CpuAcctTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.metrics.cgroups; +package org.apache.druid.java.util.metrics.cgroups; import org.junit.Assert; import org.junit.Before; diff --git a/java-util/src/test/java/io/druid/java/util/metrics/cgroups/MemoryTest.java b/java-util/src/test/java/org/apache/druid/java/util/metrics/cgroups/MemoryTest.java similarity index 99% rename from java-util/src/test/java/io/druid/java/util/metrics/cgroups/MemoryTest.java rename to java-util/src/test/java/org/apache/druid/java/util/metrics/cgroups/MemoryTest.java index f69b2154e7a5..029ef5d037ff 100644 --- a/java-util/src/test/java/io/druid/java/util/metrics/cgroups/MemoryTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/metrics/cgroups/MemoryTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.metrics.cgroups; +package org.apache.druid.java.util.metrics.cgroups; import com.google.common.collect.ImmutableMap; import org.junit.Assert; diff --git a/java-util/src/test/java/io/druid/java/util/metrics/cgroups/ProcCgroupDiscovererTest.java b/java-util/src/test/java/org/apache/druid/java/util/metrics/cgroups/ProcCgroupDiscovererTest.java similarity index 98% rename from java-util/src/test/java/io/druid/java/util/metrics/cgroups/ProcCgroupDiscovererTest.java rename to java-util/src/test/java/org/apache/druid/java/util/metrics/cgroups/ProcCgroupDiscovererTest.java index 815733f832b7..a133e18c95e9 100644 --- a/java-util/src/test/java/io/druid/java/util/metrics/cgroups/ProcCgroupDiscovererTest.java +++ b/java-util/src/test/java/org/apache/druid/java/util/metrics/cgroups/ProcCgroupDiscovererTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.java.util.metrics.cgroups; +package org.apache.druid.java.util.metrics.cgroups; import com.google.common.collect.ImmutableSet; import org.junit.Assert; diff --git a/java-util/src/test/java/io/druid/java/util/metrics/cgroups/TestUtils.java b/java-util/src/test/java/org/apache/druid/java/util/metrics/cgroups/TestUtils.java similarity index 95% rename from java-util/src/test/java/io/druid/java/util/metrics/cgroups/TestUtils.java rename to java-util/src/test/java/org/apache/druid/java/util/metrics/cgroups/TestUtils.java index 7b5ae5e36db2..a69d30a74e6b 100644 --- a/java-util/src/test/java/io/druid/java/util/metrics/cgroups/TestUtils.java +++ b/java-util/src/test/java/org/apache/druid/java/util/metrics/cgroups/TestUtils.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.java.util.metrics.cgroups; +package org.apache.druid.java.util.metrics.cgroups; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import org.junit.Assert; import java.io.File; diff --git a/pom.xml b/pom.xml index 83ef71a14f59..52e750db210c 100644 --- a/pom.xml +++ b/pom.xml @@ -28,6 +28,7 @@ 2 + org.apache.druid druid 0.13.0-SNAPSHOT pom @@ -53,9 +54,9 @@ 2011 - scm:git:ssh://git@github.com/druid-io/druid.git - scm:git:ssh://git@github.com/druid-io/druid.git - https://github.com/druid-io/druid.git + scm:git:ssh://git@github.com/apache/incubator-druid.git + scm:git:ssh://git@github.com/apache/incubator-druid.git + https://github.com/apache/incubator-druid.git 0.13.0-SNAPSHOT @@ -76,8 +77,8 @@ 2.5 3.10.6.Final - + 4.0.52.Final 1.7.12 @@ -928,8 +929,8 @@ ${session.executionRootDirectory}/codestyle/druid-forbidden-apis.txt - io/druid/java/util/common/DateTimes$UtcFormatter.class - io/druid/java/util/common/DateTimes.class + org/apache/druid/java/util/common/DateTimes$UtcFormatter.class + org/apache/druid/java/util/common/DateTimes.class @@ -1030,7 +1031,7 @@ -Dfile.encoding=UTF-8 -Duser.timezone=UTC -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager - + -Ddruid.indexing.doubleStorage=double @@ -1135,10 +1136,10 @@ - io.druid.sql.antlr4.* + org.apache.druid.sql.antlr4.* - io/druid/sql/antlr4/**/*.class + org/apache/druid/sql/antlr4/**/*.class xml @@ -1254,7 +1255,7 @@ -Xmx768m -Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8 -Duser.timezone=UTC -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager - + -Ddruid.indexing.doubleStorage=double diff --git a/processing/benchmarks/io.druid.collections.bitmap.RangeBitmapBenchmarkTest.html b/processing/benchmarks/io.druid.collections.bitmap.RangeBitmapBenchmarkTest.html deleted file mode 100644 index b9bb3b2a50a4..000000000000 --- a/processing/benchmarks/io.druid.collections.bitmap.RangeBitmapBenchmarkTest.html +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - - Benchmark results for methods in class RangeBitmapBenchmarkTest - - - - - - - - - - -

-

Benchmark results for methods in class RangeBitmapBenchmarkTest

- -
-
- -
- - -
-
- - - - diff --git a/processing/benchmarks/io.druid.collections.bitmap.RangeBitmapBenchmarkTest.jsonp b/processing/benchmarks/io.druid.collections.bitmap.RangeBitmapBenchmarkTest.jsonp deleted file mode 100644 index 17306131437b..000000000000 --- a/processing/benchmarks/io.druid.collections.bitmap.RangeBitmapBenchmarkTest.jsonp +++ /dev/null @@ -1,22 +0,0 @@ -receiveJsonpData({ -"cols": [ -{"label": "Run", "type": "string"}, -{"label": "Custom key", "type": "string"}, -{"label": "Timestamp", "type": "string"}, -{"label": "timeConciseUnion", "type": "string"} , -{"label": "timeGenericConciseIntersection", "type": "string"} , -{"label": "timeGenericConciseUnion", "type": "string"} , -{"label": "timeGenericRoaringIntersection", "type": "string"} , -{"label": "timeGenericRoaringUnion", "type": "string"} , -{"label": "timeImmutableRoaringUnion", "type": "string"} , -{"label": "timeOffheapConciseUnion", "type": "string"} , -{"label": "timeOffheapRoaringUnion", "type": "string"} , -{"label": "timeRoaringUnion", "type": "string"} ], -"rows": [ -{"c": [{"v": "5"}, {"v": "0.00001"}, {"v": "2014-11-04 14:03:04.268"}, {"v": 80.304}, {"v": 79.758}, {"v": 65.896}, {"v": 0.008}, {"v": 0.278}, {"v": 0.596}, {"v": 70.89}, {"v": 0.275}, {"v": 0.202}]}, -{"c": [{"v": "1"}, {"v": "0.0001"}, {"v": "2014-11-04 13:32:21.752"}, {"v": 30.843}, {"v": 30.863}, {"v": 32.306}, {"v": 0.012}, {"v": 0.272}, {"v": 0.546}, {"v": 32.727}, {"v": 0.327}, {"v": 0.158}]}, -{"c": [{"v": "2"}, {"v": "0.0010"}, {"v": "2014-11-04 13:41:55.608"}, {"v": 3.801}, {"v": 3.441}, {"v": 3.421}, {"v": 0.019}, {"v": 0.272}, {"v": 0.524}, {"v": 3.76}, {"v": 0.271}, {"v": 0.171}]}, -{"c": [{"v": "3"}, {"v": "0.0100"}, {"v": "2014-11-04 13:45:36.077"}, {"v": 0.341}, {"v": 0.541}, {"v": 0.628}, {"v": 0.025}, {"v": 0.276}, {"v": 0.576}, {"v": 0.352}, {"v": 0.276}, {"v": 0.263}]}, -{"c": [{"v": "4"}, {"v": "0.1000"}, {"v": "2014-11-04 13:49:27.509"}, {"v": 0.051}, {"v": 0.062}, {"v": 0.046}, {"v": 0.039}, {"v": 0.295}, {"v": 0.47}, {"v": 0.045}, {"v": 0.299}, {"v": 0.181}]}, -{"c": [{"v": "38"}, {"v": "0.25000"}, {"v": "2014-11-04 15:22:42.446"}, {"v": 0.036}, {"v": 0.041}, {"v": 0.04}, {"v": 0.052}, {"v": 0.179}, {"v": 0.391}, {"v": 0.042}, {"v": 0.18}, {"v": 0.105}]} -]}); diff --git a/processing/benchmarks/io.druid.collections.bitmap.UniformBitmapBenchmarkTest.html b/processing/benchmarks/io.druid.collections.bitmap.UniformBitmapBenchmarkTest.html deleted file mode 100644 index 698d966d821a..000000000000 --- a/processing/benchmarks/io.druid.collections.bitmap.UniformBitmapBenchmarkTest.html +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - - Benchmark results for methods in class UniformBitmapBenchmarkTest - - - - - - - - - - -
-

Benchmark results for methods in class UniformBitmapBenchmarkTest

- -
-
- -
- - -
-
- - - - diff --git a/processing/benchmarks/io.druid.collections.bitmap.UniformBitmapBenchmarkTest.jsonp b/processing/benchmarks/io.druid.collections.bitmap.UniformBitmapBenchmarkTest.jsonp deleted file mode 100644 index 1194215e2289..000000000000 --- a/processing/benchmarks/io.druid.collections.bitmap.UniformBitmapBenchmarkTest.jsonp +++ /dev/null @@ -1,23 +0,0 @@ -receiveJsonpData({ -"cols": [ -{"label": "Run", "type": "string"}, -{"label": "Custom key", "type": "string"}, -{"label": "Timestamp", "type": "string"}, -{"label": "timeConciseUnion", "type": "string"} , -{"label": "timeGenericConciseIntersection", "type": "string"} , -{"label": "timeGenericConciseUnion", "type": "string"} , -{"label": "timeGenericRoaringIntersection", "type": "string"} , -{"label": "timeGenericRoaringUnion", "type": "string"} , -{"label": "timeImmutableRoaringUnion", "type": "string"} , -{"label": "timeOffheapConciseUnion", "type": "string"} , -{"label": "timeOffheapRoaringUnion", "type": "string"} , -{"label": "timeRoaringUnion", "type": "string"} ], -"rows": [ -{"c": [{"v": "6"}, {"v": "0.0001"}, {"v": "2014-11-04 11:41:24.142"}, {"v": 1.099}, {"v": 0.401}, {"v": 1.391}, {"v": 0.02}, {"v": 0.131}, {"v": 0.104}, {"v": 1.171}, {"v": 0.132}, {"v": 0.091}]}, -{"c": [{"v": "5"}, {"v": "0.0010"}, {"v": "2014-11-04 11:37:12.305"}, {"v": 6.989}, {"v": 0.595}, {"v": 7.4}, {"v": 0.026}, {"v": 0.144}, {"v": 0.098}, {"v": 7.95}, {"v": 0.139}, {"v": 0.066}]}, -{"c": [{"v": "4"}, {"v": "0.0100"}, {"v": "2014-11-04 11:23:42.26"}, {"v": 50.259}, {"v": 4.768}, {"v": 51.716}, {"v": 0.053}, {"v": 0.563}, {"v": 0.223}, {"v": 54.117}, {"v": 0.59}, {"v": 0.175}]}, -{"c": [{"v": "8"}, {"v": "0.1000"}, {"v": "2014-11-04 12:19:56.926"}, {"v": 64.505}, {"v": 23.741}, {"v": 63.565}, {"v": 0.031}, {"v": 0.353}, {"v": 0.528}, {"v": 59.636}, {"v": 0.352}, {"v": 0.155}]}, -{"c": [{"v": "7"}, {"v": "0.2500"}, {"v": "2014-11-04 11:52:42.488"}, {"v": 67.57}, {"v": 64.276}, {"v": 60.747}, {"v": 0.021}, {"v": 0.275}, {"v": 0.523}, {"v": 69.835}, {"v": 0.251}, {"v": 0.178}]}, -{"c": [{"v": "2"}, {"v": "0.5000"}, {"v": "2014-11-04 10:19:33.921"}, {"v": 66.058}, {"v": 67.714}, {"v": 64.162}, {"v": 0.026}, {"v": 0.264}, {"v": 0.541}, {"v": 66.445}, {"v": 0.281}, {"v": 0.168}]}, -{"c": [{"v": "3"}, {"v": "0.7500"}, {"v": "2014-11-04 10:44:45.546"}, {"v": 65.028}, {"v": 70.115}, {"v": 63.475}, {"v": 0.027}, {"v": 0.284}, {"v": 0.574}, {"v": 68.909}, {"v": 0.295}, {"v": 0.195}]} -]}); diff --git a/processing/pom.xml b/processing/pom.xml index 622b4a8b1644..ccb60ca9ef26 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -26,29 +26,29 @@ A module that is everything required to understands Druid Segments - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT - io.druid + org.apache.druid druid-common ${project.parent.version} - io.druid + org.apache.druid java-util ${project.parent.version} - io.druid + org.apache.druid druid-hll ${project.parent.version} - io.druid + org.apache.druid extendedset ${project.parent.version} @@ -119,7 +119,7 @@ - io.druid + org.apache.druid druid-common ${project.parent.version} test-jar @@ -171,13 +171,13 @@ - io.druid + org.apache.druid druid-common ${project.parent.version} - io.druid.annotations.SubclassesMustBePublicAnnotationProcessor + org.apache.druid.annotations.SubclassesMustBePublicAnnotationProcessor @@ -206,12 +206,12 @@ -Dfile.encoding=UTF-8 -Duser.timezone=UTC -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager - + -Ddruid.indexing.doubleStorage=double true - io.druid.collections.test.annotation.Benchmark + org.apache.druid.collections.test.annotation.Benchmark @@ -226,8 +226,8 @@ maven-surefire-plugin -server -Xms3G -Xmx3G -Djub.consumers=CONSOLE,H2 -Djub.db.file=benchmarks/benchmarks - io.druid.collections.test.annotation.Benchmark - io.druid.collections.test.annotation.Dummy + org.apache.druid.collections.test.annotation.Benchmark + org.apache.druid.collections.test.annotation.Dummy diff --git a/processing/src/main/java/io/druid/collections/IntegerSet.java b/processing/src/main/java/org/apache/druid/collections/IntegerSet.java similarity index 97% rename from processing/src/main/java/io/druid/collections/IntegerSet.java rename to processing/src/main/java/org/apache/druid/collections/IntegerSet.java index 6419b1702be9..0f9b19c25f29 100644 --- a/processing/src/main/java/io/druid/collections/IntegerSet.java +++ b/processing/src/main/java/org/apache/druid/collections/IntegerSet.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.collections; +package org.apache.druid.collections; -import io.druid.collections.bitmap.MutableBitmap; +import org.apache.druid.collections.bitmap.MutableBitmap; import org.roaringbitmap.IntIterator; import java.util.AbstractSet; diff --git a/processing/src/main/java/io/druid/collections/bitmap/BitSetBitmapFactory.java b/processing/src/main/java/org/apache/druid/collections/bitmap/BitSetBitmapFactory.java similarity index 98% rename from processing/src/main/java/io/druid/collections/bitmap/BitSetBitmapFactory.java rename to processing/src/main/java/org/apache/druid/collections/bitmap/BitSetBitmapFactory.java index 373fd577cd1e..f3e02396053e 100644 --- a/processing/src/main/java/io/druid/collections/bitmap/BitSetBitmapFactory.java +++ b/processing/src/main/java/org/apache/druid/collections/bitmap/BitSetBitmapFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.collections.bitmap; +package org.apache.druid.collections.bitmap; import java.nio.ByteBuffer; import java.util.BitSet; diff --git a/processing/src/main/java/io/druid/collections/bitmap/BitmapFactory.java b/processing/src/main/java/org/apache/druid/collections/bitmap/BitmapFactory.java similarity index 98% rename from processing/src/main/java/io/druid/collections/bitmap/BitmapFactory.java rename to processing/src/main/java/org/apache/druid/collections/bitmap/BitmapFactory.java index 5d11928e8a71..c06637575306 100644 --- a/processing/src/main/java/io/druid/collections/bitmap/BitmapFactory.java +++ b/processing/src/main/java/org/apache/druid/collections/bitmap/BitmapFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.collections.bitmap; +package org.apache.druid.collections.bitmap; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/collections/bitmap/ConciseBitmapFactory.java b/processing/src/main/java/org/apache/druid/collections/bitmap/ConciseBitmapFactory.java similarity index 96% rename from processing/src/main/java/io/druid/collections/bitmap/ConciseBitmapFactory.java rename to processing/src/main/java/org/apache/druid/collections/bitmap/ConciseBitmapFactory.java index 155eaff16e4c..be83bb3e9640 100644 --- a/processing/src/main/java/io/druid/collections/bitmap/ConciseBitmapFactory.java +++ b/processing/src/main/java/org/apache/druid/collections/bitmap/ConciseBitmapFactory.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.collections.bitmap; +package org.apache.druid.collections.bitmap; import com.google.common.collect.Iterables; -import io.druid.extendedset.intset.ImmutableConciseSet; -import io.druid.java.util.common.ISE; +import org.apache.druid.extendedset.intset.ImmutableConciseSet; +import org.apache.druid.java.util.common.ISE; import java.nio.ByteBuffer; import java.util.Collection; diff --git a/processing/src/main/java/io/druid/collections/bitmap/ImmutableBitmap.java b/processing/src/main/java/org/apache/druid/collections/bitmap/ImmutableBitmap.java similarity index 97% rename from processing/src/main/java/io/druid/collections/bitmap/ImmutableBitmap.java rename to processing/src/main/java/org/apache/druid/collections/bitmap/ImmutableBitmap.java index 6d741711f976..6e8247cfb226 100644 --- a/processing/src/main/java/io/druid/collections/bitmap/ImmutableBitmap.java +++ b/processing/src/main/java/org/apache/druid/collections/bitmap/ImmutableBitmap.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.collections.bitmap; +package org.apache.druid.collections.bitmap; import org.roaringbitmap.IntIterator; diff --git a/processing/src/main/java/io/druid/collections/bitmap/MutableBitmap.java b/processing/src/main/java/org/apache/druid/collections/bitmap/MutableBitmap.java similarity index 97% rename from processing/src/main/java/io/druid/collections/bitmap/MutableBitmap.java rename to processing/src/main/java/org/apache/druid/collections/bitmap/MutableBitmap.java index 987735cd05d9..09f982f57268 100644 --- a/processing/src/main/java/io/druid/collections/bitmap/MutableBitmap.java +++ b/processing/src/main/java/org/apache/druid/collections/bitmap/MutableBitmap.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.collections.bitmap; +package org.apache.druid.collections.bitmap; /** * This class is meant to represent a simple wrapper around a bitmap class. diff --git a/processing/src/main/java/io/druid/collections/bitmap/RoaringBitmapFactory.java b/processing/src/main/java/org/apache/druid/collections/bitmap/RoaringBitmapFactory.java similarity index 98% rename from processing/src/main/java/io/druid/collections/bitmap/RoaringBitmapFactory.java rename to processing/src/main/java/org/apache/druid/collections/bitmap/RoaringBitmapFactory.java index 64da1f2c3bab..a51aa571bf6c 100644 --- a/processing/src/main/java/io/druid/collections/bitmap/RoaringBitmapFactory.java +++ b/processing/src/main/java/org/apache/druid/collections/bitmap/RoaringBitmapFactory.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.collections.bitmap; +package org.apache.druid.collections.bitmap; import com.google.common.base.Throwables; import com.google.common.collect.Iterables; -import io.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.ISE; import org.roaringbitmap.RoaringBitmap; import org.roaringbitmap.buffer.BufferFastAggregation; import org.roaringbitmap.buffer.ImmutableRoaringBitmap; diff --git a/processing/src/main/java/io/druid/collections/bitmap/WrappedBitSetBitmap.java b/processing/src/main/java/org/apache/druid/collections/bitmap/WrappedBitSetBitmap.java similarity index 97% rename from processing/src/main/java/io/druid/collections/bitmap/WrappedBitSetBitmap.java rename to processing/src/main/java/org/apache/druid/collections/bitmap/WrappedBitSetBitmap.java index 8d3d6e5be0e8..25aab47708fd 100644 --- a/processing/src/main/java/io/druid/collections/bitmap/WrappedBitSetBitmap.java +++ b/processing/src/main/java/org/apache/druid/collections/bitmap/WrappedBitSetBitmap.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.collections.bitmap; +package org.apache.druid.collections.bitmap; -import io.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.IAE; import java.nio.ByteBuffer; import java.util.BitSet; diff --git a/processing/src/main/java/io/druid/collections/bitmap/WrappedConciseBitmap.java b/processing/src/main/java/org/apache/druid/collections/bitmap/WrappedConciseBitmap.java similarity index 94% rename from processing/src/main/java/io/druid/collections/bitmap/WrappedConciseBitmap.java rename to processing/src/main/java/org/apache/druid/collections/bitmap/WrappedConciseBitmap.java index 46f44497a9e2..ee50739eb825 100644 --- a/processing/src/main/java/io/druid/collections/bitmap/WrappedConciseBitmap.java +++ b/processing/src/main/java/org/apache/druid/collections/bitmap/WrappedConciseBitmap.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.collections.bitmap; +package org.apache.druid.collections.bitmap; -import io.druid.extendedset.intset.ConciseSet; -import io.druid.extendedset.intset.ImmutableConciseSet; +import org.apache.druid.extendedset.intset.ConciseSet; +import org.apache.druid.extendedset.intset.ImmutableConciseSet; import org.roaringbitmap.IntIterator; public class WrappedConciseBitmap implements MutableBitmap diff --git a/processing/src/main/java/io/druid/collections/bitmap/WrappedImmutableBitSetBitmap.java b/processing/src/main/java/org/apache/druid/collections/bitmap/WrappedImmutableBitSetBitmap.java similarity index 98% rename from processing/src/main/java/io/druid/collections/bitmap/WrappedImmutableBitSetBitmap.java rename to processing/src/main/java/org/apache/druid/collections/bitmap/WrappedImmutableBitSetBitmap.java index ee93e8ab189b..4b8da4f62859 100644 --- a/processing/src/main/java/io/druid/collections/bitmap/WrappedImmutableBitSetBitmap.java +++ b/processing/src/main/java/org/apache/druid/collections/bitmap/WrappedImmutableBitSetBitmap.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.collections.bitmap; +package org.apache.druid.collections.bitmap; import org.roaringbitmap.IntIterator; diff --git a/processing/src/main/java/io/druid/collections/bitmap/WrappedImmutableConciseBitmap.java b/processing/src/main/java/org/apache/druid/collections/bitmap/WrappedImmutableConciseBitmap.java similarity index 95% rename from processing/src/main/java/io/druid/collections/bitmap/WrappedImmutableConciseBitmap.java rename to processing/src/main/java/org/apache/druid/collections/bitmap/WrappedImmutableConciseBitmap.java index 253543f12d9a..6710b1097ab8 100644 --- a/processing/src/main/java/io/druid/collections/bitmap/WrappedImmutableConciseBitmap.java +++ b/processing/src/main/java/org/apache/druid/collections/bitmap/WrappedImmutableConciseBitmap.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.collections.bitmap; +package org.apache.druid.collections.bitmap; -import io.druid.extendedset.intset.ImmutableConciseSet; +import org.apache.druid.extendedset.intset.ImmutableConciseSet; import org.roaringbitmap.IntIterator; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/collections/bitmap/WrappedImmutableRoaringBitmap.java b/processing/src/main/java/org/apache/druid/collections/bitmap/WrappedImmutableRoaringBitmap.java similarity index 98% rename from processing/src/main/java/io/druid/collections/bitmap/WrappedImmutableRoaringBitmap.java rename to processing/src/main/java/org/apache/druid/collections/bitmap/WrappedImmutableRoaringBitmap.java index b0ed03a4f46c..f689e81a7214 100644 --- a/processing/src/main/java/io/druid/collections/bitmap/WrappedImmutableRoaringBitmap.java +++ b/processing/src/main/java/org/apache/druid/collections/bitmap/WrappedImmutableRoaringBitmap.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.collections.bitmap; +package org.apache.druid.collections.bitmap; import com.google.common.base.Throwables; import org.roaringbitmap.IntIterator; diff --git a/processing/src/main/java/io/druid/collections/bitmap/WrappedRoaringBitmap.java b/processing/src/main/java/org/apache/druid/collections/bitmap/WrappedRoaringBitmap.java similarity index 99% rename from processing/src/main/java/io/druid/collections/bitmap/WrappedRoaringBitmap.java rename to processing/src/main/java/org/apache/druid/collections/bitmap/WrappedRoaringBitmap.java index d1ead97d9049..de06d2bb8717 100644 --- a/processing/src/main/java/io/druid/collections/bitmap/WrappedRoaringBitmap.java +++ b/processing/src/main/java/org/apache/druid/collections/bitmap/WrappedRoaringBitmap.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.collections.bitmap; +package org.apache.druid.collections.bitmap; import com.google.common.base.Throwables; import org.roaringbitmap.IntIterator; diff --git a/processing/src/main/java/io/druid/collections/spatial/ImmutableNode.java b/processing/src/main/java/org/apache/druid/collections/spatial/ImmutableNode.java similarity index 97% rename from processing/src/main/java/io/druid/collections/spatial/ImmutableNode.java rename to processing/src/main/java/org/apache/druid/collections/spatial/ImmutableNode.java index d4bb589ee143..dae71985ebd1 100644 --- a/processing/src/main/java/io/druid/collections/spatial/ImmutableNode.java +++ b/processing/src/main/java/org/apache/druid/collections/spatial/ImmutableNode.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.collections.spatial; +package org.apache.druid.collections.spatial; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.ImmutableBitmap; import java.nio.ByteBuffer; import java.util.Iterator; diff --git a/processing/src/main/java/io/druid/collections/spatial/ImmutablePoint.java b/processing/src/main/java/org/apache/druid/collections/spatial/ImmutablePoint.java similarity index 94% rename from processing/src/main/java/io/druid/collections/spatial/ImmutablePoint.java rename to processing/src/main/java/org/apache/druid/collections/spatial/ImmutablePoint.java index 28d9a48efda0..e8eb9ab9e1a2 100644 --- a/processing/src/main/java/io/druid/collections/spatial/ImmutablePoint.java +++ b/processing/src/main/java/org/apache/druid/collections/spatial/ImmutablePoint.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.collections.spatial; +package org.apache.druid.collections.spatial; -import io.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.BitmapFactory; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/collections/spatial/ImmutableRTree.java b/processing/src/main/java/org/apache/druid/collections/spatial/ImmutableRTree.java similarity index 89% rename from processing/src/main/java/io/druid/collections/spatial/ImmutableRTree.java rename to processing/src/main/java/org/apache/druid/collections/spatial/ImmutableRTree.java index bc63ce1bf083..b9e62d2d0f03 100644 --- a/processing/src/main/java/io/druid/collections/spatial/ImmutableRTree.java +++ b/processing/src/main/java/org/apache/druid/collections/spatial/ImmutableRTree.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.collections.spatial; +package org.apache.druid.collections.spatial; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.collections.spatial.search.Bound; -import io.druid.collections.spatial.search.GutmanSearchStrategy; -import io.druid.collections.spatial.search.SearchStrategy; -import io.druid.io.Channels; -import io.druid.segment.writeout.WriteOutBytes; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.collections.spatial.search.Bound; +import org.apache.druid.collections.spatial.search.GutmanSearchStrategy; +import org.apache.druid.collections.spatial.search.SearchStrategy; +import org.apache.druid.io.Channels; +import org.apache.druid.segment.writeout.WriteOutBytes; import it.unimi.dsi.fastutil.bytes.ByteArrays; import java.io.IOException; diff --git a/processing/src/main/java/io/druid/collections/spatial/Node.java b/processing/src/main/java/org/apache/druid/collections/spatial/Node.java similarity index 97% rename from processing/src/main/java/io/druid/collections/spatial/Node.java rename to processing/src/main/java/org/apache/druid/collections/spatial/Node.java index b9ed875a7671..96f476bfb236 100644 --- a/processing/src/main/java/io/druid/collections/spatial/Node.java +++ b/processing/src/main/java/org/apache/druid/collections/spatial/Node.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.collections.spatial; +package org.apache.druid.collections.spatial; import com.google.common.base.Preconditions; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.MutableBitmap; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.MutableBitmap; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/collections/spatial/Point.java b/processing/src/main/java/org/apache/druid/collections/spatial/Point.java similarity index 93% rename from processing/src/main/java/io/druid/collections/spatial/Point.java rename to processing/src/main/java/org/apache/druid/collections/spatial/Point.java index 9ec6fe4297c2..6e2bf0ec79a5 100644 --- a/processing/src/main/java/io/druid/collections/spatial/Point.java +++ b/processing/src/main/java/org/apache/druid/collections/spatial/Point.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.collections.spatial; +package org.apache.druid.collections.spatial; import com.google.common.collect.Lists; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.MutableBitmap; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.MutableBitmap; import java.util.List; diff --git a/processing/src/main/java/io/druid/collections/spatial/RTree.java b/processing/src/main/java/org/apache/druid/collections/spatial/RTree.java similarity index 96% rename from processing/src/main/java/io/druid/collections/spatial/RTree.java rename to processing/src/main/java/org/apache/druid/collections/spatial/RTree.java index 8a9801b73b57..0e917dcb721c 100644 --- a/processing/src/main/java/io/druid/collections/spatial/RTree.java +++ b/processing/src/main/java/org/apache/druid/collections/spatial/RTree.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.collections.spatial; +package org.apache.druid.collections.spatial; import com.google.common.base.Preconditions; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.MutableBitmap; -import io.druid.collections.spatial.split.SplitStrategy; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.MutableBitmap; +import org.apache.druid.collections.spatial.split.SplitStrategy; import java.util.Arrays; diff --git a/processing/src/main/java/io/druid/collections/spatial/RTreeUtils.java b/processing/src/main/java/org/apache/druid/collections/spatial/RTreeUtils.java similarity index 97% rename from processing/src/main/java/io/druid/collections/spatial/RTreeUtils.java rename to processing/src/main/java/org/apache/druid/collections/spatial/RTreeUtils.java index 13d408931166..ca8bc6b464e6 100644 --- a/processing/src/main/java/io/druid/collections/spatial/RTreeUtils.java +++ b/processing/src/main/java/org/apache/druid/collections/spatial/RTreeUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.collections.spatial; +package org.apache.druid.collections.spatial; import com.google.common.base.Preconditions; diff --git a/processing/src/main/java/io/druid/collections/spatial/search/Bound.java b/processing/src/main/java/org/apache/druid/collections/spatial/search/Bound.java similarity index 89% rename from processing/src/main/java/io/druid/collections/spatial/search/Bound.java rename to processing/src/main/java/org/apache/druid/collections/spatial/search/Bound.java index 3cc23a8b991c..1b8a97e9713c 100644 --- a/processing/src/main/java/io/druid/collections/spatial/search/Bound.java +++ b/processing/src/main/java/org/apache/druid/collections/spatial/search/Bound.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.collections.spatial.search; +package org.apache.druid.collections.spatial.search; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.druid.collections.spatial.ImmutableNode; -import io.druid.collections.spatial.ImmutablePoint; +import org.apache.druid.collections.spatial.ImmutableNode; +import org.apache.druid.collections.spatial.ImmutablePoint; /** */ diff --git a/processing/src/main/java/io/druid/collections/spatial/search/GutmanSearchStrategy.java b/processing/src/main/java/org/apache/druid/collections/spatial/search/GutmanSearchStrategy.java similarity index 96% rename from processing/src/main/java/io/druid/collections/spatial/search/GutmanSearchStrategy.java rename to processing/src/main/java/org/apache/druid/collections/spatial/search/GutmanSearchStrategy.java index 6050375740fa..de7d56edcd52 100644 --- a/processing/src/main/java/io/druid/collections/spatial/search/GutmanSearchStrategy.java +++ b/processing/src/main/java/org/apache/druid/collections/spatial/search/GutmanSearchStrategy.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.collections.spatial.search; +package org.apache.druid.collections.spatial.search; import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.collections.spatial.ImmutableNode; -import io.druid.collections.spatial.ImmutablePoint; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.collections.spatial.ImmutableNode; +import org.apache.druid.collections.spatial.ImmutablePoint; /** */ diff --git a/processing/src/main/java/io/druid/collections/spatial/search/PolygonBound.java b/processing/src/main/java/org/apache/druid/collections/spatial/search/PolygonBound.java similarity index 98% rename from processing/src/main/java/io/druid/collections/spatial/search/PolygonBound.java rename to processing/src/main/java/org/apache/druid/collections/spatial/search/PolygonBound.java index b1bef243c01d..2b77bc23a294 100644 --- a/processing/src/main/java/io/druid/collections/spatial/search/PolygonBound.java +++ b/processing/src/main/java/org/apache/druid/collections/spatial/search/PolygonBound.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.collections.spatial.search; +package org.apache.druid.collections.spatial.search; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; -import io.druid.collections.spatial.ImmutablePoint; +import org.apache.druid.collections.spatial.ImmutablePoint; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/collections/spatial/search/RadiusBound.java b/processing/src/main/java/org/apache/druid/collections/spatial/search/RadiusBound.java similarity index 96% rename from processing/src/main/java/io/druid/collections/spatial/search/RadiusBound.java rename to processing/src/main/java/org/apache/druid/collections/spatial/search/RadiusBound.java index f7cc6db11db4..87f9bccd152e 100644 --- a/processing/src/main/java/io/druid/collections/spatial/search/RadiusBound.java +++ b/processing/src/main/java/org/apache/druid/collections/spatial/search/RadiusBound.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.collections.spatial.search; +package org.apache.druid.collections.spatial.search; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; -import io.druid.collections.spatial.ImmutablePoint; +import org.apache.druid.collections.spatial.ImmutablePoint; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/collections/spatial/search/RectangularBound.java b/processing/src/main/java/org/apache/druid/collections/spatial/search/RectangularBound.java similarity index 95% rename from processing/src/main/java/io/druid/collections/spatial/search/RectangularBound.java rename to processing/src/main/java/org/apache/druid/collections/spatial/search/RectangularBound.java index 824f937359a0..8f5dd04bae80 100644 --- a/processing/src/main/java/io/druid/collections/spatial/search/RectangularBound.java +++ b/processing/src/main/java/org/apache/druid/collections/spatial/search/RectangularBound.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.collections.spatial.search; +package org.apache.druid.collections.spatial.search; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; -import io.druid.collections.spatial.ImmutableNode; -import io.druid.collections.spatial.ImmutablePoint; +import org.apache.druid.collections.spatial.ImmutableNode; +import org.apache.druid.collections.spatial.ImmutablePoint; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/collections/spatial/search/SearchStrategy.java b/processing/src/main/java/org/apache/druid/collections/spatial/search/SearchStrategy.java similarity index 84% rename from processing/src/main/java/io/druid/collections/spatial/search/SearchStrategy.java rename to processing/src/main/java/org/apache/druid/collections/spatial/search/SearchStrategy.java index e8cbd318b2b8..712c56bc1bc0 100644 --- a/processing/src/main/java/io/druid/collections/spatial/search/SearchStrategy.java +++ b/processing/src/main/java/org/apache/druid/collections/spatial/search/SearchStrategy.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.collections.spatial.search; +package org.apache.druid.collections.spatial.search; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.collections.spatial.ImmutableNode; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.collections.spatial.ImmutableNode; /** diff --git a/processing/src/main/java/io/druid/collections/spatial/split/GutmanSplitStrategy.java b/processing/src/main/java/org/apache/druid/collections/spatial/split/GutmanSplitStrategy.java similarity index 95% rename from processing/src/main/java/io/druid/collections/spatial/split/GutmanSplitStrategy.java rename to processing/src/main/java/org/apache/druid/collections/spatial/split/GutmanSplitStrategy.java index db8f8801b31a..c4b3bd4ca85d 100644 --- a/processing/src/main/java/io/druid/collections/spatial/split/GutmanSplitStrategy.java +++ b/processing/src/main/java/org/apache/druid/collections/spatial/split/GutmanSplitStrategy.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.collections.spatial.split; +package org.apache.druid.collections.spatial.split; import com.google.common.collect.Lists; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.spatial.Node; -import io.druid.collections.spatial.RTreeUtils; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.spatial.Node; +import org.apache.druid.collections.spatial.RTreeUtils; import java.util.List; diff --git a/processing/src/main/java/io/druid/collections/spatial/split/LinearGutmanSplitStrategy.java b/processing/src/main/java/org/apache/druid/collections/spatial/split/LinearGutmanSplitStrategy.java similarity index 96% rename from processing/src/main/java/io/druid/collections/spatial/split/LinearGutmanSplitStrategy.java rename to processing/src/main/java/org/apache/druid/collections/spatial/split/LinearGutmanSplitStrategy.java index 8cf22625e0ed..52410fba40ea 100644 --- a/processing/src/main/java/io/druid/collections/spatial/split/LinearGutmanSplitStrategy.java +++ b/processing/src/main/java/org/apache/druid/collections/spatial/split/LinearGutmanSplitStrategy.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.collections.spatial.split; +package org.apache.druid.collections.spatial.split; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.spatial.Node; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.spatial.Node; import java.util.List; diff --git a/processing/src/main/java/io/druid/collections/spatial/split/SplitStrategy.java b/processing/src/main/java/org/apache/druid/collections/spatial/split/SplitStrategy.java similarity index 89% rename from processing/src/main/java/io/druid/collections/spatial/split/SplitStrategy.java rename to processing/src/main/java/org/apache/druid/collections/spatial/split/SplitStrategy.java index 3696d3543857..627680e979cd 100644 --- a/processing/src/main/java/io/druid/collections/spatial/split/SplitStrategy.java +++ b/processing/src/main/java/org/apache/druid/collections/spatial/split/SplitStrategy.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.collections.spatial.split; +package org.apache.druid.collections.spatial.split; -import io.druid.collections.spatial.Node; +import org.apache.druid.collections.spatial.Node; /** */ diff --git a/processing/src/main/java/io/druid/guice/ConfigModule.java b/processing/src/main/java/org/apache/druid/guice/ConfigModule.java similarity index 94% rename from processing/src/main/java/io/druid/guice/ConfigModule.java rename to processing/src/main/java/org/apache/druid/guice/ConfigModule.java index d68cad4b563a..522ee63337e4 100644 --- a/processing/src/main/java/io/druid/guice/ConfigModule.java +++ b/processing/src/main/java/org/apache/druid/guice/ConfigModule.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.google.inject.Binder; import com.google.inject.Module; import com.google.inject.Provides; -import io.druid.java.util.common.config.Config; +import org.apache.druid.java.util.common.config.Config; import org.skife.config.ConfigurationObjectFactory; import javax.validation.Validation; diff --git a/processing/src/main/java/io/druid/guice/ExtensionsConfig.java b/processing/src/main/java/org/apache/druid/guice/ExtensionsConfig.java similarity index 98% rename from processing/src/main/java/io/druid/guice/ExtensionsConfig.java rename to processing/src/main/java/org/apache/druid/guice/ExtensionsConfig.java index adafbb860fa4..c48d27eb588e 100644 --- a/processing/src/main/java/io/druid/guice/ExtensionsConfig.java +++ b/processing/src/main/java/org/apache/druid/guice/ExtensionsConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/processing/src/main/java/io/druid/guice/GuiceInjectors.java b/processing/src/main/java/org/apache/druid/guice/GuiceInjectors.java similarity index 96% rename from processing/src/main/java/io/druid/guice/GuiceInjectors.java rename to processing/src/main/java/org/apache/druid/guice/GuiceInjectors.java index cc5670fedf63..46f61f656145 100644 --- a/processing/src/main/java/io/druid/guice/GuiceInjectors.java +++ b/processing/src/main/java/org/apache/druid/guice/GuiceInjectors.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Module; -import io.druid.jackson.JacksonModule; +import org.apache.druid.jackson.JacksonModule; import java.util.Arrays; import java.util.Collection; diff --git a/processing/src/main/java/io/druid/guice/ModulesConfig.java b/processing/src/main/java/org/apache/druid/guice/ModulesConfig.java similarity index 97% rename from processing/src/main/java/io/druid/guice/ModulesConfig.java rename to processing/src/main/java/org/apache/druid/guice/ModulesConfig.java index 548b125314ed..5ff8dee917bf 100644 --- a/processing/src/main/java/io/druid/guice/ModulesConfig.java +++ b/processing/src/main/java/org/apache/druid/guice/ModulesConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/processing/src/main/java/io/druid/guice/NullHandlingModule.java b/processing/src/main/java/org/apache/druid/guice/NullHandlingModule.java similarity index 89% rename from processing/src/main/java/io/druid/guice/NullHandlingModule.java rename to processing/src/main/java/org/apache/druid/guice/NullHandlingModule.java index 64f01291a341..99819805e4c6 100644 --- a/processing/src/main/java/io/druid/guice/NullHandlingModule.java +++ b/processing/src/main/java/org/apache/druid/guice/NullHandlingModule.java @@ -17,12 +17,12 @@ * 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.common.config.NullHandling; -import io.druid.common.config.NullValueHandlingConfig; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.common.config.NullValueHandlingConfig; /** */ diff --git a/processing/src/main/java/io/druid/guice/PropertiesModule.java b/processing/src/main/java/org/apache/druid/guice/PropertiesModule.java similarity index 94% rename from processing/src/main/java/io/druid/guice/PropertiesModule.java rename to processing/src/main/java/org/apache/druid/guice/PropertiesModule.java index 1c698658432c..4be17f2f0c4c 100644 --- a/processing/src/main/java/io/druid/guice/PropertiesModule.java +++ b/processing/src/main/java/org/apache/druid/guice/PropertiesModule.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.google.common.base.Throwables; import com.google.inject.Binder; import com.google.inject.Module; -import io.druid.java.util.common.guava.CloseQuietly; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.guava.CloseQuietly; +import org.apache.druid.java.util.common.logger.Logger; import java.io.BufferedInputStream; import java.io.File; diff --git a/processing/src/main/java/io/druid/guice/annotations/Merging.java b/processing/src/main/java/org/apache/druid/guice/annotations/Merging.java similarity index 96% rename from processing/src/main/java/io/druid/guice/annotations/Merging.java rename to processing/src/main/java/org/apache/druid/guice/annotations/Merging.java index 451b95cbb52c..f50ec361602e 100644 --- a/processing/src/main/java/io/druid/guice/annotations/Merging.java +++ b/processing/src/main/java/org/apache/druid/guice/annotations/Merging.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.guice.annotations; +package org.apache.druid.guice.annotations; import com.google.inject.BindingAnnotation; diff --git a/processing/src/main/java/io/druid/guice/annotations/Processing.java b/processing/src/main/java/org/apache/druid/guice/annotations/Processing.java similarity index 96% rename from processing/src/main/java/io/druid/guice/annotations/Processing.java rename to processing/src/main/java/org/apache/druid/guice/annotations/Processing.java index e681581815b3..f82691c2b766 100644 --- a/processing/src/main/java/io/druid/guice/annotations/Processing.java +++ b/processing/src/main/java/org/apache/druid/guice/annotations/Processing.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.guice.annotations; +package org.apache.druid.guice.annotations; import com.google.inject.BindingAnnotation; diff --git a/processing/src/main/java/io/druid/jackson/AggregatorsModule.java b/processing/src/main/java/org/apache/druid/jackson/AggregatorsModule.java similarity index 63% rename from processing/src/main/java/io/druid/jackson/AggregatorsModule.java rename to processing/src/main/java/org/apache/druid/jackson/AggregatorsModule.java index d3cc9a7365bf..ad8b7db28b85 100644 --- a/processing/src/main/java/io/druid/jackson/AggregatorsModule.java +++ b/processing/src/main/java/org/apache/druid/jackson/AggregatorsModule.java @@ -17,54 +17,54 @@ * under the License. */ -package io.druid.jackson; +package org.apache.druid.jackson; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.databind.module.SimpleModule; -import io.druid.hll.HyperLogLogHash; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.DoubleMaxAggregatorFactory; -import io.druid.query.aggregation.DoubleMinAggregatorFactory; -import io.druid.query.aggregation.DoubleSumAggregatorFactory; -import io.druid.query.aggregation.FilteredAggregatorFactory; -import io.druid.query.aggregation.FloatMaxAggregatorFactory; -import io.druid.query.aggregation.FloatMinAggregatorFactory; -import io.druid.query.aggregation.FloatSumAggregatorFactory; -import io.druid.query.aggregation.HistogramAggregatorFactory; -import io.druid.query.aggregation.JavaScriptAggregatorFactory; -import io.druid.query.aggregation.LongMaxAggregatorFactory; -import io.druid.query.aggregation.LongMinAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.SerializablePairLongStringSerde; -import io.druid.query.aggregation.cardinality.CardinalityAggregatorFactory; -import io.druid.query.aggregation.first.DoubleFirstAggregatorFactory; -import io.druid.query.aggregation.first.FloatFirstAggregatorFactory; -import io.druid.query.aggregation.first.LongFirstAggregatorFactory; -import io.druid.query.aggregation.first.StringFirstAggregatorFactory; -import io.druid.query.aggregation.first.StringFirstFoldingAggregatorFactory; -import io.druid.query.aggregation.hyperloglog.HyperUniqueFinalizingPostAggregator; -import io.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; -import io.druid.query.aggregation.hyperloglog.HyperUniquesSerde; -import io.druid.query.aggregation.hyperloglog.PreComputedHyperUniquesSerde; -import io.druid.query.aggregation.last.DoubleLastAggregatorFactory; -import io.druid.query.aggregation.last.FloatLastAggregatorFactory; -import io.druid.query.aggregation.last.LongLastAggregatorFactory; -import io.druid.query.aggregation.last.StringLastAggregatorFactory; -import io.druid.query.aggregation.last.StringLastFoldingAggregatorFactory; -import io.druid.query.aggregation.post.ArithmeticPostAggregator; -import io.druid.query.aggregation.post.ConstantPostAggregator; -import io.druid.query.aggregation.post.DoubleGreatestPostAggregator; -import io.druid.query.aggregation.post.DoubleLeastPostAggregator; -import io.druid.query.aggregation.post.ExpressionPostAggregator; -import io.druid.query.aggregation.post.FieldAccessPostAggregator; -import io.druid.query.aggregation.post.FinalizingFieldAccessPostAggregator; -import io.druid.query.aggregation.post.JavaScriptPostAggregator; -import io.druid.query.aggregation.post.LongGreatestPostAggregator; -import io.druid.query.aggregation.post.LongLeastPostAggregator; -import io.druid.segment.serde.ComplexMetrics; +import org.apache.druid.hll.HyperLogLogHash; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleMaxAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleMinAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; +import org.apache.druid.query.aggregation.FilteredAggregatorFactory; +import org.apache.druid.query.aggregation.FloatMaxAggregatorFactory; +import org.apache.druid.query.aggregation.FloatMinAggregatorFactory; +import org.apache.druid.query.aggregation.FloatSumAggregatorFactory; +import org.apache.druid.query.aggregation.HistogramAggregatorFactory; +import org.apache.druid.query.aggregation.JavaScriptAggregatorFactory; +import org.apache.druid.query.aggregation.LongMaxAggregatorFactory; +import org.apache.druid.query.aggregation.LongMinAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.SerializablePairLongStringSerde; +import org.apache.druid.query.aggregation.cardinality.CardinalityAggregatorFactory; +import org.apache.druid.query.aggregation.first.DoubleFirstAggregatorFactory; +import org.apache.druid.query.aggregation.first.FloatFirstAggregatorFactory; +import org.apache.druid.query.aggregation.first.LongFirstAggregatorFactory; +import org.apache.druid.query.aggregation.first.StringFirstAggregatorFactory; +import org.apache.druid.query.aggregation.first.StringFirstFoldingAggregatorFactory; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniqueFinalizingPostAggregator; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesSerde; +import org.apache.druid.query.aggregation.hyperloglog.PreComputedHyperUniquesSerde; +import org.apache.druid.query.aggregation.last.DoubleLastAggregatorFactory; +import org.apache.druid.query.aggregation.last.FloatLastAggregatorFactory; +import org.apache.druid.query.aggregation.last.LongLastAggregatorFactory; +import org.apache.druid.query.aggregation.last.StringLastAggregatorFactory; +import org.apache.druid.query.aggregation.last.StringLastFoldingAggregatorFactory; +import org.apache.druid.query.aggregation.post.ArithmeticPostAggregator; +import org.apache.druid.query.aggregation.post.ConstantPostAggregator; +import org.apache.druid.query.aggregation.post.DoubleGreatestPostAggregator; +import org.apache.druid.query.aggregation.post.DoubleLeastPostAggregator; +import org.apache.druid.query.aggregation.post.ExpressionPostAggregator; +import org.apache.druid.query.aggregation.post.FieldAccessPostAggregator; +import org.apache.druid.query.aggregation.post.FinalizingFieldAccessPostAggregator; +import org.apache.druid.query.aggregation.post.JavaScriptPostAggregator; +import org.apache.druid.query.aggregation.post.LongGreatestPostAggregator; +import org.apache.druid.query.aggregation.post.LongLeastPostAggregator; +import org.apache.druid.segment.serde.ComplexMetrics; /** */ diff --git a/processing/src/main/java/io/druid/jackson/DefaultObjectMapper.java b/processing/src/main/java/org/apache/druid/jackson/DefaultObjectMapper.java similarity index 98% rename from processing/src/main/java/io/druid/jackson/DefaultObjectMapper.java rename to processing/src/main/java/org/apache/druid/jackson/DefaultObjectMapper.java index 6bcade20656e..85af41c98273 100644 --- a/processing/src/main/java/io/druid/jackson/DefaultObjectMapper.java +++ b/processing/src/main/java/org/apache/druid/jackson/DefaultObjectMapper.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.jackson; +package org.apache.druid.jackson; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.databind.DeserializationFeature; diff --git a/processing/src/main/java/io/druid/jackson/DruidDefaultSerializersModule.java b/processing/src/main/java/org/apache/druid/jackson/DruidDefaultSerializersModule.java similarity index 94% rename from processing/src/main/java/io/druid/jackson/DruidDefaultSerializersModule.java rename to processing/src/main/java/org/apache/druid/jackson/DruidDefaultSerializersModule.java index 208ff363dcc7..10bd8785337e 100644 --- a/processing/src/main/java/io/druid/jackson/DruidDefaultSerializersModule.java +++ b/processing/src/main/java/org/apache/druid/jackson/DruidDefaultSerializersModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.jackson; +package org.apache.druid.jackson; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -29,10 +29,10 @@ import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.google.common.base.Throwables; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.guava.Accumulator; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Yielder; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.guava.Accumulator; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Yielder; import org.joda.time.DateTimeZone; import java.io.IOException; diff --git a/processing/src/main/java/io/druid/jackson/GranularityModule.java b/processing/src/main/java/org/apache/druid/jackson/GranularityModule.java similarity index 80% rename from processing/src/main/java/io/druid/jackson/GranularityModule.java rename to processing/src/main/java/org/apache/druid/jackson/GranularityModule.java index fa34e7bed4a1..631187831b26 100644 --- a/processing/src/main/java/io/druid/jackson/GranularityModule.java +++ b/processing/src/main/java/org/apache/druid/jackson/GranularityModule.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.jackson; +package org.apache.druid.jackson; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; -import io.druid.java.util.common.granularity.AllGranularity; -import io.druid.java.util.common.granularity.DurationGranularity; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.granularity.NoneGranularity; -import io.druid.java.util.common.granularity.PeriodGranularity; +import org.apache.druid.java.util.common.granularity.AllGranularity; +import org.apache.druid.java.util.common.granularity.DurationGranularity; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.granularity.NoneGranularity; +import org.apache.druid.java.util.common.granularity.PeriodGranularity; public class GranularityModule extends SimpleModule { diff --git a/processing/src/main/java/io/druid/jackson/JacksonModule.java b/processing/src/main/java/org/apache/druid/jackson/JacksonModule.java similarity index 91% rename from processing/src/main/java/io/druid/jackson/JacksonModule.java rename to processing/src/main/java/org/apache/druid/jackson/JacksonModule.java index 3d402c6304a0..853a088dfbaa 100644 --- a/processing/src/main/java/io/druid/jackson/JacksonModule.java +++ b/processing/src/main/java/org/apache/druid/jackson/JacksonModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.jackson; +package org.apache.druid.jackson; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.smile.SmileFactory; @@ -26,9 +26,9 @@ import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.Provides; -import io.druid.guice.LazySingleton; -import io.druid.guice.annotations.Json; -import io.druid.guice.annotations.Smile; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.guice.annotations.Smile; /** */ diff --git a/processing/src/main/java/io/druid/jackson/JodaStuff.java b/processing/src/main/java/org/apache/druid/jackson/JodaStuff.java similarity index 96% rename from processing/src/main/java/io/druid/jackson/JodaStuff.java rename to processing/src/main/java/org/apache/druid/jackson/JodaStuff.java index c5fbee95e2ef..b7af383c915d 100644 --- a/processing/src/main/java/io/druid/jackson/JodaStuff.java +++ b/processing/src/main/java/org/apache/druid/jackson/JodaStuff.java @@ -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; @@ -30,8 +30,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.datatype.joda.deser.DurationDeserializer; import com.fasterxml.jackson.datatype.joda.deser.PeriodDeserializer; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; import org.joda.time.DateTime; import org.joda.time.Duration; import org.joda.time.Interval; diff --git a/processing/src/main/java/io/druid/jackson/SegmentizerModule.java b/processing/src/main/java/org/apache/druid/jackson/SegmentizerModule.java similarity index 91% rename from processing/src/main/java/io/druid/jackson/SegmentizerModule.java rename to processing/src/main/java/org/apache/druid/jackson/SegmentizerModule.java index 87c8009a2b2b..82e96ccb87c5 100644 --- a/processing/src/main/java/io/druid/jackson/SegmentizerModule.java +++ b/processing/src/main/java/org/apache/druid/jackson/SegmentizerModule.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.jackson; +package org.apache.druid.jackson; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; -import io.druid.segment.loading.MMappedQueryableSegmentizerFactory; +import org.apache.druid.segment.loading.MMappedQueryableSegmentizerFactory; public class SegmentizerModule extends SimpleModule { diff --git a/processing/src/main/java/io/druid/jackson/SegmentsModule.java b/processing/src/main/java/org/apache/druid/jackson/SegmentsModule.java similarity index 90% rename from processing/src/main/java/io/druid/jackson/SegmentsModule.java rename to processing/src/main/java/org/apache/druid/jackson/SegmentsModule.java index 355a14c1a262..0f3cd21f3b64 100644 --- a/processing/src/main/java/io/druid/jackson/SegmentsModule.java +++ b/processing/src/main/java/org/apache/druid/jackson/SegmentsModule.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.jackson; +package org.apache.druid.jackson; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.databind.module.SimpleModule; -import io.druid.timeline.partition.NoneShardSpec; -import io.druid.timeline.partition.ShardSpec; +import org.apache.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.timeline.partition.ShardSpec; /** */ diff --git a/processing/src/main/java/io/druid/jackson/StringComparatorModule.java b/processing/src/main/java/org/apache/druid/jackson/StringComparatorModule.java similarity index 92% rename from processing/src/main/java/io/druid/jackson/StringComparatorModule.java rename to processing/src/main/java/org/apache/druid/jackson/StringComparatorModule.java index 045529a54b77..a072ba191998 100644 --- a/processing/src/main/java/io/druid/jackson/StringComparatorModule.java +++ b/processing/src/main/java/org/apache/druid/jackson/StringComparatorModule.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.jackson; +package org.apache.druid.jackson; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; -import io.druid.query.ordering.StringComparator; -import io.druid.query.ordering.StringComparators; +import org.apache.druid.query.ordering.StringComparator; +import org.apache.druid.query.ordering.StringComparators; public class StringComparatorModule extends SimpleModule { diff --git a/processing/src/main/java/io/druid/query/AbstractPrioritizedCallable.java b/processing/src/main/java/org/apache/druid/query/AbstractPrioritizedCallable.java similarity index 97% rename from processing/src/main/java/io/druid/query/AbstractPrioritizedCallable.java rename to processing/src/main/java/org/apache/druid/query/AbstractPrioritizedCallable.java index 5a8b17f75bec..0afee709f3b4 100644 --- a/processing/src/main/java/io/druid/query/AbstractPrioritizedCallable.java +++ b/processing/src/main/java/org/apache/druid/query/AbstractPrioritizedCallable.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; public abstract class AbstractPrioritizedCallable implements PrioritizedCallable { diff --git a/processing/src/main/java/io/druid/query/AsyncQueryRunner.java b/processing/src/main/java/org/apache/druid/query/AsyncQueryRunner.java similarity index 95% rename from processing/src/main/java/io/druid/query/AsyncQueryRunner.java rename to processing/src/main/java/org/apache/druid/query/AsyncQueryRunner.java index 57c8d6055e72..5281f99333d7 100644 --- a/processing/src/main/java/io/druid/query/AsyncQueryRunner.java +++ b/processing/src/main/java/org/apache/druid/query/AsyncQueryRunner.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.base.Supplier; import com.google.common.base.Throwables; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.java.util.common.guava.LazySequence; -import io.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.LazySequence; +import org.apache.druid.java.util.common.guava.Sequence; import java.util.Map; import java.util.concurrent.ExecutionException; diff --git a/processing/src/main/java/io/druid/query/BaseQuery.java b/processing/src/main/java/org/apache/druid/query/BaseQuery.java similarity index 95% rename from processing/src/main/java/io/druid/query/BaseQuery.java rename to processing/src/main/java/org/apache/druid/query/BaseQuery.java index 3c1a0096aae4..bc90e4e96afa 100644 --- a/processing/src/main/java/io/druid/query/BaseQuery.java +++ b/processing/src/main/java/org/apache/druid/query/BaseQuery.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.annotations.VisibleForTesting; @@ -25,11 +25,11 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.common.collect.Ordering; -import io.druid.guice.annotations.ExtensionPoint; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.granularity.PeriodGranularity; -import io.druid.query.spec.QuerySegmentSpec; +import org.apache.druid.guice.annotations.ExtensionPoint; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.granularity.PeriodGranularity; +import org.apache.druid.query.spec.QuerySegmentSpec; import org.joda.time.DateTimeZone; import org.joda.time.Duration; import org.joda.time.Interval; diff --git a/processing/src/main/java/io/druid/query/BitmapResultFactory.java b/processing/src/main/java/org/apache/druid/query/BitmapResultFactory.java similarity index 96% rename from processing/src/main/java/io/druid/query/BitmapResultFactory.java rename to processing/src/main/java/org/apache/druid/query/BitmapResultFactory.java index 294fc2283899..46634c1f0f49 100644 --- a/processing/src/main/java/io/druid/query/BitmapResultFactory.java +++ b/processing/src/main/java/org/apache/druid/query/BitmapResultFactory.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.ImmutableBitmap; /** * BitmapResultFactory is an abstraction that allows to record something along with preFilter bitmap construction, and diff --git a/processing/src/main/java/io/druid/query/BySegmentQueryRunner.java b/processing/src/main/java/org/apache/druid/query/BySegmentQueryRunner.java similarity index 93% rename from processing/src/main/java/io/druid/query/BySegmentQueryRunner.java rename to processing/src/main/java/org/apache/druid/query/BySegmentQueryRunner.java index 123c0f37bd59..a2ed5574f1b1 100644 --- a/processing/src/main/java/io/druid/query/BySegmentQueryRunner.java +++ b/processing/src/main/java/org/apache/druid/query/BySegmentQueryRunner.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; import org.joda.time.DateTime; import java.util.Collections; diff --git a/processing/src/main/java/io/druid/query/BySegmentResultValue.java b/processing/src/main/java/org/apache/druid/query/BySegmentResultValue.java similarity index 92% rename from processing/src/main/java/io/druid/query/BySegmentResultValue.java rename to processing/src/main/java/org/apache/druid/query/BySegmentResultValue.java index eaa39258ada1..579786f0999f 100644 --- a/processing/src/main/java/io/druid/query/BySegmentResultValue.java +++ b/processing/src/main/java/org/apache/druid/query/BySegmentResultValue.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; -import io.druid.guice.annotations.PublicApi; +import org.apache.druid.guice.annotations.PublicApi; import org.joda.time.Interval; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/BySegmentResultValueClass.java b/processing/src/main/java/org/apache/druid/query/BySegmentResultValueClass.java similarity index 98% rename from processing/src/main/java/io/druid/query/BySegmentResultValueClass.java rename to processing/src/main/java/org/apache/druid/query/BySegmentResultValueClass.java index c22f6e173fb6..d5ce01b9ead9 100644 --- a/processing/src/main/java/io/druid/query/BySegmentResultValueClass.java +++ b/processing/src/main/java/org/apache/druid/query/BySegmentResultValueClass.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.fasterxml.jackson.annotation.JsonProperty; import org.joda.time.Interval; diff --git a/processing/src/main/java/io/druid/query/BySegmentSkippingQueryRunner.java b/processing/src/main/java/org/apache/druid/query/BySegmentSkippingQueryRunner.java similarity index 94% rename from processing/src/main/java/io/druid/query/BySegmentSkippingQueryRunner.java rename to processing/src/main/java/org/apache/druid/query/BySegmentSkippingQueryRunner.java index 71cf32f8da03..0a5d5de86282 100644 --- a/processing/src/main/java/io/druid/query/BySegmentSkippingQueryRunner.java +++ b/processing/src/main/java/org/apache/druid/query/BySegmentSkippingQueryRunner.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; -import io.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequence; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/CPUTimeMetricQueryRunner.java b/processing/src/main/java/org/apache/druid/query/CPUTimeMetricQueryRunner.java similarity index 90% rename from processing/src/main/java/io/druid/query/CPUTimeMetricQueryRunner.java rename to processing/src/main/java/org/apache/druid/query/CPUTimeMetricQueryRunner.java index fda5c72f7dc4..67fbdf828367 100644 --- a/processing/src/main/java/io/druid/query/CPUTimeMetricQueryRunner.java +++ b/processing/src/main/java/org/apache/druid/query/CPUTimeMetricQueryRunner.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.base.Supplier; -import io.druid.common.utils.VMUtils; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.SequenceWrapper; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.common.utils.VMUtils; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.SequenceWrapper; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; diff --git a/processing/src/main/java/io/druid/query/CacheStrategy.java b/processing/src/main/java/org/apache/druid/query/CacheStrategy.java similarity index 97% rename from processing/src/main/java/io/druid/query/CacheStrategy.java rename to processing/src/main/java/org/apache/druid/query/CacheStrategy.java index 7128d2f8576b..7a300c0c63dd 100644 --- a/processing/src/main/java/io/druid/query/CacheStrategy.java +++ b/processing/src/main/java/org/apache/druid/query/CacheStrategy.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.base.Function; -import io.druid.guice.annotations.ExtensionPoint; +import org.apache.druid.guice.annotations.ExtensionPoint; import java.util.concurrent.ExecutorService; diff --git a/processing/src/main/java/io/druid/query/ChainedExecutionQueryRunner.java b/processing/src/main/java/org/apache/druid/query/ChainedExecutionQueryRunner.java similarity index 95% rename from processing/src/main/java/io/druid/query/ChainedExecutionQueryRunner.java rename to processing/src/main/java/org/apache/druid/query/ChainedExecutionQueryRunner.java index f0b1cf3f88be..0cfce5766090 100644 --- a/processing/src/main/java/io/druid/query/ChainedExecutionQueryRunner.java +++ b/processing/src/main/java/org/apache/druid/query/ChainedExecutionQueryRunner.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.base.Throwables; import com.google.common.collect.Iterables; @@ -27,11 +27,11 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.guava.BaseSequence; -import io.druid.java.util.common.guava.MergeIterable; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.guava.BaseSequence; +import org.apache.druid.java.util.common.guava.MergeIterable; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.logger.Logger; import java.util.Arrays; import java.util.Iterator; diff --git a/processing/src/main/java/io/druid/query/ColumnSelectorPlus.java b/processing/src/main/java/org/apache/druid/query/ColumnSelectorPlus.java similarity index 93% rename from processing/src/main/java/io/druid/query/ColumnSelectorPlus.java rename to processing/src/main/java/org/apache/druid/query/ColumnSelectorPlus.java index 5f23905a7d4b..d2dba1511355 100644 --- a/processing/src/main/java/io/druid/query/ColumnSelectorPlus.java +++ b/processing/src/main/java/org/apache/druid/query/ColumnSelectorPlus.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; -import io.druid.query.dimension.ColumnSelectorStrategy; -import io.druid.segment.ColumnValueSelector; +import org.apache.druid.query.dimension.ColumnSelectorStrategy; +import org.apache.druid.segment.ColumnValueSelector; /** * A grouping of various related objects used during query processing for a single dimension, used for convenience. diff --git a/processing/src/main/java/io/druid/query/ConcatQueryRunner.java b/processing/src/main/java/org/apache/druid/query/ConcatQueryRunner.java similarity index 91% rename from processing/src/main/java/io/druid/query/ConcatQueryRunner.java rename to processing/src/main/java/org/apache/druid/query/ConcatQueryRunner.java index ec6cbd3733d1..9392233a4ad6 100644 --- a/processing/src/main/java/io/druid/query/ConcatQueryRunner.java +++ b/processing/src/main/java/org/apache/druid/query/ConcatQueryRunner.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.base.Function; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/DataSource.java b/processing/src/main/java/org/apache/druid/query/DataSource.java similarity index 97% rename from processing/src/main/java/io/druid/query/DataSource.java rename to processing/src/main/java/org/apache/druid/query/DataSource.java index e5fd620eccfd..13a3cf5cc4bf 100644 --- a/processing/src/main/java/io/druid/query/DataSource.java +++ b/processing/src/main/java/org/apache/druid/query/DataSource.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/processing/src/main/java/io/druid/query/DataSourceUtil.java b/processing/src/main/java/org/apache/druid/query/DataSourceUtil.java similarity index 97% rename from processing/src/main/java/io/druid/query/DataSourceUtil.java rename to processing/src/main/java/org/apache/druid/query/DataSourceUtil.java index d07455425b54..fdc7747f2d93 100644 --- a/processing/src/main/java/io/druid/query/DataSourceUtil.java +++ b/processing/src/main/java/org/apache/druid/query/DataSourceUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/DefaultBitmapResultFactory.java b/processing/src/main/java/org/apache/druid/query/DefaultBitmapResultFactory.java similarity index 93% rename from processing/src/main/java/io/druid/query/DefaultBitmapResultFactory.java rename to processing/src/main/java/org/apache/druid/query/DefaultBitmapResultFactory.java index d448db88abc2..0407726d57fe 100644 --- a/processing/src/main/java/io/druid/query/DefaultBitmapResultFactory.java +++ b/processing/src/main/java/org/apache/druid/query/DefaultBitmapResultFactory.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.ImmutableBitmap; public final class DefaultBitmapResultFactory implements BitmapResultFactory { diff --git a/processing/src/main/java/io/druid/query/DefaultGenericQueryMetricsFactory.java b/processing/src/main/java/org/apache/druid/query/DefaultGenericQueryMetricsFactory.java similarity index 83% rename from processing/src/main/java/io/druid/query/DefaultGenericQueryMetricsFactory.java rename to processing/src/main/java/org/apache/druid/query/DefaultGenericQueryMetricsFactory.java index 9a53007c8f85..fb859dbb825d 100644 --- a/processing/src/main/java/io/druid/query/DefaultGenericQueryMetricsFactory.java +++ b/processing/src/main/java/org/apache/druid/query/DefaultGenericQueryMetricsFactory.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; import com.google.inject.Inject; -import io.druid.guice.LazySingleton; -import io.druid.guice.annotations.Json; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.jackson.DefaultObjectMapper; @LazySingleton public class DefaultGenericQueryMetricsFactory implements GenericQueryMetricsFactory @@ -34,8 +34,8 @@ public class DefaultGenericQueryMetricsFactory implements GenericQueryMetricsFac /** * Should be used only in tests, directly or indirectly (e. g. in {@link - * io.druid.query.search.SearchQueryQueryToolChest#SearchQueryQueryToolChest( - * io.druid.query.search.SearchQueryConfig, IntervalChunkingQueryRunnerDecorator)}). + * org.apache.druid.query.search.SearchQueryQueryToolChest#SearchQueryQueryToolChest( + * org.apache.druid.query.search.SearchQueryConfig, IntervalChunkingQueryRunnerDecorator)}). */ @VisibleForTesting public static GenericQueryMetricsFactory instance() diff --git a/processing/src/main/java/io/druid/query/DefaultQueryMetrics.java b/processing/src/main/java/org/apache/druid/query/DefaultQueryMetrics.java similarity index 95% rename from processing/src/main/java/io/druid/query/DefaultQueryMetrics.java rename to processing/src/main/java/org/apache/druid/query/DefaultQueryMetrics.java index 09900a57be96..6f8d3c6c2b34 100644 --- a/processing/src/main/java/io/druid/query/DefaultQueryMetrics.java +++ b/processing/src/main/java/org/apache/druid/query/DefaultQueryMetrics.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.query.filter.Filter; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.query.filter.Filter; import org.joda.time.Interval; import java.util.HashMap; diff --git a/processing/src/main/java/io/druid/query/DefaultQueryRunnerFactoryConglomerate.java b/processing/src/main/java/org/apache/druid/query/DefaultQueryRunnerFactoryConglomerate.java similarity index 97% rename from processing/src/main/java/io/druid/query/DefaultQueryRunnerFactoryConglomerate.java rename to processing/src/main/java/org/apache/druid/query/DefaultQueryRunnerFactoryConglomerate.java index 48df155a4a1b..ecd77b70021b 100644 --- a/processing/src/main/java/io/druid/query/DefaultQueryRunnerFactoryConglomerate.java +++ b/processing/src/main/java/org/apache/druid/query/DefaultQueryRunnerFactoryConglomerate.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.inject.Inject; diff --git a/processing/src/main/java/io/druid/query/DruidMetrics.java b/processing/src/main/java/org/apache/druid/query/DruidMetrics.java similarity index 96% rename from processing/src/main/java/io/druid/query/DruidMetrics.java rename to processing/src/main/java/org/apache/druid/query/DruidMetrics.java index 052037d8e399..b813c6b75d69 100644 --- a/processing/src/main/java/io/druid/query/DruidMetrics.java +++ b/processing/src/main/java/org/apache/druid/query/DruidMetrics.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; -import io.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorFactory; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/DruidProcessingConfig.java b/processing/src/main/java/org/apache/druid/query/DruidProcessingConfig.java similarity index 94% rename from processing/src/main/java/io/druid/query/DruidProcessingConfig.java rename to processing/src/main/java/org/apache/druid/query/DruidProcessingConfig.java index 06ea03478067..f91957e4721a 100644 --- a/processing/src/main/java/io/druid/query/DruidProcessingConfig.java +++ b/processing/src/main/java/org/apache/druid/query/DruidProcessingConfig.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; -import io.druid.java.util.common.concurrent.ExecutorServiceConfig; -import io.druid.segment.column.ColumnConfig; +import org.apache.druid.java.util.common.concurrent.ExecutorServiceConfig; +import org.apache.druid.segment.column.ColumnConfig; import org.skife.config.Config; public abstract class DruidProcessingConfig extends ExecutorServiceConfig implements ColumnConfig diff --git a/processing/src/main/java/io/druid/query/Druids.java b/processing/src/main/java/org/apache/druid/query/Druids.java similarity index 94% rename from processing/src/main/java/io/druid/query/Druids.java rename to processing/src/main/java/org/apache/druid/query/Druids.java index e715423af904..5070d8a2a961 100644 --- a/processing/src/main/java/io/druid/query/Druids.java +++ b/processing/src/main/java/org/apache/druid/query/Druids.java @@ -17,39 +17,39 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.datasourcemetadata.DataSourceMetadataQuery; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.filter.DimFilter; -import io.druid.query.filter.InDimFilter; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.query.metadata.metadata.ColumnIncluderator; -import io.druid.query.metadata.metadata.SegmentMetadataQuery; -import io.druid.query.search.ContainsSearchQuerySpec; -import io.druid.query.search.FragmentSearchQuerySpec; -import io.druid.query.search.InsensitiveContainsSearchQuerySpec; -import io.druid.query.search.SearchQuery; -import io.druid.query.search.SearchQuerySpec; -import io.druid.query.search.SearchSortSpec; -import io.druid.query.select.PagingSpec; -import io.druid.query.select.SelectQuery; -import io.druid.query.spec.LegacySegmentSpec; -import io.druid.query.spec.QuerySegmentSpec; -import io.druid.query.timeboundary.TimeBoundaryQuery; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.segment.VirtualColumn; -import io.druid.segment.VirtualColumns; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.datasourcemetadata.DataSourceMetadataQuery; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.filter.InDimFilter; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.query.metadata.metadata.ColumnIncluderator; +import org.apache.druid.query.metadata.metadata.SegmentMetadataQuery; +import org.apache.druid.query.search.ContainsSearchQuerySpec; +import org.apache.druid.query.search.FragmentSearchQuerySpec; +import org.apache.druid.query.search.InsensitiveContainsSearchQuerySpec; +import org.apache.druid.query.search.SearchQuery; +import org.apache.druid.query.search.SearchQuerySpec; +import org.apache.druid.query.search.SearchSortSpec; +import org.apache.druid.query.select.PagingSpec; +import org.apache.druid.query.select.SelectQuery; +import org.apache.druid.query.spec.LegacySegmentSpec; +import org.apache.druid.query.spec.QuerySegmentSpec; +import org.apache.druid.query.timeboundary.TimeBoundaryQuery; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.segment.VirtualColumn; +import org.apache.druid.segment.VirtualColumns; import org.joda.time.Interval; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/query/ExecutorServiceMonitor.java b/processing/src/main/java/org/apache/druid/query/ExecutorServiceMonitor.java similarity index 88% rename from processing/src/main/java/io/druid/query/ExecutorServiceMonitor.java rename to processing/src/main/java/org/apache/druid/query/ExecutorServiceMonitor.java index 975da9dea2cc..4a2058268372 100644 --- a/processing/src/main/java/io/druid/query/ExecutorServiceMonitor.java +++ b/processing/src/main/java/org/apache/druid/query/ExecutorServiceMonitor.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.collect.Lists; import com.google.inject.Inject; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.java.util.metrics.AbstractMonitor; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.metrics.AbstractMonitor; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/FinalizeResultsQueryRunner.java b/processing/src/main/java/org/apache/druid/query/FinalizeResultsQueryRunner.java similarity index 90% rename from processing/src/main/java/io/druid/query/FinalizeResultsQueryRunner.java rename to processing/src/main/java/org/apache/druid/query/FinalizeResultsQueryRunner.java index b4b1dc2c502a..df1d27e06dbc 100644 --- a/processing/src/main/java/io/druid/query/FinalizeResultsQueryRunner.java +++ b/processing/src/main/java/org/apache/druid/query/FinalizeResultsQueryRunner.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.query.aggregation.MetricManipulationFn; -import io.druid.query.aggregation.MetricManipulatorFns; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.query.aggregation.MetricManipulationFn; +import org.apache.druid.query.aggregation.MetricManipulatorFns; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/FluentQueryRunnerBuilder.java b/processing/src/main/java/org/apache/druid/query/FluentQueryRunnerBuilder.java similarity index 94% rename from processing/src/main/java/io/druid/query/FluentQueryRunnerBuilder.java rename to processing/src/main/java/org/apache/druid/query/FluentQueryRunnerBuilder.java index 9159dd91093b..e95b38af4c6e 100644 --- a/processing/src/main/java/io/druid/query/FluentQueryRunnerBuilder.java +++ b/processing/src/main/java/org/apache/druid/query/FluentQueryRunnerBuilder.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.common.guava.Sequence; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; diff --git a/processing/src/main/java/io/druid/query/GenericQueryMetricsFactory.java b/processing/src/main/java/org/apache/druid/query/GenericQueryMetricsFactory.java similarity index 95% rename from processing/src/main/java/io/druid/query/GenericQueryMetricsFactory.java rename to processing/src/main/java/org/apache/druid/query/GenericQueryMetricsFactory.java index 4f3d9795ee86..ce9c4e19c482 100644 --- a/processing/src/main/java/io/druid/query/GenericQueryMetricsFactory.java +++ b/processing/src/main/java/org/apache/druid/query/GenericQueryMetricsFactory.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; -import io.druid.guice.annotations.PublicApi; +import org.apache.druid.guice.annotations.PublicApi; /** * This factory is used for DI of custom {@link QueryMetrics} implementations for all query types, which don't (yet) diff --git a/processing/src/main/java/io/druid/query/GroupByMergedQueryRunner.java b/processing/src/main/java/org/apache/druid/query/GroupByMergedQueryRunner.java similarity index 91% rename from processing/src/main/java/io/druid/query/GroupByMergedQueryRunner.java rename to processing/src/main/java/org/apache/druid/query/GroupByMergedQueryRunner.java index c311fedcaa44..dd7004945699 100644 --- a/processing/src/main/java/io/druid/query/GroupByMergedQueryRunner.java +++ b/processing/src/main/java/org/apache/druid/query/GroupByMergedQueryRunner.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.base.Function; import com.google.common.base.Predicates; @@ -29,18 +29,18 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.collections.NonBlockingPool; -import io.druid.data.input.Row; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.guava.Accumulator; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.groupby.GroupByQuery; -import io.druid.query.groupby.GroupByQueryConfig; -import io.druid.query.groupby.GroupByQueryHelper; -import io.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.collections.NonBlockingPool; +import org.apache.druid.data.input.Row; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.guava.Accumulator; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.groupby.GroupByQuery; +import org.apache.druid.query.groupby.GroupByQueryConfig; +import org.apache.druid.query.groupby.GroupByQueryHelper; +import org.apache.druid.segment.incremental.IncrementalIndex; import java.nio.ByteBuffer; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/InsufficientResourcesException.java b/processing/src/main/java/org/apache/druid/query/InsufficientResourcesException.java similarity index 97% rename from processing/src/main/java/io/druid/query/InsufficientResourcesException.java rename to processing/src/main/java/org/apache/druid/query/InsufficientResourcesException.java index 2ccb936e7c34..05424bf47613 100644 --- a/processing/src/main/java/io/druid/query/InsufficientResourcesException.java +++ b/processing/src/main/java/org/apache/druid/query/InsufficientResourcesException.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; /** * This exception is thrown when the requested operation cannot be completed due to a lack of available resources. diff --git a/processing/src/main/java/io/druid/query/IntervalChunkingQueryRunner.java b/processing/src/main/java/org/apache/druid/query/IntervalChunkingQueryRunner.java similarity index 91% rename from processing/src/main/java/io/druid/query/IntervalChunkingQueryRunner.java rename to processing/src/main/java/org/apache/druid/query/IntervalChunkingQueryRunner.java index c174a3de45f7..d97c4fae6840 100644 --- a/processing/src/main/java/io/druid/query/IntervalChunkingQueryRunner.java +++ b/processing/src/main/java/org/apache/druid/query/IntervalChunkingQueryRunner.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.base.Function; import com.google.common.collect.Lists; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.granularity.PeriodGranularity; -import io.druid.java.util.common.guava.FunctionalIterable; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.granularity.PeriodGranularity; +import org.apache.druid.java.util.common.guava.FunctionalIterable; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; import org.joda.time.DateTime; import org.joda.time.Interval; import org.joda.time.Period; diff --git a/processing/src/main/java/io/druid/query/IntervalChunkingQueryRunnerDecorator.java b/processing/src/main/java/org/apache/druid/query/IntervalChunkingQueryRunnerDecorator.java similarity index 88% rename from processing/src/main/java/io/druid/query/IntervalChunkingQueryRunnerDecorator.java rename to processing/src/main/java/org/apache/druid/query/IntervalChunkingQueryRunnerDecorator.java index f4ddd232623b..50b28cf79375 100644 --- a/processing/src/main/java/io/druid/query/IntervalChunkingQueryRunnerDecorator.java +++ b/processing/src/main/java/org/apache/druid/query/IntervalChunkingQueryRunnerDecorator.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.inject.Inject; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.guice.annotations.Processing; -import io.druid.guice.annotations.PublicApi; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.guice.annotations.Processing; +import org.apache.druid.guice.annotations.PublicApi; import java.util.concurrent.ExecutorService; diff --git a/processing/src/main/java/io/druid/query/LegacyDataSource.java b/processing/src/main/java/org/apache/druid/query/LegacyDataSource.java similarity index 97% rename from processing/src/main/java/io/druid/query/LegacyDataSource.java rename to processing/src/main/java/org/apache/druid/query/LegacyDataSource.java index 6e14fc7b598b..79c4014413ad 100644 --- a/processing/src/main/java/io/druid/query/LegacyDataSource.java +++ b/processing/src/main/java/org/apache/druid/query/LegacyDataSource.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; diff --git a/processing/src/main/java/io/druid/query/MapQueryToolChestWarehouse.java b/processing/src/main/java/org/apache/druid/query/MapQueryToolChestWarehouse.java similarity index 97% rename from processing/src/main/java/io/druid/query/MapQueryToolChestWarehouse.java rename to processing/src/main/java/org/apache/druid/query/MapQueryToolChestWarehouse.java index 03c3d0d6b2cd..db88db14dbe3 100644 --- a/processing/src/main/java/io/druid/query/MapQueryToolChestWarehouse.java +++ b/processing/src/main/java/org/apache/druid/query/MapQueryToolChestWarehouse.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.inject.Inject; diff --git a/processing/src/main/java/io/druid/query/MetricValueExtractor.java b/processing/src/main/java/org/apache/druid/query/MetricValueExtractor.java similarity index 98% rename from processing/src/main/java/io/druid/query/MetricValueExtractor.java rename to processing/src/main/java/org/apache/druid/query/MetricValueExtractor.java index 1103e349a2d8..e08520f944d7 100644 --- a/processing/src/main/java/io/druid/query/MetricValueExtractor.java +++ b/processing/src/main/java/org/apache/druid/query/MetricValueExtractor.java @@ -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.JsonValue; diff --git a/processing/src/main/java/io/druid/query/MetricsEmittingExecutorService.java b/processing/src/main/java/org/apache/druid/query/MetricsEmittingExecutorService.java similarity index 92% rename from processing/src/main/java/io/druid/query/MetricsEmittingExecutorService.java rename to processing/src/main/java/org/apache/druid/query/MetricsEmittingExecutorService.java index 22584110c9d4..14b35608a6a5 100644 --- a/processing/src/main/java/io/druid/query/MetricsEmittingExecutorService.java +++ b/processing/src/main/java/org/apache/druid/query/MetricsEmittingExecutorService.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.util.concurrent.ForwardingListeningExecutorService; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; import java.util.concurrent.Callable; diff --git a/processing/src/main/java/io/druid/query/MetricsEmittingQueryRunner.java b/processing/src/main/java/org/apache/druid/query/MetricsEmittingQueryRunner.java similarity index 91% rename from processing/src/main/java/io/druid/query/MetricsEmittingQueryRunner.java rename to processing/src/main/java/org/apache/druid/query/MetricsEmittingQueryRunner.java index af8821cb4e46..6b601f3a1c7e 100644 --- a/processing/src/main/java/io/druid/query/MetricsEmittingQueryRunner.java +++ b/processing/src/main/java/org/apache/druid/query/MetricsEmittingQueryRunner.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.common.guava.LazySequence; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.SequenceWrapper; -import io.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.common.guava.LazySequence; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.SequenceWrapper; +import org.apache.druid.java.util.common.guava.Sequences; import java.util.Map; import java.util.function.Consumer; diff --git a/processing/src/main/java/io/druid/query/NoopQueryRunner.java b/processing/src/main/java/org/apache/druid/query/NoopQueryRunner.java similarity index 87% rename from processing/src/main/java/io/druid/query/NoopQueryRunner.java rename to processing/src/main/java/org/apache/druid/query/NoopQueryRunner.java index 6e4da29e9b60..ab43dcb7372d 100644 --- a/processing/src/main/java/io/druid/query/NoopQueryRunner.java +++ b/processing/src/main/java/org/apache/druid/query/NoopQueryRunner.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/PerSegmentOptimizingQueryRunner.java b/processing/src/main/java/org/apache/druid/query/PerSegmentOptimizingQueryRunner.java similarity index 95% rename from processing/src/main/java/io/druid/query/PerSegmentOptimizingQueryRunner.java rename to processing/src/main/java/org/apache/druid/query/PerSegmentOptimizingQueryRunner.java index 11e7f2f9e995..0e51294c1662 100644 --- a/processing/src/main/java/io/druid/query/PerSegmentOptimizingQueryRunner.java +++ b/processing/src/main/java/org/apache/druid/query/PerSegmentOptimizingQueryRunner.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; -import io.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequence; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/PerSegmentQueryOptimizationContext.java b/processing/src/main/java/org/apache/druid/query/PerSegmentQueryOptimizationContext.java similarity index 97% rename from processing/src/main/java/io/druid/query/PerSegmentQueryOptimizationContext.java rename to processing/src/main/java/org/apache/druid/query/PerSegmentQueryOptimizationContext.java index 993ccf13ce37..46a58776fa3f 100644 --- a/processing/src/main/java/io/druid/query/PerSegmentQueryOptimizationContext.java +++ b/processing/src/main/java/org/apache/druid/query/PerSegmentQueryOptimizationContext.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; /** * Holds information about a single segment that Query objects can use to optimize themselves diff --git a/processing/src/main/java/io/druid/query/PostProcessingOperator.java b/processing/src/main/java/org/apache/druid/query/PostProcessingOperator.java similarity index 97% rename from processing/src/main/java/io/druid/query/PostProcessingOperator.java rename to processing/src/main/java/org/apache/druid/query/PostProcessingOperator.java index e899850199f3..5b558d63c3a7 100644 --- a/processing/src/main/java/io/druid/query/PostProcessingOperator.java +++ b/processing/src/main/java/org/apache/druid/query/PostProcessingOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/processing/src/main/java/io/druid/query/PrioritizedCallable.java b/processing/src/main/java/org/apache/druid/query/PrioritizedCallable.java similarity index 96% rename from processing/src/main/java/io/druid/query/PrioritizedCallable.java rename to processing/src/main/java/org/apache/druid/query/PrioritizedCallable.java index 8a1d6a08fdcd..d7afa5e1a85b 100644 --- a/processing/src/main/java/io/druid/query/PrioritizedCallable.java +++ b/processing/src/main/java/org/apache/druid/query/PrioritizedCallable.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import java.util.concurrent.Callable; diff --git a/processing/src/main/java/io/druid/query/PrioritizedExecutorService.java b/processing/src/main/java/org/apache/druid/query/PrioritizedExecutorService.java similarity index 98% rename from processing/src/main/java/io/druid/query/PrioritizedExecutorService.java rename to processing/src/main/java/org/apache/druid/query/PrioritizedExecutorService.java index 10f9fd45f8ba..3ebdc376951c 100644 --- a/processing/src/main/java/io/druid/query/PrioritizedExecutorService.java +++ b/processing/src/main/java/org/apache/druid/query/PrioritizedExecutorService.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.base.Preconditions; import com.google.common.collect.Ordering; @@ -26,7 +26,7 @@ import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import io.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; import javax.annotation.Nullable; import java.util.Comparator; diff --git a/processing/src/main/java/io/druid/query/PrioritizedRunnable.java b/processing/src/main/java/org/apache/druid/query/PrioritizedRunnable.java similarity index 96% rename from processing/src/main/java/io/druid/query/PrioritizedRunnable.java rename to processing/src/main/java/org/apache/druid/query/PrioritizedRunnable.java index 943ccdc53c57..4184a57c5d12 100644 --- a/processing/src/main/java/io/druid/query/PrioritizedRunnable.java +++ b/processing/src/main/java/org/apache/druid/query/PrioritizedRunnable.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; public interface PrioritizedRunnable extends Runnable { diff --git a/processing/src/main/java/io/druid/query/Queries.java b/processing/src/main/java/org/apache/druid/query/Queries.java similarity index 96% rename from processing/src/main/java/io/druid/query/Queries.java rename to processing/src/main/java/org/apache/druid/query/Queries.java index f898b43ff83f..1fbe33587d00 100644 --- a/processing/src/main/java/io/druid/query/Queries.java +++ b/processing/src/main/java/org/apache/druid/query/Queries.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import io.druid.guice.annotations.PublicApi; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; import java.util.Collections; import java.util.HashMap; diff --git a/processing/src/main/java/io/druid/query/Query.java b/processing/src/main/java/org/apache/druid/query/Query.java similarity index 81% rename from processing/src/main/java/io/druid/query/Query.java rename to processing/src/main/java/org/apache/druid/query/Query.java index 5212bd5053ff..65090ce9a678 100644 --- a/processing/src/main/java/io/druid/query/Query.java +++ b/processing/src/main/java/org/apache/druid/query/Query.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.google.common.collect.Ordering; -import io.druid.guice.annotations.ExtensionPoint; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.query.datasourcemetadata.DataSourceMetadataQuery; -import io.druid.query.filter.DimFilter; -import io.druid.query.groupby.GroupByQuery; -import io.druid.query.metadata.metadata.SegmentMetadataQuery; -import io.druid.query.search.SearchQuery; -import io.druid.query.scan.ScanQuery; -import io.druid.query.select.SelectQuery; -import io.druid.query.spec.QuerySegmentSpec; -import io.druid.query.timeboundary.TimeBoundaryQuery; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.topn.TopNQuery; +import org.apache.druid.guice.annotations.ExtensionPoint; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.query.datasourcemetadata.DataSourceMetadataQuery; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.groupby.GroupByQuery; +import org.apache.druid.query.metadata.metadata.SegmentMetadataQuery; +import org.apache.druid.query.search.SearchQuery; +import org.apache.druid.query.scan.ScanQuery; +import org.apache.druid.query.select.SelectQuery; +import org.apache.druid.query.spec.QuerySegmentSpec; +import org.apache.druid.query.timeboundary.TimeBoundaryQuery; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.topn.TopNQuery; import org.joda.time.DateTimeZone; import org.joda.time.Duration; import org.joda.time.Interval; diff --git a/processing/src/main/java/io/druid/query/QueryContexts.java b/processing/src/main/java/org/apache/druid/query/QueryContexts.java similarity index 97% rename from processing/src/main/java/io/druid/query/QueryContexts.java rename to processing/src/main/java/org/apache/druid/query/QueryContexts.java index fe5c7625e5ec..7fb168a2eaa3 100644 --- a/processing/src/main/java/io/druid/query/QueryContexts.java +++ b/processing/src/main/java/org/apache/druid/query/QueryContexts.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; -import io.druid.guice.annotations.PublicApi; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.Numbers; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.Numbers; import java.util.concurrent.TimeUnit; diff --git a/processing/src/main/java/io/druid/query/QueryDataSource.java b/processing/src/main/java/org/apache/druid/query/QueryDataSource.java similarity index 98% rename from processing/src/main/java/io/druid/query/QueryDataSource.java rename to processing/src/main/java/org/apache/druid/query/QueryDataSource.java index 98b8072c37f3..5e5201711d84 100644 --- a/processing/src/main/java/io/druid/query/QueryDataSource.java +++ b/processing/src/main/java/org/apache/druid/query/QueryDataSource.java @@ -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; diff --git a/processing/src/main/java/io/druid/query/QueryInterruptedException.java b/processing/src/main/java/org/apache/druid/query/QueryInterruptedException.java similarity index 98% rename from processing/src/main/java/io/druid/query/QueryInterruptedException.java rename to processing/src/main/java/org/apache/druid/query/QueryInterruptedException.java index 6b95e1bb6917..947a6566bdfb 100644 --- a/processing/src/main/java/io/druid/query/QueryInterruptedException.java +++ b/processing/src/main/java/org/apache/druid/query/QueryInterruptedException.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import java.util.concurrent.CancellationException; import java.util.concurrent.TimeoutException; diff --git a/processing/src/main/java/io/druid/query/QueryMetrics.java b/processing/src/main/java/org/apache/druid/query/QueryMetrics.java similarity index 91% rename from processing/src/main/java/io/druid/query/QueryMetrics.java rename to processing/src/main/java/org/apache/druid/query/QueryMetrics.java index 2bfa3a9dbf7a..b8d2b558b0fa 100644 --- a/processing/src/main/java/io/druid/query/QueryMetrics.java +++ b/processing/src/main/java/org/apache/druid/query/QueryMetrics.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.query; - -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.guice.annotations.ExtensionPoint; -import io.druid.guice.annotations.PublicApi; -import io.druid.query.filter.Filter; -import io.druid.query.search.SearchQueryMetricsFactory; +package org.apache.druid.query; + +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.guice.annotations.ExtensionPoint; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.query.search.SearchQueryMetricsFactory; import org.joda.time.Interval; import java.util.List; /** - * Abstraction wrapping {@link io.druid.java.util.emitter.service.ServiceMetricEvent.Builder} and allowing to control what + * Abstraction wrapping {@link org.apache.druid.java.util.emitter.service.ServiceMetricEvent.Builder} and allowing to control what * metrics are actually emitted, what dimensions do they have, etc. * * @@ -87,7 +87,7 @@ *

If implementors of custom QueryMetrics don't want to fix builds on every Druid release (e. g. if they want to add * a single dimension to emitted events and don't want to alter other dimensions and emitted metrics), they could * inherit their custom QueryMetrics from {@link DefaultQueryMetrics} or query-specific default implementation class, - * such as {@link io.druid.query.topn.DefaultTopNQueryMetrics}. Those classes are guaranteed to stay around and + * such as {@link org.apache.druid.query.topn.DefaultTopNQueryMetrics}. Those classes are guaranteed to stay around and * implement new methods, added to the QueryMetrics interface (or a query-specific subinterface). However, there is no * 100% guarantee of compatibility, because methods could not only be added to QueryMetrics, existing methods could also * be changed or removed. @@ -113,7 +113,7 @@ * * Making subinterfaces of QueryMetrics for emitting custom dimensions and/or metrics for specific query types * ----------------------------------------------------------------------------------------------------------- - * If a query type (e. g. {@link io.druid.query.metadata.metadata.SegmentMetadataQuery} (it's runners) needs to emit + * If a query type (e. g. {@link org.apache.druid.query.metadata.metadata.SegmentMetadataQuery} (it's runners) needs to emit * custom dimensions and/or metrics which doesn't make sense for all other query types, the following steps should be * executed: * @@ -135,7 +135,7 @@ * `return new DefaultSegmentMetadataQueryMetrics(genericQueryMetricsFactory.makeMetrics(query));` * * 5. Inject and use SegmentMetadataQueryMetricsFactory instead of {@link GenericQueryMetricsFactory} in - * {@link io.druid.query.metadata.SegmentMetadataQueryQueryToolChest}. + * {@link org.apache.druid.query.metadata.SegmentMetadataQueryQueryToolChest}. * * 6. Establish injection of SegmentMetadataQueryMetricsFactory using config and provider method in * QueryToolChestModule (see how it is done in QueryToolChestModule) for existing query types @@ -148,14 +148,14 @@ * This complex procedure is needed to ensure custom {@link GenericQueryMetricsFactory} specified by users still works * for the query type when query type decides to create their custom QueryMetrics subclass. * - * {@link io.druid.query.topn.TopNQueryMetrics}, {@link io.druid.query.groupby.GroupByQueryMetrics}, and {@link - * io.druid.query.timeseries.TimeseriesQueryMetrics} are implemented differently, because they are introduced at the + * {@link org.apache.druid.query.topn.TopNQueryMetrics}, {@link org.apache.druid.query.groupby.GroupByQueryMetrics}, and {@link + * org.apache.druid.query.timeseries.TimeseriesQueryMetrics} are implemented differently, because they are introduced at the * same time as the whole QueryMetrics abstraction and their default implementations have to actually emit more * dimensions than the default generic QueryMetrics. So those subinterfaces shouldn't be taken as direct examples for * following the plan specified above. * * Refer {@link SearchQueryMetricsFactory} - * and {@link io.druid.query.select.SelectQueryMetricsFactory} as an implementation example of this procedure. + * and {@link org.apache.druid.query.select.SelectQueryMetricsFactory} as an implementation example of this procedure. * * @param */ diff --git a/processing/src/main/java/io/druid/query/QueryPlus.java b/processing/src/main/java/org/apache/druid/query/QueryPlus.java similarity index 96% rename from processing/src/main/java/io/druid/query/QueryPlus.java rename to processing/src/main/java/org/apache/druid/query/QueryPlus.java index c8110bbfc7f6..08983027be2c 100644 --- a/processing/src/main/java/io/druid/query/QueryPlus.java +++ b/processing/src/main/java/org/apache/druid/query/QueryPlus.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.base.Preconditions; -import io.druid.guice.annotations.PublicApi; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.spec.QuerySegmentSpec; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.spec.QuerySegmentSpec; import javax.annotation.Nullable; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/QueryRunner.java b/processing/src/main/java/org/apache/druid/query/QueryRunner.java similarity index 87% rename from processing/src/main/java/io/druid/query/QueryRunner.java rename to processing/src/main/java/org/apache/druid/query/QueryRunner.java index 3faa0a632088..a7d62d4514bd 100644 --- a/processing/src/main/java/io/druid/query/QueryRunner.java +++ b/processing/src/main/java/org/apache/druid/query/QueryRunner.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; -import io.druid.guice.annotations.ExtensionPoint; -import io.druid.java.util.common.guava.Sequence; +import org.apache.druid.guice.annotations.ExtensionPoint; +import org.apache.druid.java.util.common.guava.Sequence; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/QueryRunnerFactory.java b/processing/src/main/java/org/apache/druid/query/QueryRunnerFactory.java similarity index 95% rename from processing/src/main/java/io/druid/query/QueryRunnerFactory.java rename to processing/src/main/java/org/apache/druid/query/QueryRunnerFactory.java index 297282fefba2..069cb5e36eff 100644 --- a/processing/src/main/java/io/druid/query/QueryRunnerFactory.java +++ b/processing/src/main/java/org/apache/druid/query/QueryRunnerFactory.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; -import io.druid.guice.annotations.ExtensionPoint; -import io.druid.segment.Segment; +import org.apache.druid.guice.annotations.ExtensionPoint; +import org.apache.druid.segment.Segment; import java.util.concurrent.ExecutorService; diff --git a/processing/src/main/java/io/druid/query/QueryRunnerFactoryConglomerate.java b/processing/src/main/java/org/apache/druid/query/QueryRunnerFactoryConglomerate.java similarity index 96% rename from processing/src/main/java/io/druid/query/QueryRunnerFactoryConglomerate.java rename to processing/src/main/java/org/apache/druid/query/QueryRunnerFactoryConglomerate.java index 861799a6bf95..da89d81c8dda 100644 --- a/processing/src/main/java/io/druid/query/QueryRunnerFactoryConglomerate.java +++ b/processing/src/main/java/org/apache/druid/query/QueryRunnerFactoryConglomerate.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; /** */ diff --git a/processing/src/main/java/io/druid/query/QueryRunnerHelper.java b/processing/src/main/java/org/apache/druid/query/QueryRunnerHelper.java similarity index 85% rename from processing/src/main/java/io/druid/query/QueryRunnerHelper.java rename to processing/src/main/java/org/apache/druid/query/QueryRunnerHelper.java index aa9944284609..53f281dbd868 100644 --- a/processing/src/main/java/io/druid/query/QueryRunnerHelper.java +++ b/processing/src/main/java/org/apache/druid/query/QueryRunnerHelper.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.base.Predicates; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.query.filter.Filter; -import io.druid.segment.Cursor; -import io.druid.segment.StorageAdapter; -import io.druid.segment.VirtualColumns; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.segment.Cursor; +import org.apache.druid.segment.StorageAdapter; +import org.apache.druid.segment.VirtualColumns; import org.joda.time.Interval; import java.io.Closeable; diff --git a/processing/src/main/java/io/druid/query/QuerySegmentWalker.java b/processing/src/main/java/org/apache/druid/query/QuerySegmentWalker.java similarity index 98% rename from processing/src/main/java/io/druid/query/QuerySegmentWalker.java rename to processing/src/main/java/org/apache/druid/query/QuerySegmentWalker.java index 23c24ff13920..970fb6e28c08 100644 --- a/processing/src/main/java/io/druid/query/QuerySegmentWalker.java +++ b/processing/src/main/java/org/apache/druid/query/QuerySegmentWalker.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import org.joda.time.Interval; diff --git a/processing/src/main/java/io/druid/query/QueryToolChest.java b/processing/src/main/java/org/apache/druid/query/QueryToolChest.java similarity index 97% rename from processing/src/main/java/io/druid/query/QueryToolChest.java rename to processing/src/main/java/org/apache/druid/query/QueryToolChest.java index 007ee03db2da..0b890c061331 100644 --- a/processing/src/main/java/io/druid/query/QueryToolChest.java +++ b/processing/src/main/java/org/apache/druid/query/QueryToolChest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.base.Function; -import io.druid.guice.annotations.ExtensionPoint; -import io.druid.query.aggregation.MetricManipulationFn; -import io.druid.timeline.LogicalSegment; +import org.apache.druid.guice.annotations.ExtensionPoint; +import org.apache.druid.query.aggregation.MetricManipulationFn; +import org.apache.druid.timeline.LogicalSegment; import javax.annotation.Nullable; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/QueryToolChestWarehouse.java b/processing/src/main/java/org/apache/druid/query/QueryToolChestWarehouse.java similarity index 96% rename from processing/src/main/java/io/druid/query/QueryToolChestWarehouse.java rename to processing/src/main/java/org/apache/druid/query/QueryToolChestWarehouse.java index 321b4ee0b5d6..1724ddded2a6 100644 --- a/processing/src/main/java/io/druid/query/QueryToolChestWarehouse.java +++ b/processing/src/main/java/org/apache/druid/query/QueryToolChestWarehouse.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; /** */ diff --git a/processing/src/main/java/io/druid/query/QueryWatcher.java b/processing/src/main/java/org/apache/druid/query/QueryWatcher.java similarity index 98% rename from processing/src/main/java/io/druid/query/QueryWatcher.java rename to processing/src/main/java/org/apache/druid/query/QueryWatcher.java index e1e631665e1d..0457bea25c45 100644 --- a/processing/src/main/java/io/druid/query/QueryWatcher.java +++ b/processing/src/main/java/org/apache/druid/query/QueryWatcher.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.util.concurrent.ListenableFuture; diff --git a/processing/src/main/java/io/druid/query/ReferenceCountingSegmentQueryRunner.java b/processing/src/main/java/org/apache/druid/query/ReferenceCountingSegmentQueryRunner.java similarity index 91% rename from processing/src/main/java/io/druid/query/ReferenceCountingSegmentQueryRunner.java rename to processing/src/main/java/org/apache/druid/query/ReferenceCountingSegmentQueryRunner.java index 5c4d1f9cda2f..0aaa61f8f033 100644 --- a/processing/src/main/java/io/druid/query/ReferenceCountingSegmentQueryRunner.java +++ b/processing/src/main/java/org/apache/druid/query/ReferenceCountingSegmentQueryRunner.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.segment.ReferenceCountingSegment; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.segment.ReferenceCountingSegment; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/ReflectionLoaderThingy.java b/processing/src/main/java/org/apache/druid/query/ReflectionLoaderThingy.java similarity index 94% rename from processing/src/main/java/io/druid/query/ReflectionLoaderThingy.java rename to processing/src/main/java/org/apache/druid/query/ReflectionLoaderThingy.java index bac9562d7388..a976b07e9992 100644 --- a/processing/src/main/java/io/druid/query/ReflectionLoaderThingy.java +++ b/processing/src/main/java/org/apache/druid/query/ReflectionLoaderThingy.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; -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 java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/processing/src/main/java/io/druid/query/ReflectionQueryToolChestWarehouse.java b/processing/src/main/java/org/apache/druid/query/ReflectionQueryToolChestWarehouse.java similarity index 97% rename from processing/src/main/java/io/druid/query/ReflectionQueryToolChestWarehouse.java rename to processing/src/main/java/org/apache/druid/query/ReflectionQueryToolChestWarehouse.java index 2d440692067d..4c7aab72d439 100644 --- a/processing/src/main/java/io/druid/query/ReflectionQueryToolChestWarehouse.java +++ b/processing/src/main/java/org/apache/druid/query/ReflectionQueryToolChestWarehouse.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; /** */ diff --git a/processing/src/main/java/io/druid/query/ReportTimelineMissingSegmentQueryRunner.java b/processing/src/main/java/org/apache/druid/query/ReportTimelineMissingSegmentQueryRunner.java similarity index 91% rename from processing/src/main/java/io/druid/query/ReportTimelineMissingSegmentQueryRunner.java rename to processing/src/main/java/org/apache/druid/query/ReportTimelineMissingSegmentQueryRunner.java index 801df6148e52..cd2c82137635 100644 --- a/processing/src/main/java/io/druid/query/ReportTimelineMissingSegmentQueryRunner.java +++ b/processing/src/main/java/org/apache/druid/query/ReportTimelineMissingSegmentQueryRunner.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.collect.Lists; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; import java.util.List; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/ResourceLimitExceededException.java b/processing/src/main/java/org/apache/druid/query/ResourceLimitExceededException.java similarity index 93% rename from processing/src/main/java/io/druid/query/ResourceLimitExceededException.java rename to processing/src/main/java/org/apache/druid/query/ResourceLimitExceededException.java index 77d424a647d8..f24a2ff3e466 100644 --- a/processing/src/main/java/io/druid/query/ResourceLimitExceededException.java +++ b/processing/src/main/java/org/apache/druid/query/ResourceLimitExceededException.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; /** * Exception indicating that an operation failed because it exceeded some configured resource limit. diff --git a/processing/src/main/java/io/druid/query/Result.java b/processing/src/main/java/org/apache/druid/query/Result.java similarity index 96% rename from processing/src/main/java/io/druid/query/Result.java rename to processing/src/main/java/org/apache/druid/query/Result.java index 0b8831e3763c..f68ba41819ef 100644 --- a/processing/src/main/java/io/druid/query/Result.java +++ b/processing/src/main/java/org/apache/druid/query/Result.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; 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; import org.joda.time.DateTime; import java.util.function.Function; diff --git a/processing/src/main/java/io/druid/query/ResultGranularTimestampComparator.java b/processing/src/main/java/org/apache/druid/query/ResultGranularTimestampComparator.java similarity index 91% rename from processing/src/main/java/io/druid/query/ResultGranularTimestampComparator.java rename to processing/src/main/java/org/apache/druid/query/ResultGranularTimestampComparator.java index 724b98dab4c0..08f407d18717 100644 --- a/processing/src/main/java/io/druid/query/ResultGranularTimestampComparator.java +++ b/processing/src/main/java/org/apache/druid/query/ResultGranularTimestampComparator.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.collect.Ordering; import com.google.common.primitives.Longs; -import io.druid.guice.annotations.PublicApi; -import io.druid.java.util.common.granularity.Granularity; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.java.util.common.granularity.Granularity; import java.util.Comparator; diff --git a/processing/src/main/java/io/druid/query/ResultMergeQueryRunner.java b/processing/src/main/java/org/apache/druid/query/ResultMergeQueryRunner.java similarity index 85% rename from processing/src/main/java/io/druid/query/ResultMergeQueryRunner.java rename to processing/src/main/java/org/apache/druid/query/ResultMergeQueryRunner.java index fd8882ae740d..444aadffb6c2 100644 --- a/processing/src/main/java/io/druid/query/ResultMergeQueryRunner.java +++ b/processing/src/main/java/org/apache/druid/query/ResultMergeQueryRunner.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.collect.Ordering; -import io.druid.common.guava.CombiningSequence; -import io.druid.guice.annotations.PublicApi; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.nary.BinaryFn; +import org.apache.druid.common.guava.CombiningSequence; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.nary.BinaryFn; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/RetryQueryRunner.java b/processing/src/main/java/org/apache/druid/query/RetryQueryRunner.java similarity index 86% rename from processing/src/main/java/io/druid/query/RetryQueryRunner.java rename to processing/src/main/java/org/apache/druid/query/RetryQueryRunner.java index cc1bce020f50..8d7203ad6446 100644 --- a/processing/src/main/java/io/druid/query/RetryQueryRunner.java +++ b/processing/src/main/java/org/apache/druid/query/RetryQueryRunner.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.common.guava.MergeSequence; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.common.guava.Yielder; -import io.druid.java.util.common.guava.YieldingAccumulator; -import io.druid.java.util.common.guava.YieldingSequenceBase; -import io.druid.query.spec.MultipleSpecificSegmentSpec; -import io.druid.segment.SegmentMissingException; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.common.guava.MergeSequence; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.guava.Yielder; +import org.apache.druid.java.util.common.guava.YieldingAccumulator; +import org.apache.druid.java.util.common.guava.YieldingSequenceBase; +import org.apache.druid.query.spec.MultipleSpecificSegmentSpec; +import org.apache.druid.segment.SegmentMissingException; import java.util.List; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/RetryQueryRunnerConfig.java b/processing/src/main/java/org/apache/druid/query/RetryQueryRunnerConfig.java similarity index 97% rename from processing/src/main/java/io/druid/query/RetryQueryRunnerConfig.java rename to processing/src/main/java/org/apache/druid/query/RetryQueryRunnerConfig.java index 29f62209eb05..222aa32db5b6 100644 --- a/processing/src/main/java/io/druid/query/RetryQueryRunnerConfig.java +++ b/processing/src/main/java/org/apache/druid/query/RetryQueryRunnerConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/processing/src/main/java/io/druid/query/SubqueryQueryRunner.java b/processing/src/main/java/org/apache/druid/query/SubqueryQueryRunner.java similarity index 94% rename from processing/src/main/java/io/druid/query/SubqueryQueryRunner.java rename to processing/src/main/java/org/apache/druid/query/SubqueryQueryRunner.java index a78842d0e077..07b64cd3a777 100644 --- a/processing/src/main/java/io/druid/query/SubqueryQueryRunner.java +++ b/processing/src/main/java/org/apache/druid/query/SubqueryQueryRunner.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; -import io.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequence; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/TableDataSource.java b/processing/src/main/java/org/apache/druid/query/TableDataSource.java similarity index 98% rename from processing/src/main/java/io/druid/query/TableDataSource.java rename to processing/src/main/java/org/apache/druid/query/TableDataSource.java index 17bb13097e44..bbebb51d593c 100644 --- a/processing/src/main/java/io/druid/query/TableDataSource.java +++ b/processing/src/main/java/org/apache/druid/query/TableDataSource.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/processing/src/main/java/io/druid/query/TimewarpOperator.java b/processing/src/main/java/org/apache/druid/query/TimewarpOperator.java similarity index 93% rename from processing/src/main/java/io/druid/query/TimewarpOperator.java rename to processing/src/main/java/org/apache/druid/query/TimewarpOperator.java index e1a1155864bc..827e780cb2c8 100644 --- a/processing/src/main/java/io/druid/query/TimewarpOperator.java +++ b/processing/src/main/java/org/apache/druid/query/TimewarpOperator.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Function; -import io.druid.data.input.MapBasedRow; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.query.spec.MultipleIntervalSegmentSpec; -import io.druid.query.timeboundary.TimeBoundaryQuery; -import io.druid.query.timeboundary.TimeBoundaryResultValue; +import org.apache.druid.data.input.MapBasedRow; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.query.timeboundary.TimeBoundaryQuery; +import org.apache.druid.query.timeboundary.TimeBoundaryResultValue; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.Interval; diff --git a/processing/src/main/java/io/druid/query/UnionDataSource.java b/processing/src/main/java/org/apache/druid/query/UnionDataSource.java similarity index 98% rename from processing/src/main/java/io/druid/query/UnionDataSource.java rename to processing/src/main/java/org/apache/druid/query/UnionDataSource.java index b286d9299f31..a48bbf0f06b5 100644 --- a/processing/src/main/java/io/druid/query/UnionDataSource.java +++ b/processing/src/main/java/org/apache/druid/query/UnionDataSource.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/processing/src/main/java/io/druid/query/UnionQueryRunner.java b/processing/src/main/java/org/apache/druid/query/UnionQueryRunner.java similarity index 91% rename from processing/src/main/java/io/druid/query/UnionQueryRunner.java rename to processing/src/main/java/org/apache/druid/query/UnionQueryRunner.java index 112dc7c80591..f5105ab8d2cd 100644 --- a/processing/src/main/java/io/druid/query/UnionQueryRunner.java +++ b/processing/src/main/java/org/apache/druid/query/UnionQueryRunner.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.base.Function; import com.google.common.collect.Lists; -import io.druid.java.util.common.guava.MergeSequence; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.guava.MergeSequence; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/aggregation/AggregateCombiner.java b/processing/src/main/java/org/apache/druid/query/aggregation/AggregateCombiner.java similarity index 78% rename from processing/src/main/java/io/druid/query/aggregation/AggregateCombiner.java rename to processing/src/main/java/org/apache/druid/query/aggregation/AggregateCombiner.java index 45bca12771b6..9b46a77d4de0 100644 --- a/processing/src/main/java/io/druid/query/aggregation/AggregateCombiner.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/AggregateCombiner.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.guice.annotations.ExtensionPoint; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnValueSelector; +import org.apache.druid.guice.annotations.ExtensionPoint; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnValueSelector; /** * AggregateCombiner is used to fold rollup aggregation results from serveral "rows" of different indexes during index - * merging (see {@link io.druid.segment.IndexMerger}). + * merging (see {@link org.apache.druid.segment.IndexMerger}). * * The state of the implementations of this interface is an aggregation value (either a primitive or an object), that * could be queried via {@link ColumnValueSelector}'s methods. Before {@link #reset} is ever called on an @@ -47,11 +47,11 @@ public interface AggregateCombiner extends ColumnValueSelector * Resets this AggregateCombiner's state value to the value of the given selector, e. g. after calling this method * combiner.get*() should return the same value as selector.get*(). * - * If the selector is an {@link io.druid.segment.ObjectColumnSelector}, the object returned from {@link - * io.druid.segment.ObjectColumnSelector#getObject()} must not be modified, and must not become a subject for + * If the selector is an {@link org.apache.druid.segment.ObjectColumnSelector}, the object returned from {@link + * org.apache.druid.segment.ObjectColumnSelector#getObject()} must not be modified, and must not become a subject for * modification during subsequent {@link #fold} calls. */ - @SuppressWarnings("unused") // Going to be used when https://github.com/druid-io/druid/projects/2 is complete + @SuppressWarnings("unused") // Going to be used when https://github.com/apache/incubator-druid/projects/2 is complete void reset(ColumnValueSelector selector); /** @@ -60,8 +60,8 @@ public interface AggregateCombiner extends ColumnValueSelector * that would be the result of {@link AggregatorFactory#combine * aggregatorFactory.combine(combiner.get*(), selector.get*())} call. * - * Unlike {@link AggregatorFactory#combine}, if the selector is an {@link io.druid.segment.ObjectColumnSelector}, the - * object returned from {@link io.druid.segment.ObjectColumnSelector#getObject()} must not be modified, and must not + * Unlike {@link AggregatorFactory#combine}, if the selector is an {@link org.apache.druid.segment.ObjectColumnSelector}, the + * object returned from {@link org.apache.druid.segment.ObjectColumnSelector#getObject()} must not be modified, and must not * become a subject for modification during subsequent fold() calls. * * Since the state of AggregateCombiner is undefined before {@link #reset} is ever called on it, the effects of @@ -69,7 +69,7 @@ public interface AggregateCombiner extends ColumnValueSelector * * @see AggregatorFactory#combine */ - @SuppressWarnings("unused") // Going to be used when https://github.com/druid-io/druid/projects/2 is complete + @SuppressWarnings("unused") // Going to be used when https://github.com/apache/incubator-druid/projects/2 is complete void fold(ColumnValueSelector selector); @Override diff --git a/processing/src/main/java/io/druid/query/aggregation/Aggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/Aggregator.java similarity index 93% rename from processing/src/main/java/io/druid/query/aggregation/Aggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/Aggregator.java index 7ed00838aba3..a41263e77924 100644 --- a/processing/src/main/java/io/druid/query/aggregation/Aggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/Aggregator.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.guice.annotations.ExtensionPoint; +import org.apache.druid.guice.annotations.ExtensionPoint; import javax.annotation.Nullable; import java.io.Closeable; @@ -31,7 +31,7 @@ * * Thus, an Aggregator can be thought of as a closure over some other thing that is stateful and changes between calls * to aggregate(). This is currently (as of this documentation) implemented through the use of {@link - * io.druid.segment.ColumnValueSelector} objects. + * org.apache.druid.segment.ColumnValueSelector} objects. */ @ExtensionPoint public interface Aggregator extends Closeable diff --git a/processing/src/main/java/io/druid/query/aggregation/AggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/AggregatorFactory.java similarity index 93% rename from processing/src/main/java/io/druid/query/aggregation/AggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/AggregatorFactory.java index 6a5515fefc4e..6ec9fde8fcbf 100644 --- a/processing/src/main/java/io/druid/query/aggregation/AggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/AggregatorFactory.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.guice.annotations.ExtensionPoint; -import io.druid.java.util.common.Cacheable; -import io.druid.java.util.common.UOE; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.PerSegmentQueryOptimizationContext; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.guice.annotations.ExtensionPoint; +import org.apache.druid.java.util.common.Cacheable; +import org.apache.druid.java.util.common.UOE; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.PerSegmentQueryOptimizationContext; +import org.apache.druid.segment.ColumnSelectorFactory; import javax.annotation.Nullable; import java.util.Arrays; @@ -36,7 +36,7 @@ /** * AggregatorFactory is a strategy (in the terms of Design Patterns) that represents column aggregation, e. g. min, * max, sum of metric columns, or cardinality of dimension columns (see {@link - * io.druid.query.aggregation.cardinality.CardinalityAggregatorFactory}). + * org.apache.druid.query.aggregation.cardinality.CardinalityAggregatorFactory}). * Implementations of {@link AggregatorFactory} which need to Support Nullable Aggregations are encouraged * to extend {@link NullableAggregatorFactory}. */ @@ -68,11 +68,11 @@ public abstract class AggregatorFactory implements Cacheable /** * Creates an AggregateCombiner to fold rollup aggregation results from serveral "rows" of different indexes during * index merging. AggregateCombiner implements the same logic as {@link #combine}, with the difference that it uses - * {@link io.druid.segment.ColumnValueSelector} and it's subinterfaces to get inputs and implements {@code + * {@link org.apache.druid.segment.ColumnValueSelector} and it's subinterfaces to get inputs and implements {@code * ColumnValueSelector} to provide output. * * @see AggregateCombiner - * @see io.druid.segment.IndexMerger + * @see org.apache.druid.segment.IndexMerger */ public AggregateCombiner makeAggregateCombiner() { diff --git a/processing/src/main/java/io/druid/query/aggregation/AggregatorFactoryNotMergeableException.java b/processing/src/main/java/org/apache/druid/query/aggregation/AggregatorFactoryNotMergeableException.java similarity index 93% rename from processing/src/main/java/io/druid/query/aggregation/AggregatorFactoryNotMergeableException.java rename to processing/src/main/java/org/apache/druid/query/aggregation/AggregatorFactoryNotMergeableException.java index 312f416a83fe..dc14133bddc6 100644 --- a/processing/src/main/java/io/druid/query/aggregation/AggregatorFactoryNotMergeableException.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/AggregatorFactoryNotMergeableException.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; /** */ diff --git a/processing/src/main/java/io/druid/query/aggregation/AggregatorUtil.java b/processing/src/main/java/org/apache/druid/query/aggregation/AggregatorUtil.java similarity index 92% rename from processing/src/main/java/io/druid/query/aggregation/AggregatorUtil.java rename to processing/src/main/java/org/apache/druid/query/aggregation/AggregatorUtil.java index 89d07e6d9238..6265407a3d1c 100644 --- a/processing/src/main/java/io/druid/query/aggregation/AggregatorUtil.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/AggregatorUtil.java @@ -17,25 +17,25 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.google.common.collect.Lists; -import io.druid.guice.annotations.PublicApi; -import io.druid.java.util.common.Pair; -import io.druid.math.expr.Expr; -import io.druid.math.expr.ExprEval; -import io.druid.math.expr.ExprMacroTable; -import io.druid.math.expr.Parser; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseDoubleColumnValueSelector; -import io.druid.segment.BaseFloatColumnValueSelector; -import io.druid.segment.BaseLongColumnValueSelector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.DoubleColumnSelector; -import io.druid.segment.FloatColumnSelector; -import io.druid.segment.LongColumnSelector; -import io.druid.segment.virtual.ExpressionSelectors; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.math.expr.Expr; +import org.apache.druid.math.expr.ExprEval; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.math.expr.Parser; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseDoubleColumnValueSelector; +import org.apache.druid.segment.BaseFloatColumnValueSelector; +import org.apache.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.DoubleColumnSelector; +import org.apache.druid.segment.FloatColumnSelector; +import org.apache.druid.segment.LongColumnSelector; +import org.apache.druid.segment.virtual.ExpressionSelectors; import java.util.HashSet; import java.util.LinkedList; diff --git a/processing/src/main/java/io/druid/query/aggregation/BufferAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/BufferAggregator.java similarity index 96% rename from processing/src/main/java/io/druid/query/aggregation/BufferAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/BufferAggregator.java index 7264f5c58a45..ecd0c11b526a 100644 --- a/processing/src/main/java/io/druid/query/aggregation/BufferAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/BufferAggregator.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.guice.annotations.ExtensionPoint; -import io.druid.query.monomorphicprocessing.CalledFromHotLoop; -import io.druid.query.monomorphicprocessing.HotLoopCallee; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.guice.annotations.ExtensionPoint; +import org.apache.druid.query.monomorphicprocessing.CalledFromHotLoop; +import org.apache.druid.query.monomorphicprocessing.HotLoopCallee; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/CountAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/CountAggregator.java similarity index 97% rename from processing/src/main/java/io/druid/query/aggregation/CountAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/CountAggregator.java index ccdb645cc5f5..da8cddad4d43 100644 --- a/processing/src/main/java/io/druid/query/aggregation/CountAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/CountAggregator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import java.util.Comparator; diff --git a/processing/src/main/java/io/druid/query/aggregation/CountAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/CountAggregatorFactory.java similarity index 97% rename from processing/src/main/java/io/druid/query/aggregation/CountAggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/CountAggregatorFactory.java index 0e5385ec9e06..23fba55eed53 100644 --- a/processing/src/main/java/io/druid/query/aggregation/CountAggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/CountAggregatorFactory.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnSelectorFactory; import java.util.Collections; import java.util.Comparator; diff --git a/processing/src/main/java/io/druid/query/aggregation/CountBufferAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/CountBufferAggregator.java similarity index 93% rename from processing/src/main/java/io/druid/query/aggregation/CountBufferAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/CountBufferAggregator.java index f561663e4551..7f30fa0006e3 100644 --- a/processing/src/main/java/io/druid/query/aggregation/CountBufferAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/CountBufferAggregator.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/DoubleAggregateCombiner.java b/processing/src/main/java/org/apache/druid/query/aggregation/DoubleAggregateCombiner.java similarity index 91% rename from processing/src/main/java/io/druid/query/aggregation/DoubleAggregateCombiner.java rename to processing/src/main/java/org/apache/druid/query/aggregation/DoubleAggregateCombiner.java index 2e80580be80c..0f7503a0cf2b 100644 --- a/processing/src/main/java/io/druid/query/aggregation/DoubleAggregateCombiner.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/DoubleAggregateCombiner.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.segment.DoubleColumnSelector; +import org.apache.druid.segment.DoubleColumnSelector; /** * Specialization of {@link AggregateCombiner} for primitive double aggregations. diff --git a/processing/src/main/java/io/druid/query/aggregation/DoubleMaxAggregateCombiner.java b/processing/src/main/java/org/apache/druid/query/aggregation/DoubleMaxAggregateCombiner.java similarity index 92% rename from processing/src/main/java/io/druid/query/aggregation/DoubleMaxAggregateCombiner.java rename to processing/src/main/java/org/apache/druid/query/aggregation/DoubleMaxAggregateCombiner.java index df204b48f5b3..e43878eccf7c 100644 --- a/processing/src/main/java/io/druid/query/aggregation/DoubleMaxAggregateCombiner.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/DoubleMaxAggregateCombiner.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.ColumnValueSelector; final class DoubleMaxAggregateCombiner extends DoubleAggregateCombiner { diff --git a/processing/src/main/java/io/druid/query/aggregation/DoubleMaxAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/DoubleMaxAggregator.java similarity index 94% rename from processing/src/main/java/io/druid/query/aggregation/DoubleMaxAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/DoubleMaxAggregator.java index 651cbbeb5075..5d9b88a46a45 100644 --- a/processing/src/main/java/io/druid/query/aggregation/DoubleMaxAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/DoubleMaxAggregator.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.segment.BaseDoubleColumnValueSelector; +import org.apache.druid.segment.BaseDoubleColumnValueSelector; /** */ diff --git a/processing/src/main/java/io/druid/query/aggregation/DoubleMaxAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/DoubleMaxAggregatorFactory.java similarity index 93% rename from processing/src/main/java/io/druid/query/aggregation/DoubleMaxAggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/DoubleMaxAggregatorFactory.java index 83a079580e14..75ef2f614095 100644 --- a/processing/src/main/java/io/druid/query/aggregation/DoubleMaxAggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/DoubleMaxAggregatorFactory.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.StringUtils; -import io.druid.math.expr.ExprMacroTable; -import io.druid.segment.BaseDoubleColumnValueSelector; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.segment.BaseDoubleColumnValueSelector; +import org.apache.druid.segment.ColumnSelectorFactory; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/DoubleMaxBufferAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/DoubleMaxBufferAggregator.java similarity index 93% rename from processing/src/main/java/io/druid/query/aggregation/DoubleMaxBufferAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/DoubleMaxBufferAggregator.java index a56ec4fbe5a2..94d3659ea710 100644 --- a/processing/src/main/java/io/druid/query/aggregation/DoubleMaxBufferAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/DoubleMaxBufferAggregator.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.segment.BaseDoubleColumnValueSelector; +import org.apache.druid.segment.BaseDoubleColumnValueSelector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/DoubleMinAggregateCombiner.java b/processing/src/main/java/org/apache/druid/query/aggregation/DoubleMinAggregateCombiner.java similarity index 92% rename from processing/src/main/java/io/druid/query/aggregation/DoubleMinAggregateCombiner.java rename to processing/src/main/java/org/apache/druid/query/aggregation/DoubleMinAggregateCombiner.java index 90bb269396c0..44d2b4ec4558 100644 --- a/processing/src/main/java/io/druid/query/aggregation/DoubleMinAggregateCombiner.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/DoubleMinAggregateCombiner.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.ColumnValueSelector; final class DoubleMinAggregateCombiner extends DoubleAggregateCombiner { diff --git a/processing/src/main/java/io/druid/query/aggregation/DoubleMinAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/DoubleMinAggregator.java similarity index 94% rename from processing/src/main/java/io/druid/query/aggregation/DoubleMinAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/DoubleMinAggregator.java index f85f522e6002..7956d99c2ac7 100644 --- a/processing/src/main/java/io/druid/query/aggregation/DoubleMinAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/DoubleMinAggregator.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.segment.BaseDoubleColumnValueSelector; +import org.apache.druid.segment.BaseDoubleColumnValueSelector; /** */ diff --git a/processing/src/main/java/io/druid/query/aggregation/DoubleMinAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/DoubleMinAggregatorFactory.java similarity index 93% rename from processing/src/main/java/io/druid/query/aggregation/DoubleMinAggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/DoubleMinAggregatorFactory.java index 4d345e9658a7..e1ddb7f9bf9a 100644 --- a/processing/src/main/java/io/druid/query/aggregation/DoubleMinAggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/DoubleMinAggregatorFactory.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.StringUtils; -import io.druid.math.expr.ExprMacroTable; -import io.druid.segment.BaseDoubleColumnValueSelector; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.segment.BaseDoubleColumnValueSelector; +import org.apache.druid.segment.ColumnSelectorFactory; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/DoubleMinBufferAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/DoubleMinBufferAggregator.java similarity index 93% rename from processing/src/main/java/io/druid/query/aggregation/DoubleMinBufferAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/DoubleMinBufferAggregator.java index 3494c40e05d8..f5f8e45cec1c 100644 --- a/processing/src/main/java/io/druid/query/aggregation/DoubleMinBufferAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/DoubleMinBufferAggregator.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.segment.BaseDoubleColumnValueSelector; +import org.apache.druid.segment.BaseDoubleColumnValueSelector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregateCombiner.java b/processing/src/main/java/org/apache/druid/query/aggregation/DoubleSumAggregateCombiner.java similarity index 92% rename from processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregateCombiner.java rename to processing/src/main/java/org/apache/druid/query/aggregation/DoubleSumAggregateCombiner.java index e454e61481b7..d188e9121be2 100644 --- a/processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregateCombiner.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/DoubleSumAggregateCombiner.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.ColumnValueSelector; final class DoubleSumAggregateCombiner extends DoubleAggregateCombiner { diff --git a/processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/DoubleSumAggregator.java similarity index 95% rename from processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/DoubleSumAggregator.java index f5f58fbc3762..67c72b1bb6ae 100644 --- a/processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/DoubleSumAggregator.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.google.common.collect.Ordering; import com.google.common.primitives.Doubles; -import io.druid.segment.BaseDoubleColumnValueSelector; +import org.apache.druid.segment.BaseDoubleColumnValueSelector; import java.util.Comparator; diff --git a/processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/DoubleSumAggregatorFactory.java similarity index 93% rename from processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/DoubleSumAggregatorFactory.java index 6ce68bb3f7a7..e5c8bf6c7f83 100644 --- a/processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/DoubleSumAggregatorFactory.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.StringUtils; -import io.druid.math.expr.ExprMacroTable; -import io.druid.segment.BaseDoubleColumnValueSelector; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.segment.BaseDoubleColumnValueSelector; +import org.apache.druid.segment.ColumnSelectorFactory; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/DoubleSumBufferAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/DoubleSumBufferAggregator.java similarity index 92% rename from processing/src/main/java/io/druid/query/aggregation/DoubleSumBufferAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/DoubleSumBufferAggregator.java index f260d8740be5..43e53ddad798 100644 --- a/processing/src/main/java/io/druid/query/aggregation/DoubleSumBufferAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/DoubleSumBufferAggregator.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.segment.BaseDoubleColumnValueSelector; +import org.apache.druid.segment.BaseDoubleColumnValueSelector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/FilteredAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/FilteredAggregator.java similarity index 94% rename from processing/src/main/java/io/druid/query/aggregation/FilteredAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/FilteredAggregator.java index 8bb992268cd9..6ffea5b70f46 100644 --- a/processing/src/main/java/io/druid/query/aggregation/FilteredAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/FilteredAggregator.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.query.filter.ValueMatcher; +import org.apache.druid.query.filter.ValueMatcher; public class FilteredAggregator implements Aggregator { diff --git a/processing/src/main/java/io/druid/query/aggregation/FilteredAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/FilteredAggregatorFactory.java similarity index 94% rename from processing/src/main/java/io/druid/query/aggregation/FilteredAggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/FilteredAggregatorFactory.java index f9f54a9a6838..e9c8573d0d95 100644 --- a/processing/src/main/java/io/druid/query/aggregation/FilteredAggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/FilteredAggregatorFactory.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.query.PerSegmentQueryOptimizationContext; -import io.druid.query.filter.DimFilter; -import io.druid.query.filter.IntervalDimFilter; -import io.druid.query.filter.ValueMatcher; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.column.Column; -import io.druid.segment.filter.Filters; +import org.apache.druid.query.PerSegmentQueryOptimizationContext; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.filter.IntervalDimFilter; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.filter.Filters; import org.joda.time.Interval; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/FilteredBufferAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/FilteredBufferAggregator.java similarity index 93% rename from processing/src/main/java/io/druid/query/aggregation/FilteredBufferAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/FilteredBufferAggregator.java index 8b75c010e1f1..47e8498189e0 100644 --- a/processing/src/main/java/io/druid/query/aggregation/FilteredBufferAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/FilteredBufferAggregator.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/FloatMaxAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/FloatMaxAggregator.java similarity index 94% rename from processing/src/main/java/io/druid/query/aggregation/FloatMaxAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/FloatMaxAggregator.java index a61181aba626..feba3b452e9b 100644 --- a/processing/src/main/java/io/druid/query/aggregation/FloatMaxAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/FloatMaxAggregator.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.segment.BaseFloatColumnValueSelector; +import org.apache.druid.segment.BaseFloatColumnValueSelector; /** */ diff --git a/processing/src/main/java/io/druid/query/aggregation/FloatMaxAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/FloatMaxAggregatorFactory.java similarity index 93% rename from processing/src/main/java/io/druid/query/aggregation/FloatMaxAggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/FloatMaxAggregatorFactory.java index 29ffab315d86..a0b2f24eb927 100644 --- a/processing/src/main/java/io/druid/query/aggregation/FloatMaxAggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/FloatMaxAggregatorFactory.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.StringUtils; -import io.druid.math.expr.ExprMacroTable; -import io.druid.segment.BaseFloatColumnValueSelector; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.segment.BaseFloatColumnValueSelector; +import org.apache.druid.segment.ColumnSelectorFactory; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/FloatMaxBufferAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/FloatMaxBufferAggregator.java similarity index 92% rename from processing/src/main/java/io/druid/query/aggregation/FloatMaxBufferAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/FloatMaxBufferAggregator.java index dec4cd2b10e0..bf155a79c5ce 100644 --- a/processing/src/main/java/io/druid/query/aggregation/FloatMaxBufferAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/FloatMaxBufferAggregator.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.segment.BaseFloatColumnValueSelector; +import org.apache.druid.segment.BaseFloatColumnValueSelector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/FloatMinAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/FloatMinAggregator.java similarity index 94% rename from processing/src/main/java/io/druid/query/aggregation/FloatMinAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/FloatMinAggregator.java index efeb7500db8b..044d3a791436 100644 --- a/processing/src/main/java/io/druid/query/aggregation/FloatMinAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/FloatMinAggregator.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.segment.BaseFloatColumnValueSelector; +import org.apache.druid.segment.BaseFloatColumnValueSelector; /** */ diff --git a/processing/src/main/java/io/druid/query/aggregation/FloatMinAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/FloatMinAggregatorFactory.java similarity index 93% rename from processing/src/main/java/io/druid/query/aggregation/FloatMinAggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/FloatMinAggregatorFactory.java index 00ff2b5a8b58..bf5cc24c9d50 100644 --- a/processing/src/main/java/io/druid/query/aggregation/FloatMinAggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/FloatMinAggregatorFactory.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.StringUtils; -import io.druid.math.expr.ExprMacroTable; -import io.druid.segment.BaseFloatColumnValueSelector; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.segment.BaseFloatColumnValueSelector; +import org.apache.druid.segment.ColumnSelectorFactory; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/FloatMinBufferAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/FloatMinBufferAggregator.java similarity index 92% rename from processing/src/main/java/io/druid/query/aggregation/FloatMinBufferAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/FloatMinBufferAggregator.java index 166c1c9a2d8e..bad0fe4af981 100644 --- a/processing/src/main/java/io/druid/query/aggregation/FloatMinBufferAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/FloatMinBufferAggregator.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.segment.BaseFloatColumnValueSelector; +import org.apache.druid.segment.BaseFloatColumnValueSelector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/FloatSumAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/FloatSumAggregator.java similarity index 95% rename from processing/src/main/java/io/druid/query/aggregation/FloatSumAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/FloatSumAggregator.java index 7a51d8f40d29..3bf4b8123a32 100644 --- a/processing/src/main/java/io/druid/query/aggregation/FloatSumAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/FloatSumAggregator.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.google.common.collect.Ordering; -import io.druid.segment.BaseFloatColumnValueSelector; +import org.apache.druid.segment.BaseFloatColumnValueSelector; import java.util.Comparator; diff --git a/processing/src/main/java/io/druid/query/aggregation/FloatSumAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/FloatSumAggregatorFactory.java similarity index 93% rename from processing/src/main/java/io/druid/query/aggregation/FloatSumAggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/FloatSumAggregatorFactory.java index feb29c36b1cb..17a9f9df74c8 100644 --- a/processing/src/main/java/io/druid/query/aggregation/FloatSumAggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/FloatSumAggregatorFactory.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.StringUtils; -import io.druid.math.expr.ExprMacroTable; -import io.druid.segment.BaseFloatColumnValueSelector; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.segment.BaseFloatColumnValueSelector; +import org.apache.druid.segment.ColumnSelectorFactory; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/FloatSumBufferAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/FloatSumBufferAggregator.java similarity index 92% rename from processing/src/main/java/io/druid/query/aggregation/FloatSumBufferAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/FloatSumBufferAggregator.java index bcf4279fbf76..840a0e70e0fb 100644 --- a/processing/src/main/java/io/druid/query/aggregation/FloatSumBufferAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/FloatSumBufferAggregator.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.segment.BaseFloatColumnValueSelector; +import org.apache.druid.segment.BaseFloatColumnValueSelector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/Histogram.java b/processing/src/main/java/org/apache/druid/query/aggregation/Histogram.java similarity index 99% rename from processing/src/main/java/io/druid/query/aggregation/Histogram.java rename to processing/src/main/java/org/apache/druid/query/aggregation/Histogram.java index ede7c92a2e8c..708ba84e06ea 100644 --- a/processing/src/main/java/io/druid/query/aggregation/Histogram.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/Histogram.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.fasterxml.jackson.annotation.JsonValue; import com.google.common.base.Preconditions; diff --git a/processing/src/main/java/io/druid/query/aggregation/HistogramAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/HistogramAggregator.java similarity index 95% rename from processing/src/main/java/io/druid/query/aggregation/HistogramAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/HistogramAggregator.java index 84da44a0619f..0d4cd8010bc4 100644 --- a/processing/src/main/java/io/druid/query/aggregation/HistogramAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/HistogramAggregator.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.google.common.primitives.Longs; -import io.druid.segment.BaseFloatColumnValueSelector; +import org.apache.druid.segment.BaseFloatColumnValueSelector; import java.util.Comparator; diff --git a/processing/src/main/java/io/druid/query/aggregation/HistogramAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/HistogramAggregatorFactory.java similarity index 97% rename from processing/src/main/java/io/druid/query/aggregation/HistogramAggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/HistogramAggregatorFactory.java index 336f5c120c26..7e2d07437145 100644 --- a/processing/src/main/java/io/druid/query/aggregation/HistogramAggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/HistogramAggregatorFactory.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import io.druid.java.util.common.StringUtils; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; import org.apache.commons.codec.binary.Base64; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/query/aggregation/HistogramBufferAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/HistogramBufferAggregator.java similarity index 95% rename from processing/src/main/java/io/druid/query/aggregation/HistogramBufferAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/HistogramBufferAggregator.java index e2e6ef2d9e04..6226936d5e81 100644 --- a/processing/src/main/java/io/druid/query/aggregation/HistogramBufferAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/HistogramBufferAggregator.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseFloatColumnValueSelector; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseFloatColumnValueSelector; import java.nio.ByteBuffer; import java.util.Arrays; diff --git a/processing/src/main/java/io/druid/query/aggregation/HistogramVisual.java b/processing/src/main/java/org/apache/druid/query/aggregation/HistogramVisual.java similarity index 98% rename from processing/src/main/java/io/druid/query/aggregation/HistogramVisual.java rename to processing/src/main/java/org/apache/druid/query/aggregation/HistogramVisual.java index bbce46aba95d..74564b38f6d9 100644 --- a/processing/src/main/java/io/druid/query/aggregation/HistogramVisual.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/HistogramVisual.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/JavaScriptAggregator.java similarity index 94% rename from processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/JavaScriptAggregator.java index 453f1d59dc7d..78887bc0cc5a 100644 --- a/processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/JavaScriptAggregator.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.segment.BaseObjectColumnValueSelector; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/JavaScriptAggregatorFactory.java similarity index 97% rename from processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/JavaScriptAggregatorFactory.java index a3bc5175d1ba..91ebafaa109b 100644 --- a/processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/JavaScriptAggregatorFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; @@ -27,11 +27,11 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.druid.java.util.common.StringUtils; -import io.druid.js.JavaScriptConfig; -import io.druid.segment.BaseObjectColumnValueSelector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.js.JavaScriptConfig; +import org.apache.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; import org.mozilla.javascript.Context; import org.mozilla.javascript.ContextAction; import org.mozilla.javascript.ContextFactory; diff --git a/processing/src/main/java/io/druid/query/aggregation/JavaScriptBufferAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/JavaScriptBufferAggregator.java similarity index 92% rename from processing/src/main/java/io/druid/query/aggregation/JavaScriptBufferAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/JavaScriptBufferAggregator.java index 7170f49b72c3..c320a8d6406a 100644 --- a/processing/src/main/java/io/druid/query/aggregation/JavaScriptBufferAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/JavaScriptBufferAggregator.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseObjectColumnValueSelector; import java.nio.ByteBuffer; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/aggregation/LongAggregateCombiner.java b/processing/src/main/java/org/apache/druid/query/aggregation/LongAggregateCombiner.java similarity index 91% rename from processing/src/main/java/io/druid/query/aggregation/LongAggregateCombiner.java rename to processing/src/main/java/org/apache/druid/query/aggregation/LongAggregateCombiner.java index b4c73cefa960..9fd6da393f86 100644 --- a/processing/src/main/java/io/druid/query/aggregation/LongAggregateCombiner.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/LongAggregateCombiner.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.segment.LongColumnSelector; +import org.apache.druid.segment.LongColumnSelector; /** * Specialization of {@link AggregateCombiner} for primitive long aggregations. diff --git a/processing/src/main/java/io/druid/query/aggregation/LongMaxAggregateCombiner.java b/processing/src/main/java/org/apache/druid/query/aggregation/LongMaxAggregateCombiner.java similarity index 92% rename from processing/src/main/java/io/druid/query/aggregation/LongMaxAggregateCombiner.java rename to processing/src/main/java/org/apache/druid/query/aggregation/LongMaxAggregateCombiner.java index 944a3e3ffc54..86e1924c7ef5 100644 --- a/processing/src/main/java/io/druid/query/aggregation/LongMaxAggregateCombiner.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/LongMaxAggregateCombiner.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.ColumnValueSelector; final class LongMaxAggregateCombiner extends LongAggregateCombiner { diff --git a/processing/src/main/java/io/druid/query/aggregation/LongMaxAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/LongMaxAggregator.java similarity index 94% rename from processing/src/main/java/io/druid/query/aggregation/LongMaxAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/LongMaxAggregator.java index 6c4286b1be12..82c08d1f42bc 100644 --- a/processing/src/main/java/io/druid/query/aggregation/LongMaxAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/LongMaxAggregator.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.segment.BaseLongColumnValueSelector; /** */ diff --git a/processing/src/main/java/io/druid/query/aggregation/LongMaxAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/LongMaxAggregatorFactory.java similarity index 93% rename from processing/src/main/java/io/druid/query/aggregation/LongMaxAggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/LongMaxAggregatorFactory.java index 4d7030e074f0..78f398b1dae0 100644 --- a/processing/src/main/java/io/druid/query/aggregation/LongMaxAggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/LongMaxAggregatorFactory.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.StringUtils; -import io.druid.math.expr.ExprMacroTable; -import io.druid.segment.BaseLongColumnValueSelector; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.segment.ColumnSelectorFactory; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/LongMaxBufferAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/LongMaxBufferAggregator.java similarity index 92% rename from processing/src/main/java/io/druid/query/aggregation/LongMaxBufferAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/LongMaxBufferAggregator.java index 3564f3dbfa8f..4b8ff7d3fad3 100644 --- a/processing/src/main/java/io/druid/query/aggregation/LongMaxBufferAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/LongMaxBufferAggregator.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.segment.BaseLongColumnValueSelector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/LongMinAggregateCombiner.java b/processing/src/main/java/org/apache/druid/query/aggregation/LongMinAggregateCombiner.java similarity index 92% rename from processing/src/main/java/io/druid/query/aggregation/LongMinAggregateCombiner.java rename to processing/src/main/java/org/apache/druid/query/aggregation/LongMinAggregateCombiner.java index 6e255fd11076..08737e524cf1 100644 --- a/processing/src/main/java/io/druid/query/aggregation/LongMinAggregateCombiner.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/LongMinAggregateCombiner.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.ColumnValueSelector; final class LongMinAggregateCombiner extends LongAggregateCombiner { diff --git a/processing/src/main/java/io/druid/query/aggregation/LongMinAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/LongMinAggregator.java similarity index 94% rename from processing/src/main/java/io/druid/query/aggregation/LongMinAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/LongMinAggregator.java index 352276132eb3..91525efaa331 100644 --- a/processing/src/main/java/io/druid/query/aggregation/LongMinAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/LongMinAggregator.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.segment.BaseLongColumnValueSelector; /** */ diff --git a/processing/src/main/java/io/druid/query/aggregation/LongMinAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/LongMinAggregatorFactory.java similarity index 93% rename from processing/src/main/java/io/druid/query/aggregation/LongMinAggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/LongMinAggregatorFactory.java index 15174f171f24..bb0f199efd68 100644 --- a/processing/src/main/java/io/druid/query/aggregation/LongMinAggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/LongMinAggregatorFactory.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.StringUtils; -import io.druid.math.expr.ExprMacroTable; -import io.druid.segment.BaseLongColumnValueSelector; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.segment.ColumnSelectorFactory; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/LongMinBufferAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/LongMinBufferAggregator.java similarity index 92% rename from processing/src/main/java/io/druid/query/aggregation/LongMinBufferAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/LongMinBufferAggregator.java index 4e71d6ad21a8..595686f4e4af 100644 --- a/processing/src/main/java/io/druid/query/aggregation/LongMinBufferAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/LongMinBufferAggregator.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.segment.BaseLongColumnValueSelector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/LongSumAggregateCombiner.java b/processing/src/main/java/org/apache/druid/query/aggregation/LongSumAggregateCombiner.java similarity index 92% rename from processing/src/main/java/io/druid/query/aggregation/LongSumAggregateCombiner.java rename to processing/src/main/java/org/apache/druid/query/aggregation/LongSumAggregateCombiner.java index b47889c96e27..7a75f8ff2b3f 100644 --- a/processing/src/main/java/io/druid/query/aggregation/LongSumAggregateCombiner.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/LongSumAggregateCombiner.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.ColumnValueSelector; public final class LongSumAggregateCombiner extends LongAggregateCombiner { diff --git a/processing/src/main/java/io/druid/query/aggregation/LongSumAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/LongSumAggregator.java similarity index 95% rename from processing/src/main/java/io/druid/query/aggregation/LongSumAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/LongSumAggregator.java index fad3c9c9c103..d794708a39a8 100644 --- a/processing/src/main/java/io/druid/query/aggregation/LongSumAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/LongSumAggregator.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.google.common.primitives.Longs; -import io.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.segment.BaseLongColumnValueSelector; import java.util.Comparator; diff --git a/processing/src/main/java/io/druid/query/aggregation/LongSumAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/LongSumAggregatorFactory.java similarity index 93% rename from processing/src/main/java/io/druid/query/aggregation/LongSumAggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/LongSumAggregatorFactory.java index 285b1ef4af81..0fc2c6941375 100644 --- a/processing/src/main/java/io/druid/query/aggregation/LongSumAggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/LongSumAggregatorFactory.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.StringUtils; -import io.druid.math.expr.ExprMacroTable; -import io.druid.segment.BaseLongColumnValueSelector; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.segment.ColumnSelectorFactory; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/LongSumBufferAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/LongSumBufferAggregator.java similarity index 92% rename from processing/src/main/java/io/druid/query/aggregation/LongSumBufferAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/LongSumBufferAggregator.java index 985cd164bda3..0e4762d222b6 100644 --- a/processing/src/main/java/io/druid/query/aggregation/LongSumBufferAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/LongSumBufferAggregator.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.segment.BaseLongColumnValueSelector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/MetricManipulationFn.java b/processing/src/main/java/org/apache/druid/query/aggregation/MetricManipulationFn.java similarity index 90% rename from processing/src/main/java/io/druid/query/aggregation/MetricManipulationFn.java rename to processing/src/main/java/org/apache/druid/query/aggregation/MetricManipulationFn.java index f1109bba367e..1a29fa3573cd 100644 --- a/processing/src/main/java/io/druid/query/aggregation/MetricManipulationFn.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/MetricManipulationFn.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.guice.annotations.PublicApi; +import org.apache.druid.guice.annotations.PublicApi; /** */ diff --git a/processing/src/main/java/io/druid/query/aggregation/MetricManipulatorFns.java b/processing/src/main/java/org/apache/druid/query/aggregation/MetricManipulatorFns.java similarity index 97% rename from processing/src/main/java/io/druid/query/aggregation/MetricManipulatorFns.java rename to processing/src/main/java/org/apache/druid/query/aggregation/MetricManipulatorFns.java index 0cfafd6d99e1..f666a8382c2c 100644 --- a/processing/src/main/java/io/druid/query/aggregation/MetricManipulatorFns.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/MetricManipulatorFns.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; /** */ diff --git a/processing/src/main/java/io/druid/query/aggregation/NoopAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/NoopAggregator.java similarity index 96% rename from processing/src/main/java/io/druid/query/aggregation/NoopAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/NoopAggregator.java index f2c5de98ec22..c408898cbc3b 100644 --- a/processing/src/main/java/io/druid/query/aggregation/NoopAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/NoopAggregator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; public final class NoopAggregator implements Aggregator { diff --git a/processing/src/main/java/io/druid/query/aggregation/NoopBufferAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/NoopBufferAggregator.java similarity index 93% rename from processing/src/main/java/io/druid/query/aggregation/NoopBufferAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/NoopBufferAggregator.java index 406256d26c5a..ba20c9293453 100644 --- a/processing/src/main/java/io/druid/query/aggregation/NoopBufferAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/NoopBufferAggregator.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/NullableAggregateCombiner.java b/processing/src/main/java/org/apache/druid/query/aggregation/NullableAggregateCombiner.java similarity index 93% rename from processing/src/main/java/io/druid/query/aggregation/NullableAggregateCombiner.java rename to processing/src/main/java/org/apache/druid/query/aggregation/NullableAggregateCombiner.java index 8c530585dc26..4b29d7b0e8d0 100644 --- a/processing/src/main/java/io/druid/query/aggregation/NullableAggregateCombiner.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/NullableAggregateCombiner.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.guice.annotations.PublicApi; -import io.druid.segment.BaseNullableColumnValueSelector; -import io.druid.segment.ColumnValueSelector; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.segment.BaseNullableColumnValueSelector; +import org.apache.druid.segment.ColumnValueSelector; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/query/aggregation/NullableAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/NullableAggregator.java similarity index 94% rename from processing/src/main/java/io/druid/query/aggregation/NullableAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/NullableAggregator.java index 3b3353da4bf7..64658b6ca351 100644 --- a/processing/src/main/java/io/druid/query/aggregation/NullableAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/NullableAggregator.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.guice.annotations.PublicApi; -import io.druid.segment.BaseNullableColumnValueSelector; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.segment.BaseNullableColumnValueSelector; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/query/aggregation/NullableAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/NullableAggregatorFactory.java similarity index 90% rename from processing/src/main/java/io/druid/query/aggregation/NullableAggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/NullableAggregatorFactory.java index fdefd317c95a..1c7d4b231feb 100644 --- a/processing/src/main/java/io/druid/query/aggregation/NullableAggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/NullableAggregatorFactory.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.common.config.NullHandling; -import io.druid.guice.annotations.ExtensionPoint; -import io.druid.segment.BaseNullableColumnValueSelector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.guice.annotations.ExtensionPoint; +import org.apache.druid.segment.BaseNullableColumnValueSelector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; /** * Abstract class with functionality to wrap {@link Aggregator}, {@link BufferAggregator} and {@link AggregateCombiner} diff --git a/processing/src/main/java/io/druid/query/aggregation/NullableBufferAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/NullableBufferAggregator.java similarity index 94% rename from processing/src/main/java/io/druid/query/aggregation/NullableBufferAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/NullableBufferAggregator.java index 2c8e1a5618e2..48de4dfebf70 100644 --- a/processing/src/main/java/io/druid/query/aggregation/NullableBufferAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/NullableBufferAggregator.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.common.config.NullHandling; -import io.druid.guice.annotations.PublicApi; -import io.druid.segment.BaseNullableColumnValueSelector; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.segment.BaseNullableColumnValueSelector; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/ObjectAggregateCombiner.java b/processing/src/main/java/org/apache/druid/query/aggregation/ObjectAggregateCombiner.java similarity index 91% rename from processing/src/main/java/io/druid/query/aggregation/ObjectAggregateCombiner.java rename to processing/src/main/java/org/apache/druid/query/aggregation/ObjectAggregateCombiner.java index 39e77543b116..14948750f02f 100644 --- a/processing/src/main/java/io/druid/query/aggregation/ObjectAggregateCombiner.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/ObjectAggregateCombiner.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.segment.ObjectColumnSelector; +import org.apache.druid.segment.ObjectColumnSelector; /** * Specialization of {@link AggregateCombiner} for object aggregations. diff --git a/processing/src/main/java/io/druid/query/aggregation/PostAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/PostAggregator.java similarity index 91% rename from processing/src/main/java/io/druid/query/aggregation/PostAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/PostAggregator.java index b089f7fff3cc..5df02d09d32a 100644 --- a/processing/src/main/java/io/druid/query/aggregation/PostAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/PostAggregator.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.guice.annotations.ExtensionPoint; -import io.druid.java.util.common.Cacheable; +import org.apache.druid.guice.annotations.ExtensionPoint; +import org.apache.druid.java.util.common.Cacheable; import javax.annotation.Nullable; import java.util.Comparator; diff --git a/processing/src/main/java/io/druid/query/aggregation/SerializablePairLongString.java b/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongString.java similarity index 92% rename from processing/src/main/java/io/druid/query/aggregation/SerializablePairLongString.java rename to processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongString.java index 91f9b2622a75..69261aa4e501 100644 --- a/processing/src/main/java/io/druid/query/aggregation/SerializablePairLongString.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongString.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.collections.SerializablePair; +import org.apache.druid.collections.SerializablePair; public class SerializablePairLongString extends SerializablePair { diff --git a/processing/src/main/java/io/druid/query/aggregation/SerializablePairLongStringSerde.java b/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongStringSerde.java similarity index 84% rename from processing/src/main/java/io/druid/query/aggregation/SerializablePairLongStringSerde.java rename to processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongStringSerde.java index ca245fa13395..26b0b8160546 100644 --- a/processing/src/main/java/io/druid/query/aggregation/SerializablePairLongStringSerde.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongStringSerde.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.query.aggregation; - -import io.druid.data.input.InputRow; -import io.druid.java.util.common.StringUtils; -import io.druid.query.aggregation.first.StringFirstAggregatorFactory; -import io.druid.segment.GenericColumnSerializer; -import io.druid.segment.column.ColumnBuilder; -import io.druid.segment.data.GenericIndexed; -import io.druid.segment.data.ObjectStrategy; -import io.druid.segment.serde.ComplexColumnPartSupplier; -import io.druid.segment.serde.ComplexMetricExtractor; -import io.druid.segment.serde.ComplexMetricSerde; -import io.druid.segment.serde.LargeColumnSupportedComplexColumnSerializer; -import io.druid.segment.writeout.SegmentWriteOutMedium; +package org.apache.druid.query.aggregation; + +import org.apache.druid.data.input.InputRow; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.aggregation.first.StringFirstAggregatorFactory; +import org.apache.druid.segment.GenericColumnSerializer; +import org.apache.druid.segment.column.ColumnBuilder; +import org.apache.druid.segment.data.GenericIndexed; +import org.apache.druid.segment.data.ObjectStrategy; +import org.apache.druid.segment.serde.ComplexColumnPartSupplier; +import org.apache.druid.segment.serde.ComplexMetricExtractor; +import org.apache.druid.segment.serde.ComplexMetricSerde; +import org.apache.druid.segment.serde.LargeColumnSupportedComplexColumnSerializer; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/SimpleDoubleAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/SimpleDoubleAggregatorFactory.java similarity index 93% rename from processing/src/main/java/io/druid/query/aggregation/SimpleDoubleAggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/SimpleDoubleAggregatorFactory.java index a9add73aadd3..32c598cc57a4 100644 --- a/processing/src/main/java/io/druid/query/aggregation/SimpleDoubleAggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/SimpleDoubleAggregatorFactory.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.math.expr.ExprMacroTable; -import io.druid.math.expr.Parser; -import io.druid.segment.BaseDoubleColumnValueSelector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.column.Column; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.math.expr.Parser; +import org.apache.druid.segment.BaseDoubleColumnValueSelector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.column.Column; import javax.annotation.Nullable; import java.util.Collections; diff --git a/processing/src/main/java/io/druid/query/aggregation/SimpleDoubleBufferAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/SimpleDoubleBufferAggregator.java similarity index 90% rename from processing/src/main/java/io/druid/query/aggregation/SimpleDoubleBufferAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/SimpleDoubleBufferAggregator.java index 626a2af06d1c..29db6424de1f 100644 --- a/processing/src/main/java/io/druid/query/aggregation/SimpleDoubleBufferAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/SimpleDoubleBufferAggregator.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.query.monomorphicprocessing.CalledFromHotLoop; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseDoubleColumnValueSelector; +import org.apache.druid.query.monomorphicprocessing.CalledFromHotLoop; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseDoubleColumnValueSelector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/SimpleFloatAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/SimpleFloatAggregatorFactory.java similarity index 94% rename from processing/src/main/java/io/druid/query/aggregation/SimpleFloatAggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/SimpleFloatAggregatorFactory.java index 919a31425ad6..3f05c44bb0b8 100644 --- a/processing/src/main/java/io/druid/query/aggregation/SimpleFloatAggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/SimpleFloatAggregatorFactory.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.math.expr.ExprMacroTable; -import io.druid.math.expr.Parser; -import io.druid.segment.BaseFloatColumnValueSelector; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.math.expr.Parser; +import org.apache.druid.segment.BaseFloatColumnValueSelector; +import org.apache.druid.segment.ColumnSelectorFactory; import javax.annotation.Nullable; import java.util.Collections; diff --git a/processing/src/main/java/io/druid/query/aggregation/SimpleFloatBufferAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/SimpleFloatBufferAggregator.java similarity index 88% rename from processing/src/main/java/io/druid/query/aggregation/SimpleFloatBufferAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/SimpleFloatBufferAggregator.java index 41e93c1ef8e5..42338936c8de 100644 --- a/processing/src/main/java/io/druid/query/aggregation/SimpleFloatBufferAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/SimpleFloatBufferAggregator.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.query.monomorphicprocessing.CalledFromHotLoop; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseFloatColumnValueSelector; +import org.apache.druid.query.monomorphicprocessing.CalledFromHotLoop; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseFloatColumnValueSelector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/SimpleLongAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/SimpleLongAggregatorFactory.java similarity index 94% rename from processing/src/main/java/io/druid/query/aggregation/SimpleLongAggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/SimpleLongAggregatorFactory.java index cd66fcab2157..d023d6091241 100644 --- a/processing/src/main/java/io/druid/query/aggregation/SimpleLongAggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/SimpleLongAggregatorFactory.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.math.expr.ExprMacroTable; -import io.druid.math.expr.Parser; -import io.druid.segment.BaseLongColumnValueSelector; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.math.expr.Parser; +import org.apache.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.segment.ColumnSelectorFactory; import javax.annotation.Nullable; import java.util.Collections; diff --git a/processing/src/main/java/io/druid/query/aggregation/SimpleLongBufferAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/SimpleLongBufferAggregator.java similarity index 90% rename from processing/src/main/java/io/druid/query/aggregation/SimpleLongBufferAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/SimpleLongBufferAggregator.java index bf23fb1d389c..d10ba175e4be 100644 --- a/processing/src/main/java/io/druid/query/aggregation/SimpleLongBufferAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/SimpleLongBufferAggregator.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseLongColumnValueSelector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/SuppressedAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/SuppressedAggregatorFactory.java similarity index 96% rename from processing/src/main/java/io/druid/query/aggregation/SuppressedAggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/SuppressedAggregatorFactory.java index 1d393ce0eda2..64dcaf08ebb9 100644 --- a/processing/src/main/java/io/druid/query/aggregation/SuppressedAggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/SuppressedAggregatorFactory.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.query.PerSegmentQueryOptimizationContext; -import io.druid.query.cache.CacheKeyBuilder; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.query.PerSegmentQueryOptimizationContext; +import org.apache.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnSelectorFactory; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/cardinality/CardinalityAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/cardinality/CardinalityAggregator.java similarity index 92% rename from processing/src/main/java/io/druid/query/aggregation/cardinality/CardinalityAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/cardinality/CardinalityAggregator.java index 70e18dff9f39..c3a314712260 100644 --- a/processing/src/main/java/io/druid/query/aggregation/cardinality/CardinalityAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/cardinality/CardinalityAggregator.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.query.aggregation.cardinality; +package org.apache.druid.query.aggregation.cardinality; import com.google.common.annotations.VisibleForTesting; import com.google.common.hash.HashFunction; import com.google.common.hash.Hasher; import com.google.common.hash.Hashing; -import io.druid.hll.HyperLogLogCollector; -import io.druid.query.ColumnSelectorPlus; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.cardinality.types.CardinalityAggregatorColumnSelectorStrategy; +import org.apache.druid.hll.HyperLogLogCollector; +import org.apache.druid.query.ColumnSelectorPlus; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.cardinality.types.CardinalityAggregatorColumnSelectorStrategy; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/aggregation/cardinality/CardinalityAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/cardinality/CardinalityAggregatorFactory.java similarity index 87% rename from processing/src/main/java/io/druid/query/aggregation/cardinality/CardinalityAggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/cardinality/CardinalityAggregatorFactory.java index fb1fcc0bb156..6bf3e5785b81 100644 --- a/processing/src/main/java/io/druid/query/aggregation/cardinality/CardinalityAggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/cardinality/CardinalityAggregatorFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.cardinality; +package org.apache.druid.query.aggregation.cardinality; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -25,24 +25,24 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.druid.hll.HyperLogLogCollector; -import io.druid.java.util.common.StringUtils; -import io.druid.query.ColumnSelectorPlus; -import io.druid.query.aggregation.AggregateCombiner; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.NoopAggregator; -import io.druid.query.aggregation.NoopBufferAggregator; -import io.druid.query.aggregation.cardinality.types.CardinalityAggregatorColumnSelectorStrategy; -import io.druid.query.aggregation.cardinality.types.CardinalityAggregatorColumnSelectorStrategyFactory; -import io.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; -import io.druid.query.cache.CacheKeyBuilder; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.dimension.DimensionSpec; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.DimensionHandlerUtils; +import org.apache.druid.hll.HyperLogLogCollector; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.ColumnSelectorPlus; +import org.apache.druid.query.aggregation.AggregateCombiner; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.NoopAggregator; +import org.apache.druid.query.aggregation.NoopBufferAggregator; +import org.apache.druid.query.aggregation.cardinality.types.CardinalityAggregatorColumnSelectorStrategy; +import org.apache.druid.query.aggregation.cardinality.types.CardinalityAggregatorColumnSelectorStrategyFactory; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; +import org.apache.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.DimensionHandlerUtils; import org.apache.commons.codec.binary.Base64; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/cardinality/CardinalityBufferAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/cardinality/CardinalityBufferAggregator.java similarity index 89% rename from processing/src/main/java/io/druid/query/aggregation/cardinality/CardinalityBufferAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/cardinality/CardinalityBufferAggregator.java index 3288adcfcff0..abb157738d4d 100644 --- a/processing/src/main/java/io/druid/query/aggregation/cardinality/CardinalityBufferAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/cardinality/CardinalityBufferAggregator.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.aggregation.cardinality; +package org.apache.druid.query.aggregation.cardinality; -import io.druid.hll.HyperLogLogCollector; -import io.druid.query.ColumnSelectorPlus; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.cardinality.types.CardinalityAggregatorColumnSelectorStrategy; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.hll.HyperLogLogCollector; +import org.apache.druid.query.ColumnSelectorPlus; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.cardinality.types.CardinalityAggregatorColumnSelectorStrategy; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/cardinality/HyperLogLogCollectorAggregateCombiner.java b/processing/src/main/java/org/apache/druid/query/aggregation/cardinality/HyperLogLogCollectorAggregateCombiner.java similarity index 87% rename from processing/src/main/java/io/druid/query/aggregation/cardinality/HyperLogLogCollectorAggregateCombiner.java rename to processing/src/main/java/org/apache/druid/query/aggregation/cardinality/HyperLogLogCollectorAggregateCombiner.java index 205de3cd230d..d1d76e54a429 100644 --- a/processing/src/main/java/io/druid/query/aggregation/cardinality/HyperLogLogCollectorAggregateCombiner.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/cardinality/HyperLogLogCollectorAggregateCombiner.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation.cardinality; +package org.apache.druid.query.aggregation.cardinality; -import io.druid.hll.HyperLogLogCollector; -import io.druid.query.aggregation.ObjectAggregateCombiner; -import io.druid.segment.ColumnValueSelector; +import org.apache.druid.hll.HyperLogLogCollector; +import org.apache.druid.query.aggregation.ObjectAggregateCombiner; +import org.apache.druid.segment.ColumnValueSelector; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/query/aggregation/cardinality/types/CardinalityAggregatorColumnSelectorStrategy.java b/processing/src/main/java/org/apache/druid/query/aggregation/cardinality/types/CardinalityAggregatorColumnSelectorStrategy.java similarity index 89% rename from processing/src/main/java/io/druid/query/aggregation/cardinality/types/CardinalityAggregatorColumnSelectorStrategy.java rename to processing/src/main/java/org/apache/druid/query/aggregation/cardinality/types/CardinalityAggregatorColumnSelectorStrategy.java index 1327e6df8157..89c49bd8385b 100644 --- a/processing/src/main/java/io/druid/query/aggregation/cardinality/types/CardinalityAggregatorColumnSelectorStrategy.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/cardinality/types/CardinalityAggregatorColumnSelectorStrategy.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation.cardinality.types; +package org.apache.druid.query.aggregation.cardinality.types; import com.google.common.hash.Hasher; -import io.druid.hll.HyperLogLogCollector; -import io.druid.query.dimension.ColumnSelectorStrategy; +import org.apache.druid.hll.HyperLogLogCollector; +import org.apache.druid.query.dimension.ColumnSelectorStrategy; public interface CardinalityAggregatorColumnSelectorStrategy extends ColumnSelectorStrategy { diff --git a/processing/src/main/java/io/druid/query/aggregation/cardinality/types/CardinalityAggregatorColumnSelectorStrategyFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/cardinality/types/CardinalityAggregatorColumnSelectorStrategyFactory.java similarity index 83% rename from processing/src/main/java/io/druid/query/aggregation/cardinality/types/CardinalityAggregatorColumnSelectorStrategyFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/cardinality/types/CardinalityAggregatorColumnSelectorStrategyFactory.java index 7d914950a80b..be444b683fb9 100644 --- a/processing/src/main/java/io/druid/query/aggregation/cardinality/types/CardinalityAggregatorColumnSelectorStrategyFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/cardinality/types/CardinalityAggregatorColumnSelectorStrategyFactory.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.aggregation.cardinality.types; +package org.apache.druid.query.aggregation.cardinality.types; -import io.druid.java.util.common.IAE; -import io.druid.query.dimension.ColumnSelectorStrategyFactory; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.column.ValueType; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.query.dimension.ColumnSelectorStrategyFactory; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.column.ValueType; public class CardinalityAggregatorColumnSelectorStrategyFactory implements ColumnSelectorStrategyFactory diff --git a/processing/src/main/java/io/druid/query/aggregation/cardinality/types/DoubleCardinalityAggregatorColumnSelectorStrategy.java b/processing/src/main/java/org/apache/druid/query/aggregation/cardinality/types/DoubleCardinalityAggregatorColumnSelectorStrategy.java similarity index 85% rename from processing/src/main/java/io/druid/query/aggregation/cardinality/types/DoubleCardinalityAggregatorColumnSelectorStrategy.java rename to processing/src/main/java/org/apache/druid/query/aggregation/cardinality/types/DoubleCardinalityAggregatorColumnSelectorStrategy.java index b62c48aba1e2..68967b8bfdac 100644 --- a/processing/src/main/java/io/druid/query/aggregation/cardinality/types/DoubleCardinalityAggregatorColumnSelectorStrategy.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/cardinality/types/DoubleCardinalityAggregatorColumnSelectorStrategy.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.aggregation.cardinality.types; +package org.apache.druid.query.aggregation.cardinality.types; import com.google.common.hash.Hasher; -import io.druid.common.config.NullHandling; -import io.druid.hll.HyperLogLogCollector; -import io.druid.query.aggregation.cardinality.CardinalityAggregator; -import io.druid.segment.BaseDoubleColumnValueSelector; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.hll.HyperLogLogCollector; +import org.apache.druid.query.aggregation.cardinality.CardinalityAggregator; +import org.apache.druid.segment.BaseDoubleColumnValueSelector; /** * If performance of this class appears to be a bottleneck for somebody, diff --git a/processing/src/main/java/io/druid/query/aggregation/cardinality/types/FloatCardinalityAggregatorColumnSelectorStrategy.java b/processing/src/main/java/org/apache/druid/query/aggregation/cardinality/types/FloatCardinalityAggregatorColumnSelectorStrategy.java similarity index 85% rename from processing/src/main/java/io/druid/query/aggregation/cardinality/types/FloatCardinalityAggregatorColumnSelectorStrategy.java rename to processing/src/main/java/org/apache/druid/query/aggregation/cardinality/types/FloatCardinalityAggregatorColumnSelectorStrategy.java index de8160e39350..c9c1e575c649 100644 --- a/processing/src/main/java/io/druid/query/aggregation/cardinality/types/FloatCardinalityAggregatorColumnSelectorStrategy.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/cardinality/types/FloatCardinalityAggregatorColumnSelectorStrategy.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.aggregation.cardinality.types; +package org.apache.druid.query.aggregation.cardinality.types; import com.google.common.hash.Hasher; -import io.druid.common.config.NullHandling; -import io.druid.hll.HyperLogLogCollector; -import io.druid.query.aggregation.cardinality.CardinalityAggregator; -import io.druid.segment.BaseFloatColumnValueSelector; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.hll.HyperLogLogCollector; +import org.apache.druid.query.aggregation.cardinality.CardinalityAggregator; +import org.apache.druid.segment.BaseFloatColumnValueSelector; /** * If performance of this class appears to be a bottleneck for somebody, diff --git a/processing/src/main/java/io/druid/query/aggregation/cardinality/types/LongCardinalityAggregatorColumnSelectorStrategy.java b/processing/src/main/java/org/apache/druid/query/aggregation/cardinality/types/LongCardinalityAggregatorColumnSelectorStrategy.java similarity index 85% rename from processing/src/main/java/io/druid/query/aggregation/cardinality/types/LongCardinalityAggregatorColumnSelectorStrategy.java rename to processing/src/main/java/org/apache/druid/query/aggregation/cardinality/types/LongCardinalityAggregatorColumnSelectorStrategy.java index a3d4e45177c1..f8f735d3e14d 100644 --- a/processing/src/main/java/io/druid/query/aggregation/cardinality/types/LongCardinalityAggregatorColumnSelectorStrategy.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/cardinality/types/LongCardinalityAggregatorColumnSelectorStrategy.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.aggregation.cardinality.types; +package org.apache.druid.query.aggregation.cardinality.types; import com.google.common.hash.Hasher; -import io.druid.common.config.NullHandling; -import io.druid.hll.HyperLogLogCollector; -import io.druid.query.aggregation.cardinality.CardinalityAggregator; -import io.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.hll.HyperLogLogCollector; +import org.apache.druid.query.aggregation.cardinality.CardinalityAggregator; +import org.apache.druid.segment.BaseLongColumnValueSelector; /** * If performance of this class appears to be a bottleneck for somebody, diff --git a/processing/src/main/java/io/druid/query/aggregation/cardinality/types/StringCardinalityAggregatorColumnSelectorStrategy.java b/processing/src/main/java/org/apache/druid/query/aggregation/cardinality/types/StringCardinalityAggregatorColumnSelectorStrategy.java similarity index 91% rename from processing/src/main/java/io/druid/query/aggregation/cardinality/types/StringCardinalityAggregatorColumnSelectorStrategy.java rename to processing/src/main/java/org/apache/druid/query/aggregation/cardinality/types/StringCardinalityAggregatorColumnSelectorStrategy.java index d7129470b5de..5fe5f7ae1fee 100644 --- a/processing/src/main/java/io/druid/query/aggregation/cardinality/types/StringCardinalityAggregatorColumnSelectorStrategy.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/cardinality/types/StringCardinalityAggregatorColumnSelectorStrategy.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.aggregation.cardinality.types; +package org.apache.druid.query.aggregation.cardinality.types; import com.google.common.hash.Hasher; -import io.druid.common.config.NullHandling; -import io.druid.hll.HyperLogLogCollector; -import io.druid.query.aggregation.cardinality.CardinalityAggregator; -import io.druid.segment.DimensionSelector; -import io.druid.segment.data.IndexedInts; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.hll.HyperLogLogCollector; +import org.apache.druid.query.aggregation.cardinality.CardinalityAggregator; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.data.IndexedInts; import java.util.Arrays; diff --git a/processing/src/main/java/io/druid/query/aggregation/first/DoubleFirstAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/first/DoubleFirstAggregator.java similarity index 86% rename from processing/src/main/java/io/druid/query/aggregation/first/DoubleFirstAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/first/DoubleFirstAggregator.java index d6dbbd8d3780..11a355830e79 100644 --- a/processing/src/main/java/io/druid/query/aggregation/first/DoubleFirstAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/first/DoubleFirstAggregator.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.aggregation.first; +package org.apache.druid.query.aggregation.first; -import io.druid.collections.SerializablePair; -import io.druid.query.aggregation.Aggregator; -import io.druid.segment.BaseDoubleColumnValueSelector; -import io.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.collections.SerializablePair; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.segment.BaseDoubleColumnValueSelector; +import org.apache.druid.segment.BaseLongColumnValueSelector; public class DoubleFirstAggregator implements Aggregator { diff --git a/processing/src/main/java/io/druid/query/aggregation/first/DoubleFirstAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/first/DoubleFirstAggregatorFactory.java similarity index 89% rename from processing/src/main/java/io/druid/query/aggregation/first/DoubleFirstAggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/first/DoubleFirstAggregatorFactory.java index 240b06e694c4..f4cd9d428510 100644 --- a/processing/src/main/java/io/druid/query/aggregation/first/DoubleFirstAggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/first/DoubleFirstAggregatorFactory.java @@ -17,26 +17,26 @@ * under the License. */ -package io.druid.query.aggregation.first; +package org.apache.druid.query.aggregation.first; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.primitives.Doubles; import com.google.common.primitives.Longs; -import io.druid.collections.SerializablePair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.UOE; -import io.druid.query.aggregation.AggregateCombiner; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.NullableAggregatorFactory; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.column.Column; +import org.apache.druid.collections.SerializablePair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.UOE; +import org.apache.druid.query.aggregation.AggregateCombiner; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.NullableAggregatorFactory; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.column.Column; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/first/DoubleFirstBufferAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/first/DoubleFirstBufferAggregator.java similarity index 87% rename from processing/src/main/java/io/druid/query/aggregation/first/DoubleFirstBufferAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/first/DoubleFirstBufferAggregator.java index 5d270c147475..e917c680ef96 100644 --- a/processing/src/main/java/io/druid/query/aggregation/first/DoubleFirstBufferAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/first/DoubleFirstBufferAggregator.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.aggregation.first; +package org.apache.druid.query.aggregation.first; -import io.druid.collections.SerializablePair; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseDoubleColumnValueSelector; -import io.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.collections.SerializablePair; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseDoubleColumnValueSelector; +import org.apache.druid.segment.BaseLongColumnValueSelector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/first/FloatFirstAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/first/FloatFirstAggregator.java similarity index 87% rename from processing/src/main/java/io/druid/query/aggregation/first/FloatFirstAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/first/FloatFirstAggregator.java index 9e943465d1e2..af7167c4e1de 100644 --- a/processing/src/main/java/io/druid/query/aggregation/first/FloatFirstAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/first/FloatFirstAggregator.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.aggregation.first; +package org.apache.druid.query.aggregation.first; -import io.druid.collections.SerializablePair; -import io.druid.query.aggregation.Aggregator; -import io.druid.segment.BaseFloatColumnValueSelector; -import io.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.collections.SerializablePair; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.segment.BaseFloatColumnValueSelector; +import org.apache.druid.segment.BaseLongColumnValueSelector; public class FloatFirstAggregator implements Aggregator { diff --git a/processing/src/main/java/io/druid/query/aggregation/first/FloatFirstAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/first/FloatFirstAggregatorFactory.java similarity index 89% rename from processing/src/main/java/io/druid/query/aggregation/first/FloatFirstAggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/first/FloatFirstAggregatorFactory.java index 2f17b3d0cfdd..2c9a6f580e70 100644 --- a/processing/src/main/java/io/druid/query/aggregation/first/FloatFirstAggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/first/FloatFirstAggregatorFactory.java @@ -17,26 +17,26 @@ * under the License. */ -package io.druid.query.aggregation.first; +package org.apache.druid.query.aggregation.first; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.primitives.Doubles; import com.google.common.primitives.Longs; -import io.druid.collections.SerializablePair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.UOE; -import io.druid.query.aggregation.AggregateCombiner; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.NullableAggregatorFactory; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.column.Column; +import org.apache.druid.collections.SerializablePair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.UOE; +import org.apache.druid.query.aggregation.AggregateCombiner; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.NullableAggregatorFactory; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.column.Column; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/first/FloatFirstBufferAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/first/FloatFirstBufferAggregator.java similarity index 87% rename from processing/src/main/java/io/druid/query/aggregation/first/FloatFirstBufferAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/first/FloatFirstBufferAggregator.java index 89f65d7521f1..d7797b52eb6c 100644 --- a/processing/src/main/java/io/druid/query/aggregation/first/FloatFirstBufferAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/first/FloatFirstBufferAggregator.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.aggregation.first; +package org.apache.druid.query.aggregation.first; -import io.druid.collections.SerializablePair; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseFloatColumnValueSelector; -import io.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.collections.SerializablePair; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseFloatColumnValueSelector; +import org.apache.druid.segment.BaseLongColumnValueSelector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/first/LongFirstAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/first/LongFirstAggregator.java similarity index 89% rename from processing/src/main/java/io/druid/query/aggregation/first/LongFirstAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/first/LongFirstAggregator.java index 41064fc0ae8a..d1fd9aebd268 100644 --- a/processing/src/main/java/io/druid/query/aggregation/first/LongFirstAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/first/LongFirstAggregator.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation.first; +package org.apache.druid.query.aggregation.first; -import io.druid.collections.SerializablePair; -import io.druid.query.aggregation.Aggregator; -import io.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.collections.SerializablePair; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.segment.BaseLongColumnValueSelector; public class LongFirstAggregator implements Aggregator { diff --git a/processing/src/main/java/io/druid/query/aggregation/first/LongFirstAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/first/LongFirstAggregatorFactory.java similarity index 89% rename from processing/src/main/java/io/druid/query/aggregation/first/LongFirstAggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/first/LongFirstAggregatorFactory.java index 099da2577c42..1313dedeaf2f 100644 --- a/processing/src/main/java/io/druid/query/aggregation/first/LongFirstAggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/first/LongFirstAggregatorFactory.java @@ -17,25 +17,25 @@ * under the License. */ -package io.druid.query.aggregation.first; +package org.apache.druid.query.aggregation.first; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.primitives.Longs; -import io.druid.collections.SerializablePair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.UOE; -import io.druid.query.aggregation.AggregateCombiner; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.NullableAggregatorFactory; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.column.Column; +import org.apache.druid.collections.SerializablePair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.UOE; +import org.apache.druid.query.aggregation.AggregateCombiner; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.NullableAggregatorFactory; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.column.Column; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/first/LongFirstBufferAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/first/LongFirstBufferAggregator.java similarity index 89% rename from processing/src/main/java/io/druid/query/aggregation/first/LongFirstBufferAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/first/LongFirstBufferAggregator.java index 322ec44a1387..2ef812af81d7 100644 --- a/processing/src/main/java/io/druid/query/aggregation/first/LongFirstBufferAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/first/LongFirstBufferAggregator.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.aggregation.first; +package org.apache.druid.query.aggregation.first; -import io.druid.collections.SerializablePair; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.collections.SerializablePair; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseLongColumnValueSelector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/first/StringFirstAggregateCombiner.java b/processing/src/main/java/org/apache/druid/query/aggregation/first/StringFirstAggregateCombiner.java similarity index 89% rename from processing/src/main/java/io/druid/query/aggregation/first/StringFirstAggregateCombiner.java rename to processing/src/main/java/org/apache/druid/query/aggregation/first/StringFirstAggregateCombiner.java index 20487f659002..9a86a13be337 100644 --- a/processing/src/main/java/io/druid/query/aggregation/first/StringFirstAggregateCombiner.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/first/StringFirstAggregateCombiner.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.aggregation.first; +package org.apache.druid.query.aggregation.first; -import io.druid.query.aggregation.ObjectAggregateCombiner; -import io.druid.segment.ColumnValueSelector; +import org.apache.druid.query.aggregation.ObjectAggregateCombiner; +import org.apache.druid.segment.ColumnValueSelector; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/query/aggregation/first/StringFirstAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/first/StringFirstAggregator.java similarity index 89% rename from processing/src/main/java/io/druid/query/aggregation/first/StringFirstAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/first/StringFirstAggregator.java index 5710a6107280..0c277795f113 100644 --- a/processing/src/main/java/io/druid/query/aggregation/first/StringFirstAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/first/StringFirstAggregator.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.aggregation.first; +package org.apache.druid.query.aggregation.first; -import io.druid.java.util.common.ISE; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.SerializablePairLongString; -import io.druid.segment.BaseLongColumnValueSelector; -import io.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.SerializablePairLongString; +import org.apache.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.segment.BaseObjectColumnValueSelector; public class StringFirstAggregator implements Aggregator { diff --git a/processing/src/main/java/io/druid/query/aggregation/first/StringFirstAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/first/StringFirstAggregatorFactory.java similarity index 90% rename from processing/src/main/java/io/druid/query/aggregation/first/StringFirstAggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/first/StringFirstAggregatorFactory.java index 71439596e250..350f271b3b69 100644 --- a/processing/src/main/java/io/druid/query/aggregation/first/StringFirstAggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/first/StringFirstAggregatorFactory.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.query.aggregation.first; +package org.apache.druid.query.aggregation.first; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.base.Preconditions; import com.google.common.primitives.Longs; -import io.druid.query.aggregation.AggregateCombiner; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.NullableAggregatorFactory; -import io.druid.query.aggregation.SerializablePairLongString; -import io.druid.query.cache.CacheKeyBuilder; -import io.druid.segment.BaseObjectColumnValueSelector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.column.Column; +import org.apache.druid.query.aggregation.AggregateCombiner; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.NullableAggregatorFactory; +import org.apache.druid.query.aggregation.SerializablePairLongString; +import org.apache.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.column.Column; import java.util.Arrays; import java.util.Collections; diff --git a/processing/src/main/java/io/druid/query/aggregation/first/StringFirstBufferAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/first/StringFirstBufferAggregator.java similarity index 90% rename from processing/src/main/java/io/druid/query/aggregation/first/StringFirstBufferAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/first/StringFirstBufferAggregator.java index c71cfbfc2de7..4d05ec3a44bd 100644 --- a/processing/src/main/java/io/druid/query/aggregation/first/StringFirstBufferAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/first/StringFirstBufferAggregator.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.aggregation.first; - -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.SerializablePairLongString; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseLongColumnValueSelector; -import io.druid.segment.BaseObjectColumnValueSelector; +package org.apache.druid.query.aggregation.first; + +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.SerializablePairLongString; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.segment.BaseObjectColumnValueSelector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/first/StringFirstFoldingAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/first/StringFirstFoldingAggregatorFactory.java similarity index 86% rename from processing/src/main/java/io/druid/query/aggregation/first/StringFirstFoldingAggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/first/StringFirstFoldingAggregatorFactory.java index 1b129f592793..1c49a54f9846 100644 --- a/processing/src/main/java/io/druid/query/aggregation/first/StringFirstFoldingAggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/first/StringFirstFoldingAggregatorFactory.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.aggregation.first; +package org.apache.druid.query.aggregation.first; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.druid.java.util.common.StringUtils; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.SerializablePairLongString; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseObjectColumnValueSelector; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.SerializablePairLongString; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.segment.ColumnSelectorFactory; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniqueFinalizingPostAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniqueFinalizingPostAggregator.java similarity index 93% rename from processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniqueFinalizingPostAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniqueFinalizingPostAggregator.java index 5a2d7ac0e3fb..7ee605ed682a 100644 --- a/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniqueFinalizingPostAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniqueFinalizingPostAggregator.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.aggregation.hyperloglog; +package org.apache.druid.query.aggregation.hyperloglog; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.Ordering; import com.google.common.collect.Sets; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.post.PostAggregatorIds; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.post.PostAggregatorIds; +import org.apache.druid.query.cache.CacheKeyBuilder; import java.util.Comparator; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniquesAggregator.java similarity index 91% rename from processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniquesAggregator.java index e1939d627233..6524e058488a 100644 --- a/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniquesAggregator.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation.hyperloglog; +package org.apache.druid.query.aggregation.hyperloglog; -import io.druid.hll.HyperLogLogCollector; -import io.druid.query.aggregation.Aggregator; -import io.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.hll.HyperLogLogCollector; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.segment.BaseObjectColumnValueSelector; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniquesAggregatorFactory.java similarity index 86% rename from processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniquesAggregatorFactory.java index 37194965bacc..628019edf93f 100644 --- a/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniquesAggregatorFactory.java @@ -17,27 +17,27 @@ * under the License. */ -package io.druid.query.aggregation.hyperloglog; +package org.apache.druid.query.aggregation.hyperloglog; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.hll.HyperLogLogCollector; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.guava.Comparators; -import io.druid.query.aggregation.AggregateCombiner; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.AggregatorFactoryNotMergeableException; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.NoopAggregator; -import io.druid.query.aggregation.NoopBufferAggregator; -import io.druid.query.aggregation.cardinality.HyperLogLogCollectorAggregateCombiner; -import io.druid.query.cache.CacheKeyBuilder; -import io.druid.segment.BaseObjectColumnValueSelector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.NilColumnValueSelector; +import org.apache.druid.hll.HyperLogLogCollector; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.query.aggregation.AggregateCombiner; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorFactoryNotMergeableException; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.NoopAggregator; +import org.apache.druid.query.aggregation.NoopBufferAggregator; +import org.apache.druid.query.aggregation.cardinality.HyperLogLogCollectorAggregateCombiner; +import org.apache.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.NilColumnValueSelector; import org.apache.commons.codec.binary.Base64; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesBufferAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniquesBufferAggregator.java similarity index 91% rename from processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesBufferAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniquesBufferAggregator.java index c5cf7b736376..c7f31f4fc9d4 100644 --- a/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesBufferAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniquesBufferAggregator.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.aggregation.hyperloglog; +package org.apache.druid.query.aggregation.hyperloglog; -import io.druid.hll.HyperLogLogCollector; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.hll.HyperLogLogCollector; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseObjectColumnValueSelector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesSerde.java b/processing/src/main/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniquesSerde.java similarity index 85% rename from processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesSerde.java rename to processing/src/main/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniquesSerde.java index a04d48fe13e7..a85a8e1fc609 100644 --- a/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesSerde.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniquesSerde.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.query.aggregation.hyperloglog; +package org.apache.druid.query.aggregation.hyperloglog; import com.google.common.collect.Ordering; -import io.druid.data.input.InputRow; -import io.druid.hll.HyperLogLogCollector; -import io.druid.hll.HyperLogLogHash; -import io.druid.segment.writeout.SegmentWriteOutMedium; -import io.druid.segment.GenericColumnSerializer; -import io.druid.segment.column.ColumnBuilder; -import io.druid.segment.data.GenericIndexed; -import io.druid.segment.data.ObjectStrategy; -import io.druid.segment.serde.ComplexColumnPartSupplier; -import io.druid.segment.serde.ComplexMetricExtractor; -import io.druid.segment.serde.ComplexMetricSerde; -import io.druid.segment.serde.LargeColumnSupportedComplexColumnSerializer; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.hll.HyperLogLogCollector; +import org.apache.druid.hll.HyperLogLogHash; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.segment.GenericColumnSerializer; +import org.apache.druid.segment.column.ColumnBuilder; +import org.apache.druid.segment.data.GenericIndexed; +import org.apache.druid.segment.data.ObjectStrategy; +import org.apache.druid.segment.serde.ComplexColumnPartSupplier; +import org.apache.druid.segment.serde.ComplexMetricExtractor; +import org.apache.druid.segment.serde.ComplexMetricSerde; +import org.apache.druid.segment.serde.LargeColumnSupportedComplexColumnSerializer; import java.nio.ByteBuffer; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/aggregation/hyperloglog/PreComputedHyperUniquesSerde.java b/processing/src/main/java/org/apache/druid/query/aggregation/hyperloglog/PreComputedHyperUniquesSerde.java similarity index 87% rename from processing/src/main/java/io/druid/query/aggregation/hyperloglog/PreComputedHyperUniquesSerde.java rename to processing/src/main/java/org/apache/druid/query/aggregation/hyperloglog/PreComputedHyperUniquesSerde.java index 0c45e60fa7b2..7be5e41deba0 100644 --- a/processing/src/main/java/io/druid/query/aggregation/hyperloglog/PreComputedHyperUniquesSerde.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/hyperloglog/PreComputedHyperUniquesSerde.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.aggregation.hyperloglog; +package org.apache.druid.query.aggregation.hyperloglog; -import io.druid.data.input.InputRow; -import io.druid.hll.HyperLogLogCollector; -import io.druid.hll.HyperLogLogHash; -import io.druid.java.util.common.ISE; -import io.druid.segment.serde.ComplexMetricExtractor; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.hll.HyperLogLogCollector; +import org.apache.druid.hll.HyperLogLogHash; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.segment.serde.ComplexMetricExtractor; import org.apache.commons.codec.binary.Base64; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/last/DoubleLastAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/last/DoubleLastAggregator.java similarity index 86% rename from processing/src/main/java/io/druid/query/aggregation/last/DoubleLastAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/last/DoubleLastAggregator.java index c0de17716c49..d6678d7f2ea6 100644 --- a/processing/src/main/java/io/druid/query/aggregation/last/DoubleLastAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/last/DoubleLastAggregator.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.aggregation.last; +package org.apache.druid.query.aggregation.last; -import io.druid.collections.SerializablePair; -import io.druid.query.aggregation.Aggregator; -import io.druid.segment.BaseDoubleColumnValueSelector; -import io.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.collections.SerializablePair; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.segment.BaseDoubleColumnValueSelector; +import org.apache.druid.segment.BaseLongColumnValueSelector; public class DoubleLastAggregator implements Aggregator { diff --git a/processing/src/main/java/io/druid/query/aggregation/last/DoubleLastAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/last/DoubleLastAggregatorFactory.java similarity index 87% rename from processing/src/main/java/io/druid/query/aggregation/last/DoubleLastAggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/last/DoubleLastAggregatorFactory.java index e0854312bdaa..8842baafd639 100644 --- a/processing/src/main/java/io/druid/query/aggregation/last/DoubleLastAggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/last/DoubleLastAggregatorFactory.java @@ -17,26 +17,26 @@ * under the License. */ -package io.druid.query.aggregation.last; +package org.apache.druid.query.aggregation.last; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.collections.SerializablePair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.UOE; -import io.druid.query.aggregation.AggregateCombiner; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.NullableAggregatorFactory; -import io.druid.query.aggregation.first.DoubleFirstAggregatorFactory; -import io.druid.query.aggregation.first.LongFirstAggregatorFactory; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.column.Column; +import org.apache.druid.collections.SerializablePair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.UOE; +import org.apache.druid.query.aggregation.AggregateCombiner; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.NullableAggregatorFactory; +import org.apache.druid.query.aggregation.first.DoubleFirstAggregatorFactory; +import org.apache.druid.query.aggregation.first.LongFirstAggregatorFactory; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.column.Column; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/last/DoubleLastBufferAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/last/DoubleLastBufferAggregator.java similarity index 87% rename from processing/src/main/java/io/druid/query/aggregation/last/DoubleLastBufferAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/last/DoubleLastBufferAggregator.java index fe36b305f4ee..b389b5f9af85 100644 --- a/processing/src/main/java/io/druid/query/aggregation/last/DoubleLastBufferAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/last/DoubleLastBufferAggregator.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.aggregation.last; +package org.apache.druid.query.aggregation.last; -import io.druid.collections.SerializablePair; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseDoubleColumnValueSelector; -import io.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.collections.SerializablePair; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseDoubleColumnValueSelector; +import org.apache.druid.segment.BaseLongColumnValueSelector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/last/FloatLastAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/last/FloatLastAggregator.java similarity index 86% rename from processing/src/main/java/io/druid/query/aggregation/last/FloatLastAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/last/FloatLastAggregator.java index 597a9cb871d1..77e3455c489b 100644 --- a/processing/src/main/java/io/druid/query/aggregation/last/FloatLastAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/last/FloatLastAggregator.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.aggregation.last; +package org.apache.druid.query.aggregation.last; -import io.druid.collections.SerializablePair; -import io.druid.query.aggregation.Aggregator; -import io.druid.segment.BaseFloatColumnValueSelector; -import io.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.collections.SerializablePair; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.segment.BaseFloatColumnValueSelector; +import org.apache.druid.segment.BaseLongColumnValueSelector; public class FloatLastAggregator implements Aggregator { diff --git a/processing/src/main/java/io/druid/query/aggregation/last/FloatLastAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/last/FloatLastAggregatorFactory.java similarity index 87% rename from processing/src/main/java/io/druid/query/aggregation/last/FloatLastAggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/last/FloatLastAggregatorFactory.java index c87804e224d7..f9a8fba7de43 100644 --- a/processing/src/main/java/io/druid/query/aggregation/last/FloatLastAggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/last/FloatLastAggregatorFactory.java @@ -17,26 +17,26 @@ * under the License. */ -package io.druid.query.aggregation.last; +package org.apache.druid.query.aggregation.last; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.collections.SerializablePair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.UOE; -import io.druid.query.aggregation.AggregateCombiner; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.NullableAggregatorFactory; -import io.druid.query.aggregation.first.FloatFirstAggregatorFactory; -import io.druid.query.aggregation.first.LongFirstAggregatorFactory; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.column.Column; +import org.apache.druid.collections.SerializablePair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.UOE; +import org.apache.druid.query.aggregation.AggregateCombiner; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.NullableAggregatorFactory; +import org.apache.druid.query.aggregation.first.FloatFirstAggregatorFactory; +import org.apache.druid.query.aggregation.first.LongFirstAggregatorFactory; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.column.Column; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/last/FloatLastBufferAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/last/FloatLastBufferAggregator.java similarity index 87% rename from processing/src/main/java/io/druid/query/aggregation/last/FloatLastBufferAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/last/FloatLastBufferAggregator.java index 195b5c7c0828..59d8c0bc484c 100644 --- a/processing/src/main/java/io/druid/query/aggregation/last/FloatLastBufferAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/last/FloatLastBufferAggregator.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.aggregation.last; +package org.apache.druid.query.aggregation.last; -import io.druid.collections.SerializablePair; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseFloatColumnValueSelector; -import io.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.collections.SerializablePair; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseFloatColumnValueSelector; +import org.apache.druid.segment.BaseLongColumnValueSelector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/last/LongLastAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/last/LongLastAggregator.java similarity index 89% rename from processing/src/main/java/io/druid/query/aggregation/last/LongLastAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/last/LongLastAggregator.java index 6c5c0be89c19..b44371f03aaf 100644 --- a/processing/src/main/java/io/druid/query/aggregation/last/LongLastAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/last/LongLastAggregator.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation.last; +package org.apache.druid.query.aggregation.last; -import io.druid.collections.SerializablePair; -import io.druid.query.aggregation.Aggregator; -import io.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.collections.SerializablePair; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.segment.BaseLongColumnValueSelector; public class LongLastAggregator implements Aggregator { diff --git a/processing/src/main/java/io/druid/query/aggregation/last/LongLastAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/last/LongLastAggregatorFactory.java similarity index 86% rename from processing/src/main/java/io/druid/query/aggregation/last/LongLastAggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/last/LongLastAggregatorFactory.java index 5101e3ceff80..f992119dabac 100644 --- a/processing/src/main/java/io/druid/query/aggregation/last/LongLastAggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/last/LongLastAggregatorFactory.java @@ -17,26 +17,26 @@ * under the License. */ -package io.druid.query.aggregation.last; +package org.apache.druid.query.aggregation.last; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.collections.SerializablePair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.UOE; -import io.druid.query.aggregation.AggregateCombiner; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.NullableAggregatorFactory; -import io.druid.query.aggregation.first.DoubleFirstAggregatorFactory; -import io.druid.query.aggregation.first.LongFirstAggregatorFactory; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.column.Column; +import org.apache.druid.collections.SerializablePair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.UOE; +import org.apache.druid.query.aggregation.AggregateCombiner; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.NullableAggregatorFactory; +import org.apache.druid.query.aggregation.first.DoubleFirstAggregatorFactory; +import org.apache.druid.query.aggregation.first.LongFirstAggregatorFactory; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.column.Column; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/last/LongLastBufferAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/last/LongLastBufferAggregator.java similarity index 89% rename from processing/src/main/java/io/druid/query/aggregation/last/LongLastBufferAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/last/LongLastBufferAggregator.java index 521900b62f0a..490c1e4c441d 100644 --- a/processing/src/main/java/io/druid/query/aggregation/last/LongLastBufferAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/last/LongLastBufferAggregator.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.aggregation.last; +package org.apache.druid.query.aggregation.last; -import io.druid.collections.SerializablePair; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.collections.SerializablePair; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseLongColumnValueSelector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/last/StringLastAggregateCombiner.java b/processing/src/main/java/org/apache/druid/query/aggregation/last/StringLastAggregateCombiner.java similarity index 88% rename from processing/src/main/java/io/druid/query/aggregation/last/StringLastAggregateCombiner.java rename to processing/src/main/java/org/apache/druid/query/aggregation/last/StringLastAggregateCombiner.java index 6625f084e792..e6ea2ff074d4 100644 --- a/processing/src/main/java/io/druid/query/aggregation/last/StringLastAggregateCombiner.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/last/StringLastAggregateCombiner.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.aggregation.last; +package org.apache.druid.query.aggregation.last; -import io.druid.query.aggregation.ObjectAggregateCombiner; -import io.druid.segment.ColumnValueSelector; +import org.apache.druid.query.aggregation.ObjectAggregateCombiner; +import org.apache.druid.segment.ColumnValueSelector; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/query/aggregation/last/StringLastAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/last/StringLastAggregator.java similarity index 89% rename from processing/src/main/java/io/druid/query/aggregation/last/StringLastAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/last/StringLastAggregator.java index 85cd0dddb3e6..547560ace271 100644 --- a/processing/src/main/java/io/druid/query/aggregation/last/StringLastAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/last/StringLastAggregator.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.aggregation.last; +package org.apache.druid.query.aggregation.last; -import io.druid.java.util.common.ISE; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.SerializablePairLongString; -import io.druid.segment.BaseLongColumnValueSelector; -import io.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.SerializablePairLongString; +import org.apache.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.segment.BaseObjectColumnValueSelector; public class StringLastAggregator implements Aggregator { diff --git a/processing/src/main/java/io/druid/query/aggregation/last/StringLastAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/last/StringLastAggregatorFactory.java similarity index 87% rename from processing/src/main/java/io/druid/query/aggregation/last/StringLastAggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/last/StringLastAggregatorFactory.java index 25a9423be91b..d9ef34a4d605 100644 --- a/processing/src/main/java/io/druid/query/aggregation/last/StringLastAggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/last/StringLastAggregatorFactory.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.query.aggregation.last; +package org.apache.druid.query.aggregation.last; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.base.Preconditions; -import io.druid.query.aggregation.AggregateCombiner; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.NullableAggregatorFactory; -import io.druid.query.aggregation.SerializablePairLongString; -import io.druid.query.aggregation.first.StringFirstAggregatorFactory; -import io.druid.query.cache.CacheKeyBuilder; -import io.druid.segment.BaseObjectColumnValueSelector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.column.Column; +import org.apache.druid.query.aggregation.AggregateCombiner; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.NullableAggregatorFactory; +import org.apache.druid.query.aggregation.SerializablePairLongString; +import org.apache.druid.query.aggregation.first.StringFirstAggregatorFactory; +import org.apache.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.column.Column; import java.util.Arrays; import java.util.Collections; diff --git a/processing/src/main/java/io/druid/query/aggregation/last/StringLastBufferAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/last/StringLastBufferAggregator.java similarity index 90% rename from processing/src/main/java/io/druid/query/aggregation/last/StringLastBufferAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/last/StringLastBufferAggregator.java index 12c99483a61b..1d7fca5f50f0 100644 --- a/processing/src/main/java/io/druid/query/aggregation/last/StringLastBufferAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/last/StringLastBufferAggregator.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.aggregation.last; - -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.SerializablePairLongString; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseLongColumnValueSelector; -import io.druid.segment.BaseObjectColumnValueSelector; +package org.apache.druid.query.aggregation.last; + +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.SerializablePairLongString; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.segment.BaseObjectColumnValueSelector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/last/StringLastFoldingAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/last/StringLastFoldingAggregatorFactory.java similarity index 86% rename from processing/src/main/java/io/druid/query/aggregation/last/StringLastFoldingAggregatorFactory.java rename to processing/src/main/java/org/apache/druid/query/aggregation/last/StringLastFoldingAggregatorFactory.java index 73d1d8481d57..77d4ad3a94b9 100644 --- a/processing/src/main/java/io/druid/query/aggregation/last/StringLastFoldingAggregatorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/last/StringLastFoldingAggregatorFactory.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.aggregation.last; +package org.apache.druid.query.aggregation.last; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.druid.java.util.common.StringUtils; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.SerializablePairLongString; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseObjectColumnValueSelector; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.SerializablePairLongString; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.segment.ColumnSelectorFactory; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/aggregation/post/ArithmeticPostAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/post/ArithmeticPostAggregator.java similarity index 95% rename from processing/src/main/java/io/druid/query/aggregation/post/ArithmeticPostAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/post/ArithmeticPostAggregator.java index 4eabedfa05ca..2ca65470e07a 100644 --- a/processing/src/main/java/io/druid/query/aggregation/post/ArithmeticPostAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/post/ArithmeticPostAggregator.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.query.aggregation.post; +package org.apache.druid.query.aggregation.post; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.IAE; -import io.druid.query.Queries; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.query.Queries; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.cache.CacheKeyBuilder; import java.util.Comparator; import java.util.Iterator; diff --git a/processing/src/main/java/io/druid/query/aggregation/post/ConstantPostAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/post/ConstantPostAggregator.java similarity index 91% rename from processing/src/main/java/io/druid/query/aggregation/post/ConstantPostAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/post/ConstantPostAggregator.java index 1b4bf3501129..ac0c56da57b6 100644 --- a/processing/src/main/java/io/druid/query/aggregation/post/ConstantPostAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/post/ConstantPostAggregator.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.query.aggregation.post; +package org.apache.druid.query.aggregation.post; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; -import io.druid.java.util.common.guava.Comparators; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.cache.CacheKeyBuilder; import java.util.Comparator; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/aggregation/post/DoubleGreatestPostAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/post/DoubleGreatestPostAggregator.java similarity index 92% rename from processing/src/main/java/io/druid/query/aggregation/post/DoubleGreatestPostAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/post/DoubleGreatestPostAggregator.java index 32568e6d6f72..8bf77d366634 100644 --- a/processing/src/main/java/io/druid/query/aggregation/post/DoubleGreatestPostAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/post/DoubleGreatestPostAggregator.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.aggregation.post; +package org.apache.druid.query.aggregation.post; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; -import io.druid.common.config.NullHandling; -import io.druid.query.Queries; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.query.Queries; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.cache.CacheKeyBuilder; import java.util.Comparator; import java.util.Iterator; diff --git a/processing/src/main/java/io/druid/query/aggregation/post/DoubleLeastPostAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/post/DoubleLeastPostAggregator.java similarity index 92% rename from processing/src/main/java/io/druid/query/aggregation/post/DoubleLeastPostAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/post/DoubleLeastPostAggregator.java index 0617a47db162..51da6588a70c 100644 --- a/processing/src/main/java/io/druid/query/aggregation/post/DoubleLeastPostAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/post/DoubleLeastPostAggregator.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.aggregation.post; +package org.apache.druid.query.aggregation.post; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; -import io.druid.common.config.NullHandling; -import io.druid.query.Queries; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.query.Queries; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.cache.CacheKeyBuilder; import java.util.Comparator; import java.util.Iterator; diff --git a/processing/src/main/java/io/druid/query/aggregation/post/ExpressionPostAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/post/ExpressionPostAggregator.java similarity index 94% rename from processing/src/main/java/io/druid/query/aggregation/post/ExpressionPostAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/post/ExpressionPostAggregator.java index ffdc1cf1f2bd..6463f80ea1c4 100644 --- a/processing/src/main/java/io/druid/query/aggregation/post/ExpressionPostAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/post/ExpressionPostAggregator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.post; +package org.apache.druid.query.aggregation.post; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; @@ -27,13 +27,13 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; -import io.druid.java.util.common.guava.Comparators; -import io.druid.math.expr.Expr; -import io.druid.math.expr.ExprMacroTable; -import io.druid.math.expr.Parser; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.math.expr.Expr; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.math.expr.Parser; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.cache.CacheKeyBuilder; import javax.annotation.Nullable; import java.util.Comparator; diff --git a/processing/src/main/java/io/druid/query/aggregation/post/FieldAccessPostAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/post/FieldAccessPostAggregator.java similarity index 93% rename from processing/src/main/java/io/druid/query/aggregation/post/FieldAccessPostAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/post/FieldAccessPostAggregator.java index 40665ae66e88..d816bc6b24f3 100644 --- a/processing/src/main/java/io/druid/query/aggregation/post/FieldAccessPostAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/post/FieldAccessPostAggregator.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.aggregation.post; +package org.apache.druid.query.aggregation.post; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.cache.CacheKeyBuilder; import java.util.Comparator; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/aggregation/post/FinalizingFieldAccessPostAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/post/FinalizingFieldAccessPostAggregator.java similarity index 94% rename from processing/src/main/java/io/druid/query/aggregation/post/FinalizingFieldAccessPostAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/post/FinalizingFieldAccessPostAggregator.java index 975eb596980d..3cb5c3137099 100644 --- a/processing/src/main/java/io/druid/query/aggregation/post/FinalizingFieldAccessPostAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/post/FinalizingFieldAccessPostAggregator.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.aggregation.post; +package org.apache.druid.query.aggregation.post; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.Sets; -import io.druid.java.util.common.guava.Comparators; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.cache.CacheKeyBuilder; import java.util.Comparator; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/aggregation/post/JavaScriptPostAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/post/JavaScriptPostAggregator.java similarity index 95% rename from processing/src/main/java/io/druid/query/aggregation/post/JavaScriptPostAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/post/JavaScriptPostAggregator.java index b44eb989883f..9bd6dc66a450 100644 --- a/processing/src/main/java/io/druid/query/aggregation/post/JavaScriptPostAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/post/JavaScriptPostAggregator.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.aggregation.post; +package org.apache.druid.query.aggregation.post; 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 com.google.common.collect.Sets; -import io.druid.js.JavaScriptConfig; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.js.JavaScriptConfig; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.cache.CacheKeyBuilder; import org.mozilla.javascript.Context; import org.mozilla.javascript.ContextFactory; import org.mozilla.javascript.ScriptableObject; diff --git a/processing/src/main/java/io/druid/query/aggregation/post/LongGreatestPostAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/post/LongGreatestPostAggregator.java similarity index 92% rename from processing/src/main/java/io/druid/query/aggregation/post/LongGreatestPostAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/post/LongGreatestPostAggregator.java index 5f38b4e7a285..ad4af00b05ca 100644 --- a/processing/src/main/java/io/druid/query/aggregation/post/LongGreatestPostAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/post/LongGreatestPostAggregator.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.aggregation.post; +package org.apache.druid.query.aggregation.post; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; -import io.druid.common.config.NullHandling; -import io.druid.query.Queries; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.query.Queries; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.cache.CacheKeyBuilder; import java.util.Comparator; import java.util.Iterator; diff --git a/processing/src/main/java/io/druid/query/aggregation/post/LongLeastPostAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/post/LongLeastPostAggregator.java similarity index 92% rename from processing/src/main/java/io/druid/query/aggregation/post/LongLeastPostAggregator.java rename to processing/src/main/java/org/apache/druid/query/aggregation/post/LongLeastPostAggregator.java index e00df00a9374..c5fe66ce73fa 100644 --- a/processing/src/main/java/io/druid/query/aggregation/post/LongLeastPostAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/post/LongLeastPostAggregator.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.aggregation.post; +package org.apache.druid.query.aggregation.post; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; -import io.druid.common.config.NullHandling; -import io.druid.query.Queries; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.query.Queries; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.cache.CacheKeyBuilder; import java.util.Comparator; import java.util.Iterator; diff --git a/processing/src/main/java/io/druid/query/aggregation/post/PostAggregatorIds.java b/processing/src/main/java/org/apache/druid/query/aggregation/post/PostAggregatorIds.java similarity index 97% rename from processing/src/main/java/io/druid/query/aggregation/post/PostAggregatorIds.java rename to processing/src/main/java/org/apache/druid/query/aggregation/post/PostAggregatorIds.java index 69ff4f68546c..6d576a4a783d 100644 --- a/processing/src/main/java/io/druid/query/aggregation/post/PostAggregatorIds.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/post/PostAggregatorIds.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.post; +package org.apache.druid.query.aggregation.post; public class PostAggregatorIds { diff --git a/processing/src/main/java/io/druid/query/cache/CacheKeyBuilder.java b/processing/src/main/java/org/apache/druid/query/cache/CacheKeyBuilder.java similarity index 97% rename from processing/src/main/java/io/druid/query/cache/CacheKeyBuilder.java rename to processing/src/main/java/org/apache/druid/query/cache/CacheKeyBuilder.java index 2c32f488c663..97f0f14816bd 100644 --- a/processing/src/main/java/io/druid/query/cache/CacheKeyBuilder.java +++ b/processing/src/main/java/org/apache/druid/query/cache/CacheKeyBuilder.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.query.cache; +package org.apache.druid.query.cache; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.primitives.Ints; import com.google.common.primitives.UnsignedBytes; -import io.druid.guice.annotations.PublicApi; -import io.druid.java.util.common.Cacheable; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.java.util.common.Cacheable; +import org.apache.druid.java.util.common.StringUtils; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/datasourcemetadata/DataSourceMetadataQuery.java b/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceMetadataQuery.java similarity index 87% rename from processing/src/main/java/io/druid/query/datasourcemetadata/DataSourceMetadataQuery.java rename to processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceMetadataQuery.java index e1450d66b644..96662ee32edb 100644 --- a/processing/src/main/java/io/druid/query/datasourcemetadata/DataSourceMetadataQuery.java +++ b/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceMetadataQuery.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.query.datasourcemetadata; +package org.apache.druid.query.datasourcemetadata; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.Lists; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.query.BaseQuery; -import io.druid.query.DataSource; -import io.druid.query.Druids; -import io.druid.query.Query; -import io.druid.query.Result; -import io.druid.query.filter.DimFilter; -import io.druid.query.spec.MultipleIntervalSegmentSpec; -import io.druid.query.spec.QuerySegmentSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.query.BaseQuery; +import org.apache.druid.query.DataSource; +import org.apache.druid.query.Druids; +import org.apache.druid.query.Query; +import org.apache.druid.query.Result; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.query.spec.QuerySegmentSpec; import org.joda.time.DateTime; import java.util.Collections; diff --git a/processing/src/main/java/io/druid/query/datasourcemetadata/DataSourceMetadataQueryRunnerFactory.java b/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceMetadataQueryRunnerFactory.java similarity index 85% rename from processing/src/main/java/io/druid/query/datasourcemetadata/DataSourceMetadataQueryRunnerFactory.java rename to processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceMetadataQueryRunnerFactory.java index 1e3c80d50caa..ec34b1fe8eda 100644 --- a/processing/src/main/java/io/druid/query/datasourcemetadata/DataSourceMetadataQueryRunnerFactory.java +++ b/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceMetadataQueryRunnerFactory.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.query.datasourcemetadata; +package org.apache.druid.query.datasourcemetadata; import com.google.inject.Inject; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.guava.BaseSequence; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.ChainedExecutionQueryRunner; -import io.druid.query.Query; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryToolChest; -import io.druid.query.QueryWatcher; -import io.druid.query.Result; -import io.druid.segment.Segment; -import io.druid.segment.StorageAdapter; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.guava.BaseSequence; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.ChainedExecutionQueryRunner; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.QueryWatcher; +import org.apache.druid.query.Result; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.StorageAdapter; import java.util.Iterator; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/datasourcemetadata/DataSourceMetadataResultValue.java b/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceMetadataResultValue.java similarity index 97% rename from processing/src/main/java/io/druid/query/datasourcemetadata/DataSourceMetadataResultValue.java rename to processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceMetadataResultValue.java index fd8c5da74d8d..2e643d0c293a 100644 --- a/processing/src/main/java/io/druid/query/datasourcemetadata/DataSourceMetadataResultValue.java +++ b/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceMetadataResultValue.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.datasourcemetadata; +package org.apache.druid.query.datasourcemetadata; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/processing/src/main/java/io/druid/query/datasourcemetadata/DataSourceQueryQueryToolChest.java b/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceQueryQueryToolChest.java similarity index 84% rename from processing/src/main/java/io/druid/query/datasourcemetadata/DataSourceQueryQueryToolChest.java rename to processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceQueryQueryToolChest.java index 0b3de84e9362..33099fc0aab6 100644 --- a/processing/src/main/java/io/druid/query/datasourcemetadata/DataSourceQueryQueryToolChest.java +++ b/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceQueryQueryToolChest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.datasourcemetadata; +package org.apache.druid.query.datasourcemetadata; import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.base.Function; @@ -26,19 +26,19 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.inject.Inject; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.query.BySegmentSkippingQueryRunner; -import io.druid.query.CacheStrategy; -import io.druid.query.GenericQueryMetricsFactory; -import io.druid.query.Query; -import io.druid.query.QueryMetrics; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryToolChest; -import io.druid.query.Result; -import io.druid.query.aggregation.MetricManipulationFn; -import io.druid.timeline.LogicalSegment; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.query.BySegmentSkippingQueryRunner; +import org.apache.druid.query.CacheStrategy; +import org.apache.druid.query.GenericQueryMetricsFactory; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryMetrics; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.MetricManipulationFn; +import org.apache.druid.timeline.LogicalSegment; import java.util.List; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/dimension/BaseFilteredDimensionSpec.java b/processing/src/main/java/org/apache/druid/query/dimension/BaseFilteredDimensionSpec.java similarity index 92% rename from processing/src/main/java/io/druid/query/dimension/BaseFilteredDimensionSpec.java rename to processing/src/main/java/org/apache/druid/query/dimension/BaseFilteredDimensionSpec.java index 81c700fe1abb..5fae72f961e4 100644 --- a/processing/src/main/java/io/druid/query/dimension/BaseFilteredDimensionSpec.java +++ b/processing/src/main/java/org/apache/druid/query/dimension/BaseFilteredDimensionSpec.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.dimension; +package org.apache.druid.query.dimension; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.query.extraction.ExtractionFn; -import io.druid.segment.column.ValueType; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.segment.column.ValueType; /** */ diff --git a/processing/src/main/java/io/druid/query/dimension/ColumnSelectorStrategy.java b/processing/src/main/java/org/apache/druid/query/dimension/ColumnSelectorStrategy.java similarity index 95% rename from processing/src/main/java/io/druid/query/dimension/ColumnSelectorStrategy.java rename to processing/src/main/java/org/apache/druid/query/dimension/ColumnSelectorStrategy.java index 5cd4b7135e11..79ff59599ee7 100644 --- a/processing/src/main/java/io/druid/query/dimension/ColumnSelectorStrategy.java +++ b/processing/src/main/java/org/apache/druid/query/dimension/ColumnSelectorStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.dimension; +package org.apache.druid.query.dimension; /** * Base type for strategy objects that handle value type operations pertaining to a specific query type diff --git a/processing/src/main/java/io/druid/query/dimension/ColumnSelectorStrategyFactory.java b/processing/src/main/java/org/apache/druid/query/dimension/ColumnSelectorStrategyFactory.java similarity index 87% rename from processing/src/main/java/io/druid/query/dimension/ColumnSelectorStrategyFactory.java rename to processing/src/main/java/org/apache/druid/query/dimension/ColumnSelectorStrategyFactory.java index 03ed64140f3c..dc9304d26962 100644 --- a/processing/src/main/java/io/druid/query/dimension/ColumnSelectorStrategyFactory.java +++ b/processing/src/main/java/org/apache/druid/query/dimension/ColumnSelectorStrategyFactory.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.dimension; +package org.apache.druid.query.dimension; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.column.ColumnCapabilities; public interface ColumnSelectorStrategyFactory { diff --git a/processing/src/main/java/io/druid/query/dimension/DefaultDimensionSpec.java b/processing/src/main/java/org/apache/druid/query/dimension/DefaultDimensionSpec.java similarity index 94% rename from processing/src/main/java/io/druid/query/dimension/DefaultDimensionSpec.java rename to processing/src/main/java/org/apache/druid/query/dimension/DefaultDimensionSpec.java index bb3164301c8a..9f8e27ae2dff 100644 --- a/processing/src/main/java/io/druid/query/dimension/DefaultDimensionSpec.java +++ b/processing/src/main/java/org/apache/druid/query/dimension/DefaultDimensionSpec.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.dimension; +package org.apache.druid.query.dimension; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import io.druid.java.util.common.StringUtils; -import io.druid.query.extraction.ExtractionFn; -import io.druid.segment.DimensionSelector; -import io.druid.segment.column.ValueType; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.column.ValueType; import java.nio.ByteBuffer; import java.util.Arrays; diff --git a/processing/src/main/java/io/druid/query/dimension/DimensionSpec.java b/processing/src/main/java/org/apache/druid/query/dimension/DimensionSpec.java similarity index 89% rename from processing/src/main/java/io/druid/query/dimension/DimensionSpec.java rename to processing/src/main/java/org/apache/druid/query/dimension/DimensionSpec.java index d83f5360e9f8..fa12358f38f2 100644 --- a/processing/src/main/java/io/druid/query/dimension/DimensionSpec.java +++ b/processing/src/main/java/org/apache/druid/query/dimension/DimensionSpec.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.dimension; +package org.apache.druid.query.dimension; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.druid.java.util.common.Cacheable; -import io.druid.query.extraction.ExtractionFn; -import io.druid.segment.DimensionSelector; -import io.druid.segment.column.ValueType; +import org.apache.druid.java.util.common.Cacheable; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.column.ValueType; /** * Provides information about a dimension for a grouping query, like topN or groupBy. Note that this is not annotated diff --git a/processing/src/main/java/io/druid/query/dimension/ExtractionDimensionSpec.java b/processing/src/main/java/org/apache/druid/query/dimension/ExtractionDimensionSpec.java similarity index 95% rename from processing/src/main/java/io/druid/query/dimension/ExtractionDimensionSpec.java rename to processing/src/main/java/org/apache/druid/query/dimension/ExtractionDimensionSpec.java index 7c063bf817cb..6a14a9f36c54 100644 --- a/processing/src/main/java/io/druid/query/dimension/ExtractionDimensionSpec.java +++ b/processing/src/main/java/org/apache/druid/query/dimension/ExtractionDimensionSpec.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.dimension; +package org.apache.druid.query.dimension; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.java.util.common.StringUtils; -import io.druid.query.extraction.ExtractionFn; -import io.druid.segment.DimensionSelector; -import io.druid.segment.column.ValueType; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.column.ValueType; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/dimension/ForwardingFilteredDimensionSelector.java b/processing/src/main/java/org/apache/druid/query/dimension/ForwardingFilteredDimensionSelector.java similarity index 91% rename from processing/src/main/java/io/druid/query/dimension/ForwardingFilteredDimensionSelector.java rename to processing/src/main/java/org/apache/druid/query/dimension/ForwardingFilteredDimensionSelector.java index 4511f1f66ed1..38e000e7eacd 100644 --- a/processing/src/main/java/io/druid/query/dimension/ForwardingFilteredDimensionSelector.java +++ b/processing/src/main/java/org/apache/druid/query/dimension/ForwardingFilteredDimensionSelector.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.query.dimension; +package org.apache.druid.query.dimension; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.base.Predicates; -import io.druid.java.util.common.IAE; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.DimensionSelector; -import io.druid.segment.DimensionSelectorUtils; -import io.druid.segment.IdLookup; -import io.druid.segment.data.ArrayBasedIndexedInts; -import io.druid.segment.data.IndexedInts; -import io.druid.segment.filter.BooleanValueMatcher; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.DimensionSelectorUtils; +import org.apache.druid.segment.IdLookup; +import org.apache.druid.segment.data.ArrayBasedIndexedInts; +import org.apache.druid.segment.data.IndexedInts; +import org.apache.druid.segment.filter.BooleanValueMatcher; import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/query/dimension/LegacyDimensionSpec.java b/processing/src/main/java/org/apache/druid/query/dimension/LegacyDimensionSpec.java similarity index 94% rename from processing/src/main/java/io/druid/query/dimension/LegacyDimensionSpec.java rename to processing/src/main/java/org/apache/druid/query/dimension/LegacyDimensionSpec.java index 49b75489b341..8c8eec03df6a 100644 --- a/processing/src/main/java/io/druid/query/dimension/LegacyDimensionSpec.java +++ b/processing/src/main/java/org/apache/druid/query/dimension/LegacyDimensionSpec.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.dimension; +package org.apache.druid.query.dimension; import com.fasterxml.jackson.annotation.JsonCreator; -import io.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.IAE; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/dimension/ListFilteredDimensionSpec.java b/processing/src/main/java/org/apache/druid/query/dimension/ListFilteredDimensionSpec.java similarity index 95% rename from processing/src/main/java/io/druid/query/dimension/ListFilteredDimensionSpec.java rename to processing/src/main/java/org/apache/druid/query/dimension/ListFilteredDimensionSpec.java index f5c8714c26e7..cf8f6bae433d 100644 --- a/processing/src/main/java/io/druid/query/dimension/ListFilteredDimensionSpec.java +++ b/processing/src/main/java/org/apache/druid/query/dimension/ListFilteredDimensionSpec.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.dimension; +package org.apache.druid.query.dimension; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.base.Predicates; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.StringUtils; -import io.druid.query.filter.DimFilterUtils; -import io.druid.segment.DimensionSelector; -import io.druid.segment.IdLookup; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.filter.DimFilterUtils; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.IdLookup; import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/query/dimension/PredicateFilteredDimensionSelector.java b/processing/src/main/java/org/apache/druid/query/dimension/PredicateFilteredDimensionSelector.java similarity index 92% rename from processing/src/main/java/io/druid/query/dimension/PredicateFilteredDimensionSelector.java rename to processing/src/main/java/org/apache/druid/query/dimension/PredicateFilteredDimensionSelector.java index 0c8af41e0b2a..51390eefe913 100644 --- a/processing/src/main/java/io/druid/query/dimension/PredicateFilteredDimensionSelector.java +++ b/processing/src/main/java/org/apache/druid/query/dimension/PredicateFilteredDimensionSelector.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.dimension; +package org.apache.druid.query.dimension; import com.google.common.base.Predicate; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.DimensionSelector; -import io.druid.segment.IdLookup; -import io.druid.segment.data.ArrayBasedIndexedInts; -import io.druid.segment.data.IndexedInts; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.IdLookup; +import org.apache.druid.segment.data.ArrayBasedIndexedInts; +import org.apache.druid.segment.data.IndexedInts; import javax.annotation.Nullable; import java.util.Objects; diff --git a/processing/src/main/java/io/druid/query/dimension/RegexFilteredDimensionSpec.java b/processing/src/main/java/org/apache/druid/query/dimension/RegexFilteredDimensionSpec.java similarity index 94% rename from processing/src/main/java/io/druid/query/dimension/RegexFilteredDimensionSpec.java rename to processing/src/main/java/org/apache/druid/query/dimension/RegexFilteredDimensionSpec.java index 010719f4908d..12746c7b6e7e 100644 --- a/processing/src/main/java/io/druid/query/dimension/RegexFilteredDimensionSpec.java +++ b/processing/src/main/java/org/apache/druid/query/dimension/RegexFilteredDimensionSpec.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.dimension; +package org.apache.druid.query.dimension; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.StringUtils; -import io.druid.query.filter.DimFilterUtils; -import io.druid.segment.DimensionSelector; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.filter.DimFilterUtils; +import org.apache.druid.segment.DimensionSelector; import it.unimi.dsi.fastutil.ints.Int2IntMap; import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap; diff --git a/processing/src/main/java/io/druid/query/expression/ExprUtils.java b/processing/src/main/java/org/apache/druid/query/expression/ExprUtils.java similarity index 90% rename from processing/src/main/java/io/druid/query/expression/ExprUtils.java rename to processing/src/main/java/org/apache/druid/query/expression/ExprUtils.java index f79ad2856f1f..0ff6532321f0 100644 --- a/processing/src/main/java/io/druid/query/expression/ExprUtils.java +++ b/processing/src/main/java/org/apache/druid/query/expression/ExprUtils.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.expression; +package org.apache.druid.query.expression; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.granularity.PeriodGranularity; -import io.druid.math.expr.Expr; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.granularity.PeriodGranularity; +import org.apache.druid.math.expr.Expr; import org.joda.time.Chronology; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/processing/src/main/java/io/druid/query/expression/GuiceExprMacroTable.java b/processing/src/main/java/org/apache/druid/query/expression/GuiceExprMacroTable.java similarity index 92% rename from processing/src/main/java/io/druid/query/expression/GuiceExprMacroTable.java rename to processing/src/main/java/org/apache/druid/query/expression/GuiceExprMacroTable.java index 8258fe7b84dc..ce05debcf6d4 100644 --- a/processing/src/main/java/io/druid/query/expression/GuiceExprMacroTable.java +++ b/processing/src/main/java/org/apache/druid/query/expression/GuiceExprMacroTable.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.expression; +package org.apache.druid.query.expression; import com.google.common.collect.ImmutableList; -import io.druid.math.expr.ExprMacroTable; +import org.apache.druid.math.expr.ExprMacroTable; import javax.inject.Inject; import java.util.Set; diff --git a/processing/src/main/java/io/druid/query/expression/LikeExprMacro.java b/processing/src/main/java/org/apache/druid/query/expression/LikeExprMacro.java similarity index 86% rename from processing/src/main/java/io/druid/query/expression/LikeExprMacro.java rename to processing/src/main/java/org/apache/druid/query/expression/LikeExprMacro.java index f13451d6d0cf..f6329100a1f2 100644 --- a/processing/src/main/java/io/druid/query/expression/LikeExprMacro.java +++ b/processing/src/main/java/org/apache/druid/query/expression/LikeExprMacro.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.expression; +package org.apache.druid.query.expression; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.IAE; -import io.druid.math.expr.Expr; -import io.druid.math.expr.ExprEval; -import io.druid.math.expr.ExprMacroTable; -import io.druid.math.expr.ExprType; -import io.druid.query.filter.LikeDimFilter; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.math.expr.Expr; +import org.apache.druid.math.expr.ExprEval; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.math.expr.ExprType; +import org.apache.druid.query.filter.LikeDimFilter; import javax.annotation.Nonnull; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/expression/RegexpExtractExprMacro.java b/processing/src/main/java/org/apache/druid/query/expression/RegexpExtractExprMacro.java similarity index 89% rename from processing/src/main/java/io/druid/query/expression/RegexpExtractExprMacro.java rename to processing/src/main/java/org/apache/druid/query/expression/RegexpExtractExprMacro.java index 4f48b01d4738..305c03e4ed51 100644 --- a/processing/src/main/java/io/druid/query/expression/RegexpExtractExprMacro.java +++ b/processing/src/main/java/org/apache/druid/query/expression/RegexpExtractExprMacro.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.expression; +package org.apache.druid.query.expression; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.IAE; -import io.druid.math.expr.Expr; -import io.druid.math.expr.ExprEval; -import io.druid.math.expr.ExprMacroTable; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.math.expr.Expr; +import org.apache.druid.math.expr.ExprEval; +import org.apache.druid.math.expr.ExprMacroTable; import javax.annotation.Nonnull; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/expression/TimestampCeilExprMacro.java b/processing/src/main/java/org/apache/druid/query/expression/TimestampCeilExprMacro.java similarity index 88% rename from processing/src/main/java/io/druid/query/expression/TimestampCeilExprMacro.java rename to processing/src/main/java/org/apache/druid/query/expression/TimestampCeilExprMacro.java index 5ca01ffb5f22..a775c69b7969 100644 --- a/processing/src/main/java/io/druid/query/expression/TimestampCeilExprMacro.java +++ b/processing/src/main/java/org/apache/druid/query/expression/TimestampCeilExprMacro.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.expression; +package org.apache.druid.query.expression; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.granularity.PeriodGranularity; -import io.druid.math.expr.Expr; -import io.druid.math.expr.ExprEval; -import io.druid.math.expr.ExprMacroTable; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.granularity.PeriodGranularity; +import org.apache.druid.math.expr.Expr; +import org.apache.druid.math.expr.ExprEval; +import org.apache.druid.math.expr.ExprMacroTable; import javax.annotation.Nonnull; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/expression/TimestampExtractExprMacro.java b/processing/src/main/java/org/apache/druid/query/expression/TimestampExtractExprMacro.java similarity index 92% rename from processing/src/main/java/io/druid/query/expression/TimestampExtractExprMacro.java rename to processing/src/main/java/org/apache/druid/query/expression/TimestampExtractExprMacro.java index a865cc957c46..3f1f6836bdc9 100644 --- a/processing/src/main/java/io/druid/query/expression/TimestampExtractExprMacro.java +++ b/processing/src/main/java/org/apache/druid/query/expression/TimestampExtractExprMacro.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.expression; +package org.apache.druid.query.expression; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.math.expr.Expr; -import io.druid.math.expr.ExprEval; -import io.druid.math.expr.ExprMacroTable; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.math.expr.Expr; +import org.apache.druid.math.expr.ExprEval; +import org.apache.druid.math.expr.ExprMacroTable; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.chrono.ISOChronology; diff --git a/processing/src/main/java/io/druid/query/expression/TimestampFloorExprMacro.java b/processing/src/main/java/org/apache/druid/query/expression/TimestampFloorExprMacro.java similarity index 90% rename from processing/src/main/java/io/druid/query/expression/TimestampFloorExprMacro.java rename to processing/src/main/java/org/apache/druid/query/expression/TimestampFloorExprMacro.java index 54f29b99e8aa..ae0f16b2151a 100644 --- a/processing/src/main/java/io/druid/query/expression/TimestampFloorExprMacro.java +++ b/processing/src/main/java/org/apache/druid/query/expression/TimestampFloorExprMacro.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.expression; - -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.granularity.PeriodGranularity; -import io.druid.math.expr.Expr; -import io.druid.math.expr.ExprEval; -import io.druid.math.expr.ExprMacroTable; +package org.apache.druid.query.expression; + +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.granularity.PeriodGranularity; +import org.apache.druid.math.expr.Expr; +import org.apache.druid.math.expr.ExprEval; +import org.apache.druid.math.expr.ExprMacroTable; import javax.annotation.Nonnull; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/expression/TimestampFormatExprMacro.java b/processing/src/main/java/org/apache/druid/query/expression/TimestampFormatExprMacro.java similarity index 92% rename from processing/src/main/java/io/druid/query/expression/TimestampFormatExprMacro.java rename to processing/src/main/java/org/apache/druid/query/expression/TimestampFormatExprMacro.java index 3f4f80d5837c..196b61ea42c3 100644 --- a/processing/src/main/java/io/druid/query/expression/TimestampFormatExprMacro.java +++ b/processing/src/main/java/org/apache/druid/query/expression/TimestampFormatExprMacro.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.expression; +package org.apache.druid.query.expression; import com.google.common.base.Preconditions; -import io.druid.java.util.common.IAE; -import io.druid.math.expr.Expr; -import io.druid.math.expr.ExprEval; -import io.druid.math.expr.ExprMacroTable; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.math.expr.Expr; +import org.apache.druid.math.expr.ExprEval; +import org.apache.druid.math.expr.ExprMacroTable; import org.joda.time.DateTimeZone; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; diff --git a/processing/src/main/java/io/druid/query/expression/TimestampParseExprMacro.java b/processing/src/main/java/org/apache/druid/query/expression/TimestampParseExprMacro.java similarity index 93% rename from processing/src/main/java/io/druid/query/expression/TimestampParseExprMacro.java rename to processing/src/main/java/org/apache/druid/query/expression/TimestampParseExprMacro.java index 1abd850346d3..8e4ace7d089f 100644 --- a/processing/src/main/java/io/druid/query/expression/TimestampParseExprMacro.java +++ b/processing/src/main/java/org/apache/druid/query/expression/TimestampParseExprMacro.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.expression; +package org.apache.druid.query.expression; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.IAE; -import io.druid.math.expr.Expr; -import io.druid.math.expr.ExprEval; -import io.druid.math.expr.ExprMacroTable; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.math.expr.Expr; +import org.apache.druid.math.expr.ExprEval; +import org.apache.druid.math.expr.ExprMacroTable; import org.joda.time.DateTimeZone; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; diff --git a/processing/src/main/java/io/druid/query/expression/TimestampShiftExprMacro.java b/processing/src/main/java/org/apache/druid/query/expression/TimestampShiftExprMacro.java similarity index 92% rename from processing/src/main/java/io/druid/query/expression/TimestampShiftExprMacro.java rename to processing/src/main/java/org/apache/druid/query/expression/TimestampShiftExprMacro.java index 78cee6f845f5..c76803809d7b 100644 --- a/processing/src/main/java/io/druid/query/expression/TimestampShiftExprMacro.java +++ b/processing/src/main/java/org/apache/druid/query/expression/TimestampShiftExprMacro.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.expression; +package org.apache.druid.query.expression; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.granularity.PeriodGranularity; -import io.druid.math.expr.Expr; -import io.druid.math.expr.ExprEval; -import io.druid.math.expr.ExprMacroTable; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.granularity.PeriodGranularity; +import org.apache.druid.math.expr.Expr; +import org.apache.druid.math.expr.ExprEval; +import org.apache.druid.math.expr.ExprMacroTable; import org.joda.time.Chronology; import org.joda.time.Period; import org.joda.time.chrono.ISOChronology; diff --git a/processing/src/main/java/io/druid/query/expression/TrimExprMacro.java b/processing/src/main/java/org/apache/druid/query/expression/TrimExprMacro.java similarity index 96% rename from processing/src/main/java/io/druid/query/expression/TrimExprMacro.java rename to processing/src/main/java/org/apache/druid/query/expression/TrimExprMacro.java index c828c6dda36f..777cb90b07a1 100644 --- a/processing/src/main/java/io/druid/query/expression/TrimExprMacro.java +++ b/processing/src/main/java/org/apache/druid/query/expression/TrimExprMacro.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.expression; +package org.apache.druid.query.expression; -import io.druid.java.util.common.IAE; -import io.druid.math.expr.Expr; -import io.druid.math.expr.ExprEval; -import io.druid.math.expr.ExprMacroTable; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.math.expr.Expr; +import org.apache.druid.math.expr.ExprEval; +import org.apache.druid.math.expr.ExprMacroTable; import javax.annotation.Nonnull; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/extraction/BucketExtractionFn.java b/processing/src/main/java/org/apache/druid/query/extraction/BucketExtractionFn.java similarity index 97% rename from processing/src/main/java/io/druid/query/extraction/BucketExtractionFn.java rename to processing/src/main/java/org/apache/druid/query/extraction/BucketExtractionFn.java index 0822c8989b65..96180f04481c 100644 --- a/processing/src/main/java/io/druid/query/extraction/BucketExtractionFn.java +++ b/processing/src/main/java/org/apache/druid/query/extraction/BucketExtractionFn.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/extraction/CascadeExtractionFn.java b/processing/src/main/java/org/apache/druid/query/extraction/CascadeExtractionFn.java similarity index 99% rename from processing/src/main/java/io/druid/query/extraction/CascadeExtractionFn.java rename to processing/src/main/java/org/apache/druid/query/extraction/CascadeExtractionFn.java index 1331351fa53f..d03ff7596255 100644 --- a/processing/src/main/java/io/druid/query/extraction/CascadeExtractionFn.java +++ b/processing/src/main/java/org/apache/druid/query/extraction/CascadeExtractionFn.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/processing/src/main/java/io/druid/query/extraction/DimExtractionFn.java b/processing/src/main/java/org/apache/druid/query/extraction/DimExtractionFn.java similarity index 96% rename from processing/src/main/java/io/druid/query/extraction/DimExtractionFn.java rename to processing/src/main/java/org/apache/druid/query/extraction/DimExtractionFn.java index 64dee55c296d..11247f3533ff 100644 --- a/processing/src/main/java/io/druid/query/extraction/DimExtractionFn.java +++ b/processing/src/main/java/org/apache/druid/query/extraction/DimExtractionFn.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import javax.annotation.Nullable; import java.util.Objects; diff --git a/processing/src/main/java/io/druid/query/extraction/ExtractionCacheHelper.java b/processing/src/main/java/org/apache/druid/query/extraction/ExtractionCacheHelper.java similarity index 97% rename from processing/src/main/java/io/druid/query/extraction/ExtractionCacheHelper.java rename to processing/src/main/java/org/apache/druid/query/extraction/ExtractionCacheHelper.java index 621529694135..9f136540522c 100644 --- a/processing/src/main/java/io/druid/query/extraction/ExtractionCacheHelper.java +++ b/processing/src/main/java/org/apache/druid/query/extraction/ExtractionCacheHelper.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; /** * diff --git a/processing/src/main/java/io/druid/query/extraction/ExtractionFn.java b/processing/src/main/java/org/apache/druid/query/extraction/ExtractionFn.java similarity index 96% rename from processing/src/main/java/io/druid/query/extraction/ExtractionFn.java rename to processing/src/main/java/org/apache/druid/query/extraction/ExtractionFn.java index 8d9881a81f37..5122460864c8 100644 --- a/processing/src/main/java/io/druid/query/extraction/ExtractionFn.java +++ b/processing/src/main/java/org/apache/druid/query/extraction/ExtractionFn.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.druid.guice.annotations.ExtensionPoint; -import io.druid.java.util.common.Cacheable; -import io.druid.query.lookup.LookupExtractionFn; +import org.apache.druid.guice.annotations.ExtensionPoint; +import org.apache.druid.java.util.common.Cacheable; +import org.apache.druid.query.lookup.LookupExtractionFn; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/query/extraction/FunctionalExtraction.java b/processing/src/main/java/org/apache/druid/query/extraction/FunctionalExtraction.java similarity index 97% rename from processing/src/main/java/io/druid/query/extraction/FunctionalExtraction.java rename to processing/src/main/java/org/apache/druid/query/extraction/FunctionalExtraction.java index 2d4d989559a9..c01a21d109f3 100644 --- a/processing/src/main/java/io/druid/query/extraction/FunctionalExtraction.java +++ b/processing/src/main/java/org/apache/druid/query/extraction/FunctionalExtraction.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import com.google.common.base.Function; import com.google.common.base.Preconditions; -import io.druid.common.config.NullHandling; +import org.apache.druid.common.config.NullHandling; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/query/extraction/IdentityExtractionFn.java b/processing/src/main/java/org/apache/druid/query/extraction/IdentityExtractionFn.java similarity index 95% rename from processing/src/main/java/io/druid/query/extraction/IdentityExtractionFn.java rename to processing/src/main/java/org/apache/druid/query/extraction/IdentityExtractionFn.java index e139361547b8..462700f9ac41 100644 --- a/processing/src/main/java/io/druid/query/extraction/IdentityExtractionFn.java +++ b/processing/src/main/java/org/apache/druid/query/extraction/IdentityExtractionFn.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; -import io.druid.common.config.NullHandling; +import org.apache.druid.common.config.NullHandling; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/query/extraction/JavaScriptExtractionFn.java b/processing/src/main/java/org/apache/druid/query/extraction/JavaScriptExtractionFn.java similarity index 96% rename from processing/src/main/java/io/druid/query/extraction/JavaScriptExtractionFn.java rename to processing/src/main/java/org/apache/druid/query/extraction/JavaScriptExtractionFn.java index d006ead88a85..06892ecd7724 100644 --- a/processing/src/main/java/io/druid/query/extraction/JavaScriptExtractionFn.java +++ b/processing/src/main/java/org/apache/druid/query/extraction/JavaScriptExtractionFn.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Function; import com.google.common.base.Preconditions; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.StringUtils; -import io.druid.js.JavaScriptConfig; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.js.JavaScriptConfig; import org.mozilla.javascript.Context; import org.mozilla.javascript.ContextFactory; import org.mozilla.javascript.ScriptableObject; diff --git a/processing/src/main/java/io/druid/query/extraction/LowerExtractionFn.java b/processing/src/main/java/org/apache/druid/query/extraction/LowerExtractionFn.java similarity index 94% rename from processing/src/main/java/io/druid/query/extraction/LowerExtractionFn.java rename to processing/src/main/java/org/apache/druid/query/extraction/LowerExtractionFn.java index 831aff75edf8..9ccf9c3209d8 100644 --- a/processing/src/main/java/io/druid/query/extraction/LowerExtractionFn.java +++ b/processing/src/main/java/org/apache/druid/query/extraction/LowerExtractionFn.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.StringUtils; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/extraction/MapLookupExtractor.java b/processing/src/main/java/org/apache/druid/query/extraction/MapLookupExtractor.java similarity index 95% rename from processing/src/main/java/io/druid/query/extraction/MapLookupExtractor.java rename to processing/src/main/java/org/apache/druid/query/extraction/MapLookupExtractor.java index a90db2990d76..4c8dd60815bd 100644 --- a/processing/src/main/java/io/druid/query/extraction/MapLookupExtractor.java +++ b/processing/src/main/java/org/apache/druid/query/extraction/MapLookupExtractor.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -26,9 +26,9 @@ import com.google.common.base.Strings; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.StringUtils; -import io.druid.query.lookup.LookupExtractor; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.lookup.LookupExtractor; import javax.annotation.Nullable; import java.io.ByteArrayOutputStream; diff --git a/processing/src/main/java/io/druid/query/extraction/MatchingDimExtractionFn.java b/processing/src/main/java/org/apache/druid/query/extraction/MatchingDimExtractionFn.java similarity index 94% rename from processing/src/main/java/io/druid/query/extraction/MatchingDimExtractionFn.java rename to processing/src/main/java/org/apache/druid/query/extraction/MatchingDimExtractionFn.java index 82657f2670da..4c1d2c2a118b 100644 --- a/processing/src/main/java/io/druid/query/extraction/MatchingDimExtractionFn.java +++ b/processing/src/main/java/org/apache/druid/query/extraction/MatchingDimExtractionFn.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.StringUtils; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/extraction/RegexDimExtractionFn.java b/processing/src/main/java/org/apache/druid/query/extraction/RegexDimExtractionFn.java similarity index 97% rename from processing/src/main/java/io/druid/query/extraction/RegexDimExtractionFn.java rename to processing/src/main/java/org/apache/druid/query/extraction/RegexDimExtractionFn.java index 79977ffb7d67..e911340fe778 100644 --- a/processing/src/main/java/io/druid/query/extraction/RegexDimExtractionFn.java +++ b/processing/src/main/java/org/apache/druid/query/extraction/RegexDimExtractionFn.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.primitives.Ints; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.StringUtils; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/extraction/SearchQuerySpecDimExtractionFn.java b/processing/src/main/java/org/apache/druid/query/extraction/SearchQuerySpecDimExtractionFn.java similarity index 94% rename from processing/src/main/java/io/druid/query/extraction/SearchQuerySpecDimExtractionFn.java rename to processing/src/main/java/org/apache/druid/query/extraction/SearchQuerySpecDimExtractionFn.java index 4c5555d370a5..e75103b2b30e 100644 --- a/processing/src/main/java/io/druid/query/extraction/SearchQuerySpecDimExtractionFn.java +++ b/processing/src/main/java/org/apache/druid/query/extraction/SearchQuerySpecDimExtractionFn.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.common.config.NullHandling; -import io.druid.query.search.SearchQuerySpec; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.query.search.SearchQuerySpec; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/extraction/StringFormatExtractionFn.java b/processing/src/main/java/org/apache/druid/query/extraction/StringFormatExtractionFn.java similarity index 94% rename from processing/src/main/java/io/druid/query/extraction/StringFormatExtractionFn.java rename to processing/src/main/java/org/apache/druid/query/extraction/StringFormatExtractionFn.java index 1bc7ca3fdd5a..2e8bb77eed7a 100644 --- a/processing/src/main/java/io/druid/query/extraction/StringFormatExtractionFn.java +++ b/processing/src/main/java/org/apache/druid/query/extraction/StringFormatExtractionFn.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; import com.google.common.base.Preconditions; import com.google.common.base.Strings; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import javax.annotation.Nullable; import java.nio.ByteBuffer; @@ -107,7 +107,7 @@ public String apply(@Nullable String value) value = ""; } } - return io.druid.common.config.NullHandling.emptyToNullIfNeeded(StringUtils.format(format, value)); + return org.apache.druid.common.config.NullHandling.emptyToNullIfNeeded(StringUtils.format(format, value)); } @Override diff --git a/processing/src/main/java/io/druid/query/extraction/StrlenExtractionFn.java b/processing/src/main/java/org/apache/druid/query/extraction/StrlenExtractionFn.java similarity index 94% rename from processing/src/main/java/io/druid/query/extraction/StrlenExtractionFn.java rename to processing/src/main/java/org/apache/druid/query/extraction/StrlenExtractionFn.java index 063441485b0c..fb665433bc3f 100644 --- a/processing/src/main/java/io/druid/query/extraction/StrlenExtractionFn.java +++ b/processing/src/main/java/org/apache/druid/query/extraction/StrlenExtractionFn.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import com.fasterxml.jackson.annotation.JsonCreator; -import io.druid.common.config.NullHandling; +import org.apache.druid.common.config.NullHandling; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/query/extraction/SubstringDimExtractionFn.java b/processing/src/main/java/org/apache/druid/query/extraction/SubstringDimExtractionFn.java similarity index 95% rename from processing/src/main/java/io/druid/query/extraction/SubstringDimExtractionFn.java rename to processing/src/main/java/org/apache/druid/query/extraction/SubstringDimExtractionFn.java index 5813ceb705c1..f8f80b2175df 100644 --- a/processing/src/main/java/io/druid/query/extraction/SubstringDimExtractionFn.java +++ b/processing/src/main/java/org/apache/druid/query/extraction/SubstringDimExtractionFn.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.StringUtils; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/extraction/TimeDimExtractionFn.java b/processing/src/main/java/org/apache/druid/query/extraction/TimeDimExtractionFn.java similarity index 96% rename from processing/src/main/java/io/druid/query/extraction/TimeDimExtractionFn.java rename to processing/src/main/java/org/apache/druid/query/extraction/TimeDimExtractionFn.java index 3e4f2534a667..8b58a8198593 100644 --- a/processing/src/main/java/io/druid/query/extraction/TimeDimExtractionFn.java +++ b/processing/src/main/java/org/apache/druid/query/extraction/TimeDimExtractionFn.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.ibm.icu.text.SimpleDateFormat; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.StringUtils; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormat; diff --git a/processing/src/main/java/io/druid/query/extraction/TimeFormatExtractionFn.java b/processing/src/main/java/org/apache/druid/query/extraction/TimeFormatExtractionFn.java similarity index 94% rename from processing/src/main/java/io/druid/query/extraction/TimeFormatExtractionFn.java rename to processing/src/main/java/org/apache/druid/query/extraction/TimeFormatExtractionFn.java index 03fa5788842b..42e99b76aba1 100644 --- a/processing/src/main/java/io/druid/query/extraction/TimeFormatExtractionFn.java +++ b/processing/src/main/java/org/apache/druid/query/extraction/TimeFormatExtractionFn.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.common.guava.GuavaUtils; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; +import org.apache.druid.common.guava.GuavaUtils; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.chrono.ISOChronology; diff --git a/processing/src/main/java/io/druid/query/extraction/UpperExtractionFn.java b/processing/src/main/java/org/apache/druid/query/extraction/UpperExtractionFn.java similarity index 94% rename from processing/src/main/java/io/druid/query/extraction/UpperExtractionFn.java rename to processing/src/main/java/org/apache/druid/query/extraction/UpperExtractionFn.java index 5814a44bb627..c92c876abf06 100644 --- a/processing/src/main/java/io/druid/query/extraction/UpperExtractionFn.java +++ b/processing/src/main/java/org/apache/druid/query/extraction/UpperExtractionFn.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.StringUtils; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/filter/AndDimFilter.java b/processing/src/main/java/org/apache/druid/query/filter/AndDimFilter.java similarity index 94% rename from processing/src/main/java/io/druid/query/filter/AndDimFilter.java rename to processing/src/main/java/org/apache/druid/query/filter/AndDimFilter.java index dcd215715acd..8161241457a1 100644 --- a/processing/src/main/java/io/druid/query/filter/AndDimFilter.java +++ b/processing/src/main/java/org/apache/druid/query/filter/AndDimFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -26,9 +26,9 @@ import com.google.common.collect.RangeSet; import com.google.common.collect.Sets; import com.google.common.collect.TreeRangeSet; -import io.druid.java.util.common.StringUtils; -import io.druid.segment.filter.AndFilter; -import io.druid.segment.filter.Filters; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.segment.filter.AndFilter; +import org.apache.druid.segment.filter.Filters; import java.util.Arrays; import java.util.HashSet; diff --git a/processing/src/main/java/io/druid/query/filter/BitmapIndexSelector.java b/processing/src/main/java/org/apache/druid/query/filter/BitmapIndexSelector.java similarity index 79% rename from processing/src/main/java/io/druid/query/filter/BitmapIndexSelector.java rename to processing/src/main/java/org/apache/druid/query/filter/BitmapIndexSelector.java index 80215823aeab..a89a24f575d9 100644 --- a/processing/src/main/java/io/druid/query/filter/BitmapIndexSelector.java +++ b/processing/src/main/java/org/apache/druid/query/filter/BitmapIndexSelector.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.collections.spatial.ImmutableRTree; -import io.druid.segment.column.BitmapIndex; -import io.druid.segment.data.Indexed; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.collections.spatial.ImmutableRTree; +import org.apache.druid.segment.column.BitmapIndex; +import org.apache.druid.segment.data.Indexed; /** */ diff --git a/processing/src/main/java/io/druid/query/filter/BooleanFilter.java b/processing/src/main/java/org/apache/druid/query/filter/BooleanFilter.java similarity index 95% rename from processing/src/main/java/io/druid/query/filter/BooleanFilter.java rename to processing/src/main/java/org/apache/druid/query/filter/BooleanFilter.java index 61af4b2a46c7..a919487c1fbf 100644 --- a/processing/src/main/java/io/druid/query/filter/BooleanFilter.java +++ b/processing/src/main/java/org/apache/druid/query/filter/BooleanFilter.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnSelectorFactory; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/filter/BoundDimFilter.java b/processing/src/main/java/org/apache/druid/query/filter/BoundDimFilter.java similarity index 98% rename from processing/src/main/java/io/druid/query/filter/BoundDimFilter.java rename to processing/src/main/java/org/apache/druid/query/filter/BoundDimFilter.java index 3c5c10c6cd3f..38ff78a46bdd 100644 --- a/processing/src/main/java/io/druid/query/filter/BoundDimFilter.java +++ b/processing/src/main/java/org/apache/druid/query/filter/BoundDimFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -30,12 +30,12 @@ import com.google.common.collect.TreeRangeSet; import com.google.common.primitives.Doubles; import com.google.common.primitives.Floats; -import io.druid.common.guava.GuavaUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.ordering.StringComparator; -import io.druid.query.ordering.StringComparators; -import io.druid.segment.filter.BoundFilter; +import org.apache.druid.common.guava.GuavaUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.ordering.StringComparator; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.segment.filter.BoundFilter; import javax.annotation.Nullable; import java.math.BigDecimal; diff --git a/processing/src/main/java/io/druid/query/filter/ColumnComparisonDimFilter.java b/processing/src/main/java/org/apache/druid/query/filter/ColumnComparisonDimFilter.java similarity index 93% rename from processing/src/main/java/io/druid/query/filter/ColumnComparisonDimFilter.java rename to processing/src/main/java/org/apache/druid/query/filter/ColumnComparisonDimFilter.java index a2e16f0de4c3..1d7cb502210f 100644 --- a/processing/src/main/java/io/druid/query/filter/ColumnComparisonDimFilter.java +++ b/processing/src/main/java/org/apache/druid/query/filter/ColumnComparisonDimFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -25,9 +25,9 @@ import com.google.common.base.Preconditions; import com.google.common.collect.RangeSet; import com.google.common.collect.Sets; -import io.druid.query.cache.CacheKeyBuilder; -import io.druid.query.dimension.DimensionSpec; -import io.druid.segment.filter.ColumnComparisonFilter; +import org.apache.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.segment.filter.ColumnComparisonFilter; import java.util.HashSet; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/filter/DimFilter.java b/processing/src/main/java/org/apache/druid/query/filter/DimFilter.java similarity index 97% rename from processing/src/main/java/io/druid/query/filter/DimFilter.java rename to processing/src/main/java/org/apache/druid/query/filter/DimFilter.java index bc2a1fc7ad2d..81a4c5a41cac 100644 --- a/processing/src/main/java/io/druid/query/filter/DimFilter.java +++ b/processing/src/main/java/org/apache/druid/query/filter/DimFilter.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.google.common.collect.RangeSet; -import io.druid.java.util.common.Cacheable; +import org.apache.druid.java.util.common.Cacheable; import java.util.HashSet; diff --git a/processing/src/main/java/io/druid/query/filter/DimFilterUtils.java b/processing/src/main/java/org/apache/druid/query/filter/DimFilterUtils.java similarity index 98% rename from processing/src/main/java/io/druid/query/filter/DimFilterUtils.java rename to processing/src/main/java/org/apache/druid/query/filter/DimFilterUtils.java index 108e1d1466db..5a0f776f0c14 100644 --- a/processing/src/main/java/io/druid/query/filter/DimFilterUtils.java +++ b/processing/src/main/java/org/apache/druid/query/filter/DimFilterUtils.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.collect.Maps; import com.google.common.collect.RangeSet; import com.google.common.collect.Sets; -import io.druid.timeline.partition.ShardSpec; +import org.apache.druid.timeline.partition.ShardSpec; import java.nio.ByteBuffer; import java.util.HashMap; diff --git a/processing/src/main/java/io/druid/query/filter/DimFilters.java b/processing/src/main/java/org/apache/druid/query/filter/DimFilters.java similarity index 98% rename from processing/src/main/java/io/druid/query/filter/DimFilters.java rename to processing/src/main/java/org/apache/druid/query/filter/DimFilters.java index cf7756407d33..a20dd7cd429e 100644 --- a/processing/src/main/java/io/druid/query/filter/DimFilters.java +++ b/processing/src/main/java/org/apache/druid/query/filter/DimFilters.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.google.common.base.Function; import com.google.common.base.Predicates; diff --git a/processing/src/main/java/io/druid/query/filter/DoubleValueMatcherColumnSelectorStrategy.java b/processing/src/main/java/org/apache/druid/query/filter/DoubleValueMatcherColumnSelectorStrategy.java similarity index 91% rename from processing/src/main/java/io/druid/query/filter/DoubleValueMatcherColumnSelectorStrategy.java rename to processing/src/main/java/org/apache/druid/query/filter/DoubleValueMatcherColumnSelectorStrategy.java index c1be4c573155..6abf253ffeb3 100644 --- a/processing/src/main/java/io/druid/query/filter/DoubleValueMatcherColumnSelectorStrategy.java +++ b/processing/src/main/java/org/apache/druid/query/filter/DoubleValueMatcherColumnSelectorStrategy.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseDoubleColumnValueSelector; -import io.druid.segment.DimensionHandlerUtils; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseDoubleColumnValueSelector; +import org.apache.druid.segment.DimensionHandlerUtils; public class DoubleValueMatcherColumnSelectorStrategy diff --git a/processing/src/main/java/io/druid/query/filter/DruidDoublePredicate.java b/processing/src/main/java/org/apache/druid/query/filter/DruidDoublePredicate.java similarity index 89% rename from processing/src/main/java/io/druid/query/filter/DruidDoublePredicate.java rename to processing/src/main/java/org/apache/druid/query/filter/DruidDoublePredicate.java index 4c6a0f69208d..c31bc5fd161b 100644 --- a/processing/src/main/java/io/druid/query/filter/DruidDoublePredicate.java +++ b/processing/src/main/java/org/apache/druid/query/filter/DruidDoublePredicate.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; /** - * Note: this is not a {@link io.druid.guice.annotations.PublicApi} or an - * {@link io.druid.guice.annotations.ExtensionPoint} of Druid. + * Note: this is not a {@link org.apache.druid.guice.annotations.PublicApi} or an + * {@link org.apache.druid.guice.annotations.ExtensionPoint} of Druid. */ // All implementations are currently lambda expressions and intellij inspections wrongly complains about unused // variable. SupressWarnings can be removed once https://youtrack.jetbrains.com/issue/IDEA-191743 is resolved. diff --git a/processing/src/main/java/io/druid/query/filter/DruidFloatPredicate.java b/processing/src/main/java/org/apache/druid/query/filter/DruidFloatPredicate.java similarity index 88% rename from processing/src/main/java/io/druid/query/filter/DruidFloatPredicate.java rename to processing/src/main/java/org/apache/druid/query/filter/DruidFloatPredicate.java index ead810410e6e..f805d2b0d29f 100644 --- a/processing/src/main/java/io/druid/query/filter/DruidFloatPredicate.java +++ b/processing/src/main/java/org/apache/druid/query/filter/DruidFloatPredicate.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; /** - * Note: this is not a {@link io.druid.guice.annotations.PublicApi} or an - * {@link io.druid.guice.annotations.ExtensionPoint} of Druid. + * Note: this is not a {@link org.apache.druid.guice.annotations.PublicApi} or an + * {@link org.apache.druid.guice.annotations.ExtensionPoint} of Druid. */ // All implementations are currently lambda expressions and intellij inspections wrongly complains about unused // variable. SupressWarnings can be removed once https://youtrack.jetbrains.com/issue/IDEA-191743 is resolved. diff --git a/processing/src/main/java/io/druid/query/filter/DruidLongPredicate.java b/processing/src/main/java/org/apache/druid/query/filter/DruidLongPredicate.java similarity index 87% rename from processing/src/main/java/io/druid/query/filter/DruidLongPredicate.java rename to processing/src/main/java/org/apache/druid/query/filter/DruidLongPredicate.java index 60817cf42e50..3056295da561 100644 --- a/processing/src/main/java/io/druid/query/filter/DruidLongPredicate.java +++ b/processing/src/main/java/org/apache/druid/query/filter/DruidLongPredicate.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; /** - * Note: this is not a {@link io.druid.guice.annotations.PublicApi} or an - * {@link io.druid.guice.annotations.ExtensionPoint} of Druid. + * Note: this is not a {@link org.apache.druid.guice.annotations.PublicApi} or an + * {@link org.apache.druid.guice.annotations.ExtensionPoint} of Druid. */ public interface DruidLongPredicate { diff --git a/processing/src/main/java/io/druid/query/filter/DruidPredicateFactory.java b/processing/src/main/java/org/apache/druid/query/filter/DruidPredicateFactory.java similarity index 96% rename from processing/src/main/java/io/druid/query/filter/DruidPredicateFactory.java rename to processing/src/main/java/org/apache/druid/query/filter/DruidPredicateFactory.java index 5aaacf77101c..eade09a79fa9 100644 --- a/processing/src/main/java/io/druid/query/filter/DruidPredicateFactory.java +++ b/processing/src/main/java/org/apache/druid/query/filter/DruidPredicateFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.google.common.base.Predicate; diff --git a/processing/src/main/java/io/druid/query/filter/ExpressionDimFilter.java b/processing/src/main/java/org/apache/druid/query/filter/ExpressionDimFilter.java similarity index 90% rename from processing/src/main/java/io/druid/query/filter/ExpressionDimFilter.java rename to processing/src/main/java/org/apache/druid/query/filter/ExpressionDimFilter.java index f17f2c728b37..75061ca8a9be 100644 --- a/processing/src/main/java/io/druid/query/filter/ExpressionDimFilter.java +++ b/processing/src/main/java/org/apache/druid/query/filter/ExpressionDimFilter.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.RangeSet; import com.google.common.collect.Sets; -import io.druid.math.expr.Expr; -import io.druid.math.expr.ExprMacroTable; -import io.druid.math.expr.Parser; -import io.druid.query.cache.CacheKeyBuilder; -import io.druid.segment.filter.ExpressionFilter; +import org.apache.druid.math.expr.Expr; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.math.expr.Parser; +import org.apache.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.segment.filter.ExpressionFilter; import java.util.HashSet; import java.util.Objects; diff --git a/processing/src/main/java/io/druid/query/filter/ExtractionDimFilter.java b/processing/src/main/java/org/apache/druid/query/filter/ExtractionDimFilter.java similarity index 96% rename from processing/src/main/java/io/druid/query/filter/ExtractionDimFilter.java rename to processing/src/main/java/org/apache/druid/query/filter/ExtractionDimFilter.java index 25de7cf44973..4387ce50f393 100644 --- a/processing/src/main/java/io/druid/query/filter/ExtractionDimFilter.java +++ b/processing/src/main/java/org/apache/druid/query/filter/ExtractionDimFilter.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.RangeSet; import com.google.common.collect.Sets; -import io.druid.java.util.common.StringUtils; -import io.druid.query.extraction.ExtractionFn; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.extraction.ExtractionFn; import java.nio.ByteBuffer; import java.util.HashSet; diff --git a/processing/src/main/java/io/druid/query/filter/Filter.java b/processing/src/main/java/org/apache/druid/query/filter/Filter.java similarity index 91% rename from processing/src/main/java/io/druid/query/filter/Filter.java rename to processing/src/main/java/org/apache/druid/query/filter/Filter.java index ffeebfa87705..a8b7c7f627dd 100644 --- a/processing/src/main/java/io/druid/query/filter/Filter.java +++ b/processing/src/main/java/org/apache/druid/query/filter/Filter.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.query.BitmapResultFactory; -import io.druid.query.DefaultBitmapResultFactory; -import io.druid.segment.ColumnSelector; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.query.BitmapResultFactory; +import org.apache.druid.query.DefaultBitmapResultFactory; +import org.apache.druid.segment.ColumnSelector; +import org.apache.druid.segment.ColumnSelectorFactory; public interface Filter { @@ -60,7 +60,7 @@ default ImmutableBitmap getBitmapIndex(BitmapIndexSelector selector) /** * Estimate selectivity of this filter. - * This method can be used for cost-based query planning like in {@link io.druid.query.search.AutoStrategy}. + * This method can be used for cost-based query planning like in {@link org.apache.druid.query.search.AutoStrategy}. * To avoid significant performance degradation for calculating the exact cost, * implementation of this method targets to achieve rapid selectivity estimation * with reasonable sacrifice of the accuracy. diff --git a/processing/src/main/java/io/druid/query/filter/FloatValueMatcherColumnSelectorStrategy.java b/processing/src/main/java/org/apache/druid/query/filter/FloatValueMatcherColumnSelectorStrategy.java similarity index 91% rename from processing/src/main/java/io/druid/query/filter/FloatValueMatcherColumnSelectorStrategy.java rename to processing/src/main/java/org/apache/druid/query/filter/FloatValueMatcherColumnSelectorStrategy.java index c84be7b57387..602f6b92d19c 100644 --- a/processing/src/main/java/io/druid/query/filter/FloatValueMatcherColumnSelectorStrategy.java +++ b/processing/src/main/java/org/apache/druid/query/filter/FloatValueMatcherColumnSelectorStrategy.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseFloatColumnValueSelector; -import io.druid.segment.DimensionHandlerUtils; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseFloatColumnValueSelector; +import org.apache.druid.segment.DimensionHandlerUtils; public class FloatValueMatcherColumnSelectorStrategy implements ValueMatcherColumnSelectorStrategy diff --git a/processing/src/main/java/io/druid/query/filter/InDimFilter.java b/processing/src/main/java/org/apache/druid/query/filter/InDimFilter.java similarity index 96% rename from processing/src/main/java/io/druid/query/filter/InDimFilter.java rename to processing/src/main/java/org/apache/druid/query/filter/InDimFilter.java index aeba75db2947..7f63acf99868 100644 --- a/processing/src/main/java/io/druid/query/filter/InDimFilter.java +++ b/processing/src/main/java/org/apache/druid/query/filter/InDimFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -31,15 +31,15 @@ import com.google.common.collect.TreeRangeSet; import com.google.common.primitives.Doubles; import com.google.common.primitives.Floats; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.guava.Comparators; -import io.druid.query.cache.CacheKeyBuilder; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.lookup.LookupExtractionFn; -import io.druid.query.lookup.LookupExtractor; -import io.druid.segment.DimensionHandlerUtils; -import io.druid.segment.filter.InFilter; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.lookup.LookupExtractionFn; +import org.apache.druid.query.lookup.LookupExtractor; +import org.apache.druid.segment.DimensionHandlerUtils; +import org.apache.druid.segment.filter.InFilter; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntOpenHashSet; import it.unimi.dsi.fastutil.longs.LongArrayList; diff --git a/processing/src/main/java/io/druid/query/filter/IntervalDimFilter.java b/processing/src/main/java/org/apache/druid/query/filter/IntervalDimFilter.java similarity index 94% rename from processing/src/main/java/io/druid/query/filter/IntervalDimFilter.java rename to processing/src/main/java/org/apache/druid/query/filter/IntervalDimFilter.java index 0cbdf580b96a..c2d8511ba1f2 100644 --- a/processing/src/main/java/io/druid/query/filter/IntervalDimFilter.java +++ b/processing/src/main/java/org/apache/druid/query/filter/IntervalDimFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -25,11 +25,11 @@ import com.google.common.collect.RangeSet; import com.google.common.collect.Sets; import com.google.common.primitives.Longs; -import io.druid.java.util.common.JodaUtils; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.ordering.StringComparators; +import org.apache.druid.java.util.common.JodaUtils; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.ordering.StringComparators; import org.joda.time.Interval; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/filter/JavaScriptDimFilter.java b/processing/src/main/java/org/apache/druid/query/filter/JavaScriptDimFilter.java similarity index 96% rename from processing/src/main/java/io/druid/query/filter/JavaScriptDimFilter.java rename to processing/src/main/java/org/apache/druid/query/filter/JavaScriptDimFilter.java index 42259958aeb7..0569aa481d6c 100644 --- a/processing/src/main/java/io/druid/query/filter/JavaScriptDimFilter.java +++ b/processing/src/main/java/org/apache/druid/query/filter/JavaScriptDimFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; @@ -26,10 +26,10 @@ import com.google.common.base.Predicate; import com.google.common.collect.RangeSet; import com.google.common.collect.Sets; -import io.druid.java.util.common.StringUtils; -import io.druid.js.JavaScriptConfig; -import io.druid.query.extraction.ExtractionFn; -import io.druid.segment.filter.JavaScriptFilter; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.js.JavaScriptConfig; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.segment.filter.JavaScriptFilter; import org.mozilla.javascript.Context; import org.mozilla.javascript.Function; import org.mozilla.javascript.ScriptableObject; diff --git a/processing/src/main/java/io/druid/query/filter/LikeDimFilter.java b/processing/src/main/java/org/apache/druid/query/filter/LikeDimFilter.java similarity index 97% rename from processing/src/main/java/io/druid/query/filter/LikeDimFilter.java rename to processing/src/main/java/org/apache/druid/query/filter/LikeDimFilter.java index 430e6f665a79..500223906689 100644 --- a/processing/src/main/java/io/druid/query/filter/LikeDimFilter.java +++ b/processing/src/main/java/org/apache/druid/query/filter/LikeDimFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -27,11 +27,11 @@ import com.google.common.collect.Sets; import com.google.common.io.BaseEncoding; import com.google.common.primitives.Chars; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.StringUtils; -import io.druid.query.extraction.ExtractionFn; -import io.druid.segment.data.Indexed; -import io.druid.segment.filter.LikeFilter; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.segment.data.Indexed; +import org.apache.druid.segment.filter.LikeFilter; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/filter/LongValueMatcherColumnSelectorStrategy.java b/processing/src/main/java/org/apache/druid/query/filter/LongValueMatcherColumnSelectorStrategy.java similarity index 91% rename from processing/src/main/java/io/druid/query/filter/LongValueMatcherColumnSelectorStrategy.java rename to processing/src/main/java/org/apache/druid/query/filter/LongValueMatcherColumnSelectorStrategy.java index 70fe9d3a1c7f..255fd79db44e 100644 --- a/processing/src/main/java/io/druid/query/filter/LongValueMatcherColumnSelectorStrategy.java +++ b/processing/src/main/java/org/apache/druid/query/filter/LongValueMatcherColumnSelectorStrategy.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseLongColumnValueSelector; -import io.druid.segment.DimensionHandlerUtils; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.segment.DimensionHandlerUtils; public class LongValueMatcherColumnSelectorStrategy implements ValueMatcherColumnSelectorStrategy diff --git a/processing/src/main/java/io/druid/query/filter/NotDimFilter.java b/processing/src/main/java/org/apache/druid/query/filter/NotDimFilter.java similarity index 97% rename from processing/src/main/java/io/druid/query/filter/NotDimFilter.java rename to processing/src/main/java/org/apache/druid/query/filter/NotDimFilter.java index 0b3436801d6a..23f968074c7b 100644 --- a/processing/src/main/java/io/druid/query/filter/NotDimFilter.java +++ b/processing/src/main/java/org/apache/druid/query/filter/NotDimFilter.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.RangeSet; -import io.druid.segment.filter.NotFilter; +import org.apache.druid.segment.filter.NotFilter; import java.nio.ByteBuffer; import java.util.HashSet; diff --git a/processing/src/main/java/io/druid/query/filter/OrDimFilter.java b/processing/src/main/java/org/apache/druid/query/filter/OrDimFilter.java similarity index 95% rename from processing/src/main/java/io/druid/query/filter/OrDimFilter.java rename to processing/src/main/java/org/apache/druid/query/filter/OrDimFilter.java index 7972628cb7b1..337c9e7e35d5 100644 --- a/processing/src/main/java/io/druid/query/filter/OrDimFilter.java +++ b/processing/src/main/java/org/apache/druid/query/filter/OrDimFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -26,9 +26,9 @@ import com.google.common.collect.RangeSet; import com.google.common.collect.Sets; import com.google.common.collect.TreeRangeSet; -import io.druid.java.util.common.StringUtils; -import io.druid.segment.filter.Filters; -import io.druid.segment.filter.OrFilter; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.segment.filter.Filters; +import org.apache.druid.segment.filter.OrFilter; import java.util.ArrayList; import java.util.Arrays; diff --git a/processing/src/main/java/io/druid/query/filter/RegexDimFilter.java b/processing/src/main/java/org/apache/druid/query/filter/RegexDimFilter.java similarity index 95% rename from processing/src/main/java/io/druid/query/filter/RegexDimFilter.java rename to processing/src/main/java/org/apache/druid/query/filter/RegexDimFilter.java index 1e95062fe55c..adb52ba614bc 100644 --- a/processing/src/main/java/io/druid/query/filter/RegexDimFilter.java +++ b/processing/src/main/java/org/apache/druid/query/filter/RegexDimFilter.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.RangeSet; import com.google.common.collect.Sets; -import io.druid.java.util.common.StringUtils; -import io.druid.query.extraction.ExtractionFn; -import io.druid.segment.filter.RegexFilter; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.segment.filter.RegexFilter; import java.nio.ByteBuffer; import java.util.HashSet; diff --git a/processing/src/main/java/io/druid/query/filter/RowOffsetMatcherFactory.java b/processing/src/main/java/org/apache/druid/query/filter/RowOffsetMatcherFactory.java similarity index 90% rename from processing/src/main/java/io/druid/query/filter/RowOffsetMatcherFactory.java rename to processing/src/main/java/org/apache/druid/query/filter/RowOffsetMatcherFactory.java index d519b6ab730c..1e2f5a4f26be 100644 --- a/processing/src/main/java/io/druid/query/filter/RowOffsetMatcherFactory.java +++ b/processing/src/main/java/org/apache/druid/query/filter/RowOffsetMatcherFactory.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; -import io.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.collections.bitmap.ImmutableBitmap; /** */ diff --git a/processing/src/main/java/io/druid/query/filter/SearchQueryDimFilter.java b/processing/src/main/java/org/apache/druid/query/filter/SearchQueryDimFilter.java similarity index 93% rename from processing/src/main/java/io/druid/query/filter/SearchQueryDimFilter.java rename to processing/src/main/java/org/apache/druid/query/filter/SearchQueryDimFilter.java index cebf2f083741..67d78b6f87fc 100644 --- a/processing/src/main/java/io/druid/query/filter/SearchQueryDimFilter.java +++ b/processing/src/main/java/org/apache/druid/query/filter/SearchQueryDimFilter.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.RangeSet; import com.google.common.collect.Sets; -import io.druid.java.util.common.StringUtils; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.search.SearchQuerySpec; -import io.druid.segment.filter.SearchQueryFilter; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.search.SearchQuerySpec; +import org.apache.druid.segment.filter.SearchQueryFilter; import java.nio.ByteBuffer; import java.util.HashSet; diff --git a/processing/src/main/java/io/druid/query/filter/SelectorDimFilter.java b/processing/src/main/java/org/apache/druid/query/filter/SelectorDimFilter.java similarity index 94% rename from processing/src/main/java/io/druid/query/filter/SelectorDimFilter.java rename to processing/src/main/java/org/apache/druid/query/filter/SelectorDimFilter.java index 5a71ecc4cd94..2c71ccc89608 100644 --- a/processing/src/main/java/io/druid/query/filter/SelectorDimFilter.java +++ b/processing/src/main/java/org/apache/druid/query/filter/SelectorDimFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -30,13 +30,13 @@ import com.google.common.collect.TreeRangeSet; import com.google.common.primitives.Doubles; import com.google.common.primitives.Floats; -import io.druid.common.config.NullHandling; -import io.druid.common.guava.GuavaUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.query.cache.CacheKeyBuilder; -import io.druid.query.extraction.ExtractionFn; -import io.druid.segment.filter.DimensionPredicateFilter; -import io.druid.segment.filter.SelectorFilter; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.common.guava.GuavaUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.segment.filter.DimensionPredicateFilter; +import org.apache.druid.segment.filter.SelectorFilter; import javax.annotation.Nullable; import java.util.Collections; diff --git a/processing/src/main/java/io/druid/query/filter/SpatialDimFilter.java b/processing/src/main/java/org/apache/druid/query/filter/SpatialDimFilter.java similarity index 94% rename from processing/src/main/java/io/druid/query/filter/SpatialDimFilter.java rename to processing/src/main/java/org/apache/druid/query/filter/SpatialDimFilter.java index 313734fa09e2..1cd2c4624ac8 100644 --- a/processing/src/main/java/io/druid/query/filter/SpatialDimFilter.java +++ b/processing/src/main/java/org/apache/druid/query/filter/SpatialDimFilter.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.RangeSet; import com.google.common.collect.Sets; -import io.druid.collections.spatial.search.Bound; -import io.druid.java.util.common.StringUtils; -import io.druid.segment.filter.SpatialFilter; +import org.apache.druid.collections.spatial.search.Bound; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.segment.filter.SpatialFilter; import java.nio.ByteBuffer; import java.util.HashSet; diff --git a/processing/src/main/java/io/druid/query/filter/StringValueMatcherColumnSelectorStrategy.java b/processing/src/main/java/org/apache/druid/query/filter/StringValueMatcherColumnSelectorStrategy.java similarity index 92% rename from processing/src/main/java/io/druid/query/filter/StringValueMatcherColumnSelectorStrategy.java rename to processing/src/main/java/org/apache/druid/query/filter/StringValueMatcherColumnSelectorStrategy.java index a30303ad8b8c..e50927534784 100644 --- a/processing/src/main/java/io/druid/query/filter/StringValueMatcherColumnSelectorStrategy.java +++ b/processing/src/main/java/org/apache/druid/query/filter/StringValueMatcherColumnSelectorStrategy.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.google.common.base.Predicate; -import io.druid.segment.DimensionSelector; -import io.druid.segment.data.IndexedInts; -import io.druid.segment.filter.BooleanValueMatcher; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.data.IndexedInts; +import org.apache.druid.segment.filter.BooleanValueMatcher; public class StringValueMatcherColumnSelectorStrategy implements ValueMatcherColumnSelectorStrategy { diff --git a/processing/src/main/java/io/druid/query/filter/TrueDimFilter.java b/processing/src/main/java/org/apache/druid/query/filter/TrueDimFilter.java similarity index 94% rename from processing/src/main/java/io/druid/query/filter/TrueDimFilter.java rename to processing/src/main/java/org/apache/druid/query/filter/TrueDimFilter.java index 7d21eec6e5db..405bece232bd 100644 --- a/processing/src/main/java/io/druid/query/filter/TrueDimFilter.java +++ b/processing/src/main/java/org/apache/druid/query/filter/TrueDimFilter.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.google.common.collect.RangeSet; -import io.druid.segment.filter.TrueFilter; +import org.apache.druid.segment.filter.TrueFilter; import java.nio.ByteBuffer; import java.util.HashSet; diff --git a/processing/src/main/java/io/druid/query/filter/ValueGetter.java b/processing/src/main/java/org/apache/druid/query/filter/ValueGetter.java similarity index 96% rename from processing/src/main/java/io/druid/query/filter/ValueGetter.java rename to processing/src/main/java/org/apache/druid/query/filter/ValueGetter.java index ce4529c0d3d0..ceb5d3653882 100644 --- a/processing/src/main/java/io/druid/query/filter/ValueGetter.java +++ b/processing/src/main/java/org/apache/druid/query/filter/ValueGetter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/query/filter/ValueMatcher.java b/processing/src/main/java/org/apache/druid/query/filter/ValueMatcher.java similarity index 80% rename from processing/src/main/java/io/druid/query/filter/ValueMatcher.java rename to processing/src/main/java/org/apache/druid/query/filter/ValueMatcher.java index ae01dd352a3a..be36c4d760b1 100644 --- a/processing/src/main/java/io/druid/query/filter/ValueMatcher.java +++ b/processing/src/main/java/org/apache/druid/query/filter/ValueMatcher.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; -import io.druid.query.monomorphicprocessing.CalledFromHotLoop; -import io.druid.query.monomorphicprocessing.HotLoopCallee; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseNullableColumnValueSelector; +import org.apache.druid.query.monomorphicprocessing.CalledFromHotLoop; +import org.apache.druid.query.monomorphicprocessing.HotLoopCallee; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseNullableColumnValueSelector; /** */ diff --git a/processing/src/main/java/io/druid/query/filter/ValueMatcherColumnSelectorStrategy.java b/processing/src/main/java/org/apache/druid/query/filter/ValueMatcherColumnSelectorStrategy.java similarity index 94% rename from processing/src/main/java/io/druid/query/filter/ValueMatcherColumnSelectorStrategy.java rename to processing/src/main/java/org/apache/druid/query/filter/ValueMatcherColumnSelectorStrategy.java index b1d5b23bfcf9..53d053ee7463 100644 --- a/processing/src/main/java/io/druid/query/filter/ValueMatcherColumnSelectorStrategy.java +++ b/processing/src/main/java/org/apache/druid/query/filter/ValueMatcherColumnSelectorStrategy.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; -import io.druid.query.dimension.ColumnSelectorStrategy; +import org.apache.druid.query.dimension.ColumnSelectorStrategy; public interface ValueMatcherColumnSelectorStrategy extends ColumnSelectorStrategy { diff --git a/processing/src/main/java/io/druid/query/filter/ValueMatcherColumnSelectorStrategyFactory.java b/processing/src/main/java/org/apache/druid/query/filter/ValueMatcherColumnSelectorStrategyFactory.java similarity index 85% rename from processing/src/main/java/io/druid/query/filter/ValueMatcherColumnSelectorStrategyFactory.java rename to processing/src/main/java/org/apache/druid/query/filter/ValueMatcherColumnSelectorStrategyFactory.java index 04d4557c5dd6..d6bb13d3669c 100644 --- a/processing/src/main/java/io/druid/query/filter/ValueMatcherColumnSelectorStrategyFactory.java +++ b/processing/src/main/java/org/apache/druid/query/filter/ValueMatcherColumnSelectorStrategyFactory.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; -import io.druid.java.util.common.IAE; -import io.druid.query.dimension.ColumnSelectorStrategyFactory; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.column.ValueType; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.query.dimension.ColumnSelectorStrategyFactory; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.column.ValueType; public class ValueMatcherColumnSelectorStrategyFactory implements ColumnSelectorStrategyFactory diff --git a/processing/src/main/java/io/druid/query/groupby/DefaultGroupByQueryMetrics.java b/processing/src/main/java/org/apache/druid/query/groupby/DefaultGroupByQueryMetrics.java similarity index 93% rename from processing/src/main/java/io/druid/query/groupby/DefaultGroupByQueryMetrics.java rename to processing/src/main/java/org/apache/druid/query/groupby/DefaultGroupByQueryMetrics.java index 9c9ca109e22b..e1cd7de50821 100644 --- a/processing/src/main/java/io/druid/query/groupby/DefaultGroupByQueryMetrics.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/DefaultGroupByQueryMetrics.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.groupby; +package org.apache.druid.query.groupby; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.query.DefaultQueryMetrics; -import io.druid.query.DruidMetrics; +import org.apache.druid.query.DefaultQueryMetrics; +import org.apache.druid.query.DruidMetrics; public class DefaultGroupByQueryMetrics extends DefaultQueryMetrics implements GroupByQueryMetrics { diff --git a/processing/src/main/java/io/druid/query/groupby/DefaultGroupByQueryMetricsFactory.java b/processing/src/main/java/org/apache/druid/query/groupby/DefaultGroupByQueryMetricsFactory.java similarity index 81% rename from processing/src/main/java/io/druid/query/groupby/DefaultGroupByQueryMetricsFactory.java rename to processing/src/main/java/org/apache/druid/query/groupby/DefaultGroupByQueryMetricsFactory.java index bb9e726b0809..f8de6c4a8793 100644 --- a/processing/src/main/java/io/druid/query/groupby/DefaultGroupByQueryMetricsFactory.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/DefaultGroupByQueryMetricsFactory.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.groupby; +package org.apache.druid.query.groupby; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; import com.google.inject.Inject; -import io.druid.guice.LazySingleton; -import io.druid.guice.annotations.Json; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.jackson.DefaultObjectMapper; @LazySingleton public class DefaultGroupByQueryMetricsFactory implements GroupByQueryMetricsFactory @@ -34,8 +34,8 @@ public class DefaultGroupByQueryMetricsFactory implements GroupByQueryMetricsFac /** * Should be used only in tests, directly or indirectly (via {@link - * GroupByQueryQueryToolChest#GroupByQueryQueryToolChest(io.druid.query.groupby.strategy.GroupByStrategySelector, - * io.druid.query.IntervalChunkingQueryRunnerDecorator)}). + * GroupByQueryQueryToolChest#GroupByQueryQueryToolChest(org.apache.druid.query.groupby.strategy.GroupByStrategySelector, + * org.apache.druid.query.IntervalChunkingQueryRunnerDecorator)}). */ @VisibleForTesting public static GroupByQueryMetricsFactory instance() diff --git a/processing/src/main/java/io/druid/query/groupby/GroupByQuery.java b/processing/src/main/java/org/apache/druid/query/groupby/GroupByQuery.java similarity index 94% rename from processing/src/main/java/io/druid/query/groupby/GroupByQuery.java rename to processing/src/main/java/org/apache/druid/query/groupby/GroupByQuery.java index 7aa7adbd55d0..bedd6f2ef649 100644 --- a/processing/src/main/java/io/druid/query/groupby/GroupByQuery.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/GroupByQuery.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.groupby; +package org.apache.druid.query.groupby; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -31,39 +31,39 @@ import com.google.common.collect.Ordering; import com.google.common.collect.Sets; import com.google.common.primitives.Longs; -import io.druid.data.input.Row; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.Comparators; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.query.BaseQuery; -import io.druid.query.DataSource; -import io.druid.query.Queries; -import io.druid.query.Query; -import io.druid.query.QueryDataSource; -import io.druid.query.TableDataSource; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.filter.DimFilter; -import io.druid.query.groupby.having.HavingSpec; -import io.druid.query.groupby.orderby.DefaultLimitSpec; -import io.druid.query.groupby.orderby.LimitSpec; -import io.druid.query.groupby.orderby.NoopLimitSpec; -import io.druid.query.groupby.orderby.OrderByColumnSpec; -import io.druid.query.ordering.StringComparator; -import io.druid.query.ordering.StringComparators; -import io.druid.query.spec.LegacySegmentSpec; -import io.druid.query.spec.QuerySegmentSpec; -import io.druid.segment.DimensionHandlerUtils; -import io.druid.segment.VirtualColumn; -import io.druid.segment.VirtualColumns; -import io.druid.segment.column.Column; -import io.druid.segment.column.ValueType; +import org.apache.druid.data.input.Row; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.query.BaseQuery; +import org.apache.druid.query.DataSource; +import org.apache.druid.query.Queries; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryDataSource; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.groupby.having.HavingSpec; +import org.apache.druid.query.groupby.orderby.DefaultLimitSpec; +import org.apache.druid.query.groupby.orderby.LimitSpec; +import org.apache.druid.query.groupby.orderby.NoopLimitSpec; +import org.apache.druid.query.groupby.orderby.OrderByColumnSpec; +import org.apache.druid.query.ordering.StringComparator; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.query.spec.LegacySegmentSpec; +import org.apache.druid.query.spec.QuerySegmentSpec; +import org.apache.druid.segment.DimensionHandlerUtils; +import org.apache.druid.segment.VirtualColumn; +import org.apache.druid.segment.VirtualColumns; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ValueType; import org.joda.time.Interval; import javax.annotation.Nullable; @@ -203,7 +203,7 @@ private GroupByQuery( // Verify no duplicate names between dimensions, aggregators, and postAggregators. // They will all end up in the same namespace in the returned Rows and we can't have them clobbering each other. - // We're not counting __time, even though that name is problematic. See: https://github.com/druid-io/druid/pull/3684 + // We're not counting __time, even though that name is problematic. See: https://github.com/apache/incubator-druid/pull/3684 verifyOutputNames(this.dimensions, this.aggregatorSpecs, this.postAggregatorSpecs); this.postProcessingFn = postProcessingFn != null ? postProcessingFn : makePostProcessingFn(); diff --git a/processing/src/main/java/io/druid/query/groupby/GroupByQueryConfig.java b/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryConfig.java similarity index 98% rename from processing/src/main/java/io/druid/query/groupby/GroupByQueryConfig.java rename to processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryConfig.java index e298f73853f2..2a653d920a0a 100644 --- a/processing/src/main/java/io/druid/query/groupby/GroupByQueryConfig.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryConfig.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.groupby; +package org.apache.druid.query.groupby; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.query.groupby.strategy.GroupByStrategySelector; +import org.apache.druid.query.groupby.strategy.GroupByStrategySelector; /** */ diff --git a/processing/src/main/java/io/druid/query/groupby/GroupByQueryEngine.java b/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryEngine.java similarity index 91% rename from processing/src/main/java/io/druid/query/groupby/GroupByQueryEngine.java rename to processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryEngine.java index be47b5eb6c9f..4d9e34fffb8b 100644 --- a/processing/src/main/java/io/druid/query/groupby/GroupByQueryEngine.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryEngine.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.groupby; +package org.apache.druid.query.groupby; import com.google.common.base.Function; import com.google.common.base.Supplier; @@ -25,30 +25,30 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.inject.Inject; -import io.druid.collections.NonBlockingPool; -import io.druid.collections.ResourceHolder; -import io.druid.data.input.MapBasedRow; -import io.druid.data.input.Row; -import io.druid.guice.annotations.Global; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.guava.BaseSequence; -import io.druid.java.util.common.guava.CloseQuietly; -import io.druid.java.util.common.guava.FunctionalIterator; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.common.parsers.CloseableIterator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.filter.Filter; -import io.druid.segment.Cursor; -import io.druid.segment.DimensionSelector; -import io.druid.segment.StorageAdapter; -import io.druid.segment.column.ValueType; -import io.druid.segment.data.IndexedInts; -import io.druid.segment.filter.Filters; +import org.apache.druid.collections.NonBlockingPool; +import org.apache.druid.collections.ResourceHolder; +import org.apache.druid.data.input.MapBasedRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.guice.annotations.Global; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.guava.BaseSequence; +import org.apache.druid.java.util.common.guava.CloseQuietly; +import org.apache.druid.java.util.common.guava.FunctionalIterator; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.parsers.CloseableIterator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.segment.Cursor; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.StorageAdapter; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.data.IndexedInts; +import org.apache.druid.segment.filter.Filters; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/processing/src/main/java/io/druid/query/groupby/GroupByQueryHelper.java b/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryHelper.java similarity index 85% rename from processing/src/main/java/io/druid/query/groupby/GroupByQueryHelper.java rename to processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryHelper.java index 9bcf61e76389..4a7c50c863c8 100644 --- a/processing/src/main/java/io/druid/query/groupby/GroupByQueryHelper.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryHelper.java @@ -17,34 +17,34 @@ * under the License. */ -package io.druid.query.groupby; +package org.apache.druid.query.groupby; import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import io.druid.collections.NonBlockingPool; -import io.druid.common.guava.GuavaUtils; -import io.druid.data.input.MapBasedInputRow; -import io.druid.data.input.MapBasedRow; -import io.druid.data.input.Row; -import io.druid.data.input.impl.DimensionSchema; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.StringDimensionSchema; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.Accumulator; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.query.ResourceLimitExceededException; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.dimension.DimensionSpec; -import io.druid.segment.column.ValueType; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexSchema; -import io.druid.segment.incremental.IndexSizeExceededException; +import org.apache.druid.collections.NonBlockingPool; +import org.apache.druid.common.guava.GuavaUtils; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.data.input.MapBasedRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.data.input.impl.DimensionSchema; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.StringDimensionSchema; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.Accumulator; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.query.ResourceLimitExceededException; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.segment.incremental.IndexSizeExceededException; import org.joda.time.DateTime; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/groupby/GroupByQueryMetrics.java b/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryMetrics.java similarity index 90% rename from processing/src/main/java/io/druid/query/groupby/GroupByQueryMetrics.java rename to processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryMetrics.java index 811bd944e7b1..292828fc9858 100644 --- a/processing/src/main/java/io/druid/query/groupby/GroupByQueryMetrics.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryMetrics.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.groupby; +package org.apache.druid.query.groupby; -import io.druid.guice.annotations.ExtensionPoint; -import io.druid.guice.annotations.PublicApi; -import io.druid.query.QueryMetrics; +import org.apache.druid.guice.annotations.ExtensionPoint; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.query.QueryMetrics; /** * Specialization of {@link QueryMetrics} for {@link GroupByQuery}. diff --git a/processing/src/main/java/io/druid/query/groupby/GroupByQueryMetricsFactory.java b/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryMetricsFactory.java similarity index 96% rename from processing/src/main/java/io/druid/query/groupby/GroupByQueryMetricsFactory.java rename to processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryMetricsFactory.java index 9eb8ba9f8a46..a25ea75dff1d 100644 --- a/processing/src/main/java/io/druid/query/groupby/GroupByQueryMetricsFactory.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryMetricsFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.groupby; +package org.apache.druid.query.groupby; /** * Implementations could be injected using diff --git a/processing/src/main/java/io/druid/query/groupby/GroupByQueryQueryToolChest.java b/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryQueryToolChest.java similarity index 92% rename from processing/src/main/java/io/druid/query/groupby/GroupByQueryQueryToolChest.java rename to processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryQueryToolChest.java index 80d59e28d522..44977454286d 100644 --- a/processing/src/main/java/io/druid/query/groupby/GroupByQueryQueryToolChest.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryQueryToolChest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.groupby; +package org.apache.druid.query.groupby; import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.annotations.VisibleForTesting; @@ -31,34 +31,34 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.inject.Inject; -import io.druid.data.input.MapBasedRow; -import io.druid.data.input.Row; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.MappedSequence; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.query.CacheStrategy; -import io.druid.query.DataSource; -import io.druid.query.IntervalChunkingQueryRunnerDecorator; -import io.druid.query.QueryContexts; -import io.druid.query.QueryDataSource; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryToolChest; -import io.druid.query.SubqueryQueryRunner; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.MetricManipulationFn; -import io.druid.query.aggregation.MetricManipulatorFns; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.cache.CacheKeyBuilder; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.groupby.resource.GroupByQueryResource; -import io.druid.query.groupby.strategy.GroupByStrategy; -import io.druid.query.groupby.strategy.GroupByStrategySelector; -import io.druid.segment.DimensionHandlerUtils; +import org.apache.druid.data.input.MapBasedRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.MappedSequence; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.query.CacheStrategy; +import org.apache.druid.query.DataSource; +import org.apache.druid.query.IntervalChunkingQueryRunnerDecorator; +import org.apache.druid.query.QueryContexts; +import org.apache.druid.query.QueryDataSource; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.SubqueryQueryRunner; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.MetricManipulationFn; +import org.apache.druid.query.aggregation.MetricManipulatorFns; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.groupby.resource.GroupByQueryResource; +import org.apache.druid.query.groupby.strategy.GroupByStrategy; +import org.apache.druid.query.groupby.strategy.GroupByStrategySelector; +import org.apache.druid.segment.DimensionHandlerUtils; import org.joda.time.DateTime; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/query/groupby/GroupByQueryRunnerFactory.java b/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryRunnerFactory.java similarity index 85% rename from processing/src/main/java/io/druid/query/groupby/GroupByQueryRunnerFactory.java rename to processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryRunnerFactory.java index dee637ed8ad1..53d581f9e7b6 100644 --- a/processing/src/main/java/io/druid/query/groupby/GroupByQueryRunnerFactory.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryRunnerFactory.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.query.groupby; +package org.apache.druid.query.groupby; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.inject.Inject; -import io.druid.data.input.Row; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.Query; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryToolChest; -import io.druid.query.groupby.strategy.GroupByStrategySelector; -import io.druid.segment.Segment; -import io.druid.segment.StorageAdapter; +import org.apache.druid.data.input.Row; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.groupby.strategy.GroupByStrategySelector; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.StorageAdapter; import java.util.Map; import java.util.concurrent.ExecutorService; diff --git a/processing/src/main/java/io/druid/query/groupby/RowBasedColumnSelectorFactory.java b/processing/src/main/java/org/apache/druid/query/groupby/RowBasedColumnSelectorFactory.java similarity index 92% rename from processing/src/main/java/io/druid/query/groupby/RowBasedColumnSelectorFactory.java rename to processing/src/main/java/org/apache/druid/query/groupby/RowBasedColumnSelectorFactory.java index 2074bad109e3..925df54bda2a 100644 --- a/processing/src/main/java/io/druid/query/groupby/RowBasedColumnSelectorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/RowBasedColumnSelectorFactory.java @@ -17,30 +17,30 @@ * under the License. */ -package io.druid.query.groupby; +package org.apache.druid.query.groupby; import com.google.common.base.Predicate; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableMap; -import io.druid.common.config.NullHandling; -import io.druid.data.input.Row; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.DimensionHandlerUtils; -import io.druid.segment.DimensionSelector; -import io.druid.segment.IdLookup; -import io.druid.segment.LongColumnSelector; -import io.druid.segment.column.Column; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.column.ColumnCapabilitiesImpl; -import io.druid.segment.column.ValueType; -import io.druid.segment.data.IndexedInts; -import io.druid.segment.data.RangeIndexedInts; -import io.druid.segment.data.ZeroIndexedInts; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.data.input.Row; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.DimensionHandlerUtils; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.IdLookup; +import org.apache.druid.segment.LongColumnSelector; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.column.ColumnCapabilitiesImpl; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.data.IndexedInts; +import org.apache.druid.segment.data.RangeIndexedInts; +import org.apache.druid.segment.data.ZeroIndexedInts; import javax.annotation.Nullable; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/groupby/epinephelinae/AbstractBufferHashGrouper.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/AbstractBufferHashGrouper.java similarity index 95% rename from processing/src/main/java/io/druid/query/groupby/epinephelinae/AbstractBufferHashGrouper.java rename to processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/AbstractBufferHashGrouper.java index d073d3f6febc..8ca48ebb949a 100644 --- a/processing/src/main/java/io/druid/query/groupby/epinephelinae/AbstractBufferHashGrouper.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/AbstractBufferHashGrouper.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.groupby.epinephelinae; +package org.apache.druid.query.groupby.epinephelinae; import com.google.common.base.Supplier; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.BufferAggregator; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.BufferAggregator; import java.nio.ByteBuffer; @@ -45,7 +45,7 @@ public abstract class AbstractBufferHashGrouper implements Grouper { diff --git a/processing/src/main/java/io/druid/query/groupby/epinephelinae/column/GroupByColumnSelectorStrategy.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/column/GroupByColumnSelectorStrategy.java similarity index 93% rename from processing/src/main/java/io/druid/query/groupby/epinephelinae/column/GroupByColumnSelectorStrategy.java rename to processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/column/GroupByColumnSelectorStrategy.java index bb4586a6e2b2..10172bc9361f 100644 --- a/processing/src/main/java/io/druid/query/groupby/epinephelinae/column/GroupByColumnSelectorStrategy.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/column/GroupByColumnSelectorStrategy.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.groupby.epinephelinae.column; +package org.apache.druid.query.groupby.epinephelinae.column; -import io.druid.query.dimension.ColumnSelectorStrategy; -import io.druid.segment.ColumnValueSelector; +import org.apache.druid.query.dimension.ColumnSelectorStrategy; +import org.apache.druid.segment.ColumnValueSelector; import java.nio.ByteBuffer; import java.util.Map; @@ -78,9 +78,9 @@ void processValueFromGroupingKey( void initColumnValues(ColumnValueSelector selector, int columnIndex, Object[] valuess); /** - * Read the first value within a row values object (e. g. {@link io.druid.segment.data.IndexedInts}, as the value in + * Read the first value within a row values object (e. g. {@link org.apache.druid.segment.data.IndexedInts}, as the value in * a dictionary-encoded string column) and write that value to the keyBuffer at keyBufferPosition. If the row size is - * 0 (e. g. {@link io.druid.segment.data.IndexedInts#size}), write {@link #GROUP_BY_MISSING_VALUE} instead. + * 0 (e. g. {@link org.apache.druid.segment.data.IndexedInts#size}), write {@link #GROUP_BY_MISSING_VALUE} instead. * * If the size of the row is > 0, write 1 to stack[] at columnIndex, otherwise write 0. * diff --git a/processing/src/main/java/io/druid/query/groupby/epinephelinae/column/LongGroupByColumnSelectorStrategy.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/column/LongGroupByColumnSelectorStrategy.java similarity index 93% rename from processing/src/main/java/io/druid/query/groupby/epinephelinae/column/LongGroupByColumnSelectorStrategy.java rename to processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/column/LongGroupByColumnSelectorStrategy.java index a8c2bb46bd81..c62608648b4b 100644 --- a/processing/src/main/java/io/druid/query/groupby/epinephelinae/column/LongGroupByColumnSelectorStrategy.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/column/LongGroupByColumnSelectorStrategy.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.groupby.epinephelinae.column; +package org.apache.druid.query.groupby.epinephelinae.column; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.DimensionHandlerUtils; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.DimensionHandlerUtils; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/groupby/epinephelinae/column/NullableValueGroupByColumnSelectorStrategy.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/column/NullableValueGroupByColumnSelectorStrategy.java similarity index 95% rename from processing/src/main/java/io/druid/query/groupby/epinephelinae/column/NullableValueGroupByColumnSelectorStrategy.java rename to processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/column/NullableValueGroupByColumnSelectorStrategy.java index 842da6c4d73b..827c8249f6cb 100644 --- a/processing/src/main/java/io/druid/query/groupby/epinephelinae/column/NullableValueGroupByColumnSelectorStrategy.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/column/NullableValueGroupByColumnSelectorStrategy.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.groupby.epinephelinae.column; +package org.apache.druid.query.groupby.epinephelinae.column; -import io.druid.common.config.NullHandling; -import io.druid.segment.ColumnValueSelector; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.segment.ColumnValueSelector; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/groupby/epinephelinae/column/StringGroupByColumnSelectorStrategy.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/column/StringGroupByColumnSelectorStrategy.java similarity index 93% rename from processing/src/main/java/io/druid/query/groupby/epinephelinae/column/StringGroupByColumnSelectorStrategy.java rename to processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/column/StringGroupByColumnSelectorStrategy.java index 478ec9173f61..e7a1f8e903b5 100644 --- a/processing/src/main/java/io/druid/query/groupby/epinephelinae/column/StringGroupByColumnSelectorStrategy.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/column/StringGroupByColumnSelectorStrategy.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.groupby.epinephelinae.column; +package org.apache.druid.query.groupby.epinephelinae.column; import com.google.common.base.Preconditions; -import io.druid.common.config.NullHandling; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.DimensionSelector; -import io.druid.segment.data.IndexedInts; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.data.IndexedInts; import java.nio.ByteBuffer; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/groupby/having/AlwaysHavingSpec.java b/processing/src/main/java/org/apache/druid/query/groupby/having/AlwaysHavingSpec.java similarity index 91% rename from processing/src/main/java/io/druid/query/groupby/having/AlwaysHavingSpec.java rename to processing/src/main/java/org/apache/druid/query/groupby/having/AlwaysHavingSpec.java index 6a4089eb869c..1ac4f3140a30 100644 --- a/processing/src/main/java/io/druid/query/groupby/having/AlwaysHavingSpec.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/having/AlwaysHavingSpec.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.groupby.having; +package org.apache.druid.query.groupby.having; -import io.druid.data.input.Row; +import org.apache.druid.data.input.Row; /** * A "having" spec that always evaluates to true diff --git a/processing/src/main/java/io/druid/query/groupby/having/AndHavingSpec.java b/processing/src/main/java/org/apache/druid/query/groupby/having/AndHavingSpec.java similarity index 93% rename from processing/src/main/java/io/druid/query/groupby/having/AndHavingSpec.java rename to processing/src/main/java/org/apache/druid/query/groupby/having/AndHavingSpec.java index e86d034bc334..55ca3ee31a17 100644 --- a/processing/src/main/java/io/druid/query/groupby/having/AndHavingSpec.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/having/AndHavingSpec.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.groupby.having; +package org.apache.druid.query.groupby.having; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; -import io.druid.data.input.Row; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.segment.column.ValueType; +import org.apache.druid.data.input.Row; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.segment.column.ValueType; import java.util.List; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/groupby/having/BaseHavingSpec.java b/processing/src/main/java/org/apache/druid/query/groupby/having/BaseHavingSpec.java similarity index 87% rename from processing/src/main/java/io/druid/query/groupby/having/BaseHavingSpec.java rename to processing/src/main/java/org/apache/druid/query/groupby/having/BaseHavingSpec.java index f8654cd15acf..e4db0cbdb781 100644 --- a/processing/src/main/java/io/druid/query/groupby/having/BaseHavingSpec.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/having/BaseHavingSpec.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.groupby.having; +package org.apache.druid.query.groupby.having; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.segment.column.ValueType; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.segment.column.ValueType; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/groupby/having/DimFilterHavingSpec.java b/processing/src/main/java/org/apache/druid/query/groupby/having/DimFilterHavingSpec.java similarity index 91% rename from processing/src/main/java/io/druid/query/groupby/having/DimFilterHavingSpec.java rename to processing/src/main/java/org/apache/druid/query/groupby/having/DimFilterHavingSpec.java index 5cec07fc0c52..00155bab39ba 100644 --- a/processing/src/main/java/io/druid/query/groupby/having/DimFilterHavingSpec.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/having/DimFilterHavingSpec.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.query.groupby.having; +package org.apache.druid.query.groupby.having; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.data.input.InputRow; -import io.druid.data.input.Row; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.filter.DimFilter; -import io.druid.segment.column.ValueType; -import io.druid.segment.transform.RowFunction; -import io.druid.segment.transform.Transform; -import io.druid.segment.transform.TransformSpec; -import io.druid.segment.transform.Transformer; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.transform.RowFunction; +import org.apache.druid.segment.transform.Transform; +import org.apache.druid.segment.transform.TransformSpec; +import org.apache.druid.segment.transform.Transformer; import org.joda.time.DateTime; import java.util.ArrayList; diff --git a/processing/src/main/java/io/druid/query/groupby/having/DimensionSelectorHavingSpec.java b/processing/src/main/java/org/apache/druid/query/groupby/having/DimensionSelectorHavingSpec.java similarity index 94% rename from processing/src/main/java/io/druid/query/groupby/having/DimensionSelectorHavingSpec.java rename to processing/src/main/java/org/apache/druid/query/groupby/having/DimensionSelectorHavingSpec.java index 8e35dfd261d4..90041167693a 100644 --- a/processing/src/main/java/io/druid/query/groupby/having/DimensionSelectorHavingSpec.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/having/DimensionSelectorHavingSpec.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.groupby.having; +package org.apache.druid.query.groupby.having; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.base.Strings; -import io.druid.data.input.Row; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.extraction.IdentityExtractionFn; +import org.apache.druid.data.input.Row; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.extraction.IdentityExtractionFn; import java.util.List; import java.util.Objects; diff --git a/processing/src/main/java/io/druid/query/groupby/having/EqualToHavingSpec.java b/processing/src/main/java/org/apache/druid/query/groupby/having/EqualToHavingSpec.java similarity index 95% rename from processing/src/main/java/io/druid/query/groupby/having/EqualToHavingSpec.java rename to processing/src/main/java/org/apache/druid/query/groupby/having/EqualToHavingSpec.java index 7c4efef9218a..ac8d64e99a10 100644 --- a/processing/src/main/java/io/druid/query/groupby/having/EqualToHavingSpec.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/having/EqualToHavingSpec.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.groupby.having; +package org.apache.druid.query.groupby.having; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.data.input.Row; -import io.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.data.input.Row; +import org.apache.druid.query.aggregation.AggregatorFactory; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/groupby/having/GreaterThanHavingSpec.java b/processing/src/main/java/org/apache/druid/query/groupby/having/GreaterThanHavingSpec.java similarity index 95% rename from processing/src/main/java/io/druid/query/groupby/having/GreaterThanHavingSpec.java rename to processing/src/main/java/org/apache/druid/query/groupby/having/GreaterThanHavingSpec.java index f48e3e90aed2..842dbcde69a5 100644 --- a/processing/src/main/java/io/druid/query/groupby/having/GreaterThanHavingSpec.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/having/GreaterThanHavingSpec.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.groupby.having; +package org.apache.druid.query.groupby.having; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.data.input.Row; -import io.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.data.input.Row; +import org.apache.druid.query.aggregation.AggregatorFactory; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/groupby/having/HavingSpec.java b/processing/src/main/java/org/apache/druid/query/groupby/having/HavingSpec.java similarity index 93% rename from processing/src/main/java/io/druid/query/groupby/having/HavingSpec.java rename to processing/src/main/java/org/apache/druid/query/groupby/having/HavingSpec.java index d8f597110f3b..19ad071365f3 100644 --- a/processing/src/main/java/io/druid/query/groupby/having/HavingSpec.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/having/HavingSpec.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.groupby.having; +package org.apache.druid.query.groupby.having; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.druid.data.input.Row; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.segment.column.ValueType; +import org.apache.druid.data.input.Row; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.segment.column.ValueType; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/groupby/having/HavingSpecMetricComparator.java b/processing/src/main/java/org/apache/druid/query/groupby/having/HavingSpecMetricComparator.java similarity index 95% rename from processing/src/main/java/io/druid/query/groupby/having/HavingSpecMetricComparator.java rename to processing/src/main/java/org/apache/druid/query/groupby/having/HavingSpecMetricComparator.java index a156e4ecc502..02bd9fd9a17d 100644 --- a/processing/src/main/java/io/druid/query/groupby/having/HavingSpecMetricComparator.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/having/HavingSpecMetricComparator.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.groupby.having; +package org.apache.druid.query.groupby.having; import com.google.common.primitives.Doubles; import com.google.common.primitives.Longs; -import io.druid.java.util.common.ISE; -import io.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.query.aggregation.AggregatorFactory; import java.math.BigDecimal; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/groupby/having/LessThanHavingSpec.java b/processing/src/main/java/org/apache/druid/query/groupby/having/LessThanHavingSpec.java similarity index 95% rename from processing/src/main/java/io/druid/query/groupby/having/LessThanHavingSpec.java rename to processing/src/main/java/org/apache/druid/query/groupby/having/LessThanHavingSpec.java index 5a9ce0c9c364..99917cb245d9 100644 --- a/processing/src/main/java/io/druid/query/groupby/having/LessThanHavingSpec.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/having/LessThanHavingSpec.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.groupby.having; +package org.apache.druid.query.groupby.having; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.data.input.Row; -import io.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.data.input.Row; +import org.apache.druid.query.aggregation.AggregatorFactory; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/groupby/having/NeverHavingSpec.java b/processing/src/main/java/org/apache/druid/query/groupby/having/NeverHavingSpec.java similarity index 91% rename from processing/src/main/java/io/druid/query/groupby/having/NeverHavingSpec.java rename to processing/src/main/java/org/apache/druid/query/groupby/having/NeverHavingSpec.java index c36eb6a42ebf..55ab48b505fe 100644 --- a/processing/src/main/java/io/druid/query/groupby/having/NeverHavingSpec.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/having/NeverHavingSpec.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.groupby.having; +package org.apache.druid.query.groupby.having; -import io.druid.data.input.Row; +import org.apache.druid.data.input.Row; /** * A "having" spec that always evaluates to false diff --git a/processing/src/main/java/io/druid/query/groupby/having/NotHavingSpec.java b/processing/src/main/java/org/apache/druid/query/groupby/having/NotHavingSpec.java similarity index 92% rename from processing/src/main/java/io/druid/query/groupby/having/NotHavingSpec.java rename to processing/src/main/java/org/apache/druid/query/groupby/having/NotHavingSpec.java index 50a81a4c3f83..315d05932ea8 100644 --- a/processing/src/main/java/io/druid/query/groupby/having/NotHavingSpec.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/having/NotHavingSpec.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.groupby.having; +package org.apache.druid.query.groupby.having; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.data.input.Row; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.segment.column.ValueType; +import org.apache.druid.data.input.Row; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.segment.column.ValueType; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/groupby/having/OrHavingSpec.java b/processing/src/main/java/org/apache/druid/query/groupby/having/OrHavingSpec.java similarity index 93% rename from processing/src/main/java/io/druid/query/groupby/having/OrHavingSpec.java rename to processing/src/main/java/org/apache/druid/query/groupby/having/OrHavingSpec.java index 3ef24a945a00..7425b9024764 100644 --- a/processing/src/main/java/io/druid/query/groupby/having/OrHavingSpec.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/having/OrHavingSpec.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.groupby.having; +package org.apache.druid.query.groupby.having; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; -import io.druid.data.input.Row; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.segment.column.ValueType; +import org.apache.druid.data.input.Row; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.segment.column.ValueType; import java.util.List; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/groupby/orderby/DefaultLimitSpec.java b/processing/src/main/java/org/apache/druid/query/groupby/orderby/DefaultLimitSpec.java similarity index 93% rename from processing/src/main/java/io/druid/query/groupby/orderby/DefaultLimitSpec.java rename to processing/src/main/java/org/apache/druid/query/groupby/orderby/DefaultLimitSpec.java index ab114b88b0db..b74f93eadd27 100644 --- a/processing/src/main/java/io/druid/query/groupby/orderby/DefaultLimitSpec.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/orderby/DefaultLimitSpec.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.groupby.orderby; +package org.apache.druid.query.groupby.orderby; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -30,19 +30,19 @@ import com.google.common.collect.Sets; import com.google.common.primitives.Ints; import com.google.common.primitives.Longs; -import io.druid.common.config.NullHandling; -import io.druid.data.input.Row; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.ordering.StringComparator; -import io.druid.query.ordering.StringComparators; -import io.druid.segment.column.ValueType; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.data.input.Row; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.ordering.StringComparator; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.segment.column.ValueType; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/groupby/orderby/LimitSpec.java b/processing/src/main/java/org/apache/druid/query/groupby/orderby/LimitSpec.java similarity index 82% rename from processing/src/main/java/io/druid/query/groupby/orderby/LimitSpec.java rename to processing/src/main/java/org/apache/druid/query/groupby/orderby/LimitSpec.java index db587a41f79a..d7243359e3a8 100644 --- a/processing/src/main/java/io/druid/query/groupby/orderby/LimitSpec.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/orderby/LimitSpec.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.query.groupby.orderby; +package org.apache.druid.query.groupby.orderby; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.google.common.base.Function; -import io.druid.data.input.Row; -import io.druid.java.util.common.Cacheable; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.dimension.DimensionSpec; +import org.apache.druid.data.input.Row; +import org.apache.druid.java.util.common.Cacheable; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.dimension.DimensionSpec; import javax.annotation.Nullable; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/groupby/orderby/NoopLimitSpec.java b/processing/src/main/java/org/apache/druid/query/groupby/orderby/NoopLimitSpec.java similarity index 83% rename from processing/src/main/java/io/druid/query/groupby/orderby/NoopLimitSpec.java rename to processing/src/main/java/org/apache/druid/query/groupby/orderby/NoopLimitSpec.java index ab1273bf3848..fcfc2919ee83 100644 --- a/processing/src/main/java/io/druid/query/groupby/orderby/NoopLimitSpec.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/orderby/NoopLimitSpec.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.groupby.orderby; +package org.apache.druid.query.groupby.orderby; import com.fasterxml.jackson.annotation.JsonCreator; import com.google.common.base.Function; import com.google.common.base.Functions; -import io.druid.data.input.Row; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.dimension.DimensionSpec; +import org.apache.druid.data.input.Row; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.dimension.DimensionSpec; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/groupby/orderby/OrderByColumnSpec.java b/processing/src/main/java/org/apache/druid/query/groupby/orderby/OrderByColumnSpec.java similarity index 94% rename from processing/src/main/java/io/druid/query/groupby/orderby/OrderByColumnSpec.java rename to processing/src/main/java/org/apache/druid/query/groupby/orderby/OrderByColumnSpec.java index 09d9b5d6599d..d71eb7823202 100644 --- a/processing/src/main/java/io/druid/query/groupby/orderby/OrderByColumnSpec.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/orderby/OrderByColumnSpec.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.groupby.orderby; +package org.apache.druid.query.groupby.orderby; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -25,13 +25,13 @@ import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.ordering.StringComparator; -import io.druid.query.ordering.StringComparators; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.ordering.StringComparator; +import org.apache.druid.query.ordering.StringComparators; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/groupby/orderby/TopNSequence.java b/processing/src/main/java/org/apache/druid/query/groupby/orderby/TopNSequence.java similarity index 92% rename from processing/src/main/java/io/druid/query/groupby/orderby/TopNSequence.java rename to processing/src/main/java/org/apache/druid/query/groupby/orderby/TopNSequence.java index d4f54cf9bea9..bada6d5eea44 100644 --- a/processing/src/main/java/io/druid/query/groupby/orderby/TopNSequence.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/orderby/TopNSequence.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.groupby.orderby; +package org.apache.druid.query.groupby.orderby; import com.google.common.collect.MinMaxPriorityQueue; import com.google.common.collect.Ordering; -import io.druid.java.util.common.guava.Accumulator; -import io.druid.java.util.common.guava.BaseSequence; -import io.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Accumulator; +import org.apache.druid.java.util.common.guava.BaseSequence; +import org.apache.druid.java.util.common.guava.Sequence; import java.util.Collections; import java.util.Iterator; diff --git a/processing/src/main/java/io/druid/query/groupby/resource/GroupByQueryResource.java b/processing/src/main/java/org/apache/druid/query/groupby/resource/GroupByQueryResource.java similarity index 92% rename from processing/src/main/java/io/druid/query/groupby/resource/GroupByQueryResource.java rename to processing/src/main/java/org/apache/druid/query/groupby/resource/GroupByQueryResource.java index ae384541cd08..89ba61bfb46f 100644 --- a/processing/src/main/java/io/druid/query/groupby/resource/GroupByQueryResource.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/resource/GroupByQueryResource.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.groupby.resource; +package org.apache.druid.query.groupby.resource; -import io.druid.collections.ReferenceCountingResourceHolder; -import io.druid.collections.ResourceHolder; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.collections.ReferenceCountingResourceHolder; +import org.apache.druid.collections.ResourceHolder; +import org.apache.druid.java.util.common.logger.Logger; import java.io.Closeable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/groupby/strategy/GroupByStrategy.java b/processing/src/main/java/org/apache/druid/query/groupby/strategy/GroupByStrategy.java similarity index 84% rename from processing/src/main/java/io/druid/query/groupby/strategy/GroupByStrategy.java rename to processing/src/main/java/org/apache/druid/query/groupby/strategy/GroupByStrategy.java index 638175efc4e1..c3e4d709a797 100644 --- a/processing/src/main/java/io/druid/query/groupby/strategy/GroupByStrategy.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/strategy/GroupByStrategy.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.query.groupby.strategy; +package org.apache.druid.query.groupby.strategy; import com.google.common.util.concurrent.ListeningExecutorService; -import io.druid.data.input.Row; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.IntervalChunkingQueryRunnerDecorator; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.groupby.GroupByQuery; -import io.druid.query.groupby.GroupByQueryQueryToolChest; -import io.druid.query.groupby.resource.GroupByQueryResource; -import io.druid.segment.StorageAdapter; +import org.apache.druid.data.input.Row; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.IntervalChunkingQueryRunnerDecorator; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.groupby.GroupByQuery; +import org.apache.druid.query.groupby.GroupByQueryQueryToolChest; +import org.apache.druid.query.groupby.resource.GroupByQueryResource; +import org.apache.druid.segment.StorageAdapter; import java.util.Map; import java.util.concurrent.ExecutorService; diff --git a/processing/src/main/java/io/druid/query/groupby/strategy/GroupByStrategySelector.java b/processing/src/main/java/org/apache/druid/query/groupby/strategy/GroupByStrategySelector.java similarity index 88% rename from processing/src/main/java/io/druid/query/groupby/strategy/GroupByStrategySelector.java rename to processing/src/main/java/org/apache/druid/query/groupby/strategy/GroupByStrategySelector.java index 99a3cfe4b8bf..6c22c7ff293b 100644 --- a/processing/src/main/java/io/druid/query/groupby/strategy/GroupByStrategySelector.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/strategy/GroupByStrategySelector.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.groupby.strategy; +package org.apache.druid.query.groupby.strategy; import com.google.common.base.Supplier; import com.google.inject.Inject; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.query.groupby.GroupByQuery; -import io.druid.query.groupby.GroupByQueryConfig; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.query.groupby.GroupByQuery; +import org.apache.druid.query.groupby.GroupByQueryConfig; public class GroupByStrategySelector { diff --git a/processing/src/main/java/io/druid/query/groupby/strategy/GroupByStrategyV1.java b/processing/src/main/java/org/apache/druid/query/groupby/strategy/GroupByStrategyV1.java similarity index 87% rename from processing/src/main/java/io/druid/query/groupby/strategy/GroupByStrategyV1.java rename to processing/src/main/java/org/apache/druid/query/groupby/strategy/GroupByStrategyV1.java index 3ea902ffee15..fcc0fe410b2c 100644 --- a/processing/src/main/java/io/druid/query/groupby/strategy/GroupByStrategyV1.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/strategy/GroupByStrategyV1.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.groupby.strategy; +package org.apache.druid.query.groupby.strategy; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -29,30 +29,30 @@ import com.google.common.collect.Sets; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.inject.Inject; -import io.druid.collections.NonBlockingPool; -import io.druid.data.input.Row; -import io.druid.guice.annotations.Global; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.query.GroupByMergedQueryRunner; -import io.druid.query.IntervalChunkingQueryRunnerDecorator; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryWatcher; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.groupby.GroupByQuery; -import io.druid.query.groupby.GroupByQueryConfig; -import io.druid.query.groupby.GroupByQueryEngine; -import io.druid.query.groupby.GroupByQueryHelper; -import io.druid.query.groupby.GroupByQueryQueryToolChest; -import io.druid.query.groupby.orderby.NoopLimitSpec; -import io.druid.query.groupby.resource.GroupByQueryResource; -import io.druid.query.spec.MultipleIntervalSegmentSpec; -import io.druid.segment.StorageAdapter; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexStorageAdapter; +import org.apache.druid.collections.NonBlockingPool; +import org.apache.druid.data.input.Row; +import org.apache.druid.guice.annotations.Global; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.query.GroupByMergedQueryRunner; +import org.apache.druid.query.IntervalChunkingQueryRunnerDecorator; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryWatcher; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.groupby.GroupByQuery; +import org.apache.druid.query.groupby.GroupByQueryConfig; +import org.apache.druid.query.groupby.GroupByQueryEngine; +import org.apache.druid.query.groupby.GroupByQueryHelper; +import org.apache.druid.query.groupby.GroupByQueryQueryToolChest; +import org.apache.druid.query.groupby.orderby.NoopLimitSpec; +import org.apache.druid.query.groupby.resource.GroupByQueryResource; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.segment.StorageAdapter; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexStorageAdapter; import org.joda.time.Interval; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/groupby/strategy/GroupByStrategyV2.java b/processing/src/main/java/org/apache/druid/query/groupby/strategy/GroupByStrategyV2.java similarity index 86% rename from processing/src/main/java/io/druid/query/groupby/strategy/GroupByStrategyV2.java rename to processing/src/main/java/org/apache/druid/query/groupby/strategy/GroupByStrategyV2.java index 536759abc638..0e3e441b1381 100644 --- a/processing/src/main/java/io/druid/query/groupby/strategy/GroupByStrategyV2.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/strategy/GroupByStrategyV2.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.groupby.strategy; +package org.apache.druid.query.groupby.strategy; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Function; @@ -29,47 +29,47 @@ import com.google.common.collect.Ordering; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.inject.Inject; -import io.druid.collections.BlockingPool; -import io.druid.collections.NonBlockingPool; -import io.druid.collections.ReferenceCountingResourceHolder; -import io.druid.data.input.MapBasedRow; -import io.druid.data.input.Row; -import io.druid.guice.annotations.Global; -import io.druid.guice.annotations.Merging; -import io.druid.guice.annotations.Smile; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.CloseQuietly; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.common.guava.nary.BinaryFn; -import io.druid.query.DataSource; -import io.druid.query.DruidProcessingConfig; -import io.druid.query.InsufficientResourcesException; -import io.druid.query.IntervalChunkingQueryRunnerDecorator; -import io.druid.query.Query; -import io.druid.query.QueryContexts; -import io.druid.query.QueryDataSource; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryWatcher; -import io.druid.query.ResourceLimitExceededException; -import io.druid.query.ResultMergeQueryRunner; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.groupby.GroupByQuery; -import io.druid.query.groupby.GroupByQueryConfig; -import io.druid.query.groupby.GroupByQueryHelper; -import io.druid.query.groupby.GroupByQueryQueryToolChest; -import io.druid.query.groupby.epinephelinae.GroupByBinaryFnV2; -import io.druid.query.groupby.epinephelinae.GroupByMergingQueryRunnerV2; -import io.druid.query.groupby.epinephelinae.GroupByQueryEngineV2; -import io.druid.query.groupby.epinephelinae.GroupByRowProcessor; -import io.druid.query.groupby.epinephelinae.Grouper; -import io.druid.query.groupby.resource.GroupByQueryResource; -import io.druid.segment.StorageAdapter; +import org.apache.druid.collections.BlockingPool; +import org.apache.druid.collections.NonBlockingPool; +import org.apache.druid.collections.ReferenceCountingResourceHolder; +import org.apache.druid.data.input.MapBasedRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.guice.annotations.Global; +import org.apache.druid.guice.annotations.Merging; +import org.apache.druid.guice.annotations.Smile; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.CloseQuietly; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.guava.nary.BinaryFn; +import org.apache.druid.query.DataSource; +import org.apache.druid.query.DruidProcessingConfig; +import org.apache.druid.query.InsufficientResourcesException; +import org.apache.druid.query.IntervalChunkingQueryRunnerDecorator; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryContexts; +import org.apache.druid.query.QueryDataSource; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryWatcher; +import org.apache.druid.query.ResourceLimitExceededException; +import org.apache.druid.query.ResultMergeQueryRunner; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.groupby.GroupByQuery; +import org.apache.druid.query.groupby.GroupByQueryConfig; +import org.apache.druid.query.groupby.GroupByQueryHelper; +import org.apache.druid.query.groupby.GroupByQueryQueryToolChest; +import org.apache.druid.query.groupby.epinephelinae.GroupByBinaryFnV2; +import org.apache.druid.query.groupby.epinephelinae.GroupByMergingQueryRunnerV2; +import org.apache.druid.query.groupby.epinephelinae.GroupByQueryEngineV2; +import org.apache.druid.query.groupby.epinephelinae.GroupByRowProcessor; +import org.apache.druid.query.groupby.epinephelinae.Grouper; +import org.apache.druid.query.groupby.resource.GroupByQueryResource; +import org.apache.druid.segment.StorageAdapter; import org.joda.time.DateTime; import org.joda.time.Interval; @@ -209,7 +209,7 @@ public QueryRunner createIntervalChunkingRunner( // 1) It concats query chunks for consecutive intervals, which won't generate correct results. // 2) Merging instead of concating isn't a good idea, since it requires all chunks to run simultaneously, // which may take more resources than the cluster has. - // See also https://github.com/druid-io/druid/pull/4004 + // See also https://github.com/apache/incubator-druid/pull/4004 return runner; } diff --git a/processing/src/main/java/io/druid/query/lookup/LookupBean.java b/processing/src/main/java/org/apache/druid/query/lookup/LookupBean.java similarity index 98% rename from processing/src/main/java/io/druid/query/lookup/LookupBean.java rename to processing/src/main/java/org/apache/druid/query/lookup/LookupBean.java index ad24e5f3ee60..372db7c93537 100644 --- a/processing/src/main/java/io/druid/query/lookup/LookupBean.java +++ b/processing/src/main/java/org/apache/druid/query/lookup/LookupBean.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/processing/src/main/java/io/druid/query/lookup/LookupConfig.java b/processing/src/main/java/org/apache/druid/query/lookup/LookupConfig.java similarity index 97% rename from processing/src/main/java/io/druid/query/lookup/LookupConfig.java rename to processing/src/main/java/org/apache/druid/query/lookup/LookupConfig.java index d296d6974d73..fd2dc84b5476 100644 --- a/processing/src/main/java/io/druid/query/lookup/LookupConfig.java +++ b/processing/src/main/java/org/apache/druid/query/lookup/LookupConfig.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import javax.validation.constraints.Min; import java.util.Objects; diff --git a/processing/src/main/java/io/druid/query/lookup/LookupExtractionFn.java b/processing/src/main/java/org/apache/druid/query/lookup/LookupExtractionFn.java similarity index 95% rename from processing/src/main/java/io/druid/query/lookup/LookupExtractionFn.java rename to processing/src/main/java/org/apache/druid/query/lookup/LookupExtractionFn.java index e41710b42e0f..8ef8a321f079 100644 --- a/processing/src/main/java/io/druid/query/lookup/LookupExtractionFn.java +++ b/processing/src/main/java/org/apache/druid/query/lookup/LookupExtractionFn.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Function; import com.google.common.base.Throwables; -import io.druid.java.util.common.StringUtils; -import io.druid.query.extraction.ExtractionCacheHelper; -import io.druid.query.extraction.FunctionalExtraction; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.extraction.ExtractionCacheHelper; +import org.apache.druid.query.extraction.FunctionalExtraction; import javax.annotation.Nullable; import java.io.ByteArrayOutputStream; diff --git a/processing/src/main/java/io/druid/query/lookup/LookupExtractor.java b/processing/src/main/java/org/apache/druid/query/lookup/LookupExtractor.java similarity index 97% rename from processing/src/main/java/io/druid/query/lookup/LookupExtractor.java rename to processing/src/main/java/org/apache/druid/query/lookup/LookupExtractor.java index 897001c22e68..d99736b303af 100644 --- a/processing/src/main/java/io/druid/query/lookup/LookupExtractor.java +++ b/processing/src/main/java/org/apache/druid/query/lookup/LookupExtractor.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.druid.query.extraction.MapLookupExtractor; +import org.apache.druid.query.extraction.MapLookupExtractor; import javax.annotation.Nullable; import java.util.Collections; diff --git a/processing/src/main/java/io/druid/query/lookup/LookupExtractorFactory.java b/processing/src/main/java/org/apache/druid/query/lookup/LookupExtractorFactory.java similarity index 98% rename from processing/src/main/java/io/druid/query/lookup/LookupExtractorFactory.java rename to processing/src/main/java/org/apache/druid/query/lookup/LookupExtractorFactory.java index a117d8ea52dc..8d4ee42c5bb8 100644 --- a/processing/src/main/java/io/druid/query/lookup/LookupExtractorFactory.java +++ b/processing/src/main/java/org/apache/druid/query/lookup/LookupExtractorFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.google.common.base.Supplier; diff --git a/processing/src/main/java/io/druid/query/lookup/LookupExtractorFactoryContainer.java b/processing/src/main/java/org/apache/druid/query/lookup/LookupExtractorFactoryContainer.java similarity index 96% rename from processing/src/main/java/io/druid/query/lookup/LookupExtractorFactoryContainer.java rename to processing/src/main/java/org/apache/druid/query/lookup/LookupExtractorFactoryContainer.java index 8c842ab345b5..e0a6b43737f6 100644 --- a/processing/src/main/java/io/druid/query/lookup/LookupExtractorFactoryContainer.java +++ b/processing/src/main/java/org/apache/druid/query/lookup/LookupExtractorFactoryContainer.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.java.util.common.guava.Comparators; +import org.apache.druid.java.util.common.guava.Comparators; import java.util.Objects; diff --git a/processing/src/main/java/io/druid/query/lookup/LookupIntrospectHandler.java b/processing/src/main/java/org/apache/druid/query/lookup/LookupIntrospectHandler.java similarity index 96% rename from processing/src/main/java/io/druid/query/lookup/LookupIntrospectHandler.java rename to processing/src/main/java/org/apache/druid/query/lookup/LookupIntrospectHandler.java index f9e84dbb19cf..d8363749fe2a 100644 --- a/processing/src/main/java/io/druid/query/lookup/LookupIntrospectHandler.java +++ b/processing/src/main/java/org/apache/druid/query/lookup/LookupIntrospectHandler.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; /** diff --git a/processing/src/main/java/io/druid/query/lookup/LookupSnapshotTaker.java b/processing/src/main/java/org/apache/druid/query/lookup/LookupSnapshotTaker.java similarity index 92% rename from processing/src/main/java/io/druid/query/lookup/LookupSnapshotTaker.java rename to processing/src/main/java/org/apache/druid/query/lookup/LookupSnapshotTaker.java index a44f8efb6047..6d60aafdedc1 100644 --- a/processing/src/main/java/io/druid/query/lookup/LookupSnapshotTaker.java +++ b/processing/src/main/java/org/apache/druid/query/lookup/LookupSnapshotTaker.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.base.Strings; -import io.druid.guice.annotations.Json; -import io.druid.java.util.common.FileUtils; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.java.util.common.FileUtils; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; import java.io.File; import java.io.IOException; diff --git a/processing/src/main/java/io/druid/query/lookup/LookupsState.java b/processing/src/main/java/org/apache/druid/query/lookup/LookupsState.java similarity index 98% rename from processing/src/main/java/io/druid/query/lookup/LookupsState.java rename to processing/src/main/java/org/apache/druid/query/lookup/LookupsState.java index d4b962754d9a..685fd61c4467 100644 --- a/processing/src/main/java/io/druid/query/lookup/LookupsState.java +++ b/processing/src/main/java/org/apache/druid/query/lookup/LookupsState.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/processing/src/main/java/io/druid/query/metadata/SegmentAnalyzer.java b/processing/src/main/java/org/apache/druid/query/metadata/SegmentAnalyzer.java similarity index 88% rename from processing/src/main/java/io/druid/query/metadata/SegmentAnalyzer.java rename to processing/src/main/java/org/apache/druid/query/metadata/SegmentAnalyzer.java index f0e1709b3db8..e201f78c3c41 100644 --- a/processing/src/main/java/io/druid/query/metadata/SegmentAnalyzer.java +++ b/processing/src/main/java/org/apache/druid/query/metadata/SegmentAnalyzer.java @@ -17,37 +17,37 @@ * under the License. */ -package io.druid.query.metadata; +package org.apache.druid.query.metadata; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.Accumulator; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.metadata.metadata.ColumnAnalysis; -import io.druid.query.metadata.metadata.SegmentMetadataQuery; -import io.druid.segment.Cursor; -import io.druid.segment.DimensionSelector; -import io.druid.segment.QueryableIndex; -import io.druid.segment.Segment; -import io.druid.segment.StorageAdapter; -import io.druid.segment.VirtualColumns; -import io.druid.segment.column.BitmapIndex; -import io.druid.segment.column.Column; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.column.ColumnCapabilitiesImpl; -import io.druid.segment.column.ComplexColumn; -import io.druid.segment.column.ValueType; -import io.druid.segment.data.IndexedInts; -import io.druid.segment.serde.ComplexMetricSerde; -import io.druid.segment.serde.ComplexMetrics; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.Accumulator; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.metadata.metadata.ColumnAnalysis; +import org.apache.druid.query.metadata.metadata.SegmentMetadataQuery; +import org.apache.druid.segment.Cursor; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.StorageAdapter; +import org.apache.druid.segment.VirtualColumns; +import org.apache.druid.segment.column.BitmapIndex; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.column.ColumnCapabilitiesImpl; +import org.apache.druid.segment.column.ComplexColumn; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.data.IndexedInts; +import org.apache.druid.segment.serde.ComplexMetricSerde; +import org.apache.druid.segment.serde.ComplexMetrics; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/processing/src/main/java/io/druid/query/metadata/SegmentMetadataQueryConfig.java b/processing/src/main/java/org/apache/druid/query/metadata/SegmentMetadataQueryConfig.java similarity index 95% rename from processing/src/main/java/io/druid/query/metadata/SegmentMetadataQueryConfig.java rename to processing/src/main/java/org/apache/druid/query/metadata/SegmentMetadataQueryConfig.java index 4d6055695a07..0045b050984f 100644 --- a/processing/src/main/java/io/druid/query/metadata/SegmentMetadataQueryConfig.java +++ b/processing/src/main/java/org/apache/druid/query/metadata/SegmentMetadataQueryConfig.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.metadata; +package org.apache.druid.query.metadata; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.query.metadata.metadata.SegmentMetadataQuery; +import org.apache.druid.query.metadata.metadata.SegmentMetadataQuery; import org.joda.time.Period; import org.joda.time.format.ISOPeriodFormat; import org.joda.time.format.PeriodFormatter; diff --git a/processing/src/main/java/io/druid/query/metadata/SegmentMetadataQueryQueryToolChest.java b/processing/src/main/java/org/apache/druid/query/metadata/SegmentMetadataQueryQueryToolChest.java similarity index 89% rename from processing/src/main/java/io/druid/query/metadata/SegmentMetadataQueryQueryToolChest.java rename to processing/src/main/java/org/apache/druid/query/metadata/SegmentMetadataQueryQueryToolChest.java index ec62e68b0f02..615d88afa8fd 100644 --- a/processing/src/main/java/io/druid/query/metadata/SegmentMetadataQueryQueryToolChest.java +++ b/processing/src/main/java/org/apache/druid/query/metadata/SegmentMetadataQueryQueryToolChest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.metadata; +package org.apache.druid.query.metadata; import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.annotations.VisibleForTesting; @@ -31,30 +31,30 @@ import com.google.common.collect.Ordering; import com.google.common.collect.Sets; import com.google.inject.Inject; -import io.druid.common.guava.CombiningSequence; -import io.druid.java.util.common.JodaUtils; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.Comparators; -import io.druid.java.util.common.guava.MappedSequence; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.nary.BinaryFn; -import io.druid.query.BySegmentSkippingQueryRunner; -import io.druid.query.CacheStrategy; -import io.druid.query.DefaultGenericQueryMetricsFactory; -import io.druid.query.GenericQueryMetricsFactory; -import io.druid.query.Query; -import io.druid.query.QueryMetrics; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryToolChest; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.AggregatorFactoryNotMergeableException; -import io.druid.query.aggregation.MetricManipulationFn; -import io.druid.query.metadata.metadata.ColumnAnalysis; -import io.druid.query.metadata.metadata.SegmentAnalysis; -import io.druid.query.metadata.metadata.SegmentMetadataQuery; -import io.druid.timeline.LogicalSegment; +import org.apache.druid.common.guava.CombiningSequence; +import org.apache.druid.java.util.common.JodaUtils; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.java.util.common.guava.MappedSequence; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.nary.BinaryFn; +import org.apache.druid.query.BySegmentSkippingQueryRunner; +import org.apache.druid.query.CacheStrategy; +import org.apache.druid.query.DefaultGenericQueryMetricsFactory; +import org.apache.druid.query.GenericQueryMetricsFactory; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryMetrics; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorFactoryNotMergeableException; +import org.apache.druid.query.aggregation.MetricManipulationFn; +import org.apache.druid.query.metadata.metadata.ColumnAnalysis; +import org.apache.druid.query.metadata.metadata.SegmentAnalysis; +import org.apache.druid.query.metadata.metadata.SegmentMetadataQuery; +import org.apache.druid.timeline.LogicalSegment; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/processing/src/main/java/io/druid/query/metadata/SegmentMetadataQueryRunnerFactory.java b/processing/src/main/java/org/apache/druid/query/metadata/SegmentMetadataQueryRunnerFactory.java similarity index 88% rename from processing/src/main/java/io/druid/query/metadata/SegmentMetadataQueryRunnerFactory.java rename to processing/src/main/java/org/apache/druid/query/metadata/SegmentMetadataQueryRunnerFactory.java index 54fdc1d7128d..2b925b3e4336 100644 --- a/processing/src/main/java/io/druid/query/metadata/SegmentMetadataQueryRunnerFactory.java +++ b/processing/src/main/java/org/apache/druid/query/metadata/SegmentMetadataQueryRunnerFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.metadata; +package org.apache.druid.query.metadata; import com.google.common.base.Function; import com.google.common.base.Throwables; @@ -26,28 +26,28 @@ import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.inject.Inject; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.AbstractPrioritizedCallable; -import io.druid.query.ConcatQueryRunner; -import io.druid.query.Query; -import io.druid.query.QueryContexts; -import io.druid.query.QueryInterruptedException; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryToolChest; -import io.druid.query.QueryWatcher; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.metadata.metadata.ColumnAnalysis; -import io.druid.query.metadata.metadata.ColumnIncluderator; -import io.druid.query.metadata.metadata.SegmentAnalysis; -import io.druid.query.metadata.metadata.SegmentMetadataQuery; -import io.druid.segment.Metadata; -import io.druid.segment.Segment; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.AbstractPrioritizedCallable; +import org.apache.druid.query.ConcatQueryRunner; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryContexts; +import org.apache.druid.query.QueryInterruptedException; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.QueryWatcher; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.metadata.metadata.ColumnAnalysis; +import org.apache.druid.query.metadata.metadata.ColumnIncluderator; +import org.apache.druid.query.metadata.metadata.SegmentAnalysis; +import org.apache.druid.query.metadata.metadata.SegmentMetadataQuery; +import org.apache.druid.segment.Metadata; +import org.apache.druid.segment.Segment; import org.joda.time.Interval; import java.util.Collections; diff --git a/processing/src/main/java/io/druid/query/metadata/metadata/AllColumnIncluderator.java b/processing/src/main/java/org/apache/druid/query/metadata/metadata/AllColumnIncluderator.java similarity index 96% rename from processing/src/main/java/io/druid/query/metadata/metadata/AllColumnIncluderator.java rename to processing/src/main/java/org/apache/druid/query/metadata/metadata/AllColumnIncluderator.java index 4d7bf2f81d1d..4ab4099cb92d 100644 --- a/processing/src/main/java/io/druid/query/metadata/metadata/AllColumnIncluderator.java +++ b/processing/src/main/java/org/apache/druid/query/metadata/metadata/AllColumnIncluderator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.metadata.metadata; +package org.apache.druid.query.metadata.metadata; /** */ diff --git a/processing/src/main/java/io/druid/query/metadata/metadata/ColumnAnalysis.java b/processing/src/main/java/org/apache/druid/query/metadata/metadata/ColumnAnalysis.java similarity index 99% rename from processing/src/main/java/io/druid/query/metadata/metadata/ColumnAnalysis.java rename to processing/src/main/java/org/apache/druid/query/metadata/metadata/ColumnAnalysis.java index 81c4cadfc9e5..aa9da8d40af4 100644 --- a/processing/src/main/java/io/druid/query/metadata/metadata/ColumnAnalysis.java +++ b/processing/src/main/java/org/apache/druid/query/metadata/metadata/ColumnAnalysis.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.metadata.metadata; +package org.apache.druid.query.metadata.metadata; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/processing/src/main/java/io/druid/query/metadata/metadata/ColumnIncluderator.java b/processing/src/main/java/org/apache/druid/query/metadata/metadata/ColumnIncluderator.java similarity index 96% rename from processing/src/main/java/io/druid/query/metadata/metadata/ColumnIncluderator.java rename to processing/src/main/java/org/apache/druid/query/metadata/metadata/ColumnIncluderator.java index 9ecfa3084181..7f55474b7e5e 100644 --- a/processing/src/main/java/io/druid/query/metadata/metadata/ColumnIncluderator.java +++ b/processing/src/main/java/org/apache/druid/query/metadata/metadata/ColumnIncluderator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.metadata.metadata; +package org.apache.druid.query.metadata.metadata; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/processing/src/main/java/io/druid/query/metadata/metadata/ListColumnIncluderator.java b/processing/src/main/java/org/apache/druid/query/metadata/metadata/ListColumnIncluderator.java similarity index 95% rename from processing/src/main/java/io/druid/query/metadata/metadata/ListColumnIncluderator.java rename to processing/src/main/java/org/apache/druid/query/metadata/metadata/ListColumnIncluderator.java index 2813a3ed48bb..dd3473a8ebb9 100644 --- a/processing/src/main/java/io/druid/query/metadata/metadata/ListColumnIncluderator.java +++ b/processing/src/main/java/org/apache/druid/query/metadata/metadata/ListColumnIncluderator.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.metadata.metadata; +package org.apache.druid.query.metadata.metadata; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import java.nio.ByteBuffer; import java.util.Collections; diff --git a/processing/src/main/java/io/druid/query/metadata/metadata/NoneColumnIncluderator.java b/processing/src/main/java/org/apache/druid/query/metadata/metadata/NoneColumnIncluderator.java similarity index 95% rename from processing/src/main/java/io/druid/query/metadata/metadata/NoneColumnIncluderator.java rename to processing/src/main/java/org/apache/druid/query/metadata/metadata/NoneColumnIncluderator.java index f870dbc03c7c..b72f0242f047 100644 --- a/processing/src/main/java/io/druid/query/metadata/metadata/NoneColumnIncluderator.java +++ b/processing/src/main/java/org/apache/druid/query/metadata/metadata/NoneColumnIncluderator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.metadata.metadata; +package org.apache.druid.query.metadata.metadata; /** */ diff --git a/processing/src/main/java/io/druid/query/metadata/metadata/SegmentAnalysis.java b/processing/src/main/java/org/apache/druid/query/metadata/metadata/SegmentAnalysis.java similarity index 95% rename from processing/src/main/java/io/druid/query/metadata/metadata/SegmentAnalysis.java rename to processing/src/main/java/org/apache/druid/query/metadata/metadata/SegmentAnalysis.java index 9fb84c6104ee..f4f6e0419689 100644 --- a/processing/src/main/java/io/druid/query/metadata/metadata/SegmentAnalysis.java +++ b/processing/src/main/java/org/apache/druid/query/metadata/metadata/SegmentAnalysis.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.metadata.metadata; +package org.apache.druid.query.metadata.metadata; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.query.aggregation.AggregatorFactory; import org.joda.time.Interval; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/metadata/metadata/SegmentMetadataQuery.java b/processing/src/main/java/org/apache/druid/query/metadata/metadata/SegmentMetadataQuery.java similarity index 92% rename from processing/src/main/java/io/druid/query/metadata/metadata/SegmentMetadataQuery.java rename to processing/src/main/java/org/apache/druid/query/metadata/metadata/SegmentMetadataQuery.java index f78bfa536336..3888f8c989bb 100644 --- a/processing/src/main/java/io/druid/query/metadata/metadata/SegmentMetadataQuery.java +++ b/processing/src/main/java/org/apache/druid/query/metadata/metadata/SegmentMetadataQuery.java @@ -17,25 +17,25 @@ * under the License. */ -package io.druid.query.metadata.metadata; +package org.apache.druid.query.metadata.metadata; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.query.BaseQuery; -import io.druid.query.DataSource; -import io.druid.query.Druids; -import io.druid.query.Query; -import io.druid.query.TableDataSource; -import io.druid.query.UnionDataSource; -import io.druid.query.filter.DimFilter; -import io.druid.query.metadata.SegmentMetadataQueryConfig; -import io.druid.query.spec.MultipleIntervalSegmentSpec; -import io.druid.query.spec.QuerySegmentSpec; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.BaseQuery; +import org.apache.druid.query.DataSource; +import org.apache.druid.query.Druids; +import org.apache.druid.query.Query; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.query.UnionDataSource; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.metadata.SegmentMetadataQueryConfig; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.query.spec.QuerySegmentSpec; import org.joda.time.Interval; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/monomorphicprocessing/CalledFromHotLoop.java b/processing/src/main/java/org/apache/druid/query/monomorphicprocessing/CalledFromHotLoop.java similarity index 96% rename from processing/src/main/java/io/druid/query/monomorphicprocessing/CalledFromHotLoop.java rename to processing/src/main/java/org/apache/druid/query/monomorphicprocessing/CalledFromHotLoop.java index 4cbe8b8f11a4..6cef2b4b8f85 100644 --- a/processing/src/main/java/io/druid/query/monomorphicprocessing/CalledFromHotLoop.java +++ b/processing/src/main/java/org/apache/druid/query/monomorphicprocessing/CalledFromHotLoop.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.monomorphicprocessing; +package org.apache.druid.query.monomorphicprocessing; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/processing/src/main/java/io/druid/query/monomorphicprocessing/HotLoopCallee.java b/processing/src/main/java/org/apache/druid/query/monomorphicprocessing/HotLoopCallee.java similarity index 97% rename from processing/src/main/java/io/druid/query/monomorphicprocessing/HotLoopCallee.java rename to processing/src/main/java/org/apache/druid/query/monomorphicprocessing/HotLoopCallee.java index 7b6ebf73eeb9..2bbac9b3ff40 100644 --- a/processing/src/main/java/io/druid/query/monomorphicprocessing/HotLoopCallee.java +++ b/processing/src/main/java/org/apache/druid/query/monomorphicprocessing/HotLoopCallee.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.monomorphicprocessing; +package org.apache.druid.query.monomorphicprocessing; /** * Marker interface for abstractions, which are called from hot loops during query processing. Some of the methods of diff --git a/processing/src/main/java/io/druid/query/monomorphicprocessing/RuntimeShapeInspector.java b/processing/src/main/java/org/apache/druid/query/monomorphicprocessing/RuntimeShapeInspector.java similarity index 89% rename from processing/src/main/java/io/druid/query/monomorphicprocessing/RuntimeShapeInspector.java rename to processing/src/main/java/org/apache/druid/query/monomorphicprocessing/RuntimeShapeInspector.java index be651a242029..5dffef202b70 100644 --- a/processing/src/main/java/io/druid/query/monomorphicprocessing/RuntimeShapeInspector.java +++ b/processing/src/main/java/org/apache/druid/query/monomorphicprocessing/RuntimeShapeInspector.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.monomorphicprocessing; +package org.apache.druid.query.monomorphicprocessing; import javax.annotation.Nullable; @@ -37,7 +37,7 @@ public interface RuntimeShapeInspector /** * To be called from {@link HotLoopCallee#inspectRuntimeShape(RuntimeShapeInspector)} with something, that is * important to ensure monomorphism and predictable branch taking in hot loops, but doesn't apply to other visit() - * methods in RuntimeShapeInspector. For example, {@link io.druid.segment.BitmapOffset#inspectRuntimeShape} reports + * methods in RuntimeShapeInspector. For example, {@link org.apache.druid.segment.BitmapOffset#inspectRuntimeShape} reports * bitmap population via this method, to ensure predictable branch taking inside Bitmap's iterators. */ void visit(String key, String runtimeShape); diff --git a/processing/src/main/java/io/druid/query/monomorphicprocessing/SpecializationService.java b/processing/src/main/java/org/apache/druid/query/monomorphicprocessing/SpecializationService.java similarity index 98% rename from processing/src/main/java/io/druid/query/monomorphicprocessing/SpecializationService.java rename to processing/src/main/java/org/apache/druid/query/monomorphicprocessing/SpecializationService.java index bd3f2b1ae7cb..daca57542de7 100644 --- a/processing/src/main/java/io/druid/query/monomorphicprocessing/SpecializationService.java +++ b/processing/src/main/java/org/apache/druid/query/monomorphicprocessing/SpecializationService.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.monomorphicprocessing; +package org.apache.druid.query.monomorphicprocessing; import com.google.common.collect.ImmutableMap; import com.google.common.io.ByteStreams; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.logger.Logger; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.ClassWriter; diff --git a/processing/src/main/java/io/druid/query/monomorphicprocessing/SpecializationState.java b/processing/src/main/java/org/apache/druid/query/monomorphicprocessing/SpecializationState.java similarity index 97% rename from processing/src/main/java/io/druid/query/monomorphicprocessing/SpecializationState.java rename to processing/src/main/java/org/apache/druid/query/monomorphicprocessing/SpecializationState.java index 9ad8c6aa6472..ba5cbe113a1d 100644 --- a/processing/src/main/java/io/druid/query/monomorphicprocessing/SpecializationState.java +++ b/processing/src/main/java/org/apache/druid/query/monomorphicprocessing/SpecializationState.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.monomorphicprocessing; +package org.apache.druid.query.monomorphicprocessing; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/query/monomorphicprocessing/StringRuntimeShape.java b/processing/src/main/java/org/apache/druid/query/monomorphicprocessing/StringRuntimeShape.java similarity index 98% rename from processing/src/main/java/io/druid/query/monomorphicprocessing/StringRuntimeShape.java rename to processing/src/main/java/org/apache/druid/query/monomorphicprocessing/StringRuntimeShape.java index f1ba7f33f5d1..8c695b9873c8 100644 --- a/processing/src/main/java/io/druid/query/monomorphicprocessing/StringRuntimeShape.java +++ b/processing/src/main/java/org/apache/druid/query/monomorphicprocessing/StringRuntimeShape.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.monomorphicprocessing; +package org.apache.druid.query.monomorphicprocessing; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/ordering/StringComparator.java b/processing/src/main/java/org/apache/druid/query/ordering/StringComparator.java similarity index 91% rename from processing/src/main/java/io/druid/query/ordering/StringComparator.java rename to processing/src/main/java/org/apache/druid/query/ordering/StringComparator.java index ed0bc530c31c..33016c4d2af9 100644 --- a/processing/src/main/java/io/druid/query/ordering/StringComparator.java +++ b/processing/src/main/java/org/apache/druid/query/ordering/StringComparator.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.ordering; +package org.apache.druid.query.ordering; import com.fasterxml.jackson.annotation.JsonCreator; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.StringUtils; import java.util.Comparator; diff --git a/processing/src/main/java/io/druid/query/ordering/StringComparators.java b/processing/src/main/java/org/apache/druid/query/ordering/StringComparators.java similarity index 98% rename from processing/src/main/java/io/druid/query/ordering/StringComparators.java rename to processing/src/main/java/org/apache/druid/query/ordering/StringComparators.java index 12803865ed54..1f991737ee2e 100644 --- a/processing/src/main/java/io/druid/query/ordering/StringComparators.java +++ b/processing/src/main/java/org/apache/druid/query/ordering/StringComparators.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.ordering; +package org.apache.druid.query.ordering; import com.google.common.collect.Ordering; import com.google.common.primitives.Ints; import com.google.common.primitives.UnsignedBytes; -import io.druid.common.guava.GuavaUtils; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.common.guava.GuavaUtils; +import org.apache.druid.java.util.common.StringUtils; import java.math.BigDecimal; import java.util.Comparator; diff --git a/processing/src/main/java/io/druid/query/scan/ScanQuery.java b/processing/src/main/java/org/apache/druid/query/scan/ScanQuery.java similarity index 95% rename from processing/src/main/java/io/druid/query/scan/ScanQuery.java rename to processing/src/main/java/org/apache/druid/query/scan/ScanQuery.java index 89ca943df480..b93731942e47 100644 --- a/processing/src/main/java/io/druid/query/scan/ScanQuery.java +++ b/processing/src/main/java/org/apache/druid/query/scan/ScanQuery.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.query.scan; +package org.apache.druid.query.scan; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import io.druid.query.BaseQuery; -import io.druid.query.DataSource; -import io.druid.query.Query; -import io.druid.query.TableDataSource; -import io.druid.query.filter.DimFilter; -import io.druid.query.spec.QuerySegmentSpec; -import io.druid.segment.VirtualColumn; -import io.druid.segment.VirtualColumns; +import org.apache.druid.query.BaseQuery; +import org.apache.druid.query.DataSource; +import org.apache.druid.query.Query; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.spec.QuerySegmentSpec; +import org.apache.druid.segment.VirtualColumn; +import org.apache.druid.segment.VirtualColumns; import java.util.Arrays; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/scan/ScanQueryConfig.java b/processing/src/main/java/org/apache/druid/query/scan/ScanQueryConfig.java similarity index 97% rename from processing/src/main/java/io/druid/query/scan/ScanQueryConfig.java rename to processing/src/main/java/org/apache/druid/query/scan/ScanQueryConfig.java index 799081d5d1e4..272bddbeaecc 100644 --- a/processing/src/main/java/io/druid/query/scan/ScanQueryConfig.java +++ b/processing/src/main/java/org/apache/druid/query/scan/ScanQueryConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.scan; +package org.apache.druid.query.scan; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/processing/src/main/java/io/druid/query/scan/ScanQueryEngine.java b/processing/src/main/java/org/apache/druid/query/scan/ScanQueryEngine.java similarity index 92% rename from processing/src/main/java/io/druid/query/scan/ScanQueryEngine.java rename to processing/src/main/java/org/apache/druid/query/scan/ScanQueryEngine.java index 7706ca6903dc..06c48063a7cd 100644 --- a/processing/src/main/java/io/druid/query/scan/ScanQueryEngine.java +++ b/processing/src/main/java/org/apache/druid/query/scan/ScanQueryEngine.java @@ -16,30 +16,30 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.query.scan; +package org.apache.druid.query.scan; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.UOE; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.BaseSequence; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.query.QueryContexts; -import io.druid.query.QueryInterruptedException; -import io.druid.query.filter.Filter; -import io.druid.segment.BaseObjectColumnValueSelector; -import io.druid.segment.Cursor; -import io.druid.segment.Segment; -import io.druid.segment.StorageAdapter; -import io.druid.segment.VirtualColumn; -import io.druid.segment.column.Column; -import io.druid.segment.filter.Filters; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.UOE; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.BaseSequence; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.query.QueryContexts; +import org.apache.druid.query.QueryInterruptedException; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.segment.Cursor; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.StorageAdapter; +import org.apache.druid.segment.VirtualColumn; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.filter.Filters; import org.joda.time.Interval; import java.util.ArrayList; diff --git a/processing/src/main/java/io/druid/query/scan/ScanQueryLimitRowIterator.java b/processing/src/main/java/org/apache/druid/query/scan/ScanQueryLimitRowIterator.java similarity index 88% rename from processing/src/main/java/io/druid/query/scan/ScanQueryLimitRowIterator.java rename to processing/src/main/java/org/apache/druid/query/scan/ScanQueryLimitRowIterator.java index f4b0641c3e81..f07647aee581 100644 --- a/processing/src/main/java/io/druid/query/scan/ScanQueryLimitRowIterator.java +++ b/processing/src/main/java/org/apache/druid/query/scan/ScanQueryLimitRowIterator.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.query.scan; +package org.apache.druid.query.scan; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Yielder; -import io.druid.java.util.common.guava.YieldingAccumulator; -import io.druid.java.util.common.parsers.CloseableIterator; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Yielder; +import org.apache.druid.java.util.common.guava.YieldingAccumulator; +import org.apache.druid.java.util.common.parsers.CloseableIterator; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; import java.io.IOException; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/scan/ScanQueryQueryToolChest.java b/processing/src/main/java/org/apache/druid/query/scan/ScanQueryQueryToolChest.java similarity index 88% rename from processing/src/main/java/io/druid/query/scan/ScanQueryQueryToolChest.java rename to processing/src/main/java/org/apache/druid/query/scan/ScanQueryQueryToolChest.java index 0b23957786eb..72d3fdbb2f01 100644 --- a/processing/src/main/java/io/druid/query/scan/ScanQueryQueryToolChest.java +++ b/processing/src/main/java/org/apache/druid/query/scan/ScanQueryQueryToolChest.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.query.scan; +package org.apache.druid.query.scan; import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.base.Function; import com.google.common.base.Functions; import com.google.inject.Inject; -import io.druid.java.util.common.guava.BaseSequence; -import io.druid.java.util.common.guava.CloseQuietly; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.GenericQueryMetricsFactory; -import io.druid.query.Query; -import io.druid.query.QueryMetrics; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryToolChest; -import io.druid.query.aggregation.MetricManipulationFn; +import org.apache.druid.java.util.common.guava.BaseSequence; +import org.apache.druid.java.util.common.guava.CloseQuietly; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.GenericQueryMetricsFactory; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryMetrics; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.aggregation.MetricManipulationFn; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/scan/ScanQueryRunnerFactory.java b/processing/src/main/java/org/apache/druid/query/scan/ScanQueryRunnerFactory.java similarity index 88% rename from processing/src/main/java/io/druid/query/scan/ScanQueryRunnerFactory.java rename to processing/src/main/java/org/apache/druid/query/scan/ScanQueryRunnerFactory.java index ecfd80de228a..72d1b0ce2470 100644 --- a/processing/src/main/java/io/druid/query/scan/ScanQueryRunnerFactory.java +++ b/processing/src/main/java/org/apache/druid/query/scan/ScanQueryRunnerFactory.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.query.scan; +package org.apache.druid.query.scan; import com.google.common.base.Function; import com.google.inject.Inject; -import io.druid.java.util.common.JodaUtils; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.query.Query; -import io.druid.query.QueryContexts; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryToolChest; -import io.druid.segment.Segment; +import org.apache.druid.java.util.common.JodaUtils; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryContexts; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.segment.Segment; import java.util.Map; import java.util.concurrent.ExecutorService; diff --git a/processing/src/main/java/io/druid/query/scan/ScanResultValue.java b/processing/src/main/java/org/apache/druid/query/scan/ScanResultValue.java similarity index 98% rename from processing/src/main/java/io/druid/query/scan/ScanResultValue.java rename to processing/src/main/java/org/apache/druid/query/scan/ScanResultValue.java index f62bf7a53a7d..6fa38250478d 100644 --- a/processing/src/main/java/io/druid/query/scan/ScanResultValue.java +++ b/processing/src/main/java/org/apache/druid/query/scan/ScanResultValue.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.query.scan; +package org.apache.druid.query.scan; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/processing/src/main/java/io/druid/query/search/AllSearchQuerySpec.java b/processing/src/main/java/org/apache/druid/query/search/AllSearchQuerySpec.java similarity index 97% rename from processing/src/main/java/io/druid/query/search/AllSearchQuerySpec.java rename to processing/src/main/java/org/apache/druid/query/search/AllSearchQuerySpec.java index c25029035fef..92125671f139 100644 --- a/processing/src/main/java/io/druid/query/search/AllSearchQuerySpec.java +++ b/processing/src/main/java/org/apache/druid/query/search/AllSearchQuerySpec.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/query/search/AutoStrategy.java b/processing/src/main/java/org/apache/druid/query/search/AutoStrategy.java similarity index 90% rename from processing/src/main/java/io/druid/query/search/AutoStrategy.java rename to processing/src/main/java/org/apache/druid/query/search/AutoStrategy.java index 3ae6f2dc860f..919492f6b23a 100644 --- a/processing/src/main/java/io/druid/query/search/AutoStrategy.java +++ b/processing/src/main/java/org/apache/druid/query/search/AutoStrategy.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.filter.BitmapIndexSelector; -import io.druid.segment.ColumnSelectorBitmapIndexSelector; -import io.druid.segment.QueryableIndex; -import io.druid.segment.Segment; -import io.druid.segment.VirtualColumns; -import io.druid.segment.column.BitmapIndex; -import io.druid.segment.column.Column; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.filter.BitmapIndexSelector; +import org.apache.druid.segment.ColumnSelectorBitmapIndexSelector; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.VirtualColumns; +import org.apache.druid.segment.column.BitmapIndex; +import org.apache.druid.segment.column.Column; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/search/BySegmentSearchResultValue.java b/processing/src/main/java/org/apache/druid/query/search/BySegmentSearchResultValue.java similarity index 94% rename from processing/src/main/java/io/druid/query/search/BySegmentSearchResultValue.java rename to processing/src/main/java/org/apache/druid/query/search/BySegmentSearchResultValue.java index b56bcb3aa2bf..bbb3a689d050 100644 --- a/processing/src/main/java/io/druid/query/search/BySegmentSearchResultValue.java +++ b/processing/src/main/java/org/apache/druid/query/search/BySegmentSearchResultValue.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; -import io.druid.query.BySegmentResultValue; -import io.druid.query.Result; +import org.apache.druid.query.BySegmentResultValue; +import org.apache.druid.query.Result; import org.joda.time.Interval; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/search/ConciseBitmapDecisionHelper.java b/processing/src/main/java/org/apache/druid/query/search/ConciseBitmapDecisionHelper.java similarity index 89% rename from processing/src/main/java/io/druid/query/search/ConciseBitmapDecisionHelper.java rename to processing/src/main/java/org/apache/druid/query/search/ConciseBitmapDecisionHelper.java index e57da0605047..d793f0d6682b 100644 --- a/processing/src/main/java/io/druid/query/search/ConciseBitmapDecisionHelper.java +++ b/processing/src/main/java/org/apache/druid/query/search/ConciseBitmapDecisionHelper.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; public class ConciseBitmapDecisionHelper extends SearchQueryDecisionHelper { // This value comes from an experiment. - // See the discussion at https://github.com/druid-io/druid/pull/3792#issuecomment-268331804. + // See the discussion at https://github.com/apache/incubator-druid/pull/3792#issuecomment-268331804. private static final double BITMAP_INTERSECT_COST = 7.425; private static final ConciseBitmapDecisionHelper INSTANCE = new ConciseBitmapDecisionHelper(); diff --git a/processing/src/main/java/io/druid/query/search/ContainsSearchQuerySpec.java b/processing/src/main/java/org/apache/druid/query/search/ContainsSearchQuerySpec.java similarity index 97% rename from processing/src/main/java/io/druid/query/search/ContainsSearchQuerySpec.java rename to processing/src/main/java/org/apache/druid/query/search/ContainsSearchQuerySpec.java index a13e40cff06d..95c2bf57d1a2 100644 --- a/processing/src/main/java/io/druid/query/search/ContainsSearchQuerySpec.java +++ b/processing/src/main/java/org/apache/druid/query/search/ContainsSearchQuerySpec.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Objects; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/search/CursorOnlyStrategy.java b/processing/src/main/java/org/apache/druid/query/search/CursorOnlyStrategy.java similarity index 87% rename from processing/src/main/java/io/druid/query/search/CursorOnlyStrategy.java rename to processing/src/main/java/org/apache/druid/query/search/CursorOnlyStrategy.java index 73e22702b43c..64f43561f4bb 100644 --- a/processing/src/main/java/io/druid/query/search/CursorOnlyStrategy.java +++ b/processing/src/main/java/org/apache/druid/query/search/CursorOnlyStrategy.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; import com.google.common.collect.ImmutableList; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.ColumnSelectorPlus; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.filter.Filter; -import io.druid.query.search.SearchQueryRunner.SearchColumnSelectorStrategy; -import io.druid.segment.Cursor; -import io.druid.segment.DimensionHandlerUtils; -import io.druid.segment.Segment; -import io.druid.segment.StorageAdapter; -import io.druid.segment.VirtualColumns; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.ColumnSelectorPlus; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.query.search.SearchQueryRunner.SearchColumnSelectorStrategy; +import org.apache.druid.segment.Cursor; +import org.apache.druid.segment.DimensionHandlerUtils; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.StorageAdapter; +import org.apache.druid.segment.VirtualColumns; import it.unimi.dsi.fastutil.objects.Object2IntRBTreeMap; import org.joda.time.Interval; diff --git a/processing/src/main/java/io/druid/query/search/DefaultSearchQueryMetrics.java b/processing/src/main/java/org/apache/druid/query/search/DefaultSearchQueryMetrics.java similarity index 93% rename from processing/src/main/java/io/druid/query/search/DefaultSearchQueryMetrics.java rename to processing/src/main/java/org/apache/druid/query/search/DefaultSearchQueryMetrics.java index 480e8ea8573e..96b126a9be0a 100644 --- a/processing/src/main/java/io/druid/query/search/DefaultSearchQueryMetrics.java +++ b/processing/src/main/java/org/apache/druid/query/search/DefaultSearchQueryMetrics.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.search; - -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.java.util.common.ISE; -import io.druid.query.BitmapResultFactory; -import io.druid.query.Query; -import io.druid.query.QueryMetrics; -import io.druid.query.filter.Filter; +package org.apache.druid.query.search; + +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.query.BitmapResultFactory; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryMetrics; +import org.apache.druid.query.filter.Filter; import org.joda.time.Interval; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/search/DefaultSearchQueryMetricsFactory.java b/processing/src/main/java/org/apache/druid/query/search/DefaultSearchQueryMetricsFactory.java similarity index 91% rename from processing/src/main/java/io/druid/query/search/DefaultSearchQueryMetricsFactory.java rename to processing/src/main/java/org/apache/druid/query/search/DefaultSearchQueryMetricsFactory.java index c7a5a3e9fc33..76f0ebaf4267 100644 --- a/processing/src/main/java/io/druid/query/search/DefaultSearchQueryMetricsFactory.java +++ b/processing/src/main/java/org/apache/druid/query/search/DefaultSearchQueryMetricsFactory.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; import com.google.common.annotations.VisibleForTesting; import com.google.inject.Inject; -import io.druid.query.DefaultGenericQueryMetricsFactory; -import io.druid.query.GenericQueryMetricsFactory; +import org.apache.druid.query.DefaultGenericQueryMetricsFactory; +import org.apache.druid.query.GenericQueryMetricsFactory; public class DefaultSearchQueryMetricsFactory implements SearchQueryMetricsFactory { diff --git a/processing/src/main/java/io/druid/query/search/FragmentSearchQuerySpec.java b/processing/src/main/java/org/apache/druid/query/search/FragmentSearchQuerySpec.java similarity index 97% rename from processing/src/main/java/io/druid/query/search/FragmentSearchQuerySpec.java rename to processing/src/main/java/org/apache/druid/query/search/FragmentSearchQuerySpec.java index cdf7a7d66ae7..dfdfb7072079 100644 --- a/processing/src/main/java/io/druid/query/search/FragmentSearchQuerySpec.java +++ b/processing/src/main/java/org/apache/druid/query/search/FragmentSearchQuerySpec.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/search/InsensitiveContainsSearchQuerySpec.java b/processing/src/main/java/org/apache/druid/query/search/InsensitiveContainsSearchQuerySpec.java similarity index 97% rename from processing/src/main/java/io/druid/query/search/InsensitiveContainsSearchQuerySpec.java rename to processing/src/main/java/org/apache/druid/query/search/InsensitiveContainsSearchQuerySpec.java index 967fceb5d88b..4c660ad2b8c4 100644 --- a/processing/src/main/java/io/druid/query/search/InsensitiveContainsSearchQuerySpec.java +++ b/processing/src/main/java/org/apache/druid/query/search/InsensitiveContainsSearchQuerySpec.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/processing/src/main/java/io/druid/query/search/RegexSearchQuerySpec.java b/processing/src/main/java/org/apache/druid/query/search/RegexSearchQuerySpec.java similarity index 96% rename from processing/src/main/java/io/druid/query/search/RegexSearchQuerySpec.java rename to processing/src/main/java/org/apache/druid/query/search/RegexSearchQuerySpec.java index 510053a07af0..76335bdde040 100644 --- a/processing/src/main/java/io/druid/query/search/RegexSearchQuerySpec.java +++ b/processing/src/main/java/org/apache/druid/query/search/RegexSearchQuerySpec.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/search/RoaringBitmapDecisionHelper.java b/processing/src/main/java/org/apache/druid/query/search/RoaringBitmapDecisionHelper.java similarity index 89% rename from processing/src/main/java/io/druid/query/search/RoaringBitmapDecisionHelper.java rename to processing/src/main/java/org/apache/druid/query/search/RoaringBitmapDecisionHelper.java index c95b16008db0..14e3cdd45ce1 100644 --- a/processing/src/main/java/io/druid/query/search/RoaringBitmapDecisionHelper.java +++ b/processing/src/main/java/org/apache/druid/query/search/RoaringBitmapDecisionHelper.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; public class RoaringBitmapDecisionHelper extends SearchQueryDecisionHelper { // This value comes from an experiment. - // See the discussion at https://github.com/druid-io/druid/pull/3792#issuecomment-268331804. + // See the discussion at https://github.com/apache/incubator-druid/pull/3792#issuecomment-268331804. private static final double BITMAP_INTERSECT_COST = 4.5; private static final RoaringBitmapDecisionHelper INSTANCE = new RoaringBitmapDecisionHelper(); diff --git a/processing/src/main/java/io/druid/query/search/SearchBinaryFn.java b/processing/src/main/java/org/apache/druid/query/search/SearchBinaryFn.java similarity index 92% rename from processing/src/main/java/io/druid/query/search/SearchBinaryFn.java rename to processing/src/main/java/org/apache/druid/query/search/SearchBinaryFn.java index 53fe782139aa..31e954d7af9e 100644 --- a/processing/src/main/java/io/druid/query/search/SearchBinaryFn.java +++ b/processing/src/main/java/org/apache/druid/query/search/SearchBinaryFn.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import io.druid.java.util.common.granularity.AllGranularity; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.nary.BinaryFn; -import io.druid.query.Result; +import org.apache.druid.java.util.common.granularity.AllGranularity; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.nary.BinaryFn; +import org.apache.druid.query.Result; import org.joda.time.DateTime; import java.util.Arrays; diff --git a/processing/src/main/java/io/druid/query/search/SearchHit.java b/processing/src/main/java/org/apache/druid/query/search/SearchHit.java similarity index 96% rename from processing/src/main/java/io/druid/query/search/SearchHit.java rename to processing/src/main/java/org/apache/druid/query/search/SearchHit.java index deb192e986cc..643ee883a4d1 100644 --- a/processing/src/main/java/io/druid/query/search/SearchHit.java +++ b/processing/src/main/java/org/apache/druid/query/search/SearchHit.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.common.config.NullHandling; +import org.apache.druid.common.config.NullHandling; /** */ diff --git a/processing/src/main/java/io/druid/query/search/SearchQuery.java b/processing/src/main/java/org/apache/druid/query/search/SearchQuery.java similarity index 90% rename from processing/src/main/java/io/druid/query/search/SearchQuery.java rename to processing/src/main/java/org/apache/druid/query/search/SearchQuery.java index d4828755fea5..4182c5b6d72f 100644 --- a/processing/src/main/java/io/druid/query/search/SearchQuery.java +++ b/processing/src/main/java/org/apache/druid/query/search/SearchQuery.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.query.BaseQuery; -import io.druid.query.DataSource; -import io.druid.query.Druids; -import io.druid.query.Query; -import io.druid.query.Result; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.filter.DimFilter; -import io.druid.query.ordering.StringComparators; -import io.druid.query.spec.QuerySegmentSpec; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.query.BaseQuery; +import org.apache.druid.query.DataSource; +import org.apache.druid.query.Druids; +import org.apache.druid.query.Query; +import org.apache.druid.query.Result; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.query.spec.QuerySegmentSpec; import java.util.List; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/search/SearchQueryConfig.java b/processing/src/main/java/org/apache/druid/query/search/SearchQueryConfig.java similarity index 97% rename from processing/src/main/java/io/druid/query/search/SearchQueryConfig.java rename to processing/src/main/java/org/apache/druid/query/search/SearchQueryConfig.java index 1a0775a1ae62..c45793c98517 100644 --- a/processing/src/main/java/io/druid/query/search/SearchQueryConfig.java +++ b/processing/src/main/java/org/apache/druid/query/search/SearchQueryConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/processing/src/main/java/io/druid/query/search/SearchQueryDecisionHelper.java b/processing/src/main/java/org/apache/druid/query/search/SearchQueryDecisionHelper.java similarity index 96% rename from processing/src/main/java/io/druid/query/search/SearchQueryDecisionHelper.java rename to processing/src/main/java/org/apache/druid/query/search/SearchQueryDecisionHelper.java index dd194a14cf32..fb68f9ae5789 100644 --- a/processing/src/main/java/io/druid/query/search/SearchQueryDecisionHelper.java +++ b/processing/src/main/java/org/apache/druid/query/search/SearchQueryDecisionHelper.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; public abstract class SearchQueryDecisionHelper { diff --git a/processing/src/main/java/io/druid/query/search/SearchQueryExecutor.java b/processing/src/main/java/org/apache/druid/query/search/SearchQueryExecutor.java similarity index 91% rename from processing/src/main/java/io/druid/query/search/SearchQueryExecutor.java rename to processing/src/main/java/org/apache/druid/query/search/SearchQueryExecutor.java index a211b646ea02..da4b9b52806b 100644 --- a/processing/src/main/java/io/druid/query/search/SearchQueryExecutor.java +++ b/processing/src/main/java/org/apache/druid/query/search/SearchQueryExecutor.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; -import io.druid.query.dimension.DimensionSpec; -import io.druid.segment.Segment; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.segment.Segment; import it.unimi.dsi.fastutil.objects.Object2IntRBTreeMap; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/search/SearchQueryMetrics.java b/processing/src/main/java/org/apache/druid/query/search/SearchQueryMetrics.java similarity index 87% rename from processing/src/main/java/io/druid/query/search/SearchQueryMetrics.java rename to processing/src/main/java/org/apache/druid/query/search/SearchQueryMetrics.java index ecf519a50dae..294a80b43817 100644 --- a/processing/src/main/java/io/druid/query/search/SearchQueryMetrics.java +++ b/processing/src/main/java/org/apache/druid/query/search/SearchQueryMetrics.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; -import io.druid.query.QueryMetrics; +import org.apache.druid.query.QueryMetrics; public interface SearchQueryMetrics extends QueryMetrics { @@ -27,7 +27,7 @@ public interface SearchQueryMetrics extends QueryMetrics * Sets the granularity of {@link SearchQuery#getGranularity()} of the given query as dimension. * * This method is going to be used in "full" metrics impl, - * see https://github.com/druid-io/druid/pull/4570#issuecomment-319458229 + * see https://github.com/apache/incubator-druid/pull/4570#issuecomment-319458229 */ @SuppressWarnings("unused") void granularity(SearchQuery query); diff --git a/processing/src/main/java/io/druid/query/search/SearchQueryMetricsFactory.java b/processing/src/main/java/org/apache/druid/query/search/SearchQueryMetricsFactory.java similarity index 97% rename from processing/src/main/java/io/druid/query/search/SearchQueryMetricsFactory.java rename to processing/src/main/java/org/apache/druid/query/search/SearchQueryMetricsFactory.java index 2493b54d88b5..8b950e2e9129 100644 --- a/processing/src/main/java/io/druid/query/search/SearchQueryMetricsFactory.java +++ b/processing/src/main/java/org/apache/druid/query/search/SearchQueryMetricsFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; /** * Implementations could be injected using diff --git a/processing/src/main/java/io/druid/query/search/SearchQueryQueryToolChest.java b/processing/src/main/java/org/apache/druid/query/search/SearchQueryQueryToolChest.java similarity index 94% rename from processing/src/main/java/io/druid/query/search/SearchQueryQueryToolChest.java rename to processing/src/main/java/org/apache/druid/query/search/SearchQueryQueryToolChest.java index 6f6dfe8a1bcf..8f800938f93c 100644 --- a/processing/src/main/java/io/druid/query/search/SearchQueryQueryToolChest.java +++ b/processing/src/main/java/org/apache/druid/query/search/SearchQueryQueryToolChest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.annotations.VisibleForTesting; @@ -30,25 +30,25 @@ import com.google.common.collect.Ordering; import com.google.common.primitives.Ints; import com.google.inject.Inject; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.common.guava.nary.BinaryFn; -import io.druid.query.CacheStrategy; -import io.druid.query.IntervalChunkingQueryRunnerDecorator; -import io.druid.query.Query; -import io.druid.query.QueryContexts; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryToolChest; -import io.druid.query.Result; -import io.druid.query.ResultGranularTimestampComparator; -import io.druid.query.ResultMergeQueryRunner; -import io.druid.query.aggregation.MetricManipulationFn; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.filter.DimFilter; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.guava.nary.BinaryFn; +import org.apache.druid.query.CacheStrategy; +import org.apache.druid.query.IntervalChunkingQueryRunnerDecorator; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryContexts; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.Result; +import org.apache.druid.query.ResultGranularTimestampComparator; +import org.apache.druid.query.ResultMergeQueryRunner; +import org.apache.druid.query.aggregation.MetricManipulationFn; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.filter.DimFilter; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/search/SearchQueryRunner.java b/processing/src/main/java/org/apache/druid/query/search/SearchQueryRunner.java similarity index 87% rename from processing/src/main/java/io/druid/query/search/SearchQueryRunner.java rename to processing/src/main/java/org/apache/druid/query/search/SearchQueryRunner.java index de51b2cffc37..6808cdf4774b 100644 --- a/processing/src/main/java/io/druid/query/search/SearchQueryRunner.java +++ b/processing/src/main/java/org/apache/druid/query/search/SearchQueryRunner.java @@ -17,33 +17,33 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.guava.FunctionalIterable; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.query.Query; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.Result; -import io.druid.query.dimension.ColumnSelectorStrategy; -import io.druid.query.dimension.ColumnSelectorStrategyFactory; -import io.druid.segment.BaseDoubleColumnValueSelector; -import io.druid.segment.BaseFloatColumnValueSelector; -import io.druid.segment.BaseLongColumnValueSelector; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.DimensionSelector; -import io.druid.segment.DimensionSelectorUtils; -import io.druid.segment.Segment; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.column.ValueType; -import io.druid.segment.data.IndexedInts; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.guava.FunctionalIterable; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.Result; +import org.apache.druid.query.dimension.ColumnSelectorStrategy; +import org.apache.druid.query.dimension.ColumnSelectorStrategyFactory; +import org.apache.druid.segment.BaseDoubleColumnValueSelector; +import org.apache.druid.segment.BaseFloatColumnValueSelector; +import org.apache.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.DimensionSelectorUtils; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.data.IndexedInts; import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntRBTreeMap; diff --git a/processing/src/main/java/io/druid/query/search/SearchQueryRunnerFactory.java b/processing/src/main/java/org/apache/druid/query/search/SearchQueryRunnerFactory.java similarity index 85% rename from processing/src/main/java/io/druid/query/search/SearchQueryRunnerFactory.java rename to processing/src/main/java/org/apache/druid/query/search/SearchQueryRunnerFactory.java index b680b2839ba3..e806f1b7262f 100644 --- a/processing/src/main/java/io/druid/query/search/SearchQueryRunnerFactory.java +++ b/processing/src/main/java/org/apache/druid/query/search/SearchQueryRunnerFactory.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; import com.google.inject.Inject; -import io.druid.query.ChainedExecutionQueryRunner; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryToolChest; -import io.druid.query.QueryWatcher; -import io.druid.query.Result; -import io.druid.segment.Segment; +import org.apache.druid.query.ChainedExecutionQueryRunner; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.QueryWatcher; +import org.apache.druid.query.Result; +import org.apache.druid.segment.Segment; import java.util.concurrent.ExecutorService; diff --git a/processing/src/main/java/io/druid/query/search/SearchQuerySpec.java b/processing/src/main/java/org/apache/druid/query/search/SearchQuerySpec.java similarity index 97% rename from processing/src/main/java/io/druid/query/search/SearchQuerySpec.java rename to processing/src/main/java/org/apache/druid/query/search/SearchQuerySpec.java index 1f00058c2f04..c0daf775eb5a 100644 --- a/processing/src/main/java/io/druid/query/search/SearchQuerySpec.java +++ b/processing/src/main/java/org/apache/druid/query/search/SearchQuerySpec.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/processing/src/main/java/io/druid/query/search/SearchResultValue.java b/processing/src/main/java/org/apache/druid/query/search/SearchResultValue.java similarity index 98% rename from processing/src/main/java/io/druid/query/search/SearchResultValue.java rename to processing/src/main/java/org/apache/druid/query/search/SearchResultValue.java index 18e3f9deb694..3c4360e07ea1 100644 --- a/processing/src/main/java/io/druid/query/search/SearchResultValue.java +++ b/processing/src/main/java/org/apache/druid/query/search/SearchResultValue.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/processing/src/main/java/io/druid/query/search/SearchSortSpec.java b/processing/src/main/java/org/apache/druid/query/search/SearchSortSpec.java similarity index 92% rename from processing/src/main/java/io/druid/query/search/SearchSortSpec.java rename to processing/src/main/java/org/apache/druid/query/search/SearchSortSpec.java index 28ec98f952ab..a7aa2250ba81 100644 --- a/processing/src/main/java/io/druid/query/search/SearchSortSpec.java +++ b/processing/src/main/java/org/apache/druid/query/search/SearchSortSpec.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.StringUtils; -import io.druid.query.ordering.StringComparator; -import io.druid.query.ordering.StringComparators; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.ordering.StringComparator; +import org.apache.druid.query.ordering.StringComparators; import java.util.Comparator; diff --git a/processing/src/main/java/io/druid/query/search/SearchStrategy.java b/processing/src/main/java/org/apache/druid/query/search/SearchStrategy.java similarity index 80% rename from processing/src/main/java/io/druid/query/search/SearchStrategy.java rename to processing/src/main/java/org/apache/druid/query/search/SearchStrategy.java index 159dc65a6eb4..07e6acd5d1df 100644 --- a/processing/src/main/java/io/druid/query/search/SearchStrategy.java +++ b/processing/src/main/java/org/apache/druid/query/search/SearchStrategy.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.ConciseBitmapFactory; -import io.druid.collections.bitmap.RoaringBitmapFactory; -import io.druid.java.util.common.IAE; -import io.druid.query.Druids; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.filter.Filter; -import io.druid.segment.QueryableIndex; -import io.druid.segment.Segment; -import io.druid.segment.data.Indexed; -import io.druid.segment.filter.Filters; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.ConciseBitmapFactory; +import org.apache.druid.collections.bitmap.RoaringBitmapFactory; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.query.Druids; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.data.Indexed; +import org.apache.druid.segment.filter.Filters; import org.joda.time.Interval; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/search/SearchStrategySelector.java b/processing/src/main/java/org/apache/druid/query/search/SearchStrategySelector.java similarity index 93% rename from processing/src/main/java/io/druid/query/search/SearchStrategySelector.java rename to processing/src/main/java/org/apache/druid/query/search/SearchStrategySelector.java index e873eba7a25f..6b8be88de249 100644 --- a/processing/src/main/java/io/druid/query/search/SearchStrategySelector.java +++ b/processing/src/main/java/org/apache/druid/query/search/SearchStrategySelector.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; import com.google.common.base.Supplier; import com.google.inject.Inject; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.common.ISE; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.common.ISE; public class SearchStrategySelector { diff --git a/processing/src/main/java/io/druid/query/search/UseIndexesStrategy.java b/processing/src/main/java/org/apache/druid/query/search/UseIndexesStrategy.java similarity index 89% rename from processing/src/main/java/io/druid/query/search/UseIndexesStrategy.java rename to processing/src/main/java/org/apache/druid/query/search/UseIndexesStrategy.java index 2276bf868ae5..e01c2af070c8 100644 --- a/processing/src/main/java/io/druid/query/search/UseIndexesStrategy.java +++ b/processing/src/main/java/org/apache/druid/query/search/UseIndexesStrategy.java @@ -17,30 +17,30 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.collections.bitmap.MutableBitmap; -import io.druid.java.util.common.Pair; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.extraction.IdentityExtractionFn; -import io.druid.query.filter.BitmapIndexSelector; -import io.druid.query.filter.Filter; -import io.druid.query.search.CursorOnlyStrategy.CursorBasedExecutor; -import io.druid.segment.ColumnSelectorBitmapIndexSelector; -import io.druid.segment.QueryableIndex; -import io.druid.segment.Segment; -import io.druid.segment.StorageAdapter; -import io.druid.segment.VirtualColumns; -import io.druid.segment.column.BitmapIndex; -import io.druid.segment.column.Column; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.column.GenericColumn; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.collections.bitmap.MutableBitmap; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.extraction.IdentityExtractionFn; +import org.apache.druid.query.filter.BitmapIndexSelector; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.query.search.CursorOnlyStrategy.CursorBasedExecutor; +import org.apache.druid.segment.ColumnSelectorBitmapIndexSelector; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.StorageAdapter; +import org.apache.druid.segment.VirtualColumns; +import org.apache.druid.segment.column.BitmapIndex; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.column.GenericColumn; import it.unimi.dsi.fastutil.objects.Object2IntRBTreeMap; import org.joda.time.Interval; diff --git a/processing/src/main/java/io/druid/query/select/DefaultSelectQueryMetrics.java b/processing/src/main/java/org/apache/druid/query/select/DefaultSelectQueryMetrics.java similarity index 93% rename from processing/src/main/java/io/druid/query/select/DefaultSelectQueryMetrics.java rename to processing/src/main/java/org/apache/druid/query/select/DefaultSelectQueryMetrics.java index c79dc83b3a7e..bf594127d00f 100644 --- a/processing/src/main/java/io/druid/query/select/DefaultSelectQueryMetrics.java +++ b/processing/src/main/java/org/apache/druid/query/select/DefaultSelectQueryMetrics.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.select; - -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.java.util.common.ISE; -import io.druid.query.BitmapResultFactory; -import io.druid.query.Query; -import io.druid.query.QueryMetrics; -import io.druid.query.filter.Filter; +package org.apache.druid.query.select; + +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.query.BitmapResultFactory; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryMetrics; +import org.apache.druid.query.filter.Filter; import org.joda.time.Interval; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/select/DefaultSelectQueryMetricsFactory.java b/processing/src/main/java/org/apache/druid/query/select/DefaultSelectQueryMetricsFactory.java similarity index 91% rename from processing/src/main/java/io/druid/query/select/DefaultSelectQueryMetricsFactory.java rename to processing/src/main/java/org/apache/druid/query/select/DefaultSelectQueryMetricsFactory.java index 202ae18b5053..83384b2aa671 100644 --- a/processing/src/main/java/io/druid/query/select/DefaultSelectQueryMetricsFactory.java +++ b/processing/src/main/java/org/apache/druid/query/select/DefaultSelectQueryMetricsFactory.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.select; +package org.apache.druid.query.select; import com.google.common.annotations.VisibleForTesting; import com.google.inject.Inject; -import io.druid.query.DefaultGenericQueryMetricsFactory; -import io.druid.query.GenericQueryMetricsFactory; +import org.apache.druid.query.DefaultGenericQueryMetricsFactory; +import org.apache.druid.query.GenericQueryMetricsFactory; public class DefaultSelectQueryMetricsFactory implements SelectQueryMetricsFactory { diff --git a/processing/src/main/java/io/druid/query/select/EventHolder.java b/processing/src/main/java/org/apache/druid/query/select/EventHolder.java similarity index 95% rename from processing/src/main/java/io/druid/query/select/EventHolder.java rename to processing/src/main/java/org/apache/druid/query/select/EventHolder.java index 13ad2d8f5be9..0146decb84d1 100644 --- a/processing/src/main/java/io/druid/query/select/EventHolder.java +++ b/processing/src/main/java/org/apache/druid/query/select/EventHolder.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.select; +package org.apache.druid.query.select; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.Maps; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; import org.joda.time.DateTime; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/select/PagingOffset.java b/processing/src/main/java/org/apache/druid/query/select/PagingOffset.java similarity index 98% rename from processing/src/main/java/io/druid/query/select/PagingOffset.java rename to processing/src/main/java/org/apache/druid/query/select/PagingOffset.java index b4ab32f03e78..3a72c1d46127 100644 --- a/processing/src/main/java/io/druid/query/select/PagingOffset.java +++ b/processing/src/main/java/org/apache/druid/query/select/PagingOffset.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.select; +package org.apache.druid.query.select; import com.google.common.annotations.VisibleForTesting; diff --git a/processing/src/main/java/io/druid/query/select/PagingSpec.java b/processing/src/main/java/org/apache/druid/query/select/PagingSpec.java similarity index 98% rename from processing/src/main/java/io/druid/query/select/PagingSpec.java rename to processing/src/main/java/org/apache/druid/query/select/PagingSpec.java index c7d82c3fed3d..c77c16c24481 100644 --- a/processing/src/main/java/io/druid/query/select/PagingSpec.java +++ b/processing/src/main/java/org/apache/druid/query/select/PagingSpec.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.select; +package org.apache.druid.query.select; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.Maps; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import java.nio.ByteBuffer; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/select/SelectBinaryFn.java b/processing/src/main/java/org/apache/druid/query/select/SelectBinaryFn.java similarity index 91% rename from processing/src/main/java/io/druid/query/select/SelectBinaryFn.java rename to processing/src/main/java/org/apache/druid/query/select/SelectBinaryFn.java index 14de22789602..aa2ecac67152 100644 --- a/processing/src/main/java/io/druid/query/select/SelectBinaryFn.java +++ b/processing/src/main/java/org/apache/druid/query/select/SelectBinaryFn.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.select; +package org.apache.druid.query.select; import com.google.common.collect.Sets; -import io.druid.java.util.common.granularity.AllGranularity; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.nary.BinaryFn; -import io.druid.query.Result; +import org.apache.druid.java.util.common.granularity.AllGranularity; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.nary.BinaryFn; +import org.apache.druid.query.Result; import org.joda.time.DateTime; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/select/SelectQuery.java b/processing/src/main/java/org/apache/druid/query/select/SelectQuery.java similarity index 91% rename from processing/src/main/java/io/druid/query/select/SelectQuery.java rename to processing/src/main/java/org/apache/druid/query/select/SelectQuery.java index b1c99f51b75c..7dee4056b63c 100644 --- a/processing/src/main/java/io/druid/query/select/SelectQuery.java +++ b/processing/src/main/java/org/apache/druid/query/select/SelectQuery.java @@ -17,23 +17,23 @@ * under the License. */ -package io.druid.query.select; +package org.apache.druid.query.select; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.base.Preconditions; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.query.BaseQuery; -import io.druid.query.DataSource; -import io.druid.query.Druids; -import io.druid.query.Query; -import io.druid.query.Result; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.filter.DimFilter; -import io.druid.query.spec.QuerySegmentSpec; -import io.druid.segment.VirtualColumns; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.query.BaseQuery; +import org.apache.druid.query.DataSource; +import org.apache.druid.query.Druids; +import org.apache.druid.query.Query; +import org.apache.druid.query.Result; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.spec.QuerySegmentSpec; +import org.apache.druid.segment.VirtualColumns; import java.util.List; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/select/SelectQueryConfig.java b/processing/src/main/java/org/apache/druid/query/select/SelectQueryConfig.java similarity index 97% rename from processing/src/main/java/io/druid/query/select/SelectQueryConfig.java rename to processing/src/main/java/org/apache/druid/query/select/SelectQueryConfig.java index e5cbe5b108f3..386fc09387ee 100644 --- a/processing/src/main/java/io/druid/query/select/SelectQueryConfig.java +++ b/processing/src/main/java/org/apache/druid/query/select/SelectQueryConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.select; +package org.apache.druid.query.select; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/processing/src/main/java/io/druid/query/select/SelectQueryEngine.java b/processing/src/main/java/org/apache/druid/query/select/SelectQueryEngine.java similarity index 86% rename from processing/src/main/java/io/druid/query/select/SelectQueryEngine.java rename to processing/src/main/java/org/apache/druid/query/select/SelectQueryEngine.java index 47f9fbdb2fc5..a61067583244 100644 --- a/processing/src/main/java/io/druid/query/select/SelectQueryEngine.java +++ b/processing/src/main/java/org/apache/druid/query/select/SelectQueryEngine.java @@ -17,41 +17,41 @@ * under the License. */ -package io.druid.query.select; +package org.apache.druid.query.select; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.ColumnSelectorPlus; -import io.druid.query.QueryRunnerHelper; -import io.druid.query.Result; -import io.druid.query.dimension.ColumnSelectorStrategy; -import io.druid.query.dimension.ColumnSelectorStrategyFactory; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.filter.Filter; -import io.druid.segment.BaseDoubleColumnValueSelector; -import io.druid.segment.BaseFloatColumnValueSelector; -import io.druid.segment.BaseLongColumnValueSelector; -import io.druid.segment.BaseObjectColumnValueSelector; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.Cursor; -import io.druid.segment.DimensionHandlerUtils; -import io.druid.segment.DimensionSelector; -import io.druid.segment.Segment; -import io.druid.segment.StorageAdapter; -import io.druid.segment.column.Column; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.column.ValueType; -import io.druid.segment.data.IndexedInts; -import io.druid.segment.filter.Filters; -import io.druid.timeline.DataSegmentUtils; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.ColumnSelectorPlus; +import org.apache.druid.query.QueryRunnerHelper; +import org.apache.druid.query.Result; +import org.apache.druid.query.dimension.ColumnSelectorStrategy; +import org.apache.druid.query.dimension.ColumnSelectorStrategyFactory; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.segment.BaseDoubleColumnValueSelector; +import org.apache.druid.segment.BaseFloatColumnValueSelector; +import org.apache.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.Cursor; +import org.apache.druid.segment.DimensionHandlerUtils; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.StorageAdapter; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.data.IndexedInts; +import org.apache.druid.segment.filter.Filters; +import org.apache.druid.timeline.DataSegmentUtils; import org.joda.time.Interval; import java.util.ArrayList; diff --git a/processing/src/main/java/io/druid/query/select/SelectQueryMetrics.java b/processing/src/main/java/org/apache/druid/query/select/SelectQueryMetrics.java similarity index 87% rename from processing/src/main/java/io/druid/query/select/SelectQueryMetrics.java rename to processing/src/main/java/org/apache/druid/query/select/SelectQueryMetrics.java index 064725c27b89..790c01631826 100644 --- a/processing/src/main/java/io/druid/query/select/SelectQueryMetrics.java +++ b/processing/src/main/java/org/apache/druid/query/select/SelectQueryMetrics.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.select; +package org.apache.druid.query.select; -import io.druid.query.QueryMetrics; +import org.apache.druid.query.QueryMetrics; public interface SelectQueryMetrics extends QueryMetrics { @@ -27,7 +27,7 @@ public interface SelectQueryMetrics extends QueryMetrics * Sets the granularity of {@link SelectQuery#getGranularity()} of the given query as dimension. * * This method is going to be used in "full" metrics impl, - * see https://github.com/druid-io/druid/pull/4570#issuecomment-319458229 + * see https://github.com/apache/incubator-druid/pull/4570#issuecomment-319458229 */ @SuppressWarnings("unused") void granularity(SelectQuery query); diff --git a/processing/src/main/java/io/druid/query/select/SelectQueryMetricsFactory.java b/processing/src/main/java/org/apache/druid/query/select/SelectQueryMetricsFactory.java similarity index 97% rename from processing/src/main/java/io/druid/query/select/SelectQueryMetricsFactory.java rename to processing/src/main/java/org/apache/druid/query/select/SelectQueryMetricsFactory.java index 444b78ed6fe9..6b0d7fdb3768 100644 --- a/processing/src/main/java/io/druid/query/select/SelectQueryMetricsFactory.java +++ b/processing/src/main/java/org/apache/druid/query/select/SelectQueryMetricsFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.select; +package org.apache.druid.query.select; /** * Implementations could be injected using diff --git a/processing/src/main/java/io/druid/query/select/SelectQueryQueryToolChest.java b/processing/src/main/java/org/apache/druid/query/select/SelectQueryQueryToolChest.java similarity index 93% rename from processing/src/main/java/io/druid/query/select/SelectQueryQueryToolChest.java rename to processing/src/main/java/org/apache/druid/query/select/SelectQueryQueryToolChest.java index fd268e99ecc3..ad2ae5563e57 100644 --- a/processing/src/main/java/io/druid/query/select/SelectQueryQueryToolChest.java +++ b/processing/src/main/java/org/apache/druid/query/select/SelectQueryQueryToolChest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.select; +package org.apache.druid.query.select; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -32,25 +32,25 @@ import com.google.common.collect.Ordering; import com.google.common.collect.Sets; import com.google.inject.Inject; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.Comparators; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.nary.BinaryFn; -import io.druid.query.CacheStrategy; -import io.druid.query.IntervalChunkingQueryRunnerDecorator; -import io.druid.query.Query; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryToolChest; -import io.druid.query.Result; -import io.druid.query.ResultGranularTimestampComparator; -import io.druid.query.ResultMergeQueryRunner; -import io.druid.query.aggregation.MetricManipulationFn; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.filter.DimFilter; -import io.druid.timeline.DataSegmentUtils; -import io.druid.timeline.LogicalSegment; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.nary.BinaryFn; +import org.apache.druid.query.CacheStrategy; +import org.apache.druid.query.IntervalChunkingQueryRunnerDecorator; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.Result; +import org.apache.druid.query.ResultGranularTimestampComparator; +import org.apache.druid.query.ResultMergeQueryRunner; +import org.apache.druid.query.aggregation.MetricManipulationFn; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.timeline.DataSegmentUtils; +import org.apache.druid.timeline.LogicalSegment; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/processing/src/main/java/io/druid/query/select/SelectQueryRunnerFactory.java b/processing/src/main/java/org/apache/druid/query/select/SelectQueryRunnerFactory.java similarity index 83% rename from processing/src/main/java/io/druid/query/select/SelectQueryRunnerFactory.java rename to processing/src/main/java/org/apache/druid/query/select/SelectQueryRunnerFactory.java index 0161597f5fdb..ab3216255841 100644 --- a/processing/src/main/java/io/druid/query/select/SelectQueryRunnerFactory.java +++ b/processing/src/main/java/org/apache/druid/query/select/SelectQueryRunnerFactory.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.query.select; +package org.apache.druid.query.select; import com.google.inject.Inject; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.ChainedExecutionQueryRunner; -import io.druid.query.Query; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryToolChest; -import io.druid.query.QueryWatcher; -import io.druid.query.Result; -import io.druid.segment.Segment; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.ChainedExecutionQueryRunner; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.QueryWatcher; +import org.apache.druid.query.Result; +import org.apache.druid.segment.Segment; import java.util.Map; import java.util.concurrent.ExecutorService; diff --git a/processing/src/main/java/io/druid/query/select/SelectResultValue.java b/processing/src/main/java/org/apache/druid/query/select/SelectResultValue.java similarity index 98% rename from processing/src/main/java/io/druid/query/select/SelectResultValue.java rename to processing/src/main/java/org/apache/druid/query/select/SelectResultValue.java index 568dab9943fc..fb138664137a 100644 --- a/processing/src/main/java/io/druid/query/select/SelectResultValue.java +++ b/processing/src/main/java/org/apache/druid/query/select/SelectResultValue.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.select; +package org.apache.druid.query.select; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/processing/src/main/java/io/druid/query/select/SelectResultValueBuilder.java b/processing/src/main/java/org/apache/druid/query/select/SelectResultValueBuilder.java similarity index 96% rename from processing/src/main/java/io/druid/query/select/SelectResultValueBuilder.java rename to processing/src/main/java/org/apache/druid/query/select/SelectResultValueBuilder.java index 3f45b0a67ac2..a4ded3feee60 100644 --- a/processing/src/main/java/io/druid/query/select/SelectResultValueBuilder.java +++ b/processing/src/main/java/org/apache/druid/query/select/SelectResultValueBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.select; +package org.apache.druid.query.select; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -25,8 +25,8 @@ import com.google.common.collect.Queues; import com.google.common.collect.Sets; import com.google.common.primitives.Longs; -import io.druid.java.util.common.guava.Comparators; -import io.druid.query.Result; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.query.Result; import org.joda.time.DateTime; import java.util.Comparator; diff --git a/processing/src/main/java/io/druid/query/spec/LegacySegmentSpec.java b/processing/src/main/java/org/apache/druid/query/spec/LegacySegmentSpec.java similarity index 96% rename from processing/src/main/java/io/druid/query/spec/LegacySegmentSpec.java rename to processing/src/main/java/org/apache/druid/query/spec/LegacySegmentSpec.java index 25dadf75ee53..96d079a6fba9 100644 --- a/processing/src/main/java/io/druid/query/spec/LegacySegmentSpec.java +++ b/processing/src/main/java/org/apache/druid/query/spec/LegacySegmentSpec.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.spec; +package org.apache.druid.query.spec; import com.fasterxml.jackson.annotation.JsonCreator; -import io.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.IAE; import org.joda.time.Interval; import org.joda.time.chrono.ISOChronology; diff --git a/processing/src/main/java/io/druid/query/spec/MultipleIntervalSegmentSpec.java b/processing/src/main/java/org/apache/druid/query/spec/MultipleIntervalSegmentSpec.java similarity index 91% rename from processing/src/main/java/io/druid/query/spec/MultipleIntervalSegmentSpec.java rename to processing/src/main/java/org/apache/druid/query/spec/MultipleIntervalSegmentSpec.java index ccecea2dcb93..2f8e83385cb2 100644 --- a/processing/src/main/java/io/druid/query/spec/MultipleIntervalSegmentSpec.java +++ b/processing/src/main/java/org/apache/druid/query/spec/MultipleIntervalSegmentSpec.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.spec; +package org.apache.druid.query.spec; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.JodaUtils; -import io.druid.query.Query; -import io.druid.query.QueryRunner; -import io.druid.query.QuerySegmentWalker; +import org.apache.druid.java.util.common.JodaUtils; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QuerySegmentWalker; import org.joda.time.Interval; import java.util.Collections; diff --git a/processing/src/main/java/io/druid/query/spec/MultipleSpecificSegmentSpec.java b/processing/src/main/java/org/apache/druid/query/spec/MultipleSpecificSegmentSpec.java similarity index 91% rename from processing/src/main/java/io/druid/query/spec/MultipleSpecificSegmentSpec.java rename to processing/src/main/java/org/apache/druid/query/spec/MultipleSpecificSegmentSpec.java index a7ce08cc5851..626233580dd1 100644 --- a/processing/src/main/java/io/druid/query/spec/MultipleSpecificSegmentSpec.java +++ b/processing/src/main/java/org/apache/druid/query/spec/MultipleSpecificSegmentSpec.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.spec; +package org.apache.druid.query.spec; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Function; import com.google.common.collect.Iterables; -import io.druid.java.util.common.JodaUtils; -import io.druid.query.Query; -import io.druid.query.QueryRunner; -import io.druid.query.QuerySegmentWalker; -import io.druid.query.SegmentDescriptor; +import org.apache.druid.java.util.common.JodaUtils; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QuerySegmentWalker; +import org.apache.druid.query.SegmentDescriptor; import org.joda.time.Interval; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/spec/QuerySegmentSpec.java b/processing/src/main/java/org/apache/druid/query/spec/QuerySegmentSpec.java similarity index 89% rename from processing/src/main/java/io/druid/query/spec/QuerySegmentSpec.java rename to processing/src/main/java/org/apache/druid/query/spec/QuerySegmentSpec.java index 09e4a3b3bd32..00f2dfd86b74 100644 --- a/processing/src/main/java/io/druid/query/spec/QuerySegmentSpec.java +++ b/processing/src/main/java/org/apache/druid/query/spec/QuerySegmentSpec.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.spec; +package org.apache.druid.query.spec; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.druid.query.Query; -import io.druid.query.QueryRunner; -import io.druid.query.QuerySegmentWalker; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QuerySegmentWalker; import org.joda.time.Interval; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/spec/SpecificSegmentQueryRunner.java b/processing/src/main/java/org/apache/druid/query/spec/SpecificSegmentQueryRunner.java similarity index 86% rename from processing/src/main/java/io/druid/query/spec/SpecificSegmentQueryRunner.java rename to processing/src/main/java/org/apache/druid/query/spec/SpecificSegmentQueryRunner.java index fd46460bcd10..7effb68037b3 100644 --- a/processing/src/main/java/io/druid/query/spec/SpecificSegmentQueryRunner.java +++ b/processing/src/main/java/org/apache/druid/query/spec/SpecificSegmentQueryRunner.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.query.spec; +package org.apache.druid.query.spec; import com.google.common.base.Supplier; import com.google.common.collect.Lists; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.guava.Accumulator; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.SequenceWrapper; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.common.guava.Yielder; -import io.druid.java.util.common.guava.Yielders; -import io.druid.java.util.common.guava.YieldingAccumulator; -import io.druid.query.Query; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.Result; -import io.druid.query.SegmentDescriptor; -import io.druid.segment.SegmentMissingException; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.guava.Accumulator; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.SequenceWrapper; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.guava.Yielder; +import org.apache.druid.java.util.common.guava.Yielders; +import org.apache.druid.java.util.common.guava.YieldingAccumulator; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.Result; +import org.apache.druid.query.SegmentDescriptor; +import org.apache.druid.segment.SegmentMissingException; import java.io.IOException; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/spec/SpecificSegmentSpec.java b/processing/src/main/java/org/apache/druid/query/spec/SpecificSegmentSpec.java similarity index 90% rename from processing/src/main/java/io/druid/query/spec/SpecificSegmentSpec.java rename to processing/src/main/java/org/apache/druid/query/spec/SpecificSegmentSpec.java index f805c3daba7b..861439ad68ab 100644 --- a/processing/src/main/java/io/druid/query/spec/SpecificSegmentSpec.java +++ b/processing/src/main/java/org/apache/druid/query/spec/SpecificSegmentSpec.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.spec; +package org.apache.druid.query.spec; -import io.druid.query.Query; -import io.druid.query.QueryRunner; -import io.druid.query.QuerySegmentWalker; -import io.druid.query.SegmentDescriptor; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QuerySegmentWalker; +import org.apache.druid.query.SegmentDescriptor; import org.joda.time.Interval; import java.util.Collections; diff --git a/processing/src/main/java/io/druid/query/timeboundary/TimeBoundaryQuery.java b/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQuery.java similarity index 91% rename from processing/src/main/java/io/druid/query/timeboundary/TimeBoundaryQuery.java rename to processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQuery.java index 41eda3421338..e1db75785156 100644 --- a/processing/src/main/java/io/druid/query/timeboundary/TimeBoundaryQuery.java +++ b/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQuery.java @@ -17,23 +17,23 @@ * under the License. */ -package io.druid.query.timeboundary; +package org.apache.druid.query.timeboundary; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.query.BaseQuery; -import io.druid.query.DataSource; -import io.druid.query.Druids; -import io.druid.query.Query; -import io.druid.query.Result; -import io.druid.query.filter.DimFilter; -import io.druid.query.spec.MultipleIntervalSegmentSpec; -import io.druid.query.spec.QuerySegmentSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.BaseQuery; +import org.apache.druid.query.DataSource; +import org.apache.druid.query.Druids; +import org.apache.druid.query.Query; +import org.apache.druid.query.Result; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.query.spec.QuerySegmentSpec; import org.joda.time.DateTime; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/timeboundary/TimeBoundaryQueryQueryToolChest.java b/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryQueryToolChest.java similarity index 88% rename from processing/src/main/java/io/druid/query/timeboundary/TimeBoundaryQueryQueryToolChest.java rename to processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryQueryToolChest.java index 9d49616024a3..e8a4f8d4a237 100644 --- a/processing/src/main/java/io/druid/query/timeboundary/TimeBoundaryQueryQueryToolChest.java +++ b/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryQueryToolChest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.timeboundary; +package org.apache.druid.query.timeboundary; import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.annotations.VisibleForTesting; @@ -27,21 +27,21 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.inject.Inject; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.query.BySegmentSkippingQueryRunner; -import io.druid.query.CacheStrategy; -import io.druid.query.DefaultGenericQueryMetricsFactory; -import io.druid.query.GenericQueryMetricsFactory; -import io.druid.query.Query; -import io.druid.query.QueryMetrics; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryToolChest; -import io.druid.query.Result; -import io.druid.query.aggregation.MetricManipulationFn; -import io.druid.timeline.LogicalSegment; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.query.BySegmentSkippingQueryRunner; +import org.apache.druid.query.CacheStrategy; +import org.apache.druid.query.DefaultGenericQueryMetricsFactory; +import org.apache.druid.query.GenericQueryMetricsFactory; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryMetrics; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.MetricManipulationFn; +import org.apache.druid.timeline.LogicalSegment; import java.nio.ByteBuffer; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/timeboundary/TimeBoundaryQueryRunnerFactory.java b/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryRunnerFactory.java similarity index 84% rename from processing/src/main/java/io/druid/query/timeboundary/TimeBoundaryQueryRunnerFactory.java rename to processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryRunnerFactory.java index 43d46041ce5b..ae025766d3e6 100644 --- a/processing/src/main/java/io/druid/query/timeboundary/TimeBoundaryQueryRunnerFactory.java +++ b/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryRunnerFactory.java @@ -17,31 +17,31 @@ * under the License. */ -package io.druid.query.timeboundary; +package org.apache.druid.query.timeboundary; import com.google.common.base.Function; import com.google.inject.Inject; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.BaseSequence; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.ChainedExecutionQueryRunner; -import io.druid.query.Query; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryRunnerHelper; -import io.druid.query.QueryToolChest; -import io.druid.query.QueryWatcher; -import io.druid.query.Result; -import io.druid.segment.BaseLongColumnValueSelector; -import io.druid.segment.Cursor; -import io.druid.segment.Segment; -import io.druid.segment.StorageAdapter; -import io.druid.segment.VirtualColumns; -import io.druid.segment.column.Column; -import io.druid.segment.filter.Filters; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.BaseSequence; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.ChainedExecutionQueryRunner; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryRunnerHelper; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.QueryWatcher; +import org.apache.druid.query.Result; +import org.apache.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.segment.Cursor; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.StorageAdapter; +import org.apache.druid.segment.VirtualColumns; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.filter.Filters; import org.joda.time.DateTime; import java.util.Iterator; diff --git a/processing/src/main/java/io/druid/query/timeboundary/TimeBoundaryResultValue.java b/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryResultValue.java similarity index 95% rename from processing/src/main/java/io/druid/query/timeboundary/TimeBoundaryResultValue.java rename to processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryResultValue.java index c3b2f4a85ebe..d5a1c447ad5b 100644 --- a/processing/src/main/java/io/druid/query/timeboundary/TimeBoundaryResultValue.java +++ b/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryResultValue.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.timeboundary; +package org.apache.druid.query.timeboundary; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.IAE; import org.joda.time.DateTime; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/query/timeseries/DefaultTimeseriesQueryMetrics.java b/processing/src/main/java/org/apache/druid/query/timeseries/DefaultTimeseriesQueryMetrics.java similarity index 93% rename from processing/src/main/java/io/druid/query/timeseries/DefaultTimeseriesQueryMetrics.java rename to processing/src/main/java/org/apache/druid/query/timeseries/DefaultTimeseriesQueryMetrics.java index d994ee7c0ed0..d682d34d7eed 100644 --- a/processing/src/main/java/io/druid/query/timeseries/DefaultTimeseriesQueryMetrics.java +++ b/processing/src/main/java/org/apache/druid/query/timeseries/DefaultTimeseriesQueryMetrics.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.timeseries; +package org.apache.druid.query.timeseries; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.query.DefaultQueryMetrics; -import io.druid.query.DruidMetrics; +import org.apache.druid.query.DefaultQueryMetrics; +import org.apache.druid.query.DruidMetrics; public class DefaultTimeseriesQueryMetrics extends DefaultQueryMetrics implements TimeseriesQueryMetrics diff --git a/processing/src/main/java/io/druid/query/timeseries/DefaultTimeseriesQueryMetricsFactory.java b/processing/src/main/java/org/apache/druid/query/timeseries/DefaultTimeseriesQueryMetricsFactory.java similarity index 87% rename from processing/src/main/java/io/druid/query/timeseries/DefaultTimeseriesQueryMetricsFactory.java rename to processing/src/main/java/org/apache/druid/query/timeseries/DefaultTimeseriesQueryMetricsFactory.java index 54e9ac54448c..ed236a6ccbf0 100644 --- a/processing/src/main/java/io/druid/query/timeseries/DefaultTimeseriesQueryMetricsFactory.java +++ b/processing/src/main/java/org/apache/druid/query/timeseries/DefaultTimeseriesQueryMetricsFactory.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.timeseries; +package org.apache.druid.query.timeseries; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; import com.google.inject.Inject; -import io.druid.guice.LazySingleton; -import io.druid.guice.annotations.Json; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.jackson.DefaultObjectMapper; @LazySingleton public class DefaultTimeseriesQueryMetricsFactory implements TimeseriesQueryMetricsFactory @@ -34,7 +34,7 @@ public class DefaultTimeseriesQueryMetricsFactory implements TimeseriesQueryMetr /** * Should be used only in tests, directly or indirectly (via {@link - * TimeseriesQueryQueryToolChest#TimeseriesQueryQueryToolChest(io.druid.query.IntervalChunkingQueryRunnerDecorator)}). + * TimeseriesQueryQueryToolChest#TimeseriesQueryQueryToolChest(org.apache.druid.query.IntervalChunkingQueryRunnerDecorator)}). */ @VisibleForTesting public static TimeseriesQueryMetricsFactory instance() diff --git a/processing/src/main/java/io/druid/query/timeseries/TimeseriesBinaryFn.java b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesBinaryFn.java similarity index 87% rename from processing/src/main/java/io/druid/query/timeseries/TimeseriesBinaryFn.java rename to processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesBinaryFn.java index 35f31f7c6513..9aafdaba7a14 100644 --- a/processing/src/main/java/io/druid/query/timeseries/TimeseriesBinaryFn.java +++ b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesBinaryFn.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.timeseries; +package org.apache.druid.query.timeseries; -import io.druid.java.util.common.granularity.AllGranularity; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.nary.BinaryFn; -import io.druid.query.Result; -import io.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.java.util.common.granularity.AllGranularity; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.nary.BinaryFn; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.AggregatorFactory; import java.util.LinkedHashMap; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/timeseries/TimeseriesQuery.java b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQuery.java similarity index 90% rename from processing/src/main/java/io/druid/query/timeseries/TimeseriesQuery.java rename to processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQuery.java index dcbb03f13726..74d2a9306768 100644 --- a/processing/src/main/java/io/druid/query/timeseries/TimeseriesQuery.java +++ b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQuery.java @@ -17,26 +17,26 @@ * under the License. */ -package io.druid.query.timeseries; +package org.apache.druid.query.timeseries; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.query.BaseQuery; -import io.druid.query.DataSource; -import io.druid.query.Druids; -import io.druid.query.PerSegmentQueryOptimizationContext; -import io.druid.query.Queries; -import io.druid.query.Query; -import io.druid.query.Result; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.filter.DimFilter; -import io.druid.query.spec.QuerySegmentSpec; -import io.druid.segment.VirtualColumns; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.query.BaseQuery; +import org.apache.druid.query.DataSource; +import org.apache.druid.query.Druids; +import org.apache.druid.query.PerSegmentQueryOptimizationContext; +import org.apache.druid.query.Queries; +import org.apache.druid.query.Query; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.spec.QuerySegmentSpec; +import org.apache.druid.segment.VirtualColumns; import java.util.ArrayList; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryEngine.java b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQueryEngine.java similarity index 86% rename from processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryEngine.java rename to processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQueryEngine.java index df13bb7ca7c3..0de74bbcbbf9 100644 --- a/processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryEngine.java +++ b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQueryEngine.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.query.timeseries; +package org.apache.druid.query.timeseries; import com.google.common.base.Function; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.QueryRunnerHelper; -import io.druid.query.Result; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.filter.Filter; -import io.druid.segment.Cursor; -import io.druid.segment.SegmentMissingException; -import io.druid.segment.StorageAdapter; -import io.druid.segment.filter.Filters; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.QueryRunnerHelper; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.segment.Cursor; +import org.apache.druid.segment.SegmentMissingException; +import org.apache.druid.segment.StorageAdapter; +import org.apache.druid.segment.filter.Filters; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryMetrics.java b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQueryMetrics.java similarity index 89% rename from processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryMetrics.java rename to processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQueryMetrics.java index bf0160e54b8c..57064aec7b34 100644 --- a/processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryMetrics.java +++ b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQueryMetrics.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.timeseries; +package org.apache.druid.query.timeseries; -import io.druid.guice.annotations.ExtensionPoint; -import io.druid.guice.annotations.PublicApi; -import io.druid.query.QueryMetrics; +import org.apache.druid.guice.annotations.ExtensionPoint; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.query.QueryMetrics; /** * Specialization of {@link QueryMetrics} for {@link TimeseriesQuery}. diff --git a/processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryMetricsFactory.java b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQueryMetricsFactory.java similarity index 96% rename from processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryMetricsFactory.java rename to processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQueryMetricsFactory.java index 73b8ff1cc2b0..66dcfa1542d5 100644 --- a/processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryMetricsFactory.java +++ b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQueryMetricsFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.timeseries; +package org.apache.druid.query.timeseries; /** * Implementations could be injected using diff --git a/processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryQueryToolChest.java b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQueryQueryToolChest.java similarity index 91% rename from processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryQueryToolChest.java rename to processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQueryQueryToolChest.java index 0869a07147a4..46d7a7c53411 100644 --- a/processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryQueryToolChest.java +++ b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQueryQueryToolChest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.timeseries; +package org.apache.druid.query.timeseries; import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.annotations.VisibleForTesting; @@ -28,28 +28,28 @@ import com.google.common.collect.Maps; import com.google.common.collect.Ordering; import com.google.inject.Inject; -import io.druid.data.input.MapBasedRow; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.common.guava.nary.BinaryFn; -import io.druid.query.CacheStrategy; -import io.druid.query.IntervalChunkingQueryRunnerDecorator; -import io.druid.query.Query; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryToolChest; -import io.druid.query.Result; -import io.druid.query.ResultGranularTimestampComparator; -import io.druid.query.ResultMergeQueryRunner; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.MetricManipulationFn; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.cache.CacheKeyBuilder; -import io.druid.query.groupby.RowBasedColumnSelectorFactory; +import org.apache.druid.data.input.MapBasedRow; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.guava.nary.BinaryFn; +import org.apache.druid.query.CacheStrategy; +import org.apache.druid.query.IntervalChunkingQueryRunnerDecorator; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.Result; +import org.apache.druid.query.ResultGranularTimestampComparator; +import org.apache.druid.query.ResultMergeQueryRunner; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.MetricManipulationFn; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.query.groupby.RowBasedColumnSelectorFactory; import org.joda.time.DateTime; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryRunnerFactory.java b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQueryRunnerFactory.java similarity index 83% rename from processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryRunnerFactory.java rename to processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQueryRunnerFactory.java index 2ffd28950441..9bd77dc45503 100644 --- a/processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryRunnerFactory.java +++ b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQueryRunnerFactory.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.query.timeseries; +package org.apache.druid.query.timeseries; import com.google.inject.Inject; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.ChainedExecutionQueryRunner; -import io.druid.query.Query; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryToolChest; -import io.druid.query.QueryWatcher; -import io.druid.query.Result; -import io.druid.segment.Segment; -import io.druid.segment.StorageAdapter; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.ChainedExecutionQueryRunner; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.QueryWatcher; +import org.apache.druid.query.Result; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.StorageAdapter; import java.util.Map; import java.util.concurrent.ExecutorService; diff --git a/processing/src/main/java/io/druid/query/timeseries/TimeseriesResultBuilder.java b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesResultBuilder.java similarity index 91% rename from processing/src/main/java/io/druid/query/timeseries/TimeseriesResultBuilder.java rename to processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesResultBuilder.java index 761938b0c377..bd389cddaf81 100644 --- a/processing/src/main/java/io/druid/query/timeseries/TimeseriesResultBuilder.java +++ b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesResultBuilder.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.timeseries; +package org.apache.druid.query.timeseries; -import io.druid.query.Result; -import io.druid.query.aggregation.Aggregator; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.Aggregator; import org.joda.time.DateTime; import java.util.HashMap; diff --git a/processing/src/main/java/io/druid/query/timeseries/TimeseriesResultValue.java b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesResultValue.java similarity index 92% rename from processing/src/main/java/io/druid/query/timeseries/TimeseriesResultValue.java rename to processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesResultValue.java index e9538b03f35f..0d7c82184974 100644 --- a/processing/src/main/java/io/druid/query/timeseries/TimeseriesResultValue.java +++ b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesResultValue.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.timeseries; +package org.apache.druid.query.timeseries; import com.fasterxml.jackson.annotation.JsonCreator; -import io.druid.query.MetricValueExtractor; +import org.apache.druid.query.MetricValueExtractor; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/topn/AggregateTopNMetricFirstAlgorithm.java b/processing/src/main/java/org/apache/druid/query/topn/AggregateTopNMetricFirstAlgorithm.java similarity index 90% rename from processing/src/main/java/io/druid/query/topn/AggregateTopNMetricFirstAlgorithm.java rename to processing/src/main/java/org/apache/druid/query/topn/AggregateTopNMetricFirstAlgorithm.java index e7767e20acd6..5541678927b4 100644 --- a/processing/src/main/java/io/druid/query/topn/AggregateTopNMetricFirstAlgorithm.java +++ b/processing/src/main/java/org/apache/druid/query/topn/AggregateTopNMetricFirstAlgorithm.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.topn; - -import io.druid.collections.NonBlockingPool; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Pair; -import io.druid.query.ColumnSelectorPlus; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.PostAggregator; -import io.druid.segment.Cursor; -import io.druid.segment.StorageAdapter; +package org.apache.druid.query.topn; + +import org.apache.druid.collections.NonBlockingPool; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.query.ColumnSelectorPlus; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.segment.Cursor; +import org.apache.druid.segment.StorageAdapter; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/topn/AlphaNumericTopNMetricSpec.java b/processing/src/main/java/org/apache/druid/query/topn/AlphaNumericTopNMetricSpec.java similarity index 88% rename from processing/src/main/java/io/druid/query/topn/AlphaNumericTopNMetricSpec.java rename to processing/src/main/java/org/apache/druid/query/topn/AlphaNumericTopNMetricSpec.java index 319c3496c074..02532f3d2c14 100644 --- a/processing/src/main/java/io/druid/query/topn/AlphaNumericTopNMetricSpec.java +++ b/processing/src/main/java/org/apache/druid/query/topn/AlphaNumericTopNMetricSpec.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.StringUtils; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.ordering.StringComparators; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.ordering.StringComparators; import java.nio.ByteBuffer; import java.util.Comparator; diff --git a/processing/src/main/java/io/druid/query/topn/BaseTopNAlgorithm.java b/processing/src/main/java/org/apache/druid/query/topn/BaseTopNAlgorithm.java similarity index 94% rename from processing/src/main/java/io/druid/query/topn/BaseTopNAlgorithm.java rename to processing/src/main/java/org/apache/druid/query/topn/BaseTopNAlgorithm.java index 716310faa9b8..bb49c357f3fe 100644 --- a/processing/src/main/java/io/druid/query/topn/BaseTopNAlgorithm.java +++ b/processing/src/main/java/org/apache/druid/query/topn/BaseTopNAlgorithm.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.google.common.annotations.VisibleForTesting; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.Pair; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.topn.types.TopNColumnSelectorStrategy; -import io.druid.segment.Capabilities; -import io.druid.segment.Cursor; -import io.druid.segment.DimensionSelector; -import io.druid.segment.IdLookup; -import io.druid.segment.StorageAdapter; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.topn.types.TopNColumnSelectorStrategy; +import org.apache.druid.segment.Capabilities; +import org.apache.druid.segment.Cursor; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.IdLookup; +import org.apache.druid.segment.StorageAdapter; import javax.annotation.Nullable; import java.util.Arrays; diff --git a/processing/src/main/java/io/druid/query/topn/BySegmentTopNResultValue.java b/processing/src/main/java/org/apache/druid/query/topn/BySegmentTopNResultValue.java similarity index 94% rename from processing/src/main/java/io/druid/query/topn/BySegmentTopNResultValue.java rename to processing/src/main/java/org/apache/druid/query/topn/BySegmentTopNResultValue.java index 7df32ced22b5..0d825076dcb3 100644 --- a/processing/src/main/java/io/druid/query/topn/BySegmentTopNResultValue.java +++ b/processing/src/main/java/org/apache/druid/query/topn/BySegmentTopNResultValue.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; -import io.druid.query.BySegmentResultValue; -import io.druid.query.Result; +import org.apache.druid.query.BySegmentResultValue; +import org.apache.druid.query.Result; import org.joda.time.Interval; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/topn/DefaultTopNQueryMetrics.java b/processing/src/main/java/org/apache/druid/query/topn/DefaultTopNQueryMetrics.java similarity index 92% rename from processing/src/main/java/io/druid/query/topn/DefaultTopNQueryMetrics.java rename to processing/src/main/java/org/apache/druid/query/topn/DefaultTopNQueryMetrics.java index e5f02008b21a..ce70ee9b0f6c 100644 --- a/processing/src/main/java/io/druid/query/topn/DefaultTopNQueryMetrics.java +++ b/processing/src/main/java/org/apache/druid/query/topn/DefaultTopNQueryMetrics.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.query.DefaultQueryMetrics; -import io.druid.query.DruidMetrics; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.Cursor; +import org.apache.druid.query.DefaultQueryMetrics; +import org.apache.druid.query.DruidMetrics; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.Cursor; public class DefaultTopNQueryMetrics extends DefaultQueryMetrics implements TopNQueryMetrics { diff --git a/processing/src/main/java/io/druid/query/topn/DefaultTopNQueryMetricsFactory.java b/processing/src/main/java/org/apache/druid/query/topn/DefaultTopNQueryMetricsFactory.java similarity index 86% rename from processing/src/main/java/io/druid/query/topn/DefaultTopNQueryMetricsFactory.java rename to processing/src/main/java/org/apache/druid/query/topn/DefaultTopNQueryMetricsFactory.java index a4aa740e1b84..7ff80ca7349f 100644 --- a/processing/src/main/java/io/druid/query/topn/DefaultTopNQueryMetricsFactory.java +++ b/processing/src/main/java/org/apache/druid/query/topn/DefaultTopNQueryMetricsFactory.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; import com.google.inject.Inject; -import io.druid.guice.LazySingleton; -import io.druid.guice.annotations.Json; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.jackson.DefaultObjectMapper; @LazySingleton public class DefaultTopNQueryMetricsFactory implements TopNQueryMetricsFactory @@ -33,7 +33,7 @@ public class DefaultTopNQueryMetricsFactory implements TopNQueryMetricsFactory /** * Should be used only in tests, directly or indirectly (via {@link TopNQueryQueryToolChest#TopNQueryQueryToolChest( - * TopNQueryConfig, io.druid.query.IntervalChunkingQueryRunnerDecorator)}). + * TopNQueryConfig, org.apache.druid.query.IntervalChunkingQueryRunnerDecorator)}). */ @VisibleForTesting public static TopNQueryMetricsFactory instance() diff --git a/processing/src/main/java/io/druid/query/topn/DimExtractionTopNAlgorithm.java b/processing/src/main/java/org/apache/druid/query/topn/DimExtractionTopNAlgorithm.java similarity index 92% rename from processing/src/main/java/io/druid/query/topn/DimExtractionTopNAlgorithm.java rename to processing/src/main/java/org/apache/druid/query/topn/DimExtractionTopNAlgorithm.java index e7b441a1beb2..8f3941bc4a07 100644 --- a/processing/src/main/java/io/druid/query/topn/DimExtractionTopNAlgorithm.java +++ b/processing/src/main/java/org/apache/druid/query/topn/DimExtractionTopNAlgorithm.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; -import io.druid.query.ColumnSelectorPlus; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.topn.types.TopNColumnSelectorStrategy; -import io.druid.segment.Cursor; -import io.druid.segment.StorageAdapter; +import org.apache.druid.query.ColumnSelectorPlus; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.topn.types.TopNColumnSelectorStrategy; +import org.apache.druid.segment.Cursor; +import org.apache.druid.segment.StorageAdapter; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/topn/DimValHolder.java b/processing/src/main/java/org/apache/druid/query/topn/DimValHolder.java similarity index 98% rename from processing/src/main/java/io/druid/query/topn/DimValHolder.java rename to processing/src/main/java/org/apache/druid/query/topn/DimValHolder.java index 3b212bbcf330..9c9df3b73d8d 100644 --- a/processing/src/main/java/io/druid/query/topn/DimValHolder.java +++ b/processing/src/main/java/org/apache/druid/query/topn/DimValHolder.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/topn/DimensionAndMetricValueExtractor.java b/processing/src/main/java/org/apache/druid/query/topn/DimensionAndMetricValueExtractor.java similarity index 95% rename from processing/src/main/java/io/druid/query/topn/DimensionAndMetricValueExtractor.java rename to processing/src/main/java/org/apache/druid/query/topn/DimensionAndMetricValueExtractor.java index 076218c4c686..caf1f3110561 100644 --- a/processing/src/main/java/io/druid/query/topn/DimensionAndMetricValueExtractor.java +++ b/processing/src/main/java/org/apache/druid/query/topn/DimensionAndMetricValueExtractor.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.fasterxml.jackson.annotation.JsonCreator; -import io.druid.query.MetricValueExtractor; +import org.apache.druid.query.MetricValueExtractor; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/topn/DimensionTopNMetricSpec.java b/processing/src/main/java/org/apache/druid/query/topn/DimensionTopNMetricSpec.java similarity index 92% rename from processing/src/main/java/io/druid/query/topn/DimensionTopNMetricSpec.java rename to processing/src/main/java/org/apache/druid/query/topn/DimensionTopNMetricSpec.java index 46eb41a5720b..6878288de033 100644 --- a/processing/src/main/java/io/druid/query/topn/DimensionTopNMetricSpec.java +++ b/processing/src/main/java/org/apache/druid/query/topn/DimensionTopNMetricSpec.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.StringUtils; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.ordering.StringComparator; -import io.druid.query.ordering.StringComparators; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.ordering.StringComparator; +import org.apache.druid.query.ordering.StringComparators; import org.joda.time.DateTime; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/topn/Generic1AggPooledTopNScanner.java b/processing/src/main/java/org/apache/druid/query/topn/Generic1AggPooledTopNScanner.java similarity index 88% rename from processing/src/main/java/io/druid/query/topn/Generic1AggPooledTopNScanner.java rename to processing/src/main/java/org/apache/druid/query/topn/Generic1AggPooledTopNScanner.java index f7ac98f871b4..544cef0dfaf1 100644 --- a/processing/src/main/java/io/druid/query/topn/Generic1AggPooledTopNScanner.java +++ b/processing/src/main/java/org/apache/druid/query/topn/Generic1AggPooledTopNScanner.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.segment.Cursor; -import io.druid.segment.DimensionSelector; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.segment.Cursor; +import org.apache.druid.segment.DimensionSelector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/topn/Generic1AggPooledTopNScannerPrototype.java b/processing/src/main/java/org/apache/druid/query/topn/Generic1AggPooledTopNScannerPrototype.java similarity index 92% rename from processing/src/main/java/io/druid/query/topn/Generic1AggPooledTopNScannerPrototype.java rename to processing/src/main/java/org/apache/druid/query/topn/Generic1AggPooledTopNScannerPrototype.java index 493e83d8c2de..e94b31e85e37 100644 --- a/processing/src/main/java/io/druid/query/topn/Generic1AggPooledTopNScannerPrototype.java +++ b/processing/src/main/java/org/apache/druid/query/topn/Generic1AggPooledTopNScannerPrototype.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.segment.Cursor; -import io.druid.segment.DimensionSelector; -import io.druid.segment.data.IndexedInts; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.segment.Cursor; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.data.IndexedInts; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/topn/Generic2AggPooledTopNScanner.java b/processing/src/main/java/org/apache/druid/query/topn/Generic2AggPooledTopNScanner.java similarity index 89% rename from processing/src/main/java/io/druid/query/topn/Generic2AggPooledTopNScanner.java rename to processing/src/main/java/org/apache/druid/query/topn/Generic2AggPooledTopNScanner.java index 27cd611b3d35..6b6adb881c03 100644 --- a/processing/src/main/java/io/druid/query/topn/Generic2AggPooledTopNScanner.java +++ b/processing/src/main/java/org/apache/druid/query/topn/Generic2AggPooledTopNScanner.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.segment.Cursor; -import io.druid.segment.DimensionSelector; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.segment.Cursor; +import org.apache.druid.segment.DimensionSelector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/topn/Generic2AggPooledTopNScannerPrototype.java b/processing/src/main/java/org/apache/druid/query/topn/Generic2AggPooledTopNScannerPrototype.java similarity index 93% rename from processing/src/main/java/io/druid/query/topn/Generic2AggPooledTopNScannerPrototype.java rename to processing/src/main/java/org/apache/druid/query/topn/Generic2AggPooledTopNScannerPrototype.java index 279d2f9fa533..2f70fdd73801 100644 --- a/processing/src/main/java/io/druid/query/topn/Generic2AggPooledTopNScannerPrototype.java +++ b/processing/src/main/java/org/apache/druid/query/topn/Generic2AggPooledTopNScannerPrototype.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.segment.Cursor; -import io.druid.segment.DimensionSelector; -import io.druid.segment.data.IndexedInts; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.segment.Cursor; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.data.IndexedInts; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/topn/Historical1AggPooledTopNScanner.java b/processing/src/main/java/org/apache/druid/query/topn/Historical1AggPooledTopNScanner.java similarity index 87% rename from processing/src/main/java/io/druid/query/topn/Historical1AggPooledTopNScanner.java rename to processing/src/main/java/org/apache/druid/query/topn/Historical1AggPooledTopNScanner.java index 68bf76df6c82..a7679dcfec8e 100644 --- a/processing/src/main/java/io/druid/query/topn/Historical1AggPooledTopNScanner.java +++ b/processing/src/main/java/org/apache/druid/query/topn/Historical1AggPooledTopNScanner.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.segment.historical.HistoricalCursor; -import io.druid.segment.historical.HistoricalDimensionSelector; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.segment.historical.HistoricalCursor; +import org.apache.druid.segment.historical.HistoricalDimensionSelector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/topn/Historical1SimpleDoubleAggPooledTopNScannerPrototype.java b/processing/src/main/java/org/apache/druid/query/topn/Historical1SimpleDoubleAggPooledTopNScannerPrototype.java similarity index 88% rename from processing/src/main/java/io/druid/query/topn/Historical1SimpleDoubleAggPooledTopNScannerPrototype.java rename to processing/src/main/java/org/apache/druid/query/topn/Historical1SimpleDoubleAggPooledTopNScannerPrototype.java index ffaef4c760fc..36374900da2a 100644 --- a/processing/src/main/java/io/druid/query/topn/Historical1SimpleDoubleAggPooledTopNScannerPrototype.java +++ b/processing/src/main/java/org/apache/druid/query/topn/Historical1SimpleDoubleAggPooledTopNScannerPrototype.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; -import io.druid.query.aggregation.SimpleDoubleBufferAggregator; -import io.druid.segment.data.IndexedInts; -import io.druid.segment.data.Offset; -import io.druid.segment.historical.HistoricalCursor; -import io.druid.segment.historical.HistoricalDimensionSelector; -import io.druid.segment.historical.HistoricalColumnSelector; +import org.apache.druid.query.aggregation.SimpleDoubleBufferAggregator; +import org.apache.druid.segment.data.IndexedInts; +import org.apache.druid.segment.data.Offset; +import org.apache.druid.segment.historical.HistoricalCursor; +import org.apache.druid.segment.historical.HistoricalDimensionSelector; +import org.apache.druid.segment.historical.HistoricalColumnSelector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/topn/HistoricalSingleValueDimSelector1SimpleDoubleAggPooledTopNScannerPrototype.java b/processing/src/main/java/org/apache/druid/query/topn/HistoricalSingleValueDimSelector1SimpleDoubleAggPooledTopNScannerPrototype.java similarity index 89% rename from processing/src/main/java/io/druid/query/topn/HistoricalSingleValueDimSelector1SimpleDoubleAggPooledTopNScannerPrototype.java rename to processing/src/main/java/org/apache/druid/query/topn/HistoricalSingleValueDimSelector1SimpleDoubleAggPooledTopNScannerPrototype.java index 893f1caab92b..b1389c36f015 100644 --- a/processing/src/main/java/io/druid/query/topn/HistoricalSingleValueDimSelector1SimpleDoubleAggPooledTopNScannerPrototype.java +++ b/processing/src/main/java/org/apache/druid/query/topn/HistoricalSingleValueDimSelector1SimpleDoubleAggPooledTopNScannerPrototype.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; -import io.druid.query.aggregation.SimpleDoubleBufferAggregator; -import io.druid.segment.data.Offset; -import io.druid.segment.historical.HistoricalCursor; -import io.druid.segment.historical.HistoricalColumnSelector; -import io.druid.segment.historical.SingleValueHistoricalDimensionSelector; +import org.apache.druid.query.aggregation.SimpleDoubleBufferAggregator; +import org.apache.druid.segment.data.Offset; +import org.apache.druid.segment.historical.HistoricalCursor; +import org.apache.druid.segment.historical.HistoricalColumnSelector; +import org.apache.druid.segment.historical.SingleValueHistoricalDimensionSelector; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/topn/InvertedTopNMetricSpec.java b/processing/src/main/java/org/apache/druid/query/topn/InvertedTopNMetricSpec.java similarity index 93% rename from processing/src/main/java/io/druid/query/topn/InvertedTopNMetricSpec.java rename to processing/src/main/java/org/apache/druid/query/topn/InvertedTopNMetricSpec.java index dde4a1b883db..b4c8cbc5f58c 100644 --- a/processing/src/main/java/io/druid/query/topn/InvertedTopNMetricSpec.java +++ b/processing/src/main/java/org/apache/druid/query/topn/InvertedTopNMetricSpec.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.guava.Comparators; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.dimension.DimensionSpec; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.dimension.DimensionSpec; import org.joda.time.DateTime; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/topn/LegacyTopNMetricSpec.java b/processing/src/main/java/org/apache/druid/query/topn/LegacyTopNMetricSpec.java similarity index 94% rename from processing/src/main/java/io/druid/query/topn/LegacyTopNMetricSpec.java rename to processing/src/main/java/org/apache/druid/query/topn/LegacyTopNMetricSpec.java index f4203bdfdf76..595e25430785 100644 --- a/processing/src/main/java/io/druid/query/topn/LegacyTopNMetricSpec.java +++ b/processing/src/main/java/org/apache/druid/query/topn/LegacyTopNMetricSpec.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.fasterxml.jackson.annotation.JsonCreator; -import io.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.IAE; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/topn/LexicographicTopNMetricSpec.java b/processing/src/main/java/org/apache/druid/query/topn/LexicographicTopNMetricSpec.java similarity index 92% rename from processing/src/main/java/io/druid/query/topn/LexicographicTopNMetricSpec.java rename to processing/src/main/java/org/apache/druid/query/topn/LexicographicTopNMetricSpec.java index 51849861084f..92b69887d504 100644 --- a/processing/src/main/java/io/druid/query/topn/LexicographicTopNMetricSpec.java +++ b/processing/src/main/java/org/apache/druid/query/topn/LexicographicTopNMetricSpec.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.StringUtils; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.ordering.StringComparators; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.ordering.StringComparators; import org.joda.time.DateTime; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/topn/NumericTopNMetricSpec.java b/processing/src/main/java/org/apache/druid/query/topn/NumericTopNMetricSpec.java similarity index 95% rename from processing/src/main/java/io/druid/query/topn/NumericTopNMetricSpec.java rename to processing/src/main/java/org/apache/druid/query/topn/NumericTopNMetricSpec.java index 7e7bc8c17989..878c010e3b03 100644 --- a/processing/src/main/java/io/druid/query/topn/NumericTopNMetricSpec.java +++ b/processing/src/main/java/org/apache/druid/query/topn/NumericTopNMetricSpec.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; -import io.druid.java.util.common.StringUtils; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.dimension.DimensionSpec; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.dimension.DimensionSpec; import org.joda.time.DateTime; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/topn/PooledTopNAlgorithm.java b/processing/src/main/java/org/apache/druid/query/topn/PooledTopNAlgorithm.java similarity index 95% rename from processing/src/main/java/io/druid/query/topn/PooledTopNAlgorithm.java rename to processing/src/main/java/org/apache/druid/query/topn/PooledTopNAlgorithm.java index bd37474e658e..dd0e88c6c432 100644 --- a/processing/src/main/java/io/druid/query/topn/PooledTopNAlgorithm.java +++ b/processing/src/main/java/org/apache/druid/query/topn/PooledTopNAlgorithm.java @@ -17,31 +17,31 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; -import io.druid.collections.NonBlockingPool; -import io.druid.collections.ResourceHolder; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.guava.CloseQuietly; -import io.druid.query.BaseQuery; -import io.druid.query.ColumnSelectorPlus; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.SimpleDoubleBufferAggregator; -import io.druid.query.monomorphicprocessing.SpecializationService; -import io.druid.query.monomorphicprocessing.SpecializationState; -import io.druid.query.monomorphicprocessing.StringRuntimeShape; -import io.druid.segment.Cursor; -import io.druid.segment.DimensionSelector; -import io.druid.segment.FilteredOffset; -import io.druid.segment.StorageAdapter; -import io.druid.segment.data.IndexedInts; -import io.druid.segment.data.Offset; -import io.druid.segment.historical.HistoricalColumnSelector; -import io.druid.segment.historical.HistoricalCursor; -import io.druid.segment.historical.HistoricalDimensionSelector; -import io.druid.segment.historical.SingleValueHistoricalDimensionSelector; +import org.apache.druid.collections.NonBlockingPool; +import org.apache.druid.collections.ResourceHolder; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.guava.CloseQuietly; +import org.apache.druid.query.BaseQuery; +import org.apache.druid.query.ColumnSelectorPlus; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.SimpleDoubleBufferAggregator; +import org.apache.druid.query.monomorphicprocessing.SpecializationService; +import org.apache.druid.query.monomorphicprocessing.SpecializationState; +import org.apache.druid.query.monomorphicprocessing.StringRuntimeShape; +import org.apache.druid.segment.Cursor; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.FilteredOffset; +import org.apache.druid.segment.StorageAdapter; +import org.apache.druid.segment.data.IndexedInts; +import org.apache.druid.segment.data.Offset; +import org.apache.druid.segment.historical.HistoricalColumnSelector; +import org.apache.druid.segment.historical.HistoricalCursor; +import org.apache.druid.segment.historical.HistoricalDimensionSelector; +import org.apache.druid.segment.historical.SingleValueHistoricalDimensionSelector; import java.nio.ByteBuffer; import java.util.ArrayList; diff --git a/processing/src/main/java/io/druid/query/topn/TimeExtractionTopNAlgorithm.java b/processing/src/main/java/org/apache/druid/query/topn/TimeExtractionTopNAlgorithm.java similarity index 92% rename from processing/src/main/java/io/druid/query/topn/TimeExtractionTopNAlgorithm.java rename to processing/src/main/java/org/apache/druid/query/topn/TimeExtractionTopNAlgorithm.java index 71d8b79009c8..8313d0449e34 100644 --- a/processing/src/main/java/io/druid/query/topn/TimeExtractionTopNAlgorithm.java +++ b/processing/src/main/java/org/apache/druid/query/topn/TimeExtractionTopNAlgorithm.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.google.common.collect.Maps; -import io.druid.query.ColumnSelectorPlus; -import io.druid.query.aggregation.Aggregator; -import io.druid.segment.Cursor; -import io.druid.segment.DimensionSelector; -import io.druid.segment.StorageAdapter; +import org.apache.druid.query.ColumnSelectorPlus; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.segment.Cursor; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.StorageAdapter; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/topn/TopNAlgorithm.java b/processing/src/main/java/org/apache/druid/query/topn/TopNAlgorithm.java similarity index 84% rename from processing/src/main/java/io/druid/query/topn/TopNAlgorithm.java rename to processing/src/main/java/org/apache/druid/query/topn/TopNAlgorithm.java index 33b63038ba58..0f7a52707a01 100644 --- a/processing/src/main/java/io/druid/query/topn/TopNAlgorithm.java +++ b/processing/src/main/java/org/apache/druid/query/topn/TopNAlgorithm.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; -import io.druid.query.ColumnSelectorPlus; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.topn.types.TopNColumnSelectorStrategy; -import io.druid.segment.Cursor; +import org.apache.druid.query.ColumnSelectorPlus; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.topn.types.TopNColumnSelectorStrategy; +import org.apache.druid.segment.Cursor; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/query/topn/TopNAlgorithmSelector.java b/processing/src/main/java/org/apache/druid/query/topn/TopNAlgorithmSelector.java similarity index 98% rename from processing/src/main/java/io/druid/query/topn/TopNAlgorithmSelector.java rename to processing/src/main/java/org/apache/druid/query/topn/TopNAlgorithmSelector.java index e87f63a78169..6e245d47e571 100644 --- a/processing/src/main/java/io/druid/query/topn/TopNAlgorithmSelector.java +++ b/processing/src/main/java/org/apache/druid/query/topn/TopNAlgorithmSelector.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; /** */ diff --git a/processing/src/main/java/io/druid/query/topn/TopNBinaryFn.java b/processing/src/main/java/org/apache/druid/query/topn/TopNBinaryFn.java similarity index 89% rename from processing/src/main/java/io/druid/query/topn/TopNBinaryFn.java rename to processing/src/main/java/org/apache/druid/query/topn/TopNBinaryFn.java index c004eb871e73..99acecbb33cb 100644 --- a/processing/src/main/java/io/druid/query/topn/TopNBinaryFn.java +++ b/processing/src/main/java/org/apache/druid/query/topn/TopNBinaryFn.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.query.topn; - -import io.druid.java.util.common.granularity.AllGranularity; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.nary.BinaryFn; -import io.druid.query.Result; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.dimension.DimensionSpec; +package org.apache.druid.query.topn; + +import org.apache.druid.java.util.common.granularity.AllGranularity; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.nary.BinaryFn; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.dimension.DimensionSpec; import org.joda.time.DateTime; import java.util.Comparator; diff --git a/processing/src/main/java/io/druid/query/topn/TopNLexicographicResultBuilder.java b/processing/src/main/java/org/apache/druid/query/topn/TopNLexicographicResultBuilder.java similarity index 96% rename from processing/src/main/java/io/druid/query/topn/TopNLexicographicResultBuilder.java rename to processing/src/main/java/org/apache/druid/query/topn/TopNLexicographicResultBuilder.java index a5f884090b25..ea17367f875f 100644 --- a/processing/src/main/java/io/druid/query/topn/TopNLexicographicResultBuilder.java +++ b/processing/src/main/java/org/apache/druid/query/topn/TopNLexicographicResultBuilder.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.query.Result; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.dimension.DimensionSpec; import org.joda.time.DateTime; import java.util.Arrays; diff --git a/processing/src/main/java/io/druid/query/topn/TopNMapFn.java b/processing/src/main/java/org/apache/druid/query/topn/TopNMapFn.java similarity index 87% rename from processing/src/main/java/io/druid/query/topn/TopNMapFn.java rename to processing/src/main/java/org/apache/druid/query/topn/TopNMapFn.java index 9ca4c5a273bf..af12047005a5 100644 --- a/processing/src/main/java/io/druid/query/topn/TopNMapFn.java +++ b/processing/src/main/java/org/apache/druid/query/topn/TopNMapFn.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; -import io.druid.query.ColumnSelectorPlus; -import io.druid.query.Result; -import io.druid.query.topn.types.TopNColumnSelectorStrategyFactory; -import io.druid.segment.Cursor; -import io.druid.segment.DimensionHandlerUtils; +import org.apache.druid.query.ColumnSelectorPlus; +import org.apache.druid.query.Result; +import org.apache.druid.query.topn.types.TopNColumnSelectorStrategyFactory; +import org.apache.druid.segment.Cursor; +import org.apache.druid.segment.DimensionHandlerUtils; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/query/topn/TopNMetricSpec.java b/processing/src/main/java/org/apache/druid/query/topn/TopNMetricSpec.java similarity index 89% rename from processing/src/main/java/io/druid/query/topn/TopNMetricSpec.java rename to processing/src/main/java/org/apache/druid/query/topn/TopNMetricSpec.java index 884e78d34e5e..f52e33e05b68 100644 --- a/processing/src/main/java/io/druid/query/topn/TopNMetricSpec.java +++ b/processing/src/main/java/org/apache/druid/query/topn/TopNMetricSpec.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.druid.java.util.common.Cacheable; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.dimension.DimensionSpec; +import org.apache.druid.java.util.common.Cacheable; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.dimension.DimensionSpec; import org.joda.time.DateTime; import java.util.Comparator; diff --git a/processing/src/main/java/io/druid/query/topn/TopNMetricSpecBuilder.java b/processing/src/main/java/org/apache/druid/query/topn/TopNMetricSpecBuilder.java similarity index 96% rename from processing/src/main/java/io/druid/query/topn/TopNMetricSpecBuilder.java rename to processing/src/main/java/org/apache/druid/query/topn/TopNMetricSpecBuilder.java index 0ee22971550e..2474a543e111 100644 --- a/processing/src/main/java/io/druid/query/topn/TopNMetricSpecBuilder.java +++ b/processing/src/main/java/org/apache/druid/query/topn/TopNMetricSpecBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; /** */ diff --git a/processing/src/main/java/io/druid/query/topn/TopNNumericResultBuilder.java b/processing/src/main/java/org/apache/druid/query/topn/TopNNumericResultBuilder.java similarity index 96% rename from processing/src/main/java/io/druid/query/topn/TopNNumericResultBuilder.java rename to processing/src/main/java/org/apache/druid/query/topn/TopNNumericResultBuilder.java index 503e090a3494..09f41599fe20 100644 --- a/processing/src/main/java/io/druid/query/topn/TopNNumericResultBuilder.java +++ b/processing/src/main/java/org/apache/druid/query/topn/TopNNumericResultBuilder.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.query.Result; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.dimension.DimensionSpec; import org.joda.time.DateTime; import java.util.Arrays; diff --git a/processing/src/main/java/io/druid/query/topn/TopNParams.java b/processing/src/main/java/org/apache/druid/query/topn/TopNParams.java similarity index 88% rename from processing/src/main/java/io/druid/query/topn/TopNParams.java rename to processing/src/main/java/org/apache/druid/query/topn/TopNParams.java index 78814c451dd4..a80e1bd1f732 100644 --- a/processing/src/main/java/io/druid/query/topn/TopNParams.java +++ b/processing/src/main/java/org/apache/druid/query/topn/TopNParams.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; -import io.druid.query.ColumnSelectorPlus; -import io.druid.query.topn.types.TopNColumnSelectorStrategy; -import io.druid.segment.Cursor; -import io.druid.segment.DimensionSelector; +import org.apache.druid.query.ColumnSelectorPlus; +import org.apache.druid.query.topn.types.TopNColumnSelectorStrategy; +import org.apache.druid.segment.Cursor; +import org.apache.druid.segment.DimensionSelector; /** */ diff --git a/processing/src/main/java/io/druid/query/topn/TopNQuery.java b/processing/src/main/java/org/apache/druid/query/topn/TopNQuery.java similarity index 91% rename from processing/src/main/java/io/druid/query/topn/TopNQuery.java rename to processing/src/main/java/org/apache/druid/query/topn/TopNQuery.java index 6897cc5fba35..c77011c0325d 100644 --- a/processing/src/main/java/io/druid/query/topn/TopNQuery.java +++ b/processing/src/main/java/org/apache/druid/query/topn/TopNQuery.java @@ -17,25 +17,25 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.query.BaseQuery; -import io.druid.query.DataSource; -import io.druid.query.PerSegmentQueryOptimizationContext; -import io.druid.query.Queries; -import io.druid.query.Query; -import io.druid.query.Result; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.filter.DimFilter; -import io.druid.query.spec.QuerySegmentSpec; -import io.druid.segment.VirtualColumns; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.query.BaseQuery; +import org.apache.druid.query.DataSource; +import org.apache.druid.query.PerSegmentQueryOptimizationContext; +import org.apache.druid.query.Queries; +import org.apache.druid.query.Query; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.spec.QuerySegmentSpec; +import org.apache.druid.segment.VirtualColumns; import java.util.ArrayList; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/topn/TopNQueryBuilder.java b/processing/src/main/java/org/apache/druid/query/topn/TopNQueryBuilder.java similarity index 88% rename from processing/src/main/java/io/druid/query/topn/TopNQueryBuilder.java rename to processing/src/main/java/org/apache/druid/query/topn/TopNQueryBuilder.java index 1ff4e5387a64..f1d187e11977 100644 --- a/processing/src/main/java/io/druid/query/topn/TopNQueryBuilder.java +++ b/processing/src/main/java/org/apache/druid/query/topn/TopNQueryBuilder.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.google.common.collect.Lists; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.query.DataSource; -import io.druid.query.TableDataSource; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.filter.DimFilter; -import io.druid.query.filter.InDimFilter; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.query.spec.LegacySegmentSpec; -import io.druid.query.spec.QuerySegmentSpec; -import io.druid.segment.VirtualColumn; -import io.druid.segment.VirtualColumns; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.query.DataSource; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.filter.InDimFilter; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.query.spec.LegacySegmentSpec; +import org.apache.druid.query.spec.QuerySegmentSpec; +import org.apache.druid.segment.VirtualColumn; +import org.apache.druid.segment.VirtualColumns; import org.joda.time.Interval; import java.util.Arrays; diff --git a/processing/src/main/java/io/druid/query/topn/TopNQueryConfig.java b/processing/src/main/java/org/apache/druid/query/topn/TopNQueryConfig.java similarity index 96% rename from processing/src/main/java/io/druid/query/topn/TopNQueryConfig.java rename to processing/src/main/java/org/apache/druid/query/topn/TopNQueryConfig.java index 573316d7c5bb..9e5dcd31744b 100644 --- a/processing/src/main/java/io/druid/query/topn/TopNQueryConfig.java +++ b/processing/src/main/java/org/apache/druid/query/topn/TopNQueryConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/processing/src/main/java/io/druid/query/topn/TopNQueryEngine.java b/processing/src/main/java/org/apache/druid/query/topn/TopNQueryEngine.java similarity index 88% rename from processing/src/main/java/io/druid/query/topn/TopNQueryEngine.java rename to processing/src/main/java/org/apache/druid/query/topn/TopNQueryEngine.java index 96b2a3d65b35..81413f1ea4ad 100644 --- a/processing/src/main/java/io/druid/query/topn/TopNQueryEngine.java +++ b/processing/src/main/java/org/apache/druid/query/topn/TopNQueryEngine.java @@ -17,26 +17,26 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.base.Predicates; -import io.druid.collections.NonBlockingPool; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.query.Result; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.filter.Filter; -import io.druid.segment.Cursor; -import io.druid.segment.SegmentMissingException; -import io.druid.segment.StorageAdapter; -import io.druid.segment.column.Column; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.column.ValueType; -import io.druid.segment.filter.Filters; +import org.apache.druid.collections.NonBlockingPool; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.segment.Cursor; +import org.apache.druid.segment.SegmentMissingException; +import org.apache.druid.segment.StorageAdapter; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.filter.Filters; import org.joda.time.Interval; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/query/topn/TopNQueryMetrics.java b/processing/src/main/java/org/apache/druid/query/topn/TopNQueryMetrics.java similarity index 89% rename from processing/src/main/java/io/druid/query/topn/TopNQueryMetrics.java rename to processing/src/main/java/org/apache/druid/query/topn/TopNQueryMetrics.java index e8675700f7c6..7e3e8ca3a9af 100644 --- a/processing/src/main/java/io/druid/query/topn/TopNQueryMetrics.java +++ b/processing/src/main/java/org/apache/druid/query/topn/TopNQueryMetrics.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; -import io.druid.guice.annotations.ExtensionPoint; -import io.druid.guice.annotations.PublicApi; -import io.druid.query.QueryMetrics; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.Cursor; +import org.apache.druid.guice.annotations.ExtensionPoint; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.query.QueryMetrics; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.Cursor; /** * Specialization of {@link QueryMetrics} for {@link TopNQuery}. @@ -38,7 +38,7 @@ public interface TopNQueryMetrics extends QueryMetrics void threshold(TopNQuery query); /** - * Sets {@link TopNQuery#getDimensionSpec()}.{@link io.druid.query.dimension.DimensionSpec#getDimension() + * Sets {@link TopNQuery#getDimensionSpec()}.{@link org.apache.druid.query.dimension.DimensionSpec#getDimension() * getDimension()} of the given query as dimension. */ @PublicApi diff --git a/processing/src/main/java/io/druid/query/topn/TopNQueryMetricsFactory.java b/processing/src/main/java/org/apache/druid/query/topn/TopNQueryMetricsFactory.java similarity index 97% rename from processing/src/main/java/io/druid/query/topn/TopNQueryMetricsFactory.java rename to processing/src/main/java/org/apache/druid/query/topn/TopNQueryMetricsFactory.java index b931a6e1343e..a2807bb675be 100644 --- a/processing/src/main/java/io/druid/query/topn/TopNQueryMetricsFactory.java +++ b/processing/src/main/java/org/apache/druid/query/topn/TopNQueryMetricsFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; /** * Implementations could be injected using diff --git a/processing/src/main/java/io/druid/query/topn/TopNQueryQueryToolChest.java b/processing/src/main/java/org/apache/druid/query/topn/TopNQueryQueryToolChest.java similarity index 94% rename from processing/src/main/java/io/druid/query/topn/TopNQueryQueryToolChest.java rename to processing/src/main/java/org/apache/druid/query/topn/TopNQueryQueryToolChest.java index 36331f67ed31..5c5ad3eab832 100644 --- a/processing/src/main/java/io/druid/query/topn/TopNQueryQueryToolChest.java +++ b/processing/src/main/java/org/apache/druid/query/topn/TopNQueryQueryToolChest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.annotations.VisibleForTesting; @@ -27,30 +27,30 @@ import com.google.common.collect.Maps; import com.google.common.collect.Ordering; import com.google.inject.Inject; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.common.guava.nary.BinaryFn; -import io.druid.query.BySegmentResultValue; -import io.druid.query.CacheStrategy; -import io.druid.query.IntervalChunkingQueryRunnerDecorator; -import io.druid.query.Query; -import io.druid.query.QueryContexts; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryToolChest; -import io.druid.query.Result; -import io.druid.query.ResultGranularTimestampComparator; -import io.druid.query.ResultMergeQueryRunner; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.AggregatorUtil; -import io.druid.query.aggregation.MetricManipulationFn; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.cache.CacheKeyBuilder; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.dimension.DimensionSpec; -import io.druid.segment.DimensionHandlerUtils; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.guava.nary.BinaryFn; +import org.apache.druid.query.BySegmentResultValue; +import org.apache.druid.query.CacheStrategy; +import org.apache.druid.query.IntervalChunkingQueryRunnerDecorator; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryContexts; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.Result; +import org.apache.druid.query.ResultGranularTimestampComparator; +import org.apache.druid.query.ResultMergeQueryRunner; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorUtil; +import org.apache.druid.query.aggregation.MetricManipulationFn; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.segment.DimensionHandlerUtils; import org.joda.time.DateTime; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/query/topn/TopNQueryRunnerFactory.java b/processing/src/main/java/org/apache/druid/query/topn/TopNQueryRunnerFactory.java similarity index 81% rename from processing/src/main/java/io/druid/query/topn/TopNQueryRunnerFactory.java rename to processing/src/main/java/org/apache/druid/query/topn/TopNQueryRunnerFactory.java index 21aec8dad00e..aad1021c78cd 100644 --- a/processing/src/main/java/io/druid/query/topn/TopNQueryRunnerFactory.java +++ b/processing/src/main/java/org/apache/druid/query/topn/TopNQueryRunnerFactory.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.google.inject.Inject; -import io.druid.collections.NonBlockingPool; -import io.druid.guice.annotations.Global; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.ChainedExecutionQueryRunner; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryToolChest; -import io.druid.query.QueryWatcher; -import io.druid.query.Result; -import io.druid.segment.Segment; +import org.apache.druid.collections.NonBlockingPool; +import org.apache.druid.guice.annotations.Global; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.ChainedExecutionQueryRunner; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.QueryWatcher; +import org.apache.druid.query.Result; +import org.apache.druid.segment.Segment; import java.nio.ByteBuffer; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/topn/TopNResultBuilder.java b/processing/src/main/java/org/apache/druid/query/topn/TopNResultBuilder.java similarity index 94% rename from processing/src/main/java/io/druid/query/topn/TopNResultBuilder.java rename to processing/src/main/java/org/apache/druid/query/topn/TopNResultBuilder.java index 4fba6772c134..08aa46440a3d 100644 --- a/processing/src/main/java/io/druid/query/topn/TopNResultBuilder.java +++ b/processing/src/main/java/org/apache/druid/query/topn/TopNResultBuilder.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; -import io.druid.query.Result; +import org.apache.druid.query.Result; import java.util.Iterator; diff --git a/processing/src/main/java/io/druid/query/topn/TopNResultValue.java b/processing/src/main/java/org/apache/druid/query/topn/TopNResultValue.java similarity index 97% rename from processing/src/main/java/io/druid/query/topn/TopNResultValue.java rename to processing/src/main/java/org/apache/druid/query/topn/TopNResultValue.java index 3fab4e32f573..84d97efa2f51 100644 --- a/processing/src/main/java/io/druid/query/topn/TopNResultValue.java +++ b/processing/src/main/java/org/apache/druid/query/topn/TopNResultValue.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; import com.google.common.base.Function; import com.google.common.collect.Lists; -import io.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.IAE; import javax.annotation.Nullable; import java.util.Iterator; diff --git a/processing/src/main/java/io/druid/query/topn/TopNUtils.java b/processing/src/main/java/org/apache/druid/query/topn/TopNUtils.java similarity index 88% rename from processing/src/main/java/io/druid/query/topn/TopNUtils.java rename to processing/src/main/java/org/apache/druid/query/topn/TopNUtils.java index 4843c4031cf2..170f109c36d5 100644 --- a/processing/src/main/java/io/druid/query/topn/TopNUtils.java +++ b/processing/src/main/java/org/apache/druid/query/topn/TopNUtils.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; -import io.druid.segment.historical.HistoricalCursor; +import org.apache.druid.segment.historical.HistoricalCursor; final class TopNUtils { /** * Returns Object, so javac couldn't remove cast in methods like * {@link HistoricalSingleValueDimSelector1SimpleDoubleAggPooledTopNScannerPrototype#scanAndAggregate}. That cast is - * needed, because when TopNScannerPrototype is specialized, occurrences of {@link io.druid.segment.data.Offset} are + * needed, because when TopNScannerPrototype is specialized, occurrences of {@link org.apache.druid.segment.data.Offset} are * replaced with the specific Offset subtype in the TopNScannerPrototype bytecode, via {@link - * io.druid.query.monomorphicprocessing.SpecializationService#getSpecializationState(Class, String, + * org.apache.druid.query.monomorphicprocessing.SpecializationService#getSpecializationState(Class, String, * com.google.common.collect.ImmutableMap)}, providing ImmutableMap.of(Offset.class, specificOffsetSubtype) as the * classRemapping argument. * diff --git a/processing/src/main/java/io/druid/query/topn/types/NumericTopNColumnSelectorStrategy.java b/processing/src/main/java/org/apache/druid/query/topn/types/NumericTopNColumnSelectorStrategy.java similarity index 91% rename from processing/src/main/java/io/druid/query/topn/types/NumericTopNColumnSelectorStrategy.java rename to processing/src/main/java/org/apache/druid/query/topn/types/NumericTopNColumnSelectorStrategy.java index 7648e1a3bdc3..f396825d5470 100644 --- a/processing/src/main/java/io/druid/query/topn/types/NumericTopNColumnSelectorStrategy.java +++ b/processing/src/main/java/org/apache/druid/query/topn/types/NumericTopNColumnSelectorStrategy.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.query.topn.types; +package org.apache.druid.query.topn.types; -import io.druid.java.util.common.IAE; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.topn.BaseTopNAlgorithm; -import io.druid.query.topn.TopNParams; -import io.druid.query.topn.TopNQuery; -import io.druid.query.topn.TopNResultBuilder; -import io.druid.segment.BaseDoubleColumnValueSelector; -import io.druid.segment.BaseFloatColumnValueSelector; -import io.druid.segment.BaseLongColumnValueSelector; -import io.druid.segment.Cursor; -import io.druid.segment.DimensionHandlerUtils; -import io.druid.segment.StorageAdapter; -import io.druid.segment.column.ValueType; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.topn.BaseTopNAlgorithm; +import org.apache.druid.query.topn.TopNParams; +import org.apache.druid.query.topn.TopNQuery; +import org.apache.druid.query.topn.TopNResultBuilder; +import org.apache.druid.segment.BaseDoubleColumnValueSelector; +import org.apache.druid.segment.BaseFloatColumnValueSelector; +import org.apache.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.segment.Cursor; +import org.apache.druid.segment.DimensionHandlerUtils; +import org.apache.druid.segment.StorageAdapter; +import org.apache.druid.segment.column.ValueType; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import it.unimi.dsi.fastutil.longs.Long2ObjectMap; diff --git a/processing/src/main/java/io/druid/query/topn/types/StringTopNColumnSelectorStrategy.java b/processing/src/main/java/org/apache/druid/query/topn/types/StringTopNColumnSelectorStrategy.java similarity index 90% rename from processing/src/main/java/io/druid/query/topn/types/StringTopNColumnSelectorStrategy.java rename to processing/src/main/java/org/apache/druid/query/topn/types/StringTopNColumnSelectorStrategy.java index 76936ddc392a..dd30c369fcb9 100644 --- a/processing/src/main/java/io/druid/query/topn/types/StringTopNColumnSelectorStrategy.java +++ b/processing/src/main/java/org/apache/druid/query/topn/types/StringTopNColumnSelectorStrategy.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.query.topn.types; - -import io.druid.query.aggregation.Aggregator; -import io.druid.query.topn.BaseTopNAlgorithm; -import io.druid.query.topn.TopNParams; -import io.druid.query.topn.TopNQuery; -import io.druid.query.topn.TopNResultBuilder; -import io.druid.segment.Cursor; -import io.druid.segment.DimensionHandlerUtils; -import io.druid.segment.DimensionSelector; -import io.druid.segment.StorageAdapter; -import io.druid.segment.column.ValueType; -import io.druid.segment.data.IndexedInts; +package org.apache.druid.query.topn.types; + +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.topn.BaseTopNAlgorithm; +import org.apache.druid.query.topn.TopNParams; +import org.apache.druid.query.topn.TopNQuery; +import org.apache.druid.query.topn.TopNResultBuilder; +import org.apache.druid.segment.Cursor; +import org.apache.druid.segment.DimensionHandlerUtils; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.StorageAdapter; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.data.IndexedInts; import java.util.HashMap; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/topn/types/TopNColumnSelectorStrategy.java b/processing/src/main/java/org/apache/druid/query/topn/types/TopNColumnSelectorStrategy.java similarity index 91% rename from processing/src/main/java/io/druid/query/topn/types/TopNColumnSelectorStrategy.java rename to processing/src/main/java/org/apache/druid/query/topn/types/TopNColumnSelectorStrategy.java index 40f499ee03fc..464189d487d7 100644 --- a/processing/src/main/java/io/druid/query/topn/types/TopNColumnSelectorStrategy.java +++ b/processing/src/main/java/org/apache/druid/query/topn/types/TopNColumnSelectorStrategy.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.topn.types; +package org.apache.druid.query.topn.types; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.dimension.ColumnSelectorStrategy; -import io.druid.query.topn.TopNParams; -import io.druid.query.topn.TopNQuery; -import io.druid.query.topn.TopNResultBuilder; -import io.druid.segment.Cursor; -import io.druid.segment.StorageAdapter; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.dimension.ColumnSelectorStrategy; +import org.apache.druid.query.topn.TopNParams; +import org.apache.druid.query.topn.TopNQuery; +import org.apache.druid.query.topn.TopNResultBuilder; +import org.apache.druid.segment.Cursor; +import org.apache.druid.segment.StorageAdapter; import java.util.Map; diff --git a/processing/src/main/java/io/druid/query/topn/types/TopNColumnSelectorStrategyFactory.java b/processing/src/main/java/org/apache/druid/query/topn/types/TopNColumnSelectorStrategyFactory.java similarity index 89% rename from processing/src/main/java/io/druid/query/topn/types/TopNColumnSelectorStrategyFactory.java rename to processing/src/main/java/org/apache/druid/query/topn/types/TopNColumnSelectorStrategyFactory.java index 5f29874f1c2a..e0023c847f77 100644 --- a/processing/src/main/java/io/druid/query/topn/types/TopNColumnSelectorStrategyFactory.java +++ b/processing/src/main/java/org/apache/druid/query/topn/types/TopNColumnSelectorStrategyFactory.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.topn.types; +package org.apache.druid.query.topn.types; import com.google.common.base.Preconditions; -import io.druid.java.util.common.IAE; -import io.druid.query.dimension.ColumnSelectorStrategyFactory; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.column.ValueType; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.query.dimension.ColumnSelectorStrategyFactory; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.column.ValueType; public class TopNColumnSelectorStrategyFactory implements ColumnSelectorStrategyFactory { diff --git a/processing/src/main/java/io/druid/segment/AbstractIndex.java b/processing/src/main/java/org/apache/druid/segment/AbstractIndex.java similarity index 92% rename from processing/src/main/java/io/druid/segment/AbstractIndex.java rename to processing/src/main/java/org/apache/druid/segment/AbstractIndex.java index 207dab282803..670b36caaad0 100644 --- a/processing/src/main/java/io/druid/segment/AbstractIndex.java +++ b/processing/src/main/java/org/apache/druid/segment/AbstractIndex.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.segment.column.Column; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.segment.column.Column; import java.util.ArrayList; import java.util.Arrays; diff --git a/processing/src/main/java/io/druid/segment/AbstractSegment.java b/processing/src/main/java/org/apache/druid/segment/AbstractSegment.java similarity index 97% rename from processing/src/main/java/io/druid/segment/AbstractSegment.java rename to processing/src/main/java/org/apache/druid/segment/AbstractSegment.java index 4a921a4c228c..a7fb22cca39c 100644 --- a/processing/src/main/java/io/druid/segment/AbstractSegment.java +++ b/processing/src/main/java/org/apache/druid/segment/AbstractSegment.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; public abstract class AbstractSegment implements Segment { diff --git a/processing/src/main/java/io/druid/segment/BaseDoubleColumnValueSelector.java b/processing/src/main/java/org/apache/druid/segment/BaseDoubleColumnValueSelector.java similarity index 86% rename from processing/src/main/java/io/druid/segment/BaseDoubleColumnValueSelector.java rename to processing/src/main/java/org/apache/druid/segment/BaseDoubleColumnValueSelector.java index 58ff0d236478..42d38ae39051 100644 --- a/processing/src/main/java/io/druid/segment/BaseDoubleColumnValueSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/BaseDoubleColumnValueSelector.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.guice.annotations.PublicApi; -import io.druid.query.monomorphicprocessing.CalledFromHotLoop; -import io.druid.query.monomorphicprocessing.HotLoopCallee; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.query.monomorphicprocessing.CalledFromHotLoop; +import org.apache.druid.query.monomorphicprocessing.HotLoopCallee; /** * Double value selecting polymorphic "part" of the {@link ColumnValueSelector} interface. Users of {@link diff --git a/processing/src/main/java/io/druid/segment/BaseFloatColumnValueSelector.java b/processing/src/main/java/org/apache/druid/segment/BaseFloatColumnValueSelector.java similarity index 86% rename from processing/src/main/java/io/druid/segment/BaseFloatColumnValueSelector.java rename to processing/src/main/java/org/apache/druid/segment/BaseFloatColumnValueSelector.java index 3fc00809ff24..bf70346239ef 100644 --- a/processing/src/main/java/io/druid/segment/BaseFloatColumnValueSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/BaseFloatColumnValueSelector.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.guice.annotations.PublicApi; -import io.druid.query.monomorphicprocessing.CalledFromHotLoop; -import io.druid.query.monomorphicprocessing.HotLoopCallee; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.query.monomorphicprocessing.CalledFromHotLoop; +import org.apache.druid.query.monomorphicprocessing.HotLoopCallee; /** * Float value selecting polymorphic "part" of the {@link ColumnValueSelector} interface. Users of {@link diff --git a/processing/src/main/java/io/druid/segment/BaseLongColumnValueSelector.java b/processing/src/main/java/org/apache/druid/segment/BaseLongColumnValueSelector.java similarity index 85% rename from processing/src/main/java/io/druid/segment/BaseLongColumnValueSelector.java rename to processing/src/main/java/org/apache/druid/segment/BaseLongColumnValueSelector.java index 98e9cc1f961a..1d95564ace1b 100644 --- a/processing/src/main/java/io/druid/segment/BaseLongColumnValueSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/BaseLongColumnValueSelector.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.guice.annotations.PublicApi; -import io.druid.query.monomorphicprocessing.CalledFromHotLoop; -import io.druid.query.monomorphicprocessing.HotLoopCallee; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.query.monomorphicprocessing.CalledFromHotLoop; +import org.apache.druid.query.monomorphicprocessing.HotLoopCallee; /** * Long value selecting polymorphic "part" of the {@link ColumnValueSelector} interface. Users of {@link diff --git a/processing/src/main/java/io/druid/segment/BaseNullableColumnValueSelector.java b/processing/src/main/java/org/apache/druid/segment/BaseNullableColumnValueSelector.java similarity index 90% rename from processing/src/main/java/io/druid/segment/BaseNullableColumnValueSelector.java rename to processing/src/main/java/org/apache/druid/segment/BaseNullableColumnValueSelector.java index d2756b0864f0..2c4c0c56e896 100644 --- a/processing/src/main/java/io/druid/segment/BaseNullableColumnValueSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/BaseNullableColumnValueSelector.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.guice.annotations.PublicApi; -import io.druid.query.monomorphicprocessing.CalledFromHotLoop; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.query.monomorphicprocessing.CalledFromHotLoop; /** * Null value checking polymorphic "part" of the {@link ColumnValueSelector} interface for primitive values. diff --git a/processing/src/main/java/io/druid/segment/BaseObjectColumnValueSelector.java b/processing/src/main/java/org/apache/druid/segment/BaseObjectColumnValueSelector.java similarity index 94% rename from processing/src/main/java/io/druid/segment/BaseObjectColumnValueSelector.java rename to processing/src/main/java/org/apache/druid/segment/BaseObjectColumnValueSelector.java index 7db0ae13a3fb..71e1af2606be 100644 --- a/processing/src/main/java/io/druid/segment/BaseObjectColumnValueSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/BaseObjectColumnValueSelector.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.guice.annotations.PublicApi; +import org.apache.druid.guice.annotations.PublicApi; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/segment/BaseProgressIndicator.java b/processing/src/main/java/org/apache/druid/segment/BaseProgressIndicator.java similarity index 97% rename from processing/src/main/java/io/druid/segment/BaseProgressIndicator.java rename to processing/src/main/java/org/apache/druid/segment/BaseProgressIndicator.java index 702eb7243c0f..9d1016eaa50a 100644 --- a/processing/src/main/java/io/druid/segment/BaseProgressIndicator.java +++ b/processing/src/main/java/org/apache/druid/segment/BaseProgressIndicator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; /** */ diff --git a/processing/src/main/java/io/druid/segment/BitmapOffset.java b/processing/src/main/java/org/apache/druid/segment/BitmapOffset.java similarity index 91% rename from processing/src/main/java/io/druid/segment/BitmapOffset.java rename to processing/src/main/java/org/apache/druid/segment/BitmapOffset.java index 13253c6d0408..0729ea7324b9 100644 --- a/processing/src/main/java/io/druid/segment/BitmapOffset.java +++ b/processing/src/main/java/org/apache/druid/segment/BitmapOffset.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.segment; - -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.collections.bitmap.MutableBitmap; -import io.druid.collections.bitmap.WrappedImmutableRoaringBitmap; -import io.druid.extendedset.intset.EmptyIntIterator; -import io.druid.java.util.common.RE; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.data.Offset; -import io.druid.segment.data.ReadableOffset; -import io.druid.segment.data.RoaringBitmapSerdeFactory; +package org.apache.druid.segment; + +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.collections.bitmap.MutableBitmap; +import org.apache.druid.collections.bitmap.WrappedImmutableRoaringBitmap; +import org.apache.druid.extendedset.intset.EmptyIntIterator; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.data.Offset; +import org.apache.druid.segment.data.ReadableOffset; +import org.apache.druid.segment.data.RoaringBitmapSerdeFactory; import org.roaringbitmap.IntIterator; import java.util.Arrays; @@ -92,7 +92,7 @@ public class BitmapOffset extends Offset * this method, uses different copies of the same code, so JIT compiler analyzes and compiles the code for different * factorized fullness separately. The goal is to capture frequency of abstraction usage in compressed bitmap * algorithms, i. e. - * - "Zero sequence" vs. "Literal" vs. "One sequence" in {@link io.druid.extendedset.intset.ImmutableConciseSet} + * - "Zero sequence" vs. "Literal" vs. "One sequence" in {@link org.apache.druid.extendedset.intset.ImmutableConciseSet} * - {@link org.roaringbitmap.ArrayContainer} vs {@link org.roaringbitmap.BitmapContainer} in Roaring * and then https://shipilev.net/blog/2015/black-magic-method-dispatch/ comes into play. The secondary goal is to * capture HotSpot's thresholds, which it uses to compile conditional blocks differently inside bitmap impls. See @@ -232,7 +232,7 @@ public void inspectRuntimeShape(RuntimeShapeInspector inspector) private static IntIterator safeClone(IntIterator iterator) { // Calling clone() on empty iterators from RoaringBitmap library sometimes fails with NPE, - // see https://github.com/druid-io/druid/issues/4709, https://github.com/RoaringBitmap/RoaringBitmap/issues/177 + // see https://github.com/apache/incubator-druid/issues/4709, https://github.com/RoaringBitmap/RoaringBitmap/issues/177 return iterator.hasNext() ? iterator.clone() : EmptyIntIterator.instance(); } } diff --git a/processing/src/main/java/io/druid/segment/Capabilities.java b/processing/src/main/java/org/apache/druid/segment/Capabilities.java similarity index 97% rename from processing/src/main/java/io/druid/segment/Capabilities.java rename to processing/src/main/java/org/apache/druid/segment/Capabilities.java index 89ed4b36947b..d278118395af 100644 --- a/processing/src/main/java/io/druid/segment/Capabilities.java +++ b/processing/src/main/java/org/apache/druid/segment/Capabilities.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; /** */ diff --git a/processing/src/main/java/io/druid/segment/ColumnSelector.java b/processing/src/main/java/org/apache/druid/segment/ColumnSelector.java similarity index 92% rename from processing/src/main/java/io/druid/segment/ColumnSelector.java rename to processing/src/main/java/org/apache/druid/segment/ColumnSelector.java index 8205e69f68cf..c3ac63e8ab41 100644 --- a/processing/src/main/java/io/druid/segment/ColumnSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/ColumnSelector.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.segment.column.Column; +import org.apache.druid.segment.column.Column; import javax.annotation.Nullable; import java.util.List; diff --git a/processing/src/main/java/io/druid/segment/ColumnSelectorBitmapIndexSelector.java b/processing/src/main/java/org/apache/druid/segment/ColumnSelectorBitmapIndexSelector.java similarity index 88% rename from processing/src/main/java/io/druid/segment/ColumnSelectorBitmapIndexSelector.java rename to processing/src/main/java/org/apache/druid/segment/ColumnSelectorBitmapIndexSelector.java index ac7b9586cd42..f452a5025b27 100644 --- a/processing/src/main/java/io/druid/segment/ColumnSelectorBitmapIndexSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/ColumnSelectorBitmapIndexSelector.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.segment; - -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.collections.spatial.ImmutableRTree; -import io.druid.common.config.NullHandling; -import io.druid.query.filter.BitmapIndexSelector; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.column.BitmapIndex; -import io.druid.segment.column.Column; -import io.druid.segment.column.DictionaryEncodedColumn; -import io.druid.segment.column.GenericColumn; -import io.druid.segment.column.ValueType; -import io.druid.segment.data.Indexed; -import io.druid.segment.data.IndexedIterable; -import io.druid.segment.filter.Filters; +package org.apache.druid.segment; + +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.collections.spatial.ImmutableRTree; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.query.filter.BitmapIndexSelector; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.column.BitmapIndex; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.DictionaryEncodedColumn; +import org.apache.druid.segment.column.GenericColumn; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.data.Indexed; +import org.apache.druid.segment.data.IndexedIterable; +import org.apache.druid.segment.filter.Filters; import java.util.Iterator; @@ -176,7 +176,7 @@ public BitmapFactory getBitmapFactory() /** * Return -2 for non-null values to match what the {@link BitmapIndex} implementation in - * {@link io.druid.segment.serde.BitmapIndexColumnPartSupplier} + * {@link org.apache.druid.segment.serde.BitmapIndexColumnPartSupplier} * would return for {@link BitmapIndex#getIndex(String)} when there is only a single index, for the null value. * i.e., return an 'insertion point' of 1 for non-null values (see {@link BitmapIndex} interface) */ diff --git a/processing/src/main/java/io/druid/segment/ColumnSelectorFactory.java b/processing/src/main/java/org/apache/druid/segment/ColumnSelectorFactory.java similarity index 89% rename from processing/src/main/java/io/druid/segment/ColumnSelectorFactory.java rename to processing/src/main/java/org/apache/druid/segment/ColumnSelectorFactory.java index 17ccad4c425c..3d51c27ee7fa 100644 --- a/processing/src/main/java/io/druid/segment/ColumnSelectorFactory.java +++ b/processing/src/main/java/org/apache/druid/segment/ColumnSelectorFactory.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.guice.annotations.PublicApi; -import io.druid.query.dimension.DimensionSpec; -import io.druid.segment.column.ColumnCapabilities; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.segment.column.ColumnCapabilities; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/segment/ColumnValueSelector.java b/processing/src/main/java/org/apache/druid/segment/ColumnValueSelector.java similarity index 95% rename from processing/src/main/java/io/druid/segment/ColumnValueSelector.java rename to processing/src/main/java/org/apache/druid/segment/ColumnValueSelector.java index 73083058e693..be7a5fd34a02 100644 --- a/processing/src/main/java/io/druid/segment/ColumnValueSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/ColumnValueSelector.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.guice.annotations.PublicApi; +import org.apache.druid.guice.annotations.PublicApi; /** * Base type for interfaces that manage column value selection, e.g. {@link DimensionSelector}, {@link diff --git a/processing/src/main/java/io/druid/segment/CompressedPools.java b/processing/src/main/java/org/apache/druid/segment/CompressedPools.java similarity index 93% rename from processing/src/main/java/io/druid/segment/CompressedPools.java rename to processing/src/main/java/org/apache/druid/segment/CompressedPools.java index e83814b53c51..19dfa4458df8 100644 --- a/processing/src/main/java/io/druid/segment/CompressedPools.java +++ b/processing/src/main/java/org/apache/druid/segment/CompressedPools.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.base.Supplier; import com.ning.compress.BufferRecycler; -import io.druid.collections.NonBlockingPool; -import io.druid.collections.ResourceHolder; -import io.druid.collections.StupidPool; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.collections.NonBlockingPool; +import org.apache.druid.collections.ResourceHolder; +import org.apache.druid.collections.StupidPool; +import org.apache.druid.java.util.common.logger.Logger; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/processing/src/main/java/io/druid/segment/ConstantDimensionSelector.java b/processing/src/main/java/org/apache/druid/segment/ConstantDimensionSelector.java similarity index 85% rename from processing/src/main/java/io/druid/segment/ConstantDimensionSelector.java rename to processing/src/main/java/org/apache/druid/segment/ConstantDimensionSelector.java index f7b01b899d89..a50afc3b1e14 100644 --- a/processing/src/main/java/io/druid/segment/ConstantDimensionSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/ConstantDimensionSelector.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.base.Predicate; -import io.druid.common.config.NullHandling; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.data.IndexedInts; -import io.druid.segment.data.ZeroIndexedInts; -import io.druid.segment.filter.BooleanValueMatcher; -import io.druid.segment.historical.SingleValueHistoricalDimensionSelector; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.data.IndexedInts; +import org.apache.druid.segment.data.ZeroIndexedInts; +import org.apache.druid.segment.filter.BooleanValueMatcher; +import org.apache.druid.segment.historical.SingleValueHistoricalDimensionSelector; import javax.annotation.Nullable; import java.util.Objects; diff --git a/processing/src/main/java/io/druid/segment/ConstantExprEvalSelector.java b/processing/src/main/java/org/apache/druid/segment/ConstantExprEvalSelector.java similarity index 91% rename from processing/src/main/java/io/druid/segment/ConstantExprEvalSelector.java rename to processing/src/main/java/org/apache/druid/segment/ConstantExprEvalSelector.java index 66ea1dfe89b6..67b883779d3e 100644 --- a/processing/src/main/java/io/druid/segment/ConstantExprEvalSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/ConstantExprEvalSelector.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.base.Preconditions; -import io.druid.common.config.NullHandling; -import io.druid.math.expr.ExprEval; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.math.expr.ExprEval; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; public class ConstantExprEvalSelector implements ColumnValueSelector { diff --git a/processing/src/main/java/io/druid/segment/Cursor.java b/processing/src/main/java/org/apache/druid/segment/Cursor.java similarity index 87% rename from processing/src/main/java/io/druid/segment/Cursor.java rename to processing/src/main/java/org/apache/druid/segment/Cursor.java index 54ef8d1b418d..7964485f5296 100644 --- a/processing/src/main/java/io/druid/segment/Cursor.java +++ b/processing/src/main/java/org/apache/druid/segment/Cursor.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import org.joda.time.DateTime; /** * Cursor is an interface for iteration over a range of data points, used during query execution. {@link * QueryableIndexStorageAdapter.QueryableIndexCursor} is an implementation for historical segments, and {@link - * io.druid.segment.incremental.IncrementalIndexStorageAdapter.IncrementalIndexCursor} is an implementation for {@link - * io.druid.segment.incremental.IncrementalIndex}. + * org.apache.druid.segment.incremental.IncrementalIndexStorageAdapter.IncrementalIndexCursor} is an implementation for {@link + * org.apache.druid.segment.incremental.IncrementalIndex}. * * Cursor is conceptually similar to {@link TimeAndDimsPointer}, but the latter is used for historical segment creation * rather than query execution (as Cursor). If those abstractions could be collapsed (and if it is worthwhile) is yet to diff --git a/processing/src/main/java/io/druid/segment/CursorFactory.java b/processing/src/main/java/org/apache/druid/segment/CursorFactory.java similarity index 82% rename from processing/src/main/java/io/druid/segment/CursorFactory.java rename to processing/src/main/java/org/apache/druid/segment/CursorFactory.java index 345c44e9ddbe..c3e55031702b 100644 --- a/processing/src/main/java/io/druid/segment/CursorFactory.java +++ b/processing/src/main/java/org/apache/druid/segment/CursorFactory.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.QueryMetrics; -import io.druid.query.filter.Filter; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.QueryMetrics; +import org.apache.druid.query.filter.Filter; import org.joda.time.Interval; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/segment/DimensionHandler.java b/processing/src/main/java/org/apache/druid/segment/DimensionHandler.java similarity index 91% rename from processing/src/main/java/io/druid/segment/DimensionHandler.java rename to processing/src/main/java/org/apache/druid/segment/DimensionHandler.java index b84f6baf74d7..805d5b8a197d 100644 --- a/processing/src/main/java/io/druid/segment/DimensionHandler.java +++ b/processing/src/main/java/org/apache/druid/segment/DimensionHandler.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.data.input.impl.DimensionSchema.MultiValueHandling; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.selector.settable.SettableColumnValueSelector; -import io.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.data.input.impl.DimensionSchema.MultiValueHandling; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.selector.settable.SettableColumnValueSelector; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; import java.util.Comparator; @@ -39,7 +39,7 @@ * * This interface allows type-specific behavior column logic, such as choice of indexing structures and disk formats. * to be contained within a type-specific set of handler objects, simplifying processing classes - * such as {@link io.druid.segment.incremental.IncrementalIndex} and {@link IndexMerger} and allowing for abstracted + * such as {@link org.apache.druid.segment.incremental.IncrementalIndex} and {@link IndexMerger} and allowing for abstracted * development of additional dimension types. * * A DimensionHandler is a stateless object, and thus thread-safe; its methods should be pure functions. @@ -124,7 +124,7 @@ DimensionMergerV9 makeMerger( /** * Creates and returns a new object of some implementation of {@link SettableColumnValueSelector}, that corresponds * to the type of this DimensionHandler. E. g. {@link LongDimensionHandler} returns {@link - * io.druid.segment.selector.settable.SettableLongColumnValueSelector}, etc. + * org.apache.druid.segment.selector.settable.SettableLongColumnValueSelector}, etc. */ SettableColumnValueSelector makeNewSettableEncodedValueSelector(); } diff --git a/processing/src/main/java/io/druid/segment/DimensionHandlerUtils.java b/processing/src/main/java/org/apache/druid/segment/DimensionHandlerUtils.java similarity index 95% rename from processing/src/main/java/io/druid/segment/DimensionHandlerUtils.java rename to processing/src/main/java/org/apache/druid/segment/DimensionHandlerUtils.java index b89296e805a6..13b278c04144 100644 --- a/processing/src/main/java/io/druid/segment/DimensionHandlerUtils.java +++ b/processing/src/main/java/org/apache/druid/segment/DimensionHandlerUtils.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Doubles; import com.google.common.primitives.Floats; -import io.druid.common.guava.GuavaUtils; -import io.druid.data.input.impl.DimensionSchema.MultiValueHandling; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.guava.Comparators; -import io.druid.java.util.common.parsers.ParseException; -import io.druid.query.ColumnSelectorPlus; -import io.druid.query.dimension.ColumnSelectorStrategy; -import io.druid.query.dimension.ColumnSelectorStrategyFactory; -import io.druid.query.dimension.DimensionSpec; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.column.ColumnCapabilitiesImpl; -import io.druid.segment.column.ValueType; +import org.apache.druid.common.guava.GuavaUtils; +import org.apache.druid.data.input.impl.DimensionSchema.MultiValueHandling; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.java.util.common.parsers.ParseException; +import org.apache.druid.query.ColumnSelectorPlus; +import org.apache.druid.query.dimension.ColumnSelectorStrategy; +import org.apache.druid.query.dimension.ColumnSelectorStrategyFactory; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.column.ColumnCapabilitiesImpl; +import org.apache.druid.segment.column.ValueType; import javax.annotation.Nullable; import java.math.BigDecimal; diff --git a/processing/src/main/java/io/druid/segment/DimensionIndexer.java b/processing/src/main/java/org/apache/druid/segment/DimensionIndexer.java similarity index 96% rename from processing/src/main/java/io/druid/segment/DimensionIndexer.java rename to processing/src/main/java/org/apache/druid/segment/DimensionIndexer.java index 10d16c96e817..118df7700c0a 100644 --- a/processing/src/main/java/io/druid/segment/DimensionIndexer.java +++ b/processing/src/main/java/org/apache/druid/segment/DimensionIndexer.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.MutableBitmap; -import io.druid.query.dimension.DimensionSpec; -import io.druid.segment.data.Indexed; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexRowHolder; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.MutableBitmap; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.segment.data.Indexed; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexRowHolder; import javax.annotation.Nullable; @@ -59,7 +59,7 @@ * The first ordering will be referred to as "Unsorted" in the documentation for this interface, and * the second ordering will be referred to as "Sorted". * - * The unsorted ordering is used during ingestion, within the {@link io.druid.segment.incremental.IncrementalIndexRow} + * The unsorted ordering is used during ingestion, within the {@link org.apache.druid.segment.incremental.IncrementalIndexRow} * keys; the encodings are built as rows are ingested, taking the order in which new dimension values are seen. * * The generation of a sorted encoding takes place during segment creation when indexes are merged/persisted. diff --git a/processing/src/main/java/io/druid/segment/DimensionMerger.java b/processing/src/main/java/org/apache/druid/segment/DimensionMerger.java similarity index 97% rename from processing/src/main/java/io/druid/segment/DimensionMerger.java rename to processing/src/main/java/org/apache/druid/segment/DimensionMerger.java index 472d40ecc810..bd366929a712 100644 --- a/processing/src/main/java/io/druid/segment/DimensionMerger.java +++ b/processing/src/main/java/org/apache/druid/segment/DimensionMerger.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import javax.annotation.Nullable; import java.io.IOException; @@ -55,7 +55,7 @@ public interface DimensionMerger /** * Given a list of segment adapters: * - Read _sorted order_ (e. g. see {@link - * io.druid.segment.incremental.IncrementalIndexAdapter#getDimValueLookup(String)}) dictionary encoding information + * org.apache.druid.segment.incremental.IncrementalIndexAdapter#getDimValueLookup(String)}) dictionary encoding information * from the adapters * - Merge those sorted order dictionary into a one big sorted order dictionary and write this merged dictionary. * diff --git a/processing/src/main/java/io/druid/segment/DimensionMergerV9.java b/processing/src/main/java/org/apache/druid/segment/DimensionMergerV9.java similarity index 93% rename from processing/src/main/java/io/druid/segment/DimensionMergerV9.java rename to processing/src/main/java/org/apache/druid/segment/DimensionMergerV9.java index 9fba4395ac3a..b5049a89817e 100644 --- a/processing/src/main/java/io/druid/segment/DimensionMergerV9.java +++ b/processing/src/main/java/org/apache/druid/segment/DimensionMergerV9.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.segment.column.ColumnDescriptor; +import org.apache.druid.segment.column.ColumnDescriptor; /** * Processing related interface diff --git a/processing/src/main/java/io/druid/segment/DimensionSelector.java b/processing/src/main/java/org/apache/druid/segment/DimensionSelector.java similarity index 84% rename from processing/src/main/java/io/druid/segment/DimensionSelector.java rename to processing/src/main/java/org/apache/druid/segment/DimensionSelector.java index 460a3a2bd874..1097b2ac29b0 100644 --- a/processing/src/main/java/io/druid/segment/DimensionSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/DimensionSelector.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.base.Predicate; -import io.druid.guice.annotations.PublicApi; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.monomorphicprocessing.CalledFromHotLoop; -import io.druid.query.monomorphicprocessing.HotLoopCallee; -import io.druid.segment.data.IndexedInts; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.monomorphicprocessing.CalledFromHotLoop; +import org.apache.druid.query.monomorphicprocessing.HotLoopCallee; +import org.apache.druid.segment.data.IndexedInts; import javax.annotation.Nullable; @@ -40,9 +40,9 @@ public interface DimensionSelector extends ColumnValueSelector, HotLoopCallee * * IMPORTANT. The returned {@link IndexedInts} object could generally be reused inside the implementation of * DimensionSelector, i. e. this method could always return the same object for the same selector. Users - * of this API, such as {@link io.druid.query.aggregation.Aggregator#aggregate()}, {@link - * io.druid.query.aggregation.BufferAggregator#aggregate}, {@link io.druid.query.aggregation.AggregateCombiner#reset}, - * {@link io.druid.query.aggregation.AggregateCombiner#fold} should be prepared for that and not storing the object + * of this API, such as {@link org.apache.druid.query.aggregation.Aggregator#aggregate()}, {@link + * org.apache.druid.query.aggregation.BufferAggregator#aggregate}, {@link org.apache.druid.query.aggregation.AggregateCombiner#reset}, + * {@link org.apache.druid.query.aggregation.AggregateCombiner#fold} should be prepared for that and not storing the object * returned from this method in their state, assuming that the object will remain unchanged even when the position of * the selector changes. This may not be the case. */ @@ -129,7 +129,7 @@ public interface DimensionSelector extends ColumnValueSelector, HotLoopCallee @Override default float getFloat() { - // This is controversial, see https://github.com/druid-io/druid/issues/4888 + // This is controversial, see https://github.com/apache/incubator-druid/issues/4888 return 0.0f; } @@ -137,7 +137,7 @@ default float getFloat() @Override default double getDouble() { - // This is controversial, see https://github.com/druid-io/druid/issues/4888 + // This is controversial, see https://github.com/apache/incubator-druid/issues/4888 return 0.0; } @@ -145,7 +145,7 @@ default double getDouble() @Override default long getLong() { - // This is controversial, see https://github.com/druid-io/druid/issues/4888 + // This is controversial, see https://github.com/apache/incubator-druid/issues/4888 return 0L; } diff --git a/processing/src/main/java/io/druid/segment/DimensionSelectorUtils.java b/processing/src/main/java/org/apache/druid/segment/DimensionSelectorUtils.java similarity index 95% rename from processing/src/main/java/io/druid/segment/DimensionSelectorUtils.java rename to processing/src/main/java/org/apache/druid/segment/DimensionSelectorUtils.java index bb8698d24a06..7360fefb5fc2 100644 --- a/processing/src/main/java/io/druid/segment/DimensionSelectorUtils.java +++ b/processing/src/main/java/org/apache/druid/segment/DimensionSelectorUtils.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.base.Predicate; import com.google.common.base.Predicates; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.IAE; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.data.IndexedInts; -import io.druid.segment.filter.BooleanValueMatcher; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.data.IndexedInts; +import org.apache.druid.segment.filter.BooleanValueMatcher; import javax.annotation.Nullable; import java.util.BitSet; diff --git a/processing/src/main/java/io/druid/segment/DoubleColumnSelector.java b/processing/src/main/java/org/apache/druid/segment/DoubleColumnSelector.java similarity index 98% rename from processing/src/main/java/io/druid/segment/DoubleColumnSelector.java rename to processing/src/main/java/org/apache/druid/segment/DoubleColumnSelector.java index 50533480668a..e7f16295a54a 100644 --- a/processing/src/main/java/io/druid/segment/DoubleColumnSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/DoubleColumnSelector.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/segment/DoubleColumnSerializer.java b/processing/src/main/java/org/apache/druid/segment/DoubleColumnSerializer.java similarity index 86% rename from processing/src/main/java/io/druid/segment/DoubleColumnSerializer.java rename to processing/src/main/java/org/apache/druid/segment/DoubleColumnSerializer.java index fb58c92ab8e8..0082f2595dcb 100644 --- a/processing/src/main/java/io/druid/segment/DoubleColumnSerializer.java +++ b/processing/src/main/java/org/apache/druid/segment/DoubleColumnSerializer.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.segment.writeout.SegmentWriteOutMedium; -import io.druid.segment.data.CompressionFactory; -import io.druid.segment.data.CompressionStrategy; -import io.druid.segment.data.ColumnarDoublesSerializer; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.segment.data.CompressionFactory; +import org.apache.druid.segment.data.CompressionStrategy; +import org.apache.druid.segment.data.ColumnarDoublesSerializer; import java.io.IOException; import java.nio.ByteOrder; diff --git a/processing/src/main/java/io/druid/segment/DoubleColumnSerializerV2.java b/processing/src/main/java/org/apache/druid/segment/DoubleColumnSerializerV2.java similarity index 85% rename from processing/src/main/java/io/druid/segment/DoubleColumnSerializerV2.java rename to processing/src/main/java/org/apache/druid/segment/DoubleColumnSerializerV2.java index bd56e09d5f6d..9859cee82338 100644 --- a/processing/src/main/java/io/druid/segment/DoubleColumnSerializerV2.java +++ b/processing/src/main/java/org/apache/druid/segment/DoubleColumnSerializerV2.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.primitives.Ints; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.collections.bitmap.MutableBitmap; -import io.druid.common.utils.SerializerUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.segment.data.BitmapSerdeFactory; -import io.druid.segment.data.ByteBufferWriter; -import io.druid.segment.data.ColumnarDoublesSerializer; -import io.druid.segment.data.CompressionFactory; -import io.druid.segment.data.CompressionStrategy; -import io.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.collections.bitmap.MutableBitmap; +import org.apache.druid.common.utils.SerializerUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.segment.data.BitmapSerdeFactory; +import org.apache.druid.segment.data.ByteBufferWriter; +import org.apache.druid.segment.data.ColumnarDoublesSerializer; +import org.apache.druid.segment.data.CompressionFactory; +import org.apache.druid.segment.data.CompressionStrategy; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; import java.io.IOException; import java.nio.ByteOrder; diff --git a/processing/src/main/java/io/druid/segment/DoubleDimensionHandler.java b/processing/src/main/java/org/apache/druid/segment/DoubleDimensionHandler.java similarity index 87% rename from processing/src/main/java/io/druid/segment/DoubleDimensionHandler.java rename to processing/src/main/java/org/apache/druid/segment/DoubleDimensionHandler.java index 5cb645ffe270..008c46ef3e79 100644 --- a/processing/src/main/java/io/druid/segment/DoubleDimensionHandler.java +++ b/processing/src/main/java/org/apache/druid/segment/DoubleDimensionHandler.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.selector.settable.SettableColumnValueSelector; -import io.druid.segment.selector.settable.SettableDoubleColumnValueSelector; -import io.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.selector.settable.SettableColumnValueSelector; +import org.apache.druid.segment.selector.settable.SettableDoubleColumnValueSelector; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; import java.util.Comparator; diff --git a/processing/src/main/java/io/druid/segment/DoubleDimensionIndexer.java b/processing/src/main/java/org/apache/druid/segment/DoubleDimensionIndexer.java similarity index 89% rename from processing/src/main/java/io/druid/segment/DoubleDimensionIndexer.java rename to processing/src/main/java/org/apache/druid/segment/DoubleDimensionIndexer.java index 4c7b04dfe8d4..9277bb814321 100644 --- a/processing/src/main/java/io/druid/segment/DoubleDimensionIndexer.java +++ b/processing/src/main/java/org/apache/druid/segment/DoubleDimensionIndexer.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.segment; - -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.MutableBitmap; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.guava.Comparators; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.data.Indexed; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexRowHolder; +package org.apache.druid.segment; + +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.MutableBitmap; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.data.Indexed; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexRowHolder; import javax.annotation.Nullable; import java.util.Comparator; diff --git a/processing/src/main/java/io/druid/segment/DoubleDimensionMergerV9.java b/processing/src/main/java/org/apache/druid/segment/DoubleDimensionMergerV9.java similarity index 85% rename from processing/src/main/java/io/druid/segment/DoubleDimensionMergerV9.java rename to processing/src/main/java/org/apache/druid/segment/DoubleDimensionMergerV9.java index ffffac334381..ffa9530f1b73 100644 --- a/processing/src/main/java/io/druid/segment/DoubleDimensionMergerV9.java +++ b/processing/src/main/java/org/apache/druid/segment/DoubleDimensionMergerV9.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.segment.column.ColumnDescriptor; -import io.druid.segment.column.ValueType; -import io.druid.segment.serde.ColumnPartSerde; -import io.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.segment.column.ColumnDescriptor; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.serde.ColumnPartSerde; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; public class DoubleDimensionMergerV9 extends NumericDimensionMergerV9 { diff --git a/processing/src/main/java/io/druid/segment/DoubleWrappingDimensionSelector.java b/processing/src/main/java/org/apache/druid/segment/DoubleWrappingDimensionSelector.java similarity index 87% rename from processing/src/main/java/io/druid/segment/DoubleWrappingDimensionSelector.java rename to processing/src/main/java/org/apache/druid/segment/DoubleWrappingDimensionSelector.java index f42dbb11c1b5..7ae8a6e3464b 100644 --- a/processing/src/main/java/io/druid/segment/DoubleWrappingDimensionSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/DoubleWrappingDimensionSelector.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.virtual.BaseSingleValueDimensionSelector; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.virtual.BaseSingleValueDimensionSelector; public class DoubleWrappingDimensionSelector extends BaseSingleValueDimensionSelector { diff --git a/processing/src/main/java/io/druid/segment/FilteredOffset.java b/processing/src/main/java/org/apache/druid/segment/FilteredOffset.java similarity index 88% rename from processing/src/main/java/io/druid/segment/FilteredOffset.java rename to processing/src/main/java/org/apache/druid/segment/FilteredOffset.java index 697108558bf5..d387c65c6a10 100644 --- a/processing/src/main/java/io/druid/segment/FilteredOffset.java +++ b/processing/src/main/java/org/apache/druid/segment/FilteredOffset.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.segment; - -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.query.BaseQuery; -import io.druid.query.filter.BooleanFilter; -import io.druid.query.filter.Filter; -import io.druid.query.filter.RowOffsetMatcherFactory; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.data.Offset; -import io.druid.segment.data.ReadableOffset; -import io.druid.segment.filter.BooleanValueMatcher; +package org.apache.druid.segment; + +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.query.BaseQuery; +import org.apache.druid.query.filter.BooleanFilter; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.query.filter.RowOffsetMatcherFactory; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.data.Offset; +import org.apache.druid.segment.data.ReadableOffset; +import org.apache.druid.segment.filter.BooleanValueMatcher; import org.roaringbitmap.IntIterator; public final class FilteredOffset extends Offset @@ -116,9 +116,9 @@ public ReadableOffset getBaseReadableOffset() * approach could be investigated. * * If clone is made possible for FilteredOffset, some improvements could become possible in {@link - * io.druid.query.topn.PooledTopNAlgorithm#computeSpecializedScanAndAggregateImplementations}. + * org.apache.druid.query.topn.PooledTopNAlgorithm#computeSpecializedScanAndAggregateImplementations}. * - * See also https://github.com/druid-io/druid/issues/5132. + * See also https://github.com/apache/incubator-druid/issues/5132. */ @Override public Offset clone() diff --git a/processing/src/main/java/io/druid/segment/FloatColumnSelector.java b/processing/src/main/java/org/apache/druid/segment/FloatColumnSelector.java similarity index 98% rename from processing/src/main/java/io/druid/segment/FloatColumnSelector.java rename to processing/src/main/java/org/apache/druid/segment/FloatColumnSelector.java index e7508540bc9a..068e7c8e8160 100644 --- a/processing/src/main/java/io/druid/segment/FloatColumnSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/FloatColumnSelector.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/segment/FloatColumnSerializer.java b/processing/src/main/java/org/apache/druid/segment/FloatColumnSerializer.java similarity index 86% rename from processing/src/main/java/io/druid/segment/FloatColumnSerializer.java rename to processing/src/main/java/org/apache/druid/segment/FloatColumnSerializer.java index ef68e02ace27..f21325f86575 100644 --- a/processing/src/main/java/io/druid/segment/FloatColumnSerializer.java +++ b/processing/src/main/java/org/apache/druid/segment/FloatColumnSerializer.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.segment.writeout.SegmentWriteOutMedium; -import io.druid.segment.data.CompressionFactory; -import io.druid.segment.data.CompressionStrategy; -import io.druid.segment.data.ColumnarFloatsSerializer; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.segment.data.CompressionFactory; +import org.apache.druid.segment.data.CompressionStrategy; +import org.apache.druid.segment.data.ColumnarFloatsSerializer; import java.io.IOException; import java.nio.ByteOrder; diff --git a/processing/src/main/java/io/druid/segment/FloatColumnSerializerV2.java b/processing/src/main/java/org/apache/druid/segment/FloatColumnSerializerV2.java similarity index 85% rename from processing/src/main/java/io/druid/segment/FloatColumnSerializerV2.java rename to processing/src/main/java/org/apache/druid/segment/FloatColumnSerializerV2.java index 51d79622501e..1ef0b59bce9b 100644 --- a/processing/src/main/java/io/druid/segment/FloatColumnSerializerV2.java +++ b/processing/src/main/java/org/apache/druid/segment/FloatColumnSerializerV2.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.primitives.Ints; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.collections.bitmap.MutableBitmap; -import io.druid.common.utils.SerializerUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.segment.data.BitmapSerdeFactory; -import io.druid.segment.data.ByteBufferWriter; -import io.druid.segment.data.ColumnarFloatsSerializer; -import io.druid.segment.data.CompressionFactory; -import io.druid.segment.data.CompressionStrategy; -import io.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.collections.bitmap.MutableBitmap; +import org.apache.druid.common.utils.SerializerUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.segment.data.BitmapSerdeFactory; +import org.apache.druid.segment.data.ByteBufferWriter; +import org.apache.druid.segment.data.ColumnarFloatsSerializer; +import org.apache.druid.segment.data.CompressionFactory; +import org.apache.druid.segment.data.CompressionStrategy; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; import java.io.IOException; import java.nio.ByteOrder; diff --git a/processing/src/main/java/io/druid/segment/FloatDimensionHandler.java b/processing/src/main/java/org/apache/druid/segment/FloatDimensionHandler.java similarity index 87% rename from processing/src/main/java/io/druid/segment/FloatDimensionHandler.java rename to processing/src/main/java/org/apache/druid/segment/FloatDimensionHandler.java index 0e72275376d1..0c0f4cb768f9 100644 --- a/processing/src/main/java/io/druid/segment/FloatDimensionHandler.java +++ b/processing/src/main/java/org/apache/druid/segment/FloatDimensionHandler.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.selector.settable.SettableColumnValueSelector; -import io.druid.segment.selector.settable.SettableFloatColumnValueSelector; -import io.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.selector.settable.SettableColumnValueSelector; +import org.apache.druid.segment.selector.settable.SettableFloatColumnValueSelector; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; import java.util.Comparator; diff --git a/processing/src/main/java/io/druid/segment/FloatDimensionIndexer.java b/processing/src/main/java/org/apache/druid/segment/FloatDimensionIndexer.java similarity index 89% rename from processing/src/main/java/io/druid/segment/FloatDimensionIndexer.java rename to processing/src/main/java/org/apache/druid/segment/FloatDimensionIndexer.java index f48fa10d3bb9..9960e1a12ccf 100644 --- a/processing/src/main/java/io/druid/segment/FloatDimensionIndexer.java +++ b/processing/src/main/java/org/apache/druid/segment/FloatDimensionIndexer.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.segment; - -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.MutableBitmap; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.guava.Comparators; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.data.Indexed; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexRowHolder; +package org.apache.druid.segment; + +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.MutableBitmap; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.data.Indexed; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexRowHolder; import javax.annotation.Nullable; import java.util.Comparator; diff --git a/processing/src/main/java/io/druid/segment/FloatDimensionMergerV9.java b/processing/src/main/java/org/apache/druid/segment/FloatDimensionMergerV9.java similarity index 85% rename from processing/src/main/java/io/druid/segment/FloatDimensionMergerV9.java rename to processing/src/main/java/org/apache/druid/segment/FloatDimensionMergerV9.java index 2f2a4977b278..eec1aa306582 100644 --- a/processing/src/main/java/io/druid/segment/FloatDimensionMergerV9.java +++ b/processing/src/main/java/org/apache/druid/segment/FloatDimensionMergerV9.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.segment.column.ColumnDescriptor; -import io.druid.segment.column.ValueType; -import io.druid.segment.serde.ColumnPartSerde; -import io.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.segment.column.ColumnDescriptor; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.serde.ColumnPartSerde; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; public class FloatDimensionMergerV9 extends NumericDimensionMergerV9 { diff --git a/processing/src/main/java/io/druid/segment/FloatWrappingDimensionSelector.java b/processing/src/main/java/org/apache/druid/segment/FloatWrappingDimensionSelector.java similarity index 88% rename from processing/src/main/java/io/druid/segment/FloatWrappingDimensionSelector.java rename to processing/src/main/java/org/apache/druid/segment/FloatWrappingDimensionSelector.java index f21f9c2e07cd..b2ee8de3e59f 100644 --- a/processing/src/main/java/io/druid/segment/FloatWrappingDimensionSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/FloatWrappingDimensionSelector.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.virtual.BaseSingleValueDimensionSelector; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.virtual.BaseSingleValueDimensionSelector; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/segment/ForwardingRowIterator.java b/processing/src/main/java/org/apache/druid/segment/ForwardingRowIterator.java similarity index 98% rename from processing/src/main/java/io/druid/segment/ForwardingRowIterator.java rename to processing/src/main/java/org/apache/druid/segment/ForwardingRowIterator.java index 53ad01c2047e..044b5e0aa2fd 100644 --- a/processing/src/main/java/io/druid/segment/ForwardingRowIterator.java +++ b/processing/src/main/java/org/apache/druid/segment/ForwardingRowIterator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; /** * Implementation of {@link TransformableRowIterator} that just delegates all methods to some baseIterator (adapter diff --git a/processing/src/main/java/io/druid/segment/GenericColumnSerializer.java b/processing/src/main/java/org/apache/druid/segment/GenericColumnSerializer.java similarity index 87% rename from processing/src/main/java/io/druid/segment/GenericColumnSerializer.java rename to processing/src/main/java/org/apache/druid/segment/GenericColumnSerializer.java index f654611b9403..16d41ca92e3e 100644 --- a/processing/src/main/java/io/druid/segment/GenericColumnSerializer.java +++ b/processing/src/main/java/org/apache/druid/segment/GenericColumnSerializer.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.guice.annotations.ExtensionPoint; -import io.druid.segment.serde.Serializer; +import org.apache.druid.guice.annotations.ExtensionPoint; +import org.apache.druid.segment.serde.Serializer; import java.io.IOException; diff --git a/processing/src/main/java/io/druid/segment/IdLookup.java b/processing/src/main/java/org/apache/druid/segment/IdLookup.java similarity index 96% rename from processing/src/main/java/io/druid/segment/IdLookup.java rename to processing/src/main/java/org/apache/druid/segment/IdLookup.java index 81567ddc92c9..e939952330ca 100644 --- a/processing/src/main/java/io/druid/segment/IdLookup.java +++ b/processing/src/main/java/org/apache/druid/segment/IdLookup.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/segment/IncrementalIndexSegment.java b/processing/src/main/java/org/apache/druid/segment/IncrementalIndexSegment.java similarity index 90% rename from processing/src/main/java/io/druid/segment/IncrementalIndexSegment.java rename to processing/src/main/java/org/apache/druid/segment/IncrementalIndexSegment.java index 4cb1187969bd..f48adc6e623b 100644 --- a/processing/src/main/java/io/druid/segment/IncrementalIndexSegment.java +++ b/processing/src/main/java/org/apache/druid/segment/IncrementalIndexSegment.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexStorageAdapter; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexStorageAdapter; import org.joda.time.Interval; /** diff --git a/processing/src/main/java/io/druid/segment/IndexIO.java b/processing/src/main/java/org/apache/druid/segment/IndexIO.java similarity index 92% rename from processing/src/main/java/io/druid/segment/IndexIO.java rename to processing/src/main/java/org/apache/druid/segment/IndexIO.java index 42c9cbdb716a..5088f9d23bad 100644 --- a/processing/src/main/java/io/druid/segment/IndexIO.java +++ b/processing/src/main/java/org/apache/druid/segment/IndexIO.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.JsonMappingException; @@ -32,39 +32,39 @@ import com.google.common.io.Files; import com.google.common.primitives.Ints; import com.google.inject.Inject; -import io.druid.collections.bitmap.ConciseBitmapFactory; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.collections.spatial.ImmutableRTree; -import io.druid.common.utils.SerializerUtils; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.IOE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.io.smoosh.Smoosh; -import io.druid.java.util.common.io.smoosh.SmooshedFileMapper; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.segment.column.Column; -import io.druid.segment.column.ColumnBuilder; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.column.ColumnConfig; -import io.druid.segment.column.ColumnDescriptor; -import io.druid.segment.column.ValueType; -import io.druid.segment.data.BitmapSerde; -import io.druid.segment.data.BitmapSerdeFactory; -import io.druid.segment.data.CompressedColumnarLongsSupplier; -import io.druid.segment.data.GenericIndexed; -import io.druid.segment.data.ImmutableRTreeObjectStrategy; -import io.druid.segment.data.IndexedIterable; -import io.druid.segment.data.VSizeColumnarMultiInts; -import io.druid.segment.serde.BitmapIndexColumnPartSupplier; -import io.druid.segment.serde.ComplexColumnPartSupplier; -import io.druid.segment.serde.DictionaryEncodedColumnSupplier; -import io.druid.segment.serde.FloatGenericColumnSupplier; -import io.druid.segment.serde.LongGenericColumnSupplier; -import io.druid.segment.serde.SpatialIndexColumnPartSupplier; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.collections.bitmap.ConciseBitmapFactory; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.collections.spatial.ImmutableRTree; +import org.apache.druid.common.utils.SerializerUtils; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.IOE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.io.smoosh.Smoosh; +import org.apache.druid.java.util.common.io.smoosh.SmooshedFileMapper; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ColumnBuilder; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.column.ColumnConfig; +import org.apache.druid.segment.column.ColumnDescriptor; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.data.BitmapSerde; +import org.apache.druid.segment.data.BitmapSerdeFactory; +import org.apache.druid.segment.data.CompressedColumnarLongsSupplier; +import org.apache.druid.segment.data.GenericIndexed; +import org.apache.druid.segment.data.ImmutableRTreeObjectStrategy; +import org.apache.druid.segment.data.IndexedIterable; +import org.apache.druid.segment.data.VSizeColumnarMultiInts; +import org.apache.druid.segment.serde.BitmapIndexColumnPartSupplier; +import org.apache.druid.segment.serde.ComplexColumnPartSupplier; +import org.apache.druid.segment.serde.DictionaryEncodedColumnSupplier; +import org.apache.druid.segment.serde.FloatGenericColumnSupplier; +import org.apache.druid.segment.serde.LongGenericColumnSupplier; +import org.apache.druid.segment.serde.SpatialIndexColumnPartSupplier; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; import org.joda.time.Interval; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/segment/IndexMerger.java b/processing/src/main/java/org/apache/druid/segment/IndexMerger.java similarity index 95% rename from processing/src/main/java/io/druid/segment/IndexMerger.java rename to processing/src/main/java/org/apache/druid/segment/IndexMerger.java index 1e7cbfbb2105..be471f6a3f0a 100644 --- a/processing/src/main/java/io/druid/segment/IndexMerger.java +++ b/processing/src/main/java/org/apache/druid/segment/IndexMerger.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; @@ -27,18 +27,18 @@ import com.google.common.collect.PeekingIterator; import com.google.common.collect.Sets; import com.google.inject.ImplementedBy; -import io.druid.common.config.NullHandling; -import io.druid.common.utils.SerializerUtils; -import io.druid.java.util.common.ByteBufferUtils; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.guava.Comparators; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.common.parsers.CloseableIterator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.segment.data.Indexed; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.common.utils.SerializerUtils; +import org.apache.druid.java.util.common.ByteBufferUtils; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.parsers.CloseableIterator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.segment.data.Indexed; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; import org.joda.time.Interval; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/segment/IndexMergerV9.java b/processing/src/main/java/org/apache/druid/segment/IndexMergerV9.java similarity index 95% rename from processing/src/main/java/io/druid/segment/IndexMergerV9.java rename to processing/src/main/java/org/apache/druid/segment/IndexMergerV9.java index 7ba0c0fd177f..a828cd604c8e 100644 --- a/processing/src/main/java/io/druid/segment/IndexMergerV9.java +++ b/processing/src/main/java/org/apache/druid/segment/IndexMergerV9.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; @@ -29,39 +29,39 @@ import com.google.common.io.Files; import com.google.common.primitives.Ints; import com.google.inject.Inject; -import io.druid.common.config.NullHandling; -import io.druid.io.ZeroCopyByteArrayOutputStream; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.JodaUtils; -import io.druid.java.util.common.guava.Comparators; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.java.util.common.io.smoosh.SmooshedWriter; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.segment.column.Column; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.column.ColumnCapabilitiesImpl; -import io.druid.segment.column.ColumnDescriptor; -import io.druid.segment.column.ValueType; -import io.druid.segment.data.GenericIndexed; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexAdapter; -import io.druid.segment.loading.MMappedQueryableSegmentizerFactory; -import io.druid.segment.serde.ColumnPartSerde; -import io.druid.segment.serde.ComplexColumnPartSerde; -import io.druid.segment.serde.ComplexMetricSerde; -import io.druid.segment.serde.ComplexMetrics; -import io.druid.segment.serde.DoubleGenericColumnPartSerde; -import io.druid.segment.serde.DoubleGenericColumnPartSerdeV2; -import io.druid.segment.serde.FloatGenericColumnPartSerde; -import io.druid.segment.serde.FloatGenericColumnPartSerdeV2; -import io.druid.segment.serde.LongGenericColumnPartSerde; -import io.druid.segment.serde.LongGenericColumnPartSerdeV2; -import io.druid.segment.writeout.SegmentWriteOutMedium; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.io.ZeroCopyByteArrayOutputStream; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.JodaUtils; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.java.util.common.io.smoosh.SmooshedWriter; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.column.ColumnCapabilitiesImpl; +import org.apache.druid.segment.column.ColumnDescriptor; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.data.GenericIndexed; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexAdapter; +import org.apache.druid.segment.loading.MMappedQueryableSegmentizerFactory; +import org.apache.druid.segment.serde.ColumnPartSerde; +import org.apache.druid.segment.serde.ComplexColumnPartSerde; +import org.apache.druid.segment.serde.ComplexMetricSerde; +import org.apache.druid.segment.serde.ComplexMetrics; +import org.apache.druid.segment.serde.DoubleGenericColumnPartSerde; +import org.apache.druid.segment.serde.DoubleGenericColumnPartSerdeV2; +import org.apache.druid.segment.serde.FloatGenericColumnPartSerde; +import org.apache.druid.segment.serde.FloatGenericColumnPartSerdeV2; +import org.apache.druid.segment.serde.LongGenericColumnPartSerde; +import org.apache.druid.segment.serde.LongGenericColumnPartSerdeV2; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; import org.apache.commons.io.FileUtils; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/processing/src/main/java/io/druid/segment/IndexSpec.java b/processing/src/main/java/org/apache/druid/segment/IndexSpec.java similarity index 95% rename from processing/src/main/java/io/druid/segment/IndexSpec.java rename to processing/src/main/java/org/apache/druid/segment/IndexSpec.java index 8c6a3e368b4f..4de55b6609c6 100644 --- a/processing/src/main/java/io/druid/segment/IndexSpec.java +++ b/processing/src/main/java/org/apache/druid/segment/IndexSpec.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; -import io.druid.segment.data.BitmapSerde; -import io.druid.segment.data.BitmapSerdeFactory; -import io.druid.segment.data.CompressionFactory; -import io.druid.segment.data.CompressionStrategy; -import io.druid.segment.data.ConciseBitmapSerdeFactory; +import org.apache.druid.segment.data.BitmapSerde; +import org.apache.druid.segment.data.BitmapSerdeFactory; +import org.apache.druid.segment.data.CompressionFactory; +import org.apache.druid.segment.data.CompressionStrategy; +import org.apache.druid.segment.data.ConciseBitmapSerdeFactory; import java.util.Arrays; import java.util.Objects; diff --git a/processing/src/main/java/io/druid/segment/IndexableAdapter.java b/processing/src/main/java/org/apache/druid/segment/IndexableAdapter.java similarity index 88% rename from processing/src/main/java/io/druid/segment/IndexableAdapter.java rename to processing/src/main/java/org/apache/druid/segment/IndexableAdapter.java index 0d4300b3dd71..9cb4ec3cdc56 100644 --- a/processing/src/main/java/io/druid/segment/IndexableAdapter.java +++ b/processing/src/main/java/org/apache/druid/segment/IndexableAdapter.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.data.BitmapValues; -import io.druid.segment.data.Indexed; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.data.BitmapValues; +import org.apache.druid.segment.data.Indexed; import org.joda.time.Interval; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/segment/IntIteratorUtils.java b/processing/src/main/java/org/apache/druid/segment/IntIteratorUtils.java similarity index 95% rename from processing/src/main/java/io/druid/segment/IntIteratorUtils.java rename to processing/src/main/java/org/apache/druid/segment/IntIteratorUtils.java index add3282b4993..7ada05e93fc9 100644 --- a/processing/src/main/java/io/druid/segment/IntIteratorUtils.java +++ b/processing/src/main/java/org/apache/druid/segment/IntIteratorUtils.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.IAE; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntIterator; import it.unimi.dsi.fastutil.ints.IntIterators; @@ -53,7 +53,7 @@ public static int skip(IntIterator it, int n) * It isn't checked if the given source iterators are actually ascending, if they are not, the order of values in the * returned iterator is undefined. *

- * This is similar to what {@link io.druid.java.util.common.guava.MergeIterator} does with simple + * This is similar to what {@link org.apache.druid.java.util.common.guava.MergeIterator} does with simple * {@link java.util.Iterator}s. * * @param iterators iterators to merge, must return ascending values @@ -70,7 +70,7 @@ public static IntIterator mergeAscending(List iterators) } /** - * This class is designed mostly after {@link io.druid.java.util.common.guava.MergeIterator}. + * This class is designed mostly after {@link org.apache.druid.java.util.common.guava.MergeIterator}. * {@code MergeIterator} uses a priority queue of wrapper * "peeking" iterators. Peeking wrappers are not available in fastutil for specialized iterators like IntIterator, so * they should be implemented manually in the druid codebase. Instead, another approach is taken: a priority queue diff --git a/processing/src/main/java/io/druid/segment/IntListUtils.java b/processing/src/main/java/org/apache/druid/segment/IntListUtils.java similarity index 97% rename from processing/src/main/java/io/druid/segment/IntListUtils.java rename to processing/src/main/java/org/apache/druid/segment/IntListUtils.java index 9b2b2748a14a..dbc3d04411eb 100644 --- a/processing/src/main/java/io/druid/segment/IntListUtils.java +++ b/processing/src/main/java/org/apache/druid/segment/IntListUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.base.Preconditions; import it.unimi.dsi.fastutil.ints.AbstractIntList; diff --git a/processing/src/main/java/io/druid/segment/LongColumnSelector.java b/processing/src/main/java/org/apache/druid/segment/LongColumnSelector.java similarity index 98% rename from processing/src/main/java/io/druid/segment/LongColumnSelector.java rename to processing/src/main/java/org/apache/druid/segment/LongColumnSelector.java index d3640d981058..103cd964dc65 100644 --- a/processing/src/main/java/io/druid/segment/LongColumnSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/LongColumnSelector.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/segment/LongColumnSerializer.java b/processing/src/main/java/org/apache/druid/segment/LongColumnSerializer.java similarity index 87% rename from processing/src/main/java/io/druid/segment/LongColumnSerializer.java rename to processing/src/main/java/org/apache/druid/segment/LongColumnSerializer.java index 23a3ee42cf01..0bf57e98e5d7 100644 --- a/processing/src/main/java/io/druid/segment/LongColumnSerializer.java +++ b/processing/src/main/java/org/apache/druid/segment/LongColumnSerializer.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.segment.writeout.SegmentWriteOutMedium; -import io.druid.segment.data.CompressionFactory; -import io.druid.segment.data.CompressionStrategy; -import io.druid.segment.data.ColumnarLongsSerializer; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.segment.data.CompressionFactory; +import org.apache.druid.segment.data.CompressionStrategy; +import org.apache.druid.segment.data.ColumnarLongsSerializer; import java.io.IOException; import java.nio.ByteOrder; diff --git a/processing/src/main/java/io/druid/segment/LongColumnSerializerV2.java b/processing/src/main/java/org/apache/druid/segment/LongColumnSerializerV2.java similarity index 86% rename from processing/src/main/java/io/druid/segment/LongColumnSerializerV2.java rename to processing/src/main/java/org/apache/druid/segment/LongColumnSerializerV2.java index c3d2c314029a..f6927297b8c4 100644 --- a/processing/src/main/java/io/druid/segment/LongColumnSerializerV2.java +++ b/processing/src/main/java/org/apache/druid/segment/LongColumnSerializerV2.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.primitives.Ints; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.collections.bitmap.MutableBitmap; -import io.druid.common.utils.SerializerUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.segment.data.BitmapSerdeFactory; -import io.druid.segment.data.ByteBufferWriter; -import io.druid.segment.data.ColumnarLongsSerializer; -import io.druid.segment.data.CompressionFactory; -import io.druid.segment.data.CompressionStrategy; -import io.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.collections.bitmap.MutableBitmap; +import org.apache.druid.common.utils.SerializerUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.segment.data.BitmapSerdeFactory; +import org.apache.druid.segment.data.ByteBufferWriter; +import org.apache.druid.segment.data.ColumnarLongsSerializer; +import org.apache.druid.segment.data.CompressionFactory; +import org.apache.druid.segment.data.CompressionStrategy; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; import java.io.IOException; import java.nio.ByteOrder; diff --git a/processing/src/main/java/io/druid/segment/LongDimensionHandler.java b/processing/src/main/java/org/apache/druid/segment/LongDimensionHandler.java similarity index 87% rename from processing/src/main/java/io/druid/segment/LongDimensionHandler.java rename to processing/src/main/java/org/apache/druid/segment/LongDimensionHandler.java index a102573c80a9..0fc176409f21 100644 --- a/processing/src/main/java/io/druid/segment/LongDimensionHandler.java +++ b/processing/src/main/java/org/apache/druid/segment/LongDimensionHandler.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.selector.settable.SettableColumnValueSelector; -import io.druid.segment.selector.settable.SettableLongColumnValueSelector; -import io.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.selector.settable.SettableColumnValueSelector; +import org.apache.druid.segment.selector.settable.SettableLongColumnValueSelector; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; import java.util.Comparator; diff --git a/processing/src/main/java/io/druid/segment/LongDimensionIndexer.java b/processing/src/main/java/org/apache/druid/segment/LongDimensionIndexer.java similarity index 89% rename from processing/src/main/java/io/druid/segment/LongDimensionIndexer.java rename to processing/src/main/java/org/apache/druid/segment/LongDimensionIndexer.java index 76c433c3eaac..20f192d75983 100644 --- a/processing/src/main/java/io/druid/segment/LongDimensionIndexer.java +++ b/processing/src/main/java/org/apache/druid/segment/LongDimensionIndexer.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.segment; - -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.MutableBitmap; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.guava.Comparators; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.data.Indexed; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexRowHolder; +package org.apache.druid.segment; + +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.MutableBitmap; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.data.Indexed; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexRowHolder; import javax.annotation.Nullable; import java.util.Comparator; diff --git a/processing/src/main/java/io/druid/segment/LongDimensionMergerV9.java b/processing/src/main/java/org/apache/druid/segment/LongDimensionMergerV9.java similarity index 85% rename from processing/src/main/java/io/druid/segment/LongDimensionMergerV9.java rename to processing/src/main/java/org/apache/druid/segment/LongDimensionMergerV9.java index e526c5c14bd0..e4ab6ba3849c 100644 --- a/processing/src/main/java/io/druid/segment/LongDimensionMergerV9.java +++ b/processing/src/main/java/org/apache/druid/segment/LongDimensionMergerV9.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.segment.column.ColumnDescriptor; -import io.druid.segment.column.ValueType; -import io.druid.segment.serde.ColumnPartSerde; -import io.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.segment.column.ColumnDescriptor; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.serde.ColumnPartSerde; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; public class LongDimensionMergerV9 extends NumericDimensionMergerV9 { diff --git a/processing/src/main/java/io/druid/segment/LongWrappingDimensionSelector.java b/processing/src/main/java/org/apache/druid/segment/LongWrappingDimensionSelector.java similarity index 88% rename from processing/src/main/java/io/druid/segment/LongWrappingDimensionSelector.java rename to processing/src/main/java/org/apache/druid/segment/LongWrappingDimensionSelector.java index fc5593ebff06..ced7b1a30939 100644 --- a/processing/src/main/java/io/druid/segment/LongWrappingDimensionSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/LongWrappingDimensionSelector.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.virtual.BaseSingleValueDimensionSelector; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.virtual.BaseSingleValueDimensionSelector; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/segment/MMappedIndex.java b/processing/src/main/java/org/apache/druid/segment/MMappedIndex.java similarity index 88% rename from processing/src/main/java/io/druid/segment/MMappedIndex.java rename to processing/src/main/java/org/apache/druid/segment/MMappedIndex.java index 87907b9c534b..7691cc70b0c3 100644 --- a/processing/src/main/java/io/druid/segment/MMappedIndex.java +++ b/processing/src/main/java/org/apache/druid/segment/MMappedIndex.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment; - -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.collections.spatial.ImmutableRTree; -import io.druid.java.util.common.io.smoosh.SmooshedFileMapper; -import io.druid.segment.data.CompressedColumnarLongsSupplier; -import io.druid.segment.data.GenericIndexed; -import io.druid.segment.data.VSizeColumnarMultiInts; +package org.apache.druid.segment; + +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.collections.spatial.ImmutableRTree; +import org.apache.druid.java.util.common.io.smoosh.SmooshedFileMapper; +import org.apache.druid.segment.data.CompressedColumnarLongsSupplier; +import org.apache.druid.segment.data.GenericIndexed; +import org.apache.druid.segment.data.VSizeColumnarMultiInts; import org.joda.time.Interval; import java.util.Map; diff --git a/processing/src/main/java/io/druid/segment/MergingRowIterator.java b/processing/src/main/java/org/apache/druid/segment/MergingRowIterator.java similarity index 99% rename from processing/src/main/java/io/druid/segment/MergingRowIterator.java rename to processing/src/main/java/org/apache/druid/segment/MergingRowIterator.java index 9654c5abdc06..b9162af1e2c2 100644 --- a/processing/src/main/java/io/druid/segment/MergingRowIterator.java +++ b/processing/src/main/java/org/apache/druid/segment/MergingRowIterator.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.io.Closer; import it.unimi.dsi.fastutil.objects.ObjectHeaps; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/segment/Metadata.java b/processing/src/main/java/org/apache/druid/segment/Metadata.java similarity index 96% rename from processing/src/main/java/io/druid/segment/Metadata.java rename to processing/src/main/java/org/apache/druid/segment/Metadata.java index 9c74811bdd99..08c29113cbad 100644 --- a/processing/src/main/java/io/druid/segment/Metadata.java +++ b/processing/src/main/java/org/apache/druid/segment/Metadata.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.guice.annotations.PublicApi; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.query.aggregation.AggregatorFactory; import javax.annotation.Nullable; import java.util.ArrayList; diff --git a/processing/src/main/java/io/druid/segment/MetricHolder.java b/processing/src/main/java/org/apache/druid/segment/MetricHolder.java similarity index 86% rename from processing/src/main/java/io/druid/segment/MetricHolder.java rename to processing/src/main/java/org/apache/druid/segment/MetricHolder.java index f3cb44293d54..f68246d59b56 100644 --- a/processing/src/main/java/io/druid/segment/MetricHolder.java +++ b/processing/src/main/java/org/apache/druid/segment/MetricHolder.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.segment; - -import io.druid.common.utils.SerializerUtils; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.io.smoosh.SmooshedFileMapper; -import io.druid.segment.data.CompressedColumnarFloatsSupplier; -import io.druid.segment.data.GenericIndexed; -import io.druid.segment.data.Indexed; -import io.druid.segment.data.ObjectStrategy; -import io.druid.segment.serde.ComplexMetricSerde; -import io.druid.segment.serde.ComplexMetrics; +package org.apache.druid.segment; + +import org.apache.druid.common.utils.SerializerUtils; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.io.smoosh.SmooshedFileMapper; +import org.apache.druid.segment.data.CompressedColumnarFloatsSupplier; +import org.apache.druid.segment.data.GenericIndexed; +import org.apache.druid.segment.data.Indexed; +import org.apache.druid.segment.data.ObjectStrategy; +import org.apache.druid.segment.serde.ComplexMetricSerde; +import org.apache.druid.segment.serde.ComplexMetrics; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/processing/src/main/java/io/druid/segment/NilColumnValueSelector.java b/processing/src/main/java/org/apache/druid/segment/NilColumnValueSelector.java similarity index 93% rename from processing/src/main/java/io/druid/segment/NilColumnValueSelector.java rename to processing/src/main/java/org/apache/druid/segment/NilColumnValueSelector.java index b8c2ff386449..9cddf58d22f9 100644 --- a/processing/src/main/java/io/druid/segment/NilColumnValueSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/NilColumnValueSelector.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.common.config.NullHandling; -import io.druid.guice.annotations.PublicApi; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/segment/NullDimensionSelector.java b/processing/src/main/java/org/apache/druid/segment/NullDimensionSelector.java similarity index 84% rename from processing/src/main/java/io/druid/segment/NullDimensionSelector.java rename to processing/src/main/java/org/apache/druid/segment/NullDimensionSelector.java index d8708d06be00..0c91e342c829 100644 --- a/processing/src/main/java/io/druid/segment/NullDimensionSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/NullDimensionSelector.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.base.Predicate; -import io.druid.common.config.NullHandling; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.data.IndexedInts; -import io.druid.segment.data.ZeroIndexedInts; -import io.druid.segment.filter.BooleanValueMatcher; -import io.druid.segment.historical.SingleValueHistoricalDimensionSelector; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.data.IndexedInts; +import org.apache.druid.segment.data.ZeroIndexedInts; +import org.apache.druid.segment.filter.BooleanValueMatcher; +import org.apache.druid.segment.historical.SingleValueHistoricalDimensionSelector; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/segment/NumericDimensionMergerV9.java b/processing/src/main/java/org/apache/druid/segment/NumericDimensionMergerV9.java similarity index 96% rename from processing/src/main/java/io/druid/segment/NumericDimensionMergerV9.java rename to processing/src/main/java/org/apache/druid/segment/NumericDimensionMergerV9.java index 3144285a850f..332812df2edf 100644 --- a/processing/src/main/java/io/druid/segment/NumericDimensionMergerV9.java +++ b/processing/src/main/java/org/apache/druid/segment/NumericDimensionMergerV9.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; import javax.annotation.Nullable; import java.io.IOException; diff --git a/processing/src/main/java/io/druid/segment/ObjectColumnSelector.java b/processing/src/main/java/org/apache/druid/segment/ObjectColumnSelector.java similarity index 98% rename from processing/src/main/java/io/druid/segment/ObjectColumnSelector.java rename to processing/src/main/java/org/apache/druid/segment/ObjectColumnSelector.java index 92a0af648e98..fb8617b289c5 100644 --- a/processing/src/main/java/io/druid/segment/ObjectColumnSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/ObjectColumnSelector.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; /** * This interface is convenient for implementation of "object-sourcing" {@link ColumnValueSelector}s, it provides diff --git a/processing/src/main/java/io/druid/segment/ProgressIndicator.java b/processing/src/main/java/org/apache/druid/segment/ProgressIndicator.java similarity index 96% rename from processing/src/main/java/io/druid/segment/ProgressIndicator.java rename to processing/src/main/java/org/apache/druid/segment/ProgressIndicator.java index 8485405b3aae..3d723607a73e 100644 --- a/processing/src/main/java/io/druid/segment/ProgressIndicator.java +++ b/processing/src/main/java/org/apache/druid/segment/ProgressIndicator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; /** */ diff --git a/processing/src/main/java/io/druid/segment/QueryableIndex.java b/processing/src/main/java/org/apache/druid/segment/QueryableIndex.java similarity index 93% rename from processing/src/main/java/io/druid/segment/QueryableIndex.java rename to processing/src/main/java/org/apache/druid/segment/QueryableIndex.java index 50f764265b46..b3c7a0c21cb7 100644 --- a/processing/src/main/java/io/druid/segment/QueryableIndex.java +++ b/processing/src/main/java/org/apache/druid/segment/QueryableIndex.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.segment.data.Indexed; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.segment.data.Indexed; import org.joda.time.Interval; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/segment/QueryableIndexColumnSelectorFactory.java b/processing/src/main/java/org/apache/druid/segment/QueryableIndexColumnSelectorFactory.java similarity index 86% rename from processing/src/main/java/io/druid/segment/QueryableIndexColumnSelectorFactory.java rename to processing/src/main/java/org/apache/druid/segment/QueryableIndexColumnSelectorFactory.java index 90b7121dc86e..f6193ed4e509 100644 --- a/processing/src/main/java/io/druid/segment/QueryableIndexColumnSelectorFactory.java +++ b/processing/src/main/java/org/apache/druid/segment/QueryableIndexColumnSelectorFactory.java @@ -17,25 +17,25 @@ * under the License. */ -package io.druid.segment; - -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.io.Closer; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.extraction.ExtractionFn; -import io.druid.segment.column.BaseColumn; -import io.druid.segment.column.Column; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.column.DictionaryEncodedColumn; -import io.druid.segment.column.ValueType; -import io.druid.segment.data.ReadableOffset; +package org.apache.druid.segment; + +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.segment.column.BaseColumn; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.column.DictionaryEncodedColumn; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.data.ReadableOffset; import javax.annotation.Nullable; import java.util.Map; /** * The basic implementation of {@link ColumnSelectorFactory} over a historical segment (i. e. {@link QueryableIndex}). - * It's counterpart for incremental index is {@link io.druid.segment.incremental.IncrementalIndexColumnSelectorFactory}. + * It's counterpart for incremental index is {@link org.apache.druid.segment.incremental.IncrementalIndexColumnSelectorFactory}. */ class QueryableIndexColumnSelectorFactory implements ColumnSelectorFactory { diff --git a/processing/src/main/java/io/druid/segment/QueryableIndexIndexableAdapter.java b/processing/src/main/java/org/apache/druid/segment/QueryableIndexIndexableAdapter.java similarity index 91% rename from processing/src/main/java/io/druid/segment/QueryableIndexIndexableAdapter.java rename to processing/src/main/java/org/apache/druid/segment/QueryableIndexIndexableAdapter.java index c4d626fb794e..429b34695d7c 100644 --- a/processing/src/main/java/io/druid/segment/QueryableIndexIndexableAdapter.java +++ b/processing/src/main/java/org/apache/druid/segment/QueryableIndexIndexableAdapter.java @@ -17,29 +17,29 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.guava.CloseQuietly; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.column.BaseColumn; -import io.druid.segment.column.BitmapIndex; -import io.druid.segment.column.Column; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.column.ComplexColumn; -import io.druid.segment.column.DictionaryEncodedColumn; -import io.druid.segment.column.ValueType; -import io.druid.segment.data.BitmapValues; -import io.druid.segment.data.ImmutableBitmapValues; -import io.druid.segment.data.Indexed; -import io.druid.segment.data.IndexedIterable; -import io.druid.segment.selector.settable.SettableColumnValueSelector; -import io.druid.segment.selector.settable.SettableLongColumnValueSelector; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.guava.CloseQuietly; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.column.BaseColumn; +import org.apache.druid.segment.column.BitmapIndex; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.column.ComplexColumn; +import org.apache.druid.segment.column.DictionaryEncodedColumn; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.data.BitmapValues; +import org.apache.druid.segment.data.ImmutableBitmapValues; +import org.apache.druid.segment.data.Indexed; +import org.apache.druid.segment.data.IndexedIterable; +import org.apache.druid.segment.selector.settable.SettableColumnValueSelector; +import org.apache.druid.segment.selector.settable.SettableLongColumnValueSelector; import org.joda.time.Interval; import javax.annotation.Nullable; @@ -188,7 +188,7 @@ public RowIteratorImpl getRows() * expensive. * 2) {@link #mark()} is a "lookbehind" style functionality, in compressed columnar format, that would cause * repetitive excessive decompressions on the block boundaries. E. g. see {@link - * io.druid.segment.data.BlockLayoutColumnarDoublesSupplier} and similar classes. Some special support for + * org.apache.druid.segment.data.BlockLayoutColumnarDoublesSupplier} and similar classes. Some special support for * "lookbehind" could be added to these classes, but it's significant extra complexity. */ class RowIteratorImpl implements TransformableRowIterator diff --git a/processing/src/main/java/io/druid/segment/QueryableIndexSegment.java b/processing/src/main/java/org/apache/druid/segment/QueryableIndexSegment.java similarity index 97% rename from processing/src/main/java/io/druid/segment/QueryableIndexSegment.java rename to processing/src/main/java/org/apache/druid/segment/QueryableIndexSegment.java index cd2d70055d68..40d89c7736ed 100644 --- a/processing/src/main/java/io/druid/segment/QueryableIndexSegment.java +++ b/processing/src/main/java/org/apache/druid/segment/QueryableIndexSegment.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import org.joda.time.Interval; diff --git a/processing/src/main/java/io/druid/segment/QueryableIndexStorageAdapter.java b/processing/src/main/java/org/apache/druid/segment/QueryableIndexStorageAdapter.java similarity index 94% rename from processing/src/main/java/io/druid/segment/QueryableIndexStorageAdapter.java rename to processing/src/main/java/org/apache/druid/segment/QueryableIndexStorageAdapter.java index 9701902ffe24..a74b403e922a 100644 --- a/processing/src/main/java/io/druid/segment/QueryableIndexStorageAdapter.java +++ b/processing/src/main/java/org/apache/druid/segment/QueryableIndexStorageAdapter.java @@ -17,35 +17,35 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.common.io.Closer; -import io.druid.query.BaseQuery; -import io.druid.query.BitmapResultFactory; -import io.druid.query.DefaultBitmapResultFactory; -import io.druid.query.QueryMetrics; -import io.druid.query.filter.Filter; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.column.BaseColumn; -import io.druid.segment.column.BitmapIndex; -import io.druid.segment.column.Column; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.column.ComplexColumn; -import io.druid.segment.column.GenericColumn; -import io.druid.segment.data.Indexed; -import io.druid.segment.data.Offset; -import io.druid.segment.data.ReadableOffset; -import io.druid.segment.filter.AndFilter; -import io.druid.segment.historical.HistoricalCursor; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.query.BaseQuery; +import org.apache.druid.query.BitmapResultFactory; +import org.apache.druid.query.DefaultBitmapResultFactory; +import org.apache.druid.query.QueryMetrics; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.column.BaseColumn; +import org.apache.druid.segment.column.BitmapIndex; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.column.ComplexColumn; +import org.apache.druid.segment.column.GenericColumn; +import org.apache.druid.segment.data.Indexed; +import org.apache.druid.segment.data.Offset; +import org.apache.druid.segment.data.ReadableOffset; +import org.apache.druid.segment.filter.AndFilter; +import org.apache.druid.segment.historical.HistoricalCursor; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/processing/src/main/java/io/druid/segment/ReferenceCountingSegment.java b/processing/src/main/java/org/apache/druid/segment/ReferenceCountingSegment.java similarity index 97% rename from processing/src/main/java/io/druid/segment/ReferenceCountingSegment.java rename to processing/src/main/java/org/apache/druid/segment/ReferenceCountingSegment.java index b11eb4f094b5..7add08fa7bdf 100644 --- a/processing/src/main/java/io/druid/segment/ReferenceCountingSegment.java +++ b/processing/src/main/java/org/apache/druid/segment/ReferenceCountingSegment.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.base.Preconditions; -import io.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.EmittingLogger; import org.joda.time.Interval; import java.io.Closeable; diff --git a/processing/src/main/java/io/druid/segment/RowCombiningTimeAndDimsIterator.java b/processing/src/main/java/org/apache/druid/segment/RowCombiningTimeAndDimsIterator.java similarity index 98% rename from processing/src/main/java/io/druid/segment/RowCombiningTimeAndDimsIterator.java rename to processing/src/main/java/org/apache/druid/segment/RowCombiningTimeAndDimsIterator.java index b73ca16a95cc..5120ece6a956 100644 --- a/processing/src/main/java/io/druid/segment/RowCombiningTimeAndDimsIterator.java +++ b/processing/src/main/java/org/apache/druid/segment/RowCombiningTimeAndDimsIterator.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.query.aggregation.AggregateCombiner; -import io.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregateCombiner; +import org.apache.druid.query.aggregation.AggregatorFactory; import javax.annotation.Nullable; import java.util.Arrays; diff --git a/processing/src/main/java/io/druid/segment/RowFilteringIndexAdapter.java b/processing/src/main/java/org/apache/druid/segment/RowFilteringIndexAdapter.java similarity index 94% rename from processing/src/main/java/io/druid/segment/RowFilteringIndexAdapter.java rename to processing/src/main/java/org/apache/druid/segment/RowFilteringIndexAdapter.java index cb464cb48776..289d74d61f69 100644 --- a/processing/src/main/java/io/druid/segment/RowFilteringIndexAdapter.java +++ b/processing/src/main/java/org/apache/druid/segment/RowFilteringIndexAdapter.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.data.BitmapValues; -import io.druid.segment.data.Indexed; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.data.BitmapValues; +import org.apache.druid.segment.data.Indexed; import org.joda.time.Interval; import java.util.List; diff --git a/processing/src/main/java/io/druid/segment/RowIterator.java b/processing/src/main/java/org/apache/druid/segment/RowIterator.java similarity index 99% rename from processing/src/main/java/io/druid/segment/RowIterator.java rename to processing/src/main/java/org/apache/druid/segment/RowIterator.java index d06361ace548..11b34f90a382 100644 --- a/processing/src/main/java/io/druid/segment/RowIterator.java +++ b/processing/src/main/java/org/apache/druid/segment/RowIterator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; /** * Extension of {@link TimeAndDimsIterator}, specialized for {@link RowPointer} instead of {@link TimeAndDimsPointer}. diff --git a/processing/src/main/java/io/druid/segment/RowNumCounter.java b/processing/src/main/java/org/apache/druid/segment/RowNumCounter.java similarity index 97% rename from processing/src/main/java/io/druid/segment/RowNumCounter.java rename to processing/src/main/java/org/apache/druid/segment/RowNumCounter.java index a304b35d3071..b7f877c3b0f9 100644 --- a/processing/src/main/java/io/druid/segment/RowNumCounter.java +++ b/processing/src/main/java/org/apache/druid/segment/RowNumCounter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import java.util.function.IntSupplier; diff --git a/processing/src/main/java/io/druid/segment/RowPointer.java b/processing/src/main/java/org/apache/druid/segment/RowPointer.java similarity index 98% rename from processing/src/main/java/io/druid/segment/RowPointer.java rename to processing/src/main/java/org/apache/druid/segment/RowPointer.java index 68775b746b65..dcb7ab6b2040 100644 --- a/processing/src/main/java/io/druid/segment/RowPointer.java +++ b/processing/src/main/java/org/apache/druid/segment/RowPointer.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import java.util.List; import java.util.function.IntSupplier; diff --git a/processing/src/main/java/io/druid/segment/Segment.java b/processing/src/main/java/org/apache/druid/segment/Segment.java similarity index 96% rename from processing/src/main/java/io/druid/segment/Segment.java rename to processing/src/main/java/org/apache/druid/segment/Segment.java index f62089c6d86e..3f7395430c14 100644 --- a/processing/src/main/java/io/druid/segment/Segment.java +++ b/processing/src/main/java/org/apache/druid/segment/Segment.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.guice.annotations.PublicApi; +import org.apache.druid.guice.annotations.PublicApi; import org.joda.time.Interval; import java.io.Closeable; diff --git a/processing/src/main/java/io/druid/segment/SegmentMissingException.java b/processing/src/main/java/org/apache/druid/segment/SegmentMissingException.java similarity index 89% rename from processing/src/main/java/io/druid/segment/SegmentMissingException.java rename to processing/src/main/java/org/apache/druid/segment/SegmentMissingException.java index 925cf71680a9..ea102d3e0b2b 100644 --- a/processing/src/main/java/io/druid/segment/SegmentMissingException.java +++ b/processing/src/main/java/org/apache/druid/segment/SegmentMissingException.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; public class SegmentMissingException extends ISE { diff --git a/processing/src/main/java/io/druid/segment/SegmentValidationException.java b/processing/src/main/java/org/apache/druid/segment/SegmentValidationException.java similarity index 93% rename from processing/src/main/java/io/druid/segment/SegmentValidationException.java rename to processing/src/main/java/org/apache/druid/segment/SegmentValidationException.java index 2e1b529a2f4f..1b7b6c6acd70 100644 --- a/processing/src/main/java/io/druid/segment/SegmentValidationException.java +++ b/processing/src/main/java/org/apache/druid/segment/SegmentValidationException.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; /** * diff --git a/processing/src/main/java/io/druid/segment/SimpleAscendingOffset.java b/processing/src/main/java/org/apache/druid/segment/SimpleAscendingOffset.java similarity index 90% rename from processing/src/main/java/io/druid/segment/SimpleAscendingOffset.java rename to processing/src/main/java/org/apache/druid/segment/SimpleAscendingOffset.java index a08dfa5cdfcf..31b635b5d03b 100644 --- a/processing/src/main/java/io/druid/segment/SimpleAscendingOffset.java +++ b/processing/src/main/java/org/apache/druid/segment/SimpleAscendingOffset.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.data.Offset; -import io.druid.segment.data.ReadableOffset; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.data.Offset; +import org.apache.druid.segment.data.ReadableOffset; public class SimpleAscendingOffset extends Offset { diff --git a/processing/src/main/java/io/druid/segment/SimpleDescendingOffset.java b/processing/src/main/java/org/apache/druid/segment/SimpleDescendingOffset.java similarity index 90% rename from processing/src/main/java/io/druid/segment/SimpleDescendingOffset.java rename to processing/src/main/java/org/apache/druid/segment/SimpleDescendingOffset.java index ca6f5d4e0a64..f19e36cc6821 100644 --- a/processing/src/main/java/io/druid/segment/SimpleDescendingOffset.java +++ b/processing/src/main/java/org/apache/druid/segment/SimpleDescendingOffset.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.data.Offset; -import io.druid.segment.data.ReadableOffset; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.data.Offset; +import org.apache.druid.segment.data.ReadableOffset; public class SimpleDescendingOffset extends Offset { diff --git a/processing/src/main/java/io/druid/segment/SimpleQueryableIndex.java b/processing/src/main/java/org/apache/druid/segment/SimpleQueryableIndex.java similarity index 93% rename from processing/src/main/java/io/druid/segment/SimpleQueryableIndex.java rename to processing/src/main/java/org/apache/druid/segment/SimpleQueryableIndex.java index 04393774829a..2ff1b637cf48 100644 --- a/processing/src/main/java/io/druid/segment/SimpleQueryableIndex.java +++ b/processing/src/main/java/org/apache/druid/segment/SimpleQueryableIndex.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.java.util.common.io.smoosh.SmooshedFileMapper; -import io.druid.segment.column.Column; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.data.Indexed; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.java.util.common.io.smoosh.SmooshedFileMapper; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.data.Indexed; import org.joda.time.Interval; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/segment/SingleScanTimeDimSelector.java b/processing/src/main/java/org/apache/druid/segment/SingleScanTimeDimSelector.java similarity index 94% rename from processing/src/main/java/io/druid/segment/SingleScanTimeDimSelector.java rename to processing/src/main/java/org/apache/druid/segment/SingleScanTimeDimSelector.java index 17b4b157deb8..265297bf3fd1 100644 --- a/processing/src/main/java/io/druid/segment/SingleScanTimeDimSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/SingleScanTimeDimSelector.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.base.Predicate; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.data.IndexedInts; -import io.druid.segment.data.SingleIndexedInt; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.data.IndexedInts; +import org.apache.druid.segment.data.SingleIndexedInt; import javax.annotation.Nullable; import java.util.ArrayList; diff --git a/processing/src/main/java/io/druid/segment/StorageAdapter.java b/processing/src/main/java/org/apache/druid/segment/StorageAdapter.java similarity index 92% rename from processing/src/main/java/io/druid/segment/StorageAdapter.java rename to processing/src/main/java/org/apache/druid/segment/StorageAdapter.java index 5412d254c4c7..009759c964dd 100644 --- a/processing/src/main/java/io/druid/segment/StorageAdapter.java +++ b/processing/src/main/java/org/apache/druid/segment/StorageAdapter.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.guice.annotations.PublicApi; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.data.Indexed; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.data.Indexed; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/processing/src/main/java/io/druid/segment/StringDimensionHandler.java b/processing/src/main/java/org/apache/druid/segment/StringDimensionHandler.java similarity index 90% rename from processing/src/main/java/io/druid/segment/StringDimensionHandler.java rename to processing/src/main/java/org/apache/druid/segment/StringDimensionHandler.java index c1273189a652..cafc5c8843d1 100644 --- a/processing/src/main/java/io/druid/segment/StringDimensionHandler.java +++ b/processing/src/main/java/org/apache/druid/segment/StringDimensionHandler.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.segment; - -import io.druid.data.input.impl.DimensionSchema.MultiValueHandling; -import io.druid.java.util.common.ISE; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.data.IndexedInts; -import io.druid.segment.data.ZeroIndexedInts; -import io.druid.segment.selector.settable.SettableColumnValueSelector; -import io.druid.segment.selector.settable.SettableDimensionValueSelector; -import io.druid.segment.writeout.SegmentWriteOutMedium; +package org.apache.druid.segment; + +import org.apache.druid.data.input.impl.DimensionSchema.MultiValueHandling; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.data.IndexedInts; +import org.apache.druid.segment.data.ZeroIndexedInts; +import org.apache.druid.segment.selector.settable.SettableColumnValueSelector; +import org.apache.druid.segment.selector.settable.SettableDimensionValueSelector; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; import java.util.Comparator; diff --git a/processing/src/main/java/io/druid/segment/StringDimensionIndexer.java b/processing/src/main/java/org/apache/druid/segment/StringDimensionIndexer.java similarity index 95% rename from processing/src/main/java/io/druid/segment/StringDimensionIndexer.java rename to processing/src/main/java/org/apache/druid/segment/StringDimensionIndexer.java index d75d00d15d61..89f025ce1e80 100644 --- a/processing/src/main/java/io/druid/segment/StringDimensionIndexer.java +++ b/processing/src/main/java/org/apache/druid/segment/StringDimensionIndexer.java @@ -17,31 +17,31 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Lists; import com.google.common.primitives.Ints; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.MutableBitmap; -import io.druid.common.config.NullHandling; -import io.druid.data.input.impl.DimensionSchema.MultiValueHandling; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.guava.Comparators; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.data.ArrayBasedIndexedInts; -import io.druid.segment.data.Indexed; -import io.druid.segment.data.IndexedInts; -import io.druid.segment.data.IndexedIterable; -import io.druid.segment.filter.BooleanValueMatcher; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexRow; -import io.druid.segment.incremental.IncrementalIndexRowHolder; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.MutableBitmap; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.data.input.impl.DimensionSchema.MultiValueHandling; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.data.ArrayBasedIndexedInts; +import org.apache.druid.segment.data.Indexed; +import org.apache.druid.segment.data.IndexedInts; +import org.apache.druid.segment.data.IndexedIterable; +import org.apache.druid.segment.filter.BooleanValueMatcher; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexRow; +import org.apache.druid.segment.incremental.IncrementalIndexRowHolder; import it.unimi.dsi.fastutil.ints.IntArrays; import it.unimi.dsi.fastutil.ints.IntIterator; import it.unimi.dsi.fastutil.objects.Object2IntMap; diff --git a/processing/src/main/java/io/druid/segment/StringDimensionMergerV9.java b/processing/src/main/java/org/apache/druid/segment/StringDimensionMergerV9.java similarity index 90% rename from processing/src/main/java/io/druid/segment/StringDimensionMergerV9.java rename to processing/src/main/java/org/apache/druid/segment/StringDimensionMergerV9.java index 2d9fc40c3ffc..40146dad52f4 100644 --- a/processing/src/main/java/io/druid/segment/StringDimensionMergerV9.java +++ b/processing/src/main/java/org/apache/druid/segment/StringDimensionMergerV9.java @@ -17,45 +17,45 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.base.Predicate; import com.google.common.base.Splitter; import com.google.common.collect.Lists; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.collections.bitmap.MutableBitmap; -import io.druid.collections.spatial.ImmutableRTree; -import io.druid.collections.spatial.RTree; -import io.druid.collections.spatial.split.LinearGutmanSplitStrategy; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.column.ColumnDescriptor; -import io.druid.segment.column.ValueType; -import io.druid.segment.data.ArrayIndexed; -import io.druid.segment.data.BitmapSerdeFactory; -import io.druid.segment.data.BitmapValues; -import io.druid.segment.data.ByteBufferWriter; -import io.druid.segment.data.ColumnarIntsSerializer; -import io.druid.segment.data.ColumnarMultiIntsSerializer; -import io.druid.segment.data.CompressedVSizeColumnarIntsSerializer; -import io.druid.segment.data.CompressionStrategy; -import io.druid.segment.data.GenericIndexed; -import io.druid.segment.data.GenericIndexedWriter; -import io.druid.segment.data.ImmutableRTreeObjectStrategy; -import io.druid.segment.data.Indexed; -import io.druid.segment.data.IndexedInts; -import io.druid.segment.data.SingleValueColumnarIntsSerializer; -import io.druid.segment.data.V3CompressedVSizeColumnarMultiIntsSerializer; -import io.druid.segment.data.VSizeColumnarIntsSerializer; -import io.druid.segment.data.VSizeColumnarMultiIntsSerializer; -import io.druid.segment.serde.DictionaryEncodedColumnPartSerde; -import io.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.collections.bitmap.MutableBitmap; +import org.apache.druid.collections.spatial.ImmutableRTree; +import org.apache.druid.collections.spatial.RTree; +import org.apache.druid.collections.spatial.split.LinearGutmanSplitStrategy; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.column.ColumnDescriptor; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.data.ArrayIndexed; +import org.apache.druid.segment.data.BitmapSerdeFactory; +import org.apache.druid.segment.data.BitmapValues; +import org.apache.druid.segment.data.ByteBufferWriter; +import org.apache.druid.segment.data.ColumnarIntsSerializer; +import org.apache.druid.segment.data.ColumnarMultiIntsSerializer; +import org.apache.druid.segment.data.CompressedVSizeColumnarIntsSerializer; +import org.apache.druid.segment.data.CompressionStrategy; +import org.apache.druid.segment.data.GenericIndexed; +import org.apache.druid.segment.data.GenericIndexedWriter; +import org.apache.druid.segment.data.ImmutableRTreeObjectStrategy; +import org.apache.druid.segment.data.Indexed; +import org.apache.druid.segment.data.IndexedInts; +import org.apache.druid.segment.data.SingleValueColumnarIntsSerializer; +import org.apache.druid.segment.data.V3CompressedVSizeColumnarMultiIntsSerializer; +import org.apache.druid.segment.data.VSizeColumnarIntsSerializer; +import org.apache.druid.segment.data.VSizeColumnarMultiIntsSerializer; +import org.apache.druid.segment.serde.DictionaryEncodedColumnPartSerde; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; import it.unimi.dsi.fastutil.ints.IntIterable; import it.unimi.dsi.fastutil.ints.IntIterator; diff --git a/processing/src/main/java/io/druid/segment/TimeAndDimsIterator.java b/processing/src/main/java/org/apache/druid/segment/TimeAndDimsIterator.java similarity index 98% rename from processing/src/main/java/io/druid/segment/TimeAndDimsIterator.java rename to processing/src/main/java/org/apache/druid/segment/TimeAndDimsIterator.java index 097b9492f95d..64682670efbd 100644 --- a/processing/src/main/java/io/druid/segment/TimeAndDimsIterator.java +++ b/processing/src/main/java/org/apache/druid/segment/TimeAndDimsIterator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import java.io.Closeable; diff --git a/processing/src/main/java/io/druid/segment/TimeAndDimsPointer.java b/processing/src/main/java/org/apache/druid/segment/TimeAndDimsPointer.java similarity index 97% rename from processing/src/main/java/io/druid/segment/TimeAndDimsPointer.java rename to processing/src/main/java/org/apache/druid/segment/TimeAndDimsPointer.java index 56fa5baae435..2ee41711dbe8 100644 --- a/processing/src/main/java/io/druid/segment/TimeAndDimsPointer.java +++ b/processing/src/main/java/org/apache/druid/segment/TimeAndDimsPointer.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.base.Preconditions; -import io.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.DateTimes; import javax.annotation.Nonnull; import java.util.Arrays; @@ -37,7 +37,7 @@ * facilicate ordering and rollup during merging of collections of rows (see {@link IndexMergerV9#merge} methods). * * The difference between "time and dims" and "row" abstraction (see {@link - * io.druid.segment.incremental.IncrementalIndexRow}, {@link RowPointer}) is that "time and dims" is logical composite + * org.apache.druid.segment.incremental.IncrementalIndexRow}, {@link RowPointer}) is that "time and dims" is logical composite * of only time point and dimension and metric values, not tied to a specific position in any data structure (aka "row * index"). * diff --git a/processing/src/main/java/io/druid/segment/TransformableRowIterator.java b/processing/src/main/java/org/apache/druid/segment/TransformableRowIterator.java similarity index 98% rename from processing/src/main/java/io/druid/segment/TransformableRowIterator.java rename to processing/src/main/java/org/apache/druid/segment/TransformableRowIterator.java index 1c1b648efcbc..7e0b387a6748 100644 --- a/processing/src/main/java/io/druid/segment/TransformableRowIterator.java +++ b/processing/src/main/java/org/apache/druid/segment/TransformableRowIterator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; /** * TransformableRowIterator tightens {@link RowIterator#getPointer()} contract, that allows to transform iterated diff --git a/processing/src/main/java/io/druid/segment/VirtualColumn.java b/processing/src/main/java/org/apache/druid/segment/VirtualColumn.java similarity index 93% rename from processing/src/main/java/io/druid/segment/VirtualColumn.java rename to processing/src/main/java/org/apache/druid/segment/VirtualColumn.java index dde1cda2da29..7382b2ebd759 100644 --- a/processing/src/main/java/io/druid/segment/VirtualColumn.java +++ b/processing/src/main/java/org/apache/druid/segment/VirtualColumn.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.druid.java.util.common.Cacheable; -import io.druid.query.dimension.DimensionSpec; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.virtual.ExpressionVirtualColumn; +import org.apache.druid.java.util.common.Cacheable; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.virtual.ExpressionVirtualColumn; import java.util.List; diff --git a/processing/src/main/java/io/druid/segment/VirtualColumns.java b/processing/src/main/java/org/apache/druid/segment/VirtualColumns.java similarity index 94% rename from processing/src/main/java/io/druid/segment/VirtualColumns.java rename to processing/src/main/java/org/apache/druid/segment/VirtualColumns.java index 1acb84d15426..8b66444b1aa8 100644 --- a/processing/src/main/java/io/druid/segment/VirtualColumns.java +++ b/processing/src/main/java/org/apache/druid/segment/VirtualColumns.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -27,14 +27,14 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import io.druid.java.util.common.Cacheable; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.Pair; -import io.druid.query.cache.CacheKeyBuilder; -import io.druid.query.dimension.DimensionSpec; -import io.druid.segment.column.Column; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.virtual.VirtualizedColumnSelectorFactory; +import org.apache.druid.java.util.common.Cacheable; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.virtual.VirtualizedColumnSelectorFactory; import javax.annotation.Nullable; import java.util.List; diff --git a/processing/src/main/java/io/druid/segment/column/BaseColumn.java b/processing/src/main/java/org/apache/druid/segment/column/BaseColumn.java similarity index 86% rename from processing/src/main/java/io/druid/segment/column/BaseColumn.java rename to processing/src/main/java/org/apache/druid/segment/column/BaseColumn.java index f5c6f8280ca8..8de067ee8e6b 100644 --- a/processing/src/main/java/io/druid/segment/column/BaseColumn.java +++ b/processing/src/main/java/org/apache/druid/segment/column/BaseColumn.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.column; +package org.apache.druid.segment.column; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.data.ReadableOffset; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.data.ReadableOffset; import java.io.Closeable; diff --git a/processing/src/main/java/io/druid/segment/column/BitmapIndex.java b/processing/src/main/java/org/apache/druid/segment/column/BitmapIndex.java similarity index 89% rename from processing/src/main/java/io/druid/segment/column/BitmapIndex.java rename to processing/src/main/java/org/apache/druid/segment/column/BitmapIndex.java index 9621a7c1a0a3..8de489cd3df0 100644 --- a/processing/src/main/java/io/druid/segment/column/BitmapIndex.java +++ b/processing/src/main/java/org/apache/druid/segment/column/BitmapIndex.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.column; +package org.apache.druid.segment.column; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.ImmutableBitmap; /** */ diff --git a/processing/src/main/java/io/druid/segment/column/Column.java b/processing/src/main/java/org/apache/druid/segment/column/Column.java similarity index 90% rename from processing/src/main/java/io/druid/segment/column/Column.java rename to processing/src/main/java/org/apache/druid/segment/column/Column.java index 95e223fe2a3c..85cde8fe3da9 100644 --- a/processing/src/main/java/io/druid/segment/column/Column.java +++ b/processing/src/main/java/org/apache/druid/segment/column/Column.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.column; +package org.apache.druid.segment.column; -import io.druid.java.util.common.StringUtils; -import io.druid.segment.selector.settable.SettableColumnValueSelector; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.segment.selector.settable.SettableColumnValueSelector; /** */ diff --git a/processing/src/main/java/io/druid/segment/column/ColumnBuilder.java b/processing/src/main/java/org/apache/druid/segment/column/ColumnBuilder.java similarity index 96% rename from processing/src/main/java/io/druid/segment/column/ColumnBuilder.java rename to processing/src/main/java/org/apache/druid/segment/column/ColumnBuilder.java index 6791e2c95522..92ad6f5bb883 100644 --- a/processing/src/main/java/io/druid/segment/column/ColumnBuilder.java +++ b/processing/src/main/java/org/apache/druid/segment/column/ColumnBuilder.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment.column; +package org.apache.druid.segment.column; import com.google.common.base.Preconditions; import com.google.common.base.Supplier; -import io.druid.java.util.common.io.smoosh.SmooshedFileMapper; +import org.apache.druid.java.util.common.io.smoosh.SmooshedFileMapper; /** */ diff --git a/processing/src/main/java/io/druid/segment/column/ColumnCapabilities.java b/processing/src/main/java/org/apache/druid/segment/column/ColumnCapabilities.java similarity index 96% rename from processing/src/main/java/io/druid/segment/column/ColumnCapabilities.java rename to processing/src/main/java/org/apache/druid/segment/column/ColumnCapabilities.java index 2c11fb90d0ab..10fe1c91e4d9 100644 --- a/processing/src/main/java/io/druid/segment/column/ColumnCapabilities.java +++ b/processing/src/main/java/org/apache/druid/segment/column/ColumnCapabilities.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.column; +package org.apache.druid.segment.column; /** */ diff --git a/processing/src/main/java/io/druid/segment/column/ColumnCapabilitiesImpl.java b/processing/src/main/java/org/apache/druid/segment/column/ColumnCapabilitiesImpl.java similarity index 97% rename from processing/src/main/java/io/druid/segment/column/ColumnCapabilitiesImpl.java rename to processing/src/main/java/org/apache/druid/segment/column/ColumnCapabilitiesImpl.java index 76341d76d5c8..961163033b22 100644 --- a/processing/src/main/java/io/druid/segment/column/ColumnCapabilitiesImpl.java +++ b/processing/src/main/java/org/apache/druid/segment/column/ColumnCapabilitiesImpl.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.column; +package org.apache.druid.segment.column; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.ISE; /** */ diff --git a/processing/src/main/java/io/druid/segment/column/ColumnConfig.java b/processing/src/main/java/org/apache/druid/segment/column/ColumnConfig.java similarity index 95% rename from processing/src/main/java/io/druid/segment/column/ColumnConfig.java rename to processing/src/main/java/org/apache/druid/segment/column/ColumnConfig.java index c5516d857a3b..ed3fa6b44264 100644 --- a/processing/src/main/java/io/druid/segment/column/ColumnConfig.java +++ b/processing/src/main/java/org/apache/druid/segment/column/ColumnConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.column; +package org.apache.druid.segment.column; public interface ColumnConfig { diff --git a/processing/src/main/java/io/druid/segment/column/ColumnDescriptor.java b/processing/src/main/java/org/apache/druid/segment/column/ColumnDescriptor.java similarity index 92% rename from processing/src/main/java/io/druid/segment/column/ColumnDescriptor.java rename to processing/src/main/java/org/apache/druid/segment/column/ColumnDescriptor.java index 8760270c052a..3fe4c8926972 100644 --- a/processing/src/main/java/io/druid/segment/column/ColumnDescriptor.java +++ b/processing/src/main/java/org/apache/druid/segment/column/ColumnDescriptor.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.segment.column; +package org.apache.druid.segment.column; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.java.util.common.io.smoosh.SmooshedFileMapper; -import io.druid.segment.serde.ColumnPartSerde; -import io.druid.segment.serde.Serializer; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.java.util.common.io.smoosh.SmooshedFileMapper; +import org.apache.druid.segment.serde.ColumnPartSerde; +import org.apache.druid.segment.serde.Serializer; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/segment/column/ComplexColumn.java b/processing/src/main/java/org/apache/druid/segment/column/ComplexColumn.java similarity index 85% rename from processing/src/main/java/io/druid/segment/column/ComplexColumn.java rename to processing/src/main/java/org/apache/druid/segment/column/ComplexColumn.java index ec93b416c15b..7075e301b221 100644 --- a/processing/src/main/java/io/druid/segment/column/ComplexColumn.java +++ b/processing/src/main/java/org/apache/druid/segment/column/ComplexColumn.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment.column; +package org.apache.druid.segment.column; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.ObjectColumnSelector; -import io.druid.segment.data.ReadableOffset; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.ObjectColumnSelector; +import org.apache.druid.segment.data.ReadableOffset; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/segment/column/DictionaryEncodedColumn.java b/processing/src/main/java/org/apache/druid/segment/column/DictionaryEncodedColumn.java similarity index 82% rename from processing/src/main/java/io/druid/segment/column/DictionaryEncodedColumn.java rename to processing/src/main/java/org/apache/druid/segment/column/DictionaryEncodedColumn.java index 79a80f7efe63..d493c46e82cd 100644 --- a/processing/src/main/java/io/druid/segment/column/DictionaryEncodedColumn.java +++ b/processing/src/main/java/org/apache/druid/segment/column/DictionaryEncodedColumn.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.segment.column; +package org.apache.druid.segment.column; -import io.druid.query.extraction.ExtractionFn; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.DimensionSelector; -import io.druid.segment.data.IndexedInts; -import io.druid.segment.data.ReadableOffset; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.data.IndexedInts; +import org.apache.druid.segment.data.ReadableOffset; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/segment/column/DoublesColumn.java b/processing/src/main/java/org/apache/druid/segment/column/DoublesColumn.java similarity index 83% rename from processing/src/main/java/io/druid/segment/column/DoublesColumn.java rename to processing/src/main/java/org/apache/druid/segment/column/DoublesColumn.java index 1f2725c62081..753e45047b38 100644 --- a/processing/src/main/java/io/druid/segment/column/DoublesColumn.java +++ b/processing/src/main/java/org/apache/druid/segment/column/DoublesColumn.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment.column; +package org.apache.druid.segment.column; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.IndexIO; -import io.druid.segment.data.ColumnarDoubles; -import io.druid.segment.data.ReadableOffset; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.data.ColumnarDoubles; +import org.apache.druid.segment.data.ReadableOffset; /** diff --git a/processing/src/main/java/io/druid/segment/column/DoublesColumnWithNulls.java b/processing/src/main/java/org/apache/druid/segment/column/DoublesColumnWithNulls.java similarity index 82% rename from processing/src/main/java/io/druid/segment/column/DoublesColumnWithNulls.java rename to processing/src/main/java/org/apache/druid/segment/column/DoublesColumnWithNulls.java index 2693ab79c37f..905a1db62941 100644 --- a/processing/src/main/java/io/druid/segment/column/DoublesColumnWithNulls.java +++ b/processing/src/main/java/org/apache/druid/segment/column/DoublesColumnWithNulls.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.segment.column; +package org.apache.druid.segment.column; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.data.ColumnarDoubles; -import io.druid.segment.data.ReadableOffset; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.data.ColumnarDoubles; +import org.apache.druid.segment.data.ReadableOffset; /** * DoublesColumn with null values. diff --git a/processing/src/main/java/io/druid/segment/column/FloatsColumn.java b/processing/src/main/java/org/apache/druid/segment/column/FloatsColumn.java similarity index 83% rename from processing/src/main/java/io/druid/segment/column/FloatsColumn.java rename to processing/src/main/java/org/apache/druid/segment/column/FloatsColumn.java index 5c8a680f1c38..0337d30fb603 100644 --- a/processing/src/main/java/io/druid/segment/column/FloatsColumn.java +++ b/processing/src/main/java/org/apache/druid/segment/column/FloatsColumn.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment.column; +package org.apache.druid.segment.column; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.IndexIO; -import io.druid.segment.data.ColumnarFloats; -import io.druid.segment.data.ReadableOffset; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.data.ColumnarFloats; +import org.apache.druid.segment.data.ReadableOffset; /** */ diff --git a/processing/src/main/java/io/druid/segment/column/FloatsColumnWithNulls.java b/processing/src/main/java/org/apache/druid/segment/column/FloatsColumnWithNulls.java similarity index 82% rename from processing/src/main/java/io/druid/segment/column/FloatsColumnWithNulls.java rename to processing/src/main/java/org/apache/druid/segment/column/FloatsColumnWithNulls.java index 796fa22c4824..0ec0d167fea5 100644 --- a/processing/src/main/java/io/druid/segment/column/FloatsColumnWithNulls.java +++ b/processing/src/main/java/org/apache/druid/segment/column/FloatsColumnWithNulls.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.segment.column; +package org.apache.druid.segment.column; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.data.ColumnarFloats; -import io.druid.segment.data.ReadableOffset; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.data.ColumnarFloats; +import org.apache.druid.segment.data.ReadableOffset; /** * FloatsColumn with null values. diff --git a/processing/src/main/java/io/druid/segment/column/GenericColumn.java b/processing/src/main/java/org/apache/druid/segment/column/GenericColumn.java similarity index 84% rename from processing/src/main/java/io/druid/segment/column/GenericColumn.java rename to processing/src/main/java/org/apache/druid/segment/column/GenericColumn.java index e6da4ff072c8..2b12c1cf7932 100644 --- a/processing/src/main/java/io/druid/segment/column/GenericColumn.java +++ b/processing/src/main/java/org/apache/druid/segment/column/GenericColumn.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.column; +package org.apache.druid.segment.column; -import io.druid.query.monomorphicprocessing.CalledFromHotLoop; -import io.druid.query.monomorphicprocessing.HotLoopCallee; +import org.apache.druid.query.monomorphicprocessing.CalledFromHotLoop; +import org.apache.druid.query.monomorphicprocessing.HotLoopCallee; /** */ diff --git a/processing/src/main/java/io/druid/segment/column/IndexedComplexColumn.java b/processing/src/main/java/org/apache/druid/segment/column/IndexedComplexColumn.java similarity index 94% rename from processing/src/main/java/io/druid/segment/column/IndexedComplexColumn.java rename to processing/src/main/java/org/apache/druid/segment/column/IndexedComplexColumn.java index 27b49ba62fed..536486736243 100644 --- a/processing/src/main/java/io/druid/segment/column/IndexedComplexColumn.java +++ b/processing/src/main/java/org/apache/druid/segment/column/IndexedComplexColumn.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.column; +package org.apache.druid.segment.column; -import io.druid.segment.data.Indexed; +import org.apache.druid.segment.data.Indexed; /** */ diff --git a/processing/src/main/java/io/druid/segment/column/LongsColumn.java b/processing/src/main/java/org/apache/druid/segment/column/LongsColumn.java similarity index 83% rename from processing/src/main/java/io/druid/segment/column/LongsColumn.java rename to processing/src/main/java/org/apache/druid/segment/column/LongsColumn.java index 093be62ae591..6100dbb7a06b 100644 --- a/processing/src/main/java/io/druid/segment/column/LongsColumn.java +++ b/processing/src/main/java/org/apache/druid/segment/column/LongsColumn.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment.column; +package org.apache.druid.segment.column; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.IndexIO; -import io.druid.segment.data.ColumnarLongs; -import io.druid.segment.data.ReadableOffset; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.data.ColumnarLongs; +import org.apache.druid.segment.data.ReadableOffset; /** */ diff --git a/processing/src/main/java/io/druid/segment/column/LongsColumnWithNulls.java b/processing/src/main/java/org/apache/druid/segment/column/LongsColumnWithNulls.java similarity index 82% rename from processing/src/main/java/io/druid/segment/column/LongsColumnWithNulls.java rename to processing/src/main/java/org/apache/druid/segment/column/LongsColumnWithNulls.java index 72e1eecf191b..9c2500d2974d 100644 --- a/processing/src/main/java/io/druid/segment/column/LongsColumnWithNulls.java +++ b/processing/src/main/java/org/apache/druid/segment/column/LongsColumnWithNulls.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.segment.column; +package org.apache.druid.segment.column; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.data.ColumnarLongs; -import io.druid.segment.data.ReadableOffset; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.data.ColumnarLongs; +import org.apache.druid.segment.data.ReadableOffset; /** * LongsColumn with null values. diff --git a/processing/src/main/java/io/druid/segment/column/SimpleColumn.java b/processing/src/main/java/org/apache/druid/segment/column/SimpleColumn.java similarity index 95% rename from processing/src/main/java/io/druid/segment/column/SimpleColumn.java rename to processing/src/main/java/org/apache/druid/segment/column/SimpleColumn.java index bf76c1b0ddf5..71d30e745547 100644 --- a/processing/src/main/java/io/druid/segment/column/SimpleColumn.java +++ b/processing/src/main/java/org/apache/druid/segment/column/SimpleColumn.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.column; +package org.apache.druid.segment.column; import com.google.common.base.Supplier; -import io.druid.segment.selector.settable.SettableColumnValueSelector; +import org.apache.druid.segment.selector.settable.SettableColumnValueSelector; /** */ diff --git a/processing/src/main/java/io/druid/segment/column/SimpleDictionaryEncodedColumn.java b/processing/src/main/java/org/apache/druid/segment/column/SimpleDictionaryEncodedColumn.java similarity index 90% rename from processing/src/main/java/io/druid/segment/column/SimpleDictionaryEncodedColumn.java rename to processing/src/main/java/org/apache/druid/segment/column/SimpleDictionaryEncodedColumn.java index c325de133791..ef0e8ad9413d 100644 --- a/processing/src/main/java/io/druid/segment/column/SimpleDictionaryEncodedColumn.java +++ b/processing/src/main/java/org/apache/druid/segment/column/SimpleDictionaryEncodedColumn.java @@ -17,25 +17,25 @@ * under the License. */ -package io.druid.segment.column; +package org.apache.druid.segment.column; import com.google.common.base.Predicate; import com.google.common.base.Predicates; -import io.druid.java.util.common.guava.CloseQuietly; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.DimensionSelectorUtils; -import io.druid.segment.IdLookup; -import io.druid.segment.data.CachingIndexed; -import io.druid.segment.data.ColumnarInts; -import io.druid.segment.data.ColumnarMultiInts; -import io.druid.segment.data.IndexedInts; -import io.druid.segment.data.ReadableOffset; -import io.druid.segment.data.SingleIndexedInt; -import io.druid.segment.filter.BooleanValueMatcher; -import io.druid.segment.historical.HistoricalDimensionSelector; -import io.druid.segment.historical.SingleValueHistoricalDimensionSelector; +import org.apache.druid.java.util.common.guava.CloseQuietly; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.DimensionSelectorUtils; +import org.apache.druid.segment.IdLookup; +import org.apache.druid.segment.data.CachingIndexed; +import org.apache.druid.segment.data.ColumnarInts; +import org.apache.druid.segment.data.ColumnarMultiInts; +import org.apache.druid.segment.data.IndexedInts; +import org.apache.druid.segment.data.ReadableOffset; +import org.apache.druid.segment.data.SingleIndexedInt; +import org.apache.druid.segment.filter.BooleanValueMatcher; +import org.apache.druid.segment.historical.HistoricalDimensionSelector; +import org.apache.druid.segment.historical.SingleValueHistoricalDimensionSelector; import javax.annotation.Nullable; import java.io.IOException; diff --git a/processing/src/main/java/io/druid/segment/column/SpatialIndex.java b/processing/src/main/java/org/apache/druid/segment/column/SpatialIndex.java similarity index 89% rename from processing/src/main/java/io/druid/segment/column/SpatialIndex.java rename to processing/src/main/java/org/apache/druid/segment/column/SpatialIndex.java index d296e1b6e711..462a15a079b3 100644 --- a/processing/src/main/java/io/druid/segment/column/SpatialIndex.java +++ b/processing/src/main/java/org/apache/druid/segment/column/SpatialIndex.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.column; +package org.apache.druid.segment.column; -import io.druid.collections.spatial.ImmutableRTree; +import org.apache.druid.collections.spatial.ImmutableRTree; /** */ diff --git a/processing/src/main/java/io/druid/segment/column/ValueType.java b/processing/src/main/java/org/apache/druid/segment/column/ValueType.java similarity index 76% rename from processing/src/main/java/io/druid/segment/column/ValueType.java rename to processing/src/main/java/org/apache/druid/segment/column/ValueType.java index 472007084c91..ed863d788297 100644 --- a/processing/src/main/java/io/druid/segment/column/ValueType.java +++ b/processing/src/main/java/org/apache/druid/segment/column/ValueType.java @@ -17,25 +17,25 @@ * under the License. */ -package io.druid.segment.column; +package org.apache.druid.segment.column; import com.fasterxml.jackson.annotation.JsonCreator; -import io.druid.java.util.common.StringUtils; -import io.druid.query.extraction.ExtractionFn; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.DimensionSelector; -import io.druid.segment.DoubleWrappingDimensionSelector; -import io.druid.segment.FloatWrappingDimensionSelector; -import io.druid.segment.LongWrappingDimensionSelector; -import io.druid.segment.selector.settable.SettableColumnValueSelector; -import io.druid.segment.selector.settable.SettableDimensionValueSelector; -import io.druid.segment.selector.settable.SettableDoubleColumnValueSelector; -import io.druid.segment.selector.settable.SettableFloatColumnValueSelector; -import io.druid.segment.selector.settable.SettableLongColumnValueSelector; -import io.druid.segment.selector.settable.SettableObjectColumnValueSelector; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.DoubleWrappingDimensionSelector; +import org.apache.druid.segment.FloatWrappingDimensionSelector; +import org.apache.druid.segment.LongWrappingDimensionSelector; +import org.apache.druid.segment.selector.settable.SettableColumnValueSelector; +import org.apache.druid.segment.selector.settable.SettableDimensionValueSelector; +import org.apache.druid.segment.selector.settable.SettableDoubleColumnValueSelector; +import org.apache.druid.segment.selector.settable.SettableFloatColumnValueSelector; +import org.apache.druid.segment.selector.settable.SettableLongColumnValueSelector; +import org.apache.druid.segment.selector.settable.SettableObjectColumnValueSelector; /** - * Should be the same as {@link io.druid.data.input.impl.DimensionSchema.ValueType}. + * Should be the same as {@link org.apache.druid.data.input.impl.DimensionSchema.ValueType}. * TODO merge them when druid-api is merged back into the main repo */ public enum ValueType diff --git a/processing/src/main/java/io/druid/segment/data/ArrayBasedIndexedInts.java b/processing/src/main/java/org/apache/druid/segment/data/ArrayBasedIndexedInts.java similarity index 94% rename from processing/src/main/java/io/druid/segment/data/ArrayBasedIndexedInts.java rename to processing/src/main/java/org/apache/druid/segment/data/ArrayBasedIndexedInts.java index 475b8c1015b5..450b3e2bb568 100644 --- a/processing/src/main/java/io/druid/segment/data/ArrayBasedIndexedInts.java +++ b/processing/src/main/java/org/apache/druid/segment/data/ArrayBasedIndexedInts.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.java.util.common.IAE; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; import it.unimi.dsi.fastutil.ints.IntArrays; /** diff --git a/processing/src/main/java/io/druid/segment/data/ArrayIndexed.java b/processing/src/main/java/org/apache/druid/segment/data/ArrayIndexed.java similarity index 93% rename from processing/src/main/java/io/druid/segment/data/ArrayIndexed.java rename to processing/src/main/java/org/apache/druid/segment/data/ArrayIndexed.java index 718f9bcccdc3..7dca91d36d02 100644 --- a/processing/src/main/java/io/druid/segment/data/ArrayIndexed.java +++ b/processing/src/main/java/org/apache/druid/segment/data/ArrayIndexed.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; import java.util.Arrays; import java.util.Iterator; diff --git a/processing/src/main/java/io/druid/segment/data/BitmapSerde.java b/processing/src/main/java/org/apache/druid/segment/data/BitmapSerde.java similarity index 97% rename from processing/src/main/java/io/druid/segment/data/BitmapSerde.java rename to processing/src/main/java/org/apache/druid/segment/data/BitmapSerde.java index 25e6085b981b..90db1416a0c4 100644 --- a/processing/src/main/java/io/druid/segment/data/BitmapSerde.java +++ b/processing/src/main/java/org/apache/druid/segment/data/BitmapSerde.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.fasterxml.jackson.annotation.JsonTypeName; diff --git a/processing/src/main/java/io/druid/segment/data/BitmapSerdeFactory.java b/processing/src/main/java/org/apache/druid/segment/data/BitmapSerdeFactory.java similarity index 89% rename from processing/src/main/java/io/druid/segment/data/BitmapSerdeFactory.java rename to processing/src/main/java/org/apache/druid/segment/data/BitmapSerdeFactory.java index 29850d83be96..71e28e031cd6 100644 --- a/processing/src/main/java/io/druid/segment/data/BitmapSerdeFactory.java +++ b/processing/src/main/java/org/apache/druid/segment/data/BitmapSerdeFactory.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.ImmutableBitmap; /** */ diff --git a/processing/src/main/java/io/druid/segment/data/BitmapValues.java b/processing/src/main/java/org/apache/druid/segment/data/BitmapValues.java similarity index 97% rename from processing/src/main/java/io/druid/segment/data/BitmapValues.java rename to processing/src/main/java/org/apache/druid/segment/data/BitmapValues.java index 077ac824946e..00ecde570ddd 100644 --- a/processing/src/main/java/io/druid/segment/data/BitmapValues.java +++ b/processing/src/main/java/org/apache/druid/segment/data/BitmapValues.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import it.unimi.dsi.fastutil.ints.IntIterator; import it.unimi.dsi.fastutil.ints.IntIterators; diff --git a/processing/src/main/java/io/druid/segment/data/BlockLayoutColumnarDoublesSerializer.java b/processing/src/main/java/org/apache/druid/segment/data/BlockLayoutColumnarDoublesSerializer.java similarity index 91% rename from processing/src/main/java/io/druid/segment/data/BlockLayoutColumnarDoublesSerializer.java rename to processing/src/main/java/org/apache/druid/segment/data/BlockLayoutColumnarDoublesSerializer.java index 3f754d221619..8c2db09fefae 100644 --- a/processing/src/main/java/io/druid/segment/data/BlockLayoutColumnarDoublesSerializer.java +++ b/processing/src/main/java/org/apache/druid/segment/data/BlockLayoutColumnarDoublesSerializer.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.segment.CompressedPools; -import io.druid.segment.serde.MetaSerdeHelper; -import io.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.segment.CompressedPools; +import org.apache.druid.segment.serde.MetaSerdeHelper; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/segment/data/BlockLayoutColumnarDoublesSupplier.java b/processing/src/main/java/org/apache/druid/segment/data/BlockLayoutColumnarDoublesSupplier.java similarity index 96% rename from processing/src/main/java/io/druid/segment/data/BlockLayoutColumnarDoublesSupplier.java rename to processing/src/main/java/org/apache/druid/segment/data/BlockLayoutColumnarDoublesSupplier.java index 2e60cb4e051d..8701ea970f85 100644 --- a/processing/src/main/java/io/druid/segment/data/BlockLayoutColumnarDoublesSupplier.java +++ b/processing/src/main/java/org/apache/druid/segment/data/BlockLayoutColumnarDoublesSupplier.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.base.Supplier; -import io.druid.collections.ResourceHolder; -import io.druid.java.util.common.guava.CloseQuietly; +import org.apache.druid.collections.ResourceHolder; +import org.apache.druid.java.util.common.guava.CloseQuietly; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/processing/src/main/java/io/druid/segment/data/BlockLayoutColumnarFloatsSerializer.java b/processing/src/main/java/org/apache/druid/segment/data/BlockLayoutColumnarFloatsSerializer.java similarity index 91% rename from processing/src/main/java/io/druid/segment/data/BlockLayoutColumnarFloatsSerializer.java rename to processing/src/main/java/org/apache/druid/segment/data/BlockLayoutColumnarFloatsSerializer.java index 0a6b657aed7f..4411c0898c84 100644 --- a/processing/src/main/java/io/druid/segment/data/BlockLayoutColumnarFloatsSerializer.java +++ b/processing/src/main/java/org/apache/druid/segment/data/BlockLayoutColumnarFloatsSerializer.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.segment.writeout.SegmentWriteOutMedium; -import io.druid.segment.CompressedPools; -import io.druid.segment.serde.MetaSerdeHelper; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.segment.CompressedPools; +import org.apache.druid.segment.serde.MetaSerdeHelper; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/segment/data/BlockLayoutColumnarFloatsSupplier.java b/processing/src/main/java/org/apache/druid/segment/data/BlockLayoutColumnarFloatsSupplier.java similarity index 95% rename from processing/src/main/java/io/druid/segment/data/BlockLayoutColumnarFloatsSupplier.java rename to processing/src/main/java/org/apache/druid/segment/data/BlockLayoutColumnarFloatsSupplier.java index dd1639dbe718..5673164131e5 100644 --- a/processing/src/main/java/io/druid/segment/data/BlockLayoutColumnarFloatsSupplier.java +++ b/processing/src/main/java/org/apache/druid/segment/data/BlockLayoutColumnarFloatsSupplier.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.base.Supplier; -import io.druid.collections.ResourceHolder; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.guava.CloseQuietly; +import org.apache.druid.collections.ResourceHolder; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.guava.CloseQuietly; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/processing/src/main/java/io/druid/segment/data/BlockLayoutColumnarLongsSerializer.java b/processing/src/main/java/org/apache/druid/segment/data/BlockLayoutColumnarLongsSerializer.java similarity index 93% rename from processing/src/main/java/io/druid/segment/data/BlockLayoutColumnarLongsSerializer.java rename to processing/src/main/java/org/apache/druid/segment/data/BlockLayoutColumnarLongsSerializer.java index 1031bc25b68b..cad801d4becc 100644 --- a/processing/src/main/java/io/druid/segment/data/BlockLayoutColumnarLongsSerializer.java +++ b/processing/src/main/java/org/apache/druid/segment/data/BlockLayoutColumnarLongsSerializer.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.segment.writeout.SegmentWriteOutMedium; -import io.druid.segment.CompressedPools; -import io.druid.segment.serde.MetaSerdeHelper; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.segment.CompressedPools; +import org.apache.druid.segment.serde.MetaSerdeHelper; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/segment/data/BlockLayoutColumnarLongsSupplier.java b/processing/src/main/java/org/apache/druid/segment/data/BlockLayoutColumnarLongsSupplier.java similarity index 96% rename from processing/src/main/java/io/druid/segment/data/BlockLayoutColumnarLongsSupplier.java rename to processing/src/main/java/org/apache/druid/segment/data/BlockLayoutColumnarLongsSupplier.java index 4ced7c6eea3c..b8be1de96276 100644 --- a/processing/src/main/java/io/druid/segment/data/BlockLayoutColumnarLongsSupplier.java +++ b/processing/src/main/java/org/apache/druid/segment/data/BlockLayoutColumnarLongsSupplier.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.base.Supplier; -import io.druid.collections.ResourceHolder; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.guava.CloseQuietly; +import org.apache.druid.collections.ResourceHolder; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.guava.CloseQuietly; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/processing/src/main/java/io/druid/segment/data/ByteBufferWriter.java b/processing/src/main/java/org/apache/druid/segment/data/ByteBufferWriter.java similarity index 89% rename from processing/src/main/java/io/druid/segment/data/ByteBufferWriter.java rename to processing/src/main/java/org/apache/druid/segment/data/ByteBufferWriter.java index 48bc8170b0c5..715294401134 100644 --- a/processing/src/main/java/io/druid/segment/data/ByteBufferWriter.java +++ b/processing/src/main/java/org/apache/druid/segment/data/ByteBufferWriter.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.base.Preconditions; import com.google.common.primitives.Ints; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.segment.serde.Serializer; -import io.druid.segment.writeout.SegmentWriteOutMedium; -import io.druid.segment.writeout.WriteOutBytes; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.segment.serde.Serializer; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.segment.writeout.WriteOutBytes; import java.io.IOException; import java.nio.channels.WritableByteChannel; diff --git a/processing/src/main/java/io/druid/segment/data/CacheableObjectStrategy.java b/processing/src/main/java/org/apache/druid/segment/data/CacheableObjectStrategy.java similarity index 96% rename from processing/src/main/java/io/druid/segment/data/CacheableObjectStrategy.java rename to processing/src/main/java/org/apache/druid/segment/data/CacheableObjectStrategy.java index 0de7d46f9339..25b454b3fce5 100644 --- a/processing/src/main/java/io/druid/segment/data/CacheableObjectStrategy.java +++ b/processing/src/main/java/org/apache/druid/segment/data/CacheableObjectStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; /** * Implementing CacheableObjectStrategy instead of ObjectSrategy indicates diff --git a/processing/src/main/java/io/druid/segment/data/CachingIndexed.java b/processing/src/main/java/org/apache/druid/segment/data/CachingIndexed.java similarity index 94% rename from processing/src/main/java/io/druid/segment/data/CachingIndexed.java rename to processing/src/main/java/org/apache/druid/segment/data/CachingIndexed.java index bd686374be1f..863f2fc2b490 100644 --- a/processing/src/main/java/io/druid/segment/data/CachingIndexed.java +++ b/processing/src/main/java/org/apache/druid/segment/data/CachingIndexed.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; import java.io.Closeable; import java.util.Iterator; diff --git a/processing/src/main/java/io/druid/segment/data/ColumnarDoubles.java b/processing/src/main/java/org/apache/druid/segment/data/ColumnarDoubles.java similarity index 86% rename from processing/src/main/java/io/druid/segment/data/ColumnarDoubles.java rename to processing/src/main/java/org/apache/druid/segment/data/ColumnarDoubles.java index c01c281a5e46..39e9cf03aba6 100644 --- a/processing/src/main/java/io/druid/segment/data/ColumnarDoubles.java +++ b/processing/src/main/java/org/apache/druid/segment/data/ColumnarDoubles.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.common.config.NullHandling; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.DoubleColumnSelector; -import io.druid.segment.historical.HistoricalColumnSelector; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.DoubleColumnSelector; +import org.apache.druid.segment.historical.HistoricalColumnSelector; import java.io.Closeable; /** * Resource that provides random access to a packed array of primitive doubles. Backs up {@link - * io.druid.segment.column.DoublesColumn}. + * org.apache.druid.segment.column.DoublesColumn}. */ public interface ColumnarDoubles extends Closeable { diff --git a/processing/src/main/java/io/druid/segment/data/ColumnarDoublesSerializer.java b/processing/src/main/java/org/apache/druid/segment/data/ColumnarDoublesSerializer.java similarity index 92% rename from processing/src/main/java/io/druid/segment/data/ColumnarDoublesSerializer.java rename to processing/src/main/java/org/apache/druid/segment/data/ColumnarDoublesSerializer.java index 91bf6c4b3108..da1b9779d1dc 100644 --- a/processing/src/main/java/io/druid/segment/data/ColumnarDoublesSerializer.java +++ b/processing/src/main/java/org/apache/druid/segment/data/ColumnarDoublesSerializer.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.segment.serde.Serializer; +import org.apache.druid.segment.serde.Serializer; import java.io.IOException; diff --git a/processing/src/main/java/io/druid/segment/data/ColumnarFloats.java b/processing/src/main/java/org/apache/druid/segment/data/ColumnarFloats.java similarity index 87% rename from processing/src/main/java/io/druid/segment/data/ColumnarFloats.java rename to processing/src/main/java/org/apache/druid/segment/data/ColumnarFloats.java index 31910c2241c4..f8441a27b688 100644 --- a/processing/src/main/java/io/druid/segment/data/ColumnarFloats.java +++ b/processing/src/main/java/org/apache/druid/segment/data/ColumnarFloats.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.common.config.NullHandling; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.FloatColumnSelector; -import io.druid.segment.historical.HistoricalColumnSelector; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.FloatColumnSelector; +import org.apache.druid.segment.historical.HistoricalColumnSelector; import java.io.Closeable; /** * Resource that provides random access to a packed array of primitive floats. Backs up {@link - * io.druid.segment.column.FloatsColumn}. + * org.apache.druid.segment.column.FloatsColumn}. */ public interface ColumnarFloats extends Closeable { diff --git a/processing/src/main/java/io/druid/segment/data/ColumnarFloatsSerializer.java b/processing/src/main/java/org/apache/druid/segment/data/ColumnarFloatsSerializer.java similarity index 92% rename from processing/src/main/java/io/druid/segment/data/ColumnarFloatsSerializer.java rename to processing/src/main/java/org/apache/druid/segment/data/ColumnarFloatsSerializer.java index b07bee6f653b..efa63088e265 100644 --- a/processing/src/main/java/io/druid/segment/data/ColumnarFloatsSerializer.java +++ b/processing/src/main/java/org/apache/druid/segment/data/ColumnarFloatsSerializer.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.segment.serde.Serializer; +import org.apache.druid.segment.serde.Serializer; import java.io.IOException; diff --git a/processing/src/main/java/io/druid/segment/data/ColumnarInts.java b/processing/src/main/java/org/apache/druid/segment/data/ColumnarInts.java similarity index 87% rename from processing/src/main/java/io/druid/segment/data/ColumnarInts.java rename to processing/src/main/java/org/apache/druid/segment/data/ColumnarInts.java index 2f946ddd8c18..458be0b9ba5c 100644 --- a/processing/src/main/java/io/druid/segment/data/ColumnarInts.java +++ b/processing/src/main/java/org/apache/druid/segment/data/ColumnarInts.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import java.io.Closeable; /** * Resource that provides random access to a packed array of primitive int values. Typically backs up dictionary-encoded - * string columns (see {@link io.druid.segment.column.DictionaryEncodedColumn}), either directly for single-valued + * string columns (see {@link org.apache.druid.segment.column.DictionaryEncodedColumn}), either directly for single-valued * string columns, or indirectly as part of implementation of {@link ColumnarMultiInts}. */ public interface ColumnarInts extends IndexedInts, Closeable diff --git a/processing/src/main/java/io/druid/segment/data/ColumnarIntsSerializer.java b/processing/src/main/java/org/apache/druid/segment/data/ColumnarIntsSerializer.java similarity index 92% rename from processing/src/main/java/io/druid/segment/data/ColumnarIntsSerializer.java rename to processing/src/main/java/org/apache/druid/segment/data/ColumnarIntsSerializer.java index 0b009d4b72f3..77aa8d4eecdb 100644 --- a/processing/src/main/java/io/druid/segment/data/ColumnarIntsSerializer.java +++ b/processing/src/main/java/org/apache/druid/segment/data/ColumnarIntsSerializer.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.segment.serde.Serializer; +import org.apache.druid.segment.serde.Serializer; import java.io.IOException; diff --git a/processing/src/main/java/io/druid/segment/data/ColumnarLongs.java b/processing/src/main/java/org/apache/druid/segment/data/ColumnarLongs.java similarity index 87% rename from processing/src/main/java/io/druid/segment/data/ColumnarLongs.java rename to processing/src/main/java/org/apache/druid/segment/data/ColumnarLongs.java index 3e942d942829..00ff086ddd86 100644 --- a/processing/src/main/java/io/druid/segment/data/ColumnarLongs.java +++ b/processing/src/main/java/org/apache/druid/segment/data/ColumnarLongs.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.common.config.NullHandling; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.LongColumnSelector; -import io.druid.segment.historical.HistoricalColumnSelector; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.LongColumnSelector; +import org.apache.druid.segment.historical.HistoricalColumnSelector; import java.io.Closeable; /** * Resource that provides random access to a packed array of primitive longs. Backs up {@link - * io.druid.segment.column.LongsColumn}. + * org.apache.druid.segment.column.LongsColumn}. */ public interface ColumnarLongs extends Closeable { diff --git a/processing/src/main/java/io/druid/segment/data/ColumnarLongsSerializer.java b/processing/src/main/java/org/apache/druid/segment/data/ColumnarLongsSerializer.java similarity index 92% rename from processing/src/main/java/io/druid/segment/data/ColumnarLongsSerializer.java rename to processing/src/main/java/org/apache/druid/segment/data/ColumnarLongsSerializer.java index e13b8bc9afaf..05cf26439e35 100644 --- a/processing/src/main/java/io/druid/segment/data/ColumnarLongsSerializer.java +++ b/processing/src/main/java/org/apache/druid/segment/data/ColumnarLongsSerializer.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.segment.serde.Serializer; +import org.apache.druid.segment.serde.Serializer; import java.io.IOException; diff --git a/processing/src/main/java/io/druid/segment/data/ColumnarMultiInts.java b/processing/src/main/java/org/apache/druid/segment/data/ColumnarMultiInts.java similarity index 89% rename from processing/src/main/java/io/druid/segment/data/ColumnarMultiInts.java rename to processing/src/main/java/org/apache/druid/segment/data/ColumnarMultiInts.java index 0a9815db5af1..8392e133ff78 100644 --- a/processing/src/main/java/io/druid/segment/data/ColumnarMultiInts.java +++ b/processing/src/main/java/org/apache/druid/segment/data/ColumnarMultiInts.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import java.io.Closeable; /** * Resource that provides random access to a packed array of short arrays of ints ({@link IndexedInts}). Backs up - * multi-valued {@link io.druid.segment.column.DictionaryEncodedColumn}s. + * multi-valued {@link org.apache.druid.segment.column.DictionaryEncodedColumn}s. */ public interface ColumnarMultiInts extends Indexed, Closeable { diff --git a/processing/src/main/java/io/druid/segment/data/ColumnarMultiIntsSerializer.java b/processing/src/main/java/org/apache/druid/segment/data/ColumnarMultiIntsSerializer.java similarity index 96% rename from processing/src/main/java/io/druid/segment/data/ColumnarMultiIntsSerializer.java rename to processing/src/main/java/org/apache/druid/segment/data/ColumnarMultiIntsSerializer.java index 3def65f76d39..6553a3c035c1 100644 --- a/processing/src/main/java/io/druid/segment/data/ColumnarMultiIntsSerializer.java +++ b/processing/src/main/java/org/apache/druid/segment/data/ColumnarMultiIntsSerializer.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import java.io.IOException; diff --git a/processing/src/main/java/io/druid/segment/data/CompressedColumnarDoublesSuppliers.java b/processing/src/main/java/org/apache/druid/segment/data/CompressedColumnarDoublesSuppliers.java similarity index 95% rename from processing/src/main/java/io/druid/segment/data/CompressedColumnarDoublesSuppliers.java rename to processing/src/main/java/org/apache/druid/segment/data/CompressedColumnarDoublesSuppliers.java index dd6db50190b9..86443f942cea 100644 --- a/processing/src/main/java/io/druid/segment/data/CompressedColumnarDoublesSuppliers.java +++ b/processing/src/main/java/org/apache/druid/segment/data/CompressedColumnarDoublesSuppliers.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.base.Supplier; -import io.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.IAE; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/processing/src/main/java/io/druid/segment/data/CompressedColumnarFloatsSupplier.java b/processing/src/main/java/org/apache/druid/segment/data/CompressedColumnarFloatsSupplier.java similarity index 92% rename from processing/src/main/java/io/druid/segment/data/CompressedColumnarFloatsSupplier.java rename to processing/src/main/java/org/apache/druid/segment/data/CompressedColumnarFloatsSupplier.java index cf12e95f826e..17b8af1c57cb 100644 --- a/processing/src/main/java/io/druid/segment/data/CompressedColumnarFloatsSupplier.java +++ b/processing/src/main/java/org/apache/druid/segment/data/CompressedColumnarFloatsSupplier.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.base.Supplier; -import io.druid.io.Channels; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.segment.serde.MetaSerdeHelper; -import io.druid.segment.serde.Serializer; +import org.apache.druid.io.Channels; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.segment.serde.MetaSerdeHelper; +import org.apache.druid.segment.serde.Serializer; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/segment/data/CompressedColumnarIntsSerializer.java b/processing/src/main/java/org/apache/druid/segment/data/CompressedColumnarIntsSerializer.java similarity index 93% rename from processing/src/main/java/io/druid/segment/data/CompressedColumnarIntsSerializer.java rename to processing/src/main/java/org/apache/druid/segment/data/CompressedColumnarIntsSerializer.java index 406d1139ac5d..dacf62f27b49 100644 --- a/processing/src/main/java/io/druid/segment/data/CompressedColumnarIntsSerializer.java +++ b/processing/src/main/java/org/apache/druid/segment/data/CompressedColumnarIntsSerializer.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.segment.serde.MetaSerdeHelper; -import io.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.segment.serde.MetaSerdeHelper; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/segment/data/CompressedColumnarIntsSupplier.java b/processing/src/main/java/org/apache/druid/segment/data/CompressedColumnarIntsSupplier.java similarity index 95% rename from processing/src/main/java/io/druid/segment/data/CompressedColumnarIntsSupplier.java rename to processing/src/main/java/org/apache/druid/segment/data/CompressedColumnarIntsSupplier.java index 1089e49b7719..b3161f2f4596 100644 --- a/processing/src/main/java/io/druid/segment/data/CompressedColumnarIntsSupplier.java +++ b/processing/src/main/java/org/apache/druid/segment/data/CompressedColumnarIntsSupplier.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; -import io.druid.collections.ResourceHolder; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.guava.CloseQuietly; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.CompressedPools; -import io.druid.segment.serde.MetaSerdeHelper; +import org.apache.druid.collections.ResourceHolder; +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 org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.CompressedPools; +import org.apache.druid.segment.serde.MetaSerdeHelper; import it.unimi.dsi.fastutil.ints.IntArrayList; import java.io.IOException; diff --git a/processing/src/main/java/io/druid/segment/data/CompressedColumnarLongsSupplier.java b/processing/src/main/java/org/apache/druid/segment/data/CompressedColumnarLongsSupplier.java similarity index 93% rename from processing/src/main/java/io/druid/segment/data/CompressedColumnarLongsSupplier.java rename to processing/src/main/java/org/apache/druid/segment/data/CompressedColumnarLongsSupplier.java index e369643d6fc8..39df9af79c69 100644 --- a/processing/src/main/java/io/druid/segment/data/CompressedColumnarLongsSupplier.java +++ b/processing/src/main/java/org/apache/druid/segment/data/CompressedColumnarLongsSupplier.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.base.Supplier; -import io.druid.io.Channels; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.segment.serde.MetaSerdeHelper; -import io.druid.segment.serde.Serializer; +import org.apache.druid.io.Channels; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.segment.serde.MetaSerdeHelper; +import org.apache.druid.segment.serde.Serializer; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/segment/data/CompressedVSizeColumnarIntsSerializer.java b/processing/src/main/java/org/apache/druid/segment/data/CompressedVSizeColumnarIntsSerializer.java similarity index 94% rename from processing/src/main/java/io/druid/segment/data/CompressedVSizeColumnarIntsSerializer.java rename to processing/src/main/java/org/apache/druid/segment/data/CompressedVSizeColumnarIntsSerializer.java index 9f36651bea71..ffc1ee84a6cd 100644 --- a/processing/src/main/java/io/druid/segment/data/CompressedVSizeColumnarIntsSerializer.java +++ b/processing/src/main/java/org/apache/druid/segment/data/CompressedVSizeColumnarIntsSerializer.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.common.utils.ByteUtils; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.segment.IndexIO; -import io.druid.segment.serde.MetaSerdeHelper; -import io.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.common.utils.ByteUtils; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.serde.MetaSerdeHelper; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/segment/data/CompressedVSizeColumnarIntsSupplier.java b/processing/src/main/java/org/apache/druid/segment/data/CompressedVSizeColumnarIntsSupplier.java similarity index 95% rename from processing/src/main/java/io/druid/segment/data/CompressedVSizeColumnarIntsSupplier.java rename to processing/src/main/java/org/apache/druid/segment/data/CompressedVSizeColumnarIntsSupplier.java index 1b8bc649c11e..200fa1dcaae3 100644 --- a/processing/src/main/java/io/druid/segment/data/CompressedVSizeColumnarIntsSupplier.java +++ b/processing/src/main/java/org/apache/druid/segment/data/CompressedVSizeColumnarIntsSupplier.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; -import io.druid.collections.ResourceHolder; -import io.druid.common.utils.ByteUtils; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.guava.CloseQuietly; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.CompressedPools; -import io.druid.segment.serde.MetaSerdeHelper; +import org.apache.druid.collections.ResourceHolder; +import org.apache.druid.common.utils.ByteUtils; +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 org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.CompressedPools; +import org.apache.druid.segment.serde.MetaSerdeHelper; import it.unimi.dsi.fastutil.ints.IntList; import java.io.IOException; diff --git a/processing/src/main/java/io/druid/segment/data/CompressedVSizeColumnarMultiIntsSupplier.java b/processing/src/main/java/org/apache/druid/segment/data/CompressedVSizeColumnarMultiIntsSupplier.java similarity index 95% rename from processing/src/main/java/io/druid/segment/data/CompressedVSizeColumnarMultiIntsSupplier.java rename to processing/src/main/java/org/apache/druid/segment/data/CompressedVSizeColumnarMultiIntsSupplier.java index c6e35f759c56..8b7f84ba5bc6 100644 --- a/processing/src/main/java/io/druid/segment/data/CompressedVSizeColumnarMultiIntsSupplier.java +++ b/processing/src/main/java/org/apache/druid/segment/data/CompressedVSizeColumnarMultiIntsSupplier.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.annotations.VisibleForTesting; -import io.druid.io.Channels; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.io.Channels; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntList; diff --git a/processing/src/main/java/io/druid/segment/data/CompressionFactory.java b/processing/src/main/java/org/apache/druid/segment/data/CompressionFactory.java similarity index 97% rename from processing/src/main/java/io/druid/segment/data/CompressionFactory.java rename to processing/src/main/java/org/apache/druid/segment/data/CompressionFactory.java index fad203909bae..a9d4cbe6c42d 100644 --- a/processing/src/main/java/io/druid/segment/data/CompressionFactory.java +++ b/processing/src/main/java/org/apache/druid/segment/data/CompressionFactory.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; import com.google.common.base.Supplier; import com.google.common.collect.Maps; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.StringUtils; -import io.druid.segment.serde.MetaSerdeHelper; -import io.druid.segment.writeout.SegmentWriteOutMedium; -import io.druid.segment.writeout.WriteOutBytes; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.segment.serde.MetaSerdeHelper; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.segment.writeout.WriteOutBytes; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/segment/data/CompressionStrategy.java b/processing/src/main/java/org/apache/druid/segment/data/CompressionStrategy.java similarity index 97% rename from processing/src/main/java/io/druid/segment/data/CompressionStrategy.java rename to processing/src/main/java/org/apache/druid/segment/data/CompressionStrategy.java index 3b504563896c..a1304d7848e0 100644 --- a/processing/src/main/java/io/druid/segment/data/CompressionStrategy.java +++ b/processing/src/main/java/org/apache/druid/segment/data/CompressionStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,11 +25,11 @@ import com.ning.compress.BufferRecycler; import com.ning.compress.lzf.LZFDecoder; import com.ning.compress.lzf.LZFEncoder; -import io.druid.collections.ResourceHolder; -import io.druid.java.util.common.ByteBufferUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.io.Closer; -import io.druid.segment.CompressedPools; +import org.apache.druid.collections.ResourceHolder; +import org.apache.druid.java.util.common.ByteBufferUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.segment.CompressedPools; import net.jpountz.lz4.LZ4Factory; import net.jpountz.lz4.LZ4SafeDecompressor; import org.apache.commons.lang.ArrayUtils; diff --git a/processing/src/main/java/io/druid/segment/data/ConciseBitmapSerdeFactory.java b/processing/src/main/java/org/apache/druid/segment/data/ConciseBitmapSerdeFactory.java similarity index 86% rename from processing/src/main/java/io/druid/segment/data/ConciseBitmapSerdeFactory.java rename to processing/src/main/java/org/apache/druid/segment/data/ConciseBitmapSerdeFactory.java index c79c9afa29f3..1d08867a288a 100644 --- a/processing/src/main/java/io/druid/segment/data/ConciseBitmapSerdeFactory.java +++ b/processing/src/main/java/org/apache/druid/segment/data/ConciseBitmapSerdeFactory.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.ConciseBitmapFactory; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.collections.bitmap.WrappedImmutableConciseBitmap; -import io.druid.extendedset.intset.ImmutableConciseSet; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.ConciseBitmapFactory; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.collections.bitmap.WrappedImmutableConciseBitmap; +import org.apache.druid.extendedset.intset.ImmutableConciseSet; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/segment/data/DecompressingByteBufferObjectStrategy.java b/processing/src/main/java/org/apache/druid/segment/data/DecompressingByteBufferObjectStrategy.java similarity index 94% rename from processing/src/main/java/io/druid/segment/data/DecompressingByteBufferObjectStrategy.java rename to processing/src/main/java/org/apache/druid/segment/data/DecompressingByteBufferObjectStrategy.java index 15f4c2692526..c3967b967528 100644 --- a/processing/src/main/java/io/druid/segment/data/DecompressingByteBufferObjectStrategy.java +++ b/processing/src/main/java/org/apache/druid/segment/data/DecompressingByteBufferObjectStrategy.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.collections.ResourceHolder; -import io.druid.segment.CompressedPools; +import org.apache.druid.collections.ResourceHolder; +import org.apache.druid.segment.CompressedPools; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/processing/src/main/java/io/druid/segment/data/DeltaLongEncodingReader.java b/processing/src/main/java/org/apache/druid/segment/data/DeltaLongEncodingReader.java similarity index 96% rename from processing/src/main/java/io/druid/segment/data/DeltaLongEncodingReader.java rename to processing/src/main/java/org/apache/druid/segment/data/DeltaLongEncodingReader.java index 8e404c02efef..c76e919c119a 100644 --- a/processing/src/main/java/io/druid/segment/data/DeltaLongEncodingReader.java +++ b/processing/src/main/java/org/apache/druid/segment/data/DeltaLongEncodingReader.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.IAE; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/segment/data/DeltaLongEncodingWriter.java b/processing/src/main/java/org/apache/druid/segment/data/DeltaLongEncodingWriter.java similarity index 96% rename from processing/src/main/java/io/druid/segment/data/DeltaLongEncodingWriter.java rename to processing/src/main/java/org/apache/druid/segment/data/DeltaLongEncodingWriter.java index 7fe714adb545..835178e0be06 100644 --- a/processing/src/main/java/io/druid/segment/data/DeltaLongEncodingWriter.java +++ b/processing/src/main/java/org/apache/druid/segment/data/DeltaLongEncodingWriter.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.segment.writeout.WriteOutBytes; +import org.apache.druid.segment.writeout.WriteOutBytes; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/segment/data/EntireLayoutColumnarDoublesSerializer.java b/processing/src/main/java/org/apache/druid/segment/data/EntireLayoutColumnarDoublesSerializer.java similarity index 90% rename from processing/src/main/java/io/druid/segment/data/EntireLayoutColumnarDoublesSerializer.java rename to processing/src/main/java/org/apache/druid/segment/data/EntireLayoutColumnarDoublesSerializer.java index 35960da3e563..ed178638e187 100644 --- a/processing/src/main/java/io/druid/segment/data/EntireLayoutColumnarDoublesSerializer.java +++ b/processing/src/main/java/org/apache/druid/segment/data/EntireLayoutColumnarDoublesSerializer.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.segment.serde.MetaSerdeHelper; -import io.druid.segment.writeout.SegmentWriteOutMedium; -import io.druid.segment.writeout.WriteOutBytes; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.segment.serde.MetaSerdeHelper; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.segment.writeout.WriteOutBytes; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/segment/data/EntireLayoutColumnarDoublesSupplier.java b/processing/src/main/java/org/apache/druid/segment/data/EntireLayoutColumnarDoublesSupplier.java similarity index 97% rename from processing/src/main/java/io/druid/segment/data/EntireLayoutColumnarDoublesSupplier.java rename to processing/src/main/java/org/apache/druid/segment/data/EntireLayoutColumnarDoublesSupplier.java index 7ff6d677f36a..965a44c06454 100644 --- a/processing/src/main/java/io/druid/segment/data/EntireLayoutColumnarDoublesSupplier.java +++ b/processing/src/main/java/org/apache/druid/segment/data/EntireLayoutColumnarDoublesSupplier.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.base.Supplier; diff --git a/processing/src/main/java/io/druid/segment/data/EntireLayoutColumnarFloatsSerializer.java b/processing/src/main/java/org/apache/druid/segment/data/EntireLayoutColumnarFloatsSerializer.java similarity index 90% rename from processing/src/main/java/io/druid/segment/data/EntireLayoutColumnarFloatsSerializer.java rename to processing/src/main/java/org/apache/druid/segment/data/EntireLayoutColumnarFloatsSerializer.java index a958419d3491..745472428208 100644 --- a/processing/src/main/java/io/druid/segment/data/EntireLayoutColumnarFloatsSerializer.java +++ b/processing/src/main/java/org/apache/druid/segment/data/EntireLayoutColumnarFloatsSerializer.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.segment.writeout.WriteOutBytes; -import io.druid.segment.writeout.SegmentWriteOutMedium; -import io.druid.segment.serde.MetaSerdeHelper; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.segment.writeout.WriteOutBytes; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.segment.serde.MetaSerdeHelper; import java.io.IOException; import java.nio.ByteOrder; diff --git a/processing/src/main/java/io/druid/segment/data/EntireLayoutColumnarFloatsSupplier.java b/processing/src/main/java/org/apache/druid/segment/data/EntireLayoutColumnarFloatsSupplier.java similarity index 96% rename from processing/src/main/java/io/druid/segment/data/EntireLayoutColumnarFloatsSupplier.java rename to processing/src/main/java/org/apache/druid/segment/data/EntireLayoutColumnarFloatsSupplier.java index 72274e42d3ff..612f8b08ef56 100644 --- a/processing/src/main/java/io/druid/segment/data/EntireLayoutColumnarFloatsSupplier.java +++ b/processing/src/main/java/org/apache/druid/segment/data/EntireLayoutColumnarFloatsSupplier.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.base.Supplier; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/processing/src/main/java/io/druid/segment/data/EntireLayoutColumnarLongsSerializer.java b/processing/src/main/java/org/apache/druid/segment/data/EntireLayoutColumnarLongsSerializer.java similarity index 90% rename from processing/src/main/java/io/druid/segment/data/EntireLayoutColumnarLongsSerializer.java rename to processing/src/main/java/org/apache/druid/segment/data/EntireLayoutColumnarLongsSerializer.java index 143c33fdbda1..4a3c0126ba4d 100644 --- a/processing/src/main/java/io/druid/segment/data/EntireLayoutColumnarLongsSerializer.java +++ b/processing/src/main/java/org/apache/druid/segment/data/EntireLayoutColumnarLongsSerializer.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.segment.serde.MetaSerdeHelper; -import io.druid.segment.writeout.SegmentWriteOutMedium; -import io.druid.segment.writeout.WriteOutBytes; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.segment.serde.MetaSerdeHelper; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.segment.writeout.WriteOutBytes; import java.io.IOException; import java.nio.channels.WritableByteChannel; diff --git a/processing/src/main/java/io/druid/segment/data/EntireLayoutColumnarLongsSupplier.java b/processing/src/main/java/org/apache/druid/segment/data/EntireLayoutColumnarLongsSupplier.java similarity index 95% rename from processing/src/main/java/io/druid/segment/data/EntireLayoutColumnarLongsSupplier.java rename to processing/src/main/java/org/apache/druid/segment/data/EntireLayoutColumnarLongsSupplier.java index 7efee3a0d23a..84bb254406d9 100644 --- a/processing/src/main/java/io/druid/segment/data/EntireLayoutColumnarLongsSupplier.java +++ b/processing/src/main/java/org/apache/druid/segment/data/EntireLayoutColumnarLongsSupplier.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.base.Supplier; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; public class EntireLayoutColumnarLongsSupplier implements Supplier { diff --git a/processing/src/main/java/io/druid/segment/data/GenericIndexed.java b/processing/src/main/java/org/apache/druid/segment/data/GenericIndexed.java similarity index 96% rename from processing/src/main/java/io/druid/segment/data/GenericIndexed.java rename to processing/src/main/java/org/apache/druid/segment/data/GenericIndexed.java index 327cff758ef1..bd13ca5c36eb 100644 --- a/processing/src/main/java/io/druid/segment/data/GenericIndexed.java +++ b/processing/src/main/java/org/apache/druid/segment/data/GenericIndexed.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.primitives.Ints; -import io.druid.collections.ResourceHolder; -import io.druid.common.config.NullHandling; -import io.druid.common.utils.SerializerUtils; -import io.druid.io.Channels; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.guava.CloseQuietly; -import io.druid.java.util.common.guava.Comparators; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.java.util.common.io.smoosh.SmooshedFileMapper; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.serde.MetaSerdeHelper; -import io.druid.segment.serde.Serializer; -import io.druid.segment.writeout.HeapByteBufferWriteOutBytes; +import org.apache.druid.collections.ResourceHolder; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.common.utils.SerializerUtils; +import org.apache.druid.io.Channels; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.guava.CloseQuietly; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.java.util.common.io.smoosh.SmooshedFileMapper; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.serde.MetaSerdeHelper; +import org.apache.druid.segment.serde.Serializer; +import org.apache.druid.segment.writeout.HeapByteBufferWriteOutBytes; import javax.annotation.Nullable; import java.io.Closeable; diff --git a/processing/src/main/java/io/druid/segment/data/GenericIndexedWriter.java b/processing/src/main/java/org/apache/druid/segment/data/GenericIndexedWriter.java similarity index 96% rename from processing/src/main/java/io/druid/segment/data/GenericIndexedWriter.java rename to processing/src/main/java/org/apache/druid/segment/data/GenericIndexedWriter.java index 85f6c2eab14f..4b3d0ea76690 100644 --- a/processing/src/main/java/io/druid/segment/data/GenericIndexedWriter.java +++ b/processing/src/main/java/org/apache/druid/segment/data/GenericIndexedWriter.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.base.Preconditions; import com.google.common.primitives.Ints; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.java.util.common.io.smoosh.SmooshedWriter; -import io.druid.segment.serde.MetaSerdeHelper; -import io.druid.segment.serde.Serializer; -import io.druid.segment.writeout.SegmentWriteOutMedium; -import io.druid.segment.writeout.WriteOutBytes; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.java.util.common.io.smoosh.SmooshedWriter; +import org.apache.druid.segment.serde.MetaSerdeHelper; +import org.apache.druid.segment.serde.Serializer; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.segment.writeout.WriteOutBytes; import it.unimi.dsi.fastutil.longs.LongArrayList; import it.unimi.dsi.fastutil.longs.LongList; diff --git a/processing/src/main/java/io/druid/segment/data/ImmutableBitmapValues.java b/processing/src/main/java/org/apache/druid/segment/data/ImmutableBitmapValues.java similarity index 89% rename from processing/src/main/java/io/druid/segment/data/ImmutableBitmapValues.java rename to processing/src/main/java/org/apache/druid/segment/data/ImmutableBitmapValues.java index bf3de7448a20..ccfa765fb148 100644 --- a/processing/src/main/java/io/druid/segment/data/ImmutableBitmapValues.java +++ b/processing/src/main/java/org/apache/druid/segment/data/ImmutableBitmapValues.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.segment.IntIteratorUtils; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.segment.IntIteratorUtils; import it.unimi.dsi.fastutil.ints.IntIterator; /** diff --git a/processing/src/main/java/io/druid/segment/data/ImmutableRTreeObjectStrategy.java b/processing/src/main/java/org/apache/druid/segment/data/ImmutableRTreeObjectStrategy.java similarity index 91% rename from processing/src/main/java/io/druid/segment/data/ImmutableRTreeObjectStrategy.java rename to processing/src/main/java/org/apache/druid/segment/data/ImmutableRTreeObjectStrategy.java index 95c986318032..bf26e4d06039 100644 --- a/processing/src/main/java/io/druid/segment/data/ImmutableRTreeObjectStrategy.java +++ b/processing/src/main/java/org/apache/druid/segment/data/ImmutableRTreeObjectStrategy.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.collect.Ordering; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.spatial.ImmutableRTree; -import io.druid.segment.writeout.WriteOutBytes; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.spatial.ImmutableRTree; +import org.apache.druid.segment.writeout.WriteOutBytes; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/segment/data/Indexed.java b/processing/src/main/java/org/apache/druid/segment/data/Indexed.java similarity index 85% rename from processing/src/main/java/io/druid/segment/data/Indexed.java rename to processing/src/main/java/org/apache/druid/segment/data/Indexed.java index 5b228a135d4a..e1c2b0ad6e9f 100644 --- a/processing/src/main/java/io/druid/segment/data/Indexed.java +++ b/processing/src/main/java/org/apache/druid/segment/data/Indexed.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.guice.annotations.PublicApi; -import io.druid.query.monomorphicprocessing.CalledFromHotLoop; -import io.druid.query.monomorphicprocessing.HotLoopCallee; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.query.monomorphicprocessing.CalledFromHotLoop; +import org.apache.druid.query.monomorphicprocessing.HotLoopCallee; @PublicApi public interface Indexed extends Iterable, HotLoopCallee diff --git a/processing/src/main/java/io/druid/segment/data/IndexedInts.java b/processing/src/main/java/org/apache/druid/segment/data/IndexedInts.java similarity index 88% rename from processing/src/main/java/io/druid/segment/data/IndexedInts.java rename to processing/src/main/java/org/apache/druid/segment/data/IndexedInts.java index 69fc5e0c96f8..b075f633371f 100644 --- a/processing/src/main/java/io/druid/segment/data/IndexedInts.java +++ b/processing/src/main/java/org/apache/druid/segment/data/IndexedInts.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.guice.annotations.PublicApi; -import io.druid.query.monomorphicprocessing.CalledFromHotLoop; -import io.druid.query.monomorphicprocessing.HotLoopCallee; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.query.monomorphicprocessing.CalledFromHotLoop; +import org.apache.druid.query.monomorphicprocessing.HotLoopCallee; import java.util.function.IntConsumer; diff --git a/processing/src/main/java/io/druid/segment/data/IndexedIterable.java b/processing/src/main/java/org/apache/druid/segment/data/IndexedIterable.java similarity index 97% rename from processing/src/main/java/io/druid/segment/data/IndexedIterable.java rename to processing/src/main/java/org/apache/druid/segment/data/IndexedIterable.java index 785feb01c549..2fe15f2880cb 100644 --- a/processing/src/main/java/io/druid/segment/data/IndexedIterable.java +++ b/processing/src/main/java/org/apache/druid/segment/data/IndexedIterable.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/processing/src/main/java/io/druid/segment/data/IntermediateColumnarLongsSerializer.java b/processing/src/main/java/org/apache/druid/segment/data/IntermediateColumnarLongsSerializer.java similarity index 96% rename from processing/src/main/java/io/druid/segment/data/IntermediateColumnarLongsSerializer.java rename to processing/src/main/java/org/apache/druid/segment/data/IntermediateColumnarLongsSerializer.java index 7e70f12cfea5..97b81bc36327 100644 --- a/processing/src/main/java/io/druid/segment/data/IntermediateColumnarLongsSerializer.java +++ b/processing/src/main/java/org/apache/druid/segment/data/IntermediateColumnarLongsSerializer.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.math.LongMath; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; import it.unimi.dsi.fastutil.longs.Long2IntMap; import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap; import it.unimi.dsi.fastutil.longs.LongArrayList; diff --git a/processing/src/main/java/io/druid/segment/data/ListIndexed.java b/processing/src/main/java/org/apache/druid/segment/data/ListIndexed.java similarity index 93% rename from processing/src/main/java/io/druid/segment/data/ListIndexed.java rename to processing/src/main/java/org/apache/druid/segment/data/ListIndexed.java index 3da19f8dfd7a..6443f3f0b3d9 100644 --- a/processing/src/main/java/io/druid/segment/data/ListIndexed.java +++ b/processing/src/main/java/org/apache/druid/segment/data/ListIndexed.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; import java.util.Iterator; import java.util.List; diff --git a/processing/src/main/java/io/druid/segment/data/LongsLongEncodingReader.java b/processing/src/main/java/org/apache/druid/segment/data/LongsLongEncodingReader.java similarity index 97% rename from processing/src/main/java/io/druid/segment/data/LongsLongEncodingReader.java rename to processing/src/main/java/org/apache/druid/segment/data/LongsLongEncodingReader.java index 062c467566f4..316cf78cc4c6 100644 --- a/processing/src/main/java/io/druid/segment/data/LongsLongEncodingReader.java +++ b/processing/src/main/java/org/apache/druid/segment/data/LongsLongEncodingReader.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/processing/src/main/java/io/druid/segment/data/LongsLongEncodingWriter.java b/processing/src/main/java/org/apache/druid/segment/data/LongsLongEncodingWriter.java similarity index 96% rename from processing/src/main/java/io/druid/segment/data/LongsLongEncodingWriter.java rename to processing/src/main/java/org/apache/druid/segment/data/LongsLongEncodingWriter.java index 3e57a2f0fd6f..b421105f91f7 100644 --- a/processing/src/main/java/io/druid/segment/data/LongsLongEncodingWriter.java +++ b/processing/src/main/java/org/apache/druid/segment/data/LongsLongEncodingWriter.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.segment.writeout.WriteOutBytes; +import org.apache.druid.segment.writeout.WriteOutBytes; import java.io.IOException; import java.io.OutputStream; diff --git a/processing/src/main/java/io/druid/segment/data/ObjectStrategy.java b/processing/src/main/java/org/apache/druid/segment/data/ObjectStrategy.java similarity index 94% rename from processing/src/main/java/io/druid/segment/data/ObjectStrategy.java rename to processing/src/main/java/org/apache/druid/segment/data/ObjectStrategy.java index d53504a5e4ac..36387292a66d 100644 --- a/processing/src/main/java/io/druid/segment/data/ObjectStrategy.java +++ b/processing/src/main/java/org/apache/druid/segment/data/ObjectStrategy.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.guice.annotations.ExtensionPoint; -import io.druid.segment.writeout.WriteOutBytes; +import org.apache.druid.guice.annotations.ExtensionPoint; +import org.apache.druid.segment.writeout.WriteOutBytes; import javax.annotation.Nullable; import java.io.IOException; diff --git a/processing/src/main/java/io/druid/segment/data/Offset.java b/processing/src/main/java/org/apache/druid/segment/data/Offset.java similarity index 78% rename from processing/src/main/java/io/druid/segment/data/Offset.java rename to processing/src/main/java/org/apache/druid/segment/data/Offset.java index 01100349a049..ea0c5e046e22 100644 --- a/processing/src/main/java/io/druid/segment/data/Offset.java +++ b/processing/src/main/java/org/apache/druid/segment/data/Offset.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.annotations.SubclassesMustBePublic; -import io.druid.query.monomorphicprocessing.CalledFromHotLoop; +import org.apache.druid.annotations.SubclassesMustBePublic; +import org.apache.druid.query.monomorphicprocessing.CalledFromHotLoop; /** * The "mutable" version of a ReadableOffset. Introduces "increment()" and "withinBounds()" methods, which are @@ -30,13 +30,13 @@ * from a single thread. * * Annotated with {@link SubclassesMustBePublic} because Offset occurrences are replaced with a subclass in {@link - * io.druid.query.topn.Historical1SimpleDoubleAggPooledTopNScannerPrototype} and {@link - * io.druid.query.topn.HistoricalSingleValueDimSelector1SimpleDoubleAggPooledTopNScannerPrototype} during + * org.apache.druid.query.topn.Historical1SimpleDoubleAggPooledTopNScannerPrototype} and {@link + * org.apache.druid.query.topn.HistoricalSingleValueDimSelector1SimpleDoubleAggPooledTopNScannerPrototype} during * specialization, and specialized version of those prototypes must be able to any subclass of Offset. * - * This interface is the core "pointer" interface that is used to create {@link io.druid.segment.ColumnValueSelector}s + * This interface is the core "pointer" interface that is used to create {@link org.apache.druid.segment.ColumnValueSelector}s * over historical segments. It's counterpart for incremental index is {@link - * io.druid.segment.incremental.IncrementalIndexRowHolder}. + * org.apache.druid.segment.incremental.IncrementalIndexRowHolder}. */ @SubclassesMustBePublic public abstract class Offset implements ReadableOffset, Cloneable @@ -55,7 +55,7 @@ public abstract class Offset implements ReadableOffset, Cloneable /** * Returns the same offset ("this") or a readable "view" of this offset, which always returns the same value from * {@link #getOffset()}, as this offset. This method is useful for "unwrapping" such offsets as {@link - * io.druid.segment.FilteredOffset} and reduce reference indirection, when only {@link ReadableOffset} API is needed. + * org.apache.druid.segment.FilteredOffset} and reduce reference indirection, when only {@link ReadableOffset} API is needed. */ public abstract ReadableOffset getBaseReadableOffset(); diff --git a/processing/src/main/java/io/druid/segment/data/RangeIndexedInts.java b/processing/src/main/java/org/apache/druid/segment/data/RangeIndexedInts.java similarity index 90% rename from processing/src/main/java/io/druid/segment/data/RangeIndexedInts.java rename to processing/src/main/java/org/apache/druid/segment/data/RangeIndexedInts.java index 7cad9ce630f9..aec7d071fa6d 100644 --- a/processing/src/main/java/io/druid/segment/data/RangeIndexedInts.java +++ b/processing/src/main/java/org/apache/druid/segment/data/RangeIndexedInts.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.java.util.common.IAE; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; /** * Reusable IndexedInts that returns sequences [0, 1, ..., N]. diff --git a/processing/src/main/java/io/druid/segment/data/ReadableOffset.java b/processing/src/main/java/org/apache/druid/segment/data/ReadableOffset.java similarity index 87% rename from processing/src/main/java/io/druid/segment/data/ReadableOffset.java rename to processing/src/main/java/org/apache/druid/segment/data/ReadableOffset.java index c69ba7d8dbcb..e116aebb66f6 100644 --- a/processing/src/main/java/io/druid/segment/data/ReadableOffset.java +++ b/processing/src/main/java/org/apache/druid/segment/data/ReadableOffset.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.query.monomorphicprocessing.CalledFromHotLoop; -import io.druid.query.monomorphicprocessing.HotLoopCallee; +import org.apache.druid.query.monomorphicprocessing.CalledFromHotLoop; +import org.apache.druid.query.monomorphicprocessing.HotLoopCallee; /** * A ReadableOffset is an object that provides an integer offset, ostensibly as an index into an array. diff --git a/processing/src/main/java/io/druid/segment/data/RoaringBitmapSerdeFactory.java b/processing/src/main/java/org/apache/druid/segment/data/RoaringBitmapSerdeFactory.java similarity index 91% rename from processing/src/main/java/io/druid/segment/data/RoaringBitmapSerdeFactory.java rename to processing/src/main/java/org/apache/druid/segment/data/RoaringBitmapSerdeFactory.java index 448af370add9..09c007c0aeda 100644 --- a/processing/src/main/java/io/druid/segment/data/RoaringBitmapSerdeFactory.java +++ b/processing/src/main/java/org/apache/druid/segment/data/RoaringBitmapSerdeFactory.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.collections.bitmap.RoaringBitmapFactory; -import io.druid.collections.bitmap.WrappedImmutableRoaringBitmap; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.collections.bitmap.RoaringBitmapFactory; +import org.apache.druid.collections.bitmap.WrappedImmutableRoaringBitmap; import org.roaringbitmap.buffer.ImmutableRoaringBitmap; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/segment/data/SingleIndexedInt.java b/processing/src/main/java/org/apache/druid/segment/data/SingleIndexedInt.java similarity index 89% rename from processing/src/main/java/io/druid/segment/data/SingleIndexedInt.java rename to processing/src/main/java/org/apache/druid/segment/data/SingleIndexedInt.java index 80e2ff904c08..80721ac5e906 100644 --- a/processing/src/main/java/io/druid/segment/data/SingleIndexedInt.java +++ b/processing/src/main/java/org/apache/druid/segment/data/SingleIndexedInt.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.java.util.common.IAE; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; /** * Reusable IndexedInts that represents a sequence of a solo value [X]. diff --git a/processing/src/main/java/io/druid/segment/data/SingleValueColumnarIntsSerializer.java b/processing/src/main/java/org/apache/druid/segment/data/SingleValueColumnarIntsSerializer.java similarity index 96% rename from processing/src/main/java/io/druid/segment/data/SingleValueColumnarIntsSerializer.java rename to processing/src/main/java/org/apache/druid/segment/data/SingleValueColumnarIntsSerializer.java index 5c2ba12000fa..5f4fad508148 100644 --- a/processing/src/main/java/io/druid/segment/data/SingleValueColumnarIntsSerializer.java +++ b/processing/src/main/java/org/apache/druid/segment/data/SingleValueColumnarIntsSerializer.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import java.io.IOException; diff --git a/processing/src/main/java/io/druid/segment/data/SliceIndexedInts.java b/processing/src/main/java/org/apache/druid/segment/data/SliceIndexedInts.java similarity index 91% rename from processing/src/main/java/io/druid/segment/data/SliceIndexedInts.java rename to processing/src/main/java/org/apache/druid/segment/data/SliceIndexedInts.java index 575e711aeeae..0ec87d38a159 100644 --- a/processing/src/main/java/io/druid/segment/data/SliceIndexedInts.java +++ b/processing/src/main/java/org/apache/druid/segment/data/SliceIndexedInts.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.java.util.common.IAE; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; /** * Reusable IndexedInts, that could represent a sub-sequence ("slice") in a larger IndexedInts object. Used in diff --git a/processing/src/main/java/io/druid/segment/data/TableLongEncodingReader.java b/processing/src/main/java/org/apache/druid/segment/data/TableLongEncodingReader.java similarity index 96% rename from processing/src/main/java/io/druid/segment/data/TableLongEncodingReader.java rename to processing/src/main/java/org/apache/druid/segment/data/TableLongEncodingReader.java index 202536288806..738de6fcc6aa 100644 --- a/processing/src/main/java/io/druid/segment/data/TableLongEncodingReader.java +++ b/processing/src/main/java/org/apache/druid/segment/data/TableLongEncodingReader.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.IAE; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/segment/data/TableLongEncodingWriter.java b/processing/src/main/java/org/apache/druid/segment/data/TableLongEncodingWriter.java similarity index 95% rename from processing/src/main/java/io/druid/segment/data/TableLongEncodingWriter.java rename to processing/src/main/java/org/apache/druid/segment/data/TableLongEncodingWriter.java index 633492801ab4..456b290332f0 100644 --- a/processing/src/main/java/io/druid/segment/data/TableLongEncodingWriter.java +++ b/processing/src/main/java/org/apache/druid/segment/data/TableLongEncodingWriter.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.java.util.common.IAE; -import io.druid.segment.writeout.WriteOutBytes; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.segment.writeout.WriteOutBytes; import it.unimi.dsi.fastutil.longs.Long2IntMap; import it.unimi.dsi.fastutil.longs.LongList; diff --git a/processing/src/main/java/io/druid/segment/data/V3CompressedVSizeColumnarMultiIntsSerializer.java b/processing/src/main/java/org/apache/druid/segment/data/V3CompressedVSizeColumnarMultiIntsSerializer.java similarity index 93% rename from processing/src/main/java/io/druid/segment/data/V3CompressedVSizeColumnarMultiIntsSerializer.java rename to processing/src/main/java/org/apache/druid/segment/data/V3CompressedVSizeColumnarMultiIntsSerializer.java index f1327521e57b..ebf0c4b44cfe 100644 --- a/processing/src/main/java/io/druid/segment/data/V3CompressedVSizeColumnarMultiIntsSerializer.java +++ b/processing/src/main/java/org/apache/druid/segment/data/V3CompressedVSizeColumnarMultiIntsSerializer.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.io.Channels; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.segment.IndexIO; -import io.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.io.Channels; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/segment/data/V3CompressedVSizeColumnarMultiIntsSupplier.java b/processing/src/main/java/org/apache/druid/segment/data/V3CompressedVSizeColumnarMultiIntsSupplier.java similarity index 95% rename from processing/src/main/java/io/druid/segment/data/V3CompressedVSizeColumnarMultiIntsSupplier.java rename to processing/src/main/java/org/apache/druid/segment/data/V3CompressedVSizeColumnarMultiIntsSupplier.java index de5aa68a91d2..b69d320cca13 100644 --- a/processing/src/main/java/io/druid/segment/data/V3CompressedVSizeColumnarMultiIntsSupplier.java +++ b/processing/src/main/java/org/apache/druid/segment/data/V3CompressedVSizeColumnarMultiIntsSupplier.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.annotations.VisibleForTesting; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; import it.unimi.dsi.fastutil.ints.IntArrayList; import java.io.IOException; diff --git a/processing/src/main/java/io/druid/segment/data/VSizeColumnarInts.java b/processing/src/main/java/org/apache/druid/segment/data/VSizeColumnarInts.java similarity index 92% rename from processing/src/main/java/io/druid/segment/data/VSizeColumnarInts.java rename to processing/src/main/java/org/apache/druid/segment/data/VSizeColumnarInts.java index 5840fddbd1f8..d949e3c62e7e 100644 --- a/processing/src/main/java/io/druid/segment/data/VSizeColumnarInts.java +++ b/processing/src/main/java/org/apache/druid/segment/data/VSizeColumnarInts.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.primitives.Ints; -import io.druid.common.utils.ByteUtils; -import io.druid.io.Channels; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.serde.MetaSerdeHelper; -import io.druid.segment.writeout.HeapByteBufferWriteOutBytes; +import org.apache.druid.common.utils.ByteUtils; +import org.apache.druid.io.Channels; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.serde.MetaSerdeHelper; +import org.apache.druid.segment.writeout.HeapByteBufferWriteOutBytes; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/segment/data/VSizeColumnarIntsSerializer.java b/processing/src/main/java/org/apache/druid/segment/data/VSizeColumnarIntsSerializer.java similarity index 90% rename from processing/src/main/java/io/druid/segment/data/VSizeColumnarIntsSerializer.java rename to processing/src/main/java/org/apache/druid/segment/data/VSizeColumnarIntsSerializer.java index 59a896c4aef3..90d4c2033ccc 100644 --- a/processing/src/main/java/io/druid/segment/data/VSizeColumnarIntsSerializer.java +++ b/processing/src/main/java/org/apache/druid/segment/data/VSizeColumnarIntsSerializer.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.primitives.Ints; -import io.druid.common.utils.ByteUtils; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.segment.serde.MetaSerdeHelper; -import io.druid.segment.writeout.SegmentWriteOutMedium; -import io.druid.segment.writeout.WriteOutBytes; +import org.apache.druid.common.utils.ByteUtils; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.segment.serde.MetaSerdeHelper; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.segment.writeout.WriteOutBytes; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/segment/data/VSizeColumnarMultiInts.java b/processing/src/main/java/org/apache/druid/segment/data/VSizeColumnarMultiInts.java similarity index 92% rename from processing/src/main/java/io/druid/segment/data/VSizeColumnarMultiInts.java rename to processing/src/main/java/org/apache/druid/segment/data/VSizeColumnarMultiInts.java index 87c52637fc1c..f278bbb5f9cf 100644 --- a/processing/src/main/java/io/druid/segment/data/VSizeColumnarMultiInts.java +++ b/processing/src/main/java/org/apache/druid/segment/data/VSizeColumnarMultiInts.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.primitives.Ints; -import io.druid.common.utils.ByteUtils; -import io.druid.io.Channels; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.serde.MetaSerdeHelper; -import io.druid.segment.writeout.HeapByteBufferWriteOutBytes; +import org.apache.druid.common.utils.ByteUtils; +import org.apache.druid.io.Channels; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.serde.MetaSerdeHelper; +import org.apache.druid.segment.writeout.HeapByteBufferWriteOutBytes; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/segment/data/VSizeColumnarMultiIntsSerializer.java b/processing/src/main/java/org/apache/druid/segment/data/VSizeColumnarMultiIntsSerializer.java similarity index 94% rename from processing/src/main/java/io/druid/segment/data/VSizeColumnarMultiIntsSerializer.java rename to processing/src/main/java/org/apache/druid/segment/data/VSizeColumnarMultiIntsSerializer.java index f572fb7665c0..d183d357437d 100644 --- a/processing/src/main/java/io/druid/segment/data/VSizeColumnarMultiIntsSerializer.java +++ b/processing/src/main/java/org/apache/druid/segment/data/VSizeColumnarMultiIntsSerializer.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.base.Preconditions; import com.google.common.primitives.Ints; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.segment.serde.MetaSerdeHelper; -import io.druid.segment.writeout.SegmentWriteOutMedium; -import io.druid.segment.writeout.WriteOutBytes; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.segment.serde.MetaSerdeHelper; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.segment.writeout.WriteOutBytes; import java.io.IOException; import java.nio.channels.WritableByteChannel; diff --git a/processing/src/main/java/io/druid/segment/data/VSizeLongSerde.java b/processing/src/main/java/org/apache/druid/segment/data/VSizeLongSerde.java similarity index 99% rename from processing/src/main/java/io/druid/segment/data/VSizeLongSerde.java rename to processing/src/main/java/org/apache/druid/segment/data/VSizeLongSerde.java index 4f7abe1d0308..3bfa68ac281e 100644 --- a/processing/src/main/java/io/druid/segment/data/VSizeLongSerde.java +++ b/processing/src/main/java/org/apache/druid/segment/data/VSizeLongSerde.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.IAE; import java.io.Closeable; import java.io.IOException; diff --git a/processing/src/main/java/io/druid/segment/data/WritableSupplier.java b/processing/src/main/java/org/apache/druid/segment/data/WritableSupplier.java similarity index 91% rename from processing/src/main/java/io/druid/segment/data/WritableSupplier.java rename to processing/src/main/java/org/apache/druid/segment/data/WritableSupplier.java index 3460fb88ea1e..ead134b51fc7 100644 --- a/processing/src/main/java/io/druid/segment/data/WritableSupplier.java +++ b/processing/src/main/java/org/apache/druid/segment/data/WritableSupplier.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.base.Supplier; -import io.druid.segment.serde.Serializer; +import org.apache.druid.segment.serde.Serializer; public interface WritableSupplier extends Supplier, Serializer { diff --git a/processing/src/main/java/io/druid/segment/data/ZeroIndexedInts.java b/processing/src/main/java/org/apache/druid/segment/data/ZeroIndexedInts.java similarity index 92% rename from processing/src/main/java/io/druid/segment/data/ZeroIndexedInts.java rename to processing/src/main/java/org/apache/druid/segment/data/ZeroIndexedInts.java index 2c0e41b2e4dd..0004311fa544 100644 --- a/processing/src/main/java/io/druid/segment/data/ZeroIndexedInts.java +++ b/processing/src/main/java/org/apache/druid/segment/data/ZeroIndexedInts.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; /** * An IndexedInts that always returns a row containing a single zero. diff --git a/processing/src/main/java/io/druid/segment/filter/AndFilter.java b/processing/src/main/java/org/apache/druid/segment/filter/AndFilter.java similarity index 90% rename from processing/src/main/java/io/druid/segment/filter/AndFilter.java rename to processing/src/main/java/org/apache/druid/segment/filter/AndFilter.java index 9bb6e13e3743..1fef033dbf5d 100644 --- a/processing/src/main/java/io/druid/segment/filter/AndFilter.java +++ b/processing/src/main/java/org/apache/druid/segment/filter/AndFilter.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.java.util.common.StringUtils; -import io.druid.query.BitmapResultFactory; -import io.druid.query.filter.BitmapIndexSelector; -import io.druid.query.filter.BooleanFilter; -import io.druid.query.filter.Filter; -import io.druid.query.filter.RowOffsetMatcherFactory; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnSelector; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.BitmapResultFactory; +import org.apache.druid.query.filter.BitmapIndexSelector; +import org.apache.druid.query.filter.BooleanFilter; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.query.filter.RowOffsetMatcherFactory; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnSelector; +import org.apache.druid.segment.ColumnSelectorFactory; import java.util.ArrayList; import java.util.List; diff --git a/processing/src/main/java/io/druid/segment/filter/BooleanValueMatcher.java b/processing/src/main/java/org/apache/druid/segment/filter/BooleanValueMatcher.java similarity index 91% rename from processing/src/main/java/io/druid/segment/filter/BooleanValueMatcher.java rename to processing/src/main/java/org/apache/druid/segment/filter/BooleanValueMatcher.java index ca871fe6c9b3..1a65aef74c80 100644 --- a/processing/src/main/java/io/druid/segment/filter/BooleanValueMatcher.java +++ b/processing/src/main/java/org/apache/druid/segment/filter/BooleanValueMatcher.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; -import io.druid.query.filter.ValueMatcher; +import org.apache.druid.query.filter.ValueMatcher; /** */ diff --git a/processing/src/main/java/io/druid/segment/filter/BoundFilter.java b/processing/src/main/java/org/apache/druid/segment/filter/BoundFilter.java similarity index 89% rename from processing/src/main/java/io/druid/segment/filter/BoundFilter.java rename to processing/src/main/java/org/apache/druid/segment/filter/BoundFilter.java index eeb484e9edf1..840407e21cb2 100644 --- a/processing/src/main/java/io/druid/segment/filter/BoundFilter.java +++ b/processing/src/main/java/org/apache/druid/segment/filter/BoundFilter.java @@ -17,28 +17,28 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.base.Predicate; import com.google.common.base.Supplier; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.Pair; -import io.druid.query.BitmapResultFactory; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.filter.BitmapIndexSelector; -import io.druid.query.filter.BoundDimFilter; -import io.druid.query.filter.DruidDoublePredicate; -import io.druid.query.filter.DruidFloatPredicate; -import io.druid.query.filter.DruidLongPredicate; -import io.druid.query.filter.DruidPredicateFactory; -import io.druid.query.filter.Filter; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.ordering.StringComparators; -import io.druid.segment.ColumnSelector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.IntListUtils; -import io.druid.segment.column.BitmapIndex; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.query.BitmapResultFactory; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.filter.BitmapIndexSelector; +import org.apache.druid.query.filter.BoundDimFilter; +import org.apache.druid.query.filter.DruidDoublePredicate; +import org.apache.druid.query.filter.DruidFloatPredicate; +import org.apache.druid.query.filter.DruidLongPredicate; +import org.apache.druid.query.filter.DruidPredicateFactory; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.segment.ColumnSelector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.IntListUtils; +import org.apache.druid.segment.column.BitmapIndex; import it.unimi.dsi.fastutil.ints.IntList; import java.util.Comparator; diff --git a/processing/src/main/java/io/druid/segment/filter/ColumnComparisonFilter.java b/processing/src/main/java/org/apache/druid/segment/filter/ColumnComparisonFilter.java similarity index 83% rename from processing/src/main/java/io/druid/segment/filter/ColumnComparisonFilter.java rename to processing/src/main/java/org/apache/druid/segment/filter/ColumnComparisonFilter.java index 024f39e38c99..6e6da583980a 100644 --- a/processing/src/main/java/io/druid/segment/filter/ColumnComparisonFilter.java +++ b/processing/src/main/java/org/apache/druid/segment/filter/ColumnComparisonFilter.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.base.Preconditions; -import io.druid.query.BitmapResultFactory; -import io.druid.query.ColumnSelectorPlus; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.filter.BitmapIndexSelector; -import io.druid.query.filter.Filter; -import io.druid.query.filter.ValueGetter; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.filter.ValueMatcherColumnSelectorStrategy; -import io.druid.query.filter.ValueMatcherColumnSelectorStrategyFactory; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnSelector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.DimensionHandlerUtils; +import org.apache.druid.query.BitmapResultFactory; +import org.apache.druid.query.ColumnSelectorPlus; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.filter.BitmapIndexSelector; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.query.filter.ValueGetter; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.filter.ValueMatcherColumnSelectorStrategy; +import org.apache.druid.query.filter.ValueMatcherColumnSelectorStrategyFactory; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnSelector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.DimensionHandlerUtils; import javax.annotation.Nullable; import java.util.List; diff --git a/processing/src/main/java/io/druid/segment/filter/DimensionPredicateFilter.java b/processing/src/main/java/org/apache/druid/segment/filter/DimensionPredicateFilter.java similarity index 84% rename from processing/src/main/java/io/druid/segment/filter/DimensionPredicateFilter.java rename to processing/src/main/java/org/apache/druid/segment/filter/DimensionPredicateFilter.java index 47b2b847d64d..63d0c418c472 100644 --- a/processing/src/main/java/io/druid/segment/filter/DimensionPredicateFilter.java +++ b/processing/src/main/java/org/apache/druid/segment/filter/DimensionPredicateFilter.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; -import io.druid.java.util.common.StringUtils; -import io.druid.query.BitmapResultFactory; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.filter.BitmapIndexSelector; -import io.druid.query.filter.DruidDoublePredicate; -import io.druid.query.filter.DruidFloatPredicate; -import io.druid.query.filter.DruidLongPredicate; -import io.druid.query.filter.DruidPredicateFactory; -import io.druid.query.filter.Filter; -import io.druid.query.filter.ValueMatcher; -import io.druid.segment.ColumnSelector; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.BitmapResultFactory; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.filter.BitmapIndexSelector; +import org.apache.druid.query.filter.DruidDoublePredicate; +import org.apache.druid.query.filter.DruidFloatPredicate; +import org.apache.druid.query.filter.DruidLongPredicate; +import org.apache.druid.query.filter.DruidPredicateFactory; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.segment.ColumnSelector; +import org.apache.druid.segment.ColumnSelectorFactory; /** */ diff --git a/processing/src/main/java/io/druid/segment/filter/ExpressionFilter.java b/processing/src/main/java/org/apache/druid/segment/filter/ExpressionFilter.java similarity index 83% rename from processing/src/main/java/io/druid/segment/filter/ExpressionFilter.java rename to processing/src/main/java/org/apache/druid/segment/filter/ExpressionFilter.java index 8f52d9b86b19..208ea4d87895 100644 --- a/processing/src/main/java/io/druid/segment/filter/ExpressionFilter.java +++ b/processing/src/main/java/org/apache/druid/segment/filter/ExpressionFilter.java @@ -17,25 +17,25 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; -import io.druid.common.config.NullHandling; -import io.druid.math.expr.Evals; -import io.druid.math.expr.Expr; -import io.druid.math.expr.ExprEval; -import io.druid.math.expr.Parser; -import io.druid.query.BitmapResultFactory; -import io.druid.query.expression.ExprUtils; -import io.druid.query.filter.BitmapIndexSelector; -import io.druid.query.filter.Filter; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnSelector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.virtual.ExpressionSelectors; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.math.expr.Evals; +import org.apache.druid.math.expr.Expr; +import org.apache.druid.math.expr.ExprEval; +import org.apache.druid.math.expr.Parser; +import org.apache.druid.query.BitmapResultFactory; +import org.apache.druid.query.expression.ExprUtils; +import org.apache.druid.query.filter.BitmapIndexSelector; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnSelector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.virtual.ExpressionSelectors; import java.util.Set; diff --git a/processing/src/main/java/io/druid/segment/filter/FalseValueMatcher.java b/processing/src/main/java/org/apache/druid/segment/filter/FalseValueMatcher.java similarity index 88% rename from processing/src/main/java/io/druid/segment/filter/FalseValueMatcher.java rename to processing/src/main/java/org/apache/druid/segment/filter/FalseValueMatcher.java index be6b29af28a5..97d12562b2ea 100644 --- a/processing/src/main/java/io/druid/segment/filter/FalseValueMatcher.java +++ b/processing/src/main/java/org/apache/druid/segment/filter/FalseValueMatcher.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; final class FalseValueMatcher implements ValueMatcher { diff --git a/processing/src/main/java/io/druid/segment/filter/Filters.java b/processing/src/main/java/org/apache/druid/segment/filter/Filters.java similarity index 93% rename from processing/src/main/java/io/druid/segment/filter/Filters.java rename to processing/src/main/java/org/apache/druid/segment/filter/Filters.java index 66557dbb3220..6f56f199b2f5 100644 --- a/processing/src/main/java/io/druid/segment/filter/Filters.java +++ b/processing/src/main/java/org/apache/druid/segment/filter/Filters.java @@ -17,39 +17,39 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.java.util.common.guava.FunctionalIterable; -import io.druid.query.BitmapResultFactory; -import io.druid.query.ColumnSelectorPlus; -import io.druid.query.Query; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.filter.BitmapIndexSelector; -import io.druid.query.filter.BooleanFilter; -import io.druid.query.filter.DimFilter; -import io.druid.query.filter.DruidLongPredicate; -import io.druid.query.filter.DruidPredicateFactory; -import io.druid.query.filter.Filter; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.filter.ValueMatcherColumnSelectorStrategy; -import io.druid.query.filter.ValueMatcherColumnSelectorStrategyFactory; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseLongColumnValueSelector; -import io.druid.segment.ColumnSelector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.DimensionHandlerUtils; -import io.druid.segment.IntIteratorUtils; -import io.druid.segment.column.BitmapIndex; -import io.druid.segment.column.Column; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.column.ValueType; -import io.druid.segment.data.Indexed; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.java.util.common.guava.FunctionalIterable; +import org.apache.druid.query.BitmapResultFactory; +import org.apache.druid.query.ColumnSelectorPlus; +import org.apache.druid.query.Query; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.filter.BitmapIndexSelector; +import org.apache.druid.query.filter.BooleanFilter; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.filter.DruidLongPredicate; +import org.apache.druid.query.filter.DruidPredicateFactory; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.filter.ValueMatcherColumnSelectorStrategy; +import org.apache.druid.query.filter.ValueMatcherColumnSelectorStrategyFactory; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.segment.ColumnSelector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.DimensionHandlerUtils; +import org.apache.druid.segment.IntIteratorUtils; +import org.apache.druid.segment.column.BitmapIndex; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.data.Indexed; import it.unimi.dsi.fastutil.ints.IntIterable; import it.unimi.dsi.fastutil.ints.IntIterator; import it.unimi.dsi.fastutil.ints.IntList; diff --git a/processing/src/main/java/io/druid/segment/filter/InFilter.java b/processing/src/main/java/org/apache/druid/segment/filter/InFilter.java similarity index 87% rename from processing/src/main/java/io/druid/segment/filter/InFilter.java rename to processing/src/main/java/org/apache/druid/segment/filter/InFilter.java index 00d13e617f9b..d615848ccc80 100644 --- a/processing/src/main/java/io/druid/segment/filter/InFilter.java +++ b/processing/src/main/java/org/apache/druid/segment/filter/InFilter.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.base.Predicate; import com.google.common.base.Supplier; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.query.BitmapResultFactory; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.filter.BitmapIndexSelector; -import io.druid.query.filter.DruidDoublePredicate; -import io.druid.query.filter.DruidFloatPredicate; -import io.druid.query.filter.DruidLongPredicate; -import io.druid.query.filter.DruidPredicateFactory; -import io.druid.query.filter.Filter; -import io.druid.query.filter.ValueMatcher; -import io.druid.segment.ColumnSelector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.IntIteratorUtils; -import io.druid.segment.column.BitmapIndex; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.query.BitmapResultFactory; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.filter.BitmapIndexSelector; +import org.apache.druid.query.filter.DruidDoublePredicate; +import org.apache.druid.query.filter.DruidFloatPredicate; +import org.apache.druid.query.filter.DruidLongPredicate; +import org.apache.druid.query.filter.DruidPredicateFactory; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.segment.ColumnSelector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.IntIteratorUtils; +import org.apache.druid.segment.column.BitmapIndex; import it.unimi.dsi.fastutil.ints.IntIterable; import it.unimi.dsi.fastutil.ints.IntIterator; diff --git a/processing/src/main/java/io/druid/segment/filter/JavaScriptFilter.java b/processing/src/main/java/org/apache/druid/segment/filter/JavaScriptFilter.java similarity index 87% rename from processing/src/main/java/io/druid/segment/filter/JavaScriptFilter.java rename to processing/src/main/java/org/apache/druid/segment/filter/JavaScriptFilter.java index b02ad49b9405..9c755d9e7828 100644 --- a/processing/src/main/java/io/druid/segment/filter/JavaScriptFilter.java +++ b/processing/src/main/java/org/apache/druid/segment/filter/JavaScriptFilter.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.base.Predicate; -import io.druid.query.BitmapResultFactory; -import io.druid.query.filter.BitmapIndexSelector; -import io.druid.query.filter.Filter; -import io.druid.query.filter.JavaScriptDimFilter; -import io.druid.query.filter.ValueMatcher; -import io.druid.segment.ColumnSelector; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.query.BitmapResultFactory; +import org.apache.druid.query.filter.BitmapIndexSelector; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.query.filter.JavaScriptDimFilter; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.segment.ColumnSelector; +import org.apache.druid.segment.ColumnSelectorFactory; import org.mozilla.javascript.Context; public class JavaScriptFilter implements Filter diff --git a/processing/src/main/java/io/druid/segment/filter/LikeFilter.java b/processing/src/main/java/org/apache/druid/segment/filter/LikeFilter.java similarity index 90% rename from processing/src/main/java/io/druid/segment/filter/LikeFilter.java rename to processing/src/main/java/org/apache/druid/segment/filter/LikeFilter.java index 3de050e2d5b9..665227960edc 100644 --- a/processing/src/main/java/io/druid/segment/filter/LikeFilter.java +++ b/processing/src/main/java/org/apache/druid/segment/filter/LikeFilter.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.collect.ImmutableList; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.common.config.NullHandling; -import io.druid.query.BitmapResultFactory; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.filter.BitmapIndexSelector; -import io.druid.query.filter.Filter; -import io.druid.query.filter.LikeDimFilter; -import io.druid.query.filter.ValueMatcher; -import io.druid.segment.ColumnSelector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.column.BitmapIndex; -import io.druid.segment.data.Indexed; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.query.BitmapResultFactory; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.filter.BitmapIndexSelector; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.query.filter.LikeDimFilter; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.segment.ColumnSelector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.column.BitmapIndex; +import org.apache.druid.segment.data.Indexed; import it.unimi.dsi.fastutil.ints.IntIterable; import it.unimi.dsi.fastutil.ints.IntIterator; diff --git a/processing/src/main/java/io/druid/segment/filter/NotFilter.java b/processing/src/main/java/org/apache/druid/segment/filter/NotFilter.java similarity index 84% rename from processing/src/main/java/io/druid/segment/filter/NotFilter.java rename to processing/src/main/java/org/apache/druid/segment/filter/NotFilter.java index 71ef40e2d6da..121290409c36 100644 --- a/processing/src/main/java/io/druid/segment/filter/NotFilter.java +++ b/processing/src/main/java/org/apache/druid/segment/filter/NotFilter.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; -import io.druid.query.BitmapResultFactory; -import io.druid.query.filter.BitmapIndexSelector; -import io.druid.query.filter.Filter; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnSelector; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.query.BitmapResultFactory; +import org.apache.druid.query.filter.BitmapIndexSelector; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnSelector; +import org.apache.druid.segment.ColumnSelectorFactory; /** */ diff --git a/processing/src/main/java/io/druid/segment/filter/OrFilter.java b/processing/src/main/java/org/apache/druid/segment/filter/OrFilter.java similarity index 88% rename from processing/src/main/java/io/druid/segment/filter/OrFilter.java rename to processing/src/main/java/org/apache/druid/segment/filter/OrFilter.java index a569c419db21..43b9039bb9b8 100644 --- a/processing/src/main/java/io/druid/segment/filter/OrFilter.java +++ b/processing/src/main/java/org/apache/druid/segment/filter/OrFilter.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.java.util.common.StringUtils; -import io.druid.query.BitmapResultFactory; -import io.druid.query.filter.BitmapIndexSelector; -import io.druid.query.filter.BooleanFilter; -import io.druid.query.filter.Filter; -import io.druid.query.filter.RowOffsetMatcherFactory; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnSelector; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.BitmapResultFactory; +import org.apache.druid.query.filter.BitmapIndexSelector; +import org.apache.druid.query.filter.BooleanFilter; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.query.filter.RowOffsetMatcherFactory; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnSelector; +import org.apache.druid.segment.ColumnSelectorFactory; import java.util.ArrayList; import java.util.List; diff --git a/processing/src/main/java/io/druid/segment/filter/RegexFilter.java b/processing/src/main/java/org/apache/druid/segment/filter/RegexFilter.java similarity index 86% rename from processing/src/main/java/io/druid/segment/filter/RegexFilter.java rename to processing/src/main/java/org/apache/druid/segment/filter/RegexFilter.java index 4f868b9769de..6ebc46ca1599 100644 --- a/processing/src/main/java/io/druid/segment/filter/RegexFilter.java +++ b/processing/src/main/java/org/apache/druid/segment/filter/RegexFilter.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.base.Predicate; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.filter.DruidDoublePredicate; -import io.druid.query.filter.DruidFloatPredicate; -import io.druid.query.filter.DruidLongPredicate; -import io.druid.query.filter.DruidPredicateFactory; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.filter.DruidDoublePredicate; +import org.apache.druid.query.filter.DruidFloatPredicate; +import org.apache.druid.query.filter.DruidLongPredicate; +import org.apache.druid.query.filter.DruidPredicateFactory; import java.util.regex.Pattern; diff --git a/processing/src/main/java/io/druid/segment/filter/SearchQueryFilter.java b/processing/src/main/java/org/apache/druid/segment/filter/SearchQueryFilter.java similarity index 84% rename from processing/src/main/java/io/druid/segment/filter/SearchQueryFilter.java rename to processing/src/main/java/org/apache/druid/segment/filter/SearchQueryFilter.java index 54ea5dfe6316..9063cd7818a2 100644 --- a/processing/src/main/java/io/druid/segment/filter/SearchQueryFilter.java +++ b/processing/src/main/java/org/apache/druid/segment/filter/SearchQueryFilter.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Predicate; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.filter.DruidDoublePredicate; -import io.druid.query.filter.DruidFloatPredicate; -import io.druid.query.filter.DruidLongPredicate; -import io.druid.query.filter.DruidPredicateFactory; -import io.druid.query.search.SearchQuerySpec; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.filter.DruidDoublePredicate; +import org.apache.druid.query.filter.DruidFloatPredicate; +import org.apache.druid.query.filter.DruidLongPredicate; +import org.apache.druid.query.filter.DruidPredicateFactory; +import org.apache.druid.query.search.SearchQuerySpec; /** */ diff --git a/processing/src/main/java/io/druid/segment/filter/SelectorFilter.java b/processing/src/main/java/org/apache/druid/segment/filter/SelectorFilter.java similarity index 84% rename from processing/src/main/java/io/druid/segment/filter/SelectorFilter.java rename to processing/src/main/java/org/apache/druid/segment/filter/SelectorFilter.java index 2eda229efd76..0b9433b784aa 100644 --- a/processing/src/main/java/io/druid/segment/filter/SelectorFilter.java +++ b/processing/src/main/java/org/apache/druid/segment/filter/SelectorFilter.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; -import io.druid.java.util.common.StringUtils; -import io.druid.query.BitmapResultFactory; -import io.druid.query.filter.BitmapIndexSelector; -import io.druid.query.filter.Filter; -import io.druid.query.filter.ValueMatcher; -import io.druid.segment.ColumnSelector; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.BitmapResultFactory; +import org.apache.druid.query.filter.BitmapIndexSelector; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.segment.ColumnSelector; +import org.apache.druid.segment.ColumnSelectorFactory; /** */ diff --git a/processing/src/main/java/io/druid/segment/filter/SpatialFilter.java b/processing/src/main/java/org/apache/druid/segment/filter/SpatialFilter.java similarity index 81% rename from processing/src/main/java/io/druid/segment/filter/SpatialFilter.java rename to processing/src/main/java/org/apache/druid/segment/filter/SpatialFilter.java index 0fc899b9f470..aba0502e1e77 100644 --- a/processing/src/main/java/io/druid/segment/filter/SpatialFilter.java +++ b/processing/src/main/java/org/apache/druid/segment/filter/SpatialFilter.java @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.collections.spatial.search.Bound; -import io.druid.query.BitmapResultFactory; -import io.druid.query.filter.BitmapIndexSelector; -import io.druid.query.filter.DruidDoublePredicate; -import io.druid.query.filter.DruidFloatPredicate; -import io.druid.query.filter.DruidLongPredicate; -import io.druid.query.filter.DruidPredicateFactory; -import io.druid.query.filter.Filter; -import io.druid.query.filter.ValueMatcher; -import io.druid.segment.ColumnSelector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.incremental.SpatialDimensionRowTransformer; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.collections.spatial.search.Bound; +import org.apache.druid.query.BitmapResultFactory; +import org.apache.druid.query.filter.BitmapIndexSelector; +import org.apache.druid.query.filter.DruidDoublePredicate; +import org.apache.druid.query.filter.DruidFloatPredicate; +import org.apache.druid.query.filter.DruidLongPredicate; +import org.apache.druid.query.filter.DruidPredicateFactory; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.segment.ColumnSelector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.incremental.SpatialDimensionRowTransformer; /** */ diff --git a/processing/src/main/java/io/druid/segment/filter/TrueFilter.java b/processing/src/main/java/org/apache/druid/segment/filter/TrueFilter.java similarity index 82% rename from processing/src/main/java/io/druid/segment/filter/TrueFilter.java rename to processing/src/main/java/org/apache/druid/segment/filter/TrueFilter.java index b1f609c8ed7b..4d23612a5d2d 100644 --- a/processing/src/main/java/io/druid/segment/filter/TrueFilter.java +++ b/processing/src/main/java/org/apache/druid/segment/filter/TrueFilter.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; -import io.druid.query.BitmapResultFactory; -import io.druid.query.filter.BitmapIndexSelector; -import io.druid.query.filter.Filter; -import io.druid.query.filter.ValueMatcher; -import io.druid.segment.ColumnSelector; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.query.BitmapResultFactory; +import org.apache.druid.query.filter.BitmapIndexSelector; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.segment.ColumnSelector; +import org.apache.druid.segment.ColumnSelectorFactory; /** */ diff --git a/processing/src/main/java/io/druid/segment/filter/TrueValueMatcher.java b/processing/src/main/java/org/apache/druid/segment/filter/TrueValueMatcher.java similarity index 88% rename from processing/src/main/java/io/druid/segment/filter/TrueValueMatcher.java rename to processing/src/main/java/org/apache/druid/segment/filter/TrueValueMatcher.java index 4edd85cde675..953c255af568 100644 --- a/processing/src/main/java/io/druid/segment/filter/TrueValueMatcher.java +++ b/processing/src/main/java/org/apache/druid/segment/filter/TrueValueMatcher.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; final class TrueValueMatcher implements ValueMatcher { diff --git a/processing/src/main/java/io/druid/segment/historical/HistoricalColumnSelector.java b/processing/src/main/java/org/apache/druid/segment/historical/HistoricalColumnSelector.java similarity index 84% rename from processing/src/main/java/io/druid/segment/historical/HistoricalColumnSelector.java rename to processing/src/main/java/org/apache/druid/segment/historical/HistoricalColumnSelector.java index 59f20151ea03..494e5424eb70 100644 --- a/processing/src/main/java/io/druid/segment/historical/HistoricalColumnSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/historical/HistoricalColumnSelector.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.historical; +package org.apache.druid.segment.historical; -import io.druid.query.monomorphicprocessing.CalledFromHotLoop; -import io.druid.segment.ColumnValueSelector; +import org.apache.druid.query.monomorphicprocessing.CalledFromHotLoop; +import org.apache.druid.segment.ColumnValueSelector; public interface HistoricalColumnSelector extends ColumnValueSelector { diff --git a/processing/src/main/java/io/druid/segment/historical/HistoricalCursor.java b/processing/src/main/java/org/apache/druid/segment/historical/HistoricalCursor.java similarity index 87% rename from processing/src/main/java/io/druid/segment/historical/HistoricalCursor.java rename to processing/src/main/java/org/apache/druid/segment/historical/HistoricalCursor.java index ff96fdae0555..beb29126f3c5 100644 --- a/processing/src/main/java/io/druid/segment/historical/HistoricalCursor.java +++ b/processing/src/main/java/org/apache/druid/segment/historical/HistoricalCursor.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.historical; +package org.apache.druid.segment.historical; -import io.druid.segment.Cursor; -import io.druid.segment.data.Offset; +import org.apache.druid.segment.Cursor; +import org.apache.druid.segment.data.Offset; public interface HistoricalCursor extends Cursor { diff --git a/processing/src/main/java/io/druid/segment/historical/HistoricalDimensionSelector.java b/processing/src/main/java/org/apache/druid/segment/historical/HistoricalDimensionSelector.java similarity index 82% rename from processing/src/main/java/io/druid/segment/historical/HistoricalDimensionSelector.java rename to processing/src/main/java/org/apache/druid/segment/historical/HistoricalDimensionSelector.java index ef34ff8ddb32..fabb4bacf912 100644 --- a/processing/src/main/java/io/druid/segment/historical/HistoricalDimensionSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/historical/HistoricalDimensionSelector.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment.historical; +package org.apache.druid.segment.historical; -import io.druid.query.monomorphicprocessing.CalledFromHotLoop; -import io.druid.segment.DimensionSelector; -import io.druid.segment.data.IndexedInts; +import org.apache.druid.query.monomorphicprocessing.CalledFromHotLoop; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.data.IndexedInts; /** * Specialization for {@link DimensionSelector} queryable via offsets from {@link HistoricalCursor}. diff --git a/processing/src/main/java/io/druid/segment/historical/SingleValueHistoricalDimensionSelector.java b/processing/src/main/java/org/apache/druid/segment/historical/SingleValueHistoricalDimensionSelector.java similarity index 89% rename from processing/src/main/java/io/druid/segment/historical/SingleValueHistoricalDimensionSelector.java rename to processing/src/main/java/org/apache/druid/segment/historical/SingleValueHistoricalDimensionSelector.java index 4e19f99b1a36..cae53aefcbb4 100644 --- a/processing/src/main/java/io/druid/segment/historical/SingleValueHistoricalDimensionSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/historical/SingleValueHistoricalDimensionSelector.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.historical; +package org.apache.druid.segment.historical; -import io.druid.query.monomorphicprocessing.CalledFromHotLoop; +import org.apache.druid.query.monomorphicprocessing.CalledFromHotLoop; public interface SingleValueHistoricalDimensionSelector extends HistoricalDimensionSelector { diff --git a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndex.java b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndex.java similarity index 95% rename from processing/src/main/java/io/druid/segment/incremental/IncrementalIndex.java rename to processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndex.java index 0faeaef578db..c496d0237144 100644 --- a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndex.java +++ b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndex.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.incremental; +package org.apache.druid.segment.incremental; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; @@ -30,48 +30,48 @@ import com.google.common.collect.Maps; import com.google.common.primitives.Ints; import com.google.common.primitives.Longs; -import io.druid.collections.NonBlockingPool; -import io.druid.common.config.NullHandling; -import io.druid.common.guava.GuavaUtils; -import io.druid.data.input.InputRow; -import io.druid.data.input.MapBasedRow; -import io.druid.data.input.Row; -import io.druid.data.input.impl.DimensionSchema; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.SpatialDimensionSchema; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.parsers.ParseException; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.groupby.RowBasedColumnSelectorFactory; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.AbstractIndex; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.DimensionHandler; -import io.druid.segment.DimensionHandlerUtils; -import io.druid.segment.DimensionIndexer; -import io.druid.segment.DimensionSelector; -import io.druid.segment.DoubleColumnSelector; -import io.druid.segment.FloatColumnSelector; -import io.druid.segment.LongColumnSelector; -import io.druid.segment.Metadata; -import io.druid.segment.NilColumnValueSelector; -import io.druid.segment.ObjectColumnSelector; -import io.druid.segment.StorageAdapter; -import io.druid.segment.VirtualColumns; -import io.druid.segment.column.Column; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.column.ColumnCapabilitiesImpl; -import io.druid.segment.column.ValueType; -import io.druid.segment.serde.ComplexMetricExtractor; -import io.druid.segment.serde.ComplexMetricSerde; -import io.druid.segment.serde.ComplexMetrics; +import org.apache.druid.collections.NonBlockingPool; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.common.guava.GuavaUtils; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.MapBasedRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.data.input.impl.DimensionSchema; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.SpatialDimensionSchema; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.parsers.ParseException; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.groupby.RowBasedColumnSelectorFactory; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.AbstractIndex; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.DimensionHandler; +import org.apache.druid.segment.DimensionHandlerUtils; +import org.apache.druid.segment.DimensionIndexer; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.DoubleColumnSelector; +import org.apache.druid.segment.FloatColumnSelector; +import org.apache.druid.segment.LongColumnSelector; +import org.apache.druid.segment.Metadata; +import org.apache.druid.segment.NilColumnValueSelector; +import org.apache.druid.segment.ObjectColumnSelector; +import org.apache.druid.segment.StorageAdapter; +import org.apache.druid.segment.VirtualColumns; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.column.ColumnCapabilitiesImpl; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.serde.ComplexMetricExtractor; +import org.apache.druid.segment.serde.ComplexMetricSerde; +import org.apache.druid.segment.serde.ComplexMetrics; import org.joda.time.DateTime; import org.joda.time.Interval; @@ -904,7 +904,7 @@ private ColumnCapabilitiesImpl makeCapabilitiesFromValueType(ValueType type) /** * Currently called to initialize IncrementalIndex dimension order during index creation * Index dimension ordering could be changed to initialize from DimensionsSpec after resolution of - * https://github.com/druid-io/druid/issues/2011 + * https://github.com/apache/incubator-druid/issues/2011 */ public void loadDimensionIterable(Iterable oldDimensionOrder, Map oldColumnCapabilities) { diff --git a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndexAdapter.java b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexAdapter.java similarity index 91% rename from processing/src/main/java/io/druid/segment/incremental/IncrementalIndexAdapter.java rename to processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexAdapter.java index 59856fab3baa..4a119d9bfba3 100644 --- a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndexAdapter.java +++ b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexAdapter.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.segment.incremental; - -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.MutableBitmap; -import io.druid.segment.DimensionIndexer; -import io.druid.segment.IndexableAdapter; -import io.druid.segment.IntIteratorUtils; -import io.druid.segment.Metadata; -import io.druid.segment.TransformableRowIterator; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.data.BitmapValues; -import io.druid.segment.data.Indexed; +package org.apache.druid.segment.incremental; + +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.MutableBitmap; +import org.apache.druid.segment.DimensionIndexer; +import org.apache.druid.segment.IndexableAdapter; +import org.apache.druid.segment.IntIteratorUtils; +import org.apache.druid.segment.Metadata; +import org.apache.druid.segment.TransformableRowIterator; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.data.BitmapValues; +import org.apache.druid.segment.data.Indexed; import it.unimi.dsi.fastutil.ints.IntIterator; import org.joda.time.Interval; diff --git a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndexAddResult.java b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexAddResult.java similarity index 94% rename from processing/src/main/java/io/druid/segment/incremental/IncrementalIndexAddResult.java rename to processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexAddResult.java index 0f20a68daac3..c483e50fc376 100644 --- a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndexAddResult.java +++ b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexAddResult.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.incremental; +package org.apache.druid.segment.incremental; -import io.druid.java.util.common.parsers.ParseException; +import org.apache.druid.java.util.common.parsers.ParseException; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndexColumnSelectorFactory.java b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexColumnSelectorFactory.java similarity index 85% rename from processing/src/main/java/io/druid/segment/incremental/IncrementalIndexColumnSelectorFactory.java rename to processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexColumnSelectorFactory.java index 11d1b21b1496..bffceb1f17d3 100644 --- a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndexColumnSelectorFactory.java +++ b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexColumnSelectorFactory.java @@ -17,25 +17,25 @@ * under the License. */ -package io.druid.segment.incremental; - -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.extraction.ExtractionFn; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.DimensionIndexer; -import io.druid.segment.DimensionSelector; -import io.druid.segment.DimensionSelectorUtils; -import io.druid.segment.SingleScanTimeDimSelector; -import io.druid.segment.VirtualColumns; -import io.druid.segment.column.Column; -import io.druid.segment.column.ColumnCapabilities; +package org.apache.druid.segment.incremental; + +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.DimensionIndexer; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.DimensionSelectorUtils; +import org.apache.druid.segment.SingleScanTimeDimSelector; +import org.apache.druid.segment.VirtualColumns; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ColumnCapabilities; import javax.annotation.Nullable; /** * The basic implementation of {@link ColumnSelectorFactory} over an {@link IncrementalIndex}. It's counterpart for - * historical segments is {@link io.druid.segment.QueryableIndexColumnSelectorFactory}. + * historical segments is {@link org.apache.druid.segment.QueryableIndexColumnSelectorFactory}. */ class IncrementalIndexColumnSelectorFactory implements ColumnSelectorFactory { diff --git a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndexRow.java b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexRow.java similarity index 97% rename from processing/src/main/java/io/druid/segment/incremental/IncrementalIndexRow.java rename to processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexRow.java index f27a2cf8cc13..5c4d7b613ec0 100644 --- a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndexRow.java +++ b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexRow.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment.incremental; +package org.apache.druid.segment.incremental; import com.google.common.base.Function; import com.google.common.collect.Lists; -import io.druid.java.util.common.DateTimes; -import io.druid.segment.DimensionIndexer; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.segment.DimensionIndexer; import javax.annotation.Nullable; import java.lang.reflect.Array; diff --git a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndexRowHolder.java b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexRowHolder.java similarity index 91% rename from processing/src/main/java/io/druid/segment/incremental/IncrementalIndexRowHolder.java rename to processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexRowHolder.java index 0dbb1e2e2ff6..b9180ddd5f7b 100644 --- a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndexRowHolder.java +++ b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexRowHolder.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.incremental; +package org.apache.druid.segment.incremental; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.LongColumnSelector; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.LongColumnSelector; /** * IncrementalIndexRowHolder is a simple {@link #get}/{@link #set} holder of {@link IncrementalIndexRow}. It is used diff --git a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndexRowIterator.java b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexRowIterator.java similarity index 89% rename from processing/src/main/java/io/druid/segment/incremental/IncrementalIndexRowIterator.java rename to processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexRowIterator.java index f3634c2882f2..627c63f2d8a7 100644 --- a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndexRowIterator.java +++ b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexRowIterator.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.segment.incremental; +package org.apache.druid.segment.incremental; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.DimensionHandler; -import io.druid.segment.IndexableAdapter; -import io.druid.segment.RowNumCounter; -import io.druid.segment.RowPointer; -import io.druid.segment.TimeAndDimsPointer; -import io.druid.segment.TransformableRowIterator; -import io.druid.segment.VirtualColumns; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.DimensionHandler; +import org.apache.druid.segment.IndexableAdapter; +import org.apache.druid.segment.RowNumCounter; +import org.apache.druid.segment.RowPointer; +import org.apache.druid.segment.TimeAndDimsPointer; +import org.apache.druid.segment.TransformableRowIterator; +import org.apache.druid.segment.VirtualColumns; import java.util.Iterator; import java.util.List; diff --git a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndexSchema.java b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexSchema.java similarity index 91% rename from processing/src/main/java/io/druid/segment/incremental/IncrementalIndexSchema.java rename to processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexSchema.java index 6c7ff3d1881e..b848920ed573 100644 --- a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndexSchema.java +++ b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexSchema.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.segment.incremental; - -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.segment.VirtualColumns; +package org.apache.druid.segment.incremental; + +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.segment.VirtualColumns; /** */ diff --git a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndexStorageAdapter.java b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexStorageAdapter.java similarity index 89% rename from processing/src/main/java/io/druid/segment/incremental/IncrementalIndexStorageAdapter.java rename to processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexStorageAdapter.java index c10df128a9ed..53cba0fcda35 100644 --- a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndexStorageAdapter.java +++ b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexStorageAdapter.java @@ -17,30 +17,30 @@ * under the License. */ -package io.druid.segment.incremental; +package org.apache.druid.segment.incremental; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.query.BaseQuery; -import io.druid.query.QueryMetrics; -import io.druid.query.filter.Filter; -import io.druid.query.filter.ValueMatcher; -import io.druid.segment.Capabilities; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.Cursor; -import io.druid.segment.DimensionIndexer; -import io.druid.segment.Metadata; -import io.druid.segment.StorageAdapter; -import io.druid.segment.VirtualColumns; -import io.druid.segment.column.Column; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.data.Indexed; -import io.druid.segment.data.ListIndexed; -import io.druid.segment.filter.BooleanValueMatcher; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.query.BaseQuery; +import org.apache.druid.query.QueryMetrics; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.segment.Capabilities; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.Cursor; +import org.apache.druid.segment.DimensionIndexer; +import org.apache.druid.segment.Metadata; +import org.apache.druid.segment.StorageAdapter; +import org.apache.druid.segment.VirtualColumns; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.data.Indexed; +import org.apache.druid.segment.data.ListIndexed; +import org.apache.druid.segment.filter.BooleanValueMatcher; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/processing/src/main/java/io/druid/segment/incremental/IndexSizeExceededException.java b/processing/src/main/java/org/apache/druid/segment/incremental/IndexSizeExceededException.java similarity index 91% rename from processing/src/main/java/io/druid/segment/incremental/IndexSizeExceededException.java rename to processing/src/main/java/org/apache/druid/segment/incremental/IndexSizeExceededException.java index db590ec70323..53973bc148c4 100644 --- a/processing/src/main/java/io/druid/segment/incremental/IndexSizeExceededException.java +++ b/processing/src/main/java/org/apache/druid/segment/incremental/IndexSizeExceededException.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.incremental; +package org.apache.druid.segment.incremental; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import java.io.IOException; diff --git a/processing/src/main/java/io/druid/segment/incremental/OffheapIncrementalIndex.java b/processing/src/main/java/org/apache/druid/segment/incremental/OffheapIncrementalIndex.java similarity index 94% rename from processing/src/main/java/io/druid/segment/incremental/OffheapIncrementalIndex.java rename to processing/src/main/java/org/apache/druid/segment/incremental/OffheapIncrementalIndex.java index 198137bb8baf..74b638d22db1 100644 --- a/processing/src/main/java/io/druid/segment/incremental/OffheapIncrementalIndex.java +++ b/processing/src/main/java/org/apache/druid/segment/incremental/OffheapIncrementalIndex.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.segment.incremental; +package org.apache.druid.segment.incremental; import com.google.common.base.Supplier; import com.google.common.collect.Maps; -import io.druid.collections.NonBlockingPool; -import io.druid.collections.ResourceHolder; -import io.druid.data.input.InputRow; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.common.parsers.ParseException; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.segment.ColumnSelectorFactory; +import org.apache.druid.collections.NonBlockingPool; +import org.apache.druid.collections.ResourceHolder; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.parsers.ParseException; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.segment.ColumnSelectorFactory; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/segment/incremental/OnheapIncrementalIndex.java b/processing/src/main/java/org/apache/druid/segment/incremental/OnheapIncrementalIndex.java similarity index 94% rename from processing/src/main/java/io/druid/segment/incremental/OnheapIncrementalIndex.java rename to processing/src/main/java/org/apache/druid/segment/incremental/OnheapIncrementalIndex.java index c08f57999b87..50fb3ddfc47b 100644 --- a/processing/src/main/java/io/druid/segment/incremental/OnheapIncrementalIndex.java +++ b/processing/src/main/java/org/apache/druid/segment/incremental/OnheapIncrementalIndex.java @@ -17,23 +17,23 @@ * under the License. */ -package io.druid.segment.incremental; +package org.apache.druid.segment.incremental; import com.google.common.base.Supplier; import com.google.common.base.Throwables; import com.google.common.collect.Maps; -import io.druid.data.input.InputRow; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.common.parsers.ParseException; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.dimension.DimensionSpec; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.DimensionSelector; -import io.druid.segment.column.ColumnCapabilities; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.parsers.ParseException; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.column.ColumnCapabilities; import javax.annotation.Nullable; import java.io.IOException; diff --git a/processing/src/main/java/io/druid/segment/incremental/SpatialDimensionRowTransformer.java b/processing/src/main/java/org/apache/druid/segment/incremental/SpatialDimensionRowTransformer.java similarity index 96% rename from processing/src/main/java/io/druid/segment/incremental/SpatialDimensionRowTransformer.java rename to processing/src/main/java/org/apache/druid/segment/incremental/SpatialDimensionRowTransformer.java index 72860163fa3b..cebcfb4f74b3 100644 --- a/processing/src/main/java/io/druid/segment/incremental/SpatialDimensionRowTransformer.java +++ b/processing/src/main/java/org/apache/druid/segment/incremental/SpatialDimensionRowTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.incremental; +package org.apache.druid.segment.incremental; import com.google.common.base.Function; import com.google.common.base.Joiner; @@ -28,10 +28,10 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import io.druid.data.input.InputRow; -import io.druid.data.input.Row; -import io.druid.data.input.impl.SpatialDimensionSchema; -import io.druid.java.util.common.ISE; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.data.input.impl.SpatialDimensionSchema; +import org.apache.druid.java.util.common.ISE; import org.joda.time.DateTime; import java.util.Collections; diff --git a/processing/src/main/java/io/druid/segment/serde/package-info.java b/processing/src/main/java/org/apache/druid/segment/incremental/package-info.java similarity index 88% rename from processing/src/main/java/io/druid/segment/serde/package-info.java rename to processing/src/main/java/org/apache/druid/segment/incremental/package-info.java index 4306db801633..2f6aaef73766 100644 --- a/processing/src/main/java/io/druid/segment/serde/package-info.java +++ b/processing/src/main/java/org/apache/druid/segment/incremental/package-info.java @@ -18,6 +18,6 @@ */ @EverythingIsNonnullByDefault -package io.druid.segment.serde; +package org.apache.druid.segment.incremental; -import io.druid.annotations.EverythingIsNonnullByDefault; +import org.apache.druid.annotations.EverythingIsNonnullByDefault; diff --git a/processing/src/main/java/io/druid/segment/loading/MMappedQueryableSegmentizerFactory.java b/processing/src/main/java/org/apache/druid/segment/loading/MMappedQueryableSegmentizerFactory.java similarity index 87% rename from processing/src/main/java/io/druid/segment/loading/MMappedQueryableSegmentizerFactory.java rename to processing/src/main/java/org/apache/druid/segment/loading/MMappedQueryableSegmentizerFactory.java index f24a930c61d2..9a1abffa4b7c 100644 --- a/processing/src/main/java/io/druid/segment/loading/MMappedQueryableSegmentizerFactory.java +++ b/processing/src/main/java/org/apache/druid/segment/loading/MMappedQueryableSegmentizerFactory.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment.loading; +package org.apache.druid.segment.loading; import com.fasterxml.jackson.annotation.JacksonInject; import com.google.common.base.Preconditions; -import io.druid.segment.IndexIO; -import io.druid.segment.QueryableIndexSegment; -import io.druid.segment.Segment; -import io.druid.timeline.DataSegment; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.QueryableIndexSegment; +import org.apache.druid.segment.Segment; +import org.apache.druid.timeline.DataSegment; import java.io.File; import java.io.IOException; diff --git a/processing/src/main/java/io/druid/segment/loading/SegmentizerFactory.java b/processing/src/main/java/org/apache/druid/segment/loading/SegmentizerFactory.java similarity index 90% rename from processing/src/main/java/io/druid/segment/loading/SegmentizerFactory.java rename to processing/src/main/java/org/apache/druid/segment/loading/SegmentizerFactory.java index 934f7ea854e2..5bf17a6ea268 100644 --- a/processing/src/main/java/io/druid/segment/loading/SegmentizerFactory.java +++ b/processing/src/main/java/org/apache/druid/segment/loading/SegmentizerFactory.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment.loading; +package org.apache.druid.segment.loading; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.druid.segment.Segment; -import io.druid.timeline.DataSegment; +import org.apache.druid.segment.Segment; +import org.apache.druid.timeline.DataSegment; import java.io.File; diff --git a/processing/src/main/java/io/druid/segment/incremental/package-info.java b/processing/src/main/java/org/apache/druid/segment/package-info.java similarity index 89% rename from processing/src/main/java/io/druid/segment/incremental/package-info.java rename to processing/src/main/java/org/apache/druid/segment/package-info.java index 664299786455..534100362a3f 100644 --- a/processing/src/main/java/io/druid/segment/incremental/package-info.java +++ b/processing/src/main/java/org/apache/druid/segment/package-info.java @@ -18,6 +18,6 @@ */ @EverythingIsNonnullByDefault -package io.druid.segment.incremental; +package org.apache.druid.segment; -import io.druid.annotations.EverythingIsNonnullByDefault; +import org.apache.druid.annotations.EverythingIsNonnullByDefault; diff --git a/processing/src/main/java/io/druid/segment/selector/settable/SettableColumnValueSelector.java b/processing/src/main/java/org/apache/druid/segment/selector/settable/SettableColumnValueSelector.java similarity index 78% rename from processing/src/main/java/io/druid/segment/selector/settable/SettableColumnValueSelector.java rename to processing/src/main/java/org/apache/druid/segment/selector/settable/SettableColumnValueSelector.java index 4d8df8f60cbd..1aa2fc46edc7 100644 --- a/processing/src/main/java/io/druid/segment/selector/settable/SettableColumnValueSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/selector/settable/SettableColumnValueSelector.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.segment.selector.settable; +package org.apache.druid.segment.selector.settable; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnValueSelector; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnValueSelector; /** - * SettableColumnValueSelectors are used in {@link io.druid.segment.QueryableIndexIndexableAdapter.RowIteratorImpl}. + * SettableColumnValueSelectors are used in {@link org.apache.druid.segment.QueryableIndexIndexableAdapter.RowIteratorImpl}. */ public interface SettableColumnValueSelector extends ColumnValueSelector { diff --git a/processing/src/main/java/io/druid/segment/selector/settable/SettableDimensionValueSelector.java b/processing/src/main/java/org/apache/druid/segment/selector/settable/SettableDimensionValueSelector.java similarity index 88% rename from processing/src/main/java/io/druid/segment/selector/settable/SettableDimensionValueSelector.java rename to processing/src/main/java/org/apache/druid/segment/selector/settable/SettableDimensionValueSelector.java index 4435f27c08d8..16ee188fae5c 100644 --- a/processing/src/main/java/io/druid/segment/selector/settable/SettableDimensionValueSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/selector/settable/SettableDimensionValueSelector.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.segment.selector.settable; +package org.apache.druid.segment.selector.settable; import com.google.common.base.Predicate; -import io.druid.query.filter.ValueMatcher; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.DimensionSelector; -import io.druid.segment.IdLookup; -import io.druid.segment.data.ArrayBasedIndexedInts; -import io.druid.segment.data.IndexedInts; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.IdLookup; +import org.apache.druid.segment.data.ArrayBasedIndexedInts; +import org.apache.druid.segment.data.IndexedInts; import javax.annotation.Nullable; import java.util.Objects; diff --git a/processing/src/main/java/io/druid/segment/selector/settable/SettableDoubleColumnValueSelector.java b/processing/src/main/java/org/apache/druid/segment/selector/settable/SettableDoubleColumnValueSelector.java similarity index 86% rename from processing/src/main/java/io/druid/segment/selector/settable/SettableDoubleColumnValueSelector.java rename to processing/src/main/java/org/apache/druid/segment/selector/settable/SettableDoubleColumnValueSelector.java index 74ecfd0f07af..0aae27b7c33b 100644 --- a/processing/src/main/java/io/druid/segment/selector/settable/SettableDoubleColumnValueSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/selector/settable/SettableDoubleColumnValueSelector.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment.selector.settable; +package org.apache.druid.segment.selector.settable; -import io.druid.common.config.NullHandling; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.DoubleColumnSelector; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.DoubleColumnSelector; public class SettableDoubleColumnValueSelector implements SettableColumnValueSelector, DoubleColumnSelector { diff --git a/processing/src/main/java/io/druid/segment/selector/settable/SettableFloatColumnValueSelector.java b/processing/src/main/java/org/apache/druid/segment/selector/settable/SettableFloatColumnValueSelector.java similarity index 86% rename from processing/src/main/java/io/druid/segment/selector/settable/SettableFloatColumnValueSelector.java rename to processing/src/main/java/org/apache/druid/segment/selector/settable/SettableFloatColumnValueSelector.java index 00444c2c4506..8fd2a79d7ec7 100644 --- a/processing/src/main/java/io/druid/segment/selector/settable/SettableFloatColumnValueSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/selector/settable/SettableFloatColumnValueSelector.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment.selector.settable; +package org.apache.druid.segment.selector.settable; -import io.druid.common.config.NullHandling; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.FloatColumnSelector; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.FloatColumnSelector; public class SettableFloatColumnValueSelector implements SettableColumnValueSelector, FloatColumnSelector { diff --git a/processing/src/main/java/io/druid/segment/selector/settable/SettableLongColumnValueSelector.java b/processing/src/main/java/org/apache/druid/segment/selector/settable/SettableLongColumnValueSelector.java similarity index 87% rename from processing/src/main/java/io/druid/segment/selector/settable/SettableLongColumnValueSelector.java rename to processing/src/main/java/org/apache/druid/segment/selector/settable/SettableLongColumnValueSelector.java index 6c68c59c9a07..a03c6eb0124d 100644 --- a/processing/src/main/java/io/druid/segment/selector/settable/SettableLongColumnValueSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/selector/settable/SettableLongColumnValueSelector.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment.selector.settable; +package org.apache.druid.segment.selector.settable; -import io.druid.common.config.NullHandling; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.LongColumnSelector; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.LongColumnSelector; public class SettableLongColumnValueSelector implements SettableColumnValueSelector, LongColumnSelector { diff --git a/processing/src/main/java/io/druid/segment/selector/settable/SettableObjectColumnValueSelector.java b/processing/src/main/java/org/apache/druid/segment/selector/settable/SettableObjectColumnValueSelector.java similarity index 89% rename from processing/src/main/java/io/druid/segment/selector/settable/SettableObjectColumnValueSelector.java rename to processing/src/main/java/org/apache/druid/segment/selector/settable/SettableObjectColumnValueSelector.java index 83d026807fa6..d574f5e928aa 100644 --- a/processing/src/main/java/io/druid/segment/selector/settable/SettableObjectColumnValueSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/selector/settable/SettableObjectColumnValueSelector.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.selector.settable; +package org.apache.druid.segment.selector.settable; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.ObjectColumnSelector; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.ObjectColumnSelector; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/segment/serde/BitmapIndexColumnPartSupplier.java b/processing/src/main/java/org/apache/druid/segment/serde/BitmapIndexColumnPartSupplier.java similarity index 90% rename from processing/src/main/java/io/druid/segment/serde/BitmapIndexColumnPartSupplier.java rename to processing/src/main/java/org/apache/druid/segment/serde/BitmapIndexColumnPartSupplier.java index d00ce22e3d6c..7660253408c9 100644 --- a/processing/src/main/java/io/druid/segment/serde/BitmapIndexColumnPartSupplier.java +++ b/processing/src/main/java/org/apache/druid/segment/serde/BitmapIndexColumnPartSupplier.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.segment.serde; +package org.apache.druid.segment.serde; import com.google.common.base.Supplier; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.segment.column.BitmapIndex; -import io.druid.segment.data.GenericIndexed; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.segment.column.BitmapIndex; +import org.apache.druid.segment.data.GenericIndexed; /** */ diff --git a/processing/src/main/java/io/druid/segment/serde/ColumnPartSerde.java b/processing/src/main/java/org/apache/druid/segment/serde/ColumnPartSerde.java similarity index 93% rename from processing/src/main/java/io/druid/segment/serde/ColumnPartSerde.java rename to processing/src/main/java/org/apache/druid/segment/serde/ColumnPartSerde.java index 06118840ddf8..0c43cbe393ef 100644 --- a/processing/src/main/java/io/druid/segment/serde/ColumnPartSerde.java +++ b/processing/src/main/java/org/apache/druid/segment/serde/ColumnPartSerde.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment.serde; +package org.apache.druid.segment.serde; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.druid.segment.column.ColumnBuilder; -import io.druid.segment.column.ColumnConfig; +import org.apache.druid.segment.column.ColumnBuilder; +import org.apache.druid.segment.column.ColumnConfig; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/segment/serde/ComplexColumnPartSerde.java b/processing/src/main/java/org/apache/druid/segment/serde/ComplexColumnPartSerde.java similarity index 92% rename from processing/src/main/java/io/druid/segment/serde/ComplexColumnPartSerde.java rename to processing/src/main/java/org/apache/druid/segment/serde/ComplexColumnPartSerde.java index b7f30d0542ce..0e5592619e8b 100644 --- a/processing/src/main/java/io/druid/segment/serde/ComplexColumnPartSerde.java +++ b/processing/src/main/java/org/apache/druid/segment/serde/ComplexColumnPartSerde.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.segment.serde; +package org.apache.druid.segment.serde; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.segment.GenericColumnSerializer; -import io.druid.segment.column.ColumnBuilder; -import io.druid.segment.column.ColumnConfig; +import org.apache.druid.segment.GenericColumnSerializer; +import org.apache.druid.segment.column.ColumnBuilder; +import org.apache.druid.segment.column.ColumnConfig; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/segment/serde/ComplexColumnPartSupplier.java b/processing/src/main/java/org/apache/druid/segment/serde/ComplexColumnPartSupplier.java similarity index 86% rename from processing/src/main/java/io/druid/segment/serde/ComplexColumnPartSupplier.java rename to processing/src/main/java/org/apache/druid/segment/serde/ComplexColumnPartSupplier.java index 4338ec6ddff0..de22f00f2a15 100644 --- a/processing/src/main/java/io/druid/segment/serde/ComplexColumnPartSupplier.java +++ b/processing/src/main/java/org/apache/druid/segment/serde/ComplexColumnPartSupplier.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment.serde; +package org.apache.druid.segment.serde; import com.google.common.base.Supplier; -import io.druid.segment.column.ComplexColumn; -import io.druid.segment.column.IndexedComplexColumn; -import io.druid.segment.data.GenericIndexed; +import org.apache.druid.segment.column.ComplexColumn; +import org.apache.druid.segment.column.IndexedComplexColumn; +import org.apache.druid.segment.data.GenericIndexed; /** */ diff --git a/processing/src/main/java/io/druid/segment/serde/ComplexColumnSerializer.java b/processing/src/main/java/org/apache/druid/segment/serde/ComplexColumnSerializer.java similarity index 83% rename from processing/src/main/java/io/druid/segment/serde/ComplexColumnSerializer.java rename to processing/src/main/java/org/apache/druid/segment/serde/ComplexColumnSerializer.java index b49e7dbdfc7c..fb2866f09f2b 100644 --- a/processing/src/main/java/io/druid/segment/serde/ComplexColumnSerializer.java +++ b/processing/src/main/java/org/apache/druid/segment/serde/ComplexColumnSerializer.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.segment.serde; +package org.apache.druid.segment.serde; -import io.druid.guice.annotations.PublicApi; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.GenericColumnSerializer; -import io.druid.segment.data.GenericIndexedWriter; -import io.druid.segment.data.ObjectStrategy; -import io.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.GenericColumnSerializer; +import org.apache.druid.segment.data.GenericIndexedWriter; +import org.apache.druid.segment.data.ObjectStrategy; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; import java.io.IOException; import java.nio.channels.WritableByteChannel; diff --git a/processing/src/main/java/io/druid/segment/serde/ComplexMetricExtractor.java b/processing/src/main/java/org/apache/druid/segment/serde/ComplexMetricExtractor.java similarity index 87% rename from processing/src/main/java/io/druid/segment/serde/ComplexMetricExtractor.java rename to processing/src/main/java/org/apache/druid/segment/serde/ComplexMetricExtractor.java index b85c6d3fedba..81f60a7c8c7d 100644 --- a/processing/src/main/java/io/druid/segment/serde/ComplexMetricExtractor.java +++ b/processing/src/main/java/org/apache/druid/segment/serde/ComplexMetricExtractor.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.serde; +package org.apache.druid.segment.serde; -import io.druid.data.input.InputRow; -import io.druid.guice.annotations.ExtensionPoint; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.guice.annotations.ExtensionPoint; /** */ diff --git a/processing/src/main/java/io/druid/segment/serde/ComplexMetricSerde.java b/processing/src/main/java/org/apache/druid/segment/serde/ComplexMetricSerde.java similarity index 92% rename from processing/src/main/java/io/druid/segment/serde/ComplexMetricSerde.java rename to processing/src/main/java/org/apache/druid/segment/serde/ComplexMetricSerde.java index 8d833aaeed47..81f0dc405140 100644 --- a/processing/src/main/java/io/druid/segment/serde/ComplexMetricSerde.java +++ b/processing/src/main/java/org/apache/druid/segment/serde/ComplexMetricSerde.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment.serde; +package org.apache.druid.segment.serde; import com.google.common.base.Function; -import io.druid.guice.annotations.ExtensionPoint; -import io.druid.segment.GenericColumnSerializer; -import io.druid.segment.column.ColumnBuilder; -import io.druid.segment.data.ObjectStrategy; -import io.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.guice.annotations.ExtensionPoint; +import org.apache.druid.segment.GenericColumnSerializer; +import org.apache.druid.segment.column.ColumnBuilder; +import org.apache.druid.segment.data.ObjectStrategy; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/segment/serde/ComplexMetrics.java b/processing/src/main/java/org/apache/druid/segment/serde/ComplexMetrics.java similarity index 94% rename from processing/src/main/java/io/druid/segment/serde/ComplexMetrics.java rename to processing/src/main/java/org/apache/druid/segment/serde/ComplexMetrics.java index 7af4ea90eae4..9e837ec486cc 100644 --- a/processing/src/main/java/io/druid/segment/serde/ComplexMetrics.java +++ b/processing/src/main/java/org/apache/druid/segment/serde/ComplexMetrics.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.serde; +package org.apache.druid.segment.serde; import com.google.common.collect.Maps; -import io.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.ISE; import java.util.Map; diff --git a/processing/src/main/java/io/druid/segment/serde/DictionaryEncodedColumnPartSerde.java b/processing/src/main/java/org/apache/druid/segment/serde/DictionaryEncodedColumnPartSerde.java similarity index 89% rename from processing/src/main/java/io/druid/segment/serde/DictionaryEncodedColumnPartSerde.java rename to processing/src/main/java/org/apache/druid/segment/serde/DictionaryEncodedColumnPartSerde.java index 69e2f3a99d91..2bb64f785fae 100644 --- a/processing/src/main/java/io/druid/segment/serde/DictionaryEncodedColumnPartSerde.java +++ b/processing/src/main/java/org/apache/druid/segment/serde/DictionaryEncodedColumnPartSerde.java @@ -17,35 +17,35 @@ * under the License. */ -package io.druid.segment.serde; +package org.apache.druid.segment.serde; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.primitives.Ints; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.collections.spatial.ImmutableRTree; -import io.druid.io.Channels; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.segment.column.ColumnBuilder; -import io.druid.segment.column.ColumnConfig; -import io.druid.segment.column.ValueType; -import io.druid.segment.data.BitmapSerde; -import io.druid.segment.data.BitmapSerdeFactory; -import io.druid.segment.data.ByteBufferWriter; -import io.druid.segment.data.ColumnarInts; -import io.druid.segment.data.ColumnarIntsSerializer; -import io.druid.segment.data.ColumnarMultiInts; -import io.druid.segment.data.CompressedVSizeColumnarIntsSupplier; -import io.druid.segment.data.CompressedVSizeColumnarMultiIntsSupplier; -import io.druid.segment.data.GenericIndexed; -import io.druid.segment.data.GenericIndexedWriter; -import io.druid.segment.data.ImmutableRTreeObjectStrategy; -import io.druid.segment.data.V3CompressedVSizeColumnarMultiIntsSupplier; -import io.druid.segment.data.VSizeColumnarInts; -import io.druid.segment.data.VSizeColumnarMultiInts; -import io.druid.segment.data.WritableSupplier; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.collections.spatial.ImmutableRTree; +import org.apache.druid.io.Channels; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.segment.column.ColumnBuilder; +import org.apache.druid.segment.column.ColumnConfig; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.data.BitmapSerde; +import org.apache.druid.segment.data.BitmapSerdeFactory; +import org.apache.druid.segment.data.ByteBufferWriter; +import org.apache.druid.segment.data.ColumnarInts; +import org.apache.druid.segment.data.ColumnarIntsSerializer; +import org.apache.druid.segment.data.ColumnarMultiInts; +import org.apache.druid.segment.data.CompressedVSizeColumnarIntsSupplier; +import org.apache.druid.segment.data.CompressedVSizeColumnarMultiIntsSupplier; +import org.apache.druid.segment.data.GenericIndexed; +import org.apache.druid.segment.data.GenericIndexedWriter; +import org.apache.druid.segment.data.ImmutableRTreeObjectStrategy; +import org.apache.druid.segment.data.V3CompressedVSizeColumnarMultiIntsSupplier; +import org.apache.druid.segment.data.VSizeColumnarInts; +import org.apache.druid.segment.data.VSizeColumnarMultiInts; +import org.apache.druid.segment.data.WritableSupplier; import javax.annotation.Nullable; import javax.validation.constraints.NotNull; diff --git a/processing/src/main/java/io/druid/segment/serde/DictionaryEncodedColumnSupplier.java b/processing/src/main/java/org/apache/druid/segment/serde/DictionaryEncodedColumnSupplier.java similarity index 82% rename from processing/src/main/java/io/druid/segment/serde/DictionaryEncodedColumnSupplier.java rename to processing/src/main/java/org/apache/druid/segment/serde/DictionaryEncodedColumnSupplier.java index ae5064c956bc..d8de21684ed3 100644 --- a/processing/src/main/java/io/druid/segment/serde/DictionaryEncodedColumnSupplier.java +++ b/processing/src/main/java/org/apache/druid/segment/serde/DictionaryEncodedColumnSupplier.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.segment.serde; +package org.apache.druid.segment.serde; import com.google.common.base.Supplier; -import io.druid.segment.column.DictionaryEncodedColumn; -import io.druid.segment.column.SimpleDictionaryEncodedColumn; -import io.druid.segment.data.CachingIndexed; -import io.druid.segment.data.ColumnarInts; -import io.druid.segment.data.ColumnarMultiInts; -import io.druid.segment.data.GenericIndexed; +import org.apache.druid.segment.column.DictionaryEncodedColumn; +import org.apache.druid.segment.column.SimpleDictionaryEncodedColumn; +import org.apache.druid.segment.data.CachingIndexed; +import org.apache.druid.segment.data.ColumnarInts; +import org.apache.druid.segment.data.ColumnarMultiInts; +import org.apache.druid.segment.data.GenericIndexed; /** */ diff --git a/processing/src/main/java/io/druid/segment/serde/DoubleGenericColumnPartSerde.java b/processing/src/main/java/org/apache/druid/segment/serde/DoubleGenericColumnPartSerde.java similarity index 89% rename from processing/src/main/java/io/druid/segment/serde/DoubleGenericColumnPartSerde.java rename to processing/src/main/java/org/apache/druid/segment/serde/DoubleGenericColumnPartSerde.java index db95820a4176..4381b42870cf 100644 --- a/processing/src/main/java/io/druid/segment/serde/DoubleGenericColumnPartSerde.java +++ b/processing/src/main/java/org/apache/druid/segment/serde/DoubleGenericColumnPartSerde.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.segment.serde; +package org.apache.druid.segment.serde; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Supplier; -import io.druid.segment.IndexIO; -import io.druid.segment.column.ColumnBuilder; -import io.druid.segment.column.ColumnConfig; -import io.druid.segment.column.ValueType; -import io.druid.segment.data.ColumnarDoubles; -import io.druid.segment.data.CompressedColumnarDoublesSuppliers; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.column.ColumnBuilder; +import org.apache.druid.segment.column.ColumnConfig; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.data.ColumnarDoubles; +import org.apache.druid.segment.data.CompressedColumnarDoublesSuppliers; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/processing/src/main/java/io/druid/segment/serde/DoubleGenericColumnPartSerdeV2.java b/processing/src/main/java/org/apache/druid/segment/serde/DoubleGenericColumnPartSerdeV2.java similarity index 90% rename from processing/src/main/java/io/druid/segment/serde/DoubleGenericColumnPartSerdeV2.java rename to processing/src/main/java/org/apache/druid/segment/serde/DoubleGenericColumnPartSerdeV2.java index 79d4e08fa485..05c0c272d92c 100644 --- a/processing/src/main/java/io/druid/segment/serde/DoubleGenericColumnPartSerdeV2.java +++ b/processing/src/main/java/org/apache/druid/segment/serde/DoubleGenericColumnPartSerdeV2.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.segment.serde; +package org.apache.druid.segment.serde; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Supplier; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.segment.column.ValueType; -import io.druid.segment.data.BitmapSerde; -import io.druid.segment.data.BitmapSerdeFactory; -import io.druid.segment.data.ColumnarDoubles; -import io.druid.segment.data.CompressedColumnarDoublesSuppliers; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.data.BitmapSerde; +import org.apache.druid.segment.data.BitmapSerdeFactory; +import org.apache.druid.segment.data.ColumnarDoubles; +import org.apache.druid.segment.data.CompressedColumnarDoublesSuppliers; import javax.annotation.Nullable; import java.io.IOException; diff --git a/processing/src/main/java/io/druid/segment/serde/DoubleGenericColumnSupplier.java b/processing/src/main/java/org/apache/druid/segment/serde/DoubleGenericColumnSupplier.java similarity index 83% rename from processing/src/main/java/io/druid/segment/serde/DoubleGenericColumnSupplier.java rename to processing/src/main/java/org/apache/druid/segment/serde/DoubleGenericColumnSupplier.java index f408ba89af59..8c8698d0fcec 100644 --- a/processing/src/main/java/io/druid/segment/serde/DoubleGenericColumnSupplier.java +++ b/processing/src/main/java/org/apache/druid/segment/serde/DoubleGenericColumnSupplier.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.segment.serde; +package org.apache.druid.segment.serde; import com.google.common.base.Supplier; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.segment.column.DoublesColumn; -import io.druid.segment.column.GenericColumn; -import io.druid.segment.data.ColumnarDoubles; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.segment.column.DoublesColumn; +import org.apache.druid.segment.column.GenericColumn; +import org.apache.druid.segment.data.ColumnarDoubles; public class DoubleGenericColumnSupplier implements Supplier { diff --git a/processing/src/main/java/io/druid/segment/serde/FloatGenericColumnPartSerde.java b/processing/src/main/java/org/apache/druid/segment/serde/FloatGenericColumnPartSerde.java similarity index 90% rename from processing/src/main/java/io/druid/segment/serde/FloatGenericColumnPartSerde.java rename to processing/src/main/java/org/apache/druid/segment/serde/FloatGenericColumnPartSerde.java index 67b1a44b2f25..c54803656658 100644 --- a/processing/src/main/java/io/druid/segment/serde/FloatGenericColumnPartSerde.java +++ b/processing/src/main/java/org/apache/druid/segment/serde/FloatGenericColumnPartSerde.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.segment.serde; +package org.apache.druid.segment.serde; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.segment.IndexIO; -import io.druid.segment.column.ColumnBuilder; -import io.druid.segment.column.ColumnConfig; -import io.druid.segment.column.ValueType; -import io.druid.segment.data.CompressedColumnarFloatsSupplier; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.column.ColumnBuilder; +import org.apache.druid.segment.column.ColumnConfig; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.data.CompressedColumnarFloatsSupplier; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/processing/src/main/java/io/druid/segment/serde/FloatGenericColumnPartSerdeV2.java b/processing/src/main/java/org/apache/druid/segment/serde/FloatGenericColumnPartSerdeV2.java similarity index 91% rename from processing/src/main/java/io/druid/segment/serde/FloatGenericColumnPartSerdeV2.java rename to processing/src/main/java/org/apache/druid/segment/serde/FloatGenericColumnPartSerdeV2.java index 34412b93b624..cabe0dd3719b 100644 --- a/processing/src/main/java/io/druid/segment/serde/FloatGenericColumnPartSerdeV2.java +++ b/processing/src/main/java/org/apache/druid/segment/serde/FloatGenericColumnPartSerdeV2.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.segment.serde; +package org.apache.druid.segment.serde; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.segment.column.ValueType; -import io.druid.segment.data.BitmapSerde; -import io.druid.segment.data.BitmapSerdeFactory; -import io.druid.segment.data.CompressedColumnarFloatsSupplier; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.data.BitmapSerde; +import org.apache.druid.segment.data.BitmapSerdeFactory; +import org.apache.druid.segment.data.CompressedColumnarFloatsSupplier; import javax.annotation.Nullable; import java.io.IOException; diff --git a/processing/src/main/java/io/druid/segment/serde/FloatGenericColumnSupplier.java b/processing/src/main/java/org/apache/druid/segment/serde/FloatGenericColumnSupplier.java similarity index 83% rename from processing/src/main/java/io/druid/segment/serde/FloatGenericColumnSupplier.java rename to processing/src/main/java/org/apache/druid/segment/serde/FloatGenericColumnSupplier.java index eb0a6e1c0dd0..88dfda411918 100644 --- a/processing/src/main/java/io/druid/segment/serde/FloatGenericColumnSupplier.java +++ b/processing/src/main/java/org/apache/druid/segment/serde/FloatGenericColumnSupplier.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.segment.serde; +package org.apache.druid.segment.serde; import com.google.common.base.Supplier; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.segment.column.FloatsColumn; -import io.druid.segment.column.GenericColumn; -import io.druid.segment.data.CompressedColumnarFloatsSupplier; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.segment.column.FloatsColumn; +import org.apache.druid.segment.column.GenericColumn; +import org.apache.druid.segment.data.CompressedColumnarFloatsSupplier; /** */ diff --git a/processing/src/main/java/io/druid/segment/serde/LargeColumnSupportedComplexColumnSerializer.java b/processing/src/main/java/org/apache/druid/segment/serde/LargeColumnSupportedComplexColumnSerializer.java similarity index 86% rename from processing/src/main/java/io/druid/segment/serde/LargeColumnSupportedComplexColumnSerializer.java rename to processing/src/main/java/org/apache/druid/segment/serde/LargeColumnSupportedComplexColumnSerializer.java index 2bf78f82dd8d..0241c3ecd23c 100644 --- a/processing/src/main/java/io/druid/segment/serde/LargeColumnSupportedComplexColumnSerializer.java +++ b/processing/src/main/java/org/apache/druid/segment/serde/LargeColumnSupportedComplexColumnSerializer.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.segment.serde; +package org.apache.druid.segment.serde; -import io.druid.guice.annotations.PublicApi; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.GenericColumnSerializer; -import io.druid.segment.data.GenericIndexedWriter; -import io.druid.segment.data.ObjectStrategy; -import io.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.GenericColumnSerializer; +import org.apache.druid.segment.data.GenericIndexedWriter; +import org.apache.druid.segment.data.ObjectStrategy; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; import java.io.IOException; import java.nio.channels.WritableByteChannel; diff --git a/processing/src/main/java/io/druid/segment/serde/LongGenericColumnPartSerde.java b/processing/src/main/java/org/apache/druid/segment/serde/LongGenericColumnPartSerde.java similarity index 90% rename from processing/src/main/java/io/druid/segment/serde/LongGenericColumnPartSerde.java rename to processing/src/main/java/org/apache/druid/segment/serde/LongGenericColumnPartSerde.java index 21db8ac94933..64b454cc95d1 100644 --- a/processing/src/main/java/io/druid/segment/serde/LongGenericColumnPartSerde.java +++ b/processing/src/main/java/org/apache/druid/segment/serde/LongGenericColumnPartSerde.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.segment.serde; +package org.apache.druid.segment.serde; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.segment.IndexIO; -import io.druid.segment.column.ColumnBuilder; -import io.druid.segment.column.ColumnConfig; -import io.druid.segment.column.ValueType; -import io.druid.segment.data.CompressedColumnarLongsSupplier; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.column.ColumnBuilder; +import org.apache.druid.segment.column.ColumnConfig; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.data.CompressedColumnarLongsSupplier; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/processing/src/main/java/io/druid/segment/serde/LongGenericColumnPartSerdeV2.java b/processing/src/main/java/org/apache/druid/segment/serde/LongGenericColumnPartSerdeV2.java similarity index 91% rename from processing/src/main/java/io/druid/segment/serde/LongGenericColumnPartSerdeV2.java rename to processing/src/main/java/org/apache/druid/segment/serde/LongGenericColumnPartSerdeV2.java index 320b85587e58..f072afd8efa0 100644 --- a/processing/src/main/java/io/druid/segment/serde/LongGenericColumnPartSerdeV2.java +++ b/processing/src/main/java/org/apache/druid/segment/serde/LongGenericColumnPartSerdeV2.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.segment.serde; +package org.apache.druid.segment.serde; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.segment.column.ValueType; -import io.druid.segment.data.BitmapSerde; -import io.druid.segment.data.BitmapSerdeFactory; -import io.druid.segment.data.CompressedColumnarLongsSupplier; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.data.BitmapSerde; +import org.apache.druid.segment.data.BitmapSerdeFactory; +import org.apache.druid.segment.data.CompressedColumnarLongsSupplier; import javax.annotation.Nullable; import java.io.IOException; diff --git a/processing/src/main/java/io/druid/segment/serde/LongGenericColumnSupplier.java b/processing/src/main/java/org/apache/druid/segment/serde/LongGenericColumnSupplier.java similarity index 82% rename from processing/src/main/java/io/druid/segment/serde/LongGenericColumnSupplier.java rename to processing/src/main/java/org/apache/druid/segment/serde/LongGenericColumnSupplier.java index 22f8a9720dcc..729d2e8bb36f 100644 --- a/processing/src/main/java/io/druid/segment/serde/LongGenericColumnSupplier.java +++ b/processing/src/main/java/org/apache/druid/segment/serde/LongGenericColumnSupplier.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.segment.serde; +package org.apache.druid.segment.serde; import com.google.common.base.Supplier; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.segment.column.GenericColumn; -import io.druid.segment.column.LongsColumn; -import io.druid.segment.data.CompressedColumnarLongsSupplier; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.segment.column.GenericColumn; +import org.apache.druid.segment.column.LongsColumn; +import org.apache.druid.segment.data.CompressedColumnarLongsSupplier; /** */ diff --git a/processing/src/main/java/io/druid/segment/serde/MetaSerdeHelper.java b/processing/src/main/java/org/apache/druid/segment/serde/MetaSerdeHelper.java similarity index 98% rename from processing/src/main/java/io/druid/segment/serde/MetaSerdeHelper.java rename to processing/src/main/java/org/apache/druid/segment/serde/MetaSerdeHelper.java index 313d015b2494..55f385647719 100644 --- a/processing/src/main/java/io/druid/segment/serde/MetaSerdeHelper.java +++ b/processing/src/main/java/org/apache/druid/segment/serde/MetaSerdeHelper.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.serde; +package org.apache.druid.segment.serde; -import io.druid.io.Channels; +import org.apache.druid.io.Channels; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/segment/serde/Serializer.java b/processing/src/main/java/org/apache/druid/segment/serde/Serializer.java similarity index 93% rename from processing/src/main/java/io/druid/segment/serde/Serializer.java rename to processing/src/main/java/org/apache/druid/segment/serde/Serializer.java index 4d78398046bd..607d17195cd9 100644 --- a/processing/src/main/java/io/druid/segment/serde/Serializer.java +++ b/processing/src/main/java/org/apache/druid/segment/serde/Serializer.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.serde; +package org.apache.druid.segment.serde; -import io.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; import java.io.IOException; import java.nio.channels.WritableByteChannel; diff --git a/processing/src/main/java/io/druid/segment/serde/SpatialIndexColumnPartSupplier.java b/processing/src/main/java/org/apache/druid/segment/serde/SpatialIndexColumnPartSupplier.java similarity index 89% rename from processing/src/main/java/io/druid/segment/serde/SpatialIndexColumnPartSupplier.java rename to processing/src/main/java/org/apache/druid/segment/serde/SpatialIndexColumnPartSupplier.java index 7aeb3d0e5bd8..c5a3653e7e64 100644 --- a/processing/src/main/java/io/druid/segment/serde/SpatialIndexColumnPartSupplier.java +++ b/processing/src/main/java/org/apache/druid/segment/serde/SpatialIndexColumnPartSupplier.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.segment.serde; +package org.apache.druid.segment.serde; import com.google.common.base.Supplier; -import io.druid.collections.spatial.ImmutableRTree; -import io.druid.segment.column.SpatialIndex; +import org.apache.druid.collections.spatial.ImmutableRTree; +import org.apache.druid.segment.column.SpatialIndex; /** */ diff --git a/processing/src/main/java/io/druid/segment/package-info.java b/processing/src/main/java/org/apache/druid/segment/serde/package-info.java similarity index 88% rename from processing/src/main/java/io/druid/segment/package-info.java rename to processing/src/main/java/org/apache/druid/segment/serde/package-info.java index f390eb697014..7e2270f94df1 100644 --- a/processing/src/main/java/io/druid/segment/package-info.java +++ b/processing/src/main/java/org/apache/druid/segment/serde/package-info.java @@ -18,6 +18,6 @@ */ @EverythingIsNonnullByDefault -package io.druid.segment; +package org.apache.druid.segment.serde; -import io.druid.annotations.EverythingIsNonnullByDefault; +import org.apache.druid.annotations.EverythingIsNonnullByDefault; diff --git a/processing/src/main/java/io/druid/segment/transform/ExpressionTransform.java b/processing/src/main/java/org/apache/druid/segment/transform/ExpressionTransform.java similarity index 92% rename from processing/src/main/java/io/druid/segment/transform/ExpressionTransform.java rename to processing/src/main/java/org/apache/druid/segment/transform/ExpressionTransform.java index be0225eb35cd..a9b562c0238b 100644 --- a/processing/src/main/java/io/druid/segment/transform/ExpressionTransform.java +++ b/processing/src/main/java/org/apache/druid/segment/transform/ExpressionTransform.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.segment.transform; +package org.apache.druid.segment.transform; 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.data.input.Row; -import io.druid.math.expr.Expr; -import io.druid.math.expr.ExprMacroTable; -import io.druid.math.expr.Parser; -import io.druid.segment.column.Column; +import org.apache.druid.data.input.Row; +import org.apache.druid.math.expr.Expr; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.math.expr.Parser; +import org.apache.druid.segment.column.Column; import java.util.Objects; diff --git a/processing/src/main/java/io/druid/segment/transform/RowFunction.java b/processing/src/main/java/org/apache/druid/segment/transform/RowFunction.java similarity index 91% rename from processing/src/main/java/io/druid/segment/transform/RowFunction.java rename to processing/src/main/java/org/apache/druid/segment/transform/RowFunction.java index 4499361a9109..0c0d915373ce 100644 --- a/processing/src/main/java/io/druid/segment/transform/RowFunction.java +++ b/processing/src/main/java/org/apache/druid/segment/transform/RowFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.transform; +package org.apache.druid.segment.transform; -import io.druid.data.input.Row; +import org.apache.druid.data.input.Row; /** * Interface for evaluating functions on rows. Used by {@link Transformer}. diff --git a/processing/src/main/java/io/druid/segment/transform/Transform.java b/processing/src/main/java/org/apache/druid/segment/transform/Transform.java similarity index 98% rename from processing/src/main/java/io/druid/segment/transform/Transform.java rename to processing/src/main/java/org/apache/druid/segment/transform/Transform.java index 7c5b653b7949..a12313c14d31 100644 --- a/processing/src/main/java/io/druid/segment/transform/Transform.java +++ b/processing/src/main/java/org/apache/druid/segment/transform/Transform.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.transform; +package org.apache.druid.segment.transform; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/processing/src/main/java/io/druid/segment/transform/TransformSpec.java b/processing/src/main/java/org/apache/druid/segment/transform/TransformSpec.java similarity index 94% rename from processing/src/main/java/io/druid/segment/transform/TransformSpec.java rename to processing/src/main/java/org/apache/druid/segment/transform/TransformSpec.java index e6b295a33913..048299e6e266 100644 --- a/processing/src/main/java/io/druid/segment/transform/TransformSpec.java +++ b/processing/src/main/java/org/apache/druid/segment/transform/TransformSpec.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.segment.transform; +package org.apache.druid.segment.transform; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.java.util.common.ISE; -import io.druid.query.filter.DimFilter; -import io.druid.segment.column.ValueType; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.segment.column.ValueType; import javax.annotation.Nullable; import java.util.HashSet; diff --git a/processing/src/main/java/io/druid/segment/transform/Transformer.java b/processing/src/main/java/org/apache/druid/segment/transform/Transformer.java similarity index 91% rename from processing/src/main/java/io/druid/segment/transform/Transformer.java rename to processing/src/main/java/org/apache/druid/segment/transform/Transformer.java index a8c2af20fbb2..9501fbc483a7 100644 --- a/processing/src/main/java/io/druid/segment/transform/Transformer.java +++ b/processing/src/main/java/org/apache/druid/segment/transform/Transformer.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.segment.transform; - -import io.druid.data.input.InputRow; -import io.druid.data.input.Row; -import io.druid.data.input.Rows; -import io.druid.java.util.common.DateTimes; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.groupby.RowBasedColumnSelectorFactory; -import io.druid.segment.column.Column; -import io.druid.segment.column.ValueType; +package org.apache.druid.segment.transform; + +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.data.input.Rows; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.groupby.RowBasedColumnSelectorFactory; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ValueType; import org.joda.time.DateTime; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/segment/transform/TransformingInputRowParser.java b/processing/src/main/java/org/apache/druid/segment/transform/TransformingInputRowParser.java similarity index 90% rename from processing/src/main/java/io/druid/segment/transform/TransformingInputRowParser.java rename to processing/src/main/java/org/apache/druid/segment/transform/TransformingInputRowParser.java index 5083e7f75217..0482bb614a19 100644 --- a/processing/src/main/java/io/druid/segment/transform/TransformingInputRowParser.java +++ b/processing/src/main/java/org/apache/druid/segment/transform/TransformingInputRowParser.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment.transform; +package org.apache.druid.segment.transform; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.ParseSpec; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.ParseSpec; import java.util.List; import java.util.stream.Collectors; diff --git a/processing/src/main/java/io/druid/segment/transform/TransformingStringInputRowParser.java b/processing/src/main/java/org/apache/druid/segment/transform/TransformingStringInputRowParser.java similarity index 90% rename from processing/src/main/java/io/druid/segment/transform/TransformingStringInputRowParser.java rename to processing/src/main/java/org/apache/druid/segment/transform/TransformingStringInputRowParser.java index f37092650d32..d9a0aa2d954a 100644 --- a/processing/src/main/java/io/druid/segment/transform/TransformingStringInputRowParser.java +++ b/processing/src/main/java/org/apache/druid/segment/transform/TransformingStringInputRowParser.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment.transform; +package org.apache.druid.segment.transform; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.ParseSpec; -import io.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.ParseSpec; +import org.apache.druid.data.input.impl.StringInputRowParser; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/segment/virtual/BaseSingleValueDimensionSelector.java b/processing/src/main/java/org/apache/druid/segment/virtual/BaseSingleValueDimensionSelector.java similarity index 85% rename from processing/src/main/java/io/druid/segment/virtual/BaseSingleValueDimensionSelector.java rename to processing/src/main/java/org/apache/druid/segment/virtual/BaseSingleValueDimensionSelector.java index 7e8aef7a3b84..3a01f720e1ba 100644 --- a/processing/src/main/java/io/druid/segment/virtual/BaseSingleValueDimensionSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/virtual/BaseSingleValueDimensionSelector.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.segment.virtual; +package org.apache.druid.segment.virtual; import com.google.common.base.Predicate; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.monomorphicprocessing.CalledFromHotLoop; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.DimensionSelector; -import io.druid.segment.IdLookup; -import io.druid.segment.data.IndexedInts; -import io.druid.segment.data.ZeroIndexedInts; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.monomorphicprocessing.CalledFromHotLoop; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.IdLookup; +import org.apache.druid.segment.data.IndexedInts; +import org.apache.druid.segment.data.ZeroIndexedInts; import javax.annotation.Nullable; import java.util.Objects; diff --git a/processing/src/main/java/io/druid/segment/virtual/ExpressionColumnValueSelector.java b/processing/src/main/java/org/apache/druid/segment/virtual/ExpressionColumnValueSelector.java similarity index 90% rename from processing/src/main/java/io/druid/segment/virtual/ExpressionColumnValueSelector.java rename to processing/src/main/java/org/apache/druid/segment/virtual/ExpressionColumnValueSelector.java index 4af0d1eb63da..caffc48b9bd1 100644 --- a/processing/src/main/java/io/druid/segment/virtual/ExpressionColumnValueSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/virtual/ExpressionColumnValueSelector.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.segment.virtual; +package org.apache.druid.segment.virtual; import com.google.common.base.Preconditions; -import io.druid.math.expr.Expr; -import io.druid.math.expr.ExprEval; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnValueSelector; +import org.apache.druid.math.expr.Expr; +import org.apache.druid.math.expr.ExprEval; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnValueSelector; import javax.annotation.Nonnull; diff --git a/processing/src/main/java/io/druid/segment/virtual/ExpressionSelectors.java b/processing/src/main/java/org/apache/druid/segment/virtual/ExpressionSelectors.java similarity index 91% rename from processing/src/main/java/io/druid/segment/virtual/ExpressionSelectors.java rename to processing/src/main/java/org/apache/druid/segment/virtual/ExpressionSelectors.java index 3f1cfc69ef37..5e855eab0dd3 100644 --- a/processing/src/main/java/io/druid/segment/virtual/ExpressionSelectors.java +++ b/processing/src/main/java/org/apache/druid/segment/virtual/ExpressionSelectors.java @@ -17,33 +17,33 @@ * under the License. */ -package io.druid.segment.virtual; +package org.apache.druid.segment.virtual; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.base.Supplier; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; -import io.druid.common.config.NullHandling; -import io.druid.math.expr.Expr; -import io.druid.math.expr.ExprEval; -import io.druid.math.expr.Parser; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.expression.ExprUtils; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseObjectColumnValueSelector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.ConstantExprEvalSelector; -import io.druid.segment.DimensionSelector; -import io.druid.segment.DimensionSelectorUtils; -import io.druid.segment.NilColumnValueSelector; -import io.druid.segment.NullDimensionSelector; -import io.druid.segment.column.Column; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.column.ValueType; -import io.druid.segment.data.IndexedInts; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.math.expr.Expr; +import org.apache.druid.math.expr.ExprEval; +import org.apache.druid.math.expr.Parser; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.expression.ExprUtils; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.ConstantExprEvalSelector; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.DimensionSelectorUtils; +import org.apache.druid.segment.NilColumnValueSelector; +import org.apache.druid.segment.NullDimensionSelector; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.data.IndexedInts; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/segment/virtual/ExpressionVirtualColumn.java b/processing/src/main/java/org/apache/druid/segment/virtual/ExpressionVirtualColumn.java similarity index 85% rename from processing/src/main/java/io/druid/segment/virtual/ExpressionVirtualColumn.java rename to processing/src/main/java/org/apache/druid/segment/virtual/ExpressionVirtualColumn.java index f356cf957f98..45a25c4d94fb 100644 --- a/processing/src/main/java/io/druid/segment/virtual/ExpressionVirtualColumn.java +++ b/processing/src/main/java/org/apache/druid/segment/virtual/ExpressionVirtualColumn.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.segment.virtual; +package org.apache.druid.segment.virtual; 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.math.expr.Expr; -import io.druid.math.expr.ExprMacroTable; -import io.druid.math.expr.Parser; -import io.druid.query.cache.CacheKeyBuilder; -import io.druid.query.dimension.DimensionSpec; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.DimensionSelector; -import io.druid.segment.VirtualColumn; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.column.ColumnCapabilitiesImpl; -import io.druid.segment.column.ValueType; +import org.apache.druid.math.expr.Expr; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.math.expr.Parser; +import org.apache.druid.query.cache.CacheKeyBuilder; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.VirtualColumn; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.column.ColumnCapabilitiesImpl; +import org.apache.druid.segment.column.ValueType; import java.util.List; import java.util.Objects; diff --git a/processing/src/main/java/io/druid/segment/virtual/SingleInputBindings.java b/processing/src/main/java/org/apache/druid/segment/virtual/SingleInputBindings.java similarity index 93% rename from processing/src/main/java/io/druid/segment/virtual/SingleInputBindings.java rename to processing/src/main/java/org/apache/druid/segment/virtual/SingleInputBindings.java index 1ac96d1f0640..eecc9feaf61b 100644 --- a/processing/src/main/java/io/druid/segment/virtual/SingleInputBindings.java +++ b/processing/src/main/java/org/apache/druid/segment/virtual/SingleInputBindings.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.virtual; +package org.apache.druid.segment.virtual; -import io.druid.math.expr.Expr; +import org.apache.druid.math.expr.Expr; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/segment/virtual/SingleLongInputCachingExpressionColumnValueSelector.java b/processing/src/main/java/org/apache/druid/segment/virtual/SingleLongInputCachingExpressionColumnValueSelector.java similarity index 92% rename from processing/src/main/java/io/druid/segment/virtual/SingleLongInputCachingExpressionColumnValueSelector.java rename to processing/src/main/java/org/apache/druid/segment/virtual/SingleLongInputCachingExpressionColumnValueSelector.java index d7af85fcf561..f3ffe8318612 100644 --- a/processing/src/main/java/io/druid/segment/virtual/SingleLongInputCachingExpressionColumnValueSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/virtual/SingleLongInputCachingExpressionColumnValueSelector.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.segment.virtual; +package org.apache.druid.segment.virtual; import com.google.common.base.Preconditions; -import io.druid.java.util.common.ISE; -import io.druid.math.expr.Expr; -import io.druid.math.expr.ExprEval; -import io.druid.math.expr.Parser; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnValueSelector; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.math.expr.Expr; +import org.apache.druid.math.expr.ExprEval; +import org.apache.druid.math.expr.Parser; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnValueSelector; import javax.annotation.Nonnull; diff --git a/processing/src/main/java/io/druid/segment/virtual/SingleStringInputCachingExpressionColumnValueSelector.java b/processing/src/main/java/org/apache/druid/segment/virtual/SingleStringInputCachingExpressionColumnValueSelector.java similarity index 91% rename from processing/src/main/java/io/druid/segment/virtual/SingleStringInputCachingExpressionColumnValueSelector.java rename to processing/src/main/java/org/apache/druid/segment/virtual/SingleStringInputCachingExpressionColumnValueSelector.java index d18a8de4ce33..cef8436efd14 100644 --- a/processing/src/main/java/io/druid/segment/virtual/SingleStringInputCachingExpressionColumnValueSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/virtual/SingleStringInputCachingExpressionColumnValueSelector.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.segment.virtual; +package org.apache.druid.segment.virtual; import com.google.common.base.Preconditions; import com.google.common.base.Supplier; -import io.druid.java.util.common.ISE; -import io.druid.math.expr.Expr; -import io.druid.math.expr.ExprEval; -import io.druid.math.expr.Parser; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.DimensionSelector; -import io.druid.segment.data.IndexedInts; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.math.expr.Expr; +import org.apache.druid.math.expr.ExprEval; +import org.apache.druid.math.expr.Parser; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.data.IndexedInts; import it.unimi.dsi.fastutil.ints.Int2ObjectLinkedOpenHashMap; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/segment/virtual/SingleStringInputDimensionSelector.java b/processing/src/main/java/org/apache/druid/segment/virtual/SingleStringInputDimensionSelector.java similarity index 87% rename from processing/src/main/java/io/druid/segment/virtual/SingleStringInputDimensionSelector.java rename to processing/src/main/java/org/apache/druid/segment/virtual/SingleStringInputDimensionSelector.java index 33408f9c43d9..ce49901553b3 100644 --- a/processing/src/main/java/io/druid/segment/virtual/SingleStringInputDimensionSelector.java +++ b/processing/src/main/java/org/apache/druid/segment/virtual/SingleStringInputDimensionSelector.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.segment.virtual; +package org.apache.druid.segment.virtual; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; -import io.druid.java.util.common.ISE; -import io.druid.math.expr.Expr; -import io.druid.math.expr.Parser; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.DimensionSelector; -import io.druid.segment.DimensionSelectorUtils; -import io.druid.segment.IdLookup; -import io.druid.segment.data.IndexedInts; -import io.druid.segment.data.SingleIndexedInt; -import io.druid.segment.data.ZeroIndexedInts; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.math.expr.Expr; +import org.apache.druid.math.expr.Parser; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.DimensionSelectorUtils; +import org.apache.druid.segment.IdLookup; +import org.apache.druid.segment.data.IndexedInts; +import org.apache.druid.segment.data.SingleIndexedInt; +import org.apache.druid.segment.data.ZeroIndexedInts; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/segment/virtual/VirtualColumnCacheHelper.java b/processing/src/main/java/org/apache/druid/segment/virtual/VirtualColumnCacheHelper.java similarity index 96% rename from processing/src/main/java/io/druid/segment/virtual/VirtualColumnCacheHelper.java rename to processing/src/main/java/org/apache/druid/segment/virtual/VirtualColumnCacheHelper.java index 504d341cd029..a116c0b92bb7 100644 --- a/processing/src/main/java/io/druid/segment/virtual/VirtualColumnCacheHelper.java +++ b/processing/src/main/java/org/apache/druid/segment/virtual/VirtualColumnCacheHelper.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.virtual; +package org.apache.druid.segment.virtual; public class VirtualColumnCacheHelper { diff --git a/processing/src/main/java/io/druid/segment/virtual/VirtualizedColumnSelectorFactory.java b/processing/src/main/java/org/apache/druid/segment/virtual/VirtualizedColumnSelectorFactory.java similarity index 86% rename from processing/src/main/java/io/druid/segment/virtual/VirtualizedColumnSelectorFactory.java rename to processing/src/main/java/org/apache/druid/segment/virtual/VirtualizedColumnSelectorFactory.java index 4b771459c8d3..35805f5b5cab 100644 --- a/processing/src/main/java/io/druid/segment/virtual/VirtualizedColumnSelectorFactory.java +++ b/processing/src/main/java/org/apache/druid/segment/virtual/VirtualizedColumnSelectorFactory.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.segment.virtual; +package org.apache.druid.segment.virtual; import com.google.common.base.Preconditions; -import io.druid.query.dimension.DimensionSpec; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.DimensionSelector; -import io.druid.segment.VirtualColumns; -import io.druid.segment.column.ColumnCapabilities; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.VirtualColumns; +import org.apache.druid.segment.column.ColumnCapabilities; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/segment/writeout/ByteBufferWriteOutBytes.java b/processing/src/main/java/org/apache/druid/segment/writeout/ByteBufferWriteOutBytes.java similarity index 97% rename from processing/src/main/java/io/druid/segment/writeout/ByteBufferWriteOutBytes.java rename to processing/src/main/java/org/apache/druid/segment/writeout/ByteBufferWriteOutBytes.java index e96e9eb01023..59c8733b2266 100644 --- a/processing/src/main/java/io/druid/segment/writeout/ByteBufferWriteOutBytes.java +++ b/processing/src/main/java/org/apache/druid/segment/writeout/ByteBufferWriteOutBytes.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment.writeout; +package org.apache.druid.segment.writeout; import com.google.common.base.Preconditions; import com.google.common.io.ByteSource; import com.google.common.primitives.Ints; -import io.druid.io.ByteBufferInputStream; -import io.druid.io.Channels; -import io.druid.java.util.common.IAE; +import org.apache.druid.io.ByteBufferInputStream; +import org.apache.druid.io.Channels; +import org.apache.druid.java.util.common.IAE; import java.io.IOException; import java.io.InputStream; diff --git a/processing/src/main/java/io/druid/segment/writeout/DirectByteBufferWriteOutBytes.java b/processing/src/main/java/org/apache/druid/segment/writeout/DirectByteBufferWriteOutBytes.java similarity index 92% rename from processing/src/main/java/io/druid/segment/writeout/DirectByteBufferWriteOutBytes.java rename to processing/src/main/java/org/apache/druid/segment/writeout/DirectByteBufferWriteOutBytes.java index ba6c0dd47f54..41f0b6f0bd98 100644 --- a/processing/src/main/java/io/druid/segment/writeout/DirectByteBufferWriteOutBytes.java +++ b/processing/src/main/java/org/apache/druid/segment/writeout/DirectByteBufferWriteOutBytes.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.writeout; +package org.apache.druid.segment.writeout; -import io.druid.java.util.common.ByteBufferUtils; +import org.apache.druid.java.util.common.ByteBufferUtils; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/segment/writeout/FileWriteOutBytes.java b/processing/src/main/java/org/apache/druid/segment/writeout/FileWriteOutBytes.java similarity index 96% rename from processing/src/main/java/io/druid/segment/writeout/FileWriteOutBytes.java rename to processing/src/main/java/org/apache/druid/segment/writeout/FileWriteOutBytes.java index e2eaeac8da6b..14fb0f33f3e6 100644 --- a/processing/src/main/java/io/druid/segment/writeout/FileWriteOutBytes.java +++ b/processing/src/main/java/org/apache/druid/segment/writeout/FileWriteOutBytes.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment.writeout; +package org.apache.druid.segment.writeout; import com.google.common.io.ByteStreams; -import io.druid.io.Channels; -import io.druid.java.util.common.IAE; +import org.apache.druid.io.Channels; +import org.apache.druid.java.util.common.IAE; import java.io.File; import java.io.FileInputStream; diff --git a/processing/src/main/java/io/druid/segment/writeout/HeapByteBufferWriteOutBytes.java b/processing/src/main/java/org/apache/druid/segment/writeout/HeapByteBufferWriteOutBytes.java similarity index 95% rename from processing/src/main/java/io/druid/segment/writeout/HeapByteBufferWriteOutBytes.java rename to processing/src/main/java/org/apache/druid/segment/writeout/HeapByteBufferWriteOutBytes.java index 1eb316092411..2ff770378829 100644 --- a/processing/src/main/java/io/druid/segment/writeout/HeapByteBufferWriteOutBytes.java +++ b/processing/src/main/java/org/apache/druid/segment/writeout/HeapByteBufferWriteOutBytes.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.writeout; +package org.apache.druid.segment.writeout; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/segment/writeout/OffHeapMemorySegmentWriteOutMedium.java b/processing/src/main/java/org/apache/druid/segment/writeout/OffHeapMemorySegmentWriteOutMedium.java similarity index 93% rename from processing/src/main/java/io/druid/segment/writeout/OffHeapMemorySegmentWriteOutMedium.java rename to processing/src/main/java/org/apache/druid/segment/writeout/OffHeapMemorySegmentWriteOutMedium.java index c30c6990cd13..b9edb93bb4e8 100644 --- a/processing/src/main/java/io/druid/segment/writeout/OffHeapMemorySegmentWriteOutMedium.java +++ b/processing/src/main/java/org/apache/druid/segment/writeout/OffHeapMemorySegmentWriteOutMedium.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.writeout; +package org.apache.druid.segment.writeout; -import io.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.io.Closer; import java.io.IOException; diff --git a/processing/src/main/java/io/druid/segment/writeout/OffHeapMemorySegmentWriteOutMediumFactory.java b/processing/src/main/java/org/apache/druid/segment/writeout/OffHeapMemorySegmentWriteOutMediumFactory.java similarity index 97% rename from processing/src/main/java/io/druid/segment/writeout/OffHeapMemorySegmentWriteOutMediumFactory.java rename to processing/src/main/java/org/apache/druid/segment/writeout/OffHeapMemorySegmentWriteOutMediumFactory.java index 65fcd1cbf351..052001bf1b36 100644 --- a/processing/src/main/java/io/druid/segment/writeout/OffHeapMemorySegmentWriteOutMediumFactory.java +++ b/processing/src/main/java/org/apache/druid/segment/writeout/OffHeapMemorySegmentWriteOutMediumFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.writeout; +package org.apache.druid.segment.writeout; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/processing/src/main/java/io/druid/segment/writeout/OnHeapMemorySegmentWriteOutMedium.java b/processing/src/main/java/org/apache/druid/segment/writeout/OnHeapMemorySegmentWriteOutMedium.java similarity index 93% rename from processing/src/main/java/io/druid/segment/writeout/OnHeapMemorySegmentWriteOutMedium.java rename to processing/src/main/java/org/apache/druid/segment/writeout/OnHeapMemorySegmentWriteOutMedium.java index 6a99ba3472fd..5e154c474a43 100644 --- a/processing/src/main/java/io/druid/segment/writeout/OnHeapMemorySegmentWriteOutMedium.java +++ b/processing/src/main/java/org/apache/druid/segment/writeout/OnHeapMemorySegmentWriteOutMedium.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.writeout; +package org.apache.druid.segment.writeout; import com.google.common.annotations.VisibleForTesting; -import io.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.io.Closer; import java.io.IOException; diff --git a/processing/src/main/java/io/druid/segment/writeout/SegmentWriteOutMedium.java b/processing/src/main/java/org/apache/druid/segment/writeout/SegmentWriteOutMedium.java similarity index 95% rename from processing/src/main/java/io/druid/segment/writeout/SegmentWriteOutMedium.java rename to processing/src/main/java/org/apache/druid/segment/writeout/SegmentWriteOutMedium.java index e27f280fba78..1fb5371edac1 100644 --- a/processing/src/main/java/io/druid/segment/writeout/SegmentWriteOutMedium.java +++ b/processing/src/main/java/org/apache/druid/segment/writeout/SegmentWriteOutMedium.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.writeout; +package org.apache.druid.segment.writeout; -import io.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.io.Closer; import java.io.Closeable; import java.io.IOException; diff --git a/processing/src/main/java/io/druid/segment/writeout/SegmentWriteOutMediumFactory.java b/processing/src/main/java/org/apache/druid/segment/writeout/SegmentWriteOutMediumFactory.java similarity index 97% rename from processing/src/main/java/io/druid/segment/writeout/SegmentWriteOutMediumFactory.java rename to processing/src/main/java/org/apache/druid/segment/writeout/SegmentWriteOutMediumFactory.java index d42daad9d0e6..be55b4fd2cb2 100644 --- a/processing/src/main/java/io/druid/segment/writeout/SegmentWriteOutMediumFactory.java +++ b/processing/src/main/java/org/apache/druid/segment/writeout/SegmentWriteOutMediumFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.writeout; +package org.apache.druid.segment.writeout; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/processing/src/main/java/io/druid/segment/writeout/SegmentWriteOutMediumModule.java b/processing/src/main/java/org/apache/druid/segment/writeout/SegmentWriteOutMediumModule.java similarity index 92% rename from processing/src/main/java/io/druid/segment/writeout/SegmentWriteOutMediumModule.java rename to processing/src/main/java/org/apache/druid/segment/writeout/SegmentWriteOutMediumModule.java index d1809eb3feb5..8728ff9c8b4a 100644 --- a/processing/src/main/java/io/druid/segment/writeout/SegmentWriteOutMediumModule.java +++ b/processing/src/main/java/org/apache/druid/segment/writeout/SegmentWriteOutMediumModule.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment.writeout; +package org.apache.druid.segment.writeout; import com.google.inject.Binder; import com.google.inject.Module; -import io.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.JsonConfigProvider; public class SegmentWriteOutMediumModule implements Module { diff --git a/processing/src/main/java/io/druid/segment/writeout/TmpFileSegmentWriteOutMedium.java b/processing/src/main/java/org/apache/druid/segment/writeout/TmpFileSegmentWriteOutMedium.java similarity index 95% rename from processing/src/main/java/io/druid/segment/writeout/TmpFileSegmentWriteOutMedium.java rename to processing/src/main/java/org/apache/druid/segment/writeout/TmpFileSegmentWriteOutMedium.java index 9b30ad9ab05c..ee3f881e0878 100644 --- a/processing/src/main/java/io/druid/segment/writeout/TmpFileSegmentWriteOutMedium.java +++ b/processing/src/main/java/org/apache/druid/segment/writeout/TmpFileSegmentWriteOutMedium.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.writeout; +package org.apache.druid.segment.writeout; -import io.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.io.Closer; import org.apache.commons.io.FileUtils; import java.io.File; diff --git a/processing/src/main/java/io/druid/segment/writeout/TmpFileSegmentWriteOutMediumFactory.java b/processing/src/main/java/org/apache/druid/segment/writeout/TmpFileSegmentWriteOutMediumFactory.java similarity index 97% rename from processing/src/main/java/io/druid/segment/writeout/TmpFileSegmentWriteOutMediumFactory.java rename to processing/src/main/java/org/apache/druid/segment/writeout/TmpFileSegmentWriteOutMediumFactory.java index 6684a5ff7303..82d74f7bde49 100644 --- a/processing/src/main/java/io/druid/segment/writeout/TmpFileSegmentWriteOutMediumFactory.java +++ b/processing/src/main/java/org/apache/druid/segment/writeout/TmpFileSegmentWriteOutMediumFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.writeout; +package org.apache.druid.segment.writeout; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/processing/src/main/java/io/druid/segment/writeout/WriteOutBytes.java b/processing/src/main/java/org/apache/druid/segment/writeout/WriteOutBytes.java similarity index 98% rename from processing/src/main/java/io/druid/segment/writeout/WriteOutBytes.java rename to processing/src/main/java/org/apache/druid/segment/writeout/WriteOutBytes.java index 37d0bb386602..f6a5e71ce93f 100644 --- a/processing/src/main/java/io/druid/segment/writeout/WriteOutBytes.java +++ b/processing/src/main/java/org/apache/druid/segment/writeout/WriteOutBytes.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.writeout; +package org.apache.druid.segment.writeout; import java.io.IOException; import java.io.InputStream; diff --git a/processing/src/test/java/io/druid/collections/CombiningIterableTest.java b/processing/src/test/java/org/apache/druid/collections/CombiningIterableTest.java similarity index 93% rename from processing/src/test/java/io/druid/collections/CombiningIterableTest.java rename to processing/src/test/java/org/apache/druid/collections/CombiningIterableTest.java index 886cd1f4ac0a..83ac6d657e5f 100644 --- a/processing/src/test/java/io/druid/collections/CombiningIterableTest.java +++ b/processing/src/test/java/org/apache/druid/collections/CombiningIterableTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.collections; +package org.apache.druid.collections; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.guava.nary.BinaryFn; -import io.druid.query.Result; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.guava.nary.BinaryFn; +import org.apache.druid.query.Result; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/collections/IntSetTestUtility.java b/processing/src/test/java/org/apache/druid/collections/IntSetTestUtility.java similarity index 94% rename from processing/src/test/java/io/druid/collections/IntSetTestUtility.java rename to processing/src/test/java/org/apache/druid/collections/IntSetTestUtility.java index 8d0b552ff509..30fc99e57c8f 100644 --- a/processing/src/test/java/io/druid/collections/IntSetTestUtility.java +++ b/processing/src/test/java/org/apache/druid/collections/IntSetTestUtility.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.collections; +package org.apache.druid.collections; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.collections.bitmap.MutableBitmap; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.collections.bitmap.MutableBitmap; import org.roaringbitmap.IntIterator; import java.util.BitSet; diff --git a/processing/src/test/java/io/druid/collections/TestIntegerSet.java b/processing/src/test/java/org/apache/druid/collections/TestIntegerSet.java similarity index 96% rename from processing/src/test/java/io/druid/collections/TestIntegerSet.java rename to processing/src/test/java/org/apache/druid/collections/TestIntegerSet.java index 001bc912ea06..5165c1d4b3fb 100644 --- a/processing/src/test/java/io/druid/collections/TestIntegerSet.java +++ b/processing/src/test/java/org/apache/druid/collections/TestIntegerSet.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.collections; +package org.apache.druid.collections; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import io.druid.collections.bitmap.MutableBitmap; -import io.druid.collections.bitmap.WrappedBitSetBitmap; -import io.druid.collections.bitmap.WrappedConciseBitmap; -import io.druid.collections.bitmap.WrappedRoaringBitmap; +import org.apache.druid.collections.bitmap.MutableBitmap; +import org.apache.druid.collections.bitmap.WrappedBitSetBitmap; +import org.apache.druid.collections.bitmap.WrappedConciseBitmap; +import org.apache.druid.collections.bitmap.WrappedRoaringBitmap; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/collections/bitmap/BitmapBenchmark.java b/processing/src/test/java/org/apache/druid/collections/bitmap/BitmapBenchmark.java similarity index 98% rename from processing/src/test/java/io/druid/collections/bitmap/BitmapBenchmark.java rename to processing/src/test/java/org/apache/druid/collections/bitmap/BitmapBenchmark.java index c20d534161b8..2c34deac7e5e 100644 --- a/processing/src/test/java/io/druid/collections/bitmap/BitmapBenchmark.java +++ b/processing/src/test/java/org/apache/druid/collections/bitmap/BitmapBenchmark.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.collections.bitmap; +package org.apache.druid.collections.bitmap; import com.carrotsearch.junitbenchmarks.BenchmarkOptions; import com.carrotsearch.junitbenchmarks.BenchmarkRule; import com.carrotsearch.junitbenchmarks.Clock; -import io.druid.extendedset.intset.ImmutableConciseSet; +import org.apache.druid.extendedset.intset.ImmutableConciseSet; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/collections/bitmap/BitmapIterationTest.java b/processing/src/test/java/org/apache/druid/collections/bitmap/BitmapIterationTest.java similarity index 99% rename from processing/src/test/java/io/druid/collections/bitmap/BitmapIterationTest.java rename to processing/src/test/java/org/apache/druid/collections/bitmap/BitmapIterationTest.java index 120e976e919d..be37546d3bb7 100644 --- a/processing/src/test/java/io/druid/collections/bitmap/BitmapIterationTest.java +++ b/processing/src/test/java/org/apache/druid/collections/bitmap/BitmapIterationTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.collections.bitmap; +package org.apache.druid.collections.bitmap; import com.google.common.collect.UnmodifiableIterator; import com.google.common.collect.testing.CollectionTestSuiteBuilder; diff --git a/processing/src/test/java/io/druid/collections/bitmap/ConciseBitmapFactoryTest.java b/processing/src/test/java/org/apache/druid/collections/bitmap/ConciseBitmapFactoryTest.java similarity index 94% rename from processing/src/test/java/io/druid/collections/bitmap/ConciseBitmapFactoryTest.java rename to processing/src/test/java/org/apache/druid/collections/bitmap/ConciseBitmapFactoryTest.java index 8c90c5e8561c..02c530f39f02 100644 --- a/processing/src/test/java/io/druid/collections/bitmap/ConciseBitmapFactoryTest.java +++ b/processing/src/test/java/org/apache/druid/collections/bitmap/ConciseBitmapFactoryTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.collections.bitmap; +package org.apache.druid.collections.bitmap; import com.google.common.base.Function; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; -import io.druid.extendedset.intset.ConciseSet; -import io.druid.extendedset.intset.ImmutableConciseSet; +import org.apache.druid.extendedset.intset.ConciseSet; +import org.apache.druid.extendedset.intset.ImmutableConciseSet; import junit.framework.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/collections/bitmap/RangeBitmapBenchmarkTest.java b/processing/src/test/java/org/apache/druid/collections/bitmap/RangeBitmapBenchmarkTest.java similarity index 91% rename from processing/src/test/java/io/druid/collections/bitmap/RangeBitmapBenchmarkTest.java rename to processing/src/test/java/org/apache/druid/collections/bitmap/RangeBitmapBenchmarkTest.java index 1a4d91046f70..6f97e4b37956 100644 --- a/processing/src/test/java/io/druid/collections/bitmap/RangeBitmapBenchmarkTest.java +++ b/processing/src/test/java/org/apache/druid/collections/bitmap/RangeBitmapBenchmarkTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.collections.bitmap; +package org.apache.druid.collections.bitmap; import com.carrotsearch.junitbenchmarks.annotation.BenchmarkHistoryChart; import com.carrotsearch.junitbenchmarks.annotation.LabelType; -import io.druid.extendedset.intset.ConciseSet; -import io.druid.extendedset.intset.ImmutableConciseSet; -import io.druid.java.util.common.StringUtils; -import io.druid.collections.test.annotation.Benchmark; +import org.apache.druid.extendedset.intset.ConciseSet; +import org.apache.druid.extendedset.intset.ImmutableConciseSet; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.collections.test.annotation.Benchmark; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; import org.roaringbitmap.buffer.MutableRoaringBitmap; diff --git a/processing/src/test/java/io/druid/collections/bitmap/RoaringBitmapFactoryTest.java b/processing/src/test/java/org/apache/druid/collections/bitmap/RoaringBitmapFactoryTest.java similarity index 98% rename from processing/src/test/java/io/druid/collections/bitmap/RoaringBitmapFactoryTest.java rename to processing/src/test/java/org/apache/druid/collections/bitmap/RoaringBitmapFactoryTest.java index 600c483bfb6f..af60e3f806e1 100644 --- a/processing/src/test/java/io/druid/collections/bitmap/RoaringBitmapFactoryTest.java +++ b/processing/src/test/java/org/apache/druid/collections/bitmap/RoaringBitmapFactoryTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.collections.bitmap; +package org.apache.druid.collections.bitmap; import com.google.common.base.Function; import com.google.common.collect.Iterables; diff --git a/processing/src/test/java/io/druid/collections/bitmap/UniformBitmapBenchmarkTest.java b/processing/src/test/java/org/apache/druid/collections/bitmap/UniformBitmapBenchmarkTest.java similarity index 90% rename from processing/src/test/java/io/druid/collections/bitmap/UniformBitmapBenchmarkTest.java rename to processing/src/test/java/org/apache/druid/collections/bitmap/UniformBitmapBenchmarkTest.java index ec90a64d2c41..d0af420dbc05 100644 --- a/processing/src/test/java/io/druid/collections/bitmap/UniformBitmapBenchmarkTest.java +++ b/processing/src/test/java/org/apache/druid/collections/bitmap/UniformBitmapBenchmarkTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.collections.bitmap; +package org.apache.druid.collections.bitmap; import com.carrotsearch.junitbenchmarks.annotation.BenchmarkHistoryChart; import com.carrotsearch.junitbenchmarks.annotation.LabelType; -import io.druid.extendedset.intset.ConciseSet; -import io.druid.extendedset.intset.ImmutableConciseSet; -import io.druid.java.util.common.StringUtils; -import io.druid.collections.test.annotation.Benchmark; +import org.apache.druid.extendedset.intset.ConciseSet; +import org.apache.druid.extendedset.intset.ImmutableConciseSet; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.collections.test.annotation.Benchmark; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; import org.roaringbitmap.buffer.MutableRoaringBitmap; diff --git a/processing/src/test/java/io/druid/collections/bitmap/WrappedBitSetBitmapBitSetTest.java b/processing/src/test/java/org/apache/druid/collections/bitmap/WrappedBitSetBitmapBitSetTest.java similarity index 98% rename from processing/src/test/java/io/druid/collections/bitmap/WrappedBitSetBitmapBitSetTest.java rename to processing/src/test/java/org/apache/druid/collections/bitmap/WrappedBitSetBitmapBitSetTest.java index b9dfe07c26d3..974dd0baeeb5 100644 --- a/processing/src/test/java/io/druid/collections/bitmap/WrappedBitSetBitmapBitSetTest.java +++ b/processing/src/test/java/org/apache/druid/collections/bitmap/WrappedBitSetBitmapBitSetTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.collections.bitmap; +package org.apache.druid.collections.bitmap; import com.google.common.collect.Sets; -import io.druid.collections.IntSetTestUtility; +import org.apache.druid.collections.IntSetTestUtility; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/collections/bitmap/WrappedRoaringBitmapTest.java b/processing/src/test/java/org/apache/druid/collections/bitmap/WrappedRoaringBitmapTest.java similarity index 98% rename from processing/src/test/java/io/druid/collections/bitmap/WrappedRoaringBitmapTest.java rename to processing/src/test/java/org/apache/druid/collections/bitmap/WrappedRoaringBitmapTest.java index ed4722b36079..798a3f49d703 100644 --- a/processing/src/test/java/io/druid/collections/bitmap/WrappedRoaringBitmapTest.java +++ b/processing/src/test/java/org/apache/druid/collections/bitmap/WrappedRoaringBitmapTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.collections.bitmap; +package org.apache.druid.collections.bitmap; import junit.framework.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/collections/spatial/ImmutableRTreeTest.java b/processing/src/test/java/org/apache/druid/collections/spatial/ImmutableRTreeTest.java similarity index 97% rename from processing/src/test/java/io/druid/collections/spatial/ImmutableRTreeTest.java rename to processing/src/test/java/org/apache/druid/collections/spatial/ImmutableRTreeTest.java index 6736bb2c40ee..1d12d379ab20 100644 --- a/processing/src/test/java/io/druid/collections/spatial/ImmutableRTreeTest.java +++ b/processing/src/test/java/org/apache/druid/collections/spatial/ImmutableRTreeTest.java @@ -17,23 +17,23 @@ * under the License. */ -package io.druid.collections.spatial; +package org.apache.druid.collections.spatial; import com.google.common.base.Stopwatch; import com.google.common.base.Throwables; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import com.google.common.primitives.Bytes; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.ConciseBitmapFactory; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.collections.bitmap.RoaringBitmapFactory; -import io.druid.collections.spatial.search.PolygonBound; -import io.druid.collections.spatial.search.RadiusBound; -import io.druid.collections.spatial.search.RectangularBound; -import io.druid.collections.spatial.split.LinearGutmanSplitStrategy; -import io.druid.segment.data.GenericIndexed; -import io.druid.segment.data.ImmutableRTreeObjectStrategy; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.ConciseBitmapFactory; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.collections.bitmap.RoaringBitmapFactory; +import org.apache.druid.collections.spatial.search.PolygonBound; +import org.apache.druid.collections.spatial.search.RadiusBound; +import org.apache.druid.collections.spatial.search.RectangularBound; +import org.apache.druid.collections.spatial.split.LinearGutmanSplitStrategy; +import org.apache.druid.segment.data.GenericIndexed; +import org.apache.druid.segment.data.ImmutableRTreeObjectStrategy; import junit.framework.Assert; import org.junit.Test; import org.roaringbitmap.IntIterator; diff --git a/processing/src/test/java/io/druid/collections/spatial/RTreeTest.java b/processing/src/test/java/org/apache/druid/collections/spatial/RTreeTest.java similarity index 91% rename from processing/src/test/java/io/druid/collections/spatial/RTreeTest.java rename to processing/src/test/java/org/apache/druid/collections/spatial/RTreeTest.java index 827d610a2887..79d0daa81bcc 100644 --- a/processing/src/test/java/io/druid/collections/spatial/RTreeTest.java +++ b/processing/src/test/java/org/apache/druid/collections/spatial/RTreeTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.collections.spatial; +package org.apache.druid.collections.spatial; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.ConciseBitmapFactory; -import io.druid.collections.bitmap.RoaringBitmapFactory; -import io.druid.collections.spatial.split.LinearGutmanSplitStrategy; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.ConciseBitmapFactory; +import org.apache.druid.collections.bitmap.RoaringBitmapFactory; +import org.apache.druid.collections.spatial.split.LinearGutmanSplitStrategy; import junit.framework.Assert; import org.junit.Before; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/collections/spatial/search/PolygonBoundTest.java b/processing/src/test/java/org/apache/druid/collections/spatial/search/PolygonBoundTest.java similarity index 98% rename from processing/src/test/java/io/druid/collections/spatial/search/PolygonBoundTest.java rename to processing/src/test/java/org/apache/druid/collections/spatial/search/PolygonBoundTest.java index b0c0651b47a6..5172bafa08d0 100644 --- a/processing/src/test/java/io/druid/collections/spatial/search/PolygonBoundTest.java +++ b/processing/src/test/java/org/apache/druid/collections/spatial/search/PolygonBoundTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.collections.spatial.search; +package org.apache.druid.collections.spatial.search; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/collections/spatial/search/RadiusBoundTest.java b/processing/src/test/java/org/apache/druid/collections/spatial/search/RadiusBoundTest.java similarity index 96% rename from processing/src/test/java/io/druid/collections/spatial/search/RadiusBoundTest.java rename to processing/src/test/java/org/apache/druid/collections/spatial/search/RadiusBoundTest.java index c5f5675eab78..53b0a0006e53 100644 --- a/processing/src/test/java/io/druid/collections/spatial/search/RadiusBoundTest.java +++ b/processing/src/test/java/org/apache/druid/collections/spatial/search/RadiusBoundTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.collections.spatial.search; +package org.apache.druid.collections.spatial.search; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/collections/spatial/search/RectangularBoundTest.java b/processing/src/test/java/org/apache/druid/collections/spatial/search/RectangularBoundTest.java similarity index 97% rename from processing/src/test/java/io/druid/collections/spatial/search/RectangularBoundTest.java rename to processing/src/test/java/org/apache/druid/collections/spatial/search/RectangularBoundTest.java index bd4a26f145e8..b7ea2e589d9b 100644 --- a/processing/src/test/java/io/druid/collections/spatial/search/RectangularBoundTest.java +++ b/processing/src/test/java/org/apache/druid/collections/spatial/search/RectangularBoundTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.collections.spatial.search; +package org.apache.druid.collections.spatial.search; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/collections/spatial/split/LinearGutmanSplitStrategyTest.java b/processing/src/test/java/org/apache/druid/collections/spatial/split/LinearGutmanSplitStrategyTest.java similarity index 90% rename from processing/src/test/java/io/druid/collections/spatial/split/LinearGutmanSplitStrategyTest.java rename to processing/src/test/java/org/apache/druid/collections/spatial/split/LinearGutmanSplitStrategyTest.java index c90d6028e494..df6b63329719 100644 --- a/processing/src/test/java/io/druid/collections/spatial/split/LinearGutmanSplitStrategyTest.java +++ b/processing/src/test/java/org/apache/druid/collections/spatial/split/LinearGutmanSplitStrategyTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.collections.spatial.split; +package org.apache.druid.collections.spatial.split; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.ConciseBitmapFactory; -import io.druid.collections.bitmap.RoaringBitmapFactory; -import io.druid.collections.spatial.Node; -import io.druid.collections.spatial.Point; -import io.druid.collections.spatial.RTree; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.ConciseBitmapFactory; +import org.apache.druid.collections.bitmap.RoaringBitmapFactory; +import org.apache.druid.collections.spatial.Node; +import org.apache.druid.collections.spatial.Point; +import org.apache.druid.collections.spatial.RTree; import junit.framework.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/collections/test/annotation/Benchmark.java b/processing/src/test/java/org/apache/druid/collections/test/annotation/Benchmark.java similarity index 93% rename from processing/src/test/java/io/druid/collections/test/annotation/Benchmark.java rename to processing/src/test/java/org/apache/druid/collections/test/annotation/Benchmark.java index 534898479271..14020aec5be5 100644 --- a/processing/src/test/java/io/druid/collections/test/annotation/Benchmark.java +++ b/processing/src/test/java/org/apache/druid/collections/test/annotation/Benchmark.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.collections.test.annotation; +package org.apache.druid.collections.test.annotation; public interface Benchmark { diff --git a/processing/src/test/java/io/druid/collections/test/annotation/Dummy.java b/processing/src/test/java/org/apache/druid/collections/test/annotation/Dummy.java similarity index 93% rename from processing/src/test/java/io/druid/collections/test/annotation/Dummy.java rename to processing/src/test/java/org/apache/druid/collections/test/annotation/Dummy.java index 84ff197591e6..45e1e6633102 100644 --- a/processing/src/test/java/io/druid/collections/test/annotation/Dummy.java +++ b/processing/src/test/java/org/apache/druid/collections/test/annotation/Dummy.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.collections.test.annotation; +package org.apache.druid.collections.test.annotation; public interface Dummy { diff --git a/processing/src/test/java/io/druid/granularity/QueryGranularityTest.java b/processing/src/test/java/org/apache/druid/granularity/QueryGranularityTest.java similarity index 98% rename from processing/src/test/java/io/druid/granularity/QueryGranularityTest.java rename to processing/src/test/java/org/apache/druid/granularity/QueryGranularityTest.java index 04dad0e2e9c6..1485e846ee21 100644 --- a/processing/src/test/java/io/druid/granularity/QueryGranularityTest.java +++ b/processing/src/test/java/org/apache/druid/granularity/QueryGranularityTest.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.granularity; +package org.apache.druid.granularity; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.DurationGranularity; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.granularity.GranularityType; -import io.druid.java.util.common.granularity.PeriodGranularity; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.DurationGranularity; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.granularity.GranularityType; +import org.apache.druid.java.util.common.granularity.PeriodGranularity; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.Days; diff --git a/processing/src/test/java/io/druid/guice/ExtensionsConfigTest.java b/processing/src/test/java/org/apache/druid/guice/ExtensionsConfigTest.java similarity index 98% rename from processing/src/test/java/io/druid/guice/ExtensionsConfigTest.java rename to processing/src/test/java/org/apache/druid/guice/ExtensionsConfigTest.java index 3ed226ec2381..d5dd29addd6e 100644 --- a/processing/src/test/java/io/druid/guice/ExtensionsConfigTest.java +++ b/processing/src/test/java/org/apache/druid/guice/ExtensionsConfigTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; -import io.druid.segment.TestHelper; +import org.apache.druid.segment.TestHelper; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/guice/GuiceInjectorsTest.java b/processing/src/test/java/org/apache/druid/guice/GuiceInjectorsTest.java similarity index 98% rename from processing/src/test/java/io/druid/guice/GuiceInjectorsTest.java rename to processing/src/test/java/org/apache/druid/guice/GuiceInjectorsTest.java index 4993e02c7caf..99eafadad5d3 100644 --- a/processing/src/test/java/io/druid/guice/GuiceInjectorsTest.java +++ b/processing/src/test/java/org/apache/druid/guice/GuiceInjectorsTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.fasterxml.jackson.annotation.JacksonInject; import com.google.inject.Binder; diff --git a/processing/src/test/java/io/druid/guice/MetadataStorageTablesConfigTest.java b/processing/src/test/java/org/apache/druid/guice/MetadataStorageTablesConfigTest.java similarity index 95% rename from processing/src/test/java/io/druid/guice/MetadataStorageTablesConfigTest.java rename to processing/src/test/java/org/apache/druid/guice/MetadataStorageTablesConfigTest.java index fad4c87dbf9a..40f2d4805b97 100644 --- a/processing/src/test/java/io/druid/guice/MetadataStorageTablesConfigTest.java +++ b/processing/src/test/java/org/apache/druid/guice/MetadataStorageTablesConfigTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.inject.Binder; @@ -25,8 +25,8 @@ import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.Provides; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.metadata.MetadataStorageTablesConfig; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.metadata.MetadataStorageTablesConfig; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/guice/SegmentMetadataQueryConfigTest.java b/processing/src/test/java/org/apache/druid/guice/SegmentMetadataQueryConfigTest.java similarity index 93% rename from processing/src/test/java/io/druid/guice/SegmentMetadataQueryConfigTest.java rename to processing/src/test/java/org/apache/druid/guice/SegmentMetadataQueryConfigTest.java index 8557f7e36318..9817cb5b7000 100644 --- a/processing/src/test/java/io/druid/guice/SegmentMetadataQueryConfigTest.java +++ b/processing/src/test/java/org/apache/druid/guice/SegmentMetadataQueryConfigTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.inject.Binder; @@ -25,9 +25,9 @@ import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.Provides; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.query.metadata.SegmentMetadataQueryConfig; -import io.druid.query.metadata.metadata.SegmentMetadataQuery; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.query.metadata.SegmentMetadataQueryConfig; +import org.apache.druid.query.metadata.metadata.SegmentMetadataQuery; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/jackson/DefaultObjectMapperTest.java b/processing/src/test/java/org/apache/druid/jackson/DefaultObjectMapperTest.java similarity index 89% rename from processing/src/test/java/io/druid/jackson/DefaultObjectMapperTest.java rename to processing/src/test/java/org/apache/druid/jackson/DefaultObjectMapperTest.java index d3c3fed426ea..1c5560be7c65 100644 --- a/processing/src/test/java/io/druid/jackson/DefaultObjectMapperTest.java +++ b/processing/src/test/java/org/apache/druid/jackson/DefaultObjectMapperTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.jackson; +package org.apache.druid.jackson; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.StringUtils; import org.joda.time.DateTime; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/AsyncQueryRunnerTest.java b/processing/src/test/java/org/apache/druid/query/AsyncQueryRunnerTest.java similarity index 94% rename from processing/src/test/java/io/druid/query/AsyncQueryRunnerTest.java rename to processing/src/test/java/org/apache/druid/query/AsyncQueryRunnerTest.java index 0ea8fc875c1d..e2fb8bf0b9da 100644 --- a/processing/src/test/java/io/druid/query/AsyncQueryRunnerTest.java +++ b/processing/src/test/java/org/apache/druid/query/AsyncQueryRunnerTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.query.aggregation.CountAggregatorFactory; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/CachingEmitter.java b/processing/src/test/java/org/apache/druid/query/CachingEmitter.java similarity index 89% rename from processing/src/test/java/io/druid/query/CachingEmitter.java rename to processing/src/test/java/org/apache/druid/query/CachingEmitter.java index f6acaeb66f10..11014328537e 100644 --- a/processing/src/test/java/io/druid/query/CachingEmitter.java +++ b/processing/src/test/java/org/apache/druid/query/CachingEmitter.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; -import io.druid.java.util.emitter.core.Emitter; -import io.druid.java.util.emitter.core.Event; +import org.apache.druid.java.util.emitter.core.Emitter; +import org.apache.druid.java.util.emitter.core.Event; public class CachingEmitter implements Emitter { diff --git a/processing/src/test/java/io/druid/query/ChainedExecutionQueryRunnerTest.java b/processing/src/test/java/org/apache/druid/query/ChainedExecutionQueryRunnerTest.java similarity index 97% rename from processing/src/test/java/io/druid/query/ChainedExecutionQueryRunnerTest.java rename to processing/src/test/java/org/apache/druid/query/ChainedExecutionQueryRunnerTest.java index 191ef494134a..97c28909b380 100644 --- a/processing/src/test/java/io/druid/query/ChainedExecutionQueryRunnerTest.java +++ b/processing/src/test/java/org/apache/druid/query/ChainedExecutionQueryRunnerTest.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.timeseries.TimeseriesQuery; import org.easymock.Capture; import org.easymock.EasyMock; import org.easymock.IAnswer; diff --git a/processing/src/test/java/io/druid/query/DataSourceTest.java b/processing/src/test/java/org/apache/druid/query/DataSourceTest.java similarity index 93% rename from processing/src/test/java/io/druid/query/DataSourceTest.java rename to processing/src/test/java/org/apache/druid/query/DataSourceTest.java index 1bf056829470..750331b8557f 100644 --- a/processing/src/test/java/io/druid/query/DataSourceTest.java +++ b/processing/src/test/java/org/apache/druid/query/DataSourceTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Lists; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.groupby.GroupByQuery; -import io.druid.segment.TestHelper; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.groupby.GroupByQuery; +import org.apache.druid.segment.TestHelper; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/DefaultQueryMetricsTest.java b/processing/src/test/java/org/apache/druid/query/DefaultQueryMetricsTest.java similarity index 92% rename from processing/src/test/java/io/druid/query/DefaultQueryMetricsTest.java rename to processing/src/test/java/org/apache/druid/query/DefaultQueryMetricsTest.java index d26153aadf81..ac022cacfffa 100644 --- a/processing/src/test/java/io/druid/query/DefaultQueryMetricsTest.java +++ b/processing/src/test/java/org/apache/druid/query/DefaultQueryMetricsTest.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.collect.ImmutableSet; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.dimension.ListFilteredDimensionSpec; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.query.topn.TopNQuery; -import io.druid.query.topn.TopNQueryBuilder; -import io.druid.segment.TestHelper; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.ListFilteredDimensionSpec; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.query.topn.TopNQuery; +import org.apache.druid.query.topn.TopNQueryBuilder; +import org.apache.druid.segment.TestHelper; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/DoubleStorageTest.java b/processing/src/test/java/org/apache/druid/query/DoubleStorageTest.java similarity index 83% rename from processing/src/test/java/io/druid/query/DoubleStorageTest.java rename to processing/src/test/java/org/apache/druid/query/DoubleStorageTest.java index d9a64eae501e..5e1283f1b6d8 100644 --- a/processing/src/test/java/io/druid/query/DoubleStorageTest.java +++ b/processing/src/test/java/org/apache/druid/query/DoubleStorageTest.java @@ -16,47 +16,47 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.JSONParseSpec; -import io.druid.data.input.impl.MapInputRowParser; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.query.aggregation.DoubleSumAggregatorFactory; -import io.druid.query.metadata.SegmentMetadataQueryConfig; -import io.druid.query.metadata.SegmentMetadataQueryQueryToolChest; -import io.druid.query.metadata.SegmentMetadataQueryRunnerFactory; -import io.druid.query.metadata.metadata.ColumnAnalysis; -import io.druid.query.metadata.metadata.ListColumnIncluderator; -import io.druid.query.metadata.metadata.SegmentAnalysis; -import io.druid.query.metadata.metadata.SegmentMetadataQuery; -import io.druid.query.scan.ScanQuery; -import io.druid.query.scan.ScanQueryConfig; -import io.druid.query.scan.ScanQueryEngine; -import io.druid.query.scan.ScanQueryQueryToolChest; -import io.druid.query.scan.ScanQueryRunnerFactory; -import io.druid.query.scan.ScanQueryRunnerTest; -import io.druid.query.scan.ScanResultValue; -import io.druid.query.spec.LegacySegmentSpec; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMergerV9; -import io.druid.segment.IndexSpec; -import io.druid.segment.QueryableIndex; -import io.druid.segment.QueryableIndexSegment; -import io.druid.segment.TestHelper; -import io.druid.segment.column.Column; -import io.druid.segment.column.ValueType; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexSchema; -import io.druid.segment.incremental.IndexSizeExceededException; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.JSONParseSpec; +import org.apache.druid.data.input.impl.MapInputRowParser; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; +import org.apache.druid.query.metadata.SegmentMetadataQueryConfig; +import org.apache.druid.query.metadata.SegmentMetadataQueryQueryToolChest; +import org.apache.druid.query.metadata.SegmentMetadataQueryRunnerFactory; +import org.apache.druid.query.metadata.metadata.ColumnAnalysis; +import org.apache.druid.query.metadata.metadata.ListColumnIncluderator; +import org.apache.druid.query.metadata.metadata.SegmentAnalysis; +import org.apache.druid.query.metadata.metadata.SegmentMetadataQuery; +import org.apache.druid.query.scan.ScanQuery; +import org.apache.druid.query.scan.ScanQueryConfig; +import org.apache.druid.query.scan.ScanQueryEngine; +import org.apache.druid.query.scan.ScanQueryQueryToolChest; +import org.apache.druid.query.scan.ScanQueryRunnerFactory; +import org.apache.druid.query.scan.ScanQueryRunnerTest; +import org.apache.druid.query.scan.ScanResultValue; +import org.apache.druid.query.spec.LegacySegmentSpec; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMergerV9; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.QueryableIndexSegment; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.segment.incremental.IndexSizeExceededException; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; import org.joda.time.Interval; import org.junit.After; import org.junit.Assert; diff --git a/processing/src/test/java/io/druid/query/DruidProcessingConfigTest.java b/processing/src/test/java/org/apache/druid/query/DruidProcessingConfigTest.java similarity index 97% rename from processing/src/test/java/io/druid/query/DruidProcessingConfigTest.java rename to processing/src/test/java/org/apache/druid/query/DruidProcessingConfigTest.java index 6af3a42b6b7f..e00a2db1a3f6 100644 --- a/processing/src/test/java/io/druid/query/DruidProcessingConfigTest.java +++ b/processing/src/test/java/org/apache/druid/query/DruidProcessingConfigTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.config.Config; +import org.apache.druid.java.util.common.config.Config; import org.junit.Assert; import org.junit.Test; import org.skife.config.ConfigurationObjectFactory; diff --git a/processing/src/test/java/io/druid/query/IntervalChunkingQueryRunnerTest.java b/processing/src/test/java/org/apache/druid/query/IntervalChunkingQueryRunnerTest.java similarity index 92% rename from processing/src/test/java/io/druid/query/IntervalChunkingQueryRunnerTest.java rename to processing/src/test/java/org/apache/druid/query/IntervalChunkingQueryRunnerTest.java index 0bc0ea0ce1ff..5a335592b659 100644 --- a/processing/src/test/java/io/druid/query/IntervalChunkingQueryRunnerTest.java +++ b/processing/src/test/java/org/apache/druid/query/IntervalChunkingQueryRunnerTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.common.guava.Sequences; -import io.druid.query.Druids.TimeseriesQueryBuilder; -import io.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.query.Druids.TimeseriesQueryBuilder; +import org.apache.druid.query.aggregation.CountAggregatorFactory; import org.easymock.EasyMock; import org.junit.Before; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/MultiValuedDimensionTest.java b/processing/src/test/java/org/apache/druid/query/MultiValuedDimensionTest.java similarity index 83% rename from processing/src/test/java/io/druid/query/MultiValuedDimensionTest.java rename to processing/src/test/java/org/apache/druid/query/MultiValuedDimensionTest.java index 2487ffe75cda..f1987267854e 100644 --- a/processing/src/test/java/io/druid/query/MultiValuedDimensionTest.java +++ b/processing/src/test/java/org/apache/druid/query/MultiValuedDimensionTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -25,41 +25,41 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.io.Files; -import io.druid.collections.CloseableStupidPool; -import io.druid.data.input.Row; -import io.druid.data.input.impl.CSVParseSpec; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.aggregation.AggregationTestHelper; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.dimension.ListFilteredDimensionSpec; -import io.druid.query.dimension.RegexFilteredDimensionSpec; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.query.groupby.GroupByQuery; -import io.druid.query.groupby.GroupByQueryConfig; -import io.druid.query.groupby.GroupByQueryRunnerTest; -import io.druid.query.groupby.GroupByQueryRunnerTestHelper; -import io.druid.query.spec.LegacySegmentSpec; -import io.druid.query.topn.TopNQuery; -import io.druid.query.topn.TopNQueryBuilder; -import io.druid.query.topn.TopNQueryConfig; -import io.druid.query.topn.TopNQueryQueryToolChest; -import io.druid.query.topn.TopNQueryRunnerFactory; -import io.druid.query.topn.TopNResultValue; -import io.druid.segment.IncrementalIndexSegment; -import io.druid.segment.IndexSpec; -import io.druid.segment.QueryableIndex; -import io.druid.segment.QueryableIndexSegment; -import io.druid.segment.TestHelper; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; -import io.druid.segment.writeout.TmpFileSegmentWriteOutMediumFactory; +import org.apache.druid.collections.CloseableStupidPool; +import org.apache.druid.data.input.Row; +import org.apache.druid.data.input.impl.CSVParseSpec; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.aggregation.AggregationTestHelper; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.ListFilteredDimensionSpec; +import org.apache.druid.query.dimension.RegexFilteredDimensionSpec; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.query.groupby.GroupByQuery; +import org.apache.druid.query.groupby.GroupByQueryConfig; +import org.apache.druid.query.groupby.GroupByQueryRunnerTest; +import org.apache.druid.query.groupby.GroupByQueryRunnerTestHelper; +import org.apache.druid.query.spec.LegacySegmentSpec; +import org.apache.druid.query.topn.TopNQuery; +import org.apache.druid.query.topn.TopNQueryBuilder; +import org.apache.druid.query.topn.TopNQueryConfig; +import org.apache.druid.query.topn.TopNQueryQueryToolChest; +import org.apache.druid.query.topn.TopNQueryRunnerFactory; +import org.apache.druid.query.topn.TopNResultValue; +import org.apache.druid.segment.IncrementalIndexSegment; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.QueryableIndexSegment; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.segment.writeout.TmpFileSegmentWriteOutMediumFactory; import org.apache.commons.io.FileUtils; import org.junit.After; import org.junit.Before; diff --git a/processing/src/test/java/io/druid/query/PrioritizedExecutorServiceTest.java b/processing/src/test/java/org/apache/druid/query/PrioritizedExecutorServiceTest.java similarity index 99% rename from processing/src/test/java/io/druid/query/PrioritizedExecutorServiceTest.java rename to processing/src/test/java/org/apache/druid/query/PrioritizedExecutorServiceTest.java index 22cf8e2a8fac..e97df06fbe6a 100644 --- a/processing/src/test/java/io/druid/query/PrioritizedExecutorServiceTest.java +++ b/processing/src/test/java/org/apache/druid/query/PrioritizedExecutorServiceTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; import org.junit.After; import org.junit.Assert; import org.junit.Assume; diff --git a/processing/src/test/java/io/druid/query/QueriesTest.java b/processing/src/test/java/org/apache/druid/query/QueriesTest.java similarity index 92% rename from processing/src/test/java/io/druid/query/QueriesTest.java rename to processing/src/test/java/org/apache/druid/query/QueriesTest.java index b6cdde260790..fd5abf238297 100644 --- a/processing/src/test/java/io/druid/query/QueriesTest.java +++ b/processing/src/test/java/org/apache/druid/query/QueriesTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.collect.ImmutableList; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.DoubleSumAggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.post.ArithmeticPostAggregator; -import io.druid.query.aggregation.post.ConstantPostAggregator; -import io.druid.query.aggregation.post.FieldAccessPostAggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.post.ArithmeticPostAggregator; +import org.apache.druid.query.aggregation.post.ConstantPostAggregator; +import org.apache.druid.query.aggregation.post.FieldAccessPostAggregator; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/QueryContextsTest.java b/processing/src/test/java/org/apache/druid/query/QueryContextsTest.java similarity index 94% rename from processing/src/test/java/io/druid/query/QueryContextsTest.java rename to processing/src/test/java/org/apache/druid/query/QueryContextsTest.java index 90f2f4cacb57..49df451fb1ea 100644 --- a/processing/src/test/java/io/druid/query/QueryContextsTest.java +++ b/processing/src/test/java/org/apache/druid/query/QueryContextsTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.Intervals; -import io.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/QueryInterruptedExceptionTest.java b/processing/src/test/java/org/apache/druid/query/QueryInterruptedExceptionTest.java similarity index 95% rename from processing/src/test/java/io/druid/query/QueryInterruptedExceptionTest.java rename to processing/src/test/java/org/apache/druid/query/QueryInterruptedExceptionTest.java index 13d98241092c..ecfe3c084152 100644 --- a/processing/src/test/java/io/druid/query/QueryInterruptedExceptionTest.java +++ b/processing/src/test/java/org/apache/druid/query/QueryInterruptedExceptionTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Throwables; -import io.druid.java.util.common.ISE; -import io.druid.segment.TestHelper; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.segment.TestHelper; import org.junit.Assert; import org.junit.Test; @@ -112,7 +112,7 @@ public void testErrorClass() new QueryInterruptedException(new TimeoutException()).getErrorClass() ); Assert.assertEquals( - "io.druid.query.ResourceLimitExceededException", + "org.apache.druid.query.ResourceLimitExceededException", new QueryInterruptedException(new ResourceLimitExceededException("too many!")).getErrorClass() ); Assert.assertEquals( @@ -120,11 +120,11 @@ public void testErrorClass() new QueryInterruptedException(null).getErrorClass() ); Assert.assertEquals( - "io.druid.java.util.common.ISE", + "org.apache.druid.java.util.common.ISE", new QueryInterruptedException(new ISE("Something bad!")).getErrorClass() ); Assert.assertEquals( - "io.druid.java.util.common.ISE", + "org.apache.druid.java.util.common.ISE", new QueryInterruptedException(new QueryInterruptedException(new ISE("Something bad!"))).getErrorClass() ); } @@ -170,11 +170,11 @@ public void testSerde() roundTrip(new QueryInterruptedException(null)).getErrorClass() ); Assert.assertEquals( - "io.druid.java.util.common.ISE", + "org.apache.druid.java.util.common.ISE", roundTrip(new QueryInterruptedException(new ISE("Something bad!"))).getErrorClass() ); Assert.assertEquals( - "io.druid.java.util.common.ISE", + "org.apache.druid.java.util.common.ISE", roundTrip(new QueryInterruptedException(new QueryInterruptedException(new ISE("Something bad!")))).getErrorClass() ); Assert.assertEquals( diff --git a/processing/src/test/java/io/druid/query/QueryRunnerTestHelper.java b/processing/src/test/java/org/apache/druid/query/QueryRunnerTestHelper.java similarity index 89% rename from processing/src/test/java/io/druid/query/QueryRunnerTestHelper.java rename to processing/src/test/java/org/apache/druid/query/QueryRunnerTestHelper.java index 4ffb8daa8561..14e7af3bd87a 100644 --- a/processing/src/test/java/io/druid/query/QueryRunnerTestHelper.java +++ b/processing/src/test/java/org/apache/druid/query/QueryRunnerTestHelper.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; @@ -25,43 +25,43 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.MergeSequence; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.emitter.core.NoopEmitter; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.js.JavaScriptConfig; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.DoubleSumAggregatorFactory; -import io.druid.query.aggregation.FloatSumAggregatorFactory; -import io.druid.query.aggregation.JavaScriptAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.aggregation.cardinality.CardinalityAggregatorFactory; -import io.druid.query.aggregation.hyperloglog.HyperUniqueFinalizingPostAggregator; -import io.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; -import io.druid.query.aggregation.post.ArithmeticPostAggregator; -import io.druid.query.aggregation.post.ConstantPostAggregator; -import io.druid.query.aggregation.post.FieldAccessPostAggregator; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.spec.MultipleIntervalSegmentSpec; -import io.druid.query.spec.QuerySegmentSpec; -import io.druid.query.spec.SpecificSegmentSpec; -import io.druid.query.timeseries.TimeseriesQueryEngine; -import io.druid.query.timeseries.TimeseriesQueryQueryToolChest; -import io.druid.query.timeseries.TimeseriesQueryRunnerFactory; -import io.druid.segment.IncrementalIndexSegment; -import io.druid.segment.QueryableIndex; -import io.druid.segment.QueryableIndexSegment; -import io.druid.segment.Segment; -import io.druid.segment.TestIndex; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.timeline.TimelineObjectHolder; -import io.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.MergeSequence; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.emitter.core.NoopEmitter; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.js.JavaScriptConfig; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; +import org.apache.druid.query.aggregation.FloatSumAggregatorFactory; +import org.apache.druid.query.aggregation.JavaScriptAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.aggregation.cardinality.CardinalityAggregatorFactory; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniqueFinalizingPostAggregator; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; +import org.apache.druid.query.aggregation.post.ArithmeticPostAggregator; +import org.apache.druid.query.aggregation.post.ConstantPostAggregator; +import org.apache.druid.query.aggregation.post.FieldAccessPostAggregator; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.query.spec.QuerySegmentSpec; +import org.apache.druid.query.spec.SpecificSegmentSpec; +import org.apache.druid.query.timeseries.TimeseriesQueryEngine; +import org.apache.druid.query.timeseries.TimeseriesQueryQueryToolChest; +import org.apache.druid.query.timeseries.TimeseriesQueryRunnerFactory; +import org.apache.druid.segment.IncrementalIndexSegment; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.QueryableIndexSegment; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.TestIndex; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.timeline.TimelineObjectHolder; +import org.apache.druid.timeline.VersionedIntervalTimeline; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/processing/src/test/java/io/druid/query/ResultGranularTimestampComparatorTest.java b/processing/src/test/java/org/apache/druid/query/ResultGranularTimestampComparatorTest.java similarity index 93% rename from processing/src/test/java/io/druid/query/ResultGranularTimestampComparatorTest.java rename to processing/src/test/java/org/apache/druid/query/ResultGranularTimestampComparatorTest.java index 42ae4473bd5d..7edcca9a232a 100644 --- a/processing/src/test/java/io/druid/query/ResultGranularTimestampComparatorTest.java +++ b/processing/src/test/java/org/apache/druid/query/ResultGranularTimestampComparatorTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; import org.joda.time.DateTime; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/RetryQueryRunnerTest.java b/processing/src/test/java/org/apache/druid/query/RetryQueryRunnerTest.java similarity index 95% rename from processing/src/test/java/io/druid/query/RetryQueryRunnerTest.java rename to processing/src/test/java/org/apache/druid/query/RetryQueryRunnerTest.java index bb519fd490d2..1f866a5b7a26 100644 --- a/processing/src/test/java/io/druid/query/RetryQueryRunnerTest.java +++ b/processing/src/test/java/org/apache/druid/query/RetryQueryRunnerTest.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.spec.MultipleSpecificSegmentSpec; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.timeseries.TimeseriesResultValue; -import io.druid.segment.SegmentMissingException; -import io.druid.segment.TestHelper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.spec.MultipleSpecificSegmentSpec; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.timeseries.TimeseriesResultValue; +import org.apache.druid.segment.SegmentMissingException; +import org.apache.druid.segment.TestHelper; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/SchemaEvolutionTest.java b/processing/src/test/java/org/apache/druid/query/SchemaEvolutionTest.java similarity index 90% rename from processing/src/test/java/io/druid/query/SchemaEvolutionTest.java rename to processing/src/test/java/org/apache/druid/query/SchemaEvolutionTest.java index a0bafa059b0c..f051d7105324 100644 --- a/processing/src/test/java/io/druid/query/SchemaEvolutionTest.java +++ b/processing/src/test/java/org/apache/druid/query/SchemaEvolutionTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; @@ -25,31 +25,31 @@ import com.google.common.collect.Maps; import com.google.common.io.Closeables; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.common.config.NullHandling; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.MapInputRowParser; -import io.druid.data.input.impl.TimeAndDimsParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.guava.FunctionalIterable; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.DoubleSumAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; -import io.druid.query.expression.TestExprMacroTable; -import io.druid.query.filter.BoundDimFilter; -import io.druid.query.ordering.StringComparators; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.timeseries.TimeseriesQueryRunnerFactory; -import io.druid.query.timeseries.TimeseriesResultValue; -import io.druid.segment.IndexBuilder; -import io.druid.segment.QueryableIndex; -import io.druid.segment.QueryableIndexSegment; -import io.druid.segment.TestHelper; -import io.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.MapInputRowParser; +import org.apache.druid.data.input.impl.TimeAndDimsParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.guava.FunctionalIterable; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; +import org.apache.druid.query.expression.TestExprMacroTable; +import org.apache.druid.query.filter.BoundDimFilter; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.timeseries.TimeseriesQueryRunnerFactory; +import org.apache.druid.query.timeseries.TimeseriesResultValue; +import org.apache.druid.segment.IndexBuilder; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.QueryableIndexSegment; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/processing/src/test/java/io/druid/query/TestQuery.java b/processing/src/test/java/org/apache/druid/query/TestQuery.java similarity index 92% rename from processing/src/test/java/io/druid/query/TestQuery.java rename to processing/src/test/java/org/apache/druid/query/TestQuery.java index f8ad21171557..26de3d069961 100644 --- a/processing/src/test/java/io/druid/query/TestQuery.java +++ b/processing/src/test/java/org/apache/druid/query/TestQuery.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; -import io.druid.query.filter.DimFilter; -import io.druid.query.spec.QuerySegmentSpec; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.spec.QuerySegmentSpec; import java.util.Map; diff --git a/processing/src/test/java/io/druid/query/TestQueryRunners.java b/processing/src/test/java/org/apache/druid/query/TestQueryRunners.java similarity index 78% rename from processing/src/test/java/io/druid/query/TestQueryRunners.java rename to processing/src/test/java/org/apache/druid/query/TestQueryRunners.java index 44b209b05aea..24b104da87c6 100644 --- a/processing/src/test/java/io/druid/query/TestQueryRunners.java +++ b/processing/src/test/java/org/apache/druid/query/TestQueryRunners.java @@ -17,23 +17,23 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.base.Suppliers; -import io.druid.collections.CloseableStupidPool; -import io.druid.collections.NonBlockingPool; -import io.druid.query.search.SearchQueryConfig; -import io.druid.query.search.SearchQueryQueryToolChest; -import io.druid.query.search.SearchQueryRunnerFactory; -import io.druid.query.search.SearchStrategySelector; -import io.druid.query.timeboundary.TimeBoundaryQueryRunnerFactory; -import io.druid.query.timeseries.TimeseriesQueryEngine; -import io.druid.query.timeseries.TimeseriesQueryQueryToolChest; -import io.druid.query.timeseries.TimeseriesQueryRunnerFactory; -import io.druid.query.topn.TopNQueryConfig; -import io.druid.query.topn.TopNQueryQueryToolChest; -import io.druid.query.topn.TopNQueryRunnerFactory; -import io.druid.segment.Segment; +import org.apache.druid.collections.CloseableStupidPool; +import org.apache.druid.collections.NonBlockingPool; +import org.apache.druid.query.search.SearchQueryConfig; +import org.apache.druid.query.search.SearchQueryQueryToolChest; +import org.apache.druid.query.search.SearchQueryRunnerFactory; +import org.apache.druid.query.search.SearchStrategySelector; +import org.apache.druid.query.timeboundary.TimeBoundaryQueryRunnerFactory; +import org.apache.druid.query.timeseries.TimeseriesQueryEngine; +import org.apache.druid.query.timeseries.TimeseriesQueryQueryToolChest; +import org.apache.druid.query.timeseries.TimeseriesQueryRunnerFactory; +import org.apache.druid.query.topn.TopNQueryConfig; +import org.apache.druid.query.topn.TopNQueryQueryToolChest; +import org.apache.druid.query.topn.TopNQueryRunnerFactory; +import org.apache.druid.segment.Segment; import java.nio.ByteBuffer; diff --git a/processing/src/test/java/io/druid/query/TimewarpOperatorTest.java b/processing/src/test/java/org/apache/druid/query/TimewarpOperatorTest.java similarity index 96% rename from processing/src/test/java/io/druid/query/TimewarpOperatorTest.java rename to processing/src/test/java/org/apache/druid/query/TimewarpOperatorTest.java index d15e5f9f4434..97f5d253ab0c 100644 --- a/processing/src/test/java/io/druid/query/TimewarpOperatorTest.java +++ b/processing/src/test/java/org/apache/druid/query/TimewarpOperatorTest.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.granularity.PeriodGranularity; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.timeboundary.TimeBoundaryResultValue; -import io.druid.query.timeseries.TimeseriesResultValue; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.granularity.PeriodGranularity; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.timeboundary.TimeBoundaryResultValue; +import org.apache.druid.query.timeseries.TimeseriesResultValue; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.Interval; diff --git a/processing/src/test/java/io/druid/query/UnionQueryRunnerTest.java b/processing/src/test/java/org/apache/druid/query/UnionQueryRunnerTest.java similarity index 95% rename from processing/src/test/java/io/druid/query/UnionQueryRunnerTest.java rename to processing/src/test/java/org/apache/druid/query/UnionQueryRunnerTest.java index e51854ac2ea7..ea0b48d26718 100644 --- a/processing/src/test/java/io/druid/query/UnionQueryRunnerTest.java +++ b/processing/src/test/java/org/apache/druid/query/UnionQueryRunnerTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; import junit.framework.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/aggregation/AggregationTestHelper.java b/processing/src/test/java/org/apache/druid/query/aggregation/AggregationTestHelper.java similarity index 88% rename from processing/src/test/java/io/druid/query/aggregation/AggregationTestHelper.java rename to processing/src/test/java/org/apache/druid/query/aggregation/AggregationTestHelper.java index 0fb199771822..5855bb98a743 100644 --- a/processing/src/test/java/io/druid/query/aggregation/AggregationTestHelper.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/AggregationTestHelper.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; @@ -34,53 +34,53 @@ import com.google.common.collect.Maps; import com.google.common.io.Closeables; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.collections.CloseableStupidPool; -import io.druid.data.input.InputRow; -import io.druid.data.input.Row; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.CloseQuietly; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.common.guava.Yielder; -import io.druid.java.util.common.guava.YieldingAccumulator; -import io.druid.java.util.common.io.Closer; -import io.druid.query.FinalizeResultsQueryRunner; -import io.druid.query.Query; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.QueryToolChest; -import io.druid.query.groupby.GroupByQueryConfig; -import io.druid.query.groupby.GroupByQueryRunnerFactory; -import io.druid.query.groupby.GroupByQueryRunnerTest; -import io.druid.query.select.SelectQueryConfig; -import io.druid.query.select.SelectQueryEngine; -import io.druid.query.select.SelectQueryQueryToolChest; -import io.druid.query.select.SelectQueryRunnerFactory; -import io.druid.query.timeseries.TimeseriesQueryEngine; -import io.druid.query.timeseries.TimeseriesQueryQueryToolChest; -import io.druid.query.timeseries.TimeseriesQueryRunnerFactory; -import io.druid.query.topn.TopNQueryConfig; -import io.druid.query.topn.TopNQueryQueryToolChest; -import io.druid.query.topn.TopNQueryRunnerFactory; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMerger; -import io.druid.segment.IndexMergerV9; -import io.druid.segment.IndexSpec; -import io.druid.segment.QueryableIndex; -import io.druid.segment.QueryableIndexSegment; -import io.druid.segment.Segment; -import io.druid.segment.TestHelper; -import io.druid.segment.column.ColumnConfig; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexSchema; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; +import org.apache.druid.collections.CloseableStupidPool; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.CloseQuietly; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.guava.Yielder; +import org.apache.druid.java.util.common.guava.YieldingAccumulator; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.query.FinalizeResultsQueryRunner; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.groupby.GroupByQueryConfig; +import org.apache.druid.query.groupby.GroupByQueryRunnerFactory; +import org.apache.druid.query.groupby.GroupByQueryRunnerTest; +import org.apache.druid.query.select.SelectQueryConfig; +import org.apache.druid.query.select.SelectQueryEngine; +import org.apache.druid.query.select.SelectQueryQueryToolChest; +import org.apache.druid.query.select.SelectQueryRunnerFactory; +import org.apache.druid.query.timeseries.TimeseriesQueryEngine; +import org.apache.druid.query.timeseries.TimeseriesQueryQueryToolChest; +import org.apache.druid.query.timeseries.TimeseriesQueryRunnerFactory; +import org.apache.druid.query.topn.TopNQueryConfig; +import org.apache.druid.query.topn.TopNQueryQueryToolChest; +import org.apache.druid.query.topn.TopNQueryRunnerFactory; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMerger; +import org.apache.druid.segment.IndexMergerV9; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.QueryableIndexSegment; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.column.ColumnConfig; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; import org.apache.commons.io.IOUtils; import org.apache.commons.io.LineIterator; import org.junit.rules.TemporaryFolder; diff --git a/processing/src/test/java/io/druid/query/aggregation/AggregatorFactoryTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/AggregatorFactoryTest.java similarity index 98% rename from processing/src/test/java/io/druid/query/aggregation/AggregatorFactoryTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/AggregatorFactoryTest.java index c1e50e6846e4..cace5c236770 100644 --- a/processing/src/test/java/io/druid/query/aggregation/AggregatorFactoryTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/AggregatorFactoryTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.google.common.collect.ImmutableList; import org.junit.Assert; diff --git a/processing/src/test/java/io/druid/query/aggregation/AggregatorUtilTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/AggregatorUtilTest.java similarity index 93% rename from processing/src/test/java/io/druid/query/aggregation/AggregatorUtilTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/AggregatorUtilTest.java index 4d1fdedda817..83f81d357025 100644 --- a/processing/src/test/java/io/druid/query/aggregation/AggregatorUtilTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/AggregatorUtilTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import io.druid.java.util.common.Pair; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.aggregation.post.ArithmeticPostAggregator; -import io.druid.query.aggregation.post.ConstantPostAggregator; -import io.druid.query.aggregation.post.FieldAccessPostAggregator; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.aggregation.post.ArithmeticPostAggregator; +import org.apache.druid.query.aggregation.post.ConstantPostAggregator; +import org.apache.druid.query.aggregation.post.FieldAccessPostAggregator; import org.junit.Assert; import org.junit.Test; @@ -34,7 +34,7 @@ import java.util.Collections; import java.util.List; -import static io.druid.query.QueryRunnerTestHelper.dependentPostAggMetric; +import static org.apache.druid.query.QueryRunnerTestHelper.dependentPostAggMetric; public class AggregatorUtilTest { diff --git a/processing/src/test/java/io/druid/query/aggregation/CountAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/CountAggregatorTest.java similarity index 97% rename from processing/src/test/java/io/druid/query/aggregation/CountAggregatorTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/CountAggregatorTest.java index ac07e8b51e24..71500d46bc53 100644 --- a/processing/src/test/java/io/druid/query/aggregation/CountAggregatorTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/CountAggregatorTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/aggregation/DoubleMaxAggregationTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/DoubleMaxAggregationTest.java similarity index 96% rename from processing/src/test/java/io/druid/query/aggregation/DoubleMaxAggregationTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/DoubleMaxAggregationTest.java index dd8fd1a69acb..dde8feec355c 100644 --- a/processing/src/test/java/io/druid/query/aggregation/DoubleMaxAggregationTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/DoubleMaxAggregationTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.TestHelper; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.TestHelper; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; diff --git a/processing/src/test/java/io/druid/query/aggregation/DoubleMinAggregationTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/DoubleMinAggregationTest.java similarity index 96% rename from processing/src/test/java/io/druid/query/aggregation/DoubleMinAggregationTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/DoubleMinAggregationTest.java index 79446bce53d1..a35ad336c2dd 100644 --- a/processing/src/test/java/io/druid/query/aggregation/DoubleMinAggregationTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/DoubleMinAggregationTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.TestHelper; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.TestHelper; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; diff --git a/processing/src/test/java/io/druid/query/aggregation/DoubleSumAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/DoubleSumAggregatorTest.java similarity index 98% rename from processing/src/test/java/io/druid/query/aggregation/DoubleSumAggregatorTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/DoubleSumAggregatorTest.java index 248d694c3d88..0732a8497c72 100644 --- a/processing/src/test/java/io/druid/query/aggregation/DoubleSumAggregatorTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/DoubleSumAggregatorTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/aggregation/FilteredAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/FilteredAggregatorTest.java similarity index 88% rename from processing/src/test/java/io/druid/query/aggregation/FilteredAggregatorTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/FilteredAggregatorTest.java index 00e1921317cd..fd27033c6de9 100644 --- a/processing/src/test/java/io/druid/query/aggregation/FilteredAggregatorTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/FilteredAggregatorTest.java @@ -17,38 +17,38 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.google.common.base.Predicate; import com.google.common.collect.Lists; -import io.druid.common.config.NullHandling; -import io.druid.js.JavaScriptConfig; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.extraction.JavaScriptExtractionFn; -import io.druid.query.filter.AndDimFilter; -import io.druid.query.filter.BoundDimFilter; -import io.druid.query.filter.InDimFilter; -import io.druid.query.filter.JavaScriptDimFilter; -import io.druid.query.filter.NotDimFilter; -import io.druid.query.filter.OrDimFilter; -import io.druid.query.filter.RegexDimFilter; -import io.druid.query.filter.SearchQueryDimFilter; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.query.ordering.StringComparators; -import io.druid.query.search.ContainsSearchQuerySpec; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.DimensionSelector; -import io.druid.segment.DimensionSelectorUtils; -import io.druid.segment.IdLookup; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.column.ColumnCapabilitiesImpl; -import io.druid.segment.column.ValueType; -import io.druid.segment.data.IndexedInts; -import io.druid.segment.data.SingleIndexedInt; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.js.JavaScriptConfig; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.extraction.JavaScriptExtractionFn; +import org.apache.druid.query.filter.AndDimFilter; +import org.apache.druid.query.filter.BoundDimFilter; +import org.apache.druid.query.filter.InDimFilter; +import org.apache.druid.query.filter.JavaScriptDimFilter; +import org.apache.druid.query.filter.NotDimFilter; +import org.apache.druid.query.filter.OrDimFilter; +import org.apache.druid.query.filter.RegexDimFilter; +import org.apache.druid.query.filter.SearchQueryDimFilter; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.query.search.ContainsSearchQuerySpec; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.DimensionSelectorUtils; +import org.apache.druid.segment.IdLookup; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.column.ColumnCapabilitiesImpl; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.data.IndexedInts; +import org.apache.druid.segment.data.SingleIndexedInt; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/aggregation/HistogramAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/HistogramAggregatorTest.java similarity index 98% rename from processing/src/test/java/io/druid/query/aggregation/HistogramAggregatorTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/HistogramAggregatorTest.java index 7339528d7d38..6d3261b45d58 100644 --- a/processing/src/test/java/io/druid/query/aggregation/HistogramAggregatorTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/HistogramAggregatorTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Floats; -import io.druid.segment.TestHelper; +import org.apache.druid.segment.TestHelper; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/aggregation/HistogramTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/HistogramTest.java similarity index 97% rename from processing/src/test/java/io/druid/query/aggregation/HistogramTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/HistogramTest.java index a92203927d27..59ae1caa27a4 100644 --- a/processing/src/test/java/io/druid/query/aggregation/HistogramTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/HistogramTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Maps; -import io.druid.segment.TestHelper; +import org.apache.druid.segment.TestHelper; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/aggregation/JavaScriptAggregatorBenchmark.java b/processing/src/test/java/org/apache/druid/query/aggregation/JavaScriptAggregatorBenchmark.java similarity index 98% rename from processing/src/test/java/io/druid/query/aggregation/JavaScriptAggregatorBenchmark.java rename to processing/src/test/java/org/apache/druid/query/aggregation/JavaScriptAggregatorBenchmark.java index e90116c83b66..033778bbd346 100644 --- a/processing/src/test/java/io/druid/query/aggregation/JavaScriptAggregatorBenchmark.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/JavaScriptAggregatorBenchmark.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.google.caliper.Runner; import com.google.caliper.SimpleBenchmark; diff --git a/processing/src/test/java/io/druid/query/aggregation/JavaScriptAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/JavaScriptAggregatorTest.java similarity index 96% rename from processing/src/test/java/io/druid/query/aggregation/JavaScriptAggregatorTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/JavaScriptAggregatorTest.java index 4721cbccc4bb..0e276f772c0c 100644 --- a/processing/src/test/java/io/druid/query/aggregation/JavaScriptAggregatorTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/JavaScriptAggregatorTest.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; -import io.druid.java.util.common.StringUtils; -import io.druid.js.JavaScriptConfig; -import io.druid.query.dimension.DimensionSpec; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.DimensionSelector; -import io.druid.segment.column.ColumnCapabilities; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.js.JavaScriptConfig; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.column.ColumnCapabilities; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/aggregation/LongMaxAggregationTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/LongMaxAggregationTest.java similarity index 96% rename from processing/src/test/java/io/druid/query/aggregation/LongMaxAggregationTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/LongMaxAggregationTest.java index 59c42ceff6c1..2c97e5e09705 100644 --- a/processing/src/test/java/io/druid/query/aggregation/LongMaxAggregationTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/LongMaxAggregationTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.TestHelper; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.TestHelper; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; diff --git a/processing/src/test/java/io/druid/query/aggregation/LongMinAggregationTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/LongMinAggregationTest.java similarity index 96% rename from processing/src/test/java/io/druid/query/aggregation/LongMinAggregationTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/LongMinAggregationTest.java index 3c1443348a2e..6c06695c348a 100644 --- a/processing/src/test/java/io/druid/query/aggregation/LongMinAggregationTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/LongMinAggregationTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.TestHelper; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.TestHelper; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; diff --git a/processing/src/test/java/io/druid/query/aggregation/LongSumAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/LongSumAggregatorTest.java similarity index 98% rename from processing/src/test/java/io/druid/query/aggregation/LongSumAggregatorTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/LongSumAggregatorTest.java index 00b9f702caa7..b1c5fbfe831d 100644 --- a/processing/src/test/java/io/druid/query/aggregation/LongSumAggregatorTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/LongSumAggregatorTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/aggregation/MetricManipulatorFnsTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/MetricManipulatorFnsTest.java similarity index 94% rename from processing/src/test/java/io/druid/query/aggregation/MetricManipulatorFnsTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/MetricManipulatorFnsTest.java index 86abbd8ee9d0..68fe2981875c 100644 --- a/processing/src/test/java/io/druid/query/aggregation/MetricManipulatorFnsTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/MetricManipulatorFnsTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.hll.HyperLogLogCollector; -import io.druid.java.util.common.StringUtils; -import io.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; -import io.druid.segment.TestLongColumnSelector; +import org.apache.druid.hll.HyperLogLogCollector; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; +import org.apache.druid.segment.TestLongColumnSelector; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/processing/src/test/java/io/druid/query/aggregation/TestDoubleColumnSelectorImpl.java b/processing/src/test/java/org/apache/druid/query/aggregation/TestDoubleColumnSelectorImpl.java similarity index 92% rename from processing/src/test/java/io/druid/query/aggregation/TestDoubleColumnSelectorImpl.java rename to processing/src/test/java/org/apache/druid/query/aggregation/TestDoubleColumnSelectorImpl.java index f5de58181dda..8f40d40b028b 100644 --- a/processing/src/test/java/io/druid/query/aggregation/TestDoubleColumnSelectorImpl.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/TestDoubleColumnSelectorImpl.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; -import io.druid.segment.TestDoubleColumnSelector; +import org.apache.druid.segment.TestDoubleColumnSelector; public class TestDoubleColumnSelectorImpl extends TestDoubleColumnSelector { diff --git a/processing/src/test/java/io/druid/query/aggregation/TestFloatColumnSelector.java b/processing/src/test/java/org/apache/druid/query/aggregation/TestFloatColumnSelector.java similarity index 89% rename from processing/src/test/java/io/druid/query/aggregation/TestFloatColumnSelector.java rename to processing/src/test/java/org/apache/druid/query/aggregation/TestFloatColumnSelector.java index a5cf54ec6691..275ecd5e5b10 100644 --- a/processing/src/test/java/io/druid/query/aggregation/TestFloatColumnSelector.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/TestFloatColumnSelector.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; /** */ -public class TestFloatColumnSelector extends io.druid.segment.TestFloatColumnSelector +public class TestFloatColumnSelector extends org.apache.druid.segment.TestFloatColumnSelector { private final float[] floats; diff --git a/processing/src/test/java/io/druid/query/aggregation/TestLongColumnSelector.java b/processing/src/test/java/org/apache/druid/query/aggregation/TestLongColumnSelector.java similarity index 89% rename from processing/src/test/java/io/druid/query/aggregation/TestLongColumnSelector.java rename to processing/src/test/java/org/apache/druid/query/aggregation/TestLongColumnSelector.java index cab120379ce7..8f0d4f0bb1a2 100644 --- a/processing/src/test/java/io/druid/query/aggregation/TestLongColumnSelector.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/TestLongColumnSelector.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; /** */ -public class TestLongColumnSelector extends io.druid.segment.TestLongColumnSelector +public class TestLongColumnSelector extends org.apache.druid.segment.TestLongColumnSelector { private final long[] longs; diff --git a/processing/src/test/java/io/druid/query/aggregation/TestObjectColumnSelector.java b/processing/src/test/java/org/apache/druid/query/aggregation/TestObjectColumnSelector.java similarity index 89% rename from processing/src/test/java/io/druid/query/aggregation/TestObjectColumnSelector.java rename to processing/src/test/java/org/apache/druid/query/aggregation/TestObjectColumnSelector.java index b5814470d6b7..06cdc9952fb0 100644 --- a/processing/src/test/java/io/druid/query/aggregation/TestObjectColumnSelector.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/TestObjectColumnSelector.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation; +package org.apache.druid.query.aggregation; /** */ -public class TestObjectColumnSelector extends io.druid.segment.TestObjectColumnSelector +public class TestObjectColumnSelector extends org.apache.druid.segment.TestObjectColumnSelector { private final Object[] objects; diff --git a/processing/src/test/java/io/druid/query/aggregation/cardinality/CardinalityAggregatorBenchmark.java b/processing/src/test/java/org/apache/druid/query/aggregation/cardinality/CardinalityAggregatorBenchmark.java similarity index 89% rename from processing/src/test/java/io/druid/query/aggregation/cardinality/CardinalityAggregatorBenchmark.java rename to processing/src/test/java/org/apache/druid/query/aggregation/cardinality/CardinalityAggregatorBenchmark.java index 3e9dffc69197..9ef8b05345ae 100644 --- a/processing/src/test/java/io/druid/query/aggregation/cardinality/CardinalityAggregatorBenchmark.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/cardinality/CardinalityAggregatorBenchmark.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.cardinality; +package org.apache.druid.query.aggregation.cardinality; import com.google.caliper.Param; import com.google.caliper.Runner; @@ -27,12 +27,12 @@ import com.google.common.collect.DiscreteDomain; import com.google.common.collect.FluentIterable; import com.google.common.collect.Range; -import io.druid.query.ColumnSelectorPlus; -import io.druid.query.aggregation.cardinality.types.CardinalityAggregatorColumnSelectorStrategy; -import io.druid.query.aggregation.cardinality.types.StringCardinalityAggregatorColumnSelectorStrategy; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.dimension.DimensionSpec; -import io.druid.segment.DimensionSelector; +import org.apache.druid.query.ColumnSelectorPlus; +import org.apache.druid.query.aggregation.cardinality.types.CardinalityAggregatorColumnSelectorStrategy; +import org.apache.druid.query.aggregation.cardinality.types.StringCardinalityAggregatorColumnSelectorStrategy; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.segment.DimensionSelector; import java.nio.ByteBuffer; import java.util.Collections; diff --git a/processing/src/test/java/io/druid/query/aggregation/cardinality/CardinalityAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/cardinality/CardinalityAggregatorTest.java similarity index 93% rename from processing/src/test/java/io/druid/query/aggregation/cardinality/CardinalityAggregatorTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/cardinality/CardinalityAggregatorTest.java index 338fda381e79..37d016a36089 100644 --- a/processing/src/test/java/io/druid/query/aggregation/cardinality/CardinalityAggregatorTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/cardinality/CardinalityAggregatorTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.aggregation.cardinality; +package org.apache.druid.query.aggregation.cardinality; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Function; @@ -27,28 +27,28 @@ import com.google.common.collect.Iterators; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.common.config.NullHandling; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.js.JavaScriptConfig; -import io.druid.query.ColumnSelectorPlus; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.cardinality.types.CardinalityAggregatorColumnSelectorStrategy; -import io.druid.query.aggregation.cardinality.types.StringCardinalityAggregatorColumnSelectorStrategy; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.dimension.ExtractionDimensionSpec; -import io.druid.query.dimension.RegexFilteredDimensionSpec; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.extraction.JavaScriptExtractionFn; -import io.druid.query.extraction.RegexDimExtractionFn; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.DimensionSelector; -import io.druid.segment.DimensionSelectorUtils; -import io.druid.segment.IdLookup; -import io.druid.segment.data.IndexedInts; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.js.JavaScriptConfig; +import org.apache.druid.query.ColumnSelectorPlus; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.cardinality.types.CardinalityAggregatorColumnSelectorStrategy; +import org.apache.druid.query.aggregation.cardinality.types.StringCardinalityAggregatorColumnSelectorStrategy; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.dimension.ExtractionDimensionSpec; +import org.apache.druid.query.dimension.RegexFilteredDimensionSpec; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.extraction.JavaScriptExtractionFn; +import org.apache.druid.query.extraction.RegexDimExtractionFn; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.DimensionSelectorUtils; +import org.apache.druid.segment.IdLookup; +import org.apache.druid.segment.data.IndexedInts; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/aggregation/first/DoubleFirstAggregationTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/first/DoubleFirstAggregationTest.java similarity index 90% rename from processing/src/test/java/io/druid/query/aggregation/first/DoubleFirstAggregationTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/first/DoubleFirstAggregationTest.java index 7fc70962fcbb..13d976b28ddf 100644 --- a/processing/src/test/java/io/druid/query/aggregation/first/DoubleFirstAggregationTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/first/DoubleFirstAggregationTest.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.query.aggregation.first; - -import io.druid.collections.SerializablePair; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Pair; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.TestDoubleColumnSelectorImpl; -import io.druid.query.aggregation.TestLongColumnSelector; -import io.druid.query.aggregation.TestObjectColumnSelector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.column.Column; +package org.apache.druid.query.aggregation.first; + +import org.apache.druid.collections.SerializablePair; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.TestDoubleColumnSelectorImpl; +import org.apache.druid.query.aggregation.TestLongColumnSelector; +import org.apache.druid.query.aggregation.TestObjectColumnSelector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.column.Column; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; diff --git a/processing/src/test/java/io/druid/query/aggregation/first/FloatFirstAggregationTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/first/FloatFirstAggregationTest.java similarity index 90% rename from processing/src/test/java/io/druid/query/aggregation/first/FloatFirstAggregationTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/first/FloatFirstAggregationTest.java index 27ebeaf05146..db7962871a79 100644 --- a/processing/src/test/java/io/druid/query/aggregation/first/FloatFirstAggregationTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/first/FloatFirstAggregationTest.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.query.aggregation.first; - -import io.druid.collections.SerializablePair; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Pair; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.TestFloatColumnSelector; -import io.druid.query.aggregation.TestLongColumnSelector; -import io.druid.query.aggregation.TestObjectColumnSelector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.column.Column; +package org.apache.druid.query.aggregation.first; + +import org.apache.druid.collections.SerializablePair; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.TestFloatColumnSelector; +import org.apache.druid.query.aggregation.TestLongColumnSelector; +import org.apache.druid.query.aggregation.TestObjectColumnSelector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.column.Column; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; diff --git a/processing/src/test/java/io/druid/query/aggregation/first/LongFirstAggregationTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/first/LongFirstAggregationTest.java similarity index 90% rename from processing/src/test/java/io/druid/query/aggregation/first/LongFirstAggregationTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/first/LongFirstAggregationTest.java index c2c81b14c873..f75493607df0 100644 --- a/processing/src/test/java/io/druid/query/aggregation/first/LongFirstAggregationTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/first/LongFirstAggregationTest.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.query.aggregation.first; - -import io.druid.collections.SerializablePair; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Pair; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.TestLongColumnSelector; -import io.druid.query.aggregation.TestObjectColumnSelector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.column.Column; +package org.apache.druid.query.aggregation.first; + +import org.apache.druid.collections.SerializablePair; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.TestLongColumnSelector; +import org.apache.druid.query.aggregation.TestObjectColumnSelector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.column.Column; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; diff --git a/processing/src/test/java/io/druid/query/aggregation/first/StringFirstAggregationTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/first/StringFirstAggregationTest.java similarity index 90% rename from processing/src/test/java/io/druid/query/aggregation/first/StringFirstAggregationTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/first/StringFirstAggregationTest.java index 0c07ffa06da1..1540ce88d8ef 100644 --- a/processing/src/test/java/io/druid/query/aggregation/first/StringFirstAggregationTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/first/StringFirstAggregationTest.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.query.aggregation.first; - -import io.druid.java.util.common.Pair; -import io.druid.query.aggregation.AggregateCombiner; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.SerializablePairLongString; -import io.druid.query.aggregation.TestLongColumnSelector; -import io.druid.query.aggregation.TestObjectColumnSelector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.column.Column; +package org.apache.druid.query.aggregation.first; + +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.query.aggregation.AggregateCombiner; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.SerializablePairLongString; +import org.apache.druid.query.aggregation.TestLongColumnSelector; +import org.apache.druid.query.aggregation.TestObjectColumnSelector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.column.Column; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; diff --git a/processing/src/test/java/io/druid/query/aggregation/first/StringFirstBufferAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/first/StringFirstBufferAggregatorTest.java similarity index 94% rename from processing/src/test/java/io/druid/query/aggregation/first/StringFirstBufferAggregatorTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/first/StringFirstBufferAggregatorTest.java index 8a4a0de986eb..573d55a53467 100644 --- a/processing/src/test/java/io/druid/query/aggregation/first/StringFirstBufferAggregatorTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/first/StringFirstBufferAggregatorTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.aggregation.first; +package org.apache.druid.query.aggregation.first; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.SerializablePairLongString; -import io.druid.query.aggregation.TestLongColumnSelector; -import io.druid.query.aggregation.TestObjectColumnSelector; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.SerializablePairLongString; +import org.apache.druid.query.aggregation.TestLongColumnSelector; +import org.apache.druid.query.aggregation.TestObjectColumnSelector; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/aggregation/first/StringFirstTimeseriesQueryTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/first/StringFirstTimeseriesQueryTest.java similarity index 80% rename from processing/src/test/java/io/druid/query/aggregation/first/StringFirstTimeseriesQueryTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/first/StringFirstTimeseriesQueryTest.java index 0a61b27e6fa7..d9c8a112b81e 100644 --- a/processing/src/test/java/io/druid/query/aggregation/first/StringFirstTimeseriesQueryTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/first/StringFirstTimeseriesQueryTest.java @@ -17,25 +17,25 @@ * under the License. */ -package io.druid.query.aggregation.first; +package org.apache.druid.query.aggregation.first; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import io.druid.data.input.MapBasedInputRow; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.Druids; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.Result; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.SerializablePairLongString; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.timeseries.TimeseriesQueryEngine; -import io.druid.query.timeseries.TimeseriesResultValue; -import io.druid.segment.TestHelper; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexSchema; -import io.druid.segment.incremental.IncrementalIndexStorageAdapter; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.Druids; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.SerializablePairLongString; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.timeseries.TimeseriesQueryEngine; +import org.apache.druid.query.timeseries.TimeseriesResultValue; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.segment.incremental.IncrementalIndexStorageAdapter; import org.joda.time.DateTime; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/aggregation/hyperloglog/HyperUniqueFinalizingPostAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniqueFinalizingPostAggregatorTest.java similarity index 91% rename from processing/src/test/java/io/druid/query/aggregation/hyperloglog/HyperUniqueFinalizingPostAggregatorTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniqueFinalizingPostAggregatorTest.java index b233b1ad3dd2..eb8b0a7a415f 100644 --- a/processing/src/test/java/io/druid/query/aggregation/hyperloglog/HyperUniqueFinalizingPostAggregatorTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniqueFinalizingPostAggregatorTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.aggregation.hyperloglog; +package org.apache.druid.query.aggregation.hyperloglog; import com.google.common.collect.ImmutableMap; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; -import io.druid.hll.HyperLogLogCollector; -import io.druid.query.aggregation.cardinality.CardinalityAggregatorFactory; -import io.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.hll.HyperLogLogCollector; +import org.apache.druid.query.aggregation.cardinality.CardinalityAggregatorFactory; +import org.apache.druid.query.dimension.DefaultDimensionSpec; import org.hamcrest.CoreMatchers; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregationTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniquesAggregationTest.java similarity index 93% rename from processing/src/test/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregationTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniquesAggregationTest.java index c2c945a8f2cb..bac084ce9491 100644 --- a/processing/src/test/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregationTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniquesAggregationTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.query.aggregation.hyperloglog; +package org.apache.druid.query.aggregation.hyperloglog; import com.google.common.collect.Lists; -import io.druid.data.input.MapBasedRow; -import io.druid.jackson.AggregatorsModule; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.aggregation.AggregationTestHelper; -import io.druid.query.groupby.GroupByQueryConfig; -import io.druid.query.groupby.GroupByQueryRunnerTest; +import org.apache.druid.data.input.MapBasedRow; +import org.apache.druid.jackson.AggregatorsModule; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.aggregation.AggregationTestHelper; +import org.apache.druid.query.groupby.GroupByQueryConfig; +import org.apache.druid.query.groupby.GroupByQueryRunnerTest; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregatorFactoryTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniquesAggregatorFactoryTest.java similarity index 96% rename from processing/src/test/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregatorFactoryTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniquesAggregatorFactoryTest.java index 6b9b4e4fb76e..af76c99df704 100644 --- a/processing/src/test/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregatorFactoryTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniquesAggregatorFactoryTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.query.aggregation.hyperloglog; +package org.apache.druid.query.aggregation.hyperloglog; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; -import io.druid.hll.HLLCV0; -import io.druid.hll.HyperLogLogCollector; -import io.druid.java.util.common.StringUtils; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.segment.TestHelper; +import org.apache.druid.hll.HLLCV0; +import org.apache.druid.hll.HyperLogLogCollector; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.segment.TestHelper; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/aggregation/last/DoubleLastAggregationTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/last/DoubleLastAggregationTest.java similarity index 89% rename from processing/src/test/java/io/druid/query/aggregation/last/DoubleLastAggregationTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/last/DoubleLastAggregationTest.java index c44f476e4e76..450d7eeb7788 100644 --- a/processing/src/test/java/io/druid/query/aggregation/last/DoubleLastAggregationTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/last/DoubleLastAggregationTest.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.query.aggregation.last; - -import io.druid.collections.SerializablePair; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Pair; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.TestDoubleColumnSelectorImpl; -import io.druid.query.aggregation.TestLongColumnSelector; -import io.druid.query.aggregation.TestObjectColumnSelector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.column.Column; +package org.apache.druid.query.aggregation.last; + +import org.apache.druid.collections.SerializablePair; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.TestDoubleColumnSelectorImpl; +import org.apache.druid.query.aggregation.TestLongColumnSelector; +import org.apache.druid.query.aggregation.TestObjectColumnSelector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.column.Column; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; diff --git a/processing/src/test/java/io/druid/query/aggregation/last/FloatLastAggregationTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/last/FloatLastAggregationTest.java similarity index 90% rename from processing/src/test/java/io/druid/query/aggregation/last/FloatLastAggregationTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/last/FloatLastAggregationTest.java index dce994946525..1d7a42ec8a92 100644 --- a/processing/src/test/java/io/druid/query/aggregation/last/FloatLastAggregationTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/last/FloatLastAggregationTest.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.query.aggregation.last; - -import io.druid.collections.SerializablePair; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Pair; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.TestFloatColumnSelector; -import io.druid.query.aggregation.TestLongColumnSelector; -import io.druid.query.aggregation.TestObjectColumnSelector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.column.Column; +package org.apache.druid.query.aggregation.last; + +import org.apache.druid.collections.SerializablePair; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.TestFloatColumnSelector; +import org.apache.druid.query.aggregation.TestLongColumnSelector; +import org.apache.druid.query.aggregation.TestObjectColumnSelector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.column.Column; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; diff --git a/processing/src/test/java/io/druid/query/aggregation/last/LongLastAggregationTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/last/LongLastAggregationTest.java similarity index 90% rename from processing/src/test/java/io/druid/query/aggregation/last/LongLastAggregationTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/last/LongLastAggregationTest.java index d888247015f5..63fdec7e1795 100644 --- a/processing/src/test/java/io/druid/query/aggregation/last/LongLastAggregationTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/last/LongLastAggregationTest.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.query.aggregation.last; - -import io.druid.collections.SerializablePair; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Pair; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.TestLongColumnSelector; -import io.druid.query.aggregation.TestObjectColumnSelector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.column.Column; +package org.apache.druid.query.aggregation.last; + +import org.apache.druid.collections.SerializablePair; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.TestLongColumnSelector; +import org.apache.druid.query.aggregation.TestObjectColumnSelector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.column.Column; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; diff --git a/processing/src/test/java/io/druid/query/aggregation/last/StringLastAggregationTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/last/StringLastAggregationTest.java similarity index 90% rename from processing/src/test/java/io/druid/query/aggregation/last/StringLastAggregationTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/last/StringLastAggregationTest.java index 817469ab9480..99d7e0de2b38 100644 --- a/processing/src/test/java/io/druid/query/aggregation/last/StringLastAggregationTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/last/StringLastAggregationTest.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.query.aggregation.last; - -import io.druid.java.util.common.Pair; -import io.druid.query.aggregation.AggregateCombiner; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.SerializablePairLongString; -import io.druid.query.aggregation.TestLongColumnSelector; -import io.druid.query.aggregation.TestObjectColumnSelector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.column.Column; +package org.apache.druid.query.aggregation.last; + +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.query.aggregation.AggregateCombiner; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.SerializablePairLongString; +import org.apache.druid.query.aggregation.TestLongColumnSelector; +import org.apache.druid.query.aggregation.TestObjectColumnSelector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.column.Column; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; diff --git a/processing/src/test/java/io/druid/query/aggregation/last/StringLastBufferAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/last/StringLastBufferAggregatorTest.java similarity index 94% rename from processing/src/test/java/io/druid/query/aggregation/last/StringLastBufferAggregatorTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/last/StringLastBufferAggregatorTest.java index c7c125b67ddf..e621a4eb390b 100644 --- a/processing/src/test/java/io/druid/query/aggregation/last/StringLastBufferAggregatorTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/last/StringLastBufferAggregatorTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.aggregation.last; +package org.apache.druid.query.aggregation.last; -import io.druid.query.aggregation.BufferAggregator; -import io.druid.query.aggregation.SerializablePairLongString; -import io.druid.query.aggregation.TestLongColumnSelector; -import io.druid.query.aggregation.TestObjectColumnSelector; +import org.apache.druid.query.aggregation.BufferAggregator; +import org.apache.druid.query.aggregation.SerializablePairLongString; +import org.apache.druid.query.aggregation.TestLongColumnSelector; +import org.apache.druid.query.aggregation.TestObjectColumnSelector; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/aggregation/last/StringLastTimeseriesQueryTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/last/StringLastTimeseriesQueryTest.java similarity index 80% rename from processing/src/test/java/io/druid/query/aggregation/last/StringLastTimeseriesQueryTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/last/StringLastTimeseriesQueryTest.java index f407f5bdca64..6fef95f98699 100644 --- a/processing/src/test/java/io/druid/query/aggregation/last/StringLastTimeseriesQueryTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/last/StringLastTimeseriesQueryTest.java @@ -17,25 +17,25 @@ * under the License. */ -package io.druid.query.aggregation.last; +package org.apache.druid.query.aggregation.last; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import io.druid.data.input.MapBasedInputRow; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.Druids; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.Result; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.SerializablePairLongString; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.timeseries.TimeseriesQueryEngine; -import io.druid.query.timeseries.TimeseriesResultValue; -import io.druid.segment.TestHelper; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexSchema; -import io.druid.segment.incremental.IncrementalIndexStorageAdapter; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.Druids; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.SerializablePairLongString; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.timeseries.TimeseriesQueryEngine; +import org.apache.druid.query.timeseries.TimeseriesResultValue; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.segment.incremental.IncrementalIndexStorageAdapter; import org.joda.time.DateTime; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/aggregation/post/ArithmeticPostAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/post/ArithmeticPostAggregatorTest.java similarity index 96% rename from processing/src/test/java/io/druid/query/aggregation/post/ArithmeticPostAggregatorTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/post/ArithmeticPostAggregatorTest.java index ca8733c74706..0d33e7b117cb 100644 --- a/processing/src/test/java/io/druid/query/aggregation/post/ArithmeticPostAggregatorTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/post/ArithmeticPostAggregatorTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.aggregation.post; +package org.apache.druid.query.aggregation.post; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import io.druid.query.aggregation.CountAggregator; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.expression.TestExprMacroTable; +import org.apache.druid.query.aggregation.CountAggregator; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.expression.TestExprMacroTable; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/aggregation/post/ConstantPostAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/post/ConstantPostAggregatorTest.java similarity index 95% rename from processing/src/test/java/io/druid/query/aggregation/post/ConstantPostAggregatorTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/post/ConstantPostAggregatorTest.java index 608793ef5425..deac5bdbb36c 100644 --- a/processing/src/test/java/io/druid/query/aggregation/post/ConstantPostAggregatorTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/post/ConstantPostAggregatorTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation.post; +package org.apache.druid.query.aggregation.post; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/aggregation/post/DoubleGreatestPostAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/post/DoubleGreatestPostAggregatorTest.java similarity index 94% rename from processing/src/test/java/io/druid/query/aggregation/post/DoubleGreatestPostAggregatorTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/post/DoubleGreatestPostAggregatorTest.java index 219c6983716b..689bde5c6d00 100644 --- a/processing/src/test/java/io/druid/query/aggregation/post/DoubleGreatestPostAggregatorTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/post/DoubleGreatestPostAggregatorTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation.post; +package org.apache.druid.query.aggregation.post; import com.google.common.collect.Lists; -import io.druid.query.aggregation.CountAggregator; -import io.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.CountAggregator; +import org.apache.druid.query.aggregation.PostAggregator; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/aggregation/post/DoubleLeastPostAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/post/DoubleLeastPostAggregatorTest.java similarity index 94% rename from processing/src/test/java/io/druid/query/aggregation/post/DoubleLeastPostAggregatorTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/post/DoubleLeastPostAggregatorTest.java index e53da35c9e60..b729d30fbe01 100644 --- a/processing/src/test/java/io/druid/query/aggregation/post/DoubleLeastPostAggregatorTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/post/DoubleLeastPostAggregatorTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation.post; +package org.apache.druid.query.aggregation.post; import com.google.common.collect.Lists; -import io.druid.query.aggregation.CountAggregator; -import io.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.CountAggregator; +import org.apache.druid.query.aggregation.PostAggregator; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/aggregation/post/FieldAccessPostAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/post/FieldAccessPostAggregatorTest.java similarity index 93% rename from processing/src/test/java/io/druid/query/aggregation/post/FieldAccessPostAggregatorTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/post/FieldAccessPostAggregatorTest.java index 3967e111ea18..662219d1572f 100644 --- a/processing/src/test/java/io/druid/query/aggregation/post/FieldAccessPostAggregatorTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/post/FieldAccessPostAggregatorTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.aggregation.post; +package org.apache.druid.query.aggregation.post; -import io.druid.query.aggregation.CountAggregator; +import org.apache.druid.query.aggregation.CountAggregator; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/aggregation/post/FinalizingFieldAccessPostAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/post/FinalizingFieldAccessPostAggregatorTest.java similarity index 92% rename from processing/src/test/java/io/druid/query/aggregation/post/FinalizingFieldAccessPostAggregatorTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/post/FinalizingFieldAccessPostAggregatorTest.java index 7af6633e450a..a4c19d70ad55 100644 --- a/processing/src/test/java/io/druid/query/aggregation/post/FinalizingFieldAccessPostAggregatorTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/post/FinalizingFieldAccessPostAggregatorTest.java @@ -17,26 +17,26 @@ * under the License. */ -package io.druid.query.aggregation.post; +package org.apache.druid.query.aggregation.post; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Ordering; -import io.druid.data.input.MapBasedRow; -import io.druid.jackson.AggregatorsModule; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.Comparators; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.aggregation.AggregationTestHelper; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregator; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.groupby.GroupByQueryRunnerTest; -import io.druid.segment.TestHelper; +import org.apache.druid.data.input.MapBasedRow; +import org.apache.druid.jackson.AggregatorsModule; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.aggregation.AggregationTestHelper; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregator; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.groupby.GroupByQueryRunnerTest; +import org.apache.druid.segment.TestHelper; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Rule; diff --git a/processing/src/test/java/io/druid/query/aggregation/post/JavaScriptPostAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/post/JavaScriptPostAggregatorTest.java similarity index 96% rename from processing/src/test/java/io/druid/query/aggregation/post/JavaScriptPostAggregatorTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/post/JavaScriptPostAggregatorTest.java index 8965cec38137..c454d57a58a1 100644 --- a/processing/src/test/java/io/druid/query/aggregation/post/JavaScriptPostAggregatorTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/post/JavaScriptPostAggregatorTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation.post; +package org.apache.druid.query.aggregation.post; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.js.JavaScriptConfig; +import org.apache.druid.js.JavaScriptConfig; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/aggregation/post/LongGreatestPostAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/post/LongGreatestPostAggregatorTest.java similarity index 94% rename from processing/src/test/java/io/druid/query/aggregation/post/LongGreatestPostAggregatorTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/post/LongGreatestPostAggregatorTest.java index c7a56caaa647..c3c1d11ab974 100644 --- a/processing/src/test/java/io/druid/query/aggregation/post/LongGreatestPostAggregatorTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/post/LongGreatestPostAggregatorTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation.post; +package org.apache.druid.query.aggregation.post; import com.google.common.collect.Lists; -import io.druid.query.aggregation.CountAggregator; -import io.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.CountAggregator; +import org.apache.druid.query.aggregation.PostAggregator; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/aggregation/post/LongLeastPostAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/post/LongLeastPostAggregatorTest.java similarity index 94% rename from processing/src/test/java/io/druid/query/aggregation/post/LongLeastPostAggregatorTest.java rename to processing/src/test/java/org/apache/druid/query/aggregation/post/LongLeastPostAggregatorTest.java index 10b535f92a32..c889ddf70c20 100644 --- a/processing/src/test/java/io/druid/query/aggregation/post/LongLeastPostAggregatorTest.java +++ b/processing/src/test/java/org/apache/druid/query/aggregation/post/LongLeastPostAggregatorTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.aggregation.post; +package org.apache.druid.query.aggregation.post; import com.google.common.collect.Lists; -import io.druid.query.aggregation.CountAggregator; -import io.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.CountAggregator; +import org.apache.druid.query.aggregation.PostAggregator; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/cache/CacheKeyBuilderTest.java b/processing/src/test/java/org/apache/druid/query/cache/CacheKeyBuilderTest.java similarity index 98% rename from processing/src/test/java/io/druid/query/cache/CacheKeyBuilderTest.java rename to processing/src/test/java/org/apache/druid/query/cache/CacheKeyBuilderTest.java index e2b1075be846..6d8083c66772 100644 --- a/processing/src/test/java/io/druid/query/cache/CacheKeyBuilderTest.java +++ b/processing/src/test/java/org/apache/druid/query/cache/CacheKeyBuilderTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.cache; +package org.apache.druid.query.cache; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.druid.java.util.common.Cacheable; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.Cacheable; +import org.apache.druid.java.util.common.StringUtils; import org.junit.Test; import java.nio.ByteBuffer; diff --git a/processing/src/test/java/io/druid/query/datasourcemetadata/DataSourceMetadataQueryTest.java b/processing/src/test/java/org/apache/druid/query/datasourcemetadata/DataSourceMetadataQueryTest.java similarity index 89% rename from processing/src/test/java/io/druid/query/datasourcemetadata/DataSourceMetadataQueryTest.java rename to processing/src/test/java/org/apache/druid/query/datasourcemetadata/DataSourceMetadataQueryTest.java index bf254e8acec8..b6fad6066c6c 100644 --- a/processing/src/test/java/io/druid/query/datasourcemetadata/DataSourceMetadataQueryTest.java +++ b/processing/src/test/java/org/apache/druid/query/datasourcemetadata/DataSourceMetadataQueryTest.java @@ -17,31 +17,31 @@ * under the License. */ -package io.druid.query.datasourcemetadata; +package org.apache.druid.query.datasourcemetadata; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import io.druid.data.input.MapBasedInputRow; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.jackson.JacksonUtils; -import io.druid.query.DefaultGenericQueryMetricsFactory; -import io.druid.query.Druids; -import io.druid.query.GenericQueryMetricsFactory; -import io.druid.query.Query; -import io.druid.query.QueryContexts; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.Result; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.segment.IncrementalIndexSegment; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.timeline.LogicalSegment; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.query.DefaultGenericQueryMetricsFactory; +import org.apache.druid.query.Druids; +import org.apache.druid.query.GenericQueryMetricsFactory; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryContexts; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.segment.IncrementalIndexSegment; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.timeline.LogicalSegment; import org.joda.time.DateTime; import org.joda.time.Interval; import org.junit.Assert; diff --git a/processing/src/test/java/io/druid/query/dimension/DefaultDimensionSpecTest.java b/processing/src/test/java/org/apache/druid/query/dimension/DefaultDimensionSpecTest.java similarity index 93% rename from processing/src/test/java/io/druid/query/dimension/DefaultDimensionSpecTest.java rename to processing/src/test/java/org/apache/druid/query/dimension/DefaultDimensionSpecTest.java index 7e0518d24ef5..ba7ae52ec921 100644 --- a/processing/src/test/java/io/druid/query/dimension/DefaultDimensionSpecTest.java +++ b/processing/src/test/java/org/apache/druid/query/dimension/DefaultDimensionSpecTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.dimension; +package org.apache.druid.query.dimension; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.segment.column.ValueType; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.segment.column.ValueType; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/dimension/ExtractionDimensionSpecTest.java b/processing/src/test/java/org/apache/druid/query/dimension/ExtractionDimensionSpecTest.java similarity index 95% rename from processing/src/test/java/io/druid/query/dimension/ExtractionDimensionSpecTest.java rename to processing/src/test/java/org/apache/druid/query/dimension/ExtractionDimensionSpecTest.java index 272510345ec8..e428d41c4d6b 100644 --- a/processing/src/test/java/io/druid/query/dimension/ExtractionDimensionSpecTest.java +++ b/processing/src/test/java/org/apache/druid/query/dimension/ExtractionDimensionSpecTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.dimension; +package org.apache.druid.query.dimension; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.query.extraction.MatchingDimExtractionFn; -import io.druid.query.extraction.RegexDimExtractionFn; -import io.druid.segment.column.ValueType; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.query.extraction.MatchingDimExtractionFn; +import org.apache.druid.query.extraction.RegexDimExtractionFn; +import org.apache.druid.segment.column.ValueType; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/dimension/LegacyDimensionSpecTest.java b/processing/src/test/java/org/apache/druid/query/dimension/LegacyDimensionSpecTest.java similarity index 91% rename from processing/src/test/java/io/druid/query/dimension/LegacyDimensionSpecTest.java rename to processing/src/test/java/org/apache/druid/query/dimension/LegacyDimensionSpecTest.java index e955b5ab7043..aaf6aece9f59 100644 --- a/processing/src/test/java/io/druid/query/dimension/LegacyDimensionSpecTest.java +++ b/processing/src/test/java/org/apache/druid/query/dimension/LegacyDimensionSpecTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.dimension; +package org.apache.druid.query.dimension; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.StringUtils; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/dimension/ListFilteredDimensionSpecTest.java b/processing/src/test/java/org/apache/druid/query/dimension/ListFilteredDimensionSpecTest.java similarity index 96% rename from processing/src/test/java/io/druid/query/dimension/ListFilteredDimensionSpecTest.java rename to processing/src/test/java/org/apache/druid/query/dimension/ListFilteredDimensionSpecTest.java index 1909555fd4ca..75bdba360cd3 100644 --- a/processing/src/test/java/io/druid/query/dimension/ListFilteredDimensionSpecTest.java +++ b/processing/src/test/java/org/apache/druid/query/dimension/ListFilteredDimensionSpecTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.dimension; +package org.apache.druid.query.dimension; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableSet; -import io.druid.segment.DimensionSelector; -import io.druid.segment.TestHelper; -import io.druid.segment.data.IndexedInts; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.data.IndexedInts; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/dimension/RegexFilteredDimensionSpecTest.java b/processing/src/test/java/org/apache/druid/query/dimension/RegexFilteredDimensionSpecTest.java similarity index 94% rename from processing/src/test/java/io/druid/query/dimension/RegexFilteredDimensionSpecTest.java rename to processing/src/test/java/org/apache/druid/query/dimension/RegexFilteredDimensionSpecTest.java index 937de0d7311c..147c124a9c32 100644 --- a/processing/src/test/java/io/druid/query/dimension/RegexFilteredDimensionSpecTest.java +++ b/processing/src/test/java/org/apache/druid/query/dimension/RegexFilteredDimensionSpecTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.dimension; +package org.apache.druid.query.dimension; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.segment.DimensionSelector; -import io.druid.segment.TestHelper; -import io.druid.segment.data.IndexedInts; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.data.IndexedInts; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/dimension/TestDimensionSelector.java b/processing/src/test/java/org/apache/druid/query/dimension/TestDimensionSelector.java similarity index 84% rename from processing/src/test/java/io/druid/query/dimension/TestDimensionSelector.java rename to processing/src/test/java/org/apache/druid/query/dimension/TestDimensionSelector.java index 36125ae93bba..4bd192a1adcd 100644 --- a/processing/src/test/java/io/druid/query/dimension/TestDimensionSelector.java +++ b/processing/src/test/java/org/apache/druid/query/dimension/TestDimensionSelector.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.query.dimension; +package org.apache.druid.query.dimension; import com.google.common.base.Predicate; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.DimensionSelector; -import io.druid.segment.DimensionSelectorUtils; -import io.druid.segment.IdLookup; -import io.druid.segment.data.IndexedInts; -import io.druid.segment.data.ArrayBasedIndexedInts; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.DimensionSelectorUtils; +import org.apache.druid.segment.IdLookup; +import org.apache.druid.segment.data.IndexedInts; +import org.apache.druid.segment.data.ArrayBasedIndexedInts; import javax.annotation.Nullable; diff --git a/processing/src/test/java/io/druid/query/expression/TestExprMacroTable.java b/processing/src/test/java/org/apache/druid/query/expression/TestExprMacroTable.java similarity index 94% rename from processing/src/test/java/io/druid/query/expression/TestExprMacroTable.java rename to processing/src/test/java/org/apache/druid/query/expression/TestExprMacroTable.java index 4e68634dcc10..ba0758f8d3b1 100644 --- a/processing/src/test/java/io/druid/query/expression/TestExprMacroTable.java +++ b/processing/src/test/java/org/apache/druid/query/expression/TestExprMacroTable.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.expression; +package org.apache.druid.query.expression; import com.google.common.collect.ImmutableList; -import io.druid.math.expr.ExprMacroTable; +import org.apache.druid.math.expr.ExprMacroTable; public class TestExprMacroTable extends ExprMacroTable { diff --git a/processing/src/test/java/io/druid/query/extraction/BucketExtractionFnTest.java b/processing/src/test/java/org/apache/druid/query/extraction/BucketExtractionFnTest.java similarity index 97% rename from processing/src/test/java/io/druid/query/extraction/BucketExtractionFnTest.java rename to processing/src/test/java/org/apache/druid/query/extraction/BucketExtractionFnTest.java index 037b4b473d8b..dece9f89ec83 100644 --- a/processing/src/test/java/io/druid/query/extraction/BucketExtractionFnTest.java +++ b/processing/src/test/java/org/apache/druid/query/extraction/BucketExtractionFnTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/extraction/CascadeExtractionFnTest.java b/processing/src/test/java/org/apache/druid/query/extraction/CascadeExtractionFnTest.java similarity index 98% rename from processing/src/test/java/io/druid/query/extraction/CascadeExtractionFnTest.java rename to processing/src/test/java/org/apache/druid/query/extraction/CascadeExtractionFnTest.java index faa38ec42391..bc4c6e6d741b 100644 --- a/processing/src/test/java/io/druid/query/extraction/CascadeExtractionFnTest.java +++ b/processing/src/test/java/org/apache/druid/query/extraction/CascadeExtractionFnTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.js.JavaScriptConfig; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.js.JavaScriptConfig; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/extraction/FunctionalExtractionTest.java b/processing/src/test/java/org/apache/druid/query/extraction/FunctionalExtractionTest.java similarity index 98% rename from processing/src/test/java/io/druid/query/extraction/FunctionalExtractionTest.java rename to processing/src/test/java/org/apache/druid/query/extraction/FunctionalExtractionTest.java index 2073ddd8a3ff..c00ac686c57b 100644 --- a/processing/src/test/java/io/druid/query/extraction/FunctionalExtractionTest.java +++ b/processing/src/test/java/org/apache/druid/query/extraction/FunctionalExtractionTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import com.google.common.base.Function; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; -import io.druid.common.config.NullHandling; +import org.apache.druid.common.config.NullHandling; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/processing/src/test/java/io/druid/query/extraction/JavaScriptExtractionFnTest.java b/processing/src/test/java/org/apache/druid/query/extraction/JavaScriptExtractionFnTest.java similarity index 98% rename from processing/src/test/java/io/druid/query/extraction/JavaScriptExtractionFnTest.java rename to processing/src/test/java/org/apache/druid/query/extraction/JavaScriptExtractionFnTest.java index 5450522e0c74..2402cc288f20 100644 --- a/processing/src/test/java/io/druid/query/extraction/JavaScriptExtractionFnTest.java +++ b/processing/src/test/java/org/apache/druid/query/extraction/JavaScriptExtractionFnTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; -import io.druid.common.config.NullHandling; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.js.JavaScriptConfig; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.js.JavaScriptConfig; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/extraction/LowerExtractionFnTest.java b/processing/src/test/java/org/apache/druid/query/extraction/LowerExtractionFnTest.java similarity index 94% rename from processing/src/test/java/io/druid/query/extraction/LowerExtractionFnTest.java rename to processing/src/test/java/org/apache/druid/query/extraction/LowerExtractionFnTest.java index cf3af19dd0d3..76609ac3f8f8 100644 --- a/processing/src/test/java/io/druid/query/extraction/LowerExtractionFnTest.java +++ b/processing/src/test/java/org/apache/druid/query/extraction/LowerExtractionFnTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; -import io.druid.common.config.NullHandling; +import org.apache.druid.common.config.NullHandling; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/extraction/MapLookupExtractionFnSerDeTest.java b/processing/src/test/java/org/apache/druid/query/extraction/MapLookupExtractionFnSerDeTest.java similarity index 92% rename from processing/src/test/java/io/druid/query/extraction/MapLookupExtractionFnSerDeTest.java rename to processing/src/test/java/org/apache/druid/query/extraction/MapLookupExtractionFnSerDeTest.java index 808e0e0797f6..a5132bfb344c 100644 --- a/processing/src/test/java/io/druid/query/extraction/MapLookupExtractionFnSerDeTest.java +++ b/processing/src/test/java/org/apache/druid/query/extraction/MapLookupExtractionFnSerDeTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import com.google.inject.Injector; import com.google.inject.Key; -import io.druid.guice.GuiceInjectors; -import io.druid.guice.annotations.Json; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.java.util.common.StringUtils; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/extraction/MapLookupExtractorTest.java b/processing/src/test/java/org/apache/druid/query/extraction/MapLookupExtractorTest.java similarity index 97% rename from processing/src/test/java/io/druid/query/extraction/MapLookupExtractorTest.java rename to processing/src/test/java/org/apache/druid/query/extraction/MapLookupExtractorTest.java index 751eafec3ee1..dbae78442cad 100644 --- a/processing/src/test/java/io/druid/query/extraction/MapLookupExtractorTest.java +++ b/processing/src/test/java/org/apache/druid/query/extraction/MapLookupExtractorTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; -import io.druid.common.config.NullHandling; +import org.apache.druid.common.config.NullHandling; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/extraction/MatchingDimExtractionFnTest.java b/processing/src/test/java/org/apache/druid/query/extraction/MatchingDimExtractionFnTest.java similarity index 95% rename from processing/src/test/java/io/druid/query/extraction/MatchingDimExtractionFnTest.java rename to processing/src/test/java/org/apache/druid/query/extraction/MatchingDimExtractionFnTest.java index a354e44d5451..06711476be4c 100644 --- a/processing/src/test/java/io/druid/query/extraction/MatchingDimExtractionFnTest.java +++ b/processing/src/test/java/org/apache/druid/query/extraction/MatchingDimExtractionFnTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Sets; -import io.druid.common.config.NullHandling; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/extraction/RegexDimExtractionFnTest.java b/processing/src/test/java/org/apache/druid/query/extraction/RegexDimExtractionFnTest.java similarity index 98% rename from processing/src/test/java/io/druid/query/extraction/RegexDimExtractionFnTest.java rename to processing/src/test/java/org/apache/druid/query/extraction/RegexDimExtractionFnTest.java index f499c3f0fe9f..9695a933fa3b 100644 --- a/processing/src/test/java/io/druid/query/extraction/RegexDimExtractionFnTest.java +++ b/processing/src/test/java/org/apache/druid/query/extraction/RegexDimExtractionFnTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; -import io.druid.common.config.NullHandling; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/extraction/SearchQuerySpecDimExtractionFnTest.java b/processing/src/test/java/org/apache/druid/query/extraction/SearchQuerySpecDimExtractionFnTest.java similarity index 94% rename from processing/src/test/java/io/druid/query/extraction/SearchQuerySpecDimExtractionFnTest.java rename to processing/src/test/java/org/apache/druid/query/extraction/SearchQuerySpecDimExtractionFnTest.java index fde6e69e819b..74c2787a15a6 100644 --- a/processing/src/test/java/io/druid/query/extraction/SearchQuerySpecDimExtractionFnTest.java +++ b/processing/src/test/java/org/apache/druid/query/extraction/SearchQuerySpecDimExtractionFnTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.query.search.FragmentSearchQuerySpec; -import io.druid.query.search.SearchQuerySpec; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.query.search.FragmentSearchQuerySpec; +import org.apache.druid.query.search.SearchQuerySpec; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/extraction/StringFormatExtractionFnTest.java b/processing/src/test/java/org/apache/druid/query/extraction/StringFormatExtractionFnTest.java similarity index 95% rename from processing/src/test/java/io/druid/query/extraction/StringFormatExtractionFnTest.java rename to processing/src/test/java/org/apache/druid/query/extraction/StringFormatExtractionFnTest.java index 189194098b46..e98ee05da024 100644 --- a/processing/src/test/java/io/druid/query/extraction/StringFormatExtractionFnTest.java +++ b/processing/src/test/java/org/apache/druid/query/extraction/StringFormatExtractionFnTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.common.config.NullHandling; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/extraction/StrlenExtractionFnTest.java b/processing/src/test/java/org/apache/druid/query/extraction/StrlenExtractionFnTest.java similarity index 94% rename from processing/src/test/java/io/druid/query/extraction/StrlenExtractionFnTest.java rename to processing/src/test/java/org/apache/druid/query/extraction/StrlenExtractionFnTest.java index 17b754a62a02..baf629d40bb6 100644 --- a/processing/src/test/java/io/druid/query/extraction/StrlenExtractionFnTest.java +++ b/processing/src/test/java/org/apache/druid/query/extraction/StrlenExtractionFnTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.common.config.NullHandling; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/extraction/SubstringDimExtractionFnTest.java b/processing/src/test/java/org/apache/druid/query/extraction/SubstringDimExtractionFnTest.java similarity index 97% rename from processing/src/test/java/io/druid/query/extraction/SubstringDimExtractionFnTest.java rename to processing/src/test/java/org/apache/druid/query/extraction/SubstringDimExtractionFnTest.java index 84443c0c5491..1a3d3be9f662 100644 --- a/processing/src/test/java/io/druid/query/extraction/SubstringDimExtractionFnTest.java +++ b/processing/src/test/java/org/apache/druid/query/extraction/SubstringDimExtractionFnTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/extraction/TimeDimExtractionFnTest.java b/processing/src/test/java/org/apache/druid/query/extraction/TimeDimExtractionFnTest.java similarity index 97% rename from processing/src/test/java/io/druid/query/extraction/TimeDimExtractionFnTest.java rename to processing/src/test/java/org/apache/druid/query/extraction/TimeDimExtractionFnTest.java index 2b7f5fe7af9f..07513a6ee13a 100644 --- a/processing/src/test/java/io/druid/query/extraction/TimeDimExtractionFnTest.java +++ b/processing/src/test/java/org/apache/druid/query/extraction/TimeDimExtractionFnTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Sets; -import io.druid.common.config.NullHandling; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/extraction/TimeFormatExtractionFnTest.java b/processing/src/test/java/org/apache/druid/query/extraction/TimeFormatExtractionFnTest.java similarity index 95% rename from processing/src/test/java/io/druid/query/extraction/TimeFormatExtractionFnTest.java rename to processing/src/test/java/org/apache/druid/query/extraction/TimeFormatExtractionFnTest.java index 394026506872..14a1282a6568 100644 --- a/processing/src/test/java/io/druid/query/extraction/TimeFormatExtractionFnTest.java +++ b/processing/src/test/java/org/apache/druid/query/extraction/TimeFormatExtractionFnTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; import org.joda.time.DateTimeZone; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/extraction/UpperExtractionFnTest.java b/processing/src/test/java/org/apache/druid/query/extraction/UpperExtractionFnTest.java similarity index 94% rename from processing/src/test/java/io/druid/query/extraction/UpperExtractionFnTest.java rename to processing/src/test/java/org/apache/druid/query/extraction/UpperExtractionFnTest.java index 55d8f5255a36..05a2590091f2 100644 --- a/processing/src/test/java/io/druid/query/extraction/UpperExtractionFnTest.java +++ b/processing/src/test/java/org/apache/druid/query/extraction/UpperExtractionFnTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.extraction; +package org.apache.druid.query.extraction; -import io.druid.common.config.NullHandling; +import org.apache.druid.common.config.NullHandling; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/filter/AndDimFilterTest.java b/processing/src/test/java/org/apache/druid/query/filter/AndDimFilterTest.java similarity index 97% rename from processing/src/test/java/io/druid/query/filter/AndDimFilterTest.java rename to processing/src/test/java/org/apache/druid/query/filter/AndDimFilterTest.java index 8dc7ac8aac58..4e430c70c13b 100644 --- a/processing/src/test/java/io/druid/query/filter/AndDimFilterTest.java +++ b/processing/src/test/java/org/apache/druid/query/filter/AndDimFilterTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.google.common.collect.Lists; import com.google.common.collect.Sets; diff --git a/processing/src/test/java/io/druid/query/filter/BoundDimFilterTest.java b/processing/src/test/java/org/apache/druid/query/filter/BoundDimFilterTest.java similarity index 94% rename from processing/src/test/java/io/druid/query/filter/BoundDimFilterTest.java rename to processing/src/test/java/org/apache/druid/query/filter/BoundDimFilterTest.java index d4c73d790e73..e07d70cb7479 100644 --- a/processing/src/test/java/io/druid/query/filter/BoundDimFilterTest.java +++ b/processing/src/test/java/org/apache/druid/query/filter/BoundDimFilterTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.fasterxml.jackson.databind.ObjectMapper; @@ -25,11 +25,11 @@ import com.google.common.collect.Sets; import com.google.inject.Injector; import com.google.inject.Key; -import io.druid.guice.GuiceInjectors; -import io.druid.guice.annotations.Json; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.extraction.RegexDimExtractionFn; -import io.druid.query.ordering.StringComparators; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.extraction.RegexDimExtractionFn; +import org.apache.druid.query.ordering.StringComparators; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/processing/src/test/java/io/druid/query/filter/ColumnComparisonDimFilterTest.java b/processing/src/test/java/org/apache/druid/query/filter/ColumnComparisonDimFilterTest.java similarity index 97% rename from processing/src/test/java/io/druid/query/filter/ColumnComparisonDimFilterTest.java rename to processing/src/test/java/org/apache/druid/query/filter/ColumnComparisonDimFilterTest.java index 8533d7f8be63..c90e0d867419 100644 --- a/processing/src/test/java/io/druid/query/filter/ColumnComparisonDimFilterTest.java +++ b/processing/src/test/java/org/apache/druid/query/filter/ColumnComparisonDimFilterTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; -import io.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.DefaultDimensionSpec; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/filter/DimFilterUtilsTest.java b/processing/src/test/java/org/apache/druid/query/filter/DimFilterUtilsTest.java similarity index 97% rename from processing/src/test/java/io/druid/query/filter/DimFilterUtilsTest.java rename to processing/src/test/java/org/apache/druid/query/filter/DimFilterUtilsTest.java index c446cd7bd643..77705073508c 100644 --- a/processing/src/test/java/io/druid/query/filter/DimFilterUtilsTest.java +++ b/processing/src/test/java/org/apache/druid/query/filter/DimFilterUtilsTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -28,7 +28,7 @@ import com.google.common.collect.Range; import com.google.common.collect.RangeSet; import com.google.common.collect.Sets; -import io.druid.timeline.partition.ShardSpec; +import org.apache.druid.timeline.partition.ShardSpec; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/filter/ExtractionDimFilterTest.java b/processing/src/test/java/org/apache/druid/query/filter/ExtractionDimFilterTest.java similarity index 91% rename from processing/src/test/java/io/druid/query/filter/ExtractionDimFilterTest.java rename to processing/src/test/java/org/apache/druid/query/filter/ExtractionDimFilterTest.java index a97966f05fb0..a99b1da6974d 100644 --- a/processing/src/test/java/io/druid/query/filter/ExtractionDimFilterTest.java +++ b/processing/src/test/java/org/apache/druid/query/filter/ExtractionDimFilterTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; -import io.druid.query.extraction.IdentityExtractionFn; -import io.druid.query.extraction.RegexDimExtractionFn; +import org.apache.druid.query.extraction.IdentityExtractionFn; +import org.apache.druid.query.extraction.RegexDimExtractionFn; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/filter/GetDimensionRangeSetTest.java b/processing/src/test/java/org/apache/druid/query/filter/GetDimensionRangeSetTest.java similarity index 96% rename from processing/src/test/java/io/druid/query/filter/GetDimensionRangeSetTest.java rename to processing/src/test/java/org/apache/druid/query/filter/GetDimensionRangeSetTest.java index e9e9c238575a..d51bf5374a67 100644 --- a/processing/src/test/java/io/druid/query/filter/GetDimensionRangeSetTest.java +++ b/processing/src/test/java/org/apache/druid/query/filter/GetDimensionRangeSetTest.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableRangeSet; import com.google.common.collect.Range; import com.google.common.collect.RangeSet; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.Intervals; -import io.druid.js.JavaScriptConfig; -import io.druid.query.extraction.IdentityExtractionFn; -import io.druid.query.ordering.StringComparators; -import io.druid.query.search.ContainsSearchQuerySpec; -import io.druid.segment.column.Column; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.js.JavaScriptConfig; +import org.apache.druid.query.extraction.IdentityExtractionFn; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.query.search.ContainsSearchQuerySpec; +import org.apache.druid.segment.column.Column; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/filter/InDimFilterSerDesrTest.java b/processing/src/test/java/org/apache/druid/query/filter/InDimFilterSerDesrTest.java similarity index 94% rename from processing/src/test/java/io/druid/query/filter/InDimFilterSerDesrTest.java rename to processing/src/test/java/org/apache/druid/query/filter/InDimFilterSerDesrTest.java index e59be3713b8f..1306a66f6839 100644 --- a/processing/src/test/java/io/druid/query/filter/InDimFilterSerDesrTest.java +++ b/processing/src/test/java/org/apache/druid/query/filter/InDimFilterSerDesrTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.inject.Injector; import com.google.inject.Key; -import io.druid.guice.GuiceInjectors; -import io.druid.guice.annotations.Json; -import io.druid.query.extraction.RegexDimExtractionFn; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.query.extraction.RegexDimExtractionFn; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/filter/IntervalDimFilterTest.java b/processing/src/test/java/org/apache/druid/query/filter/IntervalDimFilterTest.java similarity index 96% rename from processing/src/test/java/io/druid/query/filter/IntervalDimFilterTest.java rename to processing/src/test/java/org/apache/druid/query/filter/IntervalDimFilterTest.java index 1eb35af147ac..8a1903b05ee6 100644 --- a/processing/src/test/java/io/druid/query/filter/IntervalDimFilterTest.java +++ b/processing/src/test/java/org/apache/druid/query/filter/IntervalDimFilterTest.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Sets; import com.google.inject.Injector; import com.google.inject.Key; -import io.druid.guice.GuiceInjectors; -import io.druid.guice.annotations.Json; -import io.druid.java.util.common.Intervals; -import io.druid.query.extraction.RegexDimExtractionFn; -import io.druid.segment.column.Column; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.query.extraction.RegexDimExtractionFn; +import org.apache.druid.segment.column.Column; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/filter/JavaScriptDimFilterTest.java b/processing/src/test/java/org/apache/druid/query/filter/JavaScriptDimFilterTest.java similarity index 96% rename from processing/src/test/java/io/druid/query/filter/JavaScriptDimFilterTest.java rename to processing/src/test/java/org/apache/druid/query/filter/JavaScriptDimFilterTest.java index cb5b1605a556..b9f29936136e 100644 --- a/processing/src/test/java/io/druid/query/filter/JavaScriptDimFilterTest.java +++ b/processing/src/test/java/org/apache/druid/query/filter/JavaScriptDimFilterTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.google.common.collect.Sets; -import io.druid.js.JavaScriptConfig; -import io.druid.query.extraction.RegexDimExtractionFn; -import io.druid.segment.filter.JavaScriptFilter; +import org.apache.druid.js.JavaScriptConfig; +import org.apache.druid.query.extraction.RegexDimExtractionFn; +import org.apache.druid.segment.filter.JavaScriptFilter; import org.hamcrest.CoreMatchers; import org.junit.Assert; import org.junit.Rule; diff --git a/processing/src/test/java/io/druid/query/filter/LikeDimFilterTest.java b/processing/src/test/java/org/apache/druid/query/filter/LikeDimFilterTest.java similarity index 94% rename from processing/src/test/java/io/druid/query/filter/LikeDimFilterTest.java rename to processing/src/test/java/org/apache/druid/query/filter/LikeDimFilterTest.java index adfff1f3a16d..e918a66f7aa3 100644 --- a/processing/src/test/java/io/druid/query/filter/LikeDimFilterTest.java +++ b/processing/src/test/java/org/apache/druid/query/filter/LikeDimFilterTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Sets; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.query.extraction.SubstringDimExtractionFn; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.query.extraction.SubstringDimExtractionFn; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/filter/RegexDimFilterTest.java b/processing/src/test/java/org/apache/druid/query/filter/RegexDimFilterTest.java similarity index 96% rename from processing/src/test/java/io/druid/query/filter/RegexDimFilterTest.java rename to processing/src/test/java/org/apache/druid/query/filter/RegexDimFilterTest.java index aa18be0d74b8..9261a2000faf 100644 --- a/processing/src/test/java/io/druid/query/filter/RegexDimFilterTest.java +++ b/processing/src/test/java/org/apache/druid/query/filter/RegexDimFilterTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; -import io.druid.query.extraction.RegexDimExtractionFn; +import org.apache.druid.query.extraction.RegexDimExtractionFn; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/filter/SearchQueryDimFilterTest.java b/processing/src/test/java/org/apache/druid/query/filter/SearchQueryDimFilterTest.java similarity index 96% rename from processing/src/test/java/io/druid/query/filter/SearchQueryDimFilterTest.java rename to processing/src/test/java/org/apache/druid/query/filter/SearchQueryDimFilterTest.java index 255026b9fc5e..78bc7f129728 100644 --- a/processing/src/test/java/io/druid/query/filter/SearchQueryDimFilterTest.java +++ b/processing/src/test/java/org/apache/druid/query/filter/SearchQueryDimFilterTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; -import io.druid.java.util.common.StringUtils; -import io.druid.query.extraction.RegexDimExtractionFn; -import io.druid.query.search.SearchQuerySpec; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.extraction.RegexDimExtractionFn; +import org.apache.druid.query.search.SearchQuerySpec; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/filter/SelectorDimFilterTest.java b/processing/src/test/java/org/apache/druid/query/filter/SelectorDimFilterTest.java similarity index 96% rename from processing/src/test/java/io/druid/query/filter/SelectorDimFilterTest.java rename to processing/src/test/java/org/apache/druid/query/filter/SelectorDimFilterTest.java index daa0b6db4035..695826312117 100644 --- a/processing/src/test/java/io/druid/query/filter/SelectorDimFilterTest.java +++ b/processing/src/test/java/org/apache/druid/query/filter/SelectorDimFilterTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.filter; +package org.apache.druid.query.filter; import com.google.common.collect.Sets; -import io.druid.query.extraction.RegexDimExtractionFn; +import org.apache.druid.query.extraction.RegexDimExtractionFn; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/groupby/DefaultGroupByQueryMetricsTest.java b/processing/src/test/java/org/apache/druid/query/groupby/DefaultGroupByQueryMetricsTest.java similarity index 84% rename from processing/src/test/java/io/druid/query/groupby/DefaultGroupByQueryMetricsTest.java rename to processing/src/test/java/org/apache/druid/query/groupby/DefaultGroupByQueryMetricsTest.java index ca69e82d8c7e..379c7e04d315 100644 --- a/processing/src/test/java/io/druid/query/groupby/DefaultGroupByQueryMetricsTest.java +++ b/processing/src/test/java/org/apache/druid/query/groupby/DefaultGroupByQueryMetricsTest.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.query.groupby; +package org.apache.druid.query.groupby; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.PeriodGranularity; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.query.CachingEmitter; -import io.druid.query.DefaultQueryMetricsTest; -import io.druid.query.DruidMetrics; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.dimension.ExtractionDimensionSpec; -import io.druid.query.extraction.MapLookupExtractor; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.query.lookup.LookupExtractionFn; -import io.druid.segment.TestHelper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.PeriodGranularity; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.query.CachingEmitter; +import org.apache.druid.query.DefaultQueryMetricsTest; +import org.apache.druid.query.DruidMetrics; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.dimension.ExtractionDimensionSpec; +import org.apache.druid.query.extraction.MapLookupExtractor; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.query.lookup.LookupExtractionFn; +import org.apache.druid.segment.TestHelper; import org.joda.time.Interval; import org.joda.time.Period; import org.junit.Assert; diff --git a/processing/src/test/java/io/druid/query/groupby/GroupByLimitPushDownInsufficientBufferTest.java b/processing/src/test/java/org/apache/druid/query/groupby/GroupByLimitPushDownInsufficientBufferTest.java similarity index 88% rename from processing/src/test/java/io/druid/query/groupby/GroupByLimitPushDownInsufficientBufferTest.java rename to processing/src/test/java/org/apache/druid/query/groupby/GroupByLimitPushDownInsufficientBufferTest.java index 11f0cd84b74b..99a8b646a661 100644 --- a/processing/src/test/java/io/druid/query/groupby/GroupByLimitPushDownInsufficientBufferTest.java +++ b/processing/src/test/java/org/apache/druid/query/groupby/GroupByLimitPushDownInsufficientBufferTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.groupby; +package org.apache.druid.query.groupby; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; @@ -30,53 +30,53 @@ import com.google.common.collect.Maps; import com.google.common.io.Files; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.collections.CloseableDefaultBlockingPool; -import io.druid.collections.CloseableStupidPool; -import io.druid.data.input.InputRow; -import io.druid.data.input.MapBasedInputRow; -import io.druid.data.input.Row; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.LongDimensionSchema; -import io.druid.data.input.impl.StringDimensionSchema; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.common.logger.Logger; -import io.druid.math.expr.ExprMacroTable; -import io.druid.query.BySegmentQueryRunner; -import io.druid.query.DruidProcessingConfig; -import io.druid.query.FinalizeResultsQueryRunner; -import io.druid.query.IntervalChunkingQueryRunnerDecorator; -import io.druid.query.Query; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryToolChest; -import io.druid.query.QueryWatcher; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.groupby.orderby.DefaultLimitSpec; -import io.druid.query.groupby.orderby.OrderByColumnSpec; -import io.druid.query.groupby.strategy.GroupByStrategySelector; -import io.druid.query.groupby.strategy.GroupByStrategyV1; -import io.druid.query.groupby.strategy.GroupByStrategyV2; -import io.druid.query.ordering.StringComparators; -import io.druid.query.spec.MultipleIntervalSegmentSpec; -import io.druid.query.spec.QuerySegmentSpec; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMergerV9; -import io.druid.segment.IndexSpec; -import io.druid.segment.QueryableIndex; -import io.druid.segment.QueryableIndexSegment; -import io.druid.segment.Segment; -import io.druid.segment.column.ColumnConfig; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexSchema; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; +import org.apache.druid.collections.CloseableDefaultBlockingPool; +import org.apache.druid.collections.CloseableStupidPool; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.LongDimensionSchema; +import org.apache.druid.data.input.impl.StringDimensionSchema; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.query.BySegmentQueryRunner; +import org.apache.druid.query.DruidProcessingConfig; +import org.apache.druid.query.FinalizeResultsQueryRunner; +import org.apache.druid.query.IntervalChunkingQueryRunnerDecorator; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.QueryWatcher; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.groupby.orderby.DefaultLimitSpec; +import org.apache.druid.query.groupby.orderby.OrderByColumnSpec; +import org.apache.druid.query.groupby.strategy.GroupByStrategySelector; +import org.apache.druid.query.groupby.strategy.GroupByStrategyV1; +import org.apache.druid.query.groupby.strategy.GroupByStrategyV2; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.query.spec.QuerySegmentSpec; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMergerV9; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.QueryableIndexSegment; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.column.ColumnConfig; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; import org.apache.commons.io.FileUtils; import org.junit.After; import org.junit.Assert; diff --git a/processing/src/test/java/io/druid/query/groupby/GroupByLimitPushDownMultiNodeMergeTest.java b/processing/src/test/java/org/apache/druid/query/groupby/GroupByLimitPushDownMultiNodeMergeTest.java similarity index 88% rename from processing/src/test/java/io/druid/query/groupby/GroupByLimitPushDownMultiNodeMergeTest.java rename to processing/src/test/java/org/apache/druid/query/groupby/GroupByLimitPushDownMultiNodeMergeTest.java index 98dd9e69efb5..6b12b2d05415 100644 --- a/processing/src/test/java/io/druid/query/groupby/GroupByLimitPushDownMultiNodeMergeTest.java +++ b/processing/src/test/java/org/apache/druid/query/groupby/GroupByLimitPushDownMultiNodeMergeTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.groupby; +package org.apache.druid.query.groupby; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; @@ -30,61 +30,61 @@ import com.google.common.collect.Maps; import com.google.common.io.Files; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.collections.CloseableDefaultBlockingPool; -import io.druid.collections.CloseableStupidPool; -import io.druid.data.input.InputRow; -import io.druid.data.input.MapBasedInputRow; -import io.druid.data.input.Row; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.LongDimensionSchema; -import io.druid.data.input.impl.StringDimensionSchema; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.PeriodGranularity; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.common.logger.Logger; -import io.druid.math.expr.ExprMacroTable; -import io.druid.query.BySegmentQueryRunner; -import io.druid.query.DruidProcessingConfig; -import io.druid.query.FinalizeResultsQueryRunner; -import io.druid.query.IntervalChunkingQueryRunnerDecorator; -import io.druid.query.Query; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryToolChest; -import io.druid.query.QueryWatcher; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.dimension.ExtractionDimensionSpec; -import io.druid.query.expression.TestExprMacroTable; -import io.druid.query.extraction.TimeFormatExtractionFn; -import io.druid.query.groupby.orderby.DefaultLimitSpec; -import io.druid.query.groupby.orderby.OrderByColumnSpec; -import io.druid.query.groupby.strategy.GroupByStrategySelector; -import io.druid.query.groupby.strategy.GroupByStrategyV1; -import io.druid.query.groupby.strategy.GroupByStrategyV2; -import io.druid.query.ordering.StringComparators; -import io.druid.query.spec.MultipleIntervalSegmentSpec; -import io.druid.query.spec.QuerySegmentSpec; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMergerV9; -import io.druid.segment.IndexSpec; -import io.druid.segment.QueryableIndex; -import io.druid.segment.QueryableIndexSegment; -import io.druid.segment.Segment; -import io.druid.segment.column.Column; -import io.druid.segment.column.ColumnConfig; -import io.druid.segment.column.ValueType; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexSchema; -import io.druid.segment.virtual.ExpressionVirtualColumn; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; +import org.apache.druid.collections.CloseableDefaultBlockingPool; +import org.apache.druid.collections.CloseableStupidPool; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.LongDimensionSchema; +import org.apache.druid.data.input.impl.StringDimensionSchema; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.PeriodGranularity; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.query.BySegmentQueryRunner; +import org.apache.druid.query.DruidProcessingConfig; +import org.apache.druid.query.FinalizeResultsQueryRunner; +import org.apache.druid.query.IntervalChunkingQueryRunnerDecorator; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.QueryWatcher; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.ExtractionDimensionSpec; +import org.apache.druid.query.expression.TestExprMacroTable; +import org.apache.druid.query.extraction.TimeFormatExtractionFn; +import org.apache.druid.query.groupby.orderby.DefaultLimitSpec; +import org.apache.druid.query.groupby.orderby.OrderByColumnSpec; +import org.apache.druid.query.groupby.strategy.GroupByStrategySelector; +import org.apache.druid.query.groupby.strategy.GroupByStrategyV1; +import org.apache.druid.query.groupby.strategy.GroupByStrategyV2; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.query.spec.QuerySegmentSpec; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMergerV9; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.QueryableIndexSegment; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ColumnConfig; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.segment.virtual.ExpressionVirtualColumn; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; import org.apache.commons.io.FileUtils; import org.joda.time.DateTimeZone; import org.joda.time.Period; diff --git a/processing/src/test/java/io/druid/query/groupby/GroupByMultiSegmentTest.java b/processing/src/test/java/org/apache/druid/query/groupby/GroupByMultiSegmentTest.java similarity index 81% rename from processing/src/test/java/io/druid/query/groupby/GroupByMultiSegmentTest.java rename to processing/src/test/java/org/apache/druid/query/groupby/GroupByMultiSegmentTest.java index 37549dce6849..708fb95aca8e 100644 --- a/processing/src/test/java/io/druid/query/groupby/GroupByMultiSegmentTest.java +++ b/processing/src/test/java/org/apache/druid/query/groupby/GroupByMultiSegmentTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.groupby; +package org.apache.druid.query.groupby; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; @@ -28,52 +28,52 @@ import com.google.common.collect.Maps; import com.google.common.io.Files; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.collections.CloseableDefaultBlockingPool; -import io.druid.collections.CloseableStupidPool; -import io.druid.data.input.InputRow; -import io.druid.data.input.MapBasedInputRow; -import io.druid.data.input.Row; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.LongDimensionSchema; -import io.druid.data.input.impl.StringDimensionSchema; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.common.logger.Logger; -import io.druid.math.expr.ExprMacroTable; -import io.druid.query.BySegmentQueryRunner; -import io.druid.query.DruidProcessingConfig; -import io.druid.query.FinalizeResultsQueryRunner; -import io.druid.query.IntervalChunkingQueryRunnerDecorator; -import io.druid.query.Query; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryToolChest; -import io.druid.query.QueryWatcher; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.groupby.having.GreaterThanHavingSpec; -import io.druid.query.groupby.orderby.DefaultLimitSpec; -import io.druid.query.groupby.orderby.OrderByColumnSpec; -import io.druid.query.groupby.strategy.GroupByStrategySelector; -import io.druid.query.groupby.strategy.GroupByStrategyV1; -import io.druid.query.groupby.strategy.GroupByStrategyV2; -import io.druid.query.spec.MultipleIntervalSegmentSpec; -import io.druid.query.spec.QuerySegmentSpec; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMergerV9; -import io.druid.segment.IndexSpec; -import io.druid.segment.QueryableIndex; -import io.druid.segment.QueryableIndexSegment; -import io.druid.segment.Segment; -import io.druid.segment.column.ColumnConfig; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexSchema; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; +import org.apache.druid.collections.CloseableDefaultBlockingPool; +import org.apache.druid.collections.CloseableStupidPool; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.LongDimensionSchema; +import org.apache.druid.data.input.impl.StringDimensionSchema; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.query.BySegmentQueryRunner; +import org.apache.druid.query.DruidProcessingConfig; +import org.apache.druid.query.FinalizeResultsQueryRunner; +import org.apache.druid.query.IntervalChunkingQueryRunnerDecorator; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.QueryWatcher; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.groupby.having.GreaterThanHavingSpec; +import org.apache.druid.query.groupby.orderby.DefaultLimitSpec; +import org.apache.druid.query.groupby.orderby.OrderByColumnSpec; +import org.apache.druid.query.groupby.strategy.GroupByStrategySelector; +import org.apache.druid.query.groupby.strategy.GroupByStrategyV1; +import org.apache.druid.query.groupby.strategy.GroupByStrategyV2; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.query.spec.QuerySegmentSpec; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMergerV9; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.QueryableIndexSegment; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.column.ColumnConfig; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; import org.apache.commons.io.FileUtils; import org.junit.After; import org.junit.Assert; diff --git a/processing/src/test/java/io/druid/query/groupby/GroupByQueryConfigTest.java b/processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryConfigTest.java similarity index 95% rename from processing/src/test/java/io/druid/query/groupby/GroupByQueryConfigTest.java rename to processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryConfigTest.java index b94b0031163e..74d5e28c9aa7 100644 --- a/processing/src/test/java/io/druid/query/groupby/GroupByQueryConfigTest.java +++ b/processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryConfigTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.groupby; +package org.apache.druid.query.groupby; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.segment.TestHelper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.segment.TestHelper; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/groupby/GroupByQueryMergeBufferTest.java b/processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryMergeBufferTest.java similarity index 93% rename from processing/src/test/java/io/druid/query/groupby/GroupByQueryMergeBufferTest.java rename to processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryMergeBufferTest.java index 2a0e91830c43..537ecb3be593 100644 --- a/processing/src/test/java/io/druid/query/groupby/GroupByQueryMergeBufferTest.java +++ b/processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryMergeBufferTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.groupby; +package org.apache.druid.query.groupby; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Supplier; @@ -26,21 +26,21 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.collections.CloseableDefaultBlockingPool; -import io.druid.collections.CloseableStupidPool; -import io.druid.collections.ReferenceCountingResourceHolder; -import io.druid.data.input.Row; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.DruidProcessingConfig; -import io.druid.query.QueryContexts; -import io.druid.query.QueryDataSource; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.groupby.strategy.GroupByStrategySelector; -import io.druid.query.groupby.strategy.GroupByStrategyV1; -import io.druid.query.groupby.strategy.GroupByStrategyV2; +import org.apache.druid.collections.CloseableDefaultBlockingPool; +import org.apache.druid.collections.CloseableStupidPool; +import org.apache.druid.collections.ReferenceCountingResourceHolder; +import org.apache.druid.data.input.Row; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.DruidProcessingConfig; +import org.apache.druid.query.QueryContexts; +import org.apache.druid.query.QueryDataSource; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.groupby.strategy.GroupByStrategySelector; +import org.apache.druid.query.groupby.strategy.GroupByStrategyV1; +import org.apache.druid.query.groupby.strategy.GroupByStrategyV2; import org.junit.AfterClass; import org.junit.Before; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerFactoryTest.java b/processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryRunnerFactoryTest.java similarity index 80% rename from processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerFactoryTest.java rename to processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryRunnerFactoryTest.java index e54c09e11723..6b1fa92a858d 100644 --- a/processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerFactoryTest.java +++ b/processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryRunnerFactoryTest.java @@ -17,33 +17,33 @@ * under the License. */ -package io.druid.query.groupby; +package org.apache.druid.query.groupby; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; -import io.druid.data.input.Row; -import io.druid.data.input.impl.CSVParseSpec; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.MergeSequence; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.common.io.Closer; -import io.druid.query.Query; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.spec.LegacySegmentSpec; -import io.druid.segment.CloserRule; -import io.druid.segment.IncrementalIndexSegment; -import io.druid.segment.Segment; -import io.druid.segment.TestHelper; -import io.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.data.input.Row; +import org.apache.druid.data.input.impl.CSVParseSpec; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.MergeSequence; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.spec.LegacySegmentSpec; +import org.apache.druid.segment.CloserRule; +import org.apache.druid.segment.IncrementalIndexSegment; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.incremental.IncrementalIndex; import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerFailureTest.java b/processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryRunnerFailureTest.java similarity index 89% rename from processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerFailureTest.java rename to processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryRunnerFailureTest.java index 9e55b5868212..cac1ac443c67 100644 --- a/processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerFailureTest.java +++ b/processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryRunnerFailureTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.groupby; +package org.apache.druid.query.groupby; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Supplier; @@ -26,24 +26,24 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.collections.CloseableDefaultBlockingPool; -import io.druid.collections.CloseableStupidPool; -import io.druid.collections.ReferenceCountingResourceHolder; -import io.druid.data.input.Row; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.DruidProcessingConfig; -import io.druid.query.InsufficientResourcesException; -import io.druid.query.QueryContexts; -import io.druid.query.QueryDataSource; -import io.druid.query.QueryInterruptedException; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.ResourceLimitExceededException; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.groupby.strategy.GroupByStrategySelector; -import io.druid.query.groupby.strategy.GroupByStrategyV1; -import io.druid.query.groupby.strategy.GroupByStrategyV2; +import org.apache.druid.collections.CloseableDefaultBlockingPool; +import org.apache.druid.collections.CloseableStupidPool; +import org.apache.druid.collections.ReferenceCountingResourceHolder; +import org.apache.druid.data.input.Row; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.DruidProcessingConfig; +import org.apache.druid.query.InsufficientResourcesException; +import org.apache.druid.query.QueryContexts; +import org.apache.druid.query.QueryDataSource; +import org.apache.druid.query.QueryInterruptedException; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.ResourceLimitExceededException; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.groupby.strategy.GroupByStrategySelector; +import org.apache.druid.query.groupby.strategy.GroupByStrategyV1; +import org.apache.druid.query.groupby.strategy.GroupByStrategyV2; import org.hamcrest.CoreMatchers; import org.junit.AfterClass; import org.junit.Rule; diff --git a/processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerTest.java b/processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryRunnerTest.java similarity index 98% rename from processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerTest.java rename to processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryRunnerTest.java index 3043bd74b9c2..7697506dd7d8 100644 --- a/processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerTest.java +++ b/processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryRunnerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.groupby; +package org.apache.druid.query.groupby; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Functions; @@ -31,99 +31,99 @@ import com.google.common.collect.Ordering; import com.google.common.collect.Sets; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.collections.CloseableDefaultBlockingPool; -import io.druid.collections.CloseableStupidPool; -import io.druid.common.config.NullHandling; -import io.druid.data.input.Row; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.DurationGranularity; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.PeriodGranularity; -import io.druid.java.util.common.guava.MergeSequence; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.common.io.Closer; -import io.druid.js.JavaScriptConfig; -import io.druid.query.BySegmentResultValue; -import io.druid.query.BySegmentResultValueClass; -import io.druid.query.ChainedExecutionQueryRunner; -import io.druid.query.DruidProcessingConfig; -import io.druid.query.FinalizeResultsQueryRunner; -import io.druid.query.QueryContexts; -import io.druid.query.QueryDataSource; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.QueryToolChest; -import io.druid.query.ResourceLimitExceededException; -import io.druid.query.Result; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.DoubleMaxAggregatorFactory; -import io.druid.query.aggregation.DoubleSumAggregatorFactory; -import io.druid.query.aggregation.FilteredAggregatorFactory; -import io.druid.query.aggregation.FloatSumAggregatorFactory; -import io.druid.query.aggregation.JavaScriptAggregatorFactory; -import io.druid.query.aggregation.LongMaxAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.aggregation.cardinality.CardinalityAggregatorFactory; -import io.druid.query.aggregation.first.LongFirstAggregatorFactory; -import io.druid.query.aggregation.hyperloglog.HyperUniqueFinalizingPostAggregator; -import io.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; -import io.druid.query.aggregation.last.LongLastAggregatorFactory; -import io.druid.query.aggregation.post.ArithmeticPostAggregator; -import io.druid.query.aggregation.post.ConstantPostAggregator; -import io.druid.query.aggregation.post.ExpressionPostAggregator; -import io.druid.query.aggregation.post.FieldAccessPostAggregator; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.dimension.ExtractionDimensionSpec; -import io.druid.query.dimension.ListFilteredDimensionSpec; -import io.druid.query.dimension.RegexFilteredDimensionSpec; -import io.druid.query.expression.TestExprMacroTable; -import io.druid.query.extraction.CascadeExtractionFn; -import io.druid.query.extraction.DimExtractionFn; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.extraction.JavaScriptExtractionFn; -import io.druid.query.extraction.MapLookupExtractor; -import io.druid.query.extraction.RegexDimExtractionFn; -import io.druid.query.extraction.StringFormatExtractionFn; -import io.druid.query.extraction.StrlenExtractionFn; -import io.druid.query.extraction.TimeFormatExtractionFn; -import io.druid.query.filter.AndDimFilter; -import io.druid.query.filter.BoundDimFilter; -import io.druid.query.filter.DimFilter; -import io.druid.query.filter.ExtractionDimFilter; -import io.druid.query.filter.InDimFilter; -import io.druid.query.filter.JavaScriptDimFilter; -import io.druid.query.filter.OrDimFilter; -import io.druid.query.filter.RegexDimFilter; -import io.druid.query.filter.SearchQueryDimFilter; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.query.groupby.having.BaseHavingSpec; -import io.druid.query.groupby.having.DimFilterHavingSpec; -import io.druid.query.groupby.having.DimensionSelectorHavingSpec; -import io.druid.query.groupby.having.EqualToHavingSpec; -import io.druid.query.groupby.having.GreaterThanHavingSpec; -import io.druid.query.groupby.having.OrHavingSpec; -import io.druid.query.groupby.orderby.DefaultLimitSpec; -import io.druid.query.groupby.orderby.LimitSpec; -import io.druid.query.groupby.orderby.OrderByColumnSpec; -import io.druid.query.groupby.strategy.GroupByStrategySelector; -import io.druid.query.groupby.strategy.GroupByStrategyV1; -import io.druid.query.groupby.strategy.GroupByStrategyV2; -import io.druid.query.lookup.LookupExtractionFn; -import io.druid.query.ordering.StringComparators; -import io.druid.query.search.ContainsSearchQuerySpec; -import io.druid.query.spec.MultipleIntervalSegmentSpec; -import io.druid.segment.TestHelper; -import io.druid.segment.column.Column; -import io.druid.segment.column.ValueType; -import io.druid.segment.virtual.ExpressionVirtualColumn; +import org.apache.druid.collections.CloseableDefaultBlockingPool; +import org.apache.druid.collections.CloseableStupidPool; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.data.input.Row; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.DurationGranularity; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.PeriodGranularity; +import org.apache.druid.java.util.common.guava.MergeSequence; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.js.JavaScriptConfig; +import org.apache.druid.query.BySegmentResultValue; +import org.apache.druid.query.BySegmentResultValueClass; +import org.apache.druid.query.ChainedExecutionQueryRunner; +import org.apache.druid.query.DruidProcessingConfig; +import org.apache.druid.query.FinalizeResultsQueryRunner; +import org.apache.druid.query.QueryContexts; +import org.apache.druid.query.QueryDataSource; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.ResourceLimitExceededException; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleMaxAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; +import org.apache.druid.query.aggregation.FilteredAggregatorFactory; +import org.apache.druid.query.aggregation.FloatSumAggregatorFactory; +import org.apache.druid.query.aggregation.JavaScriptAggregatorFactory; +import org.apache.druid.query.aggregation.LongMaxAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.aggregation.cardinality.CardinalityAggregatorFactory; +import org.apache.druid.query.aggregation.first.LongFirstAggregatorFactory; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniqueFinalizingPostAggregator; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; +import org.apache.druid.query.aggregation.last.LongLastAggregatorFactory; +import org.apache.druid.query.aggregation.post.ArithmeticPostAggregator; +import org.apache.druid.query.aggregation.post.ConstantPostAggregator; +import org.apache.druid.query.aggregation.post.ExpressionPostAggregator; +import org.apache.druid.query.aggregation.post.FieldAccessPostAggregator; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.ExtractionDimensionSpec; +import org.apache.druid.query.dimension.ListFilteredDimensionSpec; +import org.apache.druid.query.dimension.RegexFilteredDimensionSpec; +import org.apache.druid.query.expression.TestExprMacroTable; +import org.apache.druid.query.extraction.CascadeExtractionFn; +import org.apache.druid.query.extraction.DimExtractionFn; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.extraction.JavaScriptExtractionFn; +import org.apache.druid.query.extraction.MapLookupExtractor; +import org.apache.druid.query.extraction.RegexDimExtractionFn; +import org.apache.druid.query.extraction.StringFormatExtractionFn; +import org.apache.druid.query.extraction.StrlenExtractionFn; +import org.apache.druid.query.extraction.TimeFormatExtractionFn; +import org.apache.druid.query.filter.AndDimFilter; +import org.apache.druid.query.filter.BoundDimFilter; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.filter.ExtractionDimFilter; +import org.apache.druid.query.filter.InDimFilter; +import org.apache.druid.query.filter.JavaScriptDimFilter; +import org.apache.druid.query.filter.OrDimFilter; +import org.apache.druid.query.filter.RegexDimFilter; +import org.apache.druid.query.filter.SearchQueryDimFilter; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.query.groupby.having.BaseHavingSpec; +import org.apache.druid.query.groupby.having.DimFilterHavingSpec; +import org.apache.druid.query.groupby.having.DimensionSelectorHavingSpec; +import org.apache.druid.query.groupby.having.EqualToHavingSpec; +import org.apache.druid.query.groupby.having.GreaterThanHavingSpec; +import org.apache.druid.query.groupby.having.OrHavingSpec; +import org.apache.druid.query.groupby.orderby.DefaultLimitSpec; +import org.apache.druid.query.groupby.orderby.LimitSpec; +import org.apache.druid.query.groupby.orderby.OrderByColumnSpec; +import org.apache.druid.query.groupby.strategy.GroupByStrategySelector; +import org.apache.druid.query.groupby.strategy.GroupByStrategyV1; +import org.apache.druid.query.groupby.strategy.GroupByStrategyV2; +import org.apache.druid.query.lookup.LookupExtractionFn; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.query.search.ContainsSearchQuerySpec; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.virtual.ExpressionVirtualColumn; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.Period; @@ -4090,7 +4090,7 @@ public void testSubqueryWithMultipleIntervalsInOuterQueryAndChunkPeriod() @Test public void testSubqueryWithExtractionFnInOuterQuery() { - //https://github.com/druid-io/druid/issues/2556 + //https://github.com/apache/incubator-druid/issues/2556 GroupByQuery subquery = GroupByQuery .builder() diff --git a/processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerTestHelper.java b/processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryRunnerTestHelper.java similarity index 83% rename from processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerTestHelper.java rename to processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryRunnerTestHelper.java index 0f25594e1b65..5a448a404c16 100644 --- a/processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerTestHelper.java +++ b/processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryRunnerTestHelper.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.query.groupby; +package org.apache.druid.query.groupby; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.data.input.MapBasedRow; -import io.druid.data.input.Row; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.FinalizeResultsQueryRunner; -import io.druid.query.Query; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryToolChest; -import io.druid.segment.column.Column; +import org.apache.druid.data.input.MapBasedRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.FinalizeResultsQueryRunner; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.segment.column.Column; import org.joda.time.DateTime; import org.joda.time.chrono.ISOChronology; diff --git a/processing/src/test/java/io/druid/query/groupby/GroupByQueryTest.java b/processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryTest.java similarity index 81% rename from processing/src/test/java/io/druid/query/groupby/GroupByQueryTest.java rename to processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryTest.java index eee80ebcd740..5fd314da0883 100644 --- a/processing/src/test/java/io/druid/query/groupby/GroupByQueryTest.java +++ b/processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryTest.java @@ -17,30 +17,30 @@ * under the License. */ -package io.druid.query.groupby; +package org.apache.druid.query.groupby; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Ordering; -import io.druid.data.input.MapBasedRow; -import io.druid.data.input.Row; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.BaseQuery; -import io.druid.query.Query; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.aggregation.post.FieldAccessPostAggregator; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.groupby.orderby.DefaultLimitSpec; -import io.druid.query.groupby.orderby.OrderByColumnSpec; -import io.druid.query.ordering.StringComparators; -import io.druid.query.spec.MultipleIntervalSegmentSpec; -import io.druid.query.spec.QuerySegmentSpec; -import io.druid.segment.TestHelper; -import io.druid.segment.column.ValueType; +import org.apache.druid.data.input.MapBasedRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.BaseQuery; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.aggregation.post.FieldAccessPostAggregator; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.groupby.orderby.DefaultLimitSpec; +import org.apache.druid.query.groupby.orderby.OrderByColumnSpec; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.query.spec.QuerySegmentSpec; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.column.ValueType; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/groupby/GroupByTimeseriesQueryRunnerTest.java b/processing/src/test/java/org/apache/druid/query/groupby/GroupByTimeseriesQueryRunnerTest.java similarity index 87% rename from processing/src/test/java/io/druid/query/groupby/GroupByTimeseriesQueryRunnerTest.java rename to processing/src/test/java/org/apache/druid/query/groupby/GroupByTimeseriesQueryRunnerTest.java index f41b026e6c28..06a3e5eec037 100644 --- a/processing/src/test/java/io/druid/query/groupby/GroupByTimeseriesQueryRunnerTest.java +++ b/processing/src/test/java/org/apache/druid/query/groupby/GroupByTimeseriesQueryRunnerTest.java @@ -17,33 +17,33 @@ * under the License. */ -package io.druid.query.groupby; +package org.apache.druid.query.groupby; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.data.input.MapBasedRow; -import io.druid.data.input.Row; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.common.io.Closer; -import io.druid.query.Druids; -import io.druid.query.FinalizeResultsQueryRunner; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.QueryToolChest; -import io.druid.query.Result; -import io.druid.query.aggregation.DoubleMaxAggregatorFactory; -import io.druid.query.aggregation.DoubleMinAggregatorFactory; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.timeseries.TimeseriesQueryRunnerTest; -import io.druid.query.timeseries.TimeseriesResultValue; +import org.apache.druid.data.input.MapBasedRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.query.Druids; +import org.apache.druid.query.FinalizeResultsQueryRunner; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.DoubleMaxAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleMinAggregatorFactory; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.timeseries.TimeseriesQueryRunnerTest; +import org.apache.druid.query.timeseries.TimeseriesResultValue; import org.joda.time.DateTime; import org.junit.AfterClass; import org.junit.Assert; diff --git a/processing/src/test/java/io/druid/query/groupby/epinephelinae/BufferArrayGrouperTest.java b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/BufferArrayGrouperTest.java similarity index 89% rename from processing/src/test/java/io/druid/query/groupby/epinephelinae/BufferArrayGrouperTest.java rename to processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/BufferArrayGrouperTest.java index 5d28f7f60909..8f2d3f69a571 100644 --- a/processing/src/test/java/io/druid/query/groupby/epinephelinae/BufferArrayGrouperTest.java +++ b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/BufferArrayGrouperTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.groupby.epinephelinae; +package org.apache.druid.query.groupby.epinephelinae; import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableList; @@ -25,12 +25,12 @@ import com.google.common.collect.Lists; import com.google.common.collect.Ordering; import com.google.common.primitives.Ints; -import io.druid.common.config.NullHandling; -import io.druid.data.input.MapBasedRow; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.groupby.epinephelinae.Grouper.Entry; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.data.input.MapBasedRow; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.groupby.epinephelinae.Grouper.Entry; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/groupby/epinephelinae/BufferHashGrouperTest.java b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/BufferHashGrouperTest.java similarity index 94% rename from processing/src/test/java/io/druid/query/groupby/epinephelinae/BufferHashGrouperTest.java rename to processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/BufferHashGrouperTest.java index 07b61e7233ab..53a74c75ea8a 100644 --- a/processing/src/test/java/io/druid/query/groupby/epinephelinae/BufferHashGrouperTest.java +++ b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/BufferHashGrouperTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.groupby.epinephelinae; +package org.apache.druid.query.groupby.epinephelinae; import com.google.common.base.Suppliers; import com.google.common.base.Throwables; @@ -27,13 +27,13 @@ import com.google.common.collect.Ordering; import com.google.common.io.Files; import com.google.common.primitives.Ints; -import io.druid.common.config.NullHandling; -import io.druid.data.input.MapBasedRow; -import io.druid.java.util.common.ByteBufferUtils; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.segment.CloserRule; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.data.input.MapBasedRow; +import org.apache.druid.java.util.common.ByteBufferUtils; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.segment.CloserRule; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/groupby/epinephelinae/ByteBufferMinMaxOffsetHeapTest.java b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/ByteBufferMinMaxOffsetHeapTest.java similarity index 99% rename from processing/src/test/java/io/druid/query/groupby/epinephelinae/ByteBufferMinMaxOffsetHeapTest.java rename to processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/ByteBufferMinMaxOffsetHeapTest.java index dec1a632826b..fa24a594dd1a 100644 --- a/processing/src/test/java/io/druid/query/groupby/epinephelinae/ByteBufferMinMaxOffsetHeapTest.java +++ b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/ByteBufferMinMaxOffsetHeapTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.groupby.epinephelinae; +package org.apache.druid.query.groupby.epinephelinae; import com.google.common.collect.Lists; import com.google.common.collect.Ordering; diff --git a/processing/src/test/java/io/druid/query/groupby/epinephelinae/ConcurrentGrouperTest.java b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/ConcurrentGrouperTest.java similarity index 88% rename from processing/src/test/java/io/druid/query/groupby/epinephelinae/ConcurrentGrouperTest.java rename to processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/ConcurrentGrouperTest.java index f8635d0da3fc..534d402ef93f 100644 --- a/processing/src/test/java/io/druid/query/groupby/epinephelinae/ConcurrentGrouperTest.java +++ b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/ConcurrentGrouperTest.java @@ -17,27 +17,27 @@ * under the License. */ -package io.druid.query.groupby.epinephelinae; +package org.apache.druid.query.groupby.epinephelinae; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.primitives.Longs; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.collections.ReferenceCountingResourceHolder; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.parsers.CloseableIterator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.groupby.epinephelinae.Grouper.BufferComparator; -import io.druid.query.groupby.epinephelinae.Grouper.Entry; -import io.druid.query.groupby.epinephelinae.Grouper.KeySerde; -import io.druid.query.groupby.epinephelinae.Grouper.KeySerdeFactory; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.DimensionSelector; -import io.druid.segment.column.ColumnCapabilities; +import org.apache.druid.collections.ReferenceCountingResourceHolder; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.parsers.CloseableIterator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.groupby.epinephelinae.Grouper.BufferComparator; +import org.apache.druid.query.groupby.epinephelinae.Grouper.Entry; +import org.apache.druid.query.groupby.epinephelinae.Grouper.KeySerde; +import org.apache.druid.query.groupby.epinephelinae.Grouper.KeySerdeFactory; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.column.ColumnCapabilities; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Rule; diff --git a/processing/src/test/java/io/druid/query/groupby/epinephelinae/GrouperTestUtil.java b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/GrouperTestUtil.java similarity index 95% rename from processing/src/test/java/io/druid/query/groupby/epinephelinae/GrouperTestUtil.java rename to processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/GrouperTestUtil.java index bb8dafb43994..446993814127 100644 --- a/processing/src/test/java/io/druid/query/groupby/epinephelinae/GrouperTestUtil.java +++ b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/GrouperTestUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.groupby.epinephelinae; +package org.apache.druid.query.groupby.epinephelinae; public class GrouperTestUtil { diff --git a/processing/src/test/java/io/druid/query/groupby/epinephelinae/IntKeySerde.java b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/IntKeySerde.java similarity index 95% rename from processing/src/test/java/io/druid/query/groupby/epinephelinae/IntKeySerde.java rename to processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/IntKeySerde.java index 7984283e48c5..5f14af8853f7 100644 --- a/processing/src/test/java/io/druid/query/groupby/epinephelinae/IntKeySerde.java +++ b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/IntKeySerde.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.groupby.epinephelinae; +package org.apache.druid.query.groupby.epinephelinae; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Ints; -import io.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.AggregatorFactory; import java.nio.ByteBuffer; import java.util.List; diff --git a/processing/src/test/java/io/druid/query/groupby/epinephelinae/LimitedBufferHashGrouperTest.java b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/LimitedBufferHashGrouperTest.java similarity index 95% rename from processing/src/test/java/io/druid/query/groupby/epinephelinae/LimitedBufferHashGrouperTest.java rename to processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/LimitedBufferHashGrouperTest.java index c45d442e3b67..ad990a6ed5d4 100644 --- a/processing/src/test/java/io/druid/query/groupby/epinephelinae/LimitedBufferHashGrouperTest.java +++ b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/LimitedBufferHashGrouperTest.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.groupby.epinephelinae; +package org.apache.druid.query.groupby.epinephelinae; import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import io.druid.common.config.NullHandling; -import io.druid.data.input.MapBasedRow; -import io.druid.java.util.common.IAE; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.data.input.MapBasedRow; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/groupby/epinephelinae/ParallelCombinerTest.java b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/ParallelCombinerTest.java similarity index 84% rename from processing/src/test/java/io/druid/query/groupby/epinephelinae/ParallelCombinerTest.java rename to processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/ParallelCombinerTest.java index 6f9a00db941f..8f542c3ff233 100644 --- a/processing/src/test/java/io/druid/query/groupby/epinephelinae/ParallelCombinerTest.java +++ b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/ParallelCombinerTest.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.groupby.epinephelinae; +package org.apache.druid.query.groupby.epinephelinae; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.parsers.CloseableIterator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.groupby.epinephelinae.ConcurrentGrouperTest.TestKeySerdeFactory; -import io.druid.query.groupby.epinephelinae.ConcurrentGrouperTest.TestResourceHolder; -import io.druid.query.groupby.epinephelinae.Grouper.Entry; -import io.druid.query.groupby.epinephelinae.Grouper.KeySerdeFactory; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.parsers.CloseableIterator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.groupby.epinephelinae.ConcurrentGrouperTest.TestKeySerdeFactory; +import org.apache.druid.query.groupby.epinephelinae.ConcurrentGrouperTest.TestResourceHolder; +import org.apache.druid.query.groupby.epinephelinae.Grouper.Entry; +import org.apache.druid.query.groupby.epinephelinae.Grouper.KeySerdeFactory; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/groupby/epinephelinae/StreamingMergeSortedGrouperTest.java b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/StreamingMergeSortedGrouperTest.java similarity index 93% rename from processing/src/test/java/io/druid/query/groupby/epinephelinae/StreamingMergeSortedGrouperTest.java rename to processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/StreamingMergeSortedGrouperTest.java index 2a053051aae8..15712510db18 100644 --- a/processing/src/test/java/io/druid/query/groupby/epinephelinae/StreamingMergeSortedGrouperTest.java +++ b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/StreamingMergeSortedGrouperTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.groupby.epinephelinae; +package org.apache.druid.query.groupby.epinephelinae; import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableList; @@ -25,13 +25,13 @@ import com.google.common.collect.Lists; import com.google.common.collect.Ordering; import com.google.common.primitives.Ints; -import io.druid.common.config.NullHandling; -import io.druid.data.input.MapBasedRow; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.groupby.epinephelinae.Grouper.Entry; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.data.input.MapBasedRow; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.groupby.epinephelinae.Grouper.Entry; import org.hamcrest.CoreMatchers; import org.junit.Assert; import org.junit.Rule; diff --git a/processing/src/test/java/io/druid/query/groupby/epinephelinae/TestColumnSelectorFactory.java b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/TestColumnSelectorFactory.java similarity index 83% rename from processing/src/test/java/io/druid/query/groupby/epinephelinae/TestColumnSelectorFactory.java rename to processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/TestColumnSelectorFactory.java index acb9934b6b19..5ae1c8264ae3 100644 --- a/processing/src/test/java/io/druid/query/groupby/epinephelinae/TestColumnSelectorFactory.java +++ b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/TestColumnSelectorFactory.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.groupby.epinephelinae; - -import io.druid.data.input.Row; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.DimensionSelector; -import io.druid.segment.column.ColumnCapabilities; +package org.apache.druid.query.groupby.epinephelinae; + +import org.apache.druid.data.input.Row; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.column.ColumnCapabilities; import javax.annotation.Nullable; diff --git a/processing/src/test/java/io/druid/query/groupby/having/DimFilterHavingSpecTest.java b/processing/src/test/java/org/apache/druid/query/groupby/having/DimFilterHavingSpecTest.java similarity index 94% rename from processing/src/test/java/io/druid/query/groupby/having/DimFilterHavingSpecTest.java rename to processing/src/test/java/org/apache/druid/query/groupby/having/DimFilterHavingSpecTest.java index c60c2d7904ce..8e8ee5a13bfb 100644 --- a/processing/src/test/java/io/druid/query/groupby/having/DimFilterHavingSpecTest.java +++ b/processing/src/test/java/org/apache/druid/query/groupby/having/DimFilterHavingSpecTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.groupby.having; +package org.apache.druid.query.groupby.having; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import io.druid.data.input.MapBasedRow; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.segment.column.ValueType; +import org.apache.druid.data.input.MapBasedRow; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.segment.column.ValueType; import org.hamcrest.CoreMatchers; import org.junit.Assert; import org.junit.Ignore; diff --git a/processing/src/test/java/io/druid/query/groupby/having/DimensionSelectorHavingSpecTest.java b/processing/src/test/java/org/apache/druid/query/groupby/having/DimensionSelectorHavingSpecTest.java similarity index 95% rename from processing/src/test/java/io/druid/query/groupby/having/DimensionSelectorHavingSpecTest.java rename to processing/src/test/java/org/apache/druid/query/groupby/having/DimensionSelectorHavingSpecTest.java index fc56a86ae920..3e6236a283f1 100644 --- a/processing/src/test/java/io/druid/query/groupby/having/DimensionSelectorHavingSpecTest.java +++ b/processing/src/test/java/org/apache/druid/query/groupby/having/DimensionSelectorHavingSpecTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.query.groupby.having; +package org.apache.druid.query.groupby.having; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.data.input.MapBasedRow; -import io.druid.data.input.Row; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.extraction.RegexDimExtractionFn; +import org.apache.druid.data.input.MapBasedRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.extraction.RegexDimExtractionFn; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/groupby/having/HavingSpecMetricComparatorTest.java b/processing/src/test/java/org/apache/druid/query/groupby/having/HavingSpecMetricComparatorTest.java similarity index 97% rename from processing/src/test/java/io/druid/query/groupby/having/HavingSpecMetricComparatorTest.java rename to processing/src/test/java/org/apache/druid/query/groupby/having/HavingSpecMetricComparatorTest.java index 66d910204597..135328df0035 100644 --- a/processing/src/test/java/io/druid/query/groupby/having/HavingSpecMetricComparatorTest.java +++ b/processing/src/test/java/org/apache/druid/query/groupby/having/HavingSpecMetricComparatorTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.groupby.having; +package org.apache.druid.query.groupby.having; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/groupby/having/HavingSpecTest.java b/processing/src/test/java/org/apache/druid/query/groupby/having/HavingSpecTest.java similarity index 98% rename from processing/src/test/java/io/druid/query/groupby/having/HavingSpecTest.java rename to processing/src/test/java/org/apache/druid/query/groupby/having/HavingSpecTest.java index 74e0191b4a6c..ec44b7f191df 100644 --- a/processing/src/test/java/io/druid/query/groupby/having/HavingSpecTest.java +++ b/processing/src/test/java/org/apache/druid/query/groupby/having/HavingSpecTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.groupby.having; +package org.apache.druid.query.groupby.having; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.data.input.MapBasedInputRow; -import io.druid.data.input.Row; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Test; import java.util.ArrayList; diff --git a/processing/src/test/java/io/druid/query/groupby/orderby/DefaultLimitSpecTest.java b/processing/src/test/java/org/apache/druid/query/groupby/orderby/DefaultLimitSpecTest.java similarity index 91% rename from processing/src/test/java/io/druid/query/groupby/orderby/DefaultLimitSpecTest.java rename to processing/src/test/java/org/apache/druid/query/groupby/orderby/DefaultLimitSpecTest.java index a3c5580bb79f..a3d35643b5de 100644 --- a/processing/src/test/java/io/druid/query/groupby/orderby/DefaultLimitSpecTest.java +++ b/processing/src/test/java/org/apache/druid/query/groupby/orderby/DefaultLimitSpecTest.java @@ -17,28 +17,28 @@ * under the License. */ -package io.druid.query.groupby.orderby; +package org.apache.druid.query.groupby.orderby; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; -import io.druid.data.input.MapBasedRow; -import io.druid.data.input.Row; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.aggregation.post.ArithmeticPostAggregator; -import io.druid.query.aggregation.post.ConstantPostAggregator; -import io.druid.query.aggregation.post.ExpressionPostAggregator; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.expression.TestExprMacroTable; -import io.druid.query.ordering.StringComparators; -import io.druid.segment.TestHelper; -import io.druid.segment.column.ValueType; +import org.apache.druid.data.input.MapBasedRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.aggregation.post.ArithmeticPostAggregator; +import org.apache.druid.query.aggregation.post.ConstantPostAggregator; +import org.apache.druid.query.aggregation.post.ExpressionPostAggregator; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.expression.TestExprMacroTable; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.column.ValueType; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/groupby/orderby/TopNSequenceTest.java b/processing/src/test/java/org/apache/druid/query/groupby/orderby/TopNSequenceTest.java similarity index 95% rename from processing/src/test/java/io/druid/query/groupby/orderby/TopNSequenceTest.java rename to processing/src/test/java/org/apache/druid/query/groupby/orderby/TopNSequenceTest.java index 728040cf0f49..4343df5d3793 100644 --- a/processing/src/test/java/io/druid/query/groupby/orderby/TopNSequenceTest.java +++ b/processing/src/test/java/org/apache/druid/query/groupby/orderby/TopNSequenceTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.groupby.orderby; +package org.apache.druid.query.groupby.orderby; import com.google.common.base.Splitter; import com.google.common.collect.Lists; import com.google.common.collect.Ordering; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/processing/src/test/java/io/druid/query/lookup/LookupConfigTest.java b/processing/src/test/java/org/apache/druid/query/lookup/LookupConfigTest.java similarity index 96% rename from processing/src/test/java/io/druid/query/lookup/LookupConfigTest.java rename to processing/src/test/java/org/apache/druid/query/lookup/LookupConfigTest.java index 9fbe170a6552..9479c221fc3a 100644 --- a/processing/src/test/java/io/druid/query/lookup/LookupConfigTest.java +++ b/processing/src/test/java/org/apache/druid/query/lookup/LookupConfigTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.segment.TestHelper; +import org.apache.druid.segment.TestHelper; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/lookup/LookupExtractionFnExpectationsTest.java b/processing/src/test/java/org/apache/druid/query/lookup/LookupExtractionFnExpectationsTest.java similarity index 94% rename from processing/src/test/java/io/druid/query/lookup/LookupExtractionFnExpectationsTest.java rename to processing/src/test/java/org/apache/druid/query/lookup/LookupExtractionFnExpectationsTest.java index 47b80324ae70..02ffd2fc4b2d 100644 --- a/processing/src/test/java/io/druid/query/lookup/LookupExtractionFnExpectationsTest.java +++ b/processing/src/test/java/org/apache/druid/query/lookup/LookupExtractionFnExpectationsTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.google.common.collect.ImmutableMap; -import io.druid.common.config.NullHandling; -import io.druid.query.extraction.MapLookupExtractor; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.query.extraction.MapLookupExtractor; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/lookup/LookupExtractionFnTest.java b/processing/src/test/java/org/apache/druid/query/lookup/LookupExtractionFnTest.java similarity index 96% rename from processing/src/test/java/io/druid/query/lookup/LookupExtractionFnTest.java rename to processing/src/test/java/org/apache/druid/query/lookup/LookupExtractionFnTest.java index dd8b7ca581d6..c85b492c7a01 100644 --- a/processing/src/test/java/io/druid/query/lookup/LookupExtractionFnTest.java +++ b/processing/src/test/java/org/apache/druid/query/lookup/LookupExtractionFnTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; @@ -26,10 +26,10 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import io.druid.common.config.NullHandling; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.IAE; -import io.druid.query.extraction.MapLookupExtractor; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.query.extraction.MapLookupExtractor; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/processing/src/test/java/io/druid/query/lookup/LookupExtractorFactoryContainerTest.java b/processing/src/test/java/org/apache/druid/query/lookup/LookupExtractorFactoryContainerTest.java similarity index 97% rename from processing/src/test/java/io/druid/query/lookup/LookupExtractorFactoryContainerTest.java rename to processing/src/test/java/org/apache/druid/query/lookup/LookupExtractorFactoryContainerTest.java index 07a453abc7e0..875af6a676b2 100644 --- a/processing/src/test/java/io/druid/query/lookup/LookupExtractorFactoryContainerTest.java +++ b/processing/src/test/java/org/apache/druid/query/lookup/LookupExtractorFactoryContainerTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/lookup/LookupExtractorTest.java b/processing/src/test/java/org/apache/druid/query/lookup/LookupExtractorTest.java similarity index 95% rename from processing/src/test/java/io/druid/query/lookup/LookupExtractorTest.java rename to processing/src/test/java/org/apache/druid/query/lookup/LookupExtractorTest.java index b37a910ae070..db976e0f6d64 100644 --- a/processing/src/test/java/io/druid/query/lookup/LookupExtractorTest.java +++ b/processing/src/test/java/org/apache/druid/query/lookup/LookupExtractorTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.query.extraction.MapLookupExtractor; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.query.extraction.MapLookupExtractor; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/lookup/LookupsStateTest.java b/processing/src/test/java/org/apache/druid/query/lookup/LookupsStateTest.java similarity index 97% rename from processing/src/test/java/io/druid/query/lookup/LookupsStateTest.java rename to processing/src/test/java/org/apache/druid/query/lookup/LookupsStateTest.java index 3bd7bb921591..f54efca38985 100644 --- a/processing/src/test/java/io/druid/query/lookup/LookupsStateTest.java +++ b/processing/src/test/java/org/apache/druid/query/lookup/LookupsStateTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/metadata/SegmentAnalyzerTest.java b/processing/src/test/java/org/apache/druid/query/metadata/SegmentAnalyzerTest.java similarity index 88% rename from processing/src/test/java/io/druid/query/metadata/SegmentAnalyzerTest.java rename to processing/src/test/java/org/apache/druid/query/metadata/SegmentAnalyzerTest.java index 9c017d9cce8a..ad73a2435b33 100644 --- a/processing/src/test/java/io/druid/query/metadata/SegmentAnalyzerTest.java +++ b/processing/src/test/java/org/apache/druid/query/metadata/SegmentAnalyzerTest.java @@ -17,23 +17,23 @@ * under the License. */ -package io.druid.query.metadata; - -import io.druid.data.input.impl.DimensionSchema; -import io.druid.query.LegacyDataSource; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.metadata.metadata.ColumnAnalysis; -import io.druid.query.metadata.metadata.SegmentAnalysis; -import io.druid.query.metadata.metadata.SegmentMetadataQuery; -import io.druid.query.spec.LegacySegmentSpec; -import io.druid.segment.IncrementalIndexSegment; -import io.druid.segment.QueryableIndexSegment; -import io.druid.segment.Segment; -import io.druid.segment.TestIndex; -import io.druid.segment.column.ValueType; +package org.apache.druid.query.metadata; + +import org.apache.druid.data.input.impl.DimensionSchema; +import org.apache.druid.query.LegacyDataSource; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.metadata.metadata.ColumnAnalysis; +import org.apache.druid.query.metadata.metadata.SegmentAnalysis; +import org.apache.druid.query.metadata.metadata.SegmentMetadataQuery; +import org.apache.druid.query.spec.LegacySegmentSpec; +import org.apache.druid.segment.IncrementalIndexSegment; +import org.apache.druid.segment.QueryableIndexSegment; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.TestIndex; +import org.apache.druid.segment.column.ValueType; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/metadata/SegmentMetadataQueryQueryToolChestTest.java b/processing/src/test/java/org/apache/druid/query/metadata/SegmentMetadataQueryQueryToolChestTest.java similarity index 91% rename from processing/src/test/java/io/druid/query/metadata/SegmentMetadataQueryQueryToolChestTest.java rename to processing/src/test/java/org/apache/druid/query/metadata/SegmentMetadataQueryQueryToolChestTest.java index 2c417fd43505..3d9d8dd8379d 100644 --- a/processing/src/test/java/io/druid/query/metadata/SegmentMetadataQueryQueryToolChestTest.java +++ b/processing/src/test/java/org/apache/druid/query/metadata/SegmentMetadataQueryQueryToolChestTest.java @@ -17,29 +17,29 @@ * under the License. */ -package io.druid.query.metadata; +package org.apache.druid.query.metadata; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; -import io.druid.query.CacheStrategy; -import io.druid.query.Druids; -import io.druid.query.TableDataSource; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.DoubleMaxAggregatorFactory; -import io.druid.query.aggregation.DoubleSumAggregatorFactory; -import io.druid.query.aggregation.LongMaxAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.metadata.metadata.ColumnAnalysis; -import io.druid.query.metadata.metadata.SegmentAnalysis; -import io.druid.query.metadata.metadata.SegmentMetadataQuery; -import io.druid.query.spec.LegacySegmentSpec; -import io.druid.segment.column.ValueType; -import io.druid.timeline.LogicalSegment; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.query.CacheStrategy; +import org.apache.druid.query.Druids; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.DoubleMaxAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; +import org.apache.druid.query.aggregation.LongMaxAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.metadata.metadata.ColumnAnalysis; +import org.apache.druid.query.metadata.metadata.SegmentAnalysis; +import org.apache.druid.query.metadata.metadata.SegmentMetadataQuery; +import org.apache.druid.query.spec.LegacySegmentSpec; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.timeline.LogicalSegment; import org.joda.time.Period; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/metadata/SegmentMetadataQueryTest.java b/processing/src/test/java/org/apache/druid/query/metadata/SegmentMetadataQueryTest.java similarity index 95% rename from processing/src/test/java/io/druid/query/metadata/SegmentMetadataQueryTest.java rename to processing/src/test/java/org/apache/druid/query/metadata/SegmentMetadataQueryTest.java index 4c7225d2431e..af912fdc71f2 100644 --- a/processing/src/test/java/io/druid/query/metadata/SegmentMetadataQueryTest.java +++ b/processing/src/test/java/org/apache/druid/query/metadata/SegmentMetadataQueryTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.metadata; +package org.apache.druid.query.metadata; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; @@ -26,34 +26,34 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.BySegmentResultValue; -import io.druid.query.BySegmentResultValueClass; -import io.druid.query.Druids; -import io.druid.query.FinalizeResultsQueryRunner; -import io.druid.query.Query; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.QueryToolChest; -import io.druid.query.Result; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.metadata.metadata.ColumnAnalysis; -import io.druid.query.metadata.metadata.ListColumnIncluderator; -import io.druid.query.metadata.metadata.SegmentAnalysis; -import io.druid.query.metadata.metadata.SegmentMetadataQuery; -import io.druid.segment.IncrementalIndexSegment; -import io.druid.segment.QueryableIndex; -import io.druid.segment.QueryableIndexSegment; -import io.druid.segment.TestHelper; -import io.druid.segment.TestIndex; -import io.druid.segment.column.ValueType; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.timeline.LogicalSegment; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.BySegmentResultValue; +import org.apache.druid.query.BySegmentResultValueClass; +import org.apache.druid.query.Druids; +import org.apache.druid.query.FinalizeResultsQueryRunner; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.metadata.metadata.ColumnAnalysis; +import org.apache.druid.query.metadata.metadata.ListColumnIncluderator; +import org.apache.druid.query.metadata.metadata.SegmentAnalysis; +import org.apache.druid.query.metadata.metadata.SegmentMetadataQuery; +import org.apache.druid.segment.IncrementalIndexSegment; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.QueryableIndexSegment; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.TestIndex; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.timeline.LogicalSegment; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Test; @@ -834,7 +834,7 @@ public void testBySegmentResults() FACTORY.mergeRunners( MoreExecutors.sameThreadExecutor(), //Note: It is essential to have atleast 2 query runners merged to reproduce the regression bug described in - //https://github.com/druid-io/druid/pull/1172 + //https://github.com/apache/incubator-druid/pull/1172 //the bug surfaces only when ordering is used which happens only when you have 2 things to compare Lists.newArrayList(singleSegmentQueryRunner, singleSegmentQueryRunner) ) diff --git a/processing/src/test/java/io/druid/query/metadata/SegmentMetadataUnionQueryTest.java b/processing/src/test/java/org/apache/druid/query/metadata/SegmentMetadataUnionQueryTest.java similarity index 81% rename from processing/src/test/java/io/druid/query/metadata/SegmentMetadataUnionQueryTest.java rename to processing/src/test/java/org/apache/druid/query/metadata/SegmentMetadataUnionQueryTest.java index ba78ea58ae09..b15d1970ffd5 100644 --- a/processing/src/test/java/io/druid/query/metadata/SegmentMetadataUnionQueryTest.java +++ b/processing/src/test/java/org/apache/druid/query/metadata/SegmentMetadataUnionQueryTest.java @@ -17,26 +17,26 @@ * under the License. */ -package io.druid.query.metadata; +package org.apache.druid.query.metadata; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import io.druid.java.util.common.Intervals; -import io.druid.query.Druids; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.metadata.metadata.ColumnAnalysis; -import io.druid.query.metadata.metadata.ListColumnIncluderator; -import io.druid.query.metadata.metadata.SegmentAnalysis; -import io.druid.query.metadata.metadata.SegmentMetadataQuery; -import io.druid.segment.IncrementalIndexSegment; -import io.druid.segment.QueryableIndexSegment; -import io.druid.segment.TestHelper; -import io.druid.segment.TestIndex; -import io.druid.segment.column.ValueType; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.query.Druids; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.metadata.metadata.ColumnAnalysis; +import org.apache.druid.query.metadata.metadata.ListColumnIncluderator; +import org.apache.druid.query.metadata.metadata.SegmentAnalysis; +import org.apache.druid.query.metadata.metadata.SegmentMetadataQuery; +import org.apache.druid.segment.IncrementalIndexSegment; +import org.apache.druid.segment.QueryableIndexSegment; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.TestIndex; +import org.apache.druid.segment.column.ValueType; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/processing/src/test/java/io/druid/query/metadata/metadata/ColumnAnalysisTest.java b/processing/src/test/java/org/apache/druid/query/metadata/metadata/ColumnAnalysisTest.java similarity index 98% rename from processing/src/test/java/io/druid/query/metadata/metadata/ColumnAnalysisTest.java rename to processing/src/test/java/org/apache/druid/query/metadata/metadata/ColumnAnalysisTest.java index e7d544155371..ccf3363737aa 100644 --- a/processing/src/test/java/io/druid/query/metadata/metadata/ColumnAnalysisTest.java +++ b/processing/src/test/java/org/apache/druid/query/metadata/metadata/ColumnAnalysisTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.metadata.metadata; +package org.apache.druid.query.metadata.metadata; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.segment.TestHelper; +import org.apache.druid.segment.TestHelper; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/monomorphicprocessing/StringRuntimeShapeTest.java b/processing/src/test/java/org/apache/druid/query/monomorphicprocessing/StringRuntimeShapeTest.java similarity index 81% rename from processing/src/test/java/io/druid/query/monomorphicprocessing/StringRuntimeShapeTest.java rename to processing/src/test/java/org/apache/druid/query/monomorphicprocessing/StringRuntimeShapeTest.java index 1210ebdb26e8..8d02ec711121 100644 --- a/processing/src/test/java/io/druid/query/monomorphicprocessing/StringRuntimeShapeTest.java +++ b/processing/src/test/java/org/apache/druid/query/monomorphicprocessing/StringRuntimeShapeTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.monomorphicprocessing; +package org.apache.druid.query.monomorphicprocessing; import org.junit.Assert; import org.junit.Test; @@ -68,12 +68,12 @@ public void testStringRuntimeShape() { String barRuntimeShape = StringRuntimeShape.of(new Bar()); Assert.assertEquals( - "io.druid.query.monomorphicprocessing.StringRuntimeShapeTest$Bar {\n" - + " foo: io.druid.query.monomorphicprocessing.StringRuntimeShapeTest$Foo {\n" + "org.apache.druid.query.monomorphicprocessing.StringRuntimeShapeTest$Bar {\n" + + " foo: org.apache.druid.query.monomorphicprocessing.StringRuntimeShapeTest$Foo {\n" + " flag1: true,\n" + " flag2: false,\n" + " key: value,\n" - + " empty: io.druid.query.monomorphicprocessing.StringRuntimeShapeTest$Empty,\n" + + " empty: org.apache.druid.query.monomorphicprocessing.StringRuntimeShapeTest$Empty,\n" + " object: java.nio.HeapByteBuffer {order: BIG_ENDIAN},\n" + " array: [\n" + " java.util.HashSet,\n" @@ -82,11 +82,11 @@ public void testStringRuntimeShape() + " emptyArray: []\n" + " },\n" + " array: [\n" - + " io.druid.query.monomorphicprocessing.StringRuntimeShapeTest$Foo {\n" + + " org.apache.druid.query.monomorphicprocessing.StringRuntimeShapeTest$Foo {\n" + " flag1: true,\n" + " flag2: false,\n" + " key: value,\n" - + " empty: io.druid.query.monomorphicprocessing.StringRuntimeShapeTest$Empty,\n" + + " empty: org.apache.druid.query.monomorphicprocessing.StringRuntimeShapeTest$Empty,\n" + " object: java.nio.HeapByteBuffer {order: BIG_ENDIAN},\n" + " array: [\n" + " java.util.HashSet,\n" @@ -94,11 +94,11 @@ public void testStringRuntimeShape() + " ],\n" + " emptyArray: []\n" + " },\n" - + " io.druid.query.monomorphicprocessing.StringRuntimeShapeTest$Foo {\n" + + " org.apache.druid.query.monomorphicprocessing.StringRuntimeShapeTest$Foo {\n" + " flag1: true,\n" + " flag2: false,\n" + " key: value,\n" - + " empty: io.druid.query.monomorphicprocessing.StringRuntimeShapeTest$Empty,\n" + + " empty: org.apache.druid.query.monomorphicprocessing.StringRuntimeShapeTest$Empty,\n" + " object: java.nio.HeapByteBuffer {order: BIG_ENDIAN},\n" + " array: [\n" + " java.util.HashSet,\n" diff --git a/processing/src/test/java/io/druid/query/ordering/StringComparatorsTest.java b/processing/src/test/java/org/apache/druid/query/ordering/StringComparatorsTest.java similarity index 98% rename from processing/src/test/java/io/druid/query/ordering/StringComparatorsTest.java rename to processing/src/test/java/org/apache/druid/query/ordering/StringComparatorsTest.java index e529091b73bf..3b48420c824f 100644 --- a/processing/src/test/java/io/druid/query/ordering/StringComparatorsTest.java +++ b/processing/src/test/java/org/apache/druid/query/ordering/StringComparatorsTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.ordering; +package org.apache.druid.query.ordering; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/scan/MultiSegmentScanQueryTest.java b/processing/src/test/java/org/apache/druid/query/scan/MultiSegmentScanQueryTest.java similarity index 90% rename from processing/src/test/java/io/druid/query/scan/MultiSegmentScanQueryTest.java rename to processing/src/test/java/org/apache/druid/query/scan/MultiSegmentScanQueryTest.java index 1c4b11699f59..36cfe3e1e774 100644 --- a/processing/src/test/java/io/druid/query/scan/MultiSegmentScanQueryTest.java +++ b/processing/src/test/java/org/apache/druid/query/scan/MultiSegmentScanQueryTest.java @@ -17,31 +17,31 @@ * under the License. */ -package io.druid.query.scan; +package org.apache.druid.query.scan; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.io.CharSource; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.MergeSequence; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.query.DefaultGenericQueryMetricsFactory; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.TableDataSource; -import io.druid.query.select.SelectQueryRunnerTest; -import io.druid.segment.IncrementalIndexSegment; -import io.druid.segment.Segment; -import io.druid.segment.TestIndex; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexSchema; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.MergeSequence; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.query.DefaultGenericQueryMetricsFactory; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.query.select.SelectQueryRunnerTest; +import org.apache.druid.segment.IncrementalIndexSegment; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.TestIndex; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.joda.time.Interval; diff --git a/processing/src/test/java/io/druid/query/scan/ScanQueryRunnerTest.java b/processing/src/test/java/org/apache/druid/query/scan/ScanQueryRunnerTest.java similarity index 96% rename from processing/src/test/java/io/druid/query/scan/ScanQueryRunnerTest.java rename to processing/src/test/java/org/apache/druid/query/scan/ScanQueryRunnerTest.java index 8347423edd42..cc532982b65c 100644 --- a/processing/src/test/java/io/druid/query/scan/ScanQueryRunnerTest.java +++ b/processing/src/test/java/org/apache/druid/query/scan/ScanQueryRunnerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.scan; +package org.apache.druid.query.scan; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; @@ -27,27 +27,27 @@ import com.google.common.collect.ObjectArrays; import com.google.common.collect.Sets; import com.google.common.hash.Hashing; -import io.druid.hll.HyperLogLogCollector; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.query.DefaultGenericQueryMetricsFactory; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.TableDataSource; -import io.druid.query.expression.TestExprMacroTable; -import io.druid.query.extraction.MapLookupExtractor; -import io.druid.query.filter.AndDimFilter; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.query.lookup.LookupExtractionFn; -import io.druid.query.spec.LegacySegmentSpec; -import io.druid.query.spec.QuerySegmentSpec; -import io.druid.segment.VirtualColumn; -import io.druid.segment.column.Column; -import io.druid.segment.column.ValueType; -import io.druid.segment.virtual.ExpressionVirtualColumn; +import org.apache.druid.hll.HyperLogLogCollector; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.DefaultGenericQueryMetricsFactory; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.query.expression.TestExprMacroTable; +import org.apache.druid.query.extraction.MapLookupExtractor; +import org.apache.druid.query.filter.AndDimFilter; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.query.lookup.LookupExtractionFn; +import org.apache.druid.query.spec.LegacySegmentSpec; +import org.apache.druid.query.spec.QuerySegmentSpec; +import org.apache.druid.segment.VirtualColumn; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.virtual.ExpressionVirtualColumn; import org.joda.time.DateTime; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/scan/ScanQuerySpecTest.java b/processing/src/test/java/org/apache/druid/query/scan/ScanQuerySpecTest.java similarity index 88% rename from processing/src/test/java/io/druid/query/scan/ScanQuerySpecTest.java rename to processing/src/test/java/org/apache/druid/query/scan/ScanQuerySpecTest.java index 6ebf653f26cd..ec5069546a4d 100644 --- a/processing/src/test/java/io/druid/query/scan/ScanQuerySpecTest.java +++ b/processing/src/test/java/org/apache/druid/query/scan/ScanQuerySpecTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.scan; +package org.apache.druid.query.scan; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.TableDataSource; -import io.druid.query.spec.LegacySegmentSpec; -import io.druid.segment.VirtualColumns; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.query.spec.LegacySegmentSpec; +import org.apache.druid.segment.VirtualColumns; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/search/DefaultSearchQueryMetricsTest.java b/processing/src/test/java/org/apache/druid/query/search/DefaultSearchQueryMetricsTest.java similarity index 89% rename from processing/src/test/java/io/druid/query/search/DefaultSearchQueryMetricsTest.java rename to processing/src/test/java/org/apache/druid/query/search/DefaultSearchQueryMetricsTest.java index 49af2425cf38..d0378ea2d2ba 100644 --- a/processing/src/test/java/io/druid/query/search/DefaultSearchQueryMetricsTest.java +++ b/processing/src/test/java/org/apache/druid/query/search/DefaultSearchQueryMetricsTest.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; import com.google.common.collect.ImmutableSet; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.query.CachingEmitter; -import io.druid.query.DefaultQueryMetricsTest; -import io.druid.query.DruidMetrics; -import io.druid.query.Druids; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.dimension.ListFilteredDimensionSpec; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.query.CachingEmitter; +import org.apache.druid.query.DefaultQueryMetricsTest; +import org.apache.druid.query.DruidMetrics; +import org.apache.druid.query.Druids; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.ListFilteredDimensionSpec; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/search/RegexSearchQueryTest.java b/processing/src/test/java/org/apache/druid/query/search/RegexSearchQueryTest.java similarity index 94% rename from processing/src/test/java/io/druid/query/search/RegexSearchQueryTest.java rename to processing/src/test/java/org/apache/druid/query/search/RegexSearchQueryTest.java index e0ea74659138..b59907331b1a 100644 --- a/processing/src/test/java/io/druid/query/search/RegexSearchQueryTest.java +++ b/processing/src/test/java/org/apache/druid/query/search/RegexSearchQueryTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/search/SearchBinaryFnTest.java b/processing/src/test/java/org/apache/druid/query/search/SearchBinaryFnTest.java similarity index 98% rename from processing/src/test/java/io/druid/query/search/SearchBinaryFnTest.java rename to processing/src/test/java/org/apache/druid/query/search/SearchBinaryFnTest.java index c68d8472234a..4439b91dba22 100644 --- a/processing/src/test/java/io/druid/query/search/SearchBinaryFnTest.java +++ b/processing/src/test/java/org/apache/druid/query/search/SearchBinaryFnTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; import com.google.common.collect.ImmutableList; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.Result; -import io.druid.query.ordering.StringComparators; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.Result; +import org.apache.druid.query.ordering.StringComparators; import org.joda.time.DateTime; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/search/SearchQueryQueryToolChestTest.java b/processing/src/test/java/org/apache/druid/query/search/SearchQueryQueryToolChestTest.java similarity index 82% rename from processing/src/test/java/io/druid/query/search/SearchQueryQueryToolChestTest.java rename to processing/src/test/java/org/apache/druid/query/search/SearchQueryQueryToolChestTest.java index bb3b0d25b5f8..add20d395673 100644 --- a/processing/src/test/java/io/druid/query/search/SearchQueryQueryToolChestTest.java +++ b/processing/src/test/java/org/apache/druid/query/search/SearchQueryQueryToolChestTest.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.CacheStrategy; -import io.druid.query.Druids; -import io.druid.query.Result; -import io.druid.query.TableDataSource; -import io.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.CacheStrategy; +import org.apache.druid.query.Druids; +import org.apache.druid.query.Result; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/search/SearchQueryRunnerTest.java b/processing/src/test/java/org/apache/druid/query/search/SearchQueryRunnerTest.java similarity index 94% rename from processing/src/test/java/io/druid/query/search/SearchQueryRunnerTest.java rename to processing/src/test/java/org/apache/druid/query/search/SearchQueryRunnerTest.java index 0925ee6ae541..1631307af9f9 100644 --- a/processing/src/test/java/io/druid/query/search/SearchQueryRunnerTest.java +++ b/processing/src/test/java/org/apache/druid/query/search/SearchQueryRunnerTest.java @@ -17,48 +17,48 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import io.druid.common.config.NullHandling; -import io.druid.data.input.MapBasedInputRow; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.common.logger.Logger; -import io.druid.js.JavaScriptConfig; -import io.druid.query.Druids; -import io.druid.query.Query; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.Result; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.dimension.ExtractionDimensionSpec; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.extraction.JavaScriptExtractionFn; -import io.druid.query.extraction.MapLookupExtractor; -import io.druid.query.extraction.TimeFormatExtractionFn; -import io.druid.query.filter.AndDimFilter; -import io.druid.query.filter.DimFilter; -import io.druid.query.filter.ExtractionDimFilter; -import io.druid.query.filter.OrDimFilter; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.query.lookup.LookupExtractionFn; -import io.druid.query.ordering.StringComparators; -import io.druid.query.spec.MultipleIntervalSegmentSpec; -import io.druid.segment.QueryableIndexSegment; -import io.druid.segment.TestHelper; -import io.druid.segment.TestIndex; -import io.druid.segment.column.Column; -import io.druid.segment.column.ValueType; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.js.JavaScriptConfig; +import org.apache.druid.query.Druids; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.ExtractionDimensionSpec; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.extraction.JavaScriptExtractionFn; +import org.apache.druid.query.extraction.MapLookupExtractor; +import org.apache.druid.query.extraction.TimeFormatExtractionFn; +import org.apache.druid.query.filter.AndDimFilter; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.filter.ExtractionDimFilter; +import org.apache.druid.query.filter.OrDimFilter; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.query.lookup.LookupExtractionFn; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.segment.QueryableIndexSegment; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.TestIndex; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/processing/src/test/java/io/druid/query/search/SearchQueryRunnerWithCaseTest.java b/processing/src/test/java/org/apache/druid/query/search/SearchQueryRunnerWithCaseTest.java similarity index 86% rename from processing/src/test/java/io/druid/query/search/SearchQueryRunnerWithCaseTest.java rename to processing/src/test/java/org/apache/druid/query/search/SearchQueryRunnerWithCaseTest.java index cef7bcd7a0dc..007c15098769 100644 --- a/processing/src/test/java/io/druid/query/search/SearchQueryRunnerWithCaseTest.java +++ b/processing/src/test/java/org/apache/druid/query/search/SearchQueryRunnerWithCaseTest.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; import com.google.common.base.Suppliers; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.common.io.CharSource; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.StringUtils; -import io.druid.query.Druids; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.Result; -import io.druid.segment.IncrementalIndexSegment; -import io.druid.segment.QueryableIndex; -import io.druid.segment.QueryableIndexSegment; -import io.druid.segment.TestIndex; -import io.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.Druids; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.Result; +import org.apache.druid.segment.IncrementalIndexSegment; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.QueryableIndexSegment; +import org.apache.druid.segment.TestIndex; +import org.apache.druid.segment.incremental.IncrementalIndex; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -47,17 +47,17 @@ import java.util.Map; import java.util.Set; -import static io.druid.query.QueryRunnerTestHelper.NOOP_QUERYWATCHER; -import static io.druid.query.QueryRunnerTestHelper.NoopIntervalChunkingQueryRunnerDecorator; -import static io.druid.query.QueryRunnerTestHelper.allGran; -import static io.druid.query.QueryRunnerTestHelper.dataSource; -import static io.druid.query.QueryRunnerTestHelper.fullOnInterval; -import static io.druid.query.QueryRunnerTestHelper.makeQueryRunner; -import static io.druid.query.QueryRunnerTestHelper.marketDimension; -import static io.druid.query.QueryRunnerTestHelper.placementDimension; -import static io.druid.query.QueryRunnerTestHelper.placementishDimension; -import static io.druid.query.QueryRunnerTestHelper.qualityDimension; -import static io.druid.query.QueryRunnerTestHelper.transformToConstructionFeeder; +import static org.apache.druid.query.QueryRunnerTestHelper.NOOP_QUERYWATCHER; +import static org.apache.druid.query.QueryRunnerTestHelper.NoopIntervalChunkingQueryRunnerDecorator; +import static org.apache.druid.query.QueryRunnerTestHelper.allGran; +import static org.apache.druid.query.QueryRunnerTestHelper.dataSource; +import static org.apache.druid.query.QueryRunnerTestHelper.fullOnInterval; +import static org.apache.druid.query.QueryRunnerTestHelper.makeQueryRunner; +import static org.apache.druid.query.QueryRunnerTestHelper.marketDimension; +import static org.apache.druid.query.QueryRunnerTestHelper.placementDimension; +import static org.apache.druid.query.QueryRunnerTestHelper.placementishDimension; +import static org.apache.druid.query.QueryRunnerTestHelper.qualityDimension; +import static org.apache.druid.query.QueryRunnerTestHelper.transformToConstructionFeeder; /** */ diff --git a/processing/src/test/java/io/druid/query/search/SearchQueryTest.java b/processing/src/test/java/org/apache/druid/query/search/SearchQueryTest.java similarity index 93% rename from processing/src/test/java/io/druid/query/search/SearchQueryTest.java rename to processing/src/test/java/org/apache/druid/query/search/SearchQueryTest.java index f09c489dd2bf..7d84646ee877 100644 --- a/processing/src/test/java/io/druid/query/search/SearchQueryTest.java +++ b/processing/src/test/java/org/apache/druid/query/search/SearchQueryTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.query.Druids; -import io.druid.query.Query; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.dimension.LegacyDimensionSpec; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.query.Druids; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.LegacyDimensionSpec; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/search/SearchSortSpecTest.java b/processing/src/test/java/org/apache/druid/query/search/SearchSortSpecTest.java similarity index 96% rename from processing/src/test/java/io/druid/query/search/SearchSortSpecTest.java rename to processing/src/test/java/org/apache/druid/query/search/SearchSortSpecTest.java index cfc65cd2d56d..da560b5433b0 100644 --- a/processing/src/test/java/io/druid/query/search/SearchSortSpecTest.java +++ b/processing/src/test/java/org/apache/druid/query/search/SearchSortSpecTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.search; +package org.apache.druid.query.search; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.query.ordering.StringComparators; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.query.ordering.StringComparators; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/select/DefaultSelectQueryMetricsTest.java b/processing/src/test/java/org/apache/druid/query/select/DefaultSelectQueryMetricsTest.java similarity index 91% rename from processing/src/test/java/io/druid/query/select/DefaultSelectQueryMetricsTest.java rename to processing/src/test/java/org/apache/druid/query/select/DefaultSelectQueryMetricsTest.java index 2fb034dc05f0..c97442bff433 100644 --- a/processing/src/test/java/io/druid/query/select/DefaultSelectQueryMetricsTest.java +++ b/processing/src/test/java/org/apache/druid/query/select/DefaultSelectQueryMetricsTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.select; +package org.apache.druid.query.select; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.query.CachingEmitter; -import io.druid.query.DefaultQueryMetricsTest; -import io.druid.query.DruidMetrics; -import io.druid.query.Druids; -import io.druid.query.QueryRunnerTestHelper; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.query.CachingEmitter; +import org.apache.druid.query.DefaultQueryMetricsTest; +import org.apache.druid.query.DruidMetrics; +import org.apache.druid.query.Druids; +import org.apache.druid.query.QueryRunnerTestHelper; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/select/MultiSegmentSelectQueryTest.java b/processing/src/test/java/org/apache/druid/query/select/MultiSegmentSelectQueryTest.java similarity index 91% rename from processing/src/test/java/io/druid/query/select/MultiSegmentSelectQueryTest.java rename to processing/src/test/java/org/apache/druid/query/select/MultiSegmentSelectQueryTest.java index 9b00a3666e39..66722a0eb9d1 100644 --- a/processing/src/test/java/io/druid/query/select/MultiSegmentSelectQueryTest.java +++ b/processing/src/test/java/org/apache/druid/query/select/MultiSegmentSelectQueryTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.select; +package org.apache.druid.query.select; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; @@ -25,31 +25,31 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.io.CharSource; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.Druids; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.Result; -import io.druid.query.TableDataSource; -import io.druid.query.UnionDataSource; -import io.druid.query.UnionQueryRunner; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.ordering.StringComparators; -import io.druid.segment.IncrementalIndexSegment; -import io.druid.segment.Segment; -import io.druid.segment.TestIndex; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexSchema; -import io.druid.timeline.DataSegment; -import io.druid.timeline.TimelineObjectHolder; -import io.druid.timeline.VersionedIntervalTimeline; -import io.druid.timeline.partition.NoneShardSpec; -import io.druid.timeline.partition.SingleElementPartitionChunk; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.Druids; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.Result; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.query.UnionDataSource; +import org.apache.druid.query.UnionQueryRunner; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.segment.IncrementalIndexSegment; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.TestIndex; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.TimelineObjectHolder; +import org.apache.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.timeline.partition.SingleElementPartitionChunk; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.joda.time.Interval; diff --git a/processing/src/test/java/io/druid/query/select/PagingOffsetTest.java b/processing/src/test/java/org/apache/druid/query/select/PagingOffsetTest.java similarity index 98% rename from processing/src/test/java/io/druid/query/select/PagingOffsetTest.java rename to processing/src/test/java/org/apache/druid/query/select/PagingOffsetTest.java index 17c24b5da951..4e164d8c942c 100644 --- a/processing/src/test/java/io/druid/query/select/PagingOffsetTest.java +++ b/processing/src/test/java/org/apache/druid/query/select/PagingOffsetTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.select; +package org.apache.druid.query.select; import com.google.common.collect.Lists; import com.google.common.primitives.Ints; diff --git a/processing/src/test/java/io/druid/query/select/SelectBinaryFnTest.java b/processing/src/test/java/org/apache/druid/query/select/SelectBinaryFnTest.java similarity index 97% rename from processing/src/test/java/io/druid/query/select/SelectBinaryFnTest.java rename to processing/src/test/java/org/apache/druid/query/select/SelectBinaryFnTest.java index 6c080adecdd5..2de7b4f3bbbd 100644 --- a/processing/src/test/java/io/druid/query/select/SelectBinaryFnTest.java +++ b/processing/src/test/java/org/apache/druid/query/select/SelectBinaryFnTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.select; +package org.apache.druid.query.select; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.Result; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.Result; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/select/SelectQueryConfigTest.java b/processing/src/test/java/org/apache/druid/query/select/SelectQueryConfigTest.java similarity index 95% rename from processing/src/test/java/io/druid/query/select/SelectQueryConfigTest.java rename to processing/src/test/java/org/apache/druid/query/select/SelectQueryConfigTest.java index 1da513d52707..b47bbcf3164a 100644 --- a/processing/src/test/java/io/druid/query/select/SelectQueryConfigTest.java +++ b/processing/src/test/java/org/apache/druid/query/select/SelectQueryConfigTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.select; +package org.apache.druid.query.select; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/select/SelectQueryQueryToolChestTest.java b/processing/src/test/java/org/apache/druid/query/select/SelectQueryQueryToolChestTest.java similarity index 91% rename from processing/src/test/java/io/druid/query/select/SelectQueryQueryToolChestTest.java rename to processing/src/test/java/org/apache/druid/query/select/SelectQueryQueryToolChestTest.java index 4f2b72b29bdf..45f653643e3f 100644 --- a/processing/src/test/java/io/druid/query/select/SelectQueryQueryToolChestTest.java +++ b/processing/src/test/java/org/apache/druid/query/select/SelectQueryQueryToolChestTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.select; +package org.apache.druid.query.select; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.query.CacheStrategy; -import io.druid.query.Druids; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.Result; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.query.CacheStrategy; +import org.apache.druid.query.Druids; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.Result; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/select/SelectQueryRunnerTest.java b/processing/src/test/java/org/apache/druid/query/select/SelectQueryRunnerTest.java similarity index 96% rename from processing/src/test/java/io/druid/query/select/SelectQueryRunnerTest.java rename to processing/src/test/java/org/apache/druid/query/select/SelectQueryRunnerTest.java index 7898ee49091e..0574b656b660 100644 --- a/processing/src/test/java/io/druid/query/select/SelectQueryRunnerTest.java +++ b/processing/src/test/java/org/apache/druid/query/select/SelectQueryRunnerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.select; +package org.apache.druid.query.select; import com.google.common.base.Function; import com.google.common.base.Supplier; @@ -28,34 +28,34 @@ import com.google.common.collect.Maps; import com.google.common.collect.ObjectArrays; import com.google.common.collect.Sets; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Intervals; -import io.druid.js.JavaScriptConfig; -import io.druid.query.Druids; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.Result; -import io.druid.query.TableDataSource; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.dimension.ExtractionDimensionSpec; -import io.druid.query.expression.TestExprMacroTable; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.extraction.JavaScriptExtractionFn; -import io.druid.query.extraction.MapLookupExtractor; -import io.druid.query.filter.AndDimFilter; -import io.druid.query.filter.BoundDimFilter; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.query.lookup.LookupExtractionFn; -import io.druid.query.ordering.StringComparators; -import io.druid.query.spec.LegacySegmentSpec; -import io.druid.query.spec.QuerySegmentSpec; -import io.druid.segment.column.Column; -import io.druid.segment.column.ValueType; -import io.druid.segment.virtual.ExpressionVirtualColumn; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.js.JavaScriptConfig; +import org.apache.druid.query.Druids; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.Result; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.dimension.ExtractionDimensionSpec; +import org.apache.druid.query.expression.TestExprMacroTable; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.extraction.JavaScriptExtractionFn; +import org.apache.druid.query.extraction.MapLookupExtractor; +import org.apache.druid.query.filter.AndDimFilter; +import org.apache.druid.query.filter.BoundDimFilter; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.query.lookup.LookupExtractionFn; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.query.spec.LegacySegmentSpec; +import org.apache.druid.query.spec.QuerySegmentSpec; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.virtual.ExpressionVirtualColumn; import org.joda.time.DateTime; import org.joda.time.chrono.ISOChronology; import org.junit.Assert; diff --git a/processing/src/test/java/io/druid/query/select/SelectQuerySpecTest.java b/processing/src/test/java/org/apache/druid/query/select/SelectQuerySpecTest.java similarity index 94% rename from processing/src/test/java/io/druid/query/select/SelectQuerySpecTest.java rename to processing/src/test/java/org/apache/druid/query/select/SelectQuerySpecTest.java index 2e7de49039ad..49887c2cd935 100644 --- a/processing/src/test/java/io/druid/query/select/SelectQuerySpecTest.java +++ b/processing/src/test/java/org/apache/druid/query/select/SelectQuerySpecTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.query.select; +package org.apache.druid.query.select; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.TableDataSource; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.spec.LegacySegmentSpec; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.spec.LegacySegmentSpec; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/spec/QuerySegmentSpecTest.java b/processing/src/test/java/org/apache/druid/query/spec/QuerySegmentSpecTest.java similarity index 95% rename from processing/src/test/java/io/druid/query/spec/QuerySegmentSpecTest.java rename to processing/src/test/java/org/apache/druid/query/spec/QuerySegmentSpecTest.java index d5c170df2dca..f60544db7719 100644 --- a/processing/src/test/java/io/druid/query/spec/QuerySegmentSpecTest.java +++ b/processing/src/test/java/org/apache/druid/query/spec/QuerySegmentSpecTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.spec; +package org.apache.druid.query.spec; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; -import io.druid.query.SegmentDescriptor; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.query.SegmentDescriptor; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/spec/SpecificSegmentQueryRunnerTest.java b/processing/src/test/java/org/apache/druid/query/spec/SpecificSegmentQueryRunnerTest.java similarity index 85% rename from processing/src/test/java/io/druid/query/spec/SpecificSegmentQueryRunnerTest.java rename to processing/src/test/java/org/apache/druid/query/spec/SpecificSegmentQueryRunnerTest.java index c210b88f9d51..1a5d12fe6d80 100644 --- a/processing/src/test/java/io/druid/query/spec/SpecificSegmentQueryRunnerTest.java +++ b/processing/src/test/java/org/apache/druid/query/spec/SpecificSegmentQueryRunnerTest.java @@ -17,33 +17,33 @@ * under the License. */ -package io.druid.query.spec; +package org.apache.druid.query.spec; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.Accumulator; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.common.guava.Yielder; -import io.druid.java.util.common.guava.YieldingAccumulator; -import io.druid.query.Druids; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.Result; -import io.druid.query.SegmentDescriptor; -import io.druid.query.aggregation.CountAggregator; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.timeseries.TimeseriesResultBuilder; -import io.druid.query.timeseries.TimeseriesResultValue; -import io.druid.segment.SegmentMissingException; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.Accumulator; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.guava.Yielder; +import org.apache.druid.java.util.common.guava.YieldingAccumulator; +import org.apache.druid.query.Druids; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.Result; +import org.apache.druid.query.SegmentDescriptor; +import org.apache.druid.query.aggregation.CountAggregator; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.timeseries.TimeseriesResultBuilder; +import org.apache.druid.query.timeseries.TimeseriesResultValue; +import org.apache.druid.segment.SegmentMissingException; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/timeboundary/TimeBoundaryQueryQueryToolChestTest.java b/processing/src/test/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryQueryToolChestTest.java similarity index 94% rename from processing/src/test/java/io/druid/query/timeboundary/TimeBoundaryQueryQueryToolChestTest.java rename to processing/src/test/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryQueryToolChestTest.java index 29c6541f04ca..b62fb283c7f8 100644 --- a/processing/src/test/java/io/druid/query/timeboundary/TimeBoundaryQueryQueryToolChestTest.java +++ b/processing/src/test/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryQueryToolChestTest.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.query.timeboundary; +package org.apache.druid.query.timeboundary; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.query.CacheStrategy; -import io.druid.query.Druids; -import io.druid.query.Result; -import io.druid.query.TableDataSource; -import io.druid.query.spec.MultipleIntervalSegmentSpec; -import io.druid.timeline.LogicalSegment; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.query.CacheStrategy; +import org.apache.druid.query.Druids; +import org.apache.druid.query.Result; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.timeline.LogicalSegment; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/timeboundary/TimeBoundaryQueryRunnerTest.java b/processing/src/test/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryRunnerTest.java similarity index 91% rename from processing/src/test/java/io/druid/query/timeboundary/TimeBoundaryQueryRunnerTest.java rename to processing/src/test/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryRunnerTest.java index e6c5fe6c5e39..16d30acf5134 100644 --- a/processing/src/test/java/io/druid/query/timeboundary/TimeBoundaryQueryRunnerTest.java +++ b/processing/src/test/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryRunnerTest.java @@ -17,33 +17,33 @@ * under the License. */ -package io.druid.query.timeboundary; +package org.apache.druid.query.timeboundary; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.io.CharSource; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.Druids; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.Result; -import io.druid.query.TableDataSource; -import io.druid.query.ordering.StringComparators; -import io.druid.segment.IncrementalIndexSegment; -import io.druid.segment.Segment; -import io.druid.segment.TestIndex; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexSchema; -import io.druid.timeline.DataSegment; -import io.druid.timeline.TimelineObjectHolder; -import io.druid.timeline.VersionedIntervalTimeline; -import io.druid.timeline.partition.NoneShardSpec; -import io.druid.timeline.partition.SingleElementPartitionChunk; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.Druids; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.Result; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.segment.IncrementalIndexSegment; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.TestIndex; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.TimelineObjectHolder; +import org.apache.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.timeline.partition.SingleElementPartitionChunk; import org.apache.commons.lang.StringUtils; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/processing/src/test/java/io/druid/query/timeboundary/TimeBoundaryQueryTest.java b/processing/src/test/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryTest.java similarity index 95% rename from processing/src/test/java/io/druid/query/timeboundary/TimeBoundaryQueryTest.java rename to processing/src/test/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryTest.java index e133add0eff5..27ff47050d64 100644 --- a/processing/src/test/java/io/druid/query/timeboundary/TimeBoundaryQueryTest.java +++ b/processing/src/test/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.timeboundary; +package org.apache.druid.query.timeboundary; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.query.Druids; -import io.druid.query.Query; -import io.druid.query.QueryContexts; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.query.Druids; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryContexts; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/timeseries/DefaultTimeseriesQueryMetricsTest.java b/processing/src/test/java/org/apache/druid/query/timeseries/DefaultTimeseriesQueryMetricsTest.java similarity index 90% rename from processing/src/test/java/io/druid/query/timeseries/DefaultTimeseriesQueryMetricsTest.java rename to processing/src/test/java/org/apache/druid/query/timeseries/DefaultTimeseriesQueryMetricsTest.java index c363269a97c5..2727123a7164 100644 --- a/processing/src/test/java/io/druid/query/timeseries/DefaultTimeseriesQueryMetricsTest.java +++ b/processing/src/test/java/org/apache/druid/query/timeseries/DefaultTimeseriesQueryMetricsTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.timeseries; +package org.apache.druid.query.timeseries; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.query.CachingEmitter; -import io.druid.query.DefaultQueryMetricsTest; -import io.druid.query.DruidMetrics; -import io.druid.query.Druids; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.segment.TestHelper; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.query.CachingEmitter; +import org.apache.druid.query.DefaultQueryMetricsTest; +import org.apache.druid.query.DruidMetrics; +import org.apache.druid.query.Druids; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.segment.TestHelper; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/timeseries/TimeSeriesUnionQueryRunnerTest.java b/processing/src/test/java/org/apache/druid/query/timeseries/TimeSeriesUnionQueryRunnerTest.java similarity index 91% rename from processing/src/test/java/io/druid/query/timeseries/TimeSeriesUnionQueryRunnerTest.java rename to processing/src/test/java/org/apache/druid/query/timeseries/TimeSeriesUnionQueryRunnerTest.java index 435bc0d39f1b..bed3521df186 100644 --- a/processing/src/test/java/io/druid/query/timeseries/TimeSeriesUnionQueryRunnerTest.java +++ b/processing/src/test/java/org/apache/druid/query/timeseries/TimeSeriesUnionQueryRunnerTest.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.query.timeseries; +package org.apache.druid.query.timeseries; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.query.Druids; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.QueryToolChest; -import io.druid.query.Result; -import io.druid.query.TableDataSource; -import io.druid.query.UnionDataSource; -import io.druid.query.UnionQueryRunner; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.segment.TestHelper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.query.Druids; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.Result; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.query.UnionDataSource; +import org.apache.druid.query.UnionQueryRunner; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.segment.TestHelper; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/processing/src/test/java/io/druid/query/timeseries/TimeseriesBinaryFnTest.java b/processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesBinaryFnTest.java similarity index 92% rename from processing/src/test/java/io/druid/query/timeseries/TimeseriesBinaryFnTest.java rename to processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesBinaryFnTest.java index 1d24dce112b5..3442b11509a6 100644 --- a/processing/src/test/java/io/druid/query/timeseries/TimeseriesBinaryFnTest.java +++ b/processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesBinaryFnTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.query.timeseries; +package org.apache.druid.query.timeseries; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.Result; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; import org.joda.time.DateTime; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/timeseries/TimeseriesQueryQueryToolChestTest.java b/processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesQueryQueryToolChestTest.java similarity index 86% rename from processing/src/test/java/io/druid/query/timeseries/TimeseriesQueryQueryToolChestTest.java rename to processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesQueryQueryToolChestTest.java index 28a0542705dc..0742e1e845ad 100644 --- a/processing/src/test/java/io/druid/query/timeseries/TimeseriesQueryQueryToolChestTest.java +++ b/processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesQueryQueryToolChestTest.java @@ -17,25 +17,25 @@ * under the License. */ -package io.druid.query.timeseries; +package org.apache.druid.query.timeseries; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.CacheStrategy; -import io.druid.query.Druids; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.Result; -import io.druid.query.TableDataSource; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.aggregation.post.ConstantPostAggregator; -import io.druid.query.spec.MultipleIntervalSegmentSpec; -import io.druid.segment.TestHelper; -import io.druid.segment.VirtualColumns; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.CacheStrategy; +import org.apache.druid.query.Druids; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.Result; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.aggregation.post.ConstantPostAggregator; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.VirtualColumns; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -150,7 +150,7 @@ public void testCacheKey() ) .build(); - // Test for https://github.com/druid-io/druid/issues/4093. + // Test for https://github.com/apache/incubator-druid/issues/4093. Assert.assertFalse( Arrays.equals( TOOL_CHEST.getCacheStrategy(query1).computeCacheKey(query1), diff --git a/processing/src/test/java/io/druid/query/timeseries/TimeseriesQueryRunnerBonusTest.java b/processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesQueryRunnerBonusTest.java similarity index 83% rename from processing/src/test/java/io/druid/query/timeseries/TimeseriesQueryRunnerBonusTest.java rename to processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesQueryRunnerBonusTest.java index b0a807c061ea..81e01b1581fa 100644 --- a/processing/src/test/java/io/druid/query/timeseries/TimeseriesQueryRunnerBonusTest.java +++ b/processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesQueryRunnerBonusTest.java @@ -17,27 +17,27 @@ * under the License. */ -package io.druid.query.timeseries; +package org.apache.druid.query.timeseries; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.data.input.MapBasedInputRow; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.Druids; -import io.druid.query.FinalizeResultsQueryRunner; -import io.druid.query.Query; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.Result; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.segment.IncrementalIndexSegment; -import io.druid.segment.Segment; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.Druids; +import org.apache.druid.query.FinalizeResultsQueryRunner; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.segment.IncrementalIndexSegment; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/processing/src/test/java/io/druid/query/timeseries/TimeseriesQueryRunnerTest.java b/processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesQueryRunnerTest.java similarity index 97% rename from processing/src/test/java/io/druid/query/timeseries/TimeseriesQueryRunnerTest.java rename to processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesQueryRunnerTest.java index 25251a0aa15b..60bda9309cda 100644 --- a/processing/src/test/java/io/druid/query/timeseries/TimeseriesQueryRunnerTest.java +++ b/processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesQueryRunnerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.timeseries; +package org.apache.druid.query.timeseries; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -25,43 +25,43 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.primitives.Doubles; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.granularity.PeriodGranularity; -import io.druid.query.Druids; -import io.druid.query.FinalizeResultsQueryRunner; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.QueryToolChest; -import io.druid.query.Result; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.DoubleMaxAggregatorFactory; -import io.druid.query.aggregation.DoubleMinAggregatorFactory; -import io.druid.query.aggregation.FilteredAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.aggregation.first.DoubleFirstAggregatorFactory; -import io.druid.query.aggregation.last.DoubleLastAggregatorFactory; -import io.druid.query.expression.TestExprMacroTable; -import io.druid.query.extraction.MapLookupExtractor; -import io.druid.query.filter.AndDimFilter; -import io.druid.query.filter.BoundDimFilter; -import io.druid.query.filter.InDimFilter; -import io.druid.query.filter.NotDimFilter; -import io.druid.query.filter.OrDimFilter; -import io.druid.query.filter.RegexDimFilter; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.query.lookup.LookupExtractionFn; -import io.druid.query.ordering.StringComparators; -import io.druid.query.spec.MultipleIntervalSegmentSpec; -import io.druid.segment.TestHelper; -import io.druid.segment.column.ValueType; -import io.druid.segment.virtual.ExpressionVirtualColumn; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.granularity.PeriodGranularity; +import org.apache.druid.query.Druids; +import org.apache.druid.query.FinalizeResultsQueryRunner; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleMaxAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleMinAggregatorFactory; +import org.apache.druid.query.aggregation.FilteredAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.aggregation.first.DoubleFirstAggregatorFactory; +import org.apache.druid.query.aggregation.last.DoubleLastAggregatorFactory; +import org.apache.druid.query.expression.TestExprMacroTable; +import org.apache.druid.query.extraction.MapLookupExtractor; +import org.apache.druid.query.filter.AndDimFilter; +import org.apache.druid.query.filter.BoundDimFilter; +import org.apache.druid.query.filter.InDimFilter; +import org.apache.druid.query.filter.NotDimFilter; +import org.apache.druid.query.filter.OrDimFilter; +import org.apache.druid.query.filter.RegexDimFilter; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.query.lookup.LookupExtractionFn; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.virtual.ExpressionVirtualColumn; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.Interval; diff --git a/processing/src/test/java/io/druid/query/timeseries/TimeseriesQueryTest.java b/processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesQueryTest.java similarity index 90% rename from processing/src/test/java/io/druid/query/timeseries/TimeseriesQueryTest.java rename to processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesQueryTest.java index 312ce88acf52..7463ca85951f 100644 --- a/processing/src/test/java/io/druid/query/timeseries/TimeseriesQueryTest.java +++ b/processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesQueryTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.timeseries; +package org.apache.druid.query.timeseries; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.query.Druids; -import io.druid.query.Query; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.segment.TestHelper; +import org.apache.druid.query.Druids; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.segment.TestHelper; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/processing/src/test/java/io/druid/query/topn/AlphaNumericTopNMetricSpecTest.java b/processing/src/test/java/org/apache/druid/query/topn/AlphaNumericTopNMetricSpecTest.java similarity index 98% rename from processing/src/test/java/io/druid/query/topn/AlphaNumericTopNMetricSpecTest.java rename to processing/src/test/java/org/apache/druid/query/topn/AlphaNumericTopNMetricSpecTest.java index 7b9429b30db4..c05e5a51cbdb 100644 --- a/processing/src/test/java/io/druid/query/topn/AlphaNumericTopNMetricSpecTest.java +++ b/processing/src/test/java/org/apache/druid/query/topn/AlphaNumericTopNMetricSpecTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.druid.segment.TestHelper; +import org.apache.druid.segment.TestHelper; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/topn/DefaultTopNQueryMetricsTest.java b/processing/src/test/java/org/apache/druid/query/topn/DefaultTopNQueryMetricsTest.java similarity index 86% rename from processing/src/test/java/io/druid/query/topn/DefaultTopNQueryMetricsTest.java rename to processing/src/test/java/org/apache/druid/query/topn/DefaultTopNQueryMetricsTest.java index 2d7bef36a26e..23abdb63df57 100644 --- a/processing/src/test/java/io/druid/query/topn/DefaultTopNQueryMetricsTest.java +++ b/processing/src/test/java/org/apache/druid/query/topn/DefaultTopNQueryMetricsTest.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.google.common.collect.ImmutableSet; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.CachingEmitter; -import io.druid.query.DefaultQueryMetricsTest; -import io.druid.query.DruidMetrics; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.dimension.ListFilteredDimensionSpec; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.segment.TestHelper; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.CachingEmitter; +import org.apache.druid.query.DefaultQueryMetricsTest; +import org.apache.druid.query.DruidMetrics; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.ListFilteredDimensionSpec; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.segment.TestHelper; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/topn/DimensionTopNMetricSpecTest.java b/processing/src/test/java/org/apache/druid/query/topn/DimensionTopNMetricSpecTest.java similarity index 97% rename from processing/src/test/java/io/druid/query/topn/DimensionTopNMetricSpecTest.java rename to processing/src/test/java/org/apache/druid/query/topn/DimensionTopNMetricSpecTest.java index 0609aa391e5f..be57f311266c 100644 --- a/processing/src/test/java/io/druid/query/topn/DimensionTopNMetricSpecTest.java +++ b/processing/src/test/java/org/apache/druid/query/topn/DimensionTopNMetricSpecTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.query.ordering.StringComparators; -import io.druid.segment.TestHelper; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.segment.TestHelper; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/topn/PerSegmentQueryOptimizeTest.java b/processing/src/test/java/org/apache/druid/query/topn/PerSegmentQueryOptimizeTest.java similarity index 86% rename from processing/src/test/java/io/druid/query/topn/PerSegmentQueryOptimizeTest.java rename to processing/src/test/java/org/apache/druid/query/topn/PerSegmentQueryOptimizeTest.java index 06a7f46fa24c..2d2204f2299c 100644 --- a/processing/src/test/java/io/druid/query/topn/PerSegmentQueryOptimizeTest.java +++ b/processing/src/test/java/org/apache/druid/query/topn/PerSegmentQueryOptimizeTest.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.query.topn; - -import io.druid.java.util.common.Intervals; -import io.druid.query.PerSegmentQueryOptimizationContext; -import io.druid.query.SegmentDescriptor; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.FilteredAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.aggregation.SuppressedAggregatorFactory; -import io.druid.query.filter.IntervalDimFilter; -import io.druid.segment.column.Column; +package org.apache.druid.query.topn; + +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.query.PerSegmentQueryOptimizationContext; +import org.apache.druid.query.SegmentDescriptor; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.FilteredAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.aggregation.SuppressedAggregatorFactory; +import org.apache.druid.query.filter.IntervalDimFilter; +import org.apache.druid.segment.column.Column; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/topn/PooledTopNAlgorithmTest.java b/processing/src/test/java/org/apache/druid/query/topn/PooledTopNAlgorithmTest.java similarity index 93% rename from processing/src/test/java/io/druid/query/topn/PooledTopNAlgorithmTest.java rename to processing/src/test/java/org/apache/druid/query/topn/PooledTopNAlgorithmTest.java index b6a329d9a36f..341a3c18078a 100644 --- a/processing/src/test/java/io/druid/query/topn/PooledTopNAlgorithmTest.java +++ b/processing/src/test/java/org/apache/druid/query/topn/PooledTopNAlgorithmTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; -import io.druid.collections.ResourceHolder; -import io.druid.segment.StorageAdapter; +import org.apache.druid.collections.ResourceHolder; +import org.apache.druid.segment.StorageAdapter; import org.easymock.EasyMock; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/topn/TopNBinaryFnBenchmark.java b/processing/src/test/java/org/apache/druid/query/topn/TopNBinaryFnBenchmark.java similarity index 84% rename from processing/src/test/java/io/druid/query/topn/TopNBinaryFnBenchmark.java rename to processing/src/test/java/org/apache/druid/query/topn/TopNBinaryFnBenchmark.java index 878f5c53a539..1d6be652e571 100644 --- a/processing/src/test/java/io/druid/query/topn/TopNBinaryFnBenchmark.java +++ b/processing/src/test/java/org/apache/druid/query/topn/TopNBinaryFnBenchmark.java @@ -17,23 +17,23 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.google.caliper.Param; import com.google.caliper.Runner; import com.google.caliper.SimpleBenchmark; import com.google.common.collect.Lists; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.Result; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.post.ArithmeticPostAggregator; -import io.druid.query.aggregation.post.ConstantPostAggregator; -import io.druid.query.aggregation.post.FieldAccessPostAggregator; -import io.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.post.ArithmeticPostAggregator; +import org.apache.druid.query.aggregation.post.ConstantPostAggregator; +import org.apache.druid.query.aggregation.post.FieldAccessPostAggregator; +import org.apache.druid.query.dimension.DefaultDimensionSpec; import org.joda.time.DateTime; import java.util.ArrayList; diff --git a/processing/src/test/java/io/druid/query/topn/TopNBinaryFnTest.java b/processing/src/test/java/org/apache/druid/query/topn/TopNBinaryFnTest.java similarity index 95% rename from processing/src/test/java/io/druid/query/topn/TopNBinaryFnTest.java rename to processing/src/test/java/org/apache/druid/query/topn/TopNBinaryFnTest.java index 94f9f49a4866..08314e1bbc98 100644 --- a/processing/src/test/java/io/druid/query/topn/TopNBinaryFnTest.java +++ b/processing/src/test/java/org/apache/druid/query/topn/TopNBinaryFnTest.java @@ -17,23 +17,23 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.Result; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.post.ArithmeticPostAggregator; -import io.druid.query.aggregation.post.ConstantPostAggregator; -import io.druid.query.aggregation.post.FieldAccessPostAggregator; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.ordering.StringComparators; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.post.ArithmeticPostAggregator; +import org.apache.druid.query.aggregation.post.ConstantPostAggregator; +import org.apache.druid.query.aggregation.post.FieldAccessPostAggregator; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.ordering.StringComparators; import org.joda.time.DateTime; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/topn/TopNMetricSpecOptimizationsTest.java b/processing/src/test/java/org/apache/druid/query/topn/TopNMetricSpecOptimizationsTest.java similarity index 88% rename from processing/src/test/java/io/druid/query/topn/TopNMetricSpecOptimizationsTest.java rename to processing/src/test/java/org/apache/druid/query/topn/TopNMetricSpecOptimizationsTest.java index dfa5f288103d..91a00e80b051 100644 --- a/processing/src/test/java/io/druid/query/topn/TopNMetricSpecOptimizationsTest.java +++ b/processing/src/test/java/org/apache/druid/query/topn/TopNMetricSpecOptimizationsTest.java @@ -17,32 +17,32 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.QueryMetrics; -import io.druid.query.aggregation.DoubleMaxAggregatorFactory; -import io.druid.query.aggregation.DoubleMinAggregatorFactory; -import io.druid.query.filter.Filter; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.Capabilities; -import io.druid.segment.Cursor; -import io.druid.segment.DimensionSelector; -import io.druid.segment.IdLookup; -import io.druid.segment.Metadata; -import io.druid.segment.StorageAdapter; -import io.druid.segment.VirtualColumns; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.data.Indexed; -import io.druid.segment.data.IndexedInts; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.QueryMetrics; +import org.apache.druid.query.aggregation.DoubleMaxAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleMinAggregatorFactory; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.Capabilities; +import org.apache.druid.segment.Cursor; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.IdLookup; +import org.apache.druid.segment.Metadata; +import org.apache.druid.segment.StorageAdapter; +import org.apache.druid.segment.VirtualColumns; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.data.Indexed; +import org.apache.druid.segment.data.IndexedInts; import org.joda.time.DateTime; import org.joda.time.Interval; import org.junit.Assert; @@ -51,13 +51,13 @@ import javax.annotation.Nullable; import java.util.Collections; -import static io.druid.query.QueryRunnerTestHelper.addRowsIndexConstant; -import static io.druid.query.QueryRunnerTestHelper.allGran; -import static io.druid.query.QueryRunnerTestHelper.commonDoubleAggregators; -import static io.druid.query.QueryRunnerTestHelper.dataSource; -import static io.druid.query.QueryRunnerTestHelper.indexMetric; -import static io.druid.query.QueryRunnerTestHelper.marketDimension; -import static io.druid.query.QueryRunnerTestHelper.qualityDimension; +import static org.apache.druid.query.QueryRunnerTestHelper.addRowsIndexConstant; +import static org.apache.druid.query.QueryRunnerTestHelper.allGran; +import static org.apache.druid.query.QueryRunnerTestHelper.commonDoubleAggregators; +import static org.apache.druid.query.QueryRunnerTestHelper.dataSource; +import static org.apache.druid.query.QueryRunnerTestHelper.indexMetric; +import static org.apache.druid.query.QueryRunnerTestHelper.marketDimension; +import static org.apache.druid.query.QueryRunnerTestHelper.qualityDimension; public class TopNMetricSpecOptimizationsTest { diff --git a/processing/src/test/java/io/druid/query/topn/TopNQueryQueryToolChestTest.java b/processing/src/test/java/org/apache/druid/query/topn/TopNQueryQueryToolChestTest.java similarity index 86% rename from processing/src/test/java/io/druid/query/topn/TopNQueryQueryToolChestTest.java rename to processing/src/test/java/org/apache/druid/query/topn/TopNQueryQueryToolChestTest.java index 2847c89506de..b8207b9381a1 100644 --- a/processing/src/test/java/io/druid/query/topn/TopNQueryQueryToolChestTest.java +++ b/processing/src/test/java/org/apache/druid/query/topn/TopNQueryQueryToolChestTest.java @@ -17,36 +17,36 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import io.druid.collections.CloseableStupidPool; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.CacheStrategy; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.Result; -import io.druid.query.TableDataSource; -import io.druid.query.TestQueryRunners; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.post.ArithmeticPostAggregator; -import io.druid.query.aggregation.post.ConstantPostAggregator; -import io.druid.query.aggregation.post.FieldAccessPostAggregator; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.spec.MultipleIntervalSegmentSpec; -import io.druid.segment.IncrementalIndexSegment; -import io.druid.segment.TestHelper; -import io.druid.segment.TestIndex; -import io.druid.segment.VirtualColumns; -import io.druid.segment.column.ValueType; +import org.apache.druid.collections.CloseableStupidPool; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.CacheStrategy; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.Result; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.query.TestQueryRunners; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.post.ArithmeticPostAggregator; +import org.apache.druid.query.aggregation.post.ConstantPostAggregator; +import org.apache.druid.query.aggregation.post.FieldAccessPostAggregator; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.segment.IncrementalIndexSegment; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.TestIndex; +import org.apache.druid.segment.VirtualColumns; +import org.apache.druid.segment.column.ValueType; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/topn/TopNQueryRunnerBenchmark.java b/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerBenchmark.java similarity index 89% rename from processing/src/test/java/io/druid/query/topn/TopNQueryRunnerBenchmark.java rename to processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerBenchmark.java index c3f9534223c9..5bf9f8eb3304 100644 --- a/processing/src/test/java/io/druid/query/topn/TopNQueryRunnerBenchmark.java +++ b/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerBenchmark.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.carrotsearch.junitbenchmarks.AbstractBenchmark; import com.carrotsearch.junitbenchmarks.BenchmarkOptions; @@ -25,16 +25,16 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.collections.StupidPool; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.aggregation.DoubleMaxAggregatorFactory; -import io.druid.query.aggregation.DoubleMinAggregatorFactory; -import io.druid.segment.IncrementalIndexSegment; -import io.druid.segment.QueryableIndexSegment; -import io.druid.segment.TestIndex; +import org.apache.druid.collections.StupidPool; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.aggregation.DoubleMaxAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleMinAggregatorFactory; +import org.apache.druid.segment.IncrementalIndexSegment; +import org.apache.druid.segment.QueryableIndexSegment; +import org.apache.druid.segment.TestIndex; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/topn/TopNQueryRunnerTest.java b/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerTest.java similarity index 98% rename from processing/src/test/java/io/druid/query/topn/TopNQueryRunnerTest.java rename to processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerTest.java index 8dc5c159650f..d805065b1a76 100644 --- a/processing/src/test/java/io/druid/query/topn/TopNQueryRunnerTest.java +++ b/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; @@ -28,69 +28,69 @@ import com.google.common.collect.Sets; import com.google.common.primitives.Doubles; import com.google.common.primitives.Longs; -import io.druid.collections.CloseableStupidPool; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.io.Closer; -import io.druid.js.JavaScriptConfig; -import io.druid.math.expr.ExprMacroTable; -import io.druid.query.BySegmentResultValue; -import io.druid.query.BySegmentResultValueClass; -import io.druid.query.FinalizeResultsQueryRunner; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.Result; -import io.druid.query.TestQueryRunners; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.DoubleMaxAggregatorFactory; -import io.druid.query.aggregation.DoubleMinAggregatorFactory; -import io.druid.query.aggregation.DoubleSumAggregatorFactory; -import io.druid.query.aggregation.FilteredAggregatorFactory; -import io.druid.query.aggregation.FloatMaxAggregatorFactory; -import io.druid.query.aggregation.FloatMinAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.aggregation.cardinality.CardinalityAggregatorFactory; -import io.druid.query.aggregation.first.DoubleFirstAggregatorFactory; -import io.druid.query.aggregation.first.FloatFirstAggregatorFactory; -import io.druid.query.aggregation.first.LongFirstAggregatorFactory; -import io.druid.query.aggregation.hyperloglog.HyperUniqueFinalizingPostAggregator; -import io.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; -import io.druid.query.aggregation.last.FloatLastAggregatorFactory; -import io.druid.query.aggregation.last.LongLastAggregatorFactory; -import io.druid.query.aggregation.post.ExpressionPostAggregator; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.dimension.ExtractionDimensionSpec; -import io.druid.query.dimension.ListFilteredDimensionSpec; -import io.druid.query.expression.TestExprMacroTable; -import io.druid.query.extraction.DimExtractionFn; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.extraction.JavaScriptExtractionFn; -import io.druid.query.extraction.MapLookupExtractor; -import io.druid.query.extraction.RegexDimExtractionFn; -import io.druid.query.extraction.StringFormatExtractionFn; -import io.druid.query.extraction.StrlenExtractionFn; -import io.druid.query.extraction.TimeFormatExtractionFn; -import io.druid.query.filter.AndDimFilter; -import io.druid.query.filter.BoundDimFilter; -import io.druid.query.filter.DimFilter; -import io.druid.query.filter.ExtractionDimFilter; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.query.lookup.LookupExtractionFn; -import io.druid.query.ordering.StringComparators; -import io.druid.query.spec.MultipleIntervalSegmentSpec; -import io.druid.segment.TestHelper; -import io.druid.segment.column.Column; -import io.druid.segment.column.ValueType; -import io.druid.segment.virtual.ExpressionVirtualColumn; +import org.apache.druid.collections.CloseableStupidPool; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.js.JavaScriptConfig; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.query.BySegmentResultValue; +import org.apache.druid.query.BySegmentResultValueClass; +import org.apache.druid.query.FinalizeResultsQueryRunner; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.Result; +import org.apache.druid.query.TestQueryRunners; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleMaxAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleMinAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; +import org.apache.druid.query.aggregation.FilteredAggregatorFactory; +import org.apache.druid.query.aggregation.FloatMaxAggregatorFactory; +import org.apache.druid.query.aggregation.FloatMinAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.aggregation.cardinality.CardinalityAggregatorFactory; +import org.apache.druid.query.aggregation.first.DoubleFirstAggregatorFactory; +import org.apache.druid.query.aggregation.first.FloatFirstAggregatorFactory; +import org.apache.druid.query.aggregation.first.LongFirstAggregatorFactory; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniqueFinalizingPostAggregator; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; +import org.apache.druid.query.aggregation.last.FloatLastAggregatorFactory; +import org.apache.druid.query.aggregation.last.LongLastAggregatorFactory; +import org.apache.druid.query.aggregation.post.ExpressionPostAggregator; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.dimension.ExtractionDimensionSpec; +import org.apache.druid.query.dimension.ListFilteredDimensionSpec; +import org.apache.druid.query.expression.TestExprMacroTable; +import org.apache.druid.query.extraction.DimExtractionFn; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.extraction.JavaScriptExtractionFn; +import org.apache.druid.query.extraction.MapLookupExtractor; +import org.apache.druid.query.extraction.RegexDimExtractionFn; +import org.apache.druid.query.extraction.StringFormatExtractionFn; +import org.apache.druid.query.extraction.StrlenExtractionFn; +import org.apache.druid.query.extraction.TimeFormatExtractionFn; +import org.apache.druid.query.filter.AndDimFilter; +import org.apache.druid.query.filter.BoundDimFilter; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.filter.ExtractionDimFilter; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.query.lookup.LookupExtractionFn; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.virtual.ExpressionVirtualColumn; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Rule; @@ -5707,7 +5707,7 @@ public void testFullOnTopNWithAggsOnNumericDims() @Test public void testFullOnTopNBoundFilterAndLongSumMetric() { - // this tests the stack overflow issue from https://github.com/druid-io/druid/issues/4628 + // this tests the stack overflow issue from https://github.com/apache/incubator-druid/issues/4628 TopNQuery query = new TopNQueryBuilder() .dataSource(QueryRunnerTestHelper.dataSource) .granularity(QueryRunnerTestHelper.allGran) @@ -5740,7 +5740,7 @@ public void testFullOnTopNBoundFilterAndLongSumMetric() } /** - * Regression test for https://github.com/druid-io/druid/issues/5132 + * Regression test for https://github.com/apache/incubator-druid/issues/5132 */ @Test public void testTopNWithNonBitmapFilter() diff --git a/processing/src/test/java/io/druid/query/topn/TopNQueryRunnerTestHelper.java b/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerTestHelper.java similarity index 92% rename from processing/src/test/java/io/druid/query/topn/TopNQueryRunnerTestHelper.java rename to processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerTestHelper.java index d25746541ad3..aa3f9f9cbbef 100644 --- a/processing/src/test/java/io/druid/query/topn/TopNQueryRunnerTestHelper.java +++ b/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerTestHelper.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.java.util.common.DateTimes; -import io.druid.query.Result; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.query.Result; import java.util.List; import java.util.Map; diff --git a/processing/src/test/java/io/druid/query/topn/TopNQueryTest.java b/processing/src/test/java/org/apache/druid/query/topn/TopNQueryTest.java similarity index 81% rename from processing/src/test/java/io/druid/query/topn/TopNQueryTest.java rename to processing/src/test/java/org/apache/druid/query/topn/TopNQueryTest.java index 572010182ff6..44a030c9e5f6 100644 --- a/processing/src/test/java/io/druid/query/topn/TopNQueryTest.java +++ b/processing/src/test/java/org/apache/druid/query/topn/TopNQueryTest.java @@ -17,35 +17,35 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import io.druid.query.Query; -import io.druid.query.aggregation.DoubleMaxAggregatorFactory; -import io.druid.query.aggregation.DoubleMinAggregatorFactory; -import io.druid.query.dimension.ExtractionDimensionSpec; -import io.druid.query.dimension.LegacyDimensionSpec; -import io.druid.query.extraction.MapLookupExtractor; -import io.druid.query.lookup.LookupExtractionFn; -import io.druid.query.ordering.StringComparators; -import io.druid.segment.TestHelper; +import org.apache.druid.query.Query; +import org.apache.druid.query.aggregation.DoubleMaxAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleMinAggregatorFactory; +import org.apache.druid.query.dimension.ExtractionDimensionSpec; +import org.apache.druid.query.dimension.LegacyDimensionSpec; +import org.apache.druid.query.extraction.MapLookupExtractor; +import org.apache.druid.query.lookup.LookupExtractionFn; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.segment.TestHelper; import org.junit.Assert; import org.junit.Test; import java.io.IOException; import java.util.Collections; -import static io.druid.query.QueryRunnerTestHelper.addRowsIndexConstant; -import static io.druid.query.QueryRunnerTestHelper.allGran; -import static io.druid.query.QueryRunnerTestHelper.commonDoubleAggregators; -import static io.druid.query.QueryRunnerTestHelper.dataSource; -import static io.druid.query.QueryRunnerTestHelper.fullOnInterval; -import static io.druid.query.QueryRunnerTestHelper.indexMetric; -import static io.druid.query.QueryRunnerTestHelper.marketDimension; -import static io.druid.query.QueryRunnerTestHelper.rowsCount; +import static org.apache.druid.query.QueryRunnerTestHelper.addRowsIndexConstant; +import static org.apache.druid.query.QueryRunnerTestHelper.allGran; +import static org.apache.druid.query.QueryRunnerTestHelper.commonDoubleAggregators; +import static org.apache.druid.query.QueryRunnerTestHelper.dataSource; +import static org.apache.druid.query.QueryRunnerTestHelper.fullOnInterval; +import static org.apache.druid.query.QueryRunnerTestHelper.indexMetric; +import static org.apache.druid.query.QueryRunnerTestHelper.marketDimension; +import static org.apache.druid.query.QueryRunnerTestHelper.rowsCount; public class TopNQueryTest { diff --git a/processing/src/test/java/io/druid/query/topn/TopNUnionQueryTest.java b/processing/src/test/java/org/apache/druid/query/topn/TopNUnionQueryTest.java similarity index 92% rename from processing/src/test/java/io/druid/query/topn/TopNUnionQueryTest.java rename to processing/src/test/java/org/apache/druid/query/topn/TopNUnionQueryTest.java index b760d54eb4f1..4913fbbff90f 100644 --- a/processing/src/test/java/io/druid/query/topn/TopNUnionQueryTest.java +++ b/processing/src/test/java/org/apache/druid/query/topn/TopNUnionQueryTest.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.query.topn; +package org.apache.druid.query.topn; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import io.druid.collections.CloseableStupidPool; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.io.Closer; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.Result; -import io.druid.query.TestQueryRunners; -import io.druid.query.aggregation.DoubleMaxAggregatorFactory; -import io.druid.query.aggregation.DoubleMinAggregatorFactory; -import io.druid.segment.TestHelper; +import org.apache.druid.collections.CloseableStupidPool; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.Result; +import org.apache.druid.query.TestQueryRunners; +import org.apache.druid.query.aggregation.DoubleMaxAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleMinAggregatorFactory; +import org.apache.druid.segment.TestHelper; import org.junit.AfterClass; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/processing/src/test/java/io/druid/segment/AppendTest.java b/processing/src/test/java/org/apache/druid/segment/AppendTest.java similarity index 92% rename from processing/src/test/java/io/druid/segment/AppendTest.java rename to processing/src/test/java/org/apache/druid/segment/AppendTest.java index 193c28e87d39..6b52e122b35c 100644 --- a/processing/src/test/java/io/druid/segment/AppendTest.java +++ b/processing/src/test/java/org/apache/druid/segment/AppendTest.java @@ -17,49 +17,49 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import io.druid.collections.CloseableStupidPool; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.query.Druids; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.Result; -import io.druid.query.TestQueryRunners; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.DoubleMaxAggregatorFactory; -import io.druid.query.aggregation.DoubleMinAggregatorFactory; -import io.druid.query.aggregation.DoubleSumAggregatorFactory; -import io.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; -import io.druid.query.aggregation.post.ArithmeticPostAggregator; -import io.druid.query.aggregation.post.ConstantPostAggregator; -import io.druid.query.aggregation.post.FieldAccessPostAggregator; -import io.druid.query.filter.AndDimFilter; -import io.druid.query.filter.NotDimFilter; -import io.druid.query.filter.OrDimFilter; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.query.search.SearchHit; -import io.druid.query.search.SearchQuery; -import io.druid.query.search.SearchResultValue; -import io.druid.query.spec.MultipleIntervalSegmentSpec; -import io.druid.query.spec.QuerySegmentSpec; -import io.druid.query.timeboundary.TimeBoundaryQuery; -import io.druid.query.timeboundary.TimeBoundaryResultValue; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.timeseries.TimeseriesResultValue; -import io.druid.query.topn.TopNQuery; -import io.druid.query.topn.TopNQueryBuilder; -import io.druid.query.topn.TopNResultValue; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; +import org.apache.druid.collections.CloseableStupidPool; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.query.Druids; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.Result; +import org.apache.druid.query.TestQueryRunners; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleMaxAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleMinAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; +import org.apache.druid.query.aggregation.post.ArithmeticPostAggregator; +import org.apache.druid.query.aggregation.post.ConstantPostAggregator; +import org.apache.druid.query.aggregation.post.FieldAccessPostAggregator; +import org.apache.druid.query.filter.AndDimFilter; +import org.apache.druid.query.filter.NotDimFilter; +import org.apache.druid.query.filter.OrDimFilter; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.query.search.SearchHit; +import org.apache.druid.query.search.SearchQuery; +import org.apache.druid.query.search.SearchResultValue; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.query.spec.QuerySegmentSpec; +import org.apache.druid.query.timeboundary.TimeBoundaryQuery; +import org.apache.druid.query.timeboundary.TimeBoundaryResultValue; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.timeseries.TimeseriesResultValue; +import org.apache.druid.query.topn.TopNQuery; +import org.apache.druid.query.topn.TopNQueryBuilder; +import org.apache.druid.query.topn.TopNResultValue; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/BitmapOffsetTest.java b/processing/src/test/java/org/apache/druid/segment/BitmapOffsetTest.java similarity index 86% rename from processing/src/test/java/io/druid/segment/BitmapOffsetTest.java rename to processing/src/test/java/org/apache/druid/segment/BitmapOffsetTest.java index 1ab0351b7372..ef892496bf1a 100644 --- a/processing/src/test/java/io/druid/segment/BitmapOffsetTest.java +++ b/processing/src/test/java/org/apache/druid/segment/BitmapOffsetTest.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.base.Function; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; -import io.druid.collections.bitmap.BitSetBitmapFactory; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.ConciseBitmapFactory; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.collections.bitmap.MutableBitmap; -import io.druid.collections.bitmap.RoaringBitmapFactory; -import io.druid.segment.data.Offset; +import org.apache.druid.collections.bitmap.BitSetBitmapFactory; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.ConciseBitmapFactory; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.collections.bitmap.MutableBitmap; +import org.apache.druid.collections.bitmap.RoaringBitmapFactory; +import org.apache.druid.segment.data.Offset; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/processing/src/test/java/io/druid/segment/CloserRule.java b/processing/src/test/java/org/apache/druid/segment/CloserRule.java similarity index 93% rename from processing/src/test/java/io/druid/segment/CloserRule.java rename to processing/src/test/java/org/apache/druid/segment/CloserRule.java index aff2c994dd48..8f87288f869a 100644 --- a/processing/src/test/java/io/druid/segment/CloserRule.java +++ b/processing/src/test/java/org/apache/druid/segment/CloserRule.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.logger.Logger; import org.junit.rules.TestRule; import org.junit.runner.Description; import org.junit.runners.model.Statement; diff --git a/processing/src/test/java/io/druid/segment/CloserRuleTest.java b/processing/src/test/java/org/apache/druid/segment/CloserRuleTest.java similarity index 99% rename from processing/src/test/java/io/druid/segment/CloserRuleTest.java rename to processing/src/test/java/org/apache/druid/segment/CloserRuleTest.java index 4482568969b4..800e2ffd4aca 100644 --- a/processing/src/test/java/io/druid/segment/CloserRuleTest.java +++ b/processing/src/test/java/org/apache/druid/segment/CloserRuleTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.util.concurrent.Runnables; import org.junit.Assert; diff --git a/processing/src/test/java/io/druid/segment/ConciseBitmapIndexMergerV9Test.java b/processing/src/test/java/org/apache/druid/segment/ConciseBitmapIndexMergerV9Test.java similarity index 83% rename from processing/src/test/java/io/druid/segment/ConciseBitmapIndexMergerV9Test.java rename to processing/src/test/java/org/apache/druid/segment/ConciseBitmapIndexMergerV9Test.java index cd85947a2b92..b2afbb378e9d 100644 --- a/processing/src/test/java/io/druid/segment/ConciseBitmapIndexMergerV9Test.java +++ b/processing/src/test/java/org/apache/druid/segment/ConciseBitmapIndexMergerV9Test.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; -import io.druid.segment.data.CompressionFactory.LongEncodingStrategy; -import io.druid.segment.data.CompressionStrategy; -import io.druid.segment.data.ConciseBitmapSerdeFactory; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.segment.data.CompressionFactory.LongEncodingStrategy; +import org.apache.druid.segment.data.CompressionStrategy; +import org.apache.druid.segment.data.ConciseBitmapSerdeFactory; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/processing/src/test/java/io/druid/segment/ConstantDimensionSelectorTest.java b/processing/src/test/java/org/apache/druid/segment/ConstantDimensionSelectorTest.java similarity index 92% rename from processing/src/test/java/io/druid/segment/ConstantDimensionSelectorTest.java rename to processing/src/test/java/org/apache/druid/segment/ConstantDimensionSelectorTest.java index 9ba0eff774ba..d397496a0db8 100644 --- a/processing/src/test/java/io/druid/segment/ConstantDimensionSelectorTest.java +++ b/processing/src/test/java/org/apache/druid/segment/ConstantDimensionSelectorTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.common.config.NullHandling; -import io.druid.query.extraction.StringFormatExtractionFn; -import io.druid.query.extraction.SubstringDimExtractionFn; -import io.druid.segment.data.IndexedInts; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.query.extraction.StringFormatExtractionFn; +import org.apache.druid.query.extraction.SubstringDimExtractionFn; +import org.apache.druid.segment.data.IndexedInts; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/DebugRow.java b/processing/src/test/java/org/apache/druid/segment/DebugRow.java similarity index 97% rename from processing/src/test/java/io/druid/segment/DebugRow.java rename to processing/src/test/java/org/apache/druid/segment/DebugRow.java index 8c6ea9fba84e..362dceaab6df 100644 --- a/processing/src/test/java/io/druid/segment/DebugRow.java +++ b/processing/src/test/java/org/apache/druid/segment/DebugRow.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import java.util.ArrayList; import java.util.List; diff --git a/processing/src/test/java/io/druid/segment/DictionaryMergeIteratorTest.java b/processing/src/test/java/org/apache/druid/segment/DictionaryMergeIteratorTest.java similarity index 95% rename from processing/src/test/java/io/druid/segment/DictionaryMergeIteratorTest.java rename to processing/src/test/java/org/apache/druid/segment/DictionaryMergeIteratorTest.java index 630b1056774b..fce6c858f9a5 100644 --- a/processing/src/test/java/io/druid/segment/DictionaryMergeIteratorTest.java +++ b/processing/src/test/java/org/apache/druid/segment/DictionaryMergeIteratorTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.collect.Iterators; -import io.druid.segment.data.ArrayIndexed; -import io.druid.segment.data.Indexed; +import org.apache.druid.segment.data.ArrayIndexed; +import org.apache.druid.segment.data.Indexed; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/EmptyIndexTest.java b/processing/src/test/java/org/apache/druid/segment/EmptyIndexTest.java similarity index 84% rename from processing/src/test/java/io/druid/segment/EmptyIndexTest.java rename to processing/src/test/java/org/apache/druid/segment/EmptyIndexTest.java index 2592f14398be..42d8d34d522b 100644 --- a/processing/src/test/java/io/druid/segment/EmptyIndexTest.java +++ b/processing/src/test/java/org/apache/druid/segment/EmptyIndexTest.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import io.druid.collections.bitmap.ConciseBitmapFactory; -import io.druid.java.util.common.Intervals; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.segment.column.Column; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexAdapter; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; -import io.druid.segment.writeout.TmpFileSegmentWriteOutMediumFactory; +import org.apache.druid.collections.bitmap.ConciseBitmapFactory; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexAdapter; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.segment.writeout.TmpFileSegmentWriteOutMediumFactory; import org.apache.commons.io.FileUtils; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/IndexBuilder.java b/processing/src/test/java/org/apache/druid/segment/IndexBuilder.java similarity index 91% rename from processing/src/test/java/io/druid/segment/IndexBuilder.java rename to processing/src/test/java/org/apache/druid/segment/IndexBuilder.java index 55464e3483b6..31b314ba42f2 100644 --- a/processing/src/test/java/io/druid/segment/IndexBuilder.java +++ b/processing/src/test/java/org/apache/druid/segment/IndexBuilder.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import io.druid.data.input.InputRow; -import io.druid.java.util.common.StringUtils; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexSchema; -import io.druid.segment.incremental.IndexSizeExceededException; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.segment.incremental.IndexSizeExceededException; import java.io.File; import java.io.IOException; diff --git a/processing/src/test/java/io/druid/segment/IndexIOTest.java b/processing/src/test/java/org/apache/druid/segment/IndexIOTest.java similarity index 92% rename from processing/src/test/java/io/druid/segment/IndexIOTest.java rename to processing/src/test/java/org/apache/druid/segment/IndexIOTest.java index b005b10d6084..356f9fe17286 100644 --- a/processing/src/test/java/io/druid/segment/IndexIOTest.java +++ b/processing/src/test/java/org/apache/druid/segment/IndexIOTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.base.Function; import com.google.common.base.Predicates; @@ -27,20 +27,20 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.data.input.MapBasedInputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.UOE; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.segment.data.CompressionFactory; -import io.druid.segment.data.CompressionStrategy; -import io.druid.segment.data.ConciseBitmapSerdeFactory; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexAdapter; -import io.druid.segment.incremental.IncrementalIndexSchema; -import io.druid.segment.incremental.IndexSizeExceededException; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.UOE; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.segment.data.CompressionFactory; +import org.apache.druid.segment.data.CompressionStrategy; +import org.apache.druid.segment.data.ConciseBitmapSerdeFactory; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexAdapter; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.segment.incremental.IndexSizeExceededException; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Before; diff --git a/processing/src/test/java/io/druid/segment/IndexMergerNullHandlingTest.java b/processing/src/test/java/org/apache/druid/segment/IndexMergerNullHandlingTest.java similarity index 92% rename from processing/src/test/java/io/druid/segment/IndexMergerNullHandlingTest.java rename to processing/src/test/java/org/apache/druid/segment/IndexMergerNullHandlingTest.java index b94f65c33968..fda318a960c2 100644 --- a/processing/src/test/java/io/druid/segment/IndexMergerNullHandlingTest.java +++ b/processing/src/test/java/org/apache/druid/segment/IndexMergerNullHandlingTest.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMultiset; import com.google.common.collect.Sets; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.common.config.NullHandling; -import io.druid.data.input.MapBasedInputRow; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.guava.Comparators; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.segment.column.BitmapIndex; -import io.druid.segment.column.Column; -import io.druid.segment.column.DictionaryEncodedColumn; -import io.druid.segment.data.IncrementalIndexTest; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.segment.column.BitmapIndex; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.DictionaryEncodedColumn; +import org.apache.druid.segment.data.IncrementalIndexTest; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; diff --git a/processing/src/test/java/io/druid/segment/IndexMergerTestBase.java b/processing/src/test/java/org/apache/druid/segment/IndexMergerTestBase.java similarity index 97% rename from processing/src/test/java/io/druid/segment/IndexMergerTestBase.java rename to processing/src/test/java/org/apache/druid/segment/IndexMergerTestBase.java index 046cd15621ad..f6178958205a 100644 --- a/processing/src/test/java/io/druid/segment/IndexMergerTestBase.java +++ b/processing/src/test/java/org/apache/druid/segment/IndexMergerTestBase.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.base.Function; import com.google.common.collect.Collections2; @@ -26,38 +26,38 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import io.druid.collections.bitmap.RoaringBitmapFactory; -import io.druid.common.config.NullHandling; -import io.druid.data.input.InputRow; -import io.druid.data.input.MapBasedInputRow; -import io.druid.data.input.impl.DimensionSchema; -import io.druid.data.input.impl.DimensionSchema.MultiValueHandling; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.FloatDimensionSchema; -import io.druid.data.input.impl.LongDimensionSchema; -import io.druid.data.input.impl.StringDimensionSchema; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.io.smoosh.SmooshedFileMapper; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.segment.column.Column; -import io.druid.segment.column.ColumnCapabilitiesImpl; -import io.druid.segment.column.DictionaryEncodedColumn; -import io.druid.segment.column.SimpleDictionaryEncodedColumn; -import io.druid.segment.data.BitmapSerdeFactory; -import io.druid.segment.data.BitmapValues; -import io.druid.segment.data.CompressionFactory; -import io.druid.segment.data.CompressionStrategy; -import io.druid.segment.data.ConciseBitmapSerdeFactory; -import io.druid.segment.data.IncrementalIndexTest; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexAdapter; -import io.druid.segment.incremental.IncrementalIndexSchema; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.collections.bitmap.RoaringBitmapFactory; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.data.input.impl.DimensionSchema; +import org.apache.druid.data.input.impl.DimensionSchema.MultiValueHandling; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.FloatDimensionSchema; +import org.apache.druid.data.input.impl.LongDimensionSchema; +import org.apache.druid.data.input.impl.StringDimensionSchema; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.io.smoosh.SmooshedFileMapper; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ColumnCapabilitiesImpl; +import org.apache.druid.segment.column.DictionaryEncodedColumn; +import org.apache.druid.segment.column.SimpleDictionaryEncodedColumn; +import org.apache.druid.segment.data.BitmapSerdeFactory; +import org.apache.druid.segment.data.BitmapValues; +import org.apache.druid.segment.data.CompressionFactory; +import org.apache.druid.segment.data.CompressionStrategy; +import org.apache.druid.segment.data.ConciseBitmapSerdeFactory; +import org.apache.druid.segment.data.IncrementalIndexTest; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexAdapter; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; import it.unimi.dsi.fastutil.ints.IntIterator; import org.joda.time.Interval; import org.junit.Assert; diff --git a/processing/src/test/java/io/druid/segment/IndexMergerV9CompatibilityTest.java b/processing/src/test/java/org/apache/druid/segment/IndexMergerV9CompatibilityTest.java similarity index 88% rename from processing/src/test/java/io/druid/segment/IndexMergerV9CompatibilityTest.java rename to processing/src/test/java/org/apache/druid/segment/IndexMergerV9CompatibilityTest.java index 8537a0080060..75e5de2fada2 100644 --- a/processing/src/test/java/io/druid/segment/IndexMergerV9CompatibilityTest.java +++ b/processing/src/test/java/org/apache/druid/segment/IndexMergerV9CompatibilityTest.java @@ -17,26 +17,26 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.io.ByteSource; import com.google.common.io.Files; -import io.druid.data.input.InputRow; -import io.druid.data.input.MapBasedInputRow; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.JodaUtils; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.segment.data.CompressionFactory; -import io.druid.segment.data.CompressionStrategy; -import io.druid.segment.data.ConciseBitmapSerdeFactory; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexSchema; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; -import io.druid.segment.writeout.TmpFileSegmentWriteOutMediumFactory; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.JodaUtils; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.segment.data.CompressionFactory; +import org.apache.druid.segment.data.CompressionStrategy; +import org.apache.druid.segment.data.ConciseBitmapSerdeFactory; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.segment.writeout.TmpFileSegmentWriteOutMediumFactory; import org.apache.commons.io.FileUtils; import org.junit.After; import org.junit.Assert; diff --git a/processing/src/test/java/io/druid/segment/IndexMergerV9WithSpatialIndexTest.java b/processing/src/test/java/org/apache/druid/segment/IndexMergerV9WithSpatialIndexTest.java similarity index 93% rename from processing/src/test/java/io/druid/segment/IndexMergerV9WithSpatialIndexTest.java rename to processing/src/test/java/org/apache/druid/segment/IndexMergerV9WithSpatialIndexTest.java index 3e4c02a04c77..3509eec506a0 100644 --- a/processing/src/test/java/io/druid/segment/IndexMergerV9WithSpatialIndexTest.java +++ b/processing/src/test/java/org/apache/druid/segment/IndexMergerV9WithSpatialIndexTest.java @@ -17,38 +17,38 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.collections.spatial.search.RadiusBound; -import io.druid.collections.spatial.search.RectangularBound; -import io.druid.data.input.MapBasedInputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.SpatialDimensionSchema; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; -import io.druid.query.Druids; -import io.druid.query.FinalizeResultsQueryRunner; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.Result; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.filter.SpatialDimFilter; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.timeseries.TimeseriesQueryEngine; -import io.druid.query.timeseries.TimeseriesQueryQueryToolChest; -import io.druid.query.timeseries.TimeseriesQueryRunnerFactory; -import io.druid.query.timeseries.TimeseriesResultValue; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.collections.spatial.search.RadiusBound; +import org.apache.druid.collections.spatial.search.RectangularBound; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.SpatialDimensionSchema; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.query.Druids; +import org.apache.druid.query.FinalizeResultsQueryRunner; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.filter.SpatialDimFilter; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.timeseries.TimeseriesQueryEngine; +import org.apache.druid.query.timeseries.TimeseriesQueryQueryToolChest; +import org.apache.druid.query.timeseries.TimeseriesQueryRunnerFactory; +import org.apache.druid.query.timeseries.TimeseriesResultValue; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; import org.apache.commons.io.FileUtils; import org.joda.time.Interval; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/IndexSpecTest.java b/processing/src/test/java/org/apache/druid/segment/IndexSpecTest.java similarity index 90% rename from processing/src/test/java/io/druid/segment/IndexSpecTest.java rename to processing/src/test/java/org/apache/druid/segment/IndexSpecTest.java index 74ca2c79e6d7..4e03668f68ba 100644 --- a/processing/src/test/java/io/druid/segment/IndexSpecTest.java +++ b/processing/src/test/java/org/apache/druid/segment/IndexSpecTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.segment.data.CompressionFactory; -import io.druid.segment.data.CompressionStrategy; -import io.druid.segment.data.RoaringBitmapSerdeFactory; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.segment.data.CompressionFactory; +import org.apache.druid.segment.data.CompressionStrategy; +import org.apache.druid.segment.data.RoaringBitmapSerdeFactory; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/IntIteratorUtilsTest.java b/processing/src/test/java/org/apache/druid/segment/IntIteratorUtilsTest.java similarity index 94% rename from processing/src/test/java/io/druid/segment/IntIteratorUtilsTest.java rename to processing/src/test/java/org/apache/druid/segment/IntIteratorUtilsTest.java index 05dcde6b416a..3d195e3cfe7d 100644 --- a/processing/src/test/java/io/druid/segment/IntIteratorUtilsTest.java +++ b/processing/src/test/java/org/apache/druid/segment/IntIteratorUtilsTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import it.unimi.dsi.fastutil.ints.IntIterators; import it.unimi.dsi.fastutil.ints.IntListIterator; import org.junit.Test; -import static io.druid.segment.IntIteratorUtils.skip; +import static org.apache.druid.segment.IntIteratorUtils.skip; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/processing/src/test/java/io/druid/segment/IntListUtilsTest.java b/processing/src/test/java/org/apache/druid/segment/IntListUtilsTest.java similarity index 97% rename from processing/src/test/java/io/druid/segment/IntListUtilsTest.java rename to processing/src/test/java/org/apache/druid/segment/IntListUtilsTest.java index 0d6c9df6341c..83006953fc2c 100644 --- a/processing/src/test/java/io/druid/segment/IntListUtilsTest.java +++ b/processing/src/test/java/org/apache/druid/segment/IntListUtilsTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import it.unimi.dsi.fastutil.ints.IntList; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/MergeIntIteratorTest.java b/processing/src/test/java/org/apache/druid/segment/MergeIntIteratorTest.java similarity index 97% rename from processing/src/test/java/io/druid/segment/MergeIntIteratorTest.java rename to processing/src/test/java/org/apache/druid/segment/MergeIntIteratorTest.java index fbead54b3409..5a6cefcf7c3a 100644 --- a/processing/src/test/java/io/druid/segment/MergeIntIteratorTest.java +++ b/processing/src/test/java/org/apache/druid/segment/MergeIntIteratorTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.collect.Lists; import it.unimi.dsi.fastutil.ints.IntArrayList; @@ -34,7 +34,7 @@ import java.util.NoSuchElementException; import java.util.concurrent.ThreadLocalRandom; -import static io.druid.segment.IntIteratorUtils.mergeAscending; +import static org.apache.druid.segment.IntIteratorUtils.mergeAscending; import static it.unimi.dsi.fastutil.ints.IntIterators.EMPTY_ITERATOR; import static java.lang.Integer.MAX_VALUE; import static org.junit.Assert.assertFalse; diff --git a/processing/src/test/java/io/druid/segment/MergingRowIteratorTest.java b/processing/src/test/java/org/apache/druid/segment/MergingRowIteratorTest.java similarity index 98% rename from processing/src/test/java/io/druid/segment/MergingRowIteratorTest.java rename to processing/src/test/java/org/apache/druid/segment/MergingRowIteratorTest.java index d591e02e96af..3a471f676dcb 100644 --- a/processing/src/test/java/io/druid/segment/MergingRowIteratorTest.java +++ b/processing/src/test/java/org/apache/druid/segment/MergingRowIteratorTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.collect.Iterators; import com.google.common.collect.UnmodifiableIterator; import com.google.common.primitives.Longs; -import io.druid.segment.selector.settable.SettableLongColumnValueSelector; +import org.apache.druid.segment.selector.settable.SettableLongColumnValueSelector; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/MetadataTest.java b/processing/src/test/java/org/apache/druid/segment/MetadataTest.java similarity index 90% rename from processing/src/test/java/io/druid/segment/MetadataTest.java rename to processing/src/test/java/org/apache/druid/segment/MetadataTest.java index d85edb11b9b1..c763e66b1ed4 100644 --- a/processing/src/test/java/io/druid/segment/MetadataTest.java +++ b/processing/src/test/java/org/apache/druid/segment/MetadataTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.DoubleMaxAggregatorFactory; -import io.druid.query.aggregation.LongMaxAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.DoubleMaxAggregatorFactory; +import org.apache.druid.query.aggregation.LongMaxAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/NoBitmapIndexMergerV9Test.java b/processing/src/test/java/org/apache/druid/segment/NoBitmapIndexMergerV9Test.java similarity index 86% rename from processing/src/test/java/io/druid/segment/NoBitmapIndexMergerV9Test.java rename to processing/src/test/java/org/apache/druid/segment/NoBitmapIndexMergerV9Test.java index 8b2673b8f611..df1be2354402 100644 --- a/processing/src/test/java/io/druid/segment/NoBitmapIndexMergerV9Test.java +++ b/processing/src/test/java/org/apache/druid/segment/NoBitmapIndexMergerV9Test.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.segment.data.CompressionFactory.LongEncodingStrategy; -import io.druid.segment.data.CompressionStrategy; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.segment.data.CompressionFactory.LongEncodingStrategy; +import org.apache.druid.segment.data.CompressionStrategy; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/processing/src/test/java/io/druid/segment/QueryableIndexIndexableAdapterTest.java b/processing/src/test/java/org/apache/druid/segment/QueryableIndexIndexableAdapterTest.java similarity index 83% rename from processing/src/test/java/io/druid/segment/QueryableIndexIndexableAdapterTest.java rename to processing/src/test/java/org/apache/druid/segment/QueryableIndexIndexableAdapterTest.java index b080e3ec7787..f333d39809de 100644 --- a/processing/src/test/java/io/druid/segment/QueryableIndexIndexableAdapterTest.java +++ b/processing/src/test/java/org/apache/druid/segment/QueryableIndexIndexableAdapterTest.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.collect.ImmutableList; -import io.druid.segment.data.BitmapValues; -import io.druid.segment.data.CompressionFactory; -import io.druid.segment.data.CompressionStrategy; -import io.druid.segment.data.ConciseBitmapSerdeFactory; -import io.druid.segment.data.IncrementalIndexTest; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; -import io.druid.segment.writeout.TmpFileSegmentWriteOutMediumFactory; +import org.apache.druid.segment.data.BitmapValues; +import org.apache.druid.segment.data.CompressionFactory; +import org.apache.druid.segment.data.CompressionStrategy; +import org.apache.druid.segment.data.ConciseBitmapSerdeFactory; +import org.apache.druid.segment.data.IncrementalIndexTest; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.segment.writeout.TmpFileSegmentWriteOutMediumFactory; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/ReferenceCountingSegmentTest.java b/processing/src/test/java/org/apache/druid/segment/ReferenceCountingSegmentTest.java similarity index 97% rename from processing/src/test/java/io/druid/segment/ReferenceCountingSegmentTest.java rename to processing/src/test/java/org/apache/druid/segment/ReferenceCountingSegmentTest.java index 78141d6ce25f..dcd3de43c490 100644 --- a/processing/src/test/java/io/druid/segment/ReferenceCountingSegmentTest.java +++ b/processing/src/test/java/org/apache/druid/segment/ReferenceCountingSegmentTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.base.Throwables; -import io.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.DateTimes; import org.joda.time.Days; import org.joda.time.Interval; import org.junit.Assert; diff --git a/processing/src/test/java/io/druid/segment/RoaringBitmapIndexMergerV9Test.java b/processing/src/test/java/org/apache/druid/segment/RoaringBitmapIndexMergerV9Test.java similarity index 83% rename from processing/src/test/java/io/druid/segment/RoaringBitmapIndexMergerV9Test.java rename to processing/src/test/java/org/apache/druid/segment/RoaringBitmapIndexMergerV9Test.java index 504df2d0d36a..5336d089749f 100644 --- a/processing/src/test/java/io/druid/segment/RoaringBitmapIndexMergerV9Test.java +++ b/processing/src/test/java/org/apache/druid/segment/RoaringBitmapIndexMergerV9Test.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; -import io.druid.segment.data.CompressionFactory.LongEncodingStrategy; -import io.druid.segment.data.CompressionStrategy; -import io.druid.segment.data.RoaringBitmapSerdeFactory; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.segment.data.CompressionFactory.LongEncodingStrategy; +import org.apache.druid.segment.data.CompressionStrategy; +import org.apache.druid.segment.data.RoaringBitmapSerdeFactory; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/processing/src/test/java/io/druid/segment/RowIteratorHelper.java b/processing/src/test/java/org/apache/druid/segment/RowIteratorHelper.java similarity index 97% rename from processing/src/test/java/io/druid/segment/RowIteratorHelper.java rename to processing/src/test/java/org/apache/druid/segment/RowIteratorHelper.java index bfe943c1c415..28dc10e6226b 100644 --- a/processing/src/test/java/io/druid/segment/RowIteratorHelper.java +++ b/processing/src/test/java/org/apache/druid/segment/RowIteratorHelper.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import java.util.ArrayList; import java.util.List; diff --git a/processing/src/test/java/io/druid/segment/SchemalessIndexTest.java b/processing/src/test/java/org/apache/druid/segment/SchemalessIndexTest.java similarity index 92% rename from processing/src/test/java/io/druid/segment/SchemalessIndexTest.java rename to processing/src/test/java/org/apache/druid/segment/SchemalessIndexTest.java index 8ab373d45d40..489202623934 100644 --- a/processing/src/test/java/io/druid/segment/SchemalessIndexTest.java +++ b/processing/src/test/java/org/apache/druid/segment/SchemalessIndexTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Function; @@ -25,30 +25,30 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.data.input.MapBasedInputRow; -import io.druid.hll.HyperLogLogHash; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.Comparators; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.DoubleSumAggregatorFactory; -import io.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; -import io.druid.query.aggregation.hyperloglog.HyperUniquesSerde; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexSchema; -import io.druid.segment.incremental.IndexSizeExceededException; -import io.druid.segment.serde.ComplexMetrics; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; -import io.druid.timeline.TimelineObjectHolder; -import io.druid.timeline.VersionedIntervalTimeline; -import io.druid.timeline.partition.NoneShardSpec; -import io.druid.timeline.partition.PartitionChunk; -import io.druid.timeline.partition.ShardSpec; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.hll.HyperLogLogHash; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesSerde; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.segment.incremental.IndexSizeExceededException; +import org.apache.druid.segment.serde.ComplexMetrics; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.timeline.TimelineObjectHolder; +import org.apache.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.timeline.partition.PartitionChunk; +import org.apache.druid.timeline.partition.ShardSpec; import org.joda.time.DateTime; import org.joda.time.Interval; import org.joda.time.chrono.ISOChronology; diff --git a/processing/src/test/java/io/druid/segment/SchemalessTestFullTest.java b/processing/src/test/java/org/apache/druid/segment/SchemalessTestFullTest.java similarity index 96% rename from processing/src/test/java/io/druid/segment/SchemalessTestFullTest.java rename to processing/src/test/java/org/apache/druid/segment/SchemalessTestFullTest.java index 95b1eaf64298..1f9ad939ea05 100644 --- a/processing/src/test/java/io/druid/segment/SchemalessTestFullTest.java +++ b/processing/src/test/java/org/apache/druid/segment/SchemalessTestFullTest.java @@ -17,49 +17,49 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.query.Druids; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.Result; -import io.druid.query.TestQueryRunners; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.DoubleMaxAggregatorFactory; -import io.druid.query.aggregation.DoubleMinAggregatorFactory; -import io.druid.query.aggregation.DoubleSumAggregatorFactory; -import io.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; -import io.druid.query.aggregation.post.ArithmeticPostAggregator; -import io.druid.query.aggregation.post.ConstantPostAggregator; -import io.druid.query.aggregation.post.FieldAccessPostAggregator; -import io.druid.query.search.SearchHit; -import io.druid.query.search.SearchQuery; -import io.druid.query.search.SearchResultValue; -import io.druid.query.spec.MultipleIntervalSegmentSpec; -import io.druid.query.spec.QuerySegmentSpec; -import io.druid.query.timeboundary.TimeBoundaryQuery; -import io.druid.query.timeboundary.TimeBoundaryResultValue; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.timeseries.TimeseriesResultValue; -import io.druid.query.topn.TopNQuery; -import io.druid.query.topn.TopNQueryBuilder; -import io.druid.query.topn.TopNResultValue; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; -import io.druid.segment.writeout.TmpFileSegmentWriteOutMediumFactory; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.query.Druids; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.Result; +import org.apache.druid.query.TestQueryRunners; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleMaxAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleMinAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; +import org.apache.druid.query.aggregation.post.ArithmeticPostAggregator; +import org.apache.druid.query.aggregation.post.ConstantPostAggregator; +import org.apache.druid.query.aggregation.post.FieldAccessPostAggregator; +import org.apache.druid.query.search.SearchHit; +import org.apache.druid.query.search.SearchQuery; +import org.apache.druid.query.search.SearchResultValue; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.query.spec.QuerySegmentSpec; +import org.apache.druid.query.timeboundary.TimeBoundaryQuery; +import org.apache.druid.query.timeboundary.TimeBoundaryResultValue; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.timeseries.TimeseriesResultValue; +import org.apache.druid.query.topn.TopNQuery; +import org.apache.druid.query.topn.TopNQueryBuilder; +import org.apache.druid.query.topn.TopNResultValue; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.segment.writeout.TmpFileSegmentWriteOutMediumFactory; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/processing/src/test/java/io/druid/segment/SchemalessTestSimpleTest.java b/processing/src/test/java/org/apache/druid/segment/SchemalessTestSimpleTest.java similarity index 84% rename from processing/src/test/java/io/druid/segment/SchemalessTestSimpleTest.java rename to processing/src/test/java/org/apache/druid/segment/SchemalessTestSimpleTest.java index e8718a205405..b16157e369ae 100644 --- a/processing/src/test/java/io/druid/segment/SchemalessTestSimpleTest.java +++ b/processing/src/test/java/org/apache/druid/segment/SchemalessTestSimpleTest.java @@ -17,46 +17,46 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import io.druid.collections.CloseableStupidPool; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.query.Druids; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.Result; -import io.druid.query.TestQueryRunners; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.DoubleMaxAggregatorFactory; -import io.druid.query.aggregation.DoubleMinAggregatorFactory; -import io.druid.query.aggregation.DoubleSumAggregatorFactory; -import io.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; -import io.druid.query.aggregation.post.ArithmeticPostAggregator; -import io.druid.query.aggregation.post.ConstantPostAggregator; -import io.druid.query.aggregation.post.FieldAccessPostAggregator; -import io.druid.query.search.SearchHit; -import io.druid.query.search.SearchQuery; -import io.druid.query.search.SearchResultValue; -import io.druid.query.spec.MultipleIntervalSegmentSpec; -import io.druid.query.spec.QuerySegmentSpec; -import io.druid.query.timeboundary.TimeBoundaryQuery; -import io.druid.query.timeboundary.TimeBoundaryResultValue; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.timeseries.TimeseriesResultValue; -import io.druid.query.topn.DimensionAndMetricValueExtractor; -import io.druid.query.topn.TopNQuery; -import io.druid.query.topn.TopNQueryBuilder; -import io.druid.query.topn.TopNResultValue; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.collections.CloseableStupidPool; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.query.Druids; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.Result; +import org.apache.druid.query.TestQueryRunners; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleMaxAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleMinAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; +import org.apache.druid.query.aggregation.post.ArithmeticPostAggregator; +import org.apache.druid.query.aggregation.post.ConstantPostAggregator; +import org.apache.druid.query.aggregation.post.FieldAccessPostAggregator; +import org.apache.druid.query.search.SearchHit; +import org.apache.druid.query.search.SearchQuery; +import org.apache.druid.query.search.SearchResultValue; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.query.spec.QuerySegmentSpec; +import org.apache.druid.query.timeboundary.TimeBoundaryQuery; +import org.apache.druid.query.timeboundary.TimeBoundaryResultValue; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.timeseries.TimeseriesResultValue; +import org.apache.druid.query.topn.DimensionAndMetricValueExtractor; +import org.apache.druid.query.topn.TopNQuery; +import org.apache.druid.query.topn.TopNQueryBuilder; +import org.apache.druid.query.topn.TopNResultValue; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/processing/src/test/java/io/druid/segment/TestDoubleColumnSelector.java b/processing/src/test/java/org/apache/druid/segment/TestDoubleColumnSelector.java similarity index 90% rename from processing/src/test/java/io/druid/segment/TestDoubleColumnSelector.java rename to processing/src/test/java/org/apache/druid/segment/TestDoubleColumnSelector.java index 94a40154ed2f..35d442654fed 100644 --- a/processing/src/test/java/io/druid/segment/TestDoubleColumnSelector.java +++ b/processing/src/test/java/org/apache/druid/segment/TestDoubleColumnSelector.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; public abstract class TestDoubleColumnSelector implements DoubleColumnSelector { diff --git a/processing/src/test/java/io/druid/segment/TestFloatColumnSelector.java b/processing/src/test/java/org/apache/druid/segment/TestFloatColumnSelector.java similarity index 90% rename from processing/src/test/java/io/druid/segment/TestFloatColumnSelector.java rename to processing/src/test/java/org/apache/druid/segment/TestFloatColumnSelector.java index 235836861e31..f32f848ca354 100644 --- a/processing/src/test/java/io/druid/segment/TestFloatColumnSelector.java +++ b/processing/src/test/java/org/apache/druid/segment/TestFloatColumnSelector.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; public abstract class TestFloatColumnSelector implements FloatColumnSelector { diff --git a/processing/src/test/java/io/druid/segment/TestHelper.java b/processing/src/test/java/org/apache/druid/segment/TestHelper.java similarity index 94% rename from processing/src/test/java/io/druid/segment/TestHelper.java rename to processing/src/test/java/org/apache/druid/segment/TestHelper.java index b44c63523f2c..78554660e250 100644 --- a/processing/src/test/java/io/druid/segment/TestHelper.java +++ b/processing/src/test/java/org/apache/druid/segment/TestHelper.java @@ -17,26 +17,26 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.data.input.MapBasedRow; -import io.druid.data.input.Row; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.guava.Sequence; -import io.druid.math.expr.ExprMacroTable; -import io.druid.query.Result; -import io.druid.query.expression.TestExprMacroTable; -import io.druid.query.timeseries.TimeseriesResultValue; -import io.druid.query.topn.TopNResultValue; -import io.druid.segment.column.ColumnConfig; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; -import io.druid.timeline.DataSegment; +import org.apache.druid.data.input.MapBasedRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.query.Result; +import org.apache.druid.query.expression.TestExprMacroTable; +import org.apache.druid.query.timeseries.TimeseriesResultValue; +import org.apache.druid.query.topn.TopNResultValue; +import org.apache.druid.segment.column.ColumnConfig; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.timeline.DataSegment; import org.junit.Assert; import java.util.Iterator; diff --git a/processing/src/test/java/io/druid/segment/TestIndex.java b/processing/src/test/java/org/apache/druid/segment/TestIndex.java similarity index 85% rename from processing/src/test/java/io/druid/segment/TestIndex.java rename to processing/src/test/java/org/apache/druid/segment/TestIndex.java index 5e1883ccf3b7..201354a430b4 100644 --- a/processing/src/test/java/io/druid/segment/TestIndex.java +++ b/processing/src/test/java/org/apache/druid/segment/TestIndex.java @@ -17,41 +17,41 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; import com.google.common.base.Throwables; import com.google.common.io.CharSource; import com.google.common.io.LineProcessor; import com.google.common.io.Resources; -import io.druid.data.input.impl.DelimitedParseSpec; -import io.druid.data.input.impl.DimensionSchema; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.DoubleDimensionSchema; -import io.druid.data.input.impl.FloatDimensionSchema; -import io.druid.data.input.impl.LongDimensionSchema; -import io.druid.data.input.impl.StringDimensionSchema; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.hll.HyperLogLogHash; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.DoubleMaxAggregatorFactory; -import io.druid.query.aggregation.DoubleMinAggregatorFactory; -import io.druid.query.aggregation.DoubleSumAggregatorFactory; -import io.druid.query.aggregation.FloatMaxAggregatorFactory; -import io.druid.query.aggregation.FloatMinAggregatorFactory; -import io.druid.query.aggregation.FloatSumAggregatorFactory; -import io.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; -import io.druid.query.aggregation.hyperloglog.HyperUniquesSerde; -import io.druid.query.expression.TestExprMacroTable; -import io.druid.segment.column.ValueType; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexSchema; -import io.druid.segment.serde.ComplexMetrics; -import io.druid.segment.virtual.ExpressionVirtualColumn; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; +import org.apache.druid.data.input.impl.DelimitedParseSpec; +import org.apache.druid.data.input.impl.DimensionSchema; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.DoubleDimensionSchema; +import org.apache.druid.data.input.impl.FloatDimensionSchema; +import org.apache.druid.data.input.impl.LongDimensionSchema; +import org.apache.druid.data.input.impl.StringDimensionSchema; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.hll.HyperLogLogHash; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.DoubleMaxAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleMinAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; +import org.apache.druid.query.aggregation.FloatMaxAggregatorFactory; +import org.apache.druid.query.aggregation.FloatMinAggregatorFactory; +import org.apache.druid.query.aggregation.FloatSumAggregatorFactory; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesSerde; +import org.apache.druid.query.expression.TestExprMacroTable; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.segment.serde.ComplexMetrics; +import org.apache.druid.segment.virtual.ExpressionVirtualColumn; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; import org.joda.time.Interval; import java.io.File; diff --git a/processing/src/test/java/io/druid/segment/TestLongColumnSelector.java b/processing/src/test/java/org/apache/druid/segment/TestLongColumnSelector.java similarity index 90% rename from processing/src/test/java/io/druid/segment/TestLongColumnSelector.java rename to processing/src/test/java/org/apache/druid/segment/TestLongColumnSelector.java index 5df0f9e40d2c..5b56226770c4 100644 --- a/processing/src/test/java/io/druid/segment/TestLongColumnSelector.java +++ b/processing/src/test/java/org/apache/druid/segment/TestLongColumnSelector.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; public abstract class TestLongColumnSelector implements LongColumnSelector { diff --git a/processing/src/test/java/io/druid/segment/TestObjectColumnSelector.java b/processing/src/test/java/org/apache/druid/segment/TestObjectColumnSelector.java similarity index 90% rename from processing/src/test/java/io/druid/segment/TestObjectColumnSelector.java rename to processing/src/test/java/org/apache/druid/segment/TestObjectColumnSelector.java index 797f696564da..cfc51ac24a3a 100644 --- a/processing/src/test/java/io/druid/segment/TestObjectColumnSelector.java +++ b/processing/src/test/java/org/apache/druid/segment/TestObjectColumnSelector.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment; +package org.apache.druid.segment; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; public abstract class TestObjectColumnSelector extends ObjectColumnSelector { diff --git a/processing/src/test/java/io/druid/segment/data/BenchmarkIndexibleWrites.java b/processing/src/test/java/org/apache/druid/segment/data/BenchmarkIndexibleWrites.java similarity index 99% rename from processing/src/test/java/io/druid/segment/data/BenchmarkIndexibleWrites.java rename to processing/src/test/java/org/apache/druid/segment/data/BenchmarkIndexibleWrites.java index 4a7d006249ed..50c0c1089320 100644 --- a/processing/src/test/java/io/druid/segment/data/BenchmarkIndexibleWrites.java +++ b/processing/src/test/java/org/apache/druid/segment/data/BenchmarkIndexibleWrites.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.carrotsearch.junitbenchmarks.AbstractBenchmark; import com.carrotsearch.junitbenchmarks.BenchmarkOptions; @@ -29,7 +29,7 @@ import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/data/BitmapCreationBenchmark.java b/processing/src/test/java/org/apache/druid/segment/data/BitmapCreationBenchmark.java similarity index 94% rename from processing/src/test/java/io/druid/segment/data/BitmapCreationBenchmark.java rename to processing/src/test/java/org/apache/druid/segment/data/BitmapCreationBenchmark.java index 0ef56fdbec74..777576043252 100644 --- a/processing/src/test/java/io/druid/segment/data/BitmapCreationBenchmark.java +++ b/processing/src/test/java/org/apache/druid/segment/data/BitmapCreationBenchmark.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.carrotsearch.junitbenchmarks.AbstractBenchmark; import com.carrotsearch.junitbenchmarks.BenchmarkOptions; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.collections.bitmap.MutableBitmap; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.collections.bitmap.MutableBitmap; +import org.apache.druid.java.util.common.logger.Logger; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; diff --git a/processing/src/test/java/io/druid/segment/data/BitmapSerdeFactoryTest.java b/processing/src/test/java/org/apache/druid/segment/data/BitmapSerdeFactoryTest.java similarity index 97% rename from processing/src/test/java/io/druid/segment/data/BitmapSerdeFactoryTest.java rename to processing/src/test/java/org/apache/druid/segment/data/BitmapSerdeFactoryTest.java index 2fb89fac5e40..10df2506456c 100644 --- a/processing/src/test/java/io/druid/segment/data/BitmapSerdeFactoryTest.java +++ b/processing/src/test/java/org/apache/druid/segment/data/BitmapSerdeFactoryTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/data/CompressedColumnarIntsSerializerTest.java b/processing/src/test/java/org/apache/druid/segment/data/CompressedColumnarIntsSerializerTest.java similarity index 92% rename from processing/src/test/java/io/druid/segment/data/CompressedColumnarIntsSerializerTest.java rename to processing/src/test/java/org/apache/druid/segment/data/CompressedColumnarIntsSerializerTest.java index c990305ba4d9..9920907abcdd 100644 --- a/processing/src/test/java/io/druid/segment/data/CompressedColumnarIntsSerializerTest.java +++ b/processing/src/test/java/org/apache/druid/segment/data/CompressedColumnarIntsSerializerTest.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.guava.CloseQuietly; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.java.util.common.io.smoosh.Smoosh; -import io.druid.java.util.common.io.smoosh.SmooshedFileMapper; -import io.druid.java.util.common.io.smoosh.SmooshedWriter; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMedium; -import io.druid.segment.writeout.SegmentWriteOutMedium; -import io.druid.segment.writeout.WriteOutBytes; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.guava.CloseQuietly; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.java.util.common.io.smoosh.Smoosh; +import org.apache.druid.java.util.common.io.smoosh.SmooshedFileMapper; +import org.apache.druid.java.util.common.io.smoosh.SmooshedWriter; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMedium; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.segment.writeout.WriteOutBytes; import it.unimi.dsi.fastutil.ints.IntArrayList; import org.apache.commons.io.IOUtils; import org.junit.After; diff --git a/processing/src/test/java/io/druid/segment/data/CompressedColumnarIntsSupplierTest.java b/processing/src/test/java/org/apache/druid/segment/data/CompressedColumnarIntsSupplierTest.java similarity index 97% rename from processing/src/test/java/io/druid/segment/data/CompressedColumnarIntsSupplierTest.java rename to processing/src/test/java/org/apache/druid/segment/data/CompressedColumnarIntsSupplierTest.java index 78fb129541e7..63d3bd31795c 100644 --- a/processing/src/test/java/io/druid/segment/data/CompressedColumnarIntsSupplierTest.java +++ b/processing/src/test/java/org/apache/druid/segment/data/CompressedColumnarIntsSupplierTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.primitives.Longs; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.guava.CloseQuietly; -import io.druid.java.util.common.io.Closer; -import io.druid.segment.CompressedPools; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.guava.CloseQuietly; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.segment.CompressedPools; import it.unimi.dsi.fastutil.ints.IntArrays; import org.junit.After; import org.junit.Assert; diff --git a/processing/src/test/java/io/druid/segment/data/CompressedFloatsSerdeTest.java b/processing/src/test/java/org/apache/druid/segment/data/CompressedFloatsSerdeTest.java similarity index 97% rename from processing/src/test/java/io/druid/segment/data/CompressedFloatsSerdeTest.java rename to processing/src/test/java/org/apache/druid/segment/data/CompressedFloatsSerdeTest.java index ecc718d5d456..ef82fcc6d38d 100644 --- a/processing/src/test/java/io/druid/segment/data/CompressedFloatsSerdeTest.java +++ b/processing/src/test/java/org/apache/druid/segment/data/CompressedFloatsSerdeTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.base.Supplier; import com.google.common.primitives.Floats; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.guava.CloseQuietly; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMedium; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.guava.CloseQuietly; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMedium; import it.unimi.dsi.fastutil.ints.IntArrays; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/data/CompressedLongsAutoEncodingSerdeTest.java b/processing/src/test/java/org/apache/druid/segment/data/CompressedLongsAutoEncodingSerdeTest.java similarity index 96% rename from processing/src/test/java/io/druid/segment/data/CompressedLongsAutoEncodingSerdeTest.java rename to processing/src/test/java/org/apache/druid/segment/data/CompressedLongsAutoEncodingSerdeTest.java index a969b34bc098..8fe0bf8ac3ad 100644 --- a/processing/src/test/java/io/druid/segment/data/CompressedLongsAutoEncodingSerdeTest.java +++ b/processing/src/test/java/org/apache/druid/segment/data/CompressedLongsAutoEncodingSerdeTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.java.util.common.StringUtils; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMedium; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMedium; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/processing/src/test/java/io/druid/segment/data/CompressedLongsSerdeTest.java b/processing/src/test/java/org/apache/druid/segment/data/CompressedLongsSerdeTest.java similarity index 97% rename from processing/src/test/java/io/druid/segment/data/CompressedLongsSerdeTest.java rename to processing/src/test/java/org/apache/druid/segment/data/CompressedLongsSerdeTest.java index ca8d3f508a65..6ba5b7ebb298 100644 --- a/processing/src/test/java/io/druid/segment/data/CompressedLongsSerdeTest.java +++ b/processing/src/test/java/org/apache/druid/segment/data/CompressedLongsSerdeTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.base.Supplier; import com.google.common.primitives.Longs; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.guava.CloseQuietly; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMedium; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.guava.CloseQuietly; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMedium; import it.unimi.dsi.fastutil.ints.IntArrays; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/data/CompressedVSizeColumnarIntsSerializerTest.java b/processing/src/test/java/org/apache/druid/segment/data/CompressedVSizeColumnarIntsSerializerTest.java similarity index 92% rename from processing/src/test/java/io/druid/segment/data/CompressedVSizeColumnarIntsSerializerTest.java rename to processing/src/test/java/org/apache/druid/segment/data/CompressedVSizeColumnarIntsSerializerTest.java index 5aa011dc636d..b89ae961bb60 100644 --- a/processing/src/test/java/io/druid/segment/data/CompressedVSizeColumnarIntsSerializerTest.java +++ b/processing/src/test/java/org/apache/druid/segment/data/CompressedVSizeColumnarIntsSerializerTest.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import com.google.common.primitives.Ints; -import io.druid.java.util.common.guava.CloseQuietly; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.java.util.common.io.smoosh.Smoosh; -import io.druid.java.util.common.io.smoosh.SmooshedFileMapper; -import io.druid.java.util.common.io.smoosh.SmooshedWriter; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMedium; -import io.druid.segment.writeout.SegmentWriteOutMedium; -import io.druid.segment.writeout.WriteOutBytes; +import org.apache.druid.java.util.common.guava.CloseQuietly; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.java.util.common.io.smoosh.Smoosh; +import org.apache.druid.java.util.common.io.smoosh.SmooshedFileMapper; +import org.apache.druid.java.util.common.io.smoosh.SmooshedWriter; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMedium; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.segment.writeout.WriteOutBytes; import it.unimi.dsi.fastutil.ints.IntArrayList; import org.apache.commons.io.IOUtils; import org.junit.After; diff --git a/processing/src/test/java/io/druid/segment/data/CompressedVSizeColumnarIntsSupplierTest.java b/processing/src/test/java/org/apache/druid/segment/data/CompressedVSizeColumnarIntsSupplierTest.java similarity index 97% rename from processing/src/test/java/io/druid/segment/data/CompressedVSizeColumnarIntsSupplierTest.java rename to processing/src/test/java/org/apache/druid/segment/data/CompressedVSizeColumnarIntsSupplierTest.java index de140ab0b202..38ae7ff981e1 100644 --- a/processing/src/test/java/io/druid/segment/data/CompressedVSizeColumnarIntsSupplierTest.java +++ b/processing/src/test/java/org/apache/druid/segment/data/CompressedVSizeColumnarIntsSupplierTest.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import com.google.common.primitives.Ints; import com.google.common.primitives.Longs; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.guava.CloseQuietly; -import io.druid.java.util.common.io.Closer; -import io.druid.segment.CompressedPools; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.guava.CloseQuietly; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.segment.CompressedPools; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntArrays; import org.junit.After; diff --git a/processing/src/test/java/io/druid/segment/data/CompressedVSizeColumnarMultiIntsSupplierTest.java b/processing/src/test/java/org/apache/druid/segment/data/CompressedVSizeColumnarMultiIntsSupplierTest.java similarity index 97% rename from processing/src/test/java/io/druid/segment/data/CompressedVSizeColumnarMultiIntsSupplierTest.java rename to processing/src/test/java/org/apache/druid/segment/data/CompressedVSizeColumnarMultiIntsSupplierTest.java index 54430d154bce..7fcb9c3262ae 100644 --- a/processing/src/test/java/io/druid/segment/data/CompressedVSizeColumnarMultiIntsSupplierTest.java +++ b/processing/src/test/java/org/apache/druid/segment/data/CompressedVSizeColumnarMultiIntsSupplierTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.collect.Iterables; -import io.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.io.Closer; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/processing/src/test/java/io/druid/segment/data/CompressionStrategyTest.java b/processing/src/test/java/org/apache/druid/segment/data/CompressionStrategyTest.java similarity index 98% rename from processing/src/test/java/io/druid/segment/data/CompressionStrategyTest.java rename to processing/src/test/java/org/apache/druid/segment/data/CompressionStrategyTest.java index 0bac03974bf1..1397db6ea50c 100644 --- a/processing/src/test/java/io/druid/segment/data/CompressionStrategyTest.java +++ b/processing/src/test/java/org/apache/druid/segment/data/CompressionStrategyTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.base.Function; import com.google.common.collect.Iterables; -import io.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.io.Closer; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/processing/src/test/java/io/druid/segment/data/GenericIndexedStringWriterTest.java b/processing/src/test/java/org/apache/druid/segment/data/GenericIndexedStringWriterTest.java similarity index 94% rename from processing/src/test/java/io/druid/segment/data/GenericIndexedStringWriterTest.java rename to processing/src/test/java/org/apache/druid/segment/data/GenericIndexedStringWriterTest.java index f5f3a97cc0a9..16961e2d5375 100644 --- a/processing/src/test/java/io/druid/segment/data/GenericIndexedStringWriterTest.java +++ b/processing/src/test/java/org/apache/druid/segment/data/GenericIndexedStringWriterTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; -import io.druid.segment.writeout.OnHeapMemorySegmentWriteOutMedium; +import org.apache.druid.segment.writeout.OnHeapMemorySegmentWriteOutMedium; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/data/GenericIndexedTest.java b/processing/src/test/java/org/apache/druid/segment/data/GenericIndexedTest.java similarity index 99% rename from processing/src/test/java/io/druid/segment/data/GenericIndexedTest.java rename to processing/src/test/java/org/apache/druid/segment/data/GenericIndexedTest.java index 179855424f97..14690e7471b2 100644 --- a/processing/src/test/java/io/druid/segment/data/GenericIndexedTest.java +++ b/processing/src/test/java/org/apache/druid/segment/data/GenericIndexedTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.collect.Maps; import org.junit.Assert; diff --git a/processing/src/test/java/io/druid/segment/data/IncrementalIndexTest.java b/processing/src/test/java/org/apache/druid/segment/data/IncrementalIndexTest.java similarity index 92% rename from processing/src/test/java/io/druid/segment/data/IncrementalIndexTest.java rename to processing/src/test/java/org/apache/druid/segment/data/IncrementalIndexTest.java index 34bd1ceab812..0aaffb972e2e 100644 --- a/processing/src/test/java/io/druid/segment/data/IncrementalIndexTest.java +++ b/processing/src/test/java/org/apache/druid/segment/data/IncrementalIndexTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; @@ -29,44 +29,44 @@ import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import io.druid.collections.CloseableStupidPool; -import io.druid.data.input.MapBasedInputRow; -import io.druid.data.input.Row; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.Accumulator; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.io.Closer; -import io.druid.query.Druids; -import io.druid.query.FinalizeResultsQueryRunner; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.Result; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.DoubleSumAggregatorFactory; -import io.druid.query.aggregation.FilteredAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.filter.BoundDimFilter; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.query.ordering.StringComparators; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.timeseries.TimeseriesQueryEngine; -import io.druid.query.timeseries.TimeseriesQueryQueryToolChest; -import io.druid.query.timeseries.TimeseriesQueryRunnerFactory; -import io.druid.query.timeseries.TimeseriesResultValue; -import io.druid.segment.CloserRule; -import io.druid.segment.IncrementalIndexSegment; -import io.druid.segment.Segment; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndex.Builder; -import io.druid.segment.incremental.IncrementalIndexSchema; -import io.druid.segment.incremental.IndexSizeExceededException; +import org.apache.druid.collections.CloseableStupidPool; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.Accumulator; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.query.Druids; +import org.apache.druid.query.FinalizeResultsQueryRunner; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; +import org.apache.druid.query.aggregation.FilteredAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.filter.BoundDimFilter; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.timeseries.TimeseriesQueryEngine; +import org.apache.druid.query.timeseries.TimeseriesQueryQueryToolChest; +import org.apache.druid.query.timeseries.TimeseriesQueryRunnerFactory; +import org.apache.druid.query.timeseries.TimeseriesResultValue; +import org.apache.druid.segment.CloserRule; +import org.apache.druid.segment.IncrementalIndexSegment; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndex.Builder; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.segment.incremental.IndexSizeExceededException; import org.joda.time.Interval; import org.junit.AfterClass; import org.junit.Assert; diff --git a/processing/src/test/java/io/druid/segment/data/IndexedIntsTest.java b/processing/src/test/java/org/apache/druid/segment/data/IndexedIntsTest.java similarity index 97% rename from processing/src/test/java/io/druid/segment/data/IndexedIntsTest.java rename to processing/src/test/java/org/apache/druid/segment/data/IndexedIntsTest.java index a60111cb23a1..c0c978382af3 100644 --- a/processing/src/test/java/io/druid/segment/data/IndexedIntsTest.java +++ b/processing/src/test/java/org/apache/druid/segment/data/IndexedIntsTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/data/V3CompressedVSizeColumnarMultiIntsSerializerTest.java b/processing/src/test/java/org/apache/druid/segment/data/V3CompressedVSizeColumnarMultiIntsSerializerTest.java similarity index 94% rename from processing/src/test/java/io/druid/segment/data/V3CompressedVSizeColumnarMultiIntsSerializerTest.java rename to processing/src/test/java/org/apache/druid/segment/data/V3CompressedVSizeColumnarMultiIntsSerializerTest.java index 2775567d7506..8234131243f8 100644 --- a/processing/src/test/java/io/druid/segment/data/V3CompressedVSizeColumnarMultiIntsSerializerTest.java +++ b/processing/src/test/java/org/apache/druid/segment/data/V3CompressedVSizeColumnarMultiIntsSerializerTest.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.common.collect.Ordering; import com.google.common.collect.Sets; import com.google.common.primitives.Ints; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.guava.CloseQuietly; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.java.util.common.io.smoosh.Smoosh; -import io.druid.java.util.common.io.smoosh.SmooshedFileMapper; -import io.druid.java.util.common.io.smoosh.SmooshedWriter; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMedium; -import io.druid.segment.writeout.SegmentWriteOutMedium; -import io.druid.segment.writeout.WriteOutBytes; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.guava.CloseQuietly; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.java.util.common.io.smoosh.Smoosh; +import org.apache.druid.java.util.common.io.smoosh.SmooshedFileMapper; +import org.apache.druid.java.util.common.io.smoosh.SmooshedWriter; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMedium; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.segment.writeout.WriteOutBytes; import org.apache.commons.io.IOUtils; import org.junit.Before; import org.junit.Rule; diff --git a/processing/src/test/java/io/druid/segment/data/V3CompressedVSizeColumnarMultiIntsSupplierTest.java b/processing/src/test/java/org/apache/druid/segment/data/V3CompressedVSizeColumnarMultiIntsSupplierTest.java similarity index 95% rename from processing/src/test/java/io/druid/segment/data/V3CompressedVSizeColumnarMultiIntsSupplierTest.java rename to processing/src/test/java/org/apache/druid/segment/data/V3CompressedVSizeColumnarMultiIntsSupplierTest.java index 62b2eeb7093b..3c8e4fc0e7d3 100644 --- a/processing/src/test/java/io/druid/segment/data/V3CompressedVSizeColumnarMultiIntsSupplierTest.java +++ b/processing/src/test/java/org/apache/druid/segment/data/V3CompressedVSizeColumnarMultiIntsSupplierTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.base.Function; import com.google.common.collect.Iterables; -import io.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.io.Closer; import org.junit.After; import org.junit.Before; diff --git a/processing/src/test/java/io/druid/segment/data/VSizeColumnarIntsSerializerTest.java b/processing/src/test/java/org/apache/druid/segment/data/VSizeColumnarIntsSerializerTest.java similarity index 92% rename from processing/src/test/java/io/druid/segment/data/VSizeColumnarIntsSerializerTest.java rename to processing/src/test/java/org/apache/druid/segment/data/VSizeColumnarIntsSerializerTest.java index ee2b5d7068c7..8456448ca698 100644 --- a/processing/src/test/java/io/druid/segment/data/VSizeColumnarIntsSerializerTest.java +++ b/processing/src/test/java/org/apache/druid/segment/data/VSizeColumnarIntsSerializerTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.primitives.Ints; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMedium; -import io.druid.segment.writeout.SegmentWriteOutMedium; -import io.druid.segment.writeout.WriteOutBytes; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMedium; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.segment.writeout.WriteOutBytes; import org.apache.commons.io.IOUtils; import org.junit.After; import org.junit.Before; diff --git a/processing/src/test/java/io/druid/segment/data/VSizeColumnarIntsTest.java b/processing/src/test/java/org/apache/druid/segment/data/VSizeColumnarIntsTest.java similarity index 98% rename from processing/src/test/java/io/druid/segment/data/VSizeColumnarIntsTest.java rename to processing/src/test/java/org/apache/druid/segment/data/VSizeColumnarIntsTest.java index 61d27db666e4..95833ee1ba10 100644 --- a/processing/src/test/java/io/druid/segment/data/VSizeColumnarIntsTest.java +++ b/processing/src/test/java/org/apache/druid/segment/data/VSizeColumnarIntsTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/data/VSizeColumnarMultiIntsTest.java b/processing/src/test/java/org/apache/druid/segment/data/VSizeColumnarMultiIntsTest.java similarity index 98% rename from processing/src/test/java/io/druid/segment/data/VSizeColumnarMultiIntsTest.java rename to processing/src/test/java/org/apache/druid/segment/data/VSizeColumnarMultiIntsTest.java index 38374cc0761b..74bcb42413cc 100644 --- a/processing/src/test/java/io/druid/segment/data/VSizeColumnarMultiIntsTest.java +++ b/processing/src/test/java/org/apache/druid/segment/data/VSizeColumnarMultiIntsTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import com.google.common.base.Function; import com.google.common.collect.Iterables; diff --git a/processing/src/test/java/io/druid/segment/data/VSizeLongSerdeTest.java b/processing/src/test/java/org/apache/druid/segment/data/VSizeLongSerdeTest.java similarity index 99% rename from processing/src/test/java/io/druid/segment/data/VSizeLongSerdeTest.java rename to processing/src/test/java/org/apache/druid/segment/data/VSizeLongSerdeTest.java index 162e1493b85e..569172dc070d 100644 --- a/processing/src/test/java/io/druid/segment/data/VSizeLongSerdeTest.java +++ b/processing/src/test/java/org/apache/druid/segment/data/VSizeLongSerdeTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.data; +package org.apache.druid.segment.data; import org.junit.Assert; diff --git a/processing/src/test/java/io/druid/segment/filter/AndFilterTest.java b/processing/src/test/java/org/apache/druid/segment/filter/AndFilterTest.java similarity index 88% rename from processing/src/test/java/io/druid/segment/filter/AndFilterTest.java rename to processing/src/test/java/org/apache/druid/segment/filter/AndFilterTest.java index 4f781f4bbe6d..c469c31356e2 100644 --- a/processing/src/test/java/io/druid/segment/filter/AndFilterTest.java +++ b/processing/src/test/java/org/apache/druid/segment/filter/AndFilterTest.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.MapInputRowParser; -import io.druid.data.input.impl.TimeAndDimsParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Pair; -import io.druid.query.filter.AndDimFilter; -import io.druid.query.filter.NotDimFilter; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.segment.IndexBuilder; -import io.druid.segment.StorageAdapter; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.MapInputRowParser; +import org.apache.druid.data.input.impl.TimeAndDimsParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.query.filter.AndDimFilter; +import org.apache.druid.query.filter.NotDimFilter; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.segment.IndexBuilder; +import org.apache.druid.segment.StorageAdapter; import org.junit.AfterClass; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/processing/src/test/java/io/druid/segment/filter/BaseFilterTest.java b/processing/src/test/java/org/apache/druid/segment/filter/BaseFilterTest.java similarity index 86% rename from processing/src/test/java/io/druid/segment/filter/BaseFilterTest.java rename to processing/src/test/java/org/apache/druid/segment/filter/BaseFilterTest.java index d5d281421847..9f1bac8f21c2 100644 --- a/processing/src/test/java/io/druid/segment/filter/BaseFilterTest.java +++ b/processing/src/test/java/org/apache/druid/segment/filter/BaseFilterTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.base.Function; import com.google.common.base.Preconditions; @@ -26,46 +26,46 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.common.guava.SettableSupplier; -import io.druid.data.input.InputRow; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.query.BitmapResultFactory; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.FilteredAggregatorFactory; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.expression.TestExprMacroTable; -import io.druid.query.filter.BitmapIndexSelector; -import io.druid.query.filter.DimFilter; -import io.druid.query.filter.Filter; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.groupby.RowBasedColumnSelectorFactory; -import io.druid.segment.ColumnSelector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.Cursor; -import io.druid.segment.DimensionSelector; -import io.druid.segment.IndexBuilder; -import io.druid.segment.IndexSpec; -import io.druid.segment.QueryableIndex; -import io.druid.segment.QueryableIndexStorageAdapter; -import io.druid.segment.StorageAdapter; -import io.druid.segment.VirtualColumns; -import io.druid.segment.column.ValueType; -import io.druid.segment.data.BitmapSerdeFactory; -import io.druid.segment.data.ConciseBitmapSerdeFactory; -import io.druid.segment.data.IndexedInts; -import io.druid.segment.data.RoaringBitmapSerdeFactory; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexStorageAdapter; -import io.druid.segment.virtual.ExpressionVirtualColumn; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; -import io.druid.segment.writeout.TmpFileSegmentWriteOutMediumFactory; +import org.apache.druid.common.guava.SettableSupplier; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.query.BitmapResultFactory; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.FilteredAggregatorFactory; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.expression.TestExprMacroTable; +import org.apache.druid.query.filter.BitmapIndexSelector; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.groupby.RowBasedColumnSelectorFactory; +import org.apache.druid.segment.ColumnSelector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.Cursor; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.IndexBuilder; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.QueryableIndexStorageAdapter; +import org.apache.druid.segment.StorageAdapter; +import org.apache.druid.segment.VirtualColumns; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.data.BitmapSerdeFactory; +import org.apache.druid.segment.data.ConciseBitmapSerdeFactory; +import org.apache.druid.segment.data.IndexedInts; +import org.apache.druid.segment.data.RoaringBitmapSerdeFactory; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexStorageAdapter; +import org.apache.druid.segment.virtual.ExpressionVirtualColumn; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.segment.writeout.TmpFileSegmentWriteOutMediumFactory; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; diff --git a/processing/src/test/java/io/druid/segment/filter/BoundFilterTest.java b/processing/src/test/java/org/apache/druid/segment/filter/BoundFilterTest.java similarity index 95% rename from processing/src/test/java/io/druid/segment/filter/BoundFilterTest.java rename to processing/src/test/java/org/apache/druid/segment/filter/BoundFilterTest.java index 2406588cfd43..6e0a3cf050c0 100644 --- a/processing/src/test/java/io/druid/segment/filter/BoundFilterTest.java +++ b/processing/src/test/java/org/apache/druid/segment/filter/BoundFilterTest.java @@ -17,27 +17,27 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.common.config.NullHandling; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.MapInputRowParser; -import io.druid.data.input.impl.TimeAndDimsParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Pair; -import io.druid.js.JavaScriptConfig; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.extraction.JavaScriptExtractionFn; -import io.druid.query.filter.BoundDimFilter; -import io.druid.query.ordering.StringComparators; -import io.druid.segment.IndexBuilder; -import io.druid.segment.StorageAdapter; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.MapInputRowParser; +import org.apache.druid.data.input.impl.TimeAndDimsParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.js.JavaScriptConfig; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.extraction.JavaScriptExtractionFn; +import org.apache.druid.query.filter.BoundDimFilter; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.segment.IndexBuilder; +import org.apache.druid.segment.StorageAdapter; import org.junit.AfterClass; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/processing/src/test/java/io/druid/segment/filter/ColumnComparisonFilterTest.java b/processing/src/test/java/org/apache/druid/segment/filter/ColumnComparisonFilterTest.java similarity index 85% rename from processing/src/test/java/io/druid/segment/filter/ColumnComparisonFilterTest.java rename to processing/src/test/java/org/apache/druid/segment/filter/ColumnComparisonFilterTest.java index 6e7352700beb..a57d36f731eb 100644 --- a/processing/src/test/java/io/druid/segment/filter/ColumnComparisonFilterTest.java +++ b/processing/src/test/java/org/apache/druid/segment/filter/ColumnComparisonFilterTest.java @@ -17,28 +17,28 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.common.config.NullHandling; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.MapInputRowParser; -import io.druid.data.input.impl.TimeAndDimsParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Pair; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.dimension.ExtractionDimensionSpec; -import io.druid.query.extraction.MapLookupExtractor; -import io.druid.query.filter.ColumnComparisonDimFilter; -import io.druid.query.lookup.LookupExtractionFn; -import io.druid.query.lookup.LookupExtractor; -import io.druid.segment.IndexBuilder; -import io.druid.segment.StorageAdapter; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.MapInputRowParser; +import org.apache.druid.data.input.impl.TimeAndDimsParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.ExtractionDimensionSpec; +import org.apache.druid.query.extraction.MapLookupExtractor; +import org.apache.druid.query.filter.ColumnComparisonDimFilter; +import org.apache.druid.query.lookup.LookupExtractionFn; +import org.apache.druid.query.lookup.LookupExtractor; +import org.apache.druid.segment.IndexBuilder; +import org.apache.druid.segment.StorageAdapter; import org.junit.AfterClass; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/processing/src/test/java/io/druid/segment/filter/ExpressionFilterTest.java b/processing/src/test/java/org/apache/druid/segment/filter/ExpressionFilterTest.java similarity index 91% rename from processing/src/test/java/io/druid/segment/filter/ExpressionFilterTest.java rename to processing/src/test/java/org/apache/druid/segment/filter/ExpressionFilterTest.java index a9730d8dc11b..6759fd0b17f7 100644 --- a/processing/src/test/java/io/druid/segment/filter/ExpressionFilterTest.java +++ b/processing/src/test/java/org/apache/druid/segment/filter/ExpressionFilterTest.java @@ -17,29 +17,29 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.common.config.NullHandling; +import org.apache.druid.common.config.NullHandling; import com.google.common.collect.Sets; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.FloatDimensionSchema; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.LongDimensionSchema; -import io.druid.data.input.impl.MapInputRowParser; -import io.druid.data.input.impl.StringDimensionSchema; -import io.druid.data.input.impl.TimeAndDimsParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Pair; -import io.druid.query.expression.TestExprMacroTable; -import io.druid.query.filter.ExpressionDimFilter; -import io.druid.segment.IndexBuilder; -import io.druid.segment.StorageAdapter; -import io.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.FloatDimensionSchema; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.LongDimensionSchema; +import org.apache.druid.data.input.impl.MapInputRowParser; +import org.apache.druid.data.input.impl.StringDimensionSchema; +import org.apache.druid.data.input.impl.TimeAndDimsParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.query.expression.TestExprMacroTable; +import org.apache.druid.query.filter.ExpressionDimFilter; +import org.apache.druid.segment.IndexBuilder; +import org.apache.druid.segment.StorageAdapter; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/filter/ExtractionDimFilterTest.java b/processing/src/test/java/org/apache/druid/segment/filter/ExtractionDimFilterTest.java similarity index 85% rename from processing/src/test/java/io/druid/segment/filter/ExtractionDimFilterTest.java rename to processing/src/test/java/org/apache/druid/segment/filter/ExtractionDimFilterTest.java index efdc04928299..6a89e4cdeec5 100644 --- a/processing/src/test/java/io/druid/segment/filter/ExtractionDimFilterTest.java +++ b/processing/src/test/java/org/apache/druid/segment/filter/ExtractionDimFilterTest.java @@ -17,31 +17,31 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.ConciseBitmapFactory; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.collections.bitmap.MutableBitmap; -import io.druid.collections.bitmap.RoaringBitmapFactory; -import io.druid.collections.spatial.ImmutableRTree; -import io.druid.query.extraction.DimExtractionFn; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.filter.BitmapIndexSelector; -import io.druid.query.filter.DimFilters; -import io.druid.query.filter.ExtractionDimFilter; -import io.druid.query.filter.Filter; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.segment.column.BitmapIndex; -import io.druid.segment.data.ArrayIndexed; -import io.druid.segment.data.BitmapSerdeFactory; -import io.druid.segment.data.ConciseBitmapSerdeFactory; -import io.druid.segment.data.GenericIndexed; -import io.druid.segment.data.Indexed; -import io.druid.segment.data.RoaringBitmapSerdeFactory; -import io.druid.segment.serde.BitmapIndexColumnPartSupplier; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.ConciseBitmapFactory; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.collections.bitmap.MutableBitmap; +import org.apache.druid.collections.bitmap.RoaringBitmapFactory; +import org.apache.druid.collections.spatial.ImmutableRTree; +import org.apache.druid.query.extraction.DimExtractionFn; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.filter.BitmapIndexSelector; +import org.apache.druid.query.filter.DimFilters; +import org.apache.druid.query.filter.ExtractionDimFilter; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.segment.column.BitmapIndex; +import org.apache.druid.segment.data.ArrayIndexed; +import org.apache.druid.segment.data.BitmapSerdeFactory; +import org.apache.druid.segment.data.ConciseBitmapSerdeFactory; +import org.apache.druid.segment.data.GenericIndexed; +import org.apache.druid.segment.data.Indexed; +import org.apache.druid.segment.data.RoaringBitmapSerdeFactory; +import org.apache.druid.segment.serde.BitmapIndexColumnPartSupplier; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/processing/src/test/java/io/druid/segment/filter/FilterPartitionTest.java b/processing/src/test/java/org/apache/druid/segment/filter/FilterPartitionTest.java similarity index 95% rename from processing/src/test/java/io/druid/segment/filter/FilterPartitionTest.java rename to processing/src/test/java/org/apache/druid/segment/filter/FilterPartitionTest.java index 262897189617..acd7498eb5d2 100644 --- a/processing/src/test/java/io/druid/segment/filter/FilterPartitionTest.java +++ b/processing/src/test/java/org/apache/druid/segment/filter/FilterPartitionTest.java @@ -17,36 +17,36 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.common.config.NullHandling; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.MapInputRowParser; -import io.druid.data.input.impl.TimeAndDimsParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Pair; -import io.druid.js.JavaScriptConfig; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.extraction.JavaScriptExtractionFn; -import io.druid.query.filter.AndDimFilter; -import io.druid.query.filter.BitmapIndexSelector; -import io.druid.query.filter.DimFilter; -import io.druid.query.filter.DruidDoublePredicate; -import io.druid.query.filter.DruidFloatPredicate; -import io.druid.query.filter.DruidLongPredicate; -import io.druid.query.filter.DruidPredicateFactory; -import io.druid.query.filter.Filter; -import io.druid.query.filter.OrDimFilter; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.segment.IndexBuilder; -import io.druid.segment.StorageAdapter; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.MapInputRowParser; +import org.apache.druid.data.input.impl.TimeAndDimsParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.js.JavaScriptConfig; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.extraction.JavaScriptExtractionFn; +import org.apache.druid.query.filter.AndDimFilter; +import org.apache.druid.query.filter.BitmapIndexSelector; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.filter.DruidDoublePredicate; +import org.apache.druid.query.filter.DruidFloatPredicate; +import org.apache.druid.query.filter.DruidLongPredicate; +import org.apache.druid.query.filter.DruidPredicateFactory; +import org.apache.druid.query.filter.Filter; +import org.apache.druid.query.filter.OrDimFilter; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.segment.IndexBuilder; +import org.apache.druid.segment.StorageAdapter; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/filter/FiltersTest.java b/processing/src/test/java/org/apache/druid/segment/filter/FiltersTest.java similarity index 88% rename from processing/src/test/java/io/druid/segment/filter/FiltersTest.java rename to processing/src/test/java/org/apache/druid/segment/filter/FiltersTest.java index 9c69b0d5f86d..b6c53fce9c95 100644 --- a/processing/src/test/java/io/druid/segment/filter/FiltersTest.java +++ b/processing/src/test/java/org/apache/druid/segment/filter/FiltersTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.collect.Lists; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.ConciseBitmapFactory; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.collections.bitmap.MutableBitmap; -import io.druid.segment.IntIteratorUtils; -import io.druid.segment.column.BitmapIndex; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.ConciseBitmapFactory; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.collections.bitmap.MutableBitmap; +import org.apache.druid.segment.IntIteratorUtils; +import org.apache.druid.segment.column.BitmapIndex; import it.unimi.dsi.fastutil.ints.IntIterators; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/filter/FloatAndDoubleFilteringTest.java b/processing/src/test/java/org/apache/druid/segment/filter/FloatAndDoubleFilteringTest.java similarity index 89% rename from processing/src/test/java/io/druid/segment/filter/FloatAndDoubleFilteringTest.java rename to processing/src/test/java/org/apache/druid/segment/filter/FloatAndDoubleFilteringTest.java index c8f4f1fdb839..797ffe68c316 100644 --- a/processing/src/test/java/io/druid/segment/filter/FloatAndDoubleFilteringTest.java +++ b/processing/src/test/java/org/apache/druid/segment/filter/FloatAndDoubleFilteringTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; @@ -26,33 +26,33 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.DoubleDimensionSchema; -import io.druid.data.input.impl.FloatDimensionSchema; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.MapInputRowParser; -import io.druid.data.input.impl.StringDimensionSchema; -import io.druid.data.input.impl.TimeAndDimsParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Pair; -import io.druid.js.JavaScriptConfig; -import io.druid.query.extraction.MapLookupExtractor; -import io.druid.query.filter.BoundDimFilter; -import io.druid.query.filter.DimFilter; -import io.druid.query.filter.InDimFilter; -import io.druid.query.filter.JavaScriptDimFilter; -import io.druid.query.filter.RegexDimFilter; -import io.druid.query.filter.SearchQueryDimFilter; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.query.lookup.LookupExtractionFn; -import io.druid.query.lookup.LookupExtractor; -import io.druid.query.ordering.StringComparators; -import io.druid.query.search.ContainsSearchQuerySpec; -import io.druid.segment.IndexBuilder; -import io.druid.segment.StorageAdapter; -import io.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.DoubleDimensionSchema; +import org.apache.druid.data.input.impl.FloatDimensionSchema; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.MapInputRowParser; +import org.apache.druid.data.input.impl.StringDimensionSchema; +import org.apache.druid.data.input.impl.TimeAndDimsParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.js.JavaScriptConfig; +import org.apache.druid.query.extraction.MapLookupExtractor; +import org.apache.druid.query.filter.BoundDimFilter; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.filter.InDimFilter; +import org.apache.druid.query.filter.JavaScriptDimFilter; +import org.apache.druid.query.filter.RegexDimFilter; +import org.apache.druid.query.filter.SearchQueryDimFilter; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.query.lookup.LookupExtractionFn; +import org.apache.druid.query.lookup.LookupExtractor; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.query.search.ContainsSearchQuerySpec; +import org.apache.druid.segment.IndexBuilder; +import org.apache.druid.segment.StorageAdapter; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/filter/InFilterTest.java b/processing/src/test/java/org/apache/druid/segment/filter/InFilterTest.java similarity index 90% rename from processing/src/test/java/io/druid/segment/filter/InFilterTest.java rename to processing/src/test/java/org/apache/druid/segment/filter/InFilterTest.java index 91c8692b16d3..74a1fd84071e 100644 --- a/processing/src/test/java/io/druid/segment/filter/InFilterTest.java +++ b/processing/src/test/java/org/apache/druid/segment/filter/InFilterTest.java @@ -17,31 +17,31 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import io.druid.common.config.NullHandling; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.MapInputRowParser; -import io.druid.data.input.impl.TimeAndDimsParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Pair; -import io.druid.js.JavaScriptConfig; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.extraction.JavaScriptExtractionFn; -import io.druid.query.extraction.MapLookupExtractor; -import io.druid.query.filter.DimFilter; -import io.druid.query.filter.InDimFilter; -import io.druid.query.lookup.LookupExtractionFn; -import io.druid.query.lookup.LookupExtractor; -import io.druid.segment.IndexBuilder; -import io.druid.segment.StorageAdapter; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.MapInputRowParser; +import org.apache.druid.data.input.impl.TimeAndDimsParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.js.JavaScriptConfig; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.extraction.JavaScriptExtractionFn; +import org.apache.druid.query.extraction.MapLookupExtractor; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.filter.InDimFilter; +import org.apache.druid.query.lookup.LookupExtractionFn; +import org.apache.druid.query.lookup.LookupExtractor; +import org.apache.druid.segment.IndexBuilder; +import org.apache.druid.segment.StorageAdapter; import org.junit.AfterClass; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/processing/src/test/java/io/druid/segment/filter/InvalidFilteringTest.java b/processing/src/test/java/org/apache/druid/segment/filter/InvalidFilteringTest.java similarity index 81% rename from processing/src/test/java/io/druid/segment/filter/InvalidFilteringTest.java rename to processing/src/test/java/org/apache/druid/segment/filter/InvalidFilteringTest.java index 1903a3b0d458..bbd3fd7271e5 100644 --- a/processing/src/test/java/io/druid/segment/filter/InvalidFilteringTest.java +++ b/processing/src/test/java/org/apache/druid/segment/filter/InvalidFilteringTest.java @@ -17,27 +17,27 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.MapInputRowParser; -import io.druid.data.input.impl.TimeAndDimsParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Pair; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.DoubleMaxAggregatorFactory; -import io.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; -import io.druid.query.filter.InDimFilter; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.segment.IndexBuilder; -import io.druid.segment.StorageAdapter; -import io.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.MapInputRowParser; +import org.apache.druid.data.input.impl.TimeAndDimsParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleMaxAggregatorFactory; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; +import org.apache.druid.query.filter.InDimFilter; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.segment.IndexBuilder; +import org.apache.druid.segment.StorageAdapter; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; import org.junit.AfterClass; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/processing/src/test/java/io/druid/segment/filter/JavaScriptFilterTest.java b/processing/src/test/java/org/apache/druid/segment/filter/JavaScriptFilterTest.java similarity index 89% rename from processing/src/test/java/io/druid/segment/filter/JavaScriptFilterTest.java rename to processing/src/test/java/org/apache/druid/segment/filter/JavaScriptFilterTest.java index a280eabbeab0..f06da4f4494b 100644 --- a/processing/src/test/java/io/druid/segment/filter/JavaScriptFilterTest.java +++ b/processing/src/test/java/org/apache/druid/segment/filter/JavaScriptFilterTest.java @@ -17,28 +17,28 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.common.config.NullHandling; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.MapInputRowParser; -import io.druid.data.input.impl.TimeAndDimsParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Pair; -import io.druid.js.JavaScriptConfig; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.extraction.MapLookupExtractor; -import io.druid.query.filter.JavaScriptDimFilter; -import io.druid.query.lookup.LookupExtractionFn; -import io.druid.query.lookup.LookupExtractor; -import io.druid.segment.IndexBuilder; -import io.druid.segment.StorageAdapter; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.MapInputRowParser; +import org.apache.druid.data.input.impl.TimeAndDimsParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.js.JavaScriptConfig; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.extraction.MapLookupExtractor; +import org.apache.druid.query.filter.JavaScriptDimFilter; +import org.apache.druid.query.lookup.LookupExtractionFn; +import org.apache.druid.query.lookup.LookupExtractor; +import org.apache.druid.segment.IndexBuilder; +import org.apache.druid.segment.StorageAdapter; import org.junit.AfterClass; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/processing/src/test/java/io/druid/segment/filter/LikeFilterTest.java b/processing/src/test/java/org/apache/druid/segment/filter/LikeFilterTest.java similarity index 87% rename from processing/src/test/java/io/druid/segment/filter/LikeFilterTest.java rename to processing/src/test/java/org/apache/druid/segment/filter/LikeFilterTest.java index 9d02542c0f85..cc646643ea61 100644 --- a/processing/src/test/java/io/druid/segment/filter/LikeFilterTest.java +++ b/processing/src/test/java/org/apache/druid/segment/filter/LikeFilterTest.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.common.config.NullHandling; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.MapInputRowParser; -import io.druid.data.input.impl.TimeAndDimsParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Pair; -import io.druid.query.extraction.SubstringDimExtractionFn; -import io.druid.query.filter.LikeDimFilter; -import io.druid.segment.IndexBuilder; -import io.druid.segment.StorageAdapter; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.MapInputRowParser; +import org.apache.druid.data.input.impl.TimeAndDimsParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.query.extraction.SubstringDimExtractionFn; +import org.apache.druid.query.filter.LikeDimFilter; +import org.apache.druid.segment.IndexBuilder; +import org.apache.druid.segment.StorageAdapter; import org.junit.AfterClass; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/processing/src/test/java/io/druid/segment/filter/LongFilteringTest.java b/processing/src/test/java/org/apache/druid/segment/filter/LongFilteringTest.java similarity index 91% rename from processing/src/test/java/io/druid/segment/filter/LongFilteringTest.java rename to processing/src/test/java/org/apache/druid/segment/filter/LongFilteringTest.java index 64a7b4ef1d5a..94c5fbde17cb 100644 --- a/processing/src/test/java/io/druid/segment/filter/LongFilteringTest.java +++ b/processing/src/test/java/org/apache/druid/segment/filter/LongFilteringTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; @@ -26,31 +26,31 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.MapInputRowParser; -import io.druid.data.input.impl.TimeAndDimsParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Pair; -import io.druid.js.JavaScriptConfig; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.extraction.MapLookupExtractor; -import io.druid.query.filter.BoundDimFilter; -import io.druid.query.filter.DimFilter; -import io.druid.query.filter.InDimFilter; -import io.druid.query.filter.JavaScriptDimFilter; -import io.druid.query.filter.RegexDimFilter; -import io.druid.query.filter.SearchQueryDimFilter; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.query.lookup.LookupExtractionFn; -import io.druid.query.lookup.LookupExtractor; -import io.druid.query.ordering.StringComparators; -import io.druid.query.search.ContainsSearchQuerySpec; -import io.druid.segment.IndexBuilder; -import io.druid.segment.StorageAdapter; -import io.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.MapInputRowParser; +import org.apache.druid.data.input.impl.TimeAndDimsParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.js.JavaScriptConfig; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.extraction.MapLookupExtractor; +import org.apache.druid.query.filter.BoundDimFilter; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.filter.InDimFilter; +import org.apache.druid.query.filter.JavaScriptDimFilter; +import org.apache.druid.query.filter.RegexDimFilter; +import org.apache.druid.query.filter.SearchQueryDimFilter; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.query.lookup.LookupExtractionFn; +import org.apache.druid.query.lookup.LookupExtractor; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.query.search.ContainsSearchQuerySpec; +import org.apache.druid.segment.IndexBuilder; +import org.apache.druid.segment.StorageAdapter; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/filter/NotFilterTest.java b/processing/src/test/java/org/apache/druid/segment/filter/NotFilterTest.java similarity index 81% rename from processing/src/test/java/io/druid/segment/filter/NotFilterTest.java rename to processing/src/test/java/org/apache/druid/segment/filter/NotFilterTest.java index 80535ebc09e6..f512d708d5c4 100644 --- a/processing/src/test/java/io/druid/segment/filter/NotFilterTest.java +++ b/processing/src/test/java/org/apache/druid/segment/filter/NotFilterTest.java @@ -17,23 +17,23 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.MapInputRowParser; -import io.druid.data.input.impl.TimeAndDimsParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Pair; -import io.druid.query.filter.NotDimFilter; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.segment.IndexBuilder; -import io.druid.segment.StorageAdapter; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.MapInputRowParser; +import org.apache.druid.data.input.impl.TimeAndDimsParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.query.filter.NotDimFilter; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.segment.IndexBuilder; +import org.apache.druid.segment.StorageAdapter; import org.junit.AfterClass; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/processing/src/test/java/io/druid/segment/filter/RegexFilterTest.java b/processing/src/test/java/org/apache/druid/segment/filter/RegexFilterTest.java similarity index 89% rename from processing/src/test/java/io/druid/segment/filter/RegexFilterTest.java rename to processing/src/test/java/org/apache/druid/segment/filter/RegexFilterTest.java index a269574a5e95..26de14da396a 100644 --- a/processing/src/test/java/io/druid/segment/filter/RegexFilterTest.java +++ b/processing/src/test/java/org/apache/druid/segment/filter/RegexFilterTest.java @@ -17,26 +17,26 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.common.config.NullHandling; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.MapInputRowParser; -import io.druid.data.input.impl.TimeAndDimsParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Pair; -import io.druid.js.JavaScriptConfig; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.extraction.JavaScriptExtractionFn; -import io.druid.query.filter.RegexDimFilter; -import io.druid.segment.IndexBuilder; -import io.druid.segment.StorageAdapter; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.MapInputRowParser; +import org.apache.druid.data.input.impl.TimeAndDimsParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.js.JavaScriptConfig; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.extraction.JavaScriptExtractionFn; +import org.apache.druid.query.filter.RegexDimFilter; +import org.apache.druid.segment.IndexBuilder; +import org.apache.druid.segment.StorageAdapter; import org.junit.AfterClass; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/processing/src/test/java/io/druid/segment/filter/SearchQueryFilterTest.java b/processing/src/test/java/org/apache/druid/segment/filter/SearchQueryFilterTest.java similarity index 89% rename from processing/src/test/java/io/druid/segment/filter/SearchQueryFilterTest.java rename to processing/src/test/java/org/apache/druid/segment/filter/SearchQueryFilterTest.java index 239c1b295fdc..57604319fea3 100644 --- a/processing/src/test/java/io/druid/segment/filter/SearchQueryFilterTest.java +++ b/processing/src/test/java/org/apache/druid/segment/filter/SearchQueryFilterTest.java @@ -17,28 +17,28 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.common.config.NullHandling; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.MapInputRowParser; -import io.druid.data.input.impl.TimeAndDimsParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Pair; -import io.druid.js.JavaScriptConfig; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.extraction.JavaScriptExtractionFn; -import io.druid.query.filter.SearchQueryDimFilter; -import io.druid.query.search.ContainsSearchQuerySpec; -import io.druid.query.search.SearchQuerySpec; -import io.druid.segment.IndexBuilder; -import io.druid.segment.StorageAdapter; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.MapInputRowParser; +import org.apache.druid.data.input.impl.TimeAndDimsParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.js.JavaScriptConfig; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.extraction.JavaScriptExtractionFn; +import org.apache.druid.query.filter.SearchQueryDimFilter; +import org.apache.druid.query.search.ContainsSearchQuerySpec; +import org.apache.druid.query.search.SearchQuerySpec; +import org.apache.druid.segment.IndexBuilder; +import org.apache.druid.segment.StorageAdapter; import org.junit.AfterClass; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/processing/src/test/java/io/druid/segment/filter/SelectorFilterTest.java b/processing/src/test/java/org/apache/druid/segment/filter/SelectorFilterTest.java similarity index 92% rename from processing/src/test/java/io/druid/segment/filter/SelectorFilterTest.java rename to processing/src/test/java/org/apache/druid/segment/filter/SelectorFilterTest.java index 00027e065882..55f8c09b9c94 100644 --- a/processing/src/test/java/io/druid/segment/filter/SelectorFilterTest.java +++ b/processing/src/test/java/org/apache/druid/segment/filter/SelectorFilterTest.java @@ -17,30 +17,30 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.common.config.NullHandling; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.MapInputRowParser; -import io.druid.data.input.impl.TimeAndDimsParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Pair; -import io.druid.query.extraction.MapLookupExtractor; -import io.druid.query.extraction.TimeDimExtractionFn; -import io.druid.query.filter.ExtractionDimFilter; -import io.druid.query.filter.InDimFilter; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.query.lookup.LookupExtractionFn; -import io.druid.query.lookup.LookupExtractor; -import io.druid.segment.IndexBuilder; -import io.druid.segment.StorageAdapter; -import io.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.MapInputRowParser; +import org.apache.druid.data.input.impl.TimeAndDimsParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.query.extraction.MapLookupExtractor; +import org.apache.druid.query.extraction.TimeDimExtractionFn; +import org.apache.druid.query.filter.ExtractionDimFilter; +import org.apache.druid.query.filter.InDimFilter; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.query.lookup.LookupExtractionFn; +import org.apache.druid.query.lookup.LookupExtractor; +import org.apache.druid.segment.IndexBuilder; +import org.apache.druid.segment.StorageAdapter; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/filter/SpatialFilterBonusTest.java b/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterBonusTest.java similarity index 92% rename from processing/src/test/java/io/druid/segment/filter/SpatialFilterBonusTest.java rename to processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterBonusTest.java index 650868787d1f..50791c53dceb 100644 --- a/processing/src/test/java/io/druid/segment/filter/SpatialFilterBonusTest.java +++ b/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterBonusTest.java @@ -17,48 +17,48 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import io.druid.collections.spatial.search.RadiusBound; -import io.druid.collections.spatial.search.RectangularBound; -import io.druid.data.input.MapBasedInputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.SpatialDimensionSchema; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; -import io.druid.query.Druids; -import io.druid.query.FinalizeResultsQueryRunner; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.Result; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.FilteredAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.filter.SpatialDimFilter; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.timeseries.TimeseriesQueryEngine; -import io.druid.query.timeseries.TimeseriesQueryQueryToolChest; -import io.druid.query.timeseries.TimeseriesQueryRunnerFactory; -import io.druid.query.timeseries.TimeseriesResultValue; -import io.druid.segment.IncrementalIndexSegment; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMerger; -import io.druid.segment.IndexSpec; -import io.druid.segment.QueryableIndex; -import io.druid.segment.QueryableIndexSegment; -import io.druid.segment.Segment; -import io.druid.segment.TestHelper; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.collections.spatial.search.RadiusBound; +import org.apache.druid.collections.spatial.search.RectangularBound; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.SpatialDimensionSchema; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.query.Druids; +import org.apache.druid.query.FinalizeResultsQueryRunner; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.FilteredAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.filter.SpatialDimFilter; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.timeseries.TimeseriesQueryEngine; +import org.apache.druid.query.timeseries.TimeseriesQueryQueryToolChest; +import org.apache.druid.query.timeseries.TimeseriesQueryRunnerFactory; +import org.apache.druid.query.timeseries.TimeseriesResultValue; +import org.apache.druid.segment.IncrementalIndexSegment; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMerger; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.QueryableIndexSegment; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; import org.joda.time.Interval; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/processing/src/test/java/io/druid/segment/filter/SpatialFilterTest.java b/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterTest.java similarity index 92% rename from processing/src/test/java/io/druid/segment/filter/SpatialFilterTest.java rename to processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterTest.java index 0330a577cb34..c2c4d2f8c76a 100644 --- a/processing/src/test/java/io/druid/segment/filter/SpatialFilterTest.java +++ b/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterTest.java @@ -17,46 +17,46 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.collections.spatial.search.RadiusBound; -import io.druid.collections.spatial.search.RectangularBound; -import io.druid.data.input.MapBasedInputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.SpatialDimensionSchema; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; -import io.druid.query.Druids; -import io.druid.query.FinalizeResultsQueryRunner; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.Result; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.filter.SpatialDimFilter; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.timeseries.TimeseriesQueryEngine; -import io.druid.query.timeseries.TimeseriesQueryQueryToolChest; -import io.druid.query.timeseries.TimeseriesQueryRunnerFactory; -import io.druid.query.timeseries.TimeseriesResultValue; -import io.druid.segment.IncrementalIndexSegment; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMerger; -import io.druid.segment.IndexSpec; -import io.druid.segment.QueryableIndex; -import io.druid.segment.QueryableIndexSegment; -import io.druid.segment.Segment; -import io.druid.segment.TestHelper; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.collections.spatial.search.RadiusBound; +import org.apache.druid.collections.spatial.search.RectangularBound; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.SpatialDimensionSchema; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; +import org.apache.druid.query.Druids; +import org.apache.druid.query.FinalizeResultsQueryRunner; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.filter.SpatialDimFilter; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.timeseries.TimeseriesQueryEngine; +import org.apache.druid.query.timeseries.TimeseriesQueryQueryToolChest; +import org.apache.druid.query.timeseries.TimeseriesQueryRunnerFactory; +import org.apache.druid.query.timeseries.TimeseriesResultValue; +import org.apache.druid.segment.IncrementalIndexSegment; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMerger; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.QueryableIndexSegment; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; import org.joda.time.Interval; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/processing/src/test/java/io/druid/segment/filter/TimeFilteringTest.java b/processing/src/test/java/org/apache/druid/segment/filter/TimeFilteringTest.java similarity index 87% rename from processing/src/test/java/io/druid/segment/filter/TimeFilteringTest.java rename to processing/src/test/java/org/apache/druid/segment/filter/TimeFilteringTest.java index e28d4fc7483c..d493b841ddcb 100644 --- a/processing/src/test/java/io/druid/segment/filter/TimeFilteringTest.java +++ b/processing/src/test/java/org/apache/druid/segment/filter/TimeFilteringTest.java @@ -17,39 +17,39 @@ * under the License. */ -package io.druid.segment.filter; +package org.apache.druid.segment.filter; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.MapInputRowParser; -import io.druid.data.input.impl.TimeAndDimsParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.Pair; -import io.druid.js.JavaScriptConfig; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.extraction.JavaScriptExtractionFn; -import io.druid.query.extraction.MapLookupExtractor; -import io.druid.query.extraction.TimeFormatExtractionFn; -import io.druid.query.filter.BoundDimFilter; -import io.druid.query.filter.InDimFilter; -import io.druid.query.filter.IntervalDimFilter; -import io.druid.query.filter.JavaScriptDimFilter; -import io.druid.query.filter.RegexDimFilter; -import io.druid.query.filter.SearchQueryDimFilter; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.query.lookup.LookupExtractionFn; -import io.druid.query.lookup.LookupExtractor; -import io.druid.query.ordering.StringComparators; -import io.druid.query.search.ContainsSearchQuerySpec; -import io.druid.segment.IndexBuilder; -import io.druid.segment.StorageAdapter; -import io.druid.segment.column.Column; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.MapInputRowParser; +import org.apache.druid.data.input.impl.TimeAndDimsParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.js.JavaScriptConfig; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.extraction.JavaScriptExtractionFn; +import org.apache.druid.query.extraction.MapLookupExtractor; +import org.apache.druid.query.extraction.TimeFormatExtractionFn; +import org.apache.druid.query.filter.BoundDimFilter; +import org.apache.druid.query.filter.InDimFilter; +import org.apache.druid.query.filter.IntervalDimFilter; +import org.apache.druid.query.filter.JavaScriptDimFilter; +import org.apache.druid.query.filter.RegexDimFilter; +import org.apache.druid.query.filter.SearchQueryDimFilter; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.query.lookup.LookupExtractionFn; +import org.apache.druid.query.lookup.LookupExtractor; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.query.search.ContainsSearchQuerySpec; +import org.apache.druid.segment.IndexBuilder; +import org.apache.druid.segment.StorageAdapter; +import org.apache.druid.segment.column.Column; import org.junit.AfterClass; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/processing/src/test/java/io/druid/segment/incremental/IncrementalIndexAdapterTest.java b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexAdapterTest.java similarity index 92% rename from processing/src/test/java/io/druid/segment/incremental/IncrementalIndexAdapterTest.java rename to processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexAdapterTest.java index 7c24bcef0292..e74efd6db6cb 100644 --- a/processing/src/test/java/io/druid/segment/incremental/IncrementalIndexAdapterTest.java +++ b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexAdapterTest.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.segment.incremental; - -import io.druid.java.util.common.StringUtils; -import io.druid.segment.IndexSpec; -import io.druid.segment.IndexableAdapter; -import io.druid.segment.RowIterator; -import io.druid.segment.data.BitmapValues; -import io.druid.segment.data.CompressionFactory; -import io.druid.segment.data.CompressionStrategy; -import io.druid.segment.data.ConciseBitmapSerdeFactory; -import io.druid.segment.data.IncrementalIndexTest; +package org.apache.druid.segment.incremental; + +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.IndexableAdapter; +import org.apache.druid.segment.RowIterator; +import org.apache.druid.segment.data.BitmapValues; +import org.apache.druid.segment.data.CompressionFactory; +import org.apache.druid.segment.data.CompressionStrategy; +import org.apache.druid.segment.data.ConciseBitmapSerdeFactory; +import org.apache.druid.segment.data.IncrementalIndexTest; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/incremental/IncrementalIndexMultiValueSpecTest.java b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexMultiValueSpecTest.java similarity index 84% rename from processing/src/test/java/io/druid/segment/incremental/IncrementalIndexMultiValueSpecTest.java rename to processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexMultiValueSpecTest.java index 8cbb23bb193c..d524b35187dd 100644 --- a/processing/src/test/java/io/druid/segment/incremental/IncrementalIndexMultiValueSpecTest.java +++ b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexMultiValueSpecTest.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.segment.incremental; +package org.apache.druid.segment.incremental; import com.google.common.collect.Lists; -import io.druid.data.input.MapBasedInputRow; -import io.druid.data.input.Row; -import io.druid.data.input.impl.DimensionSchema; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.StringDimensionSchema; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.segment.VirtualColumns; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.data.input.impl.DimensionSchema; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.StringDimensionSchema; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.segment.VirtualColumns; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/incremental/IncrementalIndexRowCompTest.java b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexRowCompTest.java similarity index 95% rename from processing/src/test/java/io/druid/segment/incremental/IncrementalIndexRowCompTest.java rename to processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexRowCompTest.java index a7e9baa73e2f..eb1092c476ba 100644 --- a/processing/src/test/java/io/druid/segment/incremental/IncrementalIndexRowCompTest.java +++ b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexRowCompTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment.incremental; +package org.apache.druid.segment.incremental; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.data.input.MapBasedInputRow; -import io.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.query.aggregation.CountAggregatorFactory; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/incremental/IncrementalIndexRowSizeTest.java b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexRowSizeTest.java similarity index 95% rename from processing/src/test/java/io/druid/segment/incremental/IncrementalIndexRowSizeTest.java rename to processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexRowSizeTest.java index 16d3871d9680..096cd01e505f 100644 --- a/processing/src/test/java/io/druid/segment/incremental/IncrementalIndexRowSizeTest.java +++ b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexRowSizeTest.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.segment.incremental; +package org.apache.druid.segment.incremental; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.data.input.MapBasedInputRow; -import io.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.query.aggregation.CountAggregatorFactory; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/incremental/IncrementalIndexStorageAdapterTest.java b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexStorageAdapterTest.java similarity index 92% rename from processing/src/test/java/io/druid/segment/incremental/IncrementalIndexStorageAdapterTest.java rename to processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexStorageAdapterTest.java index 0a1a9c2b66c2..00e718435f7b 100644 --- a/processing/src/test/java/io/druid/segment/incremental/IncrementalIndexStorageAdapterTest.java +++ b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexStorageAdapterTest.java @@ -17,40 +17,40 @@ * under the License. */ -package io.druid.segment.incremental; +package org.apache.druid.segment.incremental; import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import io.druid.collections.CloseableStupidPool; -import io.druid.common.config.NullHandling; -import io.druid.data.input.MapBasedInputRow; -import io.druid.data.input.MapBasedRow; -import io.druid.data.input.Row; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.Sequence; -import io.druid.js.JavaScriptConfig; -import io.druid.query.Result; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.JavaScriptAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.filter.DimFilters; -import io.druid.query.groupby.GroupByQuery; -import io.druid.query.groupby.GroupByQueryConfig; -import io.druid.query.groupby.GroupByQueryEngine; -import io.druid.query.topn.TopNQueryBuilder; -import io.druid.query.topn.TopNQueryEngine; -import io.druid.query.topn.TopNResultValue; -import io.druid.segment.Cursor; -import io.druid.segment.DimensionSelector; -import io.druid.segment.StorageAdapter; -import io.druid.segment.VirtualColumns; -import io.druid.segment.data.IndexedInts; -import io.druid.segment.filter.SelectorFilter; +import org.apache.druid.collections.CloseableStupidPool; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.data.input.MapBasedRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.js.JavaScriptConfig; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.JavaScriptAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.filter.DimFilters; +import org.apache.druid.query.groupby.GroupByQuery; +import org.apache.druid.query.groupby.GroupByQueryConfig; +import org.apache.druid.query.groupby.GroupByQueryEngine; +import org.apache.druid.query.topn.TopNQueryBuilder; +import org.apache.druid.query.topn.TopNQueryEngine; +import org.apache.druid.query.topn.TopNResultValue; +import org.apache.druid.segment.Cursor; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.StorageAdapter; +import org.apache.druid.segment.VirtualColumns; +import org.apache.druid.segment.data.IndexedInts; +import org.apache.druid.segment.filter.SelectorFilter; import org.joda.time.DateTime; import org.joda.time.Interval; import org.junit.Assert; diff --git a/processing/src/test/java/io/druid/segment/incremental/IncrementalIndexTest.java b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexTest.java similarity index 90% rename from processing/src/test/java/io/druid/segment/incremental/IncrementalIndexTest.java rename to processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexTest.java index 4ac492ebeabb..31266af15f55 100644 --- a/processing/src/test/java/io/druid/segment/incremental/IncrementalIndexTest.java +++ b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexTest.java @@ -17,27 +17,27 @@ * under the License. */ -package io.druid.segment.incremental; +package org.apache.druid.segment.incremental; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import io.druid.collections.CloseableStupidPool; -import io.druid.data.input.MapBasedInputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.DoubleDimensionSchema; -import io.druid.data.input.impl.FloatDimensionSchema; -import io.druid.data.input.impl.LongDimensionSchema; -import io.druid.data.input.impl.StringDimensionSchema; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.common.parsers.ParseException; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.FilteredAggregatorFactory; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.segment.CloserRule; +import org.apache.druid.collections.CloseableStupidPool; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.DoubleDimensionSchema; +import org.apache.druid.data.input.impl.FloatDimensionSchema; +import org.apache.druid.data.input.impl.LongDimensionSchema; +import org.apache.druid.data.input.impl.StringDimensionSchema; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.parsers.ParseException; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.FilteredAggregatorFactory; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.segment.CloserRule; import org.junit.After; import org.junit.Assert; import org.junit.Rule; diff --git a/processing/src/test/java/io/druid/segment/incremental/OnheapIncrementalIndexBenchmark.java b/processing/src/test/java/org/apache/druid/segment/incremental/OnheapIncrementalIndexBenchmark.java similarity index 91% rename from processing/src/test/java/io/druid/segment/incremental/OnheapIncrementalIndexBenchmark.java rename to processing/src/test/java/org/apache/druid/segment/incremental/OnheapIncrementalIndexBenchmark.java index 6cedc3ae362b..fcc2fc06b3cc 100644 --- a/processing/src/test/java/io/druid/segment/incremental/OnheapIncrementalIndexBenchmark.java +++ b/processing/src/test/java/org/apache/druid/segment/incremental/OnheapIncrementalIndexBenchmark.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.incremental; +package org.apache.druid.segment.incremental; import com.carrotsearch.junitbenchmarks.AbstractBenchmark; import com.carrotsearch.junitbenchmarks.BenchmarkOptions; @@ -31,32 +31,32 @@ import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import io.druid.data.input.InputRow; -import io.druid.data.input.MapBasedInputRow; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.parsers.ParseException; -import io.druid.query.Druids; -import io.druid.query.FinalizeResultsQueryRunner; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.Result; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.DoubleSumAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.timeseries.TimeseriesQueryEngine; -import io.druid.query.timeseries.TimeseriesQueryQueryToolChest; -import io.druid.query.timeseries.TimeseriesQueryRunnerFactory; -import io.druid.query.timeseries.TimeseriesResultValue; -import io.druid.segment.IncrementalIndexSegment; -import io.druid.segment.Segment; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.parsers.ParseException; +import org.apache.druid.query.Druids; +import org.apache.druid.query.FinalizeResultsQueryRunner; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.timeseries.TimeseriesQueryEngine; +import org.apache.druid.query.timeseries.TimeseriesQueryQueryToolChest; +import org.apache.druid.query.timeseries.TimeseriesQueryRunnerFactory; +import org.apache.druid.query.timeseries.TimeseriesResultValue; +import org.apache.druid.segment.IncrementalIndexSegment; +import org.apache.druid.segment.Segment; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Ignore; diff --git a/processing/src/test/java/io/druid/segment/incremental/OnheapIncrementalIndexTest.java b/processing/src/test/java/org/apache/druid/segment/incremental/OnheapIncrementalIndexTest.java similarity index 92% rename from processing/src/test/java/io/druid/segment/incremental/OnheapIncrementalIndexTest.java rename to processing/src/test/java/org/apache/druid/segment/incremental/OnheapIncrementalIndexTest.java index 8678a9ac8c4c..a8c565e7320d 100644 --- a/processing/src/test/java/io/druid/segment/incremental/OnheapIncrementalIndexTest.java +++ b/processing/src/test/java/org/apache/druid/segment/incremental/OnheapIncrementalIndexTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment.incremental; +package org.apache.druid.segment.incremental; import com.google.common.collect.ImmutableMap; -import io.druid.data.input.MapBasedInputRow; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.aggregation.Aggregator; -import io.druid.query.aggregation.LongMaxAggregator; -import io.druid.query.aggregation.LongMaxAggregatorFactory; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.aggregation.Aggregator; +import org.apache.druid.query.aggregation.LongMaxAggregator; +import org.apache.druid.query.aggregation.LongMaxAggregatorFactory; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/loading/SegmentizerFactoryTest.java b/processing/src/test/java/org/apache/druid/segment/loading/SegmentizerFactoryTest.java similarity index 86% rename from processing/src/test/java/io/druid/segment/loading/SegmentizerFactoryTest.java rename to processing/src/test/java/org/apache/druid/segment/loading/SegmentizerFactoryTest.java index 9d77eee853c5..105e47ff557b 100644 --- a/processing/src/test/java/io/druid/segment/loading/SegmentizerFactoryTest.java +++ b/processing/src/test/java/org/apache/druid/segment/loading/SegmentizerFactoryTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.segment.loading; +package org.apache.druid.segment.loading; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.jackson.SegmentizerModule; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; -import io.druid.segment.IndexIO; -import io.druid.segment.column.ColumnConfig; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.jackson.SegmentizerModule; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.column.ColumnConfig; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/serde/DictionaryEncodedColumnPartSerdeTest.java b/processing/src/test/java/org/apache/druid/segment/serde/DictionaryEncodedColumnPartSerdeTest.java similarity index 91% rename from processing/src/test/java/io/druid/segment/serde/DictionaryEncodedColumnPartSerdeTest.java rename to processing/src/test/java/org/apache/druid/segment/serde/DictionaryEncodedColumnPartSerdeTest.java index 8c7cb049da94..772e2e330f86 100644 --- a/processing/src/test/java/io/druid/segment/serde/DictionaryEncodedColumnPartSerdeTest.java +++ b/processing/src/test/java/org/apache/druid/segment/serde/DictionaryEncodedColumnPartSerdeTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment.serde; +package org.apache.druid.segment.serde; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.segment.TestHelper; -import io.druid.segment.data.ConciseBitmapSerdeFactory; -import io.druid.segment.data.RoaringBitmapSerdeFactory; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.data.ConciseBitmapSerdeFactory; +import org.apache.druid.segment.data.RoaringBitmapSerdeFactory; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/serde/HyperUniquesSerdeForTest.java b/processing/src/test/java/org/apache/druid/segment/serde/HyperUniquesSerdeForTest.java similarity index 90% rename from processing/src/test/java/io/druid/segment/serde/HyperUniquesSerdeForTest.java rename to processing/src/test/java/org/apache/druid/segment/serde/HyperUniquesSerdeForTest.java index 5aef219a9d46..02cef87f1794 100644 --- a/processing/src/test/java/io/druid/segment/serde/HyperUniquesSerdeForTest.java +++ b/processing/src/test/java/org/apache/druid/segment/serde/HyperUniquesSerdeForTest.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.segment.serde; +package org.apache.druid.segment.serde; import com.google.common.collect.Ordering; import com.google.common.hash.HashFunction; -import io.druid.java.util.common.StringUtils; -import io.druid.data.input.InputRow; -import io.druid.hll.HyperLogLogCollector; -import io.druid.segment.writeout.SegmentWriteOutMedium; -import io.druid.segment.GenericColumnSerializer; -import io.druid.segment.column.ColumnBuilder; -import io.druid.segment.data.GenericIndexed; -import io.druid.segment.data.ObjectStrategy; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.hll.HyperLogLogCollector; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.segment.GenericColumnSerializer; +import org.apache.druid.segment.column.ColumnBuilder; +import org.apache.druid.segment.data.GenericIndexed; +import org.apache.druid.segment.data.ObjectStrategy; import java.nio.ByteBuffer; import java.util.List; diff --git a/processing/src/test/java/io/druid/segment/serde/LargeColumnSupportedComplexColumnSerializerTest.java b/processing/src/test/java/org/apache/druid/segment/serde/LargeColumnSupportedComplexColumnSerializerTest.java similarity index 83% rename from processing/src/test/java/io/druid/segment/serde/LargeColumnSupportedComplexColumnSerializerTest.java rename to processing/src/test/java/org/apache/druid/segment/serde/LargeColumnSupportedComplexColumnSerializerTest.java index e25297589106..ccf716d8bb53 100644 --- a/processing/src/test/java/io/druid/segment/serde/LargeColumnSupportedComplexColumnSerializerTest.java +++ b/processing/src/test/java/org/apache/druid/segment/serde/LargeColumnSupportedComplexColumnSerializerTest.java @@ -17,23 +17,23 @@ * under the License. */ -package io.druid.segment.serde; +package org.apache.druid.segment.serde; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; -import io.druid.hll.HyperLogLogCollector; -import io.druid.java.util.common.io.smoosh.FileSmoosher; -import io.druid.java.util.common.io.smoosh.Smoosh; -import io.druid.java.util.common.io.smoosh.SmooshedFileMapper; -import io.druid.java.util.common.io.smoosh.SmooshedWriter; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ObjectColumnSelector; -import io.druid.segment.column.Column; -import io.druid.segment.column.ColumnBuilder; -import io.druid.segment.column.ComplexColumn; -import io.druid.segment.column.ValueType; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMedium; -import io.druid.segment.writeout.SegmentWriteOutMedium; +import org.apache.druid.hll.HyperLogLogCollector; +import org.apache.druid.java.util.common.io.smoosh.FileSmoosher; +import org.apache.druid.java.util.common.io.smoosh.Smoosh; +import org.apache.druid.java.util.common.io.smoosh.SmooshedFileMapper; +import org.apache.druid.java.util.common.io.smoosh.SmooshedWriter; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ObjectColumnSelector; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ColumnBuilder; +import org.apache.druid.segment.column.ComplexColumn; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMedium; +import org.apache.druid.segment.writeout.SegmentWriteOutMedium; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/virtual/ExpressionColumnValueSelectorTest.java b/processing/src/test/java/org/apache/druid/segment/virtual/ExpressionColumnValueSelectorTest.java similarity index 93% rename from processing/src/test/java/io/druid/segment/virtual/ExpressionColumnValueSelectorTest.java rename to processing/src/test/java/org/apache/druid/segment/virtual/ExpressionColumnValueSelectorTest.java index 16d1b1688b0c..65d86051ad0e 100644 --- a/processing/src/test/java/io/druid/segment/virtual/ExpressionColumnValueSelectorTest.java +++ b/processing/src/test/java/org/apache/druid/segment/virtual/ExpressionColumnValueSelectorTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment.virtual; +package org.apache.druid.segment.virtual; import com.google.common.base.Supplier; -import io.druid.common.guava.SettableSupplier; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.DimensionSelector; -import io.druid.segment.TestObjectColumnSelector; +import org.apache.druid.common.guava.SettableSupplier; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.TestObjectColumnSelector; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/virtual/ExpressionVirtualColumnTest.java b/processing/src/test/java/org/apache/druid/segment/virtual/ExpressionVirtualColumnTest.java similarity index 92% rename from processing/src/test/java/io/druid/segment/virtual/ExpressionVirtualColumnTest.java rename to processing/src/test/java/org/apache/druid/segment/virtual/ExpressionVirtualColumnTest.java index 87d51a31e27c..37b6e5f86b6d 100644 --- a/processing/src/test/java/io/druid/segment/virtual/ExpressionVirtualColumnTest.java +++ b/processing/src/test/java/org/apache/druid/segment/virtual/ExpressionVirtualColumnTest.java @@ -17,31 +17,31 @@ * under the License. */ -package io.druid.segment.virtual; +package org.apache.druid.segment.virtual; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.common.config.NullHandling; -import io.druid.data.input.InputRow; -import io.druid.data.input.MapBasedInputRow; -import io.druid.data.input.Row; -import io.druid.java.util.common.DateTimes; -import io.druid.math.expr.ExprEval; -import io.druid.math.expr.Parser; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.dimension.ExtractionDimensionSpec; -import io.druid.query.expression.TestExprMacroTable; -import io.druid.query.extraction.BucketExtractionFn; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.groupby.RowBasedColumnSelectorFactory; -import io.druid.segment.BaseFloatColumnValueSelector; -import io.druid.segment.BaseLongColumnValueSelector; -import io.druid.segment.BaseObjectColumnValueSelector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.DimensionSelector; -import io.druid.segment.column.ValueType; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.math.expr.ExprEval; +import org.apache.druid.math.expr.Parser; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.ExtractionDimensionSpec; +import org.apache.druid.query.expression.TestExprMacroTable; +import org.apache.druid.query.extraction.BucketExtractionFn; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.groupby.RowBasedColumnSelectorFactory; +import org.apache.druid.segment.BaseFloatColumnValueSelector; +import org.apache.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.column.ValueType; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/virtual/VirtualColumnsTest.java b/processing/src/test/java/org/apache/druid/segment/virtual/VirtualColumnsTest.java similarity index 89% rename from processing/src/test/java/io/druid/segment/virtual/VirtualColumnsTest.java rename to processing/src/test/java/org/apache/druid/segment/virtual/VirtualColumnsTest.java index 435c8692f5ea..3363a570110b 100644 --- a/processing/src/test/java/io/druid/segment/virtual/VirtualColumnsTest.java +++ b/processing/src/test/java/org/apache/druid/segment/virtual/VirtualColumnsTest.java @@ -17,37 +17,37 @@ * under the License. */ -package io.druid.segment.virtual; +package org.apache.druid.segment.virtual; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Longs; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.dimension.ExtractionDimensionSpec; -import io.druid.query.expression.TestExprMacroTable; -import io.druid.query.extraction.BucketExtractionFn; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.filter.ValueMatcher; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.segment.BaseFloatColumnValueSelector; -import io.druid.segment.BaseLongColumnValueSelector; -import io.druid.segment.BaseObjectColumnValueSelector; -import io.druid.segment.ColumnSelectorFactory; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.DimensionSelector; -import io.druid.segment.DimensionSelectorUtils; -import io.druid.segment.IdLookup; -import io.druid.segment.TestHelper; -import io.druid.segment.TestLongColumnSelector; -import io.druid.segment.VirtualColumn; -import io.druid.segment.VirtualColumns; -import io.druid.segment.column.ColumnCapabilities; -import io.druid.segment.column.ColumnCapabilitiesImpl; -import io.druid.segment.column.ValueType; -import io.druid.segment.data.IndexedInts; -import io.druid.segment.data.ZeroIndexedInts; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.dimension.ExtractionDimensionSpec; +import org.apache.druid.query.expression.TestExprMacroTable; +import org.apache.druid.query.extraction.BucketExtractionFn; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.filter.ValueMatcher; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.segment.BaseFloatColumnValueSelector; +import org.apache.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.segment.ColumnSelectorFactory; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.DimensionSelectorUtils; +import org.apache.druid.segment.IdLookup; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.TestLongColumnSelector; +import org.apache.druid.segment.VirtualColumn; +import org.apache.druid.segment.VirtualColumns; +import org.apache.druid.segment.column.ColumnCapabilities; +import org.apache.druid.segment.column.ColumnCapabilitiesImpl; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.data.IndexedInts; +import org.apache.druid.segment.data.ZeroIndexedInts; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/writeout/WriteOutBytesTest.java b/processing/src/test/java/org/apache/druid/segment/writeout/WriteOutBytesTest.java similarity index 97% rename from processing/src/test/java/io/druid/segment/writeout/WriteOutBytesTest.java rename to processing/src/test/java/org/apache/druid/segment/writeout/WriteOutBytesTest.java index 1dee815f97ad..cc05ab8fd058 100644 --- a/processing/src/test/java/io/druid/segment/writeout/WriteOutBytesTest.java +++ b/processing/src/test/java/org/apache/druid/segment/writeout/WriteOutBytesTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment.writeout; +package org.apache.druid.segment.writeout; import com.google.common.io.Files; import com.google.common.primitives.Ints; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import org.apache.commons.io.IOUtils; import org.junit.Assert; import org.junit.Test; diff --git a/publications/demo/druid_demo.tex b/publications/demo/druid_demo.tex index c4354013c20a..a357eeebff0c 100644 --- a/publications/demo/druid_demo.tex +++ b/publications/demo/druid_demo.tex @@ -108,7 +108,7 @@ \begin{abstract} Druid is an open -source\footnote{\href{https://github.com/druid-io/druid}{https://github.com/druid-io/druid}} +source\footnote{\href{https://github.com/apache/incubator-druid}{https://github.com/apache/incubator-druid}} data store built for exploratory analytics on large data sets. Druid supports fast data aggregation, low latency data ingestion, and arbitrary data exploration. The system combines a column-oriented storage layout, a @@ -170,7 +170,7 @@ \subsection{The Need for Druid} The problems of data exploration, ingestion, and availability span multiple industries. Since Druid was open sourced in October 2012, it has been deployed as a video, network monitoring, operations monitoring, and online advertising -analytics platform at multiple companies\footnote{\href{http://druid.io/druid.html}{http://druid.io/druid.html}}. +analytics platform at multiple companies\footnote{\href{http://druid.org/apache/druid.html}{http://druid.org/apache/druid.html}}. \begin{figure*} \centering diff --git a/publications/whitepaper/druid.pdf b/publications/whitepaper/druid.pdf index f7853381af74..08fd5c71962a 100644 Binary files a/publications/whitepaper/druid.pdf and b/publications/whitepaper/druid.pdf differ diff --git a/publications/whitepaper/druid.tex b/publications/whitepaper/druid.tex index b746c9721539..ea1d90b83711 100644 --- a/publications/whitepaper/druid.tex +++ b/publications/whitepaper/druid.tex @@ -62,7 +62,7 @@ \maketitle \begin{abstract} -Druid is an open source\footnote{\href{http://druid.io/}{http://druid.io/} \href{https://github.com/druid-io/druid}{https://github.com/druid-io/druid}} +Druid is an open source\footnote{\href{http://druid.io/}{http://druid.io/} \href{https://github.com/apache/incubator-druid}{https://github.com/apache/incubator-druid}} data store designed for real-time exploratory analytics on large data sets. The system combines a column-oriented storage layout, a distributed, shared-nothing architecture, and an advanced indexing structure to allow for @@ -129,7 +129,7 @@ \section{Introduction} service, and attempts to help inform anyone who faces a similar problem about a potential method of solving it. Druid is deployed in production at several technology -companies\footnote{\href{http://druid.io/druid.html}{http://druid.io/druid.html}}. +companies\footnote{\href{http://druid.org/apache/druid.html}{http://druid.org/apache/druid.html}}. The structure of the paper is as follows: we first describe the problem in Section \ref{sec:problem-definition}. Next, we detail system architecture from the point of view of how data flows through the system in Section diff --git a/publications/whitepaper/modii658-yang.pdf b/publications/whitepaper/modii658-yang.pdf index 7fbf126af601..400d5230576e 100644 Binary files a/publications/whitepaper/modii658-yang.pdf and b/publications/whitepaper/modii658-yang.pdf differ diff --git a/server/pom.xml b/server/pom.xml index 2253c3cf2e0b..7935ed8ff028 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -26,19 +26,19 @@ Druid Server - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT - io.druid + org.apache.druid druid-processing ${project.parent.version} - io.druid + org.apache.druid druid-aws-common ${project.parent.version} @@ -48,7 +48,7 @@ 0.0.2 - io.druid + org.apache.druid java-util ${project.parent.version} @@ -210,14 +210,14 @@ test - io.druid + org.apache.druid druid-common ${project.parent.version} test-jar test - io.druid + org.apache.druid druid-processing ${project.parent.version} test-jar diff --git a/server/src/main/java/io/druid/client/AbstractCuratorServerInventoryView.java b/server/src/main/java/org/apache/druid/client/AbstractCuratorServerInventoryView.java similarity index 93% rename from server/src/main/java/io/druid/client/AbstractCuratorServerInventoryView.java rename to server/src/main/java/org/apache/druid/client/AbstractCuratorServerInventoryView.java index d4d30cd5126c..dfb1ac3876cc 100644 --- a/server/src/main/java/io/druid/client/AbstractCuratorServerInventoryView.java +++ b/server/src/main/java/org/apache/druid/client/AbstractCuratorServerInventoryView.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Function; import com.google.common.base.Throwables; -import io.druid.curator.inventory.CuratorInventoryManager; -import io.druid.curator.inventory.CuratorInventoryManagerStrategy; -import io.druid.curator.inventory.InventoryManagerConfig; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.timeline.DataSegment; +import org.apache.druid.curator.inventory.CuratorInventoryManager; +import org.apache.druid.curator.inventory.CuratorInventoryManagerStrategy; +import org.apache.druid.curator.inventory.InventoryManagerConfig; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.timeline.DataSegment; import org.apache.curator.framework.CuratorFramework; import java.io.IOException; diff --git a/server/src/main/java/io/druid/client/BatchServerInventoryView.java b/server/src/main/java/org/apache/druid/client/BatchServerInventoryView.java similarity index 93% rename from server/src/main/java/io/druid/client/BatchServerInventoryView.java rename to server/src/main/java/org/apache/druid/client/BatchServerInventoryView.java index 106ea3168147..8160ff7d8512 100644 --- a/server/src/main/java/io/druid/client/BatchServerInventoryView.java +++ b/server/src/main/java/org/apache/druid/client/BatchServerInventoryView.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -28,13 +28,13 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import com.google.inject.Inject; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.guice.ManageLifecycle; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Pair; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.server.initialization.ZkPathsConfig; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.timeline.DataSegment; import org.apache.curator.framework.CuratorFramework; import java.util.Set; diff --git a/server/src/main/java/io/druid/client/BatchServerInventoryViewProvider.java b/server/src/main/java/org/apache/druid/client/BatchServerInventoryViewProvider.java similarity index 94% rename from server/src/main/java/io/druid/client/BatchServerInventoryViewProvider.java rename to server/src/main/java/org/apache/druid/client/BatchServerInventoryViewProvider.java index 6c34b47c2dd8..fff49a7f33e9 100644 --- a/server/src/main/java/io/druid/client/BatchServerInventoryViewProvider.java +++ b/server/src/main/java/org/apache/druid/client/BatchServerInventoryViewProvider.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Predicates; -import io.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.server.initialization.ZkPathsConfig; import org.apache.curator.framework.CuratorFramework; import javax.validation.constraints.NotNull; diff --git a/server/src/main/java/io/druid/client/BrokerSegmentWatcherConfig.java b/server/src/main/java/org/apache/druid/client/BrokerSegmentWatcherConfig.java similarity index 97% rename from server/src/main/java/io/druid/client/BrokerSegmentWatcherConfig.java rename to server/src/main/java/org/apache/druid/client/BrokerSegmentWatcherConfig.java index 6d2e7b097eeb..9a0fc54163a9 100644 --- a/server/src/main/java/io/druid/client/BrokerSegmentWatcherConfig.java +++ b/server/src/main/java/org/apache/druid/client/BrokerSegmentWatcherConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/client/BrokerServerView.java b/server/src/main/java/org/apache/druid/client/BrokerServerView.java similarity index 90% rename from server/src/main/java/io/druid/client/BrokerServerView.java rename to server/src/main/java/org/apache/druid/client/BrokerServerView.java index 33cf8b664a8f..cbfd7171fbd5 100644 --- a/server/src/main/java/io/druid/client/BrokerServerView.java +++ b/server/src/main/java/org/apache/druid/client/BrokerServerView.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Predicate; @@ -25,24 +25,24 @@ import com.google.common.collect.Maps; import com.google.common.collect.Ordering; import com.google.inject.Inject; -import io.druid.client.selector.QueryableDruidServer; -import io.druid.client.selector.ServerSelector; -import io.druid.client.selector.TierSelectorStrategy; -import io.druid.guice.annotations.EscalatedClient; -import io.druid.guice.annotations.Smile; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.http.client.HttpClient; -import io.druid.query.DataSource; -import io.druid.query.QueryRunner; -import io.druid.query.QueryToolChestWarehouse; -import io.druid.query.QueryWatcher; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.timeline.DataSegment; -import io.druid.timeline.VersionedIntervalTimeline; -import io.druid.timeline.partition.PartitionChunk; +import org.apache.druid.client.selector.QueryableDruidServer; +import org.apache.druid.client.selector.ServerSelector; +import org.apache.druid.client.selector.TierSelectorStrategy; +import org.apache.druid.guice.annotations.EscalatedClient; +import org.apache.druid.guice.annotations.Smile; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.query.DataSource; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryToolChestWarehouse; +import org.apache.druid.query.QueryWatcher; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.timeline.partition.PartitionChunk; import javax.annotation.Nullable; import java.util.Map; diff --git a/server/src/main/java/io/druid/client/CacheUtil.java b/server/src/main/java/org/apache/druid/client/CacheUtil.java similarity index 90% rename from server/src/main/java/io/druid/client/CacheUtil.java rename to server/src/main/java/org/apache/druid/client/CacheUtil.java index 622ec0c8db96..027db74b2f1f 100644 --- a/server/src/main/java/io/druid/client/CacheUtil.java +++ b/server/src/main/java/org/apache/druid/client/CacheUtil.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; -import io.druid.client.cache.Cache; -import io.druid.client.cache.CacheConfig; -import io.druid.java.util.common.StringUtils; -import io.druid.query.CacheStrategy; -import io.druid.query.Query; -import io.druid.query.QueryContexts; -import io.druid.query.SegmentDescriptor; +import org.apache.druid.client.cache.Cache; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.CacheStrategy; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryContexts; +import org.apache.druid.query.SegmentDescriptor; import org.joda.time.Interval; import java.nio.ByteBuffer; diff --git a/server/src/main/java/io/druid/client/CachingClusteredClient.java b/server/src/main/java/org/apache/druid/client/CachingClusteredClient.java similarity index 91% rename from server/src/main/java/io/druid/client/CachingClusteredClient.java rename to server/src/main/java/org/apache/druid/client/CachingClusteredClient.java index d227dd4ace24..8fece183cac4 100644 --- a/server/src/main/java/io/druid/client/CachingClusteredClient.java +++ b/server/src/main/java/org/apache/druid/client/CachingClusteredClient.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -33,43 +33,43 @@ import com.google.common.hash.Hasher; import com.google.common.hash.Hashing; import com.google.inject.Inject; -import io.druid.client.cache.Cache; -import io.druid.client.cache.CacheConfig; -import io.druid.client.cache.CachePopulator; -import io.druid.client.selector.QueryableDruidServer; -import io.druid.client.selector.ServerSelector; -import io.druid.guice.annotations.Smile; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.guava.BaseSequence; -import io.druid.java.util.common.guava.LazySequence; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.query.BySegmentResultValueClass; -import io.druid.query.CacheStrategy; -import io.druid.query.Query; -import io.druid.query.QueryContexts; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QuerySegmentWalker; -import io.druid.query.QueryToolChest; -import io.druid.query.QueryToolChestWarehouse; -import io.druid.query.Result; -import io.druid.query.SegmentDescriptor; -import io.druid.query.aggregation.MetricManipulatorFns; -import io.druid.query.filter.DimFilterUtils; -import io.druid.query.spec.MultipleSpecificSegmentSpec; -import io.druid.server.QueryResource; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.timeline.DataSegment; -import io.druid.timeline.TimelineLookup; -import io.druid.timeline.TimelineObjectHolder; -import io.druid.timeline.VersionedIntervalTimeline; -import io.druid.timeline.partition.PartitionChunk; -import io.druid.timeline.partition.PartitionHolder; +import org.apache.druid.client.cache.Cache; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.client.cache.CachePopulator; +import org.apache.druid.client.selector.QueryableDruidServer; +import org.apache.druid.client.selector.ServerSelector; +import org.apache.druid.guice.annotations.Smile; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.guava.BaseSequence; +import org.apache.druid.java.util.common.guava.LazySequence; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.query.BySegmentResultValueClass; +import org.apache.druid.query.CacheStrategy; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryContexts; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QuerySegmentWalker; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.QueryToolChestWarehouse; +import org.apache.druid.query.Result; +import org.apache.druid.query.SegmentDescriptor; +import org.apache.druid.query.aggregation.MetricManipulatorFns; +import org.apache.druid.query.filter.DimFilterUtils; +import org.apache.druid.query.spec.MultipleSpecificSegmentSpec; +import org.apache.druid.server.QueryResource; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.TimelineLookup; +import org.apache.druid.timeline.TimelineObjectHolder; +import org.apache.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.timeline.partition.PartitionChunk; +import org.apache.druid.timeline.partition.PartitionHolder; import org.apache.commons.codec.binary.Base64; import org.joda.time.Interval; @@ -225,7 +225,7 @@ private class SpecificQueryRunnable this.populateCache = CacheUtil.populateCacheOnBrokers(query, strategy, cacheConfig); this.isBySegment = QueryContexts.isBySegment(query); // Note that enabling this leads to putting uncovered intervals information in the response headers - // and might blow up in some cases https://github.com/druid-io/druid/issues/2108 + // and might blow up in some cases https://github.com/apache/incubator-druid/issues/2108 this.uncoveredIntervalsLimit = QueryContexts.getUncoveredIntervalsLimit(query); this.downstreamQuery = query.withOverriddenContext(makeDownstreamQueryContext()); } diff --git a/server/src/main/java/io/druid/client/CachingQueryRunner.java b/server/src/main/java/org/apache/druid/client/CachingQueryRunner.java similarity index 87% rename from server/src/main/java/io/druid/client/CachingQueryRunner.java rename to server/src/main/java/org/apache/druid/client/CachingQueryRunner.java index 422ea6515783..8f9a88a9502d 100644 --- a/server/src/main/java/io/druid/client/CachingQueryRunner.java +++ b/server/src/main/java/org/apache/druid/client/CachingQueryRunner.java @@ -17,25 +17,25 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Function; import com.google.common.base.Throwables; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.client.cache.Cache; -import io.druid.client.cache.CacheConfig; -import io.druid.client.cache.CachePopulator; -import io.druid.java.util.common.guava.BaseSequence; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.query.CacheStrategy; -import io.druid.query.Query; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryToolChest; -import io.druid.query.SegmentDescriptor; +import org.apache.druid.client.cache.Cache; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.client.cache.CachePopulator; +import org.apache.druid.java.util.common.guava.BaseSequence; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.query.CacheStrategy; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.SegmentDescriptor; import java.io.IOException; import java.util.Collection; diff --git a/server/src/main/java/io/druid/client/CoordinatorServerView.java b/server/src/main/java/org/apache/druid/client/CoordinatorServerView.java similarity index 93% rename from server/src/main/java/io/druid/client/CoordinatorServerView.java rename to server/src/main/java/org/apache/druid/client/CoordinatorServerView.java index d757841b4cb3..c4c10185279b 100644 --- a/server/src/main/java/io/druid/client/CoordinatorServerView.java +++ b/server/src/main/java/org/apache/druid/client/CoordinatorServerView.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.collect.Ordering; import com.google.inject.Inject; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.DataSource; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.timeline.DataSegment; -import io.druid.timeline.VersionedIntervalTimeline; -import io.druid.timeline.partition.PartitionChunk; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.DataSource; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.timeline.partition.PartitionChunk; import java.util.Collection; import java.util.Map; diff --git a/server/src/main/java/io/druid/client/DirectDruidClient.java b/server/src/main/java/org/apache/druid/client/DirectDruidClient.java similarity index 92% rename from server/src/main/java/io/druid/client/DirectDruidClient.java rename to server/src/main/java/org/apache/druid/client/DirectDruidClient.java index ad55db886bd6..52a28c203393 100644 --- a/server/src/main/java/io/druid/client/DirectDruidClient.java +++ b/server/src/main/java/org/apache/druid/client/DirectDruidClient.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; @@ -32,36 +32,36 @@ import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.RE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.guava.BaseSequence; -import io.druid.java.util.common.guava.CloseQuietly; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.common.jackson.JacksonUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.Request; -import io.druid.java.util.http.client.response.ClientResponse; -import io.druid.java.util.http.client.response.HttpResponseHandler; -import io.druid.java.util.http.client.response.StatusResponseHandler; -import io.druid.java.util.http.client.response.StatusResponseHolder; -import io.druid.query.BySegmentResultValueClass; -import io.druid.query.Query; -import io.druid.query.QueryContexts; -import io.druid.query.QueryInterruptedException; -import io.druid.query.QueryMetrics; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryToolChest; -import io.druid.query.QueryToolChestWarehouse; -import io.druid.query.QueryWatcher; -import io.druid.query.ResourceLimitExceededException; -import io.druid.query.Result; -import io.druid.query.aggregation.MetricManipulatorFns; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.guava.BaseSequence; +import org.apache.druid.java.util.common.guava.CloseQuietly; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.Request; +import org.apache.druid.java.util.http.client.response.ClientResponse; +import org.apache.druid.java.util.http.client.response.HttpResponseHandler; +import org.apache.druid.java.util.http.client.response.StatusResponseHandler; +import org.apache.druid.java.util.http.client.response.StatusResponseHolder; +import org.apache.druid.query.BySegmentResultValueClass; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryContexts; +import org.apache.druid.query.QueryInterruptedException; +import org.apache.druid.query.QueryMetrics; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.QueryToolChestWarehouse; +import org.apache.druid.query.QueryWatcher; +import org.apache.druid.query.ResourceLimitExceededException; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.MetricManipulatorFns; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBufferInputStream; import org.jboss.netty.handler.codec.http.HttpChunk; diff --git a/server/src/main/java/io/druid/client/DruidDataSource.java b/server/src/main/java/org/apache/druid/client/DruidDataSource.java similarity index 97% rename from server/src/main/java/io/druid/client/DruidDataSource.java rename to server/src/main/java/org/apache/druid/client/DruidDataSource.java index dbd8fee8f71e..d280e30a5b79 100644 --- a/server/src/main/java/io/druid/client/DruidDataSource.java +++ b/server/src/main/java/org/apache/druid/client/DruidDataSource.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import java.util.Collection; import java.util.Collections; diff --git a/server/src/main/java/io/druid/client/DruidServer.java b/server/src/main/java/org/apache/druid/client/DruidServer.java similarity index 96% rename from server/src/main/java/io/druid/client/DruidServer.java rename to server/src/main/java/org/apache/druid/client/DruidServer.java index 1289ff779c57..0b73f9cbaa60 100644 --- a/server/src/main/java/io/druid/client/DruidServer.java +++ b/server/src/main/java/org/apache/druid/client/DruidServer.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.DruidNode; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.server.coordination.ServerType; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.timeline.DataSegment; import java.util.Collection; import java.util.Collections; diff --git a/server/src/main/java/io/druid/client/DruidServerConfig.java b/server/src/main/java/org/apache/druid/client/DruidServerConfig.java similarity index 98% rename from server/src/main/java/io/druid/client/DruidServerConfig.java rename to server/src/main/java/org/apache/druid/client/DruidServerConfig.java index b69278c181ea..2d336a7743f7 100644 --- a/server/src/main/java/io/druid/client/DruidServerConfig.java +++ b/server/src/main/java/org/apache/druid/client/DruidServerConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.Sets; diff --git a/server/src/main/java/io/druid/client/FilteredBatchServerInventoryViewProvider.java b/server/src/main/java/org/apache/druid/client/FilteredBatchServerInventoryViewProvider.java similarity index 94% rename from server/src/main/java/io/druid/client/FilteredBatchServerInventoryViewProvider.java rename to server/src/main/java/org/apache/druid/client/FilteredBatchServerInventoryViewProvider.java index 0a02f96c35f9..bc4127e4a5a0 100644 --- a/server/src/main/java/io/druid/client/FilteredBatchServerInventoryViewProvider.java +++ b/server/src/main/java/org/apache/druid/client/FilteredBatchServerInventoryViewProvider.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Predicates; -import io.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.server.initialization.ZkPathsConfig; import org.apache.curator.framework.CuratorFramework; import javax.validation.constraints.NotNull; diff --git a/server/src/main/java/io/druid/client/FilteredHttpServerInventoryViewProvider.java b/server/src/main/java/org/apache/druid/client/FilteredHttpServerInventoryViewProvider.java similarity index 86% rename from server/src/main/java/io/druid/client/FilteredHttpServerInventoryViewProvider.java rename to server/src/main/java/org/apache/druid/client/FilteredHttpServerInventoryViewProvider.java index cc009e6e638d..daa1d9a03465 100644 --- a/server/src/main/java/io/druid/client/FilteredHttpServerInventoryViewProvider.java +++ b/server/src/main/java/org/apache/druid/client/FilteredHttpServerInventoryViewProvider.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Predicates; -import io.druid.java.util.http.client.HttpClient; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.guice.annotations.EscalatedClient; -import io.druid.guice.annotations.Smile; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.guice.annotations.EscalatedClient; +import org.apache.druid.guice.annotations.Smile; import javax.validation.constraints.NotNull; diff --git a/server/src/main/java/io/druid/client/FilteredServerInventoryView.java b/server/src/main/java/org/apache/druid/client/FilteredServerInventoryView.java similarity index 86% rename from server/src/main/java/io/druid/client/FilteredServerInventoryView.java rename to server/src/main/java/org/apache/druid/client/FilteredServerInventoryView.java index 54de7e817201..a03b6920c449 100644 --- a/server/src/main/java/io/druid/client/FilteredServerInventoryView.java +++ b/server/src/main/java/org/apache/druid/client/FilteredServerInventoryView.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.google.common.base.Predicate; -import io.druid.java.util.common.Pair; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.timeline.DataSegment; import java.util.concurrent.Executor; diff --git a/server/src/main/java/io/druid/client/FilteredServerInventoryViewProvider.java b/server/src/main/java/org/apache/druid/client/FilteredServerInventoryViewProvider.java similarity index 97% rename from server/src/main/java/io/druid/client/FilteredServerInventoryViewProvider.java rename to server/src/main/java/org/apache/druid/client/FilteredServerInventoryViewProvider.java index d1ec9f13e961..5ea3ac2c4d28 100644 --- a/server/src/main/java/io/druid/client/FilteredServerInventoryViewProvider.java +++ b/server/src/main/java/org/apache/druid/client/FilteredServerInventoryViewProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.annotation.JsonSubTypes; diff --git a/server/src/main/java/io/druid/client/FilteredSingleServerInventoryViewProvider.java b/server/src/main/java/org/apache/druid/client/FilteredSingleServerInventoryViewProvider.java similarity index 94% rename from server/src/main/java/io/druid/client/FilteredSingleServerInventoryViewProvider.java rename to server/src/main/java/org/apache/druid/client/FilteredSingleServerInventoryViewProvider.java index 931df2160697..402e31539c7e 100644 --- a/server/src/main/java/io/druid/client/FilteredSingleServerInventoryViewProvider.java +++ b/server/src/main/java/org/apache/druid/client/FilteredSingleServerInventoryViewProvider.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Predicates; -import io.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.server.initialization.ZkPathsConfig; import org.apache.curator.framework.CuratorFramework; import javax.validation.constraints.NotNull; diff --git a/server/src/main/java/io/druid/client/HttpServerInventoryView.java b/server/src/main/java/org/apache/druid/client/HttpServerInventoryView.java similarity index 93% rename from server/src/main/java/io/druid/client/HttpServerInventoryView.java rename to server/src/main/java/org/apache/druid/client/HttpServerInventoryView.java index 8ea3674bfd8c..5705f157b0c6 100644 --- a/server/src/main/java/io/druid/client/HttpServerInventoryView.java +++ b/server/src/main/java/org/apache/druid/client/HttpServerInventoryView.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -28,29 +28,29 @@ import com.google.common.collect.Maps; import com.google.common.net.HostAndPort; import com.google.inject.Inject; -import io.druid.concurrent.LifecycleLock; -import io.druid.discovery.DataNodeService; -import io.druid.discovery.DiscoveryDruidNode; -import io.druid.discovery.DruidNodeDiscovery; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.guice.annotations.EscalatedGlobal; -import io.druid.guice.annotations.Smile; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.RE; -import io.druid.java.util.common.concurrent.ScheduledExecutors; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.http.client.HttpClient; -import io.druid.server.coordination.ChangeRequestHttpSyncer; -import io.druid.server.coordination.ChangeRequestsSnapshot; -import io.druid.server.coordination.DataSegmentChangeRequest; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.server.coordination.SegmentChangeRequestDrop; -import io.druid.server.coordination.SegmentChangeRequestLoad; -import io.druid.timeline.DataSegment; +import org.apache.druid.concurrent.LifecycleLock; +import org.apache.druid.discovery.DataNodeService; +import org.apache.druid.discovery.DiscoveryDruidNode; +import org.apache.druid.discovery.DruidNodeDiscovery; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.guice.annotations.EscalatedGlobal; +import org.apache.druid.guice.annotations.Smile; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.java.util.common.concurrent.ScheduledExecutors; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.server.coordination.ChangeRequestHttpSyncer; +import org.apache.druid.server.coordination.ChangeRequestsSnapshot; +import org.apache.druid.server.coordination.DataSegmentChangeRequest; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.server.coordination.SegmentChangeRequestDrop; +import org.apache.druid.server.coordination.SegmentChangeRequestLoad; +import org.apache.druid.timeline.DataSegment; import java.net.MalformedURLException; import java.net.URL; diff --git a/server/src/main/java/io/druid/client/HttpServerInventoryViewConfig.java b/server/src/main/java/org/apache/druid/client/HttpServerInventoryViewConfig.java similarity index 98% rename from server/src/main/java/io/druid/client/HttpServerInventoryViewConfig.java rename to server/src/main/java/org/apache/druid/client/HttpServerInventoryViewConfig.java index 68632f2f88f8..6d0dcee1fca8 100644 --- a/server/src/main/java/io/druid/client/HttpServerInventoryViewConfig.java +++ b/server/src/main/java/org/apache/druid/client/HttpServerInventoryViewConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/client/HttpServerInventoryViewProvider.java b/server/src/main/java/org/apache/druid/client/HttpServerInventoryViewProvider.java similarity index 86% rename from server/src/main/java/io/druid/client/HttpServerInventoryViewProvider.java rename to server/src/main/java/org/apache/druid/client/HttpServerInventoryViewProvider.java index 4bc5b1246672..cad814710284 100644 --- a/server/src/main/java/io/druid/client/HttpServerInventoryViewProvider.java +++ b/server/src/main/java/org/apache/druid/client/HttpServerInventoryViewProvider.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Predicates; -import io.druid.java.util.http.client.HttpClient; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.guice.annotations.EscalatedClient; -import io.druid.guice.annotations.Smile; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.guice.annotations.EscalatedClient; +import org.apache.druid.guice.annotations.Smile; import javax.validation.constraints.NotNull; diff --git a/server/src/main/java/io/druid/client/HttpServerInventoryViewResource.java b/server/src/main/java/org/apache/druid/client/HttpServerInventoryViewResource.java similarity index 95% rename from server/src/main/java/io/druid/client/HttpServerInventoryViewResource.java rename to server/src/main/java/org/apache/druid/client/HttpServerInventoryViewResource.java index 4102306a3c79..cda761e6f2bc 100644 --- a/server/src/main/java/io/druid/client/HttpServerInventoryViewResource.java +++ b/server/src/main/java/org/apache/druid/client/HttpServerInventoryViewResource.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.google.inject.Inject; import com.sun.jersey.spi.container.ResourceFilters; -import io.druid.server.http.security.StateResourceFilter; +import org.apache.druid.server.http.security.StateResourceFilter; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/server/src/main/java/io/druid/client/ImmutableDruidDataSource.java b/server/src/main/java/org/apache/druid/client/ImmutableDruidDataSource.java similarity index 97% rename from server/src/main/java/io/druid/client/ImmutableDruidDataSource.java rename to server/src/main/java/org/apache/druid/client/ImmutableDruidDataSource.java index c1ff45e065a7..66b006465416 100644 --- a/server/src/main/java/io/druid/client/ImmutableDruidDataSource.java +++ b/server/src/main/java/org/apache/druid/client/ImmutableDruidDataSource.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -25,7 +25,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedMap; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import java.util.Collection; import java.util.Map; diff --git a/server/src/main/java/io/druid/client/ImmutableDruidServer.java b/server/src/main/java/org/apache/druid/client/ImmutableDruidServer.java similarity index 93% rename from server/src/main/java/io/druid/client/ImmutableDruidServer.java rename to server/src/main/java/org/apache/druid/client/ImmutableDruidServer.java index 22d5e7165366..5426d793d9d0 100644 --- a/server/src/main/java/io/druid/client/ImmutableDruidServer.java +++ b/server/src/main/java/org/apache/druid/client/ImmutableDruidServer.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.StringUtils; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.server.coordination.ServerType; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.timeline.DataSegment; import java.util.Map; diff --git a/server/src/main/java/io/druid/client/ImmutableSegmentLoadInfo.java b/server/src/main/java/org/apache/druid/client/ImmutableSegmentLoadInfo.java similarity index 94% rename from server/src/main/java/io/druid/client/ImmutableSegmentLoadInfo.java rename to server/src/main/java/org/apache/druid/client/ImmutableSegmentLoadInfo.java index 2e96d5de3c85..44da12a863b7 100644 --- a/server/src/main/java/io/druid/client/ImmutableSegmentLoadInfo.java +++ b/server/src/main/java/org/apache/druid/client/ImmutableSegmentLoadInfo.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.timeline.DataSegment; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.timeline.DataSegment; import java.util.Set; diff --git a/server/src/main/java/io/druid/client/InventoryView.java b/server/src/main/java/org/apache/druid/client/InventoryView.java similarity index 93% rename from server/src/main/java/io/druid/client/InventoryView.java rename to server/src/main/java/org/apache/druid/client/InventoryView.java index 1a957aa03252..6d09b7b362f6 100644 --- a/server/src/main/java/io/druid/client/InventoryView.java +++ b/server/src/main/java/org/apache/druid/client/InventoryView.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import java.util.Collection; diff --git a/server/src/main/java/io/druid/client/ResultLevelCacheUtil.java b/server/src/main/java/org/apache/druid/client/ResultLevelCacheUtil.java similarity index 87% rename from server/src/main/java/io/druid/client/ResultLevelCacheUtil.java rename to server/src/main/java/org/apache/druid/client/ResultLevelCacheUtil.java index 88146176ce16..95883080c1d6 100644 --- a/server/src/main/java/io/druid/client/ResultLevelCacheUtil.java +++ b/server/src/main/java/org/apache/druid/client/ResultLevelCacheUtil.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; -import io.druid.client.cache.Cache; -import io.druid.client.cache.CacheConfig; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.common.StringUtils; -import io.druid.query.CacheStrategy; -import io.druid.query.Query; -import io.druid.query.QueryContexts; +import org.apache.druid.client.cache.Cache; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.CacheStrategy; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryContexts; public class ResultLevelCacheUtil { diff --git a/server/src/main/java/io/druid/client/SegmentLoadInfo.java b/server/src/main/java/org/apache/druid/client/SegmentLoadInfo.java similarity index 94% rename from server/src/main/java/io/druid/client/SegmentLoadInfo.java rename to server/src/main/java/org/apache/druid/client/SegmentLoadInfo.java index 8de0c7bf1267..a9cca5b154a5 100644 --- a/server/src/main/java/io/druid/client/SegmentLoadInfo.java +++ b/server/src/main/java/org/apache/druid/client/SegmentLoadInfo.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.timeline.DataSegment; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.timeline.DataSegment; import java.util.Set; diff --git a/server/src/main/java/io/druid/client/ServerInventoryView.java b/server/src/main/java/org/apache/druid/client/ServerInventoryView.java similarity index 96% rename from server/src/main/java/io/druid/client/ServerInventoryView.java rename to server/src/main/java/org/apache/druid/client/ServerInventoryView.java index 97ea7c4d1d51..7ca4adb5f4b1 100644 --- a/server/src/main/java/io/druid/client/ServerInventoryView.java +++ b/server/src/main/java/org/apache/druid/client/ServerInventoryView.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; /** * Marker interface for making batch/single/http server inventory view configurable. diff --git a/server/src/main/java/io/druid/client/ServerInventoryViewProvider.java b/server/src/main/java/org/apache/druid/client/ServerInventoryViewProvider.java similarity index 97% rename from server/src/main/java/io/druid/client/ServerInventoryViewProvider.java rename to server/src/main/java/org/apache/druid/client/ServerInventoryViewProvider.java index 217b6501f487..ad34f70b6180 100644 --- a/server/src/main/java/io/druid/client/ServerInventoryViewProvider.java +++ b/server/src/main/java/org/apache/druid/client/ServerInventoryViewProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/server/src/main/java/io/druid/client/ServerView.java b/server/src/main/java/org/apache/druid/client/ServerView.java similarity index 97% rename from server/src/main/java/io/druid/client/ServerView.java rename to server/src/main/java/org/apache/druid/client/ServerView.java index 4fc92eda234e..ad335e7be755 100644 --- a/server/src/main/java/io/druid/client/ServerView.java +++ b/server/src/main/java/org/apache/druid/client/ServerView.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.timeline.DataSegment; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.timeline.DataSegment; import java.util.concurrent.Executor; diff --git a/server/src/main/java/io/druid/client/ServerViewUtil.java b/server/src/main/java/org/apache/druid/client/ServerViewUtil.java similarity index 82% rename from server/src/main/java/io/druid/client/ServerViewUtil.java rename to server/src/main/java/org/apache/druid/client/ServerViewUtil.java index b247bf3ba813..fd646b013df4 100644 --- a/server/src/main/java/io/druid/client/ServerViewUtil.java +++ b/server/src/main/java/org/apache/druid/client/ServerViewUtil.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.google.common.collect.Lists; -import io.druid.client.selector.ServerSelector; -import io.druid.query.DataSource; -import io.druid.query.LocatedSegmentDescriptor; -import io.druid.query.SegmentDescriptor; -import io.druid.query.TableDataSource; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.timeline.TimelineLookup; -import io.druid.timeline.TimelineObjectHolder; -import io.druid.timeline.partition.PartitionChunk; +import org.apache.druid.client.selector.ServerSelector; +import org.apache.druid.query.DataSource; +import org.apache.druid.query.LocatedSegmentDescriptor; +import org.apache.druid.query.SegmentDescriptor; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.timeline.TimelineLookup; +import org.apache.druid.timeline.TimelineObjectHolder; +import org.apache.druid.timeline.partition.PartitionChunk; import org.joda.time.Interval; import java.util.Collections; diff --git a/server/src/main/java/io/druid/client/SingleServerInventoryProvider.java b/server/src/main/java/org/apache/druid/client/SingleServerInventoryProvider.java similarity index 94% rename from server/src/main/java/io/druid/client/SingleServerInventoryProvider.java rename to server/src/main/java/org/apache/druid/client/SingleServerInventoryProvider.java index 491e84fe8fe7..c72c2ecff730 100644 --- a/server/src/main/java/io/druid/client/SingleServerInventoryProvider.java +++ b/server/src/main/java/org/apache/druid/client/SingleServerInventoryProvider.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Predicates; -import io.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.server.initialization.ZkPathsConfig; import org.apache.curator.framework.CuratorFramework; import javax.validation.constraints.NotNull; diff --git a/server/src/main/java/io/druid/client/SingleServerInventoryView.java b/server/src/main/java/org/apache/druid/client/SingleServerInventoryView.java similarity index 93% rename from server/src/main/java/io/druid/client/SingleServerInventoryView.java rename to server/src/main/java/org/apache/druid/client/SingleServerInventoryView.java index 4b669e04c91c..8a467e587518 100644 --- a/server/src/main/java/io/druid/client/SingleServerInventoryView.java +++ b/server/src/main/java/org/apache/druid/client/SingleServerInventoryView.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -25,12 +25,12 @@ import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.inject.Inject; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.guice.ManageLifecycle; -import io.druid.java.util.common.Pair; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.server.initialization.ZkPathsConfig; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.timeline.DataSegment; import org.apache.curator.framework.CuratorFramework; import java.util.concurrent.ConcurrentHashMap; diff --git a/server/src/main/java/io/druid/client/TimelineServerView.java b/server/src/main/java/org/apache/druid/client/TimelineServerView.java similarity index 87% rename from server/src/main/java/io/druid/client/TimelineServerView.java rename to server/src/main/java/org/apache/druid/client/TimelineServerView.java index d65cb6225e21..6ac5f622a197 100644 --- a/server/src/main/java/io/druid/client/TimelineServerView.java +++ b/server/src/main/java/org/apache/druid/client/TimelineServerView.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; -import io.druid.client.selector.ServerSelector; -import io.druid.query.DataSource; -import io.druid.query.QueryRunner; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.timeline.DataSegment; -import io.druid.timeline.TimelineLookup; +import org.apache.druid.client.selector.ServerSelector; +import org.apache.druid.query.DataSource; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.TimelineLookup; import javax.annotation.Nullable; import java.util.concurrent.Executor; diff --git a/server/src/main/java/io/druid/client/cache/BackgroundCachePopulator.java b/server/src/main/java/org/apache/druid/client/cache/BackgroundCachePopulator.java similarity index 95% rename from server/src/main/java/io/druid/client/cache/BackgroundCachePopulator.java rename to server/src/main/java/org/apache/druid/client/cache/BackgroundCachePopulator.java index d20fcf4f7e6b..9d61469e1a7d 100644 --- a/server/src/main/java/io/druid/client/cache/BackgroundCachePopulator.java +++ b/server/src/main/java/org/apache/druid/client/cache/BackgroundCachePopulator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.ObjectMapper; @@ -27,9 +27,9 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.logger.Logger; import java.io.ByteArrayOutputStream; import java.util.LinkedList; diff --git a/server/src/main/java/io/druid/client/cache/ByteCountingLRUMap.java b/server/src/main/java/org/apache/druid/client/cache/ByteCountingLRUMap.java similarity index 97% rename from server/src/main/java/io/druid/client/cache/ByteCountingLRUMap.java rename to server/src/main/java/org/apache/druid/client/cache/ByteCountingLRUMap.java index 3e07d6f4ac80..0ab61b179b69 100644 --- a/server/src/main/java/io/druid/client/cache/ByteCountingLRUMap.java +++ b/server/src/main/java/org/apache/druid/client/cache/ByteCountingLRUMap.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.logger.Logger; import java.nio.ByteBuffer; import java.util.ArrayList; diff --git a/server/src/main/java/io/druid/client/cache/BytesBoundedLinkedQueue.java b/server/src/main/java/org/apache/druid/client/cache/BytesBoundedLinkedQueue.java similarity index 98% rename from server/src/main/java/io/druid/client/cache/BytesBoundedLinkedQueue.java rename to server/src/main/java/org/apache/druid/client/cache/BytesBoundedLinkedQueue.java index 0719a3cc5a1f..6be223ade743 100644 --- a/server/src/main/java/io/druid/client/cache/BytesBoundedLinkedQueue.java +++ b/server/src/main/java/org/apache/druid/client/cache/BytesBoundedLinkedQueue.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; -import io.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.IAE; import java.util.AbstractQueue; import java.util.Collection; diff --git a/server/src/main/java/io/druid/client/cache/Cache.java b/server/src/main/java/org/apache/druid/client/cache/Cache.java similarity index 94% rename from server/src/main/java/io/druid/client/cache/Cache.java rename to server/src/main/java/org/apache/druid/client/cache/Cache.java index 3197e8cb7b5b..725a880a4da7 100644 --- a/server/src/main/java/io/druid/client/cache/Cache.java +++ b/server/src/main/java/org/apache/druid/client/cache/Cache.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.google.common.base.Preconditions; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/server/src/main/java/io/druid/client/cache/CacheConfig.java b/server/src/main/java/org/apache/druid/client/cache/CacheConfig.java similarity index 97% rename from server/src/main/java/io/druid/client/cache/CacheConfig.java rename to server/src/main/java/org/apache/druid/client/cache/CacheConfig.java index 7d8e35fd7c39..3450057c6bf2 100644 --- a/server/src/main/java/io/druid/client/cache/CacheConfig.java +++ b/server/src/main/java/org/apache/druid/client/cache/CacheConfig.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; -import io.druid.query.Query; +import org.apache.druid.query.Query; import javax.validation.constraints.Min; import java.util.List; diff --git a/server/src/main/java/io/druid/client/cache/CacheExecutorFactory.java b/server/src/main/java/org/apache/druid/client/cache/CacheExecutorFactory.java similarity index 91% rename from server/src/main/java/io/druid/client/cache/CacheExecutorFactory.java rename to server/src/main/java/org/apache/druid/client/cache/CacheExecutorFactory.java index 8d30a8eec84d..fd1212c5c221 100644 --- a/server/src/main/java/io/druid/client/cache/CacheExecutorFactory.java +++ b/server/src/main/java/org/apache/druid/client/cache/CacheExecutorFactory.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.fasterxml.jackson.annotation.JsonCreator; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.StringUtils; import java.util.concurrent.Executor; import java.util.concurrent.ForkJoinPool; diff --git a/server/src/main/java/io/druid/client/cache/CacheMonitor.java b/server/src/main/java/org/apache/druid/client/cache/CacheMonitor.java similarity index 93% rename from server/src/main/java/io/druid/client/cache/CacheMonitor.java rename to server/src/main/java/org/apache/druid/client/cache/CacheMonitor.java index 576f9dbfd2dd..43bcfb1c0eb3 100644 --- a/server/src/main/java/io/druid/client/cache/CacheMonitor.java +++ b/server/src/main/java/org/apache/druid/client/cache/CacheMonitor.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.google.inject.Inject; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.java.util.metrics.AbstractMonitor; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.metrics.AbstractMonitor; public class CacheMonitor extends AbstractMonitor { diff --git a/server/src/main/java/io/druid/client/cache/CachePopulator.java b/server/src/main/java/org/apache/druid/client/cache/CachePopulator.java similarity index 91% rename from server/src/main/java/io/druid/client/cache/CachePopulator.java rename to server/src/main/java/org/apache/druid/client/cache/CachePopulator.java index 5c8fc88776ff..0d67cb9a0eca 100644 --- a/server/src/main/java/io/druid/client/cache/CachePopulator.java +++ b/server/src/main/java/org/apache/druid/client/cache/CachePopulator.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; -import io.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequence; import java.util.function.Function; diff --git a/server/src/main/java/io/druid/client/cache/CachePopulatorStats.java b/server/src/main/java/org/apache/druid/client/cache/CachePopulatorStats.java similarity index 98% rename from server/src/main/java/io/druid/client/cache/CachePopulatorStats.java rename to server/src/main/java/org/apache/druid/client/cache/CachePopulatorStats.java index f1bcd30d8ddc..cfe4587fef7d 100644 --- a/server/src/main/java/io/druid/client/cache/CachePopulatorStats.java +++ b/server/src/main/java/org/apache/druid/client/cache/CachePopulatorStats.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import java.util.concurrent.atomic.AtomicLong; diff --git a/server/src/main/java/io/druid/client/cache/CacheProvider.java b/server/src/main/java/org/apache/druid/client/cache/CacheProvider.java similarity index 97% rename from server/src/main/java/io/druid/client/cache/CacheProvider.java rename to server/src/main/java/org/apache/druid/client/cache/CacheProvider.java index e8b8557498c5..3bb60bc05c42 100644 --- a/server/src/main/java/io/druid/client/cache/CacheProvider.java +++ b/server/src/main/java/org/apache/druid/client/cache/CacheProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/server/src/main/java/io/druid/client/cache/CacheStats.java b/server/src/main/java/org/apache/druid/client/cache/CacheStats.java similarity index 98% rename from server/src/main/java/io/druid/client/cache/CacheStats.java rename to server/src/main/java/org/apache/druid/client/cache/CacheStats.java index 564efe9b94e3..a1502a62f36b 100644 --- a/server/src/main/java/io/druid/client/cache/CacheStats.java +++ b/server/src/main/java/org/apache/druid/client/cache/CacheStats.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; /** */ diff --git a/server/src/main/java/io/druid/client/cache/CaffeineCache.java b/server/src/main/java/org/apache/druid/client/cache/CaffeineCache.java similarity index 94% rename from server/src/main/java/io/druid/client/cache/CaffeineCache.java rename to server/src/main/java/org/apache/druid/client/cache/CaffeineCache.java index 087ba239baf4..9682ca1cee20 100644 --- a/server/src/main/java/io/druid/client/cache/CaffeineCache.java +++ b/server/src/main/java/org/apache/druid/client/cache/CaffeineCache.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; @@ -25,9 +25,9 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; import net.jpountz.lz4.LZ4Compressor; import net.jpountz.lz4.LZ4Factory; import net.jpountz.lz4.LZ4FastDecompressor; @@ -39,7 +39,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -public class CaffeineCache implements io.druid.client.cache.Cache +public class CaffeineCache implements org.apache.druid.client.cache.Cache { private static final Logger log = new Logger(CaffeineCache.class); private static final int FIXED_COST = 8; // Minimum cost in "weight" per entry; @@ -115,14 +115,14 @@ public void close(String namespace) } @Override - public io.druid.client.cache.CacheStats getStats() + public org.apache.druid.client.cache.CacheStats getStats() { final CacheStats stats = cache.stats(); final long size = cache .policy().eviction() .map(eviction -> eviction.isWeighted() ? eviction.weightedSize() : OptionalLong.empty()) .orElse(OptionalLong.empty()).orElse(-1); - return new io.druid.client.cache.CacheStats( + return new org.apache.druid.client.cache.CacheStats( stats.hitCount(), stats.missCount(), cache.estimatedSize(), diff --git a/server/src/main/java/io/druid/client/cache/CaffeineCacheConfig.java b/server/src/main/java/org/apache/druid/client/cache/CaffeineCacheConfig.java similarity index 97% rename from server/src/main/java/io/druid/client/cache/CaffeineCacheConfig.java rename to server/src/main/java/org/apache/druid/client/cache/CaffeineCacheConfig.java index 585b87018975..44a552505c0c 100644 --- a/server/src/main/java/io/druid/client/cache/CaffeineCacheConfig.java +++ b/server/src/main/java/org/apache/druid/client/cache/CaffeineCacheConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.concurrent.Executor; diff --git a/server/src/main/java/io/druid/client/cache/CaffeineCacheProvider.java b/server/src/main/java/org/apache/druid/client/cache/CaffeineCacheProvider.java similarity index 96% rename from server/src/main/java/io/druid/client/cache/CaffeineCacheProvider.java rename to server/src/main/java/org/apache/druid/client/cache/CaffeineCacheProvider.java index 7dd696f316ac..90cdcb2115f0 100644 --- a/server/src/main/java/io/druid/client/cache/CaffeineCacheProvider.java +++ b/server/src/main/java/org/apache/druid/client/cache/CaffeineCacheProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; public class CaffeineCacheProvider extends CaffeineCacheConfig implements CacheProvider { diff --git a/server/src/main/java/io/druid/client/cache/ForegroundCachePopulator.java b/server/src/main/java/org/apache/druid/client/cache/ForegroundCachePopulator.java similarity index 93% rename from server/src/main/java/io/druid/client/cache/ForegroundCachePopulator.java rename to server/src/main/java/org/apache/druid/client/cache/ForegroundCachePopulator.java index 7e7fd5e386ec..5ace591c099c 100644 --- a/server/src/main/java/io/druid/client/cache/ForegroundCachePopulator.java +++ b/server/src/main/java/org/apache/druid/client/cache/ForegroundCachePopulator.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.SequenceWrapper; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.SequenceWrapper; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.logger.Logger; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/server/src/main/java/io/druid/client/cache/HybridCache.java b/server/src/main/java/org/apache/druid/client/cache/HybridCache.java similarity index 96% rename from server/src/main/java/io/druid/client/cache/HybridCache.java rename to server/src/main/java/org/apache/druid/client/cache/HybridCache.java index c25beff3da10..d940f7166185 100644 --- a/server/src/main/java/io/druid/client/cache/HybridCache.java +++ b/server/src/main/java/org/apache/druid/client/cache/HybridCache.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; import javax.annotation.Nullable; import java.util.Collections; diff --git a/server/src/main/java/io/druid/client/cache/HybridCacheConfig.java b/server/src/main/java/org/apache/druid/client/cache/HybridCacheConfig.java similarity index 97% rename from server/src/main/java/io/druid/client/cache/HybridCacheConfig.java rename to server/src/main/java/org/apache/druid/client/cache/HybridCacheConfig.java index 309260a050f5..c5bce807936e 100644 --- a/server/src/main/java/io/druid/client/cache/HybridCacheConfig.java +++ b/server/src/main/java/org/apache/druid/client/cache/HybridCacheConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/client/cache/HybridCacheProvider.java b/server/src/main/java/org/apache/druid/client/cache/HybridCacheProvider.java similarity index 97% rename from server/src/main/java/io/druid/client/cache/HybridCacheProvider.java rename to server/src/main/java/org/apache/druid/client/cache/HybridCacheProvider.java index 6fecdb0790b7..9278f393ce71 100644 --- a/server/src/main/java/io/druid/client/cache/HybridCacheProvider.java +++ b/server/src/main/java/org/apache/druid/client/cache/HybridCacheProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/server/src/main/java/io/druid/client/cache/LZ4Transcoder.java b/server/src/main/java/org/apache/druid/client/cache/LZ4Transcoder.java similarity index 98% rename from server/src/main/java/io/druid/client/cache/LZ4Transcoder.java rename to server/src/main/java/org/apache/druid/client/cache/LZ4Transcoder.java index fc9224c5f544..137a4ee130a2 100644 --- a/server/src/main/java/io/druid/client/cache/LZ4Transcoder.java +++ b/server/src/main/java/org/apache/druid/client/cache/LZ4Transcoder.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import net.jpountz.lz4.LZ4Compressor; import net.jpountz.lz4.LZ4Factory; diff --git a/server/src/main/java/io/druid/client/cache/LocalCacheProvider.java b/server/src/main/java/org/apache/druid/client/cache/LocalCacheProvider.java similarity index 97% rename from server/src/main/java/io/druid/client/cache/LocalCacheProvider.java rename to server/src/main/java/org/apache/druid/client/cache/LocalCacheProvider.java index 3eac478c7b3a..dc53f0ee1915 100644 --- a/server/src/main/java/io/druid/client/cache/LocalCacheProvider.java +++ b/server/src/main/java/org/apache/druid/client/cache/LocalCacheProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/client/cache/MapCache.java b/server/src/main/java/org/apache/druid/client/cache/MapCache.java similarity index 97% rename from server/src/main/java/io/druid/client/cache/MapCache.java rename to server/src/main/java/org/apache/druid/client/cache/MapCache.java index 116a4951b494..13a1e87356bb 100644 --- a/server/src/main/java/io/druid/client/cache/MapCache.java +++ b/server/src/main/java/org/apache/druid/client/cache/MapCache.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.primitives.Ints; -import io.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; import java.nio.ByteBuffer; import java.util.Collections; diff --git a/server/src/main/java/io/druid/client/cache/MemcacheClientPool.java b/server/src/main/java/org/apache/druid/client/cache/MemcacheClientPool.java similarity index 97% rename from server/src/main/java/io/druid/client/cache/MemcacheClientPool.java rename to server/src/main/java/org/apache/druid/client/cache/MemcacheClientPool.java index c5b33839a3bf..66b34eebafae 100644 --- a/server/src/main/java/io/druid/client/cache/MemcacheClientPool.java +++ b/server/src/main/java/org/apache/druid/client/cache/MemcacheClientPool.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.base.Supplier; -import io.druid.collections.ResourceHolder; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.collections.ResourceHolder; +import org.apache.druid.java.util.common.logger.Logger; import net.spy.memcached.MemcachedClientIF; import sun.misc.Cleaner; diff --git a/server/src/main/java/io/druid/client/cache/MemcachedCache.java b/server/src/main/java/org/apache/druid/client/cache/MemcachedCache.java similarity index 97% rename from server/src/main/java/io/druid/client/cache/MemcachedCache.java rename to server/src/main/java/org/apache/druid/client/cache/MemcachedCache.java index c93a0f60cd14..053c2970571a 100644 --- a/server/src/main/java/io/druid/client/cache/MemcachedCache.java +++ b/server/src/main/java/org/apache/druid/client/cache/MemcachedCache.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.google.common.base.Function; import com.google.common.base.Preconditions; @@ -30,13 +30,13 @@ import com.google.common.collect.Maps; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; -import io.druid.collections.ResourceHolder; -import io.druid.collections.StupidResourceHolder; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.java.util.metrics.AbstractMonitor; +import org.apache.druid.collections.ResourceHolder; +import org.apache.druid.collections.StupidResourceHolder; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.metrics.AbstractMonitor; import net.spy.memcached.AddrUtil; import net.spy.memcached.ConnectionFactory; import net.spy.memcached.ConnectionFactoryBuilder; diff --git a/server/src/main/java/io/druid/client/cache/MemcachedCacheConfig.java b/server/src/main/java/org/apache/druid/client/cache/MemcachedCacheConfig.java similarity index 98% rename from server/src/main/java/io/druid/client/cache/MemcachedCacheConfig.java rename to server/src/main/java/org/apache/druid/client/cache/MemcachedCacheConfig.java index 4b823196f0b1..6ad250396a04 100644 --- a/server/src/main/java/io/druid/client/cache/MemcachedCacheConfig.java +++ b/server/src/main/java/org/apache/druid/client/cache/MemcachedCacheConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.fasterxml.jackson.annotation.JsonProperty; import net.spy.memcached.DefaultConnectionFactory; diff --git a/server/src/main/java/io/druid/client/cache/MemcachedCacheProvider.java b/server/src/main/java/org/apache/druid/client/cache/MemcachedCacheProvider.java similarity index 96% rename from server/src/main/java/io/druid/client/cache/MemcachedCacheProvider.java rename to server/src/main/java/org/apache/druid/client/cache/MemcachedCacheProvider.java index 854aa3dc4651..4bd61cacfc46 100644 --- a/server/src/main/java/io/druid/client/cache/MemcachedCacheProvider.java +++ b/server/src/main/java/org/apache/druid/client/cache/MemcachedCacheProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; public class MemcachedCacheProvider extends MemcachedCacheConfig implements CacheProvider { diff --git a/server/src/main/java/io/druid/client/cache/MemcachedCustomConnectionFactoryBuilder.java b/server/src/main/java/org/apache/druid/client/cache/MemcachedCustomConnectionFactoryBuilder.java similarity index 99% rename from server/src/main/java/io/druid/client/cache/MemcachedCustomConnectionFactoryBuilder.java rename to server/src/main/java/org/apache/druid/client/cache/MemcachedCustomConnectionFactoryBuilder.java index da502e821e5c..5ca33e4bc7f3 100644 --- a/server/src/main/java/io/druid/client/cache/MemcachedCustomConnectionFactoryBuilder.java +++ b/server/src/main/java/org/apache/druid/client/cache/MemcachedCustomConnectionFactoryBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import net.spy.memcached.ArrayModNodeLocator; import net.spy.memcached.ConnectionFactory; diff --git a/server/src/main/java/io/druid/client/cache/MemcachedOperationQueueFactory.java b/server/src/main/java/org/apache/druid/client/cache/MemcachedOperationQueueFactory.java similarity index 97% rename from server/src/main/java/io/druid/client/cache/MemcachedOperationQueueFactory.java rename to server/src/main/java/org/apache/druid/client/cache/MemcachedOperationQueueFactory.java index 98646c6ef3dc..b046dc06c900 100644 --- a/server/src/main/java/io/druid/client/cache/MemcachedOperationQueueFactory.java +++ b/server/src/main/java/org/apache/druid/client/cache/MemcachedOperationQueueFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import net.spy.memcached.ops.Operation; import net.spy.memcached.ops.OperationQueueFactory; diff --git a/server/src/main/java/io/druid/client/coordinator/Coordinator.java b/server/src/main/java/org/apache/druid/client/coordinator/Coordinator.java similarity index 96% rename from server/src/main/java/io/druid/client/coordinator/Coordinator.java rename to server/src/main/java/org/apache/druid/client/coordinator/Coordinator.java index 6b2a6d54a69a..f1f6e98d7f1f 100644 --- a/server/src/main/java/io/druid/client/coordinator/Coordinator.java +++ b/server/src/main/java/org/apache/druid/client/coordinator/Coordinator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.coordinator; +package org.apache.druid.client.coordinator; import com.google.inject.BindingAnnotation; diff --git a/server/src/main/java/io/druid/client/coordinator/CoordinatorClient.java b/server/src/main/java/org/apache/druid/client/coordinator/CoordinatorClient.java similarity index 88% rename from server/src/main/java/io/druid/client/coordinator/CoordinatorClient.java rename to server/src/main/java/org/apache/druid/client/coordinator/CoordinatorClient.java index 21f68565418e..c278dba05c0b 100644 --- a/server/src/main/java/io/druid/client/coordinator/CoordinatorClient.java +++ b/server/src/main/java/org/apache/druid/client/coordinator/CoordinatorClient.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.client.coordinator; +package org.apache.druid.client.coordinator; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Throwables; import com.google.inject.Inject; -import io.druid.java.util.http.client.response.FullResponseHolder; -import io.druid.client.ImmutableSegmentLoadInfo; -import io.druid.discovery.DruidLeaderClient; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.http.client.response.FullResponseHolder; +import org.apache.druid.client.ImmutableSegmentLoadInfo; +import org.apache.druid.discovery.DruidLeaderClient; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; import org.jboss.netty.handler.codec.http.HttpMethod; import org.jboss.netty.handler.codec.http.HttpResponseStatus; import org.joda.time.Interval; diff --git a/server/src/main/java/io/druid/client/coordinator/CoordinatorSelectorConfig.java b/server/src/main/java/org/apache/druid/client/coordinator/CoordinatorSelectorConfig.java similarity index 96% rename from server/src/main/java/io/druid/client/coordinator/CoordinatorSelectorConfig.java rename to server/src/main/java/org/apache/druid/client/coordinator/CoordinatorSelectorConfig.java index fc668a40406c..de6ff8c8c2ad 100644 --- a/server/src/main/java/io/druid/client/coordinator/CoordinatorSelectorConfig.java +++ b/server/src/main/java/org/apache/druid/client/coordinator/CoordinatorSelectorConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.coordinator; +package org.apache.druid.client.coordinator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/client/indexing/ClientAppendQuery.java b/server/src/main/java/org/apache/druid/client/indexing/ClientAppendQuery.java similarity index 95% rename from server/src/main/java/io/druid/client/indexing/ClientAppendQuery.java rename to server/src/main/java/org/apache/druid/client/indexing/ClientAppendQuery.java index 28ee304b893f..4271200e7f69 100644 --- a/server/src/main/java/io/druid/client/indexing/ClientAppendQuery.java +++ b/server/src/main/java/org/apache/druid/client/indexing/ClientAppendQuery.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.client.indexing; +package org.apache.druid.client.indexing; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import java.util.List; diff --git a/server/src/main/java/io/druid/client/indexing/ClientCompactQuery.java b/server/src/main/java/org/apache/druid/client/indexing/ClientCompactQuery.java similarity index 96% rename from server/src/main/java/io/druid/client/indexing/ClientCompactQuery.java rename to server/src/main/java/org/apache/druid/client/indexing/ClientCompactQuery.java index db40fecf439e..8cf4c791ee91 100644 --- a/server/src/main/java/io/druid/client/indexing/ClientCompactQuery.java +++ b/server/src/main/java/org/apache/druid/client/indexing/ClientCompactQuery.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.client.indexing; +package org.apache.druid.client.indexing; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import java.util.List; import java.util.Map; diff --git a/server/src/main/java/io/druid/client/indexing/ClientCompactQueryTuningConfig.java b/server/src/main/java/org/apache/druid/client/indexing/ClientCompactQueryTuningConfig.java similarity index 97% rename from server/src/main/java/io/druid/client/indexing/ClientCompactQueryTuningConfig.java rename to server/src/main/java/org/apache/druid/client/indexing/ClientCompactQueryTuningConfig.java index 509dc3e33461..a15d7feb61aa 100644 --- a/server/src/main/java/io/druid/client/indexing/ClientCompactQueryTuningConfig.java +++ b/server/src/main/java/org/apache/druid/client/indexing/ClientCompactQueryTuningConfig.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.client.indexing; +package org.apache.druid.client.indexing; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.segment.IndexSpec; +import org.apache.druid.segment.IndexSpec; import javax.annotation.Nullable; import java.util.Objects; diff --git a/server/src/main/java/io/druid/client/indexing/ClientConversionQuery.java b/server/src/main/java/org/apache/druid/client/indexing/ClientConversionQuery.java similarity index 95% rename from server/src/main/java/io/druid/client/indexing/ClientConversionQuery.java rename to server/src/main/java/org/apache/druid/client/indexing/ClientConversionQuery.java index cf650a6c9dd5..b38bc7d6d839 100644 --- a/server/src/main/java/io/druid/client/indexing/ClientConversionQuery.java +++ b/server/src/main/java/org/apache/druid/client/indexing/ClientConversionQuery.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.client.indexing; +package org.apache.druid.client.indexing; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; /** diff --git a/server/src/main/java/io/druid/client/indexing/ClientKillQuery.java b/server/src/main/java/org/apache/druid/client/indexing/ClientKillQuery.java similarity index 97% rename from server/src/main/java/io/druid/client/indexing/ClientKillQuery.java rename to server/src/main/java/org/apache/druid/client/indexing/ClientKillQuery.java index ace85eef0a06..4d972463295c 100644 --- a/server/src/main/java/io/druid/client/indexing/ClientKillQuery.java +++ b/server/src/main/java/org/apache/druid/client/indexing/ClientKillQuery.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.indexing; +package org.apache.druid.client.indexing; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/client/indexing/ClientMergeQuery.java b/server/src/main/java/org/apache/druid/client/indexing/ClientMergeQuery.java similarity index 93% rename from server/src/main/java/io/druid/client/indexing/ClientMergeQuery.java rename to server/src/main/java/org/apache/druid/client/indexing/ClientMergeQuery.java index dc7bc41783c5..3800953950f8 100644 --- a/server/src/main/java/io/druid/client/indexing/ClientMergeQuery.java +++ b/server/src/main/java/org/apache/druid/client/indexing/ClientMergeQuery.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.client.indexing; +package org.apache.druid.client.indexing; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.timeline.DataSegment; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.timeline.DataSegment; import java.util.List; diff --git a/server/src/main/java/io/druid/client/indexing/HttpIndexingServiceClient.java b/server/src/main/java/org/apache/druid/client/indexing/HttpIndexingServiceClient.java similarity index 94% rename from server/src/main/java/io/druid/client/indexing/HttpIndexingServiceClient.java rename to server/src/main/java/org/apache/druid/client/indexing/HttpIndexingServiceClient.java index c81bb0f5f4f5..a3cf5c608c92 100644 --- a/server/src/main/java/io/druid/client/indexing/HttpIndexingServiceClient.java +++ b/server/src/main/java/org/apache/druid/client/indexing/HttpIndexingServiceClient.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.client.indexing; +package org.apache.druid.client.indexing; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; import com.google.inject.Inject; -import io.druid.discovery.DruidLeaderClient; -import io.druid.indexer.TaskStatusPlus; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.jackson.JacksonUtils; -import io.druid.java.util.http.client.response.FullResponseHolder; -import io.druid.timeline.DataSegment; +import org.apache.druid.discovery.DruidLeaderClient; +import org.apache.druid.indexer.TaskStatusPlus; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.java.util.http.client.response.FullResponseHolder; +import org.apache.druid.timeline.DataSegment; import org.jboss.netty.handler.codec.http.HttpMethod; import org.jboss.netty.handler.codec.http.HttpResponseStatus; import org.joda.time.DateTime; diff --git a/server/src/main/java/io/druid/client/indexing/IndexingService.java b/server/src/main/java/org/apache/druid/client/indexing/IndexingService.java similarity index 96% rename from server/src/main/java/io/druid/client/indexing/IndexingService.java rename to server/src/main/java/org/apache/druid/client/indexing/IndexingService.java index 160df8345f0c..f0c467f36a2f 100644 --- a/server/src/main/java/io/druid/client/indexing/IndexingService.java +++ b/server/src/main/java/org/apache/druid/client/indexing/IndexingService.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.indexing; +package org.apache.druid.client.indexing; import com.google.inject.BindingAnnotation; diff --git a/server/src/main/java/io/druid/client/indexing/IndexingServiceClient.java b/server/src/main/java/org/apache/druid/client/indexing/IndexingServiceClient.java similarity index 92% rename from server/src/main/java/io/druid/client/indexing/IndexingServiceClient.java rename to server/src/main/java/org/apache/druid/client/indexing/IndexingServiceClient.java index 72c9794b3660..a15cd54af4db 100644 --- a/server/src/main/java/io/druid/client/indexing/IndexingServiceClient.java +++ b/server/src/main/java/org/apache/druid/client/indexing/IndexingServiceClient.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.client.indexing; +package org.apache.druid.client.indexing; -import io.druid.indexer.TaskStatusPlus; -import io.druid.timeline.DataSegment; +import org.apache.druid.indexer.TaskStatusPlus; +import org.apache.druid.timeline.DataSegment; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/server/src/main/java/io/druid/client/indexing/IndexingServiceSelectorConfig.java b/server/src/main/java/org/apache/druid/client/indexing/IndexingServiceSelectorConfig.java similarity index 96% rename from server/src/main/java/io/druid/client/indexing/IndexingServiceSelectorConfig.java rename to server/src/main/java/org/apache/druid/client/indexing/IndexingServiceSelectorConfig.java index 7bdef3842094..0189fd622b54 100644 --- a/server/src/main/java/io/druid/client/indexing/IndexingServiceSelectorConfig.java +++ b/server/src/main/java/org/apache/druid/client/indexing/IndexingServiceSelectorConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.indexing; +package org.apache.druid.client.indexing; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/client/indexing/IndexingWorker.java b/server/src/main/java/org/apache/druid/client/indexing/IndexingWorker.java similarity index 94% rename from server/src/main/java/io/druid/client/indexing/IndexingWorker.java rename to server/src/main/java/org/apache/druid/client/indexing/IndexingWorker.java index 377cc96d6411..129117533c28 100644 --- a/server/src/main/java/io/druid/client/indexing/IndexingWorker.java +++ b/server/src/main/java/org/apache/druid/client/indexing/IndexingWorker.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.client.indexing; +package org.apache.druid.client.indexing; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; /** - * Should be synchronized with io.druid.indexing.worker.Worker + * Should be synchronized with org.apache.druid.indexing.worker.Worker */ public class IndexingWorker { diff --git a/server/src/main/java/io/druid/client/indexing/IndexingWorkerInfo.java b/server/src/main/java/org/apache/druid/client/indexing/IndexingWorkerInfo.java similarity index 95% rename from server/src/main/java/io/druid/client/indexing/IndexingWorkerInfo.java rename to server/src/main/java/org/apache/druid/client/indexing/IndexingWorkerInfo.java index cbfb7361bb23..b60fbc4218a1 100644 --- a/server/src/main/java/io/druid/client/indexing/IndexingWorkerInfo.java +++ b/server/src/main/java/org/apache/druid/client/indexing/IndexingWorkerInfo.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.indexing; +package org.apache.druid.client.indexing; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -28,7 +28,7 @@ import java.util.Set; /** - * Should be synchronized with io.druid.indexing.overlord.ImmutableWorkerInfo + * Should be synchronized with org.apache.druid.indexing.overlord.ImmutableWorkerInfo */ public class IndexingWorkerInfo { diff --git a/server/src/main/java/io/druid/client/indexing/QueryStatus.java b/server/src/main/java/org/apache/druid/client/indexing/QueryStatus.java similarity index 94% rename from server/src/main/java/io/druid/client/indexing/QueryStatus.java rename to server/src/main/java/org/apache/druid/client/indexing/QueryStatus.java index 78d36cbbb593..b9348731bdae 100644 --- a/server/src/main/java/io/druid/client/indexing/QueryStatus.java +++ b/server/src/main/java/org/apache/druid/client/indexing/QueryStatus.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.indexing; +package org.apache.druid.client.indexing; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -26,7 +26,7 @@ import com.google.common.base.Preconditions; /** - * Should be synchronized with io.druid.indexing.common.TaskStatus. + * Should be synchronized with org.apache.druid.indexing.common.TaskStatus. */ public class QueryStatus { diff --git a/server/src/main/java/io/druid/client/indexing/TaskStatus.java b/server/src/main/java/org/apache/druid/client/indexing/TaskStatus.java similarity index 94% rename from server/src/main/java/io/druid/client/indexing/TaskStatus.java rename to server/src/main/java/org/apache/druid/client/indexing/TaskStatus.java index 708106d2bb99..cb506876cd36 100644 --- a/server/src/main/java/io/druid/client/indexing/TaskStatus.java +++ b/server/src/main/java/org/apache/druid/client/indexing/TaskStatus.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.client.indexing; +package org.apache.druid.client.indexing; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Objects; import com.google.common.base.Preconditions; -import io.druid.indexer.TaskState; +import org.apache.druid.indexer.TaskState; /** - * Should be synced with io.druid.indexing.common.TaskStatus + * Should be synced with org.apache.druid.indexing.common.TaskStatus */ public class TaskStatus { diff --git a/server/src/main/java/io/druid/client/indexing/TaskStatusResponse.java b/server/src/main/java/org/apache/druid/client/indexing/TaskStatusResponse.java similarity index 92% rename from server/src/main/java/io/druid/client/indexing/TaskStatusResponse.java rename to server/src/main/java/org/apache/druid/client/indexing/TaskStatusResponse.java index f9c5191a0a07..08a85193f2d2 100644 --- a/server/src/main/java/io/druid/client/indexing/TaskStatusResponse.java +++ b/server/src/main/java/org/apache/druid/client/indexing/TaskStatusResponse.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.client.indexing; +package org.apache.druid.client.indexing; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.indexer.TaskStatusPlus; +import org.apache.druid.indexer.TaskStatusPlus; import javax.annotation.Nullable; import java.util.Objects; /** - * Should be synced with io.druid.indexing.overlord.http.TaskStatusResponse + * Should be synced with org.apache.druid.indexing.overlord.http.TaskStatusResponse */ public class TaskStatusResponse { diff --git a/server/src/main/java/io/druid/client/selector/AbstractTierSelectorStrategy.java b/server/src/main/java/org/apache/druid/client/selector/AbstractTierSelectorStrategy.java similarity index 96% rename from server/src/main/java/io/druid/client/selector/AbstractTierSelectorStrategy.java rename to server/src/main/java/org/apache/druid/client/selector/AbstractTierSelectorStrategy.java index 31cbb85f0dda..80cc4f73e18b 100644 --- a/server/src/main/java/io/druid/client/selector/AbstractTierSelectorStrategy.java +++ b/server/src/main/java/org/apache/druid/client/selector/AbstractTierSelectorStrategy.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.client.selector; +package org.apache.druid.client.selector; import com.google.common.collect.Iterables; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap; import javax.annotation.Nullable; diff --git a/server/src/main/java/io/druid/client/selector/ConnectionCountServerSelectorStrategy.java b/server/src/main/java/org/apache/druid/client/selector/ConnectionCountServerSelectorStrategy.java similarity index 95% rename from server/src/main/java/io/druid/client/selector/ConnectionCountServerSelectorStrategy.java rename to server/src/main/java/org/apache/druid/client/selector/ConnectionCountServerSelectorStrategy.java index 1653a45b9b52..8e12aa798018 100644 --- a/server/src/main/java/io/druid/client/selector/ConnectionCountServerSelectorStrategy.java +++ b/server/src/main/java/org/apache/druid/client/selector/ConnectionCountServerSelectorStrategy.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.client.selector; +package org.apache.druid.client.selector; import com.google.common.collect.ImmutableList; import com.google.common.collect.Ordering; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import java.util.Collections; import java.util.Comparator; diff --git a/server/src/main/java/io/druid/client/selector/CustomTierSelectorStrategy.java b/server/src/main/java/org/apache/druid/client/selector/CustomTierSelectorStrategy.java similarity index 97% rename from server/src/main/java/io/druid/client/selector/CustomTierSelectorStrategy.java rename to server/src/main/java/org/apache/druid/client/selector/CustomTierSelectorStrategy.java index 4a8293749b4a..fb47baaae15d 100644 --- a/server/src/main/java/io/druid/client/selector/CustomTierSelectorStrategy.java +++ b/server/src/main/java/org/apache/druid/client/selector/CustomTierSelectorStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.selector; +package org.apache.druid.client.selector; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/server/src/main/java/io/druid/client/selector/CustomTierSelectorStrategyConfig.java b/server/src/main/java/org/apache/druid/client/selector/CustomTierSelectorStrategyConfig.java similarity index 96% rename from server/src/main/java/io/druid/client/selector/CustomTierSelectorStrategyConfig.java rename to server/src/main/java/org/apache/druid/client/selector/CustomTierSelectorStrategyConfig.java index 6fb5d4696dd6..7d5c992220a3 100644 --- a/server/src/main/java/io/druid/client/selector/CustomTierSelectorStrategyConfig.java +++ b/server/src/main/java/org/apache/druid/client/selector/CustomTierSelectorStrategyConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.selector; +package org.apache.druid.client.selector; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.Lists; diff --git a/server/src/main/java/io/druid/client/selector/DiscoverySelector.java b/server/src/main/java/org/apache/druid/client/selector/DiscoverySelector.java similarity index 95% rename from server/src/main/java/io/druid/client/selector/DiscoverySelector.java rename to server/src/main/java/org/apache/druid/client/selector/DiscoverySelector.java index 9f30578d3b51..4191de116a24 100644 --- a/server/src/main/java/io/druid/client/selector/DiscoverySelector.java +++ b/server/src/main/java/org/apache/druid/client/selector/DiscoverySelector.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.selector; +package org.apache.druid.client.selector; import javax.annotation.Nullable; diff --git a/server/src/main/java/io/druid/client/selector/HighestPriorityTierSelectorStrategy.java b/server/src/main/java/org/apache/druid/client/selector/HighestPriorityTierSelectorStrategy.java similarity index 96% rename from server/src/main/java/io/druid/client/selector/HighestPriorityTierSelectorStrategy.java rename to server/src/main/java/org/apache/druid/client/selector/HighestPriorityTierSelectorStrategy.java index ceeeccb906c8..6d5b5a6c6fd1 100644 --- a/server/src/main/java/io/druid/client/selector/HighestPriorityTierSelectorStrategy.java +++ b/server/src/main/java/org/apache/druid/client/selector/HighestPriorityTierSelectorStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.selector; +package org.apache.druid.client.selector; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/server/src/main/java/io/druid/client/selector/LowestPriorityTierSelectorStrategy.java b/server/src/main/java/org/apache/druid/client/selector/LowestPriorityTierSelectorStrategy.java similarity index 96% rename from server/src/main/java/io/druid/client/selector/LowestPriorityTierSelectorStrategy.java rename to server/src/main/java/org/apache/druid/client/selector/LowestPriorityTierSelectorStrategy.java index 93ecb4fdce81..311881662b59 100644 --- a/server/src/main/java/io/druid/client/selector/LowestPriorityTierSelectorStrategy.java +++ b/server/src/main/java/org/apache/druid/client/selector/LowestPriorityTierSelectorStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.selector; +package org.apache.druid.client.selector; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/server/src/main/java/io/druid/client/selector/QueryableDruidServer.java b/server/src/main/java/org/apache/druid/client/selector/QueryableDruidServer.java similarity index 90% rename from server/src/main/java/io/druid/client/selector/QueryableDruidServer.java rename to server/src/main/java/org/apache/druid/client/selector/QueryableDruidServer.java index 68f400ac021d..b98f1518b147 100644 --- a/server/src/main/java/io/druid/client/selector/QueryableDruidServer.java +++ b/server/src/main/java/org/apache/druid/client/selector/QueryableDruidServer.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.client.selector; +package org.apache.druid.client.selector; -import io.druid.client.DirectDruidClient; -import io.druid.client.DruidServer; +import org.apache.druid.client.DirectDruidClient; +import org.apache.druid.client.DruidServer; /** */ diff --git a/server/src/main/java/io/druid/client/selector/RandomServerSelectorStrategy.java b/server/src/main/java/org/apache/druid/client/selector/RandomServerSelectorStrategy.java similarity index 95% rename from server/src/main/java/io/druid/client/selector/RandomServerSelectorStrategy.java rename to server/src/main/java/org/apache/druid/client/selector/RandomServerSelectorStrategy.java index 799b784d2a8c..4b6833140f2e 100644 --- a/server/src/main/java/io/druid/client/selector/RandomServerSelectorStrategy.java +++ b/server/src/main/java/org/apache/druid/client/selector/RandomServerSelectorStrategy.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.client.selector; +package org.apache.druid.client.selector; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import java.util.Collections; import java.util.List; diff --git a/server/src/main/java/io/druid/client/selector/Server.java b/server/src/main/java/org/apache/druid/client/selector/Server.java similarity index 95% rename from server/src/main/java/io/druid/client/selector/Server.java rename to server/src/main/java/org/apache/druid/client/selector/Server.java index 08b68da49321..9c6913f5361f 100644 --- a/server/src/main/java/io/druid/client/selector/Server.java +++ b/server/src/main/java/org/apache/druid/client/selector/Server.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.selector; +package org.apache.druid.client.selector; /** */ diff --git a/server/src/main/java/io/druid/client/selector/ServerSelector.java b/server/src/main/java/org/apache/druid/client/selector/ServerSelector.java similarity index 95% rename from server/src/main/java/io/druid/client/selector/ServerSelector.java rename to server/src/main/java/org/apache/druid/client/selector/ServerSelector.java index 5c9a07f3f925..0d9deb17b278 100644 --- a/server/src/main/java/io/druid/client/selector/ServerSelector.java +++ b/server/src/main/java/org/apache/druid/client/selector/ServerSelector.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.client.selector; +package org.apache.druid.client.selector; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.server.coordination.ServerType; -import io.druid.timeline.DataSegment; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.timeline.DataSegment; import it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap; import java.util.ArrayList; diff --git a/server/src/main/java/io/druid/client/selector/ServerSelectorStrategy.java b/server/src/main/java/org/apache/druid/client/selector/ServerSelectorStrategy.java similarity index 94% rename from server/src/main/java/io/druid/client/selector/ServerSelectorStrategy.java rename to server/src/main/java/org/apache/druid/client/selector/ServerSelectorStrategy.java index bf6d08774d7c..79110d39a4ae 100644 --- a/server/src/main/java/io/druid/client/selector/ServerSelectorStrategy.java +++ b/server/src/main/java/org/apache/druid/client/selector/ServerSelectorStrategy.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.client.selector; +package org.apache.druid.client.selector; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import java.util.List; import java.util.Set; diff --git a/server/src/main/java/io/druid/client/selector/TierSelectorStrategy.java b/server/src/main/java/org/apache/druid/client/selector/TierSelectorStrategy.java similarity index 95% rename from server/src/main/java/io/druid/client/selector/TierSelectorStrategy.java rename to server/src/main/java/org/apache/druid/client/selector/TierSelectorStrategy.java index 54895003911b..5393d2bea947 100644 --- a/server/src/main/java/io/druid/client/selector/TierSelectorStrategy.java +++ b/server/src/main/java/org/apache/druid/client/selector/TierSelectorStrategy.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.client.selector; +package org.apache.druid.client.selector; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap; import javax.annotation.Nullable; diff --git a/server/src/main/java/io/druid/curator/CuratorConfig.java b/server/src/main/java/org/apache/druid/curator/CuratorConfig.java similarity index 94% rename from server/src/main/java/io/druid/curator/CuratorConfig.java rename to server/src/main/java/org/apache/druid/curator/CuratorConfig.java index ff87a9a50152..f3fac4229e41 100644 --- a/server/src/main/java/io/druid/curator/CuratorConfig.java +++ b/server/src/main/java/org/apache/druid/curator/CuratorConfig.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.curator; +package org.apache.druid.curator; import javax.validation.constraints.Min; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.metadata.DefaultPasswordProvider; -import io.druid.metadata.PasswordProvider; +import org.apache.druid.metadata.DefaultPasswordProvider; +import org.apache.druid.metadata.PasswordProvider; /** */ diff --git a/server/src/main/java/io/druid/curator/CuratorModule.java b/server/src/main/java/org/apache/druid/curator/CuratorModule.java similarity index 94% rename from server/src/main/java/io/druid/curator/CuratorModule.java rename to server/src/main/java/org/apache/druid/curator/CuratorModule.java index 163ae73c3712..f6b0ab196854 100644 --- a/server/src/main/java/io/druid/curator/CuratorModule.java +++ b/server/src/main/java/org/apache/druid/curator/CuratorModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.curator; +package org.apache.druid.curator; import java.nio.charset.StandardCharsets; import java.util.List; @@ -41,11 +41,11 @@ import com.google.inject.Module; import com.google.inject.Provides; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.LazySingleton; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.common.logger.Logger; /** */ diff --git a/server/src/main/java/io/druid/curator/CuratorUtils.java b/server/src/main/java/org/apache/druid/curator/CuratorUtils.java similarity index 96% rename from server/src/main/java/io/druid/curator/CuratorUtils.java rename to server/src/main/java/org/apache/druid/curator/CuratorUtils.java index 6dcdd24400b1..1ae6eceb4af6 100644 --- a/server/src/main/java/io/druid/curator/CuratorUtils.java +++ b/server/src/main/java/org/apache/druid/curator/CuratorUtils.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.curator; +package org.apache.druid.curator; import org.apache.curator.framework.CuratorFramework; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.KeeperException; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.logger.Logger; public class CuratorUtils { diff --git a/server/src/main/java/io/druid/curator/ExhibitorConfig.java b/server/src/main/java/org/apache/druid/curator/ExhibitorConfig.java similarity index 98% rename from server/src/main/java/io/druid/curator/ExhibitorConfig.java rename to server/src/main/java/org/apache/druid/curator/ExhibitorConfig.java index abb6848a7428..0a29bd72a442 100644 --- a/server/src/main/java/io/druid/curator/ExhibitorConfig.java +++ b/server/src/main/java/org/apache/druid/curator/ExhibitorConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.curator; +package org.apache.druid.curator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/curator/PotentiallyGzippedCompressionProvider.java b/server/src/main/java/org/apache/druid/curator/PotentiallyGzippedCompressionProvider.java similarity index 97% rename from server/src/main/java/io/druid/curator/PotentiallyGzippedCompressionProvider.java rename to server/src/main/java/org/apache/druid/curator/PotentiallyGzippedCompressionProvider.java index 963fb8457803..7acddc49aa56 100644 --- a/server/src/main/java/io/druid/curator/PotentiallyGzippedCompressionProvider.java +++ b/server/src/main/java/org/apache/druid/curator/PotentiallyGzippedCompressionProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.curator; +package org.apache.druid.curator; import org.apache.curator.framework.api.CompressionProvider; import org.apache.curator.framework.imps.GzipCompressionProvider; diff --git a/server/src/main/java/io/druid/curator/announcement/Announcer.java b/server/src/main/java/org/apache/druid/curator/announcement/Announcer.java similarity index 96% rename from server/src/main/java/io/druid/curator/announcement/Announcer.java rename to server/src/main/java/org/apache/druid/curator/announcement/Announcer.java index 19457bedb97e..32ea8f7f03c2 100644 --- a/server/src/main/java/io/druid/curator/announcement/Announcer.java +++ b/server/src/main/java/org/apache/druid/curator/announcement/Announcer.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.curator.announcement; +package org.apache.druid.curator.announcement; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Throwables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import io.druid.curator.cache.PathChildrenCacheFactory; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.guava.CloseQuietly; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.curator.cache.PathChildrenCacheFactory; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.guava.CloseQuietly; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.common.logger.Logger; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.api.transaction.CuratorTransaction; import org.apache.curator.framework.api.transaction.CuratorTransactionFinal; diff --git a/server/src/main/java/io/druid/curator/cache/PathChildrenCacheFactory.java b/server/src/main/java/org/apache/druid/curator/cache/PathChildrenCacheFactory.java similarity index 98% rename from server/src/main/java/io/druid/curator/cache/PathChildrenCacheFactory.java rename to server/src/main/java/org/apache/druid/curator/cache/PathChildrenCacheFactory.java index 3b268422c753..6bb53ca4f49b 100644 --- a/server/src/main/java/io/druid/curator/cache/PathChildrenCacheFactory.java +++ b/server/src/main/java/org/apache/druid/curator/cache/PathChildrenCacheFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.curator.cache; +package org.apache.druid.curator.cache; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.recipes.cache.PathChildrenCache; diff --git a/server/src/main/java/io/druid/curator/discovery/CuratorDruidLeaderSelector.java b/server/src/main/java/org/apache/druid/curator/discovery/CuratorDruidLeaderSelector.java similarity index 92% rename from server/src/main/java/io/druid/curator/discovery/CuratorDruidLeaderSelector.java rename to server/src/main/java/org/apache/druid/curator/discovery/CuratorDruidLeaderSelector.java index 583306d00848..32d18a1663de 100644 --- a/server/src/main/java/io/druid/curator/discovery/CuratorDruidLeaderSelector.java +++ b/server/src/main/java/org/apache/druid/curator/discovery/CuratorDruidLeaderSelector.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.curator.discovery; +package org.apache.druid.curator.discovery; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; -import io.druid.concurrent.LifecycleLock; -import io.druid.discovery.DruidLeaderSelector; -import io.druid.guice.annotations.Self; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.guava.CloseQuietly; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.server.DruidNode; +import org.apache.druid.concurrent.LifecycleLock; +import org.apache.druid.discovery.DruidLeaderSelector; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.guava.CloseQuietly; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.server.DruidNode; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.recipes.leader.LeaderLatch; import org.apache.curator.framework.recipes.leader.LeaderLatchListener; diff --git a/server/src/main/java/io/druid/curator/discovery/CuratorDruidNodeAnnouncer.java b/server/src/main/java/org/apache/druid/curator/discovery/CuratorDruidNodeAnnouncer.java similarity index 87% rename from server/src/main/java/io/druid/curator/discovery/CuratorDruidNodeAnnouncer.java rename to server/src/main/java/org/apache/druid/curator/discovery/CuratorDruidNodeAnnouncer.java index 43853109d2f4..26adb758559b 100644 --- a/server/src/main/java/io/druid/curator/discovery/CuratorDruidNodeAnnouncer.java +++ b/server/src/main/java/org/apache/druid/curator/discovery/CuratorDruidNodeAnnouncer.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.curator.discovery; +package org.apache.druid.curator.discovery; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Throwables; import com.google.inject.Inject; -import io.druid.curator.announcement.Announcer; -import io.druid.discovery.DiscoveryDruidNode; -import io.druid.discovery.DruidNodeAnnouncer; -import io.druid.guice.annotations.Json; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.curator.announcement.Announcer; +import org.apache.druid.discovery.DiscoveryDruidNode; +import org.apache.druid.discovery.DruidNodeAnnouncer; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.initialization.ZkPathsConfig; import org.apache.curator.utils.ZKPaths; /** diff --git a/server/src/main/java/io/druid/curator/discovery/CuratorDruidNodeDiscoveryProvider.java b/server/src/main/java/org/apache/druid/curator/discovery/CuratorDruidNodeDiscoveryProvider.java similarity index 94% rename from server/src/main/java/io/druid/curator/discovery/CuratorDruidNodeDiscoveryProvider.java rename to server/src/main/java/org/apache/druid/curator/discovery/CuratorDruidNodeDiscoveryProvider.java index c47c741d9627..a90a64e68bd6 100644 --- a/server/src/main/java/io/druid/curator/discovery/CuratorDruidNodeDiscoveryProvider.java +++ b/server/src/main/java/org/apache/druid/curator/discovery/CuratorDruidNodeDiscoveryProvider.java @@ -17,26 +17,26 @@ * under the License. */ -package io.druid.curator.discovery; +package org.apache.druid.curator.discovery; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.inject.Inject; -import io.druid.concurrent.LifecycleLock; -import io.druid.discovery.DiscoveryDruidNode; -import io.druid.discovery.DruidNodeDiscovery; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.guice.ManageLifecycle; -import io.druid.guice.annotations.Json; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.concurrent.LifecycleLock; +import org.apache.druid.discovery.DiscoveryDruidNode; +import org.apache.druid.discovery.DruidNodeDiscovery; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.initialization.ZkPathsConfig; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.recipes.cache.PathChildrenCache; import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent; diff --git a/server/src/main/java/io/druid/curator/discovery/CuratorServiceAnnouncer.java b/server/src/main/java/org/apache/druid/curator/discovery/CuratorServiceAnnouncer.java similarity index 92% rename from server/src/main/java/io/druid/curator/discovery/CuratorServiceAnnouncer.java rename to server/src/main/java/org/apache/druid/curator/discovery/CuratorServiceAnnouncer.java index 92cd9509ae2d..96a6fbbf6cd2 100644 --- a/server/src/main/java/io/druid/curator/discovery/CuratorServiceAnnouncer.java +++ b/server/src/main/java/org/apache/druid/curator/discovery/CuratorServiceAnnouncer.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.curator.discovery; +package org.apache.druid.curator.discovery; import com.google.common.base.Throwables; import com.google.common.collect.Maps; import com.google.inject.Inject; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.server.DruidNode; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.server.DruidNode; import org.apache.curator.x.discovery.ServiceDiscovery; import org.apache.curator.x.discovery.ServiceInstance; import java.util.Map; /** - * This class is deprecated, Add service to {@link io.druid.discovery.DruidNodeAnnouncer} node announcement instead. + * This class is deprecated, Add service to {@link org.apache.druid.discovery.DruidNodeAnnouncer} node announcement instead. * * Uses the Curator Service Discovery recipe to announce services. */ diff --git a/server/src/main/java/io/druid/curator/discovery/CuratorServiceUtils.java b/server/src/main/java/org/apache/druid/curator/discovery/CuratorServiceUtils.java similarity index 94% rename from server/src/main/java/io/druid/curator/discovery/CuratorServiceUtils.java rename to server/src/main/java/org/apache/druid/curator/discovery/CuratorServiceUtils.java index 708bce2e0aa4..60c51e304c99 100644 --- a/server/src/main/java/io/druid/curator/discovery/CuratorServiceUtils.java +++ b/server/src/main/java/org/apache/druid/curator/discovery/CuratorServiceUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.curator.discovery; +package org.apache.druid.curator.discovery; /** * This class is only used by Deprecated classes. @@ -29,7 +29,7 @@ public class CuratorServiceUtils * Replacing '/' with ':' in service names makes it easier to provide an HTTP interface using * curator-x-discovery-server * - * This method is marked protected because it should never be used outside of the io.druid.curator.discovery + * This method is marked protected because it should never be used outside of the org.apache.druid.curator.discovery * package. If you are tempted to use this method anywhere else you are most likely doing something wrong. * Mapping the actual service name to the name used within curator should be left to {@link CuratorServiceAnnouncer} * and {@link ServerDiscoveryFactory} diff --git a/server/src/main/java/io/druid/curator/discovery/DiscoveryModule.java b/server/src/main/java/org/apache/druid/curator/discovery/DiscoveryModule.java similarity index 94% rename from server/src/main/java/io/druid/curator/discovery/DiscoveryModule.java rename to server/src/main/java/org/apache/druid/curator/discovery/DiscoveryModule.java index 3bbe87a32a9d..766429f2255b 100644 --- a/server/src/main/java/io/druid/curator/discovery/DiscoveryModule.java +++ b/server/src/main/java/org/apache/druid/curator/discovery/DiscoveryModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.curator.discovery; +package org.apache.druid.curator.discovery; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; @@ -32,22 +32,22 @@ import com.google.inject.TypeLiteral; import com.google.inject.name.Named; import com.google.inject.name.Names; -import io.druid.client.coordinator.Coordinator; -import io.druid.client.indexing.IndexingService; -import io.druid.discovery.DruidLeaderSelector; -import io.druid.discovery.DruidNodeAnnouncer; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.guice.DruidBinders; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.KeyHolder; -import io.druid.guice.LazySingleton; -import io.druid.guice.LifecycleModule; -import io.druid.guice.PolyBind; -import io.druid.guice.annotations.Self; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.server.DruidNode; -import io.druid.server.initialization.CuratorDiscoveryConfig; -import io.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.client.coordinator.Coordinator; +import org.apache.druid.client.indexing.IndexingService; +import org.apache.druid.discovery.DruidLeaderSelector; +import org.apache.druid.discovery.DruidNodeAnnouncer; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.guice.DruidBinders; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.KeyHolder; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.LifecycleModule; +import org.apache.druid.guice.PolyBind; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.initialization.CuratorDiscoveryConfig; +import org.apache.druid.server.initialization.ZkPathsConfig; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.utils.CloseableExecutorService; import org.apache.curator.utils.ZKPaths; diff --git a/server/src/main/java/io/druid/curator/discovery/NoopServiceAnnouncer.java b/server/src/main/java/org/apache/druid/curator/discovery/NoopServiceAnnouncer.java similarity index 92% rename from server/src/main/java/io/druid/curator/discovery/NoopServiceAnnouncer.java rename to server/src/main/java/org/apache/druid/curator/discovery/NoopServiceAnnouncer.java index 06f436fdf364..15cdd6128fdb 100644 --- a/server/src/main/java/io/druid/curator/discovery/NoopServiceAnnouncer.java +++ b/server/src/main/java/org/apache/druid/curator/discovery/NoopServiceAnnouncer.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.curator.discovery; +package org.apache.druid.curator.discovery; -import io.druid.server.DruidNode; +import org.apache.druid.server.DruidNode; /** * Does nothing. diff --git a/server/src/main/java/io/druid/curator/discovery/ServerDiscoveryFactory.java b/server/src/main/java/org/apache/druid/curator/discovery/ServerDiscoveryFactory.java similarity index 95% rename from server/src/main/java/io/druid/curator/discovery/ServerDiscoveryFactory.java rename to server/src/main/java/org/apache/druid/curator/discovery/ServerDiscoveryFactory.java index 6c43e4ac5682..ca3cba0132ca 100644 --- a/server/src/main/java/io/druid/curator/discovery/ServerDiscoveryFactory.java +++ b/server/src/main/java/org/apache/druid/curator/discovery/ServerDiscoveryFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.curator.discovery; +package org.apache.druid.curator.discovery; import com.google.inject.Inject; import org.apache.curator.x.discovery.ServiceDiscovery; @@ -27,7 +27,7 @@ import java.util.Collection; /** - * Use {@link io.druid.discovery.DruidNodeDiscovery} for discovery. + * Use {@link org.apache.druid.discovery.DruidNodeDiscovery} for discovery. */ @Deprecated public class ServerDiscoveryFactory diff --git a/server/src/main/java/io/druid/curator/discovery/ServerDiscoverySelector.java b/server/src/main/java/org/apache/druid/curator/discovery/ServerDiscoverySelector.java similarity index 89% rename from server/src/main/java/io/druid/curator/discovery/ServerDiscoverySelector.java rename to server/src/main/java/org/apache/druid/curator/discovery/ServerDiscoverySelector.java index a1dc628931c4..a47d257d24ce 100644 --- a/server/src/main/java/io/druid/curator/discovery/ServerDiscoverySelector.java +++ b/server/src/main/java/org/apache/druid/curator/discovery/ServerDiscoverySelector.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.curator.discovery; +package org.apache.druid.curator.discovery; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.Collections2; import com.google.common.net.HostAndPort; -import io.druid.client.selector.DiscoverySelector; -import io.druid.client.selector.Server; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.client.selector.DiscoverySelector; +import org.apache.druid.client.selector.Server; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.common.logger.Logger; import org.apache.curator.x.discovery.ServiceInstance; import org.apache.curator.x.discovery.ServiceProvider; @@ -37,7 +37,7 @@ import java.util.Collections; /** - * Use {@link io.druid.discovery.DruidNodeDiscovery} for discovery. + * Use {@link org.apache.druid.discovery.DruidNodeDiscovery} for discovery. */ @Deprecated public class ServerDiscoverySelector implements DiscoverySelector diff --git a/server/src/main/java/io/druid/curator/discovery/ServiceAnnouncer.java b/server/src/main/java/org/apache/druid/curator/discovery/ServiceAnnouncer.java similarity index 84% rename from server/src/main/java/io/druid/curator/discovery/ServiceAnnouncer.java rename to server/src/main/java/org/apache/druid/curator/discovery/ServiceAnnouncer.java index 2f25e559996d..10016c08307c 100644 --- a/server/src/main/java/io/druid/curator/discovery/ServiceAnnouncer.java +++ b/server/src/main/java/org/apache/druid/curator/discovery/ServiceAnnouncer.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.curator.discovery; +package org.apache.druid.curator.discovery; -import io.druid.server.DruidNode; +import org.apache.druid.server.DruidNode; /** - * This class is deprecated, Add service to {@link io.druid.discovery.DruidNodeAnnouncer} node announcement instead. + * This class is deprecated, Add service to {@link org.apache.druid.discovery.DruidNodeAnnouncer} node announcement instead. * * Announces our ability to serve a particular function. Multiple users may announce the same service, in which * case they are treated as interchangeable instances of that service. diff --git a/server/src/main/java/io/druid/curator/inventory/CuratorInventoryManager.java b/server/src/main/java/org/apache/druid/curator/inventory/CuratorInventoryManager.java similarity index 96% rename from server/src/main/java/io/druid/curator/inventory/CuratorInventoryManager.java rename to server/src/main/java/org/apache/druid/curator/inventory/CuratorInventoryManager.java index 95c027608c98..38a49d5ee5a0 100644 --- a/server/src/main/java/io/druid/curator/inventory/CuratorInventoryManager.java +++ b/server/src/main/java/org/apache/druid/curator/inventory/CuratorInventoryManager.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.curator.inventory; +package org.apache.druid.curator.inventory; import com.google.common.collect.Sets; -import io.druid.curator.cache.PathChildrenCacheFactory; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.curator.cache.PathChildrenCacheFactory; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.common.logger.Logger; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.recipes.cache.ChildData; import org.apache.curator.framework.recipes.cache.PathChildrenCache; @@ -43,7 +43,7 @@ import java.util.stream.Collectors; /** - * This class is deprecated. Use {@link io.druid.client.HttpServerInventoryView} for segment discovery. + * This class is deprecated. Use {@link org.apache.druid.client.HttpServerInventoryView} for segment discovery. * * An InventoryManager watches updates to inventory on Zookeeper (or some other discovery-like service publishing * system). It is built up on two object types: containers and inventory objects. diff --git a/server/src/main/java/io/druid/curator/inventory/CuratorInventoryManagerStrategy.java b/server/src/main/java/org/apache/druid/curator/inventory/CuratorInventoryManagerStrategy.java similarity index 97% rename from server/src/main/java/io/druid/curator/inventory/CuratorInventoryManagerStrategy.java rename to server/src/main/java/org/apache/druid/curator/inventory/CuratorInventoryManagerStrategy.java index cfd79861261e..cfe3b394e1e5 100644 --- a/server/src/main/java/io/druid/curator/inventory/CuratorInventoryManagerStrategy.java +++ b/server/src/main/java/org/apache/druid/curator/inventory/CuratorInventoryManagerStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.curator.inventory; +package org.apache.druid.curator.inventory; /** */ diff --git a/server/src/main/java/io/druid/curator/inventory/InventoryManagerConfig.java b/server/src/main/java/org/apache/druid/curator/inventory/InventoryManagerConfig.java similarity index 97% rename from server/src/main/java/io/druid/curator/inventory/InventoryManagerConfig.java rename to server/src/main/java/org/apache/druid/curator/inventory/InventoryManagerConfig.java index 7638f57fb643..ddd36dd88aee 100644 --- a/server/src/main/java/io/druid/curator/inventory/InventoryManagerConfig.java +++ b/server/src/main/java/org/apache/druid/curator/inventory/InventoryManagerConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.curator.inventory; +package org.apache.druid.curator.inventory; /** */ diff --git a/server/src/main/java/io/druid/discovery/DataNodeService.java b/server/src/main/java/org/apache/druid/discovery/DataNodeService.java similarity index 96% rename from server/src/main/java/io/druid/discovery/DataNodeService.java rename to server/src/main/java/org/apache/druid/discovery/DataNodeService.java index e9d63c52db4b..8a6f9679486d 100644 --- a/server/src/main/java/io/druid/discovery/DataNodeService.java +++ b/server/src/main/java/org/apache/druid/discovery/DataNodeService.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.discovery; +package org.apache.druid.discovery; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.server.coordination.ServerType; +import org.apache.druid.server.coordination.ServerType; import java.util.Objects; diff --git a/server/src/main/java/io/druid/discovery/DiscoveryDruidNode.java b/server/src/main/java/org/apache/druid/discovery/DiscoveryDruidNode.java similarity index 97% rename from server/src/main/java/io/druid/discovery/DiscoveryDruidNode.java rename to server/src/main/java/org/apache/druid/discovery/DiscoveryDruidNode.java index 69e7eec67b6a..fbb124afd2b2 100644 --- a/server/src/main/java/io/druid/discovery/DiscoveryDruidNode.java +++ b/server/src/main/java/org/apache/druid/discovery/DiscoveryDruidNode.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.discovery; +package org.apache.druid.discovery; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.server.DruidNode; +import org.apache.druid.server.DruidNode; import java.util.HashMap; import java.util.Map; diff --git a/server/src/main/java/io/druid/discovery/DruidLeaderClient.java b/server/src/main/java/org/apache/druid/discovery/DruidLeaderClient.java similarity index 91% rename from server/src/main/java/io/druid/discovery/DruidLeaderClient.java rename to server/src/main/java/org/apache/druid/discovery/DruidLeaderClient.java index 094d04f527e2..406703e4b987 100644 --- a/server/src/main/java/io/druid/discovery/DruidLeaderClient.java +++ b/server/src/main/java/org/apache/druid/discovery/DruidLeaderClient.java @@ -17,25 +17,25 @@ * under the License. */ -package io.druid.discovery; +package org.apache.druid.discovery; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; -import io.druid.client.selector.Server; -import io.druid.concurrent.LifecycleLock; -import io.druid.curator.discovery.ServerDiscoverySelector; -import io.druid.java.util.common.IOE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.RE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.Request; -import io.druid.java.util.http.client.response.FullResponseHandler; -import io.druid.java.util.http.client.response.FullResponseHolder; -import io.druid.java.util.http.client.response.HttpResponseHandler; +import org.apache.druid.client.selector.Server; +import org.apache.druid.concurrent.LifecycleLock; +import org.apache.druid.curator.discovery.ServerDiscoverySelector; +import org.apache.druid.java.util.common.IOE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.Request; +import org.apache.druid.java.util.http.client.response.FullResponseHandler; +import org.apache.druid.java.util.http.client.response.FullResponseHolder; +import org.apache.druid.java.util.http.client.response.HttpResponseHandler; import org.jboss.netty.channel.ChannelException; import org.jboss.netty.handler.codec.http.HttpMethod; import org.jboss.netty.handler.codec.http.HttpResponseStatus; diff --git a/server/src/main/java/io/druid/discovery/DruidLeaderSelector.java b/server/src/main/java/org/apache/druid/discovery/DruidLeaderSelector.java similarity index 98% rename from server/src/main/java/io/druid/discovery/DruidLeaderSelector.java rename to server/src/main/java/org/apache/druid/discovery/DruidLeaderSelector.java index a2a492fcad30..f97b86b07f16 100644 --- a/server/src/main/java/io/druid/discovery/DruidLeaderSelector.java +++ b/server/src/main/java/org/apache/druid/discovery/DruidLeaderSelector.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.discovery; +package org.apache.druid.discovery; import javax.annotation.Nullable; diff --git a/server/src/main/java/io/druid/discovery/DruidNodeAnnouncer.java b/server/src/main/java/org/apache/druid/discovery/DruidNodeAnnouncer.java similarity index 96% rename from server/src/main/java/io/druid/discovery/DruidNodeAnnouncer.java rename to server/src/main/java/org/apache/druid/discovery/DruidNodeAnnouncer.java index 054565721cda..6fb758ef9918 100644 --- a/server/src/main/java/io/druid/discovery/DruidNodeAnnouncer.java +++ b/server/src/main/java/org/apache/druid/discovery/DruidNodeAnnouncer.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.discovery; +package org.apache.druid.discovery; /** * DiscoveryDruidNode announcer for internal discovery. diff --git a/server/src/main/java/io/druid/discovery/DruidNodeDiscovery.java b/server/src/main/java/org/apache/druid/discovery/DruidNodeDiscovery.java similarity index 98% rename from server/src/main/java/io/druid/discovery/DruidNodeDiscovery.java rename to server/src/main/java/org/apache/druid/discovery/DruidNodeDiscovery.java index 27ea8be22e24..807440bda211 100644 --- a/server/src/main/java/io/druid/discovery/DruidNodeDiscovery.java +++ b/server/src/main/java/org/apache/druid/discovery/DruidNodeDiscovery.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.discovery; +package org.apache.druid.discovery; import java.util.Collection; import java.util.List; diff --git a/server/src/main/java/io/druid/discovery/DruidNodeDiscoveryProvider.java b/server/src/main/java/org/apache/druid/discovery/DruidNodeDiscoveryProvider.java similarity index 98% rename from server/src/main/java/io/druid/discovery/DruidNodeDiscoveryProvider.java rename to server/src/main/java/org/apache/druid/discovery/DruidNodeDiscoveryProvider.java index e341e2b400fd..dcd30ccb5e69 100644 --- a/server/src/main/java/io/druid/discovery/DruidNodeDiscoveryProvider.java +++ b/server/src/main/java/org/apache/druid/discovery/DruidNodeDiscoveryProvider.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.discovery; +package org.apache.druid.discovery; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.logger.Logger; import java.util.ArrayList; import java.util.Collection; diff --git a/server/src/main/java/io/druid/discovery/DruidService.java b/server/src/main/java/org/apache/druid/discovery/DruidService.java similarity index 97% rename from server/src/main/java/io/druid/discovery/DruidService.java rename to server/src/main/java/org/apache/druid/discovery/DruidService.java index d029df0b4662..d23c411680ff 100644 --- a/server/src/main/java/io/druid/discovery/DruidService.java +++ b/server/src/main/java/org/apache/druid/discovery/DruidService.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.discovery; +package org.apache.druid.discovery; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/server/src/main/java/io/druid/discovery/LookupNodeService.java b/server/src/main/java/org/apache/druid/discovery/LookupNodeService.java similarity index 98% rename from server/src/main/java/io/druid/discovery/LookupNodeService.java rename to server/src/main/java/org/apache/druid/discovery/LookupNodeService.java index 1dcbf020231a..bd4b059c4ec4 100644 --- a/server/src/main/java/io/druid/discovery/LookupNodeService.java +++ b/server/src/main/java/org/apache/druid/discovery/LookupNodeService.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.discovery; +package org.apache.druid.discovery; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/discovery/WorkerNodeService.java b/server/src/main/java/org/apache/druid/discovery/WorkerNodeService.java similarity index 98% rename from server/src/main/java/io/druid/discovery/WorkerNodeService.java rename to server/src/main/java/org/apache/druid/discovery/WorkerNodeService.java index 4eb845b9b27f..5ccfec964693 100644 --- a/server/src/main/java/io/druid/discovery/WorkerNodeService.java +++ b/server/src/main/java/org/apache/druid/discovery/WorkerNodeService.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.discovery; +package org.apache.druid.discovery; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/guice/AWSModule.java b/server/src/main/java/org/apache/druid/guice/AWSModule.java similarity index 85% rename from server/src/main/java/io/druid/guice/AWSModule.java rename to server/src/main/java/org/apache/druid/guice/AWSModule.java index 729aff873d19..9d0c568e8b4c 100644 --- a/server/src/main/java/io/druid/guice/AWSModule.java +++ b/server/src/main/java/org/apache/druid/guice/AWSModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.amazonaws.auth.AWSCredentialsProvider; import com.amazonaws.services.ec2.AmazonEC2; @@ -25,11 +25,11 @@ import com.google.inject.Binder; import com.google.inject.Module; import com.google.inject.Provides; -import io.druid.common.aws.AWSClientConfig; -import io.druid.common.aws.AWSCredentialsConfig; -import io.druid.common.aws.AWSCredentialsUtils; -import io.druid.common.aws.AWSEndpointConfig; -import io.druid.common.aws.AWSProxyConfig; +import org.apache.druid.common.aws.AWSClientConfig; +import org.apache.druid.common.aws.AWSCredentialsConfig; +import org.apache.druid.common.aws.AWSCredentialsUtils; +import org.apache.druid.common.aws.AWSEndpointConfig; +import org.apache.druid.common.aws.AWSProxyConfig; /** */ diff --git a/server/src/main/java/io/druid/guice/AnnouncerModule.java b/server/src/main/java/org/apache/druid/guice/AnnouncerModule.java similarity index 74% rename from server/src/main/java/io/druid/guice/AnnouncerModule.java rename to server/src/main/java/org/apache/druid/guice/AnnouncerModule.java index 2b046db2dae3..d8f469ac0d49 100644 --- a/server/src/main/java/io/druid/guice/AnnouncerModule.java +++ b/server/src/main/java/org/apache/druid/guice/AnnouncerModule.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.google.inject.Binder; import com.google.inject.Module; import com.google.inject.Provides; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.curator.announcement.Announcer; -import io.druid.server.coordination.BatchDataSegmentAnnouncer; -import io.druid.server.coordination.CuratorDataSegmentServerAnnouncer; -import io.druid.server.coordination.DataSegmentAnnouncer; -import io.druid.server.coordination.DataSegmentAnnouncerProvider; -import io.druid.server.coordination.DataSegmentServerAnnouncer; -import io.druid.server.initialization.BatchDataSegmentAnnouncerConfig; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.curator.announcement.Announcer; +import org.apache.druid.server.coordination.BatchDataSegmentAnnouncer; +import org.apache.druid.server.coordination.CuratorDataSegmentServerAnnouncer; +import org.apache.druid.server.coordination.DataSegmentAnnouncer; +import org.apache.druid.server.coordination.DataSegmentAnnouncerProvider; +import org.apache.druid.server.coordination.DataSegmentServerAnnouncer; +import org.apache.druid.server.initialization.BatchDataSegmentAnnouncerConfig; import org.apache.curator.framework.CuratorFramework; /** diff --git a/server/src/main/java/io/druid/guice/CacheModule.java b/server/src/main/java/org/apache/druid/guice/CacheModule.java similarity index 89% rename from server/src/main/java/io/druid/guice/CacheModule.java rename to server/src/main/java/org/apache/druid/guice/CacheModule.java index 488e52ca50cf..65fae6786ba3 100644 --- a/server/src/main/java/io/druid/guice/CacheModule.java +++ b/server/src/main/java/org/apache/druid/guice/CacheModule.java @@ -17,16 +17,16 @@ * 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.Module; import com.google.inject.name.Names; -import io.druid.client.cache.Cache; -import io.druid.client.cache.CachePopulatorStats; -import io.druid.client.cache.CacheProvider; -import io.druid.guice.annotations.Global; +import org.apache.druid.client.cache.Cache; +import org.apache.druid.client.cache.CachePopulatorStats; +import org.apache.druid.client.cache.CacheProvider; +import org.apache.druid.guice.annotations.Global; public class CacheModule implements Module { diff --git a/server/src/main/java/io/druid/guice/CoordinatorDiscoveryModule.java b/server/src/main/java/org/apache/druid/guice/CoordinatorDiscoveryModule.java similarity index 78% rename from server/src/main/java/io/druid/guice/CoordinatorDiscoveryModule.java rename to server/src/main/java/org/apache/druid/guice/CoordinatorDiscoveryModule.java index 8cb631c71163..46ff781f876d 100644 --- a/server/src/main/java/io/druid/guice/CoordinatorDiscoveryModule.java +++ b/server/src/main/java/org/apache/druid/guice/CoordinatorDiscoveryModule.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.google.inject.Binder; import com.google.inject.Module; import com.google.inject.Provides; -import io.druid.java.util.http.client.HttpClient; -import io.druid.client.coordinator.Coordinator; -import io.druid.client.coordinator.CoordinatorSelectorConfig; -import io.druid.curator.discovery.ServerDiscoveryFactory; -import io.druid.curator.discovery.ServerDiscoverySelector; -import io.druid.discovery.DruidLeaderClient; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.guice.annotations.EscalatedGlobal; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.client.coordinator.Coordinator; +import org.apache.druid.client.coordinator.CoordinatorSelectorConfig; +import org.apache.druid.curator.discovery.ServerDiscoveryFactory; +import org.apache.druid.curator.discovery.ServerDiscoverySelector; +import org.apache.druid.discovery.DruidLeaderClient; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.guice.annotations.EscalatedGlobal; /** */ diff --git a/server/src/main/java/io/druid/guice/DruidBinders.java b/server/src/main/java/org/apache/druid/guice/DruidBinders.java similarity index 88% rename from server/src/main/java/io/druid/guice/DruidBinders.java rename to server/src/main/java/org/apache/druid/guice/DruidBinders.java index 6a0c96697fdb..a447a5715124 100644 --- a/server/src/main/java/io/druid/guice/DruidBinders.java +++ b/server/src/main/java/org/apache/druid/guice/DruidBinders.java @@ -17,17 +17,17 @@ * 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.MapBinder; import com.google.inject.multibindings.Multibinder; -import io.druid.java.util.metrics.Monitor; -import io.druid.query.Query; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryToolChest; -import io.druid.server.DruidNode; +import org.apache.druid.java.util.metrics.Monitor; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.server.DruidNode; /** */ diff --git a/server/src/main/java/io/druid/guice/DruidProcessingConfigModule.java b/server/src/main/java/org/apache/druid/guice/DruidProcessingConfigModule.java similarity index 93% rename from server/src/main/java/io/druid/guice/DruidProcessingConfigModule.java rename to server/src/main/java/org/apache/druid/guice/DruidProcessingConfigModule.java index e953c7e7dadf..7e83817de26a 100644 --- a/server/src/main/java/io/druid/guice/DruidProcessingConfigModule.java +++ b/server/src/main/java/org/apache/druid/guice/DruidProcessingConfigModule.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.google.common.collect.ImmutableMap; import com.google.inject.Binder; import com.google.inject.Module; -import io.druid.query.DruidProcessingConfig; +import org.apache.druid.query.DruidProcessingConfig; public class DruidProcessingConfigModule implements Module { diff --git a/server/src/main/java/io/druid/guice/DruidProcessingModule.java b/server/src/main/java/org/apache/druid/guice/DruidProcessingModule.java similarity index 77% rename from server/src/main/java/io/druid/guice/DruidProcessingModule.java rename to server/src/main/java/org/apache/druid/guice/DruidProcessingModule.java index ff9859d08cad..ea53dbbea5ea 100644 --- a/server/src/main/java/io/druid/guice/DruidProcessingModule.java +++ b/server/src/main/java/org/apache/druid/guice/DruidProcessingModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.util.concurrent.ThreadFactoryBuilder; @@ -25,30 +25,30 @@ import com.google.inject.Module; import com.google.inject.Provides; import com.google.inject.ProvisionException; -import io.druid.client.cache.BackgroundCachePopulator; -import io.druid.client.cache.CacheConfig; -import io.druid.client.cache.CachePopulator; -import io.druid.client.cache.CachePopulatorStats; -import io.druid.client.cache.ForegroundCachePopulator; -import io.druid.collections.BlockingPool; -import io.druid.collections.DefaultBlockingPool; -import io.druid.collections.NonBlockingPool; -import io.druid.collections.StupidPool; -import io.druid.common.utils.VMUtils; -import io.druid.guice.annotations.Global; -import io.druid.guice.annotations.Merging; -import io.druid.guice.annotations.Processing; -import io.druid.guice.annotations.Smile; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.ExecutorServiceConfig; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.common.logger.Logger; -import io.druid.offheap.OffheapBufferGenerator; -import io.druid.query.DruidProcessingConfig; -import io.druid.query.ExecutorServiceMonitor; -import io.druid.query.MetricsEmittingExecutorService; -import io.druid.query.PrioritizedExecutorService; -import io.druid.server.metrics.MetricsModule; +import org.apache.druid.client.cache.BackgroundCachePopulator; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.client.cache.CachePopulator; +import org.apache.druid.client.cache.CachePopulatorStats; +import org.apache.druid.client.cache.ForegroundCachePopulator; +import org.apache.druid.collections.BlockingPool; +import org.apache.druid.collections.DefaultBlockingPool; +import org.apache.druid.collections.NonBlockingPool; +import org.apache.druid.collections.StupidPool; +import org.apache.druid.common.utils.VMUtils; +import org.apache.druid.guice.annotations.Global; +import org.apache.druid.guice.annotations.Merging; +import org.apache.druid.guice.annotations.Processing; +import org.apache.druid.guice.annotations.Smile; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.ExecutorServiceConfig; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.offheap.OffheapBufferGenerator; +import org.apache.druid.query.DruidProcessingConfig; +import org.apache.druid.query.ExecutorServiceMonitor; +import org.apache.druid.query.MetricsEmittingExecutorService; +import org.apache.druid.query.PrioritizedExecutorService; +import org.apache.druid.server.metrics.MetricsModule; import java.nio.ByteBuffer; import java.util.concurrent.ExecutorService; diff --git a/server/src/main/java/io/druid/guice/ExpressionModule.java b/server/src/main/java/org/apache/druid/guice/ExpressionModule.java similarity index 75% rename from server/src/main/java/io/druid/guice/ExpressionModule.java rename to server/src/main/java/org/apache/druid/guice/ExpressionModule.java index a40814d47b55..29d216d81b77 100644 --- a/server/src/main/java/io/druid/guice/ExpressionModule.java +++ b/server/src/main/java/org/apache/druid/guice/ExpressionModule.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.fasterxml.jackson.databind.Module; import com.google.common.collect.ImmutableList; import com.google.inject.Binder; import com.google.inject.multibindings.Multibinder; -import io.druid.initialization.DruidModule; -import io.druid.math.expr.ExprMacroTable; -import io.druid.query.expression.GuiceExprMacroTable; -import io.druid.query.expression.LikeExprMacro; -import io.druid.query.expression.RegexpExtractExprMacro; -import io.druid.query.expression.TimestampCeilExprMacro; -import io.druid.query.expression.TimestampExtractExprMacro; -import io.druid.query.expression.TimestampFloorExprMacro; -import io.druid.query.expression.TimestampFormatExprMacro; -import io.druid.query.expression.TimestampParseExprMacro; -import io.druid.query.expression.TimestampShiftExprMacro; -import io.druid.query.expression.TrimExprMacro; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.query.expression.GuiceExprMacroTable; +import org.apache.druid.query.expression.LikeExprMacro; +import org.apache.druid.query.expression.RegexpExtractExprMacro; +import org.apache.druid.query.expression.TimestampCeilExprMacro; +import org.apache.druid.query.expression.TimestampExtractExprMacro; +import org.apache.druid.query.expression.TimestampFloorExprMacro; +import org.apache.druid.query.expression.TimestampFormatExprMacro; +import org.apache.druid.query.expression.TimestampParseExprMacro; +import org.apache.druid.query.expression.TimestampShiftExprMacro; +import org.apache.druid.query.expression.TrimExprMacro; import java.util.List; diff --git a/server/src/main/java/io/druid/guice/FireDepartmentsProvider.java b/server/src/main/java/org/apache/druid/guice/FireDepartmentsProvider.java similarity index 95% rename from server/src/main/java/io/druid/guice/FireDepartmentsProvider.java rename to server/src/main/java/org/apache/druid/guice/FireDepartmentsProvider.java index b98810aa8f6b..b898fac7ea69 100644 --- a/server/src/main/java/io/druid/guice/FireDepartmentsProvider.java +++ b/server/src/main/java/org/apache/druid/guice/FireDepartmentsProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -25,7 +25,7 @@ import com.google.common.collect.Lists; import com.google.inject.Inject; import com.google.inject.Provider; -import io.druid.segment.realtime.FireDepartment; +import org.apache.druid.segment.realtime.FireDepartment; import java.util.List; diff --git a/server/src/main/java/io/druid/guice/FirehoseModule.java b/server/src/main/java/org/apache/druid/guice/FirehoseModule.java similarity index 73% rename from server/src/main/java/io/druid/guice/FirehoseModule.java rename to server/src/main/java/org/apache/druid/guice/FirehoseModule.java index f1c121cbb2ed..91698d3fe26e 100644 --- a/server/src/main/java/io/druid/guice/FirehoseModule.java +++ b/server/src/main/java/org/apache/druid/guice/FirehoseModule.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.inject.Binder; -import io.druid.initialization.DruidModule; -import io.druid.segment.realtime.firehose.ClippedFirehoseFactory; -import io.druid.segment.realtime.firehose.CombiningFirehoseFactory; -import io.druid.segment.realtime.firehose.EventReceiverFirehoseFactory; -import io.druid.segment.realtime.firehose.FixedCountFirehoseFactory; -import io.druid.segment.realtime.firehose.HttpFirehoseFactory; -import io.druid.segment.realtime.firehose.IrcFirehoseFactory; -import io.druid.segment.realtime.firehose.LocalFirehoseFactory; -import io.druid.segment.realtime.firehose.SqlFirehoseFactory; -import io.druid.segment.realtime.firehose.TimedShutoffFirehoseFactory; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.segment.realtime.firehose.ClippedFirehoseFactory; +import org.apache.druid.segment.realtime.firehose.CombiningFirehoseFactory; +import org.apache.druid.segment.realtime.firehose.EventReceiverFirehoseFactory; +import org.apache.druid.segment.realtime.firehose.FixedCountFirehoseFactory; +import org.apache.druid.segment.realtime.firehose.HttpFirehoseFactory; +import org.apache.druid.segment.realtime.firehose.IrcFirehoseFactory; +import org.apache.druid.segment.realtime.firehose.LocalFirehoseFactory; +import org.apache.druid.segment.realtime.firehose.SqlFirehoseFactory; +import org.apache.druid.segment.realtime.firehose.TimedShutoffFirehoseFactory; import java.util.Collections; import java.util.List; diff --git a/server/src/main/java/io/druid/guice/IndexingServiceDiscoveryModule.java b/server/src/main/java/org/apache/druid/guice/IndexingServiceDiscoveryModule.java similarity index 78% rename from server/src/main/java/io/druid/guice/IndexingServiceDiscoveryModule.java rename to server/src/main/java/org/apache/druid/guice/IndexingServiceDiscoveryModule.java index ba61f9d65097..bbb694386dab 100644 --- a/server/src/main/java/io/druid/guice/IndexingServiceDiscoveryModule.java +++ b/server/src/main/java/org/apache/druid/guice/IndexingServiceDiscoveryModule.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.google.inject.Binder; import com.google.inject.Module; import com.google.inject.Provides; -import io.druid.java.util.http.client.HttpClient; -import io.druid.client.indexing.IndexingService; -import io.druid.client.indexing.IndexingServiceSelectorConfig; -import io.druid.curator.discovery.ServerDiscoveryFactory; -import io.druid.curator.discovery.ServerDiscoverySelector; -import io.druid.discovery.DruidLeaderClient; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.guice.annotations.EscalatedGlobal; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.client.indexing.IndexingService; +import org.apache.druid.client.indexing.IndexingServiceSelectorConfig; +import org.apache.druid.curator.discovery.ServerDiscoveryFactory; +import org.apache.druid.curator.discovery.ServerDiscoverySelector; +import org.apache.druid.discovery.DruidLeaderClient; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.guice.annotations.EscalatedGlobal; /** */ diff --git a/server/src/main/java/io/druid/guice/JavaScriptModule.java b/server/src/main/java/org/apache/druid/guice/JavaScriptModule.java similarity index 93% rename from server/src/main/java/io/druid/guice/JavaScriptModule.java rename to server/src/main/java/org/apache/druid/guice/JavaScriptModule.java index f81ef5153635..55dfe92cf321 100644 --- a/server/src/main/java/io/druid/guice/JavaScriptModule.java +++ b/server/src/main/java/org/apache/druid/guice/JavaScriptModule.java @@ -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.js.JavaScriptConfig; +import org.apache.druid.js.JavaScriptConfig; public class JavaScriptModule implements Module { diff --git a/server/src/main/java/io/druid/guice/LocalDataStorageDruidModule.java b/server/src/main/java/org/apache/druid/guice/LocalDataStorageDruidModule.java similarity index 79% rename from server/src/main/java/io/druid/guice/LocalDataStorageDruidModule.java rename to server/src/main/java/org/apache/druid/guice/LocalDataStorageDruidModule.java index 804f1a91900c..db1ed09dd92a 100644 --- a/server/src/main/java/io/druid/guice/LocalDataStorageDruidModule.java +++ b/server/src/main/java/org/apache/druid/guice/LocalDataStorageDruidModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.fasterxml.jackson.core.Version; import com.fasterxml.jackson.databind.Module; @@ -25,19 +25,19 @@ import com.google.inject.Binder; import com.google.inject.Key; import com.google.inject.multibindings.MapBinder; -import io.druid.data.SearchableVersionedDataFinder; -import io.druid.initialization.DruidModule; -import io.druid.segment.loading.DataSegmentFinder; -import io.druid.segment.loading.DataSegmentKiller; -import io.druid.segment.loading.DataSegmentPusher; -import io.druid.segment.loading.LocalDataSegmentFinder; -import io.druid.segment.loading.LocalDataSegmentKiller; -import io.druid.segment.loading.LocalDataSegmentPusher; -import io.druid.segment.loading.LocalDataSegmentPusherConfig; -import io.druid.segment.loading.LocalFileTimestampVersionFinder; -import io.druid.segment.loading.LocalLoadSpec; -import io.druid.segment.loading.SegmentLoader; -import io.druid.segment.loading.SegmentLoaderLocalCacheManager; +import org.apache.druid.data.SearchableVersionedDataFinder; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.segment.loading.DataSegmentFinder; +import org.apache.druid.segment.loading.DataSegmentKiller; +import org.apache.druid.segment.loading.DataSegmentPusher; +import org.apache.druid.segment.loading.LocalDataSegmentFinder; +import org.apache.druid.segment.loading.LocalDataSegmentKiller; +import org.apache.druid.segment.loading.LocalDataSegmentPusher; +import org.apache.druid.segment.loading.LocalDataSegmentPusherConfig; +import org.apache.druid.segment.loading.LocalFileTimestampVersionFinder; +import org.apache.druid.segment.loading.LocalLoadSpec; +import org.apache.druid.segment.loading.SegmentLoader; +import org.apache.druid.segment.loading.SegmentLoaderLocalCacheManager; import java.util.List; diff --git a/server/src/main/java/io/druid/guice/MetadataConfigModule.java b/server/src/main/java/org/apache/druid/guice/MetadataConfigModule.java similarity index 83% rename from server/src/main/java/io/druid/guice/MetadataConfigModule.java rename to server/src/main/java/org/apache/druid/guice/MetadataConfigModule.java index a09289e038dd..99545650dc76 100644 --- a/server/src/main/java/io/druid/guice/MetadataConfigModule.java +++ b/server/src/main/java/org/apache/druid/guice/MetadataConfigModule.java @@ -17,14 +17,14 @@ * 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.metadata.MetadataRuleManagerConfig; -import io.druid.metadata.MetadataSegmentManagerConfig; -import io.druid.metadata.MetadataStorageConnectorConfig; -import io.druid.metadata.MetadataStorageTablesConfig; +import org.apache.druid.metadata.MetadataRuleManagerConfig; +import org.apache.druid.metadata.MetadataSegmentManagerConfig; +import org.apache.druid.metadata.MetadataStorageConnectorConfig; +import org.apache.druid.metadata.MetadataStorageTablesConfig; public class MetadataConfigModule implements Module { diff --git a/server/src/main/java/io/druid/guice/NodeTypeConfig.java b/server/src/main/java/org/apache/druid/guice/NodeTypeConfig.java similarity index 92% rename from server/src/main/java/io/druid/guice/NodeTypeConfig.java rename to server/src/main/java/org/apache/druid/guice/NodeTypeConfig.java index f76be3d38a2f..a8039a1548da 100644 --- a/server/src/main/java/io/druid/guice/NodeTypeConfig.java +++ b/server/src/main/java/org/apache/druid/guice/NodeTypeConfig.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; -import io.druid.server.coordination.ServerType; +import org.apache.druid.server.coordination.ServerType; /** */ diff --git a/server/src/main/java/io/druid/guice/NoopSegmentPublisherProvider.java b/server/src/main/java/org/apache/druid/guice/NoopSegmentPublisherProvider.java similarity index 82% rename from server/src/main/java/io/druid/guice/NoopSegmentPublisherProvider.java rename to server/src/main/java/org/apache/druid/guice/NoopSegmentPublisherProvider.java index 272130ea717c..254f2ca28235 100644 --- a/server/src/main/java/io/druid/guice/NoopSegmentPublisherProvider.java +++ b/server/src/main/java/org/apache/druid/guice/NoopSegmentPublisherProvider.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; -import io.druid.metadata.SegmentPublisherProvider; -import io.druid.segment.realtime.NoopSegmentPublisher; -import io.druid.segment.realtime.SegmentPublisher; +import org.apache.druid.metadata.SegmentPublisherProvider; +import org.apache.druid.segment.realtime.NoopSegmentPublisher; +import org.apache.druid.segment.realtime.SegmentPublisher; /** */ diff --git a/server/src/main/java/io/druid/guice/ParsersModule.java b/server/src/main/java/org/apache/druid/guice/ParsersModule.java similarity index 90% rename from server/src/main/java/io/druid/guice/ParsersModule.java rename to server/src/main/java/org/apache/druid/guice/ParsersModule.java index 123fb2188f77..421a9a133684 100644 --- a/server/src/main/java/io/druid/guice/ParsersModule.java +++ b/server/src/main/java/org/apache/druid/guice/ParsersModule.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.inject.Binder; -import io.druid.initialization.DruidModule; -import io.druid.segment.realtime.firehose.IrcInputRowParser; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.segment.realtime.firehose.IrcInputRowParser; import java.util.Collections; import java.util.List; diff --git a/server/src/main/java/io/druid/guice/QueryRunnerFactoryModule.java b/server/src/main/java/org/apache/druid/guice/QueryRunnerFactoryModule.java similarity index 66% rename from server/src/main/java/io/druid/guice/QueryRunnerFactoryModule.java rename to server/src/main/java/org/apache/druid/guice/QueryRunnerFactoryModule.java index 956d349f3ce4..2175a418a884 100644 --- a/server/src/main/java/io/druid/guice/QueryRunnerFactoryModule.java +++ b/server/src/main/java/org/apache/druid/guice/QueryRunnerFactoryModule.java @@ -17,34 +17,34 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.google.common.collect.ImmutableMap; import com.google.inject.Binder; import com.google.inject.multibindings.MapBinder; -import io.druid.query.Query; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryWatcher; -import io.druid.query.datasourcemetadata.DataSourceMetadataQuery; -import io.druid.query.datasourcemetadata.DataSourceMetadataQueryRunnerFactory; -import io.druid.query.groupby.GroupByQuery; -import io.druid.query.groupby.GroupByQueryEngine; -import io.druid.query.groupby.GroupByQueryRunnerFactory; -import io.druid.query.metadata.SegmentMetadataQueryRunnerFactory; -import io.druid.query.metadata.metadata.SegmentMetadataQuery; -import io.druid.query.scan.ScanQuery; -import io.druid.query.scan.ScanQueryRunnerFactory; -import io.druid.query.search.SearchQueryRunnerFactory; -import io.druid.query.search.SearchQuery; -import io.druid.query.select.SelectQuery; -import io.druid.query.select.SelectQueryRunnerFactory; -import io.druid.query.timeboundary.TimeBoundaryQuery; -import io.druid.query.timeboundary.TimeBoundaryQueryRunnerFactory; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.timeseries.TimeseriesQueryRunnerFactory; -import io.druid.query.topn.TopNQuery; -import io.druid.query.topn.TopNQueryRunnerFactory; -import io.druid.server.QueryManager; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryWatcher; +import org.apache.druid.query.datasourcemetadata.DataSourceMetadataQuery; +import org.apache.druid.query.datasourcemetadata.DataSourceMetadataQueryRunnerFactory; +import org.apache.druid.query.groupby.GroupByQuery; +import org.apache.druid.query.groupby.GroupByQueryEngine; +import org.apache.druid.query.groupby.GroupByQueryRunnerFactory; +import org.apache.druid.query.metadata.SegmentMetadataQueryRunnerFactory; +import org.apache.druid.query.metadata.metadata.SegmentMetadataQuery; +import org.apache.druid.query.scan.ScanQuery; +import org.apache.druid.query.scan.ScanQueryRunnerFactory; +import org.apache.druid.query.search.SearchQueryRunnerFactory; +import org.apache.druid.query.search.SearchQuery; +import org.apache.druid.query.select.SelectQuery; +import org.apache.druid.query.select.SelectQueryRunnerFactory; +import org.apache.druid.query.timeboundary.TimeBoundaryQuery; +import org.apache.druid.query.timeboundary.TimeBoundaryQueryRunnerFactory; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.timeseries.TimeseriesQueryRunnerFactory; +import org.apache.druid.query.topn.TopNQuery; +import org.apache.druid.query.topn.TopNQueryRunnerFactory; +import org.apache.druid.server.QueryManager; import java.util.Map; diff --git a/server/src/main/java/io/druid/guice/QueryToolChestModule.java b/server/src/main/java/org/apache/druid/guice/QueryToolChestModule.java similarity index 70% rename from server/src/main/java/io/druid/guice/QueryToolChestModule.java rename to server/src/main/java/org/apache/druid/guice/QueryToolChestModule.java index 961909d8b155..b21e982217ad 100644 --- a/server/src/main/java/io/druid/guice/QueryToolChestModule.java +++ b/server/src/main/java/org/apache/druid/guice/QueryToolChestModule.java @@ -17,53 +17,53 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.google.common.collect.ImmutableMap; import com.google.inject.Binder; import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.multibindings.MapBinder; -import io.druid.query.DefaultGenericQueryMetricsFactory; -import io.druid.query.GenericQueryMetricsFactory; -import io.druid.query.MapQueryToolChestWarehouse; -import io.druid.query.Query; -import io.druid.query.QueryToolChest; -import io.druid.query.QueryToolChestWarehouse; -import io.druid.query.datasourcemetadata.DataSourceMetadataQuery; -import io.druid.query.datasourcemetadata.DataSourceQueryQueryToolChest; -import io.druid.query.groupby.DefaultGroupByQueryMetricsFactory; -import io.druid.query.groupby.GroupByQuery; -import io.druid.query.groupby.GroupByQueryConfig; -import io.druid.query.groupby.GroupByQueryMetricsFactory; -import io.druid.query.groupby.GroupByQueryQueryToolChest; -import io.druid.query.metadata.SegmentMetadataQueryConfig; -import io.druid.query.metadata.SegmentMetadataQueryQueryToolChest; -import io.druid.query.metadata.metadata.SegmentMetadataQuery; -import io.druid.query.scan.ScanQuery; -import io.druid.query.scan.ScanQueryConfig; -import io.druid.query.scan.ScanQueryQueryToolChest; -import io.druid.query.search.SearchQueryQueryToolChest; -import io.druid.query.search.DefaultSearchQueryMetricsFactory; -import io.druid.query.search.SearchQuery; -import io.druid.query.search.SearchQueryConfig; -import io.druid.query.search.SearchQueryMetricsFactory; -import io.druid.query.select.DefaultSelectQueryMetricsFactory; -import io.druid.query.select.SelectQuery; -import io.druid.query.select.SelectQueryConfig; -import io.druid.query.select.SelectQueryMetricsFactory; -import io.druid.query.select.SelectQueryQueryToolChest; -import io.druid.query.timeboundary.TimeBoundaryQuery; -import io.druid.query.timeboundary.TimeBoundaryQueryQueryToolChest; -import io.druid.query.timeseries.DefaultTimeseriesQueryMetricsFactory; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.timeseries.TimeseriesQueryMetricsFactory; -import io.druid.query.timeseries.TimeseriesQueryQueryToolChest; -import io.druid.query.topn.DefaultTopNQueryMetricsFactory; -import io.druid.query.topn.TopNQuery; -import io.druid.query.topn.TopNQueryConfig; -import io.druid.query.topn.TopNQueryMetricsFactory; -import io.druid.query.topn.TopNQueryQueryToolChest; +import org.apache.druid.query.DefaultGenericQueryMetricsFactory; +import org.apache.druid.query.GenericQueryMetricsFactory; +import org.apache.druid.query.MapQueryToolChestWarehouse; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.QueryToolChestWarehouse; +import org.apache.druid.query.datasourcemetadata.DataSourceMetadataQuery; +import org.apache.druid.query.datasourcemetadata.DataSourceQueryQueryToolChest; +import org.apache.druid.query.groupby.DefaultGroupByQueryMetricsFactory; +import org.apache.druid.query.groupby.GroupByQuery; +import org.apache.druid.query.groupby.GroupByQueryConfig; +import org.apache.druid.query.groupby.GroupByQueryMetricsFactory; +import org.apache.druid.query.groupby.GroupByQueryQueryToolChest; +import org.apache.druid.query.metadata.SegmentMetadataQueryConfig; +import org.apache.druid.query.metadata.SegmentMetadataQueryQueryToolChest; +import org.apache.druid.query.metadata.metadata.SegmentMetadataQuery; +import org.apache.druid.query.scan.ScanQuery; +import org.apache.druid.query.scan.ScanQueryConfig; +import org.apache.druid.query.scan.ScanQueryQueryToolChest; +import org.apache.druid.query.search.SearchQueryQueryToolChest; +import org.apache.druid.query.search.DefaultSearchQueryMetricsFactory; +import org.apache.druid.query.search.SearchQuery; +import org.apache.druid.query.search.SearchQueryConfig; +import org.apache.druid.query.search.SearchQueryMetricsFactory; +import org.apache.druid.query.select.DefaultSelectQueryMetricsFactory; +import org.apache.druid.query.select.SelectQuery; +import org.apache.druid.query.select.SelectQueryConfig; +import org.apache.druid.query.select.SelectQueryMetricsFactory; +import org.apache.druid.query.select.SelectQueryQueryToolChest; +import org.apache.druid.query.timeboundary.TimeBoundaryQuery; +import org.apache.druid.query.timeboundary.TimeBoundaryQueryQueryToolChest; +import org.apache.druid.query.timeseries.DefaultTimeseriesQueryMetricsFactory; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.timeseries.TimeseriesQueryMetricsFactory; +import org.apache.druid.query.timeseries.TimeseriesQueryQueryToolChest; +import org.apache.druid.query.topn.DefaultTopNQueryMetricsFactory; +import org.apache.druid.query.topn.TopNQuery; +import org.apache.druid.query.topn.TopNQueryConfig; +import org.apache.druid.query.topn.TopNQueryMetricsFactory; +import org.apache.druid.query.topn.TopNQueryQueryToolChest; import java.util.Map; diff --git a/server/src/main/java/io/druid/guice/QueryableModule.java b/server/src/main/java/org/apache/druid/guice/QueryableModule.java similarity index 74% rename from server/src/main/java/io/druid/guice/QueryableModule.java rename to server/src/main/java/org/apache/druid/guice/QueryableModule.java index 10a5f077fc04..3a394fa89eda 100644 --- a/server/src/main/java/io/druid/guice/QueryableModule.java +++ b/server/src/main/java/org/apache/druid/guice/QueryableModule.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.inject.Binder; -import io.druid.initialization.DruidModule; -import io.druid.query.DefaultQueryRunnerFactoryConglomerate; -import io.druid.query.QueryRunnerFactoryConglomerate; -import io.druid.server.log.ComposingRequestLoggerProvider; -import io.druid.server.log.EmittingRequestLoggerProvider; -import io.druid.server.log.FileRequestLoggerProvider; -import io.druid.server.log.FilteredRequestLoggerProvider; -import io.druid.server.log.LoggingRequestLoggerProvider; -import io.druid.server.log.RequestLogger; -import io.druid.server.log.RequestLoggerProvider; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.query.DefaultQueryRunnerFactoryConglomerate; +import org.apache.druid.query.QueryRunnerFactoryConglomerate; +import org.apache.druid.server.log.ComposingRequestLoggerProvider; +import org.apache.druid.server.log.EmittingRequestLoggerProvider; +import org.apache.druid.server.log.FileRequestLoggerProvider; +import org.apache.druid.server.log.FilteredRequestLoggerProvider; +import org.apache.druid.server.log.LoggingRequestLoggerProvider; +import org.apache.druid.server.log.RequestLogger; +import org.apache.druid.server.log.RequestLoggerProvider; import java.util.Collections; import java.util.List; diff --git a/server/src/main/java/io/druid/guice/RealtimeManagerConfig.java b/server/src/main/java/org/apache/druid/guice/RealtimeManagerConfig.java similarity index 96% rename from server/src/main/java/io/druid/guice/RealtimeManagerConfig.java rename to server/src/main/java/org/apache/druid/guice/RealtimeManagerConfig.java index c792c6c2577e..97da66d6fd79 100644 --- a/server/src/main/java/io/druid/guice/RealtimeManagerConfig.java +++ b/server/src/main/java/org/apache/druid/guice/RealtimeManagerConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/guice/RouterProcessingModule.java b/server/src/main/java/org/apache/druid/guice/RouterProcessingModule.java similarity index 74% rename from server/src/main/java/io/druid/guice/RouterProcessingModule.java rename to server/src/main/java/org/apache/druid/guice/RouterProcessingModule.java index 4b2bbc1710a5..8093f1d1c613 100644 --- a/server/src/main/java/io/druid/guice/RouterProcessingModule.java +++ b/server/src/main/java/org/apache/druid/guice/RouterProcessingModule.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.google.inject.Binder; import com.google.inject.Module; import com.google.inject.Provides; -import io.druid.collections.BlockingPool; -import io.druid.collections.DummyBlockingPool; -import io.druid.collections.DummyNonBlockingPool; -import io.druid.collections.NonBlockingPool; -import io.druid.guice.annotations.Global; -import io.druid.guice.annotations.Merging; -import io.druid.guice.annotations.Processing; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.concurrent.ExecutorServiceConfig; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.DruidProcessingConfig; -import io.druid.query.ExecutorServiceMonitor; -import io.druid.server.metrics.MetricsModule; +import org.apache.druid.collections.BlockingPool; +import org.apache.druid.collections.DummyBlockingPool; +import org.apache.druid.collections.DummyNonBlockingPool; +import org.apache.druid.collections.NonBlockingPool; +import org.apache.druid.guice.annotations.Global; +import org.apache.druid.guice.annotations.Merging; +import org.apache.druid.guice.annotations.Processing; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.concurrent.ExecutorServiceConfig; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.DruidProcessingConfig; +import org.apache.druid.query.ExecutorServiceMonitor; +import org.apache.druid.server.metrics.MetricsModule; import java.nio.ByteBuffer; import java.util.concurrent.ExecutorService; @@ -42,7 +42,7 @@ /** * This module is used to fulfill dependency injection of query processing and caching resources: buffer pools and * thread pools on Router Druid node type. Router needs to inject those resources, because it depends on - * {@link io.druid.query.QueryToolChest}s, and they couple query type aspects not related to processing and caching, + * {@link org.apache.druid.query.QueryToolChest}s, and they couple query type aspects not related to processing and caching, * which Router uses, and related to processing and caching, which Router doesn't use, but they inject the resources. */ public class RouterProcessingModule implements Module diff --git a/server/src/main/java/io/druid/guice/SQLMetadataStorageDruidModule.java b/server/src/main/java/org/apache/druid/guice/SQLMetadataStorageDruidModule.java similarity index 76% rename from server/src/main/java/io/druid/guice/SQLMetadataStorageDruidModule.java rename to server/src/main/java/org/apache/druid/guice/SQLMetadataStorageDruidModule.java index de2c3eb8ceec..955ab6bb4be4 100644 --- a/server/src/main/java/io/druid/guice/SQLMetadataStorageDruidModule.java +++ b/server/src/main/java/org/apache/druid/guice/SQLMetadataStorageDruidModule.java @@ -17,38 +17,38 @@ * 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.Module; -import io.druid.audit.AuditManager; -import io.druid.indexer.MetadataStorageUpdaterJobHandler; -import io.druid.indexer.SQLMetadataStorageUpdaterJobHandler; -import io.druid.indexing.overlord.IndexerMetadataStorageCoordinator; -import io.druid.metadata.IndexerSQLMetadataStorageCoordinator; -import io.druid.metadata.MetadataRuleManager; -import io.druid.metadata.MetadataRuleManagerProvider; -import io.druid.metadata.MetadataSegmentManager; -import io.druid.metadata.MetadataSegmentManagerProvider; -import io.druid.metadata.MetadataSegmentPublisher; -import io.druid.metadata.MetadataSegmentPublisherProvider; -import io.druid.metadata.MetadataStorageActionHandlerFactory; -import io.druid.metadata.MetadataStorageConnector; -import io.druid.metadata.MetadataStorageProvider; -import io.druid.metadata.MetadataSupervisorManager; -import io.druid.metadata.SQLMetadataConnector; -import io.druid.metadata.SQLMetadataRuleManager; -import io.druid.metadata.SQLMetadataRuleManagerProvider; -import io.druid.metadata.SQLMetadataSegmentManager; -import io.druid.metadata.SQLMetadataSegmentManagerProvider; -import io.druid.metadata.SQLMetadataSegmentPublisher; -import io.druid.metadata.SQLMetadataSegmentPublisherProvider; -import io.druid.metadata.SQLMetadataSupervisorManager; -import io.druid.server.audit.AuditManagerProvider; -import io.druid.server.audit.SQLAuditManager; -import io.druid.server.audit.SQLAuditManagerConfig; -import io.druid.server.audit.SQLAuditManagerProvider; +import org.apache.druid.audit.AuditManager; +import org.apache.druid.indexer.MetadataStorageUpdaterJobHandler; +import org.apache.druid.indexer.SQLMetadataStorageUpdaterJobHandler; +import org.apache.druid.indexing.overlord.IndexerMetadataStorageCoordinator; +import org.apache.druid.metadata.IndexerSQLMetadataStorageCoordinator; +import org.apache.druid.metadata.MetadataRuleManager; +import org.apache.druid.metadata.MetadataRuleManagerProvider; +import org.apache.druid.metadata.MetadataSegmentManager; +import org.apache.druid.metadata.MetadataSegmentManagerProvider; +import org.apache.druid.metadata.MetadataSegmentPublisher; +import org.apache.druid.metadata.MetadataSegmentPublisherProvider; +import org.apache.druid.metadata.MetadataStorageActionHandlerFactory; +import org.apache.druid.metadata.MetadataStorageConnector; +import org.apache.druid.metadata.MetadataStorageProvider; +import org.apache.druid.metadata.MetadataSupervisorManager; +import org.apache.druid.metadata.SQLMetadataConnector; +import org.apache.druid.metadata.SQLMetadataRuleManager; +import org.apache.druid.metadata.SQLMetadataRuleManagerProvider; +import org.apache.druid.metadata.SQLMetadataSegmentManager; +import org.apache.druid.metadata.SQLMetadataSegmentManagerProvider; +import org.apache.druid.metadata.SQLMetadataSegmentPublisher; +import org.apache.druid.metadata.SQLMetadataSegmentPublisherProvider; +import org.apache.druid.metadata.SQLMetadataSupervisorManager; +import org.apache.druid.server.audit.AuditManagerProvider; +import org.apache.druid.server.audit.SQLAuditManager; +import org.apache.druid.server.audit.SQLAuditManagerConfig; +import org.apache.druid.server.audit.SQLAuditManagerProvider; public class SQLMetadataStorageDruidModule implements Module { diff --git a/server/src/main/java/io/druid/guice/ServerModule.java b/server/src/main/java/org/apache/druid/guice/ServerModule.java similarity index 74% rename from server/src/main/java/io/druid/guice/ServerModule.java rename to server/src/main/java/org/apache/druid/guice/ServerModule.java index 471e56a745e4..07068edb5a21 100644 --- a/server/src/main/java/io/druid/guice/ServerModule.java +++ b/server/src/main/java/org/apache/druid/guice/ServerModule.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.inject.Binder; import com.google.inject.Provides; -import io.druid.guice.annotations.Self; -import io.druid.initialization.DruidModule; -import io.druid.java.util.common.concurrent.ScheduledExecutorFactory; -import io.druid.java.util.common.concurrent.ScheduledExecutors; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.server.DruidNode; -import io.druid.server.initialization.ZkPathsConfig; -import io.druid.timeline.partition.HashBasedNumberedShardSpec; -import io.druid.timeline.partition.LinearShardSpec; -import io.druid.timeline.partition.NumberedShardSpec; -import io.druid.timeline.partition.SingleDimensionShardSpec; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.java.util.common.concurrent.ScheduledExecutorFactory; +import org.apache.druid.java.util.common.concurrent.ScheduledExecutors; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.timeline.partition.HashBasedNumberedShardSpec; +import org.apache.druid.timeline.partition.LinearShardSpec; +import org.apache.druid.timeline.partition.NumberedShardSpec; +import org.apache.druid.timeline.partition.SingleDimensionShardSpec; import java.util.Collections; import java.util.List; diff --git a/server/src/main/java/io/druid/guice/ServerViewModule.java b/server/src/main/java/org/apache/druid/guice/ServerViewModule.java similarity index 79% rename from server/src/main/java/io/druid/guice/ServerViewModule.java rename to server/src/main/java/org/apache/druid/guice/ServerViewModule.java index 09cdaf1584b4..3ed242e1fd3f 100644 --- a/server/src/main/java/io/druid/guice/ServerViewModule.java +++ b/server/src/main/java/org/apache/druid/guice/ServerViewModule.java @@ -17,17 +17,17 @@ * 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.client.FilteredServerInventoryView; -import io.druid.client.FilteredServerInventoryViewProvider; -import io.druid.client.HttpServerInventoryViewConfig; -import io.druid.client.InventoryView; -import io.druid.client.ServerInventoryView; -import io.druid.client.ServerInventoryViewProvider; -import io.druid.client.ServerView; +import org.apache.druid.client.FilteredServerInventoryView; +import org.apache.druid.client.FilteredServerInventoryViewProvider; +import org.apache.druid.client.HttpServerInventoryViewConfig; +import org.apache.druid.client.InventoryView; +import org.apache.druid.client.ServerInventoryView; +import org.apache.druid.client.ServerInventoryViewProvider; +import org.apache.druid.client.ServerView; /** */ diff --git a/server/src/main/java/io/druid/guice/StartupLoggingModule.java b/server/src/main/java/org/apache/druid/guice/StartupLoggingModule.java similarity index 92% rename from server/src/main/java/io/druid/guice/StartupLoggingModule.java rename to server/src/main/java/org/apache/druid/guice/StartupLoggingModule.java index a04277b4a6b8..c75b0901a88f 100644 --- a/server/src/main/java/io/druid/guice/StartupLoggingModule.java +++ b/server/src/main/java/org/apache/druid/guice/StartupLoggingModule.java @@ -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.server.log.StartupLoggingConfig; +import org.apache.druid.server.log.StartupLoggingConfig; public class StartupLoggingModule implements Module { diff --git a/server/src/main/java/io/druid/guice/StorageNodeModule.java b/server/src/main/java/org/apache/druid/guice/StorageNodeModule.java similarity index 84% rename from server/src/main/java/io/druid/guice/StorageNodeModule.java rename to server/src/main/java/org/apache/druid/guice/StorageNodeModule.java index 204ad2e9ae48..542290f6ca53 100644 --- a/server/src/main/java/io/druid/guice/StorageNodeModule.java +++ b/server/src/main/java/org/apache/druid/guice/StorageNodeModule.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.google.inject.Binder; import com.google.inject.Module; import com.google.inject.Provides; import com.google.inject.ProvisionException; import com.google.inject.util.Providers; -import io.druid.client.DruidServerConfig; -import io.druid.discovery.DataNodeService; -import io.druid.guice.annotations.Self; -import io.druid.query.DruidProcessingConfig; -import io.druid.segment.column.ColumnConfig; -import io.druid.segment.loading.SegmentLoaderConfig; -import io.druid.server.DruidNode; -import io.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.client.DruidServerConfig; +import org.apache.druid.discovery.DataNodeService; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.query.DruidProcessingConfig; +import org.apache.druid.segment.column.ColumnConfig; +import org.apache.druid.segment.loading.SegmentLoaderConfig; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.coordination.DruidServerMetadata; import javax.annotation.Nullable; diff --git a/server/src/main/java/io/druid/guice/annotations/Client.java b/server/src/main/java/org/apache/druid/guice/annotations/Client.java similarity index 96% rename from server/src/main/java/io/druid/guice/annotations/Client.java rename to server/src/main/java/org/apache/druid/guice/annotations/Client.java index 755e91966672..293da832b2a3 100644 --- a/server/src/main/java/io/druid/guice/annotations/Client.java +++ b/server/src/main/java/org/apache/druid/guice/annotations/Client.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.guice.annotations; +package org.apache.druid.guice.annotations; import com.google.inject.BindingAnnotation; diff --git a/server/src/main/java/io/druid/guice/annotations/CoordinatorIndexingServiceHelper.java b/server/src/main/java/org/apache/druid/guice/annotations/CoordinatorIndexingServiceHelper.java similarity index 96% rename from server/src/main/java/io/druid/guice/annotations/CoordinatorIndexingServiceHelper.java rename to server/src/main/java/org/apache/druid/guice/annotations/CoordinatorIndexingServiceHelper.java index eaf0c4074556..c9bfc0cabc21 100644 --- a/server/src/main/java/io/druid/guice/annotations/CoordinatorIndexingServiceHelper.java +++ b/server/src/main/java/org/apache/druid/guice/annotations/CoordinatorIndexingServiceHelper.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.guice.annotations; +package org.apache.druid.guice.annotations; import com.google.inject.BindingAnnotation; diff --git a/server/src/main/java/io/druid/guice/annotations/EscalatedClient.java b/server/src/main/java/org/apache/druid/guice/annotations/EscalatedClient.java similarity index 96% rename from server/src/main/java/io/druid/guice/annotations/EscalatedClient.java rename to server/src/main/java/org/apache/druid/guice/annotations/EscalatedClient.java index 8419a1312aa4..3b3183f57174 100644 --- a/server/src/main/java/io/druid/guice/annotations/EscalatedClient.java +++ b/server/src/main/java/org/apache/druid/guice/annotations/EscalatedClient.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.guice.annotations; +package org.apache.druid.guice.annotations; import com.google.inject.BindingAnnotation; diff --git a/server/src/main/java/io/druid/guice/annotations/RemoteChatHandler.java b/server/src/main/java/org/apache/druid/guice/annotations/RemoteChatHandler.java similarity index 96% rename from server/src/main/java/io/druid/guice/annotations/RemoteChatHandler.java rename to server/src/main/java/org/apache/druid/guice/annotations/RemoteChatHandler.java index 7c372dd28a94..59b205ca1102 100644 --- a/server/src/main/java/io/druid/guice/annotations/RemoteChatHandler.java +++ b/server/src/main/java/org/apache/druid/guice/annotations/RemoteChatHandler.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.guice.annotations; +package org.apache.druid.guice.annotations; import com.google.inject.BindingAnnotation; diff --git a/server/src/main/java/io/druid/guice/http/AbstractHttpClientProvider.java b/server/src/main/java/org/apache/druid/guice/http/AbstractHttpClientProvider.java similarity index 96% rename from server/src/main/java/io/druid/guice/http/AbstractHttpClientProvider.java rename to server/src/main/java/org/apache/druid/guice/http/AbstractHttpClientProvider.java index 96730deb2aa6..532f4c99c20b 100644 --- a/server/src/main/java/io/druid/guice/http/AbstractHttpClientProvider.java +++ b/server/src/main/java/org/apache/druid/guice/http/AbstractHttpClientProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.guice.http; +package org.apache.druid.guice.http; import com.google.common.base.Supplier; import com.google.inject.Binding; @@ -26,7 +26,7 @@ import com.google.inject.Key; import com.google.inject.Provider; import com.google.inject.TypeLiteral; -import io.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; import javax.net.ssl.SSLContext; import java.lang.annotation.Annotation; diff --git a/server/src/main/java/io/druid/guice/http/DruidHttpClientConfig.java b/server/src/main/java/org/apache/druid/guice/http/DruidHttpClientConfig.java similarity index 96% rename from server/src/main/java/io/druid/guice/http/DruidHttpClientConfig.java rename to server/src/main/java/org/apache/druid/guice/http/DruidHttpClientConfig.java index 9e859125ea0b..deadd859b4b0 100644 --- a/server/src/main/java/io/druid/guice/http/DruidHttpClientConfig.java +++ b/server/src/main/java/org/apache/druid/guice/http/DruidHttpClientConfig.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.guice.http; +package org.apache.druid.guice.http; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.logger.Logger; import org.joda.time.Duration; import org.joda.time.Period; diff --git a/server/src/main/java/io/druid/guice/http/HttpClientModule.java b/server/src/main/java/org/apache/druid/guice/http/HttpClientModule.java similarity index 89% rename from server/src/main/java/io/druid/guice/http/HttpClientModule.java rename to server/src/main/java/org/apache/druid/guice/http/HttpClientModule.java index 5340607d00ec..d81aa368b74f 100644 --- a/server/src/main/java/io/druid/guice/http/HttpClientModule.java +++ b/server/src/main/java/org/apache/druid/guice/http/HttpClientModule.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.guice.http; +package org.apache.druid.guice.http; import com.google.common.collect.Sets; import com.google.inject.Binder; import com.google.inject.Inject; import com.google.inject.Module; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.LazySingleton; -import io.druid.guice.annotations.EscalatedClient; -import io.druid.guice.annotations.EscalatedGlobal; -import io.druid.guice.annotations.Global; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.HttpClientConfig; -import io.druid.java.util.http.client.HttpClientInit; -import io.druid.server.security.Escalator; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.annotations.EscalatedClient; +import org.apache.druid.guice.annotations.EscalatedGlobal; +import org.apache.druid.guice.annotations.Global; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.HttpClientConfig; +import org.apache.druid.java.util.http.client.HttpClientInit; +import org.apache.druid.server.security.Escalator; import java.lang.annotation.Annotation; import java.util.Set; diff --git a/server/src/main/java/io/druid/guice/http/JettyHttpClientModule.java b/server/src/main/java/org/apache/druid/guice/http/JettyHttpClientModule.java similarity index 95% rename from server/src/main/java/io/druid/guice/http/JettyHttpClientModule.java rename to server/src/main/java/org/apache/druid/guice/http/JettyHttpClientModule.java index 80f167e66e0c..00cda16fbadd 100644 --- a/server/src/main/java/io/druid/guice/http/JettyHttpClientModule.java +++ b/server/src/main/java/org/apache/druid/guice/http/JettyHttpClientModule.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.guice.http; +package org.apache.druid.guice.http; import com.google.common.base.Throwables; import com.google.inject.Binder; import com.google.inject.Module; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.LazySingleton; -import io.druid.guice.annotations.Global; -import io.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.annotations.Global; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; diff --git a/server/src/main/java/io/druid/guice/http/LifecycleUtils.java b/server/src/main/java/org/apache/druid/guice/http/LifecycleUtils.java similarity index 93% rename from server/src/main/java/io/druid/guice/http/LifecycleUtils.java rename to server/src/main/java/org/apache/druid/guice/http/LifecycleUtils.java index 66020f745709..4140eaf8cad0 100644 --- a/server/src/main/java/io/druid/guice/http/LifecycleUtils.java +++ b/server/src/main/java/org/apache/druid/guice/http/LifecycleUtils.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.guice.http; +package org.apache.druid.guice.http; import com.google.common.base.Throwables; -import io.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; public class LifecycleUtils { diff --git a/server/src/main/java/io/druid/guice/security/AuthenticatorModule.java b/server/src/main/java/org/apache/druid/guice/security/AuthenticatorModule.java similarity index 84% rename from server/src/main/java/io/druid/guice/security/AuthenticatorModule.java rename to server/src/main/java/org/apache/druid/guice/security/AuthenticatorModule.java index 7e73195c743a..9384cea56c5a 100644 --- a/server/src/main/java/io/druid/guice/security/AuthenticatorModule.java +++ b/server/src/main/java/org/apache/druid/guice/security/AuthenticatorModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.guice.security; +package org.apache.druid.guice.security; import com.google.inject.Binder; import com.google.inject.Key; @@ -25,11 +25,11 @@ import com.google.inject.Provides; import com.google.inject.multibindings.MapBinder; import com.google.inject.name.Named; -import io.druid.guice.LazySingleton; -import io.druid.guice.PolyBind; -import io.druid.server.security.AllowAllAuthenticator; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.Authenticator; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.PolyBind; +import org.apache.druid.server.security.AllowAllAuthenticator; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.Authenticator; public class AuthenticatorModule implements Module { diff --git a/server/src/main/java/io/druid/guice/security/AuthorizerModule.java b/server/src/main/java/org/apache/druid/guice/security/AuthorizerModule.java similarity index 84% rename from server/src/main/java/io/druid/guice/security/AuthorizerModule.java rename to server/src/main/java/org/apache/druid/guice/security/AuthorizerModule.java index 15e28f409362..95ac8fcf5c39 100644 --- a/server/src/main/java/io/druid/guice/security/AuthorizerModule.java +++ b/server/src/main/java/org/apache/druid/guice/security/AuthorizerModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.guice.security; +package org.apache.druid.guice.security; import com.google.inject.Binder; import com.google.inject.Key; @@ -25,11 +25,11 @@ import com.google.inject.Provides; import com.google.inject.multibindings.MapBinder; import com.google.inject.name.Named; -import io.druid.guice.LazySingleton; -import io.druid.guice.PolyBind; -import io.druid.server.security.AllowAllAuthorizer; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.Authorizer; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.PolyBind; +import org.apache.druid.server.security.AllowAllAuthorizer; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.Authorizer; public class AuthorizerModule implements Module { diff --git a/server/src/main/java/io/druid/guice/security/DruidAuthModule.java b/server/src/main/java/org/apache/druid/guice/security/DruidAuthModule.java similarity index 86% rename from server/src/main/java/io/druid/guice/security/DruidAuthModule.java rename to server/src/main/java/org/apache/druid/guice/security/DruidAuthModule.java index 990b68271012..e9e8fba0f977 100644 --- a/server/src/main/java/io/druid/guice/security/DruidAuthModule.java +++ b/server/src/main/java/org/apache/druid/guice/security/DruidAuthModule.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.guice.security; +package org.apache.druid.guice.security; import com.fasterxml.jackson.databind.Module; import com.google.inject.Binder; -import io.druid.guice.JsonConfigProvider; -import io.druid.initialization.DruidModule; -import io.druid.server.security.AuthConfig; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.server.security.AuthConfig; import java.util.Collections; import java.util.List; diff --git a/server/src/main/java/io/druid/guice/security/EscalatorModule.java b/server/src/main/java/org/apache/druid/guice/security/EscalatorModule.java similarity index 88% rename from server/src/main/java/io/druid/guice/security/EscalatorModule.java rename to server/src/main/java/org/apache/druid/guice/security/EscalatorModule.java index 27e0214d2b79..ab641f192bdf 100644 --- a/server/src/main/java/io/druid/guice/security/EscalatorModule.java +++ b/server/src/main/java/org/apache/druid/guice/security/EscalatorModule.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.guice.security; +package org.apache.druid.guice.security; import com.google.inject.Binder; import com.google.inject.Module; -import io.druid.guice.JsonConfigProvider; -import io.druid.server.security.Escalator; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.server.security.Escalator; public class EscalatorModule implements Module { diff --git a/server/src/main/java/io/druid/indexer/SQLMetadataStorageUpdaterJobHandler.java b/server/src/main/java/org/apache/druid/indexer/SQLMetadataStorageUpdaterJobHandler.java similarity index 90% rename from server/src/main/java/io/druid/indexer/SQLMetadataStorageUpdaterJobHandler.java rename to server/src/main/java/org/apache/druid/indexer/SQLMetadataStorageUpdaterJobHandler.java index cf11782833c4..4ba15d568119 100644 --- a/server/src/main/java/io/druid/indexer/SQLMetadataStorageUpdaterJobHandler.java +++ b/server/src/main/java/org/apache/druid/indexer/SQLMetadataStorageUpdaterJobHandler.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.indexer; +package org.apache.druid.indexer; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import com.google.inject.Inject; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.metadata.SQLMetadataConnector; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.metadata.SQLMetadataConnector; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.skife.jdbi.v2.Handle; import org.skife.jdbi.v2.IDBI; import org.skife.jdbi.v2.PreparedBatch; diff --git a/server/src/main/java/io/druid/indexing/overlord/DataSourceMetadata.java b/server/src/main/java/org/apache/druid/indexing/overlord/DataSourceMetadata.java similarity index 98% rename from server/src/main/java/io/druid/indexing/overlord/DataSourceMetadata.java rename to server/src/main/java/org/apache/druid/indexing/overlord/DataSourceMetadata.java index 28b8590894cb..5148aede4555 100644 --- a/server/src/main/java/io/druid/indexing/overlord/DataSourceMetadata.java +++ b/server/src/main/java/org/apache/druid/indexing/overlord/DataSourceMetadata.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/server/src/main/java/io/druid/indexing/overlord/IndexerMetadataStorageCoordinator.java b/server/src/main/java/org/apache/druid/indexing/overlord/IndexerMetadataStorageCoordinator.java similarity index 97% rename from server/src/main/java/io/druid/indexing/overlord/IndexerMetadataStorageCoordinator.java rename to server/src/main/java/org/apache/druid/indexing/overlord/IndexerMetadataStorageCoordinator.java index a90ca26bbf5d..c58f2749c508 100644 --- a/server/src/main/java/io/druid/indexing/overlord/IndexerMetadataStorageCoordinator.java +++ b/server/src/main/java/org/apache/druid/indexing/overlord/IndexerMetadataStorageCoordinator.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; -import io.druid.java.util.common.Pair; -import io.druid.segment.realtime.appenderator.SegmentIdentifier; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.segment.realtime.appenderator.SegmentIdentifier; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import java.io.IOException; diff --git a/server/src/main/java/io/druid/indexing/overlord/ObjectMetadata.java b/server/src/main/java/org/apache/druid/indexing/overlord/ObjectMetadata.java similarity index 97% rename from server/src/main/java/io/druid/indexing/overlord/ObjectMetadata.java rename to server/src/main/java/org/apache/druid/indexing/overlord/ObjectMetadata.java index 7e5678fd45a8..bae6bee5e640 100644 --- a/server/src/main/java/io/druid/indexing/overlord/ObjectMetadata.java +++ b/server/src/main/java/org/apache/druid/indexing/overlord/ObjectMetadata.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/indexing/overlord/SegmentPublishResult.java b/server/src/main/java/org/apache/druid/indexing/overlord/SegmentPublishResult.java similarity index 97% rename from server/src/main/java/io/druid/indexing/overlord/SegmentPublishResult.java rename to server/src/main/java/org/apache/druid/indexing/overlord/SegmentPublishResult.java index 21bd12501f00..dc86b7268e52 100644 --- a/server/src/main/java/io/druid/indexing/overlord/SegmentPublishResult.java +++ b/server/src/main/java/org/apache/druid/indexing/overlord/SegmentPublishResult.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.indexing.overlord; +package org.apache.druid.indexing.overlord; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import java.util.Objects; import java.util.Set; diff --git a/server/src/main/java/io/druid/indexing/overlord/supervisor/NoopSupervisorSpec.java b/server/src/main/java/org/apache/druid/indexing/overlord/supervisor/NoopSupervisorSpec.java similarity index 96% rename from server/src/main/java/io/druid/indexing/overlord/supervisor/NoopSupervisorSpec.java rename to server/src/main/java/org/apache/druid/indexing/overlord/supervisor/NoopSupervisorSpec.java index ccf695e41a52..c32ea7af0b24 100644 --- a/server/src/main/java/io/druid/indexing/overlord/supervisor/NoopSupervisorSpec.java +++ b/server/src/main/java/org/apache/druid/indexing/overlord/supervisor/NoopSupervisorSpec.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.indexing.overlord.supervisor; +package org.apache.druid.indexing.overlord.supervisor; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.indexing.overlord.DataSourceMetadata; +import org.apache.druid.indexing.overlord.DataSourceMetadata; import javax.annotation.Nullable; import java.util.ArrayList; diff --git a/server/src/main/java/io/druid/indexing/overlord/supervisor/Supervisor.java b/server/src/main/java/org/apache/druid/indexing/overlord/supervisor/Supervisor.java similarity index 95% rename from server/src/main/java/io/druid/indexing/overlord/supervisor/Supervisor.java rename to server/src/main/java/org/apache/druid/indexing/overlord/supervisor/Supervisor.java index 6f3c05003a80..03c2a43d9ebb 100644 --- a/server/src/main/java/io/druid/indexing/overlord/supervisor/Supervisor.java +++ b/server/src/main/java/org/apache/druid/indexing/overlord/supervisor/Supervisor.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.indexing.overlord.supervisor; +package org.apache.druid.indexing.overlord.supervisor; import com.google.common.collect.ImmutableMap; -import io.druid.indexing.overlord.DataSourceMetadata; +import org.apache.druid.indexing.overlord.DataSourceMetadata; import javax.annotation.Nullable; import java.util.Map; diff --git a/server/src/main/java/io/druid/indexing/overlord/supervisor/SupervisorReport.java b/server/src/main/java/org/apache/druid/indexing/overlord/supervisor/SupervisorReport.java similarity index 97% rename from server/src/main/java/io/druid/indexing/overlord/supervisor/SupervisorReport.java rename to server/src/main/java/org/apache/druid/indexing/overlord/supervisor/SupervisorReport.java index 89c3a7867666..ebe1018f4d56 100644 --- a/server/src/main/java/io/druid/indexing/overlord/supervisor/SupervisorReport.java +++ b/server/src/main/java/org/apache/druid/indexing/overlord/supervisor/SupervisorReport.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.supervisor; +package org.apache.druid.indexing.overlord.supervisor; import com.fasterxml.jackson.annotation.JsonProperty; import org.joda.time.DateTime; diff --git a/server/src/main/java/io/druid/indexing/overlord/supervisor/SupervisorSpec.java b/server/src/main/java/org/apache/druid/indexing/overlord/supervisor/SupervisorSpec.java similarity index 96% rename from server/src/main/java/io/druid/indexing/overlord/supervisor/SupervisorSpec.java rename to server/src/main/java/org/apache/druid/indexing/overlord/supervisor/SupervisorSpec.java index 97c806643945..01bcb4cea561 100644 --- a/server/src/main/java/io/druid/indexing/overlord/supervisor/SupervisorSpec.java +++ b/server/src/main/java/org/apache/druid/indexing/overlord/supervisor/SupervisorSpec.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.supervisor; +package org.apache.druid.indexing.overlord.supervisor; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/server/src/main/java/io/druid/indexing/overlord/supervisor/VersionedSupervisorSpec.java b/server/src/main/java/org/apache/druid/indexing/overlord/supervisor/VersionedSupervisorSpec.java similarity index 97% rename from server/src/main/java/io/druid/indexing/overlord/supervisor/VersionedSupervisorSpec.java rename to server/src/main/java/org/apache/druid/indexing/overlord/supervisor/VersionedSupervisorSpec.java index 9965f1194db1..d589d8526042 100644 --- a/server/src/main/java/io/druid/indexing/overlord/supervisor/VersionedSupervisorSpec.java +++ b/server/src/main/java/org/apache/druid/indexing/overlord/supervisor/VersionedSupervisorSpec.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.indexing.overlord.supervisor; +package org.apache.druid.indexing.overlord.supervisor; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/initialization/ExtensionFirstClassLoader.java b/server/src/main/java/org/apache/druid/initialization/ExtensionFirstClassLoader.java similarity index 98% rename from server/src/main/java/io/druid/initialization/ExtensionFirstClassLoader.java rename to server/src/main/java/org/apache/druid/initialization/ExtensionFirstClassLoader.java index dd625a4ceb52..2c460e242aa8 100644 --- a/server/src/main/java/io/druid/initialization/ExtensionFirstClassLoader.java +++ b/server/src/main/java/org/apache/druid/initialization/ExtensionFirstClassLoader.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.initialization; +package org.apache.druid.initialization; import com.google.common.base.Preconditions; import com.google.common.collect.Iterators; diff --git a/server/src/main/java/io/druid/initialization/Initialization.java b/server/src/main/java/org/apache/druid/initialization/Initialization.java similarity index 88% rename from server/src/main/java/io/druid/initialization/Initialization.java rename to server/src/main/java/org/apache/druid/initialization/Initialization.java index eb847c6ef06b..e8f025c18129 100644 --- a/server/src/main/java/io/druid/initialization/Initialization.java +++ b/server/src/main/java/org/apache/druid/initialization/Initialization.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.initialization; +package org.apache.druid.initialization; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; @@ -30,46 +30,46 @@ import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.util.Modules; -import io.druid.curator.CuratorModule; -import io.druid.curator.discovery.DiscoveryModule; -import io.druid.guice.AWSModule; -import io.druid.guice.AnnouncerModule; -import io.druid.guice.CoordinatorDiscoveryModule; -import io.druid.guice.DruidProcessingConfigModule; -import io.druid.guice.DruidSecondaryModule; -import io.druid.guice.ExpressionModule; -import io.druid.guice.ExtensionsConfig; -import io.druid.guice.FirehoseModule; -import io.druid.guice.IndexingServiceDiscoveryModule; -import io.druid.guice.JacksonConfigManagerModule; -import io.druid.guice.JavaScriptModule; -import io.druid.guice.LifecycleModule; -import io.druid.guice.LocalDataStorageDruidModule; -import io.druid.guice.MetadataConfigModule; -import io.druid.guice.ModulesConfig; -import io.druid.guice.ParsersModule; -import io.druid.guice.ServerModule; -import io.druid.guice.ServerViewModule; -import io.druid.guice.StartupLoggingModule; -import io.druid.guice.StorageNodeModule; -import io.druid.guice.annotations.Client; -import io.druid.guice.annotations.EscalatedClient; -import io.druid.guice.annotations.Json; -import io.druid.guice.annotations.Smile; -import io.druid.guice.http.HttpClientModule; -import io.druid.guice.security.AuthenticatorModule; -import io.druid.guice.security.AuthorizerModule; -import io.druid.guice.security.DruidAuthModule; -import io.druid.guice.security.EscalatorModule; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.logger.Logger; -import io.druid.metadata.storage.derby.DerbyMetadataStorageDruidModule; -import io.druid.segment.writeout.SegmentWriteOutMediumModule; -import io.druid.server.emitter.EmitterModule; -import io.druid.server.initialization.AuthenticatorMapperModule; -import io.druid.server.initialization.AuthorizerMapperModule; -import io.druid.server.initialization.jetty.JettyServerModule; -import io.druid.server.metrics.MetricsModule; +import org.apache.druid.curator.CuratorModule; +import org.apache.druid.curator.discovery.DiscoveryModule; +import org.apache.druid.guice.AWSModule; +import org.apache.druid.guice.AnnouncerModule; +import org.apache.druid.guice.CoordinatorDiscoveryModule; +import org.apache.druid.guice.DruidProcessingConfigModule; +import org.apache.druid.guice.DruidSecondaryModule; +import org.apache.druid.guice.ExpressionModule; +import org.apache.druid.guice.ExtensionsConfig; +import org.apache.druid.guice.FirehoseModule; +import org.apache.druid.guice.IndexingServiceDiscoveryModule; +import org.apache.druid.guice.JacksonConfigManagerModule; +import org.apache.druid.guice.JavaScriptModule; +import org.apache.druid.guice.LifecycleModule; +import org.apache.druid.guice.LocalDataStorageDruidModule; +import org.apache.druid.guice.MetadataConfigModule; +import org.apache.druid.guice.ModulesConfig; +import org.apache.druid.guice.ParsersModule; +import org.apache.druid.guice.ServerModule; +import org.apache.druid.guice.ServerViewModule; +import org.apache.druid.guice.StartupLoggingModule; +import org.apache.druid.guice.StorageNodeModule; +import org.apache.druid.guice.annotations.Client; +import org.apache.druid.guice.annotations.EscalatedClient; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.guice.annotations.Smile; +import org.apache.druid.guice.http.HttpClientModule; +import org.apache.druid.guice.security.AuthenticatorModule; +import org.apache.druid.guice.security.AuthorizerModule; +import org.apache.druid.guice.security.DruidAuthModule; +import org.apache.druid.guice.security.EscalatorModule; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.metadata.storage.derby.DerbyMetadataStorageDruidModule; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumModule; +import org.apache.druid.server.emitter.EmitterModule; +import org.apache.druid.server.initialization.AuthenticatorMapperModule; +import org.apache.druid.server.initialization.AuthorizerMapperModule; +import org.apache.druid.server.initialization.jetty.JettyServerModule; +import org.apache.druid.server.metrics.MetricsModule; import org.apache.commons.io.FileUtils; import org.eclipse.aether.artifact.DefaultArtifact; diff --git a/server/src/main/java/io/druid/initialization/Log4jShutterDownerModule.java b/server/src/main/java/org/apache/druid/initialization/Log4jShutterDownerModule.java similarity index 92% rename from server/src/main/java/io/druid/initialization/Log4jShutterDownerModule.java rename to server/src/main/java/org/apache/druid/initialization/Log4jShutterDownerModule.java index 5a666ba7e3bf..a5ca8d835834 100644 --- a/server/src/main/java/io/druid/initialization/Log4jShutterDownerModule.java +++ b/server/src/main/java/org/apache/druid/initialization/Log4jShutterDownerModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.initialization; +package org.apache.druid.initialization; import com.google.inject.Binder; import com.google.inject.Key; @@ -25,11 +25,11 @@ import com.google.inject.Provides; import com.google.inject.name.Names; -import io.druid.common.config.Log4jShutdown; -import io.druid.guice.ManageLifecycle; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.common.config.Log4jShutdown; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.common.logger.Logger; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.core.impl.Log4jContextFactory; diff --git a/server/src/main/java/io/druid/metadata/DerbyMetadataStorageActionHandler.java b/server/src/main/java/org/apache/druid/metadata/DerbyMetadataStorageActionHandler.java similarity index 97% rename from server/src/main/java/io/druid/metadata/DerbyMetadataStorageActionHandler.java rename to server/src/main/java/org/apache/druid/metadata/DerbyMetadataStorageActionHandler.java index 42986c5643d2..3b24c3c7a1a7 100644 --- a/server/src/main/java/io/druid/metadata/DerbyMetadataStorageActionHandler.java +++ b/server/src/main/java/org/apache/druid/metadata/DerbyMetadataStorageActionHandler.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import org.joda.time.DateTime; import org.skife.jdbi.v2.Handle; import org.skife.jdbi.v2.Query; diff --git a/server/src/main/java/io/druid/metadata/DerbyMetadataStorageActionHandlerFactory.java b/server/src/main/java/org/apache/druid/metadata/DerbyMetadataStorageActionHandlerFactory.java similarity index 97% rename from server/src/main/java/io/druid/metadata/DerbyMetadataStorageActionHandlerFactory.java rename to server/src/main/java/org/apache/druid/metadata/DerbyMetadataStorageActionHandlerFactory.java index 1f5ebcfcae51..cf6dc44ed93b 100644 --- a/server/src/main/java/io/druid/metadata/DerbyMetadataStorageActionHandlerFactory.java +++ b/server/src/main/java/org/apache/druid/metadata/DerbyMetadataStorageActionHandlerFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.inject.Inject; diff --git a/server/src/main/java/io/druid/metadata/IndexerSQLMetadataStorageCoordinator.java b/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java similarity index 97% rename from server/src/main/java/io/druid/metadata/IndexerSQLMetadataStorageCoordinator.java rename to server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java index 82e17a13f4d0..d021e4b1f26b 100644 --- a/server/src/main/java/io/druid/metadata/IndexerSQLMetadataStorageCoordinator.java +++ b/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -33,25 +33,25 @@ import com.google.common.hash.Hashing; import com.google.common.io.BaseEncoding; import com.google.inject.Inject; -import io.druid.indexing.overlord.DataSourceMetadata; -import io.druid.indexing.overlord.IndexerMetadataStorageCoordinator; -import io.druid.indexing.overlord.SegmentPublishResult; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.realtime.appenderator.SegmentIdentifier; -import io.druid.timeline.DataSegment; -import io.druid.timeline.TimelineObjectHolder; -import io.druid.timeline.VersionedIntervalTimeline; -import io.druid.timeline.partition.LinearShardSpec; -import io.druid.timeline.partition.NoneShardSpec; -import io.druid.timeline.partition.NumberedShardSpec; -import io.druid.timeline.partition.PartitionChunk; +import org.apache.druid.indexing.overlord.DataSourceMetadata; +import org.apache.druid.indexing.overlord.IndexerMetadataStorageCoordinator; +import org.apache.druid.indexing.overlord.SegmentPublishResult; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.realtime.appenderator.SegmentIdentifier; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.TimelineObjectHolder; +import org.apache.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.timeline.partition.LinearShardSpec; +import org.apache.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.timeline.partition.NumberedShardSpec; +import org.apache.druid.timeline.partition.PartitionChunk; import org.joda.time.Interval; import org.skife.jdbi.v2.FoldController; import org.skife.jdbi.v2.Folder3; @@ -455,7 +455,7 @@ private SegmentIdentifier allocatePendingSegmentWithSegmentLineageCheck( // UNIQUE key for the row, ensuring sequences do not fork in two directions. // Using a single column instead of (sequence_name, sequence_prev_id) as some MySQL storage engines - // have difficulty with large unique keys (see https://github.com/druid-io/druid/issues/2319) + // have difficulty with large unique keys (see https://github.com/apache/incubator-druid/issues/2319) final String sequenceNamePrevIdSha1 = BaseEncoding.base16().encode( Hashing.sha1() .newHasher() @@ -524,7 +524,7 @@ private SegmentIdentifier allocatePendingSegment( // UNIQUE key for the row, ensuring we don't have more than one segment per sequence per interval. // Using a single column instead of (sequence_name, sequence_prev_id) as some MySQL storage engines - // have difficulty with large unique keys (see https://github.com/druid-io/druid/issues/2319) + // have difficulty with large unique keys (see https://github.com/apache/incubator-druid/issues/2319) final String sequenceNamePrevIdSha1 = BaseEncoding.base16().encode( Hashing.sha1() .newHasher() diff --git a/server/src/main/java/io/druid/metadata/MetadataRuleManager.java b/server/src/main/java/org/apache/druid/metadata/MetadataRuleManager.java similarity index 90% rename from server/src/main/java/io/druid/metadata/MetadataRuleManager.java rename to server/src/main/java/org/apache/druid/metadata/MetadataRuleManager.java index 0d6beedc167b..0c8019754356 100644 --- a/server/src/main/java/io/druid/metadata/MetadataRuleManager.java +++ b/server/src/main/java/org/apache/druid/metadata/MetadataRuleManager.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; -import io.druid.audit.AuditInfo; -import io.druid.server.coordinator.rules.Rule; +import org.apache.druid.audit.AuditInfo; +import org.apache.druid.server.coordinator.rules.Rule; import java.util.List; import java.util.Map; diff --git a/server/src/main/java/io/druid/metadata/MetadataRuleManagerConfig.java b/server/src/main/java/org/apache/druid/metadata/MetadataRuleManagerConfig.java similarity index 97% rename from server/src/main/java/io/druid/metadata/MetadataRuleManagerConfig.java rename to server/src/main/java/org/apache/druid/metadata/MetadataRuleManagerConfig.java index 4de89bea462e..0c7fdf648c44 100644 --- a/server/src/main/java/io/druid/metadata/MetadataRuleManagerConfig.java +++ b/server/src/main/java/org/apache/druid/metadata/MetadataRuleManagerConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.fasterxml.jackson.annotation.JsonProperty; import org.joda.time.Period; diff --git a/server/src/main/java/io/druid/metadata/MetadataRuleManagerProvider.java b/server/src/main/java/org/apache/druid/metadata/MetadataRuleManagerProvider.java similarity index 96% rename from server/src/main/java/io/druid/metadata/MetadataRuleManagerProvider.java rename to server/src/main/java/org/apache/druid/metadata/MetadataRuleManagerProvider.java index e68f5c3ac8cc..cedf99abb4b8 100644 --- a/server/src/main/java/io/druid/metadata/MetadataRuleManagerProvider.java +++ b/server/src/main/java/org/apache/druid/metadata/MetadataRuleManagerProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.google.inject.Provider; diff --git a/server/src/main/java/io/druid/metadata/MetadataSegmentManager.java b/server/src/main/java/org/apache/druid/metadata/MetadataSegmentManager.java similarity index 94% rename from server/src/main/java/io/druid/metadata/MetadataSegmentManager.java rename to server/src/main/java/org/apache/druid/metadata/MetadataSegmentManager.java index 44b126b159e4..5c93e803bc99 100644 --- a/server/src/main/java/io/druid/metadata/MetadataSegmentManager.java +++ b/server/src/main/java/org/apache/druid/metadata/MetadataSegmentManager.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; -import io.druid.client.ImmutableDruidDataSource; +import org.apache.druid.client.ImmutableDruidDataSource; import org.joda.time.Interval; import javax.annotation.Nullable; diff --git a/server/src/main/java/io/druid/metadata/MetadataSegmentManagerConfig.java b/server/src/main/java/org/apache/druid/metadata/MetadataSegmentManagerConfig.java similarity index 96% rename from server/src/main/java/io/druid/metadata/MetadataSegmentManagerConfig.java rename to server/src/main/java/org/apache/druid/metadata/MetadataSegmentManagerConfig.java index 5c0f4222477a..3f58cfa70982 100644 --- a/server/src/main/java/io/druid/metadata/MetadataSegmentManagerConfig.java +++ b/server/src/main/java/org/apache/druid/metadata/MetadataSegmentManagerConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.fasterxml.jackson.annotation.JsonProperty; import org.joda.time.Period; diff --git a/server/src/main/java/io/druid/metadata/MetadataSegmentManagerProvider.java b/server/src/main/java/org/apache/druid/metadata/MetadataSegmentManagerProvider.java similarity index 96% rename from server/src/main/java/io/druid/metadata/MetadataSegmentManagerProvider.java rename to server/src/main/java/org/apache/druid/metadata/MetadataSegmentManagerProvider.java index 92d416ebdb66..c57f5bf66d9c 100644 --- a/server/src/main/java/io/druid/metadata/MetadataSegmentManagerProvider.java +++ b/server/src/main/java/org/apache/druid/metadata/MetadataSegmentManagerProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.google.inject.Provider; diff --git a/server/src/main/java/io/druid/metadata/MetadataSegmentPublisher.java b/server/src/main/java/org/apache/druid/metadata/MetadataSegmentPublisher.java similarity index 90% rename from server/src/main/java/io/druid/metadata/MetadataSegmentPublisher.java rename to server/src/main/java/org/apache/druid/metadata/MetadataSegmentPublisher.java index 56793793d6ac..34f98e8e381e 100644 --- a/server/src/main/java/io/druid/metadata/MetadataSegmentPublisher.java +++ b/server/src/main/java/org/apache/druid/metadata/MetadataSegmentPublisher.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; -import io.druid.segment.realtime.SegmentPublisher; +import org.apache.druid.segment.realtime.SegmentPublisher; public interface MetadataSegmentPublisher extends SegmentPublisher { diff --git a/server/src/main/java/io/druid/metadata/MetadataSegmentPublisherProvider.java b/server/src/main/java/org/apache/druid/metadata/MetadataSegmentPublisherProvider.java similarity index 96% rename from server/src/main/java/io/druid/metadata/MetadataSegmentPublisherProvider.java rename to server/src/main/java/org/apache/druid/metadata/MetadataSegmentPublisherProvider.java index 3fb7d78bcabe..b493148ec907 100644 --- a/server/src/main/java/io/druid/metadata/MetadataSegmentPublisherProvider.java +++ b/server/src/main/java/org/apache/druid/metadata/MetadataSegmentPublisherProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; public interface MetadataSegmentPublisherProvider extends SegmentPublisherProvider { diff --git a/server/src/main/java/io/druid/metadata/MetadataStorage.java b/server/src/main/java/org/apache/druid/metadata/MetadataStorage.java similarity index 96% rename from server/src/main/java/io/druid/metadata/MetadataStorage.java rename to server/src/main/java/org/apache/druid/metadata/MetadataStorage.java index 5e10a7839b4c..0a98703d480c 100644 --- a/server/src/main/java/io/druid/metadata/MetadataStorage.java +++ b/server/src/main/java/org/apache/druid/metadata/MetadataStorage.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; public abstract class MetadataStorage { diff --git a/server/src/main/java/io/druid/metadata/MetadataStorageProvider.java b/server/src/main/java/org/apache/druid/metadata/MetadataStorageProvider.java similarity index 96% rename from server/src/main/java/io/druid/metadata/MetadataStorageProvider.java rename to server/src/main/java/org/apache/druid/metadata/MetadataStorageProvider.java index dce067599296..5ed598d9d682 100644 --- a/server/src/main/java/io/druid/metadata/MetadataStorageProvider.java +++ b/server/src/main/java/org/apache/druid/metadata/MetadataStorageProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.google.inject.Provider; diff --git a/server/src/main/java/io/druid/metadata/MetadataSupervisorManager.java b/server/src/main/java/org/apache/druid/metadata/MetadataSupervisorManager.java similarity index 85% rename from server/src/main/java/io/druid/metadata/MetadataSupervisorManager.java rename to server/src/main/java/org/apache/druid/metadata/MetadataSupervisorManager.java index 6ac2871b3e26..3803316b3d98 100644 --- a/server/src/main/java/io/druid/metadata/MetadataSupervisorManager.java +++ b/server/src/main/java/org/apache/druid/metadata/MetadataSupervisorManager.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; -import io.druid.indexing.overlord.supervisor.SupervisorSpec; -import io.druid.indexing.overlord.supervisor.VersionedSupervisorSpec; +import org.apache.druid.indexing.overlord.supervisor.SupervisorSpec; +import org.apache.druid.indexing.overlord.supervisor.VersionedSupervisorSpec; import java.util.List; import java.util.Map; diff --git a/server/src/main/java/io/druid/metadata/MySQLMetadataStorageActionHandler.java b/server/src/main/java/org/apache/druid/metadata/MySQLMetadataStorageActionHandler.java similarity index 96% rename from server/src/main/java/io/druid/metadata/MySQLMetadataStorageActionHandler.java rename to server/src/main/java/org/apache/druid/metadata/MySQLMetadataStorageActionHandler.java index 69af28fce9af..67260ba23683 100644 --- a/server/src/main/java/io/druid/metadata/MySQLMetadataStorageActionHandler.java +++ b/server/src/main/java/org/apache/druid/metadata/MySQLMetadataStorageActionHandler.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import org.joda.time.DateTime; import org.skife.jdbi.v2.Handle; import org.skife.jdbi.v2.Query; diff --git a/server/src/main/java/io/druid/metadata/MySQLMetadataStorageActionHandlerFactory.java b/server/src/main/java/org/apache/druid/metadata/MySQLMetadataStorageActionHandlerFactory.java similarity index 98% rename from server/src/main/java/io/druid/metadata/MySQLMetadataStorageActionHandlerFactory.java rename to server/src/main/java/org/apache/druid/metadata/MySQLMetadataStorageActionHandlerFactory.java index 99d91c9ff77b..81c27ace75ed 100644 --- a/server/src/main/java/io/druid/metadata/MySQLMetadataStorageActionHandlerFactory.java +++ b/server/src/main/java/org/apache/druid/metadata/MySQLMetadataStorageActionHandlerFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.inject.Inject; diff --git a/server/src/main/java/io/druid/metadata/NoopMetadataStorageProvider.java b/server/src/main/java/org/apache/druid/metadata/NoopMetadataStorageProvider.java similarity index 96% rename from server/src/main/java/io/druid/metadata/NoopMetadataStorageProvider.java rename to server/src/main/java/org/apache/druid/metadata/NoopMetadataStorageProvider.java index 95fcbf4e78e5..5372a9dc5d22 100644 --- a/server/src/main/java/io/druid/metadata/NoopMetadataStorageProvider.java +++ b/server/src/main/java/org/apache/druid/metadata/NoopMetadataStorageProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; public class NoopMetadataStorageProvider implements MetadataStorageProvider { diff --git a/server/src/main/java/io/druid/metadata/PostgreSQLMetadataStorageActionHandler.java b/server/src/main/java/org/apache/druid/metadata/PostgreSQLMetadataStorageActionHandler.java similarity index 96% rename from server/src/main/java/io/druid/metadata/PostgreSQLMetadataStorageActionHandler.java rename to server/src/main/java/org/apache/druid/metadata/PostgreSQLMetadataStorageActionHandler.java index 310d48ddcd82..78455d512fbf 100644 --- a/server/src/main/java/io/druid/metadata/PostgreSQLMetadataStorageActionHandler.java +++ b/server/src/main/java/org/apache/druid/metadata/PostgreSQLMetadataStorageActionHandler.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import org.joda.time.DateTime; import org.skife.jdbi.v2.Handle; import org.skife.jdbi.v2.Query; diff --git a/server/src/main/java/io/druid/metadata/PostgreSQLMetadataStorageActionHandlerFactory.java b/server/src/main/java/org/apache/druid/metadata/PostgreSQLMetadataStorageActionHandlerFactory.java similarity index 98% rename from server/src/main/java/io/druid/metadata/PostgreSQLMetadataStorageActionHandlerFactory.java rename to server/src/main/java/org/apache/druid/metadata/PostgreSQLMetadataStorageActionHandlerFactory.java index e7dae3e88d99..247b8b157d6e 100644 --- a/server/src/main/java/io/druid/metadata/PostgreSQLMetadataStorageActionHandlerFactory.java +++ b/server/src/main/java/org/apache/druid/metadata/PostgreSQLMetadataStorageActionHandlerFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.inject.Inject; diff --git a/server/src/main/java/io/druid/metadata/RetryTransactionException.java b/server/src/main/java/org/apache/druid/metadata/RetryTransactionException.java similarity index 97% rename from server/src/main/java/io/druid/metadata/RetryTransactionException.java rename to server/src/main/java/org/apache/druid/metadata/RetryTransactionException.java index 2ab92f5b48bb..080ee66b5d42 100644 --- a/server/src/main/java/io/druid/metadata/RetryTransactionException.java +++ b/server/src/main/java/org/apache/druid/metadata/RetryTransactionException.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; /** * Exception thrown by SQL connector code when it wants a transaction to be retried. This exception is checked for diff --git a/server/src/main/java/io/druid/metadata/SQLFirehoseDatabaseConnector.java b/server/src/main/java/org/apache/druid/metadata/SQLFirehoseDatabaseConnector.java similarity index 97% rename from server/src/main/java/io/druid/metadata/SQLFirehoseDatabaseConnector.java rename to server/src/main/java/org/apache/druid/metadata/SQLFirehoseDatabaseConnector.java index 6defaf44b804..0fecee0c8919 100644 --- a/server/src/main/java/io/druid/metadata/SQLFirehoseDatabaseConnector.java +++ b/server/src/main/java/org/apache/druid/metadata/SQLFirehoseDatabaseConnector.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.google.common.base.Predicate; -import io.druid.java.util.common.RetryUtils; +import org.apache.druid.java.util.common.RetryUtils; import org.apache.commons.dbcp2.BasicDataSource; import org.skife.jdbi.v2.DBI; import org.skife.jdbi.v2.exceptions.DBIException; diff --git a/server/src/main/java/io/druid/metadata/SQLMetadataConnector.java b/server/src/main/java/org/apache/druid/metadata/SQLMetadataConnector.java similarity index 98% rename from server/src/main/java/io/druid/metadata/SQLMetadataConnector.java rename to server/src/main/java/org/apache/druid/metadata/SQLMetadataConnector.java index f517fac8d3de..8c8528142e59 100644 --- a/server/src/main/java/io/druid/metadata/SQLMetadataConnector.java +++ b/server/src/main/java/org/apache/druid/metadata/SQLMetadataConnector.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.google.common.base.Predicate; import com.google.common.base.Supplier; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.RetryUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.RetryUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; import org.apache.commons.dbcp2.BasicDataSource; import org.skife.jdbi.v2.Batch; import org.skife.jdbi.v2.DBI; diff --git a/server/src/main/java/io/druid/metadata/SQLMetadataRuleManager.java b/server/src/main/java/org/apache/druid/metadata/SQLMetadataRuleManager.java similarity index 94% rename from server/src/main/java/io/druid/metadata/SQLMetadataRuleManager.java rename to server/src/main/java/org/apache/druid/metadata/SQLMetadataRuleManager.java index 6478c23b282b..b1eb9f5aa427 100644 --- a/server/src/main/java/io/druid/metadata/SQLMetadataRuleManager.java +++ b/server/src/main/java/org/apache/druid/metadata/SQLMetadataRuleManager.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; @@ -28,21 +28,21 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.inject.Inject; -import io.druid.audit.AuditEntry; -import io.druid.audit.AuditInfo; -import io.druid.audit.AuditManager; -import io.druid.client.DruidServer; -import io.druid.guice.ManageLifecycle; -import io.druid.guice.annotations.Json; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.server.coordinator.rules.ForeverLoadRule; -import io.druid.server.coordinator.rules.Rule; +import org.apache.druid.audit.AuditEntry; +import org.apache.druid.audit.AuditInfo; +import org.apache.druid.audit.AuditManager; +import org.apache.druid.client.DruidServer; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.server.coordinator.rules.ForeverLoadRule; +import org.apache.druid.server.coordinator.rules.Rule; import org.joda.time.DateTime; import org.skife.jdbi.v2.FoldController; import org.skife.jdbi.v2.Folder3; diff --git a/server/src/main/java/io/druid/metadata/SQLMetadataRuleManagerProvider.java b/server/src/main/java/org/apache/druid/metadata/SQLMetadataRuleManagerProvider.java similarity index 92% rename from server/src/main/java/io/druid/metadata/SQLMetadataRuleManagerProvider.java rename to server/src/main/java/org/apache/druid/metadata/SQLMetadataRuleManagerProvider.java index 7e0f10b72413..940af6cfe86b 100644 --- a/server/src/main/java/io/druid/metadata/SQLMetadataRuleManagerProvider.java +++ b/server/src/main/java/org/apache/druid/metadata/SQLMetadataRuleManagerProvider.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Throwables; import com.google.inject.Inject; -import io.druid.audit.AuditManager; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.server.audit.SQLAuditManager; +import org.apache.druid.audit.AuditManager; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.server.audit.SQLAuditManager; import org.skife.jdbi.v2.IDBI; /** diff --git a/server/src/main/java/io/druid/metadata/SQLMetadataSegmentManager.java b/server/src/main/java/org/apache/druid/metadata/SQLMetadataSegmentManager.java similarity index 95% rename from server/src/main/java/io/druid/metadata/SQLMetadataSegmentManager.java rename to server/src/main/java/org/apache/druid/metadata/SQLMetadataSegmentManager.java index 4a83125e1eb7..c072ee6717d5 100644 --- a/server/src/main/java/io/druid/metadata/SQLMetadataSegmentManager.java +++ b/server/src/main/java/org/apache/druid/metadata/SQLMetadataSegmentManager.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Predicates; @@ -30,21 +30,21 @@ import com.google.common.collect.Iterators; import com.google.common.collect.Lists; import com.google.inject.Inject; -import io.druid.client.DruidDataSource; -import io.druid.client.ImmutableDruidDataSource; -import io.druid.guice.ManageLifecycle; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.MapUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.timeline.DataSegment; -import io.druid.timeline.TimelineObjectHolder; -import io.druid.timeline.VersionedIntervalTimeline; -import io.druid.timeline.partition.PartitionChunk; +import org.apache.druid.client.DruidDataSource; +import org.apache.druid.client.ImmutableDruidDataSource; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.MapUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.TimelineObjectHolder; +import org.apache.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.timeline.partition.PartitionChunk; import org.joda.time.Duration; import org.joda.time.Interval; import org.skife.jdbi.v2.BaseResultSetMapper; diff --git a/server/src/main/java/io/druid/metadata/SQLMetadataSegmentManagerProvider.java b/server/src/main/java/org/apache/druid/metadata/SQLMetadataSegmentManagerProvider.java similarity index 95% rename from server/src/main/java/io/druid/metadata/SQLMetadataSegmentManagerProvider.java rename to server/src/main/java/org/apache/druid/metadata/SQLMetadataSegmentManagerProvider.java index 6bbb5e657599..0644e7feddf0 100644 --- a/server/src/main/java/io/druid/metadata/SQLMetadataSegmentManagerProvider.java +++ b/server/src/main/java/org/apache/druid/metadata/SQLMetadataSegmentManagerProvider.java @@ -18,12 +18,12 @@ */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Supplier; import com.google.inject.Inject; -import io.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; public class SQLMetadataSegmentManagerProvider implements MetadataSegmentManagerProvider diff --git a/server/src/main/java/io/druid/metadata/SQLMetadataSegmentPublisher.java b/server/src/main/java/org/apache/druid/metadata/SQLMetadataSegmentPublisher.java similarity index 93% rename from server/src/main/java/io/druid/metadata/SQLMetadataSegmentPublisher.java rename to server/src/main/java/org/apache/druid/metadata/SQLMetadataSegmentPublisher.java index 6e7e540b62b3..f982cd36eb25 100644 --- a/server/src/main/java/io/druid/metadata/SQLMetadataSegmentPublisher.java +++ b/server/src/main/java/org/apache/druid/metadata/SQLMetadataSegmentPublisher.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; import com.google.inject.Inject; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.skife.jdbi.v2.DBI; import org.skife.jdbi.v2.Handle; import org.skife.jdbi.v2.tweak.HandleCallback; diff --git a/server/src/main/java/io/druid/metadata/SQLMetadataSegmentPublisherProvider.java b/server/src/main/java/org/apache/druid/metadata/SQLMetadataSegmentPublisherProvider.java similarity index 97% rename from server/src/main/java/io/druid/metadata/SQLMetadataSegmentPublisherProvider.java rename to server/src/main/java/org/apache/druid/metadata/SQLMetadataSegmentPublisherProvider.java index 17a4d7a57466..89ba4bf9bc7c 100644 --- a/server/src/main/java/io/druid/metadata/SQLMetadataSegmentPublisherProvider.java +++ b/server/src/main/java/org/apache/druid/metadata/SQLMetadataSegmentPublisherProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/server/src/main/java/io/druid/metadata/SQLMetadataStorageActionHandler.java b/server/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandler.java similarity index 98% rename from server/src/main/java/io/druid/metadata/SQLMetadataStorageActionHandler.java rename to server/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandler.java index 4717367e0fd6..8fad097ab602 100644 --- a/server/src/main/java/io/druid/metadata/SQLMetadataStorageActionHandler.java +++ b/server/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandler.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; @@ -26,11 +26,11 @@ import com.google.common.base.Optional; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.indexer.TaskInfo; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.indexer.TaskInfo; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.emitter.EmittingLogger; import org.joda.time.DateTime; import org.skife.jdbi.v2.FoldController; import org.skife.jdbi.v2.Folder3; diff --git a/server/src/main/java/io/druid/metadata/SQLMetadataStorageActionHandlerFactory.java b/server/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandlerFactory.java similarity index 97% rename from server/src/main/java/io/druid/metadata/SQLMetadataStorageActionHandlerFactory.java rename to server/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandlerFactory.java index cad0664e4d03..1e36b132b768 100644 --- a/server/src/main/java/io/druid/metadata/SQLMetadataStorageActionHandlerFactory.java +++ b/server/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandlerFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.inject.Inject; diff --git a/server/src/main/java/io/druid/metadata/SQLMetadataSupervisorManager.java b/server/src/main/java/org/apache/druid/metadata/SQLMetadataSupervisorManager.java similarity index 94% rename from server/src/main/java/io/druid/metadata/SQLMetadataSupervisorManager.java rename to server/src/main/java/org/apache/druid/metadata/SQLMetadataSupervisorManager.java index 4e769bd95a02..a84227705f13 100644 --- a/server/src/main/java/io/druid/metadata/SQLMetadataSupervisorManager.java +++ b/server/src/main/java/org/apache/druid/metadata/SQLMetadataSupervisorManager.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -27,14 +27,14 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.inject.Inject; -import io.druid.guice.ManageLifecycle; -import io.druid.guice.annotations.Json; -import io.druid.indexing.overlord.supervisor.SupervisorSpec; -import io.druid.indexing.overlord.supervisor.VersionedSupervisorSpec; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.indexing.overlord.supervisor.SupervisorSpec; +import org.apache.druid.indexing.overlord.supervisor.VersionedSupervisorSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; import org.skife.jdbi.v2.FoldController; import org.skife.jdbi.v2.Folder3; import org.skife.jdbi.v2.Handle; diff --git a/server/src/main/java/io/druid/metadata/SQLServerMetadataStorageActionHandler.java b/server/src/main/java/org/apache/druid/metadata/SQLServerMetadataStorageActionHandler.java similarity index 96% rename from server/src/main/java/io/druid/metadata/SQLServerMetadataStorageActionHandler.java rename to server/src/main/java/org/apache/druid/metadata/SQLServerMetadataStorageActionHandler.java index fe6f92230636..e52e6380da4a 100644 --- a/server/src/main/java/io/druid/metadata/SQLServerMetadataStorageActionHandler.java +++ b/server/src/main/java/org/apache/druid/metadata/SQLServerMetadataStorageActionHandler.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import org.joda.time.DateTime; import org.skife.jdbi.v2.Handle; import org.skife.jdbi.v2.Query; diff --git a/server/src/main/java/io/druid/metadata/SQLServerMetadataStorageActionHandlerFactory.java b/server/src/main/java/org/apache/druid/metadata/SQLServerMetadataStorageActionHandlerFactory.java similarity index 98% rename from server/src/main/java/io/druid/metadata/SQLServerMetadataStorageActionHandlerFactory.java rename to server/src/main/java/org/apache/druid/metadata/SQLServerMetadataStorageActionHandlerFactory.java index fb502fad5526..1b9dacb0ef74 100644 --- a/server/src/main/java/io/druid/metadata/SQLServerMetadataStorageActionHandlerFactory.java +++ b/server/src/main/java/org/apache/druid/metadata/SQLServerMetadataStorageActionHandlerFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.inject.Inject; diff --git a/server/src/main/java/io/druid/metadata/SegmentPublisherProvider.java b/server/src/main/java/org/apache/druid/metadata/SegmentPublisherProvider.java similarity index 89% rename from server/src/main/java/io/druid/metadata/SegmentPublisherProvider.java rename to server/src/main/java/org/apache/druid/metadata/SegmentPublisherProvider.java index bb7ef43e921a..c33c3a826f2d 100644 --- a/server/src/main/java/io/druid/metadata/SegmentPublisherProvider.java +++ b/server/src/main/java/org/apache/druid/metadata/SegmentPublisherProvider.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.google.inject.Provider; -import io.druid.guice.NoopSegmentPublisherProvider; -import io.druid.segment.realtime.SegmentPublisher; +import org.apache.druid.guice.NoopSegmentPublisherProvider; +import org.apache.druid.segment.realtime.SegmentPublisher; /** */ diff --git a/server/src/main/java/io/druid/metadata/storage/derby/DerbyConnector.java b/server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyConnector.java similarity index 84% rename from server/src/main/java/io/druid/metadata/storage/derby/DerbyConnector.java rename to server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyConnector.java index 0a3f44d3380d..9a4eece4b4b5 100644 --- a/server/src/main/java/io/druid/metadata/storage/derby/DerbyConnector.java +++ b/server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyConnector.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.metadata.storage.derby; +package org.apache.druid.metadata.storage.derby; import com.google.common.base.Supplier; import com.google.inject.Inject; -import io.druid.guice.ManageLifecycle; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.common.logger.Logger; -import io.druid.metadata.MetadataStorage; -import io.druid.metadata.MetadataStorageConnectorConfig; -import io.druid.metadata.MetadataStorageTablesConfig; -import io.druid.metadata.SQLMetadataConnector; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.metadata.MetadataStorage; +import org.apache.druid.metadata.MetadataStorageConnectorConfig; +import org.apache.druid.metadata.MetadataStorageTablesConfig; +import org.apache.druid.metadata.SQLMetadataConnector; import org.apache.commons.dbcp2.BasicDataSource; import org.skife.jdbi.v2.DBI; import org.skife.jdbi.v2.Handle; diff --git a/server/src/main/java/io/druid/metadata/storage/derby/DerbyMetadataStorage.java b/server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyMetadataStorage.java similarity index 89% rename from server/src/main/java/io/druid/metadata/storage/derby/DerbyMetadataStorage.java rename to server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyMetadataStorage.java index 1116ac575ff0..deab616b4c13 100644 --- a/server/src/main/java/io/druid/metadata/storage/derby/DerbyMetadataStorage.java +++ b/server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyMetadataStorage.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.metadata.storage.derby; +package org.apache.druid.metadata.storage.derby; import com.google.common.base.Throwables; import com.google.inject.Inject; -import io.druid.java.util.common.logger.Logger; -import io.druid.metadata.MetadataStorage; -import io.druid.metadata.MetadataStorageConnectorConfig; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.metadata.MetadataStorage; +import org.apache.druid.metadata.MetadataStorageConnectorConfig; import org.apache.derby.drda.NetworkServerControl; import java.net.InetAddress; diff --git a/server/src/main/java/io/druid/metadata/storage/derby/DerbyMetadataStorageDruidModule.java b/server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyMetadataStorageDruidModule.java similarity index 76% rename from server/src/main/java/io/druid/metadata/storage/derby/DerbyMetadataStorageDruidModule.java rename to server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyMetadataStorageDruidModule.java index 6b3f4decbfe6..409c95eb6da4 100644 --- a/server/src/main/java/io/druid/metadata/storage/derby/DerbyMetadataStorageDruidModule.java +++ b/server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyMetadataStorageDruidModule.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.metadata.storage.derby; +package org.apache.druid.metadata.storage.derby; import com.google.inject.Binder; import com.google.inject.Key; -import io.druid.guice.LazySingleton; -import io.druid.guice.PolyBind; -import io.druid.guice.SQLMetadataStorageDruidModule; -import io.druid.metadata.DerbyMetadataStorageActionHandlerFactory; -import io.druid.metadata.MetadataStorage; -import io.druid.metadata.MetadataStorageActionHandlerFactory; -import io.druid.metadata.MetadataStorageConnector; -import io.druid.metadata.MetadataStorageProvider; -import io.druid.metadata.NoopMetadataStorageProvider; -import io.druid.metadata.SQLMetadataConnector; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.PolyBind; +import org.apache.druid.guice.SQLMetadataStorageDruidModule; +import org.apache.druid.metadata.DerbyMetadataStorageActionHandlerFactory; +import org.apache.druid.metadata.MetadataStorage; +import org.apache.druid.metadata.MetadataStorageActionHandlerFactory; +import org.apache.druid.metadata.MetadataStorageConnector; +import org.apache.druid.metadata.MetadataStorageProvider; +import org.apache.druid.metadata.NoopMetadataStorageProvider; +import org.apache.druid.metadata.SQLMetadataConnector; public class DerbyMetadataStorageDruidModule extends SQLMetadataStorageDruidModule { diff --git a/server/src/main/java/io/druid/metadata/storage/derby/DerbyMetadataStorageProvider.java b/server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyMetadataStorageProvider.java similarity index 84% rename from server/src/main/java/io/druid/metadata/storage/derby/DerbyMetadataStorageProvider.java rename to server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyMetadataStorageProvider.java index a0773bda32c1..225ae2338018 100644 --- a/server/src/main/java/io/druid/metadata/storage/derby/DerbyMetadataStorageProvider.java +++ b/server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyMetadataStorageProvider.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.metadata.storage.derby; +package org.apache.druid.metadata.storage.derby; import com.google.inject.Inject; -import io.druid.metadata.MetadataStorage; -import io.druid.metadata.MetadataStorageConnectorConfig; -import io.druid.metadata.MetadataStorageProvider; +import org.apache.druid.metadata.MetadataStorage; +import org.apache.druid.metadata.MetadataStorageConnectorConfig; +import org.apache.druid.metadata.MetadataStorageProvider; public class DerbyMetadataStorageProvider implements MetadataStorageProvider { diff --git a/server/src/main/java/io/druid/offheap/OffheapBufferGenerator.java b/server/src/main/java/org/apache/druid/offheap/OffheapBufferGenerator.java similarity index 94% rename from server/src/main/java/io/druid/offheap/OffheapBufferGenerator.java rename to server/src/main/java/org/apache/druid/offheap/OffheapBufferGenerator.java index 6e7065769a53..687d50f5fe57 100644 --- a/server/src/main/java/io/druid/offheap/OffheapBufferGenerator.java +++ b/server/src/main/java/org/apache/druid/offheap/OffheapBufferGenerator.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.offheap; +package org.apache.druid.offheap; import com.google.common.base.Supplier; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.logger.Logger; import java.nio.ByteBuffer; import java.util.concurrent.atomic.AtomicLong; diff --git a/server/src/main/java/io/druid/query/LocatedSegmentDescriptor.java b/server/src/main/java/org/apache/druid/query/LocatedSegmentDescriptor.java similarity index 97% rename from server/src/main/java/io/druid/query/LocatedSegmentDescriptor.java rename to server/src/main/java/org/apache/druid/query/LocatedSegmentDescriptor.java index aaaa6e849551..65a9edf01c22 100644 --- a/server/src/main/java/io/druid/query/LocatedSegmentDescriptor.java +++ b/server/src/main/java/org/apache/druid/query/LocatedSegmentDescriptor.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; -import io.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.server.coordination.DruidServerMetadata; import org.joda.time.Interval; import java.util.List; diff --git a/server/src/main/java/io/druid/query/ResultLevelCachingQueryRunner.java b/server/src/main/java/org/apache/druid/query/ResultLevelCachingQueryRunner.java similarity index 94% rename from server/src/main/java/io/druid/query/ResultLevelCachingQueryRunner.java rename to server/src/main/java/org/apache/druid/query/ResultLevelCachingQueryRunner.java index b0070d7954e9..e5b31a31c8bf 100644 --- a/server/src/main/java/io/druid/query/ResultLevelCachingQueryRunner.java +++ b/server/src/main/java/org/apache/druid/query/ResultLevelCachingQueryRunner.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.type.TypeReference; @@ -25,16 +25,16 @@ import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; -import io.druid.client.ResultLevelCacheUtil; -import io.druid.client.cache.Cache; -import io.druid.client.cache.CacheConfig; -import io.druid.java.util.common.RE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.SequenceWrapper; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.QueryResource; +import org.apache.druid.client.ResultLevelCacheUtil; +import org.apache.druid.client.cache.Cache; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.SequenceWrapper; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.QueryResource; import javax.annotation.Nullable; diff --git a/server/src/main/java/io/druid/query/dimension/LookupDimensionSpec.java b/server/src/main/java/org/apache/druid/query/dimension/LookupDimensionSpec.java similarity index 93% rename from server/src/main/java/io/druid/query/dimension/LookupDimensionSpec.java rename to server/src/main/java/org/apache/druid/query/dimension/LookupDimensionSpec.java index e684f73d6dd9..2bfeaf036717 100644 --- a/server/src/main/java/io/druid/query/dimension/LookupDimensionSpec.java +++ b/server/src/main/java/org/apache/druid/query/dimension/LookupDimensionSpec.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.query.dimension; +package org.apache.druid.query.dimension; 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 com.google.common.base.Strings; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.StringUtils; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.filter.DimFilterUtils; -import io.druid.query.lookup.LookupExtractionFn; -import io.druid.query.lookup.LookupExtractor; -import io.druid.query.lookup.LookupReferencesManager; -import io.druid.segment.DimensionSelector; -import io.druid.segment.column.ValueType; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.filter.DimFilterUtils; +import org.apache.druid.query.lookup.LookupExtractionFn; +import org.apache.druid.query.lookup.LookupExtractor; +import org.apache.druid.query.lookup.LookupReferencesManager; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.column.ValueType; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/server/src/main/java/io/druid/query/expression/LookupExprMacro.java b/server/src/main/java/org/apache/druid/query/expression/LookupExprMacro.java similarity index 85% rename from server/src/main/java/io/druid/query/expression/LookupExprMacro.java rename to server/src/main/java/org/apache/druid/query/expression/LookupExprMacro.java index 47098138cc8a..c6c912f96a25 100644 --- a/server/src/main/java/io/druid/query/expression/LookupExprMacro.java +++ b/server/src/main/java/org/apache/druid/query/expression/LookupExprMacro.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.query.expression; +package org.apache.druid.query.expression; import com.google.inject.Inject; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.IAE; -import io.druid.math.expr.Expr; -import io.druid.math.expr.ExprEval; -import io.druid.math.expr.ExprMacroTable; -import io.druid.query.lookup.LookupReferencesManager; -import io.druid.query.lookup.RegisteredLookupExtractionFn; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.math.expr.Expr; +import org.apache.druid.math.expr.ExprEval; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.query.lookup.LookupReferencesManager; +import org.apache.druid.query.lookup.RegisteredLookupExtractionFn; import javax.annotation.Nonnull; import java.util.List; diff --git a/server/src/main/java/io/druid/query/lookup/LookupIntrospectionResource.java b/server/src/main/java/org/apache/druid/query/lookup/LookupIntrospectionResource.java similarity index 95% rename from server/src/main/java/io/druid/query/lookup/LookupIntrospectionResource.java rename to server/src/main/java/org/apache/druid/query/lookup/LookupIntrospectionResource.java index c7a0331d21bb..03c3e97ba04c 100644 --- a/server/src/main/java/io/druid/query/lookup/LookupIntrospectionResource.java +++ b/server/src/main/java/org/apache/druid/query/lookup/LookupIntrospectionResource.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.google.inject.Inject; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.logger.Logger; import javax.ws.rs.Path; import javax.ws.rs.PathParam; diff --git a/server/src/main/java/io/druid/query/lookup/LookupModule.java b/server/src/main/java/org/apache/druid/query/lookup/LookupModule.java similarity index 83% rename from server/src/main/java/io/druid/query/lookup/LookupModule.java rename to server/src/main/java/org/apache/druid/query/lookup/LookupModule.java index b59e0b7e2a32..b08ffb9dff48 100644 --- a/server/src/main/java/io/druid/query/lookup/LookupModule.java +++ b/server/src/main/java/org/apache/druid/query/lookup/LookupModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; @@ -34,34 +34,34 @@ import com.google.inject.Inject; import com.google.inject.Provides; import com.sun.jersey.spi.container.ResourceFilters; -import io.druid.common.utils.ServletResourceUtils; -import io.druid.curator.announcement.Announcer; -import io.druid.discovery.LookupNodeService; -import io.druid.guice.ExpressionModule; -import io.druid.guice.Jerseys; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.LazySingleton; -import io.druid.guice.LifecycleModule; -import io.druid.guice.ManageLifecycle; -import io.druid.guice.annotations.Json; -import io.druid.guice.annotations.Self; -import io.druid.guice.annotations.Smile; -import io.druid.initialization.DruidModule; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.dimension.LookupDimensionSpec; -import io.druid.query.expression.LookupExprMacro; -import io.druid.server.DruidNode; -import io.druid.server.http.HostAndPortWithScheme; -import io.druid.server.http.security.ConfigResourceFilter; -import io.druid.server.initialization.ZkPathsConfig; -import io.druid.server.initialization.jetty.JettyBindings; -import io.druid.server.listener.announcer.ListenerResourceAnnouncer; -import io.druid.server.listener.announcer.ListeningAnnouncerConfig; -import io.druid.server.listener.resource.AbstractListenerHandler; -import io.druid.server.listener.resource.ListenerResource; -import io.druid.server.lookup.cache.LookupCoordinatorManager; -import io.druid.server.metrics.DataSourceTaskIdHolder; +import org.apache.druid.common.utils.ServletResourceUtils; +import org.apache.druid.curator.announcement.Announcer; +import org.apache.druid.discovery.LookupNodeService; +import org.apache.druid.guice.ExpressionModule; +import org.apache.druid.guice.Jerseys; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.LifecycleModule; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.guice.annotations.Smile; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.dimension.LookupDimensionSpec; +import org.apache.druid.query.expression.LookupExprMacro; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.http.HostAndPortWithScheme; +import org.apache.druid.server.http.security.ConfigResourceFilter; +import org.apache.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.server.initialization.jetty.JettyBindings; +import org.apache.druid.server.listener.announcer.ListenerResourceAnnouncer; +import org.apache.druid.server.listener.announcer.ListeningAnnouncerConfig; +import org.apache.druid.server.listener.resource.AbstractListenerHandler; +import org.apache.druid.server.listener.resource.ListenerResource; +import org.apache.druid.server.lookup.cache.LookupCoordinatorManager; +import org.apache.druid.server.metrics.DataSourceTaskIdHolder; import org.apache.curator.utils.ZKPaths; import javax.ws.rs.Path; diff --git a/server/src/main/java/io/druid/query/lookup/LookupReferencesManager.java b/server/src/main/java/org/apache/druid/query/lookup/LookupReferencesManager.java similarity index 96% rename from server/src/main/java/io/druid/query/lookup/LookupReferencesManager.java rename to server/src/main/java/org/apache/druid/query/lookup/LookupReferencesManager.java index c73515ecb041..05f802d1a2c6 100644 --- a/server/src/main/java/io/druid/query/lookup/LookupReferencesManager.java +++ b/server/src/main/java/org/apache/druid/query/lookup/LookupReferencesManager.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.fasterxml.jackson.core.type.TypeReference; @@ -28,21 +28,21 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.inject.Inject; -import io.druid.client.coordinator.Coordinator; -import io.druid.concurrent.LifecycleLock; -import io.druid.discovery.DruidLeaderClient; -import io.druid.guice.ManageLifecycle; -import io.druid.guice.annotations.Json; -import io.druid.java.util.common.IOE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.RE; -import io.druid.java.util.common.RetryUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.http.client.response.FullResponseHolder; +import org.apache.druid.client.coordinator.Coordinator; +import org.apache.druid.concurrent.LifecycleLock; +import org.apache.druid.discovery.DruidLeaderClient; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.java.util.common.IOE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.java.util.common.RetryUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.http.client.response.FullResponseHolder; import org.apache.commons.lang.mutable.MutableBoolean; import org.jboss.netty.handler.codec.http.HttpMethod; import org.jboss.netty.handler.codec.http.HttpResponseStatus; diff --git a/server/src/main/java/io/druid/query/lookup/MapLookupExtractorFactory.java b/server/src/main/java/org/apache/druid/query/lookup/MapLookupExtractorFactory.java similarity index 97% rename from server/src/main/java/io/druid/query/lookup/MapLookupExtractorFactory.java rename to server/src/main/java/org/apache/druid/query/lookup/MapLookupExtractorFactory.java index aa19e1906da5..d89e197049a9 100644 --- a/server/src/main/java/io/druid/query/lookup/MapLookupExtractorFactory.java +++ b/server/src/main/java/org/apache/druid/query/lookup/MapLookupExtractorFactory.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.base.Preconditions; -import io.druid.query.extraction.MapLookupExtractor; +import org.apache.druid.query.extraction.MapLookupExtractor; import javax.annotation.Nullable; import javax.ws.rs.GET; diff --git a/server/src/main/java/io/druid/query/lookup/RegisteredLookupExtractionFn.java b/server/src/main/java/org/apache/druid/query/lookup/RegisteredLookupExtractionFn.java similarity index 97% rename from server/src/main/java/io/druid/query/lookup/RegisteredLookupExtractionFn.java rename to server/src/main/java/org/apache/druid/query/lookup/RegisteredLookupExtractionFn.java index 2b924e6eeeeb..da2df8e071bc 100644 --- a/server/src/main/java/io/druid/query/lookup/RegisteredLookupExtractionFn.java +++ b/server/src/main/java/org/apache/druid/query/lookup/RegisteredLookupExtractionFn.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; 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.StringUtils; -import io.druid.query.extraction.ExtractionFn; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.extraction.ExtractionFn; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/server/src/main/java/io/druid/segment/indexing/DataSchema.java b/server/src/main/java/org/apache/druid/segment/indexing/DataSchema.java similarity index 92% rename from server/src/main/java/io/druid/segment/indexing/DataSchema.java rename to server/src/main/java/org/apache/druid/segment/indexing/DataSchema.java index dd72e2bd37aa..f59df348bc8a 100644 --- a/server/src/main/java/io/druid/segment/indexing/DataSchema.java +++ b/server/src/main/java/org/apache/druid/segment/indexing/DataSchema.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.indexing; +package org.apache.druid.segment.indexing; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; @@ -27,15 +27,15 @@ import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Sets; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.segment.indexing.granularity.GranularitySpec; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; -import io.druid.segment.transform.TransformSpec; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.segment.transform.TransformSpec; import java.util.Arrays; import java.util.HashSet; diff --git a/server/src/main/java/io/druid/segment/indexing/IOConfig.java b/server/src/main/java/org/apache/druid/segment/indexing/IOConfig.java similarity index 96% rename from server/src/main/java/io/druid/segment/indexing/IOConfig.java rename to server/src/main/java/org/apache/druid/segment/indexing/IOConfig.java index 26965e9b1067..b1784806e7e3 100644 --- a/server/src/main/java/io/druid/segment/indexing/IOConfig.java +++ b/server/src/main/java/org/apache/druid/segment/indexing/IOConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.indexing; +package org.apache.druid.segment.indexing; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/server/src/main/java/io/druid/segment/indexing/IngestionSpec.java b/server/src/main/java/org/apache/druid/segment/indexing/IngestionSpec.java similarity index 97% rename from server/src/main/java/io/druid/segment/indexing/IngestionSpec.java rename to server/src/main/java/org/apache/druid/segment/indexing/IngestionSpec.java index 6f2c0fc7e141..b92805ad7200 100644 --- a/server/src/main/java/io/druid/segment/indexing/IngestionSpec.java +++ b/server/src/main/java/org/apache/druid/segment/indexing/IngestionSpec.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.indexing; +package org.apache.druid.segment.indexing; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/segment/indexing/RealtimeIOConfig.java b/server/src/main/java/org/apache/druid/segment/indexing/RealtimeIOConfig.java similarity index 90% rename from server/src/main/java/io/druid/segment/indexing/RealtimeIOConfig.java rename to server/src/main/java/org/apache/druid/segment/indexing/RealtimeIOConfig.java index f1600a198b8e..309c9538bbad 100644 --- a/server/src/main/java/io/druid/segment/indexing/RealtimeIOConfig.java +++ b/server/src/main/java/org/apache/druid/segment/indexing/RealtimeIOConfig.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.segment.indexing; +package org.apache.druid.segment.indexing; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.data.input.FirehoseFactory; -import io.druid.data.input.FirehoseFactoryV2; -import io.druid.segment.realtime.plumber.PlumberSchool; +import org.apache.druid.data.input.FirehoseFactory; +import org.apache.druid.data.input.FirehoseFactoryV2; +import org.apache.druid.segment.realtime.plumber.PlumberSchool; /** */ diff --git a/server/src/main/java/io/druid/segment/indexing/RealtimeTuningConfig.java b/server/src/main/java/org/apache/druid/segment/indexing/RealtimeTuningConfig.java similarity index 93% rename from server/src/main/java/io/druid/segment/indexing/RealtimeTuningConfig.java rename to server/src/main/java/org/apache/druid/segment/indexing/RealtimeTuningConfig.java index 58b530f281b7..42c8af9065e8 100644 --- a/server/src/main/java/io/druid/segment/indexing/RealtimeTuningConfig.java +++ b/server/src/main/java/org/apache/druid/segment/indexing/RealtimeTuningConfig.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.segment.indexing; +package org.apache.druid.segment.indexing; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.io.Files; -import io.druid.java.util.common.ISE; -import io.druid.segment.IndexSpec; -import io.druid.segment.realtime.appenderator.AppenderatorConfig; -import io.druid.segment.realtime.plumber.IntervalStartVersioningPolicy; -import io.druid.segment.realtime.plumber.RejectionPolicyFactory; -import io.druid.segment.realtime.plumber.ServerTimeRejectionPolicyFactory; -import io.druid.segment.realtime.plumber.VersioningPolicy; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; -import io.druid.timeline.partition.NoneShardSpec; -import io.druid.timeline.partition.ShardSpec; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.realtime.appenderator.AppenderatorConfig; +import org.apache.druid.segment.realtime.plumber.IntervalStartVersioningPolicy; +import org.apache.druid.segment.realtime.plumber.RejectionPolicyFactory; +import org.apache.druid.segment.realtime.plumber.ServerTimeRejectionPolicyFactory; +import org.apache.druid.segment.realtime.plumber.VersioningPolicy; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.timeline.partition.ShardSpec; import org.joda.time.Period; import javax.annotation.Nullable; @@ -138,7 +138,7 @@ public RealtimeTuningConfig( { this.maxRowsInMemory = maxRowsInMemory == null ? defaultMaxRowsInMemory : maxRowsInMemory; // initializing this to 0, it will be lazily initialized to a value - // @see server.src.main.java.io.druid.segment.indexing.TuningConfigs#getMaxBytesInMemoryOrDefault(long) + // @see server.src.main.java.org.apache.druid.segment.indexing.TuningConfigs#getMaxBytesInMemoryOrDefault(long) this.maxBytesInMemory = maxBytesInMemory == null ? 0 : maxBytesInMemory; this.intermediatePersistPeriod = intermediatePersistPeriod == null ? defaultIntermediatePersistPeriod diff --git a/server/src/main/java/io/druid/segment/indexing/TuningConfig.java b/server/src/main/java/org/apache/druid/segment/indexing/TuningConfig.java similarity index 97% rename from server/src/main/java/io/druid/segment/indexing/TuningConfig.java rename to server/src/main/java/org/apache/druid/segment/indexing/TuningConfig.java index 5d6b23a621b5..8d3e1b129f41 100644 --- a/server/src/main/java/io/druid/segment/indexing/TuningConfig.java +++ b/server/src/main/java/org/apache/druid/segment/indexing/TuningConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.indexing; +package org.apache.druid.segment.indexing; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/server/src/main/java/io/druid/segment/indexing/TuningConfigs.java b/server/src/main/java/org/apache/druid/segment/indexing/TuningConfigs.java similarity index 97% rename from server/src/main/java/io/druid/segment/indexing/TuningConfigs.java rename to server/src/main/java/org/apache/druid/segment/indexing/TuningConfigs.java index 95a4290a1243..cc0f005d0ae0 100644 --- a/server/src/main/java/io/druid/segment/indexing/TuningConfigs.java +++ b/server/src/main/java/org/apache/druid/segment/indexing/TuningConfigs.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.segment.indexing; +package org.apache.druid.segment.indexing; public class TuningConfigs { diff --git a/server/src/main/java/io/druid/segment/indexing/granularity/ArbitraryGranularitySpec.java b/server/src/main/java/org/apache/druid/segment/indexing/granularity/ArbitraryGranularitySpec.java similarity index 93% rename from server/src/main/java/io/druid/segment/indexing/granularity/ArbitraryGranularitySpec.java rename to server/src/main/java/org/apache/druid/segment/indexing/granularity/ArbitraryGranularitySpec.java index 8ee46e1e4b77..fb2b8aa744a5 100644 --- a/server/src/main/java/io/druid/segment/indexing/granularity/ArbitraryGranularitySpec.java +++ b/server/src/main/java/org/apache/druid/segment/indexing/granularity/ArbitraryGranularitySpec.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.indexing.granularity; +package org.apache.druid.segment.indexing.granularity; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -27,11 +27,11 @@ import com.google.common.collect.Lists; import com.google.common.collect.PeekingIterator; import com.google.common.collect.Sets; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.Comparators; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.Comparators; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/server/src/main/java/io/druid/segment/indexing/granularity/GranularitySpec.java b/server/src/main/java/org/apache/druid/segment/indexing/granularity/GranularitySpec.java similarity index 95% rename from server/src/main/java/io/druid/segment/indexing/granularity/GranularitySpec.java rename to server/src/main/java/org/apache/druid/segment/indexing/granularity/GranularitySpec.java index 5def3c5018a3..800f768b8ccb 100644 --- a/server/src/main/java/io/druid/segment/indexing/granularity/GranularitySpec.java +++ b/server/src/main/java/org/apache/druid/segment/indexing/granularity/GranularitySpec.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.segment.indexing.granularity; +package org.apache.druid.segment.indexing.granularity; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.google.common.base.Optional; -import io.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.granularity.Granularity; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/server/src/main/java/io/druid/segment/indexing/granularity/UniformGranularitySpec.java b/server/src/main/java/org/apache/druid/segment/indexing/granularity/UniformGranularitySpec.java similarity index 96% rename from server/src/main/java/io/druid/segment/indexing/granularity/UniformGranularitySpec.java rename to server/src/main/java/org/apache/druid/segment/indexing/granularity/UniformGranularitySpec.java index 52898831799d..778ca635e7fc 100644 --- a/server/src/main/java/io/druid/segment/indexing/granularity/UniformGranularitySpec.java +++ b/server/src/main/java/org/apache/druid/segment/indexing/granularity/UniformGranularitySpec.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.indexing.granularity; +package org.apache.druid.segment.indexing.granularity; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -25,8 +25,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/server/src/main/java/io/druid/segment/loading/LocalDataSegmentFinder.java b/server/src/main/java/org/apache/druid/segment/loading/LocalDataSegmentFinder.java similarity index 94% rename from server/src/main/java/io/druid/segment/loading/LocalDataSegmentFinder.java rename to server/src/main/java/org/apache/druid/segment/loading/LocalDataSegmentFinder.java index 1bd546f226db..cec200342c57 100644 --- a/server/src/main/java/io/druid/segment/loading/LocalDataSegmentFinder.java +++ b/server/src/main/java/org/apache/druid/segment/loading/LocalDataSegmentFinder.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment.loading; +package org.apache.druid.segment.loading; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.inject.Inject; -import io.druid.guice.LocalDataStorageDruidModule; -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.LocalDataStorageDruidModule; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.timeline.DataSegment; import org.apache.commons.io.FileUtils; import java.io.File; diff --git a/server/src/main/java/io/druid/segment/loading/LocalDataSegmentKiller.java b/server/src/main/java/org/apache/druid/segment/loading/LocalDataSegmentKiller.java similarity index 93% rename from server/src/main/java/io/druid/segment/loading/LocalDataSegmentKiller.java rename to server/src/main/java/org/apache/druid/segment/loading/LocalDataSegmentKiller.java index 83717ad5170c..77d02e0a7ef8 100644 --- a/server/src/main/java/io/druid/segment/loading/LocalDataSegmentKiller.java +++ b/server/src/main/java/org/apache/druid/segment/loading/LocalDataSegmentKiller.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment.loading; +package org.apache.druid.segment.loading; import com.google.inject.Inject; -import io.druid.java.util.common.MapUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.MapUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.timeline.DataSegment; import org.apache.commons.io.FileUtils; import java.io.File; diff --git a/server/src/main/java/io/druid/segment/loading/LocalDataSegmentPuller.java b/server/src/main/java/org/apache/druid/segment/loading/LocalDataSegmentPuller.java similarity index 94% rename from server/src/main/java/io/druid/segment/loading/LocalDataSegmentPuller.java rename to server/src/main/java/org/apache/druid/segment/loading/LocalDataSegmentPuller.java index 7dc70ceddff5..95b01ecdec7a 100644 --- a/server/src/main/java/io/druid/segment/loading/LocalDataSegmentPuller.java +++ b/server/src/main/java/org/apache/druid/segment/loading/LocalDataSegmentPuller.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.segment.loading; +package org.apache.druid.segment.loading; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Predicate; import com.google.common.io.Files; -import io.druid.java.util.common.CompressionUtils; -import io.druid.java.util.common.FileUtils; -import io.druid.java.util.common.MapUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.UOE; -import io.druid.java.util.common.logger.Logger; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.CompressionUtils; +import org.apache.druid.java.util.common.FileUtils; +import org.apache.druid.java.util.common.MapUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.UOE; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.timeline.DataSegment; import javax.tools.FileObject; import java.io.File; diff --git a/server/src/main/java/io/druid/segment/loading/LocalDataSegmentPusher.java b/server/src/main/java/org/apache/druid/segment/loading/LocalDataSegmentPusher.java similarity index 94% rename from server/src/main/java/io/druid/segment/loading/LocalDataSegmentPusher.java rename to server/src/main/java/org/apache/druid/segment/loading/LocalDataSegmentPusher.java index e84e6683329a..b81baa2e4c73 100644 --- a/server/src/main/java/io/druid/segment/loading/LocalDataSegmentPusher.java +++ b/server/src/main/java/org/apache/druid/segment/loading/LocalDataSegmentPusher.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.segment.loading; +package org.apache.druid.segment.loading; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import com.google.inject.Inject; -import io.druid.java.util.common.CompressionUtils; -import io.druid.java.util.common.IOE; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.SegmentUtils; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.CompressionUtils; +import org.apache.druid.java.util.common.IOE; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.SegmentUtils; +import org.apache.druid.timeline.DataSegment; import org.apache.commons.io.FileUtils; import java.io.File; diff --git a/server/src/main/java/io/druid/segment/loading/LocalDataSegmentPusherConfig.java b/server/src/main/java/org/apache/druid/segment/loading/LocalDataSegmentPusherConfig.java similarity index 96% rename from server/src/main/java/io/druid/segment/loading/LocalDataSegmentPusherConfig.java rename to server/src/main/java/org/apache/druid/segment/loading/LocalDataSegmentPusherConfig.java index 9d93878b994f..15868da4de18 100644 --- a/server/src/main/java/io/druid/segment/loading/LocalDataSegmentPusherConfig.java +++ b/server/src/main/java/org/apache/druid/segment/loading/LocalDataSegmentPusherConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.loading; +package org.apache.druid.segment.loading; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/segment/loading/LocalFileTimestampVersionFinder.java b/server/src/main/java/org/apache/druid/segment/loading/LocalFileTimestampVersionFinder.java similarity index 95% rename from server/src/main/java/io/druid/segment/loading/LocalFileTimestampVersionFinder.java rename to server/src/main/java/org/apache/druid/segment/loading/LocalFileTimestampVersionFinder.java index 98ada46cedd7..4ca982db0fb8 100644 --- a/server/src/main/java/io/druid/segment/loading/LocalFileTimestampVersionFinder.java +++ b/server/src/main/java/org/apache/druid/segment/loading/LocalFileTimestampVersionFinder.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment.loading; +package org.apache.druid.segment.loading; import com.google.common.base.Throwables; -import io.druid.data.SearchableVersionedDataFinder; -import io.druid.java.util.common.RetryUtils; +import org.apache.druid.data.SearchableVersionedDataFinder; +import org.apache.druid.java.util.common.RetryUtils; import javax.annotation.Nullable; import java.io.File; diff --git a/server/src/main/java/io/druid/segment/loading/LocalLoadSpec.java b/server/src/main/java/org/apache/druid/segment/loading/LocalLoadSpec.java similarity index 95% rename from server/src/main/java/io/druid/segment/loading/LocalLoadSpec.java rename to server/src/main/java/org/apache/druid/segment/loading/LocalLoadSpec.java index 25e47028c8ff..a3c4d092dff5 100644 --- a/server/src/main/java/io/druid/segment/loading/LocalLoadSpec.java +++ b/server/src/main/java/org/apache/druid/segment/loading/LocalLoadSpec.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment.loading; +package org.apache.druid.segment.loading; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.base.Preconditions; -import io.druid.guice.LocalDataStorageDruidModule; +import org.apache.druid.guice.LocalDataStorageDruidModule; import java.io.File; import java.nio.file.Files; diff --git a/server/src/main/java/io/druid/segment/loading/OmniDataSegmentArchiver.java b/server/src/main/java/org/apache/druid/segment/loading/OmniDataSegmentArchiver.java similarity index 92% rename from server/src/main/java/io/druid/segment/loading/OmniDataSegmentArchiver.java rename to server/src/main/java/org/apache/druid/segment/loading/OmniDataSegmentArchiver.java index 650400f3e991..664204b2db38 100644 --- a/server/src/main/java/io/druid/segment/loading/OmniDataSegmentArchiver.java +++ b/server/src/main/java/org/apache/druid/segment/loading/OmniDataSegmentArchiver.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment.loading; +package org.apache.druid.segment.loading; import com.google.inject.Inject; -import io.druid.java.util.common.MapUtils; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.MapUtils; +import org.apache.druid.timeline.DataSegment; import java.util.Map; diff --git a/server/src/main/java/io/druid/segment/loading/OmniDataSegmentKiller.java b/server/src/main/java/org/apache/druid/segment/loading/OmniDataSegmentKiller.java similarity index 92% rename from server/src/main/java/io/druid/segment/loading/OmniDataSegmentKiller.java rename to server/src/main/java/org/apache/druid/segment/loading/OmniDataSegmentKiller.java index fe3207610956..801ccc2164a8 100644 --- a/server/src/main/java/io/druid/segment/loading/OmniDataSegmentKiller.java +++ b/server/src/main/java/org/apache/druid/segment/loading/OmniDataSegmentKiller.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment.loading; +package org.apache.druid.segment.loading; import com.google.inject.Inject; -import io.druid.java.util.common.MapUtils; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.MapUtils; +import org.apache.druid.timeline.DataSegment; import java.util.Map; diff --git a/server/src/main/java/io/druid/segment/loading/OmniDataSegmentMover.java b/server/src/main/java/org/apache/druid/segment/loading/OmniDataSegmentMover.java similarity index 92% rename from server/src/main/java/io/druid/segment/loading/OmniDataSegmentMover.java rename to server/src/main/java/org/apache/druid/segment/loading/OmniDataSegmentMover.java index 84b5fda1fc23..6aa616538609 100644 --- a/server/src/main/java/io/druid/segment/loading/OmniDataSegmentMover.java +++ b/server/src/main/java/org/apache/druid/segment/loading/OmniDataSegmentMover.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment.loading; +package org.apache.druid.segment.loading; import com.google.inject.Inject; -import io.druid.java.util.common.MapUtils; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.MapUtils; +import org.apache.druid.timeline.DataSegment; import java.util.Map; diff --git a/server/src/main/java/io/druid/segment/loading/SegmentLoader.java b/server/src/main/java/org/apache/druid/segment/loading/SegmentLoader.java similarity index 89% rename from server/src/main/java/io/druid/segment/loading/SegmentLoader.java rename to server/src/main/java/org/apache/druid/segment/loading/SegmentLoader.java index 51563de5011c..3db4672f3fb1 100644 --- a/server/src/main/java/io/druid/segment/loading/SegmentLoader.java +++ b/server/src/main/java/org/apache/druid/segment/loading/SegmentLoader.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.loading; +package org.apache.druid.segment.loading; -import io.druid.segment.Segment; -import io.druid.timeline.DataSegment; +import org.apache.druid.segment.Segment; +import org.apache.druid.timeline.DataSegment; import java.io.File; diff --git a/server/src/main/java/io/druid/segment/loading/SegmentLoaderConfig.java b/server/src/main/java/org/apache/druid/segment/loading/SegmentLoaderConfig.java similarity index 97% rename from server/src/main/java/io/druid/segment/loading/SegmentLoaderConfig.java rename to server/src/main/java/org/apache/druid/segment/loading/SegmentLoaderConfig.java index 306d6c88a740..b09bd0c5bea8 100644 --- a/server/src/main/java/io/druid/segment/loading/SegmentLoaderConfig.java +++ b/server/src/main/java/org/apache/druid/segment/loading/SegmentLoaderConfig.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment.loading; +package org.apache.druid.segment.loading; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.Lists; -import io.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.ISE; import org.hibernate.validator.constraints.NotEmpty; import java.io.File; diff --git a/server/src/main/java/io/druid/segment/loading/SegmentLoaderLocalCacheManager.java b/server/src/main/java/org/apache/druid/segment/loading/SegmentLoaderLocalCacheManager.java similarity index 96% rename from server/src/main/java/io/druid/segment/loading/SegmentLoaderLocalCacheManager.java rename to server/src/main/java/org/apache/druid/segment/loading/SegmentLoaderLocalCacheManager.java index 1dbcb4e3ff75..eebf631e7c89 100644 --- a/server/src/main/java/io/druid/segment/loading/SegmentLoaderLocalCacheManager.java +++ b/server/src/main/java/org/apache/druid/segment/loading/SegmentLoaderLocalCacheManager.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.segment.loading; +package org.apache.druid.segment.loading; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Lists; import com.google.common.primitives.Longs; import com.google.inject.Inject; -import io.druid.guice.annotations.Json; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.segment.IndexIO; -import io.druid.segment.Segment; -import io.druid.timeline.DataSegment; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.Segment; +import org.apache.druid.timeline.DataSegment; import org.apache.commons.io.FileUtils; import java.io.File; diff --git a/server/src/main/java/io/druid/segment/loading/StorageLocation.java b/server/src/main/java/org/apache/druid/segment/loading/StorageLocation.java similarity index 95% rename from server/src/main/java/io/druid/segment/loading/StorageLocation.java rename to server/src/main/java/org/apache/druid/segment/loading/StorageLocation.java index 297558a83e9b..6c603e3414d5 100644 --- a/server/src/main/java/io/druid/segment/loading/StorageLocation.java +++ b/server/src/main/java/org/apache/druid/segment/loading/StorageLocation.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment.loading; +package org.apache.druid.segment.loading; import com.google.common.collect.Sets; -import io.druid.java.util.common.logger.Logger; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.timeline.DataSegment; import javax.annotation.Nullable; import java.io.File; diff --git a/server/src/main/java/io/druid/segment/loading/StorageLocationConfig.java b/server/src/main/java/org/apache/druid/segment/loading/StorageLocationConfig.java similarity index 97% rename from server/src/main/java/io/druid/segment/loading/StorageLocationConfig.java rename to server/src/main/java/org/apache/druid/segment/loading/StorageLocationConfig.java index 2b5886c134e5..88779406dab8 100644 --- a/server/src/main/java/io/druid/segment/loading/StorageLocationConfig.java +++ b/server/src/main/java/org/apache/druid/segment/loading/StorageLocationConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.loading; +package org.apache.druid.segment.loading; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/segment/realtime/DbSegmentPublisherConfig.java b/server/src/main/java/org/apache/druid/segment/realtime/DbSegmentPublisherConfig.java similarity index 95% rename from server/src/main/java/io/druid/segment/realtime/DbSegmentPublisherConfig.java rename to server/src/main/java/org/apache/druid/segment/realtime/DbSegmentPublisherConfig.java index 77a952267869..1f6bc47dda42 100644 --- a/server/src/main/java/io/druid/segment/realtime/DbSegmentPublisherConfig.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/DbSegmentPublisherConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.realtime; +package org.apache.druid.segment.realtime; import org.skife.config.Config; diff --git a/server/src/main/java/io/druid/segment/realtime/FireDepartment.java b/server/src/main/java/org/apache/druid/segment/realtime/FireDepartment.java similarity index 88% rename from server/src/main/java/io/druid/segment/realtime/FireDepartment.java rename to server/src/main/java/org/apache/druid/segment/realtime/FireDepartment.java index 60841481e822..071e827f6e26 100644 --- a/server/src/main/java/io/druid/segment/realtime/FireDepartment.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/FireDepartment.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.segment.realtime; +package org.apache.druid.segment.realtime; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.data.input.Firehose; -import io.druid.data.input.FirehoseV2; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.IngestionSpec; -import io.druid.segment.indexing.RealtimeIOConfig; -import io.druid.segment.indexing.RealtimeTuningConfig; -import io.druid.segment.realtime.plumber.Plumber; +import org.apache.druid.data.input.Firehose; +import org.apache.druid.data.input.FirehoseV2; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.IngestionSpec; +import org.apache.druid.segment.indexing.RealtimeIOConfig; +import org.apache.druid.segment.indexing.RealtimeTuningConfig; +import org.apache.druid.segment.realtime.plumber.Plumber; import java.io.IOException; diff --git a/server/src/main/java/io/druid/segment/realtime/FireDepartmentConfig.java b/server/src/main/java/org/apache/druid/segment/realtime/FireDepartmentConfig.java similarity index 97% rename from server/src/main/java/io/druid/segment/realtime/FireDepartmentConfig.java rename to server/src/main/java/org/apache/druid/segment/realtime/FireDepartmentConfig.java index ff680013c965..299bc6e54551 100644 --- a/server/src/main/java/io/druid/segment/realtime/FireDepartmentConfig.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/FireDepartmentConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.realtime; +package org.apache.druid.segment.realtime; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/segment/realtime/FireDepartmentMetrics.java b/server/src/main/java/org/apache/druid/segment/realtime/FireDepartmentMetrics.java similarity index 99% rename from server/src/main/java/io/druid/segment/realtime/FireDepartmentMetrics.java rename to server/src/main/java/org/apache/druid/segment/realtime/FireDepartmentMetrics.java index 08fcf0d75196..64aab2b58c08 100644 --- a/server/src/main/java/io/druid/segment/realtime/FireDepartmentMetrics.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/FireDepartmentMetrics.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.realtime; +package org.apache.druid.segment.realtime; import com.google.common.base.Preconditions; diff --git a/server/src/main/java/io/druid/segment/realtime/FireHydrant.java b/server/src/main/java/org/apache/druid/segment/realtime/FireHydrant.java similarity index 92% rename from server/src/main/java/io/druid/segment/realtime/FireHydrant.java rename to server/src/main/java/org/apache/druid/segment/realtime/FireHydrant.java index aea7127c4b2f..dfa47096c0b2 100644 --- a/server/src/main/java/io/druid/segment/realtime/FireHydrant.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/FireHydrant.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment.realtime; +package org.apache.druid.segment.realtime; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Pair; -import io.druid.segment.IncrementalIndexSegment; -import io.druid.segment.ReferenceCountingSegment; -import io.druid.segment.Segment; -import io.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.segment.IncrementalIndexSegment; +import org.apache.druid.segment.ReferenceCountingSegment; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.incremental.IncrementalIndex; import org.joda.time.Interval; import javax.annotation.Nullable; diff --git a/server/src/main/java/io/druid/segment/realtime/NoopSegmentPublisher.java b/server/src/main/java/org/apache/druid/segment/realtime/NoopSegmentPublisher.java similarity index 91% rename from server/src/main/java/io/druid/segment/realtime/NoopSegmentPublisher.java rename to server/src/main/java/org/apache/druid/segment/realtime/NoopSegmentPublisher.java index 5dff3246bc7c..ef1283843a43 100644 --- a/server/src/main/java/io/druid/segment/realtime/NoopSegmentPublisher.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/NoopSegmentPublisher.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.realtime; +package org.apache.druid.segment.realtime; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; /** */ diff --git a/server/src/main/java/io/druid/segment/realtime/RealtimeManager.java b/server/src/main/java/org/apache/druid/segment/realtime/RealtimeManager.java similarity index 88% rename from server/src/main/java/io/druid/segment/realtime/RealtimeManager.java rename to server/src/main/java/org/apache/druid/segment/realtime/RealtimeManager.java index 35be8ac98393..d41358f17d70 100644 --- a/server/src/main/java/io/druid/segment/realtime/RealtimeManager.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/RealtimeManager.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.realtime; +package org.apache.druid.segment.realtime; import com.google.common.annotations.VisibleForTesting; @@ -29,33 +29,33 @@ import com.google.common.collect.Maps; import com.google.common.util.concurrent.MoreExecutors; import com.google.inject.Inject; -import io.druid.data.input.Committer; -import io.druid.data.input.Firehose; -import io.druid.data.input.FirehoseV2; -import io.druid.data.input.InputRow; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.query.FinalizeResultsQueryRunner; -import io.druid.query.NoopQueryRunner; -import io.druid.query.Query; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryRunnerFactoryConglomerate; -import io.druid.query.QuerySegmentWalker; -import io.druid.query.QueryToolChest; -import io.druid.query.SegmentDescriptor; -import io.druid.query.spec.SpecificSegmentSpec; -import io.druid.segment.incremental.IncrementalIndexAddResult; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.RealtimeTuningConfig; -import io.druid.segment.realtime.plumber.Committers; -import io.druid.segment.realtime.plumber.Plumber; -import io.druid.segment.realtime.plumber.Plumbers; -import io.druid.server.coordination.DataSegmentServerAnnouncer; +import org.apache.druid.data.input.Committer; +import org.apache.druid.data.input.Firehose; +import org.apache.druid.data.input.FirehoseV2; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.query.FinalizeResultsQueryRunner; +import org.apache.druid.query.NoopQueryRunner; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryRunnerFactoryConglomerate; +import org.apache.druid.query.QuerySegmentWalker; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.SegmentDescriptor; +import org.apache.druid.query.spec.SpecificSegmentSpec; +import org.apache.druid.segment.incremental.IncrementalIndexAddResult; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.RealtimeTuningConfig; +import org.apache.druid.segment.realtime.plumber.Committers; +import org.apache.druid.segment.realtime.plumber.Plumber; +import org.apache.druid.segment.realtime.plumber.Plumbers; +import org.apache.druid.server.coordination.DataSegmentServerAnnouncer; import org.joda.time.Interval; import java.io.IOException; diff --git a/server/src/main/java/io/druid/segment/realtime/RealtimeMetricsMonitor.java b/server/src/main/java/org/apache/druid/segment/realtime/RealtimeMetricsMonitor.java similarity index 92% rename from server/src/main/java/io/druid/segment/realtime/RealtimeMetricsMonitor.java rename to server/src/main/java/org/apache/druid/segment/realtime/RealtimeMetricsMonitor.java index 3055cc0aa80a..4af5ad4d0d4b 100644 --- a/server/src/main/java/io/druid/segment/realtime/RealtimeMetricsMonitor.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/RealtimeMetricsMonitor.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.segment.realtime; +package org.apache.druid.segment.realtime; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.inject.Inject; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.java.util.metrics.AbstractMonitor; -import io.druid.java.util.metrics.MonitorUtils; -import io.druid.query.DruidMetrics; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.metrics.AbstractMonitor; +import org.apache.druid.java.util.metrics.MonitorUtils; +import org.apache.druid.query.DruidMetrics; import java.util.List; import java.util.Map; diff --git a/server/src/main/java/io/druid/segment/realtime/SegmentPublisher.java b/server/src/main/java/org/apache/druid/segment/realtime/SegmentPublisher.java similarity index 91% rename from server/src/main/java/io/druid/segment/realtime/SegmentPublisher.java rename to server/src/main/java/org/apache/druid/segment/realtime/SegmentPublisher.java index 2ef7b2cb05ae..7910e211ca59 100644 --- a/server/src/main/java/io/druid/segment/realtime/SegmentPublisher.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/SegmentPublisher.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.realtime; +package org.apache.druid.segment.realtime; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import java.io.IOException; diff --git a/server/src/main/java/io/druid/segment/realtime/appenderator/Appenderator.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/Appenderator.java similarity index 96% rename from server/src/main/java/io/druid/segment/realtime/appenderator/Appenderator.java rename to server/src/main/java/org/apache/druid/segment/realtime/appenderator/Appenderator.java index 3c87320fa9a1..f33ed1b5d1b8 100644 --- a/server/src/main/java/io/druid/segment/realtime/appenderator/Appenderator.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/Appenderator.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; import com.google.common.base.Supplier; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.data.input.Committer; -import io.druid.data.input.InputRow; -import io.druid.java.util.common.parsers.ParseException; -import io.druid.query.QuerySegmentWalker; -import io.druid.segment.incremental.IndexSizeExceededException; +import org.apache.druid.data.input.Committer; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.java.util.common.parsers.ParseException; +import org.apache.druid.query.QuerySegmentWalker; +import org.apache.druid.segment.incremental.IndexSizeExceededException; import javax.annotation.Nullable; import java.io.Closeable; diff --git a/server/src/main/java/io/druid/segment/realtime/appenderator/AppenderatorConfig.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorConfig.java similarity index 88% rename from server/src/main/java/io/druid/segment/realtime/appenderator/AppenderatorConfig.java rename to server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorConfig.java index f93a978bbf64..15ff7d9d21f0 100644 --- a/server/src/main/java/io/druid/segment/realtime/appenderator/AppenderatorConfig.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorConfig.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; -import io.druid.segment.IndexSpec; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.segment.IndexSpec; import org.joda.time.Period; import javax.annotation.Nullable; diff --git a/server/src/main/java/io/druid/segment/realtime/appenderator/AppenderatorDriverAddResult.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorDriverAddResult.java similarity index 96% rename from server/src/main/java/io/druid/segment/realtime/appenderator/AppenderatorDriverAddResult.java rename to server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorDriverAddResult.java index c8785ad4d95a..0dc1ab52cd73 100644 --- a/server/src/main/java/io/druid/segment/realtime/appenderator/AppenderatorDriverAddResult.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorDriverAddResult.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; -import io.druid.java.util.common.parsers.ParseException; +import org.apache.druid.java.util.common.parsers.ParseException; import javax.annotation.Nullable; diff --git a/server/src/main/java/io/druid/segment/realtime/appenderator/AppenderatorDriverMetadata.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorDriverMetadata.java similarity index 97% rename from server/src/main/java/io/druid/segment/realtime/appenderator/AppenderatorDriverMetadata.java rename to server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorDriverMetadata.java index b9529a18a7e4..03cd0ff45b65 100644 --- a/server/src/main/java/io/druid/segment/realtime/appenderator/AppenderatorDriverMetadata.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorDriverMetadata.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import io.druid.segment.realtime.appenderator.SegmentWithState.SegmentState; +import org.apache.druid.segment.realtime.appenderator.SegmentWithState.SegmentState; import java.util.ArrayList; import java.util.List; diff --git a/server/src/main/java/io/druid/segment/realtime/appenderator/AppenderatorFactory.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorFactory.java similarity index 85% rename from server/src/main/java/io/druid/segment/realtime/appenderator/AppenderatorFactory.java rename to server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorFactory.java index 99549f21aafc..ac73aa0fa709 100644 --- a/server/src/main/java/io/druid/segment/realtime/appenderator/AppenderatorFactory.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorFactory.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.RealtimeTuningConfig; -import io.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.RealtimeTuningConfig; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type") @JsonSubTypes(value = { diff --git a/server/src/main/java/io/druid/segment/realtime/appenderator/AppenderatorImpl.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorImpl.java similarity index 95% rename from server/src/main/java/io/druid/segment/realtime/appenderator/AppenderatorImpl.java rename to server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorImpl.java index 4bb0857843b4..e245967daf88 100644 --- a/server/src/main/java/io/druid/segment/realtime/appenderator/AppenderatorImpl.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; @@ -38,45 +38,45 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.client.cache.Cache; -import io.druid.client.cache.CacheConfig; -import io.druid.client.cache.CachePopulatorStats; -import io.druid.common.guava.ThreadRenamingCallable; -import io.druid.data.input.Committer; -import io.druid.data.input.InputRow; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.RE; -import io.druid.java.util.common.RetryUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.query.Query; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactoryConglomerate; -import io.druid.query.QuerySegmentWalker; -import io.druid.query.SegmentDescriptor; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMerger; -import io.druid.segment.IndexSpec; -import io.druid.segment.QueryableIndex; -import io.druid.segment.QueryableIndexSegment; -import io.druid.segment.Segment; -import io.druid.segment.incremental.IncrementalIndexAddResult; -import io.druid.segment.incremental.IndexSizeExceededException; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.TuningConfigs; -import io.druid.segment.loading.DataSegmentPusher; -import io.druid.segment.realtime.FireDepartmentMetrics; -import io.druid.segment.realtime.FireHydrant; -import io.druid.segment.realtime.plumber.Sink; -import io.druid.server.coordination.DataSegmentAnnouncer; -import io.druid.timeline.DataSegment; -import io.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.client.cache.Cache; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.client.cache.CachePopulatorStats; +import org.apache.druid.common.guava.ThreadRenamingCallable; +import org.apache.druid.data.input.Committer; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.java.util.common.RetryUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactoryConglomerate; +import org.apache.druid.query.QuerySegmentWalker; +import org.apache.druid.query.SegmentDescriptor; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMerger; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.QueryableIndexSegment; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.incremental.IncrementalIndexAddResult; +import org.apache.druid.segment.incremental.IndexSizeExceededException; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.TuningConfigs; +import org.apache.druid.segment.loading.DataSegmentPusher; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.segment.realtime.FireHydrant; +import org.apache.druid.segment.realtime.plumber.Sink; +import org.apache.druid.server.coordination.DataSegmentAnnouncer; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.VersionedIntervalTimeline; import org.apache.commons.io.FileUtils; import org.joda.time.Interval; diff --git a/server/src/main/java/io/druid/segment/realtime/appenderator/AppenderatorPlumber.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorPlumber.java similarity index 90% rename from server/src/main/java/io/druid/segment/realtime/appenderator/AppenderatorPlumber.java rename to server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorPlumber.java index 530345fc5185..d0e72e3d6d1f 100644 --- a/server/src/main/java/io/druid/segment/realtime/appenderator/AppenderatorPlumber.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorPlumber.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; import com.google.common.base.Function; import com.google.common.base.Joiner; @@ -29,33 +29,33 @@ import com.google.common.collect.Lists; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; -import io.druid.common.guava.ThreadRenamingCallable; -import io.druid.data.input.Committer; -import io.druid.data.input.InputRow; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.concurrent.ScheduledExecutors; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.query.Query; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.segment.incremental.IncrementalIndexAddResult; -import io.druid.segment.incremental.IndexSizeExceededException; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.RealtimeTuningConfig; -import io.druid.segment.realtime.FireDepartmentMetrics; -import io.druid.segment.realtime.SegmentPublisher; -import io.druid.segment.realtime.plumber.Committers; -import io.druid.segment.realtime.plumber.Plumber; -import io.druid.segment.realtime.plumber.RejectionPolicy; -import io.druid.segment.realtime.plumber.SegmentHandoffNotifier; -import io.druid.segment.realtime.plumber.VersioningPolicy; -import io.druid.server.coordination.DataSegmentAnnouncer; -import io.druid.timeline.DataSegment; +import org.apache.druid.common.guava.ThreadRenamingCallable; +import org.apache.druid.data.input.Committer; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.concurrent.ScheduledExecutors; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.segment.incremental.IncrementalIndexAddResult; +import org.apache.druid.segment.incremental.IndexSizeExceededException; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.RealtimeTuningConfig; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.segment.realtime.SegmentPublisher; +import org.apache.druid.segment.realtime.plumber.Committers; +import org.apache.druid.segment.realtime.plumber.Plumber; +import org.apache.druid.segment.realtime.plumber.RejectionPolicy; +import org.apache.druid.segment.realtime.plumber.SegmentHandoffNotifier; +import org.apache.druid.segment.realtime.plumber.VersioningPolicy; +import org.apache.druid.server.coordination.DataSegmentAnnouncer; +import org.apache.druid.timeline.DataSegment; import org.joda.time.DateTime; import org.joda.time.Duration; import org.joda.time.Interval; diff --git a/server/src/main/java/io/druid/segment/realtime/appenderator/AppenderatorPlumberSchool.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorPlumberSchool.java similarity index 81% rename from server/src/main/java/io/druid/segment/realtime/appenderator/AppenderatorPlumberSchool.java rename to server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorPlumberSchool.java index 7ab59c341ed9..00ce61751dc4 100644 --- a/server/src/main/java/io/druid/segment/realtime/appenderator/AppenderatorPlumberSchool.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorPlumberSchool.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.RealtimeTuningConfig; -import io.druid.segment.realtime.FireDepartmentMetrics; -import io.druid.segment.realtime.SegmentPublisher; -import io.druid.segment.realtime.plumber.Plumber; -import io.druid.segment.realtime.plumber.PlumberSchool; -import io.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; -import io.druid.server.coordination.DataSegmentAnnouncer; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.RealtimeTuningConfig; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.segment.realtime.SegmentPublisher; +import org.apache.druid.segment.realtime.plumber.Plumber; +import org.apache.druid.segment.realtime.plumber.PlumberSchool; +import org.apache.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; +import org.apache.druid.server.coordination.DataSegmentAnnouncer; public class AppenderatorPlumberSchool implements PlumberSchool { diff --git a/server/src/main/java/io/druid/segment/realtime/appenderator/Appenderators.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/Appenderators.java similarity index 79% rename from server/src/main/java/io/druid/segment/realtime/appenderator/Appenderators.java rename to server/src/main/java/org/apache/druid/segment/realtime/appenderator/Appenderators.java index 1e22cdd85138..44d91cb54416 100644 --- a/server/src/main/java/io/druid/segment/realtime/appenderator/Appenderators.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/Appenderators.java @@ -17,23 +17,23 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.client.cache.Cache; -import io.druid.client.cache.CacheConfig; -import io.druid.client.cache.CachePopulatorStats; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.query.QueryRunnerFactoryConglomerate; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMerger; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.loading.DataSegmentPusher; -import io.druid.segment.realtime.FireDepartmentMetrics; -import io.druid.server.coordination.DataSegmentAnnouncer; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.ShardSpec; +import org.apache.druid.client.cache.Cache; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.client.cache.CachePopulatorStats; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.query.QueryRunnerFactoryConglomerate; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMerger; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.loading.DataSegmentPusher; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.server.coordination.DataSegmentAnnouncer; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.ShardSpec; import org.joda.time.Interval; import java.util.concurrent.ExecutorService; diff --git a/server/src/main/java/io/druid/segment/realtime/appenderator/BaseAppenderatorDriver.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/BaseAppenderatorDriver.java similarity index 98% rename from server/src/main/java/io/druid/segment/realtime/appenderator/BaseAppenderatorDriver.java rename to server/src/main/java/org/apache/druid/segment/realtime/appenderator/BaseAppenderatorDriver.java index 43ec063c3945..bc8260b38c09 100644 --- a/server/src/main/java/io/druid/segment/realtime/appenderator/BaseAppenderatorDriver.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/BaseAppenderatorDriver.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; @@ -34,13 +34,13 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.data.input.Committer; -import io.druid.data.input.InputRow; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.loading.DataSegmentKiller; -import io.druid.segment.realtime.appenderator.SegmentWithState.SegmentState; +import org.apache.druid.data.input.Committer; +import org.apache.druid.data.input.InputRow; +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.druid.segment.loading.DataSegmentKiller; +import org.apache.druid.segment.realtime.appenderator.SegmentWithState.SegmentState; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/server/src/main/java/io/druid/segment/realtime/appenderator/BatchAppenderatorDriver.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/BatchAppenderatorDriver.java similarity index 94% rename from server/src/main/java/io/druid/segment/realtime/appenderator/BatchAppenderatorDriver.java rename to server/src/main/java/org/apache/druid/segment/realtime/appenderator/BatchAppenderatorDriver.java index 5279d992e6ac..2a4547106272 100644 --- a/server/src/main/java/io/druid/segment/realtime/appenderator/BatchAppenderatorDriver.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/BatchAppenderatorDriver.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.data.input.InputRow; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.concurrent.ListenableFutures; -import io.druid.segment.loading.DataSegmentKiller; -import io.druid.segment.realtime.appenderator.SegmentWithState.SegmentState; -import io.druid.timeline.DataSegment; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.concurrent.ListenableFutures; +import org.apache.druid.segment.loading.DataSegmentKiller; +import org.apache.druid.segment.realtime.appenderator.SegmentWithState.SegmentState; +import org.apache.druid.timeline.DataSegment; import javax.annotation.Nullable; import java.io.IOException; diff --git a/server/src/main/java/io/druid/segment/realtime/appenderator/Committed.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/Committed.java similarity index 98% rename from server/src/main/java/io/druid/segment/realtime/appenderator/Committed.java rename to server/src/main/java/org/apache/druid/segment/realtime/appenderator/Committed.java index d0956e68a5bd..ba42670bd097 100644 --- a/server/src/main/java/io/druid/segment/realtime/appenderator/Committed.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/Committed.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/segment/realtime/appenderator/DefaultOfflineAppenderatorFactory.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/DefaultOfflineAppenderatorFactory.java similarity index 83% rename from server/src/main/java/io/druid/segment/realtime/appenderator/DefaultOfflineAppenderatorFactory.java rename to server/src/main/java/org/apache/druid/segment/realtime/appenderator/DefaultOfflineAppenderatorFactory.java index 6102eab7e6c2..5464d3f0b297 100644 --- a/server/src/main/java/io/druid/segment/realtime/appenderator/DefaultOfflineAppenderatorFactory.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/DefaultOfflineAppenderatorFactory.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMerger; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.RealtimeTuningConfig; -import io.druid.segment.loading.DataSegmentPusher; -import io.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMerger; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.RealtimeTuningConfig; +import org.apache.druid.segment.loading.DataSegmentPusher; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; public class DefaultOfflineAppenderatorFactory implements AppenderatorFactory diff --git a/server/src/main/java/io/druid/segment/realtime/appenderator/DefaultRealtimeAppenderatorFactory.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/DefaultRealtimeAppenderatorFactory.java similarity index 81% rename from server/src/main/java/io/druid/segment/realtime/appenderator/DefaultRealtimeAppenderatorFactory.java rename to server/src/main/java/org/apache/druid/segment/realtime/appenderator/DefaultRealtimeAppenderatorFactory.java index 7d027d64aa2a..ec1abe3f9997 100644 --- a/server/src/main/java/io/druid/segment/realtime/appenderator/DefaultRealtimeAppenderatorFactory.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/DefaultRealtimeAppenderatorFactory.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.client.cache.Cache; -import io.druid.client.cache.CacheConfig; -import io.druid.client.cache.CachePopulatorStats; -import io.druid.guice.annotations.Processing; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.query.QueryRunnerFactoryConglomerate; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMerger; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.RealtimeTuningConfig; -import io.druid.segment.loading.DataSegmentPusher; -import io.druid.segment.realtime.FireDepartmentMetrics; -import io.druid.server.coordination.DataSegmentAnnouncer; -import io.druid.timeline.partition.ShardSpec; +import org.apache.druid.client.cache.Cache; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.client.cache.CachePopulatorStats; +import org.apache.druid.guice.annotations.Processing; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.query.QueryRunnerFactoryConglomerate; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMerger; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.RealtimeTuningConfig; +import org.apache.druid.segment.loading.DataSegmentPusher; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.server.coordination.DataSegmentAnnouncer; +import org.apache.druid.timeline.partition.ShardSpec; import java.io.File; import java.util.concurrent.ExecutorService; diff --git a/server/src/main/java/io/druid/segment/realtime/appenderator/SegmentAllocator.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/SegmentAllocator.java similarity index 94% rename from server/src/main/java/io/druid/segment/realtime/appenderator/SegmentAllocator.java rename to server/src/main/java/org/apache/druid/segment/realtime/appenderator/SegmentAllocator.java index 0e992725bfe8..1c304aeeeeab 100644 --- a/server/src/main/java/io/druid/segment/realtime/appenderator/SegmentAllocator.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/SegmentAllocator.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; -import io.druid.data.input.InputRow; +import org.apache.druid.data.input.InputRow; import java.io.IOException; diff --git a/server/src/main/java/io/druid/segment/realtime/appenderator/SegmentIdentifier.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/SegmentIdentifier.java similarity index 95% rename from server/src/main/java/io/druid/segment/realtime/appenderator/SegmentIdentifier.java rename to server/src/main/java/org/apache/druid/segment/realtime/appenderator/SegmentIdentifier.java index 790847754955..0c0d35229246 100644 --- a/server/src/main/java/io/druid/segment/realtime/appenderator/SegmentIdentifier.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/SegmentIdentifier.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.ShardSpec; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.ShardSpec; import org.joda.time.Interval; import java.util.Objects; diff --git a/server/src/main/java/io/druid/segment/realtime/appenderator/SegmentNotWritableException.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/SegmentNotWritableException.java similarity index 90% rename from server/src/main/java/io/druid/segment/realtime/appenderator/SegmentNotWritableException.java rename to server/src/main/java/org/apache/druid/segment/realtime/appenderator/SegmentNotWritableException.java index 82bc0d7bf21b..38a2f6261ddb 100644 --- a/server/src/main/java/io/druid/segment/realtime/appenderator/SegmentNotWritableException.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/SegmentNotWritableException.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; public class SegmentNotWritableException extends Exception { diff --git a/server/src/main/java/io/druid/segment/realtime/appenderator/SegmentWithState.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/SegmentWithState.java similarity index 98% rename from server/src/main/java/io/druid/segment/realtime/appenderator/SegmentWithState.java rename to server/src/main/java/org/apache/druid/segment/realtime/appenderator/SegmentWithState.java index 9da550731a73..7a4019e6f941 100644 --- a/server/src/main/java/io/druid/segment/realtime/appenderator/SegmentWithState.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/SegmentWithState.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import javax.annotation.Nullable; import java.util.Collection; diff --git a/server/src/main/java/io/druid/segment/realtime/appenderator/SegmentsAndMetadata.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/SegmentsAndMetadata.java similarity index 95% rename from server/src/main/java/io/druid/segment/realtime/appenderator/SegmentsAndMetadata.java rename to server/src/main/java/org/apache/druid/segment/realtime/appenderator/SegmentsAndMetadata.java index 2e4c21213ef6..034044111fbe 100644 --- a/server/src/main/java/io/druid/segment/realtime/appenderator/SegmentsAndMetadata.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/SegmentsAndMetadata.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; import com.google.common.collect.ImmutableList; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import javax.annotation.Nullable; import java.util.Collections; diff --git a/server/src/main/java/io/druid/segment/realtime/appenderator/SinkQuerySegmentWalker.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/SinkQuerySegmentWalker.java similarity index 87% rename from server/src/main/java/io/druid/segment/realtime/appenderator/SinkQuerySegmentWalker.java rename to server/src/main/java/org/apache/druid/segment/realtime/appenderator/SinkQuerySegmentWalker.java index ef18be2dec94..53f68f59ef2b 100644 --- a/server/src/main/java/io/druid/segment/realtime/appenderator/SinkQuerySegmentWalker.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/SinkQuerySegmentWalker.java @@ -17,48 +17,48 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.client.CachingQueryRunner; -import io.druid.client.cache.Cache; -import io.druid.client.cache.CacheConfig; -import io.druid.client.cache.CachePopulatorStats; -import io.druid.client.cache.ForegroundCachePopulator; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.guava.CloseQuietly; -import io.druid.java.util.common.guava.FunctionalIterable; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.query.BySegmentQueryRunner; -import io.druid.query.CPUTimeMetricQueryRunner; -import io.druid.query.MetricsEmittingQueryRunner; -import io.druid.query.NoopQueryRunner; -import io.druid.query.Query; -import io.druid.query.QueryMetrics; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryRunnerFactoryConglomerate; -import io.druid.query.QueryRunnerHelper; -import io.druid.query.QuerySegmentWalker; -import io.druid.query.QueryToolChest; -import io.druid.query.ReportTimelineMissingSegmentQueryRunner; -import io.druid.query.SegmentDescriptor; -import io.druid.query.TableDataSource; -import io.druid.query.spec.SpecificSegmentQueryRunner; -import io.druid.query.spec.SpecificSegmentSpec; -import io.druid.segment.Segment; -import io.druid.segment.realtime.FireHydrant; -import io.druid.segment.realtime.plumber.Sink; -import io.druid.timeline.TimelineObjectHolder; -import io.druid.timeline.VersionedIntervalTimeline; -import io.druid.timeline.partition.PartitionChunk; -import io.druid.timeline.partition.PartitionHolder; +import org.apache.druid.client.CachingQueryRunner; +import org.apache.druid.client.cache.Cache; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.client.cache.CachePopulatorStats; +import org.apache.druid.client.cache.ForegroundCachePopulator; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.guava.CloseQuietly; +import org.apache.druid.java.util.common.guava.FunctionalIterable; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.query.BySegmentQueryRunner; +import org.apache.druid.query.CPUTimeMetricQueryRunner; +import org.apache.druid.query.MetricsEmittingQueryRunner; +import org.apache.druid.query.NoopQueryRunner; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryMetrics; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryRunnerFactoryConglomerate; +import org.apache.druid.query.QueryRunnerHelper; +import org.apache.druid.query.QuerySegmentWalker; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.ReportTimelineMissingSegmentQueryRunner; +import org.apache.druid.query.SegmentDescriptor; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.query.spec.SpecificSegmentQueryRunner; +import org.apache.druid.query.spec.SpecificSegmentSpec; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.realtime.FireHydrant; +import org.apache.druid.segment.realtime.plumber.Sink; +import org.apache.druid.timeline.TimelineObjectHolder; +import org.apache.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.timeline.partition.PartitionChunk; +import org.apache.druid.timeline.partition.PartitionHolder; import org.joda.time.Interval; import java.io.Closeable; diff --git a/server/src/main/java/io/druid/segment/realtime/appenderator/StreamAppenderatorDriver.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorDriver.java similarity index 95% rename from server/src/main/java/io/druid/segment/realtime/appenderator/StreamAppenderatorDriver.java rename to server/src/main/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorDriver.java index e24a11c0f26f..95f50b4a8997 100644 --- a/server/src/main/java/io/druid/segment/realtime/appenderator/StreamAppenderatorDriver.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorDriver.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Function; @@ -28,19 +28,19 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; -import io.druid.data.input.Committer; -import io.druid.data.input.InputRow; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.concurrent.ListenableFutures; -import io.druid.java.util.common.guava.Comparators; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.SegmentDescriptor; -import io.druid.segment.loading.DataSegmentKiller; -import io.druid.segment.realtime.FireDepartmentMetrics; -import io.druid.segment.realtime.appenderator.SegmentWithState.SegmentState; -import io.druid.segment.realtime.plumber.SegmentHandoffNotifier; -import io.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; +import org.apache.druid.data.input.Committer; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.concurrent.ListenableFutures; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.SegmentDescriptor; +import org.apache.druid.segment.loading.DataSegmentKiller; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.segment.realtime.appenderator.SegmentWithState.SegmentState; +import org.apache.druid.segment.realtime.plumber.SegmentHandoffNotifier; +import org.apache.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; import javax.annotation.Nullable; import java.io.IOException; diff --git a/server/src/main/java/io/druid/segment/realtime/appenderator/TransactionalSegmentPublisher.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/TransactionalSegmentPublisher.java similarity index 90% rename from server/src/main/java/io/druid/segment/realtime/appenderator/TransactionalSegmentPublisher.java rename to server/src/main/java/org/apache/druid/segment/realtime/appenderator/TransactionalSegmentPublisher.java index 9a30fbd2fcf5..0749a2892036 100644 --- a/server/src/main/java/io/druid/segment/realtime/appenderator/TransactionalSegmentPublisher.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/TransactionalSegmentPublisher.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; -import io.druid.indexing.overlord.SegmentPublishResult; -import io.druid.timeline.DataSegment; +import org.apache.druid.indexing.overlord.SegmentPublishResult; +import org.apache.druid.timeline.DataSegment; import javax.annotation.Nullable; import java.io.IOException; diff --git a/server/src/main/java/io/druid/segment/realtime/appenderator/UsedSegmentChecker.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/UsedSegmentChecker.java similarity index 92% rename from server/src/main/java/io/druid/segment/realtime/appenderator/UsedSegmentChecker.java rename to server/src/main/java/org/apache/druid/segment/realtime/appenderator/UsedSegmentChecker.java index dc05fec5cd87..47c0087bbaee 100644 --- a/server/src/main/java/io/druid/segment/realtime/appenderator/UsedSegmentChecker.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/UsedSegmentChecker.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import java.io.IOException; import java.util.Set; diff --git a/server/src/main/java/io/druid/segment/realtime/firehose/ChatHandler.java b/server/src/main/java/org/apache/druid/segment/realtime/firehose/ChatHandler.java similarity index 95% rename from server/src/main/java/io/druid/segment/realtime/firehose/ChatHandler.java rename to server/src/main/java/org/apache/druid/segment/realtime/firehose/ChatHandler.java index 26d7a5d5ef08..004b6c04d480 100644 --- a/server/src/main/java/io/druid/segment/realtime/firehose/ChatHandler.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/firehose/ChatHandler.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.realtime.firehose; +package org.apache.druid.segment.realtime.firehose; /** * Objects that can be registered with a {@link ServiceAnnouncingChatHandlerProvider} and provide http endpoints for indexing-related diff --git a/server/src/main/java/io/druid/segment/realtime/firehose/ChatHandlerProvider.java b/server/src/main/java/org/apache/druid/segment/realtime/firehose/ChatHandlerProvider.java similarity index 97% rename from server/src/main/java/io/druid/segment/realtime/firehose/ChatHandlerProvider.java rename to server/src/main/java/org/apache/druid/segment/realtime/firehose/ChatHandlerProvider.java index 902d17752524..3af0d5c37f00 100644 --- a/server/src/main/java/io/druid/segment/realtime/firehose/ChatHandlerProvider.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/firehose/ChatHandlerProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.realtime.firehose; +package org.apache.druid.segment.realtime.firehose; import com.google.common.base.Optional; diff --git a/server/src/main/java/io/druid/segment/realtime/firehose/ChatHandlerResource.java b/server/src/main/java/org/apache/druid/segment/realtime/firehose/ChatHandlerResource.java similarity index 94% rename from server/src/main/java/io/druid/segment/realtime/firehose/ChatHandlerResource.java rename to server/src/main/java/org/apache/druid/segment/realtime/firehose/ChatHandlerResource.java index 9eaf1ffecfb5..693b302b233a 100644 --- a/server/src/main/java/io/druid/segment/realtime/firehose/ChatHandlerResource.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/firehose/ChatHandlerResource.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment.realtime.firehose; +package org.apache.druid.segment.realtime.firehose; import com.google.common.base.Optional; import com.google.inject.Inject; -import io.druid.server.metrics.DataSourceTaskIdHolder; +import org.apache.druid.server.metrics.DataSourceTaskIdHolder; import javax.ws.rs.Path; import javax.ws.rs.PathParam; diff --git a/server/src/main/java/io/druid/segment/realtime/firehose/ChatHandlers.java b/server/src/main/java/org/apache/druid/segment/realtime/firehose/ChatHandlers.java similarity index 75% rename from server/src/main/java/io/druid/segment/realtime/firehose/ChatHandlers.java rename to server/src/main/java/org/apache/druid/segment/realtime/firehose/ChatHandlers.java index c3ba05bcb367..4f6e99217d51 100644 --- a/server/src/main/java/io/druid/segment/realtime/firehose/ChatHandlers.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/firehose/ChatHandlers.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.segment.realtime.firehose; +package org.apache.druid.segment.realtime.firehose; -import io.druid.server.security.Access; -import io.druid.server.security.Action; -import io.druid.server.security.AuthorizationUtils; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.ForbiddenException; -import io.druid.server.security.Resource; -import io.druid.server.security.ResourceAction; -import io.druid.server.security.ResourceType; +import org.apache.druid.server.security.Access; +import org.apache.druid.server.security.Action; +import org.apache.druid.server.security.AuthorizationUtils; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.ForbiddenException; +import org.apache.druid.server.security.Resource; +import org.apache.druid.server.security.ResourceAction; +import org.apache.druid.server.security.ResourceType; import javax.servlet.http.HttpServletRequest; diff --git a/server/src/main/java/io/druid/segment/realtime/firehose/ClippedFirehoseFactory.java b/server/src/main/java/org/apache/druid/segment/realtime/firehose/ClippedFirehoseFactory.java similarity index 89% rename from server/src/main/java/io/druid/segment/realtime/firehose/ClippedFirehoseFactory.java rename to server/src/main/java/org/apache/druid/segment/realtime/firehose/ClippedFirehoseFactory.java index a0e28a4c6306..9654d1f11b52 100644 --- a/server/src/main/java/io/druid/segment/realtime/firehose/ClippedFirehoseFactory.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/firehose/ClippedFirehoseFactory.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.segment.realtime.firehose; +package org.apache.druid.segment.realtime.firehose; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Predicate; -import io.druid.data.input.Firehose; -import io.druid.data.input.FirehoseFactory; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.Firehose; +import org.apache.druid.data.input.FirehoseFactory; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.InputRowParser; import org.joda.time.Interval; import java.io.File; diff --git a/server/src/main/java/io/druid/segment/realtime/firehose/CombiningFirehoseFactory.java b/server/src/main/java/org/apache/druid/segment/realtime/firehose/CombiningFirehoseFactory.java similarity index 92% rename from server/src/main/java/io/druid/segment/realtime/firehose/CombiningFirehoseFactory.java rename to server/src/main/java/org/apache/druid/segment/realtime/firehose/CombiningFirehoseFactory.java index 91458c678853..6e059e249820 100644 --- a/server/src/main/java/io/druid/segment/realtime/firehose/CombiningFirehoseFactory.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/firehose/CombiningFirehoseFactory.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.segment.realtime.firehose; +package org.apache.druid.segment.realtime.firehose; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; -import io.druid.data.input.Firehose; -import io.druid.data.input.FirehoseFactory; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.InputRowParser; -import io.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.data.input.Firehose; +import org.apache.druid.data.input.FirehoseFactory; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.java.util.emitter.EmittingLogger; import javax.annotation.Nullable; import java.io.File; diff --git a/server/src/main/java/io/druid/segment/realtime/firehose/EventReceiver.java b/server/src/main/java/org/apache/druid/segment/realtime/firehose/EventReceiver.java similarity index 94% rename from server/src/main/java/io/druid/segment/realtime/firehose/EventReceiver.java rename to server/src/main/java/org/apache/druid/segment/realtime/firehose/EventReceiver.java index 4391c918c7bd..e2b776fa4fa5 100644 --- a/server/src/main/java/io/druid/segment/realtime/firehose/EventReceiver.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/firehose/EventReceiver.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.realtime.firehose; +package org.apache.druid.segment.realtime.firehose; import java.util.Collection; import java.util.Map; diff --git a/server/src/main/java/io/druid/segment/realtime/firehose/EventReceiverFirehoseFactory.java b/server/src/main/java/org/apache/druid/segment/realtime/firehose/EventReceiverFirehoseFactory.java similarity index 93% rename from server/src/main/java/io/druid/segment/realtime/firehose/EventReceiverFirehoseFactory.java rename to server/src/main/java/org/apache/druid/segment/realtime/firehose/EventReceiverFirehoseFactory.java index 36313a4e7450..fc58d9d3be2e 100644 --- a/server/src/main/java/io/druid/segment/realtime/firehose/EventReceiverFirehoseFactory.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/firehose/EventReceiverFirehoseFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.realtime.firehose; +package org.apache.druid.segment.realtime.firehose; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; @@ -32,24 +32,24 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.io.CountingInputStream; -import io.druid.data.input.Firehose; -import io.druid.data.input.FirehoseFactory; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.InputRowParser; -import io.druid.guice.annotations.Json; -import io.druid.guice.annotations.Smile; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.server.metrics.EventReceiverFirehoseMetric; -import io.druid.server.metrics.EventReceiverFirehoseRegister; -import io.druid.server.security.Access; -import io.druid.server.security.Action; -import io.druid.server.security.AuthorizationUtils; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.Resource; -import io.druid.server.security.ResourceAction; -import io.druid.server.security.ResourceType; +import org.apache.druid.data.input.Firehose; +import org.apache.druid.data.input.FirehoseFactory; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.guice.annotations.Smile; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.server.metrics.EventReceiverFirehoseMetric; +import org.apache.druid.server.metrics.EventReceiverFirehoseRegister; +import org.apache.druid.server.security.Access; +import org.apache.druid.server.security.Action; +import org.apache.druid.server.security.AuthorizationUtils; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.Resource; +import org.apache.druid.server.security.ResourceAction; +import org.apache.druid.server.security.ResourceType; import org.joda.time.DateTime; import javax.annotation.Nullable; diff --git a/server/src/main/java/io/druid/segment/realtime/firehose/FixedCountFirehoseFactory.java b/server/src/main/java/org/apache/druid/segment/realtime/firehose/FixedCountFirehoseFactory.java similarity index 90% rename from server/src/main/java/io/druid/segment/realtime/firehose/FixedCountFirehoseFactory.java rename to server/src/main/java/org/apache/druid/segment/realtime/firehose/FixedCountFirehoseFactory.java index c6b34a0802a5..e8a7dca1a8a0 100644 --- a/server/src/main/java/io/druid/segment/realtime/firehose/FixedCountFirehoseFactory.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/firehose/FixedCountFirehoseFactory.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.segment.realtime.firehose; +package org.apache.druid.segment.realtime.firehose; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.data.input.Firehose; -import io.druid.data.input.FirehoseFactory; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.Firehose; +import org.apache.druid.data.input.FirehoseFactory; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.InputRowParser; import javax.annotation.Nullable; import java.io.File; diff --git a/server/src/main/java/io/druid/segment/realtime/firehose/HttpFirehoseFactory.java b/server/src/main/java/org/apache/druid/segment/realtime/firehose/HttpFirehoseFactory.java similarity index 91% rename from server/src/main/java/io/druid/segment/realtime/firehose/HttpFirehoseFactory.java rename to server/src/main/java/org/apache/druid/segment/realtime/firehose/HttpFirehoseFactory.java index 0e391205f826..b6ca9509edef 100644 --- a/server/src/main/java/io/druid/segment/realtime/firehose/HttpFirehoseFactory.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/firehose/HttpFirehoseFactory.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.segment.realtime.firehose; +package org.apache.druid.segment.realtime.firehose; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.net.HttpHeaders; -import io.druid.data.input.FiniteFirehoseFactory; -import io.druid.data.input.InputSplit; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.data.input.impl.prefetch.PrefetchableTextFilesFirehoseFactory; -import io.druid.java.util.common.CompressionUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.data.input.FiniteFirehoseFactory; +import org.apache.druid.data.input.InputSplit; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.data.input.impl.prefetch.PrefetchableTextFilesFirehoseFactory; +import org.apache.druid.java.util.common.CompressionUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; import java.io.IOException; import java.io.InputStream; diff --git a/server/src/main/java/io/druid/segment/realtime/firehose/IngestSegmentFirehose.java b/server/src/main/java/org/apache/druid/segment/realtime/firehose/IngestSegmentFirehose.java similarity index 86% rename from server/src/main/java/io/druid/segment/realtime/firehose/IngestSegmentFirehose.java rename to server/src/main/java/org/apache/druid/segment/realtime/firehose/IngestSegmentFirehose.java index 2c390a1ffb0e..f74a2cf12b66 100644 --- a/server/src/main/java/io/druid/segment/realtime/firehose/IngestSegmentFirehose.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/firehose/IngestSegmentFirehose.java @@ -17,34 +17,34 @@ * under the License. */ -package io.druid.segment.realtime.firehose; +package org.apache.druid.segment.realtime.firehose; import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; -import io.druid.data.input.Firehose; -import io.druid.data.input.InputRow; -import io.druid.data.input.MapBasedInputRow; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.common.guava.Yielder; -import io.druid.java.util.common.guava.Yielders; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.filter.DimFilter; -import io.druid.query.select.EventHolder; -import io.druid.segment.BaseLongColumnValueSelector; -import io.druid.segment.BaseObjectColumnValueSelector; -import io.druid.segment.Cursor; -import io.druid.segment.DimensionSelector; -import io.druid.segment.VirtualColumns; -import io.druid.segment.column.Column; -import io.druid.segment.data.IndexedInts; -import io.druid.segment.filter.Filters; -import io.druid.segment.transform.TransformSpec; -import io.druid.segment.transform.Transformer; -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.MapBasedInputRow; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.guava.Yielder; +import org.apache.druid.java.util.common.guava.Yielders; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.select.EventHolder; +import org.apache.druid.segment.BaseLongColumnValueSelector; +import org.apache.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.segment.Cursor; +import org.apache.druid.segment.DimensionSelector; +import org.apache.druid.segment.VirtualColumns; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.data.IndexedInts; +import org.apache.druid.segment.filter.Filters; +import org.apache.druid.segment.transform.TransformSpec; +import org.apache.druid.segment.transform.Transformer; +import org.apache.druid.utils.Runnables; import javax.annotation.Nullable; import java.io.IOException; diff --git a/server/src/main/java/io/druid/segment/realtime/firehose/IrcDecoder.java b/server/src/main/java/org/apache/druid/segment/realtime/firehose/IrcDecoder.java similarity index 92% rename from server/src/main/java/io/druid/segment/realtime/firehose/IrcDecoder.java rename to server/src/main/java/org/apache/druid/segment/realtime/firehose/IrcDecoder.java index 3265d116084e..59a8ddea0582 100644 --- a/server/src/main/java/io/druid/segment/realtime/firehose/IrcDecoder.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/firehose/IrcDecoder.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment.realtime.firehose; +package org.apache.druid.segment.realtime.firehose; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.druid.data.input.InputRow; +import org.apache.druid.data.input.InputRow; import org.joda.time.DateTime; @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type") diff --git a/server/src/main/java/io/druid/segment/realtime/firehose/IrcFirehoseFactory.java b/server/src/main/java/org/apache/druid/segment/realtime/firehose/IrcFirehoseFactory.java similarity index 94% rename from server/src/main/java/io/druid/segment/realtime/firehose/IrcFirehoseFactory.java rename to server/src/main/java/org/apache/druid/segment/realtime/firehose/IrcFirehoseFactory.java index 2e117370a921..87211b6fff48 100644 --- a/server/src/main/java/io/druid/segment/realtime/firehose/IrcFirehoseFactory.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/firehose/IrcFirehoseFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.realtime.firehose; +package org.apache.druid.segment.realtime.firehose; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -30,13 +30,13 @@ import com.ircclouds.irc.api.domain.messages.ChannelPrivMsg; import com.ircclouds.irc.api.listeners.VariousMessageListenerAdapter; import com.ircclouds.irc.api.state.IIRCState; -import io.druid.data.input.Firehose; -import io.druid.data.input.FirehoseFactory; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.InputRowParser; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Pair; -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.InputRow; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.logger.Logger; import org.joda.time.DateTime; import javax.annotation.Nullable; diff --git a/server/src/main/java/io/druid/segment/realtime/firehose/IrcInputRowParser.java b/server/src/main/java/org/apache/druid/segment/realtime/firehose/IrcInputRowParser.java similarity index 91% rename from server/src/main/java/io/druid/segment/realtime/firehose/IrcInputRowParser.java rename to server/src/main/java/org/apache/druid/segment/realtime/firehose/IrcInputRowParser.java index 78d498e8cea8..c8490197d70c 100644 --- a/server/src/main/java/io/druid/segment/realtime/firehose/IrcInputRowParser.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/firehose/IrcInputRowParser.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.segment.realtime.firehose; +package org.apache.druid.segment.realtime.firehose; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.collect.ImmutableList; import com.ircclouds.irc.api.domain.messages.ChannelPrivMsg; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.ParseSpec; -import io.druid.java.util.common.Pair; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.ParseSpec; +import org.apache.druid.java.util.common.Pair; import org.joda.time.DateTime; import java.util.List; diff --git a/server/src/main/java/io/druid/segment/realtime/firehose/LocalFirehoseFactory.java b/server/src/main/java/org/apache/druid/segment/realtime/firehose/LocalFirehoseFactory.java similarity index 88% rename from server/src/main/java/io/druid/segment/realtime/firehose/LocalFirehoseFactory.java rename to server/src/main/java/org/apache/druid/segment/realtime/firehose/LocalFirehoseFactory.java index 6f4bbd946b5b..2613da1d9638 100644 --- a/server/src/main/java/io/druid/segment/realtime/firehose/LocalFirehoseFactory.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/firehose/LocalFirehoseFactory.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.segment.realtime.firehose; +package org.apache.druid.segment.realtime.firehose; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.data.input.FiniteFirehoseFactory; -import io.druid.data.input.InputSplit; -import io.druid.data.input.impl.AbstractTextFilesFirehoseFactory; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.java.util.common.CompressionUtils; -import io.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.data.input.FiniteFirehoseFactory; +import org.apache.druid.data.input.InputSplit; +import org.apache.druid.data.input.impl.AbstractTextFilesFirehoseFactory; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.java.util.common.CompressionUtils; +import org.apache.druid.java.util.emitter.EmittingLogger; import org.apache.commons.io.FileUtils; import org.apache.commons.io.filefilter.TrueFileFilter; import org.apache.commons.io.filefilter.WildcardFileFilter; diff --git a/server/src/main/java/io/druid/segment/realtime/firehose/NoopChatHandlerProvider.java b/server/src/main/java/org/apache/druid/segment/realtime/firehose/NoopChatHandlerProvider.java similarity index 96% rename from server/src/main/java/io/druid/segment/realtime/firehose/NoopChatHandlerProvider.java rename to server/src/main/java/org/apache/druid/segment/realtime/firehose/NoopChatHandlerProvider.java index 70775bd30b6f..5c49b9ac292e 100644 --- a/server/src/main/java/io/druid/segment/realtime/firehose/NoopChatHandlerProvider.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/firehose/NoopChatHandlerProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.realtime.firehose; +package org.apache.druid.segment.realtime.firehose; import com.google.common.base.Optional; diff --git a/server/src/main/java/io/druid/segment/realtime/firehose/PredicateFirehose.java b/server/src/main/java/org/apache/druid/segment/realtime/firehose/PredicateFirehose.java similarity index 92% rename from server/src/main/java/io/druid/segment/realtime/firehose/PredicateFirehose.java rename to server/src/main/java/org/apache/druid/segment/realtime/firehose/PredicateFirehose.java index b784d4c2cbee..fa00a57547a5 100644 --- a/server/src/main/java/io/druid/segment/realtime/firehose/PredicateFirehose.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/firehose/PredicateFirehose.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.segment.realtime.firehose; +package org.apache.druid.segment.realtime.firehose; import com.google.common.base.Predicate; -import io.druid.data.input.Firehose; -import io.druid.data.input.InputRow; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.data.input.Firehose; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.java.util.common.logger.Logger; import javax.annotation.Nullable; import java.io.IOException; diff --git a/server/src/main/java/io/druid/segment/realtime/firehose/ServiceAnnouncingChatHandlerProvider.java b/server/src/main/java/org/apache/druid/segment/realtime/firehose/ServiceAnnouncingChatHandlerProvider.java similarity index 91% rename from server/src/main/java/io/druid/segment/realtime/firehose/ServiceAnnouncingChatHandlerProvider.java rename to server/src/main/java/org/apache/druid/segment/realtime/firehose/ServiceAnnouncingChatHandlerProvider.java index 5ba9aa8e5793..f40fd1b40ce6 100644 --- a/server/src/main/java/io/druid/segment/realtime/firehose/ServiceAnnouncingChatHandlerProvider.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/firehose/ServiceAnnouncingChatHandlerProvider.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.segment.realtime.firehose; +package org.apache.druid.segment.realtime.firehose; import com.google.common.base.Optional; import com.google.inject.Inject; -import io.druid.curator.discovery.ServiceAnnouncer; -import io.druid.guice.annotations.RemoteChatHandler; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.DruidNode; -import io.druid.server.initialization.ServerConfig; +import org.apache.druid.curator.discovery.ServiceAnnouncer; +import org.apache.druid.guice.annotations.RemoteChatHandler; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.initialization.ServerConfig; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; diff --git a/server/src/main/java/io/druid/segment/realtime/firehose/SqlFirehoseFactory.java b/server/src/main/java/org/apache/druid/segment/realtime/firehose/SqlFirehoseFactory.java similarity index 94% rename from server/src/main/java/io/druid/segment/realtime/firehose/SqlFirehoseFactory.java rename to server/src/main/java/org/apache/druid/segment/realtime/firehose/SqlFirehoseFactory.java index b28329095669..74f28f61e906 100644 --- a/server/src/main/java/io/druid/segment/realtime/firehose/SqlFirehoseFactory.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/firehose/SqlFirehoseFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.segment.realtime.firehose; +package org.apache.druid.segment.realtime.firehose; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; @@ -25,11 +25,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; -import io.druid.data.input.impl.prefetch.PrefetchSqlFirehoseFactory; -import io.druid.guice.annotations.Smile; -import io.druid.java.util.common.StringUtils; -import io.druid.metadata.MetadataStorageConnectorConfig; -import io.druid.metadata.SQLFirehoseDatabaseConnector; +import org.apache.druid.data.input.impl.prefetch.PrefetchSqlFirehoseFactory; +import org.apache.druid.guice.annotations.Smile; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.metadata.MetadataStorageConnectorConfig; +import org.apache.druid.metadata.SQLFirehoseDatabaseConnector; import org.skife.jdbi.v2.ResultIterator; import org.skife.jdbi.v2.exceptions.CallbackFailedException; import org.skife.jdbi.v2.exceptions.ResultSetException; diff --git a/server/src/main/java/io/druid/segment/realtime/firehose/TimedShutoffFirehoseFactory.java b/server/src/main/java/org/apache/druid/segment/realtime/firehose/TimedShutoffFirehoseFactory.java similarity index 91% rename from server/src/main/java/io/druid/segment/realtime/firehose/TimedShutoffFirehoseFactory.java rename to server/src/main/java/org/apache/druid/segment/realtime/firehose/TimedShutoffFirehoseFactory.java index 262c3ff106b8..47ec280c545e 100644 --- a/server/src/main/java/io/druid/segment/realtime/firehose/TimedShutoffFirehoseFactory.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/firehose/TimedShutoffFirehoseFactory.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.segment.realtime.firehose; +package org.apache.druid.segment.realtime.firehose; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.data.input.Firehose; -import io.druid.data.input.FirehoseFactory; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.InputRowParser; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.data.input.Firehose; +import org.apache.druid.data.input.FirehoseFactory; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.InputRowParser; import org.joda.time.DateTime; import javax.annotation.Nullable; diff --git a/server/src/main/java/io/druid/segment/realtime/firehose/WikipediaIrcDecoder.java b/server/src/main/java/org/apache/druid/segment/realtime/firehose/WikipediaIrcDecoder.java similarity index 97% rename from server/src/main/java/io/druid/segment/realtime/firehose/WikipediaIrcDecoder.java rename to server/src/main/java/org/apache/druid/segment/realtime/firehose/WikipediaIrcDecoder.java index 52d63d37d1b5..983a17ec8f25 100644 --- a/server/src/main/java/io/druid/segment/realtime/firehose/WikipediaIrcDecoder.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/firehose/WikipediaIrcDecoder.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.realtime.firehose; +package org.apache.druid.segment.realtime.firehose; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -28,9 +28,9 @@ import com.maxmind.geoip2.exception.GeoIp2Exception; import com.maxmind.geoip2.model.Omni; -import io.druid.data.input.InputRow; -import io.druid.data.input.Row; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.java.util.common.logger.Logger; import org.apache.commons.io.FileUtils; import org.joda.time.DateTime; diff --git a/server/src/main/java/io/druid/segment/realtime/firehose/WindowedStorageAdapter.java b/server/src/main/java/org/apache/druid/segment/realtime/firehose/WindowedStorageAdapter.java similarity index 93% rename from server/src/main/java/io/druid/segment/realtime/firehose/WindowedStorageAdapter.java rename to server/src/main/java/org/apache/druid/segment/realtime/firehose/WindowedStorageAdapter.java index 189f95e0e174..26d0b41013da 100644 --- a/server/src/main/java/io/druid/segment/realtime/firehose/WindowedStorageAdapter.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/firehose/WindowedStorageAdapter.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.realtime.firehose; +package org.apache.druid.segment.realtime.firehose; -import io.druid.segment.StorageAdapter; +import org.apache.druid.segment.StorageAdapter; import org.joda.time.Interval; public class WindowedStorageAdapter diff --git a/server/src/main/java/io/druid/segment/realtime/plumber/Committers.java b/server/src/main/java/org/apache/druid/segment/realtime/plumber/Committers.java similarity index 92% rename from server/src/main/java/io/druid/segment/realtime/plumber/Committers.java rename to server/src/main/java/org/apache/druid/segment/realtime/plumber/Committers.java index 5885c23de7d3..1cf12d908316 100644 --- a/server/src/main/java/io/druid/segment/realtime/plumber/Committers.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/plumber/Committers.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.segment.realtime.plumber; +package org.apache.druid.segment.realtime.plumber; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; -import io.druid.data.input.Committer; -import io.druid.data.input.Firehose; -import io.druid.data.input.FirehoseV2; +import org.apache.druid.data.input.Committer; +import org.apache.druid.data.input.Firehose; +import org.apache.druid.data.input.FirehoseV2; public class Committers { diff --git a/server/src/main/java/io/druid/segment/realtime/plumber/CoordinatorBasedSegmentHandoffNotifier.java b/server/src/main/java/org/apache/druid/segment/realtime/plumber/CoordinatorBasedSegmentHandoffNotifier.java similarity index 92% rename from server/src/main/java/io/druid/segment/realtime/plumber/CoordinatorBasedSegmentHandoffNotifier.java rename to server/src/main/java/org/apache/druid/segment/realtime/plumber/CoordinatorBasedSegmentHandoffNotifier.java index 3d17538b1ad9..4b6a5182dc9e 100644 --- a/server/src/main/java/io/druid/segment/realtime/plumber/CoordinatorBasedSegmentHandoffNotifier.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/plumber/CoordinatorBasedSegmentHandoffNotifier.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.segment.realtime.plumber; +package org.apache.druid.segment.realtime.plumber; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; -import io.druid.client.ImmutableSegmentLoadInfo; -import io.druid.client.coordinator.CoordinatorClient; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.SegmentDescriptor; -import io.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.client.ImmutableSegmentLoadInfo; +import org.apache.druid.client.coordinator.CoordinatorClient; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.SegmentDescriptor; +import org.apache.druid.server.coordination.DruidServerMetadata; import java.util.Iterator; import java.util.List; diff --git a/server/src/main/java/io/druid/segment/realtime/plumber/CoordinatorBasedSegmentHandoffNotifierConfig.java b/server/src/main/java/org/apache/druid/segment/realtime/plumber/CoordinatorBasedSegmentHandoffNotifierConfig.java similarity index 95% rename from server/src/main/java/io/druid/segment/realtime/plumber/CoordinatorBasedSegmentHandoffNotifierConfig.java rename to server/src/main/java/org/apache/druid/segment/realtime/plumber/CoordinatorBasedSegmentHandoffNotifierConfig.java index 37175e25d89b..285a4929d0d3 100644 --- a/server/src/main/java/io/druid/segment/realtime/plumber/CoordinatorBasedSegmentHandoffNotifierConfig.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/plumber/CoordinatorBasedSegmentHandoffNotifierConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.realtime.plumber; +package org.apache.druid.segment.realtime.plumber; import com.fasterxml.jackson.annotation.JsonProperty; import org.joda.time.Duration; diff --git a/server/src/main/java/io/druid/segment/realtime/plumber/CoordinatorBasedSegmentHandoffNotifierFactory.java b/server/src/main/java/org/apache/druid/segment/realtime/plumber/CoordinatorBasedSegmentHandoffNotifierFactory.java similarity index 92% rename from server/src/main/java/io/druid/segment/realtime/plumber/CoordinatorBasedSegmentHandoffNotifierFactory.java rename to server/src/main/java/org/apache/druid/segment/realtime/plumber/CoordinatorBasedSegmentHandoffNotifierFactory.java index a494b7b662f0..d92bea767526 100644 --- a/server/src/main/java/io/druid/segment/realtime/plumber/CoordinatorBasedSegmentHandoffNotifierFactory.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/plumber/CoordinatorBasedSegmentHandoffNotifierFactory.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.realtime.plumber; +package org.apache.druid.segment.realtime.plumber; import com.google.inject.Inject; -import io.druid.client.coordinator.CoordinatorClient; +import org.apache.druid.client.coordinator.CoordinatorClient; public class CoordinatorBasedSegmentHandoffNotifierFactory implements SegmentHandoffNotifierFactory { diff --git a/server/src/main/java/io/druid/segment/realtime/plumber/CustomVersioningPolicy.java b/server/src/main/java/org/apache/druid/segment/realtime/plumber/CustomVersioningPolicy.java similarity index 93% rename from server/src/main/java/io/druid/segment/realtime/plumber/CustomVersioningPolicy.java rename to server/src/main/java/org/apache/druid/segment/realtime/plumber/CustomVersioningPolicy.java index 6b7dbcbe53ee..1974dcec4731 100644 --- a/server/src/main/java/io/druid/segment/realtime/plumber/CustomVersioningPolicy.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/plumber/CustomVersioningPolicy.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment.realtime.plumber; +package org.apache.druid.segment.realtime.plumber; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.DateTimes; import org.joda.time.Interval; /** diff --git a/server/src/main/java/io/druid/segment/realtime/plumber/FlushingPlumber.java b/server/src/main/java/org/apache/druid/segment/realtime/plumber/FlushingPlumber.java similarity index 85% rename from server/src/main/java/io/druid/segment/realtime/plumber/FlushingPlumber.java rename to server/src/main/java/org/apache/druid/segment/realtime/plumber/FlushingPlumber.java index 2bdf3a3dba03..ceecde5d040e 100644 --- a/server/src/main/java/io/druid/segment/realtime/plumber/FlushingPlumber.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/plumber/FlushingPlumber.java @@ -17,28 +17,28 @@ * under the License. */ -package io.druid.segment.realtime.plumber; +package org.apache.druid.segment.realtime.plumber; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Lists; -import io.druid.client.cache.Cache; -import io.druid.client.cache.CacheConfig; -import io.druid.client.cache.CachePopulatorStats; -import io.druid.common.guava.ThreadRenamingCallable; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.concurrent.ScheduledExecutors; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.query.QueryRunnerFactoryConglomerate; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMerger; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.RealtimeTuningConfig; -import io.druid.segment.realtime.FireDepartmentMetrics; -import io.druid.server.coordination.DataSegmentAnnouncer; +import org.apache.druid.client.cache.Cache; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.client.cache.CachePopulatorStats; +import org.apache.druid.common.guava.ThreadRenamingCallable; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.concurrent.ScheduledExecutors; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.query.QueryRunnerFactoryConglomerate; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMerger; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.RealtimeTuningConfig; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.server.coordination.DataSegmentAnnouncer; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/server/src/main/java/io/druid/segment/realtime/plumber/FlushingPlumberSchool.java b/server/src/main/java/org/apache/druid/segment/realtime/plumber/FlushingPlumberSchool.java similarity index 85% rename from server/src/main/java/io/druid/segment/realtime/plumber/FlushingPlumberSchool.java rename to server/src/main/java/org/apache/druid/segment/realtime/plumber/FlushingPlumberSchool.java index 244b2f09febb..1c7d9827d844 100644 --- a/server/src/main/java/io/druid/segment/realtime/plumber/FlushingPlumberSchool.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/plumber/FlushingPlumberSchool.java @@ -17,25 +17,25 @@ * under the License. */ -package io.druid.segment.realtime.plumber; +package org.apache.druid.segment.realtime.plumber; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; -import io.druid.client.cache.Cache; -import io.druid.client.cache.CacheConfig; -import io.druid.client.cache.CachePopulatorStats; -import io.druid.guice.annotations.Processing; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.query.QueryRunnerFactoryConglomerate; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMergerV9; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.RealtimeTuningConfig; -import io.druid.segment.realtime.FireDepartmentMetrics; -import io.druid.server.coordination.DataSegmentAnnouncer; +import org.apache.druid.client.cache.Cache; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.client.cache.CachePopulatorStats; +import org.apache.druid.guice.annotations.Processing; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.query.QueryRunnerFactoryConglomerate; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMergerV9; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.RealtimeTuningConfig; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.server.coordination.DataSegmentAnnouncer; import org.joda.time.Duration; import java.util.concurrent.ExecutorService; diff --git a/server/src/main/java/io/druid/segment/realtime/plumber/IntervalStartVersioningPolicy.java b/server/src/main/java/org/apache/druid/segment/realtime/plumber/IntervalStartVersioningPolicy.java similarity index 95% rename from server/src/main/java/io/druid/segment/realtime/plumber/IntervalStartVersioningPolicy.java rename to server/src/main/java/org/apache/druid/segment/realtime/plumber/IntervalStartVersioningPolicy.java index fd5eb99b39a2..e343d4fe0dfa 100644 --- a/server/src/main/java/io/druid/segment/realtime/plumber/IntervalStartVersioningPolicy.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/plumber/IntervalStartVersioningPolicy.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.realtime.plumber; +package org.apache.druid.segment.realtime.plumber; import org.joda.time.Interval; diff --git a/server/src/main/java/io/druid/segment/realtime/plumber/MessageTimeRejectionPolicyFactory.java b/server/src/main/java/org/apache/druid/segment/realtime/plumber/MessageTimeRejectionPolicyFactory.java similarity index 92% rename from server/src/main/java/io/druid/segment/realtime/plumber/MessageTimeRejectionPolicyFactory.java rename to server/src/main/java/org/apache/druid/segment/realtime/plumber/MessageTimeRejectionPolicyFactory.java index f8caee6f2886..76530494667a 100644 --- a/server/src/main/java/io/druid/segment/realtime/plumber/MessageTimeRejectionPolicyFactory.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/plumber/MessageTimeRejectionPolicyFactory.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment.realtime.plumber; +package org.apache.druid.segment.realtime.plumber; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.JodaUtils; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.JodaUtils; +import org.apache.druid.java.util.common.StringUtils; import org.joda.time.DateTime; import org.joda.time.Period; diff --git a/server/src/main/java/io/druid/segment/realtime/plumber/NoopRejectionPolicyFactory.java b/server/src/main/java/org/apache/druid/segment/realtime/plumber/NoopRejectionPolicyFactory.java similarity index 92% rename from server/src/main/java/io/druid/segment/realtime/plumber/NoopRejectionPolicyFactory.java rename to server/src/main/java/org/apache/druid/segment/realtime/plumber/NoopRejectionPolicyFactory.java index 720216f358db..6acce9abaa3a 100644 --- a/server/src/main/java/io/druid/segment/realtime/plumber/NoopRejectionPolicyFactory.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/plumber/NoopRejectionPolicyFactory.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.realtime.plumber; +package org.apache.druid.segment.realtime.plumber; -import io.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.DateTimes; import org.joda.time.DateTime; import org.joda.time.Period; diff --git a/server/src/main/java/io/druid/segment/realtime/plumber/NoopSegmentHandoffNotifierFactory.java b/server/src/main/java/org/apache/druid/segment/realtime/plumber/NoopSegmentHandoffNotifierFactory.java similarity index 91% rename from server/src/main/java/io/druid/segment/realtime/plumber/NoopSegmentHandoffNotifierFactory.java rename to server/src/main/java/org/apache/druid/segment/realtime/plumber/NoopSegmentHandoffNotifierFactory.java index 3d97aba3d81c..7f13e89ac7cf 100644 --- a/server/src/main/java/io/druid/segment/realtime/plumber/NoopSegmentHandoffNotifierFactory.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/plumber/NoopSegmentHandoffNotifierFactory.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.realtime.plumber; +package org.apache.druid.segment.realtime.plumber; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.SegmentDescriptor; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.SegmentDescriptor; import java.util.concurrent.Executor; diff --git a/server/src/main/java/io/druid/segment/realtime/plumber/Plumber.java b/server/src/main/java/org/apache/druid/segment/realtime/plumber/Plumber.java similarity index 87% rename from server/src/main/java/io/druid/segment/realtime/plumber/Plumber.java rename to server/src/main/java/org/apache/druid/segment/realtime/plumber/Plumber.java index 6be8291f8714..d81f485d3100 100644 --- a/server/src/main/java/io/druid/segment/realtime/plumber/Plumber.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/plumber/Plumber.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.segment.realtime.plumber; +package org.apache.druid.segment.realtime.plumber; import com.google.common.base.Supplier; -import io.druid.data.input.Committer; -import io.druid.data.input.InputRow; -import io.druid.query.Query; -import io.druid.query.QueryRunner; -import io.druid.segment.incremental.IncrementalIndexAddResult; -import io.druid.segment.incremental.IndexSizeExceededException; +import org.apache.druid.data.input.Committer; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.segment.incremental.IncrementalIndexAddResult; +import org.apache.druid.segment.incremental.IndexSizeExceededException; public interface Plumber { diff --git a/server/src/main/java/io/druid/segment/realtime/plumber/PlumberSchool.java b/server/src/main/java/org/apache/druid/segment/realtime/plumber/PlumberSchool.java similarity index 86% rename from server/src/main/java/io/druid/segment/realtime/plumber/PlumberSchool.java rename to server/src/main/java/org/apache/druid/segment/realtime/plumber/PlumberSchool.java index c0ff65dc4e50..849d5dbb1844 100644 --- a/server/src/main/java/io/druid/segment/realtime/plumber/PlumberSchool.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/plumber/PlumberSchool.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.segment.realtime.plumber; +package org.apache.druid.segment.realtime.plumber; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.RealtimeTuningConfig; -import io.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.RealtimeTuningConfig; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; /** */ diff --git a/server/src/main/java/io/druid/segment/realtime/plumber/Plumbers.java b/server/src/main/java/org/apache/druid/segment/realtime/plumber/Plumbers.java similarity index 81% rename from server/src/main/java/io/druid/segment/realtime/plumber/Plumbers.java rename to server/src/main/java/org/apache/druid/segment/realtime/plumber/Plumbers.java index 447cfb47937b..f0a88f89950a 100644 --- a/server/src/main/java/io/druid/segment/realtime/plumber/Plumbers.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/plumber/Plumbers.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.segment.realtime.plumber; +package org.apache.druid.segment.realtime.plumber; import com.google.common.base.Supplier; -import io.druid.data.input.Committer; -import io.druid.data.input.Firehose; -import io.druid.data.input.InputRow; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.common.parsers.ParseException; -import io.druid.segment.incremental.IncrementalIndexAddResult; -import io.druid.segment.incremental.IndexSizeExceededException; -import io.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.data.input.Committer; +import org.apache.druid.data.input.Firehose; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.parsers.ParseException; +import org.apache.druid.segment.incremental.IncrementalIndexAddResult; +import org.apache.druid.segment.incremental.IndexSizeExceededException; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; public class Plumbers { diff --git a/server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumber.java b/server/src/main/java/org/apache/druid/segment/realtime/plumber/RealtimePlumber.java similarity index 93% rename from server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumber.java rename to server/src/main/java/org/apache/druid/segment/realtime/plumber/RealtimePlumber.java index bfef2c623cb5..5d9e6222e20c 100644 --- a/server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumber.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/plumber/RealtimePlumber.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.realtime.plumber; +package org.apache.druid.segment.realtime.plumber; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Function; @@ -30,52 +30,52 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.primitives.Ints; -import io.druid.client.cache.Cache; -import io.druid.client.cache.CacheConfig; -import io.druid.client.cache.CachePopulatorStats; -import io.druid.common.guava.ThreadRenamingCallable; -import io.druid.common.guava.ThreadRenamingRunnable; -import io.druid.common.utils.VMUtils; -import io.druid.concurrent.TaskThreadPriority; -import io.druid.data.input.Committer; -import io.druid.data.input.InputRow; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.concurrent.ScheduledExecutors; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.query.Query; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactoryConglomerate; -import io.druid.query.QuerySegmentWalker; -import io.druid.query.SegmentDescriptor; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMerger; -import io.druid.segment.IndexSpec; -import io.druid.segment.Metadata; -import io.druid.segment.QueryableIndex; -import io.druid.segment.QueryableIndexSegment; -import io.druid.segment.Segment; -import io.druid.segment.incremental.IncrementalIndexAddResult; -import io.druid.segment.incremental.IndexSizeExceededException; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.RealtimeTuningConfig; -import io.druid.segment.indexing.TuningConfigs; -import io.druid.segment.loading.DataSegmentPusher; -import io.druid.segment.realtime.FireDepartmentMetrics; -import io.druid.segment.realtime.FireHydrant; -import io.druid.segment.realtime.SegmentPublisher; -import io.druid.segment.realtime.appenderator.SinkQuerySegmentWalker; -import io.druid.server.coordination.DataSegmentAnnouncer; -import io.druid.timeline.DataSegment; -import io.druid.timeline.VersionedIntervalTimeline; -import io.druid.timeline.partition.SingleElementPartitionChunk; +import org.apache.druid.client.cache.Cache; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.client.cache.CachePopulatorStats; +import org.apache.druid.common.guava.ThreadRenamingCallable; +import org.apache.druid.common.guava.ThreadRenamingRunnable; +import org.apache.druid.common.utils.VMUtils; +import org.apache.druid.concurrent.TaskThreadPriority; +import org.apache.druid.data.input.Committer; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.concurrent.ScheduledExecutors; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactoryConglomerate; +import org.apache.druid.query.QuerySegmentWalker; +import org.apache.druid.query.SegmentDescriptor; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMerger; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.Metadata; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.QueryableIndexSegment; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.incremental.IncrementalIndexAddResult; +import org.apache.druid.segment.incremental.IndexSizeExceededException; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.RealtimeTuningConfig; +import org.apache.druid.segment.indexing.TuningConfigs; +import org.apache.druid.segment.loading.DataSegmentPusher; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.segment.realtime.FireHydrant; +import org.apache.druid.segment.realtime.SegmentPublisher; +import org.apache.druid.segment.realtime.appenderator.SinkQuerySegmentWalker; +import org.apache.druid.server.coordination.DataSegmentAnnouncer; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.timeline.partition.SingleElementPartitionChunk; import org.apache.commons.io.FileUtils; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumberSchool.java b/server/src/main/java/org/apache/druid/segment/realtime/plumber/RealtimePlumberSchool.java similarity index 84% rename from server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumberSchool.java rename to server/src/main/java/org/apache/druid/segment/realtime/plumber/RealtimePlumberSchool.java index 6ad7acadb32a..863fa58c2739 100644 --- a/server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumberSchool.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/plumber/RealtimePlumberSchool.java @@ -17,26 +17,26 @@ * under the License. */ -package io.druid.segment.realtime.plumber; +package org.apache.druid.segment.realtime.plumber; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; -import io.druid.client.cache.Cache; -import io.druid.client.cache.CacheConfig; -import io.druid.client.cache.CachePopulatorStats; -import io.druid.guice.annotations.Processing; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.query.QueryRunnerFactoryConglomerate; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMergerV9; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.RealtimeTuningConfig; -import io.druid.segment.loading.DataSegmentPusher; -import io.druid.segment.realtime.FireDepartmentMetrics; -import io.druid.segment.realtime.SegmentPublisher; -import io.druid.server.coordination.DataSegmentAnnouncer; +import org.apache.druid.client.cache.Cache; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.client.cache.CachePopulatorStats; +import org.apache.druid.guice.annotations.Processing; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.query.QueryRunnerFactoryConglomerate; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMergerV9; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.RealtimeTuningConfig; +import org.apache.druid.segment.loading.DataSegmentPusher; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.segment.realtime.SegmentPublisher; +import org.apache.druid.server.coordination.DataSegmentAnnouncer; import java.util.concurrent.ExecutorService; diff --git a/server/src/main/java/io/druid/segment/realtime/plumber/RejectionPolicy.java b/server/src/main/java/org/apache/druid/segment/realtime/plumber/RejectionPolicy.java similarity index 94% rename from server/src/main/java/io/druid/segment/realtime/plumber/RejectionPolicy.java rename to server/src/main/java/org/apache/druid/segment/realtime/plumber/RejectionPolicy.java index d985bbb63cfd..e1dd6185befc 100644 --- a/server/src/main/java/io/druid/segment/realtime/plumber/RejectionPolicy.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/plumber/RejectionPolicy.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.realtime.plumber; +package org.apache.druid.segment.realtime.plumber; import org.joda.time.DateTime; diff --git a/server/src/main/java/io/druid/segment/realtime/plumber/RejectionPolicyFactory.java b/server/src/main/java/org/apache/druid/segment/realtime/plumber/RejectionPolicyFactory.java similarity index 96% rename from server/src/main/java/io/druid/segment/realtime/plumber/RejectionPolicyFactory.java rename to server/src/main/java/org/apache/druid/segment/realtime/plumber/RejectionPolicyFactory.java index aa2166e36f89..f9b559f179d9 100644 --- a/server/src/main/java/io/druid/segment/realtime/plumber/RejectionPolicyFactory.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/plumber/RejectionPolicyFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.realtime.plumber; +package org.apache.druid.segment.realtime.plumber; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/server/src/main/java/io/druid/segment/realtime/plumber/SegmentHandoffNotifier.java b/server/src/main/java/org/apache/druid/segment/realtime/plumber/SegmentHandoffNotifier.java similarity index 94% rename from server/src/main/java/io/druid/segment/realtime/plumber/SegmentHandoffNotifier.java rename to server/src/main/java/org/apache/druid/segment/realtime/plumber/SegmentHandoffNotifier.java index 0d2617084969..9c77b1f07fcc 100644 --- a/server/src/main/java/io/druid/segment/realtime/plumber/SegmentHandoffNotifier.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/plumber/SegmentHandoffNotifier.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.realtime.plumber; +package org.apache.druid.segment.realtime.plumber; -import io.druid.query.SegmentDescriptor; +import org.apache.druid.query.SegmentDescriptor; import java.io.Closeable; import java.util.concurrent.Executor; diff --git a/server/src/main/java/io/druid/segment/realtime/plumber/SegmentHandoffNotifierFactory.java b/server/src/main/java/org/apache/druid/segment/realtime/plumber/SegmentHandoffNotifierFactory.java similarity index 94% rename from server/src/main/java/io/druid/segment/realtime/plumber/SegmentHandoffNotifierFactory.java rename to server/src/main/java/org/apache/druid/segment/realtime/plumber/SegmentHandoffNotifierFactory.java index a027ccad011d..96aeb5fcd3a9 100644 --- a/server/src/main/java/io/druid/segment/realtime/plumber/SegmentHandoffNotifierFactory.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/plumber/SegmentHandoffNotifierFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.realtime.plumber; +package org.apache.druid.segment.realtime.plumber; public interface SegmentHandoffNotifierFactory diff --git a/server/src/main/java/io/druid/segment/realtime/plumber/ServerTimeRejectionPolicyFactory.java b/server/src/main/java/org/apache/druid/segment/realtime/plumber/ServerTimeRejectionPolicyFactory.java similarity index 91% rename from server/src/main/java/io/druid/segment/realtime/plumber/ServerTimeRejectionPolicyFactory.java rename to server/src/main/java/org/apache/druid/segment/realtime/plumber/ServerTimeRejectionPolicyFactory.java index ae962002c05c..9cbd2cca23fd 100644 --- a/server/src/main/java/io/druid/segment/realtime/plumber/ServerTimeRejectionPolicyFactory.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/plumber/ServerTimeRejectionPolicyFactory.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.realtime.plumber; +package org.apache.druid.segment.realtime.plumber; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.StringUtils; import org.joda.time.DateTime; import org.joda.time.Period; diff --git a/server/src/main/java/io/druid/segment/realtime/plumber/Sink.java b/server/src/main/java/org/apache/druid/segment/realtime/plumber/Sink.java similarity index 92% rename from server/src/main/java/io/druid/segment/realtime/plumber/Sink.java rename to server/src/main/java/org/apache/druid/segment/realtime/plumber/Sink.java index 78e86944ec4c..e2f66f675d29 100644 --- a/server/src/main/java/io/druid/segment/realtime/plumber/Sink.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/plumber/Sink.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.realtime.plumber; +package org.apache.druid.segment.realtime.plumber; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -26,21 +26,21 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import io.druid.data.input.InputRow; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.segment.QueryableIndex; -import io.druid.segment.ReferenceCountingSegment; -import io.druid.segment.column.ColumnCapabilitiesImpl; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexAddResult; -import io.druid.segment.incremental.IncrementalIndexSchema; -import io.druid.segment.incremental.IndexSizeExceededException; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.realtime.FireHydrant; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.ShardSpec; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.ReferenceCountingSegment; +import org.apache.druid.segment.column.ColumnCapabilitiesImpl; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexAddResult; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.segment.incremental.IndexSizeExceededException; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.realtime.FireHydrant; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.ShardSpec; import org.joda.time.Interval; import javax.annotation.Nullable; diff --git a/server/src/main/java/io/druid/segment/realtime/plumber/VersioningPolicy.java b/server/src/main/java/org/apache/druid/segment/realtime/plumber/VersioningPolicy.java similarity index 96% rename from server/src/main/java/io/druid/segment/realtime/plumber/VersioningPolicy.java rename to server/src/main/java/org/apache/druid/segment/realtime/plumber/VersioningPolicy.java index 00364a4be91b..7d6e539f33a1 100644 --- a/server/src/main/java/io/druid/segment/realtime/plumber/VersioningPolicy.java +++ b/server/src/main/java/org/apache/druid/segment/realtime/plumber/VersioningPolicy.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.realtime.plumber; +package org.apache.druid.segment.realtime.plumber; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/server/src/main/java/io/druid/server/AsyncManagementForwardingServlet.java b/server/src/main/java/org/apache/druid/server/AsyncManagementForwardingServlet.java similarity index 91% rename from server/src/main/java/io/druid/server/AsyncManagementForwardingServlet.java rename to server/src/main/java/org/apache/druid/server/AsyncManagementForwardingServlet.java index ce5ba37603d7..6454da260ea6 100644 --- a/server/src/main/java/io/druid/server/AsyncManagementForwardingServlet.java +++ b/server/src/main/java/org/apache/druid/server/AsyncManagementForwardingServlet.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.server; +package org.apache.druid.server; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; import com.google.inject.Inject; import com.google.inject.Provider; -import io.druid.client.coordinator.Coordinator; -import io.druid.client.indexing.IndexingService; -import io.druid.discovery.DruidLeaderSelector; -import io.druid.guice.annotations.Global; -import io.druid.guice.annotations.Json; -import io.druid.guice.http.DruidHttpClientConfig; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.server.security.AuthConfig; +import org.apache.druid.client.coordinator.Coordinator; +import org.apache.druid.client.indexing.IndexingService; +import org.apache.druid.discovery.DruidLeaderSelector; +import org.apache.druid.guice.annotations.Global; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.guice.http.DruidHttpClientConfig; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.server.security.AuthConfig; import org.apache.http.client.utils.URIBuilder; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.api.Request; @@ -49,8 +49,8 @@ public class AsyncManagementForwardingServlet extends AsyncProxyServlet { private static final EmittingLogger log = new EmittingLogger(AsyncManagementForwardingServlet.class); - private static final String BASE_URI_ATTRIBUTE = "io.druid.proxy.to.base.uri"; - private static final String MODIFIED_PATH_ATTRIBUTE = "io.druid.proxy.to.path"; + private static final String BASE_URI_ATTRIBUTE = "org.apache.druid.proxy.to.base.uri"; + private static final String MODIFIED_PATH_ATTRIBUTE = "org.apache.druid.proxy.to.path"; // These are the typical path conventions for the coordinator and overlord APIs. If we see one of these paths, we will // forward the request with the path unmodified, e.g.: diff --git a/server/src/main/java/io/druid/server/AsyncQueryForwardingServlet.java b/server/src/main/java/org/apache/druid/server/AsyncQueryForwardingServlet.java similarity index 91% rename from server/src/main/java/io/druid/server/AsyncQueryForwardingServlet.java rename to server/src/main/java/org/apache/druid/server/AsyncQueryForwardingServlet.java index 443dc93aa930..fa41ada55632 100644 --- a/server/src/main/java/io/druid/server/AsyncQueryForwardingServlet.java +++ b/server/src/main/java/org/apache/druid/server/AsyncQueryForwardingServlet.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server; +package org.apache.druid.server; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -26,28 +26,28 @@ import com.google.common.collect.ImmutableMap; import com.google.inject.Inject; import com.google.inject.Provider; -import io.druid.client.selector.Server; -import io.druid.guice.annotations.Json; -import io.druid.guice.annotations.Smile; -import io.druid.guice.http.DruidHttpClientConfig; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.jackson.JacksonUtils; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.query.DruidMetrics; -import io.druid.query.GenericQueryMetricsFactory; -import io.druid.query.Query; -import io.druid.query.QueryMetrics; -import io.druid.query.QueryToolChestWarehouse; -import io.druid.server.log.RequestLogger; -import io.druid.server.metrics.QueryCountStatsProvider; -import io.druid.server.router.QueryHostFinder; -import io.druid.server.router.Router; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthenticationResult; -import io.druid.server.security.Authenticator; -import io.druid.server.security.AuthenticatorMapper; +import org.apache.druid.client.selector.Server; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.guice.annotations.Smile; +import org.apache.druid.guice.http.DruidHttpClientConfig; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.query.DruidMetrics; +import org.apache.druid.query.GenericQueryMetricsFactory; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryMetrics; +import org.apache.druid.query.QueryToolChestWarehouse; +import org.apache.druid.server.log.RequestLogger; +import org.apache.druid.server.metrics.QueryCountStatsProvider; +import org.apache.druid.server.router.QueryHostFinder; +import org.apache.druid.server.router.Router; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthenticationResult; +import org.apache.druid.server.security.Authenticator; +import org.apache.druid.server.security.AuthenticatorMapper; import org.apache.http.client.utils.URIBuilder; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.api.Request; @@ -80,11 +80,11 @@ public class AsyncQueryForwardingServlet extends AsyncProxyServlet implements Qu @Deprecated // use SmileMediaTypes.APPLICATION_JACKSON_SMILE private static final String APPLICATION_SMILE = "application/smile"; - private static final String HOST_ATTRIBUTE = "io.druid.proxy.to.host"; - private static final String SCHEME_ATTRIBUTE = "io.druid.proxy.to.host.scheme"; - private static final String QUERY_ATTRIBUTE = "io.druid.proxy.query"; - private static final String AVATICA_QUERY_ATTRIBUTE = "io.druid.proxy.avaticaQuery"; - private static final String OBJECTMAPPER_ATTRIBUTE = "io.druid.proxy.objectMapper"; + private static final String HOST_ATTRIBUTE = "org.apache.druid.proxy.to.host"; + private static final String SCHEME_ATTRIBUTE = "org.apache.druid.proxy.to.host.scheme"; + private static final String QUERY_ATTRIBUTE = "org.apache.druid.proxy.query"; + private static final String AVATICA_QUERY_ATTRIBUTE = "org.apache.druid.proxy.avaticaQuery"; + private static final String OBJECTMAPPER_ATTRIBUTE = "org.apache.druid.proxy.objectMapper"; private static final int CANCELLATION_TIMEOUT_MILLIS = 500; diff --git a/server/src/main/java/io/druid/server/BrokerQueryResource.java b/server/src/main/java/org/apache/druid/server/BrokerQueryResource.java similarity index 86% rename from server/src/main/java/io/druid/server/BrokerQueryResource.java rename to server/src/main/java/org/apache/druid/server/BrokerQueryResource.java index 4b910d6239df..e3354d3ba1c4 100644 --- a/server/src/main/java/io/druid/server/BrokerQueryResource.java +++ b/server/src/main/java/org/apache/druid/server/BrokerQueryResource.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.server; +package org.apache.druid.server; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.jaxrs.smile.SmileMediaTypes; import com.google.inject.Inject; import com.sun.jersey.spi.container.ResourceFilters; -import io.druid.client.ServerViewUtil; -import io.druid.client.TimelineServerView; -import io.druid.guice.annotations.Json; -import io.druid.guice.annotations.Smile; -import io.druid.query.GenericQueryMetricsFactory; -import io.druid.query.Query; -import io.druid.server.http.security.StateResourceFilter; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthorizerMapper; +import org.apache.druid.client.ServerViewUtil; +import org.apache.druid.client.TimelineServerView; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.guice.annotations.Smile; +import org.apache.druid.query.GenericQueryMetricsFactory; +import org.apache.druid.query.Query; +import org.apache.druid.server.http.security.StateResourceFilter; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthorizerMapper; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; diff --git a/server/src/main/java/io/druid/server/ClientInfoResource.java b/server/src/main/java/org/apache/druid/server/ClientInfoResource.java similarity index 88% rename from server/src/main/java/io/druid/server/ClientInfoResource.java rename to server/src/main/java/org/apache/druid/server/ClientInfoResource.java index 16e1eeb775eb..f18799e73fff 100644 --- a/server/src/main/java/io/druid/server/ClientInfoResource.java +++ b/server/src/main/java/org/apache/druid/server/ClientInfoResource.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server; +package org.apache.druid.server; import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; @@ -27,28 +27,28 @@ import com.google.common.collect.Sets; import com.google.inject.Inject; import com.sun.jersey.spi.container.ResourceFilters; -import io.druid.client.DruidDataSource; -import io.druid.client.DruidServer; -import io.druid.client.FilteredServerInventoryView; -import io.druid.client.ServerViewUtil; -import io.druid.client.TimelineServerView; -import io.druid.client.selector.ServerSelector; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.JodaUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.LocatedSegmentDescriptor; -import io.druid.query.TableDataSource; -import io.druid.query.metadata.SegmentMetadataQueryConfig; -import io.druid.server.http.security.DatasourceResourceFilter; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthorizationUtils; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.ResourceAction; -import io.druid.timeline.DataSegment; -import io.druid.timeline.TimelineLookup; -import io.druid.timeline.TimelineObjectHolder; -import io.druid.timeline.partition.PartitionHolder; +import org.apache.druid.client.DruidDataSource; +import org.apache.druid.client.DruidServer; +import org.apache.druid.client.FilteredServerInventoryView; +import org.apache.druid.client.ServerViewUtil; +import org.apache.druid.client.TimelineServerView; +import org.apache.druid.client.selector.ServerSelector; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.JodaUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.LocatedSegmentDescriptor; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.query.metadata.SegmentMetadataQueryConfig; +import org.apache.druid.server.http.security.DatasourceResourceFilter; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthorizationUtils; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.ResourceAction; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.TimelineLookup; +import org.apache.druid.timeline.TimelineObjectHolder; +import org.apache.druid.timeline.partition.PartitionHolder; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/server/src/main/java/io/druid/server/ClientQuerySegmentWalker.java b/server/src/main/java/org/apache/druid/server/ClientQuerySegmentWalker.java similarity index 81% rename from server/src/main/java/io/druid/server/ClientQuerySegmentWalker.java rename to server/src/main/java/org/apache/druid/server/ClientQuerySegmentWalker.java index eb836a2f773a..74cf310a2b3a 100644 --- a/server/src/main/java/io/druid/server/ClientQuerySegmentWalker.java +++ b/server/src/main/java/org/apache/druid/server/ClientQuerySegmentWalker.java @@ -17,27 +17,27 @@ * under the License. */ -package io.druid.server; +package org.apache.druid.server; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.inject.Inject; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.client.CachingClusteredClient; -import io.druid.client.cache.Cache; -import io.druid.client.cache.CacheConfig; -import io.druid.query.FluentQueryRunnerBuilder; -import io.druid.query.PostProcessingOperator; -import io.druid.query.Query; -import io.druid.query.QueryRunner; -import io.druid.query.QuerySegmentWalker; -import io.druid.query.QueryToolChest; -import io.druid.query.QueryToolChestWarehouse; -import io.druid.query.ResultLevelCachingQueryRunner; -import io.druid.query.RetryQueryRunner; -import io.druid.query.RetryQueryRunnerConfig; -import io.druid.query.SegmentDescriptor; -import io.druid.server.initialization.ServerConfig; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.client.CachingClusteredClient; +import org.apache.druid.client.cache.Cache; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.query.FluentQueryRunnerBuilder; +import org.apache.druid.query.PostProcessingOperator; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QuerySegmentWalker; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.QueryToolChestWarehouse; +import org.apache.druid.query.ResultLevelCachingQueryRunner; +import org.apache.druid.query.RetryQueryRunner; +import org.apache.druid.query.RetryQueryRunnerConfig; +import org.apache.druid.query.SegmentDescriptor; +import org.apache.druid.server.initialization.ServerConfig; import org.joda.time.Interval; /** @@ -92,7 +92,7 @@ private QueryRunner makeRunner(Query query, QueryRunner baseClientR { QueryToolChest> toolChest = warehouse.getToolChest(query); - // This does not adhere to the fluent workflow. See https://github.com/druid-io/druid/issues/5517 + // This does not adhere to the fluent workflow. See https://github.com/apache/incubator-druid/issues/5517 return new ResultLevelCachingQueryRunner<>(makeRunner(query, baseClientRunner, toolChest), toolChest, query, diff --git a/server/src/main/java/io/druid/server/DruidNode.java b/server/src/main/java/org/apache/druid/server/DruidNode.java similarity index 98% rename from server/src/main/java/io/druid/server/DruidNode.java rename to server/src/main/java/org/apache/druid/server/DruidNode.java index 108194b29f67..1090a22640cb 100644 --- a/server/src/main/java/io/druid/server/DruidNode.java +++ b/server/src/main/java/org/apache/druid/server/DruidNode.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server; +package org.apache.druid.server; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; @@ -25,9 +25,9 @@ import com.google.common.base.Preconditions; import com.google.common.net.HostAndPort; import com.google.inject.name.Named; -import io.druid.common.utils.SocketUtil; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; +import org.apache.druid.common.utils.SocketUtil; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; import javax.validation.constraints.Max; import javax.validation.constraints.NotNull; diff --git a/server/src/main/java/io/druid/server/GuiceServletConfig.java b/server/src/main/java/org/apache/druid/server/GuiceServletConfig.java similarity index 97% rename from server/src/main/java/io/druid/server/GuiceServletConfig.java rename to server/src/main/java/org/apache/druid/server/GuiceServletConfig.java index 30b260d59b37..061a04699f2a 100644 --- a/server/src/main/java/io/druid/server/GuiceServletConfig.java +++ b/server/src/main/java/org/apache/druid/server/GuiceServletConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server; +package org.apache.druid.server; import com.google.inject.Injector; import com.google.inject.servlet.GuiceServletContextListener; diff --git a/server/src/main/java/io/druid/server/QueryLifecycle.java b/server/src/main/java/org/apache/druid/server/QueryLifecycle.java similarity index 90% rename from server/src/main/java/io/druid/server/QueryLifecycle.java rename to server/src/main/java/org/apache/druid/server/QueryLifecycle.java index 07d329064707..88c44ef72b70 100644 --- a/server/src/main/java/io/druid/server/QueryLifecycle.java +++ b/server/src/main/java/org/apache/druid/server/QueryLifecycle.java @@ -17,34 +17,34 @@ * under the License. */ -package io.druid.server; +package org.apache.druid.server; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Iterables; -import io.druid.client.DirectDruidClient; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.SequenceWrapper; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.query.DruidMetrics; -import io.druid.query.GenericQueryMetricsFactory; -import io.druid.query.Query; -import io.druid.query.QueryInterruptedException; -import io.druid.query.QueryMetrics; -import io.druid.query.QueryPlus; -import io.druid.query.QuerySegmentWalker; -import io.druid.query.QueryToolChest; -import io.druid.query.QueryToolChestWarehouse; -import io.druid.server.log.RequestLogger; -import io.druid.server.security.Access; -import io.druid.server.security.AuthenticationResult; -import io.druid.server.security.AuthorizationUtils; -import io.druid.server.security.AuthorizerMapper; +import org.apache.druid.client.DirectDruidClient; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.SequenceWrapper; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.query.DruidMetrics; +import org.apache.druid.query.GenericQueryMetricsFactory; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryInterruptedException; +import org.apache.druid.query.QueryMetrics; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QuerySegmentWalker; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.QueryToolChestWarehouse; +import org.apache.druid.server.log.RequestLogger; +import org.apache.druid.server.security.Access; +import org.apache.druid.server.security.AuthenticationResult; +import org.apache.druid.server.security.AuthorizationUtils; +import org.apache.druid.server.security.AuthorizerMapper; import javax.annotation.Nullable; import javax.servlet.http.HttpServletRequest; diff --git a/server/src/main/java/io/druid/server/QueryLifecycleFactory.java b/server/src/main/java/org/apache/druid/server/QueryLifecycleFactory.java similarity index 81% rename from server/src/main/java/io/druid/server/QueryLifecycleFactory.java rename to server/src/main/java/org/apache/druid/server/QueryLifecycleFactory.java index 8c9b295dfd10..59d3c6ec6173 100644 --- a/server/src/main/java/io/druid/server/QueryLifecycleFactory.java +++ b/server/src/main/java/org/apache/druid/server/QueryLifecycleFactory.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.server; +package org.apache.druid.server; import com.google.inject.Inject; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.guice.LazySingleton; -import io.druid.query.GenericQueryMetricsFactory; -import io.druid.query.QuerySegmentWalker; -import io.druid.query.QueryToolChestWarehouse; -import io.druid.server.log.RequestLogger; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthorizerMapper; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.query.GenericQueryMetricsFactory; +import org.apache.druid.query.QuerySegmentWalker; +import org.apache.druid.query.QueryToolChestWarehouse; +import org.apache.druid.server.log.RequestLogger; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthorizerMapper; @LazySingleton public class QueryLifecycleFactory diff --git a/server/src/main/java/io/druid/server/QueryManager.java b/server/src/main/java/org/apache/druid/server/QueryManager.java similarity index 95% rename from server/src/main/java/io/druid/server/QueryManager.java rename to server/src/main/java/org/apache/druid/server/QueryManager.java index 5f9fd3d380a6..0684ed45fac8 100644 --- a/server/src/main/java/io/druid/server/QueryManager.java +++ b/server/src/main/java/org/apache/druid/server/QueryManager.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.server; +package org.apache.druid.server; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimaps; import com.google.common.collect.SetMultimap; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.query.Query; -import io.druid.query.QueryWatcher; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryWatcher; import java.util.List; import java.util.Set; diff --git a/server/src/main/java/io/druid/server/QueryResource.java b/server/src/main/java/org/apache/druid/server/QueryResource.java similarity index 92% rename from server/src/main/java/io/druid/server/QueryResource.java rename to server/src/main/java/org/apache/druid/server/QueryResource.java index de3ca0f99a72..70fabd21af94 100644 --- a/server/src/main/java/io/druid/server/QueryResource.java +++ b/server/src/main/java/org/apache/druid/server/QueryResource.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server; +package org.apache.druid.server; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; @@ -30,25 +30,25 @@ import com.google.common.collect.Sets; import com.google.common.io.CountingOutputStream; import com.google.inject.Inject; -import io.druid.client.DirectDruidClient; -import io.druid.guice.LazySingleton; -import io.druid.guice.annotations.Json; -import io.druid.guice.annotations.Smile; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Yielder; -import io.druid.java.util.common.guava.Yielders; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.query.GenericQueryMetricsFactory; -import io.druid.query.Query; -import io.druid.query.QueryContexts; -import io.druid.query.QueryInterruptedException; -import io.druid.server.metrics.QueryCountStatsProvider; -import io.druid.server.security.Access; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthorizationUtils; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.ForbiddenException; +import org.apache.druid.client.DirectDruidClient; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.guice.annotations.Smile; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Yielder; +import org.apache.druid.java.util.common.guava.Yielders; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.query.GenericQueryMetricsFactory; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryContexts; +import org.apache.druid.query.QueryInterruptedException; +import org.apache.druid.server.metrics.QueryCountStatsProvider; +import org.apache.druid.server.security.Access; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthorizationUtils; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.ForbiddenException; import org.joda.time.DateTime; import javax.servlet.http.HttpServletRequest; @@ -244,7 +244,7 @@ public void write(OutputStream outputStream) throws WebApplicationException DirectDruidClient.removeMagicResponseContextFields(responseContext); - //Limit the response-context header, see https://github.com/druid-io/druid/issues/2331 + //Limit the response-context header, see https://github.com/apache/incubator-druid/issues/2331 //Note that Response.ResponseBuilder.header(String key,Object value).build() calls value.toString() //and encodes the string using ASCII, so 1 char is = 1 byte String responseCtxString = jsonMapper.writeValueAsString(responseContext); diff --git a/server/src/main/java/io/druid/server/QueryStats.java b/server/src/main/java/org/apache/druid/server/QueryStats.java similarity index 97% rename from server/src/main/java/io/druid/server/QueryStats.java rename to server/src/main/java/org/apache/druid/server/QueryStats.java index ad185e09d433..98d6136637e3 100644 --- a/server/src/main/java/io/druid/server/QueryStats.java +++ b/server/src/main/java/org/apache/druid/server/QueryStats.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server; +package org.apache.druid.server; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/server/src/main/java/io/druid/server/RequestLogLine.java b/server/src/main/java/org/apache/druid/server/RequestLogLine.java similarity index 97% rename from server/src/main/java/io/druid/server/RequestLogLine.java rename to server/src/main/java/org/apache/druid/server/RequestLogLine.java index 642fd2e11c06..01f2182a9530 100644 --- a/server/src/main/java/io/druid/server/RequestLogLine.java +++ b/server/src/main/java/org/apache/druid/server/RequestLogLine.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.server; +package org.apache.druid.server; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Joiner; -import io.druid.query.Query; +import org.apache.druid.query.Query; import org.joda.time.DateTime; import java.util.Arrays; diff --git a/server/src/main/java/io/druid/server/SegmentManager.java b/server/src/main/java/org/apache/druid/server/SegmentManager.java similarity index 93% rename from server/src/main/java/io/druid/server/SegmentManager.java rename to server/src/main/java/org/apache/druid/server/SegmentManager.java index e1f044be8f48..de77b8b4fd1e 100644 --- a/server/src/main/java/io/druid/server/SegmentManager.java +++ b/server/src/main/java/org/apache/druid/server/SegmentManager.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.server; +package org.apache.druid.server; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Ordering; import com.google.inject.Inject; -import io.druid.common.guava.SettableSupplier; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.segment.ReferenceCountingSegment; -import io.druid.segment.Segment; -import io.druid.segment.loading.SegmentLoader; -import io.druid.segment.loading.SegmentLoadingException; -import io.druid.timeline.DataSegment; -import io.druid.timeline.VersionedIntervalTimeline; -import io.druid.timeline.partition.PartitionChunk; -import io.druid.timeline.partition.PartitionHolder; +import org.apache.druid.common.guava.SettableSupplier; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.segment.ReferenceCountingSegment; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.loading.SegmentLoader; +import org.apache.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.timeline.partition.PartitionChunk; +import org.apache.druid.timeline.partition.PartitionHolder; import javax.annotation.Nullable; import java.util.Map; diff --git a/server/src/main/java/io/druid/server/SetAndVerifyContextQueryRunner.java b/server/src/main/java/org/apache/druid/server/SetAndVerifyContextQueryRunner.java similarity index 86% rename from server/src/main/java/io/druid/server/SetAndVerifyContextQueryRunner.java rename to server/src/main/java/org/apache/druid/server/SetAndVerifyContextQueryRunner.java index 5737ddefe1ba..3952911a8ae6 100644 --- a/server/src/main/java/io/druid/server/SetAndVerifyContextQueryRunner.java +++ b/server/src/main/java/org/apache/druid/server/SetAndVerifyContextQueryRunner.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.server; +package org.apache.druid.server; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.Query; -import io.druid.query.QueryContexts; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.server.initialization.ServerConfig; -import io.druid.client.DirectDruidClient; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryContexts; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.server.initialization.ServerConfig; +import org.apache.druid.client.DirectDruidClient; import com.google.common.collect.ImmutableMap; import java.util.Map; diff --git a/server/src/main/java/io/druid/server/StatusResource.java b/server/src/main/java/org/apache/druid/server/StatusResource.java similarity index 94% rename from server/src/main/java/io/druid/server/StatusResource.java rename to server/src/main/java/org/apache/druid/server/StatusResource.java index 8ef9195e7fdc..5d14ca7f334c 100644 --- a/server/src/main/java/io/druid/server/StatusResource.java +++ b/server/src/main/java/org/apache/druid/server/StatusResource.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.server; +package org.apache.druid.server; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.Maps; import com.sun.jersey.spi.container.ResourceFilters; -import io.druid.client.DruidServerConfig; -import io.druid.initialization.DruidModule; -import io.druid.initialization.Initialization; -import io.druid.java.util.common.StringUtils; -import io.druid.server.http.security.ConfigResourceFilter; -import io.druid.server.http.security.StateResourceFilter; +import org.apache.druid.client.DruidServerConfig; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.server.http.security.ConfigResourceFilter; +import org.apache.druid.server.http.security.StateResourceFilter; import javax.inject.Inject; import javax.ws.rs.GET; diff --git a/server/src/main/java/io/druid/server/ZkPathsModule.java b/server/src/main/java/org/apache/druid/server/ZkPathsModule.java similarity index 96% rename from server/src/main/java/io/druid/server/ZkPathsModule.java rename to server/src/main/java/org/apache/druid/server/ZkPathsModule.java index 12b24b827b62..e619cdfc7a04 100644 --- a/server/src/main/java/io/druid/server/ZkPathsModule.java +++ b/server/src/main/java/org/apache/druid/server/ZkPathsModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server; +package org.apache.druid.server; import com.google.inject.Binder; import com.google.inject.Module; diff --git a/server/src/main/java/io/druid/server/audit/AuditManagerProvider.java b/server/src/main/java/org/apache/druid/server/audit/AuditManagerProvider.java similarity index 91% rename from server/src/main/java/io/druid/server/audit/AuditManagerProvider.java rename to server/src/main/java/org/apache/druid/server/audit/AuditManagerProvider.java index 43afd36ce41e..7607d90e3ebd 100644 --- a/server/src/main/java/io/druid/server/audit/AuditManagerProvider.java +++ b/server/src/main/java/org/apache/druid/server/audit/AuditManagerProvider.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.server.audit; +package org.apache.druid.server.audit; import com.google.inject.Provider; -import io.druid.audit.AuditManager; +import org.apache.druid.audit.AuditManager; public interface AuditManagerProvider extends Provider { diff --git a/server/src/main/java/io/druid/server/audit/SQLAuditManager.java b/server/src/main/java/org/apache/druid/server/audit/SQLAuditManager.java similarity index 94% rename from server/src/main/java/io/druid/server/audit/SQLAuditManager.java rename to server/src/main/java/org/apache/druid/server/audit/SQLAuditManager.java index ff088953f40d..7c6c65e90915 100644 --- a/server/src/main/java/io/druid/server/audit/SQLAuditManager.java +++ b/server/src/main/java/org/apache/druid/server/audit/SQLAuditManager.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.server.audit; +package org.apache.druid.server.audit; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Supplier; import com.google.inject.Inject; -import io.druid.audit.AuditEntry; -import io.druid.audit.AuditManager; -import io.druid.guice.ManageLifecycle; -import io.druid.guice.annotations.Json; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.metadata.MetadataStorageTablesConfig; -import io.druid.metadata.SQLMetadataConnector; +import org.apache.druid.audit.AuditEntry; +import org.apache.druid.audit.AuditManager; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.metadata.MetadataStorageTablesConfig; +import org.apache.druid.metadata.SQLMetadataConnector; import org.joda.time.DateTime; import org.joda.time.Interval; import org.skife.jdbi.v2.Handle; diff --git a/server/src/main/java/io/druid/server/audit/SQLAuditManagerConfig.java b/server/src/main/java/org/apache/druid/server/audit/SQLAuditManagerConfig.java similarity index 96% rename from server/src/main/java/io/druid/server/audit/SQLAuditManagerConfig.java rename to server/src/main/java/org/apache/druid/server/audit/SQLAuditManagerConfig.java index b78844e30373..c57b2d700b8d 100644 --- a/server/src/main/java/io/druid/server/audit/SQLAuditManagerConfig.java +++ b/server/src/main/java/org/apache/druid/server/audit/SQLAuditManagerConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.audit; +package org.apache.druid.server.audit; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/server/audit/SQLAuditManagerProvider.java b/server/src/main/java/org/apache/druid/server/audit/SQLAuditManagerProvider.java similarity index 85% rename from server/src/main/java/io/druid/server/audit/SQLAuditManagerProvider.java rename to server/src/main/java/org/apache/druid/server/audit/SQLAuditManagerProvider.java index f6aa76fcb3ca..a9309f01c4c1 100644 --- a/server/src/main/java/io/druid/server/audit/SQLAuditManagerProvider.java +++ b/server/src/main/java/org/apache/druid/server/audit/SQLAuditManagerProvider.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.server.audit; +package org.apache.druid.server.audit; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Supplier; import com.google.common.base.Throwables; import com.google.inject.Inject; -import io.druid.audit.AuditManager; -import io.druid.guice.annotations.Json; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.metadata.MetadataStorageTablesConfig; -import io.druid.metadata.SQLMetadataConnector; +import org.apache.druid.audit.AuditManager; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.metadata.MetadataStorageTablesConfig; +import org.apache.druid.metadata.SQLMetadataConnector; public class SQLAuditManagerProvider implements AuditManagerProvider { diff --git a/server/src/main/java/io/druid/server/coordination/BatchDataSegmentAnnouncer.java b/server/src/main/java/org/apache/druid/server/coordination/BatchDataSegmentAnnouncer.java similarity index 96% rename from server/src/main/java/io/druid/server/coordination/BatchDataSegmentAnnouncer.java rename to server/src/main/java/org/apache/druid/server/coordination/BatchDataSegmentAnnouncer.java index 9f69ec4c0280..462183d4a094 100644 --- a/server/src/main/java/io/druid/server/coordination/BatchDataSegmentAnnouncer.java +++ b/server/src/main/java/org/apache/druid/server/coordination/BatchDataSegmentAnnouncer.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordination; +package org.apache.druid.server.coordination; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -29,15 +29,15 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; import com.google.inject.Inject; -import io.druid.common.utils.UUIDUtils; -import io.druid.curator.announcement.Announcer; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.initialization.BatchDataSegmentAnnouncerConfig; -import io.druid.server.initialization.ZkPathsConfig; -import io.druid.timeline.DataSegment; +import org.apache.druid.common.utils.UUIDUtils; +import org.apache.druid.curator.announcement.Announcer; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.initialization.BatchDataSegmentAnnouncerConfig; +import org.apache.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.timeline.DataSegment; import org.apache.curator.utils.ZKPaths; import javax.annotation.Nullable; diff --git a/server/src/main/java/io/druid/server/coordination/BatchDataSegmentAnnouncerProvider.java b/server/src/main/java/org/apache/druid/server/coordination/BatchDataSegmentAnnouncerProvider.java similarity index 96% rename from server/src/main/java/io/druid/server/coordination/BatchDataSegmentAnnouncerProvider.java rename to server/src/main/java/org/apache/druid/server/coordination/BatchDataSegmentAnnouncerProvider.java index 19bcd12823a5..b4acbf71a4e9 100644 --- a/server/src/main/java/io/druid/server/coordination/BatchDataSegmentAnnouncerProvider.java +++ b/server/src/main/java/org/apache/druid/server/coordination/BatchDataSegmentAnnouncerProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordination; +package org.apache.druid.server.coordination; import com.fasterxml.jackson.annotation.JacksonInject; diff --git a/server/src/main/java/io/druid/server/coordination/ChangeRequestHistory.java b/server/src/main/java/org/apache/druid/server/coordination/ChangeRequestHistory.java similarity index 98% rename from server/src/main/java/io/druid/server/coordination/ChangeRequestHistory.java rename to server/src/main/java/org/apache/druid/server/coordination/ChangeRequestHistory.java index 87c4259cc45a..59ae39b7c881 100644 --- a/server/src/main/java/io/druid/server/coordination/ChangeRequestHistory.java +++ b/server/src/main/java/org/apache/druid/server/coordination/ChangeRequestHistory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordination; +package org.apache.druid.server.coordination; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -26,9 +26,9 @@ import com.google.common.util.concurrent.AbstractFuture; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.StringUtils; -import io.druid.utils.CircularBuffer; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.utils.CircularBuffer; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/server/src/main/java/io/druid/server/coordination/ChangeRequestHttpSyncer.java b/server/src/main/java/org/apache/druid/server/coordination/ChangeRequestHttpSyncer.java similarity index 93% rename from server/src/main/java/io/druid/server/coordination/ChangeRequestHttpSyncer.java rename to server/src/main/java/org/apache/druid/server/coordination/ChangeRequestHttpSyncer.java index 6bf9b3f6a9a9..408ab4beef7d 100644 --- a/server/src/main/java/io/druid/server/coordination/ChangeRequestHttpSyncer.java +++ b/server/src/main/java/org/apache/druid/server/coordination/ChangeRequestHttpSyncer.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordination; +package org.apache.druid.server.coordination; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -26,17 +26,17 @@ import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.concurrent.LifecycleLock; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.RE; -import io.druid.java.util.common.RetryUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.Request; -import io.druid.java.util.http.client.io.AppendableByteArrayInputStream; -import io.druid.java.util.http.client.response.ClientResponse; -import io.druid.java.util.http.client.response.InputStreamResponseHandler; +import org.apache.druid.concurrent.LifecycleLock; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.java.util.common.RetryUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.Request; +import org.apache.druid.java.util.http.client.io.AppendableByteArrayInputStream; +import org.apache.druid.java.util.http.client.response.ClientResponse; +import org.apache.druid.java.util.http.client.response.InputStreamResponseHandler; import org.jboss.netty.handler.codec.http.HttpHeaders; import org.jboss.netty.handler.codec.http.HttpMethod; import org.jboss.netty.handler.codec.http.HttpResponse; @@ -53,8 +53,8 @@ /** * This class facilitates the usage of long-polling HTTP endpoints powered by {@link ChangeRequestHistory}. - * For example {@link io.druid.client.HttpServerInventoryView} uses it to keep segment state in sync with data nodes - * which expose the segment state via HTTP endpoint in {@link io.druid.server.http.SegmentListerResource#getSegments}. + * For example {@link org.apache.druid.client.HttpServerInventoryView} uses it to keep segment state in sync with data nodes + * which expose the segment state via HTTP endpoint in {@link org.apache.druid.server.http.SegmentListerResource#getSegments}. */ public class ChangeRequestHttpSyncer { diff --git a/server/src/main/java/io/druid/server/coordination/ChangeRequestsSnapshot.java b/server/src/main/java/org/apache/druid/server/coordination/ChangeRequestsSnapshot.java similarity index 98% rename from server/src/main/java/io/druid/server/coordination/ChangeRequestsSnapshot.java rename to server/src/main/java/org/apache/druid/server/coordination/ChangeRequestsSnapshot.java index 662bb80e83b6..96b2a24f8550 100644 --- a/server/src/main/java/io/druid/server/coordination/ChangeRequestsSnapshot.java +++ b/server/src/main/java/org/apache/druid/server/coordination/ChangeRequestsSnapshot.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordination; +package org.apache.druid.server.coordination; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/server/coordination/CuratorDataSegmentServerAnnouncer.java b/server/src/main/java/org/apache/druid/server/coordination/CuratorDataSegmentServerAnnouncer.java similarity index 92% rename from server/src/main/java/io/druid/server/coordination/CuratorDataSegmentServerAnnouncer.java rename to server/src/main/java/org/apache/druid/server/coordination/CuratorDataSegmentServerAnnouncer.java index c33da1babf2d..e87f86164b8e 100644 --- a/server/src/main/java/io/druid/server/coordination/CuratorDataSegmentServerAnnouncer.java +++ b/server/src/main/java/org/apache/druid/server/coordination/CuratorDataSegmentServerAnnouncer.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.server.coordination; +package org.apache.druid.server.coordination; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Throwables; import com.google.inject.Inject; -import io.druid.curator.announcement.Announcer; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.curator.announcement.Announcer; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.initialization.ZkPathsConfig; import org.apache.curator.utils.ZKPaths; /** diff --git a/server/src/main/java/io/druid/server/coordination/DataSegmentAnnouncer.java b/server/src/main/java/org/apache/druid/server/coordination/DataSegmentAnnouncer.java similarity index 92% rename from server/src/main/java/io/druid/server/coordination/DataSegmentAnnouncer.java rename to server/src/main/java/org/apache/druid/server/coordination/DataSegmentAnnouncer.java index 0bdb6c1622bd..eac37f30a8b8 100644 --- a/server/src/main/java/io/druid/server/coordination/DataSegmentAnnouncer.java +++ b/server/src/main/java/org/apache/druid/server/coordination/DataSegmentAnnouncer.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.server.coordination; +package org.apache.druid.server.coordination; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import java.io.IOException; diff --git a/server/src/main/java/io/druid/server/coordination/DataSegmentAnnouncerProvider.java b/server/src/main/java/org/apache/druid/server/coordination/DataSegmentAnnouncerProvider.java similarity index 96% rename from server/src/main/java/io/druid/server/coordination/DataSegmentAnnouncerProvider.java rename to server/src/main/java/org/apache/druid/server/coordination/DataSegmentAnnouncerProvider.java index 398ee9f13738..cb2c1141d973 100644 --- a/server/src/main/java/io/druid/server/coordination/DataSegmentAnnouncerProvider.java +++ b/server/src/main/java/org/apache/druid/server/coordination/DataSegmentAnnouncerProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordination; +package org.apache.druid.server.coordination; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/server/src/main/java/io/druid/server/coordination/DataSegmentChangeCallback.java b/server/src/main/java/org/apache/druid/server/coordination/DataSegmentChangeCallback.java similarity index 95% rename from server/src/main/java/io/druid/server/coordination/DataSegmentChangeCallback.java rename to server/src/main/java/org/apache/druid/server/coordination/DataSegmentChangeCallback.java index a080efcca650..cfd071df627d 100644 --- a/server/src/main/java/io/druid/server/coordination/DataSegmentChangeCallback.java +++ b/server/src/main/java/org/apache/druid/server/coordination/DataSegmentChangeCallback.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordination; +package org.apache.druid.server.coordination; /** */ diff --git a/server/src/main/java/io/druid/server/coordination/DataSegmentChangeHandler.java b/server/src/main/java/org/apache/druid/server/coordination/DataSegmentChangeHandler.java similarity index 91% rename from server/src/main/java/io/druid/server/coordination/DataSegmentChangeHandler.java rename to server/src/main/java/org/apache/druid/server/coordination/DataSegmentChangeHandler.java index 867fb47852e9..f502545ef85e 100644 --- a/server/src/main/java/io/druid/server/coordination/DataSegmentChangeHandler.java +++ b/server/src/main/java/org/apache/druid/server/coordination/DataSegmentChangeHandler.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.server.coordination; +package org.apache.druid.server.coordination; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; /** */ diff --git a/server/src/main/java/io/druid/server/coordination/DataSegmentChangeRequest.java b/server/src/main/java/org/apache/druid/server/coordination/DataSegmentChangeRequest.java similarity index 96% rename from server/src/main/java/io/druid/server/coordination/DataSegmentChangeRequest.java rename to server/src/main/java/org/apache/druid/server/coordination/DataSegmentChangeRequest.java index c9f0d9dca049..d7962ce161ed 100644 --- a/server/src/main/java/io/druid/server/coordination/DataSegmentChangeRequest.java +++ b/server/src/main/java/org/apache/druid/server/coordination/DataSegmentChangeRequest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordination; +package org.apache.druid.server.coordination; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/server/src/main/java/io/druid/server/coordination/DataSegmentServerAnnouncer.java b/server/src/main/java/org/apache/druid/server/coordination/DataSegmentServerAnnouncer.java similarity index 87% rename from server/src/main/java/io/druid/server/coordination/DataSegmentServerAnnouncer.java rename to server/src/main/java/org/apache/druid/server/coordination/DataSegmentServerAnnouncer.java index 82a64838f219..6d1497831c4b 100644 --- a/server/src/main/java/io/druid/server/coordination/DataSegmentServerAnnouncer.java +++ b/server/src/main/java/org/apache/druid/server/coordination/DataSegmentServerAnnouncer.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.server.coordination; +package org.apache.druid.server.coordination; /** - * Use announcement made by {@link io.druid.discovery.DruidNodeAnnouncer} + * Use announcement made by {@link org.apache.druid.discovery.DruidNodeAnnouncer} */ @Deprecated public interface DataSegmentServerAnnouncer diff --git a/server/src/main/java/io/druid/server/coordination/DruidServerMetadata.java b/server/src/main/java/org/apache/druid/server/coordination/DruidServerMetadata.java similarity index 98% rename from server/src/main/java/io/druid/server/coordination/DruidServerMetadata.java rename to server/src/main/java/org/apache/druid/server/coordination/DruidServerMetadata.java index cd226a9b880e..ff01382ac3b6 100644 --- a/server/src/main/java/io/druid/server/coordination/DruidServerMetadata.java +++ b/server/src/main/java/org/apache/druid/server/coordination/DruidServerMetadata.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordination; +package org.apache.druid.server.coordination; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/server/coordination/NoopDataSegmentAnnouncer.java b/server/src/main/java/org/apache/druid/server/coordination/NoopDataSegmentAnnouncer.java similarity index 93% rename from server/src/main/java/io/druid/server/coordination/NoopDataSegmentAnnouncer.java rename to server/src/main/java/org/apache/druid/server/coordination/NoopDataSegmentAnnouncer.java index d83d78be3b34..576f97e9e375 100644 --- a/server/src/main/java/io/druid/server/coordination/NoopDataSegmentAnnouncer.java +++ b/server/src/main/java/org/apache/druid/server/coordination/NoopDataSegmentAnnouncer.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.server.coordination; +package org.apache.druid.server.coordination; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; /** * Mostly used for test purpose. diff --git a/server/src/main/java/io/druid/server/coordination/SegmentChangeRequestDrop.java b/server/src/main/java/org/apache/druid/server/coordination/SegmentChangeRequestDrop.java similarity index 93% rename from server/src/main/java/io/druid/server/coordination/SegmentChangeRequestDrop.java rename to server/src/main/java/org/apache/druid/server/coordination/SegmentChangeRequestDrop.java index f948c6608578..b403d4645170 100644 --- a/server/src/main/java/io/druid/server/coordination/SegmentChangeRequestDrop.java +++ b/server/src/main/java/org/apache/druid/server/coordination/SegmentChangeRequestDrop.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.server.coordination; +package org.apache.druid.server.coordination; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonUnwrapped; -import io.druid.java.util.common.StringUtils; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.timeline.DataSegment; import java.util.Objects; diff --git a/server/src/main/java/io/druid/server/coordination/SegmentChangeRequestLoad.java b/server/src/main/java/org/apache/druid/server/coordination/SegmentChangeRequestLoad.java similarity index 93% rename from server/src/main/java/io/druid/server/coordination/SegmentChangeRequestLoad.java rename to server/src/main/java/org/apache/druid/server/coordination/SegmentChangeRequestLoad.java index a8392caa96e3..1a28be8fd43e 100644 --- a/server/src/main/java/io/druid/server/coordination/SegmentChangeRequestLoad.java +++ b/server/src/main/java/org/apache/druid/server/coordination/SegmentChangeRequestLoad.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.server.coordination; +package org.apache.druid.server.coordination; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonUnwrapped; -import io.druid.java.util.common.StringUtils; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.timeline.DataSegment; import java.util.Objects; diff --git a/server/src/main/java/io/druid/server/coordination/SegmentChangeRequestNoop.java b/server/src/main/java/org/apache/druid/server/coordination/SegmentChangeRequestNoop.java similarity index 96% rename from server/src/main/java/io/druid/server/coordination/SegmentChangeRequestNoop.java rename to server/src/main/java/org/apache/druid/server/coordination/SegmentChangeRequestNoop.java index ae6c92dcefb7..4f902496bb41 100644 --- a/server/src/main/java/io/druid/server/coordination/SegmentChangeRequestNoop.java +++ b/server/src/main/java/org/apache/druid/server/coordination/SegmentChangeRequestNoop.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordination; +package org.apache.druid.server.coordination; /** */ diff --git a/server/src/main/java/io/druid/server/coordination/SegmentLoadDropHandler.java b/server/src/main/java/org/apache/druid/server/coordination/SegmentLoadDropHandler.java similarity index 97% rename from server/src/main/java/io/druid/server/coordination/SegmentLoadDropHandler.java rename to server/src/main/java/org/apache/druid/server/coordination/SegmentLoadDropHandler.java index f87de5f64bf1..010c2d4ce2cf 100644 --- a/server/src/main/java/io/druid/server/coordination/SegmentLoadDropHandler.java +++ b/server/src/main/java/org/apache/druid/server/coordination/SegmentLoadDropHandler.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordination; +package org.apache.druid.server.coordination; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -35,16 +35,16 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; import com.google.inject.Inject; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.guice.ManageLifecycle; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.segment.loading.SegmentLoaderConfig; -import io.druid.segment.loading.SegmentLoadingException; -import io.druid.server.SegmentManager; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.segment.loading.SegmentLoaderConfig; +import org.apache.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.server.SegmentManager; +import org.apache.druid.timeline.DataSegment; import java.io.File; import java.io.IOException; diff --git a/server/src/main/java/io/druid/server/coordination/ServerManager.java b/server/src/main/java/org/apache/druid/server/coordination/ServerManager.java similarity index 82% rename from server/src/main/java/io/druid/server/coordination/ServerManager.java rename to server/src/main/java/org/apache/druid/server/coordination/ServerManager.java index 4a134d7f11df..8e483479ae00 100644 --- a/server/src/main/java/io/druid/server/coordination/ServerManager.java +++ b/server/src/main/java/org/apache/druid/server/coordination/ServerManager.java @@ -17,51 +17,51 @@ * under the License. */ -package io.druid.server.coordination; +package org.apache.druid.server.coordination; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.inject.Inject; -import io.druid.client.CachingQueryRunner; -import io.druid.client.cache.Cache; -import io.druid.client.cache.CacheConfig; -import io.druid.client.cache.CachePopulator; -import io.druid.guice.annotations.Processing; -import io.druid.guice.annotations.Smile; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.guava.FunctionalIterable; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.query.BySegmentQueryRunner; -import io.druid.query.CPUTimeMetricQueryRunner; -import io.druid.query.DataSource; -import io.druid.query.FinalizeResultsQueryRunner; -import io.druid.query.MetricsEmittingQueryRunner; -import io.druid.query.NoopQueryRunner; -import io.druid.query.PerSegmentOptimizingQueryRunner; -import io.druid.query.PerSegmentQueryOptimizationContext; -import io.druid.query.Query; -import io.druid.query.QueryMetrics; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryRunnerFactoryConglomerate; -import io.druid.query.QuerySegmentWalker; -import io.druid.query.QueryToolChest; -import io.druid.query.ReferenceCountingSegmentQueryRunner; -import io.druid.query.ReportTimelineMissingSegmentQueryRunner; -import io.druid.query.SegmentDescriptor; -import io.druid.query.TableDataSource; -import io.druid.query.spec.SpecificSegmentQueryRunner; -import io.druid.query.spec.SpecificSegmentSpec; -import io.druid.segment.ReferenceCountingSegment; -import io.druid.server.SegmentManager; -import io.druid.server.SetAndVerifyContextQueryRunner; -import io.druid.server.initialization.ServerConfig; -import io.druid.timeline.TimelineObjectHolder; -import io.druid.timeline.VersionedIntervalTimeline; -import io.druid.timeline.partition.PartitionChunk; -import io.druid.timeline.partition.PartitionHolder; +import org.apache.druid.client.CachingQueryRunner; +import org.apache.druid.client.cache.Cache; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.client.cache.CachePopulator; +import org.apache.druid.guice.annotations.Processing; +import org.apache.druid.guice.annotations.Smile; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.guava.FunctionalIterable; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.query.BySegmentQueryRunner; +import org.apache.druid.query.CPUTimeMetricQueryRunner; +import org.apache.druid.query.DataSource; +import org.apache.druid.query.FinalizeResultsQueryRunner; +import org.apache.druid.query.MetricsEmittingQueryRunner; +import org.apache.druid.query.NoopQueryRunner; +import org.apache.druid.query.PerSegmentOptimizingQueryRunner; +import org.apache.druid.query.PerSegmentQueryOptimizationContext; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryMetrics; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryRunnerFactoryConglomerate; +import org.apache.druid.query.QuerySegmentWalker; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.ReferenceCountingSegmentQueryRunner; +import org.apache.druid.query.ReportTimelineMissingSegmentQueryRunner; +import org.apache.druid.query.SegmentDescriptor; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.query.spec.SpecificSegmentQueryRunner; +import org.apache.druid.query.spec.SpecificSegmentSpec; +import org.apache.druid.segment.ReferenceCountingSegment; +import org.apache.druid.server.SegmentManager; +import org.apache.druid.server.SetAndVerifyContextQueryRunner; +import org.apache.druid.server.initialization.ServerConfig; +import org.apache.druid.timeline.TimelineObjectHolder; +import org.apache.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.timeline.partition.PartitionChunk; +import org.apache.druid.timeline.partition.PartitionHolder; import org.joda.time.Interval; import javax.annotation.Nullable; diff --git a/server/src/main/java/io/druid/server/coordination/ServerType.java b/server/src/main/java/org/apache/druid/server/coordination/ServerType.java similarity index 91% rename from server/src/main/java/io/druid/server/coordination/ServerType.java rename to server/src/main/java/org/apache/druid/server/coordination/ServerType.java index c17bfb3c141f..9e5a46e642c2 100644 --- a/server/src/main/java/io/druid/server/coordination/ServerType.java +++ b/server/src/main/java/org/apache/druid/server/coordination/ServerType.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.server.coordination; +package org.apache.druid.server.coordination; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; /** * This enum represents types of druid services that hold segments. @@ -33,7 +33,7 @@ *

* The toString() method converts the enum name() to lowercase and replaces underscores with hyphens, * which is the format expected for the server type string prior to the patch that introduced ServerType: - * https://github.com/druid-io/druid/pull/4148 + * https://github.com/apache/incubator-druid/pull/4148 */ public enum ServerType { @@ -60,7 +60,7 @@ public boolean isSegmentReplicationTarget() * * @return true if it is available for replication * - * @see io.druid.server.coordinator.rules.LoadRule + * @see org.apache.druid.server.coordinator.rules.LoadRule */ public boolean isSegmentReplicationTarget() { diff --git a/server/src/main/java/io/druid/server/coordination/ZkCoordinator.java b/server/src/main/java/org/apache/druid/server/coordination/ZkCoordinator.java similarity index 93% rename from server/src/main/java/io/druid/server/coordination/ZkCoordinator.java rename to server/src/main/java/org/apache/druid/server/coordination/ZkCoordinator.java index 9e68a86b4cee..96925bcd62f7 100644 --- a/server/src/main/java/io/druid/server/coordination/ZkCoordinator.java +++ b/server/src/main/java/org/apache/druid/server/coordination/ZkCoordinator.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.server.coordination; +package org.apache.druid.server.coordination; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Throwables; import com.google.inject.Inject; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.server.initialization.ZkPathsConfig; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.recipes.cache.ChildData; import org.apache.curator.framework.recipes.cache.PathChildrenCache; @@ -37,7 +37,7 @@ import java.io.IOException; /** - * Use {@link io.druid.server.coordinator.HttpLoadQueuePeon} for segment load/drops. + * Use {@link org.apache.druid.server.coordinator.HttpLoadQueuePeon} for segment load/drops. */ @Deprecated public class ZkCoordinator diff --git a/server/src/main/java/io/druid/server/coordination/broker/DruidBroker.java b/server/src/main/java/org/apache/druid/server/coordination/broker/DruidBroker.java similarity index 81% rename from server/src/main/java/io/druid/server/coordination/broker/DruidBroker.java rename to server/src/main/java/org/apache/druid/server/coordination/broker/DruidBroker.java index 0ef6d10e27a3..41e6d9ad0b5c 100644 --- a/server/src/main/java/io/druid/server/coordination/broker/DruidBroker.java +++ b/server/src/main/java/org/apache/druid/server/coordination/broker/DruidBroker.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.server.coordination.broker; +package org.apache.druid.server.coordination.broker; import com.google.common.base.Predicates; import com.google.common.util.concurrent.MoreExecutors; import com.google.inject.Inject; -import io.druid.client.FilteredServerInventoryView; -import io.druid.client.ServerView; -import io.druid.curator.discovery.ServiceAnnouncer; -import io.druid.guice.ManageLifecycle; -import io.druid.guice.annotations.Self; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.server.DruidNode; +import org.apache.druid.client.FilteredServerInventoryView; +import org.apache.druid.client.ServerView; +import org.apache.druid.curator.discovery.ServiceAnnouncer; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.server.DruidNode; @ManageLifecycle public class DruidBroker diff --git a/server/src/main/java/io/druid/server/coordinator/BalancerSegmentHolder.java b/server/src/main/java/org/apache/druid/server/coordinator/BalancerSegmentHolder.java similarity index 91% rename from server/src/main/java/io/druid/server/coordinator/BalancerSegmentHolder.java rename to server/src/main/java/org/apache/druid/server/coordinator/BalancerSegmentHolder.java index 5895e90227a8..b842e3f5fb86 100644 --- a/server/src/main/java/io/druid/server/coordinator/BalancerSegmentHolder.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/BalancerSegmentHolder.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; -import io.druid.client.ImmutableDruidServer; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.ImmutableDruidServer; +import org.apache.druid.timeline.DataSegment; /** */ diff --git a/server/src/main/java/io/druid/server/coordinator/BalancerStrategy.java b/server/src/main/java/org/apache/druid/server/coordinator/BalancerStrategy.java similarity index 89% rename from server/src/main/java/io/druid/server/coordinator/BalancerStrategy.java rename to server/src/main/java/org/apache/druid/server/coordinator/BalancerStrategy.java index 375c5c5f15a1..059f2aab06b3 100644 --- a/server/src/main/java/io/druid/server/coordinator/BalancerStrategy.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/BalancerStrategy.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import java.util.Iterator; import java.util.List; @@ -28,8 +28,8 @@ /** * This interface describes the coordinator balancing strategy, which is responsible for making decisions on where * to place {@link DataSegment}s on historical servers (described by {@link ServerHolder}). The balancing strategy - * is used by {@link io.druid.server.coordinator.rules.LoadRule} to assign and drop segments, and by - * {@link io.druid.server.coordinator.helper.DruidCoordinatorBalancer} to migrate segments between historicals. + * is used by {@link org.apache.druid.server.coordinator.rules.LoadRule} to assign and drop segments, and by + * {@link org.apache.druid.server.coordinator.helper.DruidCoordinatorBalancer} to migrate segments between historicals. */ public interface BalancerStrategy { @@ -72,7 +72,7 @@ default Iterator pickServersToDrop(DataSegment toDropSegment, Navi /** * Add balancing strategy stats during the 'balanceTier' operation of - * {@link io.druid.server.coordinator.helper.DruidCoordinatorBalancer} to be included + * {@link org.apache.druid.server.coordinator.helper.DruidCoordinatorBalancer} to be included * @param tier historical tier being balanced * @param stats stats object to add balancing strategy stats to * @param serverHolderList servers in tier being balanced diff --git a/server/src/main/java/io/druid/server/coordinator/BalancerStrategyFactory.java b/server/src/main/java/org/apache/druid/server/coordinator/BalancerStrategyFactory.java similarity index 97% rename from server/src/main/java/io/druid/server/coordinator/BalancerStrategyFactory.java rename to server/src/main/java/org/apache/druid/server/coordinator/BalancerStrategyFactory.java index 4e927d75d163..b168ab1161e4 100644 --- a/server/src/main/java/io/druid/server/coordinator/BalancerStrategyFactory.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/BalancerStrategyFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/server/src/main/java/io/druid/server/coordinator/CachingCostBalancerStrategy.java b/server/src/main/java/org/apache/druid/server/coordinator/CachingCostBalancerStrategy.java similarity index 94% rename from server/src/main/java/io/druid/server/coordinator/CachingCostBalancerStrategy.java rename to server/src/main/java/org/apache/druid/server/coordinator/CachingCostBalancerStrategy.java index 18caeeb24fce..62082b4d8c45 100644 --- a/server/src/main/java/io/druid/server/coordinator/CachingCostBalancerStrategy.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/CachingCostBalancerStrategy.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.ListeningExecutorService; -import io.druid.server.coordinator.cost.ClusterCostCache; -import io.druid.timeline.DataSegment; +import org.apache.druid.server.coordinator.cost.ClusterCostCache; +import org.apache.druid.timeline.DataSegment; import java.util.Set; diff --git a/server/src/main/java/io/druid/server/coordinator/CachingCostBalancerStrategyFactory.java b/server/src/main/java/org/apache/druid/server/coordinator/CachingCostBalancerStrategyFactory.java similarity index 88% rename from server/src/main/java/io/druid/server/coordinator/CachingCostBalancerStrategyFactory.java rename to server/src/main/java/org/apache/druid/server/coordinator/CachingCostBalancerStrategyFactory.java index a8c960c3fa44..20c8921b79cf 100644 --- a/server/src/main/java/io/druid/server/coordinator/CachingCostBalancerStrategyFactory.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/CachingCostBalancerStrategyFactory.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.google.common.util.concurrent.ListeningExecutorService; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.client.ServerInventoryView; -import io.druid.client.ServerView; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.server.coordinator.cost.ClusterCostCache; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.client.ServerInventoryView; +import org.apache.druid.client.ServerView; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.server.coordinator.cost.ClusterCostCache; +import org.apache.druid.timeline.DataSegment; import java.util.concurrent.CancellationException; import java.util.concurrent.CompletableFuture; @@ -61,7 +61,7 @@ public CachingCostBalancerStrategyFactory( ) throws Exception { // Adding to lifecycle dynamically because couldn't use @ManageLifecycle on the class, - // see https://github.com/druid-io/druid/issues/4980 + // see https://github.com/apache/incubator-druid/issues/4980 lifecycle.addMaybeStartManagedInstance(this); serverInventoryView.registerSegmentCallback( diff --git a/server/src/main/java/io/druid/server/coordinator/CoordinatorCompactionConfig.java b/server/src/main/java/org/apache/druid/server/coordinator/CoordinatorCompactionConfig.java similarity index 99% rename from server/src/main/java/io/druid/server/coordinator/CoordinatorCompactionConfig.java rename to server/src/main/java/org/apache/druid/server/coordinator/CoordinatorCompactionConfig.java index 6c3acbbc179a..bb16e438215c 100644 --- a/server/src/main/java/io/druid/server/coordinator/CoordinatorCompactionConfig.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/CoordinatorCompactionConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/server/coordinator/CoordinatorDynamicConfig.java b/server/src/main/java/org/apache/druid/server/coordinator/CoordinatorDynamicConfig.java similarity index 97% rename from server/src/main/java/io/druid/server/coordinator/CoordinatorDynamicConfig.java rename to server/src/main/java/org/apache/druid/server/coordinator/CoordinatorDynamicConfig.java index d4dd09694e69..8e8df480bdfc 100644 --- a/server/src/main/java/io/druid/server/coordinator/CoordinatorDynamicConfig.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/CoordinatorDynamicConfig.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableSet; -import io.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.IAE; import javax.annotation.Nullable; import java.util.Collection; @@ -34,8 +34,8 @@ * This class is for users to change their configurations while their Druid cluster is running. * These configurations are designed to allow only simple values rather than complicated JSON objects. * - * @see io.druid.common.config.JacksonConfigManager - * @see io.druid.common.config.ConfigManager + * @see org.apache.druid.common.config.JacksonConfigManager + * @see org.apache.druid.common.config.ConfigManager */ public class CoordinatorDynamicConfig { @@ -59,7 +59,7 @@ public class CoordinatorDynamicConfig * The maximum number of segments that could be queued for loading to any given server. * Default values is 0 with the meaning of "unbounded" (any number of * segments could be added to the loading queue for any server). - * See {@link LoadQueuePeon}, {@link io.druid.server.coordinator.rules.LoadRule#run} + * See {@link LoadQueuePeon}, {@link org.apache.druid.server.coordinator.rules.LoadRule#run} */ private final int maxSegmentsInNodeLoadingQueue; @@ -76,7 +76,7 @@ public CoordinatorDynamicConfig( // Type is Object here so that we can support both string and list as // coordinator console can not send array of strings in the update request. - // See https://github.com/druid-io/druid/issues/3055 + // See https://github.com/apache/incubator-druid/issues/3055 @JsonProperty("killDataSourceWhitelist") Object killDataSourceWhitelist, @JsonProperty("killAllDataSources") boolean killAllDataSources, @JsonProperty("killPendingSegmentsSkipList") Object killPendingSegmentsSkipList, diff --git a/server/src/main/java/io/druid/server/coordinator/CoordinatorOverlordServiceConfig.java b/server/src/main/java/org/apache/druid/server/coordinator/CoordinatorOverlordServiceConfig.java similarity index 97% rename from server/src/main/java/io/druid/server/coordinator/CoordinatorOverlordServiceConfig.java rename to server/src/main/java/org/apache/druid/server/coordinator/CoordinatorOverlordServiceConfig.java index 9b38d29f3a04..d7e0f534c06c 100644 --- a/server/src/main/java/io/druid/server/coordinator/CoordinatorOverlordServiceConfig.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/CoordinatorOverlordServiceConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; diff --git a/server/src/main/java/io/druid/server/coordinator/CoordinatorStats.java b/server/src/main/java/org/apache/druid/server/coordinator/CoordinatorStats.java similarity index 99% rename from server/src/main/java/io/druid/server/coordinator/CoordinatorStats.java rename to server/src/main/java/org/apache/druid/server/coordinator/CoordinatorStats.java index 267b33edf43e..98842c319abf 100644 --- a/server/src/main/java/io/druid/server/coordinator/CoordinatorStats.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/CoordinatorStats.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import it.unimi.dsi.fastutil.objects.Object2LongMap; import it.unimi.dsi.fastutil.objects.Object2LongMap.Entry; diff --git a/server/src/main/java/io/druid/server/coordinator/CostBalancerStrategy.java b/server/src/main/java/org/apache/druid/server/coordinator/CostBalancerStrategy.java similarity index 97% rename from server/src/main/java/io/druid/server/coordinator/CostBalancerStrategy.java rename to server/src/main/java/org/apache/druid/server/coordinator/CostBalancerStrategy.java index 54f9cdf1afb4..254e0d55a520 100644 --- a/server/src/main/java/io/druid/server/coordinator/CostBalancerStrategy.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/CostBalancerStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; @@ -25,9 +25,9 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; -import io.druid.java.util.common.Pair; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.timeline.DataSegment; import org.apache.commons.math3.util.FastMath; import org.joda.time.Interval; @@ -54,7 +54,7 @@ public class CostBalancerStrategy implements BalancerStrategy /** * This defines the unnormalized cost function between two segments. * - * See https://github.com/druid-io/druid/pull/2972 for more details about the cost function. + * See https://github.com/apache/incubator-druid/pull/2972 for more details about the cost function. * * intervalCost: segments close together are more likely to be queried together * diff --git a/server/src/main/java/io/druid/server/coordinator/CostBalancerStrategyFactory.java b/server/src/main/java/org/apache/druid/server/coordinator/CostBalancerStrategyFactory.java similarity index 96% rename from server/src/main/java/io/druid/server/coordinator/CostBalancerStrategyFactory.java rename to server/src/main/java/org/apache/druid/server/coordinator/CostBalancerStrategyFactory.java index c09651cce4d1..08cdd05b6eb7 100644 --- a/server/src/main/java/io/druid/server/coordinator/CostBalancerStrategyFactory.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/CostBalancerStrategyFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.google.common.util.concurrent.ListeningExecutorService; diff --git a/server/src/main/java/io/druid/server/coordinator/CuratorLoadQueuePeon.java b/server/src/main/java/org/apache/druid/server/coordinator/CuratorLoadQueuePeon.java similarity index 96% rename from server/src/main/java/io/druid/server/coordinator/CuratorLoadQueuePeon.java rename to server/src/main/java/org/apache/druid/server/coordinator/CuratorLoadQueuePeon.java index ee0ee78a1ee0..25df3586ff23 100644 --- a/server/src/main/java/io/druid/server/coordinator/CuratorLoadQueuePeon.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/CuratorLoadQueuePeon.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Lists; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.concurrent.ScheduledExecutors; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.server.coordination.DataSegmentChangeRequest; -import io.druid.server.coordination.SegmentChangeRequestDrop; -import io.druid.server.coordination.SegmentChangeRequestLoad; -import io.druid.server.coordination.SegmentChangeRequestNoop; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.concurrent.ScheduledExecutors; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.server.coordination.DataSegmentChangeRequest; +import org.apache.druid.server.coordination.SegmentChangeRequestDrop; +import org.apache.druid.server.coordination.SegmentChangeRequestLoad; +import org.apache.druid.server.coordination.SegmentChangeRequestNoop; +import org.apache.druid.timeline.DataSegment; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.api.CuratorWatcher; import org.apache.curator.utils.ZKPaths; diff --git a/server/src/main/java/io/druid/server/coordinator/DataSourceCompactionConfig.java b/server/src/main/java/org/apache/druid/server/coordinator/DataSourceCompactionConfig.java similarity index 97% rename from server/src/main/java/io/druid/server/coordinator/DataSourceCompactionConfig.java rename to server/src/main/java/org/apache/druid/server/coordinator/DataSourceCompactionConfig.java index 2c8787033d01..1ddcc9e6e734 100644 --- a/server/src/main/java/io/druid/server/coordinator/DataSourceCompactionConfig.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/DataSourceCompactionConfig.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.client.indexing.ClientCompactQueryTuningConfig; +import org.apache.druid.client.indexing.ClientCompactQueryTuningConfig; import org.joda.time.Period; import javax.annotation.Nullable; diff --git a/server/src/main/java/io/druid/server/coordinator/DatasourceWhitelist.java b/server/src/main/java/org/apache/druid/server/coordinator/DatasourceWhitelist.java similarity index 97% rename from server/src/main/java/io/druid/server/coordinator/DatasourceWhitelist.java rename to server/src/main/java/org/apache/druid/server/coordinator/DatasourceWhitelist.java index 41d7b5ad742c..6d89be3863fe 100644 --- a/server/src/main/java/io/druid/server/coordinator/DatasourceWhitelist.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/DatasourceWhitelist.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/server/src/main/java/io/druid/server/coordinator/DiskNormalizedCostBalancerStrategy.java b/server/src/main/java/org/apache/druid/server/coordinator/DiskNormalizedCostBalancerStrategy.java similarity index 95% rename from server/src/main/java/io/druid/server/coordinator/DiskNormalizedCostBalancerStrategy.java rename to server/src/main/java/org/apache/druid/server/coordinator/DiskNormalizedCostBalancerStrategy.java index b0bd5994be18..1447bf5c121f 100644 --- a/server/src/main/java/io/druid/server/coordinator/DiskNormalizedCostBalancerStrategy.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/DiskNormalizedCostBalancerStrategy.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.google.common.util.concurrent.ListeningExecutorService; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; public class DiskNormalizedCostBalancerStrategy extends CostBalancerStrategy { diff --git a/server/src/main/java/io/druid/server/coordinator/DiskNormalizedCostBalancerStrategyFactory.java b/server/src/main/java/org/apache/druid/server/coordinator/DiskNormalizedCostBalancerStrategyFactory.java similarity index 96% rename from server/src/main/java/io/druid/server/coordinator/DiskNormalizedCostBalancerStrategyFactory.java rename to server/src/main/java/org/apache/druid/server/coordinator/DiskNormalizedCostBalancerStrategyFactory.java index dbe50d6316c7..90fc6f9673bf 100644 --- a/server/src/main/java/io/druid/server/coordinator/DiskNormalizedCostBalancerStrategyFactory.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/DiskNormalizedCostBalancerStrategyFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.google.common.util.concurrent.ListeningExecutorService; diff --git a/server/src/main/java/io/druid/server/coordinator/DruidCluster.java b/server/src/main/java/org/apache/druid/server/coordinator/DruidCluster.java similarity index 96% rename from server/src/main/java/io/druid/server/coordinator/DruidCluster.java rename to server/src/main/java/org/apache/druid/server/coordinator/DruidCluster.java index 912a9a059c82..c5ba2a53f83c 100644 --- a/server/src/main/java/io/druid/server/coordinator/DruidCluster.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/DruidCluster.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.google.common.annotations.VisibleForTesting; -import io.druid.client.ImmutableDruidServer; -import io.druid.java.util.common.IAE; +import org.apache.druid.client.ImmutableDruidServer; +import org.apache.druid.java.util.common.IAE; import javax.annotation.Nullable; import java.util.ArrayList; diff --git a/server/src/main/java/io/druid/server/coordinator/DruidCoordinator.java b/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinator.java similarity index 90% rename from server/src/main/java/io/druid/server/coordinator/DruidCoordinator.java rename to server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinator.java index 253caf1ec43f..1589c1cee545 100644 --- a/server/src/main/java/io/druid/server/coordinator/DruidCoordinator.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.google.common.base.Function; import com.google.common.base.Throwables; @@ -29,48 +29,48 @@ import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.inject.Inject; -import io.druid.client.DruidDataSource; -import io.druid.client.DruidServer; -import io.druid.client.ImmutableDruidDataSource; -import io.druid.client.ImmutableDruidServer; -import io.druid.client.ServerInventoryView; -import io.druid.client.coordinator.Coordinator; -import io.druid.client.indexing.IndexingServiceClient; -import io.druid.common.config.JacksonConfigManager; -import io.druid.curator.discovery.ServiceAnnouncer; -import io.druid.discovery.DruidLeaderSelector; -import io.druid.guice.ManageLifecycle; -import io.druid.guice.annotations.CoordinatorIndexingServiceHelper; -import io.druid.guice.annotations.Self; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.concurrent.ScheduledExecutorFactory; -import io.druid.java.util.common.concurrent.ScheduledExecutors; -import io.druid.java.util.common.guava.Comparators; -import io.druid.java.util.common.guava.FunctionalIterable; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.metadata.MetadataRuleManager; -import io.druid.metadata.MetadataSegmentManager; -import io.druid.server.DruidNode; -import io.druid.server.coordinator.helper.DruidCoordinatorBalancer; -import io.druid.server.coordinator.helper.DruidCoordinatorCleanupOvershadowed; -import io.druid.server.coordinator.helper.DruidCoordinatorCleanupUnneeded; -import io.druid.server.coordinator.helper.DruidCoordinatorHelper; -import io.druid.server.coordinator.helper.DruidCoordinatorLogger; -import io.druid.server.coordinator.helper.DruidCoordinatorRuleRunner; -import io.druid.server.coordinator.helper.DruidCoordinatorSegmentCompactor; -import io.druid.server.coordinator.helper.DruidCoordinatorSegmentInfoLoader; -import io.druid.server.coordinator.rules.LoadRule; -import io.druid.server.coordinator.rules.Rule; -import io.druid.server.initialization.ZkPathsConfig; -import io.druid.server.lookup.cache.LookupCoordinatorManager; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.DruidDataSource; +import org.apache.druid.client.DruidServer; +import org.apache.druid.client.ImmutableDruidDataSource; +import org.apache.druid.client.ImmutableDruidServer; +import org.apache.druid.client.ServerInventoryView; +import org.apache.druid.client.coordinator.Coordinator; +import org.apache.druid.client.indexing.IndexingServiceClient; +import org.apache.druid.common.config.JacksonConfigManager; +import org.apache.druid.curator.discovery.ServiceAnnouncer; +import org.apache.druid.discovery.DruidLeaderSelector; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.guice.annotations.CoordinatorIndexingServiceHelper; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.concurrent.ScheduledExecutorFactory; +import org.apache.druid.java.util.common.concurrent.ScheduledExecutors; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.java.util.common.guava.FunctionalIterable; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.metadata.MetadataRuleManager; +import org.apache.druid.metadata.MetadataSegmentManager; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.coordinator.helper.DruidCoordinatorBalancer; +import org.apache.druid.server.coordinator.helper.DruidCoordinatorCleanupOvershadowed; +import org.apache.druid.server.coordinator.helper.DruidCoordinatorCleanupUnneeded; +import org.apache.druid.server.coordinator.helper.DruidCoordinatorHelper; +import org.apache.druid.server.coordinator.helper.DruidCoordinatorLogger; +import org.apache.druid.server.coordinator.helper.DruidCoordinatorRuleRunner; +import org.apache.druid.server.coordinator.helper.DruidCoordinatorSegmentCompactor; +import org.apache.druid.server.coordinator.helper.DruidCoordinatorSegmentInfoLoader; +import org.apache.druid.server.coordinator.rules.LoadRule; +import org.apache.druid.server.coordinator.rules.Rule; +import org.apache.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.server.lookup.cache.LookupCoordinatorManager; +import org.apache.druid.timeline.DataSegment; import it.unimi.dsi.fastutil.objects.Object2LongMap; import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap; import org.apache.curator.framework.CuratorFramework; @@ -299,7 +299,7 @@ public Map getLoadStatus() final DruidDataSource loadedView = druidServer.getDataSource(dataSource.getName()); if (loadedView != null) { // This does not use segments.removeAll(loadedView.getSegments()) for performance reasons. - // Please see https://github.com/druid-io/druid/pull/5632 and LoadStatusBenchmark for more info. + // Please see https://github.com/apache/incubator-druid/pull/5632 and LoadStatusBenchmark for more info. for (DataSegment serverSegment : loadedView.getSegments()) { segments.remove(serverSegment); } diff --git a/server/src/main/java/io/druid/server/coordinator/DruidCoordinatorCleanupPendingSegments.java b/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinatorCleanupPendingSegments.java similarity index 90% rename from server/src/main/java/io/druid/server/coordinator/DruidCoordinatorCleanupPendingSegments.java rename to server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinatorCleanupPendingSegments.java index a2ec3c22562e..6ccc9338ac52 100644 --- a/server/src/main/java/io/druid/server/coordinator/DruidCoordinatorCleanupPendingSegments.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinatorCleanupPendingSegments.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.google.common.base.Preconditions; import com.google.inject.Inject; -import io.druid.client.indexing.IndexingServiceClient; -import io.druid.indexer.TaskStatusPlus; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.guava.Comparators; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.coordinator.helper.DruidCoordinatorHelper; +import org.apache.druid.client.indexing.IndexingServiceClient; +import org.apache.druid.indexer.TaskStatusPlus; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.coordinator.helper.DruidCoordinatorHelper; import org.joda.time.DateTime; import org.joda.time.Period; diff --git a/server/src/main/java/io/druid/server/coordinator/DruidCoordinatorConfig.java b/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinatorConfig.java similarity index 98% rename from server/src/main/java/io/druid/server/coordinator/DruidCoordinatorConfig.java rename to server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinatorConfig.java index eeafcb7b17dc..32eb87c1f675 100644 --- a/server/src/main/java/io/druid/server/coordinator/DruidCoordinatorConfig.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinatorConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import org.joda.time.Duration; import org.skife.config.Config; diff --git a/server/src/main/java/io/druid/server/coordinator/DruidCoordinatorRuntimeParams.java b/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinatorRuntimeParams.java similarity index 96% rename from server/src/main/java/io/druid/server/coordinator/DruidCoordinatorRuntimeParams.java rename to server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinatorRuntimeParams.java index f57ff8374c32..69eea863bfc5 100644 --- a/server/src/main/java/io/druid/server/coordinator/DruidCoordinatorRuntimeParams.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinatorRuntimeParams.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.client.ImmutableDruidDataSource; -import io.druid.java.util.common.DateTimes; -import io.druid.metadata.MetadataRuleManager; -import io.druid.timeline.DataSegment; -import io.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.client.ImmutableDruidDataSource; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.metadata.MetadataRuleManager; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.VersionedIntervalTimeline; import org.joda.time.DateTime; import java.util.Collection; diff --git a/server/src/main/java/io/druid/server/coordinator/HttpLoadQueuePeon.java b/server/src/main/java/org/apache/druid/server/coordinator/HttpLoadQueuePeon.java similarity index 94% rename from server/src/main/java/io/druid/server/coordinator/HttpLoadQueuePeon.java rename to server/src/main/java/org/apache/druid/server/coordinator/HttpLoadQueuePeon.java index c6392bfc56fc..87f2e8599817 100644 --- a/server/src/main/java/io/druid/server/coordinator/HttpLoadQueuePeon.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/HttpLoadQueuePeon.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -28,23 +28,23 @@ import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.RE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.ScheduledExecutors; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.Request; -import io.druid.java.util.http.client.io.AppendableByteArrayInputStream; -import io.druid.java.util.http.client.response.ClientResponse; -import io.druid.java.util.http.client.response.InputStreamResponseHandler; -import io.druid.server.coordination.DataSegmentChangeCallback; -import io.druid.server.coordination.DataSegmentChangeHandler; -import io.druid.server.coordination.DataSegmentChangeRequest; -import io.druid.server.coordination.SegmentChangeRequestDrop; -import io.druid.server.coordination.SegmentChangeRequestLoad; -import io.druid.server.coordination.SegmentLoadDropHandler; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.ScheduledExecutors; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.Request; +import org.apache.druid.java.util.http.client.io.AppendableByteArrayInputStream; +import org.apache.druid.java.util.http.client.response.ClientResponse; +import org.apache.druid.java.util.http.client.response.InputStreamResponseHandler; +import org.apache.druid.server.coordination.DataSegmentChangeCallback; +import org.apache.druid.server.coordination.DataSegmentChangeHandler; +import org.apache.druid.server.coordination.DataSegmentChangeRequest; +import org.apache.druid.server.coordination.SegmentChangeRequestDrop; +import org.apache.druid.server.coordination.SegmentChangeRequestLoad; +import org.apache.druid.server.coordination.SegmentLoadDropHandler; +import org.apache.druid.timeline.DataSegment; import org.jboss.netty.handler.codec.http.HttpHeaders; import org.jboss.netty.handler.codec.http.HttpMethod; import org.jboss.netty.handler.codec.http.HttpResponse; diff --git a/server/src/main/java/io/druid/server/coordinator/LoadPeonCallback.java b/server/src/main/java/org/apache/druid/server/coordinator/LoadPeonCallback.java similarity index 96% rename from server/src/main/java/io/druid/server/coordinator/LoadPeonCallback.java rename to server/src/main/java/org/apache/druid/server/coordinator/LoadPeonCallback.java index 6dc8c0245993..67ff8f387f4a 100644 --- a/server/src/main/java/io/druid/server/coordinator/LoadPeonCallback.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/LoadPeonCallback.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; /** */ diff --git a/server/src/main/java/io/druid/server/coordinator/LoadQueuePeon.java b/server/src/main/java/org/apache/druid/server/coordinator/LoadQueuePeon.java similarity index 95% rename from server/src/main/java/io/druid/server/coordinator/LoadQueuePeon.java rename to server/src/main/java/org/apache/druid/server/coordinator/LoadQueuePeon.java index 7bfb120e56e6..7fd5e853e25b 100644 --- a/server/src/main/java/io/druid/server/coordinator/LoadQueuePeon.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/LoadQueuePeon.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import java.util.Set; diff --git a/server/src/main/java/io/druid/server/coordinator/LoadQueueTaskMaster.java b/server/src/main/java/org/apache/druid/server/coordinator/LoadQueueTaskMaster.java similarity index 91% rename from server/src/main/java/io/druid/server/coordinator/LoadQueueTaskMaster.java rename to server/src/main/java/org/apache/druid/server/coordinator/LoadQueueTaskMaster.java index 1b0832fced5a..7b4b9857d3ee 100644 --- a/server/src/main/java/io/druid/server/coordinator/LoadQueueTaskMaster.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/LoadQueueTaskMaster.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.client.ImmutableDruidServer; -import io.druid.java.util.http.client.HttpClient; -import io.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.client.ImmutableDruidServer; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.server.initialization.ZkPathsConfig; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.utils.ZKPaths; diff --git a/server/src/main/java/io/druid/server/coordinator/RandomBalancerStrategy.java b/server/src/main/java/org/apache/druid/server/coordinator/RandomBalancerStrategy.java similarity index 96% rename from server/src/main/java/io/druid/server/coordinator/RandomBalancerStrategy.java rename to server/src/main/java/org/apache/druid/server/coordinator/RandomBalancerStrategy.java index 9dbd0ba433bb..1c123c467207 100644 --- a/server/src/main/java/io/druid/server/coordinator/RandomBalancerStrategy.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/RandomBalancerStrategy.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import java.util.Comparator; import java.util.Iterator; diff --git a/server/src/main/java/io/druid/server/coordinator/RandomBalancerStrategyFactory.java b/server/src/main/java/org/apache/druid/server/coordinator/RandomBalancerStrategyFactory.java similarity index 96% rename from server/src/main/java/io/druid/server/coordinator/RandomBalancerStrategyFactory.java rename to server/src/main/java/org/apache/druid/server/coordinator/RandomBalancerStrategyFactory.java index 7e7e612d8913..e5770c5073da 100644 --- a/server/src/main/java/io/druid/server/coordinator/RandomBalancerStrategyFactory.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/RandomBalancerStrategyFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.google.common.util.concurrent.ListeningExecutorService; diff --git a/server/src/main/java/io/druid/server/coordinator/ReplicationThrottler.java b/server/src/main/java/org/apache/druid/server/coordinator/ReplicationThrottler.java similarity index 97% rename from server/src/main/java/io/druid/server/coordinator/ReplicationThrottler.java rename to server/src/main/java/org/apache/druid/server/coordinator/ReplicationThrottler.java index cd38448f2139..8935f093f467 100644 --- a/server/src/main/java/io/druid/server/coordinator/ReplicationThrottler.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/ReplicationThrottler.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.common.StringUtils; import java.util.List; import java.util.Map; diff --git a/server/src/main/java/io/druid/server/coordinator/ReservoirSegmentSampler.java b/server/src/main/java/org/apache/druid/server/coordinator/ReservoirSegmentSampler.java similarity index 94% rename from server/src/main/java/io/druid/server/coordinator/ReservoirSegmentSampler.java rename to server/src/main/java/org/apache/druid/server/coordinator/ReservoirSegmentSampler.java index 48fd4e1d01f5..7d2b19a3ae5c 100644 --- a/server/src/main/java/io/druid/server/coordinator/ReservoirSegmentSampler.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/ReservoirSegmentSampler.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import java.util.List; import java.util.Random; diff --git a/server/src/main/java/io/druid/server/coordinator/SegmentReplicantLookup.java b/server/src/main/java/org/apache/druid/server/coordinator/SegmentReplicantLookup.java similarity index 96% rename from server/src/main/java/io/druid/server/coordinator/SegmentReplicantLookup.java rename to server/src/main/java/org/apache/druid/server/coordinator/SegmentReplicantLookup.java index 245f49005efc..b5e01565a70a 100644 --- a/server/src/main/java/io/druid/server/coordinator/SegmentReplicantLookup.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/SegmentReplicantLookup.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.google.common.collect.HashBasedTable; import com.google.common.collect.Maps; import com.google.common.collect.Table; -import io.druid.client.ImmutableDruidServer; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.ImmutableDruidServer; +import org.apache.druid.timeline.DataSegment; import java.util.Map; import java.util.SortedSet; diff --git a/server/src/main/java/io/druid/server/coordinator/ServerHolder.java b/server/src/main/java/org/apache/druid/server/coordinator/ServerHolder.java similarity index 94% rename from server/src/main/java/io/druid/server/coordinator/ServerHolder.java rename to server/src/main/java/org/apache/druid/server/coordinator/ServerHolder.java index d01a608855c5..ab07cc689915 100644 --- a/server/src/main/java/io/druid/server/coordinator/ServerHolder.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/ServerHolder.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.google.common.primitives.Longs; -import io.druid.client.ImmutableDruidServer; -import io.druid.java.util.common.logger.Logger; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.ImmutableDruidServer; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.timeline.DataSegment; import java.util.Objects; diff --git a/server/src/main/java/io/druid/server/coordinator/cost/ClusterCostCache.java b/server/src/main/java/org/apache/druid/server/coordinator/cost/ClusterCostCache.java similarity index 96% rename from server/src/main/java/io/druid/server/coordinator/cost/ClusterCostCache.java rename to server/src/main/java/org/apache/druid/server/coordinator/cost/ClusterCostCache.java index d65de768a28d..63bf3c831933 100644 --- a/server/src/main/java/io/druid/server/coordinator/cost/ClusterCostCache.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/cost/ClusterCostCache.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.server.coordinator.cost; +package org.apache.druid.server.coordinator.cost; import com.google.common.base.Preconditions; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import java.util.HashMap; import java.util.Map; diff --git a/server/src/main/java/io/druid/server/coordinator/cost/SegmentsCostCache.java b/server/src/main/java/org/apache/druid/server/coordinator/cost/SegmentsCostCache.java similarity index 97% rename from server/src/main/java/io/druid/server/coordinator/cost/SegmentsCostCache.java rename to server/src/main/java/org/apache/druid/server/coordinator/cost/SegmentsCostCache.java index 5e266050d552..dd66a535f201 100644 --- a/server/src/main/java/io/druid/server/coordinator/cost/SegmentsCostCache.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/cost/SegmentsCostCache.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.server.coordinator.cost; +package org.apache.druid.server.coordinator.cost; import com.google.common.base.Preconditions; import com.google.common.collect.Ordering; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.DurationGranularity; -import io.druid.java.util.common.guava.Comparators; -import io.druid.server.coordinator.CostBalancerStrategy; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.DurationGranularity; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.server.coordinator.CostBalancerStrategy; +import org.apache.druid.timeline.DataSegment; import org.apache.commons.math3.util.FastMath; import org.joda.time.Interval; @@ -43,7 +43,7 @@ /** * SegmentsCostCache provides faster way to calculate cost function proposed in {@link CostBalancerStrategy}. - * See https://github.com/druid-io/druid/pull/2972 for more details about the cost function. + * See https://github.com/apache/incubator-druid/pull/2972 for more details about the cost function. * * Joint cost for two segments (you can make formulas below readable by copy-pasting to * https://www.codecogs.com/latex/eqneditor.php): diff --git a/server/src/main/java/io/druid/server/coordinator/cost/ServerCostCache.java b/server/src/main/java/org/apache/druid/server/coordinator/cost/ServerCostCache.java similarity index 96% rename from server/src/main/java/io/druid/server/coordinator/cost/ServerCostCache.java rename to server/src/main/java/org/apache/druid/server/coordinator/cost/ServerCostCache.java index b3f82ca000b8..1310b472e7ed 100644 --- a/server/src/main/java/io/druid/server/coordinator/cost/ServerCostCache.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/cost/ServerCostCache.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.server.coordinator.cost; +package org.apache.druid.server.coordinator.cost; import com.google.common.base.Preconditions; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import java.util.HashMap; import java.util.Map; diff --git a/server/src/main/java/io/druid/server/coordinator/cost/package-info.java b/server/src/main/java/org/apache/druid/server/coordinator/cost/package-info.java similarity index 94% rename from server/src/main/java/io/druid/server/coordinator/cost/package-info.java rename to server/src/main/java/org/apache/druid/server/coordinator/cost/package-info.java index 6302beeee1a6..16281bbebe67 100644 --- a/server/src/main/java/io/druid/server/coordinator/cost/package-info.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/cost/package-info.java @@ -18,6 +18,6 @@ */ @ParametersAreNonnullByDefault -package io.druid.server.coordinator.cost; +package org.apache.druid.server.coordinator.cost; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/src/main/java/io/druid/server/coordinator/helper/CompactionSegmentIterator.java b/server/src/main/java/org/apache/druid/server/coordinator/helper/CompactionSegmentIterator.java similarity index 93% rename from server/src/main/java/io/druid/server/coordinator/helper/CompactionSegmentIterator.java rename to server/src/main/java/org/apache/druid/server/coordinator/helper/CompactionSegmentIterator.java index 32e9b2918003..19a2e5a624d9 100644 --- a/server/src/main/java/io/druid/server/coordinator/helper/CompactionSegmentIterator.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/helper/CompactionSegmentIterator.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.server.coordinator.helper; +package org.apache.druid.server.coordinator.helper; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap; import java.util.Iterator; diff --git a/server/src/main/java/io/druid/server/coordinator/helper/CompactionSegmentSearchPolicy.java b/server/src/main/java/org/apache/druid/server/coordinator/helper/CompactionSegmentSearchPolicy.java similarity index 84% rename from server/src/main/java/io/druid/server/coordinator/helper/CompactionSegmentSearchPolicy.java rename to server/src/main/java/org/apache/druid/server/coordinator/helper/CompactionSegmentSearchPolicy.java index 42c9abd2ce97..db861630af80 100644 --- a/server/src/main/java/io/druid/server/coordinator/helper/CompactionSegmentSearchPolicy.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/helper/CompactionSegmentSearchPolicy.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.server.coordinator.helper; +package org.apache.druid.server.coordinator.helper; -import io.druid.server.coordinator.DataSourceCompactionConfig; -import io.druid.timeline.DataSegment; -import io.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.server.coordinator.DataSourceCompactionConfig; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.VersionedIntervalTimeline; import java.util.Map; diff --git a/server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorBalancer.java b/server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorBalancer.java similarity index 91% rename from server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorBalancer.java rename to server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorBalancer.java index b5bc8d1f0b03..97589c9bec0d 100644 --- a/server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorBalancer.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorBalancer.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.server.coordinator.helper; +package org.apache.druid.server.coordinator.helper; import com.google.common.collect.Lists; -import io.druid.client.ImmutableDruidServer; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.server.coordinator.BalancerSegmentHolder; -import io.druid.server.coordinator.BalancerStrategy; -import io.druid.server.coordinator.CoordinatorStats; -import io.druid.server.coordinator.DruidCoordinator; -import io.druid.server.coordinator.DruidCoordinatorRuntimeParams; -import io.druid.server.coordinator.LoadPeonCallback; -import io.druid.server.coordinator.LoadQueuePeon; -import io.druid.server.coordinator.ServerHolder; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.ImmutableDruidServer; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.server.coordinator.BalancerSegmentHolder; +import org.apache.druid.server.coordinator.BalancerStrategy; +import org.apache.druid.server.coordinator.CoordinatorStats; +import org.apache.druid.server.coordinator.DruidCoordinator; +import org.apache.druid.server.coordinator.DruidCoordinatorRuntimeParams; +import org.apache.druid.server.coordinator.LoadPeonCallback; +import org.apache.druid.server.coordinator.LoadQueuePeon; +import org.apache.druid.server.coordinator.ServerHolder; +import org.apache.druid.timeline.DataSegment; import java.util.Comparator; import java.util.HashMap; diff --git a/server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorCleanupOvershadowed.java b/server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorCleanupOvershadowed.java similarity index 82% rename from server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorCleanupOvershadowed.java rename to server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorCleanupOvershadowed.java index 9eac39b0fabb..6894934dbbf3 100644 --- a/server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorCleanupOvershadowed.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorCleanupOvershadowed.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.server.coordinator.helper; +package org.apache.druid.server.coordinator.helper; import com.google.common.collect.Maps; -import io.druid.client.ImmutableDruidDataSource; -import io.druid.client.ImmutableDruidServer; -import io.druid.java.util.common.guava.Comparators; -import io.druid.server.coordinator.CoordinatorStats; -import io.druid.server.coordinator.DruidCluster; -import io.druid.server.coordinator.DruidCoordinator; -import io.druid.server.coordinator.DruidCoordinatorRuntimeParams; -import io.druid.server.coordinator.ServerHolder; -import io.druid.timeline.DataSegment; -import io.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.client.ImmutableDruidDataSource; +import org.apache.druid.client.ImmutableDruidServer; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.server.coordinator.CoordinatorStats; +import org.apache.druid.server.coordinator.DruidCluster; +import org.apache.druid.server.coordinator.DruidCoordinator; +import org.apache.druid.server.coordinator.DruidCoordinatorRuntimeParams; +import org.apache.druid.server.coordinator.ServerHolder; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.VersionedIntervalTimeline; import java.util.Map; import java.util.SortedSet; diff --git a/server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorCleanupUnneeded.java b/server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorCleanupUnneeded.java similarity index 85% rename from server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorCleanupUnneeded.java rename to server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorCleanupUnneeded.java index 024d7abad04d..f7604835a253 100644 --- a/server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorCleanupUnneeded.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorCleanupUnneeded.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.server.coordinator.helper; +package org.apache.druid.server.coordinator.helper; -import io.druid.client.ImmutableDruidDataSource; -import io.druid.client.ImmutableDruidServer; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.coordinator.CoordinatorStats; -import io.druid.server.coordinator.DruidCluster; -import io.druid.server.coordinator.DruidCoordinator; -import io.druid.server.coordinator.DruidCoordinatorRuntimeParams; -import io.druid.server.coordinator.LoadQueuePeon; -import io.druid.server.coordinator.ServerHolder; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.ImmutableDruidDataSource; +import org.apache.druid.client.ImmutableDruidServer; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.coordinator.CoordinatorStats; +import org.apache.druid.server.coordinator.DruidCluster; +import org.apache.druid.server.coordinator.DruidCoordinator; +import org.apache.druid.server.coordinator.DruidCoordinatorRuntimeParams; +import org.apache.druid.server.coordinator.LoadQueuePeon; +import org.apache.druid.server.coordinator.ServerHolder; +import org.apache.druid.timeline.DataSegment; import java.util.Set; import java.util.SortedSet; diff --git a/server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorHelper.java b/server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorHelper.java similarity index 91% rename from server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorHelper.java rename to server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorHelper.java index 191149c28fb2..a2752c352708 100644 --- a/server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorHelper.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorHelper.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.server.coordinator.helper; +package org.apache.druid.server.coordinator.helper; -import io.druid.server.coordinator.DruidCoordinatorRuntimeParams; +import org.apache.druid.server.coordinator.DruidCoordinatorRuntimeParams; /** */ diff --git a/server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorLogger.java b/server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorLogger.java similarity index 92% rename from server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorLogger.java rename to server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorLogger.java index 5047f01059c0..f56a3d7489af 100644 --- a/server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorLogger.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorLogger.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.server.coordinator.helper; +package org.apache.druid.server.coordinator.helper; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.client.ImmutableDruidServer; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.DruidMetrics; -import io.druid.server.coordinator.CoordinatorStats; -import io.druid.server.coordinator.DruidCluster; -import io.druid.server.coordinator.DruidCoordinator; -import io.druid.server.coordinator.DruidCoordinatorRuntimeParams; -import io.druid.server.coordinator.LoadQueuePeon; -import io.druid.server.coordinator.ServerHolder; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.PartitionChunk; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.client.ImmutableDruidServer; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.DruidMetrics; +import org.apache.druid.server.coordinator.CoordinatorStats; +import org.apache.druid.server.coordinator.DruidCluster; +import org.apache.druid.server.coordinator.DruidCoordinator; +import org.apache.druid.server.coordinator.DruidCoordinatorRuntimeParams; +import org.apache.druid.server.coordinator.LoadQueuePeon; +import org.apache.druid.server.coordinator.ServerHolder; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.PartitionChunk; import it.unimi.dsi.fastutil.objects.Object2LongMap; import java.util.List; diff --git a/server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorRuleRunner.java b/server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorRuleRunner.java similarity index 88% rename from server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorRuleRunner.java rename to server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorRuleRunner.java index f95e87f534aa..82681c64921a 100644 --- a/server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorRuleRunner.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorRuleRunner.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.server.coordinator.helper; +package org.apache.druid.server.coordinator.helper; import com.google.common.collect.Lists; import com.google.common.collect.Ordering; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.metadata.MetadataRuleManager; -import io.druid.server.coordinator.CoordinatorStats; -import io.druid.server.coordinator.DruidCluster; -import io.druid.server.coordinator.DruidCoordinator; -import io.druid.server.coordinator.DruidCoordinatorRuntimeParams; -import io.druid.server.coordinator.ReplicationThrottler; -import io.druid.server.coordinator.rules.Rule; -import io.druid.timeline.DataSegment; -import io.druid.timeline.TimelineObjectHolder; -import io.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.metadata.MetadataRuleManager; +import org.apache.druid.server.coordinator.CoordinatorStats; +import org.apache.druid.server.coordinator.DruidCluster; +import org.apache.druid.server.coordinator.DruidCoordinator; +import org.apache.druid.server.coordinator.DruidCoordinatorRuntimeParams; +import org.apache.druid.server.coordinator.ReplicationThrottler; +import org.apache.druid.server.coordinator.rules.Rule; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.TimelineObjectHolder; +import org.apache.druid.timeline.VersionedIntervalTimeline; import org.joda.time.DateTime; import java.util.HashMap; diff --git a/server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorSegmentCompactor.java b/server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorSegmentCompactor.java similarity index 92% rename from server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorSegmentCompactor.java rename to server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorSegmentCompactor.java index 4a3e4900d081..20943b875d35 100644 --- a/server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorSegmentCompactor.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorSegmentCompactor.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.server.coordinator.helper; +package org.apache.druid.server.coordinator.helper; import com.google.inject.Inject; -import io.druid.client.indexing.IndexingServiceClient; -import io.druid.indexer.TaskStatusPlus; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.coordinator.CoordinatorCompactionConfig; -import io.druid.server.coordinator.CoordinatorStats; -import io.druid.server.coordinator.DataSourceCompactionConfig; -import io.druid.server.coordinator.DruidCoordinatorRuntimeParams; -import io.druid.timeline.DataSegment; -import io.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.client.indexing.IndexingServiceClient; +import org.apache.druid.indexer.TaskStatusPlus; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.coordinator.CoordinatorCompactionConfig; +import org.apache.druid.server.coordinator.CoordinatorStats; +import org.apache.druid.server.coordinator.DataSourceCompactionConfig; +import org.apache.druid.server.coordinator.DruidCoordinatorRuntimeParams; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.VersionedIntervalTimeline; import it.unimi.dsi.fastutil.objects.Object2LongMap; import javax.annotation.Nullable; diff --git a/server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorSegmentInfoLoader.java b/server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorSegmentInfoLoader.java similarity index 86% rename from server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorSegmentInfoLoader.java rename to server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorSegmentInfoLoader.java index 524be3fe5bd4..788b0d5c2da8 100644 --- a/server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorSegmentInfoLoader.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorSegmentInfoLoader.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.server.coordinator.helper; +package org.apache.druid.server.coordinator.helper; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.coordinator.DruidCoordinator; -import io.druid.server.coordinator.DruidCoordinatorRuntimeParams; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.coordinator.DruidCoordinator; +import org.apache.druid.server.coordinator.DruidCoordinatorRuntimeParams; +import org.apache.druid.timeline.DataSegment; import java.util.Set; diff --git a/server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorSegmentKiller.java b/server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorSegmentKiller.java similarity index 90% rename from server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorSegmentKiller.java rename to server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorSegmentKiller.java index 4153682aad8c..7030e3e6dda1 100644 --- a/server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorSegmentKiller.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorSegmentKiller.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.server.coordinator.helper; +package org.apache.druid.server.coordinator.helper; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.inject.Inject; -import io.druid.client.indexing.IndexingServiceClient; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.JodaUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.metadata.MetadataSegmentManager; -import io.druid.server.coordinator.DruidCoordinatorConfig; -import io.druid.server.coordinator.DruidCoordinatorRuntimeParams; +import org.apache.druid.client.indexing.IndexingServiceClient; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.JodaUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.metadata.MetadataSegmentManager; +import org.apache.druid.server.coordinator.DruidCoordinatorConfig; +import org.apache.druid.server.coordinator.DruidCoordinatorRuntimeParams; import org.joda.time.Interval; import java.util.Collection; diff --git a/server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorSegmentMerger.java b/server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorSegmentMerger.java similarity index 92% rename from server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorSegmentMerger.java rename to server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorSegmentMerger.java index 38b889d12f91..7486dcea22e0 100644 --- a/server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorSegmentMerger.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorSegmentMerger.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordinator.helper; +package org.apache.druid.server.coordinator.helper; import com.google.common.base.Function; import com.google.common.base.Preconditions; @@ -29,22 +29,22 @@ import com.google.common.collect.Multiset; import com.google.common.collect.Ordering; import com.google.inject.Inject; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.client.indexing.IndexingServiceClient; -import io.druid.common.config.JacksonConfigManager; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.guava.FunctionalIterable; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.coordinator.CoordinatorStats; -import io.druid.server.coordinator.DatasourceWhitelist; -import io.druid.server.coordinator.DruidCoordinatorRuntimeParams; -import io.druid.timeline.DataSegment; -import io.druid.timeline.TimelineObjectHolder; -import io.druid.timeline.VersionedIntervalTimeline; -import io.druid.timeline.partition.NoneShardSpec; -import io.druid.timeline.partition.PartitionChunk; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.client.indexing.IndexingServiceClient; +import org.apache.druid.common.config.JacksonConfigManager; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.guava.FunctionalIterable; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.coordinator.CoordinatorStats; +import org.apache.druid.server.coordinator.DatasourceWhitelist; +import org.apache.druid.server.coordinator.DruidCoordinatorRuntimeParams; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.TimelineObjectHolder; +import org.apache.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.timeline.partition.PartitionChunk; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorVersionConverter.java b/server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorVersionConverter.java similarity index 82% rename from server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorVersionConverter.java rename to server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorVersionConverter.java index 5f9202ed58b9..5ef69344810d 100644 --- a/server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorVersionConverter.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorVersionConverter.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.server.coordinator.helper; +package org.apache.druid.server.coordinator.helper; import com.google.inject.Inject; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.client.indexing.IndexingServiceClient; -import io.druid.common.config.JacksonConfigManager; -import io.druid.segment.IndexIO; -import io.druid.server.coordinator.DatasourceWhitelist; -import io.druid.server.coordinator.DruidCoordinatorRuntimeParams; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.client.indexing.IndexingServiceClient; +import org.apache.druid.common.config.JacksonConfigManager; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.server.coordinator.DatasourceWhitelist; +import org.apache.druid.server.coordinator.DruidCoordinatorRuntimeParams; +import org.apache.druid.timeline.DataSegment; import java.util.concurrent.atomic.AtomicReference; diff --git a/server/src/main/java/io/druid/server/coordinator/helper/NewestSegmentFirstIterator.java b/server/src/main/java/org/apache/druid/server/coordinator/helper/NewestSegmentFirstIterator.java similarity index 96% rename from server/src/main/java/io/druid/server/coordinator/helper/NewestSegmentFirstIterator.java rename to server/src/main/java/org/apache/druid/server/coordinator/helper/NewestSegmentFirstIterator.java index 56b0faaa043f..e5a19c5e3818 100644 --- a/server/src/main/java/io/druid/server/coordinator/helper/NewestSegmentFirstIterator.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/helper/NewestSegmentFirstIterator.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.server.coordinator.helper; +package org.apache.druid.server.coordinator.helper; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.guava.Comparators; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.coordinator.DataSourceCompactionConfig; -import io.druid.timeline.DataSegment; -import io.druid.timeline.TimelineObjectHolder; -import io.druid.timeline.VersionedIntervalTimeline; -import io.druid.timeline.partition.PartitionChunk; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.coordinator.DataSourceCompactionConfig; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.TimelineObjectHolder; +import org.apache.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.timeline.partition.PartitionChunk; import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/server/src/main/java/io/druid/server/coordinator/helper/NewestSegmentFirstPolicy.java b/server/src/main/java/org/apache/druid/server/coordinator/helper/NewestSegmentFirstPolicy.java similarity index 84% rename from server/src/main/java/io/druid/server/coordinator/helper/NewestSegmentFirstPolicy.java rename to server/src/main/java/org/apache/druid/server/coordinator/helper/NewestSegmentFirstPolicy.java index 9b754a82ea31..19b882e00976 100644 --- a/server/src/main/java/io/druid/server/coordinator/helper/NewestSegmentFirstPolicy.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/helper/NewestSegmentFirstPolicy.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.server.coordinator.helper; +package org.apache.druid.server.coordinator.helper; -import io.druid.server.coordinator.DataSourceCompactionConfig; -import io.druid.timeline.DataSegment; -import io.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.server.coordinator.DataSourceCompactionConfig; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.VersionedIntervalTimeline; import java.util.Map; diff --git a/server/src/main/java/io/druid/server/coordinator/helper/SegmentCompactorUtil.java b/server/src/main/java/org/apache/druid/server/coordinator/helper/SegmentCompactorUtil.java similarity index 98% rename from server/src/main/java/io/druid/server/coordinator/helper/SegmentCompactorUtil.java rename to server/src/main/java/org/apache/druid/server/coordinator/helper/SegmentCompactorUtil.java index 04d1e81cb749..f25d1f471caa 100644 --- a/server/src/main/java/io/druid/server/coordinator/helper/SegmentCompactorUtil.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/helper/SegmentCompactorUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordinator.helper; +package org.apache.druid.server.coordinator.helper; import com.google.common.base.Preconditions; import org.joda.time.Duration; diff --git a/server/src/main/java/io/druid/server/coordinator/rules/BroadcastDistributionRule.java b/server/src/main/java/org/apache/druid/server/coordinator/rules/BroadcastDistributionRule.java similarity index 90% rename from server/src/main/java/io/druid/server/coordinator/rules/BroadcastDistributionRule.java rename to server/src/main/java/org/apache/druid/server/coordinator/rules/BroadcastDistributionRule.java index 6d8dea510e1b..99f7089a0600 100644 --- a/server/src/main/java/io/druid/server/coordinator/rules/BroadcastDistributionRule.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/rules/BroadcastDistributionRule.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.server.coordinator.rules; +package org.apache.druid.server.coordinator.rules; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.server.coordinator.CoordinatorStats; -import io.druid.server.coordinator.DruidCoordinator; -import io.druid.server.coordinator.DruidCoordinatorRuntimeParams; -import io.druid.server.coordinator.ServerHolder; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.server.coordinator.CoordinatorStats; +import org.apache.druid.server.coordinator.DruidCoordinator; +import org.apache.druid.server.coordinator.DruidCoordinatorRuntimeParams; +import org.apache.druid.server.coordinator.ServerHolder; +import org.apache.druid.timeline.DataSegment; import java.util.HashSet; import java.util.List; diff --git a/server/src/main/java/io/druid/server/coordinator/rules/DropRule.java b/server/src/main/java/org/apache/druid/server/coordinator/rules/DropRule.java similarity index 80% rename from server/src/main/java/io/druid/server/coordinator/rules/DropRule.java rename to server/src/main/java/org/apache/druid/server/coordinator/rules/DropRule.java index 71e0c9115897..fdd017802f52 100644 --- a/server/src/main/java/io/druid/server/coordinator/rules/DropRule.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/rules/DropRule.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.server.coordinator.rules; +package org.apache.druid.server.coordinator.rules; -import io.druid.server.coordinator.CoordinatorStats; -import io.druid.server.coordinator.DruidCoordinator; -import io.druid.server.coordinator.DruidCoordinatorRuntimeParams; -import io.druid.timeline.DataSegment; +import org.apache.druid.server.coordinator.CoordinatorStats; +import org.apache.druid.server.coordinator.DruidCoordinator; +import org.apache.druid.server.coordinator.DruidCoordinatorRuntimeParams; +import org.apache.druid.timeline.DataSegment; /** * DropRules indicate when segments should be completely removed from the cluster. diff --git a/server/src/main/java/io/druid/server/coordinator/rules/ForeverBroadcastDistributionRule.java b/server/src/main/java/org/apache/druid/server/coordinator/rules/ForeverBroadcastDistributionRule.java similarity index 95% rename from server/src/main/java/io/druid/server/coordinator/rules/ForeverBroadcastDistributionRule.java rename to server/src/main/java/org/apache/druid/server/coordinator/rules/ForeverBroadcastDistributionRule.java index 03d70fb5c684..d095f1100aea 100644 --- a/server/src/main/java/io/druid/server/coordinator/rules/ForeverBroadcastDistributionRule.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/rules/ForeverBroadcastDistributionRule.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.server.coordinator.rules; +package org.apache.druid.server.coordinator.rules; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/server/src/main/java/io/druid/server/coordinator/rules/ForeverDropRule.java b/server/src/main/java/org/apache/druid/server/coordinator/rules/ForeverDropRule.java similarity index 93% rename from server/src/main/java/io/druid/server/coordinator/rules/ForeverDropRule.java rename to server/src/main/java/org/apache/druid/server/coordinator/rules/ForeverDropRule.java index a50a53f56326..19479c015b91 100644 --- a/server/src/main/java/io/druid/server/coordinator/rules/ForeverDropRule.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/rules/ForeverDropRule.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.server.coordinator.rules; +package org.apache.druid.server.coordinator.rules; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/server/src/main/java/io/druid/server/coordinator/rules/ForeverLoadRule.java b/server/src/main/java/org/apache/druid/server/coordinator/rules/ForeverLoadRule.java similarity index 93% rename from server/src/main/java/io/druid/server/coordinator/rules/ForeverLoadRule.java rename to server/src/main/java/org/apache/druid/server/coordinator/rules/ForeverLoadRule.java index 4c236c2f0838..a509877aa951 100644 --- a/server/src/main/java/io/druid/server/coordinator/rules/ForeverLoadRule.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/rules/ForeverLoadRule.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.server.coordinator.rules; +package org.apache.druid.server.coordinator.rules; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableMap; -import io.druid.client.DruidServer; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.DruidServer; +import org.apache.druid.timeline.DataSegment; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/server/src/main/java/io/druid/server/coordinator/rules/IntervalBroadcastDistributionRule.java b/server/src/main/java/org/apache/druid/server/coordinator/rules/IntervalBroadcastDistributionRule.java similarity index 96% rename from server/src/main/java/io/druid/server/coordinator/rules/IntervalBroadcastDistributionRule.java rename to server/src/main/java/org/apache/druid/server/coordinator/rules/IntervalBroadcastDistributionRule.java index 512c0b1bb485..c40dff7268aa 100644 --- a/server/src/main/java/io/druid/server/coordinator/rules/IntervalBroadcastDistributionRule.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/rules/IntervalBroadcastDistributionRule.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.server.coordinator.rules; +package org.apache.druid.server.coordinator.rules; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/server/src/main/java/io/druid/server/coordinator/rules/IntervalDropRule.java b/server/src/main/java/org/apache/druid/server/coordinator/rules/IntervalDropRule.java similarity index 94% rename from server/src/main/java/io/druid/server/coordinator/rules/IntervalDropRule.java rename to server/src/main/java/org/apache/druid/server/coordinator/rules/IntervalDropRule.java index 3413108d49a1..46f8f330fb38 100644 --- a/server/src/main/java/io/druid/server/coordinator/rules/IntervalDropRule.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/rules/IntervalDropRule.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.server.coordinator.rules; +package org.apache.druid.server.coordinator.rules; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/server/src/main/java/io/druid/server/coordinator/rules/IntervalLoadRule.java b/server/src/main/java/org/apache/druid/server/coordinator/rules/IntervalLoadRule.java similarity index 94% rename from server/src/main/java/io/druid/server/coordinator/rules/IntervalLoadRule.java rename to server/src/main/java/org/apache/druid/server/coordinator/rules/IntervalLoadRule.java index 20fb1753ae21..b5f553a60e60 100644 --- a/server/src/main/java/io/druid/server/coordinator/rules/IntervalLoadRule.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/rules/IntervalLoadRule.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.server.coordinator.rules; +package org.apache.druid.server.coordinator.rules; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableMap; -import io.druid.client.DruidServer; -import io.druid.java.util.common.logger.Logger; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.DruidServer; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.timeline.DataSegment; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/server/src/main/java/io/druid/server/coordinator/rules/LoadRule.java b/server/src/main/java/org/apache/druid/server/coordinator/rules/LoadRule.java similarity index 95% rename from server/src/main/java/io/druid/server/coordinator/rules/LoadRule.java rename to server/src/main/java/org/apache/druid/server/coordinator/rules/LoadRule.java index 11ba9c28756b..e455e939ae97 100644 --- a/server/src/main/java/io/druid/server/coordinator/rules/LoadRule.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/rules/LoadRule.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.server.coordinator.rules; - -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.server.coordinator.BalancerStrategy; -import io.druid.server.coordinator.CoordinatorStats; -import io.druid.server.coordinator.DruidCluster; -import io.druid.server.coordinator.DruidCoordinator; -import io.druid.server.coordinator.DruidCoordinatorRuntimeParams; -import io.druid.server.coordinator.ReplicationThrottler; -import io.druid.server.coordinator.ServerHolder; -import io.druid.timeline.DataSegment; +package org.apache.druid.server.coordinator.rules; + +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.server.coordinator.BalancerStrategy; +import org.apache.druid.server.coordinator.CoordinatorStats; +import org.apache.druid.server.coordinator.DruidCluster; +import org.apache.druid.server.coordinator.DruidCoordinator; +import org.apache.druid.server.coordinator.DruidCoordinatorRuntimeParams; +import org.apache.druid.server.coordinator.ReplicationThrottler; +import org.apache.druid.server.coordinator.ServerHolder; +import org.apache.druid.timeline.DataSegment; import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; diff --git a/server/src/main/java/io/druid/server/coordinator/rules/PeriodBroadcastDistributionRule.java b/server/src/main/java/org/apache/druid/server/coordinator/rules/PeriodBroadcastDistributionRule.java similarity index 96% rename from server/src/main/java/io/druid/server/coordinator/rules/PeriodBroadcastDistributionRule.java rename to server/src/main/java/org/apache/druid/server/coordinator/rules/PeriodBroadcastDistributionRule.java index 9248f06bfa1a..7d00bf7f4135 100644 --- a/server/src/main/java/io/druid/server/coordinator/rules/PeriodBroadcastDistributionRule.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/rules/PeriodBroadcastDistributionRule.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.server.coordinator.rules; +package org.apache.druid.server.coordinator.rules; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import org.joda.time.DateTime; import org.joda.time.Interval; import org.joda.time.Period; diff --git a/server/src/main/java/io/druid/server/coordinator/rules/PeriodDropRule.java b/server/src/main/java/org/apache/druid/server/coordinator/rules/PeriodDropRule.java similarity index 94% rename from server/src/main/java/io/druid/server/coordinator/rules/PeriodDropRule.java rename to server/src/main/java/org/apache/druid/server/coordinator/rules/PeriodDropRule.java index 0f7492b6c866..f26c3be49df3 100644 --- a/server/src/main/java/io/druid/server/coordinator/rules/PeriodDropRule.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/rules/PeriodDropRule.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.server.coordinator.rules; +package org.apache.druid.server.coordinator.rules; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import org.joda.time.DateTime; import org.joda.time.Interval; import org.joda.time.Period; diff --git a/server/src/main/java/io/druid/server/coordinator/rules/PeriodLoadRule.java b/server/src/main/java/org/apache/druid/server/coordinator/rules/PeriodLoadRule.java similarity index 92% rename from server/src/main/java/io/druid/server/coordinator/rules/PeriodLoadRule.java rename to server/src/main/java/org/apache/druid/server/coordinator/rules/PeriodLoadRule.java index fb3e07548d85..2fe36cc14fc7 100644 --- a/server/src/main/java/io/druid/server/coordinator/rules/PeriodLoadRule.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/rules/PeriodLoadRule.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.server.coordinator.rules; +package org.apache.druid.server.coordinator.rules; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableMap; -import io.druid.client.DruidServer; -import io.druid.java.util.common.logger.Logger; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.DruidServer; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.timeline.DataSegment; import org.joda.time.DateTime; import org.joda.time.Interval; import org.joda.time.Period; diff --git a/server/src/main/java/io/druid/server/coordinator/rules/Rule.java b/server/src/main/java/org/apache/druid/server/coordinator/rules/Rule.java similarity index 88% rename from server/src/main/java/io/druid/server/coordinator/rules/Rule.java rename to server/src/main/java/org/apache/druid/server/coordinator/rules/Rule.java index 589dd1024795..cbde064b4475 100644 --- a/server/src/main/java/io/druid/server/coordinator/rules/Rule.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/rules/Rule.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.server.coordinator.rules; +package org.apache.druid.server.coordinator.rules; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.druid.server.coordinator.CoordinatorStats; -import io.druid.server.coordinator.DruidCoordinator; -import io.druid.server.coordinator.DruidCoordinatorRuntimeParams; -import io.druid.timeline.DataSegment; +import org.apache.druid.server.coordinator.CoordinatorStats; +import org.apache.druid.server.coordinator.DruidCoordinator; +import org.apache.druid.server.coordinator.DruidCoordinatorRuntimeParams; +import org.apache.druid.timeline.DataSegment; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/server/src/main/java/io/druid/server/coordinator/rules/RuleMap.java b/server/src/main/java/org/apache/druid/server/coordinator/rules/RuleMap.java similarity index 96% rename from server/src/main/java/io/druid/server/coordinator/rules/RuleMap.java rename to server/src/main/java/org/apache/druid/server/coordinator/rules/RuleMap.java index 38bba974cccb..58fcce380a8e 100644 --- a/server/src/main/java/io/druid/server/coordinator/rules/RuleMap.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/rules/RuleMap.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordinator.rules; +package org.apache.druid.server.coordinator.rules; import com.google.common.collect.Lists; diff --git a/server/src/main/java/io/druid/server/coordinator/rules/Rules.java b/server/src/main/java/org/apache/druid/server/coordinator/rules/Rules.java similarity index 96% rename from server/src/main/java/io/druid/server/coordinator/rules/Rules.java rename to server/src/main/java/org/apache/druid/server/coordinator/rules/Rules.java index 56513d80e741..e5c65d9e850a 100644 --- a/server/src/main/java/io/druid/server/coordinator/rules/Rules.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/rules/Rules.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordinator.rules; +package org.apache.druid.server.coordinator.rules; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/server/src/main/java/io/druid/server/emitter/ComposingEmitterConfig.java b/server/src/main/java/org/apache/druid/server/emitter/ComposingEmitterConfig.java similarity index 96% rename from server/src/main/java/io/druid/server/emitter/ComposingEmitterConfig.java rename to server/src/main/java/org/apache/druid/server/emitter/ComposingEmitterConfig.java index 49465b1e1afa..30d96c0b5a44 100644 --- a/server/src/main/java/io/druid/server/emitter/ComposingEmitterConfig.java +++ b/server/src/main/java/org/apache/druid/server/emitter/ComposingEmitterConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.emitter; +package org.apache.druid.server.emitter; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; diff --git a/server/src/main/java/io/druid/server/emitter/ComposingEmitterModule.java b/server/src/main/java/org/apache/druid/server/emitter/ComposingEmitterModule.java similarity index 85% rename from server/src/main/java/io/druid/server/emitter/ComposingEmitterModule.java rename to server/src/main/java/org/apache/druid/server/emitter/ComposingEmitterModule.java index 331b53cd69a2..0d6728719978 100644 --- a/server/src/main/java/io/druid/server/emitter/ComposingEmitterModule.java +++ b/server/src/main/java/org/apache/druid/server/emitter/ComposingEmitterModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.emitter; +package org.apache.druid.server.emitter; import com.fasterxml.jackson.databind.Module; import com.google.common.base.Function; @@ -28,12 +28,12 @@ import com.google.inject.Provides; import com.google.inject.name.Named; import com.google.inject.name.Names; -import io.druid.java.util.emitter.core.ComposingEmitter; -import io.druid.java.util.emitter.core.Emitter; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.ManageLifecycle; -import io.druid.initialization.DruidModule; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.core.ComposingEmitter; +import org.apache.druid.java.util.emitter.core.Emitter; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.java.util.common.logger.Logger; import java.util.Collections; import java.util.List; diff --git a/server/src/main/java/io/druid/server/emitter/EmitterModule.java b/server/src/main/java/org/apache/druid/server/emitter/EmitterModule.java similarity index 89% rename from server/src/main/java/io/druid/server/emitter/EmitterModule.java rename to server/src/main/java/org/apache/druid/server/emitter/EmitterModule.java index 2f55f8def5ed..0b731a59fa34 100644 --- a/server/src/main/java/io/druid/server/emitter/EmitterModule.java +++ b/server/src/main/java/org/apache/druid/server/emitter/EmitterModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.emitter; +package org.apache.druid.server.emitter; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableMap; @@ -33,16 +33,16 @@ import com.google.inject.multibindings.MapBinder; import com.google.inject.name.Named; import com.google.inject.name.Names; -import io.druid.guice.LazySingleton; -import io.druid.guice.ManageLifecycle; -import io.druid.guice.annotations.Self; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.core.Emitter; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.server.DruidNode; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.core.Emitter; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.server.DruidNode; import java.lang.annotation.Annotation; import java.util.List; diff --git a/server/src/main/java/io/druid/server/emitter/ExtraServiceDimensions.java b/server/src/main/java/org/apache/druid/server/emitter/ExtraServiceDimensions.java similarity index 94% rename from server/src/main/java/io/druid/server/emitter/ExtraServiceDimensions.java rename to server/src/main/java/org/apache/druid/server/emitter/ExtraServiceDimensions.java index 2d4f7b150968..3deeef564598 100644 --- a/server/src/main/java/io/druid/server/emitter/ExtraServiceDimensions.java +++ b/server/src/main/java/org/apache/druid/server/emitter/ExtraServiceDimensions.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.server.emitter; +package org.apache.druid.server.emitter; import com.google.inject.BindingAnnotation; -import io.druid.guice.annotations.PublicApi; +import org.apache.druid.guice.annotations.PublicApi; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/server/src/main/java/io/druid/server/emitter/HttpEmitterModule.java b/server/src/main/java/org/apache/druid/server/emitter/HttpEmitterModule.java similarity index 87% rename from server/src/main/java/io/druid/server/emitter/HttpEmitterModule.java rename to server/src/main/java/org/apache/druid/server/emitter/HttpEmitterModule.java index 3ea5c0715594..3c3bca1df7ec 100644 --- a/server/src/main/java/io/druid/server/emitter/HttpEmitterModule.java +++ b/server/src/main/java/org/apache/druid/server/emitter/HttpEmitterModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.emitter; +package org.apache.druid.server.emitter; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Supplier; @@ -26,16 +26,16 @@ import com.google.inject.Provides; import com.google.inject.name.Named; import com.google.inject.util.Providers; -import io.druid.guice.LazySingleton; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.emitter.core.Emitter; -import io.druid.java.util.emitter.core.HttpEmitterConfig; -import io.druid.java.util.emitter.core.HttpPostEmitter; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.ManageLifecycle; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.server.security.TLSUtils; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.core.Emitter; +import org.apache.druid.java.util.emitter.core.HttpEmitterConfig; +import org.apache.druid.java.util.emitter.core.HttpPostEmitter; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.server.security.TLSUtils; import io.netty.handler.ssl.ClientAuth; import io.netty.handler.ssl.JdkSslContext; import io.netty.util.HashedWheelTimer; diff --git a/server/src/main/java/io/druid/server/emitter/HttpEmitterSSLClientConfig.java b/server/src/main/java/org/apache/druid/server/emitter/HttpEmitterSSLClientConfig.java similarity index 85% rename from server/src/main/java/io/druid/server/emitter/HttpEmitterSSLClientConfig.java rename to server/src/main/java/org/apache/druid/server/emitter/HttpEmitterSSLClientConfig.java index 762ec3378d37..ec318489526e 100644 --- a/server/src/main/java/io/druid/server/emitter/HttpEmitterSSLClientConfig.java +++ b/server/src/main/java/org/apache/druid/server/emitter/HttpEmitterSSLClientConfig.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.server.emitter; +package org.apache.druid.server.emitter; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.metadata.PasswordProvider; +import org.apache.druid.metadata.PasswordProvider; /** - * This is kept separate from {@link io.druid.java.util.emitter.core.HttpEmitterConfig} because {@link PasswordProvider} + * This is kept separate from {@link org.apache.druid.java.util.emitter.core.HttpEmitterConfig} because {@link PasswordProvider} * is currently located in druid-api. The java-util module which contains HttpEmitterConfig cannot import * PasswordProvider because this would introduce a circular dependence between java-util and druid-api. * * PasswordProvider could be moved to java-util, but PasswordProvider is annotated with - * {@link io.druid.guice.annotations.ExtensionPoint}, which would also have to be moved. + * {@link org.apache.druid.guice.annotations.ExtensionPoint}, which would also have to be moved. * * It would be easier to resolve these issues and merge the TLS-related config with HttpEmitterConfig once - * https://github.com/druid-io/druid/issues/4312 is resolved, so the TLS config is kept separate for now. + * https://github.com/apache/incubator-druid/issues/4312 is resolved, so the TLS config is kept separate for now. */ public class HttpEmitterSSLClientConfig { diff --git a/server/src/main/java/io/druid/server/emitter/HttpEmittingMonitor.java b/server/src/main/java/org/apache/druid/server/emitter/HttpEmittingMonitor.java similarity index 77% rename from server/src/main/java/io/druid/server/emitter/HttpEmittingMonitor.java rename to server/src/main/java/org/apache/druid/server/emitter/HttpEmittingMonitor.java index 835f2c9e70d5..f69f2eb90064 100644 --- a/server/src/main/java/io/druid/server/emitter/HttpEmittingMonitor.java +++ b/server/src/main/java/org/apache/druid/server/emitter/HttpEmittingMonitor.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.server.emitter; +package org.apache.druid.server.emitter; import com.google.common.collect.ImmutableMap; import com.google.inject.Inject; -import io.druid.java.util.emitter.core.Emitter; -import io.druid.java.util.emitter.core.HttpPostEmitter; -import io.druid.java.util.emitter.core.ParametrizedUriEmitter; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.metrics.AbstractMonitor; -import io.druid.java.util.metrics.FeedDefiningMonitor; -import io.druid.java.util.metrics.HttpPostEmitterMonitor; -import io.druid.java.util.metrics.ParametrizedUriEmitterMonitor; +import org.apache.druid.java.util.emitter.core.Emitter; +import org.apache.druid.java.util.emitter.core.HttpPostEmitter; +import org.apache.druid.java.util.emitter.core.ParametrizedUriEmitter; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.metrics.AbstractMonitor; +import org.apache.druid.java.util.metrics.FeedDefiningMonitor; +import org.apache.druid.java.util.metrics.HttpPostEmitterMonitor; +import org.apache.druid.java.util.metrics.ParametrizedUriEmitterMonitor; /** * Able to monitor {@link HttpPostEmitter} or {@link ParametrizedUriEmitter}, which is based on the former. diff --git a/server/src/main/java/io/druid/server/emitter/LogEmitterModule.java b/server/src/main/java/org/apache/druid/server/emitter/LogEmitterModule.java similarity index 82% rename from server/src/main/java/io/druid/server/emitter/LogEmitterModule.java rename to server/src/main/java/org/apache/druid/server/emitter/LogEmitterModule.java index 0b1521b89c8c..f27e270a6506 100644 --- a/server/src/main/java/io/druid/server/emitter/LogEmitterModule.java +++ b/server/src/main/java/org/apache/druid/server/emitter/LogEmitterModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.emitter; +package org.apache.druid.server.emitter; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Supplier; @@ -25,11 +25,11 @@ import com.google.inject.Module; import com.google.inject.Provides; import com.google.inject.name.Named; -import io.druid.java.util.emitter.core.Emitter; -import io.druid.java.util.emitter.core.LoggingEmitter; -import io.druid.java.util.emitter.core.LoggingEmitterConfig; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.ManageLifecycle; +import org.apache.druid.java.util.emitter.core.Emitter; +import org.apache.druid.java.util.emitter.core.LoggingEmitter; +import org.apache.druid.java.util.emitter.core.LoggingEmitterConfig; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.ManageLifecycle; /** */ diff --git a/server/src/main/java/io/druid/server/emitter/NoopEmitterModule.java b/server/src/main/java/org/apache/druid/server/emitter/NoopEmitterModule.java similarity index 85% rename from server/src/main/java/io/druid/server/emitter/NoopEmitterModule.java rename to server/src/main/java/org/apache/druid/server/emitter/NoopEmitterModule.java index 70fe0fbd84d7..6e5332f18899 100644 --- a/server/src/main/java/io/druid/server/emitter/NoopEmitterModule.java +++ b/server/src/main/java/org/apache/druid/server/emitter/NoopEmitterModule.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.server.emitter; +package org.apache.druid.server.emitter; import com.google.inject.Binder; import com.google.inject.Module; import com.google.inject.Provides; import com.google.inject.name.Named; -import io.druid.java.util.emitter.core.Emitter; -import io.druid.java.util.emitter.core.NoopEmitter; -import io.druid.guice.ManageLifecycle; +import org.apache.druid.java.util.emitter.core.Emitter; +import org.apache.druid.java.util.emitter.core.NoopEmitter; +import org.apache.druid.guice.ManageLifecycle; /** */ diff --git a/server/src/main/java/io/druid/server/emitter/ParametrizedUriEmitterModule.java b/server/src/main/java/org/apache/druid/server/emitter/ParametrizedUriEmitterModule.java similarity index 83% rename from server/src/main/java/io/druid/server/emitter/ParametrizedUriEmitterModule.java rename to server/src/main/java/org/apache/druid/server/emitter/ParametrizedUriEmitterModule.java index 4d1633bd5d6d..2debcd360381 100644 --- a/server/src/main/java/io/druid/server/emitter/ParametrizedUriEmitterModule.java +++ b/server/src/main/java/org/apache/druid/server/emitter/ParametrizedUriEmitterModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.emitter; +package org.apache.druid.server.emitter; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Supplier; @@ -25,13 +25,13 @@ import com.google.inject.Module; import com.google.inject.Provides; import com.google.inject.name.Named; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.emitter.core.Emitter; -import io.druid.java.util.emitter.core.ParametrizedUriEmitter; -import io.druid.java.util.emitter.core.ParametrizedUriEmitterConfig; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.ManageLifecycle; -import io.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.core.Emitter; +import org.apache.druid.java.util.emitter.core.ParametrizedUriEmitter; +import org.apache.druid.java.util.emitter.core.ParametrizedUriEmitterConfig; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; import javax.annotation.Nullable; import javax.net.ssl.SSLContext; diff --git a/server/src/main/java/io/druid/server/emitter/ParametrizedUriEmitterSSLClientConfig.java b/server/src/main/java/org/apache/druid/server/emitter/ParametrizedUriEmitterSSLClientConfig.java similarity index 97% rename from server/src/main/java/io/druid/server/emitter/ParametrizedUriEmitterSSLClientConfig.java rename to server/src/main/java/org/apache/druid/server/emitter/ParametrizedUriEmitterSSLClientConfig.java index dd4140387fae..4023a2286621 100644 --- a/server/src/main/java/io/druid/server/emitter/ParametrizedUriEmitterSSLClientConfig.java +++ b/server/src/main/java/org/apache/druid/server/emitter/ParametrizedUriEmitterSSLClientConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.emitter; +package org.apache.druid.server.emitter; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/server/http/BrokerResource.java b/server/src/main/java/org/apache/druid/server/http/BrokerResource.java similarity index 91% rename from server/src/main/java/io/druid/server/http/BrokerResource.java rename to server/src/main/java/org/apache/druid/server/http/BrokerResource.java index 73d9f3bc8a32..ddbe19e0bcf0 100644 --- a/server/src/main/java/io/druid/server/http/BrokerResource.java +++ b/server/src/main/java/org/apache/druid/server/http/BrokerResource.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; import com.google.common.collect.ImmutableMap; import com.google.inject.Inject; import com.sun.jersey.spi.container.ResourceFilters; -import io.druid.client.BrokerServerView; -import io.druid.server.http.security.StateResourceFilter; +import org.apache.druid.client.BrokerServerView; +import org.apache.druid.server.http.security.StateResourceFilter; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/server/src/main/java/io/druid/server/http/ClusterResource.java b/server/src/main/java/org/apache/druid/server/http/ClusterResource.java similarity index 93% rename from server/src/main/java/io/druid/server/http/ClusterResource.java rename to server/src/main/java/org/apache/druid/server/http/ClusterResource.java index ce025283ce42..5fff19e4a10a 100644 --- a/server/src/main/java/io/druid/server/http/ClusterResource.java +++ b/server/src/main/java/org/apache/druid/server/http/ClusterResource.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonInclude; @@ -26,12 +26,12 @@ import com.google.common.collect.ImmutableMap; import com.google.inject.Inject; import com.sun.jersey.spi.container.ResourceFilters; -import io.druid.discovery.DiscoveryDruidNode; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.guice.LazySingleton; -import io.druid.java.util.common.StringUtils; -import io.druid.server.DruidNode; -import io.druid.server.http.security.StateResourceFilter; +import org.apache.druid.discovery.DiscoveryDruidNode; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.http.security.StateResourceFilter; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/server/src/main/java/io/druid/server/http/CoordinatorCompactionConfigsResource.java b/server/src/main/java/org/apache/druid/server/http/CoordinatorCompactionConfigsResource.java similarity index 93% rename from server/src/main/java/io/druid/server/http/CoordinatorCompactionConfigsResource.java rename to server/src/main/java/org/apache/druid/server/http/CoordinatorCompactionConfigsResource.java index eae124dbbee1..d01fbec0ae14 100644 --- a/server/src/main/java/io/druid/server/http/CoordinatorCompactionConfigsResource.java +++ b/server/src/main/java/org/apache/druid/server/http/CoordinatorCompactionConfigsResource.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.inject.Inject; import com.sun.jersey.spi.container.ResourceFilters; -import io.druid.audit.AuditInfo; -import io.druid.audit.AuditManager; -import io.druid.common.config.ConfigManager.SetResult; -import io.druid.common.config.JacksonConfigManager; -import io.druid.java.util.common.StringUtils; -import io.druid.server.coordinator.CoordinatorCompactionConfig; -import io.druid.server.coordinator.DataSourceCompactionConfig; -import io.druid.server.http.security.ConfigResourceFilter; +import org.apache.druid.audit.AuditInfo; +import org.apache.druid.audit.AuditManager; +import org.apache.druid.common.config.ConfigManager.SetResult; +import org.apache.druid.common.config.JacksonConfigManager; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.server.coordinator.CoordinatorCompactionConfig; +import org.apache.druid.server.coordinator.DataSourceCompactionConfig; +import org.apache.druid.server.http.security.ConfigResourceFilter; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; diff --git a/server/src/main/java/io/druid/server/http/CoordinatorDynamicConfigsResource.java b/server/src/main/java/org/apache/druid/server/http/CoordinatorDynamicConfigsResource.java similarity index 90% rename from server/src/main/java/io/druid/server/http/CoordinatorDynamicConfigsResource.java rename to server/src/main/java/org/apache/druid/server/http/CoordinatorDynamicConfigsResource.java index d5985d062388..1372d85e38ef 100644 --- a/server/src/main/java/io/druid/server/http/CoordinatorDynamicConfigsResource.java +++ b/server/src/main/java/org/apache/druid/server/http/CoordinatorDynamicConfigsResource.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; import com.google.common.collect.ImmutableMap; import com.sun.jersey.spi.container.ResourceFilters; -import io.druid.audit.AuditInfo; -import io.druid.audit.AuditManager; -import io.druid.common.config.ConfigManager.SetResult; -import io.druid.common.config.JacksonConfigManager; -import io.druid.java.util.common.Intervals; -import io.druid.server.coordinator.CoordinatorDynamicConfig; -import io.druid.server.http.security.ConfigResourceFilter; +import org.apache.druid.audit.AuditInfo; +import org.apache.druid.audit.AuditManager; +import org.apache.druid.common.config.ConfigManager.SetResult; +import org.apache.druid.common.config.JacksonConfigManager; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.server.coordinator.CoordinatorDynamicConfig; +import org.apache.druid.server.http.security.ConfigResourceFilter; import org.joda.time.Interval; import javax.inject.Inject; diff --git a/server/src/main/java/io/druid/server/http/CoordinatorRedirectInfo.java b/server/src/main/java/org/apache/druid/server/http/CoordinatorRedirectInfo.java similarity index 92% rename from server/src/main/java/io/druid/server/http/CoordinatorRedirectInfo.java rename to server/src/main/java/org/apache/druid/server/http/CoordinatorRedirectInfo.java index 80feaed7a9f8..3e6042d4e38e 100644 --- a/server/src/main/java/io/druid/server/http/CoordinatorRedirectInfo.java +++ b/server/src/main/java/org/apache/druid/server/http/CoordinatorRedirectInfo.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableSet; import com.google.inject.Inject; -import io.druid.java.util.common.StringUtils; -import io.druid.server.coordinator.DruidCoordinator; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.server.coordinator.DruidCoordinator; import java.net.URL; import java.util.Set; diff --git a/server/src/main/java/io/druid/server/http/CoordinatorResource.java b/server/src/main/java/org/apache/druid/server/http/CoordinatorResource.java similarity index 94% rename from server/src/main/java/io/druid/server/http/CoordinatorResource.java rename to server/src/main/java/org/apache/druid/server/http/CoordinatorResource.java index b36e87d983d6..167fc6c7d110 100644 --- a/server/src/main/java/io/druid/server/http/CoordinatorResource.java +++ b/server/src/main/java/org/apache/druid/server/http/CoordinatorResource.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; import com.google.common.base.Function; import com.google.common.collect.Collections2; @@ -25,11 +25,11 @@ import com.google.common.collect.Maps; import com.google.inject.Inject; import com.sun.jersey.spi.container.ResourceFilters; -import io.druid.server.coordinator.DruidCoordinator; -import io.druid.server.coordinator.LoadQueuePeon; -import io.druid.server.coordinator.helper.CompactionSegmentIterator; -import io.druid.server.http.security.StateResourceFilter; -import io.druid.timeline.DataSegment; +import org.apache.druid.server.coordinator.DruidCoordinator; +import org.apache.druid.server.coordinator.LoadQueuePeon; +import org.apache.druid.server.coordinator.helper.CompactionSegmentIterator; +import org.apache.druid.server.http.security.StateResourceFilter; +import org.apache.druid.timeline.DataSegment; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/server/src/main/java/io/druid/server/http/DatasourcesResource.java b/server/src/main/java/org/apache/druid/server/http/DatasourcesResource.java similarity index 94% rename from server/src/main/java/io/druid/server/http/DatasourcesResource.java rename to server/src/main/java/org/apache/druid/server/http/DatasourcesResource.java index 2905bb16189f..2708871bb509 100644 --- a/server/src/main/java/io/druid/server/http/DatasourcesResource.java +++ b/server/src/main/java/org/apache/druid/server/http/DatasourcesResource.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; @@ -26,29 +26,29 @@ import com.google.common.collect.Sets; import com.google.inject.Inject; import com.sun.jersey.spi.container.ResourceFilters; -import io.druid.client.CoordinatorServerView; -import io.druid.client.DruidDataSource; -import io.druid.client.DruidServer; -import io.druid.client.ImmutableDruidDataSource; -import io.druid.client.ImmutableSegmentLoadInfo; -import io.druid.client.SegmentLoadInfo; -import io.druid.client.indexing.IndexingServiceClient; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.MapUtils; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.guava.Comparators; -import io.druid.java.util.common.guava.FunctionalIterable; -import io.druid.java.util.common.logger.Logger; -import io.druid.metadata.MetadataSegmentManager; -import io.druid.query.TableDataSource; -import io.druid.server.http.security.DatasourceResourceFilter; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthorizerMapper; -import io.druid.timeline.DataSegment; -import io.druid.timeline.TimelineLookup; -import io.druid.timeline.TimelineObjectHolder; -import io.druid.timeline.partition.PartitionChunk; +import org.apache.druid.client.CoordinatorServerView; +import org.apache.druid.client.DruidDataSource; +import org.apache.druid.client.DruidServer; +import org.apache.druid.client.ImmutableDruidDataSource; +import org.apache.druid.client.ImmutableSegmentLoadInfo; +import org.apache.druid.client.SegmentLoadInfo; +import org.apache.druid.client.indexing.IndexingServiceClient; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.MapUtils; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.java.util.common.guava.FunctionalIterable; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.metadata.MetadataSegmentManager; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.server.http.security.DatasourceResourceFilter; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.TimelineLookup; +import org.apache.druid.timeline.TimelineObjectHolder; +import org.apache.druid.timeline.partition.PartitionChunk; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/server/src/main/java/io/druid/server/http/HistoricalResource.java b/server/src/main/java/org/apache/druid/server/http/HistoricalResource.java similarity index 91% rename from server/src/main/java/io/druid/server/http/HistoricalResource.java rename to server/src/main/java/org/apache/druid/server/http/HistoricalResource.java index f066d4023526..dcaa434696ea 100644 --- a/server/src/main/java/io/druid/server/http/HistoricalResource.java +++ b/server/src/main/java/org/apache/druid/server/http/HistoricalResource.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; import com.google.common.collect.ImmutableMap; import com.sun.jersey.spi.container.ResourceFilters; -import io.druid.server.coordination.ZkCoordinator; -import io.druid.server.http.security.StateResourceFilter; +import org.apache.druid.server.coordination.ZkCoordinator; +import org.apache.druid.server.http.security.StateResourceFilter; import javax.inject.Inject; import javax.ws.rs.GET; diff --git a/server/src/main/java/io/druid/server/http/HostAndPortWithScheme.java b/server/src/main/java/org/apache/druid/server/http/HostAndPortWithScheme.java similarity index 97% rename from server/src/main/java/io/druid/server/http/HostAndPortWithScheme.java rename to server/src/main/java/org/apache/druid/server/http/HostAndPortWithScheme.java index 4241c7246568..428a51d14018 100644 --- a/server/src/main/java/io/druid/server/http/HostAndPortWithScheme.java +++ b/server/src/main/java/org/apache/druid/server/http/HostAndPortWithScheme.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; import com.google.common.base.Preconditions; import com.google.common.net.HostAndPort; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; public class HostAndPortWithScheme { diff --git a/server/src/main/java/io/druid/server/http/IntervalsResource.java b/server/src/main/java/org/apache/druid/server/http/IntervalsResource.java similarity index 93% rename from server/src/main/java/io/druid/server/http/IntervalsResource.java rename to server/src/main/java/org/apache/druid/server/http/IntervalsResource.java index a16c58667e25..a3c3c5275b2f 100644 --- a/server/src/main/java/io/druid/server/http/IntervalsResource.java +++ b/server/src/main/java/org/apache/druid/server/http/IntervalsResource.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; import com.google.common.collect.Maps; import com.google.inject.Inject; -import io.druid.client.ImmutableDruidDataSource; -import io.druid.client.InventoryView; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.MapUtils; -import io.druid.java.util.common.guava.Comparators; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthorizerMapper; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.ImmutableDruidDataSource; +import org.apache.druid.client.InventoryView; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.MapUtils; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import javax.servlet.http.HttpServletRequest; diff --git a/server/src/main/java/io/druid/server/http/InventoryViewUtils.java b/server/src/main/java/org/apache/druid/server/http/InventoryViewUtils.java similarity index 87% rename from server/src/main/java/io/druid/server/http/InventoryViewUtils.java rename to server/src/main/java/org/apache/druid/server/http/InventoryViewUtils.java index da89fffcf026..06c9bdfe00dc 100644 --- a/server/src/main/java/io/druid/server/http/InventoryViewUtils.java +++ b/server/src/main/java/org/apache/druid/server/http/InventoryViewUtils.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; -import io.druid.client.DruidDataSource; -import io.druid.client.ImmutableDruidDataSource; -import io.druid.client.InventoryView; -import io.druid.java.util.common.ISE; -import io.druid.server.security.AuthorizationUtils; -import io.druid.server.security.AuthorizerMapper; +import org.apache.druid.client.DruidDataSource; +import org.apache.druid.client.ImmutableDruidDataSource; +import org.apache.druid.client.InventoryView; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.server.security.AuthorizationUtils; +import org.apache.druid.server.security.AuthorizerMapper; import javax.servlet.http.HttpServletRequest; import java.util.Collections; diff --git a/server/src/main/java/io/druid/server/http/LookupCoordinatorResource.java b/server/src/main/java/org/apache/druid/server/http/LookupCoordinatorResource.java similarity index 97% rename from server/src/main/java/io/druid/server/http/LookupCoordinatorResource.java rename to server/src/main/java/org/apache/druid/server/http/LookupCoordinatorResource.java index 96d238fbd717..881f3e53e053 100644 --- a/server/src/main/java/io/druid/server/http/LookupCoordinatorResource.java +++ b/server/src/main/java/org/apache/druid/server/http/LookupCoordinatorResource.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -29,18 +29,18 @@ import com.google.common.net.HostAndPort; import com.google.inject.Inject; import com.sun.jersey.spi.container.ResourceFilters; -import io.druid.audit.AuditInfo; -import io.druid.audit.AuditManager; -import io.druid.common.utils.ServletResourceUtils; -import io.druid.guice.annotations.Json; -import io.druid.guice.annotations.Smile; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.RE; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.lookup.LookupsState; -import io.druid.server.http.security.ConfigResourceFilter; -import io.druid.server.lookup.cache.LookupCoordinatorManager; -import io.druid.server.lookup.cache.LookupExtractorFactoryMapContainer; +import org.apache.druid.audit.AuditInfo; +import org.apache.druid.audit.AuditManager; +import org.apache.druid.common.utils.ServletResourceUtils; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.guice.annotations.Smile; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.lookup.LookupsState; +import org.apache.druid.server.http.security.ConfigResourceFilter; +import org.apache.druid.server.lookup.cache.LookupCoordinatorManager; +import org.apache.druid.server.lookup.cache.LookupExtractorFactoryMapContainer; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; diff --git a/server/src/main/java/io/druid/server/http/MetadataResource.java b/server/src/main/java/org/apache/druid/server/http/MetadataResource.java similarity index 92% rename from server/src/main/java/io/druid/server/http/MetadataResource.java rename to server/src/main/java/org/apache/druid/server/http/MetadataResource.java index fe88f42b23f6..719a290ead68 100644 --- a/server/src/main/java/io/druid/server/http/MetadataResource.java +++ b/server/src/main/java/org/apache/druid/server/http/MetadataResource.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; import com.google.common.base.Function; import com.google.common.collect.Collections2; @@ -25,15 +25,15 @@ import com.google.common.collect.Sets; import com.google.inject.Inject; import com.sun.jersey.spi.container.ResourceFilters; -import io.druid.client.ImmutableDruidDataSource; -import io.druid.indexing.overlord.IndexerMetadataStorageCoordinator; -import io.druid.metadata.MetadataSegmentManager; -import io.druid.server.http.security.DatasourceResourceFilter; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthorizationUtils; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.ResourceAction; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.ImmutableDruidDataSource; +import org.apache.druid.indexing.overlord.IndexerMetadataStorageCoordinator; +import org.apache.druid.metadata.MetadataSegmentManager; +import org.apache.druid.server.http.security.DatasourceResourceFilter; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthorizationUtils; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.ResourceAction; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import javax.servlet.http.HttpServletRequest; diff --git a/server/src/main/java/io/druid/server/http/OverlordProxyServlet.java b/server/src/main/java/org/apache/druid/server/http/OverlordProxyServlet.java similarity index 90% rename from server/src/main/java/io/druid/server/http/OverlordProxyServlet.java rename to server/src/main/java/org/apache/druid/server/http/OverlordProxyServlet.java index f88817d0ebd6..9f6b3eeaab99 100644 --- a/server/src/main/java/io/druid/server/http/OverlordProxyServlet.java +++ b/server/src/main/java/org/apache/druid/server/http/OverlordProxyServlet.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; import com.google.common.base.Throwables; import com.google.inject.Inject; -import io.druid.client.indexing.IndexingService; -import io.druid.discovery.DruidLeaderClient; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.server.security.AuthConfig; +import org.apache.druid.client.indexing.IndexingService; +import org.apache.druid.discovery.DruidLeaderClient; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.server.security.AuthConfig; import org.eclipse.jetty.client.api.Request; import org.eclipse.jetty.proxy.ProxyServlet; diff --git a/server/src/main/java/io/druid/server/http/RedirectFilter.java b/server/src/main/java/org/apache/druid/server/http/RedirectFilter.java similarity index 96% rename from server/src/main/java/io/druid/server/http/RedirectFilter.java rename to server/src/main/java/org/apache/druid/server/http/RedirectFilter.java index 195ac9d4bf2a..7641f1d75657 100644 --- a/server/src/main/java/io/druid/server/http/RedirectFilter.java +++ b/server/src/main/java/org/apache/druid/server/http/RedirectFilter.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; import com.google.inject.Inject; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.logger.Logger; import javax.servlet.Filter; import javax.servlet.FilterChain; diff --git a/server/src/main/java/io/druid/server/http/RedirectInfo.java b/server/src/main/java/org/apache/druid/server/http/RedirectInfo.java similarity index 96% rename from server/src/main/java/io/druid/server/http/RedirectInfo.java rename to server/src/main/java/org/apache/druid/server/http/RedirectInfo.java index 0bcf5016d9d6..587ced9f0a58 100644 --- a/server/src/main/java/io/druid/server/http/RedirectInfo.java +++ b/server/src/main/java/org/apache/druid/server/http/RedirectInfo.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; import java.net.URL; diff --git a/server/src/main/java/io/druid/server/http/RouterResource.java b/server/src/main/java/org/apache/druid/server/http/RouterResource.java similarity index 92% rename from server/src/main/java/io/druid/server/http/RouterResource.java rename to server/src/main/java/org/apache/druid/server/http/RouterResource.java index 3d4b45a772b9..df308552f230 100644 --- a/server/src/main/java/io/druid/server/http/RouterResource.java +++ b/server/src/main/java/org/apache/druid/server/http/RouterResource.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; import com.google.inject.Inject; -import io.druid.client.selector.Server; -import io.druid.server.router.TieredBrokerHostSelector; +import org.apache.druid.client.selector.Server; +import org.apache.druid.server.router.TieredBrokerHostSelector; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/server/src/main/java/io/druid/server/http/RulesResource.java b/server/src/main/java/org/apache/druid/server/http/RulesResource.java similarity index 91% rename from server/src/main/java/io/druid/server/http/RulesResource.java rename to server/src/main/java/org/apache/druid/server/http/RulesResource.java index 0f338a85b16f..10b3f5e3996d 100644 --- a/server/src/main/java/io/druid/server/http/RulesResource.java +++ b/server/src/main/java/org/apache/druid/server/http/RulesResource.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; import com.google.common.collect.ImmutableMap; import com.google.inject.Inject; import com.sun.jersey.spi.container.ResourceFilters; -import io.druid.audit.AuditEntry; -import io.druid.audit.AuditInfo; -import io.druid.audit.AuditManager; -import io.druid.java.util.common.Intervals; -import io.druid.metadata.MetadataRuleManager; -import io.druid.server.coordinator.rules.Rule; -import io.druid.server.http.security.RulesResourceFilter; -import io.druid.server.http.security.StateResourceFilter; +import org.apache.druid.audit.AuditEntry; +import org.apache.druid.audit.AuditInfo; +import org.apache.druid.audit.AuditManager; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.metadata.MetadataRuleManager; +import org.apache.druid.server.coordinator.rules.Rule; +import org.apache.druid.server.http.security.RulesResourceFilter; +import org.apache.druid.server.http.security.StateResourceFilter; import org.joda.time.Interval; import javax.servlet.http.HttpServletRequest; diff --git a/server/src/main/java/io/druid/server/http/SegmentListerResource.java b/server/src/main/java/org/apache/druid/server/http/SegmentListerResource.java similarity index 94% rename from server/src/main/java/io/druid/server/http/SegmentListerResource.java rename to server/src/main/java/org/apache/druid/server/http/SegmentListerResource.java index a0cc8aab7d53..3a531b7d384d 100644 --- a/server/src/main/java/io/druid/server/http/SegmentListerResource.java +++ b/server/src/main/java/org/apache/druid/server/http/SegmentListerResource.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.jaxrs.smile.SmileMediaTypes; @@ -26,17 +26,17 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.inject.Inject; import com.sun.jersey.spi.container.ResourceFilters; -import io.druid.client.HttpServerInventoryView; -import io.druid.guice.annotations.Json; -import io.druid.guice.annotations.Smile; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.server.coordination.BatchDataSegmentAnnouncer; -import io.druid.server.coordination.ChangeRequestHistory; -import io.druid.server.coordination.ChangeRequestsSnapshot; -import io.druid.server.coordination.DataSegmentChangeRequest; -import io.druid.server.coordination.SegmentLoadDropHandler; -import io.druid.server.coordinator.HttpLoadQueuePeon; -import io.druid.server.http.security.StateResourceFilter; +import org.apache.druid.client.HttpServerInventoryView; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.guice.annotations.Smile; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.server.coordination.BatchDataSegmentAnnouncer; +import org.apache.druid.server.coordination.ChangeRequestHistory; +import org.apache.druid.server.coordination.ChangeRequestsSnapshot; +import org.apache.druid.server.coordination.DataSegmentChangeRequest; +import org.apache.druid.server.coordination.SegmentLoadDropHandler; +import org.apache.druid.server.coordinator.HttpLoadQueuePeon; +import org.apache.druid.server.http.security.StateResourceFilter; import javax.annotation.Nullable; import javax.servlet.AsyncContext; diff --git a/server/src/main/java/io/druid/server/http/SegmentToDrop.java b/server/src/main/java/org/apache/druid/server/http/SegmentToDrop.java similarity index 97% rename from server/src/main/java/io/druid/server/http/SegmentToDrop.java rename to server/src/main/java/org/apache/druid/server/http/SegmentToDrop.java index 53b0cfa2c8b5..67289caaa5b8 100644 --- a/server/src/main/java/io/druid/server/http/SegmentToDrop.java +++ b/server/src/main/java/org/apache/druid/server/http/SegmentToDrop.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/server/http/SegmentToMove.java b/server/src/main/java/org/apache/druid/server/http/SegmentToMove.java similarity index 97% rename from server/src/main/java/io/druid/server/http/SegmentToMove.java rename to server/src/main/java/org/apache/druid/server/http/SegmentToMove.java index 7639c7c8fef9..f0361e2e238f 100644 --- a/server/src/main/java/io/druid/server/http/SegmentToMove.java +++ b/server/src/main/java/org/apache/druid/server/http/SegmentToMove.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/server/http/ServersResource.java b/server/src/main/java/org/apache/druid/server/http/ServersResource.java similarity index 96% rename from server/src/main/java/io/druid/server/http/ServersResource.java rename to server/src/main/java/org/apache/druid/server/http/ServersResource.java index 767b61d78375..112d24283ec6 100644 --- a/server/src/main/java/io/druid/server/http/ServersResource.java +++ b/server/src/main/java/org/apache/druid/server/http/ServersResource.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; import com.google.common.base.Function; import com.google.common.collect.Collections2; @@ -26,10 +26,10 @@ import com.google.common.collect.Lists; import com.google.inject.Inject; import com.sun.jersey.spi.container.ResourceFilters; -import io.druid.client.DruidServer; -import io.druid.client.InventoryView; -import io.druid.server.http.security.StateResourceFilter; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.DruidServer; +import org.apache.druid.client.InventoryView; +import org.apache.druid.server.http.security.StateResourceFilter; +import org.apache.druid.timeline.DataSegment; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/server/src/main/java/io/druid/server/http/TiersResource.java b/server/src/main/java/org/apache/druid/server/http/TiersResource.java similarity index 93% rename from server/src/main/java/io/druid/server/http/TiersResource.java rename to server/src/main/java/org/apache/druid/server/http/TiersResource.java index 2ac6e221bf01..a3722e805c47 100644 --- a/server/src/main/java/io/druid/server/http/TiersResource.java +++ b/server/src/main/java/org/apache/druid/server/http/TiersResource.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; import com.google.common.base.Function; import com.google.common.collect.HashBasedTable; @@ -28,12 +28,12 @@ import com.google.common.collect.Table; import com.google.inject.Inject; import com.sun.jersey.spi.container.ResourceFilters; -import io.druid.client.DruidDataSource; -import io.druid.client.DruidServer; -import io.druid.client.InventoryView; -import io.druid.java.util.common.MapUtils; -import io.druid.server.http.security.StateResourceFilter; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.DruidDataSource; +import org.apache.druid.client.DruidServer; +import org.apache.druid.client.InventoryView; +import org.apache.druid.java.util.common.MapUtils; +import org.apache.druid.server.http.security.StateResourceFilter; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import javax.ws.rs.GET; diff --git a/server/src/main/java/io/druid/server/http/security/AbstractResourceFilter.java b/server/src/main/java/org/apache/druid/server/http/security/AbstractResourceFilter.java similarity index 94% rename from server/src/main/java/io/druid/server/http/security/AbstractResourceFilter.java rename to server/src/main/java/org/apache/druid/server/http/security/AbstractResourceFilter.java index f42177d5b50c..1f2a245dd196 100644 --- a/server/src/main/java/io/druid/server/http/security/AbstractResourceFilter.java +++ b/server/src/main/java/org/apache/druid/server/http/security/AbstractResourceFilter.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.server.http.security; +package org.apache.druid.server.http.security; import com.google.inject.Inject; import com.sun.jersey.spi.container.ContainerRequest; import com.sun.jersey.spi.container.ContainerRequestFilter; import com.sun.jersey.spi.container.ContainerResponseFilter; import com.sun.jersey.spi.container.ResourceFilter; -import io.druid.server.security.Action; -import io.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.Action; +import org.apache.druid.server.security.AuthorizerMapper; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.core.Context; diff --git a/server/src/main/java/io/druid/server/http/security/ConfigResourceFilter.java b/server/src/main/java/org/apache/druid/server/http/security/ConfigResourceFilter.java similarity index 84% rename from server/src/main/java/io/druid/server/http/security/ConfigResourceFilter.java rename to server/src/main/java/org/apache/druid/server/http/security/ConfigResourceFilter.java index 3396bf97605d..2a7d32c1f505 100644 --- a/server/src/main/java/io/druid/server/http/security/ConfigResourceFilter.java +++ b/server/src/main/java/org/apache/druid/server/http/security/ConfigResourceFilter.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.server.http.security; +package org.apache.druid.server.http.security; import com.google.inject.Inject; import com.sun.jersey.spi.container.ContainerRequest; -import io.druid.server.security.Access; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.AuthorizationUtils; -import io.druid.server.security.ForbiddenException; -import io.druid.server.security.Resource; -import io.druid.server.security.ResourceAction; -import io.druid.server.security.ResourceType; +import org.apache.druid.server.security.Access; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.AuthorizationUtils; +import org.apache.druid.server.security.ForbiddenException; +import org.apache.druid.server.security.Resource; +import org.apache.druid.server.security.ResourceAction; +import org.apache.druid.server.security.ResourceType; /** * Use this ResourceFilter at end points where Druid Cluster configuration is read or written diff --git a/server/src/main/java/io/druid/server/http/security/DatasourceResourceFilter.java b/server/src/main/java/org/apache/druid/server/http/security/DatasourceResourceFilter.java similarity index 89% rename from server/src/main/java/io/druid/server/http/security/DatasourceResourceFilter.java rename to server/src/main/java/org/apache/druid/server/http/security/DatasourceResourceFilter.java index d2dd5484eb98..a76905dba413 100644 --- a/server/src/main/java/io/druid/server/http/security/DatasourceResourceFilter.java +++ b/server/src/main/java/org/apache/druid/server/http/security/DatasourceResourceFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.http.security; +package org.apache.druid.server.http.security; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; @@ -25,13 +25,13 @@ import com.google.common.collect.Iterables; import com.google.inject.Inject; import com.sun.jersey.spi.container.ContainerRequest; -import io.druid.server.security.Access; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.AuthorizationUtils; -import io.druid.server.security.ForbiddenException; -import io.druid.server.security.Resource; -import io.druid.server.security.ResourceAction; -import io.druid.server.security.ResourceType; +import org.apache.druid.server.security.Access; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.AuthorizationUtils; +import org.apache.druid.server.security.ForbiddenException; +import org.apache.druid.server.security.Resource; +import org.apache.druid.server.security.ResourceAction; +import org.apache.druid.server.security.ResourceType; import javax.ws.rs.core.PathSegment; import java.util.List; diff --git a/server/src/main/java/io/druid/server/http/security/RulesResourceFilter.java b/server/src/main/java/org/apache/druid/server/http/security/RulesResourceFilter.java similarity index 88% rename from server/src/main/java/io/druid/server/http/security/RulesResourceFilter.java rename to server/src/main/java/org/apache/druid/server/http/security/RulesResourceFilter.java index a1e67261dab8..0e1fee100ae5 100644 --- a/server/src/main/java/io/druid/server/http/security/RulesResourceFilter.java +++ b/server/src/main/java/org/apache/druid/server/http/security/RulesResourceFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.http.security; +package org.apache.druid.server.http.security; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; @@ -25,13 +25,13 @@ import com.google.common.collect.Iterables; import com.google.inject.Inject; import com.sun.jersey.spi.container.ContainerRequest; -import io.druid.server.security.Access; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.AuthorizationUtils; -import io.druid.server.security.ForbiddenException; -import io.druid.server.security.Resource; -import io.druid.server.security.ResourceAction; -import io.druid.server.security.ResourceType; +import org.apache.druid.server.security.Access; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.AuthorizationUtils; +import org.apache.druid.server.security.ForbiddenException; +import org.apache.druid.server.security.Resource; +import org.apache.druid.server.security.ResourceAction; +import org.apache.druid.server.security.ResourceType; import javax.ws.rs.core.PathSegment; import java.util.List; diff --git a/server/src/main/java/io/druid/server/http/security/StateResourceFilter.java b/server/src/main/java/org/apache/druid/server/http/security/StateResourceFilter.java similarity index 86% rename from server/src/main/java/io/druid/server/http/security/StateResourceFilter.java rename to server/src/main/java/org/apache/druid/server/http/security/StateResourceFilter.java index 3aab4e513c42..7e230302c254 100644 --- a/server/src/main/java/io/druid/server/http/security/StateResourceFilter.java +++ b/server/src/main/java/org/apache/druid/server/http/security/StateResourceFilter.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.server.http.security; +package org.apache.druid.server.http.security; import com.google.inject.Inject; import com.sun.jersey.spi.container.ContainerRequest; -import io.druid.server.security.Access; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.AuthorizationUtils; -import io.druid.server.security.ForbiddenException; -import io.druid.server.security.Resource; -import io.druid.server.security.ResourceAction; -import io.druid.server.security.ResourceType; +import org.apache.druid.server.security.Access; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.AuthorizationUtils; +import org.apache.druid.server.security.ForbiddenException; +import org.apache.druid.server.security.Resource; +import org.apache.druid.server.security.ResourceAction; +import org.apache.druid.server.security.ResourceType; /** * Use this ResourceFilter at end points where Druid Cluster State is read or written diff --git a/server/src/main/java/io/druid/server/initialization/AuthenticatorMapperModule.java b/server/src/main/java/org/apache/druid/server/initialization/AuthenticatorMapperModule.java similarity index 86% rename from server/src/main/java/io/druid/server/initialization/AuthenticatorMapperModule.java rename to server/src/main/java/org/apache/druid/server/initialization/AuthenticatorMapperModule.java index 2976517c7cc7..dfbbbecfa998 100644 --- a/server/src/main/java/io/druid/server/initialization/AuthenticatorMapperModule.java +++ b/server/src/main/java/org/apache/druid/server/initialization/AuthenticatorMapperModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.initialization; +package org.apache.druid.server.initialization; import com.fasterxml.jackson.databind.Module; import com.google.common.base.Supplier; @@ -26,19 +26,19 @@ import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Provider; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.JsonConfigurator; -import io.druid.guice.LazySingleton; -import io.druid.guice.LifecycleModule; -import io.druid.initialization.DruidModule; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.Authenticator; -import io.druid.server.security.AuthenticatorMapper; -import io.druid.server.security.AllowAllAuthenticator; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.JsonConfigurator; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.LifecycleModule; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.Authenticator; +import org.apache.druid.server.security.AuthenticatorMapper; +import org.apache.druid.server.security.AllowAllAuthenticator; import java.util.Collections; import java.util.HashSet; diff --git a/server/src/main/java/io/druid/server/initialization/AuthorizerMapperModule.java b/server/src/main/java/org/apache/druid/server/initialization/AuthorizerMapperModule.java similarity index 87% rename from server/src/main/java/io/druid/server/initialization/AuthorizerMapperModule.java rename to server/src/main/java/org/apache/druid/server/initialization/AuthorizerMapperModule.java index 605860ded1c9..89e4e2867439 100644 --- a/server/src/main/java/io/druid/server/initialization/AuthorizerMapperModule.java +++ b/server/src/main/java/org/apache/druid/server/initialization/AuthorizerMapperModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.initialization; +package org.apache.druid.server.initialization; import com.fasterxml.jackson.databind.Module; import com.google.common.base.Supplier; @@ -26,19 +26,19 @@ import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Provider; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.JsonConfigurator; -import io.druid.guice.LazySingleton; -import io.druid.guice.LifecycleModule; -import io.druid.initialization.DruidModule; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.security.AllowAllAuthorizer; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.Authorizer; -import io.druid.server.security.AuthorizerMapper; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.JsonConfigurator; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.LifecycleModule; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.security.AllowAllAuthorizer; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.Authorizer; +import org.apache.druid.server.security.AuthorizerMapper; import java.util.Collections; import java.util.HashSet; diff --git a/server/src/main/java/io/druid/server/initialization/BatchDataSegmentAnnouncerConfig.java b/server/src/main/java/org/apache/druid/server/initialization/BatchDataSegmentAnnouncerConfig.java similarity index 97% rename from server/src/main/java/io/druid/server/initialization/BatchDataSegmentAnnouncerConfig.java rename to server/src/main/java/org/apache/druid/server/initialization/BatchDataSegmentAnnouncerConfig.java index 17a385a3e5db..66ac575d41de 100644 --- a/server/src/main/java/io/druid/server/initialization/BatchDataSegmentAnnouncerConfig.java +++ b/server/src/main/java/org/apache/druid/server/initialization/BatchDataSegmentAnnouncerConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.initialization; +package org.apache.druid.server.initialization; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/server/initialization/CuratorDiscoveryConfig.java b/server/src/main/java/org/apache/druid/server/initialization/CuratorDiscoveryConfig.java similarity index 95% rename from server/src/main/java/io/druid/server/initialization/CuratorDiscoveryConfig.java rename to server/src/main/java/org/apache/druid/server/initialization/CuratorDiscoveryConfig.java index 9c075fcaa8e2..c8c9ef95127c 100644 --- a/server/src/main/java/io/druid/server/initialization/CuratorDiscoveryConfig.java +++ b/server/src/main/java/org/apache/druid/server/initialization/CuratorDiscoveryConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.initialization; +package org.apache.druid.server.initialization; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/server/initialization/ServerConfig.java b/server/src/main/java/org/apache/druid/server/initialization/ServerConfig.java similarity index 99% rename from server/src/main/java/io/druid/server/initialization/ServerConfig.java rename to server/src/main/java/org/apache/druid/server/initialization/ServerConfig.java index 0ef91cce1b01..11a9248d83f3 100644 --- a/server/src/main/java/io/druid/server/initialization/ServerConfig.java +++ b/server/src/main/java/org/apache/druid/server/initialization/ServerConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.initialization; +package org.apache.druid.server.initialization; import com.fasterxml.jackson.annotation.JsonProperty; import org.joda.time.Period; diff --git a/server/src/main/java/io/druid/server/initialization/TLSServerConfig.java b/server/src/main/java/org/apache/druid/server/initialization/TLSServerConfig.java similarity index 96% rename from server/src/main/java/io/druid/server/initialization/TLSServerConfig.java rename to server/src/main/java/org/apache/druid/server/initialization/TLSServerConfig.java index 79957dcee4b5..6ea2c1258d7d 100644 --- a/server/src/main/java/io/druid/server/initialization/TLSServerConfig.java +++ b/server/src/main/java/org/apache/druid/server/initialization/TLSServerConfig.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.server.initialization; +package org.apache.druid.server.initialization; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.metadata.PasswordProvider; +import org.apache.druid.metadata.PasswordProvider; import java.util.List; diff --git a/server/src/main/java/io/druid/server/initialization/ZkPathsConfig.java b/server/src/main/java/org/apache/druid/server/initialization/ZkPathsConfig.java similarity index 98% rename from server/src/main/java/io/druid/server/initialization/ZkPathsConfig.java rename to server/src/main/java/org/apache/druid/server/initialization/ZkPathsConfig.java index d71fc1869cf0..24eef17ec428 100644 --- a/server/src/main/java/io/druid/server/initialization/ZkPathsConfig.java +++ b/server/src/main/java/org/apache/druid/server/initialization/ZkPathsConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.initialization; +package org.apache.druid.server.initialization; import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.curator.utils.ZKPaths; diff --git a/server/src/main/java/io/druid/server/initialization/jetty/ChatHandlerServerModule.java b/server/src/main/java/org/apache/druid/server/initialization/jetty/ChatHandlerServerModule.java similarity index 85% rename from server/src/main/java/io/druid/server/initialization/jetty/ChatHandlerServerModule.java rename to server/src/main/java/org/apache/druid/server/initialization/jetty/ChatHandlerServerModule.java index 98ec58363275..268587e82fcd 100644 --- a/server/src/main/java/io/druid/server/initialization/jetty/ChatHandlerServerModule.java +++ b/server/src/main/java/org/apache/druid/server/initialization/jetty/ChatHandlerServerModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.initialization.jetty; +package org.apache.druid.server.initialization.jetty; import com.google.inject.Binder; import com.google.inject.Injector; @@ -25,19 +25,19 @@ import com.google.inject.Module; import com.google.inject.Provides; import com.google.inject.multibindings.Multibinder; -import io.druid.guice.Jerseys; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.LazySingleton; -import io.druid.guice.LifecycleModule; -import io.druid.guice.annotations.RemoteChatHandler; -import io.druid.guice.annotations.Self; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.realtime.firehose.ChatHandlerResource; -import io.druid.server.DruidNode; -import io.druid.server.initialization.ServerConfig; -import io.druid.server.initialization.TLSServerConfig; -import io.druid.server.metrics.DataSourceTaskIdHolder; +import org.apache.druid.guice.Jerseys; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.LifecycleModule; +import org.apache.druid.guice.annotations.RemoteChatHandler; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.realtime.firehose.ChatHandlerResource; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.initialization.ServerConfig; +import org.apache.druid.server.initialization.TLSServerConfig; +import org.apache.druid.server.metrics.DataSourceTaskIdHolder; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.util.ssl.SslContextFactory; diff --git a/server/src/main/java/io/druid/server/initialization/jetty/CustomExceptionMapper.java b/server/src/main/java/org/apache/druid/server/initialization/jetty/CustomExceptionMapper.java similarity index 96% rename from server/src/main/java/io/druid/server/initialization/jetty/CustomExceptionMapper.java rename to server/src/main/java/org/apache/druid/server/initialization/jetty/CustomExceptionMapper.java index 8e7fb6dd88b1..2b1b8351aed4 100644 --- a/server/src/main/java/io/druid/server/initialization/jetty/CustomExceptionMapper.java +++ b/server/src/main/java/org/apache/druid/server/initialization/jetty/CustomExceptionMapper.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.initialization.jetty; +package org.apache.druid.server.initialization.jetty; import com.fasterxml.jackson.databind.JsonMappingException; diff --git a/server/src/main/java/io/druid/server/initialization/jetty/ForbiddenExceptionMapper.java b/server/src/main/java/org/apache/druid/server/initialization/jetty/ForbiddenExceptionMapper.java similarity index 92% rename from server/src/main/java/io/druid/server/initialization/jetty/ForbiddenExceptionMapper.java rename to server/src/main/java/org/apache/druid/server/initialization/jetty/ForbiddenExceptionMapper.java index 9869b3a22309..a88e9fd1b50c 100644 --- a/server/src/main/java/io/druid/server/initialization/jetty/ForbiddenExceptionMapper.java +++ b/server/src/main/java/org/apache/druid/server/initialization/jetty/ForbiddenExceptionMapper.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.server.initialization.jetty; +package org.apache.druid.server.initialization.jetty; import com.google.common.collect.ImmutableMap; -import io.druid.server.security.ForbiddenException; +import org.apache.druid.server.security.ForbiddenException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; diff --git a/server/src/main/java/io/druid/server/initialization/jetty/JettyBindings.java b/server/src/main/java/org/apache/druid/server/initialization/jetty/JettyBindings.java similarity index 95% rename from server/src/main/java/io/druid/server/initialization/jetty/JettyBindings.java rename to server/src/main/java/org/apache/druid/server/initialization/jetty/JettyBindings.java index 9ae6cd3b397c..3bcbafb6e03e 100644 --- a/server/src/main/java/io/druid/server/initialization/jetty/JettyBindings.java +++ b/server/src/main/java/org/apache/druid/server/initialization/jetty/JettyBindings.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.server.initialization.jetty; +package org.apache.druid.server.initialization.jetty; import com.google.common.collect.ImmutableMap; import com.google.inject.Binder; import com.google.inject.multibindings.Multibinder; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.logger.Logger; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.servlets.QoSFilter; diff --git a/server/src/main/java/io/druid/server/initialization/jetty/JettyMonitoringConnectionFactory.java b/server/src/main/java/org/apache/druid/server/initialization/jetty/JettyMonitoringConnectionFactory.java similarity index 97% rename from server/src/main/java/io/druid/server/initialization/jetty/JettyMonitoringConnectionFactory.java rename to server/src/main/java/org/apache/druid/server/initialization/jetty/JettyMonitoringConnectionFactory.java index 8887e428ed51..07955bb0339a 100644 --- a/server/src/main/java/io/druid/server/initialization/jetty/JettyMonitoringConnectionFactory.java +++ b/server/src/main/java/org/apache/druid/server/initialization/jetty/JettyMonitoringConnectionFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.initialization.jetty; +package org.apache.druid.server.initialization.jetty; import org.eclipse.jetty.io.Connection; import org.eclipse.jetty.io.EndPoint; diff --git a/server/src/main/java/io/druid/server/initialization/jetty/JettyRequestLog.java b/server/src/main/java/org/apache/druid/server/initialization/jetty/JettyRequestLog.java similarity index 87% rename from server/src/main/java/io/druid/server/initialization/jetty/JettyRequestLog.java rename to server/src/main/java/org/apache/druid/server/initialization/jetty/JettyRequestLog.java index d1e3e85cb73c..7eece1e9766a 100644 --- a/server/src/main/java/io/druid/server/initialization/jetty/JettyRequestLog.java +++ b/server/src/main/java/org/apache/druid/server/initialization/jetty/JettyRequestLog.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.server.initialization.jetty; +package org.apache.druid.server.initialization.jetty; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.RequestLog; import org.eclipse.jetty.server.Response; import org.eclipse.jetty.util.component.AbstractLifeCycle; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.logger.Logger; public class JettyRequestLog extends AbstractLifeCycle implements RequestLog { - private static final Logger logger = new Logger("io.druid.jetty.RequestLog"); + private static final Logger logger = new Logger("org.apache.druid.jetty.RequestLog"); @Override public void log(Request request, Response response) diff --git a/server/src/main/java/io/druid/server/initialization/jetty/JettyServerInitUtils.java b/server/src/main/java/org/apache/druid/server/initialization/jetty/JettyServerInitUtils.java similarity index 97% rename from server/src/main/java/io/druid/server/initialization/jetty/JettyServerInitUtils.java rename to server/src/main/java/org/apache/druid/server/initialization/jetty/JettyServerInitUtils.java index 4c80edeb0519..90e9d6145924 100644 --- a/server/src/main/java/io/druid/server/initialization/jetty/JettyServerInitUtils.java +++ b/server/src/main/java/org/apache/druid/server/initialization/jetty/JettyServerInitUtils.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.server.initialization.jetty; +package org.apache.druid.server.initialization.jetty; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.TypeLiteral; -import io.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.ISE; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.handler.RequestLogHandler; import org.eclipse.jetty.server.handler.gzip.GzipHandler; diff --git a/server/src/main/java/io/druid/server/initialization/jetty/JettyServerInitializer.java b/server/src/main/java/org/apache/druid/server/initialization/jetty/JettyServerInitializer.java similarity index 94% rename from server/src/main/java/io/druid/server/initialization/jetty/JettyServerInitializer.java rename to server/src/main/java/org/apache/druid/server/initialization/jetty/JettyServerInitializer.java index 1edf9f024e3b..33bb5b7c654b 100644 --- a/server/src/main/java/io/druid/server/initialization/jetty/JettyServerInitializer.java +++ b/server/src/main/java/org/apache/druid/server/initialization/jetty/JettyServerInitializer.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.initialization.jetty; +package org.apache.druid.server.initialization.jetty; import com.google.inject.Injector; import org.eclipse.jetty.server.Server; diff --git a/server/src/main/java/io/druid/server/initialization/jetty/JettyServerModule.java b/server/src/main/java/org/apache/druid/server/initialization/jetty/JettyServerModule.java similarity index 92% rename from server/src/main/java/io/druid/server/initialization/jetty/JettyServerModule.java rename to server/src/main/java/org/apache/druid/server/initialization/jetty/JettyServerModule.java index a118b2cf6e9b..ee613d153348 100644 --- a/server/src/main/java/io/druid/server/initialization/jetty/JettyServerModule.java +++ b/server/src/main/java/org/apache/druid/server/initialization/jetty/JettyServerModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.initialization.jetty; +package org.apache.druid.server.initialization.jetty; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; @@ -38,28 +38,28 @@ import com.sun.jersey.guice.JerseyServletModule; import com.sun.jersey.guice.spi.container.servlet.GuiceContainer; import com.sun.jersey.spi.container.servlet.WebConfig; -import io.druid.guice.Jerseys; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.LazySingleton; -import io.druid.guice.annotations.JSR311Resource; -import io.druid.guice.annotations.Json; -import io.druid.guice.annotations.Self; -import io.druid.guice.annotations.Smile; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.RE; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.java.util.metrics.AbstractMonitor; -import io.druid.java.util.metrics.MonitorUtils; -import io.druid.server.DruidNode; -import io.druid.server.StatusResource; -import io.druid.server.initialization.ServerConfig; -import io.druid.server.initialization.TLSServerConfig; -import io.druid.server.metrics.DataSourceTaskIdHolder; -import io.druid.server.metrics.MetricsModule; -import io.druid.server.metrics.MonitorsConfig; +import org.apache.druid.guice.Jerseys; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.annotations.JSR311Resource; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.guice.annotations.Smile; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.metrics.AbstractMonitor; +import org.apache.druid.java.util.metrics.MonitorUtils; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.StatusResource; +import org.apache.druid.server.initialization.ServerConfig; +import org.apache.druid.server.initialization.TLSServerConfig; +import org.apache.druid.server.metrics.DataSourceTaskIdHolder; +import org.apache.druid.server.metrics.MetricsModule; +import org.apache.druid.server.metrics.MonitorsConfig; import org.eclipse.jetty.server.ConnectionFactory; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.HttpConfiguration; @@ -211,7 +211,7 @@ static Server makeAndInitializeServer( final Server server = new Server(threadPool); // Without this bean set, the default ScheduledExecutorScheduler runs as non-daemon, causing lifecycle hooks to fail - // to fire on main exit. Related bug: https://github.com/druid-io/druid/pull/1627 + // to fire on main exit. Related bug: https://github.com/apache/incubator-druid/pull/1627 server.addBean(new ScheduledExecutorScheduler("JettyScheduler", true), true); final List serverConnectors = new ArrayList<>(); diff --git a/server/src/main/java/io/druid/server/initialization/jetty/LimitRequestsFilter.java b/server/src/main/java/org/apache/druid/server/initialization/jetty/LimitRequestsFilter.java similarity index 97% rename from server/src/main/java/io/druid/server/initialization/jetty/LimitRequestsFilter.java rename to server/src/main/java/org/apache/druid/server/initialization/jetty/LimitRequestsFilter.java index 813e82931b02..59034351a3f8 100644 --- a/server/src/main/java/io/druid/server/initialization/jetty/LimitRequestsFilter.java +++ b/server/src/main/java/org/apache/druid/server/initialization/jetty/LimitRequestsFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.initialization.jetty; +package org.apache.druid.server.initialization.jetty; import com.google.common.base.Preconditions; diff --git a/server/src/main/java/io/druid/server/initialization/jetty/ResponseHeaderFilterHolder.java b/server/src/main/java/org/apache/druid/server/initialization/jetty/ResponseHeaderFilterHolder.java similarity index 98% rename from server/src/main/java/io/druid/server/initialization/jetty/ResponseHeaderFilterHolder.java rename to server/src/main/java/org/apache/druid/server/initialization/jetty/ResponseHeaderFilterHolder.java index 6dfa16b1a489..a274903b0d31 100644 --- a/server/src/main/java/io/druid/server/initialization/jetty/ResponseHeaderFilterHolder.java +++ b/server/src/main/java/org/apache/druid/server/initialization/jetty/ResponseHeaderFilterHolder.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.initialization.jetty; +package org.apache.druid.server.initialization.jetty; import com.google.common.collect.ImmutableMap; diff --git a/server/src/main/java/io/druid/server/initialization/jetty/ServletFilterHolder.java b/server/src/main/java/org/apache/druid/server/initialization/jetty/ServletFilterHolder.java similarity index 95% rename from server/src/main/java/io/druid/server/initialization/jetty/ServletFilterHolder.java rename to server/src/main/java/org/apache/druid/server/initialization/jetty/ServletFilterHolder.java index 3757ec96e836..373c28b5f506 100644 --- a/server/src/main/java/io/druid/server/initialization/jetty/ServletFilterHolder.java +++ b/server/src/main/java/org/apache/druid/server/initialization/jetty/ServletFilterHolder.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.server.initialization.jetty; +package org.apache.druid.server.initialization.jetty; -import io.druid.guice.annotations.ExtensionPoint; +import org.apache.druid.guice.annotations.ExtensionPoint; import javax.servlet.DispatcherType; import javax.servlet.Filter; diff --git a/server/src/main/java/io/druid/server/initialization/jetty/TaskIdResponseHeaderFilterHolder.java b/server/src/main/java/org/apache/druid/server/initialization/jetty/TaskIdResponseHeaderFilterHolder.java similarity index 90% rename from server/src/main/java/io/druid/server/initialization/jetty/TaskIdResponseHeaderFilterHolder.java rename to server/src/main/java/org/apache/druid/server/initialization/jetty/TaskIdResponseHeaderFilterHolder.java index e6282bfcea53..6302a39f07eb 100644 --- a/server/src/main/java/io/druid/server/initialization/jetty/TaskIdResponseHeaderFilterHolder.java +++ b/server/src/main/java/org/apache/druid/server/initialization/jetty/TaskIdResponseHeaderFilterHolder.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.server.initialization.jetty; +package org.apache.druid.server.initialization.jetty; import com.google.common.collect.ImmutableMap; -import io.druid.segment.realtime.firehose.ChatHandlerResource; +import org.apache.druid.segment.realtime.firehose.ChatHandlerResource; public class TaskIdResponseHeaderFilterHolder extends ResponseHeaderFilterHolder { diff --git a/server/src/main/java/io/druid/server/listener/announcer/ListenerResourceAnnouncer.java b/server/src/main/java/org/apache/druid/server/listener/announcer/ListenerResourceAnnouncer.java similarity index 88% rename from server/src/main/java/io/druid/server/listener/announcer/ListenerResourceAnnouncer.java rename to server/src/main/java/org/apache/druid/server/listener/announcer/ListenerResourceAnnouncer.java index 89a4601ef497..526d40f09d9c 100644 --- a/server/src/main/java/io/druid/server/listener/announcer/ListenerResourceAnnouncer.java +++ b/server/src/main/java/org/apache/druid/server/listener/announcer/ListenerResourceAnnouncer.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.server.listener.announcer; +package org.apache.druid.server.listener.announcer; import com.google.common.base.Throwables; -import io.druid.curator.announcement.Announcer; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.http.HostAndPortWithScheme; +import org.apache.druid.curator.announcement.Announcer; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.http.HostAndPortWithScheme; import org.apache.curator.utils.ZKPaths; import java.nio.ByteBuffer; /** - * Starting 0.11.0 Coordinator uses announcements made by {@link io.druid.discovery.DruidNodeAnnouncer} . + * Starting 0.11.0 Coordinator uses announcements made by {@link org.apache.druid.discovery.DruidNodeAnnouncer} . */ @Deprecated public abstract class ListenerResourceAnnouncer diff --git a/server/src/main/java/io/druid/server/listener/announcer/ListeningAnnouncerConfig.java b/server/src/main/java/org/apache/druid/server/listener/announcer/ListeningAnnouncerConfig.java similarity index 94% rename from server/src/main/java/io/druid/server/listener/announcer/ListeningAnnouncerConfig.java rename to server/src/main/java/org/apache/druid/server/listener/announcer/ListeningAnnouncerConfig.java index f74ae2ffabb3..8134b5cac44f 100644 --- a/server/src/main/java/io/druid/server/listener/announcer/ListeningAnnouncerConfig.java +++ b/server/src/main/java/org/apache/druid/server/listener/announcer/ListeningAnnouncerConfig.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.server.listener.announcer; +package org.apache.druid.server.listener.announcer; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.inject.Inject; -import io.druid.java.util.common.StringUtils; -import io.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.server.initialization.ZkPathsConfig; import org.apache.curator.utils.ZKPaths; /** diff --git a/server/src/main/java/io/druid/server/listener/resource/AbstractListenerHandler.java b/server/src/main/java/org/apache/druid/server/listener/resource/AbstractListenerHandler.java similarity index 96% rename from server/src/main/java/io/druid/server/listener/resource/AbstractListenerHandler.java rename to server/src/main/java/org/apache/druid/server/listener/resource/AbstractListenerHandler.java index 01e8d5551eb7..c2b9d094d798 100644 --- a/server/src/main/java/io/druid/server/listener/resource/AbstractListenerHandler.java +++ b/server/src/main/java/org/apache/druid/server/listener/resource/AbstractListenerHandler.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.listener.resource; +package org.apache.druid.server.listener.resource; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.type.TypeReference; @@ -26,9 +26,9 @@ import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import io.druid.common.utils.ServletResourceUtils; -import io.druid.java.util.common.jackson.JacksonUtils; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.common.utils.ServletResourceUtils; +import org.apache.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.java.util.common.logger.Logger; import javax.annotation.Nullable; import javax.ws.rs.core.Response; diff --git a/server/src/main/java/io/druid/server/listener/resource/ListenerHandler.java b/server/src/main/java/org/apache/druid/server/listener/resource/ListenerHandler.java similarity index 96% rename from server/src/main/java/io/druid/server/listener/resource/ListenerHandler.java rename to server/src/main/java/org/apache/druid/server/listener/resource/ListenerHandler.java index f89f346b11ab..690e27330c1a 100644 --- a/server/src/main/java/io/druid/server/listener/resource/ListenerHandler.java +++ b/server/src/main/java/org/apache/druid/server/listener/resource/ListenerHandler.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.listener.resource; +package org.apache.druid.server.listener.resource; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/server/src/main/java/io/druid/server/listener/resource/ListenerResource.java b/server/src/main/java/org/apache/druid/server/listener/resource/ListenerResource.java similarity index 96% rename from server/src/main/java/io/druid/server/listener/resource/ListenerResource.java rename to server/src/main/java/org/apache/druid/server/listener/resource/ListenerResource.java index c0d4ab878c9c..fb28b027714e 100644 --- a/server/src/main/java/io/druid/server/listener/resource/ListenerResource.java +++ b/server/src/main/java/org/apache/druid/server/listener/resource/ListenerResource.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.server.listener.resource; +package org.apache.druid.server.listener.resource; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.jaxrs.smile.SmileMediaTypes; import com.google.common.base.Preconditions; import com.google.common.base.Strings; -import io.druid.common.utils.ServletResourceUtils; -import io.druid.guice.annotations.Json; -import io.druid.guice.annotations.Smile; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.common.utils.ServletResourceUtils; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.guice.annotations.Smile; +import org.apache.druid.java.util.common.logger.Logger; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; diff --git a/server/src/main/java/io/druid/server/log/ComposingRequestLoggerProvider.java b/server/src/main/java/org/apache/druid/server/log/ComposingRequestLoggerProvider.java similarity index 91% rename from server/src/main/java/io/druid/server/log/ComposingRequestLoggerProvider.java rename to server/src/main/java/org/apache/druid/server/log/ComposingRequestLoggerProvider.java index c98edbac953d..c066935bc01b 100644 --- a/server/src/main/java/io/druid/server/log/ComposingRequestLoggerProvider.java +++ b/server/src/main/java/org/apache/druid/server/log/ComposingRequestLoggerProvider.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.server.log; +package org.apache.druid.server.log; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.base.Throwables; import com.google.common.collect.Lists; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.RequestLogLine; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.RequestLogLine; import javax.validation.constraints.NotNull; import java.io.IOException; diff --git a/server/src/main/java/io/druid/server/log/EmittingRequestLogger.java b/server/src/main/java/org/apache/druid/server/log/EmittingRequestLogger.java similarity index 89% rename from server/src/main/java/io/druid/server/log/EmittingRequestLogger.java rename to server/src/main/java/org/apache/druid/server/log/EmittingRequestLogger.java index c1f65919347d..bd15f4a0b53c 100644 --- a/server/src/main/java/io/druid/server/log/EmittingRequestLogger.java +++ b/server/src/main/java/org/apache/druid/server/log/EmittingRequestLogger.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.server.log; +package org.apache.druid.server.log; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; import com.google.common.collect.ImmutableMap; -import io.druid.guice.annotations.PublicApi; -import io.druid.java.util.emitter.core.Event; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceEventBuilder; -import io.druid.query.Query; -import io.druid.server.QueryStats; -import io.druid.server.RequestLogLine; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.java.util.emitter.core.Event; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceEventBuilder; +import org.apache.druid.query.Query; +import org.apache.druid.server.QueryStats; +import org.apache.druid.server.RequestLogLine; import org.joda.time.DateTime; import java.util.Map; diff --git a/server/src/main/java/io/druid/server/log/EmittingRequestLoggerProvider.java b/server/src/main/java/org/apache/druid/server/log/EmittingRequestLoggerProvider.java similarity index 91% rename from server/src/main/java/io/druid/server/log/EmittingRequestLoggerProvider.java rename to server/src/main/java/org/apache/druid/server/log/EmittingRequestLoggerProvider.java index f7f344fa5c62..d575db06aee2 100644 --- a/server/src/main/java/io/druid/server/log/EmittingRequestLoggerProvider.java +++ b/server/src/main/java/org/apache/druid/server/log/EmittingRequestLoggerProvider.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.server.log; +package org.apache.druid.server.log; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.inject.Inject; import com.google.inject.Injector; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.common.logger.Logger; import javax.validation.constraints.NotNull; diff --git a/server/src/main/java/io/druid/server/log/FileRequestLogger.java b/server/src/main/java/org/apache/druid/server/log/FileRequestLogger.java similarity index 89% rename from server/src/main/java/io/druid/server/log/FileRequestLogger.java rename to server/src/main/java/org/apache/druid/server/log/FileRequestLogger.java index bf056e83e05b..85edfe06f6b4 100644 --- a/server/src/main/java/io/druid/server/log/FileRequestLogger.java +++ b/server/src/main/java/org/apache/druid/server/log/FileRequestLogger.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.server.log; +package org.apache.druid.server.log; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Throwables; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.ScheduledExecutors; -import io.druid.java.util.common.guava.CloseQuietly; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.server.RequestLogLine; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.ScheduledExecutors; +import org.apache.druid.java.util.common.guava.CloseQuietly; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.server.RequestLogLine; import org.joda.time.DateTime; import org.joda.time.Duration; import org.joda.time.MutableDateTime; diff --git a/server/src/main/java/io/druid/server/log/FileRequestLoggerProvider.java b/server/src/main/java/org/apache/druid/server/log/FileRequestLoggerProvider.java similarity index 88% rename from server/src/main/java/io/druid/server/log/FileRequestLoggerProvider.java rename to server/src/main/java/org/apache/druid/server/log/FileRequestLoggerProvider.java index 44adf43976d4..20e73c3612a0 100644 --- a/server/src/main/java/io/druid/server/log/FileRequestLoggerProvider.java +++ b/server/src/main/java/org/apache/druid/server/log/FileRequestLoggerProvider.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.server.log; +package org.apache.druid.server.log; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.guice.annotations.Json; -import io.druid.java.util.common.concurrent.ScheduledExecutorFactory; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.java.util.common.concurrent.ScheduledExecutorFactory; +import org.apache.druid.java.util.common.logger.Logger; import javax.validation.constraints.NotNull; import java.io.File; diff --git a/server/src/main/java/io/druid/server/log/FilteredRequestLoggerProvider.java b/server/src/main/java/org/apache/druid/server/log/FilteredRequestLoggerProvider.java similarity index 94% rename from server/src/main/java/io/druid/server/log/FilteredRequestLoggerProvider.java rename to server/src/main/java/org/apache/druid/server/log/FilteredRequestLoggerProvider.java index df4be3f494f0..36c9989a42c9 100644 --- a/server/src/main/java/io/druid/server/log/FilteredRequestLoggerProvider.java +++ b/server/src/main/java/org/apache/druid/server/log/FilteredRequestLoggerProvider.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.server.log; +package org.apache.druid.server.log; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.RequestLogLine; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.RequestLogLine; import javax.validation.constraints.NotNull; import java.io.IOException; diff --git a/server/src/main/java/io/druid/server/log/LoggingRequestLogger.java b/server/src/main/java/org/apache/druid/server/log/LoggingRequestLogger.java similarity index 95% rename from server/src/main/java/io/druid/server/log/LoggingRequestLogger.java rename to server/src/main/java/org/apache/druid/server/log/LoggingRequestLogger.java index 288943451724..47b220b5bc78 100644 --- a/server/src/main/java/io/druid/server/log/LoggingRequestLogger.java +++ b/server/src/main/java/org/apache/druid/server/log/LoggingRequestLogger.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.server.log; +package org.apache.druid.server.log; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.Query; -import io.druid.server.RequestLogLine; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.Query; +import org.apache.druid.server.RequestLogLine; import org.slf4j.MDC; import java.io.IOException; diff --git a/server/src/main/java/io/druid/server/log/LoggingRequestLoggerProvider.java b/server/src/main/java/org/apache/druid/server/log/LoggingRequestLoggerProvider.java similarity index 91% rename from server/src/main/java/io/druid/server/log/LoggingRequestLoggerProvider.java rename to server/src/main/java/org/apache/druid/server/log/LoggingRequestLoggerProvider.java index 4da748e61df1..a94b241ec27c 100644 --- a/server/src/main/java/io/druid/server/log/LoggingRequestLoggerProvider.java +++ b/server/src/main/java/org/apache/druid/server/log/LoggingRequestLoggerProvider.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.server.log; +package org.apache.druid.server.log; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.guice.annotations.Json; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.java.util.common.logger.Logger; @JsonTypeName("slf4j") public class LoggingRequestLoggerProvider implements RequestLoggerProvider diff --git a/server/src/main/java/io/druid/server/log/NoopRequestLogger.java b/server/src/main/java/org/apache/druid/server/log/NoopRequestLogger.java similarity index 92% rename from server/src/main/java/io/druid/server/log/NoopRequestLogger.java rename to server/src/main/java/org/apache/druid/server/log/NoopRequestLogger.java index 0e7738adc372..a6885a1df568 100644 --- a/server/src/main/java/io/druid/server/log/NoopRequestLogger.java +++ b/server/src/main/java/org/apache/druid/server/log/NoopRequestLogger.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.server.log; +package org.apache.druid.server.log; -import io.druid.server.RequestLogLine; +import org.apache.druid.server.RequestLogLine; /** */ diff --git a/server/src/main/java/io/druid/server/log/NoopRequestLoggerProvider.java b/server/src/main/java/org/apache/druid/server/log/NoopRequestLoggerProvider.java similarity index 92% rename from server/src/main/java/io/druid/server/log/NoopRequestLoggerProvider.java rename to server/src/main/java/org/apache/druid/server/log/NoopRequestLoggerProvider.java index daa03340a6c7..bff0f01d3057 100644 --- a/server/src/main/java/io/druid/server/log/NoopRequestLoggerProvider.java +++ b/server/src/main/java/org/apache/druid/server/log/NoopRequestLoggerProvider.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.server.log; +package org.apache.druid.server.log; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.common.logger.Logger; /** */ diff --git a/server/src/main/java/io/druid/server/log/RequestLogger.java b/server/src/main/java/org/apache/druid/server/log/RequestLogger.java similarity index 92% rename from server/src/main/java/io/druid/server/log/RequestLogger.java rename to server/src/main/java/org/apache/druid/server/log/RequestLogger.java index 13c86d330b9c..ed75a36c0ad3 100644 --- a/server/src/main/java/io/druid/server/log/RequestLogger.java +++ b/server/src/main/java/org/apache/druid/server/log/RequestLogger.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.server.log; +package org.apache.druid.server.log; -import io.druid.server.RequestLogLine; +import org.apache.druid.server.RequestLogLine; import java.io.IOException; diff --git a/server/src/main/java/io/druid/server/log/RequestLoggerProvider.java b/server/src/main/java/org/apache/druid/server/log/RequestLoggerProvider.java similarity index 97% rename from server/src/main/java/io/druid/server/log/RequestLoggerProvider.java rename to server/src/main/java/org/apache/druid/server/log/RequestLoggerProvider.java index d3fe13ea549b..f9e8055f0c07 100644 --- a/server/src/main/java/io/druid/server/log/RequestLoggerProvider.java +++ b/server/src/main/java/org/apache/druid/server/log/RequestLoggerProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.log; +package org.apache.druid.server.log; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.google.inject.Provider; diff --git a/server/src/main/java/io/druid/server/log/StartupLoggingConfig.java b/server/src/main/java/org/apache/druid/server/log/StartupLoggingConfig.java similarity index 97% rename from server/src/main/java/io/druid/server/log/StartupLoggingConfig.java rename to server/src/main/java/org/apache/druid/server/log/StartupLoggingConfig.java index b2cfaa3530f9..26b299c8253f 100644 --- a/server/src/main/java/io/druid/server/log/StartupLoggingConfig.java +++ b/server/src/main/java/org/apache/druid/server/log/StartupLoggingConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.log; +package org.apache.druid.server.log; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; diff --git a/server/src/main/java/io/druid/server/lookup/cache/LookupCoordinatorManager.java b/server/src/main/java/org/apache/druid/server/lookup/cache/LookupCoordinatorManager.java similarity index 96% rename from server/src/main/java/io/druid/server/lookup/cache/LookupCoordinatorManager.java rename to server/src/main/java/org/apache/druid/server/lookup/cache/LookupCoordinatorManager.java index 21ac1fddc3ee..ac71c1d4f2c7 100644 --- a/server/src/main/java/io/druid/server/lookup/cache/LookupCoordinatorManager.java +++ b/server/src/main/java/org/apache/druid/server/lookup/cache/LookupCoordinatorManager.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.lookup.cache; +package org.apache.druid.server.lookup.cache; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -36,27 +36,27 @@ import com.google.common.util.concurrent.ListeningScheduledExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.inject.Inject; -import io.druid.audit.AuditInfo; -import io.druid.common.config.JacksonConfigManager; -import io.druid.concurrent.LifecycleLock; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.guice.annotations.EscalatedGlobal; -import io.druid.guice.annotations.Smile; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.IOE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StreamUtils; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.Request; -import io.druid.java.util.http.client.response.ClientResponse; -import io.druid.java.util.http.client.response.HttpResponseHandler; -import io.druid.java.util.http.client.response.SequenceInputStreamResponseHandler; -import io.druid.query.lookup.LookupsState; -import io.druid.server.http.HostAndPortWithScheme; -import io.druid.server.listener.resource.ListenerResource; +import org.apache.druid.audit.AuditInfo; +import org.apache.druid.common.config.JacksonConfigManager; +import org.apache.druid.concurrent.LifecycleLock; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.guice.annotations.EscalatedGlobal; +import org.apache.druid.guice.annotations.Smile; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.IOE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StreamUtils; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.Request; +import org.apache.druid.java.util.http.client.response.ClientResponse; +import org.apache.druid.java.util.http.client.response.HttpResponseHandler; +import org.apache.druid.java.util.http.client.response.SequenceInputStreamResponseHandler; +import org.apache.druid.query.lookup.LookupsState; +import org.apache.druid.server.http.HostAndPortWithScheme; +import org.apache.druid.server.listener.resource.ListenerResource; import org.jboss.netty.handler.codec.http.HttpHeaders; import org.jboss.netty.handler.codec.http.HttpMethod; import org.jboss.netty.handler.codec.http.HttpResponse; diff --git a/server/src/main/java/io/druid/server/lookup/cache/LookupCoordinatorManagerConfig.java b/server/src/main/java/org/apache/druid/server/lookup/cache/LookupCoordinatorManagerConfig.java similarity index 98% rename from server/src/main/java/io/druid/server/lookup/cache/LookupCoordinatorManagerConfig.java rename to server/src/main/java/org/apache/druid/server/lookup/cache/LookupCoordinatorManagerConfig.java index f8c8aa2c13fa..255047dfa8d2 100644 --- a/server/src/main/java/io/druid/server/lookup/cache/LookupCoordinatorManagerConfig.java +++ b/server/src/main/java/org/apache/druid/server/lookup/cache/LookupCoordinatorManagerConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.lookup.cache; +package org.apache.druid.server.lookup.cache; import com.fasterxml.jackson.annotation.JsonProperty; import org.joda.time.Duration; diff --git a/server/src/main/java/io/druid/server/lookup/cache/LookupExtractorFactoryMapContainer.java b/server/src/main/java/org/apache/druid/server/lookup/cache/LookupExtractorFactoryMapContainer.java similarity index 96% rename from server/src/main/java/io/druid/server/lookup/cache/LookupExtractorFactoryMapContainer.java rename to server/src/main/java/org/apache/druid/server/lookup/cache/LookupExtractorFactoryMapContainer.java index 1de66e1bea63..04a5fd781b11 100644 --- a/server/src/main/java/io/druid/server/lookup/cache/LookupExtractorFactoryMapContainer.java +++ b/server/src/main/java/org/apache/druid/server/lookup/cache/LookupExtractorFactoryMapContainer.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.server.lookup.cache; +package org.apache.druid.server.lookup.cache; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import io.druid.java.util.common.guava.Comparators; +import org.apache.druid.java.util.common.guava.Comparators; import java.util.Map; import java.util.Objects; diff --git a/server/src/main/java/io/druid/server/lookup/cache/LookupNodeDiscovery.java b/server/src/main/java/org/apache/druid/server/lookup/cache/LookupNodeDiscovery.java similarity index 89% rename from server/src/main/java/io/druid/server/lookup/cache/LookupNodeDiscovery.java rename to server/src/main/java/org/apache/druid/server/lookup/cache/LookupNodeDiscovery.java index 444b7bb3c6d1..1ad59fb501ff 100644 --- a/server/src/main/java/io/druid/server/lookup/cache/LookupNodeDiscovery.java +++ b/server/src/main/java/org/apache/druid/server/lookup/cache/LookupNodeDiscovery.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.server.lookup.cache; +package org.apache.druid.server.lookup.cache; import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableSet; -import io.druid.discovery.DiscoveryDruidNode; -import io.druid.discovery.DruidNodeDiscovery; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.discovery.LookupNodeService; -import io.druid.server.http.HostAndPortWithScheme; +import org.apache.druid.discovery.DiscoveryDruidNode; +import org.apache.druid.discovery.DruidNodeDiscovery; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.discovery.LookupNodeService; +import org.apache.druid.server.http.HostAndPortWithScheme; import javax.annotation.Nullable; import java.util.Collection; diff --git a/server/src/main/java/io/druid/server/metrics/DataSourceTaskIdHolder.java b/server/src/main/java/org/apache/druid/server/metrics/DataSourceTaskIdHolder.java similarity index 97% rename from server/src/main/java/io/druid/server/metrics/DataSourceTaskIdHolder.java rename to server/src/main/java/org/apache/druid/server/metrics/DataSourceTaskIdHolder.java index 2b36d551d954..eed680390303 100644 --- a/server/src/main/java/io/druid/server/metrics/DataSourceTaskIdHolder.java +++ b/server/src/main/java/org/apache/druid/server/metrics/DataSourceTaskIdHolder.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.metrics; +package org.apache.druid.server.metrics; import com.google.inject.Inject; import com.google.inject.name.Named; diff --git a/server/src/main/java/io/druid/server/metrics/DruidMonitorSchedulerConfig.java b/server/src/main/java/org/apache/druid/server/metrics/DruidMonitorSchedulerConfig.java similarity index 92% rename from server/src/main/java/io/druid/server/metrics/DruidMonitorSchedulerConfig.java rename to server/src/main/java/org/apache/druid/server/metrics/DruidMonitorSchedulerConfig.java index 2dea7d5fd7fd..228360f9bc2c 100644 --- a/server/src/main/java/io/druid/server/metrics/DruidMonitorSchedulerConfig.java +++ b/server/src/main/java/org/apache/druid/server/metrics/DruidMonitorSchedulerConfig.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.server.metrics; +package org.apache.druid.server.metrics; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.metrics.MonitorSchedulerConfig; +import org.apache.druid.java.util.metrics.MonitorSchedulerConfig; import org.joda.time.Duration; import org.joda.time.Period; diff --git a/server/src/main/java/io/druid/server/metrics/DruidSysMonitor.java b/server/src/main/java/org/apache/druid/server/metrics/DruidSysMonitor.java similarity index 85% rename from server/src/main/java/io/druid/server/metrics/DruidSysMonitor.java rename to server/src/main/java/org/apache/druid/server/metrics/DruidSysMonitor.java index f862b515e4d6..c62ce44fceee 100644 --- a/server/src/main/java/io/druid/server/metrics/DruidSysMonitor.java +++ b/server/src/main/java/org/apache/druid/server/metrics/DruidSysMonitor.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.server.metrics; +package org.apache.druid.server.metrics; import com.google.common.collect.Lists; import com.google.inject.Inject; -import io.druid.java.util.metrics.SysMonitor; -import io.druid.segment.loading.SegmentLoaderConfig; -import io.druid.segment.loading.StorageLocationConfig; +import org.apache.druid.java.util.metrics.SysMonitor; +import org.apache.druid.segment.loading.SegmentLoaderConfig; +import org.apache.druid.segment.loading.StorageLocationConfig; import java.util.List; diff --git a/server/src/main/java/io/druid/server/metrics/EventReceiverFirehoseMetric.java b/server/src/main/java/org/apache/druid/server/metrics/EventReceiverFirehoseMetric.java similarity index 91% rename from server/src/main/java/io/druid/server/metrics/EventReceiverFirehoseMetric.java rename to server/src/main/java/org/apache/druid/server/metrics/EventReceiverFirehoseMetric.java index e582dd4ad3c1..13502e18493c 100644 --- a/server/src/main/java/io/druid/server/metrics/EventReceiverFirehoseMetric.java +++ b/server/src/main/java/org/apache/druid/server/metrics/EventReceiverFirehoseMetric.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.metrics; +package org.apache.druid.server.metrics; /** * An EventReceiverFirehoseMetric is an object with metrics about EventReceiverFirehose objects. @@ -30,7 +30,7 @@ public interface EventReceiverFirehoseMetric { /** - * Return the current number of {@link io.druid.data.input.InputRow} that are stored in the buffer. + * Return the current number of {@link org.apache.druid.data.input.InputRow} that are stored in the buffer. */ int getCurrentBufferSize(); diff --git a/server/src/main/java/io/druid/server/metrics/EventReceiverFirehoseMonitor.java b/server/src/main/java/org/apache/druid/server/metrics/EventReceiverFirehoseMonitor.java similarity index 88% rename from server/src/main/java/io/druid/server/metrics/EventReceiverFirehoseMonitor.java rename to server/src/main/java/org/apache/druid/server/metrics/EventReceiverFirehoseMonitor.java index 6fc4ede2476d..8922f29b4b35 100644 --- a/server/src/main/java/io/druid/server/metrics/EventReceiverFirehoseMonitor.java +++ b/server/src/main/java/org/apache/druid/server/metrics/EventReceiverFirehoseMonitor.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.server.metrics; +package org.apache.druid.server.metrics; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.inject.Inject; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.java.util.metrics.AbstractMonitor; -import io.druid.java.util.metrics.KeyedDiff; -import io.druid.java.util.metrics.MonitorUtils; -import io.druid.query.DruidMetrics; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.metrics.AbstractMonitor; +import org.apache.druid.java.util.metrics.KeyedDiff; +import org.apache.druid.java.util.metrics.MonitorUtils; +import org.apache.druid.query.DruidMetrics; import java.util.Map; import java.util.Properties; diff --git a/server/src/main/java/io/druid/server/metrics/EventReceiverFirehoseRegister.java b/server/src/main/java/org/apache/druid/server/metrics/EventReceiverFirehoseRegister.java similarity index 92% rename from server/src/main/java/io/druid/server/metrics/EventReceiverFirehoseRegister.java rename to server/src/main/java/org/apache/druid/server/metrics/EventReceiverFirehoseRegister.java index 19b5f5d2a83f..649027088732 100644 --- a/server/src/main/java/io/druid/server/metrics/EventReceiverFirehoseRegister.java +++ b/server/src/main/java/org/apache/druid/server/metrics/EventReceiverFirehoseRegister.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.server.metrics; +package org.apache.druid.server.metrics; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -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; public class EventReceiverFirehoseRegister { diff --git a/server/src/main/java/io/druid/server/metrics/HistoricalMetricsMonitor.java b/server/src/main/java/org/apache/druid/server/metrics/HistoricalMetricsMonitor.java similarity index 89% rename from server/src/main/java/io/druid/server/metrics/HistoricalMetricsMonitor.java rename to server/src/main/java/org/apache/druid/server/metrics/HistoricalMetricsMonitor.java index 37405a7a5e12..893c2e91839b 100644 --- a/server/src/main/java/io/druid/server/metrics/HistoricalMetricsMonitor.java +++ b/server/src/main/java/org/apache/druid/server/metrics/HistoricalMetricsMonitor.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.server.metrics; +package org.apache.druid.server.metrics; import com.google.inject.Inject; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.java.util.metrics.AbstractMonitor; -import io.druid.client.DruidServerConfig; -import io.druid.query.DruidMetrics; -import io.druid.server.SegmentManager; -import io.druid.server.coordination.SegmentLoadDropHandler; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.metrics.AbstractMonitor; +import org.apache.druid.client.DruidServerConfig; +import org.apache.druid.query.DruidMetrics; +import org.apache.druid.server.SegmentManager; +import org.apache.druid.server.coordination.SegmentLoadDropHandler; +import org.apache.druid.timeline.DataSegment; import it.unimi.dsi.fastutil.objects.Object2LongMap; import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap; diff --git a/server/src/main/java/io/druid/server/metrics/MetricsModule.java b/server/src/main/java/org/apache/druid/server/metrics/MetricsModule.java similarity index 84% rename from server/src/main/java/io/druid/server/metrics/MetricsModule.java rename to server/src/main/java/org/apache/druid/server/metrics/MetricsModule.java index afe84576fde0..11d8162f43be 100644 --- a/server/src/main/java/io/druid/server/metrics/MetricsModule.java +++ b/server/src/main/java/org/apache/druid/server/metrics/MetricsModule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.metrics; +package org.apache.druid.server.metrics; import com.google.common.base.Supplier; import com.google.common.collect.Iterables; @@ -28,19 +28,19 @@ import com.google.inject.Module; import com.google.inject.Provides; import com.google.inject.name.Names; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.metrics.JvmCpuMonitor; -import io.druid.java.util.metrics.JvmMonitor; -import io.druid.java.util.metrics.Monitor; -import io.druid.java.util.metrics.MonitorScheduler; -import io.druid.java.util.metrics.SysMonitor; -import io.druid.guice.DruidBinders; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.LazySingleton; -import io.druid.guice.ManageLifecycle; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.ExecutorServiceMonitor; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.metrics.JvmCpuMonitor; +import org.apache.druid.java.util.metrics.JvmMonitor; +import org.apache.druid.java.util.metrics.Monitor; +import org.apache.druid.java.util.metrics.MonitorScheduler; +import org.apache.druid.java.util.metrics.SysMonitor; +import org.apache.druid.guice.DruidBinders; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.ExecutorServiceMonitor; import java.util.List; import java.util.Set; diff --git a/server/src/main/java/io/druid/server/metrics/MonitorsConfig.java b/server/src/main/java/org/apache/druid/server/metrics/MonitorsConfig.java similarity index 74% rename from server/src/main/java/io/druid/server/metrics/MonitorsConfig.java rename to server/src/main/java/org/apache/druid/server/metrics/MonitorsConfig.java index 28d9d90a636f..ef0cdc1f4217 100644 --- a/server/src/main/java/io/druid/server/metrics/MonitorsConfig.java +++ b/server/src/main/java/org/apache/druid/server/metrics/MonitorsConfig.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.server.metrics; +package org.apache.druid.server.metrics; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.metrics.Monitor; -import io.druid.query.DruidMetrics; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.metrics.Monitor; +import org.apache.druid.query.DruidMetrics; import javax.validation.constraints.NotNull; import java.util.HashMap; @@ -42,14 +42,17 @@ public class MonitorsConfig /** * Prior to 0.12.0, Druid used Monitor classes from the `com.metamx.metrics` package. - * In 0.12.0, these Monitor classes were moved into Druid under `io.druid.java.util.metrics`. - * See https://github.com/druid-io/druid/pull/5289 for details. + * In 0.12.0, these Monitor classes were moved to the Druid repo under `org.apache.druid.java.util.metrics`. + * In 0.13.0, they were moved again to `org.apache.druid.java.util.metrics`. + * See https://github.com/apache/incubator-druid/pull/5289 and https://github.com/apache/incubator-druid/pull/6266 + * for details. * - * We automatically adjust old `com.metamx.metrics` package references to `io.druid.java.util.metrics` - * for backwards compatibility purposes, easing the upgrade process for users. + * We automatically adjust old package references to `org.apache.druid.java.util.metrics` for backwards + * compatibility purposes, easing the upgrade process for users. */ - public static final String OLD_METAMX_PACKAGE_NAME = "com.metamx.metrics"; - public static final String NEW_DRUID_PACKAGE_NAME = "io.druid.java.util.metrics"; + public static final String METAMX_PACKAGE = "com.metamx.metrics"; + public static final String IO_DRUID_PACKAGE = "io.druid.java.util.metrics"; + public static final String APACHE_DRUID_PACKAGE_NAME = "org.apache.druid.java.util.metrics"; @JsonProperty("monitors") @NotNull @@ -115,13 +118,14 @@ private static List> getMonitorsFromNames(List } try { for (String monitorName : monitorNames) { - String effectiveMonitorName = monitorName.replace(OLD_METAMX_PACKAGE_NAME, NEW_DRUID_PACKAGE_NAME); + String effectiveMonitorName = monitorName + .replace(METAMX_PACKAGE, APACHE_DRUID_PACKAGE_NAME) + .replace(IO_DRUID_PACKAGE, APACHE_DRUID_PACKAGE_NAME); if (!effectiveMonitorName.equals(monitorName)) { log.warn( - "Deprecated Monitor class name [%s] found, please use package %s instead of %s", + "Deprecated Monitor class name[%s] found, please use name[%s] instead.", monitorName, - NEW_DRUID_PACKAGE_NAME, - OLD_METAMX_PACKAGE_NAME + effectiveMonitorName ); } Class monitorClass = (Class) Class.forName(effectiveMonitorName); diff --git a/server/src/main/java/io/druid/server/metrics/QueryCountStatsMonitor.java b/server/src/main/java/org/apache/druid/server/metrics/QueryCountStatsMonitor.java similarity index 86% rename from server/src/main/java/io/druid/server/metrics/QueryCountStatsMonitor.java rename to server/src/main/java/org/apache/druid/server/metrics/QueryCountStatsMonitor.java index c4885c9887bb..6d88dc66950a 100644 --- a/server/src/main/java/io/druid/server/metrics/QueryCountStatsMonitor.java +++ b/server/src/main/java/org/apache/druid/server/metrics/QueryCountStatsMonitor.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.server.metrics; +package org.apache.druid.server.metrics; import com.google.common.collect.ImmutableMap; import com.google.inject.Inject; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.java.util.metrics.AbstractMonitor; -import io.druid.java.util.metrics.KeyedDiff; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.metrics.AbstractMonitor; +import org.apache.druid.java.util.metrics.KeyedDiff; import java.util.Map; diff --git a/server/src/main/java/io/druid/server/metrics/QueryCountStatsProvider.java b/server/src/main/java/org/apache/druid/server/metrics/QueryCountStatsProvider.java similarity index 95% rename from server/src/main/java/io/druid/server/metrics/QueryCountStatsProvider.java rename to server/src/main/java/org/apache/druid/server/metrics/QueryCountStatsProvider.java index af52e4d616f4..a7bd8762b24e 100644 --- a/server/src/main/java/io/druid/server/metrics/QueryCountStatsProvider.java +++ b/server/src/main/java/org/apache/druid/server/metrics/QueryCountStatsProvider.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.server.metrics; +package org.apache.druid.server.metrics; public interface QueryCountStatsProvider { diff --git a/server/src/main/java/io/druid/server/router/AvaticaConnectionBalancer.java b/server/src/main/java/org/apache/druid/server/router/AvaticaConnectionBalancer.java similarity index 95% rename from server/src/main/java/io/druid/server/router/AvaticaConnectionBalancer.java rename to server/src/main/java/org/apache/druid/server/router/AvaticaConnectionBalancer.java index b060ed44e589..9a03f8e1e12d 100644 --- a/server/src/main/java/io/druid/server/router/AvaticaConnectionBalancer.java +++ b/server/src/main/java/org/apache/druid/server/router/AvaticaConnectionBalancer.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.server.router; +package org.apache.druid.server.router; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.druid.client.selector.Server; +import org.apache.druid.client.selector.Server; import java.util.Collection; diff --git a/server/src/main/java/io/druid/server/router/ConsistentHashAvaticaConnectionBalancer.java b/server/src/main/java/org/apache/druid/server/router/ConsistentHashAvaticaConnectionBalancer.java similarity index 91% rename from server/src/main/java/io/druid/server/router/ConsistentHashAvaticaConnectionBalancer.java rename to server/src/main/java/org/apache/druid/server/router/ConsistentHashAvaticaConnectionBalancer.java index 3b6c2e327b50..b6510e1dcd73 100644 --- a/server/src/main/java/io/druid/server/router/ConsistentHashAvaticaConnectionBalancer.java +++ b/server/src/main/java/org/apache/druid/server/router/ConsistentHashAvaticaConnectionBalancer.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.server.router; +package org.apache.druid.server.router; -import io.druid.client.selector.Server; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.client.selector.Server; +import org.apache.druid.java.util.common.StringUtils; import java.util.Collection; import java.util.HashMap; diff --git a/server/src/main/java/io/druid/server/router/ConsistentHasher.java b/server/src/main/java/org/apache/druid/server/router/ConsistentHasher.java similarity index 99% rename from server/src/main/java/io/druid/server/router/ConsistentHasher.java rename to server/src/main/java/org/apache/druid/server/router/ConsistentHasher.java index 6acc22d6cde7..8af81f05c54e 100644 --- a/server/src/main/java/io/druid/server/router/ConsistentHasher.java +++ b/server/src/main/java/org/apache/druid/server/router/ConsistentHasher.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.router; +package org.apache.druid.server.router; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; diff --git a/server/src/main/java/io/druid/server/router/CoordinatorRuleManager.java b/server/src/main/java/org/apache/druid/server/router/CoordinatorRuleManager.java similarity index 86% rename from server/src/main/java/io/druid/server/router/CoordinatorRuleManager.java rename to server/src/main/java/org/apache/druid/server/router/CoordinatorRuleManager.java index 3ef607e99434..1c6af5f4aeb8 100644 --- a/server/src/main/java/io/druid/server/router/CoordinatorRuleManager.java +++ b/server/src/main/java/org/apache/druid/server/router/CoordinatorRuleManager.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.server.router; +package org.apache.druid.server.router; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Supplier; import com.google.common.collect.Lists; import com.google.inject.Inject; -import io.druid.java.util.http.client.response.FullResponseHolder; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.discovery.DruidLeaderClient; -import io.druid.guice.ManageLifecycle; -import io.druid.guice.annotations.Json; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.concurrent.ScheduledExecutors; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.coordinator.rules.Rule; +import org.apache.druid.java.util.http.client.response.FullResponseHolder; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.discovery.DruidLeaderClient; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.concurrent.ScheduledExecutors; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.coordinator.rules.Rule; import org.jboss.netty.handler.codec.http.HttpMethod; import org.jboss.netty.handler.codec.http.HttpResponseStatus; import org.joda.time.Duration; diff --git a/server/src/main/java/io/druid/server/router/JavaScriptTieredBrokerSelectorStrategy.java b/server/src/main/java/org/apache/druid/server/router/JavaScriptTieredBrokerSelectorStrategy.java similarity index 96% rename from server/src/main/java/io/druid/server/router/JavaScriptTieredBrokerSelectorStrategy.java rename to server/src/main/java/org/apache/druid/server/router/JavaScriptTieredBrokerSelectorStrategy.java index 660d0f74f2d3..35f62560661b 100644 --- a/server/src/main/java/io/druid/server/router/JavaScriptTieredBrokerSelectorStrategy.java +++ b/server/src/main/java/org/apache/druid/server/router/JavaScriptTieredBrokerSelectorStrategy.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.server.router; +package org.apache.druid.server.router; import com.fasterxml.jackson.annotation.JacksonInject; 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.js.JavaScriptConfig; -import io.druid.query.Query; +import org.apache.druid.js.JavaScriptConfig; +import org.apache.druid.query.Query; import javax.script.Compilable; import javax.script.Invocable; diff --git a/server/src/main/java/io/druid/server/router/ManagementProxyConfig.java b/server/src/main/java/org/apache/druid/server/router/ManagementProxyConfig.java similarity index 96% rename from server/src/main/java/io/druid/server/router/ManagementProxyConfig.java rename to server/src/main/java/org/apache/druid/server/router/ManagementProxyConfig.java index ed014bc33c73..9adab5717d28 100644 --- a/server/src/main/java/io/druid/server/router/ManagementProxyConfig.java +++ b/server/src/main/java/org/apache/druid/server/router/ManagementProxyConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.router; +package org.apache.druid.server.router; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/server/router/PriorityTieredBrokerSelectorStrategy.java b/server/src/main/java/org/apache/druid/server/router/PriorityTieredBrokerSelectorStrategy.java similarity index 93% rename from server/src/main/java/io/druid/server/router/PriorityTieredBrokerSelectorStrategy.java rename to server/src/main/java/org/apache/druid/server/router/PriorityTieredBrokerSelectorStrategy.java index 4d30294f48ba..5b6a8bb0ed9c 100644 --- a/server/src/main/java/io/druid/server/router/PriorityTieredBrokerSelectorStrategy.java +++ b/server/src/main/java/org/apache/druid/server/router/PriorityTieredBrokerSelectorStrategy.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.server.router; +package org.apache.druid.server.router; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Optional; -import io.druid.query.Query; -import io.druid.query.QueryContexts; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryContexts; /** */ diff --git a/server/src/main/java/io/druid/server/router/QueryHostFinder.java b/server/src/main/java/org/apache/druid/server/router/QueryHostFinder.java similarity index 94% rename from server/src/main/java/io/druid/server/router/QueryHostFinder.java rename to server/src/main/java/org/apache/druid/server/router/QueryHostFinder.java index 593d09b714c0..8853ffcdf24e 100644 --- a/server/src/main/java/io/druid/server/router/QueryHostFinder.java +++ b/server/src/main/java/org/apache/druid/server/router/QueryHostFinder.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.server.router; +package org.apache.druid.server.router; import com.google.inject.Inject; -import io.druid.client.selector.Server; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Pair; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.query.Query; +import org.apache.druid.client.selector.Server; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.query.Query; import java.util.Collection; import java.util.List; diff --git a/server/src/main/java/io/druid/server/router/RendezvousHashAvaticaConnectionBalancer.java b/server/src/main/java/org/apache/druid/server/router/RendezvousHashAvaticaConnectionBalancer.java similarity index 91% rename from server/src/main/java/io/druid/server/router/RendezvousHashAvaticaConnectionBalancer.java rename to server/src/main/java/org/apache/druid/server/router/RendezvousHashAvaticaConnectionBalancer.java index a9156325ceb9..bbec47788508 100644 --- a/server/src/main/java/io/druid/server/router/RendezvousHashAvaticaConnectionBalancer.java +++ b/server/src/main/java/org/apache/druid/server/router/RendezvousHashAvaticaConnectionBalancer.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.server.router; +package org.apache.druid.server.router; -import io.druid.client.selector.Server; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.client.selector.Server; +import org.apache.druid.java.util.common.StringUtils; import java.util.Collection; import java.util.HashMap; diff --git a/server/src/main/java/io/druid/server/router/RendezvousHasher.java b/server/src/main/java/org/apache/druid/server/router/RendezvousHasher.java similarity index 98% rename from server/src/main/java/io/druid/server/router/RendezvousHasher.java rename to server/src/main/java/org/apache/druid/server/router/RendezvousHasher.java index 37e748f38e2b..ffc16f14b3cb 100644 --- a/server/src/main/java/io/druid/server/router/RendezvousHasher.java +++ b/server/src/main/java/org/apache/druid/server/router/RendezvousHasher.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.router; +package org.apache.druid.server.router; import com.google.common.collect.Lists; import com.google.common.hash.HashCode; diff --git a/server/src/main/java/io/druid/server/router/Router.java b/server/src/main/java/org/apache/druid/server/router/Router.java similarity index 96% rename from server/src/main/java/io/druid/server/router/Router.java rename to server/src/main/java/org/apache/druid/server/router/Router.java index 47907dbffe19..4a908668396d 100644 --- a/server/src/main/java/io/druid/server/router/Router.java +++ b/server/src/main/java/org/apache/druid/server/router/Router.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.router; +package org.apache.druid.server.router; import com.google.inject.BindingAnnotation; diff --git a/server/src/main/java/io/druid/server/router/TieredBrokerConfig.java b/server/src/main/java/org/apache/druid/server/router/TieredBrokerConfig.java similarity index 97% rename from server/src/main/java/io/druid/server/router/TieredBrokerConfig.java rename to server/src/main/java/org/apache/druid/server/router/TieredBrokerConfig.java index 2e97e5fc722f..59aa89d45329 100644 --- a/server/src/main/java/io/druid/server/router/TieredBrokerConfig.java +++ b/server/src/main/java/org/apache/druid/server/router/TieredBrokerConfig.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.server.router; +package org.apache.druid.server.router; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.client.DruidServer; +import org.apache.druid.client.DruidServer; import org.joda.time.Period; import javax.validation.constraints.NotNull; diff --git a/server/src/main/java/io/druid/server/router/TieredBrokerHostSelector.java b/server/src/main/java/org/apache/druid/server/router/TieredBrokerHostSelector.java similarity index 92% rename from server/src/main/java/io/druid/server/router/TieredBrokerHostSelector.java rename to server/src/main/java/org/apache/druid/server/router/TieredBrokerHostSelector.java index 8c4d5dc788f9..48ec58822061 100644 --- a/server/src/main/java/io/druid/server/router/TieredBrokerHostSelector.java +++ b/server/src/main/java/org/apache/druid/server/router/TieredBrokerHostSelector.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.router; +package org.apache.druid.server.router; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -25,18 +25,18 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.inject.Inject; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.client.selector.Server; -import io.druid.discovery.DiscoveryDruidNode; -import io.druid.discovery.DruidNodeDiscovery; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.query.Query; -import io.druid.server.coordinator.rules.LoadRule; -import io.druid.server.coordinator.rules.Rule; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.client.selector.Server; +import org.apache.druid.discovery.DiscoveryDruidNode; +import org.apache.druid.discovery.DruidNodeDiscovery; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.query.Query; +import org.apache.druid.server.coordinator.rules.LoadRule; +import org.apache.druid.server.coordinator.rules.Rule; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/server/src/main/java/io/druid/server/router/TieredBrokerSelectorStrategiesProvider.java b/server/src/main/java/org/apache/druid/server/router/TieredBrokerSelectorStrategiesProvider.java similarity index 97% rename from server/src/main/java/io/druid/server/router/TieredBrokerSelectorStrategiesProvider.java rename to server/src/main/java/org/apache/druid/server/router/TieredBrokerSelectorStrategiesProvider.java index d258377381c6..1adf59f7e909 100644 --- a/server/src/main/java/io/druid/server/router/TieredBrokerSelectorStrategiesProvider.java +++ b/server/src/main/java/org/apache/druid/server/router/TieredBrokerSelectorStrategiesProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.router; +package org.apache.druid.server.router; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/server/src/main/java/io/druid/server/router/TieredBrokerSelectorStrategy.java b/server/src/main/java/org/apache/druid/server/router/TieredBrokerSelectorStrategy.java similarity index 95% rename from server/src/main/java/io/druid/server/router/TieredBrokerSelectorStrategy.java rename to server/src/main/java/org/apache/druid/server/router/TieredBrokerSelectorStrategy.java index e23da42dd9b9..f40dfd4ca292 100644 --- a/server/src/main/java/io/druid/server/router/TieredBrokerSelectorStrategy.java +++ b/server/src/main/java/org/apache/druid/server/router/TieredBrokerSelectorStrategy.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.server.router; +package org.apache.druid.server.router; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.google.common.base.Optional; -import io.druid.query.Query; +import org.apache.druid.query.Query; /** */ diff --git a/server/src/main/java/io/druid/server/router/TimeBoundaryTieredBrokerSelectorStrategy.java b/server/src/main/java/org/apache/druid/server/router/TimeBoundaryTieredBrokerSelectorStrategy.java similarity index 91% rename from server/src/main/java/io/druid/server/router/TimeBoundaryTieredBrokerSelectorStrategy.java rename to server/src/main/java/org/apache/druid/server/router/TimeBoundaryTieredBrokerSelectorStrategy.java index e686eefe4b3b..02e1245d8bf6 100644 --- a/server/src/main/java/io/druid/server/router/TimeBoundaryTieredBrokerSelectorStrategy.java +++ b/server/src/main/java/org/apache/druid/server/router/TimeBoundaryTieredBrokerSelectorStrategy.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.server.router; +package org.apache.druid.server.router; import com.google.common.base.Optional; import com.google.common.collect.Iterables; -import io.druid.query.Query; -import io.druid.query.timeboundary.TimeBoundaryQuery; +import org.apache.druid.query.Query; +import org.apache.druid.query.timeboundary.TimeBoundaryQuery; /** */ diff --git a/server/src/main/java/io/druid/server/security/Access.java b/server/src/main/java/org/apache/druid/server/security/Access.java similarity index 93% rename from server/src/main/java/io/druid/server/security/Access.java rename to server/src/main/java/org/apache/druid/server/security/Access.java index 45ea4be4ecee..0c86a42a1a21 100644 --- a/server/src/main/java/io/druid/server/security/Access.java +++ b/server/src/main/java/org/apache/druid/server/security/Access.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.server.security; +package org.apache.druid.server.security; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; public class Access { diff --git a/server/src/main/java/io/druid/server/security/Action.java b/server/src/main/java/org/apache/druid/server/security/Action.java similarity index 91% rename from server/src/main/java/io/druid/server/security/Action.java rename to server/src/main/java/org/apache/druid/server/security/Action.java index 8a8535e7de61..afe846475b47 100644 --- a/server/src/main/java/io/druid/server/security/Action.java +++ b/server/src/main/java/org/apache/druid/server/security/Action.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.server.security; +package org.apache.druid.server.security; import com.fasterxml.jackson.annotation.JsonCreator; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; public enum Action { diff --git a/server/src/main/java/io/druid/server/security/AllowAllAuthenticator.java b/server/src/main/java/org/apache/druid/server/security/AllowAllAuthenticator.java similarity index 98% rename from server/src/main/java/io/druid/server/security/AllowAllAuthenticator.java rename to server/src/main/java/org/apache/druid/server/security/AllowAllAuthenticator.java index 5506a48ed74a..6767a79e66b2 100644 --- a/server/src/main/java/io/druid/server/security/AllowAllAuthenticator.java +++ b/server/src/main/java/org/apache/druid/server/security/AllowAllAuthenticator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.security; +package org.apache.druid.server.security; import javax.servlet.DispatcherType; import javax.servlet.Filter; diff --git a/server/src/main/java/io/druid/server/security/AllowAllAuthorizer.java b/server/src/main/java/org/apache/druid/server/security/AllowAllAuthorizer.java similarity index 96% rename from server/src/main/java/io/druid/server/security/AllowAllAuthorizer.java rename to server/src/main/java/org/apache/druid/server/security/AllowAllAuthorizer.java index 8870f54395ea..6271228b33de 100644 --- a/server/src/main/java/io/druid/server/security/AllowAllAuthorizer.java +++ b/server/src/main/java/org/apache/druid/server/security/AllowAllAuthorizer.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.security; +package org.apache.druid.server.security; public class AllowAllAuthorizer implements Authorizer { diff --git a/server/src/main/java/io/druid/server/security/AllowOptionsResourceFilter.java b/server/src/main/java/org/apache/druid/server/security/AllowOptionsResourceFilter.java similarity index 98% rename from server/src/main/java/io/druid/server/security/AllowOptionsResourceFilter.java rename to server/src/main/java/org/apache/druid/server/security/AllowOptionsResourceFilter.java index 599381280c5c..200df990c4d3 100644 --- a/server/src/main/java/io/druid/server/security/AllowOptionsResourceFilter.java +++ b/server/src/main/java/org/apache/druid/server/security/AllowOptionsResourceFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.security; +package org.apache.druid.server.security; import javax.servlet.Filter; import javax.servlet.FilterChain; diff --git a/server/src/main/java/io/druid/server/security/AnonymousAuthenticator.java b/server/src/main/java/org/apache/druid/server/security/AnonymousAuthenticator.java similarity index 98% rename from server/src/main/java/io/druid/server/security/AnonymousAuthenticator.java rename to server/src/main/java/org/apache/druid/server/security/AnonymousAuthenticator.java index 9f57cf398925..893528dab53d 100644 --- a/server/src/main/java/io/druid/server/security/AnonymousAuthenticator.java +++ b/server/src/main/java/org/apache/druid/server/security/AnonymousAuthenticator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.security; +package org.apache.druid.server.security; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/server/security/AuthConfig.java b/server/src/main/java/org/apache/druid/server/security/AuthConfig.java similarity index 98% rename from server/src/main/java/io/druid/server/security/AuthConfig.java rename to server/src/main/java/org/apache/druid/server/security/AuthConfig.java index f5a0df0147fe..83b233310d83 100644 --- a/server/src/main/java/io/druid/server/security/AuthConfig.java +++ b/server/src/main/java/org/apache/druid/server/security/AuthConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.security; +package org.apache.druid.server.security; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/server/security/AuthTestUtils.java b/server/src/main/java/org/apache/druid/server/security/AuthTestUtils.java similarity index 97% rename from server/src/main/java/io/druid/server/security/AuthTestUtils.java rename to server/src/main/java/org/apache/druid/server/security/AuthTestUtils.java index 323d0cb339d8..7b73c65422e9 100644 --- a/server/src/main/java/io/druid/server/security/AuthTestUtils.java +++ b/server/src/main/java/org/apache/druid/server/security/AuthTestUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.security; +package org.apache.druid.server.security; import com.google.common.collect.Maps; diff --git a/server/src/main/java/io/druid/server/security/AuthenticationResult.java b/server/src/main/java/org/apache/druid/server/security/AuthenticationResult.java similarity index 95% rename from server/src/main/java/io/druid/server/security/AuthenticationResult.java rename to server/src/main/java/org/apache/druid/server/security/AuthenticationResult.java index d2d6d724b951..854aa5e66699 100644 --- a/server/src/main/java/io/druid/server/security/AuthenticationResult.java +++ b/server/src/main/java/org/apache/druid/server/security/AuthenticationResult.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.security; +package org.apache.druid.server.security; import javax.annotation.Nullable; import java.util.Map; @@ -43,7 +43,7 @@ public class AuthenticationResult * Name of authenticator whom created the results * * If you found your self asking why the authenticatedBy field can be null please read this - * https://github.com/druid-io/druid/pull/5706#discussion_r185940889 + * https://github.com/apache/incubator-druid/pull/5706#discussion_r185940889 */ @Nullable private final String authenticatedBy; diff --git a/server/src/main/java/io/druid/server/security/AuthenticationUtils.java b/server/src/main/java/org/apache/druid/server/security/AuthenticationUtils.java similarity index 98% rename from server/src/main/java/io/druid/server/security/AuthenticationUtils.java rename to server/src/main/java/org/apache/druid/server/security/AuthenticationUtils.java index f89f04bda50a..a9438cd7dd73 100644 --- a/server/src/main/java/io/druid/server/security/AuthenticationUtils.java +++ b/server/src/main/java/org/apache/druid/server/security/AuthenticationUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.security; +package org.apache.druid.server.security; import com.fasterxml.jackson.databind.ObjectMapper; import org.eclipse.jetty.servlet.FilterHolder; diff --git a/server/src/main/java/io/druid/server/security/AuthenticationWrappingFilter.java b/server/src/main/java/org/apache/druid/server/security/AuthenticationWrappingFilter.java similarity index 98% rename from server/src/main/java/io/druid/server/security/AuthenticationWrappingFilter.java rename to server/src/main/java/org/apache/druid/server/security/AuthenticationWrappingFilter.java index 076795c801b0..8ed55dee461b 100644 --- a/server/src/main/java/io/druid/server/security/AuthenticationWrappingFilter.java +++ b/server/src/main/java/org/apache/druid/server/security/AuthenticationWrappingFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.security; +package org.apache.druid.server.security; import javax.servlet.Filter; import javax.servlet.FilterChain; diff --git a/server/src/main/java/io/druid/server/security/Authenticator.java b/server/src/main/java/org/apache/druid/server/security/Authenticator.java similarity index 97% rename from server/src/main/java/io/druid/server/security/Authenticator.java rename to server/src/main/java/org/apache/druid/server/security/Authenticator.java index 149094cdef30..803f518cb82e 100644 --- a/server/src/main/java/io/druid/server/security/Authenticator.java +++ b/server/src/main/java/org/apache/druid/server/security/Authenticator.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.server.security; +package org.apache.druid.server.security; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.druid.server.initialization.jetty.ServletFilterHolder; +import org.apache.druid.server.initialization.jetty.ServletFilterHolder; import org.eclipse.jetty.client.api.Request; import javax.annotation.Nullable; diff --git a/server/src/main/java/io/druid/server/security/AuthenticatorMapper.java b/server/src/main/java/org/apache/druid/server/security/AuthenticatorMapper.java similarity index 93% rename from server/src/main/java/io/druid/server/security/AuthenticatorMapper.java rename to server/src/main/java/org/apache/druid/server/security/AuthenticatorMapper.java index aa6e75109d65..5b59fe65e461 100644 --- a/server/src/main/java/io/druid/server/security/AuthenticatorMapper.java +++ b/server/src/main/java/org/apache/druid/server/security/AuthenticatorMapper.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.server.security; +package org.apache.druid.server.security; import com.google.common.collect.Lists; -import io.druid.guice.ManageLifecycle; +import org.apache.druid.guice.ManageLifecycle; import java.util.List; import java.util.Map; diff --git a/server/src/main/java/io/druid/server/security/AuthorizationUtils.java b/server/src/main/java/org/apache/druid/server/security/AuthorizationUtils.java similarity index 99% rename from server/src/main/java/io/druid/server/security/AuthorizationUtils.java rename to server/src/main/java/org/apache/druid/server/security/AuthorizationUtils.java index 2c138486ce91..651bed8eb5a9 100644 --- a/server/src/main/java/io/druid/server/security/AuthorizationUtils.java +++ b/server/src/main/java/org/apache/druid/server/security/AuthorizationUtils.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.server.security; +package org.apache.druid.server.security; import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import io.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.ISE; import javax.servlet.http.HttpServletRequest; import java.util.Collections; diff --git a/server/src/main/java/io/druid/server/security/Authorizer.java b/server/src/main/java/org/apache/druid/server/security/Authorizer.java similarity index 98% rename from server/src/main/java/io/druid/server/security/Authorizer.java rename to server/src/main/java/org/apache/druid/server/security/Authorizer.java index 4693eeae5ddd..8929c9045111 100644 --- a/server/src/main/java/io/druid/server/security/Authorizer.java +++ b/server/src/main/java/org/apache/druid/server/security/Authorizer.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.security; +package org.apache.druid.server.security; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/server/src/main/java/io/druid/server/security/AuthorizerMapper.java b/server/src/main/java/org/apache/druid/server/security/AuthorizerMapper.java similarity index 93% rename from server/src/main/java/io/druid/server/security/AuthorizerMapper.java rename to server/src/main/java/org/apache/druid/server/security/AuthorizerMapper.java index 8c68775063a4..e888cc14f9df 100644 --- a/server/src/main/java/io/druid/server/security/AuthorizerMapper.java +++ b/server/src/main/java/org/apache/druid/server/security/AuthorizerMapper.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.server.security; +package org.apache.druid.server.security; -import io.druid.guice.ManageLifecycle; +import org.apache.druid.guice.ManageLifecycle; import java.util.Map; diff --git a/server/src/main/java/io/druid/server/security/Escalator.java b/server/src/main/java/org/apache/druid/server/security/Escalator.java similarity index 95% rename from server/src/main/java/io/druid/server/security/Escalator.java rename to server/src/main/java/org/apache/druid/server/security/Escalator.java index 715d3e02ceb1..87e299cace40 100644 --- a/server/src/main/java/io/druid/server/security/Escalator.java +++ b/server/src/main/java/org/apache/druid/server/security/Escalator.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.server.security; +package org.apache.druid.server.security; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.HttpClient; /** * This interface provides methods needed for escalating internal system requests with priveleged authentication diff --git a/server/src/main/java/io/druid/server/security/ForbiddenException.java b/server/src/main/java/org/apache/druid/server/security/ForbiddenException.java similarity index 96% rename from server/src/main/java/io/druid/server/security/ForbiddenException.java rename to server/src/main/java/org/apache/druid/server/security/ForbiddenException.java index f43bae531fa7..f278236e98fb 100644 --- a/server/src/main/java/io/druid/server/security/ForbiddenException.java +++ b/server/src/main/java/org/apache/druid/server/security/ForbiddenException.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.security; +package org.apache.druid.server.security; /** * Throw this when a request is unauthorized and we want to send a 403 response back, Jersey exception mapper will diff --git a/server/src/main/java/io/druid/server/security/NoopEscalator.java b/server/src/main/java/org/apache/druid/server/security/NoopEscalator.java similarity index 94% rename from server/src/main/java/io/druid/server/security/NoopEscalator.java rename to server/src/main/java/org/apache/druid/server/security/NoopEscalator.java index c3fbb1eca4d5..8f785de90354 100644 --- a/server/src/main/java/io/druid/server/security/NoopEscalator.java +++ b/server/src/main/java/org/apache/druid/server/security/NoopEscalator.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.server.security; +package org.apache.druid.server.security; import com.fasterxml.jackson.annotation.JsonCreator; -import io.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.HttpClient; public class NoopEscalator implements Escalator { diff --git a/server/src/main/java/io/druid/server/security/PreResponseAuthorizationCheckFilter.java b/server/src/main/java/org/apache/druid/server/security/PreResponseAuthorizationCheckFilter.java similarity index 96% rename from server/src/main/java/io/druid/server/security/PreResponseAuthorizationCheckFilter.java rename to server/src/main/java/org/apache/druid/server/security/PreResponseAuthorizationCheckFilter.java index 24f93eb93f77..deedcc3dc214 100644 --- a/server/src/main/java/io/druid/server/security/PreResponseAuthorizationCheckFilter.java +++ b/server/src/main/java/org/apache/druid/server/security/PreResponseAuthorizationCheckFilter.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.server.security; +package org.apache.druid.server.security; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Sets; -import io.druid.java.util.common.ISE; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.query.QueryInterruptedException; -import io.druid.server.DruidNode; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.query.QueryInterruptedException; +import org.apache.druid.server.DruidNode; import org.eclipse.jetty.server.Response; import javax.servlet.Filter; diff --git a/server/src/main/java/io/druid/server/security/Resource.java b/server/src/main/java/org/apache/druid/server/security/Resource.java similarity index 97% rename from server/src/main/java/io/druid/server/security/Resource.java rename to server/src/main/java/org/apache/druid/server/security/Resource.java index 0a7e69d8e081..02b6539090cf 100644 --- a/server/src/main/java/io/druid/server/security/Resource.java +++ b/server/src/main/java/org/apache/druid/server/security/Resource.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.security; +package org.apache.druid.server.security; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/io/druid/server/security/ResourceAction.java b/server/src/main/java/org/apache/druid/server/security/ResourceAction.java similarity index 95% rename from server/src/main/java/io/druid/server/security/ResourceAction.java rename to server/src/main/java/org/apache/druid/server/security/ResourceAction.java index 3def00179333..13e99cd66878 100644 --- a/server/src/main/java/io/druid/server/security/ResourceAction.java +++ b/server/src/main/java/org/apache/druid/server/security/ResourceAction.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.server.security; +package org.apache.druid.server.security; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; public class ResourceAction { diff --git a/server/src/main/java/io/druid/server/security/ResourceType.java b/server/src/main/java/org/apache/druid/server/security/ResourceType.java similarity index 91% rename from server/src/main/java/io/druid/server/security/ResourceType.java rename to server/src/main/java/org/apache/druid/server/security/ResourceType.java index b113f18e23a7..5debab216158 100644 --- a/server/src/main/java/io/druid/server/security/ResourceType.java +++ b/server/src/main/java/org/apache/druid/server/security/ResourceType.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.server.security; +package org.apache.druid.server.security; import com.fasterxml.jackson.annotation.JsonCreator; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; public enum ResourceType { diff --git a/server/src/main/java/io/druid/server/security/SecuritySanityCheckFilter.java b/server/src/main/java/org/apache/druid/server/security/SecuritySanityCheckFilter.java similarity index 94% rename from server/src/main/java/io/druid/server/security/SecuritySanityCheckFilter.java rename to server/src/main/java/org/apache/druid/server/security/SecuritySanityCheckFilter.java index 7234bdb1c8e9..2021ef3c1352 100644 --- a/server/src/main/java/io/druid/server/security/SecuritySanityCheckFilter.java +++ b/server/src/main/java/org/apache/druid/server/security/SecuritySanityCheckFilter.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.server.security; +package org.apache.druid.server.security; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.QueryInterruptedException; -import io.druid.server.DruidNode; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.QueryInterruptedException; +import org.apache.druid.server.DruidNode; import org.eclipse.jetty.server.Response; import javax.servlet.Filter; diff --git a/server/src/main/java/io/druid/server/security/TLSUtils.java b/server/src/main/java/org/apache/druid/server/security/TLSUtils.java similarity index 96% rename from server/src/main/java/io/druid/server/security/TLSUtils.java rename to server/src/main/java/org/apache/druid/server/security/TLSUtils.java index fad54a9facfb..733af5ef34df 100644 --- a/server/src/main/java/io/druid/server/security/TLSUtils.java +++ b/server/src/main/java/org/apache/druid/server/security/TLSUtils.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.server.security; +package org.apache.druid.server.security; import com.google.common.base.Throwables; -import io.druid.metadata.PasswordProvider; +import org.apache.druid.metadata.PasswordProvider; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManagerFactory; diff --git a/server/src/main/java/io/druid/server/security/UnsecuredResourceFilter.java b/server/src/main/java/org/apache/druid/server/security/UnsecuredResourceFilter.java similarity index 98% rename from server/src/main/java/io/druid/server/security/UnsecuredResourceFilter.java rename to server/src/main/java/org/apache/druid/server/security/UnsecuredResourceFilter.java index d8c415832b1f..cb696ad45bb8 100644 --- a/server/src/main/java/io/druid/server/security/UnsecuredResourceFilter.java +++ b/server/src/main/java/org/apache/druid/server/security/UnsecuredResourceFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.security; +package org.apache.druid.server.security; import javax.servlet.Filter; import javax.servlet.FilterChain; diff --git a/server/src/main/java/io/druid/timeline/partition/HashBasedNumberedShardSpec.java b/server/src/main/java/org/apache/druid/timeline/partition/HashBasedNumberedShardSpec.java similarity index 96% rename from server/src/main/java/io/druid/timeline/partition/HashBasedNumberedShardSpec.java rename to server/src/main/java/org/apache/druid/timeline/partition/HashBasedNumberedShardSpec.java index ca873d0a523d..456da4b8c94a 100644 --- a/server/src/main/java/io/druid/timeline/partition/HashBasedNumberedShardSpec.java +++ b/server/src/main/java/org/apache/druid/timeline/partition/HashBasedNumberedShardSpec.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.timeline.partition; +package org.apache.druid.timeline.partition; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; @@ -30,8 +30,8 @@ import com.google.common.collect.Lists; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; -import io.druid.data.input.InputRow; -import io.druid.data.input.Rows; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.Rows; import javax.annotation.Nullable; import java.util.List; diff --git a/server/src/main/java/io/druid/timeline/partition/LinearShardSpec.java b/server/src/main/java/org/apache/druid/timeline/partition/LinearShardSpec.java similarity index 96% rename from server/src/main/java/io/druid/timeline/partition/LinearShardSpec.java rename to server/src/main/java/org/apache/druid/timeline/partition/LinearShardSpec.java index c460630641ea..9e7b68915c54 100644 --- a/server/src/main/java/io/druid/timeline/partition/LinearShardSpec.java +++ b/server/src/main/java/org/apache/druid/timeline/partition/LinearShardSpec.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.timeline.partition; +package org.apache.druid.timeline.partition; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.RangeSet; -import io.druid.data.input.InputRow; +import org.apache.druid.data.input.InputRow; import java.util.List; import java.util.Map; diff --git a/server/src/main/java/io/druid/timeline/partition/NumberedShardSpec.java b/server/src/main/java/org/apache/druid/timeline/partition/NumberedShardSpec.java similarity index 97% rename from server/src/main/java/io/druid/timeline/partition/NumberedShardSpec.java rename to server/src/main/java/org/apache/druid/timeline/partition/NumberedShardSpec.java index 6cd952ff547a..8b555e26fe80 100644 --- a/server/src/main/java/io/druid/timeline/partition/NumberedShardSpec.java +++ b/server/src/main/java/org/apache/druid/timeline/partition/NumberedShardSpec.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.timeline.partition; +package org.apache.druid.timeline.partition; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -25,7 +25,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.RangeSet; -import io.druid.data.input.InputRow; +import org.apache.druid.data.input.InputRow; import java.util.List; import java.util.Map; diff --git a/server/src/main/java/io/druid/timeline/partition/SingleDimensionShardSpec.java b/server/src/main/java/org/apache/druid/timeline/partition/SingleDimensionShardSpec.java similarity index 97% rename from server/src/main/java/io/druid/timeline/partition/SingleDimensionShardSpec.java rename to server/src/main/java/org/apache/druid/timeline/partition/SingleDimensionShardSpec.java index 5d5bfcbe04a6..044f1635213d 100644 --- a/server/src/main/java/io/druid/timeline/partition/SingleDimensionShardSpec.java +++ b/server/src/main/java/org/apache/druid/timeline/partition/SingleDimensionShardSpec.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.timeline.partition; +package org.apache.druid.timeline.partition; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; import com.google.common.collect.Range; import com.google.common.collect.RangeSet; -import io.druid.data.input.InputRow; -import io.druid.java.util.common.ISE; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.java.util.common.ISE; import java.util.List; import java.util.Map; diff --git a/server/src/test/java/io/druid/client/BrokerSegmentWatcherConfigTest.java b/server/src/test/java/org/apache/druid/client/BrokerSegmentWatcherConfigTest.java similarity index 96% rename from server/src/test/java/io/druid/client/BrokerSegmentWatcherConfigTest.java rename to server/src/test/java/org/apache/druid/client/BrokerSegmentWatcherConfigTest.java index 2e038947f9a4..aa69b9c0d6f5 100644 --- a/server/src/test/java/io/druid/client/BrokerSegmentWatcherConfigTest.java +++ b/server/src/test/java/org/apache/druid/client/BrokerSegmentWatcherConfigTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableSet; -import io.druid.segment.TestHelper; +import org.apache.druid.segment.TestHelper; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/client/BrokerServerViewTest.java b/server/src/test/java/org/apache/druid/client/BrokerServerViewTest.java similarity index 91% rename from server/src/test/java/io/druid/client/BrokerServerViewTest.java rename to server/src/test/java/org/apache/druid/client/BrokerServerViewTest.java index a7e1836ad09b..0df2c82a6341 100644 --- a/server/src/test/java/io/druid/client/BrokerServerViewTest.java +++ b/server/src/test/java/org/apache/druid/client/BrokerServerViewTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.smile.SmileFactory; @@ -28,28 +28,28 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import io.druid.java.util.http.client.HttpClient; -import io.druid.client.selector.HighestPriorityTierSelectorStrategy; -import io.druid.client.selector.RandomServerSelectorStrategy; -import io.druid.client.selector.ServerSelector; -import io.druid.curator.CuratorTestBase; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.Pair; -import io.druid.query.QueryToolChestWarehouse; -import io.druid.query.QueryWatcher; -import io.druid.query.TableDataSource; -import io.druid.segment.TestHelper; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.server.coordination.ServerType; -import io.druid.server.initialization.ZkPathsConfig; -import io.druid.server.metrics.NoopServiceEmitter; -import io.druid.timeline.DataSegment; -import io.druid.timeline.TimelineLookup; -import io.druid.timeline.TimelineObjectHolder; -import io.druid.timeline.partition.NoneShardSpec; -import io.druid.timeline.partition.PartitionHolder; -import io.druid.timeline.partition.SingleElementPartitionChunk; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.client.selector.HighestPriorityTierSelectorStrategy; +import org.apache.druid.client.selector.RandomServerSelectorStrategy; +import org.apache.druid.client.selector.ServerSelector; +import org.apache.druid.curator.CuratorTestBase; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.query.QueryToolChestWarehouse; +import org.apache.druid.query.QueryWatcher; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.server.metrics.NoopServiceEmitter; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.TimelineLookup; +import org.apache.druid.timeline.TimelineObjectHolder; +import org.apache.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.timeline.partition.PartitionHolder; +import org.apache.druid.timeline.partition.SingleElementPartitionChunk; import org.easymock.EasyMock; import org.joda.time.Interval; import org.junit.After; diff --git a/server/src/test/java/io/druid/client/CachingClusteredClientFunctionalityTest.java b/server/src/test/java/org/apache/druid/client/CachingClusteredClientFunctionalityTest.java similarity index 87% rename from server/src/test/java/io/druid/client/CachingClusteredClientFunctionalityTest.java rename to server/src/test/java/org/apache/druid/client/CachingClusteredClientFunctionalityTest.java index 228bb9554f8d..7ac1596b9131 100644 --- a/server/src/test/java/io/druid/client/CachingClusteredClientFunctionalityTest.java +++ b/server/src/test/java/org/apache/druid/client/CachingClusteredClientFunctionalityTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Supplier; @@ -24,32 +24,32 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Ordering; -import io.druid.client.cache.Cache; -import io.druid.client.cache.CacheConfig; -import io.druid.client.cache.CachePopulator; -import io.druid.client.cache.CachePopulatorStats; -import io.druid.client.cache.ForegroundCachePopulator; -import io.druid.client.cache.MapCache; -import io.druid.client.selector.QueryableDruidServer; -import io.druid.client.selector.ServerSelector; -import io.druid.client.selector.TierSelectorStrategy; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.io.Closer; -import io.druid.query.DataSource; -import io.druid.query.Druids; -import io.druid.query.Query; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryToolChestWarehouse; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.select.SelectQueryConfig; -import io.druid.server.coordination.ServerType; -import io.druid.timeline.DataSegment; -import io.druid.timeline.VersionedIntervalTimeline; -import io.druid.timeline.partition.NoneShardSpec; -import io.druid.timeline.partition.SingleElementPartitionChunk; +import org.apache.druid.client.cache.Cache; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.client.cache.CachePopulator; +import org.apache.druid.client.cache.CachePopulatorStats; +import org.apache.druid.client.cache.ForegroundCachePopulator; +import org.apache.druid.client.cache.MapCache; +import org.apache.druid.client.selector.QueryableDruidServer; +import org.apache.druid.client.selector.ServerSelector; +import org.apache.druid.client.selector.TierSelectorStrategy; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.query.DataSource; +import org.apache.druid.query.Druids; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryToolChestWarehouse; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.select.SelectQueryConfig; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.timeline.partition.SingleElementPartitionChunk; import it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap; import org.easymock.EasyMock; import org.joda.time.Interval; diff --git a/server/src/test/java/io/druid/client/CachingClusteredClientTest.java b/server/src/test/java/org/apache/druid/client/CachingClusteredClientTest.java similarity index 95% rename from server/src/test/java/io/druid/client/CachingClusteredClientTest.java rename to server/src/test/java/org/apache/druid/client/CachingClusteredClientTest.java index 3e509ae3aac7..4a6dfd0a7ba5 100644 --- a/server/src/test/java/io/druid/client/CachingClusteredClientTest.java +++ b/server/src/test/java/org/apache/druid/client/CachingClusteredClientTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.ObjectMapper; @@ -43,96 +43,96 @@ import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; -import io.druid.client.cache.BackgroundCachePopulator; -import io.druid.client.cache.Cache; -import io.druid.client.cache.CacheConfig; -import io.druid.client.cache.CachePopulator; -import io.druid.client.cache.CachePopulatorStats; -import io.druid.client.cache.ForegroundCachePopulator; -import io.druid.client.cache.MapCache; -import io.druid.client.selector.HighestPriorityTierSelectorStrategy; -import io.druid.client.selector.QueryableDruidServer; -import io.druid.client.selector.RandomServerSelectorStrategy; -import io.druid.client.selector.ServerSelector; -import io.druid.data.input.MapBasedRow; -import io.druid.data.input.Row; -import io.druid.hll.HyperLogLogCollector; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.granularity.PeriodGranularity; -import io.druid.java.util.common.guava.Comparators; -import io.druid.java.util.common.guava.FunctionalIterable; -import io.druid.java.util.common.guava.MergeIterable; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.common.guava.nary.TrinaryFn; -import io.druid.java.util.common.io.Closer; -import io.druid.query.BySegmentResultValueClass; -import io.druid.query.DataSource; -import io.druid.query.Druids; -import io.druid.query.FinalizeResultsQueryRunner; -import io.druid.query.Query; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.QueryToolChestWarehouse; -import io.druid.query.Result; -import io.druid.query.SegmentDescriptor; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; -import io.druid.query.aggregation.post.ArithmeticPostAggregator; -import io.druid.query.aggregation.post.ConstantPostAggregator; -import io.druid.query.aggregation.post.FieldAccessPostAggregator; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.filter.AndDimFilter; -import io.druid.query.filter.BoundDimFilter; -import io.druid.query.filter.DimFilter; -import io.druid.query.filter.InDimFilter; -import io.druid.query.filter.OrDimFilter; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.query.groupby.GroupByQuery; -import io.druid.query.groupby.strategy.GroupByStrategySelector; -import io.druid.query.ordering.StringComparators; -import io.druid.query.search.SearchHit; -import io.druid.query.search.SearchQuery; -import io.druid.query.search.SearchQueryConfig; -import io.druid.query.search.SearchQueryQueryToolChest; -import io.druid.query.search.SearchResultValue; -import io.druid.query.select.EventHolder; -import io.druid.query.select.PagingSpec; -import io.druid.query.select.SelectQuery; -import io.druid.query.select.SelectQueryConfig; -import io.druid.query.select.SelectQueryQueryToolChest; -import io.druid.query.select.SelectResultValue; -import io.druid.query.spec.MultipleIntervalSegmentSpec; -import io.druid.query.spec.MultipleSpecificSegmentSpec; -import io.druid.query.timeboundary.TimeBoundaryQuery; -import io.druid.query.timeboundary.TimeBoundaryResultValue; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.timeseries.TimeseriesQueryQueryToolChest; -import io.druid.query.timeseries.TimeseriesResultValue; -import io.druid.query.topn.TopNQuery; -import io.druid.query.topn.TopNQueryBuilder; -import io.druid.query.topn.TopNQueryConfig; -import io.druid.query.topn.TopNQueryQueryToolChest; -import io.druid.query.topn.TopNResultValue; -import io.druid.segment.TestHelper; -import io.druid.server.coordination.ServerType; -import io.druid.timeline.DataSegment; -import io.druid.timeline.VersionedIntervalTimeline; -import io.druid.timeline.partition.NoneShardSpec; -import io.druid.timeline.partition.ShardSpec; -import io.druid.timeline.partition.SingleDimensionShardSpec; -import io.druid.timeline.partition.SingleElementPartitionChunk; -import io.druid.timeline.partition.StringPartitionChunk; +import org.apache.druid.client.cache.BackgroundCachePopulator; +import org.apache.druid.client.cache.Cache; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.client.cache.CachePopulator; +import org.apache.druid.client.cache.CachePopulatorStats; +import org.apache.druid.client.cache.ForegroundCachePopulator; +import org.apache.druid.client.cache.MapCache; +import org.apache.druid.client.selector.HighestPriorityTierSelectorStrategy; +import org.apache.druid.client.selector.QueryableDruidServer; +import org.apache.druid.client.selector.RandomServerSelectorStrategy; +import org.apache.druid.client.selector.ServerSelector; +import org.apache.druid.data.input.MapBasedRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.hll.HyperLogLogCollector; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.granularity.PeriodGranularity; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.java.util.common.guava.FunctionalIterable; +import org.apache.druid.java.util.common.guava.MergeIterable; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.guava.nary.TrinaryFn; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.query.BySegmentResultValueClass; +import org.apache.druid.query.DataSource; +import org.apache.druid.query.Druids; +import org.apache.druid.query.FinalizeResultsQueryRunner; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.QueryToolChestWarehouse; +import org.apache.druid.query.Result; +import org.apache.druid.query.SegmentDescriptor; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; +import org.apache.druid.query.aggregation.post.ArithmeticPostAggregator; +import org.apache.druid.query.aggregation.post.ConstantPostAggregator; +import org.apache.druid.query.aggregation.post.FieldAccessPostAggregator; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.filter.AndDimFilter; +import org.apache.druid.query.filter.BoundDimFilter; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.filter.InDimFilter; +import org.apache.druid.query.filter.OrDimFilter; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.query.groupby.GroupByQuery; +import org.apache.druid.query.groupby.strategy.GroupByStrategySelector; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.query.search.SearchHit; +import org.apache.druid.query.search.SearchQuery; +import org.apache.druid.query.search.SearchQueryConfig; +import org.apache.druid.query.search.SearchQueryQueryToolChest; +import org.apache.druid.query.search.SearchResultValue; +import org.apache.druid.query.select.EventHolder; +import org.apache.druid.query.select.PagingSpec; +import org.apache.druid.query.select.SelectQuery; +import org.apache.druid.query.select.SelectQueryConfig; +import org.apache.druid.query.select.SelectQueryQueryToolChest; +import org.apache.druid.query.select.SelectResultValue; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.query.spec.MultipleSpecificSegmentSpec; +import org.apache.druid.query.timeboundary.TimeBoundaryQuery; +import org.apache.druid.query.timeboundary.TimeBoundaryResultValue; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.timeseries.TimeseriesQueryQueryToolChest; +import org.apache.druid.query.timeseries.TimeseriesResultValue; +import org.apache.druid.query.topn.TopNQuery; +import org.apache.druid.query.topn.TopNQueryBuilder; +import org.apache.druid.query.topn.TopNQueryConfig; +import org.apache.druid.query.topn.TopNQueryQueryToolChest; +import org.apache.druid.query.topn.TopNResultValue; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.timeline.partition.ShardSpec; +import org.apache.druid.timeline.partition.SingleDimensionShardSpec; +import org.apache.druid.timeline.partition.SingleElementPartitionChunk; +import org.apache.druid.timeline.partition.StringPartitionChunk; import org.easymock.Capture; import org.easymock.EasyMock; import org.easymock.IAnswer; diff --git a/server/src/test/java/io/druid/client/CachingClusteredClientTestUtils.java b/server/src/test/java/org/apache/druid/client/CachingClusteredClientTestUtils.java similarity index 71% rename from server/src/test/java/io/druid/client/CachingClusteredClientTestUtils.java rename to server/src/test/java/org/apache/druid/client/CachingClusteredClientTestUtils.java index 190ecdacd673..3609e2af7778 100644 --- a/server/src/test/java/io/druid/client/CachingClusteredClientTestUtils.java +++ b/server/src/test/java/org/apache/druid/client/CachingClusteredClientTestUtils.java @@ -16,37 +16,37 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.smile.SmileFactory; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableMap; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.io.Closer; -import io.druid.query.MapQueryToolChestWarehouse; -import io.druid.query.Query; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.QueryToolChest; -import io.druid.query.QueryToolChestWarehouse; -import io.druid.query.groupby.GroupByQuery; -import io.druid.query.groupby.GroupByQueryConfig; -import io.druid.query.groupby.GroupByQueryRunnerFactory; -import io.druid.query.groupby.GroupByQueryRunnerTest; -import io.druid.query.search.SearchQuery; -import io.druid.query.search.SearchQueryConfig; -import io.druid.query.search.SearchQueryQueryToolChest; -import io.druid.query.select.SelectQuery; -import io.druid.query.select.SelectQueryConfig; -import io.druid.query.select.SelectQueryQueryToolChest; -import io.druid.query.timeboundary.TimeBoundaryQuery; -import io.druid.query.timeboundary.TimeBoundaryQueryQueryToolChest; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.timeseries.TimeseriesQueryQueryToolChest; -import io.druid.query.topn.TopNQuery; -import io.druid.query.topn.TopNQueryConfig; -import io.druid.query.topn.TopNQueryQueryToolChest; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.query.MapQueryToolChestWarehouse; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.QueryToolChestWarehouse; +import org.apache.druid.query.groupby.GroupByQuery; +import org.apache.druid.query.groupby.GroupByQueryConfig; +import org.apache.druid.query.groupby.GroupByQueryRunnerFactory; +import org.apache.druid.query.groupby.GroupByQueryRunnerTest; +import org.apache.druid.query.search.SearchQuery; +import org.apache.druid.query.search.SearchQueryConfig; +import org.apache.druid.query.search.SearchQueryQueryToolChest; +import org.apache.druid.query.select.SelectQuery; +import org.apache.druid.query.select.SelectQueryConfig; +import org.apache.druid.query.select.SelectQueryQueryToolChest; +import org.apache.druid.query.timeboundary.TimeBoundaryQuery; +import org.apache.druid.query.timeboundary.TimeBoundaryQueryQueryToolChest; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.timeseries.TimeseriesQueryQueryToolChest; +import org.apache.druid.query.topn.TopNQuery; +import org.apache.druid.query.topn.TopNQueryConfig; +import org.apache.druid.query.topn.TopNQueryQueryToolChest; public final class CachingClusteredClientTestUtils { diff --git a/server/src/test/java/io/druid/client/CachingQueryRunnerTest.java b/server/src/test/java/org/apache/druid/client/CachingQueryRunnerTest.java similarity index 87% rename from server/src/test/java/io/druid/client/CachingQueryRunnerTest.java rename to server/src/test/java/org/apache/druid/client/CachingQueryRunnerTest.java index 012fe2b9be2a..b20edd804a09 100644 --- a/server/src/test/java/io/druid/client/CachingQueryRunnerTest.java +++ b/server/src/test/java/org/apache/druid/client/CachingQueryRunnerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.ObjectMapper; @@ -26,43 +26,43 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; -import io.druid.client.cache.BackgroundCachePopulator; -import io.druid.client.cache.Cache; -import io.druid.client.cache.CacheConfig; -import io.druid.client.cache.CachePopulator; -import io.druid.client.cache.CachePopulatorStats; -import io.druid.client.cache.CacheStats; -import io.druid.client.cache.ForegroundCachePopulator; -import io.druid.client.cache.MapCache; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.SequenceWrapper; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.query.CacheStrategy; -import io.druid.query.Druids; -import io.druid.query.Query; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.QueryToolChest; -import io.druid.query.Result; -import io.druid.query.SegmentDescriptor; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.timeseries.TimeseriesQueryQueryToolChest; -import io.druid.query.timeseries.TimeseriesResultValue; -import io.druid.query.topn.TopNQueryBuilder; -import io.druid.query.topn.TopNQueryConfig; -import io.druid.query.topn.TopNQueryQueryToolChest; -import io.druid.query.topn.TopNResultValue; +import org.apache.druid.client.cache.BackgroundCachePopulator; +import org.apache.druid.client.cache.Cache; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.client.cache.CachePopulator; +import org.apache.druid.client.cache.CachePopulatorStats; +import org.apache.druid.client.cache.CacheStats; +import org.apache.druid.client.cache.ForegroundCachePopulator; +import org.apache.druid.client.cache.MapCache; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.SequenceWrapper; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.query.CacheStrategy; +import org.apache.druid.query.Druids; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.Result; +import org.apache.druid.query.SegmentDescriptor; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.timeseries.TimeseriesQueryQueryToolChest; +import org.apache.druid.query.timeseries.TimeseriesResultValue; +import org.apache.druid.query.topn.TopNQueryBuilder; +import org.apache.druid.query.topn.TopNQueryConfig; +import org.apache.druid.query.topn.TopNQueryQueryToolChest; +import org.apache.druid.query.topn.TopNResultValue; import org.joda.time.DateTime; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/client/CoordinatorServerViewTest.java b/server/src/test/java/org/apache/druid/client/CoordinatorServerViewTest.java similarity index 94% rename from server/src/test/java/io/druid/client/CoordinatorServerViewTest.java rename to server/src/test/java/org/apache/druid/client/CoordinatorServerViewTest.java index 7318ca342ed0..ec67833e504a 100644 --- a/server/src/test/java/io/druid/client/CoordinatorServerViewTest.java +++ b/server/src/test/java/org/apache/druid/client/CoordinatorServerViewTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Function; @@ -26,19 +26,19 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import io.druid.curator.CuratorTestBase; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.Pair; -import io.druid.query.TableDataSource; -import io.druid.segment.TestHelper; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.server.coordination.ServerType; -import io.druid.server.initialization.ZkPathsConfig; -import io.druid.timeline.DataSegment; -import io.druid.timeline.TimelineLookup; -import io.druid.timeline.TimelineObjectHolder; -import io.druid.timeline.partition.NoneShardSpec; -import io.druid.timeline.partition.PartitionHolder; +import org.apache.druid.curator.CuratorTestBase; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.TimelineLookup; +import org.apache.druid.timeline.TimelineObjectHolder; +import org.apache.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.timeline.partition.PartitionHolder; import org.apache.curator.utils.ZKPaths; import org.joda.time.Interval; import org.junit.After; diff --git a/server/src/test/java/io/druid/client/DirectDruidClientTest.java b/server/src/test/java/org/apache/druid/client/DirectDruidClientTest.java similarity index 89% rename from server/src/test/java/io/druid/client/DirectDruidClientTest.java rename to server/src/test/java/org/apache/druid/client/DirectDruidClientTest.java index e7243a824b4f..06174b4896fc 100644 --- a/server/src/test/java/io/druid/client/DirectDruidClientTest.java +++ b/server/src/test/java/org/apache/druid/client/DirectDruidClientTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; @@ -25,30 +25,30 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import io.druid.client.selector.ConnectionCountServerSelectorStrategy; -import io.druid.client.selector.HighestPriorityTierSelectorStrategy; -import io.druid.client.selector.QueryableDruidServer; -import io.druid.client.selector.ServerSelector; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.Request; -import io.druid.java.util.http.client.response.HttpResponseHandler; -import io.druid.java.util.http.client.response.StatusResponseHolder; -import io.druid.query.Druids; -import io.druid.query.QueryInterruptedException; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.ReflectionQueryToolChestWarehouse; -import io.druid.query.Result; -import io.druid.query.timeboundary.TimeBoundaryQuery; -import io.druid.server.coordination.ServerType; -import io.druid.server.metrics.NoopServiceEmitter; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.client.selector.ConnectionCountServerSelectorStrategy; +import org.apache.druid.client.selector.HighestPriorityTierSelectorStrategy; +import org.apache.druid.client.selector.QueryableDruidServer; +import org.apache.druid.client.selector.ServerSelector; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.Request; +import org.apache.druid.java.util.http.client.response.HttpResponseHandler; +import org.apache.druid.java.util.http.client.response.StatusResponseHolder; +import org.apache.druid.query.Druids; +import org.apache.druid.query.QueryInterruptedException; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.ReflectionQueryToolChestWarehouse; +import org.apache.druid.query.Result; +import org.apache.druid.query.timeboundary.TimeBoundaryQuery; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.server.metrics.NoopServiceEmitter; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.easymock.Capture; import org.easymock.EasyMock; import org.jboss.netty.handler.codec.http.HttpMethod; diff --git a/server/src/test/java/io/druid/client/HttpServerInventoryViewConfigTest.java b/server/src/test/java/org/apache/druid/client/HttpServerInventoryViewConfigTest.java similarity index 96% rename from server/src/test/java/io/druid/client/HttpServerInventoryViewConfigTest.java rename to server/src/test/java/org/apache/druid/client/HttpServerInventoryViewConfigTest.java index a7f6b6c2f188..ade05fc1fc83 100644 --- a/server/src/test/java/io/druid/client/HttpServerInventoryViewConfigTest.java +++ b/server/src/test/java/org/apache/druid/client/HttpServerInventoryViewConfigTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; -import io.druid.segment.TestHelper; +import org.apache.druid.segment.TestHelper; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/client/HttpServerInventoryViewTest.java b/server/src/test/java/org/apache/druid/client/HttpServerInventoryViewTest.java similarity index 91% rename from server/src/test/java/io/druid/client/HttpServerInventoryViewTest.java rename to server/src/test/java/org/apache/druid/client/HttpServerInventoryViewTest.java index e25295e1bd08..0bc1ecb0edea 100644 --- a/server/src/test/java/io/druid/client/HttpServerInventoryViewTest.java +++ b/server/src/test/java/org/apache/druid/client/HttpServerInventoryViewTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; @@ -25,24 +25,24 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.Request; -import io.druid.java.util.http.client.response.HttpResponseHandler; -import io.druid.discovery.DataNodeService; -import io.druid.discovery.DiscoveryDruidNode; -import io.druid.discovery.DruidNodeDiscovery; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.RE; -import io.druid.segment.TestHelper; -import io.druid.server.DruidNode; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.server.coordination.SegmentChangeRequestDrop; -import io.druid.server.coordination.ChangeRequestHistory; -import io.druid.server.coordination.SegmentChangeRequestLoad; -import io.druid.server.coordination.ChangeRequestsSnapshot; -import io.druid.server.coordination.ServerType; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.Request; +import org.apache.druid.java.util.http.client.response.HttpResponseHandler; +import org.apache.druid.discovery.DataNodeService; +import org.apache.druid.discovery.DiscoveryDruidNode; +import org.apache.druid.discovery.DruidNodeDiscovery; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.server.coordination.SegmentChangeRequestDrop; +import org.apache.druid.server.coordination.ChangeRequestHistory; +import org.apache.druid.server.coordination.SegmentChangeRequestLoad; +import org.apache.druid.server.coordination.ChangeRequestsSnapshot; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.timeline.DataSegment; import org.easymock.EasyMock; import org.jboss.netty.buffer.ChannelBuffers; import org.jboss.netty.handler.codec.http.DefaultHttpResponse; diff --git a/server/src/test/java/io/druid/client/ImmutableDruidDataSourceTest.java b/server/src/test/java/org/apache/druid/client/ImmutableDruidDataSourceTest.java similarity index 89% rename from server/src/test/java/io/druid/client/ImmutableDruidDataSourceTest.java rename to server/src/test/java/org/apache/druid/client/ImmutableDruidDataSourceTest.java index f373aa53bc3b..a2e8186e3a62 100644 --- a/server/src/test/java/io/druid/client/ImmutableDruidDataSourceTest.java +++ b/server/src/test/java/org/apache/druid/client/ImmutableDruidDataSourceTest.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import com.fasterxml.jackson.databind.InjectableValues.Std; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedMap; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; -import io.druid.timeline.DataSegment; -import io.druid.timeline.DataSegment.PruneLoadSpecHolder; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment.PruneLoadSpecHolder; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/client/RangeIterable.java b/server/src/test/java/org/apache/druid/client/RangeIterable.java similarity index 98% rename from server/src/test/java/io/druid/client/RangeIterable.java rename to server/src/test/java/org/apache/druid/client/RangeIterable.java index f1d74496b2a1..64ec9d93481b 100644 --- a/server/src/test/java/io/druid/client/RangeIterable.java +++ b/server/src/test/java/org/apache/druid/client/RangeIterable.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client; +package org.apache.druid.client; import java.util.Iterator; diff --git a/server/src/test/java/io/druid/client/cache/ByteCountingLRUMapTest.java b/server/src/test/java/org/apache/druid/client/cache/ByteCountingLRUMapTest.java similarity index 98% rename from server/src/test/java/io/druid/client/cache/ByteCountingLRUMapTest.java rename to server/src/test/java/org/apache/druid/client/cache/ByteCountingLRUMapTest.java index bc7f0e28f135..c15c47885a06 100644 --- a/server/src/test/java/io/druid/client/cache/ByteCountingLRUMapTest.java +++ b/server/src/test/java/org/apache/druid/client/cache/ByteCountingLRUMapTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.google.common.collect.Lists; import org.junit.Assert; diff --git a/server/src/test/java/io/druid/client/cache/BytesBoundedLinkedQueueTest.java b/server/src/test/java/org/apache/druid/client/cache/BytesBoundedLinkedQueueTest.java similarity index 98% rename from server/src/test/java/io/druid/client/cache/BytesBoundedLinkedQueueTest.java rename to server/src/test/java/org/apache/druid/client/cache/BytesBoundedLinkedQueueTest.java index 95a3554f3a0b..616afb9958aa 100644 --- a/server/src/test/java/io/druid/client/cache/BytesBoundedLinkedQueueTest.java +++ b/server/src/test/java/org/apache/druid/client/cache/BytesBoundedLinkedQueueTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import org.junit.Assert; import org.junit.Test; -import io.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.ISE; import java.util.ArrayList; import java.util.List; diff --git a/server/src/test/java/io/druid/client/cache/CacheConfigTest.java b/server/src/test/java/org/apache/druid/client/cache/CacheConfigTest.java similarity index 93% rename from server/src/test/java/io/druid/client/cache/CacheConfigTest.java rename to server/src/test/java/org/apache/druid/client/cache/CacheConfigTest.java index 2e4330f4bdfe..c0c4204a0723 100644 --- a/server/src/test/java/io/druid/client/cache/CacheConfigTest.java +++ b/server/src/test/java/org/apache/druid/client/cache/CacheConfigTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.module.SimpleModule; @@ -25,10 +25,10 @@ import com.google.inject.Binder; import com.google.inject.Injector; import com.google.inject.ProvisionException; -import io.druid.guice.GuiceInjectors; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.JsonConfigurator; -import io.druid.initialization.DruidModule; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.JsonConfigurator; +import org.apache.druid.initialization.DruidModule; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; @@ -45,7 +45,7 @@ public class CacheConfigTest static Injector injector; static JsonConfigurator configurator; JsonConfigProvider configProvider; - private static final String propertyPrefix = "io.druid.collections.test.cache"; + private static final String propertyPrefix = "org.apache.druid.collections.test.cache"; @BeforeClass public static void populateStatics() diff --git a/server/src/test/java/io/druid/client/cache/CacheDistributionTest.java b/server/src/test/java/org/apache/druid/client/cache/CacheDistributionTest.java similarity index 99% rename from server/src/test/java/io/druid/client/cache/CacheDistributionTest.java rename to server/src/test/java/org/apache/druid/client/cache/CacheDistributionTest.java index 688a2adc3131..ab908055c2c6 100644 --- a/server/src/test/java/io/druid/client/cache/CacheDistributionTest.java +++ b/server/src/test/java/org/apache/druid/client/cache/CacheDistributionTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; diff --git a/server/src/test/java/io/druid/client/cache/CacheMonitorTest.java b/server/src/test/java/org/apache/druid/client/cache/CacheMonitorTest.java similarity index 89% rename from server/src/test/java/io/druid/client/cache/CacheMonitorTest.java rename to server/src/test/java/org/apache/druid/client/cache/CacheMonitorTest.java index 81fae531efda..f6bb3165ac66 100644 --- a/server/src/test/java/io/druid/client/cache/CacheMonitorTest.java +++ b/server/src/test/java/org/apache/druid/client/cache/CacheMonitorTest.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.google.common.collect.ImmutableList; import com.google.inject.Binder; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Module; -import io.druid.guice.GuiceInjectors; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.annotations.Self; -import io.druid.initialization.Initialization; -import io.druid.server.DruidNode; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.server.DruidNode; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/client/cache/CachePopulatorTest.java b/server/src/test/java/org/apache/druid/client/cache/CachePopulatorTest.java similarity index 96% rename from server/src/test/java/io/druid/client/cache/CachePopulatorTest.java rename to server/src/test/java/org/apache/druid/client/cache/CachePopulatorTest.java index b855e20288ab..515bf05ccf55 100644 --- a/server/src/test/java/io/druid/client/cache/CachePopulatorTest.java +++ b/server/src/test/java/org/apache/druid/client/cache/CachePopulatorTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.fasterxml.jackson.databind.MappingIterator; import com.fasterxml.jackson.databind.ObjectMapper; @@ -25,9 +25,9 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterators; import com.google.common.primitives.Ints; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.jackson.JacksonUtils; import org.junit.After; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/client/cache/CaffeineCacheTest.java b/server/src/test/java/org/apache/druid/client/cache/CaffeineCacheTest.java similarity index 97% rename from server/src/test/java/io/druid/client/cache/CaffeineCacheTest.java rename to server/src/test/java/org/apache/druid/client/cache/CaffeineCacheTest.java index d9f92453bf97..67f93012f80c 100644 --- a/server/src/test/java/io/druid/client/cache/CaffeineCacheTest.java +++ b/server/src/test/java/org/apache/druid/client/cache/CaffeineCacheTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; @@ -25,13 +25,13 @@ import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.name.Names; -import io.druid.guice.GuiceInjectors; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.JsonConfigurator; -import io.druid.guice.ManageLifecycle; -import io.druid.initialization.Initialization; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.JsonConfigurator; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/server/src/test/java/io/druid/client/cache/HybridCacheTest.java b/server/src/test/java/org/apache/druid/client/cache/HybridCacheTest.java similarity index 95% rename from server/src/test/java/io/druid/client/cache/HybridCacheTest.java rename to server/src/test/java/org/apache/druid/client/cache/HybridCacheTest.java index 28d4755ab68e..4284bd535b4a 100644 --- a/server/src/test/java/io/druid/client/cache/HybridCacheTest.java +++ b/server/src/test/java/org/apache/druid/client/cache/HybridCacheTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; @@ -27,11 +27,11 @@ import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.name.Names; -import io.druid.guice.CacheModule; -import io.druid.guice.GuiceInjectors; -import io.druid.guice.annotations.Global; -import io.druid.initialization.Initialization; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.guice.CacheModule; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.guice.annotations.Global; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.java.util.common.StringUtils; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/client/cache/MapCacheTest.java b/server/src/test/java/org/apache/druid/client/cache/MapCacheTest.java similarity index 96% rename from server/src/test/java/io/druid/client/cache/MapCacheTest.java rename to server/src/test/java/org/apache/druid/client/cache/MapCacheTest.java index 230077f03c0d..67315fff8250 100644 --- a/server/src/test/java/io/druid/client/cache/MapCacheTest.java +++ b/server/src/test/java/org/apache/druid/client/cache/MapCacheTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.google.common.primitives.Ints; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/server/src/test/java/io/druid/client/cache/MemcacheClientPoolTest.java b/server/src/test/java/org/apache/druid/client/cache/MemcacheClientPoolTest.java similarity index 98% rename from server/src/test/java/io/druid/client/cache/MemcacheClientPoolTest.java rename to server/src/test/java/org/apache/druid/client/cache/MemcacheClientPoolTest.java index 40a3ec584dee..eef2a6f99afa 100644 --- a/server/src/test/java/io/druid/client/cache/MemcacheClientPoolTest.java +++ b/server/src/test/java/org/apache/druid/client/cache/MemcacheClientPoolTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.google.common.base.Suppliers; import net.spy.memcached.MemcachedClientIF; diff --git a/server/src/test/java/io/druid/client/cache/MemcachedCacheBenchmark.java b/server/src/test/java/org/apache/druid/client/cache/MemcachedCacheBenchmark.java similarity index 97% rename from server/src/test/java/io/druid/client/cache/MemcachedCacheBenchmark.java rename to server/src/test/java/org/apache/druid/client/cache/MemcachedCacheBenchmark.java index 6c6264e7f5b3..e439fe2ff5a6 100644 --- a/server/src/test/java/io/druid/client/cache/MemcachedCacheBenchmark.java +++ b/server/src/test/java/org/apache/druid/client/cache/MemcachedCacheBenchmark.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.google.caliper.Param; import com.google.caliper.Runner; import com.google.caliper.SimpleBenchmark; import com.google.common.base.Suppliers; import com.google.common.collect.Lists; -import io.druid.collections.StupidResourceHolder; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.collections.StupidResourceHolder; +import org.apache.druid.java.util.common.StringUtils; import net.spy.memcached.AddrUtil; import net.spy.memcached.ConnectionFactoryBuilder; import net.spy.memcached.DefaultHashAlgorithm; diff --git a/server/src/test/java/io/druid/client/cache/MemcachedCacheTest.java b/server/src/test/java/org/apache/druid/client/cache/MemcachedCacheTest.java similarity index 96% rename from server/src/test/java/io/druid/client/cache/MemcachedCacheTest.java rename to server/src/test/java/org/apache/druid/client/cache/MemcachedCacheTest.java index 0dc2ebf396c9..89eb3daee9e8 100644 --- a/server/src/test/java/io/druid/client/cache/MemcachedCacheTest.java +++ b/server/src/test/java/org/apache/druid/client/cache/MemcachedCacheTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.cache; +package org.apache.druid.client.cache; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Suppliers; @@ -30,19 +30,19 @@ import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.name.Names; -import io.druid.collections.StupidResourceHolder; -import io.druid.guice.GuiceInjectors; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.ManageLifecycle; -import io.druid.initialization.Initialization; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.emitter.core.Emitter; -import io.druid.java.util.emitter.core.Event; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.metrics.AbstractMonitor; +import org.apache.druid.collections.StupidResourceHolder; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.core.Emitter; +import org.apache.druid.java.util.emitter.core.Event; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.metrics.AbstractMonitor; import net.spy.memcached.BroadcastOpFactory; import net.spy.memcached.CASResponse; import net.spy.memcached.CASValue; diff --git a/server/src/test/java/io/druid/client/client/BatchServerInventoryViewTest.java b/server/src/test/java/org/apache/druid/client/client/BatchServerInventoryViewTest.java similarity index 93% rename from server/src/test/java/io/druid/client/client/BatchServerInventoryViewTest.java rename to server/src/test/java/org/apache/druid/client/client/BatchServerInventoryViewTest.java index faadcb8e7ec3..fa2fa440c268 100644 --- a/server/src/test/java/io/druid/client/client/BatchServerInventoryViewTest.java +++ b/server/src/test/java/org/apache/druid/client/client/BatchServerInventoryViewTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.client.client; +package org.apache.druid.client.client; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Predicate; @@ -30,24 +30,24 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.client.BatchServerInventoryView; -import io.druid.client.DruidServer; -import io.druid.client.ServerView; -import io.druid.curator.PotentiallyGzippedCompressionProvider; -import io.druid.curator.announcement.Announcer; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.guava.Comparators; -import io.druid.segment.TestHelper; -import io.druid.server.coordination.BatchDataSegmentAnnouncer; -import io.druid.server.coordination.CuratorDataSegmentServerAnnouncer; -import io.druid.server.coordination.DataSegmentServerAnnouncer; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.server.coordination.ServerType; -import io.druid.server.initialization.BatchDataSegmentAnnouncerConfig; -import io.druid.server.initialization.ZkPathsConfig; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.BatchServerInventoryView; +import org.apache.druid.client.DruidServer; +import org.apache.druid.client.ServerView; +import org.apache.druid.curator.PotentiallyGzippedCompressionProvider; +import org.apache.druid.curator.announcement.Announcer; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.server.coordination.BatchDataSegmentAnnouncer; +import org.apache.druid.server.coordination.CuratorDataSegmentServerAnnouncer; +import org.apache.druid.server.coordination.DataSegmentServerAnnouncer; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.server.initialization.BatchDataSegmentAnnouncerConfig; +import org.apache.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.timeline.DataSegment; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.retry.ExponentialBackoffRetry; diff --git a/server/src/test/java/io/druid/client/client/ImmutableSegmentLoadInfoTest.java b/server/src/test/java/org/apache/druid/client/client/ImmutableSegmentLoadInfoTest.java similarity index 81% rename from server/src/test/java/io/druid/client/client/ImmutableSegmentLoadInfoTest.java rename to server/src/test/java/org/apache/druid/client/client/ImmutableSegmentLoadInfoTest.java index 30e14c877d2a..11d95d651d0c 100644 --- a/server/src/test/java/io/druid/client/client/ImmutableSegmentLoadInfoTest.java +++ b/server/src/test/java/org/apache/druid/client/client/ImmutableSegmentLoadInfoTest.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.client.client; +package org.apache.druid.client.client; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Sets; -import io.druid.client.ImmutableSegmentLoadInfo; -import io.druid.java.util.common.Intervals; -import io.druid.segment.TestHelper; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.server.coordination.ServerType; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.client.ImmutableSegmentLoadInfo; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import junit.framework.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/client/indexing/ClientAppendQueryTest.java b/server/src/test/java/org/apache/druid/client/indexing/ClientAppendQueryTest.java similarity index 93% rename from server/src/test/java/io/druid/client/indexing/ClientAppendQueryTest.java rename to server/src/test/java/org/apache/druid/client/indexing/ClientAppendQueryTest.java index 0d0ed5971891..1ff1772df55f 100644 --- a/server/src/test/java/io/druid/client/indexing/ClientAppendQueryTest.java +++ b/server/src/test/java/org/apache/druid/client/indexing/ClientAppendQueryTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.client.indexing; +package org.apache.druid.client.indexing; -import io.druid.java.util.common.DateTimes; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.timeline.DataSegment; import org.joda.time.DateTime; import org.joda.time.Interval; import org.junit.Assert; diff --git a/server/src/test/java/io/druid/client/indexing/ClientConversionQueryTest.java b/server/src/test/java/org/apache/druid/client/indexing/ClientConversionQueryTest.java similarity index 94% rename from server/src/test/java/io/druid/client/indexing/ClientConversionQueryTest.java rename to server/src/test/java/org/apache/druid/client/indexing/ClientConversionQueryTest.java index 1f3180b58e36..c64c76326715 100644 --- a/server/src/test/java/io/druid/client/indexing/ClientConversionQueryTest.java +++ b/server/src/test/java/org/apache/druid/client/indexing/ClientConversionQueryTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.client.indexing; +package org.apache.druid.client.indexing; -import io.druid.java.util.common.DateTimes; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.timeline.DataSegment; import org.joda.time.DateTime; import org.joda.time.Interval; import org.junit.Assert; diff --git a/server/src/test/java/io/druid/client/indexing/ClientKillQueryTest.java b/server/src/test/java/org/apache/druid/client/indexing/ClientKillQueryTest.java similarity index 94% rename from server/src/test/java/io/druid/client/indexing/ClientKillQueryTest.java rename to server/src/test/java/org/apache/druid/client/indexing/ClientKillQueryTest.java index 87d6f765f58c..ebd3b6f4438e 100644 --- a/server/src/test/java/io/druid/client/indexing/ClientKillQueryTest.java +++ b/server/src/test/java/org/apache/druid/client/indexing/ClientKillQueryTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.client.indexing; +package org.apache.druid.client.indexing; -import io.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.DateTimes; import org.joda.time.DateTime; import org.joda.time.Interval; import org.junit.After; diff --git a/server/src/test/java/io/druid/client/indexing/ClientMergeQueryTest.java b/server/src/test/java/org/apache/druid/client/indexing/ClientMergeQueryTest.java similarity index 92% rename from server/src/test/java/io/druid/client/indexing/ClientMergeQueryTest.java rename to server/src/test/java/org/apache/druid/client/indexing/ClientMergeQueryTest.java index a1404a52a6e1..61fd885eb1de 100644 --- a/server/src/test/java/io/druid/client/indexing/ClientMergeQueryTest.java +++ b/server/src/test/java/org/apache/druid/client/indexing/ClientMergeQueryTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.client.indexing; +package org.apache.druid.client.indexing; import com.google.common.collect.Lists; -import io.druid.java.util.common.DateTimes; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.timeline.DataSegment; import org.joda.time.DateTime; import org.joda.time.Interval; import org.junit.Assert; diff --git a/server/src/test/java/io/druid/client/indexing/NoopIndexingServiceClient.java b/server/src/test/java/org/apache/druid/client/indexing/NoopIndexingServiceClient.java similarity index 94% rename from server/src/test/java/io/druid/client/indexing/NoopIndexingServiceClient.java rename to server/src/test/java/org/apache/druid/client/indexing/NoopIndexingServiceClient.java index e7889dc0e2dc..664daf282d30 100644 --- a/server/src/test/java/io/druid/client/indexing/NoopIndexingServiceClient.java +++ b/server/src/test/java/org/apache/druid/client/indexing/NoopIndexingServiceClient.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.client.indexing; +package org.apache.druid.client.indexing; -import io.druid.indexer.TaskStatusPlus; -import io.druid.timeline.DataSegment; +import org.apache.druid.indexer.TaskStatusPlus; +import org.apache.druid.timeline.DataSegment; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/server/src/test/java/io/druid/client/selector/ServerSelectorTest.java b/server/src/test/java/org/apache/druid/client/selector/ServerSelectorTest.java similarity index 90% rename from server/src/test/java/io/druid/client/selector/ServerSelectorTest.java rename to server/src/test/java/org/apache/druid/client/selector/ServerSelectorTest.java index 9078120ebf43..290b18470a9f 100644 --- a/server/src/test/java/io/druid/client/selector/ServerSelectorTest.java +++ b/server/src/test/java/org/apache/druid/client/selector/ServerSelectorTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.client.selector; +package org.apache.druid.client.selector; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.client.DirectDruidClient; -import io.druid.client.DruidServer; -import io.druid.java.util.common.Intervals; -import io.druid.server.coordination.ServerType; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.client.DirectDruidClient; +import org.apache.druid.client.DruidServer; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; diff --git a/server/src/test/java/io/druid/client/selector/TierSelectorStrategyTest.java b/server/src/test/java/org/apache/druid/client/selector/TierSelectorStrategyTest.java similarity index 91% rename from server/src/test/java/io/druid/client/selector/TierSelectorStrategyTest.java rename to server/src/test/java/org/apache/druid/client/selector/TierSelectorStrategyTest.java index ffe6d473aa0f..7a8dbff00ded 100644 --- a/server/src/test/java/io/druid/client/selector/TierSelectorStrategyTest.java +++ b/server/src/test/java/org/apache/druid/client/selector/TierSelectorStrategyTest.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.client.selector; +package org.apache.druid.client.selector; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.client.DirectDruidClient; -import io.druid.client.DruidServer; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.server.coordination.ServerType; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.client.DirectDruidClient; +import org.apache.druid.client.DruidServer; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/curator/CuratorConfigTest.java b/server/src/test/java/org/apache/druid/curator/CuratorConfigTest.java similarity index 95% rename from server/src/test/java/io/druid/curator/CuratorConfigTest.java rename to server/src/test/java/org/apache/druid/curator/CuratorConfigTest.java index cb59bc15cb80..67359db0c1e4 100644 --- a/server/src/test/java/io/druid/curator/CuratorConfigTest.java +++ b/server/src/test/java/org/apache/druid/curator/CuratorConfigTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.curator; +package org.apache.druid.curator; import org.junit.Assert; import org.junit.Test; -import io.druid.guice.JsonConfigTesterBase; +import org.apache.druid.guice.JsonConfigTesterBase; public class CuratorConfigTest extends JsonConfigTesterBase { diff --git a/server/src/test/java/io/druid/curator/CuratorModuleTest.java b/server/src/test/java/org/apache/druid/curator/CuratorModuleTest.java similarity index 97% rename from server/src/test/java/io/druid/curator/CuratorModuleTest.java rename to server/src/test/java/org/apache/druid/curator/CuratorModuleTest.java index 927a49d31752..e4dddb108ae5 100644 --- a/server/src/test/java/io/druid/curator/CuratorModuleTest.java +++ b/server/src/test/java/org/apache/druid/curator/CuratorModuleTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.curator; +package org.apache.druid.curator; import com.google.common.collect.ImmutableList; import com.google.inject.Binder; @@ -25,8 +25,8 @@ import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.util.Modules; -import io.druid.guice.GuiceInjectors; -import io.druid.guice.LifecycleModule; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.guice.LifecycleModule; import org.apache.curator.ensemble.EnsembleProvider; import org.apache.curator.ensemble.exhibitor.ExhibitorEnsembleProvider; import org.apache.curator.ensemble.fixed.FixedEnsembleProvider; diff --git a/server/src/test/java/io/druid/curator/CuratorTestBase.java b/server/src/test/java/org/apache/druid/curator/CuratorTestBase.java similarity index 94% rename from server/src/test/java/io/druid/curator/CuratorTestBase.java rename to server/src/test/java/org/apache/druid/curator/CuratorTestBase.java index dc1e233ba5f9..3775f57768e9 100644 --- a/server/src/test/java/io/druid/curator/CuratorTestBase.java +++ b/server/src/test/java/org/apache/druid/curator/CuratorTestBase.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.curator; +package org.apache.druid.curator; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableSet; -import io.druid.client.DruidServer; -import io.druid.common.utils.UUIDUtils; -import io.druid.java.util.common.DateTimes; -import io.druid.server.initialization.ZkPathsConfig; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.DruidServer; +import org.apache.druid.common.utils.UUIDUtils; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.timeline.DataSegment; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.retry.RetryOneTime; @@ -82,7 +82,7 @@ protected void setupZNodeForServer(DruidServer server, ZkPathsConfig zkPathsConf * For some reason, Travis build sometimes fails here because of * org.apache.zookeeper.KeeperException$NodeExistsException: KeeperErrorCode = NodeExists, though it should never * happen because zookeeper should be in a clean state for each run of tests. - * Address issue: https://github.com/druid-io/druid/issues/1512 + * Address issue: https://github.com/apache/incubator-druid/issues/1512 */ try { curator.setData() diff --git a/server/src/test/java/io/druid/curator/CuratorUtilsTest.java b/server/src/test/java/org/apache/druid/curator/CuratorUtilsTest.java similarity index 97% rename from server/src/test/java/io/druid/curator/CuratorUtilsTest.java rename to server/src/test/java/org/apache/druid/curator/CuratorUtilsTest.java index 8f92c0a193f3..21e0dd353454 100644 --- a/server/src/test/java/io/druid/curator/CuratorUtilsTest.java +++ b/server/src/test/java/org/apache/druid/curator/CuratorUtilsTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.curator; +package org.apache.druid.curator; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import org.apache.zookeeper.CreateMode; import org.junit.After; import org.junit.Assert; diff --git a/server/src/test/java/io/druid/curator/ExhibitorConfigTest.java b/server/src/test/java/org/apache/druid/curator/ExhibitorConfigTest.java similarity index 96% rename from server/src/test/java/io/druid/curator/ExhibitorConfigTest.java rename to server/src/test/java/org/apache/druid/curator/ExhibitorConfigTest.java index 99856ae6cd0b..b8b711f926c8 100644 --- a/server/src/test/java/io/druid/curator/ExhibitorConfigTest.java +++ b/server/src/test/java/org/apache/druid/curator/ExhibitorConfigTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.curator; +package org.apache.druid.curator; -import io.druid.guice.JsonConfigTesterBase; +import org.apache.druid.guice.JsonConfigTesterBase; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/curator/announcement/AnnouncerTest.java b/server/src/test/java/org/apache/druid/curator/announcement/AnnouncerTest.java similarity index 97% rename from server/src/test/java/io/druid/curator/announcement/AnnouncerTest.java rename to server/src/test/java/org/apache/druid/curator/announcement/AnnouncerTest.java index 86864deee618..5ca9b29f0506 100644 --- a/server/src/test/java/io/druid/curator/announcement/AnnouncerTest.java +++ b/server/src/test/java/org/apache/druid/curator/announcement/AnnouncerTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.curator.announcement; +package org.apache.druid.curator.announcement; import com.google.common.collect.Sets; -import io.druid.curator.CuratorTestBase; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.curator.CuratorTestBase; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.logger.Logger; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.api.CuratorEvent; import org.apache.curator.framework.api.CuratorEventType; diff --git a/server/src/test/java/io/druid/curator/discovery/CuratorDruidLeaderSelectorTest.java b/server/src/test/java/org/apache/druid/curator/discovery/CuratorDruidLeaderSelectorTest.java similarity index 92% rename from server/src/test/java/io/druid/curator/discovery/CuratorDruidLeaderSelectorTest.java rename to server/src/test/java/org/apache/druid/curator/discovery/CuratorDruidLeaderSelectorTest.java index 694990bc77e6..1828bb6da0c5 100644 --- a/server/src/test/java/io/druid/curator/discovery/CuratorDruidLeaderSelectorTest.java +++ b/server/src/test/java/org/apache/druid/curator/discovery/CuratorDruidLeaderSelectorTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.curator.discovery; - -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.curator.CuratorTestBase; -import io.druid.discovery.DruidLeaderSelector; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.DruidNode; +package org.apache.druid.curator.discovery; + +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.curator.CuratorTestBase; +import org.apache.druid.discovery.DruidLeaderSelector; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.DruidNode; import org.easymock.EasyMock; import org.junit.After; import org.junit.Assert; diff --git a/server/src/test/java/io/druid/curator/discovery/CuratorDruidNodeAnnouncerAndDiscoveryTest.java b/server/src/test/java/org/apache/druid/curator/discovery/CuratorDruidNodeAnnouncerAndDiscoveryTest.java similarity index 92% rename from server/src/test/java/io/druid/curator/discovery/CuratorDruidNodeAnnouncerAndDiscoveryTest.java rename to server/src/test/java/org/apache/druid/curator/discovery/CuratorDruidNodeAnnouncerAndDiscoveryTest.java index caf92c3f2932..a8be9337b6f7 100644 --- a/server/src/test/java/io/druid/curator/discovery/CuratorDruidNodeAnnouncerAndDiscoveryTest.java +++ b/server/src/test/java/org/apache/druid/curator/discovery/CuratorDruidNodeAnnouncerAndDiscoveryTest.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.curator.discovery; +package org.apache.druid.curator.discovery; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.curator.CuratorTestBase; -import io.druid.curator.announcement.Announcer; -import io.druid.discovery.DiscoveryDruidNode; -import io.druid.discovery.DruidNodeDiscovery; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.server.DruidNode; -import io.druid.server.initialization.ServerConfig; -import io.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.curator.CuratorTestBase; +import org.apache.druid.curator.announcement.Announcer; +import org.apache.druid.discovery.DiscoveryDruidNode; +import org.apache.druid.discovery.DruidNodeDiscovery; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.initialization.ServerConfig; +import org.apache.druid.server.initialization.ZkPathsConfig; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/server/src/test/java/io/druid/curator/discovery/ServerDiscoverySelectorTest.java b/server/src/test/java/org/apache/druid/curator/discovery/ServerDiscoverySelectorTest.java similarity index 98% rename from server/src/test/java/io/druid/curator/discovery/ServerDiscoverySelectorTest.java rename to server/src/test/java/org/apache/druid/curator/discovery/ServerDiscoverySelectorTest.java index 9addc223d6c3..c6cf6516438f 100644 --- a/server/src/test/java/io/druid/curator/discovery/ServerDiscoverySelectorTest.java +++ b/server/src/test/java/org/apache/druid/curator/discovery/ServerDiscoverySelectorTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.curator.discovery; +package org.apache.druid.curator.discovery; -import io.druid.client.selector.Server; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.client.selector.Server; +import org.apache.druid.java.util.common.StringUtils; import org.apache.curator.x.discovery.ServiceInstance; import org.apache.curator.x.discovery.ServiceProvider; import org.easymock.EasyMock; diff --git a/server/src/test/java/io/druid/curator/discovery/ServiceAnnouncerTest.java b/server/src/test/java/org/apache/druid/curator/discovery/ServiceAnnouncerTest.java similarity index 96% rename from server/src/test/java/io/druid/curator/discovery/ServiceAnnouncerTest.java rename to server/src/test/java/org/apache/druid/curator/discovery/ServiceAnnouncerTest.java index 38ed3a2afc6c..bf0a51fd7d8b 100644 --- a/server/src/test/java/io/druid/curator/discovery/ServiceAnnouncerTest.java +++ b/server/src/test/java/org/apache/druid/curator/discovery/ServiceAnnouncerTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.curator.discovery; +package org.apache.druid.curator.discovery; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterators; -import io.druid.curator.CuratorTestBase; -import io.druid.java.util.common.ISE; +import org.apache.druid.curator.CuratorTestBase; +import org.apache.druid.java.util.common.ISE; import org.apache.curator.x.discovery.ServiceDiscovery; import org.apache.curator.x.discovery.ServiceDiscoveryBuilder; diff --git a/server/src/test/java/io/druid/curator/inventory/CuratorInventoryManagerTest.java b/server/src/test/java/org/apache/druid/curator/inventory/CuratorInventoryManagerTest.java similarity index 98% rename from server/src/test/java/io/druid/curator/inventory/CuratorInventoryManagerTest.java rename to server/src/test/java/org/apache/druid/curator/inventory/CuratorInventoryManagerTest.java index 5569630556bd..3bc26dd5a638 100644 --- a/server/src/test/java/io/druid/curator/inventory/CuratorInventoryManagerTest.java +++ b/server/src/test/java/org/apache/druid/curator/inventory/CuratorInventoryManagerTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.curator.inventory; +package org.apache.druid.curator.inventory; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.primitives.Ints; -import io.druid.curator.CuratorTestBase; -import io.druid.java.util.common.concurrent.Execs; +import org.apache.druid.curator.CuratorTestBase; +import org.apache.druid.java.util.common.concurrent.Execs; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.api.CuratorEvent; import org.apache.curator.framework.api.CuratorEventType; diff --git a/server/src/test/java/io/druid/discovery/DataNodeServiceTest.java b/server/src/test/java/org/apache/druid/discovery/DataNodeServiceTest.java similarity index 90% rename from server/src/test/java/io/druid/discovery/DataNodeServiceTest.java rename to server/src/test/java/org/apache/druid/discovery/DataNodeServiceTest.java index 2cea09a5f2d4..99325f662816 100644 --- a/server/src/test/java/io/druid/discovery/DataNodeServiceTest.java +++ b/server/src/test/java/org/apache/druid/discovery/DataNodeServiceTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.discovery; +package org.apache.druid.discovery; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.segment.TestHelper; -import io.druid.server.coordination.ServerType; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.server.coordination.ServerType; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/discovery/DruidLeaderClientTest.java b/server/src/test/java/org/apache/druid/discovery/DruidLeaderClientTest.java similarity index 92% rename from server/src/test/java/io/druid/discovery/DruidLeaderClientTest.java rename to server/src/test/java/org/apache/druid/discovery/DruidLeaderClientTest.java index c4fc1b4b44fa..60bd5662e6d4 100644 --- a/server/src/test/java/io/druid/discovery/DruidLeaderClientTest.java +++ b/server/src/test/java/org/apache/druid/discovery/DruidLeaderClientTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.discovery; +package org.apache.druid.discovery; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -29,20 +29,20 @@ import com.google.inject.name.Named; import com.google.inject.name.Names; import com.google.inject.servlet.GuiceFilter; -import io.druid.curator.discovery.ServerDiscoverySelector; -import io.druid.guice.GuiceInjectors; -import io.druid.guice.Jerseys; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.LazySingleton; -import io.druid.guice.LifecycleModule; -import io.druid.guice.annotations.Self; -import io.druid.initialization.Initialization; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.Request; -import io.druid.server.DruidNode; -import io.druid.server.initialization.BaseJettyTest; -import io.druid.server.initialization.jetty.JettyServerInitializer; +import org.apache.druid.curator.discovery.ServerDiscoverySelector; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.guice.Jerseys; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.LifecycleModule; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.Request; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.initialization.BaseJettyTest; +import org.apache.druid.server.initialization.jetty.JettyServerInitializer; import org.easymock.EasyMock; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; diff --git a/server/src/test/java/io/druid/discovery/DruidNodeDiscoveryProviderTest.java b/server/src/test/java/org/apache/druid/discovery/DruidNodeDiscoveryProviderTest.java similarity index 98% rename from server/src/test/java/io/druid/discovery/DruidNodeDiscoveryProviderTest.java rename to server/src/test/java/org/apache/druid/discovery/DruidNodeDiscoveryProviderTest.java index 69fa8cf14ab9..abce2b802aef 100644 --- a/server/src/test/java/io/druid/discovery/DruidNodeDiscoveryProviderTest.java +++ b/server/src/test/java/org/apache/druid/discovery/DruidNodeDiscoveryProviderTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.discovery; +package org.apache.druid.discovery; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.druid.server.DruidNode; -import io.druid.server.coordination.ServerType; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.coordination.ServerType; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/discovery/LookupNodeServiceTest.java b/server/src/test/java/org/apache/druid/discovery/LookupNodeServiceTest.java similarity index 94% rename from server/src/test/java/io/druid/discovery/LookupNodeServiceTest.java rename to server/src/test/java/org/apache/druid/discovery/LookupNodeServiceTest.java index a5f7c650d413..fb1c3d79b496 100644 --- a/server/src/test/java/io/druid/discovery/LookupNodeServiceTest.java +++ b/server/src/test/java/org/apache/druid/discovery/LookupNodeServiceTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.discovery; +package org.apache.druid.discovery; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.segment.TestHelper; +import org.apache.druid.segment.TestHelper; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/discovery/WorkerNodeServiceTest.java b/server/src/test/java/org/apache/druid/discovery/WorkerNodeServiceTest.java similarity index 94% rename from server/src/test/java/io/druid/discovery/WorkerNodeServiceTest.java rename to server/src/test/java/org/apache/druid/discovery/WorkerNodeServiceTest.java index 04b709a1608d..873b189d0a9a 100644 --- a/server/src/test/java/io/druid/discovery/WorkerNodeServiceTest.java +++ b/server/src/test/java/org/apache/druid/discovery/WorkerNodeServiceTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.discovery; +package org.apache.druid.discovery; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.segment.TestHelper; +import org.apache.druid.segment.TestHelper; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/guice/DruidProcessingModuleTest.java b/server/src/test/java/org/apache/druid/guice/DruidProcessingModuleTest.java similarity index 94% rename from server/src/test/java/io/druid/guice/DruidProcessingModuleTest.java rename to server/src/test/java/org/apache/druid/guice/DruidProcessingModuleTest.java index d4b1413eb1df..0b0845645096 100644 --- a/server/src/test/java/io/druid/guice/DruidProcessingModuleTest.java +++ b/server/src/test/java/org/apache/druid/guice/DruidProcessingModuleTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.google.inject.ProvisionException; -import io.druid.query.DruidProcessingConfig; +import org.apache.druid.query.DruidProcessingConfig; import org.junit.Test; public class DruidProcessingModuleTest diff --git a/server/src/test/java/io/druid/guice/JavaScriptModuleTest.java b/server/src/test/java/org/apache/druid/guice/JavaScriptModuleTest.java similarity index 96% rename from server/src/test/java/io/druid/guice/JavaScriptModuleTest.java rename to server/src/test/java/org/apache/druid/guice/JavaScriptModuleTest.java index a309cb975c51..8493080b7863 100644 --- a/server/src/test/java/io/druid/guice/JavaScriptModuleTest.java +++ b/server/src/test/java/org/apache/druid/guice/JavaScriptModuleTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.google.common.collect.ImmutableList; import com.google.inject.Binder; import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Module; -import io.druid.js.JavaScriptConfig; +import org.apache.druid.js.JavaScriptConfig; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/guice/JsonConfigTesterBase.java b/server/src/test/java/org/apache/druid/guice/JsonConfigTesterBase.java similarity index 97% rename from server/src/test/java/io/druid/guice/JsonConfigTesterBase.java rename to server/src/test/java/org/apache/druid/guice/JsonConfigTesterBase.java index bf0d3a362324..3bebdff3f9dd 100644 --- a/server/src/test/java/io/druid/guice/JsonConfigTesterBase.java +++ b/server/src/test/java/org/apache/druid/guice/JsonConfigTesterBase.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; @@ -25,8 +25,8 @@ import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.name.Names; -import io.druid.initialization.Initialization; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.java.util.common.StringUtils; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; diff --git a/server/src/test/java/io/druid/guice/JsonConfigTesterBaseTest.java b/server/src/test/java/org/apache/druid/guice/JsonConfigTesterBaseTest.java similarity index 99% rename from server/src/test/java/io/druid/guice/JsonConfigTesterBaseTest.java rename to server/src/test/java/org/apache/druid/guice/JsonConfigTesterBaseTest.java index 4f99a89e512b..abc83dfd1114 100644 --- a/server/src/test/java/io/druid/guice/JsonConfigTesterBaseTest.java +++ b/server/src/test/java/org/apache/druid/guice/JsonConfigTesterBaseTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/test/java/io/druid/initialization/ComposingEmitterModuleTest.java b/server/src/test/java/org/apache/druid/initialization/ComposingEmitterModuleTest.java similarity index 90% rename from server/src/test/java/io/druid/initialization/ComposingEmitterModuleTest.java rename to server/src/test/java/org/apache/druid/initialization/ComposingEmitterModuleTest.java index 4d0db841ccf3..50bcf09e7e55 100644 --- a/server/src/test/java/io/druid/initialization/ComposingEmitterModuleTest.java +++ b/server/src/test/java/org/apache/druid/initialization/ComposingEmitterModuleTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.initialization; +package org.apache.druid.initialization; import com.google.inject.Binder; import com.google.inject.Guice; @@ -25,11 +25,11 @@ import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.name.Names; -import io.druid.java.util.emitter.core.Emitter; -import io.druid.guice.DruidGuiceExtensions; -import io.druid.guice.LifecycleModule; -import io.druid.server.emitter.ComposingEmitterConfig; -import io.druid.server.emitter.ComposingEmitterModule; +import org.apache.druid.java.util.emitter.core.Emitter; +import org.apache.druid.guice.DruidGuiceExtensions; +import org.apache.druid.guice.LifecycleModule; +import org.apache.druid.server.emitter.ComposingEmitterConfig; +import org.apache.druid.server.emitter.ComposingEmitterModule; import org.easymock.EasyMock; import org.junit.Before; import org.junit.Test; diff --git a/server/src/test/java/io/druid/initialization/InitializationTest.java b/server/src/test/java/org/apache/druid/initialization/InitializationTest.java similarity index 96% rename from server/src/test/java/io/druid/initialization/InitializationTest.java rename to server/src/test/java/org/apache/druid/initialization/InitializationTest.java index 0e3f88dd2866..1f31a25fbb92 100644 --- a/server/src/test/java/io/druid/initialization/InitializationTest.java +++ b/server/src/test/java/org/apache/druid/initialization/InitializationTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.initialization; +package org.apache.druid.initialization; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.ObjectMapper; @@ -28,12 +28,12 @@ import com.google.inject.Binder; import com.google.inject.Injector; import com.google.inject.Key; -import io.druid.guice.ExtensionsConfig; -import io.druid.guice.GuiceInjectors; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.annotations.Self; -import io.druid.java.util.common.ISE; -import io.druid.server.DruidNode; +import org.apache.druid.guice.ExtensionsConfig; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.server.DruidNode; import org.junit.Assert; import org.junit.FixMethodOrder; import org.junit.Rule; @@ -97,7 +97,7 @@ public String apply(@Nullable DruidModule input) Assert.assertFalse( "modules does not contain TestDruidModule", Collections2.transform(Initialization.getLoadedImplementations(DruidModule.class), fnClassName) - .contains("io.druid.initialization.InitializationTest.TestDruidModule") + .contains("org.apache.druid.initialization.InitializationTest.TestDruidModule") ); Collection modules = Initialization.getFromExtensions( @@ -108,7 +108,7 @@ public String apply(@Nullable DruidModule input) Assert.assertTrue( "modules contains TestDruidModule", Collections2.transform(modules, fnClassName) - .contains("io.druid.initialization.InitializationTest.TestDruidModule") + .contains("org.apache.druid.initialization.InitializationTest.TestDruidModule") ); } diff --git a/server/src/test/java/io/druid/initialization/ZkPathsConfigTest.java b/server/src/test/java/org/apache/druid/initialization/ZkPathsConfigTest.java similarity index 90% rename from server/src/test/java/io/druid/initialization/ZkPathsConfigTest.java rename to server/src/test/java/org/apache/druid/initialization/ZkPathsConfigTest.java index 5e97701748de..f30a27d378c7 100644 --- a/server/src/test/java/io/druid/initialization/ZkPathsConfigTest.java +++ b/server/src/test/java/org/apache/druid/initialization/ZkPathsConfigTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.initialization; +package org.apache.druid.initialization; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.inject.Key; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.JsonConfigTesterBase; -import io.druid.guice.JsonConfigurator; -import io.druid.guice.annotations.Json; -import io.druid.java.util.common.StringUtils; -import io.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.JsonConfigTesterBase; +import org.apache.druid.guice.JsonConfigurator; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.server.initialization.ZkPathsConfig; import org.apache.curator.utils.ZKPaths; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/metadata/IndexerSQLMetadataStorageCoordinatorTest.java b/server/src/test/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinatorTest.java similarity index 97% rename from server/src/test/java/io/druid/metadata/IndexerSQLMetadataStorageCoordinatorTest.java rename to server/src/test/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinatorTest.java index 729bae35d6db..f13105ebceab 100644 --- a/server/src/test/java/io/druid/metadata/IndexerSQLMetadataStorageCoordinatorTest.java +++ b/server/src/test/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinatorTest.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.druid.indexing.overlord.DataSourceMetadata; -import io.druid.indexing.overlord.ObjectMetadata; -import io.druid.indexing.overlord.SegmentPublishResult; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.segment.TestHelper; -import io.druid.segment.realtime.appenderator.SegmentIdentifier; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.LinearShardSpec; -import io.druid.timeline.partition.NoneShardSpec; -import io.druid.timeline.partition.NumberedShardSpec; +import org.apache.druid.indexing.overlord.DataSourceMetadata; +import org.apache.druid.indexing.overlord.ObjectMetadata; +import org.apache.druid.indexing.overlord.SegmentPublishResult; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.realtime.appenderator.SegmentIdentifier; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.LinearShardSpec; +import org.apache.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.timeline.partition.NumberedShardSpec; import org.joda.time.DateTime; import org.joda.time.Interval; import org.junit.Assert; diff --git a/server/src/test/java/io/druid/metadata/SQLMetadataConnectorTest.java b/server/src/test/java/org/apache/druid/metadata/SQLMetadataConnectorTest.java similarity index 97% rename from server/src/test/java/io/druid/metadata/SQLMetadataConnectorTest.java rename to server/src/test/java/org/apache/druid/metadata/SQLMetadataConnectorTest.java index 116a79039d50..0baaf70d2c73 100644 --- a/server/src/test/java/io/druid/metadata/SQLMetadataConnectorTest.java +++ b/server/src/test/java/org/apache/druid/metadata/SQLMetadataConnectorTest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; diff --git a/server/src/test/java/io/druid/metadata/SQLMetadataRuleManagerTest.java b/server/src/test/java/org/apache/druid/metadata/SQLMetadataRuleManagerTest.java similarity index 90% rename from server/src/test/java/io/druid/metadata/SQLMetadataRuleManagerTest.java rename to server/src/test/java/org/apache/druid/metadata/SQLMetadataRuleManagerTest.java index f2873393765c..64f479b905a3 100644 --- a/server/src/test/java/io/druid/metadata/SQLMetadataRuleManagerTest.java +++ b/server/src/test/java/org/apache/druid/metadata/SQLMetadataRuleManagerTest.java @@ -17,25 +17,25 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableMap; -import io.druid.audit.AuditEntry; -import io.druid.audit.AuditInfo; -import io.druid.audit.AuditManager; -import io.druid.client.DruidServer; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.server.audit.SQLAuditManager; -import io.druid.server.audit.SQLAuditManagerConfig; -import io.druid.server.coordinator.rules.IntervalLoadRule; -import io.druid.server.coordinator.rules.Rule; -import io.druid.server.metrics.NoopServiceEmitter; +import org.apache.druid.audit.AuditEntry; +import org.apache.druid.audit.AuditInfo; +import org.apache.druid.audit.AuditManager; +import org.apache.druid.client.DruidServer; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.server.audit.SQLAuditManager; +import org.apache.druid.server.audit.SQLAuditManagerConfig; +import org.apache.druid.server.coordinator.rules.IntervalLoadRule; +import org.apache.druid.server.coordinator.rules.Rule; +import org.apache.druid.server.metrics.NoopServiceEmitter; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/server/src/test/java/io/druid/metadata/SQLMetadataSegmentManagerTest.java b/server/src/test/java/org/apache/druid/metadata/SQLMetadataSegmentManagerTest.java similarity index 94% rename from server/src/test/java/io/druid/metadata/SQLMetadataSegmentManagerTest.java rename to server/src/test/java/org/apache/druid/metadata/SQLMetadataSegmentManagerTest.java index d6d26f76c85d..4345aedd3a10 100644 --- a/server/src/test/java/io/druid/metadata/SQLMetadataSegmentManagerTest.java +++ b/server/src/test/java/org/apache/druid/metadata/SQLMetadataSegmentManagerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Suppliers; @@ -25,13 +25,13 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.segment.TestHelper; -import io.druid.server.metrics.NoopServiceEmitter; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.server.metrics.NoopServiceEmitter; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/server/src/test/java/io/druid/metadata/SQLMetadataStorageActionHandlerTest.java b/server/src/test/java/org/apache/druid/metadata/SQLMetadataStorageActionHandlerTest.java similarity index 97% rename from server/src/test/java/io/druid/metadata/SQLMetadataStorageActionHandlerTest.java rename to server/src/test/java/org/apache/druid/metadata/SQLMetadataStorageActionHandlerTest.java index 1487fa5a64e2..46dc7f49049d 100644 --- a/server/src/test/java/io/druid/metadata/SQLMetadataStorageActionHandlerTest.java +++ b/server/src/test/java/org/apache/druid/metadata/SQLMetadataStorageActionHandlerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -25,12 +25,12 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.druid.indexer.TaskInfo; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.indexer.TaskInfo; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.jackson.JacksonUtils; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; diff --git a/server/src/test/java/io/druid/metadata/SQLMetadataSupervisorManagerTest.java b/server/src/test/java/org/apache/druid/metadata/SQLMetadataSupervisorManagerTest.java similarity index 95% rename from server/src/test/java/io/druid/metadata/SQLMetadataSupervisorManagerTest.java rename to server/src/test/java/org/apache/druid/metadata/SQLMetadataSupervisorManagerTest.java index 493439da45e2..30f35e34c04e 100644 --- a/server/src/test/java/io/druid/metadata/SQLMetadataSupervisorManagerTest.java +++ b/server/src/test/java/org/apache/druid/metadata/SQLMetadataSupervisorManagerTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableMap; -import io.druid.indexing.overlord.supervisor.SupervisorSpec; -import io.druid.indexing.overlord.supervisor.VersionedSupervisorSpec; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.indexing.overlord.supervisor.SupervisorSpec; +import org.apache.druid.indexing.overlord.supervisor.VersionedSupervisorSpec; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.StringUtils; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/server/src/test/java/io/druid/metadata/TestDerbyConnector.java b/server/src/test/java/org/apache/druid/metadata/TestDerbyConnector.java similarity index 96% rename from server/src/test/java/io/druid/metadata/TestDerbyConnector.java rename to server/src/test/java/org/apache/druid/metadata/TestDerbyConnector.java index 139cc8fbd367..199720b25bd0 100644 --- a/server/src/test/java/io/druid/metadata/TestDerbyConnector.java +++ b/server/src/test/java/org/apache/druid/metadata/TestDerbyConnector.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; -import io.druid.java.util.common.StringUtils; -import io.druid.metadata.storage.derby.DerbyConnector; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.metadata.storage.derby.DerbyConnector; import org.junit.Assert; import org.junit.rules.ExternalResource; import org.skife.jdbi.v2.DBI; diff --git a/server/src/test/java/io/druid/metadata/TestSupervisorSpec.java b/server/src/test/java/org/apache/druid/metadata/TestSupervisorSpec.java similarity index 89% rename from server/src/test/java/io/druid/metadata/TestSupervisorSpec.java rename to server/src/test/java/org/apache/druid/metadata/TestSupervisorSpec.java index 7e9548c99e79..bb9bf46e2309 100644 --- a/server/src/test/java/io/druid/metadata/TestSupervisorSpec.java +++ b/server/src/test/java/org/apache/druid/metadata/TestSupervisorSpec.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.metadata; +package org.apache.druid.metadata; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.indexing.overlord.supervisor.Supervisor; -import io.druid.indexing.overlord.supervisor.SupervisorSpec; +import org.apache.druid.indexing.overlord.supervisor.Supervisor; +import org.apache.druid.indexing.overlord.supervisor.SupervisorSpec; import java.util.List; diff --git a/server/src/test/java/io/druid/query/LocatedSegmentDescriptorSerdeTest.java b/server/src/test/java/org/apache/druid/query/LocatedSegmentDescriptorSerdeTest.java similarity index 87% rename from server/src/test/java/io/druid/query/LocatedSegmentDescriptorSerdeTest.java rename to server/src/test/java/org/apache/druid/query/LocatedSegmentDescriptorSerdeTest.java index fe28a42d6b56..883ec43f87aa 100644 --- a/server/src/test/java/io/druid/query/LocatedSegmentDescriptorSerdeTest.java +++ b/server/src/test/java/org/apache/druid/query/LocatedSegmentDescriptorSerdeTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query; +package org.apache.druid.query; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.server.coordination.ServerType; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.server.coordination.ServerType; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/query/dimension/LookupDimensionSpecTest.java b/server/src/test/java/org/apache/druid/query/dimension/LookupDimensionSpecTest.java similarity index 93% rename from server/src/test/java/io/druid/query/dimension/LookupDimensionSpecTest.java rename to server/src/test/java/org/apache/druid/query/dimension/LookupDimensionSpecTest.java index 7fdf11296b57..9412266d565b 100644 --- a/server/src/test/java/io/druid/query/dimension/LookupDimensionSpecTest.java +++ b/server/src/test/java/org/apache/druid/query/dimension/LookupDimensionSpecTest.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.query.dimension; +package org.apache.druid.query.dimension; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.google.common.collect.ImmutableMap; -import io.druid.common.config.NullHandling; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.extraction.MapLookupExtractor; -import io.druid.query.lookup.LookupExtractor; -import io.druid.query.lookup.LookupExtractorFactoryContainer; -import io.druid.query.lookup.LookupReferencesManager; -import io.druid.query.lookup.MapLookupExtractorFactory; -import io.druid.segment.TestHelper; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.extraction.MapLookupExtractor; +import org.apache.druid.query.lookup.LookupExtractor; +import org.apache.druid.query.lookup.LookupExtractorFactoryContainer; +import org.apache.druid.query.lookup.LookupReferencesManager; +import org.apache.druid.query.lookup.MapLookupExtractorFactory; +import org.apache.druid.segment.TestHelper; import junitparams.JUnitParamsRunner; import junitparams.Parameters; import org.easymock.EasyMock; diff --git a/server/src/test/java/io/druid/query/expression/ExprMacroTest.java b/server/src/test/java/org/apache/druid/query/expression/ExprMacroTest.java similarity index 96% rename from server/src/test/java/io/druid/query/expression/ExprMacroTest.java rename to server/src/test/java/org/apache/druid/query/expression/ExprMacroTest.java index 4ba3cc3ef4ca..bbab646e5642 100644 --- a/server/src/test/java/io/druid/query/expression/ExprMacroTest.java +++ b/server/src/test/java/org/apache/druid/query/expression/ExprMacroTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.query.expression; +package org.apache.druid.query.expression; import com.google.common.collect.ImmutableMap; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.DateTimes; -import io.druid.math.expr.Expr; -import io.druid.math.expr.Parser; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.math.expr.Expr; +import org.apache.druid.math.expr.Parser; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/server/src/test/java/io/druid/query/expression/LookupEnabledTestExprMacroTable.java b/server/src/test/java/org/apache/druid/query/expression/LookupEnabledTestExprMacroTable.java similarity index 87% rename from server/src/test/java/io/druid/query/expression/LookupEnabledTestExprMacroTable.java rename to server/src/test/java/org/apache/druid/query/expression/LookupEnabledTestExprMacroTable.java index 0a4ba7a1372c..58caacf630f4 100644 --- a/server/src/test/java/io/druid/query/expression/LookupEnabledTestExprMacroTable.java +++ b/server/src/test/java/org/apache/druid/query/expression/LookupEnabledTestExprMacroTable.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.query.expression; +package org.apache.druid.query.expression; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import io.druid.math.expr.ExprMacroTable; -import io.druid.query.extraction.MapLookupExtractor; -import io.druid.query.lookup.LookupExtractor; -import io.druid.query.lookup.LookupExtractorFactory; -import io.druid.query.lookup.LookupExtractorFactoryContainer; -import io.druid.query.lookup.LookupIntrospectHandler; -import io.druid.query.lookup.LookupReferencesManager; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.query.extraction.MapLookupExtractor; +import org.apache.druid.query.lookup.LookupExtractor; +import org.apache.druid.query.lookup.LookupExtractorFactory; +import org.apache.druid.query.lookup.LookupExtractorFactoryContainer; +import org.apache.druid.query.lookup.LookupIntrospectHandler; +import org.apache.druid.query.lookup.LookupReferencesManager; import org.easymock.EasyMock; import javax.annotation.Nullable; diff --git a/server/src/test/java/io/druid/query/lookup/LookupIntrospectionResourceImplTest.java b/server/src/test/java/org/apache/druid/query/lookup/LookupIntrospectionResourceImplTest.java similarity index 99% rename from server/src/test/java/io/druid/query/lookup/LookupIntrospectionResourceImplTest.java rename to server/src/test/java/org/apache/druid/query/lookup/LookupIntrospectionResourceImplTest.java index 8f37aa079126..3236fffcdea7 100644 --- a/server/src/test/java/io/druid/query/lookup/LookupIntrospectionResourceImplTest.java +++ b/server/src/test/java/org/apache/druid/query/lookup/LookupIntrospectionResourceImplTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.google.common.collect.ImmutableMap; import com.sun.jersey.api.client.WebResource; diff --git a/server/src/test/java/io/druid/query/lookup/LookupIntrospectionResourceTest.java b/server/src/test/java/org/apache/druid/query/lookup/LookupIntrospectionResourceTest.java similarity index 97% rename from server/src/test/java/io/druid/query/lookup/LookupIntrospectionResourceTest.java rename to server/src/test/java/org/apache/druid/query/lookup/LookupIntrospectionResourceTest.java index 0148853ad76e..d605f36f91af 100644 --- a/server/src/test/java/io/druid/query/lookup/LookupIntrospectionResourceTest.java +++ b/server/src/test/java/org/apache/druid/query/lookup/LookupIntrospectionResourceTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.google.common.collect.ImmutableMap; -import io.druid.query.extraction.MapLookupExtractor; +import org.apache.druid.query.extraction.MapLookupExtractor; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; diff --git a/server/src/test/java/io/druid/query/lookup/LookupListeningAnnouncerConfigTest.java b/server/src/test/java/org/apache/druid/query/lookup/LookupListeningAnnouncerConfigTest.java similarity index 93% rename from server/src/test/java/io/druid/query/lookup/LookupListeningAnnouncerConfigTest.java rename to server/src/test/java/org/apache/druid/query/lookup/LookupListeningAnnouncerConfigTest.java index c93d01c851f1..1c653d4869c6 100644 --- a/server/src/test/java/io/druid/query/lookup/LookupListeningAnnouncerConfigTest.java +++ b/server/src/test/java/org/apache/druid/query/lookup/LookupListeningAnnouncerConfigTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.google.common.collect.ImmutableList; import com.google.inject.Binder; @@ -25,13 +25,13 @@ import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.name.Names; -import io.druid.guice.GuiceInjectors; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.JsonConfigurator; -import io.druid.guice.annotations.Self; -import io.druid.initialization.Initialization; -import io.druid.server.DruidNode; -import io.druid.server.metrics.DataSourceTaskIdHolder; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.JsonConfigurator; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.metrics.DataSourceTaskIdHolder; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/server/src/test/java/io/druid/query/lookup/LookupReferencesManagerTest.java b/server/src/test/java/org/apache/druid/query/lookup/LookupReferencesManagerTest.java similarity index 98% rename from server/src/test/java/io/druid/query/lookup/LookupReferencesManagerTest.java rename to server/src/test/java/org/apache/druid/query/lookup/LookupReferencesManagerTest.java index 57bad7c44a3b..80d35171f651 100644 --- a/server/src/test/java/io/druid/query/lookup/LookupReferencesManagerTest.java +++ b/server/src/test/java/org/apache/druid/query/lookup/LookupReferencesManagerTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.http.client.Request; -import io.druid.java.util.http.client.response.FullResponseHolder; -import io.druid.discovery.DruidLeaderClient; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.server.metrics.NoopServiceEmitter; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.http.client.Request; +import org.apache.druid.java.util.http.client.response.FullResponseHolder; +import org.apache.druid.discovery.DruidLeaderClient; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.server.metrics.NoopServiceEmitter; import org.easymock.EasyMock; import org.jboss.netty.handler.codec.http.HttpMethod; import org.jboss.netty.handler.codec.http.HttpResponse; diff --git a/server/src/test/java/io/druid/query/lookup/LookupSnapshotTakerTest.java b/server/src/test/java/org/apache/druid/query/lookup/LookupSnapshotTakerTest.java similarity index 96% rename from server/src/test/java/io/druid/query/lookup/LookupSnapshotTakerTest.java rename to server/src/test/java/org/apache/druid/query/lookup/LookupSnapshotTakerTest.java index 4a4af9315ddd..8e1cbe9c8b17 100644 --- a/server/src/test/java/io/druid/query/lookup/LookupSnapshotTakerTest.java +++ b/server/src/test/java/org/apache/druid/query/lookup/LookupSnapshotTakerTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import com.google.common.io.Files; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.segment.TestHelper; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.segment.TestHelper; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; diff --git a/server/src/test/java/io/druid/query/lookup/MapLookupExtractorFactoryTest.java b/server/src/test/java/org/apache/druid/query/lookup/MapLookupExtractorFactoryTest.java similarity index 96% rename from server/src/test/java/io/druid/query/lookup/MapLookupExtractorFactoryTest.java rename to server/src/test/java/org/apache/druid/query/lookup/MapLookupExtractorFactoryTest.java index 866e355bc75b..20b8a6782dbc 100644 --- a/server/src/test/java/io/druid/query/lookup/MapLookupExtractorFactoryTest.java +++ b/server/src/test/java/org/apache/druid/query/lookup/MapLookupExtractorFactoryTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/query/lookup/RegisteredLookupExtractionFnTest.java b/server/src/test/java/org/apache/druid/query/lookup/RegisteredLookupExtractionFnTest.java similarity index 96% rename from server/src/test/java/io/druid/query/lookup/RegisteredLookupExtractionFnTest.java rename to server/src/test/java/org/apache/druid/query/lookup/RegisteredLookupExtractionFnTest.java index 7b899207ae24..cce4cc311df1 100644 --- a/server/src/test/java/io/druid/query/lookup/RegisteredLookupExtractionFnTest.java +++ b/server/src/test/java/org/apache/druid/query/lookup/RegisteredLookupExtractionFnTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.query.lookup; +package org.apache.druid.query.lookup; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.jackson.JacksonUtils; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.extraction.MapLookupExtractor; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.extraction.MapLookupExtractor; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Rule; diff --git a/server/src/test/java/io/druid/realtime/firehose/CombiningFirehoseFactoryTest.java b/server/src/test/java/org/apache/druid/realtime/firehose/CombiningFirehoseFactoryTest.java similarity index 87% rename from server/src/test/java/io/druid/realtime/firehose/CombiningFirehoseFactoryTest.java rename to server/src/test/java/org/apache/druid/realtime/firehose/CombiningFirehoseFactoryTest.java index 6a76d5deefa6..2f3729f30dc7 100644 --- a/server/src/test/java/io/druid/realtime/firehose/CombiningFirehoseFactoryTest.java +++ b/server/src/test/java/org/apache/druid/realtime/firehose/CombiningFirehoseFactoryTest.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.realtime.firehose; +package org.apache.druid.realtime.firehose; import com.google.common.collect.Lists; -import io.druid.data.input.Firehose; -import io.druid.data.input.FirehoseFactory; -import io.druid.data.input.InputRow; -import io.druid.data.input.Row; -import io.druid.data.input.impl.InputRowParser; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.parsers.ParseException; -import io.druid.segment.realtime.firehose.CombiningFirehoseFactory; -import io.druid.utils.Runnables; +import org.apache.druid.data.input.Firehose; +import org.apache.druid.data.input.FirehoseFactory; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.parsers.ParseException; +import org.apache.druid.segment.realtime.firehose.CombiningFirehoseFactory; +import org.apache.druid.utils.Runnables; import org.joda.time.DateTime; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/segment/indexing/DataSchemaTest.java b/server/src/test/java/org/apache/druid/segment/indexing/DataSchemaTest.java similarity index 90% rename from server/src/test/java/io/druid/segment/indexing/DataSchemaTest.java rename to server/src/test/java/org/apache/druid/segment/indexing/DataSchemaTest.java index e4d06af91818..6c5c5d490c2a 100644 --- a/server/src/test/java/io/druid/segment/indexing/DataSchemaTest.java +++ b/server/src/test/java/org/apache/druid/segment/indexing/DataSchemaTest.java @@ -17,31 +17,31 @@ * under the License. */ -package io.druid.segment.indexing; +package org.apache.druid.segment.indexing; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.JSONParseSpec; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.DurationGranularity; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.jackson.JacksonUtils; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.DoubleSumAggregatorFactory; -import io.druid.query.expression.TestExprMacroTable; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.segment.TestHelper; -import io.druid.segment.indexing.granularity.ArbitraryGranularitySpec; -import io.druid.segment.transform.ExpressionTransform; -import io.druid.segment.transform.TransformSpec; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.JSONParseSpec; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.DurationGranularity; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; +import org.apache.druid.query.expression.TestExprMacroTable; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.indexing.granularity.ArbitraryGranularitySpec; +import org.apache.druid.segment.transform.ExpressionTransform; +import org.apache.druid.segment.transform.TransformSpec; import org.hamcrest.CoreMatchers; import org.junit.Assert; import org.junit.Rule; @@ -279,7 +279,7 @@ public void testSerdeWithInvalidParserMap() throws Exception expectedException.expect(CoreMatchers.instanceOf(IllegalArgumentException.class)); expectedException.expectCause(CoreMatchers.instanceOf(JsonMappingException.class)); expectedException.expectMessage( - "Instantiation of [simple type, class io.druid.data.input.impl.StringInputRowParser] value failed: parseSpec" + "Instantiation of [simple type, class org.apache.druid.data.input.impl.StringInputRowParser] value failed: parseSpec" ); // Jackson creates a default type parser (StringInputRowParser) for an invalid type. diff --git a/server/src/test/java/io/druid/segment/indexing/RealtimeTuningConfigTest.java b/server/src/test/java/org/apache/druid/segment/indexing/RealtimeTuningConfigTest.java similarity index 96% rename from server/src/test/java/io/druid/segment/indexing/RealtimeTuningConfigTest.java rename to server/src/test/java/org/apache/druid/segment/indexing/RealtimeTuningConfigTest.java index 14a80cf0b04a..e9023e8c41bd 100644 --- a/server/src/test/java/io/druid/segment/indexing/RealtimeTuningConfigTest.java +++ b/server/src/test/java/org/apache/druid/segment/indexing/RealtimeTuningConfigTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment.indexing; +package org.apache.druid.segment.indexing; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.segment.IndexSpec; -import io.druid.segment.TestHelper; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.joda.time.Period; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/segment/indexing/TransformSpecTest.java b/server/src/test/java/org/apache/druid/segment/indexing/TransformSpecTest.java similarity index 90% rename from server/src/test/java/io/druid/segment/indexing/TransformSpecTest.java rename to server/src/test/java/org/apache/druid/segment/indexing/TransformSpecTest.java index 11df348f3ecb..8102a719e8e6 100644 --- a/server/src/test/java/io/druid/segment/indexing/TransformSpecTest.java +++ b/server/src/test/java/org/apache/druid/segment/indexing/TransformSpecTest.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.segment.indexing; +package org.apache.druid.segment.indexing; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.MapInputRowParser; -import io.druid.data.input.impl.TimeAndDimsParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.DateTimes; -import io.druid.query.expression.TestExprMacroTable; -import io.druid.query.filter.AndDimFilter; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.segment.TestHelper; -import io.druid.segment.transform.ExpressionTransform; -import io.druid.segment.transform.TransformSpec; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.MapInputRowParser; +import org.apache.druid.data.input.impl.TimeAndDimsParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.query.expression.TestExprMacroTable; +import org.apache.druid.query.filter.AndDimFilter; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.transform.ExpressionTransform; +import org.apache.druid.segment.transform.TransformSpec; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/segment/indexing/granularity/ArbitraryGranularityTest.java b/server/src/test/java/org/apache/druid/segment/indexing/granularity/ArbitraryGranularityTest.java similarity index 95% rename from server/src/test/java/io/druid/segment/indexing/granularity/ArbitraryGranularityTest.java rename to server/src/test/java/org/apache/druid/segment/indexing/granularity/ArbitraryGranularityTest.java index 9a50f50f6f26..cd38177cf8ee 100644 --- a/server/src/test/java/io/druid/segment/indexing/granularity/ArbitraryGranularityTest.java +++ b/server/src/test/java/org/apache/druid/segment/indexing/granularity/ArbitraryGranularityTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.segment.indexing.granularity; +package org.apache.druid.segment.indexing.granularity; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Optional; import com.google.common.base.Throwables; import com.google.common.collect.Lists; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/segment/indexing/granularity/UniformGranularityTest.java b/server/src/test/java/org/apache/druid/segment/indexing/granularity/UniformGranularityTest.java similarity index 96% rename from server/src/test/java/io/druid/segment/indexing/granularity/UniformGranularityTest.java rename to server/src/test/java/org/apache/druid/segment/indexing/granularity/UniformGranularityTest.java index e91a675fb00a..ee5f43cf9799 100644 --- a/server/src/test/java/io/druid/segment/indexing/granularity/UniformGranularityTest.java +++ b/server/src/test/java/org/apache/druid/segment/indexing/granularity/UniformGranularityTest.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.segment.indexing.granularity; +package org.apache.druid.segment.indexing.granularity; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Optional; import com.google.common.base.Throwables; import com.google.common.collect.Lists; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.PeriodGranularity; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.PeriodGranularity; import org.joda.time.Interval; import org.joda.time.Period; import org.joda.time.chrono.ISOChronology; diff --git a/server/src/test/java/io/druid/segment/loading/CacheTestSegmentLoader.java b/server/src/test/java/org/apache/druid/segment/loading/CacheTestSegmentLoader.java similarity index 87% rename from server/src/test/java/io/druid/segment/loading/CacheTestSegmentLoader.java rename to server/src/test/java/org/apache/druid/segment/loading/CacheTestSegmentLoader.java index 9b462a11f14a..dfee2bbe0d85 100644 --- a/server/src/test/java/io/druid/segment/loading/CacheTestSegmentLoader.java +++ b/server/src/test/java/org/apache/druid/segment/loading/CacheTestSegmentLoader.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment.loading; +package org.apache.druid.segment.loading; -import io.druid.java.util.common.MapUtils; -import io.druid.segment.AbstractSegment; -import io.druid.segment.QueryableIndex; -import io.druid.segment.Segment; -import io.druid.segment.StorageAdapter; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.MapUtils; +import org.apache.druid.segment.AbstractSegment; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.StorageAdapter; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import java.io.File; diff --git a/server/src/test/java/io/druid/segment/loading/LoadSpecTest.java b/server/src/test/java/org/apache/druid/segment/loading/LoadSpecTest.java similarity index 92% rename from server/src/test/java/io/druid/segment/loading/LoadSpecTest.java rename to server/src/test/java/org/apache/druid/segment/loading/LoadSpecTest.java index cebfbb762660..63c8b9b8b998 100644 --- a/server/src/test/java/io/druid/segment/loading/LoadSpecTest.java +++ b/server/src/test/java/org/apache/druid/segment/loading/LoadSpecTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.loading; +package org.apache.druid.segment.loading; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.ObjectMapper; @@ -27,10 +27,10 @@ import com.google.inject.Binder; import com.google.inject.Injector; import com.google.inject.Module; -import io.druid.guice.GuiceAnnotationIntrospector; -import io.druid.guice.GuiceInjectableValues; -import io.druid.guice.GuiceInjectors; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.guice.GuiceAnnotationIntrospector; +import org.apache.druid.guice.GuiceInjectableValues; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/server/src/test/java/io/druid/segment/loading/LocalDataSegmentFinderTest.java b/server/src/test/java/org/apache/druid/segment/loading/LocalDataSegmentFinderTest.java similarity index 97% rename from server/src/test/java/io/druid/segment/loading/LocalDataSegmentFinderTest.java rename to server/src/test/java/org/apache/druid/segment/loading/LocalDataSegmentFinderTest.java index 1ca653021f37..5574bd6581ac 100644 --- a/server/src/test/java/io/druid/segment/loading/LocalDataSegmentFinderTest.java +++ b/server/src/test/java/org/apache/druid/segment/loading/LocalDataSegmentFinderTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.segment.loading; +package org.apache.druid.segment.loading; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.Intervals; -import io.druid.segment.TestHelper; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NumberedShardSpec; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NumberedShardSpec; import org.apache.commons.io.FileUtils; import org.junit.Assert; import org.junit.Before; diff --git a/server/src/test/java/io/druid/segment/loading/LocalDataSegmentKillerTest.java b/server/src/test/java/org/apache/druid/segment/loading/LocalDataSegmentKillerTest.java similarity index 96% rename from server/src/test/java/io/druid/segment/loading/LocalDataSegmentKillerTest.java rename to server/src/test/java/org/apache/druid/segment/loading/LocalDataSegmentKillerTest.java index c984f907ae40..01f62a81a24c 100644 --- a/server/src/test/java/io/druid/segment/loading/LocalDataSegmentKillerTest.java +++ b/server/src/test/java/org/apache/druid/segment/loading/LocalDataSegmentKillerTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.segment.loading; +package org.apache.druid.segment.loading; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.Intervals; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/server/src/test/java/io/druid/segment/loading/LocalDataSegmentPullerTest.java b/server/src/test/java/org/apache/druid/segment/loading/LocalDataSegmentPullerTest.java similarity index 97% rename from server/src/test/java/io/druid/segment/loading/LocalDataSegmentPullerTest.java rename to server/src/test/java/org/apache/druid/segment/loading/LocalDataSegmentPullerTest.java index 0208dc4859b3..f2f85c5b023f 100644 --- a/server/src/test/java/io/druid/segment/loading/LocalDataSegmentPullerTest.java +++ b/server/src/test/java/org/apache/druid/segment/loading/LocalDataSegmentPullerTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.segment.loading; +package org.apache.druid.segment.loading; import com.google.common.io.Files; -import io.druid.java.util.common.CompressionUtils; +import org.apache.druid.java.util.common.CompressionUtils; import org.apache.commons.io.FileUtils; import org.junit.After; import org.junit.Assert; diff --git a/server/src/test/java/io/druid/segment/loading/LocalDataSegmentPusherTest.java b/server/src/test/java/org/apache/druid/segment/loading/LocalDataSegmentPusherTest.java similarity index 94% rename from server/src/test/java/io/druid/segment/loading/LocalDataSegmentPusherTest.java rename to server/src/test/java/org/apache/druid/segment/loading/LocalDataSegmentPusherTest.java index dac650740432..4992aa71c3ff 100644 --- a/server/src/test/java/io/druid/segment/loading/LocalDataSegmentPusherTest.java +++ b/server/src/test/java/org/apache/druid/segment/loading/LocalDataSegmentPusherTest.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.segment.loading; +package org.apache.druid.segment.loading; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.io.Files; import com.google.common.primitives.Ints; -import io.druid.java.util.common.CompressionUtils; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.segment.TestHelper; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.java.util.common.CompressionUtils; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.apache.commons.io.FileUtils; import org.junit.Assert; import org.junit.Before; diff --git a/server/src/test/java/io/druid/segment/loading/LocalFileTimestampVersionFinderTest.java b/server/src/test/java/org/apache/druid/segment/loading/LocalFileTimestampVersionFinderTest.java similarity index 98% rename from server/src/test/java/io/druid/segment/loading/LocalFileTimestampVersionFinderTest.java rename to server/src/test/java/org/apache/druid/segment/loading/LocalFileTimestampVersionFinderTest.java index 786db4e88aff..3e8b5aee472b 100644 --- a/server/src/test/java/io/druid/segment/loading/LocalFileTimestampVersionFinderTest.java +++ b/server/src/test/java/org/apache/druid/segment/loading/LocalFileTimestampVersionFinderTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.loading; +package org.apache.druid.segment.loading; import org.junit.Assert; import org.junit.Before; diff --git a/server/src/test/java/io/druid/segment/loading/SegmentLoaderLocalCacheManagerTest.java b/server/src/test/java/org/apache/druid/segment/loading/SegmentLoaderLocalCacheManagerTest.java similarity index 96% rename from server/src/test/java/io/druid/segment/loading/SegmentLoaderLocalCacheManagerTest.java rename to server/src/test/java/org/apache/druid/segment/loading/SegmentLoaderLocalCacheManagerTest.java index 85708ab1139c..c44b0d369e6c 100644 --- a/server/src/test/java/io/druid/segment/loading/SegmentLoaderLocalCacheManagerTest.java +++ b/server/src/test/java/org/apache/druid/segment/loading/SegmentLoaderLocalCacheManagerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.loading; +package org.apache.druid.segment.loading; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; @@ -25,16 +25,16 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.segment.TestHelper; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; -import io.druid.segment.writeout.TmpFileSegmentWriteOutMediumFactory; -import io.druid.server.metrics.NoopServiceEmitter; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.segment.writeout.TmpFileSegmentWriteOutMediumFactory; +import org.apache.druid.server.metrics.NoopServiceEmitter; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; diff --git a/server/src/test/java/io/druid/segment/loading/StorageLocationTest.java b/server/src/test/java/org/apache/druid/segment/loading/StorageLocationTest.java similarity index 96% rename from server/src/test/java/io/druid/segment/loading/StorageLocationTest.java rename to server/src/test/java/org/apache/druid/segment/loading/StorageLocationTest.java index 8917515cd3fa..cc6b6fe960a2 100644 --- a/server/src/test/java/io/druid/segment/loading/StorageLocationTest.java +++ b/server/src/test/java/org/apache/druid/segment/loading/StorageLocationTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment.loading; +package org.apache.druid.segment.loading; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.Intervals; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.timeline.DataSegment; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/segment/realtime/FireDepartmentTest.java b/server/src/test/java/org/apache/druid/segment/realtime/FireDepartmentTest.java similarity index 76% rename from server/src/test/java/io/druid/segment/realtime/FireDepartmentTest.java rename to server/src/test/java/org/apache/druid/segment/realtime/FireDepartmentTest.java index f88f5bffc6c5..d7162d1186e2 100644 --- a/server/src/test/java/io/druid/segment/realtime/FireDepartmentTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/FireDepartmentTest.java @@ -17,28 +17,28 @@ * under the License. */ -package io.druid.segment.realtime; +package org.apache.druid.segment.realtime; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.client.cache.CacheConfig; -import io.druid.client.cache.CachePopulatorStats; -import io.druid.client.cache.MapCache; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.JSONParseSpec; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.segment.TestHelper; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.RealtimeIOConfig; -import io.druid.segment.indexing.RealtimeTuningConfig; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; -import io.druid.segment.realtime.plumber.RealtimePlumberSchool; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.client.cache.CachePopulatorStats; +import org.apache.druid.client.cache.MapCache; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.JSONParseSpec; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.RealtimeIOConfig; +import org.apache.druid.segment.indexing.RealtimeTuningConfig; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.segment.realtime.plumber.RealtimePlumberSchool; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/segment/realtime/RealtimeManagerTest.java b/server/src/test/java/org/apache/druid/segment/realtime/RealtimeManagerTest.java similarity index 92% rename from server/src/test/java/io/druid/segment/realtime/RealtimeManagerTest.java rename to server/src/test/java/org/apache/druid/segment/realtime/RealtimeManagerTest.java index b829895f5bfe..54fce4c9e957 100644 --- a/server/src/test/java/io/druid/segment/realtime/RealtimeManagerTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/RealtimeManagerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.realtime; +package org.apache.druid.segment.realtime; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Function; @@ -29,56 +29,56 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.data.input.Committer; -import io.druid.data.input.Firehose; -import io.druid.data.input.FirehoseFactory; -import io.druid.data.input.FirehoseFactoryV2; -import io.druid.data.input.FirehoseV2; -import io.druid.data.input.InputRow; -import io.druid.data.input.Row; -import io.druid.data.input.impl.InputRowParser; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.common.parsers.ParseException; -import io.druid.query.BaseQuery; -import io.druid.query.Query; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryRunnerFactoryConglomerate; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.SegmentDescriptor; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.groupby.GroupByQuery; -import io.druid.query.groupby.GroupByQueryConfig; -import io.druid.query.groupby.GroupByQueryRunnerFactory; -import io.druid.query.groupby.GroupByQueryRunnerTest; -import io.druid.query.groupby.GroupByQueryRunnerTestHelper; -import io.druid.query.spec.MultipleIntervalSegmentSpec; -import io.druid.query.spec.MultipleSpecificSegmentSpec; -import io.druid.query.spec.SpecificSegmentQueryRunner; -import io.druid.query.spec.SpecificSegmentSpec; -import io.druid.segment.TestHelper; -import io.druid.segment.incremental.IncrementalIndexAddResult; -import io.druid.segment.incremental.IndexSizeExceededException; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.RealtimeIOConfig; -import io.druid.segment.indexing.RealtimeTuningConfig; -import io.druid.segment.indexing.TuningConfigs; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; -import io.druid.segment.realtime.plumber.Plumber; -import io.druid.segment.realtime.plumber.PlumberSchool; -import io.druid.segment.realtime.plumber.Sink; -import io.druid.server.coordination.DataSegmentServerAnnouncer; -import io.druid.timeline.partition.LinearShardSpec; -import io.druid.utils.Runnables; +import org.apache.druid.data.input.Committer; +import org.apache.druid.data.input.Firehose; +import org.apache.druid.data.input.FirehoseFactory; +import org.apache.druid.data.input.FirehoseFactoryV2; +import org.apache.druid.data.input.FirehoseV2; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.parsers.ParseException; +import org.apache.druid.query.BaseQuery; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryRunnerFactoryConglomerate; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.SegmentDescriptor; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.groupby.GroupByQuery; +import org.apache.druid.query.groupby.GroupByQueryConfig; +import org.apache.druid.query.groupby.GroupByQueryRunnerFactory; +import org.apache.druid.query.groupby.GroupByQueryRunnerTest; +import org.apache.druid.query.groupby.GroupByQueryRunnerTestHelper; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.query.spec.MultipleSpecificSegmentSpec; +import org.apache.druid.query.spec.SpecificSegmentQueryRunner; +import org.apache.druid.query.spec.SpecificSegmentSpec; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.incremental.IncrementalIndexAddResult; +import org.apache.druid.segment.incremental.IndexSizeExceededException; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.RealtimeIOConfig; +import org.apache.druid.segment.indexing.RealtimeTuningConfig; +import org.apache.druid.segment.indexing.TuningConfigs; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.segment.realtime.plumber.Plumber; +import org.apache.druid.segment.realtime.plumber.PlumberSchool; +import org.apache.druid.segment.realtime.plumber.Sink; +import org.apache.druid.server.coordination.DataSegmentServerAnnouncer; +import org.apache.druid.timeline.partition.LinearShardSpec; +import org.apache.druid.utils.Runnables; import org.easymock.EasyMock; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/server/src/test/java/io/druid/segment/realtime/appenderator/AppenderatorPlumberTest.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/AppenderatorPlumberTest.java similarity index 87% rename from server/src/test/java/io/druid/segment/realtime/appenderator/AppenderatorPlumberTest.java rename to server/src/test/java/org/apache/druid/segment/realtime/appenderator/AppenderatorPlumberTest.java index f8ef5e2b0cd4..d87841293b28 100644 --- a/server/src/test/java/io/druid/segment/realtime/appenderator/AppenderatorPlumberTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/AppenderatorPlumberTest.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.segment.realtime.appenderator; - -import io.druid.data.input.InputRow; -import io.druid.segment.indexing.RealtimeTuningConfig; -import io.druid.segment.realtime.SegmentPublisher; -import io.druid.segment.realtime.plumber.IntervalStartVersioningPolicy; -import io.druid.segment.realtime.plumber.NoopRejectionPolicyFactory; -import io.druid.segment.realtime.plumber.SegmentHandoffNotifier; -import io.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; -import io.druid.server.coordination.DataSegmentAnnouncer; +package org.apache.druid.segment.realtime.appenderator; + +import org.apache.druid.data.input.InputRow; +import org.apache.druid.segment.indexing.RealtimeTuningConfig; +import org.apache.druid.segment.realtime.SegmentPublisher; +import org.apache.druid.segment.realtime.plumber.IntervalStartVersioningPolicy; +import org.apache.druid.segment.realtime.plumber.NoopRejectionPolicyFactory; +import org.apache.druid.segment.realtime.plumber.SegmentHandoffNotifier; +import org.apache.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; +import org.apache.druid.server.coordination.DataSegmentAnnouncer; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/segment/realtime/appenderator/AppenderatorTest.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/AppenderatorTest.java similarity index 96% rename from server/src/test/java/io/druid/segment/realtime/appenderator/AppenderatorTest.java rename to server/src/test/java/org/apache/druid/segment/realtime/appenderator/AppenderatorTest.java index 88e2f940766a..95e059351323 100644 --- a/server/src/test/java/io/druid/segment/realtime/appenderator/AppenderatorTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/AppenderatorTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; import com.google.common.base.Function; import com.google.common.base.Supplier; @@ -25,25 +25,25 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import io.druid.common.config.NullHandling; -import io.druid.data.input.Committer; -import io.druid.data.input.InputRow; -import io.druid.data.input.MapBasedInputRow; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.Druids; -import io.druid.query.QueryPlus; -import io.druid.query.Result; -import io.druid.query.SegmentDescriptor; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.spec.MultipleSpecificSegmentSpec; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.timeseries.TimeseriesResultValue; -import io.druid.segment.indexing.RealtimeTuningConfig; -import io.druid.segment.realtime.plumber.Committers; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.LinearShardSpec; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.data.input.Committer; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.Druids; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.Result; +import org.apache.druid.query.SegmentDescriptor; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.spec.MultipleSpecificSegmentSpec; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.timeseries.TimeseriesResultValue; +import org.apache.druid.segment.indexing.RealtimeTuningConfig; +import org.apache.druid.segment.realtime.plumber.Committers; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.LinearShardSpec; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/segment/realtime/appenderator/AppenderatorTester.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/AppenderatorTester.java similarity index 77% rename from server/src/test/java/io/druid/segment/realtime/appenderator/AppenderatorTester.java rename to server/src/test/java/org/apache/druid/segment/realtime/appenderator/AppenderatorTester.java index c5522d9fbfe2..9c1dfdefbcf5 100644 --- a/server/src/test/java/io/druid/segment/realtime/appenderator/AppenderatorTester.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/AppenderatorTester.java @@ -17,46 +17,46 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import io.druid.client.cache.CacheConfig; -import io.druid.client.cache.CachePopulatorStats; -import io.druid.client.cache.MapCache; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.JSONParseSpec; -import io.druid.data.input.impl.MapInputRowParser; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.core.NoopEmitter; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.query.DefaultQueryRunnerFactoryConglomerate; -import io.druid.query.IntervalChunkingQueryRunnerDecorator; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.timeseries.TimeseriesQueryEngine; -import io.druid.query.timeseries.TimeseriesQueryQueryToolChest; -import io.druid.query.timeseries.TimeseriesQueryRunnerFactory; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMerger; -import io.druid.segment.IndexMergerV9; -import io.druid.segment.column.ColumnConfig; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.RealtimeTuningConfig; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; -import io.druid.segment.loading.DataSegmentPusher; -import io.druid.segment.realtime.FireDepartmentMetrics; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; -import io.druid.server.coordination.DataSegmentAnnouncer; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.LinearShardSpec; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.client.cache.CachePopulatorStats; +import org.apache.druid.client.cache.MapCache; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.JSONParseSpec; +import org.apache.druid.data.input.impl.MapInputRowParser; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.core.NoopEmitter; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.query.DefaultQueryRunnerFactoryConglomerate; +import org.apache.druid.query.IntervalChunkingQueryRunnerDecorator; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.timeseries.TimeseriesQueryEngine; +import org.apache.druid.query.timeseries.TimeseriesQueryQueryToolChest; +import org.apache.druid.query.timeseries.TimeseriesQueryRunnerFactory; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMerger; +import org.apache.druid.segment.IndexMergerV9; +import org.apache.druid.segment.column.ColumnConfig; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.RealtimeTuningConfig; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.segment.loading.DataSegmentPusher; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; +import org.apache.druid.server.coordination.DataSegmentAnnouncer; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.LinearShardSpec; import org.apache.commons.io.FileUtils; import java.io.File; diff --git a/server/src/test/java/io/druid/segment/realtime/appenderator/BatchAppenderatorDriverTest.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/BatchAppenderatorDriverTest.java similarity index 88% rename from server/src/test/java/io/druid/segment/realtime/appenderator/BatchAppenderatorDriverTest.java rename to server/src/test/java/org/apache/druid/segment/realtime/appenderator/BatchAppenderatorDriverTest.java index c472f8016215..2175a70e787a 100644 --- a/server/src/test/java/io/druid/segment/realtime/appenderator/BatchAppenderatorDriverTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/BatchAppenderatorDriverTest.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.druid.data.input.InputRow; -import io.druid.data.input.MapBasedInputRow; -import io.druid.indexing.overlord.SegmentPublishResult; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.segment.loading.DataSegmentKiller; -import io.druid.segment.realtime.appenderator.BaseAppenderatorDriver.SegmentsForSequence; -import io.druid.segment.realtime.appenderator.SegmentWithState.SegmentState; -import io.druid.segment.realtime.appenderator.StreamAppenderatorDriverTest.TestSegmentAllocator; -import io.druid.timeline.partition.NumberedShardSpec; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.indexing.overlord.SegmentPublishResult; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.segment.loading.DataSegmentKiller; +import org.apache.druid.segment.realtime.appenderator.BaseAppenderatorDriver.SegmentsForSequence; +import org.apache.druid.segment.realtime.appenderator.SegmentWithState.SegmentState; +import org.apache.druid.segment.realtime.appenderator.StreamAppenderatorDriverTest.TestSegmentAllocator; +import org.apache.druid.timeline.partition.NumberedShardSpec; import org.easymock.EasyMock; import org.easymock.EasyMockSupport; import org.junit.After; diff --git a/server/src/test/java/io/druid/segment/realtime/appenderator/CommittedTest.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/CommittedTest.java similarity index 94% rename from server/src/test/java/io/druid/segment/realtime/appenderator/CommittedTest.java rename to server/src/test/java/org/apache/druid/segment/realtime/appenderator/CommittedTest.java index c6474c1c02b5..3aeeb78b0b43 100644 --- a/server/src/test/java/io/druid/segment/realtime/appenderator/CommittedTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/CommittedTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; -import io.druid.timeline.partition.LinearShardSpec; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.timeline.partition.LinearShardSpec; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/segment/realtime/appenderator/DefaultOfflineAppenderatorFactoryTest.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/DefaultOfflineAppenderatorFactoryTest.java similarity index 82% rename from server/src/test/java/io/druid/segment/realtime/appenderator/DefaultOfflineAppenderatorFactoryTest.java rename to server/src/test/java/org/apache/druid/segment/realtime/appenderator/DefaultOfflineAppenderatorFactoryTest.java index 42cc944c2683..8e072804ee15 100644 --- a/server/src/test/java/io/druid/segment/realtime/appenderator/DefaultOfflineAppenderatorFactoryTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/DefaultOfflineAppenderatorFactoryTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Suppliers; @@ -26,25 +26,25 @@ import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.name.Names; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.JSONParseSpec; -import io.druid.data.input.impl.MapInputRowParser; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.guice.GuiceInjectors; -import io.druid.initialization.Initialization; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.DruidProcessingConfig; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.segment.column.ColumnConfig; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.RealtimeTuningConfig; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; -import io.druid.segment.realtime.FireDepartmentMetrics; -import io.druid.segment.realtime.plumber.Committers; -import io.druid.timeline.partition.LinearShardSpec; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.JSONParseSpec; +import org.apache.druid.data.input.impl.MapInputRowParser; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.DruidProcessingConfig; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.segment.column.ColumnConfig; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.RealtimeTuningConfig; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.segment.realtime.plumber.Committers; +import org.apache.druid.timeline.partition.LinearShardSpec; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/server/src/test/java/io/druid/segment/realtime/appenderator/SegmentIdentifierTest.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/SegmentIdentifierTest.java similarity index 92% rename from server/src/test/java/io/druid/segment/realtime/appenderator/SegmentIdentifierTest.java rename to server/src/test/java/org/apache/druid/segment/realtime/appenderator/SegmentIdentifierTest.java index 642e1c92dacb..e0acfff0f161 100644 --- a/server/src/test/java/io/druid/segment/realtime/appenderator/SegmentIdentifierTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/SegmentIdentifierTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; -import io.druid.timeline.partition.NumberedShardSpec; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.timeline.partition.NumberedShardSpec; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/segment/realtime/appenderator/SegmentWithStateTest.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/SegmentWithStateTest.java similarity index 94% rename from server/src/test/java/io/druid/segment/realtime/appenderator/SegmentWithStateTest.java rename to server/src/test/java/org/apache/druid/segment/realtime/appenderator/SegmentWithStateTest.java index 23a96f7bb850..8f037ac24033 100644 --- a/server/src/test/java/io/druid/segment/realtime/appenderator/SegmentWithStateTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/SegmentWithStateTest.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/segment/realtime/appenderator/StreamAppenderatorDriverFailTest.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorDriverFailTest.java similarity index 93% rename from server/src/test/java/io/druid/segment/realtime/appenderator/StreamAppenderatorDriverFailTest.java rename to server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorDriverFailTest.java index 6eb29d85340e..4867691d8053 100644 --- a/server/src/test/java/io/druid/segment/realtime/appenderator/StreamAppenderatorDriverFailTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorDriverFailTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Function; @@ -28,24 +28,24 @@ import com.google.common.util.concurrent.AbstractFuture; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.data.input.Committer; -import io.druid.data.input.InputRow; -import io.druid.data.input.MapBasedInputRow; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.Query; -import io.druid.query.QueryRunner; -import io.druid.query.SegmentDescriptor; -import io.druid.segment.loading.DataSegmentKiller; -import io.druid.segment.realtime.FireDepartmentMetrics; -import io.druid.segment.realtime.appenderator.StreamAppenderatorDriverTest.TestCommitterSupplier; -import io.druid.segment.realtime.appenderator.StreamAppenderatorDriverTest.TestSegmentAllocator; -import io.druid.segment.realtime.appenderator.StreamAppenderatorDriverTest.TestSegmentHandoffNotifierFactory; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NumberedShardSpec; +import org.apache.druid.data.input.Committer; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.SegmentDescriptor; +import org.apache.druid.segment.loading.DataSegmentKiller; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.segment.realtime.appenderator.StreamAppenderatorDriverTest.TestCommitterSupplier; +import org.apache.druid.segment.realtime.appenderator.StreamAppenderatorDriverTest.TestSegmentAllocator; +import org.apache.druid.segment.realtime.appenderator.StreamAppenderatorDriverTest.TestSegmentHandoffNotifierFactory; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NumberedShardSpec; import org.easymock.EasyMock; import org.easymock.EasyMockSupport; import org.hamcrest.CoreMatchers; diff --git a/server/src/test/java/io/druid/segment/realtime/appenderator/StreamAppenderatorDriverTest.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorDriverTest.java similarity index 93% rename from server/src/test/java/io/druid/segment/realtime/appenderator/StreamAppenderatorDriverTest.java rename to server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorDriverTest.java index 32f04a11e488..421cc5700845 100644 --- a/server/src/test/java/io/druid/segment/realtime/appenderator/StreamAppenderatorDriverTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorDriverTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Supplier; @@ -27,23 +27,23 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.data.input.Committer; -import io.druid.data.input.InputRow; -import io.druid.data.input.MapBasedInputRow; -import io.druid.indexing.overlord.SegmentPublishResult; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.query.SegmentDescriptor; -import io.druid.segment.loading.DataSegmentKiller; -import io.druid.segment.realtime.FireDepartmentMetrics; -import io.druid.segment.realtime.plumber.SegmentHandoffNotifier; -import io.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NumberedShardSpec; +import org.apache.druid.data.input.Committer; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.indexing.overlord.SegmentPublishResult; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.query.SegmentDescriptor; +import org.apache.druid.segment.loading.DataSegmentKiller; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.segment.realtime.plumber.SegmentHandoffNotifier; +import org.apache.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NumberedShardSpec; import org.easymock.EasyMock; import org.easymock.EasyMockSupport; import org.joda.time.DateTime; diff --git a/server/src/test/java/io/druid/segment/realtime/appenderator/TestUsedSegmentChecker.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/TestUsedSegmentChecker.java similarity index 88% rename from server/src/test/java/io/druid/segment/realtime/appenderator/TestUsedSegmentChecker.java rename to server/src/test/java/org/apache/druid/segment/realtime/appenderator/TestUsedSegmentChecker.java index 90863d05fc3d..de53f890e9c0 100644 --- a/server/src/test/java/io/druid/segment/realtime/appenderator/TestUsedSegmentChecker.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/TestUsedSegmentChecker.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.segment.realtime.appenderator; +package org.apache.druid.segment.realtime.appenderator; import com.google.common.collect.Ordering; import com.google.common.collect.Sets; -import io.druid.timeline.DataSegment; -import io.druid.timeline.TimelineObjectHolder; -import io.druid.timeline.VersionedIntervalTimeline; -import io.druid.timeline.partition.PartitionChunk; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.TimelineObjectHolder; +import org.apache.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.timeline.partition.PartitionChunk; import java.util.Set; diff --git a/server/src/test/java/io/druid/segment/realtime/firehose/EventReceiverFirehoseTest.java b/server/src/test/java/org/apache/druid/segment/realtime/firehose/EventReceiverFirehoseTest.java similarity index 95% rename from server/src/test/java/io/druid/segment/realtime/firehose/EventReceiverFirehoseTest.java rename to server/src/test/java/org/apache/druid/segment/realtime/firehose/EventReceiverFirehoseTest.java index 348f0851c5a7..62414e1228e5 100644 --- a/server/src/test/java/io/druid/segment/realtime/firehose/EventReceiverFirehoseTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/firehose/EventReceiverFirehoseTest.java @@ -17,23 +17,23 @@ * under the License. */ -package io.druid.segment.realtime.firehose; +package org.apache.druid.segment.realtime.firehose; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.JSONParseSpec; -import io.druid.data.input.impl.MapInputRowParser; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.server.metrics.EventReceiverFirehoseMetric; -import io.druid.server.metrics.EventReceiverFirehoseRegister; -import io.druid.server.security.AllowAllAuthenticator; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthTestUtils; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.JSONParseSpec; +import org.apache.druid.data.input.impl.MapInputRowParser; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.server.metrics.EventReceiverFirehoseMetric; +import org.apache.druid.server.metrics.EventReceiverFirehoseRegister; +import org.apache.druid.server.security.AllowAllAuthenticator; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthTestUtils; import org.apache.commons.io.IOUtils; import org.easymock.EasyMock; import org.junit.Assert; diff --git a/server/src/test/java/io/druid/segment/realtime/firehose/HttpFirehoseFactoryTest.java b/server/src/test/java/org/apache/druid/segment/realtime/firehose/HttpFirehoseFactoryTest.java similarity index 93% rename from server/src/test/java/io/druid/segment/realtime/firehose/HttpFirehoseFactoryTest.java rename to server/src/test/java/org/apache/druid/segment/realtime/firehose/HttpFirehoseFactoryTest.java index be8396596f0e..0d74be64d7cf 100644 --- a/server/src/test/java/io/druid/segment/realtime/firehose/HttpFirehoseFactoryTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/firehose/HttpFirehoseFactoryTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment.realtime.firehose; +package org.apache.druid.segment.realtime.firehose; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/segment/realtime/firehose/IngestSegmentFirehoseTest.java b/server/src/test/java/org/apache/druid/segment/realtime/firehose/IngestSegmentFirehoseTest.java similarity index 81% rename from server/src/test/java/io/druid/segment/realtime/firehose/IngestSegmentFirehoseTest.java rename to server/src/test/java/org/apache/druid/segment/realtime/firehose/IngestSegmentFirehoseTest.java index bbf92b199c2a..1ce56627c552 100644 --- a/server/src/test/java/io/druid/segment/realtime/firehose/IngestSegmentFirehoseTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/firehose/IngestSegmentFirehoseTest.java @@ -17,39 +17,39 @@ * under the License. */ -package io.druid.segment.realtime.firehose; +package org.apache.druid.segment.realtime.firehose; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.druid.collections.spatial.search.RadiusBound; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.DelimitedParseSpec; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.NewSpatialDimensionSchema; -import io.druid.data.input.impl.StringDimensionSchema; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.hll.HyperLogLogCollector; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; -import io.druid.query.filter.SpatialDimFilter; -import io.druid.segment.IndexIO; -import io.druid.segment.IndexMerger; -import io.druid.segment.IndexSpec; -import io.druid.segment.QueryableIndex; -import io.druid.segment.QueryableIndexStorageAdapter; -import io.druid.segment.StorageAdapter; -import io.druid.segment.TestHelper; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexSchema; -import io.druid.segment.incremental.IncrementalIndexStorageAdapter; -import io.druid.segment.transform.TransformSpec; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; -import io.druid.segment.writeout.TmpFileSegmentWriteOutMediumFactory; +import org.apache.druid.collections.spatial.search.RadiusBound; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.DelimitedParseSpec; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.NewSpatialDimensionSchema; +import org.apache.druid.data.input.impl.StringDimensionSchema; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.hll.HyperLogLogCollector; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; +import org.apache.druid.query.filter.SpatialDimFilter; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.IndexMerger; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.QueryableIndexStorageAdapter; +import org.apache.druid.segment.StorageAdapter; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.incremental.IncrementalIndex; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.segment.incremental.IncrementalIndexStorageAdapter; +import org.apache.druid.segment.transform.TransformSpec; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.segment.writeout.TmpFileSegmentWriteOutMediumFactory; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/server/src/test/java/io/druid/segment/realtime/firehose/LocalFirehoseFactoryTest.java b/server/src/test/java/org/apache/druid/segment/realtime/firehose/LocalFirehoseFactoryTest.java similarity index 89% rename from server/src/test/java/io/druid/segment/realtime/firehose/LocalFirehoseFactoryTest.java rename to server/src/test/java/org/apache/druid/segment/realtime/firehose/LocalFirehoseFactoryTest.java index ac57dc6daf58..1d8366308809 100644 --- a/server/src/test/java/io/druid/segment/realtime/firehose/LocalFirehoseFactoryTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/firehose/LocalFirehoseFactoryTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.segment.realtime.firehose; +package org.apache.druid.segment.realtime.firehose; import com.google.common.collect.Lists; -import io.druid.data.input.Firehose; -import io.druid.data.input.Row; -import io.druid.data.input.impl.CSVParseSpec; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.data.input.impl.TimestampSpec; +import org.apache.druid.data.input.Firehose; +import org.apache.druid.data.input.Row; +import org.apache.druid.data.input.impl.CSVParseSpec; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.data.input.impl.TimestampSpec; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; diff --git a/server/src/test/java/io/druid/segment/realtime/firehose/ServiceAnnouncingChatHandlerProviderTest.java b/server/src/test/java/org/apache/druid/segment/realtime/firehose/ServiceAnnouncingChatHandlerProviderTest.java similarity index 95% rename from server/src/test/java/io/druid/segment/realtime/firehose/ServiceAnnouncingChatHandlerProviderTest.java rename to server/src/test/java/org/apache/druid/segment/realtime/firehose/ServiceAnnouncingChatHandlerProviderTest.java index 1beba41d700f..8815ff524d5b 100644 --- a/server/src/test/java/io/druid/segment/realtime/firehose/ServiceAnnouncingChatHandlerProviderTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/firehose/ServiceAnnouncingChatHandlerProviderTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.segment.realtime.firehose; +package org.apache.druid.segment.realtime.firehose; -import io.druid.curator.discovery.ServiceAnnouncer; -import io.druid.server.DruidNode; -import io.druid.server.initialization.ServerConfig; +import org.apache.druid.curator.discovery.ServiceAnnouncer; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.initialization.ServerConfig; import org.easymock.Capture; import org.easymock.EasyMock; import org.easymock.EasyMockRunner; diff --git a/server/src/test/java/io/druid/segment/realtime/firehose/SqlFirehoseFactoryTest.java b/server/src/test/java/org/apache/druid/segment/realtime/firehose/SqlFirehoseFactoryTest.java similarity index 93% rename from server/src/test/java/io/druid/segment/realtime/firehose/SqlFirehoseFactoryTest.java rename to server/src/test/java/org/apache/druid/segment/realtime/firehose/SqlFirehoseFactoryTest.java index 1cb0519b61d0..27f19d02de56 100644 --- a/server/src/test/java/io/druid/segment/realtime/firehose/SqlFirehoseFactoryTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/firehose/SqlFirehoseFactoryTest.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.segment.realtime.firehose; +package org.apache.druid.segment.realtime.firehose; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.druid.data.input.Firehose; -import io.druid.data.input.Row; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.MapInputRowParser; -import io.druid.data.input.impl.TimeAndDimsParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.java.util.common.StringUtils; -import io.druid.metadata.MetadataStorageConnectorConfig; -import io.druid.metadata.SQLFirehoseDatabaseConnector; -import io.druid.metadata.TestDerbyConnector; -import io.druid.segment.TestHelper; +import org.apache.druid.data.input.Firehose; +import org.apache.druid.data.input.Row; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.MapInputRowParser; +import org.apache.druid.data.input.impl.TimeAndDimsParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.metadata.MetadataStorageConnectorConfig; +import org.apache.druid.metadata.SQLFirehoseDatabaseConnector; +import org.apache.druid.metadata.TestDerbyConnector; +import org.apache.druid.segment.TestHelper; import org.apache.commons.dbcp2.BasicDataSource; import org.apache.commons.io.FileUtils; import org.junit.AfterClass; diff --git a/server/src/test/java/io/druid/segment/realtime/plumber/CoordinatorBasedSegmentHandoffNotifierTest.java b/server/src/test/java/org/apache/druid/segment/realtime/plumber/CoordinatorBasedSegmentHandoffNotifierTest.java similarity index 95% rename from server/src/test/java/io/druid/segment/realtime/plumber/CoordinatorBasedSegmentHandoffNotifierTest.java rename to server/src/test/java/org/apache/druid/segment/realtime/plumber/CoordinatorBasedSegmentHandoffNotifierTest.java index 4cf56e882dae..14d77d261f38 100644 --- a/server/src/test/java/io/druid/segment/realtime/plumber/CoordinatorBasedSegmentHandoffNotifierTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/plumber/CoordinatorBasedSegmentHandoffNotifierTest.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.segment.realtime.plumber; +package org.apache.druid.segment.realtime.plumber; import com.google.common.collect.Sets; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.client.ImmutableSegmentLoadInfo; -import io.druid.client.coordinator.CoordinatorClient; -import io.druid.java.util.common.Intervals; -import io.druid.query.SegmentDescriptor; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.server.coordination.ServerType; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NumberedShardSpec; +import org.apache.druid.client.ImmutableSegmentLoadInfo; +import org.apache.druid.client.coordinator.CoordinatorClient; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.query.SegmentDescriptor; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NumberedShardSpec; import junit.framework.Assert; import org.easymock.EasyMock; import org.joda.time.Duration; diff --git a/server/src/test/java/io/druid/segment/realtime/plumber/CustomVersioningPolicyTest.java b/server/src/test/java/org/apache/druid/segment/realtime/plumber/CustomVersioningPolicyTest.java similarity index 94% rename from server/src/test/java/io/druid/segment/realtime/plumber/CustomVersioningPolicyTest.java rename to server/src/test/java/org/apache/druid/segment/realtime/plumber/CustomVersioningPolicyTest.java index aaa66f7ed661..2def644cf5ac 100644 --- a/server/src/test/java/io/druid/segment/realtime/plumber/CustomVersioningPolicyTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/plumber/CustomVersioningPolicyTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.realtime.plumber; +package org.apache.druid.segment.realtime.plumber; -import io.druid.server.ServerTestHelper; +import org.apache.druid.server.ServerTestHelper; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.Interval; diff --git a/server/src/test/java/io/druid/segment/realtime/plumber/IntervalStartVersioningPolicyTest.java b/server/src/test/java/org/apache/druid/segment/realtime/plumber/IntervalStartVersioningPolicyTest.java similarity index 92% rename from server/src/test/java/io/druid/segment/realtime/plumber/IntervalStartVersioningPolicyTest.java rename to server/src/test/java/org/apache/druid/segment/realtime/plumber/IntervalStartVersioningPolicyTest.java index fd81da674682..15c05fd9c56f 100644 --- a/server/src/test/java/io/druid/segment/realtime/plumber/IntervalStartVersioningPolicyTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/plumber/IntervalStartVersioningPolicyTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.realtime.plumber; +package org.apache.druid.segment.realtime.plumber; -import io.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Intervals; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/segment/realtime/plumber/MessageTimeRejectionPolicyFactoryTest.java b/server/src/test/java/org/apache/druid/segment/realtime/plumber/MessageTimeRejectionPolicyFactoryTest.java similarity index 93% rename from server/src/test/java/io/druid/segment/realtime/plumber/MessageTimeRejectionPolicyFactoryTest.java rename to server/src/test/java/org/apache/druid/segment/realtime/plumber/MessageTimeRejectionPolicyFactoryTest.java index 0f721e4a8329..36e73dc60bc0 100644 --- a/server/src/test/java/io/druid/segment/realtime/plumber/MessageTimeRejectionPolicyFactoryTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/plumber/MessageTimeRejectionPolicyFactoryTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.realtime.plumber; +package org.apache.druid.segment.realtime.plumber; -import io.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.DateTimes; import org.joda.time.DateTime; import org.joda.time.Period; import org.junit.Assert; diff --git a/server/src/test/java/io/druid/segment/realtime/plumber/RealtimePlumberSchoolTest.java b/server/src/test/java/org/apache/druid/segment/realtime/plumber/RealtimePlumberSchoolTest.java similarity index 90% rename from server/src/test/java/io/druid/segment/realtime/plumber/RealtimePlumberSchoolTest.java rename to server/src/test/java/org/apache/druid/segment/realtime/plumber/RealtimePlumberSchoolTest.java index ef964178fe8e..5201e0b91390 100644 --- a/server/src/test/java/io/druid/segment/realtime/plumber/RealtimePlumberSchoolTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/plumber/RealtimePlumberSchoolTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.segment.realtime.plumber; +package org.apache.druid.segment.realtime.plumber; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Suppliers; @@ -26,39 +26,39 @@ import com.google.common.collect.Maps; import com.google.common.io.Files; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.client.cache.CachePopulatorStats; -import io.druid.client.cache.MapCache; -import io.druid.data.input.Committer; -import io.druid.data.input.InputRow; -import io.druid.data.input.Row; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.JSONParseSpec; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.query.DefaultQueryRunnerFactoryConglomerate; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.segment.QueryableIndex; -import io.druid.segment.ReferenceCountingSegment; -import io.druid.segment.TestHelper; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.RealtimeTuningConfig; -import io.druid.segment.indexing.TuningConfigs; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; -import io.druid.segment.loading.DataSegmentPusher; -import io.druid.segment.realtime.FireDepartmentMetrics; -import io.druid.segment.realtime.FireDepartmentTest; -import io.druid.segment.realtime.FireHydrant; -import io.druid.segment.realtime.SegmentPublisher; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; -import io.druid.segment.writeout.SegmentWriteOutMediumFactory; -import io.druid.segment.writeout.TmpFileSegmentWriteOutMediumFactory; -import io.druid.server.coordination.DataSegmentAnnouncer; +import org.apache.druid.client.cache.CachePopulatorStats; +import org.apache.druid.client.cache.MapCache; +import org.apache.druid.data.input.Committer; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.JSONParseSpec; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.query.DefaultQueryRunnerFactoryConglomerate; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.ReferenceCountingSegment; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.RealtimeTuningConfig; +import org.apache.druid.segment.indexing.TuningConfigs; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.segment.loading.DataSegmentPusher; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.segment.realtime.FireDepartmentTest; +import org.apache.druid.segment.realtime.FireHydrant; +import org.apache.druid.segment.realtime.SegmentPublisher; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; +import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory; +import org.apache.druid.segment.writeout.TmpFileSegmentWriteOutMediumFactory; +import org.apache.druid.server.coordination.DataSegmentAnnouncer; import org.apache.commons.io.FileUtils; import org.easymock.EasyMock; import org.joda.time.DateTime; diff --git a/server/src/test/java/io/druid/segment/realtime/plumber/ServerTimeRejectionPolicyFactoryTest.java b/server/src/test/java/org/apache/druid/segment/realtime/plumber/ServerTimeRejectionPolicyFactoryTest.java similarity index 93% rename from server/src/test/java/io/druid/segment/realtime/plumber/ServerTimeRejectionPolicyFactoryTest.java rename to server/src/test/java/org/apache/druid/segment/realtime/plumber/ServerTimeRejectionPolicyFactoryTest.java index e273804fc368..496788e030e6 100644 --- a/server/src/test/java/io/druid/segment/realtime/plumber/ServerTimeRejectionPolicyFactoryTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/plumber/ServerTimeRejectionPolicyFactoryTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.segment.realtime.plumber; +package org.apache.druid.segment.realtime.plumber; -import io.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.DateTimes; import org.joda.time.DateTime; import org.joda.time.Period; import org.junit.Assert; diff --git a/server/src/test/java/io/druid/segment/realtime/plumber/SinkTest.java b/server/src/test/java/org/apache/druid/segment/realtime/plumber/SinkTest.java similarity index 89% rename from server/src/test/java/io/druid/segment/realtime/plumber/SinkTest.java rename to server/src/test/java/org/apache/druid/segment/realtime/plumber/SinkTest.java index c9446fe9d4f4..b0ca66836af6 100644 --- a/server/src/test/java/io/druid/segment/realtime/plumber/SinkTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/plumber/SinkTest.java @@ -17,26 +17,26 @@ * under the License. */ -package io.druid.segment.realtime.plumber; +package org.apache.druid.segment.realtime.plumber; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; -import io.druid.data.input.InputRow; -import io.druid.data.input.MapBasedInputRow; -import io.druid.data.input.Row; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.RealtimeTuningConfig; -import io.druid.segment.indexing.TuningConfigs; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; -import io.druid.segment.realtime.FireHydrant; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.RealtimeTuningConfig; +import org.apache.druid.segment.indexing.TuningConfigs; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.segment.realtime.FireHydrant; import org.joda.time.DateTime; import org.joda.time.Interval; import org.joda.time.Period; diff --git a/server/src/test/java/io/druid/server/AsyncManagementForwardingServletTest.java b/server/src/test/java/org/apache/druid/server/AsyncManagementForwardingServletTest.java similarity index 95% rename from server/src/test/java/io/druid/server/AsyncManagementForwardingServletTest.java rename to server/src/test/java/org/apache/druid/server/AsyncManagementForwardingServletTest.java index 07a6539d9ba8..fa6d540ac035 100644 --- a/server/src/test/java/io/druid/server/AsyncManagementForwardingServletTest.java +++ b/server/src/test/java/org/apache/druid/server/AsyncManagementForwardingServletTest.java @@ -17,26 +17,26 @@ * under the License. */ -package io.druid.server; +package org.apache.druid.server; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.inject.Injector; import com.google.inject.Key; -import io.druid.common.utils.SocketUtil; -import io.druid.discovery.DruidLeaderSelector; -import io.druid.guice.GuiceInjectors; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.LazySingleton; -import io.druid.guice.LifecycleModule; -import io.druid.guice.annotations.Self; -import io.druid.guice.http.DruidHttpClientConfig; -import io.druid.initialization.Initialization; -import io.druid.java.util.common.StringUtils; -import io.druid.server.initialization.BaseJettyTest; -import io.druid.server.initialization.jetty.JettyServerInitUtils; -import io.druid.server.initialization.jetty.JettyServerInitializer; +import org.apache.druid.common.utils.SocketUtil; +import org.apache.druid.discovery.DruidLeaderSelector; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.LifecycleModule; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.guice.http.DruidHttpClientConfig; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.server.initialization.BaseJettyTest; +import org.apache.druid.server.initialization.jetty.JettyServerInitUtils; +import org.apache.druid.server.initialization.jetty.JettyServerInitializer; import org.apache.commons.io.IOUtils; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.server.Handler; diff --git a/server/src/test/java/io/druid/server/AsyncQueryForwardingServletTest.java b/server/src/test/java/org/apache/druid/server/AsyncQueryForwardingServletTest.java similarity index 86% rename from server/src/test/java/io/druid/server/AsyncQueryForwardingServletTest.java rename to server/src/test/java/org/apache/druid/server/AsyncQueryForwardingServletTest.java index 1ccb39fd10ab..68082c30610c 100644 --- a/server/src/test/java/io/druid/server/AsyncQueryForwardingServletTest.java +++ b/server/src/test/java/org/apache/druid/server/AsyncQueryForwardingServletTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server; +package org.apache.druid.server; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; @@ -29,34 +29,34 @@ import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.servlet.GuiceFilter; -import io.druid.common.utils.SocketUtil; -import io.druid.guice.GuiceInjectors; -import io.druid.guice.Jerseys; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.LazySingleton; -import io.druid.guice.LifecycleModule; -import io.druid.guice.annotations.Self; -import io.druid.guice.annotations.Smile; -import io.druid.guice.http.DruidHttpClientConfig; -import io.druid.initialization.Initialization; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.query.DefaultGenericQueryMetricsFactory; -import io.druid.query.Druids; -import io.druid.query.MapQueryToolChestWarehouse; -import io.druid.query.Query; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.segment.TestHelper; -import io.druid.server.initialization.BaseJettyTest; -import io.druid.server.initialization.jetty.JettyServerInitUtils; -import io.druid.server.initialization.jetty.JettyServerInitializer; -import io.druid.server.metrics.NoopServiceEmitter; -import io.druid.server.router.QueryHostFinder; -import io.druid.server.router.RendezvousHashAvaticaConnectionBalancer; -import io.druid.server.security.AllowAllAuthorizer; -import io.druid.server.security.AuthenticatorMapper; -import io.druid.server.security.Authorizer; -import io.druid.server.security.AuthorizerMapper; +import org.apache.druid.common.utils.SocketUtil; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.guice.Jerseys; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.LifecycleModule; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.guice.annotations.Smile; +import org.apache.druid.guice.http.DruidHttpClientConfig; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.query.DefaultGenericQueryMetricsFactory; +import org.apache.druid.query.Druids; +import org.apache.druid.query.MapQueryToolChestWarehouse; +import org.apache.druid.query.Query; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.server.initialization.BaseJettyTest; +import org.apache.druid.server.initialization.jetty.JettyServerInitUtils; +import org.apache.druid.server.initialization.jetty.JettyServerInitializer; +import org.apache.druid.server.metrics.NoopServiceEmitter; +import org.apache.druid.server.router.QueryHostFinder; +import org.apache.druid.server.router.RendezvousHashAvaticaConnectionBalancer; +import org.apache.druid.server.security.AllowAllAuthorizer; +import org.apache.druid.server.security.AuthenticatorMapper; +import org.apache.druid.server.security.Authorizer; +import org.apache.druid.server.security.AuthorizerMapper; import org.easymock.EasyMock; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.server.Handler; @@ -230,14 +230,14 @@ public int read() } }; EasyMock.expect(requestMock.getContentType()).andReturn("application/json").times(2); - requestMock.setAttribute("io.druid.proxy.objectMapper", jsonMapper); + requestMock.setAttribute("org.apache.druid.proxy.objectMapper", jsonMapper); EasyMock.expectLastCall(); EasyMock.expect(requestMock.getRequestURI()).andReturn("/druid/v2/"); EasyMock.expect(requestMock.getMethod()).andReturn("POST"); EasyMock.expect(requestMock.getInputStream()).andReturn(servletInputStream); - requestMock.setAttribute("io.druid.proxy.query", query); - requestMock.setAttribute("io.druid.proxy.to.host", "1.2.3.4:9999"); - requestMock.setAttribute("io.druid.proxy.to.host.scheme", "http"); + requestMock.setAttribute("org.apache.druid.proxy.query", query); + requestMock.setAttribute("org.apache.druid.proxy.to.host", "1.2.3.4:9999"); + requestMock.setAttribute("org.apache.druid.proxy.to.host.scheme", "http"); EasyMock.expectLastCall(); EasyMock.replay(requestMock); @@ -310,19 +310,19 @@ public void initialize(Server server, Injector injector) final QueryHostFinder hostFinder = new QueryHostFinder(null, new RendezvousHashAvaticaConnectionBalancer()) { @Override - public io.druid.client.selector.Server pickServer(Query query) + public org.apache.druid.client.selector.Server pickServer(Query query) { return new TestServer("http", "localhost", node.getPlaintextPort()); } @Override - public io.druid.client.selector.Server pickDefaultServer() + public org.apache.druid.client.selector.Server pickDefaultServer() { return new TestServer("http", "localhost", node.getPlaintextPort()); } @Override - public Collection getAllServers() + public Collection getAllServers() { return ImmutableList.of( new TestServer("http", "localhost", node.getPlaintextPort()), @@ -414,7 +414,7 @@ public void testRewriteURI() throws Exception ); } - private static class TestServer implements io.druid.client.selector.Server + private static class TestServer implements org.apache.druid.client.selector.Server { private final String scheme; diff --git a/server/src/test/java/io/druid/server/ClientInfoResourceTest.java b/server/src/test/java/org/apache/druid/server/ClientInfoResourceTest.java similarity index 94% rename from server/src/test/java/io/druid/server/ClientInfoResourceTest.java rename to server/src/test/java/org/apache/druid/server/ClientInfoResourceTest.java index 5f6ec2dc556f..ec11f43b2000 100644 --- a/server/src/test/java/io/druid/server/ClientInfoResourceTest.java +++ b/server/src/test/java/org/apache/druid/server/ClientInfoResourceTest.java @@ -17,28 +17,28 @@ * under the License. */ -package io.druid.server; +package org.apache.druid.server; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Ordering; -import io.druid.client.DruidServer; -import io.druid.client.FilteredServerInventoryView; -import io.druid.client.TimelineServerView; -import io.druid.client.selector.HighestPriorityTierSelectorStrategy; -import io.druid.client.selector.RandomServerSelectorStrategy; -import io.druid.client.selector.ServerSelector; -import io.druid.java.util.common.Intervals; -import io.druid.query.TableDataSource; -import io.druid.query.metadata.SegmentMetadataQueryConfig; -import io.druid.server.coordination.ServerType; -import io.druid.server.security.AuthConfig; -import io.druid.timeline.DataSegment; -import io.druid.timeline.VersionedIntervalTimeline; -import io.druid.timeline.partition.NumberedShardSpec; -import io.druid.timeline.partition.ShardSpec; -import io.druid.timeline.partition.SingleElementPartitionChunk; +import org.apache.druid.client.DruidServer; +import org.apache.druid.client.FilteredServerInventoryView; +import org.apache.druid.client.TimelineServerView; +import org.apache.druid.client.selector.HighestPriorityTierSelectorStrategy; +import org.apache.druid.client.selector.RandomServerSelectorStrategy; +import org.apache.druid.client.selector.ServerSelector; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.query.metadata.SegmentMetadataQueryConfig; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.timeline.partition.NumberedShardSpec; +import org.apache.druid.timeline.partition.ShardSpec; +import org.apache.druid.timeline.partition.SingleElementPartitionChunk; import org.easymock.EasyMock; import org.joda.time.DateTime; import org.joda.time.chrono.ISOChronology; diff --git a/server/src/test/java/io/druid/server/ConsistentHasherTest.java b/server/src/test/java/org/apache/druid/server/ConsistentHasherTest.java similarity index 97% rename from server/src/test/java/io/druid/server/ConsistentHasherTest.java rename to server/src/test/java/org/apache/druid/server/ConsistentHasherTest.java index 2ed520cc8713..8a38f5ebb7e7 100644 --- a/server/src/test/java/io/druid/server/ConsistentHasherTest.java +++ b/server/src/test/java/org/apache/druid/server/ConsistentHasherTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.server; +package org.apache.druid.server; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.router.ConsistentHasher; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.router.ConsistentHasher; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/server/DruidNodeTest.java b/server/src/test/java/org/apache/druid/server/DruidNodeTest.java similarity index 99% rename from server/src/test/java/io/druid/server/DruidNodeTest.java rename to server/src/test/java/org/apache/druid/server/DruidNodeTest.java index 469bc07927d7..d08bba0fddb6 100644 --- a/server/src/test/java/io/druid/server/DruidNodeTest.java +++ b/server/src/test/java/org/apache/druid/server/DruidNodeTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.server; +package org.apache.druid.server; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.net.HostAndPort; -import io.druid.jackson.DefaultObjectMapper; +import org.apache.druid.jackson.DefaultObjectMapper; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/server/QueryResourceTest.java b/server/src/test/java/org/apache/druid/server/QueryResourceTest.java similarity index 92% rename from server/src/test/java/io/druid/server/QueryResourceTest.java rename to server/src/test/java/org/apache/druid/server/QueryResourceTest.java index 2c7451e2a5e5..383c8aea62b6 100644 --- a/server/src/test/java/io/druid/server/QueryResourceTest.java +++ b/server/src/test/java/org/apache/druid/server/QueryResourceTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server; +package org.apache.druid.server; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -25,33 +25,33 @@ import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.query.DefaultGenericQueryMetricsFactory; -import io.druid.query.MapQueryToolChestWarehouse; -import io.druid.query.Query; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QuerySegmentWalker; -import io.druid.query.QueryToolChestWarehouse; -import io.druid.query.Result; -import io.druid.query.SegmentDescriptor; -import io.druid.query.timeboundary.TimeBoundaryResultValue; -import io.druid.server.log.TestRequestLogger; -import io.druid.server.metrics.NoopServiceEmitter; -import io.druid.server.security.Access; -import io.druid.server.security.Action; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthTestUtils; -import io.druid.server.security.AuthenticationResult; -import io.druid.server.security.Authorizer; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.ForbiddenException; -import io.druid.server.security.Resource; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.query.DefaultGenericQueryMetricsFactory; +import org.apache.druid.query.MapQueryToolChestWarehouse; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QuerySegmentWalker; +import org.apache.druid.query.QueryToolChestWarehouse; +import org.apache.druid.query.Result; +import org.apache.druid.query.SegmentDescriptor; +import org.apache.druid.query.timeboundary.TimeBoundaryResultValue; +import org.apache.druid.server.log.TestRequestLogger; +import org.apache.druid.server.metrics.NoopServiceEmitter; +import org.apache.druid.server.security.Access; +import org.apache.druid.server.security.Action; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthTestUtils; +import org.apache.druid.server.security.AuthenticationResult; +import org.apache.druid.server.security.Authorizer; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.ForbiddenException; +import org.apache.druid.server.security.Resource; import org.easymock.EasyMock; import org.joda.time.Interval; import org.junit.After; diff --git a/server/src/test/java/io/druid/server/RendezvousHasherTest.java b/server/src/test/java/org/apache/druid/server/RendezvousHasherTest.java similarity index 97% rename from server/src/test/java/io/druid/server/RendezvousHasherTest.java rename to server/src/test/java/org/apache/druid/server/RendezvousHasherTest.java index 49aded53ed91..1d7ac1b859ef 100644 --- a/server/src/test/java/io/druid/server/RendezvousHasherTest.java +++ b/server/src/test/java/org/apache/druid/server/RendezvousHasherTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.server; +package org.apache.druid.server; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.router.RendezvousHasher; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.router.RendezvousHasher; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/server/SegmentManagerTest.java b/server/src/test/java/org/apache/druid/server/SegmentManagerTest.java similarity index 95% rename from server/src/test/java/io/druid/server/SegmentManagerTest.java rename to server/src/test/java/org/apache/druid/server/SegmentManagerTest.java index de3f6e8ee684..aaa1b04a89fb 100644 --- a/server/src/test/java/io/druid/server/SegmentManagerTest.java +++ b/server/src/test/java/org/apache/druid/server/SegmentManagerTest.java @@ -17,25 +17,25 @@ * under the License. */ -package io.druid.server; +package org.apache.druid.server; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Ordering; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.MapUtils; -import io.druid.segment.AbstractSegment; -import io.druid.segment.QueryableIndex; -import io.druid.segment.ReferenceCountingSegment; -import io.druid.segment.Segment; -import io.druid.segment.StorageAdapter; -import io.druid.segment.loading.SegmentLoader; -import io.druid.segment.loading.SegmentLoadingException; -import io.druid.server.SegmentManager.DataSourceState; -import io.druid.timeline.DataSegment; -import io.druid.timeline.VersionedIntervalTimeline; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.MapUtils; +import org.apache.druid.segment.AbstractSegment; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.ReferenceCountingSegment; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.StorageAdapter; +import org.apache.druid.segment.loading.SegmentLoader; +import org.apache.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.server.SegmentManager.DataSourceState; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.joda.time.Interval; import org.junit.After; import org.junit.Assert; diff --git a/server/src/test/java/io/druid/server/ServerTestHelper.java b/server/src/test/java/org/apache/druid/server/ServerTestHelper.java similarity index 89% rename from server/src/test/java/io/druid/server/ServerTestHelper.java rename to server/src/test/java/org/apache/druid/server/ServerTestHelper.java index 6fe54e19e843..87c6ae0c0c4b 100644 --- a/server/src/test/java/io/druid/server/ServerTestHelper.java +++ b/server/src/test/java/org/apache/druid/server/ServerTestHelper.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.server; +package org.apache.druid.server; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.guice.ServerModule; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.timeline.DataSegment; +import org.apache.druid.guice.ServerModule; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.timeline.DataSegment; import java.util.List; diff --git a/server/src/test/java/io/druid/server/StatusResourceTest.java b/server/src/test/java/org/apache/druid/server/StatusResourceTest.java similarity index 91% rename from server/src/test/java/io/druid/server/StatusResourceTest.java rename to server/src/test/java/org/apache/druid/server/StatusResourceTest.java index f2053dad8a2f..b5db403bb780 100644 --- a/server/src/test/java/io/druid/server/StatusResourceTest.java +++ b/server/src/test/java/org/apache/druid/server/StatusResourceTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.server; +package org.apache.druid.server; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; import com.google.inject.Guice; import com.google.inject.Injector; -import io.druid.guice.PropertiesModule; -import io.druid.initialization.DruidModule; -import io.druid.initialization.InitializationTest; +import org.apache.druid.guice.PropertiesModule; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.initialization.InitializationTest; import org.junit.Assert; import org.junit.Test; @@ -36,7 +36,7 @@ import java.util.Map; import java.util.Set; -import static io.druid.server.StatusResource.ModuleVersion; +import static org.apache.druid.server.StatusResource.ModuleVersion; /** */ diff --git a/server/src/test/java/io/druid/server/audit/SQLAuditManagerTest.java b/server/src/test/java/org/apache/druid/server/audit/SQLAuditManagerTest.java similarity index 93% rename from server/src/test/java/io/druid/server/audit/SQLAuditManagerTest.java rename to server/src/test/java/org/apache/druid/server/audit/SQLAuditManagerTest.java index 9d0ad39033bc..8677f42a0c58 100644 --- a/server/src/test/java/io/druid/server/audit/SQLAuditManagerTest.java +++ b/server/src/test/java/org/apache/druid/server/audit/SQLAuditManagerTest.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.server.audit; +package org.apache.druid.server.audit; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.audit.AuditEntry; -import io.druid.audit.AuditInfo; -import io.druid.audit.AuditManager; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.metadata.TestDerbyConnector; -import io.druid.server.metrics.NoopServiceEmitter; +import org.apache.druid.audit.AuditEntry; +import org.apache.druid.audit.AuditInfo; +import org.apache.druid.audit.AuditManager; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.metadata.TestDerbyConnector; +import org.apache.druid.server.metrics.NoopServiceEmitter; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/server/src/test/java/io/druid/server/coordination/ChangeRequestHistoryTest.java b/server/src/test/java/org/apache/druid/server/coordination/ChangeRequestHistoryTest.java similarity index 98% rename from server/src/test/java/io/druid/server/coordination/ChangeRequestHistoryTest.java rename to server/src/test/java/org/apache/druid/server/coordination/ChangeRequestHistoryTest.java index c113fa7ab032..d513aebb92d3 100644 --- a/server/src/test/java/io/druid/server/coordination/ChangeRequestHistoryTest.java +++ b/server/src/test/java/org/apache/druid/server/coordination/ChangeRequestHistoryTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.server.coordination; +package org.apache.druid.server.coordination; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.utils.CircularBuffer; +import org.apache.druid.utils.CircularBuffer; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/server/coordination/ChangeRequestHttpSyncerTest.java b/server/src/test/java/org/apache/druid/server/coordination/ChangeRequestHttpSyncerTest.java similarity index 94% rename from server/src/test/java/io/druid/server/coordination/ChangeRequestHttpSyncerTest.java rename to server/src/test/java/org/apache/druid/server/coordination/ChangeRequestHttpSyncerTest.java index 75970ff5d4b8..26531bc3c511 100644 --- a/server/src/test/java/io/druid/server/coordination/ChangeRequestHttpSyncerTest.java +++ b/server/src/test/java/org/apache/druid/server/coordination/ChangeRequestHttpSyncerTest.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.server.coordination; +package org.apache.druid.server.coordination; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.Request; -import io.druid.java.util.http.client.response.HttpResponseHandler; -import io.druid.java.util.common.RE; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.segment.TestHelper; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.Request; +import org.apache.druid.java.util.http.client.response.HttpResponseHandler; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.segment.TestHelper; import org.easymock.EasyMock; import org.jboss.netty.buffer.ChannelBuffers; import org.jboss.netty.handler.codec.http.DefaultHttpResponse; diff --git a/server/src/test/java/io/druid/server/coordination/SegmentChangeRequestDropTest.java b/server/src/test/java/org/apache/druid/server/coordination/SegmentChangeRequestDropTest.java similarity index 87% rename from server/src/test/java/io/druid/server/coordination/SegmentChangeRequestDropTest.java rename to server/src/test/java/org/apache/druid/server/coordination/SegmentChangeRequestDropTest.java index c089704029c9..c8ad82422e75 100644 --- a/server/src/test/java/io/druid/server/coordination/SegmentChangeRequestDropTest.java +++ b/server/src/test/java/org/apache/druid/server/coordination/SegmentChangeRequestDropTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.server.coordination; +package org.apache.druid.server.coordination; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.jackson.JacksonUtils; -import io.druid.segment.IndexIO; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/server/coordination/SegmentChangeRequestLoadTest.java b/server/src/test/java/org/apache/druid/server/coordination/SegmentChangeRequestLoadTest.java similarity index 87% rename from server/src/test/java/io/druid/server/coordination/SegmentChangeRequestLoadTest.java rename to server/src/test/java/org/apache/druid/server/coordination/SegmentChangeRequestLoadTest.java index a341338dac0d..4461fc0f3017 100644 --- a/server/src/test/java/io/druid/server/coordination/SegmentChangeRequestLoadTest.java +++ b/server/src/test/java/org/apache/druid/server/coordination/SegmentChangeRequestLoadTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.server.coordination; +package org.apache.druid.server.coordination; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.jackson.JacksonUtils; -import io.druid.java.util.common.Intervals; -import io.druid.segment.IndexIO; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/server/coordination/SegmentLoadDropHandlerTest.java b/server/src/test/java/org/apache/druid/server/coordination/SegmentLoadDropHandlerTest.java similarity index 96% rename from server/src/test/java/io/druid/server/coordination/SegmentLoadDropHandlerTest.java rename to server/src/test/java/org/apache/druid/server/coordination/SegmentLoadDropHandlerTest.java index cc500f22d783..cc4f4ca69d1a 100644 --- a/server/src/test/java/io/druid/server/coordination/SegmentLoadDropHandlerTest.java +++ b/server/src/test/java/org/apache/druid/server/coordination/SegmentLoadDropHandlerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordination; +package org.apache.druid.server.coordination; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; @@ -26,16 +26,16 @@ import com.google.common.collect.Lists; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.concurrent.ScheduledExecutorFactory; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.IndexIO; -import io.druid.segment.TestHelper; -import io.druid.segment.loading.CacheTestSegmentLoader; -import io.druid.segment.loading.SegmentLoaderConfig; -import io.druid.server.SegmentManager; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.concurrent.ScheduledExecutorFactory; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.loading.CacheTestSegmentLoader; +import org.apache.druid.segment.loading.SegmentLoaderConfig; +import org.apache.druid.server.SegmentManager; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.easymock.EasyMock; import org.joda.time.Interval; import org.junit.Assert; diff --git a/server/src/test/java/io/druid/server/coordination/ServerManagerTest.java b/server/src/test/java/org/apache/druid/server/coordination/ServerManagerTest.java similarity index 89% rename from server/src/test/java/io/druid/server/coordination/ServerManagerTest.java rename to server/src/test/java/org/apache/druid/server/coordination/ServerManagerTest.java index df4aebf0a6b9..3107539e6f6c 100644 --- a/server/src/test/java/io/druid/server/coordination/ServerManagerTest.java +++ b/server/src/test/java/org/apache/druid/server/coordination/ServerManagerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordination; +package org.apache.druid.server.coordination; import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.base.Function; @@ -26,51 +26,51 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import io.druid.client.cache.CacheConfig; -import io.druid.client.cache.CachePopulatorStats; -import io.druid.client.cache.ForegroundCachePopulator; -import io.druid.client.cache.LocalCacheProvider; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.MapUtils; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.common.guava.Yielder; -import io.druid.java.util.common.guava.YieldingAccumulator; -import io.druid.java.util.common.guava.YieldingSequenceBase; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.query.ConcatQueryRunner; -import io.druid.query.DefaultQueryMetrics; -import io.druid.query.Druids; -import io.druid.query.NoopQueryRunner; -import io.druid.query.Query; -import io.druid.query.QueryMetrics; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryRunnerFactoryConglomerate; -import io.druid.query.QueryToolChest; -import io.druid.query.Result; -import io.druid.query.aggregation.MetricManipulationFn; -import io.druid.query.search.SearchQuery; -import io.druid.query.search.SearchResultValue; -import io.druid.segment.AbstractSegment; -import io.druid.segment.IndexIO; -import io.druid.segment.QueryableIndex; -import io.druid.segment.ReferenceCountingSegment; -import io.druid.segment.Segment; -import io.druid.segment.StorageAdapter; -import io.druid.segment.loading.SegmentLoader; -import io.druid.segment.loading.SegmentLoadingException; -import io.druid.server.SegmentManager; -import io.druid.server.initialization.ServerConfig; -import io.druid.server.metrics.NoopServiceEmitter; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.client.cache.CachePopulatorStats; +import org.apache.druid.client.cache.ForegroundCachePopulator; +import org.apache.druid.client.cache.LocalCacheProvider; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.MapUtils; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.guava.Yielder; +import org.apache.druid.java.util.common.guava.YieldingAccumulator; +import org.apache.druid.java.util.common.guava.YieldingSequenceBase; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.query.ConcatQueryRunner; +import org.apache.druid.query.DefaultQueryMetrics; +import org.apache.druid.query.Druids; +import org.apache.druid.query.NoopQueryRunner; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryMetrics; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryRunnerFactoryConglomerate; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.Result; +import org.apache.druid.query.aggregation.MetricManipulationFn; +import org.apache.druid.query.search.SearchQuery; +import org.apache.druid.query.search.SearchResultValue; +import org.apache.druid.segment.AbstractSegment; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.ReferenceCountingSegment; +import org.apache.druid.segment.Segment; +import org.apache.druid.segment.StorageAdapter; +import org.apache.druid.segment.loading.SegmentLoader; +import org.apache.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.server.SegmentManager; +import org.apache.druid.server.initialization.ServerConfig; +import org.apache.druid.server.metrics.NoopServiceEmitter; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Before; diff --git a/server/src/test/java/io/druid/server/coordination/ServerTypeTest.java b/server/src/test/java/org/apache/druid/server/coordination/ServerTypeTest.java similarity index 97% rename from server/src/test/java/io/druid/server/coordination/ServerTypeTest.java rename to server/src/test/java/org/apache/druid/server/coordination/ServerTypeTest.java index 9f1cf1a32edd..fecbf358dc11 100644 --- a/server/src/test/java/io/druid/server/coordination/ServerTypeTest.java +++ b/server/src/test/java/org/apache/druid/server/coordination/ServerTypeTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordination; +package org.apache.druid.server.coordination; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/server/coordination/ZkCoordinatorTest.java b/server/src/test/java/org/apache/druid/server/coordination/ZkCoordinatorTest.java similarity index 87% rename from server/src/test/java/io/druid/server/coordination/ZkCoordinatorTest.java rename to server/src/test/java/org/apache/druid/server/coordination/ZkCoordinatorTest.java index 4efa5d4fffe8..d1ee59fd8ef8 100644 --- a/server/src/test/java/io/druid/server/coordination/ZkCoordinatorTest.java +++ b/server/src/test/java/org/apache/druid/server/coordination/ZkCoordinatorTest.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.server.coordination; +package org.apache.druid.server.coordination; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import io.druid.curator.CuratorTestBase; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.segment.IndexIO; -import io.druid.segment.loading.SegmentLoaderConfig; -import io.druid.server.SegmentManager; -import io.druid.server.ServerTestHelper; -import io.druid.server.initialization.ZkPathsConfig; -import io.druid.server.metrics.NoopServiceEmitter; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.curator.CuratorTestBase; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.loading.SegmentLoaderConfig; +import org.apache.druid.server.SegmentManager; +import org.apache.druid.server.ServerTestHelper; +import org.apache.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.server.metrics.NoopServiceEmitter; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.apache.curator.utils.ZKPaths; import org.apache.zookeeper.CreateMode; import org.easymock.EasyMock; diff --git a/server/src/test/java/io/druid/server/coordination/coordination/BatchDataSegmentAnnouncerTest.java b/server/src/test/java/org/apache/druid/server/coordination/coordination/BatchDataSegmentAnnouncerTest.java similarity index 93% rename from server/src/test/java/io/druid/server/coordination/coordination/BatchDataSegmentAnnouncerTest.java rename to server/src/test/java/org/apache/druid/server/coordination/coordination/BatchDataSegmentAnnouncerTest.java index 622aee9a0177..e79b6c7a84b2 100644 --- a/server/src/test/java/io/druid/server/coordination/coordination/BatchDataSegmentAnnouncerTest.java +++ b/server/src/test/java/org/apache/druid/server/coordination/coordination/BatchDataSegmentAnnouncerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordination.coordination; +package org.apache.druid.server.coordination.coordination; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -28,19 +28,19 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.curator.PotentiallyGzippedCompressionProvider; -import io.druid.curator.announcement.Announcer; -import io.druid.java.util.common.DateTimes; -import io.druid.segment.TestHelper; -import io.druid.server.coordination.BatchDataSegmentAnnouncer; -import io.druid.server.coordination.DataSegmentChangeRequest; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.server.coordination.ChangeRequestHistory; -import io.druid.server.coordination.ChangeRequestsSnapshot; -import io.druid.server.coordination.ServerType; -import io.druid.server.initialization.BatchDataSegmentAnnouncerConfig; -import io.druid.server.initialization.ZkPathsConfig; -import io.druid.timeline.DataSegment; +import org.apache.druid.curator.PotentiallyGzippedCompressionProvider; +import org.apache.druid.curator.announcement.Announcer; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.server.coordination.BatchDataSegmentAnnouncer; +import org.apache.druid.server.coordination.DataSegmentChangeRequest; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.server.coordination.ChangeRequestHistory; +import org.apache.druid.server.coordination.ChangeRequestsSnapshot; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.server.initialization.BatchDataSegmentAnnouncerConfig; +import org.apache.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.timeline.DataSegment; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.retry.ExponentialBackoffRetry; diff --git a/server/src/test/java/io/druid/server/coordinator/CoordinatorStatsTest.java b/server/src/test/java/org/apache/druid/server/coordinator/CoordinatorStatsTest.java similarity index 98% rename from server/src/test/java/io/druid/server/coordinator/CoordinatorStatsTest.java rename to server/src/test/java/org/apache/druid/server/coordinator/CoordinatorStatsTest.java index 54324a84c0ad..3b1ddaccea9b 100644 --- a/server/src/test/java/io/druid/server/coordinator/CoordinatorStatsTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/CoordinatorStatsTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; diff --git a/server/src/test/java/io/druid/server/coordinator/CostBalancerStrategyBenchmark.java b/server/src/test/java/org/apache/druid/server/coordinator/CostBalancerStrategyBenchmark.java similarity index 95% rename from server/src/test/java/io/druid/server/coordinator/CostBalancerStrategyBenchmark.java rename to server/src/test/java/org/apache/druid/server/coordinator/CostBalancerStrategyBenchmark.java index 3ece9e0be875..410ed9fe3464 100644 --- a/server/src/test/java/io/druid/server/coordinator/CostBalancerStrategyBenchmark.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/CostBalancerStrategyBenchmark.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.carrotsearch.junitbenchmarks.AbstractBenchmark; import com.carrotsearch.junitbenchmarks.BenchmarkOptions; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.java.util.common.Intervals; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/server/src/test/java/io/druid/server/coordinator/CostBalancerStrategyTest.java b/server/src/test/java/org/apache/druid/server/coordinator/CostBalancerStrategyTest.java similarity index 95% rename from server/src/test/java/io/druid/server/coordinator/CostBalancerStrategyTest.java rename to server/src/test/java/org/apache/druid/server/coordinator/CostBalancerStrategyTest.java index b9dd2b374ac5..8e26a959a918 100644 --- a/server/src/test/java/io/druid/server/coordinator/CostBalancerStrategyTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/CostBalancerStrategyTest.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.client.ImmutableDruidDataSource; -import io.druid.client.ImmutableDruidServer; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.server.coordination.ServerType; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.ImmutableDruidDataSource; +import org.apache.druid.client.ImmutableDruidServer; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.timeline.DataSegment; import org.easymock.EasyMock; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/server/src/test/java/io/druid/server/coordinator/CuratorDruidCoordinatorTest.java b/server/src/test/java/org/apache/druid/server/coordinator/CuratorDruidCoordinatorTest.java similarity index 92% rename from server/src/test/java/io/druid/server/coordinator/CuratorDruidCoordinatorTest.java rename to server/src/test/java/org/apache/druid/server/coordinator/CuratorDruidCoordinatorTest.java index 8f098a3dfab7..0e52e668e574 100644 --- a/server/src/test/java/io/druid/server/coordinator/CuratorDruidCoordinatorTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/CuratorDruidCoordinatorTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Predicates; @@ -25,30 +25,30 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; -import io.druid.client.BatchServerInventoryView; -import io.druid.client.CoordinatorServerView; -import io.druid.client.DruidServer; -import io.druid.client.ImmutableDruidDataSource; -import io.druid.common.config.JacksonConfigManager; -import io.druid.curator.CuratorTestBase; -import io.druid.curator.discovery.NoopServiceAnnouncer; -import io.druid.discovery.DruidLeaderSelector; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.concurrent.ScheduledExecutorFactory; -import io.druid.metadata.MetadataRuleManager; -import io.druid.metadata.MetadataSegmentManager; -import io.druid.segment.TestHelper; -import io.druid.server.DruidNode; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.server.coordination.ServerType; -import io.druid.server.initialization.ZkPathsConfig; -import io.druid.server.lookup.cache.LookupCoordinatorManager; -import io.druid.server.metrics.NoopServiceEmitter; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.client.BatchServerInventoryView; +import org.apache.druid.client.CoordinatorServerView; +import org.apache.druid.client.DruidServer; +import org.apache.druid.client.ImmutableDruidDataSource; +import org.apache.druid.common.config.JacksonConfigManager; +import org.apache.druid.curator.CuratorTestBase; +import org.apache.druid.curator.discovery.NoopServiceAnnouncer; +import org.apache.druid.discovery.DruidLeaderSelector; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.concurrent.ScheduledExecutorFactory; +import org.apache.druid.metadata.MetadataRuleManager; +import org.apache.druid.metadata.MetadataSegmentManager; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.server.lookup.cache.LookupCoordinatorManager; +import org.apache.druid.server.metrics.NoopServiceEmitter; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.apache.curator.framework.recipes.cache.PathChildrenCache; import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent; import org.apache.curator.utils.ZKPaths; diff --git a/server/src/test/java/io/druid/server/coordinator/DiskNormalizedCostBalancerStrategyTest.java b/server/src/test/java/org/apache/druid/server/coordinator/DiskNormalizedCostBalancerStrategyTest.java similarity index 93% rename from server/src/test/java/io/druid/server/coordinator/DiskNormalizedCostBalancerStrategyTest.java rename to server/src/test/java/org/apache/druid/server/coordinator/DiskNormalizedCostBalancerStrategyTest.java index 4b92c6678cc2..88fe93a88ed6 100644 --- a/server/src/test/java/io/druid/server/coordinator/DiskNormalizedCostBalancerStrategyTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/DiskNormalizedCostBalancerStrategyTest.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.client.ImmutableDruidDataSource; -import io.druid.client.ImmutableDruidServer; -import io.druid.java.util.common.Intervals; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.server.coordination.ServerType; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.ImmutableDruidDataSource; +import org.apache.druid.client.ImmutableDruidServer; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.timeline.DataSegment; import org.easymock.EasyMock; import org.joda.time.Interval; import org.junit.Assert; diff --git a/server/src/test/java/io/druid/server/coordinator/DruidClusterTest.java b/server/src/test/java/org/apache/druid/server/coordinator/DruidClusterTest.java similarity index 93% rename from server/src/test/java/io/druid/server/coordinator/DruidClusterTest.java rename to server/src/test/java/org/apache/druid/server/coordinator/DruidClusterTest.java index 18132fdc3c87..62f35dc1deed 100644 --- a/server/src/test/java/io/druid/server/coordinator/DruidClusterTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/DruidClusterTest.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.druid.client.ImmutableDruidDataSource; -import io.druid.client.ImmutableDruidServer; -import io.druid.java.util.common.Intervals; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.server.coordination.ServerType; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.client.ImmutableDruidDataSource; +import org.apache.druid.client.ImmutableDruidServer; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorBalancerProfiler.java b/server/src/test/java/org/apache/druid/server/coordinator/DruidCoordinatorBalancerProfiler.java similarity index 94% rename from server/src/test/java/io/druid/server/coordinator/DruidCoordinatorBalancerProfiler.java rename to server/src/test/java/org/apache/druid/server/coordinator/DruidCoordinatorBalancerProfiler.java index c72f77bdf5f7..c505657c9afd 100644 --- a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorBalancerProfiler.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/DruidCoordinatorBalancerProfiler.java @@ -17,25 +17,25 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.google.common.base.Stopwatch; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.client.DruidServer; -import io.druid.client.ImmutableDruidServer; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.metadata.MetadataRuleManager; -import io.druid.server.coordinator.helper.DruidCoordinatorBalancer; -import io.druid.server.coordinator.helper.DruidCoordinatorRuleRunner; -import io.druid.server.coordinator.rules.PeriodLoadRule; -import io.druid.server.coordinator.rules.Rule; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.client.DruidServer; +import org.apache.druid.client.ImmutableDruidServer; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.metadata.MetadataRuleManager; +import org.apache.druid.server.coordinator.helper.DruidCoordinatorBalancer; +import org.apache.druid.server.coordinator.helper.DruidCoordinatorRuleRunner; +import org.apache.druid.server.coordinator.rules.PeriodLoadRule; +import org.apache.druid.server.coordinator.rules.Rule; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.easymock.EasyMock; import org.joda.time.Interval; import org.joda.time.Period; diff --git a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorBalancerTest.java b/server/src/test/java/org/apache/druid/server/coordinator/DruidCoordinatorBalancerTest.java similarity index 97% rename from server/src/test/java/io/druid/server/coordinator/DruidCoordinatorBalancerTest.java rename to server/src/test/java/org/apache/druid/server/coordinator/DruidCoordinatorBalancerTest.java index 225bf8ff5f36..053fedb82531 100644 --- a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorBalancerTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/DruidCoordinatorBalancerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -25,11 +25,11 @@ import com.google.common.collect.Maps; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.client.ImmutableDruidServer; -import io.druid.java.util.common.DateTimes; -import io.druid.server.coordinator.helper.DruidCoordinatorBalancer; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.client.ImmutableDruidServer; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.server.coordinator.helper.DruidCoordinatorBalancer; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.easymock.EasyMock; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorBalancerTester.java b/server/src/test/java/org/apache/druid/server/coordinator/DruidCoordinatorBalancerTester.java similarity index 90% rename from server/src/test/java/io/druid/server/coordinator/DruidCoordinatorBalancerTester.java rename to server/src/test/java/org/apache/druid/server/coordinator/DruidCoordinatorBalancerTester.java index 902f8554349f..06dafbd7f9cf 100644 --- a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorBalancerTester.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/DruidCoordinatorBalancerTester.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; -import io.druid.client.ImmutableDruidServer; -import io.druid.java.util.common.StringUtils; -import io.druid.server.coordinator.helper.DruidCoordinatorBalancer; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.ImmutableDruidServer; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.server.coordinator.helper.DruidCoordinatorBalancer; +import org.apache.druid.timeline.DataSegment; public class DruidCoordinatorBalancerTester extends DruidCoordinatorBalancer { diff --git a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorConfigTest.java b/server/src/test/java/org/apache/druid/server/coordinator/DruidCoordinatorConfigTest.java similarity index 97% rename from server/src/test/java/io/druid/server/coordinator/DruidCoordinatorConfigTest.java rename to server/src/test/java/org/apache/druid/server/coordinator/DruidCoordinatorConfigTest.java index 43ce43fce889..61fe943484cb 100644 --- a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorConfigTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/DruidCoordinatorConfigTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; -import io.druid.java.util.common.config.Config; +import org.apache.druid.java.util.common.config.Config; import org.joda.time.Duration; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorRuleRunnerTest.java b/server/src/test/java/org/apache/druid/server/coordinator/DruidCoordinatorRuleRunnerTest.java similarity index 98% rename from server/src/test/java/io/druid/server/coordinator/DruidCoordinatorRuleRunnerTest.java rename to server/src/test/java/org/apache/druid/server/coordinator/DruidCoordinatorRuleRunnerTest.java index f8951f772fb0..c16f4b3f20d7 100644 --- a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorRuleRunnerTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/DruidCoordinatorRuleRunnerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; @@ -25,21 +25,21 @@ import com.google.common.collect.Sets; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.client.DruidServer; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceEventBuilder; -import io.druid.metadata.MetadataRuleManager; -import io.druid.segment.IndexIO; -import io.druid.server.coordination.ServerType; -import io.druid.server.coordinator.helper.DruidCoordinatorRuleRunner; -import io.druid.server.coordinator.rules.ForeverLoadRule; -import io.druid.server.coordinator.rules.IntervalDropRule; -import io.druid.server.coordinator.rules.IntervalLoadRule; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.client.DruidServer; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceEventBuilder; +import org.apache.druid.metadata.MetadataRuleManager; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.server.coordinator.helper.DruidCoordinatorRuleRunner; +import org.apache.druid.server.coordinator.rules.ForeverLoadRule; +import org.apache.druid.server.coordinator.rules.IntervalDropRule; +import org.apache.druid.server.coordinator.rules.IntervalLoadRule; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.easymock.EasyMock; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorSegmentMergerTest.java b/server/src/test/java/org/apache/druid/server/coordinator/DruidCoordinatorSegmentMergerTest.java similarity index 97% rename from server/src/test/java/io/druid/server/coordinator/DruidCoordinatorSegmentMergerTest.java rename to server/src/test/java/org/apache/druid/server/coordinator/DruidCoordinatorSegmentMergerTest.java index f707f3ee4229..976493f1a436 100644 --- a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorSegmentMergerTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/DruidCoordinatorSegmentMergerTest.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; -import io.druid.client.indexing.IndexingServiceClient; -import io.druid.client.indexing.NoopIndexingServiceClient; -import io.druid.common.config.JacksonConfigManager; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.server.coordinator.helper.DruidCoordinatorSegmentMerger; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.LinearShardSpec; +import org.apache.druid.client.indexing.IndexingServiceClient; +import org.apache.druid.client.indexing.NoopIndexingServiceClient; +import org.apache.druid.common.config.JacksonConfigManager; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.server.coordinator.helper.DruidCoordinatorSegmentMerger; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.LinearShardSpec; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorTest.java b/server/src/test/java/org/apache/druid/server/coordinator/DruidCoordinatorTest.java similarity index 93% rename from server/src/test/java/io/druid/server/coordinator/DruidCoordinatorTest.java rename to server/src/test/java/org/apache/druid/server/coordinator/DruidCoordinatorTest.java index 8929f2bb3ec9..bfe308cbd609 100644 --- a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/DruidCoordinatorTest.java @@ -17,39 +17,39 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; -import io.druid.client.DruidDataSource; -import io.druid.client.DruidServer; -import io.druid.client.ImmutableDruidDataSource; -import io.druid.client.ImmutableDruidServer; -import io.druid.client.SingleServerInventoryView; -import io.druid.common.config.JacksonConfigManager; -import io.druid.curator.CuratorTestBase; -import io.druid.curator.discovery.NoopServiceAnnouncer; -import io.druid.discovery.DruidLeaderSelector; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.concurrent.ScheduledExecutorFactory; -import io.druid.java.util.emitter.core.Event; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.metadata.MetadataRuleManager; -import io.druid.metadata.MetadataSegmentManager; -import io.druid.server.DruidNode; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.server.coordination.ServerType; -import io.druid.server.coordinator.rules.ForeverLoadRule; -import io.druid.server.coordinator.rules.IntervalLoadRule; -import io.druid.server.coordinator.rules.Rule; -import io.druid.server.initialization.ZkPathsConfig; -import io.druid.server.lookup.cache.LookupCoordinatorManager; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.DruidDataSource; +import org.apache.druid.client.DruidServer; +import org.apache.druid.client.ImmutableDruidDataSource; +import org.apache.druid.client.ImmutableDruidServer; +import org.apache.druid.client.SingleServerInventoryView; +import org.apache.druid.common.config.JacksonConfigManager; +import org.apache.druid.curator.CuratorTestBase; +import org.apache.druid.curator.discovery.NoopServiceAnnouncer; +import org.apache.druid.discovery.DruidLeaderSelector; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.concurrent.ScheduledExecutorFactory; +import org.apache.druid.java.util.emitter.core.Event; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.metadata.MetadataRuleManager; +import org.apache.druid.metadata.MetadataSegmentManager; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.server.coordinator.rules.ForeverLoadRule; +import org.apache.druid.server.coordinator.rules.IntervalLoadRule; +import org.apache.druid.server.coordinator.rules.Rule; +import org.apache.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.server.lookup.cache.LookupCoordinatorManager; +import org.apache.druid.timeline.DataSegment; import it.unimi.dsi.fastutil.objects.Object2LongMap; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.recipes.cache.PathChildrenCache; diff --git a/server/src/test/java/io/druid/server/coordinator/HttpLoadQueuePeonTest.java b/server/src/test/java/org/apache/druid/server/coordinator/HttpLoadQueuePeonTest.java similarity index 91% rename from server/src/test/java/io/druid/server/coordinator/HttpLoadQueuePeonTest.java rename to server/src/test/java/org/apache/druid/server/coordinator/HttpLoadQueuePeonTest.java index 03894f3482d4..b65c1ee7d374 100644 --- a/server/src/test/java/io/druid/server/coordinator/HttpLoadQueuePeonTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/HttpLoadQueuePeonTest.java @@ -17,25 +17,25 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import io.druid.discovery.DiscoveryDruidNode; -import io.druid.discovery.DruidNodeDiscovery; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.RE; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.Request; -import io.druid.java.util.http.client.response.HttpResponseHandler; -import io.druid.server.ServerTestHelper; -import io.druid.server.coordination.DataSegmentChangeRequest; -import io.druid.server.coordination.SegmentLoadDropHandler; -import io.druid.timeline.DataSegment; +import org.apache.druid.discovery.DiscoveryDruidNode; +import org.apache.druid.discovery.DruidNodeDiscovery; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.Request; +import org.apache.druid.java.util.http.client.response.HttpResponseHandler; +import org.apache.druid.server.ServerTestHelper; +import org.apache.druid.server.coordination.DataSegmentChangeRequest; +import org.apache.druid.server.coordination.SegmentLoadDropHandler; +import org.apache.druid.timeline.DataSegment; import org.jboss.netty.buffer.ChannelBuffers; import org.jboss.netty.handler.codec.http.DefaultHttpResponse; import org.jboss.netty.handler.codec.http.HttpResponse; diff --git a/server/src/test/java/io/druid/server/coordinator/LoadQueuePeonTest.java b/server/src/test/java/org/apache/druid/server/coordinator/LoadQueuePeonTest.java similarity index 94% rename from server/src/test/java/io/druid/server/coordinator/LoadQueuePeonTest.java rename to server/src/test/java/org/apache/druid/server/coordinator/LoadQueuePeonTest.java index 938fa606d456..496cd959a933 100644 --- a/server/src/test/java/io/druid/server/coordinator/LoadQueuePeonTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/LoadQueuePeonTest.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import io.druid.curator.CuratorTestBase; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.segment.TestHelper; -import io.druid.server.coordination.DataSegmentChangeCallback; -import io.druid.server.coordination.DataSegmentChangeHandler; -import io.druid.server.coordination.DataSegmentChangeRequest; -import io.druid.server.coordination.SegmentChangeRequestDrop; -import io.druid.server.coordination.SegmentChangeRequestLoad; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.curator.CuratorTestBase; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.server.coordination.DataSegmentChangeCallback; +import org.apache.druid.server.coordination.DataSegmentChangeHandler; +import org.apache.druid.server.coordination.DataSegmentChangeRequest; +import org.apache.druid.server.coordination.SegmentChangeRequestDrop; +import org.apache.druid.server.coordination.SegmentChangeRequestLoad; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.recipes.cache.PathChildrenCache; import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent; diff --git a/server/src/test/java/io/druid/server/coordinator/LoadQueuePeonTester.java b/server/src/test/java/org/apache/druid/server/coordinator/LoadQueuePeonTester.java similarity index 94% rename from server/src/test/java/io/druid/server/coordinator/LoadQueuePeonTester.java rename to server/src/test/java/org/apache/druid/server/coordinator/LoadQueuePeonTester.java index c958564537d4..e07f363e78a4 100644 --- a/server/src/test/java/io/druid/server/coordinator/LoadQueuePeonTester.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/LoadQueuePeonTester.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; -import io.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegment; import java.util.concurrent.ConcurrentSkipListSet; diff --git a/server/src/test/java/io/druid/server/coordinator/ReservoirSegmentSamplerTest.java b/server/src/test/java/org/apache/druid/server/coordinator/ReservoirSegmentSamplerTest.java similarity index 96% rename from server/src/test/java/io/druid/server/coordinator/ReservoirSegmentSamplerTest.java rename to server/src/test/java/org/apache/druid/server/coordinator/ReservoirSegmentSamplerTest.java index 73909598cd69..1d7a831cbfd0 100644 --- a/server/src/test/java/io/druid/server/coordinator/ReservoirSegmentSamplerTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/ReservoirSegmentSamplerTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.client.ImmutableDruidServer; -import io.druid.java.util.common.DateTimes; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.client.ImmutableDruidServer; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.easymock.EasyMock; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/server/src/test/java/io/druid/server/coordinator/ServerHolderTest.java b/server/src/test/java/org/apache/druid/server/coordinator/ServerHolderTest.java similarity index 93% rename from server/src/test/java/io/druid/server/coordinator/ServerHolderTest.java rename to server/src/test/java/org/apache/druid/server/coordinator/ServerHolderTest.java index 405b5918798c..93996f0dc1e8 100644 --- a/server/src/test/java/io/druid/server/coordinator/ServerHolderTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/ServerHolderTest.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.client.ImmutableDruidDataSource; -import io.druid.client.ImmutableDruidServer; -import io.druid.java.util.common.Intervals; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.server.coordination.ServerType; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.client.ImmutableDruidDataSource; +import org.apache.druid.client.ImmutableDruidServer; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/server/coordinator/TestDruidCoordinatorConfig.java b/server/src/test/java/org/apache/druid/server/coordinator/TestDruidCoordinatorConfig.java similarity index 98% rename from server/src/test/java/io/druid/server/coordinator/TestDruidCoordinatorConfig.java rename to server/src/test/java/org/apache/druid/server/coordinator/TestDruidCoordinatorConfig.java index caa853246eb8..317f2fe67118 100644 --- a/server/src/test/java/io/druid/server/coordinator/TestDruidCoordinatorConfig.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/TestDruidCoordinatorConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordinator; +package org.apache.druid.server.coordinator; import org.joda.time.Duration; diff --git a/server/src/test/java/io/druid/server/coordinator/cost/CachingCostBalancerStrategyTest.java b/server/src/test/java/org/apache/druid/server/coordinator/cost/CachingCostBalancerStrategyTest.java similarity index 90% rename from server/src/test/java/io/druid/server/coordinator/cost/CachingCostBalancerStrategyTest.java rename to server/src/test/java/org/apache/druid/server/coordinator/cost/CachingCostBalancerStrategyTest.java index fca06c06068e..8781cf0dc957 100644 --- a/server/src/test/java/io/druid/server/coordinator/cost/CachingCostBalancerStrategyTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/cost/CachingCostBalancerStrategyTest.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.server.coordinator.cost; +package org.apache.druid.server.coordinator.cost; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.client.DruidServer; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.server.coordination.ServerType; -import io.druid.server.coordinator.CachingCostBalancerStrategy; -import io.druid.server.coordinator.CostBalancerStrategy; -import io.druid.server.coordinator.LoadQueuePeonTester; -import io.druid.server.coordinator.ServerHolder; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.DruidServer; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.server.coordinator.CachingCostBalancerStrategy; +import org.apache.druid.server.coordinator.CostBalancerStrategy; +import org.apache.druid.server.coordinator.LoadQueuePeonTester; +import org.apache.druid.server.coordinator.ServerHolder; +import org.apache.druid.timeline.DataSegment; import org.joda.time.DateTime; import org.joda.time.Interval; import org.junit.After; diff --git a/server/src/test/java/io/druid/server/coordinator/cost/SegmentsCostCacheTest.java b/server/src/test/java/org/apache/druid/server/coordinator/cost/SegmentsCostCacheTest.java similarity index 97% rename from server/src/test/java/io/druid/server/coordinator/cost/SegmentsCostCacheTest.java rename to server/src/test/java/org/apache/druid/server/coordinator/cost/SegmentsCostCacheTest.java index 9a43673551cb..ea8d0339d461 100644 --- a/server/src/test/java/io/druid/server/coordinator/cost/SegmentsCostCacheTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/cost/SegmentsCostCacheTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.server.coordinator.cost; +package org.apache.druid.server.coordinator.cost; import com.google.common.collect.Lists; -import io.druid.java.util.common.DateTimes; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.timeline.DataSegment; import org.joda.time.DateTime; import org.joda.time.Interval; import org.junit.Test; diff --git a/server/src/test/java/io/druid/server/coordinator/helper/DruidCoordinatorCleanupOvershadowedTest.java b/server/src/test/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorCleanupOvershadowedTest.java similarity index 88% rename from server/src/test/java/io/druid/server/coordinator/helper/DruidCoordinatorCleanupOvershadowedTest.java rename to server/src/test/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorCleanupOvershadowedTest.java index 036bac8d3285..996f3f9791bf 100644 --- a/server/src/test/java/io/druid/server/coordinator/helper/DruidCoordinatorCleanupOvershadowedTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorCleanupOvershadowedTest.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.server.coordinator.helper; +package org.apache.druid.server.coordinator.helper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.druid.client.ImmutableDruidDataSource; -import io.druid.client.ImmutableDruidServer; -import io.druid.java.util.common.DateTimes; -import io.druid.server.coordination.ServerType; -import io.druid.server.coordinator.CoordinatorStats; -import io.druid.server.coordinator.DruidCluster; -import io.druid.server.coordinator.DruidCoordinator; -import io.druid.server.coordinator.DruidCoordinatorRuntimeParams; -import io.druid.server.coordinator.LoadQueuePeon; -import io.druid.server.coordinator.ServerHolder; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.ImmutableDruidDataSource; +import org.apache.druid.client.ImmutableDruidServer; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.server.coordinator.CoordinatorStats; +import org.apache.druid.server.coordinator.DruidCluster; +import org.apache.druid.server.coordinator.DruidCoordinator; +import org.apache.druid.server.coordinator.DruidCoordinatorRuntimeParams; +import org.apache.druid.server.coordinator.LoadQueuePeon; +import org.apache.druid.server.coordinator.ServerHolder; +import org.apache.druid.timeline.DataSegment; import org.easymock.EasyMock; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/server/src/test/java/io/druid/server/coordinator/helper/DruidCoordinatorSegmentCompactorTest.java b/server/src/test/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorSegmentCompactorTest.java similarity index 91% rename from server/src/test/java/io/druid/server/coordinator/helper/DruidCoordinatorSegmentCompactorTest.java rename to server/src/test/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorSegmentCompactorTest.java index 62f79b2c8d1f..57038a422268 100644 --- a/server/src/test/java/io/druid/server/coordinator/helper/DruidCoordinatorSegmentCompactorTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorSegmentCompactorTest.java @@ -17,28 +17,28 @@ * under the License. */ -package io.druid.server.coordinator.helper; +package org.apache.druid.server.coordinator.helper; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.druid.client.indexing.ClientCompactQueryTuningConfig; -import io.druid.client.indexing.IndexingServiceClient; -import io.druid.client.indexing.NoopIndexingServiceClient; -import io.druid.indexer.TaskStatusPlus; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.StringUtils; -import io.druid.server.coordinator.CoordinatorCompactionConfig; -import io.druid.server.coordinator.CoordinatorStats; -import io.druid.server.coordinator.DataSourceCompactionConfig; -import io.druid.server.coordinator.DruidCoordinatorRuntimeParams; -import io.druid.timeline.DataSegment; -import io.druid.timeline.TimelineObjectHolder; -import io.druid.timeline.VersionedIntervalTimeline; -import io.druid.timeline.partition.NoneShardSpec; -import io.druid.timeline.partition.NumberedShardSpec; -import io.druid.timeline.partition.PartitionChunk; -import io.druid.timeline.partition.ShardSpec; +import org.apache.druid.client.indexing.ClientCompactQueryTuningConfig; +import org.apache.druid.client.indexing.IndexingServiceClient; +import org.apache.druid.client.indexing.NoopIndexingServiceClient; +import org.apache.druid.indexer.TaskStatusPlus; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.server.coordinator.CoordinatorCompactionConfig; +import org.apache.druid.server.coordinator.CoordinatorStats; +import org.apache.druid.server.coordinator.DataSourceCompactionConfig; +import org.apache.druid.server.coordinator.DruidCoordinatorRuntimeParams; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.TimelineObjectHolder; +import org.apache.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.timeline.partition.NumberedShardSpec; +import org.apache.druid.timeline.partition.PartitionChunk; +import org.apache.druid.timeline.partition.ShardSpec; import org.joda.time.Interval; import org.joda.time.Period; import org.junit.Assert; diff --git a/server/src/test/java/io/druid/server/coordinator/helper/DruidCoordinatorSegmentKillerTest.java b/server/src/test/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorSegmentKillerTest.java similarity index 92% rename from server/src/test/java/io/druid/server/coordinator/helper/DruidCoordinatorSegmentKillerTest.java rename to server/src/test/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorSegmentKillerTest.java index 9653bd0c5c04..8593e301b972 100644 --- a/server/src/test/java/io/druid/server/coordinator/helper/DruidCoordinatorSegmentKillerTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorSegmentKillerTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.server.coordinator.helper; +package org.apache.druid.server.coordinator.helper; import com.google.common.collect.ImmutableList; -import io.druid.client.indexing.IndexingServiceClient; -import io.druid.java.util.common.Intervals; -import io.druid.metadata.MetadataSegmentManager; -import io.druid.server.coordinator.TestDruidCoordinatorConfig; +import org.apache.druid.client.indexing.IndexingServiceClient; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.metadata.MetadataSegmentManager; +import org.apache.druid.server.coordinator.TestDruidCoordinatorConfig; import org.easymock.EasyMock; import org.joda.time.Duration; import org.joda.time.Interval; diff --git a/server/src/test/java/io/druid/server/coordinator/helper/NewestSegmentFirstPolicyTest.java b/server/src/test/java/org/apache/druid/server/coordinator/helper/NewestSegmentFirstPolicyTest.java similarity index 97% rename from server/src/test/java/io/druid/server/coordinator/helper/NewestSegmentFirstPolicyTest.java rename to server/src/test/java/org/apache/druid/server/coordinator/helper/NewestSegmentFirstPolicyTest.java index 876043207478..6530dce778b1 100644 --- a/server/src/test/java/io/druid/server/coordinator/helper/NewestSegmentFirstPolicyTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/helper/NewestSegmentFirstPolicyTest.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.server.coordinator.helper; +package org.apache.druid.server.coordinator.helper; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.guava.Comparators; -import io.druid.server.coordinator.DataSourceCompactionConfig; -import io.druid.timeline.DataSegment; -import io.druid.timeline.VersionedIntervalTimeline; -import io.druid.timeline.partition.NumberedShardSpec; -import io.druid.timeline.partition.ShardSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.guava.Comparators; +import org.apache.druid.server.coordinator.DataSourceCompactionConfig; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.timeline.partition.NumberedShardSpec; +import org.apache.druid.timeline.partition.ShardSpec; import org.joda.time.Interval; import org.joda.time.Period; import org.junit.Assert; diff --git a/server/src/test/java/io/druid/server/coordinator/rules/BroadcastDistributionRuleSerdeTest.java b/server/src/test/java/org/apache/druid/server/coordinator/rules/BroadcastDistributionRuleSerdeTest.java similarity index 94% rename from server/src/test/java/io/druid/server/coordinator/rules/BroadcastDistributionRuleSerdeTest.java rename to server/src/test/java/org/apache/druid/server/coordinator/rules/BroadcastDistributionRuleSerdeTest.java index d0367a1fcc55..012b189d3e96 100644 --- a/server/src/test/java/io/druid/server/coordinator/rules/BroadcastDistributionRuleSerdeTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/rules/BroadcastDistributionRuleSerdeTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.server.coordinator.rules; +package org.apache.druid.server.coordinator.rules; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; import org.joda.time.Period; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/server/src/test/java/io/druid/server/coordinator/rules/BroadcastDistributionRuleTest.java b/server/src/test/java/org/apache/druid/server/coordinator/rules/BroadcastDistributionRuleTest.java similarity index 93% rename from server/src/test/java/io/druid/server/coordinator/rules/BroadcastDistributionRuleTest.java rename to server/src/test/java/org/apache/druid/server/coordinator/rules/BroadcastDistributionRuleTest.java index a9002fd65940..77eaf1318e67 100644 --- a/server/src/test/java/io/druid/server/coordinator/rules/BroadcastDistributionRuleTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/rules/BroadcastDistributionRuleTest.java @@ -17,24 +17,24 @@ * under the License. */ -package io.druid.server.coordinator.rules; +package org.apache.druid.server.coordinator.rules; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.client.DruidServer; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.server.coordination.ServerType; -import io.druid.server.coordinator.CoordinatorStats; -import io.druid.server.coordinator.DruidCluster; -import io.druid.server.coordinator.DruidCoordinatorRuntimeParams; -import io.druid.server.coordinator.LoadQueuePeonTester; -import io.druid.server.coordinator.SegmentReplicantLookup; -import io.druid.server.coordinator.ServerHolder; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.client.DruidServer; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.server.coordinator.CoordinatorStats; +import org.apache.druid.server.coordinator.DruidCluster; +import org.apache.druid.server.coordinator.DruidCoordinatorRuntimeParams; +import org.apache.druid.server.coordinator.LoadQueuePeonTester; +import org.apache.druid.server.coordinator.SegmentReplicantLookup; +import org.apache.druid.server.coordinator.ServerHolder; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.junit.Before; import org.junit.Test; diff --git a/server/src/test/java/io/druid/server/coordinator/rules/ForeverLoadRuleTest.java b/server/src/test/java/org/apache/druid/server/coordinator/rules/ForeverLoadRuleTest.java similarity index 94% rename from server/src/test/java/io/druid/server/coordinator/rules/ForeverLoadRuleTest.java rename to server/src/test/java/org/apache/druid/server/coordinator/rules/ForeverLoadRuleTest.java index fd3c160c61a1..8453fe7e1507 100644 --- a/server/src/test/java/io/druid/server/coordinator/rules/ForeverLoadRuleTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/rules/ForeverLoadRuleTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.server.coordinator.rules; +package org.apache.druid.server.coordinator.rules; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import io.druid.client.DruidServer; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.IAE; +import org.apache.druid.client.DruidServer; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.IAE; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/server/coordinator/rules/IntervalLoadRuleTest.java b/server/src/test/java/org/apache/druid/server/coordinator/rules/IntervalLoadRuleTest.java similarity index 93% rename from server/src/test/java/io/druid/server/coordinator/rules/IntervalLoadRuleTest.java rename to server/src/test/java/org/apache/druid/server/coordinator/rules/IntervalLoadRuleTest.java index 4c2d0e4bce62..52e892dd8cff 100644 --- a/server/src/test/java/io/druid/server/coordinator/rules/IntervalLoadRuleTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/rules/IntervalLoadRuleTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.server.coordinator.rules; +package org.apache.druid.server.coordinator.rules; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import io.druid.client.DruidServer; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; +import org.apache.druid.client.DruidServer; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/server/coordinator/rules/LoadRuleTest.java b/server/src/test/java/org/apache/druid/server/coordinator/rules/LoadRuleTest.java similarity index 94% rename from server/src/test/java/io/druid/server/coordinator/rules/LoadRuleTest.java rename to server/src/test/java/org/apache/druid/server/coordinator/rules/LoadRuleTest.java index 8d744e6814fe..86c1b73d5a2c 100644 --- a/server/src/test/java/io/druid/server/coordinator/rules/LoadRuleTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/rules/LoadRuleTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.coordinator.rules; +package org.apache.druid.server.coordinator.rules; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; @@ -28,28 +28,28 @@ import com.google.common.collect.Sets; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.client.DruidServer; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.core.LoggingEmitter; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.server.coordination.ServerType; -import io.druid.server.coordinator.BalancerStrategy; -import io.druid.server.coordinator.CoordinatorDynamicConfig; -import io.druid.server.coordinator.CoordinatorStats; -import io.druid.server.coordinator.CostBalancerStrategyFactory; -import io.druid.server.coordinator.DruidCluster; -import io.druid.server.coordinator.DruidCoordinatorRuntimeParams; -import io.druid.server.coordinator.LoadQueuePeon; -import io.druid.server.coordinator.LoadQueuePeonTester; -import io.druid.server.coordinator.ReplicationThrottler; -import io.druid.server.coordinator.SegmentReplicantLookup; -import io.druid.server.coordinator.ServerHolder; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.client.DruidServer; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.core.LoggingEmitter; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.server.coordinator.BalancerStrategy; +import org.apache.druid.server.coordinator.CoordinatorDynamicConfig; +import org.apache.druid.server.coordinator.CoordinatorStats; +import org.apache.druid.server.coordinator.CostBalancerStrategyFactory; +import org.apache.druid.server.coordinator.DruidCluster; +import org.apache.druid.server.coordinator.DruidCoordinatorRuntimeParams; +import org.apache.druid.server.coordinator.LoadQueuePeon; +import org.apache.druid.server.coordinator.LoadQueuePeonTester; +import org.apache.druid.server.coordinator.ReplicationThrottler; +import org.apache.druid.server.coordinator.SegmentReplicantLookup; +import org.apache.druid.server.coordinator.ServerHolder; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.easymock.EasyMock; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/server/src/test/java/io/druid/server/coordinator/rules/PeriodDropRuleTest.java b/server/src/test/java/org/apache/druid/server/coordinator/rules/PeriodDropRuleTest.java similarity index 93% rename from server/src/test/java/io/druid/server/coordinator/rules/PeriodDropRuleTest.java rename to server/src/test/java/org/apache/druid/server/coordinator/rules/PeriodDropRuleTest.java index a640499018af..16df35dfe43d 100644 --- a/server/src/test/java/io/druid/server/coordinator/rules/PeriodDropRuleTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/rules/PeriodDropRuleTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.server.coordinator.rules; +package org.apache.druid.server.coordinator.rules; -import io.druid.java.util.common.DateTimes; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.joda.time.DateTime; import org.joda.time.Interval; import org.joda.time.Period; diff --git a/server/src/test/java/io/druid/server/coordinator/rules/PeriodLoadRuleTest.java b/server/src/test/java/org/apache/druid/server/coordinator/rules/PeriodLoadRuleTest.java similarity index 93% rename from server/src/test/java/io/druid/server/coordinator/rules/PeriodLoadRuleTest.java rename to server/src/test/java/org/apache/druid/server/coordinator/rules/PeriodLoadRuleTest.java index 43ac4337187b..63f4ca04ca85 100644 --- a/server/src/test/java/io/druid/server/coordinator/rules/PeriodLoadRuleTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/rules/PeriodLoadRuleTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.server.coordinator.rules; +package org.apache.druid.server.coordinator.rules; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import io.druid.client.DruidServer; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.client.DruidServer; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.joda.time.DateTime; import org.joda.time.Interval; import org.joda.time.Period; diff --git a/server/src/test/java/io/druid/server/emitter/EmitterModuleTest.java b/server/src/test/java/org/apache/druid/server/emitter/EmitterModuleTest.java similarity index 86% rename from server/src/test/java/io/druid/server/emitter/EmitterModuleTest.java rename to server/src/test/java/org/apache/druid/server/emitter/EmitterModuleTest.java index cae6bba4d800..87c4e506a11c 100644 --- a/server/src/test/java/io/druid/server/emitter/EmitterModuleTest.java +++ b/server/src/test/java/org/apache/druid/server/emitter/EmitterModuleTest.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.server.emitter; +package org.apache.druid.server.emitter; import com.google.common.collect.ImmutableList; import com.google.inject.Binder; import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Module; -import io.druid.java.util.emitter.core.Emitter; -import io.druid.java.util.emitter.core.ParametrizedUriEmitter; -import io.druid.guice.DruidGuiceExtensions; -import io.druid.guice.JsonConfigurator; -import io.druid.guice.LazySingleton; -import io.druid.guice.LifecycleModule; -import io.druid.guice.ServerModule; -import io.druid.jackson.JacksonModule; +import org.apache.druid.java.util.emitter.core.Emitter; +import org.apache.druid.java.util.emitter.core.ParametrizedUriEmitter; +import org.apache.druid.guice.DruidGuiceExtensions; +import org.apache.druid.guice.JsonConfigurator; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.LifecycleModule; +import org.apache.druid.guice.ServerModule; +import org.apache.druid.jackson.JacksonModule; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/server/http/CoordinatorDynamicConfigTest.java b/server/src/test/java/org/apache/druid/server/http/CoordinatorDynamicConfigTest.java similarity index 97% rename from server/src/test/java/io/druid/server/http/CoordinatorDynamicConfigTest.java rename to server/src/test/java/org/apache/druid/server/http/CoordinatorDynamicConfigTest.java index 71bb57f9edb0..002e1977c159 100644 --- a/server/src/test/java/io/druid/server/http/CoordinatorDynamicConfigTest.java +++ b/server/src/test/java/org/apache/druid/server/http/CoordinatorDynamicConfigTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableSet; -import io.druid.java.util.common.IAE; -import io.druid.segment.TestHelper; -import io.druid.server.coordinator.CoordinatorDynamicConfig; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.server.coordinator.CoordinatorDynamicConfig; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/server/http/CoordinatorRedirectInfoTest.java b/server/src/test/java/org/apache/druid/server/http/CoordinatorRedirectInfoTest.java similarity index 96% rename from server/src/test/java/io/druid/server/http/CoordinatorRedirectInfoTest.java rename to server/src/test/java/org/apache/druid/server/http/CoordinatorRedirectInfoTest.java index 95b0b09d513f..ecf092f4ec64 100644 --- a/server/src/test/java/io/druid/server/http/CoordinatorRedirectInfoTest.java +++ b/server/src/test/java/org/apache/druid/server/http/CoordinatorRedirectInfoTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; -import io.druid.server.coordinator.DruidCoordinator; +import org.apache.druid.server.coordinator.DruidCoordinator; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; diff --git a/server/src/test/java/io/druid/server/http/CoordinatorResourceTest.java b/server/src/test/java/org/apache/druid/server/http/CoordinatorResourceTest.java similarity index 95% rename from server/src/test/java/io/druid/server/http/CoordinatorResourceTest.java rename to server/src/test/java/org/apache/druid/server/http/CoordinatorResourceTest.java index 89cea232c042..c25417a8d13a 100644 --- a/server/src/test/java/io/druid/server/http/CoordinatorResourceTest.java +++ b/server/src/test/java/org/apache/druid/server/http/CoordinatorResourceTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; import com.google.common.collect.ImmutableMap; -import io.druid.server.coordinator.DruidCoordinator; +import org.apache.druid.server.coordinator.DruidCoordinator; import org.easymock.EasyMock; import org.junit.After; import org.junit.Assert; diff --git a/server/src/test/java/io/druid/server/http/DatasourcesResourceTest.java b/server/src/test/java/org/apache/druid/server/http/DatasourcesResourceTest.java similarity index 96% rename from server/src/test/java/io/druid/server/http/DatasourcesResourceTest.java rename to server/src/test/java/org/apache/druid/server/http/DatasourcesResourceTest.java index add7f258e8b9..da95b0baa58c 100644 --- a/server/src/test/java/io/druid/server/http/DatasourcesResourceTest.java +++ b/server/src/test/java/org/apache/druid/server/http/DatasourcesResourceTest.java @@ -17,26 +17,26 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import io.druid.client.CoordinatorServerView; -import io.druid.client.DruidDataSource; -import io.druid.client.DruidServer; -import io.druid.client.ImmutableDruidDataSource; -import io.druid.client.indexing.IndexingServiceClient; -import io.druid.java.util.common.Intervals; -import io.druid.server.coordination.ServerType; -import io.druid.server.security.Access; -import io.druid.server.security.Action; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthTestUtils; -import io.druid.server.security.AuthenticationResult; -import io.druid.server.security.Authorizer; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.Resource; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.CoordinatorServerView; +import org.apache.druid.client.DruidDataSource; +import org.apache.druid.client.DruidServer; +import org.apache.druid.client.ImmutableDruidDataSource; +import org.apache.druid.client.indexing.IndexingServiceClient; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.server.security.Access; +import org.apache.druid.server.security.Action; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthTestUtils; +import org.apache.druid.server.security.AuthenticationResult; +import org.apache.druid.server.security.Authorizer; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.Resource; +import org.apache.druid.timeline.DataSegment; import org.easymock.EasyMock; import org.joda.time.Interval; import org.junit.Assert; diff --git a/server/src/test/java/io/druid/server/http/IntervalsResourceTest.java b/server/src/test/java/org/apache/druid/server/http/IntervalsResourceTest.java similarity index 95% rename from server/src/test/java/io/druid/server/http/IntervalsResourceTest.java rename to server/src/test/java/org/apache/druid/server/http/IntervalsResourceTest.java index 5318959f8693..790cde544c87 100644 --- a/server/src/test/java/io/druid/server/http/IntervalsResourceTest.java +++ b/server/src/test/java/org/apache/druid/server/http/IntervalsResourceTest.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; import com.google.common.collect.ImmutableList; -import io.druid.client.DruidServer; -import io.druid.client.InventoryView; -import io.druid.java.util.common.Intervals; -import io.druid.server.coordination.ServerType; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthTestUtils; -import io.druid.server.security.AuthenticationResult; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.DruidServer; +import org.apache.druid.client.InventoryView; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthTestUtils; +import org.apache.druid.server.security.AuthenticationResult; +import org.apache.druid.timeline.DataSegment; import org.easymock.EasyMock; import org.joda.time.Interval; import org.junit.After; diff --git a/server/src/test/java/io/druid/server/http/LookupCoordinatorResourceTest.java b/server/src/test/java/org/apache/druid/server/http/LookupCoordinatorResourceTest.java similarity index 99% rename from server/src/test/java/io/druid/server/http/LookupCoordinatorResourceTest.java rename to server/src/test/java/org/apache/druid/server/http/LookupCoordinatorResourceTest.java index 19ed05e4b2e7..2e0819c04804 100644 --- a/server/src/test/java/io/druid/server/http/LookupCoordinatorResourceTest.java +++ b/server/src/test/java/org/apache/druid/server/http/LookupCoordinatorResourceTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; @@ -25,12 +25,12 @@ import com.google.common.collect.ImmutableSet; import com.google.common.io.ByteSource; import com.google.common.net.HostAndPort; -import io.druid.audit.AuditInfo; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.StringUtils; -import io.druid.query.lookup.LookupsState; -import io.druid.server.lookup.cache.LookupCoordinatorManager; -import io.druid.server.lookup.cache.LookupExtractorFactoryMapContainer; +import org.apache.druid.audit.AuditInfo; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.lookup.LookupsState; +import org.apache.druid.server.lookup.cache.LookupCoordinatorManager; +import org.apache.druid.server.lookup.cache.LookupExtractorFactoryMapContainer; import org.easymock.Capture; import org.easymock.EasyMock; import org.junit.Assert; diff --git a/server/src/test/java/io/druid/server/http/OverlordProxyServletTest.java b/server/src/test/java/org/apache/druid/server/http/OverlordProxyServletTest.java similarity index 95% rename from server/src/test/java/io/druid/server/http/OverlordProxyServletTest.java rename to server/src/test/java/org/apache/druid/server/http/OverlordProxyServletTest.java index 83f7268f05e8..0a3dd93e2604 100644 --- a/server/src/test/java/io/druid/server/http/OverlordProxyServletTest.java +++ b/server/src/test/java/org/apache/druid/server/http/OverlordProxyServletTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; -import io.druid.discovery.DruidLeaderClient; +import org.apache.druid.discovery.DruidLeaderClient; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/server/http/RulesResourceTest.java b/server/src/test/java/org/apache/druid/server/http/RulesResourceTest.java similarity index 96% rename from server/src/test/java/io/druid/server/http/RulesResourceTest.java rename to server/src/test/java/org/apache/druid/server/http/RulesResourceTest.java index 22ad423cb0f3..5b52e3d30ee9 100644 --- a/server/src/test/java/io/druid/server/http/RulesResourceTest.java +++ b/server/src/test/java/org/apache/druid/server/http/RulesResourceTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; import com.google.common.collect.ImmutableList; -import io.druid.audit.AuditEntry; -import io.druid.audit.AuditInfo; -import io.druid.audit.AuditManager; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.metadata.MetadataRuleManager; +import org.apache.druid.audit.AuditEntry; +import org.apache.druid.audit.AuditInfo; +import org.apache.druid.audit.AuditManager; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.metadata.MetadataRuleManager; import org.easymock.EasyMock; import org.joda.time.Interval; import org.junit.Assert; diff --git a/server/src/test/java/io/druid/server/http/ServersResourceTest.java b/server/src/test/java/org/apache/druid/server/http/ServersResourceTest.java similarity index 94% rename from server/src/test/java/io/druid/server/http/ServersResourceTest.java rename to server/src/test/java/org/apache/druid/server/http/ServersResourceTest.java index f84901f97703..da87e3b5b1d2 100644 --- a/server/src/test/java/io/druid/server/http/ServersResourceTest.java +++ b/server/src/test/java/org/apache/druid/server/http/ServersResourceTest.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.server.http; +package org.apache.druid.server.http; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; -import io.druid.client.CoordinatorServerView; -import io.druid.client.DruidServer; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.Intervals; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.server.coordination.ServerType; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.CoordinatorServerView; +import org.apache.druid.client.DruidServer; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.timeline.DataSegment; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; diff --git a/server/src/test/java/io/druid/server/http/security/PreResponseAuthorizationCheckFilterTest.java b/server/src/test/java/org/apache/druid/server/http/security/PreResponseAuthorizationCheckFilterTest.java similarity index 92% rename from server/src/test/java/io/druid/server/http/security/PreResponseAuthorizationCheckFilterTest.java rename to server/src/test/java/org/apache/druid/server/http/security/PreResponseAuthorizationCheckFilterTest.java index 0fcb14b1dc2e..a821b7bafbc0 100644 --- a/server/src/test/java/io/druid/server/http/security/PreResponseAuthorizationCheckFilterTest.java +++ b/server/src/test/java/org/apache/druid/server/http/security/PreResponseAuthorizationCheckFilterTest.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.server.http.security; - -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.ISE; -import io.druid.server.security.AllowAllAuthenticator; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthenticationResult; -import io.druid.server.security.Authenticator; -import io.druid.server.security.PreResponseAuthorizationCheckFilter; +package org.apache.druid.server.http.security; + +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.server.security.AllowAllAuthenticator; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthenticationResult; +import org.apache.druid.server.security.Authenticator; +import org.apache.druid.server.security.PreResponseAuthorizationCheckFilter; import org.easymock.EasyMock; import org.junit.Rule; import org.junit.Test; diff --git a/server/src/test/java/io/druid/server/http/security/ResourceFilterTestHelper.java b/server/src/test/java/org/apache/druid/server/http/security/ResourceFilterTestHelper.java similarity index 95% rename from server/src/test/java/io/druid/server/http/security/ResourceFilterTestHelper.java rename to server/src/test/java/org/apache/druid/server/http/security/ResourceFilterTestHelper.java index 7b66f2d99cb9..84810cf8c415 100644 --- a/server/src/test/java/io/druid/server/http/security/ResourceFilterTestHelper.java +++ b/server/src/test/java/org/apache/druid/server/http/security/ResourceFilterTestHelper.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.http.security; +package org.apache.druid.server.http.security; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -32,14 +32,14 @@ import com.sun.jersey.spi.container.ContainerRequest; import com.sun.jersey.spi.container.ResourceFilter; import com.sun.jersey.spi.container.ResourceFilters; -import io.druid.java.util.common.StringUtils; -import io.druid.server.security.Access; -import io.druid.server.security.Action; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthenticationResult; -import io.druid.server.security.Authorizer; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.Resource; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.server.security.Access; +import org.apache.druid.server.security.Action; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthenticationResult; +import org.apache.druid.server.security.Authorizer; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.Resource; import org.easymock.EasyMock; import javax.servlet.http.HttpServletRequest; diff --git a/server/src/test/java/io/druid/server/http/security/SecurityResourceFilterTest.java b/server/src/test/java/org/apache/druid/server/http/security/SecurityResourceFilterTest.java similarity index 83% rename from server/src/test/java/io/druid/server/http/security/SecurityResourceFilterTest.java rename to server/src/test/java/org/apache/druid/server/http/security/SecurityResourceFilterTest.java index bc44f518a468..be85f255cd72 100644 --- a/server/src/test/java/io/druid/server/http/security/SecurityResourceFilterTest.java +++ b/server/src/test/java/org/apache/druid/server/http/security/SecurityResourceFilterTest.java @@ -17,27 +17,27 @@ * under the License. */ -package io.druid.server.http.security; +package org.apache.druid.server.http.security; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.inject.Injector; import com.sun.jersey.spi.container.ResourceFilter; -import io.druid.server.BrokerQueryResource; -import io.druid.server.ClientInfoResource; -import io.druid.server.QueryResource; -import io.druid.server.StatusResource; -import io.druid.server.http.BrokerResource; -import io.druid.server.http.CoordinatorDynamicConfigsResource; -import io.druid.server.http.CoordinatorResource; -import io.druid.server.http.DatasourcesResource; -import io.druid.server.http.HistoricalResource; -import io.druid.server.http.IntervalsResource; -import io.druid.server.http.MetadataResource; -import io.druid.server.http.RulesResource; -import io.druid.server.http.ServersResource; -import io.druid.server.http.TiersResource; -import io.druid.server.security.ForbiddenException; +import org.apache.druid.server.BrokerQueryResource; +import org.apache.druid.server.ClientInfoResource; +import org.apache.druid.server.QueryResource; +import org.apache.druid.server.StatusResource; +import org.apache.druid.server.http.BrokerResource; +import org.apache.druid.server.http.CoordinatorDynamicConfigsResource; +import org.apache.druid.server.http.CoordinatorResource; +import org.apache.druid.server.http.DatasourcesResource; +import org.apache.druid.server.http.HistoricalResource; +import org.apache.druid.server.http.IntervalsResource; +import org.apache.druid.server.http.MetadataResource; +import org.apache.druid.server.http.RulesResource; +import org.apache.druid.server.http.ServersResource; +import org.apache.druid.server.http.TiersResource; +import org.apache.druid.server.security.ForbiddenException; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; diff --git a/server/src/test/java/io/druid/server/http/security/SecuritySanityCheckFilterTest.java b/server/src/test/java/org/apache/druid/server/http/security/SecuritySanityCheckFilterTest.java similarity index 92% rename from server/src/test/java/io/druid/server/http/security/SecuritySanityCheckFilterTest.java rename to server/src/test/java/org/apache/druid/server/http/security/SecuritySanityCheckFilterTest.java index ca8d94c34dbb..568153a13cf9 100644 --- a/server/src/test/java/io/druid/server/http/security/SecuritySanityCheckFilterTest.java +++ b/server/src/test/java/org/apache/druid/server/http/security/SecuritySanityCheckFilterTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.server.http.security; +package org.apache.druid.server.http.security; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthenticationResult; -import io.druid.server.security.SecuritySanityCheckFilter; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthenticationResult; +import org.apache.druid.server.security.SecuritySanityCheckFilter; import org.easymock.EasyMock; import org.junit.Test; diff --git a/server/src/test/java/io/druid/server/initialization/BaseJettyTest.java b/server/src/test/java/org/apache/druid/server/initialization/BaseJettyTest.java similarity index 92% rename from server/src/test/java/io/druid/server/initialization/BaseJettyTest.java rename to server/src/test/java/org/apache/druid/server/initialization/BaseJettyTest.java index 0f72ec4a38bb..571e449f0058 100644 --- a/server/src/test/java/io/druid/server/initialization/BaseJettyTest.java +++ b/server/src/test/java/org/apache/druid/server/initialization/BaseJettyTest.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.server.initialization; +package org.apache.druid.server.initialization; import com.google.common.base.Throwables; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.servlet.GuiceFilter; -import io.druid.guice.annotations.Self; -import io.druid.guice.http.LifecycleUtils; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.HttpClientConfig; -import io.druid.java.util.http.client.HttpClientInit; -import io.druid.server.DruidNode; -import io.druid.server.initialization.jetty.JettyServerInitUtils; -import io.druid.server.initialization.jetty.JettyServerInitializer; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.guice.http.LifecycleUtils; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.HttpClientConfig; +import org.apache.druid.java.util.http.client.HttpClientInit; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.initialization.jetty.JettyServerInitUtils; +import org.apache.druid.server.initialization.jetty.JettyServerInitializer; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.HandlerList; diff --git a/server/src/test/java/io/druid/server/initialization/JettyQosTest.java b/server/src/test/java/org/apache/druid/server/initialization/JettyQosTest.java similarity index 86% rename from server/src/test/java/io/druid/server/initialization/JettyQosTest.java rename to server/src/test/java/org/apache/druid/server/initialization/JettyQosTest.java index c297d456c320..158b4cb46836 100644 --- a/server/src/test/java/io/druid/server/initialization/JettyQosTest.java +++ b/server/src/test/java/org/apache/druid/server/initialization/JettyQosTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.initialization; +package org.apache.druid.server.initialization; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Throwables; @@ -28,23 +28,23 @@ import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Module; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.Request; -import io.druid.java.util.http.client.response.StatusResponseHandler; -import io.druid.java.util.http.client.response.StatusResponseHolder; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.guice.GuiceInjectors; -import io.druid.guice.Jerseys; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.LazySingleton; -import io.druid.guice.LifecycleModule; -import io.druid.guice.annotations.Self; -import io.druid.initialization.Initialization; -import io.druid.server.DruidNode; -import io.druid.server.initialization.jetty.JettyBindings; -import io.druid.server.initialization.jetty.JettyServerInitializer; -import io.druid.server.security.AuthTestUtils; -import io.druid.server.security.AuthorizerMapper; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.Request; +import org.apache.druid.java.util.http.client.response.StatusResponseHandler; +import org.apache.druid.java.util.http.client.response.StatusResponseHolder; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.guice.Jerseys; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.LifecycleModule; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.initialization.jetty.JettyBindings; +import org.apache.druid.server.initialization.jetty.JettyServerInitializer; +import org.apache.druid.server.security.AuthTestUtils; +import org.apache.druid.server.security.AuthorizerMapper; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.jboss.netty.handler.codec.http.HttpMethod; diff --git a/server/src/test/java/io/druid/server/initialization/JettyTest.java b/server/src/test/java/org/apache/druid/server/initialization/JettyTest.java similarity index 91% rename from server/src/test/java/io/druid/server/initialization/JettyTest.java rename to server/src/test/java/org/apache/druid/server/initialization/JettyTest.java index a70e2d658d82..1889870ab1a3 100644 --- a/server/src/test/java/io/druid/server/initialization/JettyTest.java +++ b/server/src/test/java/org/apache/druid/server/initialization/JettyTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.initialization; +package org.apache.druid.server.initialization; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; @@ -27,22 +27,22 @@ import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.multibindings.Multibinder; -import io.druid.guice.GuiceInjectors; -import io.druid.guice.Jerseys; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.LazySingleton; -import io.druid.guice.LifecycleModule; -import io.druid.guice.annotations.Self; -import io.druid.initialization.Initialization; -import io.druid.java.util.http.client.Request; -import io.druid.java.util.http.client.response.InputStreamResponseHandler; -import io.druid.java.util.http.client.response.StatusResponseHandler; -import io.druid.java.util.http.client.response.StatusResponseHolder; -import io.druid.server.DruidNode; -import io.druid.server.initialization.jetty.JettyServerInitializer; -import io.druid.server.initialization.jetty.ServletFilterHolder; -import io.druid.server.security.AuthTestUtils; -import io.druid.server.security.AuthorizerMapper; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.guice.Jerseys; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.LifecycleModule; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.java.util.http.client.Request; +import org.apache.druid.java.util.http.client.response.InputStreamResponseHandler; +import org.apache.druid.java.util.http.client.response.StatusResponseHandler; +import org.apache.druid.java.util.http.client.response.StatusResponseHolder; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.initialization.jetty.JettyServerInitializer; +import org.apache.druid.server.initialization.jetty.ServletFilterHolder; +import org.apache.druid.server.security.AuthTestUtils; +import org.apache.druid.server.security.AuthorizerMapper; import org.apache.commons.io.IOUtils; import org.eclipse.jetty.server.Server; import org.jboss.netty.handler.codec.http.HttpMethod; diff --git a/server/src/test/java/io/druid/server/initialization/jetty/LimitRequestsFilterTest.java b/server/src/test/java/org/apache/druid/server/initialization/jetty/LimitRequestsFilterTest.java similarity index 97% rename from server/src/test/java/io/druid/server/initialization/jetty/LimitRequestsFilterTest.java rename to server/src/test/java/org/apache/druid/server/initialization/jetty/LimitRequestsFilterTest.java index bb8d15d40fc1..73fbf485e0cd 100644 --- a/server/src/test/java/io/druid/server/initialization/jetty/LimitRequestsFilterTest.java +++ b/server/src/test/java/org/apache/druid/server/initialization/jetty/LimitRequestsFilterTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.server.initialization.jetty; +package org.apache.druid.server.initialization.jetty; -import io.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.ISE; import org.easymock.EasyMock; import org.junit.Test; diff --git a/server/src/test/java/io/druid/server/listener/announcer/ListenerResourceAnnouncerTest.java b/server/src/test/java/org/apache/druid/server/listener/announcer/ListenerResourceAnnouncerTest.java similarity index 90% rename from server/src/test/java/io/druid/server/listener/announcer/ListenerResourceAnnouncerTest.java rename to server/src/test/java/org/apache/druid/server/listener/announcer/ListenerResourceAnnouncerTest.java index a789b5ecd205..9317dfe9b822 100644 --- a/server/src/test/java/io/druid/server/listener/announcer/ListenerResourceAnnouncerTest.java +++ b/server/src/test/java/org/apache/druid/server/listener/announcer/ListenerResourceAnnouncerTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.server.listener.announcer; +package org.apache.druid.server.listener.announcer; -import io.druid.curator.CuratorTestBase; -import io.druid.curator.announcement.Announcer; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.segment.CloserRule; -import io.druid.server.http.HostAndPortWithScheme; -import io.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.curator.CuratorTestBase; +import org.apache.druid.curator.announcement.Announcer; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.segment.CloserRule; +import org.apache.druid.server.http.HostAndPortWithScheme; +import org.apache.druid.server.initialization.ZkPathsConfig; import org.apache.curator.utils.ZKPaths; import org.easymock.EasyMock; import org.junit.After; diff --git a/server/src/test/java/io/druid/server/listener/resource/AbstractListenerHandlerTest.java b/server/src/test/java/org/apache/druid/server/listener/resource/AbstractListenerHandlerTest.java similarity index 98% rename from server/src/test/java/io/druid/server/listener/resource/AbstractListenerHandlerTest.java rename to server/src/test/java/org/apache/druid/server/listener/resource/AbstractListenerHandlerTest.java index b9e59d40f893..b4e38958ccf5 100644 --- a/server/src/test/java/io/druid/server/listener/resource/AbstractListenerHandlerTest.java +++ b/server/src/test/java/org/apache/druid/server/listener/resource/AbstractListenerHandlerTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.server.listener.resource; +package org.apache.druid.server.listener.resource; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.StringUtils; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; diff --git a/server/src/test/java/io/druid/server/listener/resource/ListenerResourceTest.java b/server/src/test/java/org/apache/druid/server/listener/resource/ListenerResourceTest.java similarity index 98% rename from server/src/test/java/io/druid/server/listener/resource/ListenerResourceTest.java rename to server/src/test/java/org/apache/druid/server/listener/resource/ListenerResourceTest.java index fc4d2c1c7df2..13873ff8cc30 100644 --- a/server/src/test/java/io/druid/server/listener/resource/ListenerResourceTest.java +++ b/server/src/test/java/org/apache/druid/server/listener/resource/ListenerResourceTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.listener.resource; +package org.apache.druid.server.listener.resource; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -26,8 +26,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.StringUtils; import org.easymock.EasyMock; import org.junit.After; import org.junit.Assert; diff --git a/server/src/test/java/io/druid/server/log/FileRequestLoggerTest.java b/server/src/test/java/org/apache/druid/server/log/FileRequestLoggerTest.java similarity index 94% rename from server/src/test/java/io/druid/server/log/FileRequestLoggerTest.java rename to server/src/test/java/org/apache/druid/server/log/FileRequestLoggerTest.java index 9ba4319aeb14..060412cc8823 100644 --- a/server/src/test/java/io/druid/server/log/FileRequestLoggerTest.java +++ b/server/src/test/java/org/apache/druid/server/log/FileRequestLoggerTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.server.log; +package org.apache.druid.server.log; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.io.CharStreams; -import io.druid.java.util.common.DateTimes; -import io.druid.server.RequestLogLine; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.server.RequestLogLine; import org.easymock.EasyMock; import org.joda.time.DateTime; import org.junit.Assert; diff --git a/server/src/test/java/io/druid/server/log/FilteredRequestLoggerTest.java b/server/src/test/java/org/apache/druid/server/log/FilteredRequestLoggerTest.java similarity index 95% rename from server/src/test/java/io/druid/server/log/FilteredRequestLoggerTest.java rename to server/src/test/java/org/apache/druid/server/log/FilteredRequestLoggerTest.java index 398aef22356e..01a0abc9fe3b 100644 --- a/server/src/test/java/io/druid/server/log/FilteredRequestLoggerTest.java +++ b/server/src/test/java/org/apache/druid/server/log/FilteredRequestLoggerTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.server.log; +package org.apache.druid.server.log; import com.google.common.collect.ImmutableMap; -import io.druid.server.QueryStats; -import io.druid.server.RequestLogLine; +import org.apache.druid.server.QueryStats; +import org.apache.druid.server.RequestLogLine; import org.easymock.EasyMock; import org.junit.Test; diff --git a/server/src/test/java/io/druid/server/log/LoggingRequestLoggerProviderTest.java b/server/src/test/java/org/apache/druid/server/log/LoggingRequestLoggerProviderTest.java similarity index 91% rename from server/src/test/java/io/druid/server/log/LoggingRequestLoggerProviderTest.java rename to server/src/test/java/org/apache/druid/server/log/LoggingRequestLoggerProviderTest.java index 4a9e854505be..6f6d8d1fdaa6 100644 --- a/server/src/test/java/io/druid/server/log/LoggingRequestLoggerProviderTest.java +++ b/server/src/test/java/org/apache/druid/server/log/LoggingRequestLoggerProviderTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.log; +package org.apache.druid.server.log; import com.google.common.collect.ImmutableList; import com.google.inject.Binder; @@ -25,12 +25,12 @@ import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.name.Names; -import io.druid.guice.GuiceInjectors; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.JsonConfigurator; -import io.druid.guice.ManageLifecycle; -import io.druid.guice.QueryableModule; -import io.druid.initialization.Initialization; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.JsonConfigurator; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.guice.QueryableModule; +import org.apache.druid.initialization.Initialization; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/server/log/LoggingRequestLoggerTest.java b/server/src/test/java/org/apache/druid/server/log/LoggingRequestLoggerTest.java similarity index 90% rename from server/src/test/java/io/druid/server/log/LoggingRequestLoggerTest.java rename to server/src/test/java/org/apache/druid/server/log/LoggingRequestLoggerTest.java index a6f9d6e88acd..6d1c54c5990f 100644 --- a/server/src/test/java/io/druid/server/log/LoggingRequestLoggerTest.java +++ b/server/src/test/java/org/apache/druid/server/log/LoggingRequestLoggerTest.java @@ -17,25 +17,25 @@ * under the License. */ -package io.druid.server.log; +package org.apache.druid.server.log; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.jackson.JacksonUtils; -import io.druid.query.BaseQuery; -import io.druid.query.DataSource; -import io.druid.query.LegacyDataSource; -import io.druid.query.Query; -import io.druid.query.QueryRunner; -import io.druid.query.QuerySegmentWalker; -import io.druid.query.filter.DimFilter; -import io.druid.query.spec.QuerySegmentSpec; -import io.druid.server.QueryStats; -import io.druid.server.RequestLogLine; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.query.BaseQuery; +import org.apache.druid.query.DataSource; +import org.apache.druid.query.LegacyDataSource; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QuerySegmentWalker; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.spec.QuerySegmentSpec; +import org.apache.druid.server.QueryStats; +import org.apache.druid.server.RequestLogLine; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.Logger; diff --git a/server/src/test/java/io/druid/server/log/TestRequestLogger.java b/server/src/test/java/org/apache/druid/server/log/TestRequestLogger.java similarity index 94% rename from server/src/test/java/io/druid/server/log/TestRequestLogger.java rename to server/src/test/java/org/apache/druid/server/log/TestRequestLogger.java index 7f5cebb6a576..c5d1b02dc591 100644 --- a/server/src/test/java/io/druid/server/log/TestRequestLogger.java +++ b/server/src/test/java/org/apache/druid/server/log/TestRequestLogger.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.server.log; +package org.apache.druid.server.log; import com.google.common.collect.ImmutableList; -import io.druid.server.RequestLogLine; +import org.apache.druid.server.RequestLogLine; import java.util.ArrayList; import java.util.List; diff --git a/server/src/test/java/io/druid/server/lookup/cache/LookupCoordinatorManagerConfigTest.java b/server/src/test/java/org/apache/druid/server/lookup/cache/LookupCoordinatorManagerConfigTest.java similarity index 97% rename from server/src/test/java/io/druid/server/lookup/cache/LookupCoordinatorManagerConfigTest.java rename to server/src/test/java/org/apache/druid/server/lookup/cache/LookupCoordinatorManagerConfigTest.java index 3bf49529a39f..af0f714c01bb 100644 --- a/server/src/test/java/io/druid/server/lookup/cache/LookupCoordinatorManagerConfigTest.java +++ b/server/src/test/java/org/apache/druid/server/lookup/cache/LookupCoordinatorManagerConfigTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.lookup.cache; +package org.apache.druid.server.lookup.cache; import org.joda.time.Duration; import org.junit.Assert; diff --git a/server/src/test/java/io/druid/server/lookup/cache/LookupCoordinatorManagerTest.java b/server/src/test/java/org/apache/druid/server/lookup/cache/LookupCoordinatorManagerTest.java similarity index 97% rename from server/src/test/java/io/druid/server/lookup/cache/LookupCoordinatorManagerTest.java rename to server/src/test/java/org/apache/druid/server/lookup/cache/LookupCoordinatorManagerTest.java index 73bba0aa6b75..3e6bb436b889 100644 --- a/server/src/test/java/io/druid/server/lookup/cache/LookupCoordinatorManagerTest.java +++ b/server/src/test/java/org/apache/druid/server/lookup/cache/LookupCoordinatorManagerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.lookup.cache; +package org.apache.druid.server.lookup.cache; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -26,23 +26,23 @@ import com.google.common.collect.ImmutableSet; import com.google.common.net.HostAndPort; import com.google.common.util.concurrent.SettableFuture; -import io.druid.audit.AuditInfo; -import io.druid.common.config.ConfigManager.SetResult; -import io.druid.common.config.JacksonConfigManager; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.core.Event; -import io.druid.java.util.emitter.core.LoggingEmitter; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.http.client.HttpClient; -import io.druid.java.util.http.client.response.HttpResponseHandler; -import io.druid.java.util.http.client.response.SequenceInputStreamResponseHandler; -import io.druid.query.lookup.LookupsState; -import io.druid.server.http.HostAndPortWithScheme; +import org.apache.druid.audit.AuditInfo; +import org.apache.druid.common.config.ConfigManager.SetResult; +import org.apache.druid.common.config.JacksonConfigManager; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.core.Event; +import org.apache.druid.java.util.emitter.core.LoggingEmitter; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.java.util.http.client.response.HttpResponseHandler; +import org.apache.druid.java.util.http.client.response.SequenceInputStreamResponseHandler; +import org.apache.druid.query.lookup.LookupsState; +import org.apache.druid.server.http.HostAndPortWithScheme; import org.easymock.EasyMock; import org.junit.After; import org.junit.Assert; diff --git a/server/src/test/java/io/druid/server/lookup/cache/LookupExtractorFactoryMapContainerTest.java b/server/src/test/java/org/apache/druid/server/lookup/cache/LookupExtractorFactoryMapContainerTest.java similarity index 94% rename from server/src/test/java/io/druid/server/lookup/cache/LookupExtractorFactoryMapContainerTest.java rename to server/src/test/java/org/apache/druid/server/lookup/cache/LookupExtractorFactoryMapContainerTest.java index ab3f758eab2e..c3066cb640e9 100644 --- a/server/src/test/java/io/druid/server/lookup/cache/LookupExtractorFactoryMapContainerTest.java +++ b/server/src/test/java/org/apache/druid/server/lookup/cache/LookupExtractorFactoryMapContainerTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.server.lookup.cache; +package org.apache.druid.server.lookup.cache; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.query.lookup.LookupExtractorFactoryContainer; -import io.druid.query.lookup.MapLookupExtractorFactory; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.query.lookup.LookupExtractorFactoryContainer; +import org.apache.druid.query.lookup.MapLookupExtractorFactory; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/server/lookup/cache/LookupNodeDiscoveryTest.java b/server/src/test/java/org/apache/druid/server/lookup/cache/LookupNodeDiscoveryTest.java similarity index 91% rename from server/src/test/java/io/druid/server/lookup/cache/LookupNodeDiscoveryTest.java rename to server/src/test/java/org/apache/druid/server/lookup/cache/LookupNodeDiscoveryTest.java index d55095177186..d69e676601c6 100644 --- a/server/src/test/java/io/druid/server/lookup/cache/LookupNodeDiscoveryTest.java +++ b/server/src/test/java/org/apache/druid/server/lookup/cache/LookupNodeDiscoveryTest.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.server.lookup.cache; +package org.apache.druid.server.lookup.cache; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.druid.discovery.DiscoveryDruidNode; -import io.druid.discovery.DruidNodeDiscovery; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.discovery.LookupNodeService; -import io.druid.server.DruidNode; -import io.druid.server.http.HostAndPortWithScheme; +import org.apache.druid.discovery.DiscoveryDruidNode; +import org.apache.druid.discovery.DruidNodeDiscovery; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.discovery.LookupNodeService; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.http.HostAndPortWithScheme; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; diff --git a/server/src/test/java/io/druid/server/metrics/ExceptionCapturingServiceEmitter.java b/server/src/test/java/org/apache/druid/server/metrics/ExceptionCapturingServiceEmitter.java similarity index 90% rename from server/src/test/java/io/druid/server/metrics/ExceptionCapturingServiceEmitter.java rename to server/src/test/java/org/apache/druid/server/metrics/ExceptionCapturingServiceEmitter.java index cc217c6f5b05..f70595a2fa05 100644 --- a/server/src/test/java/io/druid/server/metrics/ExceptionCapturingServiceEmitter.java +++ b/server/src/test/java/org/apache/druid/server/metrics/ExceptionCapturingServiceEmitter.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.server.metrics; +package org.apache.druid.server.metrics; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.java.util.emitter.core.Event; -import io.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.java.util.emitter.core.Event; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; import javax.annotation.Nullable; import java.util.Map; diff --git a/server/src/test/java/io/druid/server/metrics/HistoricalMetricsMonitorTest.java b/server/src/test/java/org/apache/druid/server/metrics/HistoricalMetricsMonitorTest.java similarity index 92% rename from server/src/test/java/io/druid/server/metrics/HistoricalMetricsMonitorTest.java rename to server/src/test/java/org/apache/druid/server/metrics/HistoricalMetricsMonitorTest.java index 682dbae99338..22fb2f2e1fe4 100644 --- a/server/src/test/java/io/druid/server/metrics/HistoricalMetricsMonitorTest.java +++ b/server/src/test/java/org/apache/druid/server/metrics/HistoricalMetricsMonitorTest.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.server.metrics; +package org.apache.druid.server.metrics; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceEventBuilder; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.client.DruidServerConfig; -import io.druid.java.util.common.Intervals; -import io.druid.server.SegmentManager; -import io.druid.server.coordination.SegmentLoadDropHandler; -import io.druid.timeline.DataSegment; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceEventBuilder; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.client.DruidServerConfig; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.server.SegmentManager; +import org.apache.druid.server.coordination.SegmentLoadDropHandler; +import org.apache.druid.timeline.DataSegment; import org.easymock.Capture; import org.easymock.CaptureType; import org.easymock.EasyMock; diff --git a/server/src/test/java/io/druid/server/metrics/MetricsModuleTest.java b/server/src/test/java/org/apache/druid/server/metrics/MetricsModuleTest.java similarity index 91% rename from server/src/test/java/io/druid/server/metrics/MetricsModuleTest.java rename to server/src/test/java/org/apache/druid/server/metrics/MetricsModuleTest.java index 55a4e309025d..9b4625af5c8d 100644 --- a/server/src/test/java/io/druid/server/metrics/MetricsModuleTest.java +++ b/server/src/test/java/org/apache/druid/server/metrics/MetricsModuleTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.metrics; +package org.apache.druid.server.metrics; import com.google.common.collect.ImmutableList; import com.google.inject.Binder; @@ -25,11 +25,11 @@ import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.name.Names; -import io.druid.guice.GuiceInjectors; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.annotations.Self; -import io.druid.initialization.Initialization; -import io.druid.server.DruidNode; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.server.DruidNode; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/server/metrics/NoopServiceEmitter.java b/server/src/test/java/org/apache/druid/server/metrics/NoopServiceEmitter.java similarity index 85% rename from server/src/test/java/io/druid/server/metrics/NoopServiceEmitter.java rename to server/src/test/java/org/apache/druid/server/metrics/NoopServiceEmitter.java index 6a5ea9cd6d24..9f258ba94c3a 100644 --- a/server/src/test/java/io/druid/server/metrics/NoopServiceEmitter.java +++ b/server/src/test/java/org/apache/druid/server/metrics/NoopServiceEmitter.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.server.metrics; +package org.apache.druid.server.metrics; -import io.druid.java.util.emitter.core.Event; -import io.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.core.Event; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; public class NoopServiceEmitter extends ServiceEmitter { diff --git a/server/src/test/java/io/druid/server/router/JavaScriptTieredBrokerSelectorStrategyTest.java b/server/src/test/java/org/apache/druid/server/router/JavaScriptTieredBrokerSelectorStrategyTest.java similarity index 92% rename from server/src/test/java/io/druid/server/router/JavaScriptTieredBrokerSelectorStrategyTest.java rename to server/src/test/java/org/apache/druid/server/router/JavaScriptTieredBrokerSelectorStrategyTest.java index ed76a45a26f2..5db4b8f541ba 100644 --- a/server/src/test/java/io/druid/server/router/JavaScriptTieredBrokerSelectorStrategyTest.java +++ b/server/src/test/java/org/apache/druid/server/router/JavaScriptTieredBrokerSelectorStrategyTest.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.server.router; +package org.apache.druid.server.router; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.js.JavaScriptConfig; -import io.druid.query.Druids; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.DoubleSumAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.topn.TopNQueryBuilder; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.js.JavaScriptConfig; +import org.apache.druid.query.Druids; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.topn.TopNQueryBuilder; import org.hamcrest.CoreMatchers; import org.junit.Assert; import org.junit.Rule; diff --git a/server/src/test/java/io/druid/server/router/QueryHostFinderTest.java b/server/src/test/java/org/apache/druid/server/router/QueryHostFinderTest.java similarity index 85% rename from server/src/test/java/io/druid/server/router/QueryHostFinderTest.java rename to server/src/test/java/org/apache/druid/server/router/QueryHostFinderTest.java index 09341ede02fb..35aa5f534639 100644 --- a/server/src/test/java/io/druid/server/router/QueryHostFinderTest.java +++ b/server/src/test/java/org/apache/druid/server/router/QueryHostFinderTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.server.router; +package org.apache.druid.server.router; -import io.druid.client.selector.Server; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.Pair; -import io.druid.query.Query; -import io.druid.query.TableDataSource; -import io.druid.query.spec.MultipleIntervalSegmentSpec; -import io.druid.query.timeboundary.TimeBoundaryQuery; +import org.apache.druid.client.selector.Server; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.query.Query; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.query.timeboundary.TimeBoundaryQuery; import org.easymock.EasyMock; import org.junit.After; import org.junit.Assert; diff --git a/server/src/test/java/io/druid/server/router/TieredBrokerHostSelectorTest.java b/server/src/test/java/org/apache/druid/server/router/TieredBrokerHostSelectorTest.java similarity index 92% rename from server/src/test/java/io/druid/server/router/TieredBrokerHostSelectorTest.java rename to server/src/test/java/org/apache/druid/server/router/TieredBrokerHostSelectorTest.java index 55cdf7ece806..aa3d2f8c8cfa 100644 --- a/server/src/test/java/io/druid/server/router/TieredBrokerHostSelectorTest.java +++ b/server/src/test/java/org/apache/druid/server/router/TieredBrokerHostSelectorTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.router; +package org.apache.druid.server.router; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Function; @@ -27,21 +27,21 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.client.DruidServer; -import io.druid.client.selector.Server; -import io.druid.discovery.DiscoveryDruidNode; -import io.druid.discovery.DruidNodeDiscovery; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.guice.annotations.Json; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.Pair; -import io.druid.query.Druids; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.spec.MultipleIntervalSegmentSpec; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.server.DruidNode; -import io.druid.server.coordinator.rules.IntervalLoadRule; -import io.druid.server.coordinator.rules.Rule; +import org.apache.druid.client.DruidServer; +import org.apache.druid.client.selector.Server; +import org.apache.druid.discovery.DiscoveryDruidNode; +import org.apache.druid.discovery.DruidNodeDiscovery; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.query.Druids; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.coordinator.rules.IntervalLoadRule; +import org.apache.druid.server.coordinator.rules.Rule; import org.easymock.EasyMock; import org.junit.After; import org.junit.Assert; diff --git a/server/src/test/java/io/druid/server/security/EscalatorTest.java b/server/src/test/java/org/apache/druid/server/security/EscalatorTest.java similarity index 93% rename from server/src/test/java/io/druid/server/security/EscalatorTest.java rename to server/src/test/java/org/apache/druid/server/security/EscalatorTest.java index feb54364e951..8a32dab609cb 100644 --- a/server/src/test/java/io/druid/server/security/EscalatorTest.java +++ b/server/src/test/java/org/apache/druid/server/security/EscalatorTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.server.security; +package org.apache.druid.server.security; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.segment.TestHelper; +import org.apache.druid.segment.TestHelper; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/server/shard/NumberedShardSpecTest.java b/server/src/test/java/org/apache/druid/server/shard/NumberedShardSpecTest.java similarity index 93% rename from server/src/test/java/io/druid/server/shard/NumberedShardSpecTest.java rename to server/src/test/java/org/apache/druid/server/shard/NumberedShardSpecTest.java index 449b08d0e6ed..497a6d73a77b 100644 --- a/server/src/test/java/io/druid/server/shard/NumberedShardSpecTest.java +++ b/server/src/test/java/org/apache/druid/server/shard/NumberedShardSpecTest.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.server.shard; +package org.apache.druid.server.shard; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.collect.Ordering; -import io.druid.java.util.common.Intervals; -import io.druid.server.ServerTestHelper; -import io.druid.timeline.TimelineObjectHolder; -import io.druid.timeline.VersionedIntervalTimeline; -import io.druid.timeline.partition.NumberedShardSpec; -import io.druid.timeline.partition.PartitionChunk; -import io.druid.timeline.partition.ShardSpec; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.server.ServerTestHelper; +import org.apache.druid.timeline.TimelineObjectHolder; +import org.apache.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.timeline.partition.NumberedShardSpec; +import org.apache.druid.timeline.partition.PartitionChunk; +import org.apache.druid.timeline.partition.ShardSpec; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/server/shard/SingleDimensionShardSpecTest.java b/server/src/test/java/org/apache/druid/server/shard/SingleDimensionShardSpecTest.java similarity index 94% rename from server/src/test/java/io/druid/server/shard/SingleDimensionShardSpecTest.java rename to server/src/test/java/org/apache/druid/server/shard/SingleDimensionShardSpecTest.java index 50d502d6d673..b4ee4f57aeb4 100644 --- a/server/src/test/java/io/druid/server/shard/SingleDimensionShardSpecTest.java +++ b/server/src/test/java/org/apache/druid/server/shard/SingleDimensionShardSpecTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.server.shard; +package org.apache.druid.server.shard; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; @@ -27,12 +27,12 @@ import com.google.common.collect.Maps; import com.google.common.collect.Range; import com.google.common.collect.RangeSet; -import io.druid.data.input.InputRow; -import io.druid.data.input.MapBasedInputRow; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.timeline.partition.ShardSpec; -import io.druid.timeline.partition.SingleDimensionShardSpec; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.timeline.partition.ShardSpec; +import org.apache.druid.timeline.partition.SingleDimensionShardSpec; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/io/druid/timeline/DataSegmentTest.java b/server/src/test/java/org/apache/druid/timeline/DataSegmentTest.java similarity index 95% rename from server/src/test/java/io/druid/timeline/DataSegmentTest.java rename to server/src/test/java/org/apache/druid/timeline/DataSegmentTest.java index 9f31bda9a6b7..6eaf103995d1 100644 --- a/server/src/test/java/io/druid/timeline/DataSegmentTest.java +++ b/server/src/test/java/org/apache/druid/timeline/DataSegmentTest.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.timeline; +package org.apache.druid.timeline; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.jackson.JacksonUtils; -import io.druid.segment.IndexIO; -import io.druid.timeline.partition.NoneShardSpec; -import io.druid.timeline.partition.SingleDimensionShardSpec; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.timeline.partition.SingleDimensionShardSpec; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Before; diff --git a/server/src/test/java/io/druid/timeline/partition/HashBasedNumberedShardSpecTest.java b/server/src/test/java/org/apache/druid/timeline/partition/HashBasedNumberedShardSpecTest.java similarity index 95% rename from server/src/test/java/io/druid/timeline/partition/HashBasedNumberedShardSpecTest.java rename to server/src/test/java/org/apache/druid/timeline/partition/HashBasedNumberedShardSpecTest.java index 80d38f311a37..61e58409a428 100644 --- a/server/src/test/java/io/druid/timeline/partition/HashBasedNumberedShardSpecTest.java +++ b/server/src/test/java/org/apache/druid/timeline/partition/HashBasedNumberedShardSpecTest.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.timeline.partition; +package org.apache.druid.timeline.partition; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import io.druid.data.input.InputRow; -import io.druid.data.input.MapBasedInputRow; -import io.druid.data.input.Row; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.server.ServerTestHelper; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.data.input.Row; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.server.ServerTestHelper; import org.joda.time.DateTime; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/resources/META-INF/services/io.druid.initialization.DruidModule b/server/src/test/resources/META-INF/services/io.druid.initialization.DruidModule deleted file mode 100644 index b5bc03d5265f..000000000000 --- a/server/src/test/resources/META-INF/services/io.druid.initialization.DruidModule +++ /dev/null @@ -1 +0,0 @@ -io.druid.initialization.InitializationTest$TestDruidModule diff --git a/server/src/test/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/server/src/test/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..9008681d6a09 --- /dev/null +++ b/server/src/test/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1 @@ +org.apache.druid.initialization.InitializationTest$TestDruidModule diff --git a/services/pom.xml b/services/pom.xml index c982c627d170..b79a7b1e6482 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -25,7 +25,7 @@ druid-services - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT @@ -34,27 +34,27 @@ - io.druid + org.apache.druid druid-common ${project.parent.version} - io.druid + org.apache.druid druid-server ${project.parent.version} - io.druid + org.apache.druid druid-indexing-hadoop ${project.parent.version} - io.druid + org.apache.druid druid-indexing-service ${project.parent.version} - io.druid + org.apache.druid druid-sql ${project.parent.version} diff --git a/services/src/main/java/io/druid/cli/CliBroker.java b/services/src/main/java/org/apache/druid/cli/CliBroker.java similarity index 68% rename from services/src/main/java/io/druid/cli/CliBroker.java rename to services/src/main/java/org/apache/druid/cli/CliBroker.java index 53d93d16bd2d..a1fa6cda85f4 100644 --- a/services/src/main/java/io/druid/cli/CliBroker.java +++ b/services/src/main/java/org/apache/druid/cli/CliBroker.java @@ -17,48 +17,48 @@ * under the License. */ -package io.druid.cli; +package org.apache.druid.cli; import com.google.common.collect.ImmutableList; import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.name.Names; import io.airlift.airline.Command; -import io.druid.client.BrokerSegmentWatcherConfig; -import io.druid.client.BrokerServerView; -import io.druid.client.CachingClusteredClient; -import io.druid.client.HttpServerInventoryViewResource; -import io.druid.client.TimelineServerView; -import io.druid.client.cache.CacheConfig; -import io.druid.client.cache.CacheMonitor; -import io.druid.client.selector.CustomTierSelectorStrategyConfig; -import io.druid.client.selector.ServerSelectorStrategy; -import io.druid.client.selector.TierSelectorStrategy; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.discovery.LookupNodeService; -import io.druid.guice.CacheModule; -import io.druid.guice.DruidProcessingModule; -import io.druid.guice.Jerseys; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.LazySingleton; -import io.druid.guice.LifecycleModule; -import io.druid.guice.QueryRunnerFactoryModule; -import io.druid.guice.QueryableModule; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.QuerySegmentWalker; -import io.druid.query.RetryQueryRunnerConfig; -import io.druid.query.lookup.LookupModule; -import io.druid.server.BrokerQueryResource; -import io.druid.server.ClientInfoResource; -import io.druid.server.ClientQuerySegmentWalker; -import io.druid.server.coordination.broker.DruidBroker; -import io.druid.server.http.BrokerResource; -import io.druid.server.initialization.jetty.JettyServerInitializer; -import io.druid.server.metrics.MetricsModule; -import io.druid.server.metrics.QueryCountStatsProvider; -import io.druid.server.router.TieredBrokerConfig; -import io.druid.sql.guice.SqlModule; -import io.druid.timeline.PruneLoadSpec; +import org.apache.druid.client.BrokerSegmentWatcherConfig; +import org.apache.druid.client.BrokerServerView; +import org.apache.druid.client.CachingClusteredClient; +import org.apache.druid.client.HttpServerInventoryViewResource; +import org.apache.druid.client.TimelineServerView; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.client.cache.CacheMonitor; +import org.apache.druid.client.selector.CustomTierSelectorStrategyConfig; +import org.apache.druid.client.selector.ServerSelectorStrategy; +import org.apache.druid.client.selector.TierSelectorStrategy; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.discovery.LookupNodeService; +import org.apache.druid.guice.CacheModule; +import org.apache.druid.guice.DruidProcessingModule; +import org.apache.druid.guice.Jerseys; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.LifecycleModule; +import org.apache.druid.guice.QueryRunnerFactoryModule; +import org.apache.druid.guice.QueryableModule; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.QuerySegmentWalker; +import org.apache.druid.query.RetryQueryRunnerConfig; +import org.apache.druid.query.lookup.LookupModule; +import org.apache.druid.server.BrokerQueryResource; +import org.apache.druid.server.ClientInfoResource; +import org.apache.druid.server.ClientQuerySegmentWalker; +import org.apache.druid.server.coordination.broker.DruidBroker; +import org.apache.druid.server.http.BrokerResource; +import org.apache.druid.server.initialization.jetty.JettyServerInitializer; +import org.apache.druid.server.metrics.MetricsModule; +import org.apache.druid.server.metrics.QueryCountStatsProvider; +import org.apache.druid.server.router.TieredBrokerConfig; +import org.apache.druid.sql.guice.SqlModule; +import org.apache.druid.timeline.PruneLoadSpec; import org.eclipse.jetty.server.Server; import java.util.List; diff --git a/services/src/main/java/io/druid/cli/CliCoordinator.java b/services/src/main/java/org/apache/druid/cli/CliCoordinator.java similarity index 69% rename from services/src/main/java/io/druid/cli/CliCoordinator.java rename to services/src/main/java/org/apache/druid/cli/CliCoordinator.java index 6c7cdc388148..5503c85b84cb 100644 --- a/services/src/main/java/io/druid/cli/CliCoordinator.java +++ b/services/src/main/java/org/apache/druid/cli/CliCoordinator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.cli; +package org.apache.druid.cli; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Predicates; @@ -29,62 +29,62 @@ import com.google.inject.Provides; import com.google.inject.name.Names; import io.airlift.airline.Command; -import io.druid.audit.AuditManager; -import io.druid.client.CoordinatorServerView; -import io.druid.client.HttpServerInventoryViewResource; -import io.druid.client.coordinator.Coordinator; -import io.druid.client.indexing.HttpIndexingServiceClient; -import io.druid.client.indexing.IndexingServiceClient; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.guice.ConditionalMultibind; -import io.druid.guice.ConfigProvider; -import io.druid.guice.Jerseys; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.LazySingleton; -import io.druid.guice.LifecycleModule; -import io.druid.guice.ManageLifecycle; -import io.druid.guice.annotations.CoordinatorIndexingServiceHelper; -import io.druid.guice.annotations.EscalatedGlobal; -import io.druid.java.util.common.concurrent.ScheduledExecutorFactory; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.http.client.HttpClient; -import io.druid.metadata.MetadataRuleManager; -import io.druid.metadata.MetadataRuleManagerConfig; -import io.druid.metadata.MetadataRuleManagerProvider; -import io.druid.metadata.MetadataSegmentManager; -import io.druid.metadata.MetadataSegmentManagerConfig; -import io.druid.metadata.MetadataSegmentManagerProvider; -import io.druid.metadata.MetadataStorage; -import io.druid.metadata.MetadataStorageProvider; -import io.druid.server.audit.AuditManagerProvider; -import io.druid.server.coordinator.BalancerStrategyFactory; -import io.druid.server.coordinator.DruidCoordinator; -import io.druid.server.coordinator.DruidCoordinatorCleanupPendingSegments; -import io.druid.server.coordinator.DruidCoordinatorConfig; -import io.druid.server.coordinator.LoadQueueTaskMaster; -import io.druid.server.coordinator.helper.DruidCoordinatorHelper; -import io.druid.server.coordinator.helper.DruidCoordinatorSegmentKiller; -import io.druid.server.coordinator.helper.DruidCoordinatorSegmentMerger; -import io.druid.server.coordinator.helper.DruidCoordinatorVersionConverter; -import io.druid.server.http.ClusterResource; -import io.druid.server.http.CoordinatorCompactionConfigsResource; -import io.druid.server.http.CoordinatorDynamicConfigsResource; -import io.druid.server.http.CoordinatorRedirectInfo; -import io.druid.server.http.CoordinatorResource; -import io.druid.server.http.DatasourcesResource; -import io.druid.server.http.IntervalsResource; -import io.druid.server.http.LookupCoordinatorResource; -import io.druid.server.http.MetadataResource; -import io.druid.server.http.RedirectFilter; -import io.druid.server.http.RedirectInfo; -import io.druid.server.http.RulesResource; -import io.druid.server.http.ServersResource; -import io.druid.server.http.TiersResource; -import io.druid.server.initialization.ZkPathsConfig; -import io.druid.server.initialization.jetty.JettyServerInitializer; -import io.druid.server.lookup.cache.LookupCoordinatorManager; -import io.druid.server.lookup.cache.LookupCoordinatorManagerConfig; -import io.druid.server.router.TieredBrokerConfig; +import org.apache.druid.audit.AuditManager; +import org.apache.druid.client.CoordinatorServerView; +import org.apache.druid.client.HttpServerInventoryViewResource; +import org.apache.druid.client.coordinator.Coordinator; +import org.apache.druid.client.indexing.HttpIndexingServiceClient; +import org.apache.druid.client.indexing.IndexingServiceClient; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.guice.ConditionalMultibind; +import org.apache.druid.guice.ConfigProvider; +import org.apache.druid.guice.Jerseys; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.LifecycleModule; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.guice.annotations.CoordinatorIndexingServiceHelper; +import org.apache.druid.guice.annotations.EscalatedGlobal; +import org.apache.druid.java.util.common.concurrent.ScheduledExecutorFactory; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.metadata.MetadataRuleManager; +import org.apache.druid.metadata.MetadataRuleManagerConfig; +import org.apache.druid.metadata.MetadataRuleManagerProvider; +import org.apache.druid.metadata.MetadataSegmentManager; +import org.apache.druid.metadata.MetadataSegmentManagerConfig; +import org.apache.druid.metadata.MetadataSegmentManagerProvider; +import org.apache.druid.metadata.MetadataStorage; +import org.apache.druid.metadata.MetadataStorageProvider; +import org.apache.druid.server.audit.AuditManagerProvider; +import org.apache.druid.server.coordinator.BalancerStrategyFactory; +import org.apache.druid.server.coordinator.DruidCoordinator; +import org.apache.druid.server.coordinator.DruidCoordinatorCleanupPendingSegments; +import org.apache.druid.server.coordinator.DruidCoordinatorConfig; +import org.apache.druid.server.coordinator.LoadQueueTaskMaster; +import org.apache.druid.server.coordinator.helper.DruidCoordinatorHelper; +import org.apache.druid.server.coordinator.helper.DruidCoordinatorSegmentKiller; +import org.apache.druid.server.coordinator.helper.DruidCoordinatorSegmentMerger; +import org.apache.druid.server.coordinator.helper.DruidCoordinatorVersionConverter; +import org.apache.druid.server.http.ClusterResource; +import org.apache.druid.server.http.CoordinatorCompactionConfigsResource; +import org.apache.druid.server.http.CoordinatorDynamicConfigsResource; +import org.apache.druid.server.http.CoordinatorRedirectInfo; +import org.apache.druid.server.http.CoordinatorResource; +import org.apache.druid.server.http.DatasourcesResource; +import org.apache.druid.server.http.IntervalsResource; +import org.apache.druid.server.http.LookupCoordinatorResource; +import org.apache.druid.server.http.MetadataResource; +import org.apache.druid.server.http.RedirectFilter; +import org.apache.druid.server.http.RedirectInfo; +import org.apache.druid.server.http.RulesResource; +import org.apache.druid.server.http.ServersResource; +import org.apache.druid.server.http.TiersResource; +import org.apache.druid.server.initialization.ZkPathsConfig; +import org.apache.druid.server.initialization.jetty.JettyServerInitializer; +import org.apache.druid.server.lookup.cache.LookupCoordinatorManager; +import org.apache.druid.server.lookup.cache.LookupCoordinatorManagerConfig; +import org.apache.druid.server.router.TieredBrokerConfig; import org.apache.curator.framework.CuratorFramework; import org.eclipse.jetty.server.Server; diff --git a/services/src/main/java/io/druid/cli/CliHadoopIndexer.java b/services/src/main/java/org/apache/druid/cli/CliHadoopIndexer.java similarity index 94% rename from services/src/main/java/io/druid/cli/CliHadoopIndexer.java rename to services/src/main/java/org/apache/druid/cli/CliHadoopIndexer.java index ebc0ebd06ea0..a822a35eeb88 100644 --- a/services/src/main/java/io/druid/cli/CliHadoopIndexer.java +++ b/services/src/main/java/org/apache/druid/cli/CliHadoopIndexer.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.cli; +package org.apache.druid.cli; import com.google.common.base.Joiner; import com.google.common.collect.Lists; @@ -26,10 +26,10 @@ import io.airlift.airline.Arguments; import io.airlift.airline.Command; import io.airlift.airline.Option; -import io.druid.guice.ExtensionsConfig; -import io.druid.indexing.common.config.TaskConfig; -import io.druid.initialization.Initialization; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.guice.ExtensionsConfig; +import org.apache.druid.indexing.common.config.TaskConfig; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.java.util.common.logger.Logger; import java.io.File; import java.lang.reflect.Method; diff --git a/services/src/main/java/io/druid/cli/CliHistorical.java b/services/src/main/java/org/apache/druid/cli/CliHistorical.java similarity index 70% rename from services/src/main/java/io/druid/cli/CliHistorical.java rename to services/src/main/java/org/apache/druid/cli/CliHistorical.java index 330ee647c551..fafeadb6ace0 100644 --- a/services/src/main/java/io/druid/cli/CliHistorical.java +++ b/services/src/main/java/org/apache/druid/cli/CliHistorical.java @@ -17,41 +17,41 @@ * under the License. */ -package io.druid.cli; +package org.apache.druid.cli; import com.google.common.collect.ImmutableList; import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.name.Names; import io.airlift.airline.Command; -import io.druid.client.cache.CacheConfig; -import io.druid.client.cache.CacheMonitor; -import io.druid.discovery.DataNodeService; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.discovery.LookupNodeService; -import io.druid.guice.CacheModule; -import io.druid.guice.DruidProcessingModule; -import io.druid.guice.Jerseys; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.LazySingleton; -import io.druid.guice.LifecycleModule; -import io.druid.guice.ManageLifecycle; -import io.druid.guice.NodeTypeConfig; -import io.druid.guice.QueryRunnerFactoryModule; -import io.druid.guice.QueryableModule; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.QuerySegmentWalker; -import io.druid.query.lookup.LookupModule; -import io.druid.server.QueryResource; -import io.druid.server.SegmentManager; -import io.druid.server.coordination.ServerManager; -import io.druid.server.coordination.ServerType; -import io.druid.server.coordination.ZkCoordinator; -import io.druid.server.http.HistoricalResource; -import io.druid.server.http.SegmentListerResource; -import io.druid.server.initialization.jetty.JettyServerInitializer; -import io.druid.server.metrics.MetricsModule; -import io.druid.server.metrics.QueryCountStatsProvider; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.client.cache.CacheMonitor; +import org.apache.druid.discovery.DataNodeService; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.discovery.LookupNodeService; +import org.apache.druid.guice.CacheModule; +import org.apache.druid.guice.DruidProcessingModule; +import org.apache.druid.guice.Jerseys; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.LifecycleModule; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.guice.NodeTypeConfig; +import org.apache.druid.guice.QueryRunnerFactoryModule; +import org.apache.druid.guice.QueryableModule; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.QuerySegmentWalker; +import org.apache.druid.query.lookup.LookupModule; +import org.apache.druid.server.QueryResource; +import org.apache.druid.server.SegmentManager; +import org.apache.druid.server.coordination.ServerManager; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.server.coordination.ZkCoordinator; +import org.apache.druid.server.http.HistoricalResource; +import org.apache.druid.server.http.SegmentListerResource; +import org.apache.druid.server.initialization.jetty.JettyServerInitializer; +import org.apache.druid.server.metrics.MetricsModule; +import org.apache.druid.server.metrics.QueryCountStatsProvider; import org.eclipse.jetty.server.Server; import java.util.List; diff --git a/services/src/main/java/io/druid/cli/CliInternalHadoopIndexer.java b/services/src/main/java/org/apache/druid/cli/CliInternalHadoopIndexer.java similarity index 85% rename from services/src/main/java/io/druid/cli/CliInternalHadoopIndexer.java rename to services/src/main/java/org/apache/druid/cli/CliInternalHadoopIndexer.java index 78ffa2a2ca36..cff7e7597cb6 100644 --- a/services/src/main/java/io/druid/cli/CliInternalHadoopIndexer.java +++ b/services/src/main/java/org/apache/druid/cli/CliInternalHadoopIndexer.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.cli; +package org.apache.druid.cli; import com.google.common.base.Preconditions; import com.google.common.base.Supplier; @@ -31,21 +31,21 @@ import io.airlift.airline.Arguments; import io.airlift.airline.Command; -import io.druid.guice.LazySingleton; -import io.druid.indexer.HadoopDruidDetermineConfigurationJob; -import io.druid.indexer.HadoopDruidIndexerConfig; -import io.druid.indexer.HadoopDruidIndexerJob; -import io.druid.indexer.HadoopIngestionSpec; -import io.druid.indexer.JobHelper; -import io.druid.indexer.Jobby; -import io.druid.indexer.MetadataStorageUpdaterJobHandler; -import io.druid.indexer.path.MetadataStoreBasedUsedSegmentLister; -import io.druid.indexer.updater.MetadataStorageUpdaterJobSpec; -import io.druid.indexing.overlord.IndexerMetadataStorageCoordinator; -import io.druid.java.util.common.logger.Logger; -import io.druid.metadata.IndexerSQLMetadataStorageCoordinator; -import io.druid.metadata.MetadataStorageConnectorConfig; -import io.druid.metadata.MetadataStorageTablesConfig; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.indexer.HadoopDruidDetermineConfigurationJob; +import org.apache.druid.indexer.HadoopDruidIndexerConfig; +import org.apache.druid.indexer.HadoopDruidIndexerJob; +import org.apache.druid.indexer.HadoopIngestionSpec; +import org.apache.druid.indexer.JobHelper; +import org.apache.druid.indexer.Jobby; +import org.apache.druid.indexer.MetadataStorageUpdaterJobHandler; +import org.apache.druid.indexer.path.MetadataStoreBasedUsedSegmentLister; +import org.apache.druid.indexer.updater.MetadataStorageUpdaterJobSpec; +import org.apache.druid.indexing.overlord.IndexerMetadataStorageCoordinator; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.metadata.IndexerSQLMetadataStorageCoordinator; +import org.apache.druid.metadata.MetadataStorageConnectorConfig; +import org.apache.druid.metadata.MetadataStorageTablesConfig; import java.io.File; import java.net.URI; diff --git a/services/src/main/java/io/druid/cli/CliMiddleManager.java b/services/src/main/java/org/apache/druid/cli/CliMiddleManager.java similarity index 75% rename from services/src/main/java/io/druid/cli/CliMiddleManager.java rename to services/src/main/java/org/apache/druid/cli/CliMiddleManager.java index 0cab5029b939..e2c31af7200b 100644 --- a/services/src/main/java/io/druid/cli/CliMiddleManager.java +++ b/services/src/main/java/org/apache/druid/cli/CliMiddleManager.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.cli; +package org.apache.druid.cli; import com.google.common.collect.ImmutableList; import com.google.inject.Binder; @@ -29,36 +29,36 @@ import com.google.inject.name.Names; import com.google.inject.util.Providers; import io.airlift.airline.Command; -import io.druid.client.indexing.IndexingServiceClient; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.discovery.WorkerNodeService; -import io.druid.guice.IndexingServiceFirehoseModule; -import io.druid.guice.IndexingServiceModuleHelper; -import io.druid.guice.IndexingServiceTaskLogsModule; -import io.druid.guice.Jerseys; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.LazySingleton; -import io.druid.guice.LifecycleModule; -import io.druid.guice.ManageLifecycle; -import io.druid.guice.PolyBind; -import io.druid.guice.annotations.Self; -import io.druid.indexing.common.config.TaskConfig; -import io.druid.indexing.common.stats.DropwizardRowIngestionMetersFactory; -import io.druid.indexing.common.stats.RowIngestionMetersFactory; -import io.druid.indexing.common.task.IndexTaskClientFactory; -import io.druid.indexing.common.task.batch.parallel.ParallelIndexTaskClient; -import io.druid.indexing.overlord.ForkingTaskRunner; -import io.druid.indexing.overlord.TaskRunner; -import io.druid.indexing.worker.Worker; -import io.druid.indexing.worker.WorkerCuratorCoordinator; -import io.druid.indexing.worker.WorkerTaskMonitor; -import io.druid.indexing.worker.config.WorkerConfig; -import io.druid.indexing.worker.http.TaskManagementResource; -import io.druid.indexing.worker.http.WorkerResource; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.realtime.firehose.ChatHandlerProvider; -import io.druid.server.DruidNode; -import io.druid.server.initialization.jetty.JettyServerInitializer; +import org.apache.druid.client.indexing.IndexingServiceClient; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.discovery.WorkerNodeService; +import org.apache.druid.guice.IndexingServiceFirehoseModule; +import org.apache.druid.guice.IndexingServiceModuleHelper; +import org.apache.druid.guice.IndexingServiceTaskLogsModule; +import org.apache.druid.guice.Jerseys; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.LifecycleModule; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.guice.PolyBind; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.indexing.common.config.TaskConfig; +import org.apache.druid.indexing.common.stats.DropwizardRowIngestionMetersFactory; +import org.apache.druid.indexing.common.stats.RowIngestionMetersFactory; +import org.apache.druid.indexing.common.task.IndexTaskClientFactory; +import org.apache.druid.indexing.common.task.batch.parallel.ParallelIndexTaskClient; +import org.apache.druid.indexing.overlord.ForkingTaskRunner; +import org.apache.druid.indexing.overlord.TaskRunner; +import org.apache.druid.indexing.worker.Worker; +import org.apache.druid.indexing.worker.WorkerCuratorCoordinator; +import org.apache.druid.indexing.worker.WorkerTaskMonitor; +import org.apache.druid.indexing.worker.config.WorkerConfig; +import org.apache.druid.indexing.worker.http.TaskManagementResource; +import org.apache.druid.indexing.worker.http.WorkerResource; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.realtime.firehose.ChatHandlerProvider; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.initialization.jetty.JettyServerInitializer; import org.eclipse.jetty.server.Server; import java.util.List; diff --git a/services/src/main/java/io/druid/cli/CliOverlord.java b/services/src/main/java/org/apache/druid/cli/CliOverlord.java similarity index 75% rename from services/src/main/java/io/druid/cli/CliOverlord.java rename to services/src/main/java/org/apache/druid/cli/CliOverlord.java index 5b61e2275d83..d22e1f87e5ab 100644 --- a/services/src/main/java/io/druid/cli/CliOverlord.java +++ b/services/src/main/java/org/apache/druid/cli/CliOverlord.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.cli; +package org.apache.druid.cli; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; @@ -33,78 +33,78 @@ import com.google.inject.servlet.GuiceFilter; import com.google.inject.util.Providers; import io.airlift.airline.Command; -import io.druid.audit.AuditManager; -import io.druid.client.indexing.HttpIndexingServiceClient; -import io.druid.client.indexing.IndexingService; -import io.druid.client.indexing.IndexingServiceClient; -import io.druid.client.indexing.IndexingServiceSelectorConfig; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.guice.IndexingServiceFirehoseModule; -import io.druid.guice.IndexingServiceModuleHelper; -import io.druid.guice.IndexingServiceTaskLogsModule; -import io.druid.guice.JacksonConfigProvider; -import io.druid.guice.Jerseys; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.LazySingleton; -import io.druid.guice.LifecycleModule; -import io.druid.guice.ListProvider; -import io.druid.guice.ManageLifecycle; -import io.druid.guice.PolyBind; -import io.druid.guice.annotations.Json; -import io.druid.indexing.common.actions.LocalTaskActionClientFactory; -import io.druid.indexing.common.actions.TaskActionClientFactory; -import io.druid.indexing.common.actions.TaskActionToolbox; -import io.druid.indexing.common.config.TaskConfig; -import io.druid.indexing.common.config.TaskStorageConfig; -import io.druid.indexing.common.stats.DropwizardRowIngestionMetersFactory; -import io.druid.indexing.common.stats.RowIngestionMetersFactory; -import io.druid.indexing.common.task.IndexTaskClientFactory; -import io.druid.indexing.common.task.batch.parallel.ParallelIndexTaskClient; -import io.druid.indexing.common.tasklogs.SwitchingTaskLogStreamer; -import io.druid.indexing.common.tasklogs.TaskRunnerTaskLogStreamer; -import io.druid.indexing.overlord.ForkingTaskRunnerFactory; -import io.druid.indexing.overlord.HeapMemoryTaskStorage; -import io.druid.indexing.overlord.IndexerMetadataStorageAdapter; -import io.druid.indexing.overlord.MetadataTaskStorage; -import io.druid.indexing.overlord.RemoteTaskRunnerFactory; -import io.druid.indexing.overlord.TaskLockbox; -import io.druid.indexing.overlord.TaskMaster; -import io.druid.indexing.overlord.TaskRunnerFactory; -import io.druid.indexing.overlord.TaskStorage; -import io.druid.indexing.overlord.TaskStorageQueryAdapter; -import io.druid.indexing.overlord.autoscaling.PendingTaskBasedWorkerProvisioningConfig; -import io.druid.indexing.overlord.autoscaling.PendingTaskBasedWorkerProvisioningStrategy; -import io.druid.indexing.overlord.autoscaling.ProvisioningSchedulerConfig; -import io.druid.indexing.overlord.autoscaling.ProvisioningStrategy; -import io.druid.indexing.overlord.autoscaling.SimpleWorkerProvisioningConfig; -import io.druid.indexing.overlord.autoscaling.SimpleWorkerProvisioningStrategy; -import io.druid.indexing.overlord.config.TaskQueueConfig; -import io.druid.indexing.overlord.helpers.OverlordHelper; -import io.druid.indexing.overlord.helpers.TaskLogAutoCleaner; -import io.druid.indexing.overlord.helpers.TaskLogAutoCleanerConfig; -import io.druid.indexing.overlord.hrtr.HttpRemoteTaskRunnerFactory; -import io.druid.indexing.overlord.hrtr.HttpRemoteTaskRunnerResource; -import io.druid.indexing.overlord.http.OverlordRedirectInfo; -import io.druid.indexing.overlord.http.OverlordResource; -import io.druid.indexing.overlord.setup.WorkerBehaviorConfig; -import io.druid.indexing.overlord.supervisor.SupervisorManager; -import io.druid.indexing.overlord.supervisor.SupervisorResource; -import io.druid.indexing.worker.config.WorkerConfig; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.realtime.firehose.ChatHandlerProvider; -import io.druid.server.audit.AuditManagerProvider; -import io.druid.server.coordinator.CoordinatorOverlordServiceConfig; -import io.druid.server.http.RedirectFilter; -import io.druid.server.http.RedirectInfo; -import io.druid.server.initialization.ServerConfig; -import io.druid.server.initialization.jetty.JettyServerInitUtils; -import io.druid.server.initialization.jetty.JettyServerInitializer; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthenticationUtils; -import io.druid.server.security.Authenticator; -import io.druid.server.security.AuthenticatorMapper; -import io.druid.tasklogs.TaskLogStreamer; -import io.druid.tasklogs.TaskLogs; +import org.apache.druid.audit.AuditManager; +import org.apache.druid.client.indexing.HttpIndexingServiceClient; +import org.apache.druid.client.indexing.IndexingService; +import org.apache.druid.client.indexing.IndexingServiceClient; +import org.apache.druid.client.indexing.IndexingServiceSelectorConfig; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.guice.IndexingServiceFirehoseModule; +import org.apache.druid.guice.IndexingServiceModuleHelper; +import org.apache.druid.guice.IndexingServiceTaskLogsModule; +import org.apache.druid.guice.JacksonConfigProvider; +import org.apache.druid.guice.Jerseys; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.LifecycleModule; +import org.apache.druid.guice.ListProvider; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.guice.PolyBind; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.indexing.common.actions.LocalTaskActionClientFactory; +import org.apache.druid.indexing.common.actions.TaskActionClientFactory; +import org.apache.druid.indexing.common.actions.TaskActionToolbox; +import org.apache.druid.indexing.common.config.TaskConfig; +import org.apache.druid.indexing.common.config.TaskStorageConfig; +import org.apache.druid.indexing.common.stats.DropwizardRowIngestionMetersFactory; +import org.apache.druid.indexing.common.stats.RowIngestionMetersFactory; +import org.apache.druid.indexing.common.task.IndexTaskClientFactory; +import org.apache.druid.indexing.common.task.batch.parallel.ParallelIndexTaskClient; +import org.apache.druid.indexing.common.tasklogs.SwitchingTaskLogStreamer; +import org.apache.druid.indexing.common.tasklogs.TaskRunnerTaskLogStreamer; +import org.apache.druid.indexing.overlord.ForkingTaskRunnerFactory; +import org.apache.druid.indexing.overlord.HeapMemoryTaskStorage; +import org.apache.druid.indexing.overlord.IndexerMetadataStorageAdapter; +import org.apache.druid.indexing.overlord.MetadataTaskStorage; +import org.apache.druid.indexing.overlord.RemoteTaskRunnerFactory; +import org.apache.druid.indexing.overlord.TaskLockbox; +import org.apache.druid.indexing.overlord.TaskMaster; +import org.apache.druid.indexing.overlord.TaskRunnerFactory; +import org.apache.druid.indexing.overlord.TaskStorage; +import org.apache.druid.indexing.overlord.TaskStorageQueryAdapter; +import org.apache.druid.indexing.overlord.autoscaling.PendingTaskBasedWorkerProvisioningConfig; +import org.apache.druid.indexing.overlord.autoscaling.PendingTaskBasedWorkerProvisioningStrategy; +import org.apache.druid.indexing.overlord.autoscaling.ProvisioningSchedulerConfig; +import org.apache.druid.indexing.overlord.autoscaling.ProvisioningStrategy; +import org.apache.druid.indexing.overlord.autoscaling.SimpleWorkerProvisioningConfig; +import org.apache.druid.indexing.overlord.autoscaling.SimpleWorkerProvisioningStrategy; +import org.apache.druid.indexing.overlord.config.TaskQueueConfig; +import org.apache.druid.indexing.overlord.helpers.OverlordHelper; +import org.apache.druid.indexing.overlord.helpers.TaskLogAutoCleaner; +import org.apache.druid.indexing.overlord.helpers.TaskLogAutoCleanerConfig; +import org.apache.druid.indexing.overlord.hrtr.HttpRemoteTaskRunnerFactory; +import org.apache.druid.indexing.overlord.hrtr.HttpRemoteTaskRunnerResource; +import org.apache.druid.indexing.overlord.http.OverlordRedirectInfo; +import org.apache.druid.indexing.overlord.http.OverlordResource; +import org.apache.druid.indexing.overlord.setup.WorkerBehaviorConfig; +import org.apache.druid.indexing.overlord.supervisor.SupervisorManager; +import org.apache.druid.indexing.overlord.supervisor.SupervisorResource; +import org.apache.druid.indexing.worker.config.WorkerConfig; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.realtime.firehose.ChatHandlerProvider; +import org.apache.druid.server.audit.AuditManagerProvider; +import org.apache.druid.server.coordinator.CoordinatorOverlordServiceConfig; +import org.apache.druid.server.http.RedirectFilter; +import org.apache.druid.server.http.RedirectInfo; +import org.apache.druid.server.initialization.ServerConfig; +import org.apache.druid.server.initialization.jetty.JettyServerInitUtils; +import org.apache.druid.server.initialization.jetty.JettyServerInitializer; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthenticationUtils; +import org.apache.druid.server.security.Authenticator; +import org.apache.druid.server.security.AuthenticatorMapper; +import org.apache.druid.tasklogs.TaskLogStreamer; +import org.apache.druid.tasklogs.TaskLogs; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.HandlerList; diff --git a/services/src/main/java/io/druid/cli/CliPeon.java b/services/src/main/java/org/apache/druid/cli/CliPeon.java similarity index 74% rename from services/src/main/java/io/druid/cli/CliPeon.java rename to services/src/main/java/org/apache/druid/cli/CliPeon.java index d410b356a556..3519da0770d6 100644 --- a/services/src/main/java/io/druid/cli/CliPeon.java +++ b/services/src/main/java/org/apache/druid/cli/CliPeon.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.cli; +package org.apache.druid.cli; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Throwables; @@ -35,73 +35,73 @@ import io.airlift.airline.Arguments; import io.airlift.airline.Command; import io.airlift.airline.Option; -import io.druid.client.cache.CacheConfig; -import io.druid.client.coordinator.CoordinatorClient; -import io.druid.client.indexing.HttpIndexingServiceClient; -import io.druid.client.indexing.IndexingServiceClient; -import io.druid.guice.Binders; -import io.druid.guice.CacheModule; -import io.druid.guice.DruidProcessingModule; -import io.druid.guice.IndexingServiceFirehoseModule; -import io.druid.guice.Jerseys; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.LazySingleton; -import io.druid.guice.LifecycleModule; -import io.druid.guice.ManageLifecycle; -import io.druid.guice.NodeTypeConfig; -import io.druid.guice.PolyBind; -import io.druid.guice.QueryRunnerFactoryModule; -import io.druid.guice.QueryableModule; -import io.druid.guice.QueryablePeonModule; -import io.druid.guice.annotations.Json; -import io.druid.guice.annotations.Smile; -import io.druid.indexing.common.RetryPolicyConfig; -import io.druid.indexing.common.RetryPolicyFactory; -import io.druid.indexing.common.TaskReportFileWriter; -import io.druid.indexing.common.TaskToolboxFactory; -import io.druid.indexing.common.actions.LocalTaskActionClientFactory; -import io.druid.indexing.common.actions.RemoteTaskActionClientFactory; -import io.druid.indexing.common.actions.TaskActionClientFactory; -import io.druid.indexing.common.actions.TaskActionToolbox; -import io.druid.indexing.common.config.TaskConfig; -import io.druid.indexing.common.config.TaskStorageConfig; -import io.druid.indexing.common.stats.DropwizardRowIngestionMetersFactory; -import io.druid.indexing.common.stats.RowIngestionMetersFactory; -import io.druid.indexing.common.task.IndexTaskClientFactory; -import io.druid.indexing.common.task.batch.parallel.ParallelIndexTaskClient; -import io.druid.indexing.common.task.batch.parallel.ParallelIndexTaskClientFactory; -import io.druid.indexing.common.task.Task; -import io.druid.indexing.overlord.HeapMemoryTaskStorage; -import io.druid.indexing.overlord.IndexerMetadataStorageCoordinator; -import io.druid.indexing.overlord.SingleTaskBackgroundRunner; -import io.druid.indexing.overlord.TaskRunner; -import io.druid.indexing.overlord.TaskStorage; -import io.druid.indexing.worker.executor.ExecutorLifecycle; -import io.druid.indexing.worker.executor.ExecutorLifecycleConfig; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.common.logger.Logger; -import io.druid.metadata.IndexerSQLMetadataStorageCoordinator; -import io.druid.query.QuerySegmentWalker; -import io.druid.query.lookup.LookupModule; -import io.druid.segment.loading.DataSegmentArchiver; -import io.druid.segment.loading.DataSegmentKiller; -import io.druid.segment.loading.DataSegmentMover; -import io.druid.segment.loading.OmniDataSegmentArchiver; -import io.druid.segment.loading.OmniDataSegmentKiller; -import io.druid.segment.loading.OmniDataSegmentMover; -import io.druid.segment.loading.SegmentLoaderConfig; -import io.druid.segment.realtime.firehose.ChatHandlerProvider; -import io.druid.segment.realtime.firehose.NoopChatHandlerProvider; -import io.druid.segment.realtime.firehose.ServiceAnnouncingChatHandlerProvider; -import io.druid.segment.realtime.plumber.CoordinatorBasedSegmentHandoffNotifierConfig; -import io.druid.segment.realtime.plumber.CoordinatorBasedSegmentHandoffNotifierFactory; -import io.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; -import io.druid.server.coordination.BatchDataSegmentAnnouncer; -import io.druid.server.coordination.ServerType; -import io.druid.server.http.SegmentListerResource; -import io.druid.server.initialization.jetty.ChatHandlerServerModule; -import io.druid.server.initialization.jetty.JettyServerInitializer; -import io.druid.server.metrics.DataSourceTaskIdHolder; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.client.coordinator.CoordinatorClient; +import org.apache.druid.client.indexing.HttpIndexingServiceClient; +import org.apache.druid.client.indexing.IndexingServiceClient; +import org.apache.druid.guice.Binders; +import org.apache.druid.guice.CacheModule; +import org.apache.druid.guice.DruidProcessingModule; +import org.apache.druid.guice.IndexingServiceFirehoseModule; +import org.apache.druid.guice.Jerseys; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.LifecycleModule; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.guice.NodeTypeConfig; +import org.apache.druid.guice.PolyBind; +import org.apache.druid.guice.QueryRunnerFactoryModule; +import org.apache.druid.guice.QueryableModule; +import org.apache.druid.guice.QueryablePeonModule; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.guice.annotations.Smile; +import org.apache.druid.indexing.common.RetryPolicyConfig; +import org.apache.druid.indexing.common.RetryPolicyFactory; +import org.apache.druid.indexing.common.TaskReportFileWriter; +import org.apache.druid.indexing.common.TaskToolboxFactory; +import org.apache.druid.indexing.common.actions.LocalTaskActionClientFactory; +import org.apache.druid.indexing.common.actions.RemoteTaskActionClientFactory; +import org.apache.druid.indexing.common.actions.TaskActionClientFactory; +import org.apache.druid.indexing.common.actions.TaskActionToolbox; +import org.apache.druid.indexing.common.config.TaskConfig; +import org.apache.druid.indexing.common.config.TaskStorageConfig; +import org.apache.druid.indexing.common.stats.DropwizardRowIngestionMetersFactory; +import org.apache.druid.indexing.common.stats.RowIngestionMetersFactory; +import org.apache.druid.indexing.common.task.IndexTaskClientFactory; +import org.apache.druid.indexing.common.task.batch.parallel.ParallelIndexTaskClient; +import org.apache.druid.indexing.common.task.batch.parallel.ParallelIndexTaskClientFactory; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.overlord.HeapMemoryTaskStorage; +import org.apache.druid.indexing.overlord.IndexerMetadataStorageCoordinator; +import org.apache.druid.indexing.overlord.SingleTaskBackgroundRunner; +import org.apache.druid.indexing.overlord.TaskRunner; +import org.apache.druid.indexing.overlord.TaskStorage; +import org.apache.druid.indexing.worker.executor.ExecutorLifecycle; +import org.apache.druid.indexing.worker.executor.ExecutorLifecycleConfig; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.metadata.IndexerSQLMetadataStorageCoordinator; +import org.apache.druid.query.QuerySegmentWalker; +import org.apache.druid.query.lookup.LookupModule; +import org.apache.druid.segment.loading.DataSegmentArchiver; +import org.apache.druid.segment.loading.DataSegmentKiller; +import org.apache.druid.segment.loading.DataSegmentMover; +import org.apache.druid.segment.loading.OmniDataSegmentArchiver; +import org.apache.druid.segment.loading.OmniDataSegmentKiller; +import org.apache.druid.segment.loading.OmniDataSegmentMover; +import org.apache.druid.segment.loading.SegmentLoaderConfig; +import org.apache.druid.segment.realtime.firehose.ChatHandlerProvider; +import org.apache.druid.segment.realtime.firehose.NoopChatHandlerProvider; +import org.apache.druid.segment.realtime.firehose.ServiceAnnouncingChatHandlerProvider; +import org.apache.druid.segment.realtime.plumber.CoordinatorBasedSegmentHandoffNotifierConfig; +import org.apache.druid.segment.realtime.plumber.CoordinatorBasedSegmentHandoffNotifierFactory; +import org.apache.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; +import org.apache.druid.server.coordination.BatchDataSegmentAnnouncer; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.server.http.SegmentListerResource; +import org.apache.druid.server.initialization.jetty.ChatHandlerServerModule; +import org.apache.druid.server.initialization.jetty.JettyServerInitializer; +import org.apache.druid.server.metrics.DataSourceTaskIdHolder; import org.eclipse.jetty.server.Server; import javax.annotation.Nullable; diff --git a/services/src/main/java/io/druid/cli/CliRealtime.java b/services/src/main/java/org/apache/druid/cli/CliRealtime.java similarity index 82% rename from services/src/main/java/io/druid/cli/CliRealtime.java rename to services/src/main/java/org/apache/druid/cli/CliRealtime.java index 04b6f7fa6cbb..9319047351cb 100644 --- a/services/src/main/java/io/druid/cli/CliRealtime.java +++ b/services/src/main/java/org/apache/druid/cli/CliRealtime.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.cli; +package org.apache.druid.cli; import com.google.common.collect.ImmutableList; import com.google.inject.Inject; import com.google.inject.Module; import com.google.inject.name.Names; import io.airlift.airline.Command; -import io.druid.guice.DruidProcessingModule; -import io.druid.guice.QueryRunnerFactoryModule; -import io.druid.guice.QueryableModule; -import io.druid.guice.RealtimeModule; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.lookup.LookupModule; -import io.druid.server.initialization.jetty.ChatHandlerServerModule; +import org.apache.druid.guice.DruidProcessingModule; +import org.apache.druid.guice.QueryRunnerFactoryModule; +import org.apache.druid.guice.QueryableModule; +import org.apache.druid.guice.RealtimeModule; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.lookup.LookupModule; +import org.apache.druid.server.initialization.jetty.ChatHandlerServerModule; import java.util.List; import java.util.Properties; diff --git a/services/src/main/java/io/druid/cli/CliRealtimeExample.java b/services/src/main/java/org/apache/druid/cli/CliRealtimeExample.java similarity index 78% rename from services/src/main/java/io/druid/cli/CliRealtimeExample.java rename to services/src/main/java/org/apache/druid/cli/CliRealtimeExample.java index e717ebb3693f..a066f9977e1a 100644 --- a/services/src/main/java/io/druid/cli/CliRealtimeExample.java +++ b/services/src/main/java/org/apache/druid/cli/CliRealtimeExample.java @@ -17,29 +17,29 @@ * under the License. */ -package io.druid.cli; +package org.apache.druid.cli; import com.google.common.collect.ImmutableList; import com.google.inject.Inject; import com.google.inject.Module; import com.google.inject.name.Names; import io.airlift.airline.Command; -import io.druid.client.DruidServer; -import io.druid.client.InventoryView; -import io.druid.client.ServerView; -import io.druid.guice.DruidProcessingModule; -import io.druid.guice.LazySingleton; -import io.druid.guice.QueryRunnerFactoryModule; -import io.druid.guice.QueryableModule; -import io.druid.guice.RealtimeModule; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.lookup.LookupModule; -import io.druid.segment.loading.DataSegmentPusher; -import io.druid.segment.loading.NoopDataSegmentPusher; -import io.druid.server.coordination.DataSegmentAnnouncer; -import io.druid.server.coordination.NoopDataSegmentAnnouncer; -import io.druid.server.initialization.jetty.ChatHandlerServerModule; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.DruidServer; +import org.apache.druid.client.InventoryView; +import org.apache.druid.client.ServerView; +import org.apache.druid.guice.DruidProcessingModule; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.QueryRunnerFactoryModule; +import org.apache.druid.guice.QueryableModule; +import org.apache.druid.guice.RealtimeModule; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.lookup.LookupModule; +import org.apache.druid.segment.loading.DataSegmentPusher; +import org.apache.druid.segment.loading.NoopDataSegmentPusher; +import org.apache.druid.server.coordination.DataSegmentAnnouncer; +import org.apache.druid.server.coordination.NoopDataSegmentAnnouncer; +import org.apache.druid.server.initialization.jetty.ChatHandlerServerModule; +import org.apache.druid.timeline.DataSegment; import java.util.Collection; import java.util.List; diff --git a/services/src/main/java/io/druid/cli/CliRouter.java b/services/src/main/java/org/apache/druid/cli/CliRouter.java similarity index 72% rename from services/src/main/java/io/druid/cli/CliRouter.java rename to services/src/main/java/org/apache/druid/cli/CliRouter.java index d3216a534333..88a77a346623 100644 --- a/services/src/main/java/io/druid/cli/CliRouter.java +++ b/services/src/main/java/org/apache/druid/cli/CliRouter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.cli; +package org.apache.druid.cli; import com.google.common.collect.ImmutableList; import com.google.inject.Binder; @@ -27,38 +27,38 @@ import com.google.inject.TypeLiteral; import com.google.inject.name.Names; import io.airlift.airline.Command; -import io.druid.curator.discovery.DiscoveryModule; -import io.druid.curator.discovery.ServerDiscoveryFactory; -import io.druid.curator.discovery.ServerDiscoverySelector; -import io.druid.discovery.DruidLeaderClient; -import io.druid.discovery.DruidNodeDiscoveryProvider; -import io.druid.guice.Jerseys; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.LazySingleton; -import io.druid.guice.LifecycleModule; -import io.druid.guice.ManageLifecycle; -import io.druid.guice.QueryRunnerFactoryModule; -import io.druid.guice.QueryableModule; -import io.druid.guice.RouterProcessingModule; -import io.druid.guice.annotations.EscalatedGlobal; -import io.druid.guice.annotations.Self; -import io.druid.guice.http.JettyHttpClientModule; -import io.druid.java.util.common.logger.Logger; -import io.druid.java.util.http.client.HttpClient; -import io.druid.query.lookup.LookupModule; -import io.druid.server.AsyncQueryForwardingServlet; -import io.druid.server.http.RouterResource; -import io.druid.server.initialization.jetty.JettyServerInitializer; -import io.druid.server.metrics.QueryCountStatsProvider; -import io.druid.server.router.AvaticaConnectionBalancer; -import io.druid.server.router.CoordinatorRuleManager; -import io.druid.server.router.ManagementProxyConfig; -import io.druid.server.router.QueryHostFinder; -import io.druid.server.router.Router; -import io.druid.server.router.TieredBrokerConfig; -import io.druid.server.router.TieredBrokerHostSelector; -import io.druid.server.router.TieredBrokerSelectorStrategiesProvider; -import io.druid.server.router.TieredBrokerSelectorStrategy; +import org.apache.druid.curator.discovery.DiscoveryModule; +import org.apache.druid.curator.discovery.ServerDiscoveryFactory; +import org.apache.druid.curator.discovery.ServerDiscoverySelector; +import org.apache.druid.discovery.DruidLeaderClient; +import org.apache.druid.discovery.DruidNodeDiscoveryProvider; +import org.apache.druid.guice.Jerseys; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.LifecycleModule; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.guice.QueryRunnerFactoryModule; +import org.apache.druid.guice.QueryableModule; +import org.apache.druid.guice.RouterProcessingModule; +import org.apache.druid.guice.annotations.EscalatedGlobal; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.guice.http.JettyHttpClientModule; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.http.client.HttpClient; +import org.apache.druid.query.lookup.LookupModule; +import org.apache.druid.server.AsyncQueryForwardingServlet; +import org.apache.druid.server.http.RouterResource; +import org.apache.druid.server.initialization.jetty.JettyServerInitializer; +import org.apache.druid.server.metrics.QueryCountStatsProvider; +import org.apache.druid.server.router.AvaticaConnectionBalancer; +import org.apache.druid.server.router.CoordinatorRuleManager; +import org.apache.druid.server.router.ManagementProxyConfig; +import org.apache.druid.server.router.QueryHostFinder; +import org.apache.druid.server.router.Router; +import org.apache.druid.server.router.TieredBrokerConfig; +import org.apache.druid.server.router.TieredBrokerHostSelector; +import org.apache.druid.server.router.TieredBrokerSelectorStrategiesProvider; +import org.apache.druid.server.router.TieredBrokerSelectorStrategy; import org.eclipse.jetty.server.Server; import java.util.List; diff --git a/services/src/main/java/io/druid/cli/CoordinatorJettyServerInitializer.java b/services/src/main/java/org/apache/druid/cli/CoordinatorJettyServerInitializer.java similarity index 87% rename from services/src/main/java/io/druid/cli/CoordinatorJettyServerInitializer.java rename to services/src/main/java/org/apache/druid/cli/CoordinatorJettyServerInitializer.java index b87c87a54c2c..1674038db767 100644 --- a/services/src/main/java/io/druid/cli/CoordinatorJettyServerInitializer.java +++ b/services/src/main/java/org/apache/druid/cli/CoordinatorJettyServerInitializer.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.cli; +package org.apache.druid.cli; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Lists; @@ -25,18 +25,18 @@ import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.servlet.GuiceFilter; -import io.druid.guice.annotations.Json; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.coordinator.DruidCoordinatorConfig; -import io.druid.server.http.OverlordProxyServlet; -import io.druid.server.http.RedirectFilter; -import io.druid.server.initialization.ServerConfig; -import io.druid.server.initialization.jetty.JettyServerInitUtils; -import io.druid.server.initialization.jetty.JettyServerInitializer; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthenticationUtils; -import io.druid.server.security.Authenticator; -import io.druid.server.security.AuthenticatorMapper; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.coordinator.DruidCoordinatorConfig; +import org.apache.druid.server.http.OverlordProxyServlet; +import org.apache.druid.server.http.RedirectFilter; +import org.apache.druid.server.initialization.ServerConfig; +import org.apache.druid.server.initialization.jetty.JettyServerInitUtils; +import org.apache.druid.server.initialization.jetty.JettyServerInitializer; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthenticationUtils; +import org.apache.druid.server.security.Authenticator; +import org.apache.druid.server.security.AuthenticatorMapper; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.HandlerList; @@ -97,13 +97,13 @@ public void initialize(Server server, Injector injector) ResourceCollection staticResources; if (beOverlord) { staticResources = new ResourceCollection( - Resource.newClassPathResource("io/druid/console"), + Resource.newClassPathResource("org/apache/druid/console"), Resource.newClassPathResource("static"), Resource.newClassPathResource("indexer_static") ); } else { staticResources = new ResourceCollection( - Resource.newClassPathResource("io/druid/console"), + Resource.newClassPathResource("org/apache/druid/console"), Resource.newClassPathResource("static") ); } diff --git a/services/src/main/java/io/druid/cli/CoordinatorOverlordRedirectInfo.java b/services/src/main/java/org/apache/druid/cli/CoordinatorOverlordRedirectInfo.java similarity index 85% rename from services/src/main/java/io/druid/cli/CoordinatorOverlordRedirectInfo.java rename to services/src/main/java/org/apache/druid/cli/CoordinatorOverlordRedirectInfo.java index 1dc10d9aee19..60415ea4f323 100644 --- a/services/src/main/java/io/druid/cli/CoordinatorOverlordRedirectInfo.java +++ b/services/src/main/java/org/apache/druid/cli/CoordinatorOverlordRedirectInfo.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.cli; +package org.apache.druid.cli; import com.google.inject.Inject; -import io.druid.indexing.overlord.TaskMaster; -import io.druid.indexing.overlord.http.OverlordRedirectInfo; -import io.druid.server.coordinator.DruidCoordinator; -import io.druid.server.http.CoordinatorRedirectInfo; -import io.druid.server.http.RedirectInfo; +import org.apache.druid.indexing.overlord.TaskMaster; +import org.apache.druid.indexing.overlord.http.OverlordRedirectInfo; +import org.apache.druid.server.coordinator.DruidCoordinator; +import org.apache.druid.server.http.CoordinatorRedirectInfo; +import org.apache.druid.server.http.RedirectInfo; import java.net.URL; diff --git a/services/src/main/java/io/druid/cli/CreateTables.java b/services/src/main/java/org/apache/druid/cli/CreateTables.java similarity index 84% rename from services/src/main/java/io/druid/cli/CreateTables.java rename to services/src/main/java/org/apache/druid/cli/CreateTables.java index 4c1fcfab50ea..5e8c4451f45d 100644 --- a/services/src/main/java/io/druid/cli/CreateTables.java +++ b/services/src/main/java/org/apache/druid/cli/CreateTables.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.cli; +package org.apache.druid.cli; import com.google.common.collect.ImmutableList; import com.google.inject.Injector; @@ -25,16 +25,16 @@ import com.google.inject.Module; import io.airlift.airline.Command; import io.airlift.airline.Option; -import io.druid.guice.DruidProcessingModule; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.QueryRunnerFactoryModule; -import io.druid.guice.QueryableModule; -import io.druid.guice.annotations.Self; -import io.druid.java.util.common.logger.Logger; -import io.druid.metadata.MetadataStorageConnector; -import io.druid.metadata.MetadataStorageConnectorConfig; -import io.druid.metadata.MetadataStorageTablesConfig; -import io.druid.server.DruidNode; +import org.apache.druid.guice.DruidProcessingModule; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.QueryRunnerFactoryModule; +import org.apache.druid.guice.QueryableModule; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.metadata.MetadataStorageConnector; +import org.apache.druid.metadata.MetadataStorageConnectorConfig; +import org.apache.druid.metadata.MetadataStorageTablesConfig; +import org.apache.druid.server.DruidNode; import java.util.List; @@ -69,7 +69,7 @@ protected List getModules() return ImmutableList.of( // It's unknown why those modules are required in CreateTables, and if all of those modules are required or not. // Maybe some of those modules could be removed. - // See https://github.com/druid-io/druid/pull/4429#discussion_r123602930 + // See https://github.com/apache/incubator-druid/pull/4429#discussion_r123602930 new DruidProcessingModule(), new QueryableModule(), new QueryRunnerFactoryModule(), diff --git a/services/src/main/java/io/druid/cli/DumpSegment.java b/services/src/main/java/org/apache/druid/cli/DumpSegment.java similarity index 86% rename from services/src/main/java/io/druid/cli/DumpSegment.java rename to services/src/main/java/org/apache/druid/cli/DumpSegment.java index fdaa02439ad8..28bfe0e71fce 100644 --- a/services/src/main/java/io/druid/cli/DumpSegment.java +++ b/services/src/main/java/org/apache/druid/cli/DumpSegment.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.cli; +package org.apache.druid.cli; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.ObjectMapper; @@ -36,51 +36,51 @@ import com.google.inject.name.Names; import io.airlift.airline.Command; import io.airlift.airline.Option; -import io.druid.collections.bitmap.BitmapFactory; -import io.druid.collections.bitmap.ConciseBitmapFactory; -import io.druid.collections.bitmap.ImmutableBitmap; -import io.druid.collections.bitmap.RoaringBitmapFactory; -import io.druid.common.config.NullHandling; -import io.druid.guice.DruidProcessingModule; -import io.druid.guice.QueryRunnerFactoryModule; -import io.druid.guice.QueryableModule; -import io.druid.guice.annotations.Json; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.DruidProcessingConfig; -import io.druid.query.Query; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryRunnerFactoryConglomerate; -import io.druid.query.SegmentDescriptor; -import io.druid.query.TableDataSource; -import io.druid.query.filter.DimFilter; -import io.druid.query.metadata.metadata.ListColumnIncluderator; -import io.druid.query.metadata.metadata.SegmentAnalysis; -import io.druid.query.metadata.metadata.SegmentMetadataQuery; -import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; -import io.druid.query.spec.SpecificSegmentSpec; -import io.druid.segment.BaseObjectColumnValueSelector; -import io.druid.segment.ColumnValueSelector; -import io.druid.segment.Cursor; -import io.druid.segment.IndexIO; -import io.druid.segment.QueryableIndex; -import io.druid.segment.QueryableIndexSegment; -import io.druid.segment.QueryableIndexStorageAdapter; -import io.druid.segment.VirtualColumns; -import io.druid.segment.column.BitmapIndex; -import io.druid.segment.column.Column; -import io.druid.segment.column.ColumnConfig; -import io.druid.segment.data.BitmapSerdeFactory; -import io.druid.segment.data.ConciseBitmapSerdeFactory; -import io.druid.segment.data.RoaringBitmapSerdeFactory; -import io.druid.segment.filter.Filters; +import org.apache.druid.collections.bitmap.BitmapFactory; +import org.apache.druid.collections.bitmap.ConciseBitmapFactory; +import org.apache.druid.collections.bitmap.ImmutableBitmap; +import org.apache.druid.collections.bitmap.RoaringBitmapFactory; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.guice.DruidProcessingModule; +import org.apache.druid.guice.QueryRunnerFactoryModule; +import org.apache.druid.guice.QueryableModule; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.DruidProcessingConfig; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryRunnerFactoryConglomerate; +import org.apache.druid.query.SegmentDescriptor; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.metadata.metadata.ListColumnIncluderator; +import org.apache.druid.query.metadata.metadata.SegmentAnalysis; +import org.apache.druid.query.metadata.metadata.SegmentMetadataQuery; +import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector; +import org.apache.druid.query.spec.SpecificSegmentSpec; +import org.apache.druid.segment.BaseObjectColumnValueSelector; +import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.Cursor; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.QueryableIndexSegment; +import org.apache.druid.segment.QueryableIndexStorageAdapter; +import org.apache.druid.segment.VirtualColumns; +import org.apache.druid.segment.column.BitmapIndex; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ColumnConfig; +import org.apache.druid.segment.data.BitmapSerdeFactory; +import org.apache.druid.segment.data.ConciseBitmapSerdeFactory; +import org.apache.druid.segment.data.RoaringBitmapSerdeFactory; +import org.apache.druid.segment.filter.Filters; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.chrono.ISOChronology; diff --git a/services/src/main/java/io/druid/cli/GuiceRunnable.java b/services/src/main/java/org/apache/druid/cli/GuiceRunnable.java similarity index 92% rename from services/src/main/java/io/druid/cli/GuiceRunnable.java rename to services/src/main/java/org/apache/druid/cli/GuiceRunnable.java index 31622cde4179..a1ec9d21ab86 100644 --- a/services/src/main/java/io/druid/cli/GuiceRunnable.java +++ b/services/src/main/java/org/apache/druid/cli/GuiceRunnable.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.cli; +package org.apache.druid.cli; import com.google.common.base.Throwables; import com.google.common.collect.Ordering; @@ -25,10 +25,10 @@ import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Module; -import io.druid.initialization.Initialization; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.log.StartupLoggingConfig; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.log.StartupLoggingConfig; import java.util.List; import java.util.Properties; diff --git a/services/src/main/java/io/druid/cli/InsertSegment.java b/services/src/main/java/org/apache/druid/cli/InsertSegment.java similarity index 86% rename from services/src/main/java/io/druid/cli/InsertSegment.java rename to services/src/main/java/org/apache/druid/cli/InsertSegment.java index cbd6f6fbed44..34f4974236e0 100644 --- a/services/src/main/java/io/druid/cli/InsertSegment.java +++ b/services/src/main/java/org/apache/druid/cli/InsertSegment.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.cli; +package org.apache.druid.cli; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; @@ -27,17 +27,17 @@ import com.google.inject.Module; import io.airlift.airline.Command; import io.airlift.airline.Option; -import io.druid.guice.DruidProcessingModule; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.QueryRunnerFactoryModule; -import io.druid.guice.QueryableModule; -import io.druid.guice.annotations.Self; -import io.druid.indexing.overlord.IndexerMetadataStorageCoordinator; -import io.druid.java.util.common.logger.Logger; -import io.druid.segment.loading.DataSegmentFinder; -import io.druid.segment.loading.SegmentLoadingException; -import io.druid.server.DruidNode; -import io.druid.timeline.DataSegment; +import org.apache.druid.guice.DruidProcessingModule; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.QueryRunnerFactoryModule; +import org.apache.druid.guice.QueryableModule; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.indexing.overlord.IndexerMetadataStorageCoordinator; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.segment.loading.DataSegmentFinder; +import org.apache.druid.segment.loading.SegmentLoadingException; +import org.apache.druid.server.DruidNode; +import org.apache.druid.timeline.DataSegment; import java.io.IOException; import java.util.List; @@ -72,7 +72,7 @@ protected List getModules() return ImmutableList.of( // It's unknown if those modules are required in InsertSegment. // Maybe some of those modules could be removed. - // See https://github.com/druid-io/druid/pull/4429#discussion_r123603498 + // See https://github.com/apache/incubator-druid/pull/4429#discussion_r123603498 new DruidProcessingModule(), new QueryableModule(), new QueryRunnerFactoryModule(), diff --git a/services/src/main/java/io/druid/cli/Log4JShutdownPropertyChecker.java b/services/src/main/java/org/apache/druid/cli/Log4JShutdownPropertyChecker.java similarity index 94% rename from services/src/main/java/io/druid/cli/Log4JShutdownPropertyChecker.java rename to services/src/main/java/org/apache/druid/cli/Log4JShutdownPropertyChecker.java index 1cb0f55ec2ec..2d02670bb336 100644 --- a/services/src/main/java/io/druid/cli/Log4JShutdownPropertyChecker.java +++ b/services/src/main/java/org/apache/druid/cli/Log4JShutdownPropertyChecker.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.cli; +package org.apache.druid.cli; import java.util.Properties; @@ -27,7 +27,7 @@ public class Log4JShutdownPropertyChecker implements PropertyChecker public void checkProperties(Properties properties) { if (!properties.containsKey("log4j.shutdownCallbackRegistry")) { - properties.setProperty("log4j.shutdownCallbackRegistry", "io.druid.common.config.Log4jShutdown"); + properties.setProperty("log4j.shutdownCallbackRegistry", "org.apache.druid.common.config.Log4jShutdown"); } if (!properties.containsKey("log4j.shutdownHookEnabled")) { properties.setProperty("log4j.shutdownHookEnabled", "true"); diff --git a/services/src/main/java/io/druid/cli/Main.java b/services/src/main/java/org/apache/druid/cli/Main.java similarity index 94% rename from services/src/main/java/io/druid/cli/Main.java rename to services/src/main/java/org/apache/druid/cli/Main.java index a2c16608cd64..0c0b0c6bbadf 100644 --- a/services/src/main/java/io/druid/cli/Main.java +++ b/services/src/main/java/org/apache/druid/cli/Main.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.cli; +package org.apache.druid.cli; import com.google.inject.Injector; import io.airlift.airline.Cli; import io.airlift.airline.Help; import io.airlift.airline.ParseException; -import io.druid.cli.validate.DruidJsonValidator; -import io.druid.guice.ExtensionsConfig; -import io.druid.guice.GuiceInjectors; -import io.druid.initialization.Initialization; +import org.apache.druid.cli.validate.DruidJsonValidator; +import org.apache.druid.guice.ExtensionsConfig; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.initialization.Initialization; import java.util.Arrays; import java.util.Collection; diff --git a/services/src/main/java/io/druid/cli/MiddleManagerJettyServerInitializer.java b/services/src/main/java/org/apache/druid/cli/MiddleManagerJettyServerInitializer.java similarity index 86% rename from services/src/main/java/io/druid/cli/MiddleManagerJettyServerInitializer.java rename to services/src/main/java/org/apache/druid/cli/MiddleManagerJettyServerInitializer.java index 9021ddb0babe..b544f3b7f73d 100644 --- a/services/src/main/java/io/druid/cli/MiddleManagerJettyServerInitializer.java +++ b/services/src/main/java/org/apache/druid/cli/MiddleManagerJettyServerInitializer.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.cli; +package org.apache.druid.cli; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.servlet.GuiceFilter; -import io.druid.guice.annotations.Json; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.initialization.ServerConfig; -import io.druid.server.initialization.jetty.JettyServerInitUtils; -import io.druid.server.initialization.jetty.JettyServerInitializer; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthenticationUtils; -import io.druid.server.security.Authenticator; -import io.druid.server.security.AuthenticatorMapper; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.initialization.ServerConfig; +import org.apache.druid.server.initialization.jetty.JettyServerInitUtils; +import org.apache.druid.server.initialization.jetty.JettyServerInitializer; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthenticationUtils; +import org.apache.druid.server.security.Authenticator; +import org.apache.druid.server.security.AuthenticatorMapper; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.DefaultHandler; diff --git a/services/src/main/java/io/druid/cli/PropertyChecker.java b/services/src/main/java/org/apache/druid/cli/PropertyChecker.java similarity index 98% rename from services/src/main/java/io/druid/cli/PropertyChecker.java rename to services/src/main/java/org/apache/druid/cli/PropertyChecker.java index e82553899530..db114c5842e5 100644 --- a/services/src/main/java/io/druid/cli/PropertyChecker.java +++ b/services/src/main/java/org/apache/druid/cli/PropertyChecker.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.cli; +package org.apache.druid.cli; import java.util.Properties; diff --git a/services/src/main/java/io/druid/cli/PullDependencies.java b/services/src/main/java/org/apache/druid/cli/PullDependencies.java similarity index 98% rename from services/src/main/java/io/druid/cli/PullDependencies.java rename to services/src/main/java/org/apache/druid/cli/PullDependencies.java index 5ce69e13fc1d..58e7c70652e9 100644 --- a/services/src/main/java/io/druid/cli/PullDependencies.java +++ b/services/src/main/java/org/apache/druid/cli/PullDependencies.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.cli; +package org.apache.druid.cli; import com.google.common.base.Strings; import com.google.common.base.Throwables; @@ -27,11 +27,11 @@ import com.google.inject.Inject; import io.airlift.airline.Command; import io.airlift.airline.Option; -import io.druid.guice.ExtensionsConfig; -import io.druid.indexing.common.config.TaskConfig; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.guice.ExtensionsConfig; +import org.apache.druid.indexing.common.config.TaskConfig; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; import io.tesla.aether.Repository; import io.tesla.aether.TeslaAether; import io.tesla.aether.guice.RepositorySystemSessionProvider; @@ -108,7 +108,7 @@ public class PullDependencies implements Runnable // Conflicts can be discovered using the following command on the distribution tarball: // `find lib -iname *.jar | cut -d / -f 2 | sed -e 's/-[0-9]\.[0-9]/@/' | cut -f 1 -d @ | sort | uniq | xargs -I {} find extensions -name "*{}*.jar" | sort` - "io.druid", + "org.apache.druid", "com.metamx.druid", "asm", "org.ow2.asm", @@ -154,7 +154,7 @@ public class PullDependencies implements Runnable @Option( name = {"-c", "--coordinate"}, title = "coordinate", - description = "Extension coordinate to pull down, followed by a maven coordinate, e.g. io.druid.extensions:mysql-metadata-storage", + description = "Extension coordinate to pull down, followed by a maven coordinate, e.g. org.apache.druid.extensions:mysql-metadata-storage", required = false) public List coordinates = Lists.newArrayList(); diff --git a/services/src/main/java/io/druid/cli/QueryJettyServerInitializer.java b/services/src/main/java/org/apache/druid/cli/QueryJettyServerInitializer.java similarity index 88% rename from services/src/main/java/io/druid/cli/QueryJettyServerInitializer.java rename to services/src/main/java/org/apache/druid/cli/QueryJettyServerInitializer.java index 2b7fc6517dbd..48d2962497f5 100644 --- a/services/src/main/java/io/druid/cli/QueryJettyServerInitializer.java +++ b/services/src/main/java/org/apache/druid/cli/QueryJettyServerInitializer.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.cli; +package org.apache.druid.cli; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; @@ -26,16 +26,16 @@ import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.servlet.GuiceFilter; -import io.druid.guice.annotations.Json; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.initialization.ServerConfig; -import io.druid.server.initialization.jetty.JettyServerInitUtils; -import io.druid.server.initialization.jetty.JettyServerInitializer; -import io.druid.server.initialization.jetty.LimitRequestsFilter; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthenticationUtils; -import io.druid.server.security.Authenticator; -import io.druid.server.security.AuthenticatorMapper; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.initialization.ServerConfig; +import org.apache.druid.server.initialization.jetty.JettyServerInitUtils; +import org.apache.druid.server.initialization.jetty.JettyServerInitializer; +import org.apache.druid.server.initialization.jetty.LimitRequestsFilter; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthenticationUtils; +import org.apache.druid.server.security.Authenticator; +import org.apache.druid.server.security.AuthenticatorMapper; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.HandlerList; diff --git a/services/src/main/java/io/druid/cli/ResetCluster.java b/services/src/main/java/org/apache/druid/cli/ResetCluster.java similarity index 86% rename from services/src/main/java/io/druid/cli/ResetCluster.java rename to services/src/main/java/org/apache/druid/cli/ResetCluster.java index 1d97ea337886..a6de4443c153 100644 --- a/services/src/main/java/io/druid/cli/ResetCluster.java +++ b/services/src/main/java/org/apache/druid/cli/ResetCluster.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.cli; +package org.apache.druid.cli; import com.google.common.collect.ImmutableList; import com.google.inject.Injector; @@ -25,20 +25,20 @@ import com.google.inject.Module; import io.airlift.airline.Command; import io.airlift.airline.Option; -import io.druid.guice.DruidProcessingModule; -import io.druid.guice.IndexingServiceTaskLogsModule; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.QueryRunnerFactoryModule; -import io.druid.guice.QueryableModule; -import io.druid.guice.annotations.Self; -import io.druid.indexing.common.config.TaskConfig; -import io.druid.indexing.common.task.HadoopTask; -import io.druid.java.util.common.logger.Logger; -import io.druid.metadata.MetadataStorageConnector; -import io.druid.metadata.MetadataStorageTablesConfig; -import io.druid.segment.loading.DataSegmentKiller; -import io.druid.server.DruidNode; -import io.druid.tasklogs.TaskLogKiller; +import org.apache.druid.guice.DruidProcessingModule; +import org.apache.druid.guice.IndexingServiceTaskLogsModule; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.QueryRunnerFactoryModule; +import org.apache.druid.guice.QueryableModule; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.indexing.common.config.TaskConfig; +import org.apache.druid.indexing.common.task.HadoopTask; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.metadata.MetadataStorageConnector; +import org.apache.druid.metadata.MetadataStorageTablesConfig; +import org.apache.druid.segment.loading.DataSegmentKiller; +import org.apache.druid.server.DruidNode; +import org.apache.druid.tasklogs.TaskLogKiller; import java.util.List; @@ -80,7 +80,7 @@ protected List getModules() return ImmutableList.of( // It's unknown if those modules are required in ResetCluster. // Maybe some of those modules could be removed. - // See https://github.com/druid-io/druid/pull/4429#discussion_r123603498 + // See https://github.com/apache/incubator-druid/pull/4429#discussion_r123603498 new DruidProcessingModule(), new QueryableModule(), new QueryRunnerFactoryModule(), @@ -188,7 +188,7 @@ private void deleteIndexerHadoopWorkingDir(Injector injector) TaskConfig taskConfig = injector.getInstance(TaskConfig.class); HadoopTask.invokeForeignLoader( - "io.druid.indexer.HadoopWorkingDirCleaner", + "org.apache.druid.indexer.HadoopWorkingDirCleaner", new String[]{ taskConfig.getHadoopWorkingPath() }, diff --git a/services/src/main/java/io/druid/cli/RouterJettyServerInitializer.java b/services/src/main/java/org/apache/druid/cli/RouterJettyServerInitializer.java similarity index 87% rename from services/src/main/java/io/druid/cli/RouterJettyServerInitializer.java rename to services/src/main/java/org/apache/druid/cli/RouterJettyServerInitializer.java index ef97248293d7..25e70bf0cf55 100644 --- a/services/src/main/java/io/druid/cli/RouterJettyServerInitializer.java +++ b/services/src/main/java/org/apache/druid/cli/RouterJettyServerInitializer.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.cli; +package org.apache.druid.cli; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Lists; @@ -25,21 +25,21 @@ import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.servlet.GuiceFilter; -import io.druid.guice.annotations.Global; -import io.druid.guice.annotations.Json; -import io.druid.guice.http.DruidHttpClientConfig; -import io.druid.server.AsyncManagementForwardingServlet; -import io.druid.server.AsyncQueryForwardingServlet; -import io.druid.server.initialization.ServerConfig; -import io.druid.server.initialization.jetty.JettyServerInitUtils; -import io.druid.server.initialization.jetty.JettyServerInitializer; -import io.druid.server.router.ManagementProxyConfig; -import io.druid.server.router.Router; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthenticationUtils; -import io.druid.server.security.Authenticator; -import io.druid.server.security.AuthenticatorMapper; -import io.druid.sql.avatica.DruidAvaticaHandler; +import org.apache.druid.guice.annotations.Global; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.guice.http.DruidHttpClientConfig; +import org.apache.druid.server.AsyncManagementForwardingServlet; +import org.apache.druid.server.AsyncQueryForwardingServlet; +import org.apache.druid.server.initialization.ServerConfig; +import org.apache.druid.server.initialization.jetty.JettyServerInitUtils; +import org.apache.druid.server.initialization.jetty.JettyServerInitializer; +import org.apache.druid.server.router.ManagementProxyConfig; +import org.apache.druid.server.router.Router; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthenticationUtils; +import org.apache.druid.server.security.Authenticator; +import org.apache.druid.server.security.AuthenticatorMapper; +import org.apache.druid.sql.avatica.DruidAvaticaHandler; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.HandlerList; diff --git a/services/src/main/java/io/druid/cli/ServerRunnable.java b/services/src/main/java/org/apache/druid/cli/ServerRunnable.java similarity index 89% rename from services/src/main/java/io/druid/cli/ServerRunnable.java rename to services/src/main/java/org/apache/druid/cli/ServerRunnable.java index b153aa7985e0..bc9c68bbaccd 100644 --- a/services/src/main/java/io/druid/cli/ServerRunnable.java +++ b/services/src/main/java/org/apache/druid/cli/ServerRunnable.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.cli; +package org.apache.druid.cli; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Provider; -import io.druid.discovery.DiscoveryDruidNode; -import io.druid.discovery.DruidNodeAnnouncer; -import io.druid.discovery.DruidService; -import io.druid.guice.annotations.Self; -import io.druid.java.util.common.lifecycle.Lifecycle; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.DruidNode; +import org.apache.druid.discovery.DiscoveryDruidNode; +import org.apache.druid.discovery.DruidNodeAnnouncer; +import org.apache.druid.discovery.DruidService; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.DruidNode; import java.util.List; diff --git a/services/src/main/java/io/druid/cli/ValidateSegments.java b/services/src/main/java/org/apache/druid/cli/ValidateSegments.java similarity index 87% rename from services/src/main/java/io/druid/cli/ValidateSegments.java rename to services/src/main/java/org/apache/druid/cli/ValidateSegments.java index 18214ba00a0a..d6f92c582b95 100644 --- a/services/src/main/java/io/druid/cli/ValidateSegments.java +++ b/services/src/main/java/org/apache/druid/cli/ValidateSegments.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.cli; +package org.apache.druid.cli; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; @@ -27,14 +27,14 @@ import com.google.inject.name.Names; import io.airlift.airline.Arguments; import io.airlift.airline.Command; -import io.druid.guice.DruidProcessingModule; -import io.druid.guice.QueryRunnerFactoryModule; -import io.druid.guice.QueryableModule; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.DruidProcessingConfig; -import io.druid.segment.IndexIO; -import io.druid.segment.column.ColumnConfig; +import org.apache.druid.guice.DruidProcessingModule; +import org.apache.druid.guice.QueryRunnerFactoryModule; +import org.apache.druid.guice.QueryableModule; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.DruidProcessingConfig; +import org.apache.druid.segment.IndexIO; +import org.apache.druid.segment.column.ColumnConfig; import java.io.File; import java.util.List; @@ -82,7 +82,7 @@ protected List getModules() return ImmutableList.of( // It's unknown if those modules are required in ValidateSegments. // Maybe some of those modules could be removed. - // See https://github.com/druid-io/druid/pull/4429#discussion_r123603498 + // See https://github.com/apache/incubator-druid/pull/4429#discussion_r123603498 new DruidProcessingModule(), new QueryableModule(), new QueryRunnerFactoryModule(), diff --git a/services/src/main/java/io/druid/cli/Version.java b/services/src/main/java/org/apache/druid/cli/Version.java similarity index 85% rename from services/src/main/java/io/druid/cli/Version.java rename to services/src/main/java/org/apache/druid/cli/Version.java index fab934529670..ab85fe35794e 100644 --- a/services/src/main/java/io/druid/cli/Version.java +++ b/services/src/main/java/org/apache/druid/cli/Version.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.cli; +package org.apache.druid.cli; import io.airlift.airline.Command; -import io.druid.initialization.DruidModule; -import io.druid.initialization.Initialization; -import io.druid.server.StatusResource; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.server.StatusResource; @Command( name = "version", diff --git a/services/src/main/java/io/druid/cli/convert/ChatHandlerConverter.java b/services/src/main/java/org/apache/druid/cli/convert/ChatHandlerConverter.java similarity index 97% rename from services/src/main/java/io/druid/cli/convert/ChatHandlerConverter.java rename to services/src/main/java/org/apache/druid/cli/convert/ChatHandlerConverter.java index 7f9f78d72b61..aa8b72affd7c 100644 --- a/services/src/main/java/io/druid/cli/convert/ChatHandlerConverter.java +++ b/services/src/main/java/org/apache/druid/cli/convert/ChatHandlerConverter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.cli.convert; +package org.apache.druid.cli.convert; import com.google.common.collect.ImmutableMap; diff --git a/services/src/main/java/io/druid/cli/convert/DataSegmentPusherDefaultConverter.java b/services/src/main/java/org/apache/druid/cli/convert/DataSegmentPusherDefaultConverter.java similarity index 98% rename from services/src/main/java/io/druid/cli/convert/DataSegmentPusherDefaultConverter.java rename to services/src/main/java/org/apache/druid/cli/convert/DataSegmentPusherDefaultConverter.java index 3ca8bc78e95d..b7f3569339e4 100644 --- a/services/src/main/java/io/druid/cli/convert/DataSegmentPusherDefaultConverter.java +++ b/services/src/main/java/org/apache/druid/cli/convert/DataSegmentPusherDefaultConverter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.cli.convert; +package org.apache.druid.cli.convert; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; diff --git a/services/src/main/java/io/druid/cli/convert/DatabasePropertiesConverter.java b/services/src/main/java/org/apache/druid/cli/convert/DatabasePropertiesConverter.java similarity index 97% rename from services/src/main/java/io/druid/cli/convert/DatabasePropertiesConverter.java rename to services/src/main/java/org/apache/druid/cli/convert/DatabasePropertiesConverter.java index 383256d72165..a44e9c1bc076 100644 --- a/services/src/main/java/io/druid/cli/convert/DatabasePropertiesConverter.java +++ b/services/src/main/java/org/apache/druid/cli/convert/DatabasePropertiesConverter.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.cli.convert; +package org.apache.druid.cli.convert; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import java.util.List; import java.util.Map; diff --git a/services/src/main/java/io/druid/cli/convert/IndexCacheConverter.java b/services/src/main/java/org/apache/druid/cli/convert/IndexCacheConverter.java similarity index 94% rename from services/src/main/java/io/druid/cli/convert/IndexCacheConverter.java rename to services/src/main/java/org/apache/druid/cli/convert/IndexCacheConverter.java index bdbbc6edd981..cf39c6d35137 100644 --- a/services/src/main/java/io/druid/cli/convert/IndexCacheConverter.java +++ b/services/src/main/java/org/apache/druid/cli/convert/IndexCacheConverter.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.cli.convert; +package org.apache.druid.cli.convert; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import java.util.Map; import java.util.Properties; diff --git a/services/src/main/java/io/druid/cli/convert/PrefixRename.java b/services/src/main/java/org/apache/druid/cli/convert/PrefixRename.java similarity index 98% rename from services/src/main/java/io/druid/cli/convert/PrefixRename.java rename to services/src/main/java/org/apache/druid/cli/convert/PrefixRename.java index 597b29caee4e..866e3b86f081 100644 --- a/services/src/main/java/io/druid/cli/convert/PrefixRename.java +++ b/services/src/main/java/org/apache/druid/cli/convert/PrefixRename.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.cli.convert; +package org.apache.druid.cli.convert; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; diff --git a/services/src/main/java/io/druid/cli/convert/PropertyConverter.java b/services/src/main/java/org/apache/druid/cli/convert/PropertyConverter.java similarity index 96% rename from services/src/main/java/io/druid/cli/convert/PropertyConverter.java rename to services/src/main/java/org/apache/druid/cli/convert/PropertyConverter.java index 862c413315df..74de9635e4cc 100644 --- a/services/src/main/java/io/druid/cli/convert/PropertyConverter.java +++ b/services/src/main/java/org/apache/druid/cli/convert/PropertyConverter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.cli.convert; +package org.apache.druid.cli.convert; import java.util.Map; import java.util.Properties; diff --git a/services/src/main/java/io/druid/cli/convert/Remove.java b/services/src/main/java/org/apache/druid/cli/convert/Remove.java similarity index 97% rename from services/src/main/java/io/druid/cli/convert/Remove.java rename to services/src/main/java/org/apache/druid/cli/convert/Remove.java index b2c3831f72f6..e477d1ba2e86 100644 --- a/services/src/main/java/io/druid/cli/convert/Remove.java +++ b/services/src/main/java/org/apache/druid/cli/convert/Remove.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.cli.convert; +package org.apache.druid.cli.convert; import com.google.common.collect.ImmutableMap; diff --git a/services/src/main/java/io/druid/cli/convert/Rename.java b/services/src/main/java/org/apache/druid/cli/convert/Rename.java similarity index 97% rename from services/src/main/java/io/druid/cli/convert/Rename.java rename to services/src/main/java/org/apache/druid/cli/convert/Rename.java index 9fb10720e250..f2279700e84c 100644 --- a/services/src/main/java/io/druid/cli/convert/Rename.java +++ b/services/src/main/java/org/apache/druid/cli/convert/Rename.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.cli.convert; +package org.apache.druid.cli.convert; import com.google.common.collect.ImmutableMap; diff --git a/services/src/main/java/io/druid/cli/validate/DruidJsonValidator.java b/services/src/main/java/org/apache/druid/cli/validate/DruidJsonValidator.java similarity index 87% rename from services/src/main/java/io/druid/cli/validate/DruidJsonValidator.java rename to services/src/main/java/org/apache/druid/cli/validate/DruidJsonValidator.java index 5e8f0a9c85b8..dab54a2cd017 100644 --- a/services/src/main/java/io/druid/cli/validate/DruidJsonValidator.java +++ b/services/src/main/java/org/apache/druid/cli/validate/DruidJsonValidator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.cli.validate; +package org.apache.druid.cli.validate; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.ObjectMapper; @@ -32,25 +32,25 @@ import com.google.inject.name.Names; import io.airlift.airline.Command; import io.airlift.airline.Option; -import io.druid.cli.GuiceRunnable; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.StringInputRowParser; -import io.druid.guice.DruidProcessingModule; -import io.druid.guice.ExtensionsConfig; -import io.druid.guice.FirehoseModule; -import io.druid.guice.IndexingServiceFirehoseModule; -import io.druid.guice.LocalDataStorageDruidModule; -import io.druid.guice.ParsersModule; -import io.druid.guice.QueryRunnerFactoryModule; -import io.druid.guice.QueryableModule; -import io.druid.indexer.HadoopDruidIndexerConfig; -import io.druid.indexer.IndexingHadoopModule; -import io.druid.indexing.common.task.Task; -import io.druid.initialization.DruidModule; -import io.druid.initialization.Initialization; -import io.druid.java.util.common.UOE; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.Query; +import org.apache.druid.cli.GuiceRunnable; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.guice.DruidProcessingModule; +import org.apache.druid.guice.ExtensionsConfig; +import org.apache.druid.guice.FirehoseModule; +import org.apache.druid.guice.IndexingServiceFirehoseModule; +import org.apache.druid.guice.LocalDataStorageDruidModule; +import org.apache.druid.guice.ParsersModule; +import org.apache.druid.guice.QueryRunnerFactoryModule; +import org.apache.druid.guice.QueryableModule; +import org.apache.druid.indexer.HadoopDruidIndexerConfig; +import org.apache.druid.indexer.IndexingHadoopModule; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.java.util.common.UOE; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.Query; import org.apache.commons.io.output.NullWriter; import java.io.File; @@ -97,7 +97,7 @@ protected List getModules() return ImmutableList.of( // It's unknown if those modules are required in DruidJsonValidator. // Maybe some of those modules could be removed. - // See https://github.com/druid-io/druid/pull/4429#discussion_r123603498 + // See https://github.com/apache/incubator-druid/pull/4429#discussion_r123603498 new DruidProcessingModule(), new QueryableModule(), new QueryRunnerFactoryModule(), diff --git a/services/src/main/java/io/druid/guice/QueryablePeonModule.java b/services/src/main/java/org/apache/druid/guice/QueryablePeonModule.java similarity index 87% rename from services/src/main/java/io/druid/guice/QueryablePeonModule.java rename to services/src/main/java/org/apache/druid/guice/QueryablePeonModule.java index a4301beee3be..408cbc5bcdd3 100644 --- a/services/src/main/java/io/druid/guice/QueryablePeonModule.java +++ b/services/src/main/java/org/apache/druid/guice/QueryablePeonModule.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.guice; +package org.apache.druid.guice; import com.fasterxml.jackson.databind.Module; import com.google.inject.Binder; -import io.druid.initialization.DruidModule; -import io.druid.server.QueryResource; -import io.druid.server.metrics.QueryCountStatsProvider; +import org.apache.druid.initialization.DruidModule; +import org.apache.druid.server.QueryResource; +import org.apache.druid.server.metrics.QueryCountStatsProvider; import java.util.Collections; import java.util.List; diff --git a/services/src/main/java/io/druid/guice/RealtimeModule.java b/services/src/main/java/org/apache/druid/guice/RealtimeModule.java similarity index 73% rename from services/src/main/java/io/druid/guice/RealtimeModule.java rename to services/src/main/java/org/apache/druid/guice/RealtimeModule.java index 47194beb8822..a062fb2acee1 100644 --- a/services/src/main/java/io/druid/guice/RealtimeModule.java +++ b/services/src/main/java/org/apache/druid/guice/RealtimeModule.java @@ -17,37 +17,37 @@ * 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.Module; import com.google.inject.TypeLiteral; import com.google.inject.multibindings.MapBinder; -import io.druid.cli.QueryJettyServerInitializer; -import io.druid.client.cache.CacheConfig; -import io.druid.client.coordinator.CoordinatorClient; -import io.druid.indexing.common.stats.DropwizardRowIngestionMetersFactory; -import io.druid.indexing.common.stats.RowIngestionMetersFactory; -import io.druid.metadata.MetadataSegmentPublisher; -import io.druid.query.QuerySegmentWalker; -import io.druid.segment.realtime.FireDepartment; -import io.druid.segment.realtime.NoopSegmentPublisher; -import io.druid.segment.realtime.RealtimeManager; -import io.druid.segment.realtime.SegmentPublisher; -import io.druid.segment.realtime.firehose.ChatHandlerProvider; -import io.druid.segment.realtime.firehose.NoopChatHandlerProvider; -import io.druid.segment.realtime.firehose.ServiceAnnouncingChatHandlerProvider; -import io.druid.segment.realtime.plumber.CoordinatorBasedSegmentHandoffNotifierConfig; -import io.druid.segment.realtime.plumber.CoordinatorBasedSegmentHandoffNotifierFactory; -import io.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; -import io.druid.server.QueryResource; -import io.druid.server.SegmentManager; -import io.druid.server.coordination.ServerType; -import io.druid.server.coordination.ZkCoordinator; -import io.druid.server.http.SegmentListerResource; -import io.druid.server.initialization.jetty.JettyServerInitializer; -import io.druid.server.metrics.QueryCountStatsProvider; +import org.apache.druid.cli.QueryJettyServerInitializer; +import org.apache.druid.client.cache.CacheConfig; +import org.apache.druid.client.coordinator.CoordinatorClient; +import org.apache.druid.indexing.common.stats.DropwizardRowIngestionMetersFactory; +import org.apache.druid.indexing.common.stats.RowIngestionMetersFactory; +import org.apache.druid.metadata.MetadataSegmentPublisher; +import org.apache.druid.query.QuerySegmentWalker; +import org.apache.druid.segment.realtime.FireDepartment; +import org.apache.druid.segment.realtime.NoopSegmentPublisher; +import org.apache.druid.segment.realtime.RealtimeManager; +import org.apache.druid.segment.realtime.SegmentPublisher; +import org.apache.druid.segment.realtime.firehose.ChatHandlerProvider; +import org.apache.druid.segment.realtime.firehose.NoopChatHandlerProvider; +import org.apache.druid.segment.realtime.firehose.ServiceAnnouncingChatHandlerProvider; +import org.apache.druid.segment.realtime.plumber.CoordinatorBasedSegmentHandoffNotifierConfig; +import org.apache.druid.segment.realtime.plumber.CoordinatorBasedSegmentHandoffNotifierFactory; +import org.apache.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory; +import org.apache.druid.server.QueryResource; +import org.apache.druid.server.SegmentManager; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.server.coordination.ZkCoordinator; +import org.apache.druid.server.http.SegmentListerResource; +import org.apache.druid.server.initialization.jetty.JettyServerInitializer; +import org.apache.druid.server.metrics.QueryCountStatsProvider; import org.eclipse.jetty.server.Server; import java.util.List; diff --git a/extensions-core/lookups-cached-single/src/main/resources/META-INF/services/io.druid.initialization.DruidModule b/services/src/main/resources/META-INF/services/org.apache.druid.cli.PropertyChecker similarity index 94% rename from extensions-core/lookups-cached-single/src/main/resources/META-INF/services/io.druid.initialization.DruidModule rename to services/src/main/resources/META-INF/services/org.apache.druid.cli.PropertyChecker index 7154cafbf7c6..1d6e6c46210d 100644 --- a/extensions-core/lookups-cached-single/src/main/resources/META-INF/services/io.druid.initialization.DruidModule +++ b/services/src/main/resources/META-INF/services/org.apache.druid.cli.PropertyChecker @@ -17,4 +17,4 @@ # under the License. # -io.druid.server.lookup.LookupExtractionModule +org.apache.druid.cli.Log4JShutdownPropertyChecker diff --git a/services/src/test/java/io/druid/cli/MainTest.java b/services/src/test/java/org/apache/druid/cli/MainTest.java similarity index 96% rename from services/src/test/java/io/druid/cli/MainTest.java rename to services/src/test/java/org/apache/druid/cli/MainTest.java index 8d17ab714754..9d8a891a4187 100644 --- a/services/src/test/java/io/druid/cli/MainTest.java +++ b/services/src/test/java/org/apache/druid/cli/MainTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.cli; +package org.apache.druid.cli; import com.google.common.collect.ImmutableList; import com.google.inject.Injector; -import io.druid.guice.GuiceInjectors; +import org.apache.druid.guice.GuiceInjectors; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/services/src/test/java/io/druid/cli/PullDependenciesTest.java b/services/src/test/java/org/apache/druid/cli/PullDependenciesTest.java similarity index 98% rename from services/src/test/java/io/druid/cli/PullDependenciesTest.java rename to services/src/test/java/org/apache/druid/cli/PullDependenciesTest.java index 78b56c6a047d..107158398fa9 100644 --- a/services/src/test/java/io/druid/cli/PullDependenciesTest.java +++ b/services/src/test/java/org/apache/druid/cli/PullDependenciesTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.cli; +package org.apache.druid.cli; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.druid.guice.ExtensionsConfig; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.guice.ExtensionsConfig; +import org.apache.druid.java.util.common.StringUtils; import io.tesla.aether.internal.DefaultTeslaAether; import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.artifact.DefaultArtifact; diff --git a/services/src/test/java/io/druid/cli/validate/DruidJsonValidatorTest.java b/services/src/test/java/org/apache/druid/cli/validate/DruidJsonValidatorTest.java similarity index 82% rename from services/src/test/java/io/druid/cli/validate/DruidJsonValidatorTest.java rename to services/src/test/java/org/apache/druid/cli/validate/DruidJsonValidatorTest.java index dede151c4741..e25b9113ed5d 100644 --- a/services/src/test/java/io/druid/cli/validate/DruidJsonValidatorTest.java +++ b/services/src/test/java/org/apache/druid/cli/validate/DruidJsonValidatorTest.java @@ -17,30 +17,30 @@ * under the License. */ -package io.druid.cli.validate; +package org.apache.druid.cli.validate; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.inject.Injector; import io.airlift.airline.Cli; -import io.druid.guice.FirehoseModule; -import io.druid.guice.GuiceInjectors; -import io.druid.indexing.common.task.RealtimeIndexTask; -import io.druid.indexing.common.task.TaskResource; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.segment.IndexSpec; -import io.druid.segment.indexing.DataSchema; -import io.druid.segment.indexing.RealtimeIOConfig; -import io.druid.segment.indexing.RealtimeTuningConfig; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; -import io.druid.segment.realtime.FireDepartment; -import io.druid.segment.realtime.FireDepartmentMetrics; -import io.druid.segment.realtime.firehose.LocalFirehoseFactory; -import io.druid.segment.realtime.plumber.Plumber; -import io.druid.segment.realtime.plumber.PlumberSchool; -import io.druid.timeline.partition.NoneShardSpec; +import org.apache.druid.guice.FirehoseModule; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.indexing.common.task.RealtimeIndexTask; +import org.apache.druid.indexing.common.task.TaskResource; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.indexing.DataSchema; +import org.apache.druid.segment.indexing.RealtimeIOConfig; +import org.apache.druid.segment.indexing.RealtimeTuningConfig; +import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.segment.realtime.FireDepartment; +import org.apache.druid.segment.realtime.FireDepartmentMetrics; +import org.apache.druid.segment.realtime.firehose.LocalFirehoseFactory; +import org.apache.druid.segment.realtime.plumber.Plumber; +import org.apache.druid.segment.realtime.plumber.PlumberSchool; +import org.apache.druid.timeline.partition.NoneShardSpec; import org.joda.time.Period; import org.junit.After; import org.junit.Assert; diff --git a/services/src/test/resources/convertProps/new.properties b/services/src/test/resources/convertProps/new.properties index 151577580074..f414da96cc01 100644 --- a/services/src/test/resources/convertProps/new.properties +++ b/services/src/test/resources/convertProps/new.properties @@ -34,6 +34,6 @@ druid.metadata.storage.tables.taskLock=druid_taskLock druid.indexer.storage.type=metadata druid.publish.type=metadata -druid.extensions.coordinates=["io.druid.extensions:mysql-metadata-storage"] +druid.extensions.coordinates=["org.apache.druid.extensions:mysql-metadata-storage"] leave.me.alone=xxx diff --git a/sql/pom.xml b/sql/pom.xml index 7c041cc1c7a8..c03a00c1ae20 100644 --- a/sql/pom.xml +++ b/sql/pom.xml @@ -27,14 +27,14 @@ Druid SQL - io.druid + org.apache.druid druid 0.13.0-SNAPSHOT - io.druid + org.apache.druid druid-server ${project.parent.version} @@ -89,21 +89,21 @@ test - io.druid + org.apache.druid druid-common ${project.parent.version} test-jar test - io.druid + org.apache.druid druid-processing ${project.parent.version} test-jar test - io.druid + org.apache.druid druid-server ${project.parent.version} test-jar diff --git a/sql/src/main/java/io/druid/sql/avatica/AvaticaMonitor.java b/sql/src/main/java/org/apache/druid/sql/avatica/AvaticaMonitor.java similarity index 94% rename from sql/src/main/java/io/druid/sql/avatica/AvaticaMonitor.java rename to sql/src/main/java/org/apache/druid/sql/avatica/AvaticaMonitor.java index ee46740b7a62..830143e088c1 100644 --- a/sql/src/main/java/io/druid/sql/avatica/AvaticaMonitor.java +++ b/sql/src/main/java/org/apache/druid/sql/avatica/AvaticaMonitor.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.sql.avatica; +package org.apache.druid.sql.avatica; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.java.util.emitter.service.ServiceMetricEvent; -import io.druid.java.util.metrics.AbstractMonitor; -import io.druid.java.util.common.logger.Logger; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.java.util.metrics.AbstractMonitor; +import org.apache.druid.java.util.common.logger.Logger; import org.apache.calcite.avatica.metrics.Counter; import org.apache.calcite.avatica.metrics.Gauge; import org.apache.calcite.avatica.metrics.Histogram; diff --git a/sql/src/main/java/io/druid/sql/avatica/AvaticaServerConfig.java b/sql/src/main/java/org/apache/druid/sql/avatica/AvaticaServerConfig.java similarity index 97% rename from sql/src/main/java/io/druid/sql/avatica/AvaticaServerConfig.java rename to sql/src/main/java/org/apache/druid/sql/avatica/AvaticaServerConfig.java index a10fe1bd4724..ff421d65ee7f 100644 --- a/sql/src/main/java/io/druid/sql/avatica/AvaticaServerConfig.java +++ b/sql/src/main/java/org/apache/druid/sql/avatica/AvaticaServerConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.sql.avatica; +package org.apache.druid.sql.avatica; import com.fasterxml.jackson.annotation.JsonProperty; import org.joda.time.Period; diff --git a/sql/src/main/java/io/druid/sql/avatica/DruidAvaticaHandler.java b/sql/src/main/java/org/apache/druid/sql/avatica/DruidAvaticaHandler.java similarity index 94% rename from sql/src/main/java/io/druid/sql/avatica/DruidAvaticaHandler.java rename to sql/src/main/java/org/apache/druid/sql/avatica/DruidAvaticaHandler.java index e41290168398..6bb0ec198fff 100644 --- a/sql/src/main/java/io/druid/sql/avatica/DruidAvaticaHandler.java +++ b/sql/src/main/java/org/apache/druid/sql/avatica/DruidAvaticaHandler.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.sql.avatica; +package org.apache.druid.sql.avatica; import com.google.inject.Inject; -import io.druid.guice.annotations.Self; -import io.druid.server.DruidNode; +import org.apache.druid.guice.annotations.Self; +import org.apache.druid.server.DruidNode; import org.apache.calcite.avatica.remote.LocalService; import org.apache.calcite.avatica.remote.Service; import org.apache.calcite.avatica.server.AvaticaJsonHandler; diff --git a/sql/src/main/java/io/druid/sql/avatica/DruidConnection.java b/sql/src/main/java/org/apache/druid/sql/avatica/DruidConnection.java similarity index 97% rename from sql/src/main/java/io/druid/sql/avatica/DruidConnection.java rename to sql/src/main/java/org/apache/druid/sql/avatica/DruidConnection.java index 48386a2439f3..4e1c5f434ec7 100644 --- a/sql/src/main/java/io/druid/sql/avatica/DruidConnection.java +++ b/sql/src/main/java/org/apache/druid/sql/avatica/DruidConnection.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.sql.avatica; +package org.apache.druid.sql.avatica; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; @@ -26,8 +26,8 @@ import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -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 javax.annotation.concurrent.GuardedBy; diff --git a/sql/src/main/java/io/druid/sql/avatica/DruidMeta.java b/sql/src/main/java/org/apache/druid/sql/avatica/DruidMeta.java similarity index 97% rename from sql/src/main/java/io/druid/sql/avatica/DruidMeta.java rename to sql/src/main/java/org/apache/druid/sql/avatica/DruidMeta.java index d41c1ccf0f49..872e615a198e 100644 --- a/sql/src/main/java/io/druid/sql/avatica/DruidMeta.java +++ b/sql/src/main/java/org/apache/druid/sql/avatica/DruidMeta.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.sql.avatica; +package org.apache.druid.sql.avatica; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; @@ -30,16 +30,16 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.google.inject.Inject; import com.google.inject.Injector; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.logger.Logger; -import io.druid.server.security.AuthenticationResult; -import io.druid.server.security.Authenticator; -import io.druid.server.security.AuthenticatorMapper; -import io.druid.server.security.ForbiddenException; -import io.druid.sql.calcite.planner.Calcites; -import io.druid.sql.calcite.planner.PlannerFactory; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.server.security.AuthenticationResult; +import org.apache.druid.server.security.Authenticator; +import org.apache.druid.server.security.AuthenticatorMapper; +import org.apache.druid.server.security.ForbiddenException; +import org.apache.druid.sql.calcite.planner.Calcites; +import org.apache.druid.sql.calcite.planner.PlannerFactory; import org.apache.calcite.avatica.MetaImpl; import org.apache.calcite.avatica.MissingResultsException; import org.apache.calcite.avatica.NoSuchConnectionException; diff --git a/sql/src/main/java/io/druid/sql/avatica/DruidStatement.java b/sql/src/main/java/org/apache/druid/sql/avatica/DruidStatement.java similarity index 92% rename from sql/src/main/java/io/druid/sql/avatica/DruidStatement.java rename to sql/src/main/java/org/apache/druid/sql/avatica/DruidStatement.java index 7db1dc1c5725..91f0f0bbda70 100644 --- a/sql/src/main/java/io/druid/sql/avatica/DruidStatement.java +++ b/sql/src/main/java/org/apache/druid/sql/avatica/DruidStatement.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.sql.avatica; +package org.apache.druid.sql.avatica; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.Execs; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Yielder; -import io.druid.java.util.common.guava.Yielders; -import io.druid.server.security.AuthenticationResult; -import io.druid.sql.calcite.planner.DruidPlanner; -import io.druid.sql.calcite.planner.PlannerFactory; -import io.druid.sql.calcite.planner.PlannerResult; -import io.druid.sql.calcite.rel.QueryMaker; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Yielder; +import org.apache.druid.java.util.common.guava.Yielders; +import org.apache.druid.server.security.AuthenticationResult; +import org.apache.druid.sql.calcite.planner.DruidPlanner; +import org.apache.druid.sql.calcite.planner.PlannerFactory; +import org.apache.druid.sql.calcite.planner.PlannerResult; +import org.apache.druid.sql.calcite.rel.QueryMaker; import org.apache.calcite.avatica.ColumnMetaData; import org.apache.calcite.avatica.Meta; import org.apache.calcite.rel.type.RelDataType; @@ -79,8 +79,8 @@ enum State * we would not need to use this executor. * * See discussion at: - * https://github.com/druid-io/druid/pull/4288 - * https://github.com/druid-io/druid/pull/4415 + * https://github.com/apache/incubator-druid/pull/4288 + * https://github.com/apache/incubator-druid/pull/4415 */ private final ExecutorService yielderOpenCloseExecutor; diff --git a/sql/src/main/java/io/druid/sql/calcite/aggregation/Aggregation.java b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/Aggregation.java similarity index 92% rename from sql/src/main/java/io/druid/sql/calcite/aggregation/Aggregation.java rename to sql/src/main/java/org/apache/druid/sql/calcite/aggregation/Aggregation.java index c2ee1b28426a..6ad0caf78015 100644 --- a/sql/src/main/java/io/druid/sql/calcite/aggregation/Aggregation.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/Aggregation.java @@ -17,23 +17,23 @@ * under the License. */ -package io.druid.sql.calcite.aggregation; +package org.apache.druid.sql.calcite.aggregation; import com.google.common.base.Preconditions; 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.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.FilteredAggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.filter.AndDimFilter; -import io.druid.query.filter.DimFilter; -import io.druid.segment.VirtualColumn; -import io.druid.sql.calcite.filtration.Filtration; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.FilteredAggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.filter.AndDimFilter; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.segment.VirtualColumn; +import org.apache.druid.sql.calcite.filtration.Filtration; +import org.apache.druid.sql.calcite.table.RowSignature; import javax.annotation.Nullable; import java.util.Collections; diff --git a/sql/src/main/java/io/druid/sql/calcite/aggregation/Aggregations.java b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/Aggregations.java similarity index 87% rename from sql/src/main/java/io/druid/sql/calcite/aggregation/Aggregations.java rename to sql/src/main/java/org/apache/druid/sql/calcite/aggregation/Aggregations.java index e6bee3151825..a8f0619e0412 100644 --- a/sql/src/main/java/io/druid/sql/calcite/aggregation/Aggregations.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/Aggregations.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.sql.calcite.aggregation; +package org.apache.druid.sql.calcite.aggregation; -import io.druid.segment.column.ValueType; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.expression.Expressions; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.expression.Expressions; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rel.core.AggregateCall; import org.apache.calcite.rel.core.Project; import org.apache.calcite.rex.RexNode; diff --git a/sql/src/main/java/io/druid/sql/calcite/aggregation/DimensionExpression.java b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/DimensionExpression.java similarity index 87% rename from sql/src/main/java/io/druid/sql/calcite/aggregation/DimensionExpression.java rename to sql/src/main/java/org/apache/druid/sql/calcite/aggregation/DimensionExpression.java index 6d4ef48081fb..7fba517480f1 100644 --- a/sql/src/main/java/io/druid/sql/calcite/aggregation/DimensionExpression.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/DimensionExpression.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.sql.calcite.aggregation; +package org.apache.druid.sql.calcite.aggregation; import com.google.common.collect.ImmutableList; -import io.druid.math.expr.ExprMacroTable; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.dimension.DimensionSpec; -import io.druid.segment.VirtualColumn; -import io.druid.segment.column.ValueType; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.planner.Calcites; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.segment.VirtualColumn; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.planner.Calcites; import javax.annotation.Nullable; import java.util.List; diff --git a/sql/src/main/java/io/druid/sql/calcite/aggregation/SqlAggregator.java b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/SqlAggregator.java similarity index 94% rename from sql/src/main/java/io/druid/sql/calcite/aggregation/SqlAggregator.java rename to sql/src/main/java/org/apache/druid/sql/calcite/aggregation/SqlAggregator.java index 4c8777d4af9b..92a266d57b91 100644 --- a/sql/src/main/java/io/druid/sql/calcite/aggregation/SqlAggregator.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/SqlAggregator.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.sql.calcite.aggregation; +package org.apache.druid.sql.calcite.aggregation; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rel.core.AggregateCall; import org.apache.calcite.rel.core.Project; import org.apache.calcite.rex.RexBuilder; diff --git a/sql/src/main/java/io/druid/sql/calcite/aggregation/builtin/ApproxCountDistinctSqlAggregator.java b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/ApproxCountDistinctSqlAggregator.java similarity index 81% rename from sql/src/main/java/io/druid/sql/calcite/aggregation/builtin/ApproxCountDistinctSqlAggregator.java rename to sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/ApproxCountDistinctSqlAggregator.java index 208609aaac60..bd03a1b18f1c 100644 --- a/sql/src/main/java/io/druid/sql/calcite/aggregation/builtin/ApproxCountDistinctSqlAggregator.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/ApproxCountDistinctSqlAggregator.java @@ -17,27 +17,27 @@ * under the License. */ -package io.druid.sql.calcite.aggregation.builtin; +package org.apache.druid.sql.calcite.aggregation.builtin; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import io.druid.java.util.common.ISE; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.cardinality.CardinalityAggregatorFactory; -import io.druid.query.aggregation.hyperloglog.HyperUniqueFinalizingPostAggregator; -import io.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.dimension.DimensionSpec; -import io.druid.segment.VirtualColumn; -import io.druid.segment.column.ValueType; -import io.druid.segment.virtual.ExpressionVirtualColumn; -import io.druid.sql.calcite.aggregation.Aggregation; -import io.druid.sql.calcite.aggregation.SqlAggregator; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.expression.Expressions; -import io.druid.sql.calcite.planner.Calcites; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.cardinality.CardinalityAggregatorFactory; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniqueFinalizingPostAggregator; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.segment.VirtualColumn; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.virtual.ExpressionVirtualColumn; +import org.apache.druid.sql.calcite.aggregation.Aggregation; +import org.apache.druid.sql.calcite.aggregation.SqlAggregator; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.expression.Expressions; +import org.apache.druid.sql.calcite.planner.Calcites; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rel.core.AggregateCall; import org.apache.calcite.rel.core.Project; import org.apache.calcite.rex.RexBuilder; diff --git a/sql/src/main/java/io/druid/sql/calcite/aggregation/builtin/AvgSqlAggregator.java b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/AvgSqlAggregator.java similarity index 80% rename from sql/src/main/java/io/druid/sql/calcite/aggregation/builtin/AvgSqlAggregator.java rename to sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/AvgSqlAggregator.java index 5d695bb26559..39bc45a66283 100644 --- a/sql/src/main/java/io/druid/sql/calcite/aggregation/builtin/AvgSqlAggregator.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/AvgSqlAggregator.java @@ -17,23 +17,23 @@ * under the License. */ -package io.druid.sql.calcite.aggregation.builtin; +package org.apache.druid.sql.calcite.aggregation.builtin; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import io.druid.math.expr.ExprMacroTable; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.post.ArithmeticPostAggregator; -import io.druid.query.aggregation.post.FieldAccessPostAggregator; -import io.druid.segment.column.ValueType; -import io.druid.sql.calcite.aggregation.Aggregation; -import io.druid.sql.calcite.aggregation.Aggregations; -import io.druid.sql.calcite.aggregation.SqlAggregator; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.planner.Calcites; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.post.ArithmeticPostAggregator; +import org.apache.druid.query.aggregation.post.FieldAccessPostAggregator; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.sql.calcite.aggregation.Aggregation; +import org.apache.druid.sql.calcite.aggregation.Aggregations; +import org.apache.druid.sql.calcite.aggregation.SqlAggregator; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.planner.Calcites; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rel.core.AggregateCall; import org.apache.calcite.rel.core.Project; import org.apache.calcite.rex.RexBuilder; diff --git a/sql/src/main/java/io/druid/sql/calcite/aggregation/builtin/CountSqlAggregator.java b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/CountSqlAggregator.java similarity index 84% rename from sql/src/main/java/io/druid/sql/calcite/aggregation/builtin/CountSqlAggregator.java rename to sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/CountSqlAggregator.java index 8b47037c2414..7ff80fe6b9ae 100644 --- a/sql/src/main/java/io/druid/sql/calcite/aggregation/builtin/CountSqlAggregator.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/CountSqlAggregator.java @@ -17,20 +17,20 @@ * under the License. */ -package io.druid.sql.calcite.aggregation.builtin; +package org.apache.druid.sql.calcite.aggregation.builtin; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import io.druid.java.util.common.ISE; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.filter.DimFilter; -import io.druid.sql.calcite.aggregation.Aggregation; -import io.druid.sql.calcite.aggregation.Aggregations; -import io.druid.sql.calcite.aggregation.SqlAggregator; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.expression.Expressions; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.sql.calcite.aggregation.Aggregation; +import org.apache.druid.sql.calcite.aggregation.Aggregations; +import org.apache.druid.sql.calcite.aggregation.SqlAggregator; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.expression.Expressions; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rel.core.AggregateCall; import org.apache.calcite.rel.core.Project; import org.apache.calcite.rex.RexBuilder; diff --git a/sql/src/main/java/io/druid/sql/calcite/aggregation/builtin/MaxSqlAggregator.java b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/MaxSqlAggregator.java similarity index 78% rename from sql/src/main/java/io/druid/sql/calcite/aggregation/builtin/MaxSqlAggregator.java rename to sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/MaxSqlAggregator.java index 5e96057f4ad0..8be0555e097e 100644 --- a/sql/src/main/java/io/druid/sql/calcite/aggregation/builtin/MaxSqlAggregator.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/MaxSqlAggregator.java @@ -17,23 +17,23 @@ * under the License. */ -package io.druid.sql.calcite.aggregation.builtin; +package org.apache.druid.sql.calcite.aggregation.builtin; import com.google.common.collect.Iterables; -import io.druid.java.util.common.ISE; -import io.druid.math.expr.ExprMacroTable; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.DoubleMaxAggregatorFactory; -import io.druid.query.aggregation.FloatMaxAggregatorFactory; -import io.druid.query.aggregation.LongMaxAggregatorFactory; -import io.druid.segment.column.ValueType; -import io.druid.sql.calcite.aggregation.Aggregation; -import io.druid.sql.calcite.aggregation.Aggregations; -import io.druid.sql.calcite.aggregation.SqlAggregator; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.planner.Calcites; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.DoubleMaxAggregatorFactory; +import org.apache.druid.query.aggregation.FloatMaxAggregatorFactory; +import org.apache.druid.query.aggregation.LongMaxAggregatorFactory; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.sql.calcite.aggregation.Aggregation; +import org.apache.druid.sql.calcite.aggregation.Aggregations; +import org.apache.druid.sql.calcite.aggregation.SqlAggregator; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.planner.Calcites; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rel.core.AggregateCall; import org.apache.calcite.rel.core.Project; import org.apache.calcite.rex.RexBuilder; diff --git a/sql/src/main/java/io/druid/sql/calcite/aggregation/builtin/MinSqlAggregator.java b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/MinSqlAggregator.java similarity index 78% rename from sql/src/main/java/io/druid/sql/calcite/aggregation/builtin/MinSqlAggregator.java rename to sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/MinSqlAggregator.java index 81a26d3a5697..08ea2686ca40 100644 --- a/sql/src/main/java/io/druid/sql/calcite/aggregation/builtin/MinSqlAggregator.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/MinSqlAggregator.java @@ -17,23 +17,23 @@ * under the License. */ -package io.druid.sql.calcite.aggregation.builtin; +package org.apache.druid.sql.calcite.aggregation.builtin; import com.google.common.collect.Iterables; -import io.druid.java.util.common.ISE; -import io.druid.math.expr.ExprMacroTable; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.DoubleMinAggregatorFactory; -import io.druid.query.aggregation.FloatMinAggregatorFactory; -import io.druid.query.aggregation.LongMinAggregatorFactory; -import io.druid.segment.column.ValueType; -import io.druid.sql.calcite.aggregation.Aggregation; -import io.druid.sql.calcite.aggregation.Aggregations; -import io.druid.sql.calcite.aggregation.SqlAggregator; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.planner.Calcites; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.DoubleMinAggregatorFactory; +import org.apache.druid.query.aggregation.FloatMinAggregatorFactory; +import org.apache.druid.query.aggregation.LongMinAggregatorFactory; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.sql.calcite.aggregation.Aggregation; +import org.apache.druid.sql.calcite.aggregation.Aggregations; +import org.apache.druid.sql.calcite.aggregation.SqlAggregator; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.planner.Calcites; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rel.core.AggregateCall; import org.apache.calcite.rel.core.Project; import org.apache.calcite.rex.RexBuilder; diff --git a/sql/src/main/java/io/druid/sql/calcite/aggregation/builtin/SumSqlAggregator.java b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/SumSqlAggregator.java similarity index 78% rename from sql/src/main/java/io/druid/sql/calcite/aggregation/builtin/SumSqlAggregator.java rename to sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/SumSqlAggregator.java index 61a36c8a7e35..be1c73533d27 100644 --- a/sql/src/main/java/io/druid/sql/calcite/aggregation/builtin/SumSqlAggregator.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/SumSqlAggregator.java @@ -17,23 +17,23 @@ * under the License. */ -package io.druid.sql.calcite.aggregation.builtin; +package org.apache.druid.sql.calcite.aggregation.builtin; import com.google.common.collect.Iterables; -import io.druid.java.util.common.ISE; -import io.druid.math.expr.ExprMacroTable; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.DoubleSumAggregatorFactory; -import io.druid.query.aggregation.FloatSumAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.segment.column.ValueType; -import io.druid.sql.calcite.aggregation.Aggregation; -import io.druid.sql.calcite.aggregation.Aggregations; -import io.druid.sql.calcite.aggregation.SqlAggregator; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.planner.Calcites; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; +import org.apache.druid.query.aggregation.FloatSumAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.sql.calcite.aggregation.Aggregation; +import org.apache.druid.sql.calcite.aggregation.Aggregations; +import org.apache.druid.sql.calcite.aggregation.SqlAggregator; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.planner.Calcites; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rel.core.AggregateCall; import org.apache.calcite.rel.core.Project; import org.apache.calcite.rex.RexBuilder; diff --git a/sql/src/main/java/io/druid/sql/calcite/aggregation/builtin/SumZeroSqlAggregator.java b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/SumZeroSqlAggregator.java similarity index 94% rename from sql/src/main/java/io/druid/sql/calcite/aggregation/builtin/SumZeroSqlAggregator.java rename to sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/SumZeroSqlAggregator.java index d9d767df3553..aaa326645b6e 100644 --- a/sql/src/main/java/io/druid/sql/calcite/aggregation/builtin/SumZeroSqlAggregator.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/SumZeroSqlAggregator.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.sql.calcite.aggregation.builtin; +package org.apache.druid.sql.calcite.aggregation.builtin; import org.apache.calcite.sql.SqlAggFunction; import org.apache.calcite.sql.fun.SqlStdOperatorTable; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/AliasedOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/AliasedOperatorConversion.java similarity index 91% rename from sql/src/main/java/io/druid/sql/calcite/expression/AliasedOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/AliasedOperatorConversion.java index d5371adf2f8f..392ff16c3865 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/AliasedOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/AliasedOperatorConversion.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.sql.calcite.expression; +package org.apache.druid.sql.calcite.expression; -import io.druid.java.util.common.IAE; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rex.RexNode; import org.apache.calcite.sql.SqlFunction; import org.apache.calcite.sql.SqlKind; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/BinaryOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/BinaryOperatorConversion.java similarity index 89% rename from sql/src/main/java/io/druid/sql/calcite/expression/BinaryOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/BinaryOperatorConversion.java index 1977b12e8793..5c5343473984 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/BinaryOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/BinaryOperatorConversion.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.sql.calcite.expression; +package org.apache.druid.sql.calcite.expression; import com.google.common.base.Joiner; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rex.RexNode; import org.apache.calcite.sql.SqlOperator; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/DirectOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/DirectOperatorConversion.java similarity index 91% rename from sql/src/main/java/io/druid/sql/calcite/expression/DirectOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/DirectOperatorConversion.java index c8da5fbd8994..4eb007397297 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/DirectOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/DirectOperatorConversion.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.sql.calcite.expression; +package org.apache.druid.sql.calcite.expression; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rex.RexNode; import org.apache.calcite.sql.SqlOperator; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/DruidExpression.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/DruidExpression.java similarity index 94% rename from sql/src/main/java/io/druid/sql/calcite/expression/DruidExpression.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/DruidExpression.java index 898d5300f6d9..6e0e80c66f30 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/DruidExpression.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/DruidExpression.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.sql.calcite.expression; +package org.apache.druid.sql.calcite.expression; import com.google.common.base.Preconditions; import com.google.common.io.BaseEncoding; import com.google.common.primitives.Chars; -import io.druid.java.util.common.StringUtils; -import io.druid.math.expr.Expr; -import io.druid.math.expr.ExprMacroTable; -import io.druid.math.expr.Parser; -import io.druid.segment.column.ValueType; -import io.druid.segment.virtual.ExpressionVirtualColumn; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.math.expr.Expr; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.math.expr.Parser; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.virtual.ExpressionVirtualColumn; import java.util.Arrays; import java.util.List; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/Expressions.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/Expressions.java similarity index 93% rename from sql/src/main/java/io/druid/sql/calcite/expression/Expressions.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/Expressions.java index 63dec1979def..75018e0b3596 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/Expressions.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/Expressions.java @@ -17,39 +17,39 @@ * under the License. */ -package io.druid.sql.calcite.expression; +package org.apache.druid.sql.calcite.expression; import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.math.expr.Expr; -import io.druid.math.expr.ExprMacroTable; -import io.druid.math.expr.ExprType; -import io.druid.math.expr.Parser; -import io.druid.query.expression.TimestampFloorExprMacro; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.extraction.TimeFormatExtractionFn; -import io.druid.query.filter.AndDimFilter; -import io.druid.query.filter.DimFilter; -import io.druid.query.filter.ExpressionDimFilter; -import io.druid.query.filter.LikeDimFilter; -import io.druid.query.filter.NotDimFilter; -import io.druid.query.filter.OrDimFilter; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.query.ordering.StringComparator; -import io.druid.query.ordering.StringComparators; -import io.druid.common.config.NullHandling; -import io.druid.segment.column.Column; -import io.druid.segment.column.ValueType; -import io.druid.sql.calcite.filtration.BoundRefKey; -import io.druid.sql.calcite.filtration.Bounds; -import io.druid.sql.calcite.filtration.Filtration; -import io.druid.sql.calcite.planner.Calcites; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.math.expr.Expr; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.math.expr.ExprType; +import org.apache.druid.math.expr.Parser; +import org.apache.druid.query.expression.TimestampFloorExprMacro; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.extraction.TimeFormatExtractionFn; +import org.apache.druid.query.filter.AndDimFilter; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.filter.ExpressionDimFilter; +import org.apache.druid.query.filter.LikeDimFilter; +import org.apache.druid.query.filter.NotDimFilter; +import org.apache.druid.query.filter.OrDimFilter; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.query.ordering.StringComparator; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.sql.calcite.filtration.BoundRefKey; +import org.apache.druid.sql.calcite.filtration.Bounds; +import org.apache.druid.sql.calcite.filtration.Filtration; +import org.apache.druid.sql.calcite.planner.Calcites; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.jdbc.JavaTypeFactoryImpl; import org.apache.calcite.rel.core.Project; import org.apache.calcite.rex.RexCall; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/ExtractionFns.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/ExtractionFns.java similarity index 91% rename from sql/src/main/java/io/druid/sql/calcite/expression/ExtractionFns.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/ExtractionFns.java index 896e32da5223..8d5e91053bf8 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/ExtractionFns.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/ExtractionFns.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.sql.calcite.expression; +package org.apache.druid.sql.calcite.expression; import com.google.common.collect.Lists; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.query.extraction.CascadeExtractionFn; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.extraction.TimeFormatExtractionFn; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.query.extraction.CascadeExtractionFn; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.extraction.TimeFormatExtractionFn; import java.util.Arrays; import java.util.List; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/OperatorConversions.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/OperatorConversions.java similarity index 96% rename from sql/src/main/java/io/druid/sql/calcite/expression/OperatorConversions.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/OperatorConversions.java index 50956ebd8cb0..be922b2bb3ba 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/OperatorConversions.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/OperatorConversions.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.sql.calcite.expression; +package org.apache.druid.sql.calcite.expression; import com.google.common.base.Preconditions; -import io.druid.sql.calcite.planner.Calcites; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.sql.calcite.planner.Calcites; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rex.RexCall; import org.apache.calcite.rex.RexNode; import org.apache.calcite.sql.SqlFunction; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/SimpleExtraction.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/SimpleExtraction.java similarity index 88% rename from sql/src/main/java/io/druid/sql/calcite/expression/SimpleExtraction.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/SimpleExtraction.java index 2b55b761201d..7651b0df23de 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/SimpleExtraction.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/SimpleExtraction.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.sql.calcite.expression; +package org.apache.druid.sql.calcite.expression; import com.google.common.base.Preconditions; -import io.druid.java.util.common.StringUtils; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.dimension.ExtractionDimensionSpec; -import io.druid.query.extraction.ExtractionFn; -import io.druid.segment.column.ValueType; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.dimension.ExtractionDimensionSpec; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.segment.column.ValueType; /** * Represents a "simple" extraction of a value from a Druid row, which is defined as a column plus an extractionFn. diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/SqlOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/SqlOperatorConversion.java similarity index 90% rename from sql/src/main/java/io/druid/sql/calcite/expression/SqlOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/SqlOperatorConversion.java index bf532f57c4c7..bc68b372fd89 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/SqlOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/SqlOperatorConversion.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.sql.calcite.expression; +package org.apache.druid.sql.calcite.expression; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rex.RexNode; import org.apache.calcite.sql.SqlOperator; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/TimeUnits.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/TimeUnits.java similarity index 94% rename from sql/src/main/java/io/druid/sql/calcite/expression/TimeUnits.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/TimeUnits.java index f7fef38b187a..c5c5a0c5c122 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/TimeUnits.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/TimeUnits.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.sql.calcite.expression; +package org.apache.druid.sql.calcite.expression; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.granularity.PeriodGranularity; +import org.apache.druid.java.util.common.granularity.PeriodGranularity; import org.apache.calcite.avatica.util.TimeUnitRange; import org.joda.time.DateTimeZone; import org.joda.time.Period; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/UnaryFunctionOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/UnaryFunctionOperatorConversion.java similarity index 89% rename from sql/src/main/java/io/druid/sql/calcite/expression/UnaryFunctionOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/UnaryFunctionOperatorConversion.java index d946b5345778..e0df20c0e6f4 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/UnaryFunctionOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/UnaryFunctionOperatorConversion.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.sql.calcite.expression; +package org.apache.druid.sql.calcite.expression; import com.google.common.collect.Iterables; -import io.druid.java.util.common.StringUtils; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rex.RexNode; import org.apache.calcite.sql.SqlOperator; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/UnaryPrefixOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/UnaryPrefixOperatorConversion.java similarity index 89% rename from sql/src/main/java/io/druid/sql/calcite/expression/UnaryPrefixOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/UnaryPrefixOperatorConversion.java index 52d29cdda1a8..37c939114656 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/UnaryPrefixOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/UnaryPrefixOperatorConversion.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.sql.calcite.expression; +package org.apache.druid.sql.calcite.expression; import com.google.common.collect.Iterables; -import io.druid.java.util.common.StringUtils; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rex.RexNode; import org.apache.calcite.sql.SqlOperator; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/UnarySuffixOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/UnarySuffixOperatorConversion.java similarity index 89% rename from sql/src/main/java/io/druid/sql/calcite/expression/UnarySuffixOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/UnarySuffixOperatorConversion.java index 4d624d9c0c8b..05e195584c15 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/UnarySuffixOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/UnarySuffixOperatorConversion.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.sql.calcite.expression; +package org.apache.druid.sql.calcite.expression; import com.google.common.collect.Iterables; -import io.druid.java.util.common.StringUtils; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rex.RexNode; import org.apache.calcite.sql.SqlOperator; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/BTrimOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/BTrimOperatorConversion.java similarity index 86% rename from sql/src/main/java/io/druid/sql/calcite/expression/builtin/BTrimOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/BTrimOperatorConversion.java index bccac2d84edb..6bee9f2b9e28 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/BTrimOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/BTrimOperatorConversion.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.sql.calcite.expression.builtin; +package org.apache.druid.sql.calcite.expression.builtin; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.expression.OperatorConversions; -import io.druid.sql.calcite.expression.SqlOperatorConversion; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.expression.OperatorConversions; +import org.apache.druid.sql.calcite.expression.SqlOperatorConversion; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rex.RexNode; import org.apache.calcite.sql.SqlFunction; import org.apache.calcite.sql.SqlFunctionCategory; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/CastOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/CastOperatorConversion.java similarity index 91% rename from sql/src/main/java/io/druid/sql/calcite/expression/builtin/CastOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/CastOperatorConversion.java index c4af4d527744..3b30fd63c9bd 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/CastOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/CastOperatorConversion.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.sql.calcite.expression.builtin; +package org.apache.druid.sql.calcite.expression.builtin; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.PeriodGranularity; -import io.druid.math.expr.ExprType; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.expression.Expressions; -import io.druid.sql.calcite.expression.SqlOperatorConversion; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.PeriodGranularity; +import org.apache.druid.math.expr.ExprType; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.expression.Expressions; +import org.apache.druid.sql.calcite.expression.SqlOperatorConversion; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rex.RexCall; import org.apache.calcite.rex.RexNode; import org.apache.calcite.sql.SqlOperator; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/CeilOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/CeilOperatorConversion.java similarity index 85% rename from sql/src/main/java/io/druid/sql/calcite/expression/builtin/CeilOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/CeilOperatorConversion.java index d8c556a41af6..1a7c031559b5 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/CeilOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/CeilOperatorConversion.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.sql.calcite.expression.builtin; +package org.apache.druid.sql.calcite.expression.builtin; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.PeriodGranularity; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.expression.Expressions; -import io.druid.sql.calcite.expression.SqlOperatorConversion; -import io.druid.sql.calcite.expression.TimeUnits; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.PeriodGranularity; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.expression.Expressions; +import org.apache.druid.sql.calcite.expression.SqlOperatorConversion; +import org.apache.druid.sql.calcite.expression.TimeUnits; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.avatica.util.TimeUnitRange; import org.apache.calcite.rex.RexCall; import org.apache.calcite.rex.RexLiteral; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/ConcatOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/ConcatOperatorConversion.java similarity index 82% rename from sql/src/main/java/io/druid/sql/calcite/expression/builtin/ConcatOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/ConcatOperatorConversion.java index 21268b98318b..f559e431e0e8 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/ConcatOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/ConcatOperatorConversion.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.sql.calcite.expression.builtin; +package org.apache.druid.sql.calcite.expression.builtin; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.expression.OperatorConversions; -import io.druid.sql.calcite.expression.SqlOperatorConversion; -import io.druid.sql.calcite.planner.Calcites; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.expression.OperatorConversions; +import org.apache.druid.sql.calcite.expression.SqlOperatorConversion; +import org.apache.druid.sql.calcite.planner.Calcites; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rex.RexNode; import org.apache.calcite.sql.SqlFunction; import org.apache.calcite.sql.SqlFunctionCategory; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/DateTruncOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/DateTruncOperatorConversion.java similarity index 87% rename from sql/src/main/java/io/druid/sql/calcite/expression/builtin/DateTruncOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/DateTruncOperatorConversion.java index b55886977237..5e463759e35d 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/DateTruncOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/DateTruncOperatorConversion.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.sql.calcite.expression.builtin; +package org.apache.druid.sql.calcite.expression.builtin; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.StringUtils; -import io.druid.math.expr.Expr; -import io.druid.math.expr.Parser; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.expression.OperatorConversions; -import io.druid.sql.calcite.expression.SqlOperatorConversion; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.math.expr.Expr; +import org.apache.druid.math.expr.Parser; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.expression.OperatorConversions; +import org.apache.druid.sql.calcite.expression.SqlOperatorConversion; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rex.RexNode; import org.apache.calcite.sql.SqlFunction; import org.apache.calcite.sql.SqlFunctionCategory; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/ExtractOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/ExtractOperatorConversion.java similarity index 88% rename from sql/src/main/java/io/druid/sql/calcite/expression/builtin/ExtractOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/ExtractOperatorConversion.java index d21557166b53..19a5ff63bd86 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/ExtractOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/ExtractOperatorConversion.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.sql.calcite.expression.builtin; +package org.apache.druid.sql.calcite.expression.builtin; import com.google.common.collect.ImmutableMap; -import io.druid.query.expression.TimestampExtractExprMacro; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.expression.Expressions; -import io.druid.sql.calcite.expression.SqlOperatorConversion; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.query.expression.TimestampExtractExprMacro; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.expression.Expressions; +import org.apache.druid.sql.calcite.expression.SqlOperatorConversion; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.avatica.util.TimeUnitRange; import org.apache.calcite.rex.RexCall; import org.apache.calcite.rex.RexLiteral; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/FloorOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/FloorOperatorConversion.java similarity index 82% rename from sql/src/main/java/io/druid/sql/calcite/expression/builtin/FloorOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/FloorOperatorConversion.java index 9bb22acf353f..0b2d2b8cda54 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/FloorOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/FloorOperatorConversion.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.sql.calcite.expression.builtin; +package org.apache.druid.sql.calcite.expression.builtin; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.PeriodGranularity; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.expression.Expressions; -import io.druid.sql.calcite.expression.SqlOperatorConversion; -import io.druid.sql.calcite.expression.TimeUnits; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.PeriodGranularity; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.expression.Expressions; +import org.apache.druid.sql.calcite.expression.SqlOperatorConversion; +import org.apache.druid.sql.calcite.expression.TimeUnits; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.avatica.util.TimeUnitRange; import org.apache.calcite.rex.RexCall; import org.apache.calcite.rex.RexLiteral; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/LTrimOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/LTrimOperatorConversion.java similarity index 86% rename from sql/src/main/java/io/druid/sql/calcite/expression/builtin/LTrimOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/LTrimOperatorConversion.java index 627ff06b05e7..7653f19241cf 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/LTrimOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/LTrimOperatorConversion.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.sql.calcite.expression.builtin; +package org.apache.druid.sql.calcite.expression.builtin; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.expression.OperatorConversions; -import io.druid.sql.calcite.expression.SqlOperatorConversion; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.expression.OperatorConversions; +import org.apache.druid.sql.calcite.expression.SqlOperatorConversion; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rex.RexNode; import org.apache.calcite.sql.SqlFunction; import org.apache.calcite.sql.SqlFunctionCategory; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/LookupOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/LookupOperatorConversion.java similarity index 82% rename from sql/src/main/java/io/druid/sql/calcite/expression/builtin/LookupOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/LookupOperatorConversion.java index 3ad339dbd3db..3a6d6858e594 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/LookupOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/LookupOperatorConversion.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.sql.calcite.expression.builtin; +package org.apache.druid.sql.calcite.expression.builtin; import com.google.inject.Inject; -import io.druid.java.util.common.StringUtils; -import io.druid.math.expr.Expr; -import io.druid.query.lookup.LookupReferencesManager; -import io.druid.query.lookup.RegisteredLookupExtractionFn; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.expression.OperatorConversions; -import io.druid.sql.calcite.expression.SqlOperatorConversion; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.math.expr.Expr; +import org.apache.druid.query.lookup.LookupReferencesManager; +import org.apache.druid.query.lookup.RegisteredLookupExtractionFn; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.expression.OperatorConversions; +import org.apache.druid.sql.calcite.expression.SqlOperatorConversion; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rex.RexNode; import org.apache.calcite.sql.SqlFunction; import org.apache.calcite.sql.SqlFunctionCategory; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/MillisToTimestampOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/MillisToTimestampOperatorConversion.java similarity index 82% rename from sql/src/main/java/io/druid/sql/calcite/expression/builtin/MillisToTimestampOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/MillisToTimestampOperatorConversion.java index 7460e6ac6397..bf67d3044b6a 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/MillisToTimestampOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/MillisToTimestampOperatorConversion.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.sql.calcite.expression.builtin; +package org.apache.druid.sql.calcite.expression.builtin; import com.google.common.collect.Iterables; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.expression.Expressions; -import io.druid.sql.calcite.expression.OperatorConversions; -import io.druid.sql.calcite.expression.SqlOperatorConversion; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.expression.Expressions; +import org.apache.druid.sql.calcite.expression.OperatorConversions; +import org.apache.druid.sql.calcite.expression.SqlOperatorConversion; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rex.RexCall; import org.apache.calcite.rex.RexNode; import org.apache.calcite.sql.SqlFunction; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/RTrimOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/RTrimOperatorConversion.java similarity index 86% rename from sql/src/main/java/io/druid/sql/calcite/expression/builtin/RTrimOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/RTrimOperatorConversion.java index 9c392e06db47..4fed852458a6 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/RTrimOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/RTrimOperatorConversion.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.sql.calcite.expression.builtin; +package org.apache.druid.sql.calcite.expression.builtin; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.expression.OperatorConversions; -import io.druid.sql.calcite.expression.SqlOperatorConversion; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.expression.OperatorConversions; +import org.apache.druid.sql.calcite.expression.SqlOperatorConversion; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rex.RexNode; import org.apache.calcite.sql.SqlFunction; import org.apache.calcite.sql.SqlFunctionCategory; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/RegexpExtractOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/RegexpExtractOperatorConversion.java similarity index 84% rename from sql/src/main/java/io/druid/sql/calcite/expression/builtin/RegexpExtractOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/RegexpExtractOperatorConversion.java index ee10bb4692ef..22344a7deebf 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/RegexpExtractOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/RegexpExtractOperatorConversion.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.sql.calcite.expression.builtin; +package org.apache.druid.sql.calcite.expression.builtin; -import io.druid.java.util.common.StringUtils; -import io.druid.math.expr.Expr; -import io.druid.query.extraction.RegexDimExtractionFn; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.expression.OperatorConversions; -import io.druid.sql.calcite.expression.SqlOperatorConversion; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.math.expr.Expr; +import org.apache.druid.query.extraction.RegexDimExtractionFn; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.expression.OperatorConversions; +import org.apache.druid.sql.calcite.expression.SqlOperatorConversion; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rex.RexNode; import org.apache.calcite.sql.SqlFunction; import org.apache.calcite.sql.SqlFunctionCategory; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/ReinterpretOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/ReinterpretOperatorConversion.java similarity index 95% rename from sql/src/main/java/io/druid/sql/calcite/expression/builtin/ReinterpretOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/ReinterpretOperatorConversion.java index 93f5e512cf34..ef9794154f77 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/ReinterpretOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/ReinterpretOperatorConversion.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.sql.calcite.expression.builtin; +package org.apache.druid.sql.calcite.expression.builtin; import org.apache.calcite.sql.SqlOperator; import org.apache.calcite.sql.fun.SqlStdOperatorTable; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/StrposOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/StrposOperatorConversion.java similarity index 82% rename from sql/src/main/java/io/druid/sql/calcite/expression/builtin/StrposOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/StrposOperatorConversion.java index d96c1d5c9ef9..4fc860f08d85 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/StrposOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/StrposOperatorConversion.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.sql.calcite.expression.builtin; +package org.apache.druid.sql.calcite.expression.builtin; -import io.druid.java.util.common.StringUtils; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.expression.OperatorConversions; -import io.druid.sql.calcite.expression.SqlOperatorConversion; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.expression.OperatorConversions; +import org.apache.druid.sql.calcite.expression.SqlOperatorConversion; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rex.RexNode; import org.apache.calcite.sql.SqlFunction; import org.apache.calcite.sql.SqlFunctionCategory; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/SubstringOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/SubstringOperatorConversion.java similarity index 83% rename from sql/src/main/java/io/druid/sql/calcite/expression/builtin/SubstringOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/SubstringOperatorConversion.java index 15bbff93b7a0..dd811828c2fc 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/SubstringOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/SubstringOperatorConversion.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.sql.calcite.expression.builtin; +package org.apache.druid.sql.calcite.expression.builtin; -import io.druid.java.util.common.StringUtils; -import io.druid.query.extraction.SubstringDimExtractionFn; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.expression.Expressions; -import io.druid.sql.calcite.expression.OperatorConversions; -import io.druid.sql.calcite.expression.SqlOperatorConversion; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.extraction.SubstringDimExtractionFn; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.expression.Expressions; +import org.apache.druid.sql.calcite.expression.OperatorConversions; +import org.apache.druid.sql.calcite.expression.SqlOperatorConversion; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rex.RexCall; import org.apache.calcite.rex.RexLiteral; import org.apache.calcite.rex.RexNode; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/TextcatOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/TextcatOperatorConversion.java similarity index 83% rename from sql/src/main/java/io/druid/sql/calcite/expression/builtin/TextcatOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/TextcatOperatorConversion.java index a34b57fe05b0..3d2817a235ea 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/TextcatOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/TextcatOperatorConversion.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.sql.calcite.expression.builtin; +package org.apache.druid.sql.calcite.expression.builtin; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.expression.OperatorConversions; -import io.druid.sql.calcite.expression.SqlOperatorConversion; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.expression.OperatorConversions; +import org.apache.druid.sql.calcite.expression.SqlOperatorConversion; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rex.RexNode; import org.apache.calcite.sql.SqlFunction; import org.apache.calcite.sql.SqlFunctionCategory; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/TimeArithmeticOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/TimeArithmeticOperatorConversion.java similarity index 88% rename from sql/src/main/java/io/druid/sql/calcite/expression/builtin/TimeArithmeticOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/TimeArithmeticOperatorConversion.java index 9b8c8a54bf6b..6ac39b040224 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/TimeArithmeticOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/TimeArithmeticOperatorConversion.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.sql.calcite.expression.builtin; +package org.apache.druid.sql.calcite.expression.builtin; import com.google.common.base.Preconditions; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.expression.Expressions; -import io.druid.sql.calcite.expression.SqlOperatorConversion; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.expression.Expressions; +import org.apache.druid.sql.calcite.expression.SqlOperatorConversion; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rex.RexCall; import org.apache.calcite.rex.RexNode; import org.apache.calcite.sql.SqlOperator; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/TimeExtractOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/TimeExtractOperatorConversion.java similarity index 84% rename from sql/src/main/java/io/druid/sql/calcite/expression/builtin/TimeExtractOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/TimeExtractOperatorConversion.java index d48f642baeb6..07e054b538e8 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/TimeExtractOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/TimeExtractOperatorConversion.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.sql.calcite.expression.builtin; +package org.apache.druid.sql.calcite.expression.builtin; import com.google.common.collect.ImmutableList; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.StringUtils; -import io.druid.query.expression.TimestampExtractExprMacro; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.expression.Expressions; -import io.druid.sql.calcite.expression.OperatorConversions; -import io.druid.sql.calcite.expression.SqlOperatorConversion; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.expression.TimestampExtractExprMacro; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.expression.Expressions; +import org.apache.druid.sql.calcite.expression.OperatorConversions; +import org.apache.druid.sql.calcite.expression.SqlOperatorConversion; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rex.RexCall; import org.apache.calcite.rex.RexLiteral; import org.apache.calcite.rex.RexNode; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/TimeFloorOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/TimeFloorOperatorConversion.java similarity index 88% rename from sql/src/main/java/io/druid/sql/calcite/expression/builtin/TimeFloorOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/TimeFloorOperatorConversion.java index 2a7d6c5f9f6f..ae98f5ed9862 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/TimeFloorOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/TimeFloorOperatorConversion.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.sql.calcite.expression.builtin; +package org.apache.druid.sql.calcite.expression.builtin; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.granularity.PeriodGranularity; -import io.druid.math.expr.ExprMacroTable; -import io.druid.query.expression.TimestampFloorExprMacro; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.expression.Expressions; -import io.druid.sql.calcite.expression.OperatorConversions; -import io.druid.sql.calcite.expression.SqlOperatorConversion; -import io.druid.sql.calcite.planner.Calcites; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.granularity.PeriodGranularity; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.query.expression.TimestampFloorExprMacro; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.expression.Expressions; +import org.apache.druid.sql.calcite.expression.OperatorConversions; +import org.apache.druid.sql.calcite.expression.SqlOperatorConversion; +import org.apache.druid.sql.calcite.planner.Calcites; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rex.RexCall; import org.apache.calcite.rex.RexLiteral; import org.apache.calcite.rex.RexNode; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/TimeFormatOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/TimeFormatOperatorConversion.java similarity index 86% rename from sql/src/main/java/io/druid/sql/calcite/expression/builtin/TimeFormatOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/TimeFormatOperatorConversion.java index 852880a9cd6c..dbc452265631 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/TimeFormatOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/TimeFormatOperatorConversion.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.sql.calcite.expression.builtin; +package org.apache.druid.sql.calcite.expression.builtin; import com.google.common.collect.ImmutableList; -import io.druid.java.util.common.DateTimes; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.expression.Expressions; -import io.druid.sql.calcite.expression.OperatorConversions; -import io.druid.sql.calcite.expression.SqlOperatorConversion; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.expression.Expressions; +import org.apache.druid.sql.calcite.expression.OperatorConversions; +import org.apache.druid.sql.calcite.expression.SqlOperatorConversion; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rex.RexCall; import org.apache.calcite.rex.RexLiteral; import org.apache.calcite.rex.RexNode; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/TimeParseOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/TimeParseOperatorConversion.java similarity index 83% rename from sql/src/main/java/io/druid/sql/calcite/expression/builtin/TimeParseOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/TimeParseOperatorConversion.java index fc665e81953d..cbd678a8159b 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/TimeParseOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/TimeParseOperatorConversion.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.sql.calcite.expression.builtin; +package org.apache.druid.sql.calcite.expression.builtin; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.expression.OperatorConversions; -import io.druid.sql.calcite.expression.SqlOperatorConversion; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.expression.OperatorConversions; +import org.apache.druid.sql.calcite.expression.SqlOperatorConversion; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rex.RexNode; import org.apache.calcite.sql.SqlFunction; import org.apache.calcite.sql.SqlFunctionCategory; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/TimeShiftOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/TimeShiftOperatorConversion.java similarity index 83% rename from sql/src/main/java/io/druid/sql/calcite/expression/builtin/TimeShiftOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/TimeShiftOperatorConversion.java index 4df377bde657..2630c748d03a 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/TimeShiftOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/TimeShiftOperatorConversion.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.sql.calcite.expression.builtin; +package org.apache.druid.sql.calcite.expression.builtin; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.expression.OperatorConversions; -import io.druid.sql.calcite.expression.SqlOperatorConversion; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.expression.OperatorConversions; +import org.apache.druid.sql.calcite.expression.SqlOperatorConversion; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rex.RexNode; import org.apache.calcite.sql.SqlFunction; import org.apache.calcite.sql.SqlFunctionCategory; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/TimestampToMillisOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/TimestampToMillisOperatorConversion.java similarity index 82% rename from sql/src/main/java/io/druid/sql/calcite/expression/builtin/TimestampToMillisOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/TimestampToMillisOperatorConversion.java index 1c96f25bd315..e59da9ebdc99 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/TimestampToMillisOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/TimestampToMillisOperatorConversion.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.sql.calcite.expression.builtin; +package org.apache.druid.sql.calcite.expression.builtin; import com.google.common.collect.Iterables; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.expression.Expressions; -import io.druid.sql.calcite.expression.OperatorConversions; -import io.druid.sql.calcite.expression.SqlOperatorConversion; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.expression.Expressions; +import org.apache.druid.sql.calcite.expression.OperatorConversions; +import org.apache.druid.sql.calcite.expression.SqlOperatorConversion; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rex.RexCall; import org.apache.calcite.rex.RexNode; import org.apache.calcite.sql.SqlFunction; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/TrimOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/TrimOperatorConversion.java similarity index 89% rename from sql/src/main/java/io/druid/sql/calcite/expression/builtin/TrimOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/TrimOperatorConversion.java index 7e9f8afb5b9d..d7f99beefe5a 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/TrimOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/TrimOperatorConversion.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.sql.calcite.expression.builtin; +package org.apache.druid.sql.calcite.expression.builtin; import com.google.common.collect.ImmutableList; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.expression.Expressions; -import io.druid.sql.calcite.expression.SqlOperatorConversion; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.expression.Expressions; +import org.apache.druid.sql.calcite.expression.SqlOperatorConversion; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rex.RexCall; import org.apache.calcite.rex.RexLiteral; import org.apache.calcite.rex.RexNode; diff --git a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/TruncateOperatorConversion.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/TruncateOperatorConversion.java similarity index 85% rename from sql/src/main/java/io/druid/sql/calcite/expression/builtin/TruncateOperatorConversion.java rename to sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/TruncateOperatorConversion.java index 99241da13798..906bfb2d8f76 100644 --- a/sql/src/main/java/io/druid/sql/calcite/expression/builtin/TruncateOperatorConversion.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/TruncateOperatorConversion.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.sql.calcite.expression.builtin; +package org.apache.druid.sql.calcite.expression.builtin; -import io.druid.java.util.common.StringUtils; -import io.druid.math.expr.Expr; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.expression.OperatorConversions; -import io.druid.sql.calcite.expression.SqlOperatorConversion; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.math.expr.Expr; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.expression.OperatorConversions; +import org.apache.druid.sql.calcite.expression.SqlOperatorConversion; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rex.RexNode; import org.apache.calcite.sql.SqlFunction; import org.apache.calcite.sql.SqlFunctionCategory; diff --git a/sql/src/main/java/io/druid/sql/calcite/filtration/BottomUpTransform.java b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/BottomUpTransform.java similarity index 92% rename from sql/src/main/java/io/druid/sql/calcite/filtration/BottomUpTransform.java rename to sql/src/main/java/org/apache/druid/sql/calcite/filtration/BottomUpTransform.java index bb7ef3314722..10d7b007eb0f 100644 --- a/sql/src/main/java/io/druid/sql/calcite/filtration/BottomUpTransform.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/BottomUpTransform.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.sql.calcite.filtration; +package org.apache.druid.sql.calcite.filtration; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import io.druid.query.filter.AndDimFilter; -import io.druid.query.filter.DimFilter; -import io.druid.query.filter.NotDimFilter; -import io.druid.query.filter.OrDimFilter; +import org.apache.druid.query.filter.AndDimFilter; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.filter.NotDimFilter; +import org.apache.druid.query.filter.OrDimFilter; import java.util.List; diff --git a/sql/src/main/java/io/druid/sql/calcite/filtration/BoundRefKey.java b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/BoundRefKey.java similarity index 91% rename from sql/src/main/java/io/druid/sql/calcite/filtration/BoundRefKey.java rename to sql/src/main/java/org/apache/druid/sql/calcite/filtration/BoundRefKey.java index 4e9a6015c0da..dd1f5a5746d1 100644 --- a/sql/src/main/java/io/druid/sql/calcite/filtration/BoundRefKey.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/BoundRefKey.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.sql.calcite.filtration; +package org.apache.druid.sql.calcite.filtration; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.filter.BoundDimFilter; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.query.ordering.StringComparator; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.filter.BoundDimFilter; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.query.ordering.StringComparator; public class BoundRefKey { diff --git a/sql/src/main/java/io/druid/sql/calcite/filtration/BoundValue.java b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/BoundValue.java similarity index 93% rename from sql/src/main/java/io/druid/sql/calcite/filtration/BoundValue.java rename to sql/src/main/java/org/apache/druid/sql/calcite/filtration/BoundValue.java index 96d790aa9bbd..a5a94d70b6b0 100644 --- a/sql/src/main/java/io/druid/sql/calcite/filtration/BoundValue.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/BoundValue.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.sql.calcite.filtration; +package org.apache.druid.sql.calcite.filtration; -import io.druid.java.util.common.ISE; -import io.druid.query.ordering.StringComparator; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.query.ordering.StringComparator; public class BoundValue implements Comparable { diff --git a/sql/src/main/java/io/druid/sql/calcite/filtration/Bounds.java b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/Bounds.java similarity index 96% rename from sql/src/main/java/io/druid/sql/calcite/filtration/Bounds.java rename to sql/src/main/java/org/apache/druid/sql/calcite/filtration/Bounds.java index d6ebe34fccb3..868c117129ef 100644 --- a/sql/src/main/java/io/druid/sql/calcite/filtration/Bounds.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/Bounds.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.sql.calcite.filtration; +package org.apache.druid.sql.calcite.filtration; import com.google.common.base.Function; import com.google.common.collect.BoundType; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.Range; -import io.druid.java.util.common.ISE; -import io.druid.query.filter.BoundDimFilter; -import io.druid.query.ordering.StringComparators; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.query.filter.BoundDimFilter; +import org.apache.druid.query.ordering.StringComparators; import org.joda.time.Interval; import java.util.List; diff --git a/sql/src/main/java/io/druid/sql/calcite/filtration/CombineAndSimplifyBounds.java b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/CombineAndSimplifyBounds.java similarity index 96% rename from sql/src/main/java/io/druid/sql/calcite/filtration/CombineAndSimplifyBounds.java rename to sql/src/main/java/org/apache/druid/sql/calcite/filtration/CombineAndSimplifyBounds.java index fabd90efd050..96d1c0d48a8f 100644 --- a/sql/src/main/java/io/druid/sql/calcite/filtration/CombineAndSimplifyBounds.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/CombineAndSimplifyBounds.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.sql.calcite.filtration; +package org.apache.druid.sql.calcite.filtration; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Range; import com.google.common.collect.RangeSet; -import io.druid.java.util.common.ISE; -import io.druid.query.filter.AndDimFilter; -import io.druid.query.filter.BoundDimFilter; -import io.druid.query.filter.DimFilter; -import io.druid.query.filter.NotDimFilter; -import io.druid.query.filter.OrDimFilter; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.query.filter.AndDimFilter; +import org.apache.druid.query.filter.BoundDimFilter; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.filter.NotDimFilter; +import org.apache.druid.query.filter.OrDimFilter; import java.util.ArrayList; import java.util.Iterator; diff --git a/sql/src/main/java/io/druid/sql/calcite/filtration/ConvertBoundsToSelectors.java b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/ConvertBoundsToSelectors.java similarity index 84% rename from sql/src/main/java/io/druid/sql/calcite/filtration/ConvertBoundsToSelectors.java rename to sql/src/main/java/org/apache/druid/sql/calcite/filtration/ConvertBoundsToSelectors.java index 8506ad968ad6..3eb918e41a9d 100644 --- a/sql/src/main/java/io/druid/sql/calcite/filtration/ConvertBoundsToSelectors.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/ConvertBoundsToSelectors.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.sql.calcite.filtration; +package org.apache.druid.sql.calcite.filtration; -import io.druid.query.filter.BoundDimFilter; -import io.druid.query.filter.DimFilter; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.query.ordering.StringComparator; -import io.druid.sql.calcite.expression.SimpleExtraction; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.query.filter.BoundDimFilter; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.query.ordering.StringComparator; +import org.apache.druid.sql.calcite.expression.SimpleExtraction; +import org.apache.druid.sql.calcite.table.RowSignature; public class ConvertBoundsToSelectors extends BottomUpTransform { diff --git a/sql/src/main/java/io/druid/sql/calcite/filtration/ConvertSelectorsToIns.java b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/ConvertSelectorsToIns.java similarity index 89% rename from sql/src/main/java/io/druid/sql/calcite/filtration/ConvertSelectorsToIns.java rename to sql/src/main/java/org/apache/druid/sql/calcite/filtration/ConvertSelectorsToIns.java index d9c4e241b79b..a85d7c5e7898 100644 --- a/sql/src/main/java/io/druid/sql/calcite/filtration/ConvertSelectorsToIns.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/ConvertSelectorsToIns.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.sql.calcite.filtration; +package org.apache.druid.sql.calcite.filtration; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.java.util.common.ISE; -import io.druid.query.filter.DimFilter; -import io.druid.query.filter.InDimFilter; -import io.druid.query.filter.OrDimFilter; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.sql.calcite.expression.SimpleExtraction; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.filter.InDimFilter; +import org.apache.druid.query.filter.OrDimFilter; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.sql.calcite.expression.SimpleExtraction; +import org.apache.druid.sql.calcite.table.RowSignature; import java.util.List; import java.util.Map; diff --git a/sql/src/main/java/io/druid/sql/calcite/filtration/Filtration.java b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/Filtration.java similarity index 91% rename from sql/src/main/java/io/druid/sql/calcite/filtration/Filtration.java rename to sql/src/main/java/org/apache/druid/sql/calcite/filtration/Filtration.java index 3e915ee9324a..25232a59e6e1 100644 --- a/sql/src/main/java/io/druid/sql/calcite/filtration/Filtration.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/Filtration.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.sql.calcite.filtration; +package org.apache.druid.sql.calcite.filtration; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Intervals; -import io.druid.math.expr.ExprMacroTable; -import io.druid.query.filter.DimFilter; -import io.druid.query.filter.ExpressionDimFilter; -import io.druid.query.spec.MultipleIntervalSegmentSpec; -import io.druid.query.spec.QuerySegmentSpec; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.filter.ExpressionDimFilter; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.query.spec.QuerySegmentSpec; +import org.apache.druid.sql.calcite.table.RowSignature; import org.joda.time.Interval; import java.util.List; diff --git a/sql/src/main/java/io/druid/sql/calcite/filtration/MoveMarkerFiltersToIntervals.java b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/MoveMarkerFiltersToIntervals.java similarity index 97% rename from sql/src/main/java/io/druid/sql/calcite/filtration/MoveMarkerFiltersToIntervals.java rename to sql/src/main/java/org/apache/druid/sql/calcite/filtration/MoveMarkerFiltersToIntervals.java index 1e49a4a0786a..0f4ba88699ec 100644 --- a/sql/src/main/java/io/druid/sql/calcite/filtration/MoveMarkerFiltersToIntervals.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/MoveMarkerFiltersToIntervals.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.sql.calcite.filtration; +package org.apache.druid.sql.calcite.filtration; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; diff --git a/sql/src/main/java/io/druid/sql/calcite/filtration/MoveTimeFiltersToIntervals.java b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/MoveTimeFiltersToIntervals.java similarity index 92% rename from sql/src/main/java/io/druid/sql/calcite/filtration/MoveTimeFiltersToIntervals.java rename to sql/src/main/java/org/apache/druid/sql/calcite/filtration/MoveTimeFiltersToIntervals.java index 7e2cd5d94474..3916b9676db3 100644 --- a/sql/src/main/java/io/druid/sql/calcite/filtration/MoveTimeFiltersToIntervals.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/MoveTimeFiltersToIntervals.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.sql.calcite.filtration; +package org.apache.druid.sql.calcite.filtration; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.Range; import com.google.common.collect.RangeSet; -import io.druid.java.util.common.Pair; -import io.druid.query.filter.AndDimFilter; -import io.druid.query.filter.BoundDimFilter; -import io.druid.query.filter.DimFilter; -import io.druid.query.filter.NotDimFilter; -import io.druid.query.filter.OrDimFilter; -import io.druid.query.ordering.StringComparators; -import io.druid.segment.column.Column; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.query.filter.AndDimFilter; +import org.apache.druid.query.filter.BoundDimFilter; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.filter.NotDimFilter; +import org.apache.druid.query.filter.OrDimFilter; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.segment.column.Column; import java.util.List; diff --git a/sql/src/main/java/io/druid/sql/calcite/filtration/RangeSets.java b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/RangeSets.java similarity index 97% rename from sql/src/main/java/io/druid/sql/calcite/filtration/RangeSets.java rename to sql/src/main/java/org/apache/druid/sql/calcite/filtration/RangeSets.java index b895727a5c36..257441dbe5a3 100644 --- a/sql/src/main/java/io/druid/sql/calcite/filtration/RangeSets.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/RangeSets.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.sql.calcite.filtration; +package org.apache.druid.sql.calcite.filtration; import com.google.common.collect.BoundType; import com.google.common.collect.ImmutableList; @@ -25,7 +25,7 @@ import com.google.common.collect.Range; import com.google.common.collect.RangeSet; import com.google.common.collect.TreeRangeSet; -import io.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Intervals; import org.joda.time.Interval; import java.util.List; diff --git a/sql/src/main/java/io/druid/sql/calcite/filtration/ValidateNoMarkerFiltersRemain.java b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/ValidateNoMarkerFiltersRemain.java similarity index 90% rename from sql/src/main/java/io/druid/sql/calcite/filtration/ValidateNoMarkerFiltersRemain.java rename to sql/src/main/java/org/apache/druid/sql/calcite/filtration/ValidateNoMarkerFiltersRemain.java index 32243412a67e..1b9bfcc89d47 100644 --- a/sql/src/main/java/io/druid/sql/calcite/filtration/ValidateNoMarkerFiltersRemain.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/ValidateNoMarkerFiltersRemain.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.sql.calcite.filtration; +package org.apache.druid.sql.calcite.filtration; -import io.druid.java.util.common.ISE; -import io.druid.query.filter.DimFilter; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.query.filter.DimFilter; public class ValidateNoMarkerFiltersRemain extends BottomUpTransform { diff --git a/sql/src/main/java/io/druid/sql/calcite/planner/Calcites.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/Calcites.java similarity index 95% rename from sql/src/main/java/io/druid/sql/calcite/planner/Calcites.java rename to sql/src/main/java/org/apache/druid/sql/calcite/planner/Calcites.java index df401b351ecc..dd41c3bd9fcf 100644 --- a/sql/src/main/java/io/druid/sql/calcite/planner/Calcites.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/Calcites.java @@ -17,21 +17,21 @@ * under the License. */ -package io.druid.sql.calcite.planner; +package org.apache.druid.sql.calcite.planner; import com.google.common.base.Preconditions; import com.google.common.io.BaseEncoding; import com.google.common.primitives.Chars; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.query.ordering.StringComparator; -import io.druid.query.ordering.StringComparators; -import io.druid.segment.column.ValueType; -import io.druid.server.security.AuthorizerMapper; -import io.druid.sql.calcite.schema.DruidSchema; -import io.druid.sql.calcite.schema.InformationSchema; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.query.ordering.StringComparator; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.sql.calcite.schema.DruidSchema; +import org.apache.druid.sql.calcite.schema.InformationSchema; import org.apache.calcite.jdbc.CalciteSchema; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.rel.type.RelDataTypeFactory; diff --git a/sql/src/main/java/io/druid/sql/calcite/planner/DruidConformance.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidConformance.java similarity index 97% rename from sql/src/main/java/io/druid/sql/calcite/planner/DruidConformance.java rename to sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidConformance.java index 69bd44353a4a..c0f92f2014f4 100644 --- a/sql/src/main/java/io/druid/sql/calcite/planner/DruidConformance.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidConformance.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.sql.calcite.planner; +package org.apache.druid.sql.calcite.planner; import org.apache.calcite.sql.validate.SqlAbstractConformance; diff --git a/sql/src/main/java/io/druid/sql/calcite/planner/DruidConvertletTable.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidConvertletTable.java similarity index 98% rename from sql/src/main/java/io/druid/sql/calcite/planner/DruidConvertletTable.java rename to sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidConvertletTable.java index b377481ad92d..6e421083ccfd 100644 --- a/sql/src/main/java/io/druid/sql/calcite/planner/DruidConvertletTable.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidConvertletTable.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.sql.calcite.planner; +package org.apache.druid.sql.calcite.planner; import com.google.common.collect.ImmutableList; -import io.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.ISE; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.rex.RexNode; import org.apache.calcite.sql.SqlCall; diff --git a/sql/src/main/java/io/druid/sql/calcite/planner/DruidOperatorTable.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidOperatorTable.java similarity index 80% rename from sql/src/main/java/io/druid/sql/calcite/planner/DruidOperatorTable.java rename to sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidOperatorTable.java index 3ecd62e7d880..000c31567678 100644 --- a/sql/src/main/java/io/druid/sql/calcite/planner/DruidOperatorTable.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidOperatorTable.java @@ -17,53 +17,53 @@ * under the License. */ -package io.druid.sql.calcite.planner; +package org.apache.druid.sql.calcite.planner; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; import com.google.inject.Inject; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.sql.calcite.aggregation.SqlAggregator; -import io.druid.sql.calcite.aggregation.builtin.ApproxCountDistinctSqlAggregator; -import io.druid.sql.calcite.aggregation.builtin.AvgSqlAggregator; -import io.druid.sql.calcite.aggregation.builtin.CountSqlAggregator; -import io.druid.sql.calcite.aggregation.builtin.MaxSqlAggregator; -import io.druid.sql.calcite.aggregation.builtin.MinSqlAggregator; -import io.druid.sql.calcite.aggregation.builtin.SumSqlAggregator; -import io.druid.sql.calcite.aggregation.builtin.SumZeroSqlAggregator; -import io.druid.sql.calcite.expression.AliasedOperatorConversion; -import io.druid.sql.calcite.expression.BinaryOperatorConversion; -import io.druid.sql.calcite.expression.DirectOperatorConversion; -import io.druid.sql.calcite.expression.SqlOperatorConversion; -import io.druid.sql.calcite.expression.UnaryFunctionOperatorConversion; -import io.druid.sql.calcite.expression.UnaryPrefixOperatorConversion; -import io.druid.sql.calcite.expression.UnarySuffixOperatorConversion; -import io.druid.sql.calcite.expression.builtin.BTrimOperatorConversion; -import io.druid.sql.calcite.expression.builtin.CastOperatorConversion; -import io.druid.sql.calcite.expression.builtin.CeilOperatorConversion; -import io.druid.sql.calcite.expression.builtin.ConcatOperatorConversion; -import io.druid.sql.calcite.expression.builtin.DateTruncOperatorConversion; -import io.druid.sql.calcite.expression.builtin.ExtractOperatorConversion; -import io.druid.sql.calcite.expression.builtin.FloorOperatorConversion; -import io.druid.sql.calcite.expression.builtin.LTrimOperatorConversion; -import io.druid.sql.calcite.expression.builtin.MillisToTimestampOperatorConversion; -import io.druid.sql.calcite.expression.builtin.RTrimOperatorConversion; -import io.druid.sql.calcite.expression.builtin.RegexpExtractOperatorConversion; -import io.druid.sql.calcite.expression.builtin.ReinterpretOperatorConversion; -import io.druid.sql.calcite.expression.builtin.StrposOperatorConversion; -import io.druid.sql.calcite.expression.builtin.SubstringOperatorConversion; -import io.druid.sql.calcite.expression.builtin.TextcatOperatorConversion; -import io.druid.sql.calcite.expression.builtin.TimeArithmeticOperatorConversion; -import io.druid.sql.calcite.expression.builtin.TimeExtractOperatorConversion; -import io.druid.sql.calcite.expression.builtin.TimeFloorOperatorConversion; -import io.druid.sql.calcite.expression.builtin.TimeFormatOperatorConversion; -import io.druid.sql.calcite.expression.builtin.TimeParseOperatorConversion; -import io.druid.sql.calcite.expression.builtin.TimeShiftOperatorConversion; -import io.druid.sql.calcite.expression.builtin.TimestampToMillisOperatorConversion; -import io.druid.sql.calcite.expression.builtin.TrimOperatorConversion; -import io.druid.sql.calcite.expression.builtin.TruncateOperatorConversion; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.sql.calcite.aggregation.SqlAggregator; +import org.apache.druid.sql.calcite.aggregation.builtin.ApproxCountDistinctSqlAggregator; +import org.apache.druid.sql.calcite.aggregation.builtin.AvgSqlAggregator; +import org.apache.druid.sql.calcite.aggregation.builtin.CountSqlAggregator; +import org.apache.druid.sql.calcite.aggregation.builtin.MaxSqlAggregator; +import org.apache.druid.sql.calcite.aggregation.builtin.MinSqlAggregator; +import org.apache.druid.sql.calcite.aggregation.builtin.SumSqlAggregator; +import org.apache.druid.sql.calcite.aggregation.builtin.SumZeroSqlAggregator; +import org.apache.druid.sql.calcite.expression.AliasedOperatorConversion; +import org.apache.druid.sql.calcite.expression.BinaryOperatorConversion; +import org.apache.druid.sql.calcite.expression.DirectOperatorConversion; +import org.apache.druid.sql.calcite.expression.SqlOperatorConversion; +import org.apache.druid.sql.calcite.expression.UnaryFunctionOperatorConversion; +import org.apache.druid.sql.calcite.expression.UnaryPrefixOperatorConversion; +import org.apache.druid.sql.calcite.expression.UnarySuffixOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.BTrimOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.CastOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.CeilOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.ConcatOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.DateTruncOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.ExtractOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.FloorOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.LTrimOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.MillisToTimestampOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.RTrimOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.RegexpExtractOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.ReinterpretOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.StrposOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.SubstringOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.TextcatOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.TimeArithmeticOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.TimeExtractOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.TimeFloorOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.TimeFormatOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.TimeParseOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.TimeShiftOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.TimestampToMillisOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.TrimOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.TruncateOperatorConversion; import org.apache.calcite.sql.SqlAggFunction; import org.apache.calcite.sql.SqlFunctionCategory; import org.apache.calcite.sql.SqlIdentifier; diff --git a/sql/src/main/java/io/druid/sql/calcite/planner/DruidPlanner.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidPlanner.java similarity index 94% rename from sql/src/main/java/io/druid/sql/calcite/planner/DruidPlanner.java rename to sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidPlanner.java index f59614bf7898..53fb0b1ae750 100644 --- a/sql/src/main/java/io/druid/sql/calcite/planner/DruidPlanner.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidPlanner.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.sql.calcite.planner; +package org.apache.druid.sql.calcite.planner; import com.google.common.base.Function; import com.google.common.base.Preconditions; @@ -26,17 +26,17 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.server.security.Access; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthenticationResult; -import io.druid.server.security.AuthorizationUtils; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.ForbiddenException; -import io.druid.sql.calcite.rel.DruidConvention; -import io.druid.sql.calcite.rel.DruidRel; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.server.security.Access; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthenticationResult; +import org.apache.druid.server.security.AuthorizationUtils; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.ForbiddenException; +import org.apache.druid.sql.calcite.rel.DruidConvention; +import org.apache.druid.sql.calcite.rel.DruidRel; import org.apache.calcite.DataContext; import org.apache.calcite.adapter.java.JavaTypeFactory; import org.apache.calcite.interpreter.BindableConvention; diff --git a/sql/src/main/java/io/druid/sql/calcite/planner/DruidRexExecutor.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidRexExecutor.java similarity index 90% rename from sql/src/main/java/io/druid/sql/calcite/planner/DruidRexExecutor.java rename to sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidRexExecutor.java index dc1ed23d4ae4..18e2bddd2f53 100644 --- a/sql/src/main/java/io/druid/sql/calcite/planner/DruidRexExecutor.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidRexExecutor.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.sql.calcite.planner; - -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.IAE; -import io.druid.math.expr.Expr; -import io.druid.math.expr.ExprEval; -import io.druid.math.expr.ExprType; -import io.druid.math.expr.Parser; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.expression.Expressions; -import io.druid.sql.calcite.table.RowSignature; +package org.apache.druid.sql.calcite.planner; + +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.math.expr.Expr; +import org.apache.druid.math.expr.ExprEval; +import org.apache.druid.math.expr.ExprType; +import org.apache.druid.math.expr.Parser; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.expression.Expressions; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.rex.RexBuilder; import org.apache.calcite.rex.RexExecutor; diff --git a/sql/src/main/java/io/druid/sql/calcite/planner/DruidTypeSystem.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidTypeSystem.java similarity index 98% rename from sql/src/main/java/io/druid/sql/calcite/planner/DruidTypeSystem.java rename to sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidTypeSystem.java index 377e11641670..2f6b86801d8a 100644 --- a/sql/src/main/java/io/druid/sql/calcite/planner/DruidTypeSystem.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidTypeSystem.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.sql.calcite.planner; +package org.apache.druid.sql.calcite.planner; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.rel.type.RelDataTypeFactory; diff --git a/sql/src/main/java/io/druid/sql/calcite/planner/PlannerConfig.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerConfig.java similarity index 98% rename from sql/src/main/java/io/druid/sql/calcite/planner/PlannerConfig.java rename to sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerConfig.java index c8aa8f3a2c7e..109b3dbe76e4 100644 --- a/sql/src/main/java/io/druid/sql/calcite/planner/PlannerConfig.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerConfig.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.sql.calcite.planner; +package org.apache.druid.sql.calcite.planner; import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.IAE; import org.joda.time.DateTimeZone; import org.joda.time.Period; diff --git a/sql/src/main/java/io/druid/sql/calcite/planner/PlannerContext.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerContext.java similarity index 96% rename from sql/src/main/java/io/druid/sql/calcite/planner/PlannerContext.java rename to sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerContext.java index 7d0b4b6db011..2b088834af3d 100644 --- a/sql/src/main/java/io/druid/sql/calcite/planner/PlannerContext.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerContext.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.sql.calcite.planner; +package org.apache.druid.sql.calcite.planner; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import io.druid.java.util.common.DateTimes; -import io.druid.math.expr.ExprMacroTable; -import io.druid.server.security.AuthenticationResult; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.server.security.AuthenticationResult; import org.apache.calcite.DataContext; import org.apache.calcite.adapter.java.JavaTypeFactory; import org.apache.calcite.linq4j.QueryProvider; diff --git a/sql/src/main/java/io/druid/sql/calcite/planner/PlannerFactory.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerFactory.java similarity index 93% rename from sql/src/main/java/io/druid/sql/calcite/planner/PlannerFactory.java rename to sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerFactory.java index 097c719065d8..ef819ee2160d 100644 --- a/sql/src/main/java/io/druid/sql/calcite/planner/PlannerFactory.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerFactory.java @@ -17,16 +17,16 @@ * under the License. */ -package io.druid.sql.calcite.planner; +package org.apache.druid.sql.calcite.planner; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.inject.Inject; -import io.druid.guice.annotations.Json; -import io.druid.math.expr.ExprMacroTable; -import io.druid.server.QueryLifecycleFactory; -import io.druid.server.security.AuthorizerMapper; -import io.druid.sql.calcite.rel.QueryMaker; -import io.druid.sql.calcite.schema.DruidSchema; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.server.QueryLifecycleFactory; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.sql.calcite.rel.QueryMaker; +import org.apache.druid.sql.calcite.schema.DruidSchema; import org.apache.calcite.avatica.util.Casing; import org.apache.calcite.avatica.util.Quoting; import org.apache.calcite.config.CalciteConnectionConfig; diff --git a/sql/src/main/java/io/druid/sql/calcite/planner/PlannerResult.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerResult.java similarity index 93% rename from sql/src/main/java/io/druid/sql/calcite/planner/PlannerResult.java rename to sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerResult.java index 93c2f7756014..69c328e1d201 100644 --- a/sql/src/main/java/io/druid/sql/calcite/planner/PlannerResult.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerResult.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.sql.calcite.planner; +package org.apache.druid.sql.calcite.planner; import com.google.common.base.Supplier; -import io.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequence; import org.apache.calcite.rel.type.RelDataType; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/sql/src/main/java/io/druid/sql/calcite/planner/Rules.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/Rules.java similarity index 94% rename from sql/src/main/java/io/druid/sql/calcite/planner/Rules.java rename to sql/src/main/java/org/apache/druid/sql/calcite/planner/Rules.java index a2056ee7ce62..c398af2c2d0e 100644 --- a/sql/src/main/java/io/druid/sql/calcite/planner/Rules.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/Rules.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.sql.calcite.planner; +package org.apache.druid.sql.calcite.planner; import com.google.common.collect.ImmutableList; -import io.druid.sql.calcite.rel.QueryMaker; -import io.druid.sql.calcite.rule.CaseFilteredAggregatorRule; -import io.druid.sql.calcite.rule.DruidRelToBindableRule; -import io.druid.sql.calcite.rule.DruidRelToDruidRule; -import io.druid.sql.calcite.rule.DruidRules; -import io.druid.sql.calcite.rule.DruidSemiJoinRule; -import io.druid.sql.calcite.rule.DruidTableScanRule; -import io.druid.sql.calcite.rule.ProjectAggregatePruneUnusedCallRule; -import io.druid.sql.calcite.rule.SortCollapseRule; +import org.apache.druid.sql.calcite.rel.QueryMaker; +import org.apache.druid.sql.calcite.rule.CaseFilteredAggregatorRule; +import org.apache.druid.sql.calcite.rule.DruidRelToBindableRule; +import org.apache.druid.sql.calcite.rule.DruidRelToDruidRule; +import org.apache.druid.sql.calcite.rule.DruidRules; +import org.apache.druid.sql.calcite.rule.DruidSemiJoinRule; +import org.apache.druid.sql.calcite.rule.DruidTableScanRule; +import org.apache.druid.sql.calcite.rule.ProjectAggregatePruneUnusedCallRule; +import org.apache.druid.sql.calcite.rule.SortCollapseRule; import org.apache.calcite.interpreter.Bindables; import org.apache.calcite.plan.RelOptLattice; import org.apache.calcite.plan.RelOptMaterialization; diff --git a/sql/src/main/java/io/druid/sql/calcite/rel/CannotBuildQueryException.java b/sql/src/main/java/org/apache/druid/sql/calcite/rel/CannotBuildQueryException.java similarity index 94% rename from sql/src/main/java/io/druid/sql/calcite/rel/CannotBuildQueryException.java rename to sql/src/main/java/org/apache/druid/sql/calcite/rel/CannotBuildQueryException.java index c18cb029ed7b..d92a421b3556 100644 --- a/sql/src/main/java/io/druid/sql/calcite/rel/CannotBuildQueryException.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/rel/CannotBuildQueryException.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.sql.calcite.rel; +package org.apache.druid.sql.calcite.rel; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.core.AggregateCall; import org.apache.calcite.rex.RexNode; diff --git a/sql/src/main/java/io/druid/sql/calcite/rel/DruidConvention.java b/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidConvention.java similarity index 98% rename from sql/src/main/java/io/druid/sql/calcite/rel/DruidConvention.java rename to sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidConvention.java index d95280cbd412..9845e9cfee77 100644 --- a/sql/src/main/java/io/druid/sql/calcite/rel/DruidConvention.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidConvention.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.sql.calcite.rel; +package org.apache.druid.sql.calcite.rel; import org.apache.calcite.plan.Convention; import org.apache.calcite.plan.ConventionTraitDef; diff --git a/sql/src/main/java/io/druid/sql/calcite/rel/DruidOuterQueryRel.java b/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidOuterQueryRel.java similarity index 94% rename from sql/src/main/java/io/druid/sql/calcite/rel/DruidOuterQueryRel.java rename to sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidOuterQueryRel.java index 7d0666cd3bf5..91dc11a12a17 100644 --- a/sql/src/main/java/io/druid/sql/calcite/rel/DruidOuterQueryRel.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidOuterQueryRel.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.sql.calcite.rel; +package org.apache.druid.sql.calcite.rel; import com.fasterxml.jackson.core.JsonProcessingException; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.query.QueryDataSource; -import io.druid.query.TableDataSource; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.query.QueryDataSource; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.interpreter.BindableConvention; import org.apache.calcite.plan.RelOptCluster; import org.apache.calcite.plan.RelOptCost; diff --git a/sql/src/main/java/io/druid/sql/calcite/rel/DruidQuery.java b/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidQuery.java similarity index 93% rename from sql/src/main/java/io/druid/sql/calcite/rel/DruidQuery.java rename to sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidQuery.java index 17d1bd92ff67..70fda1104eed 100644 --- a/sql/src/main/java/io/druid/sql/calcite/rel/DruidQuery.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidQuery.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.sql.calcite.rel; +package org.apache.druid.sql.calcite.rel; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; @@ -27,48 +27,48 @@ import com.google.common.collect.Iterators; import com.google.common.collect.Maps; import com.google.common.collect.Ordering; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.Granularity; -import io.druid.math.expr.ExprMacroTable; -import io.druid.math.expr.ExprType; -import io.druid.math.expr.Parser; -import io.druid.query.DataSource; -import io.druid.query.Query; -import io.druid.query.QueryDataSource; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.aggregation.post.ExpressionPostAggregator; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.filter.DimFilter; -import io.druid.query.groupby.GroupByQuery; -import io.druid.query.groupby.having.DimFilterHavingSpec; -import io.druid.query.groupby.orderby.DefaultLimitSpec; -import io.druid.query.groupby.orderby.OrderByColumnSpec; -import io.druid.query.ordering.StringComparator; -import io.druid.query.ordering.StringComparators; -import io.druid.query.scan.ScanQuery; -import io.druid.query.select.PagingSpec; -import io.druid.query.select.SelectQuery; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.topn.DimensionTopNMetricSpec; -import io.druid.query.topn.InvertedTopNMetricSpec; -import io.druid.query.topn.NumericTopNMetricSpec; -import io.druid.query.topn.TopNMetricSpec; -import io.druid.query.topn.TopNQuery; -import io.druid.segment.VirtualColumn; -import io.druid.segment.VirtualColumns; -import io.druid.segment.column.Column; -import io.druid.segment.column.ValueType; -import io.druid.sql.calcite.aggregation.Aggregation; -import io.druid.sql.calcite.aggregation.DimensionExpression; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.expression.Expressions; -import io.druid.sql.calcite.filtration.Filtration; -import io.druid.sql.calcite.planner.Calcites; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.rule.GroupByRules; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.math.expr.ExprType; +import org.apache.druid.math.expr.Parser; +import org.apache.druid.query.DataSource; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryDataSource; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.aggregation.post.ExpressionPostAggregator; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.groupby.GroupByQuery; +import org.apache.druid.query.groupby.having.DimFilterHavingSpec; +import org.apache.druid.query.groupby.orderby.DefaultLimitSpec; +import org.apache.druid.query.groupby.orderby.OrderByColumnSpec; +import org.apache.druid.query.ordering.StringComparator; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.query.scan.ScanQuery; +import org.apache.druid.query.select.PagingSpec; +import org.apache.druid.query.select.SelectQuery; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.topn.DimensionTopNMetricSpec; +import org.apache.druid.query.topn.InvertedTopNMetricSpec; +import org.apache.druid.query.topn.NumericTopNMetricSpec; +import org.apache.druid.query.topn.TopNMetricSpec; +import org.apache.druid.query.topn.TopNQuery; +import org.apache.druid.segment.VirtualColumn; +import org.apache.druid.segment.VirtualColumns; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.sql.calcite.aggregation.Aggregation; +import org.apache.druid.sql.calcite.aggregation.DimensionExpression; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.expression.Expressions; +import org.apache.druid.sql.calcite.filtration.Filtration; +import org.apache.druid.sql.calcite.planner.Calcites; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.rule.GroupByRules; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.plan.RelOptUtil; import org.apache.calcite.rel.RelFieldCollation; import org.apache.calcite.rel.core.Aggregate; diff --git a/sql/src/main/java/io/druid/sql/calcite/rel/DruidQueryRel.java b/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidQueryRel.java similarity index 97% rename from sql/src/main/java/io/druid/sql/calcite/rel/DruidQueryRel.java rename to sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidQueryRel.java index 57dea9b91aec..dd9c5930eed2 100644 --- a/sql/src/main/java/io/druid/sql/calcite/rel/DruidQueryRel.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidQueryRel.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.sql.calcite.rel; +package org.apache.druid.sql.calcite.rel; import com.fasterxml.jackson.core.JsonProcessingException; import com.google.common.base.Preconditions; -import io.druid.java.util.common.guava.Sequence; -import io.druid.sql.calcite.table.DruidTable; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.sql.calcite.table.DruidTable; import org.apache.calcite.interpreter.BindableConvention; import org.apache.calcite.plan.Convention; import org.apache.calcite.plan.RelOptCluster; diff --git a/sql/src/main/java/io/druid/sql/calcite/rel/DruidRel.java b/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidRel.java similarity index 95% rename from sql/src/main/java/io/druid/sql/calcite/rel/DruidRel.java rename to sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidRel.java index 12053a75b997..db7ee5437938 100644 --- a/sql/src/main/java/io/druid/sql/calcite/rel/DruidRel.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidRel.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.sql.calcite.rel; +package org.apache.druid.sql.calcite.rel; import com.google.common.base.Throwables; -import io.druid.java.util.common.guava.Accumulator; -import io.druid.java.util.common.guava.Sequence; -import io.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.java.util.common.guava.Accumulator; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.sql.calcite.planner.PlannerContext; import org.apache.calcite.DataContext; import org.apache.calcite.interpreter.BindableRel; import org.apache.calcite.interpreter.Node; diff --git a/sql/src/main/java/io/druid/sql/calcite/rel/DruidSemiJoin.java b/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidSemiJoin.java similarity index 96% rename from sql/src/main/java/io/druid/sql/calcite/rel/DruidSemiJoin.java rename to sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidSemiJoin.java index c2573034dceb..5360b690865a 100644 --- a/sql/src/main/java/io/druid/sql/calcite/rel/DruidSemiJoin.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidSemiJoin.java @@ -17,19 +17,19 @@ * under the License. */ -package io.druid.sql.calcite.rel; +package org.apache.druid.sql.calcite.rel; import com.fasterxml.jackson.core.JsonProcessingException; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.guava.Accumulator; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.query.ResourceLimitExceededException; -import io.druid.segment.DimensionHandlerUtils; -import io.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.guava.Accumulator; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.query.ResourceLimitExceededException; +import org.apache.druid.segment.DimensionHandlerUtils; +import org.apache.druid.sql.calcite.planner.PlannerContext; import org.apache.calcite.interpreter.BindableConvention; import org.apache.calcite.plan.RelOptCluster; import org.apache.calcite.plan.RelOptCost; diff --git a/sql/src/main/java/io/druid/sql/calcite/rel/Grouping.java b/sql/src/main/java/org/apache/druid/sql/calcite/rel/Grouping.java similarity index 90% rename from sql/src/main/java/io/druid/sql/calcite/rel/Grouping.java rename to sql/src/main/java/org/apache/druid/sql/calcite/rel/Grouping.java index 2b3dd52f900e..d9b6d9d0e1ab 100644 --- a/sql/src/main/java/io/druid/sql/calcite/rel/Grouping.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/rel/Grouping.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.sql.calcite.rel; +package org.apache.druid.sql.calcite.rel; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; -import io.druid.java.util.common.ISE; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.PostAggregator; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.filter.DimFilter; -import io.druid.sql.calcite.aggregation.Aggregation; -import io.druid.sql.calcite.aggregation.DimensionExpression; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.sql.calcite.aggregation.Aggregation; +import org.apache.druid.sql.calcite.aggregation.DimensionExpression; +import org.apache.druid.sql.calcite.table.RowSignature; import javax.annotation.Nullable; import java.util.List; diff --git a/sql/src/main/java/io/druid/sql/calcite/rel/PartialDruidQuery.java b/sql/src/main/java/org/apache/druid/sql/calcite/rel/PartialDruidQuery.java similarity index 97% rename from sql/src/main/java/io/druid/sql/calcite/rel/PartialDruidQuery.java rename to sql/src/main/java/org/apache/druid/sql/calcite/rel/PartialDruidQuery.java index 5adfacf69ecf..c5444898555b 100644 --- a/sql/src/main/java/io/druid/sql/calcite/rel/PartialDruidQuery.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/rel/PartialDruidQuery.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.sql.calcite.rel; +package org.apache.druid.sql.calcite.rel; import com.google.common.base.Preconditions; -import io.druid.java.util.common.ISE; -import io.druid.query.DataSource; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.query.DataSource; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.plan.RelTrait; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.core.Aggregate; diff --git a/sql/src/main/java/io/druid/sql/calcite/rel/QueryMaker.java b/sql/src/main/java/org/apache/druid/sql/calcite/rel/QueryMaker.java similarity index 92% rename from sql/src/main/java/io/druid/sql/calcite/rel/QueryMaker.java rename to sql/src/main/java/org/apache/druid/sql/calcite/rel/QueryMaker.java index 205d2be7f7d3..13801f3e4e5f 100644 --- a/sql/src/main/java/io/druid/sql/calcite/rel/QueryMaker.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/rel/QueryMaker.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.sql.calcite.rel; +package org.apache.druid.sql.calcite.rel; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Function; @@ -25,33 +25,33 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.primitives.Ints; -import io.druid.data.input.Row; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Sequences; -import io.druid.math.expr.Evals; -import io.druid.query.Query; -import io.druid.query.Result; -import io.druid.query.groupby.GroupByQuery; -import io.druid.query.scan.ScanQuery; -import io.druid.query.select.EventHolder; -import io.druid.query.select.PagingSpec; -import io.druid.query.select.SelectQuery; -import io.druid.query.select.SelectResultValue; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.timeseries.TimeseriesResultValue; -import io.druid.query.topn.DimensionAndMetricValueExtractor; -import io.druid.query.topn.TopNQuery; -import io.druid.query.topn.TopNResultValue; -import io.druid.segment.DimensionHandlerUtils; -import io.druid.common.config.NullHandling; -import io.druid.segment.column.Column; -import io.druid.server.QueryLifecycleFactory; -import io.druid.server.security.AuthenticationResult; -import io.druid.sql.calcite.planner.Calcites; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.data.input.Row; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Sequences; +import org.apache.druid.math.expr.Evals; +import org.apache.druid.query.Query; +import org.apache.druid.query.Result; +import org.apache.druid.query.groupby.GroupByQuery; +import org.apache.druid.query.scan.ScanQuery; +import org.apache.druid.query.select.EventHolder; +import org.apache.druid.query.select.PagingSpec; +import org.apache.druid.query.select.SelectQuery; +import org.apache.druid.query.select.SelectResultValue; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.timeseries.TimeseriesResultValue; +import org.apache.druid.query.topn.DimensionAndMetricValueExtractor; +import org.apache.druid.query.topn.TopNQuery; +import org.apache.druid.query.topn.TopNResultValue; +import org.apache.druid.segment.DimensionHandlerUtils; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.segment.column.Column; +import org.apache.druid.server.QueryLifecycleFactory; +import org.apache.druid.server.security.AuthenticationResult; +import org.apache.druid.sql.calcite.planner.Calcites; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.avatica.ColumnMetaData; import org.apache.calcite.rel.type.RelDataTypeField; import org.apache.calcite.runtime.Hook; diff --git a/sql/src/main/java/io/druid/sql/calcite/rel/SelectProjection.java b/sql/src/main/java/org/apache/druid/sql/calcite/rel/SelectProjection.java similarity index 94% rename from sql/src/main/java/io/druid/sql/calcite/rel/SelectProjection.java rename to sql/src/main/java/org/apache/druid/sql/calcite/rel/SelectProjection.java index 98496b81a402..617554063cdf 100644 --- a/sql/src/main/java/io/druid/sql/calcite/rel/SelectProjection.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/rel/SelectProjection.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.sql.calcite.rel; +package org.apache.druid.sql.calcite.rel; -import io.druid.segment.VirtualColumn; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.segment.VirtualColumn; +import org.apache.druid.sql.calcite.table.RowSignature; import java.util.List; import java.util.Objects; diff --git a/sql/src/main/java/io/druid/sql/calcite/rel/SortProject.java b/sql/src/main/java/org/apache/druid/sql/calcite/rel/SortProject.java similarity index 94% rename from sql/src/main/java/io/druid/sql/calcite/rel/SortProject.java rename to sql/src/main/java/org/apache/druid/sql/calcite/rel/SortProject.java index b34c62cdc0e6..a2b89df296a6 100644 --- a/sql/src/main/java/io/druid/sql/calcite/rel/SortProject.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/rel/SortProject.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package io.druid.sql.calcite.rel; +package org.apache.druid.sql.calcite.rel; import com.google.common.base.Preconditions; -import io.druid.java.util.common.ISE; -import io.druid.query.aggregation.PostAggregator; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.query.aggregation.PostAggregator; +import org.apache.druid.sql.calcite.table.RowSignature; import java.util.HashSet; import java.util.List; diff --git a/sql/src/main/java/io/druid/sql/calcite/rule/CaseFilteredAggregatorRule.java b/sql/src/main/java/org/apache/druid/sql/calcite/rule/CaseFilteredAggregatorRule.java similarity index 98% rename from sql/src/main/java/io/druid/sql/calcite/rule/CaseFilteredAggregatorRule.java rename to sql/src/main/java/org/apache/druid/sql/calcite/rule/CaseFilteredAggregatorRule.java index b9d105381f7f..e143cc29e0bf 100644 --- a/sql/src/main/java/io/druid/sql/calcite/rule/CaseFilteredAggregatorRule.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/rule/CaseFilteredAggregatorRule.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.sql.calcite.rule; +package org.apache.druid.sql.calcite.rule; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import io.druid.sql.calcite.planner.Calcites; +import org.apache.druid.sql.calcite.planner.Calcites; import org.apache.calcite.plan.RelOptRule; import org.apache.calcite.plan.RelOptRuleCall; import org.apache.calcite.rel.RelNode; diff --git a/sql/src/main/java/io/druid/sql/calcite/rule/DruidRelToBindableRule.java b/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidRelToBindableRule.java similarity index 94% rename from sql/src/main/java/io/druid/sql/calcite/rule/DruidRelToBindableRule.java rename to sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidRelToBindableRule.java index e8b313a951c7..8f467e47459b 100644 --- a/sql/src/main/java/io/druid/sql/calcite/rule/DruidRelToBindableRule.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidRelToBindableRule.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.sql.calcite.rule; +package org.apache.druid.sql.calcite.rule; -import io.druid.sql.calcite.rel.DruidRel; +import org.apache.druid.sql.calcite.rel.DruidRel; import org.apache.calcite.interpreter.BindableConvention; import org.apache.calcite.plan.Convention; import org.apache.calcite.rel.RelNode; diff --git a/sql/src/main/java/io/druid/sql/calcite/rule/DruidRelToDruidRule.java b/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidRelToDruidRule.java similarity index 90% rename from sql/src/main/java/io/druid/sql/calcite/rule/DruidRelToDruidRule.java rename to sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidRelToDruidRule.java index 97cc317f3fab..2e392b0ad8f1 100644 --- a/sql/src/main/java/io/druid/sql/calcite/rule/DruidRelToDruidRule.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidRelToDruidRule.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.sql.calcite.rule; +package org.apache.druid.sql.calcite.rule; -import io.druid.sql.calcite.rel.DruidConvention; -import io.druid.sql.calcite.rel.DruidRel; +import org.apache.druid.sql.calcite.rel.DruidConvention; +import org.apache.druid.sql.calcite.rel.DruidRel; import org.apache.calcite.plan.Convention; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.convert.ConverterRule; diff --git a/sql/src/main/java/io/druid/sql/calcite/rule/DruidRules.java b/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidRules.java similarity index 97% rename from sql/src/main/java/io/druid/sql/calcite/rule/DruidRules.java rename to sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidRules.java index 642c8860c9d4..4acf98291e66 100644 --- a/sql/src/main/java/io/druid/sql/calcite/rule/DruidRules.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidRules.java @@ -17,13 +17,13 @@ * under the License. */ -package io.druid.sql.calcite.rule; +package org.apache.druid.sql.calcite.rule; import com.google.common.collect.ImmutableList; -import io.druid.java.util.common.StringUtils; -import io.druid.sql.calcite.rel.DruidOuterQueryRel; -import io.druid.sql.calcite.rel.DruidRel; -import io.druid.sql.calcite.rel.PartialDruidQuery; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.sql.calcite.rel.DruidOuterQueryRel; +import org.apache.druid.sql.calcite.rel.DruidRel; +import org.apache.druid.sql.calcite.rel.PartialDruidQuery; import org.apache.calcite.plan.RelOptRule; import org.apache.calcite.plan.RelOptRuleCall; import org.apache.calcite.plan.RelOptRuleOperand; diff --git a/sql/src/main/java/io/druid/sql/calcite/rule/DruidSemiJoinRule.java b/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidSemiJoinRule.java similarity index 95% rename from sql/src/main/java/io/druid/sql/calcite/rule/DruidSemiJoinRule.java rename to sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidSemiJoinRule.java index cc08328b68be..b2dffc7aa72f 100644 --- a/sql/src/main/java/io/druid/sql/calcite/rule/DruidSemiJoinRule.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidSemiJoinRule.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.sql.calcite.rule; +package org.apache.druid.sql.calcite.rule; import com.google.common.base.Predicate; import com.google.common.base.Predicates; -import io.druid.sql.calcite.planner.PlannerConfig; -import io.druid.sql.calcite.rel.DruidRel; -import io.druid.sql.calcite.rel.DruidSemiJoin; -import io.druid.sql.calcite.rel.PartialDruidQuery; +import org.apache.druid.sql.calcite.planner.PlannerConfig; +import org.apache.druid.sql.calcite.rel.DruidRel; +import org.apache.druid.sql.calcite.rel.DruidSemiJoin; +import org.apache.druid.sql.calcite.rel.PartialDruidQuery; import org.apache.calcite.plan.RelOptRule; import org.apache.calcite.plan.RelOptRuleCall; import org.apache.calcite.plan.RelOptUtil; diff --git a/sql/src/main/java/io/druid/sql/calcite/rule/DruidTableScanRule.java b/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidTableScanRule.java similarity index 88% rename from sql/src/main/java/io/druid/sql/calcite/rule/DruidTableScanRule.java rename to sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidTableScanRule.java index 64c26c58f8cd..cbef2127bc34 100644 --- a/sql/src/main/java/io/druid/sql/calcite/rule/DruidTableScanRule.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidTableScanRule.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.sql.calcite.rule; +package org.apache.druid.sql.calcite.rule; -import io.druid.sql.calcite.rel.DruidQueryRel; -import io.druid.sql.calcite.rel.QueryMaker; -import io.druid.sql.calcite.table.DruidTable; +import org.apache.druid.sql.calcite.rel.DruidQueryRel; +import org.apache.druid.sql.calcite.rel.QueryMaker; +import org.apache.druid.sql.calcite.table.DruidTable; import org.apache.calcite.plan.RelOptRule; import org.apache.calcite.plan.RelOptRuleCall; import org.apache.calcite.plan.RelOptTable; diff --git a/sql/src/main/java/io/druid/sql/calcite/rule/GroupByRules.java b/sql/src/main/java/org/apache/druid/sql/calcite/rule/GroupByRules.java similarity index 90% rename from sql/src/main/java/io/druid/sql/calcite/rule/GroupByRules.java rename to sql/src/main/java/org/apache/druid/sql/calcite/rule/GroupByRules.java index c42fba6e45be..f6701ce91133 100644 --- a/sql/src/main/java/io/druid/sql/calcite/rule/GroupByRules.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/rule/GroupByRules.java @@ -17,17 +17,17 @@ * under the License. */ -package io.druid.sql.calcite.rule; - -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.FilteredAggregatorFactory; -import io.druid.query.filter.DimFilter; -import io.druid.sql.calcite.aggregation.Aggregation; -import io.druid.sql.calcite.aggregation.SqlAggregator; -import io.druid.sql.calcite.expression.Expressions; -import io.druid.sql.calcite.filtration.Filtration; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +package org.apache.druid.sql.calcite.rule; + +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.FilteredAggregatorFactory; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.sql.calcite.aggregation.Aggregation; +import org.apache.druid.sql.calcite.aggregation.SqlAggregator; +import org.apache.druid.sql.calcite.expression.Expressions; +import org.apache.druid.sql.calcite.filtration.Filtration; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.rel.core.AggregateCall; import org.apache.calcite.rel.core.Project; import org.apache.calcite.rex.RexBuilder; diff --git a/sql/src/main/java/io/druid/sql/calcite/rule/ProjectAggregatePruneUnusedCallRule.java b/sql/src/main/java/org/apache/druid/sql/calcite/rule/ProjectAggregatePruneUnusedCallRule.java similarity index 98% rename from sql/src/main/java/io/druid/sql/calcite/rule/ProjectAggregatePruneUnusedCallRule.java rename to sql/src/main/java/org/apache/druid/sql/calcite/rule/ProjectAggregatePruneUnusedCallRule.java index bdf31009ecbd..826e1c250092 100644 --- a/sql/src/main/java/io/druid/sql/calcite/rule/ProjectAggregatePruneUnusedCallRule.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/rule/ProjectAggregatePruneUnusedCallRule.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.sql.calcite.rule; +package org.apache.druid.sql.calcite.rule; -import io.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.ISE; import org.apache.calcite.plan.RelOptRule; import org.apache.calcite.plan.RelOptRuleCall; import org.apache.calcite.plan.RelOptUtil; diff --git a/sql/src/main/java/io/druid/sql/calcite/rule/SortCollapseRule.java b/sql/src/main/java/org/apache/druid/sql/calcite/rule/SortCollapseRule.java similarity index 98% rename from sql/src/main/java/io/druid/sql/calcite/rule/SortCollapseRule.java rename to sql/src/main/java/org/apache/druid/sql/calcite/rule/SortCollapseRule.java index 4cb6c3d1cd9b..7bbc888809ca 100644 --- a/sql/src/main/java/io/druid/sql/calcite/rule/SortCollapseRule.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/rule/SortCollapseRule.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.sql.calcite.rule; +package org.apache.druid.sql.calcite.rule; import org.apache.calcite.plan.RelOptRule; import org.apache.calcite.plan.RelOptRuleCall; diff --git a/sql/src/main/java/io/druid/sql/calcite/schema/DruidSchema.java b/sql/src/main/java/org/apache/druid/sql/calcite/schema/DruidSchema.java similarity index 91% rename from sql/src/main/java/io/druid/sql/calcite/schema/DruidSchema.java rename to sql/src/main/java/org/apache/druid/sql/calcite/schema/DruidSchema.java index cc16536f57d6..1a9197e788f9 100644 --- a/sql/src/main/java/io/druid/sql/calcite/schema/DruidSchema.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/schema/DruidSchema.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.sql.calcite.schema; +package org.apache.druid.sql.calcite.schema; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; @@ -28,35 +28,35 @@ import com.google.common.collect.Sets; import com.google.common.util.concurrent.MoreExecutors; import com.google.inject.Inject; -import io.druid.client.ServerView; -import io.druid.client.TimelineServerView; -import io.druid.guice.ManageLifecycle; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.concurrent.ScheduledExecutors; -import io.druid.java.util.common.guava.Sequence; -import io.druid.java.util.common.guava.Yielder; -import io.druid.java.util.common.guava.Yielders; -import io.druid.java.util.common.lifecycle.LifecycleStart; -import io.druid.java.util.common.lifecycle.LifecycleStop; -import io.druid.java.util.emitter.EmittingLogger; -import io.druid.query.TableDataSource; -import io.druid.query.metadata.metadata.AllColumnIncluderator; -import io.druid.query.metadata.metadata.ColumnAnalysis; -import io.druid.query.metadata.metadata.SegmentAnalysis; -import io.druid.query.metadata.metadata.SegmentMetadataQuery; -import io.druid.query.spec.MultipleSpecificSegmentSpec; -import io.druid.segment.column.ValueType; -import io.druid.server.QueryLifecycleFactory; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.server.security.AuthenticationResult; -import io.druid.server.security.Escalator; -import io.druid.sql.calcite.planner.PlannerConfig; -import io.druid.sql.calcite.table.DruidTable; -import io.druid.sql.calcite.table.RowSignature; -import io.druid.sql.calcite.view.DruidViewMacro; -import io.druid.sql.calcite.view.ViewManager; -import io.druid.timeline.DataSegment; +import org.apache.druid.client.ServerView; +import org.apache.druid.client.TimelineServerView; +import org.apache.druid.guice.ManageLifecycle; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.concurrent.ScheduledExecutors; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.java.util.common.guava.Yielder; +import org.apache.druid.java.util.common.guava.Yielders; +import org.apache.druid.java.util.common.lifecycle.LifecycleStart; +import org.apache.druid.java.util.common.lifecycle.LifecycleStop; +import org.apache.druid.java.util.emitter.EmittingLogger; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.query.metadata.metadata.AllColumnIncluderator; +import org.apache.druid.query.metadata.metadata.ColumnAnalysis; +import org.apache.druid.query.metadata.metadata.SegmentAnalysis; +import org.apache.druid.query.metadata.metadata.SegmentMetadataQuery; +import org.apache.druid.query.spec.MultipleSpecificSegmentSpec; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.server.QueryLifecycleFactory; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.server.security.AuthenticationResult; +import org.apache.druid.server.security.Escalator; +import org.apache.druid.sql.calcite.planner.PlannerConfig; +import org.apache.druid.sql.calcite.table.DruidTable; +import org.apache.druid.sql.calcite.table.RowSignature; +import org.apache.druid.sql.calcite.view.DruidViewMacro; +import org.apache.druid.sql.calcite.view.ViewManager; +import org.apache.druid.timeline.DataSegment; import org.apache.calcite.schema.Table; import org.apache.calcite.schema.impl.AbstractSchema; diff --git a/sql/src/main/java/io/druid/sql/calcite/schema/InformationSchema.java b/sql/src/main/java/org/apache/druid/sql/calcite/schema/InformationSchema.java similarity index 97% rename from sql/src/main/java/io/druid/sql/calcite/schema/InformationSchema.java rename to sql/src/main/java/org/apache/druid/sql/calcite/schema/InformationSchema.java index de39a224e364..a0f336fa55b1 100644 --- a/sql/src/main/java/io/druid/sql/calcite/schema/InformationSchema.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/schema/InformationSchema.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.sql.calcite.schema; +package org.apache.druid.sql.calcite.schema; import com.google.common.base.Function; import com.google.common.base.Preconditions; @@ -28,13 +28,13 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.inject.Inject; -import io.druid.segment.column.ValueType; -import io.druid.server.security.AuthenticationResult; -import io.druid.server.security.AuthorizationUtils; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.ResourceAction; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.server.security.AuthenticationResult; +import org.apache.druid.server.security.AuthorizationUtils; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.ResourceAction; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; import org.apache.calcite.DataContext; import org.apache.calcite.jdbc.JavaTypeFactoryImpl; import org.apache.calcite.linq4j.Enumerable; diff --git a/sql/src/main/java/io/druid/sql/calcite/table/DruidTable.java b/sql/src/main/java/org/apache/druid/sql/calcite/table/DruidTable.java similarity index 97% rename from sql/src/main/java/io/druid/sql/calcite/table/DruidTable.java rename to sql/src/main/java/org/apache/druid/sql/calcite/table/DruidTable.java index d37d43ace4db..7f0463633b3c 100644 --- a/sql/src/main/java/io/druid/sql/calcite/table/DruidTable.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/table/DruidTable.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.sql.calcite.table; +package org.apache.druid.sql.calcite.table; import com.google.common.base.Preconditions; -import io.druid.query.DataSource; +import org.apache.druid.query.DataSource; import org.apache.calcite.config.CalciteConnectionConfig; import org.apache.calcite.plan.RelOptTable; import org.apache.calcite.rel.RelNode; diff --git a/sql/src/main/java/io/druid/sql/calcite/table/RowSignature.java b/sql/src/main/java/org/apache/druid/sql/calcite/table/RowSignature.java similarity index 93% rename from sql/src/main/java/io/druid/sql/calcite/table/RowSignature.java rename to sql/src/main/java/org/apache/druid/sql/calcite/table/RowSignature.java index 3dc56a80098b..34e22eea10f8 100644 --- a/sql/src/main/java/io/druid/sql/calcite/table/RowSignature.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/table/RowSignature.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.sql.calcite.table; +package org.apache.druid.sql.calcite.table; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.druid.java.util.common.IAE; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Pair; -import io.druid.query.ordering.StringComparator; -import io.druid.query.ordering.StringComparators; -import io.druid.segment.column.Column; -import io.druid.segment.column.ValueType; -import io.druid.sql.calcite.expression.SimpleExtraction; -import io.druid.sql.calcite.planner.Calcites; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.query.ordering.StringComparator; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.sql.calcite.expression.SimpleExtraction; +import org.apache.druid.sql.calcite.planner.Calcites; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.rel.type.RelDataTypeFactory; import org.apache.calcite.rel.type.RelDataTypeField; diff --git a/sql/src/main/java/io/druid/sql/calcite/view/DruidViewMacro.java b/sql/src/main/java/org/apache/druid/sql/calcite/view/DruidViewMacro.java similarity index 90% rename from sql/src/main/java/io/druid/sql/calcite/view/DruidViewMacro.java rename to sql/src/main/java/org/apache/druid/sql/calcite/view/DruidViewMacro.java index 0949e1900898..41cfd38b7b40 100644 --- a/sql/src/main/java/io/druid/sql/calcite/view/DruidViewMacro.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/view/DruidViewMacro.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.sql.calcite.view; +package org.apache.druid.sql.calcite.view; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; -import io.druid.server.security.Escalator; -import io.druid.sql.calcite.planner.DruidPlanner; -import io.druid.sql.calcite.planner.PlannerFactory; -import io.druid.sql.calcite.schema.DruidSchema; +import org.apache.druid.server.security.Escalator; +import org.apache.druid.sql.calcite.planner.DruidPlanner; +import org.apache.druid.sql.calcite.planner.PlannerFactory; +import org.apache.druid.sql.calcite.schema.DruidSchema; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.rel.type.RelDataTypeImpl; import org.apache.calcite.schema.FunctionParameter; diff --git a/sql/src/main/java/io/druid/sql/calcite/view/InProcessViewManager.java b/sql/src/main/java/org/apache/druid/sql/calcite/view/InProcessViewManager.java similarity index 92% rename from sql/src/main/java/io/druid/sql/calcite/view/InProcessViewManager.java rename to sql/src/main/java/org/apache/druid/sql/calcite/view/InProcessViewManager.java index e6c764955517..698071eb5b2a 100644 --- a/sql/src/main/java/io/druid/sql/calcite/view/InProcessViewManager.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/view/InProcessViewManager.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.sql.calcite.view; +package org.apache.druid.sql.calcite.view; import com.google.inject.Inject; -import io.druid.java.util.common.ISE; -import io.druid.server.security.Escalator; -import io.druid.sql.calcite.planner.PlannerFactory; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.server.security.Escalator; +import org.apache.druid.sql.calcite.planner.PlannerFactory; import org.apache.calcite.schema.TableMacro; import java.util.Map; diff --git a/sql/src/main/java/io/druid/sql/calcite/view/NoopViewManager.java b/sql/src/main/java/org/apache/druid/sql/calcite/view/NoopViewManager.java similarity index 94% rename from sql/src/main/java/io/druid/sql/calcite/view/NoopViewManager.java rename to sql/src/main/java/org/apache/druid/sql/calcite/view/NoopViewManager.java index 749b444d6bf8..ab49e52abbf7 100644 --- a/sql/src/main/java/io/druid/sql/calcite/view/NoopViewManager.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/view/NoopViewManager.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.sql.calcite.view; +package org.apache.druid.sql.calcite.view; import com.google.common.collect.ImmutableMap; -import io.druid.sql.calcite.planner.PlannerFactory; +import org.apache.druid.sql.calcite.planner.PlannerFactory; import java.util.Map; diff --git a/sql/src/main/java/io/druid/sql/calcite/view/ViewManager.java b/sql/src/main/java/org/apache/druid/sql/calcite/view/ViewManager.java similarity index 84% rename from sql/src/main/java/io/druid/sql/calcite/view/ViewManager.java rename to sql/src/main/java/org/apache/druid/sql/calcite/view/ViewManager.java index f7f3038b391f..b48280f1a61b 100644 --- a/sql/src/main/java/io/druid/sql/calcite/view/ViewManager.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/view/ViewManager.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.sql.calcite.view; +package org.apache.druid.sql.calcite.view; -import io.druid.sql.calcite.planner.PlannerFactory; +import org.apache.druid.sql.calcite.planner.PlannerFactory; import java.util.Map; /** - * View managers allow {@link io.druid.sql.calcite.schema.DruidSchema} to support views. They must be + * View managers allow {@link org.apache.druid.sql.calcite.schema.DruidSchema} to support views. They must be * thread-safe. */ public interface ViewManager diff --git a/sql/src/main/java/io/druid/sql/guice/SqlBindings.java b/sql/src/main/java/org/apache/druid/sql/guice/SqlBindings.java similarity index 89% rename from sql/src/main/java/io/druid/sql/guice/SqlBindings.java rename to sql/src/main/java/org/apache/druid/sql/guice/SqlBindings.java index 36e5c16747aa..a6b41ff64bc2 100644 --- a/sql/src/main/java/io/druid/sql/guice/SqlBindings.java +++ b/sql/src/main/java/org/apache/druid/sql/guice/SqlBindings.java @@ -17,12 +17,12 @@ * under the License. */ -package io.druid.sql.guice; +package org.apache.druid.sql.guice; import com.google.inject.Binder; import com.google.inject.multibindings.Multibinder; -import io.druid.sql.calcite.aggregation.SqlAggregator; -import io.druid.sql.calcite.expression.SqlOperatorConversion; +import org.apache.druid.sql.calcite.aggregation.SqlAggregator; +import org.apache.druid.sql.calcite.expression.SqlOperatorConversion; public class SqlBindings { diff --git a/sql/src/main/java/io/druid/sql/guice/SqlModule.java b/sql/src/main/java/org/apache/druid/sql/guice/SqlModule.java similarity index 75% rename from sql/src/main/java/io/druid/sql/guice/SqlModule.java rename to sql/src/main/java/org/apache/druid/sql/guice/SqlModule.java index cf3ddf20646d..161c8a11161b 100644 --- a/sql/src/main/java/io/druid/sql/guice/SqlModule.java +++ b/sql/src/main/java/org/apache/druid/sql/guice/SqlModule.java @@ -17,30 +17,30 @@ * under the License. */ -package io.druid.sql.guice; +package org.apache.druid.sql.guice; import com.google.common.base.Preconditions; import com.google.inject.Binder; import com.google.inject.Inject; import com.google.inject.Module; import com.google.inject.multibindings.Multibinder; -import io.druid.guice.Jerseys; -import io.druid.guice.JsonConfigProvider; -import io.druid.guice.LazySingleton; -import io.druid.guice.LifecycleModule; -import io.druid.server.initialization.jetty.JettyBindings; -import io.druid.server.metrics.MetricsModule; -import io.druid.sql.avatica.AvaticaMonitor; -import io.druid.sql.avatica.AvaticaServerConfig; -import io.druid.sql.avatica.DruidAvaticaHandler; -import io.druid.sql.calcite.aggregation.SqlAggregator; -import io.druid.sql.calcite.expression.builtin.LookupOperatorConversion; -import io.druid.sql.calcite.planner.Calcites; -import io.druid.sql.calcite.planner.PlannerConfig; -import io.druid.sql.calcite.schema.DruidSchema; -import io.druid.sql.calcite.view.NoopViewManager; -import io.druid.sql.calcite.view.ViewManager; -import io.druid.sql.http.SqlResource; +import org.apache.druid.guice.Jerseys; +import org.apache.druid.guice.JsonConfigProvider; +import org.apache.druid.guice.LazySingleton; +import org.apache.druid.guice.LifecycleModule; +import org.apache.druid.server.initialization.jetty.JettyBindings; +import org.apache.druid.server.metrics.MetricsModule; +import org.apache.druid.sql.avatica.AvaticaMonitor; +import org.apache.druid.sql.avatica.AvaticaServerConfig; +import org.apache.druid.sql.avatica.DruidAvaticaHandler; +import org.apache.druid.sql.calcite.aggregation.SqlAggregator; +import org.apache.druid.sql.calcite.expression.builtin.LookupOperatorConversion; +import org.apache.druid.sql.calcite.planner.Calcites; +import org.apache.druid.sql.calcite.planner.PlannerConfig; +import org.apache.druid.sql.calcite.schema.DruidSchema; +import org.apache.druid.sql.calcite.view.NoopViewManager; +import org.apache.druid.sql.calcite.view.ViewManager; +import org.apache.druid.sql.http.SqlResource; import java.util.Properties; diff --git a/sql/src/main/java/io/druid/sql/http/ArrayLinesWriter.java b/sql/src/main/java/org/apache/druid/sql/http/ArrayLinesWriter.java similarity index 98% rename from sql/src/main/java/io/druid/sql/http/ArrayLinesWriter.java rename to sql/src/main/java/org/apache/druid/sql/http/ArrayLinesWriter.java index 2ff2a216a8c3..01ee28d6923a 100644 --- a/sql/src/main/java/io/druid/sql/http/ArrayLinesWriter.java +++ b/sql/src/main/java/org/apache/druid/sql/http/ArrayLinesWriter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.sql.http; +package org.apache.druid.sql.http; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.io.SerializedString; diff --git a/sql/src/main/java/io/druid/sql/http/ArrayWriter.java b/sql/src/main/java/org/apache/druid/sql/http/ArrayWriter.java similarity index 98% rename from sql/src/main/java/io/druid/sql/http/ArrayWriter.java rename to sql/src/main/java/org/apache/druid/sql/http/ArrayWriter.java index dcaeb20cf3f5..9871fddb503b 100644 --- a/sql/src/main/java/io/druid/sql/http/ArrayWriter.java +++ b/sql/src/main/java/org/apache/druid/sql/http/ArrayWriter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.sql.http; +package org.apache.druid.sql.http; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/sql/src/main/java/io/druid/sql/http/CsvWriter.java b/sql/src/main/java/org/apache/druid/sql/http/CsvWriter.java similarity index 98% rename from sql/src/main/java/io/druid/sql/http/CsvWriter.java rename to sql/src/main/java/org/apache/druid/sql/http/CsvWriter.java index 4858e63a8501..a118374af685 100644 --- a/sql/src/main/java/io/druid/sql/http/CsvWriter.java +++ b/sql/src/main/java/org/apache/druid/sql/http/CsvWriter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.sql.http; +package org.apache.druid.sql.http; import com.opencsv.CSVWriter; diff --git a/sql/src/main/java/io/druid/sql/http/ObjectLinesWriter.java b/sql/src/main/java/org/apache/druid/sql/http/ObjectLinesWriter.java similarity index 98% rename from sql/src/main/java/io/druid/sql/http/ObjectLinesWriter.java rename to sql/src/main/java/org/apache/druid/sql/http/ObjectLinesWriter.java index 869d913cae6c..9b040dde1afc 100644 --- a/sql/src/main/java/io/druid/sql/http/ObjectLinesWriter.java +++ b/sql/src/main/java/org/apache/druid/sql/http/ObjectLinesWriter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.sql.http; +package org.apache.druid.sql.http; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.io.SerializedString; diff --git a/sql/src/main/java/io/druid/sql/http/ObjectWriter.java b/sql/src/main/java/org/apache/druid/sql/http/ObjectWriter.java similarity index 98% rename from sql/src/main/java/io/druid/sql/http/ObjectWriter.java rename to sql/src/main/java/org/apache/druid/sql/http/ObjectWriter.java index b247f3887e3e..76a65f618750 100644 --- a/sql/src/main/java/io/druid/sql/http/ObjectWriter.java +++ b/sql/src/main/java/org/apache/druid/sql/http/ObjectWriter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.sql.http; +package org.apache.druid.sql.http; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/sql/src/main/java/io/druid/sql/http/ResultFormat.java b/sql/src/main/java/org/apache/druid/sql/http/ResultFormat.java similarity index 97% rename from sql/src/main/java/io/druid/sql/http/ResultFormat.java rename to sql/src/main/java/org/apache/druid/sql/http/ResultFormat.java index 4a127d1db358..8d21fcbfd60e 100644 --- a/sql/src/main/java/io/druid/sql/http/ResultFormat.java +++ b/sql/src/main/java/org/apache/druid/sql/http/ResultFormat.java @@ -17,11 +17,11 @@ * under the License. */ -package io.druid.sql.http; +package org.apache.druid.sql.http; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.databind.ObjectMapper; -import io.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.StringUtils; import javax.annotation.Nullable; import javax.ws.rs.core.MediaType; diff --git a/sql/src/main/java/io/druid/sql/http/SqlQuery.java b/sql/src/main/java/org/apache/druid/sql/http/SqlQuery.java similarity index 98% rename from sql/src/main/java/io/druid/sql/http/SqlQuery.java rename to sql/src/main/java/org/apache/druid/sql/http/SqlQuery.java index de0dd41d0e80..86e6268c440c 100644 --- a/sql/src/main/java/io/druid/sql/http/SqlQuery.java +++ b/sql/src/main/java/org/apache/druid/sql/http/SqlQuery.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.sql.http; +package org.apache.druid.sql.http; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/sql/src/main/java/io/druid/sql/http/SqlResource.java b/sql/src/main/java/org/apache/druid/sql/http/SqlResource.java similarity index 91% rename from sql/src/main/java/io/druid/sql/http/SqlResource.java rename to sql/src/main/java/org/apache/druid/sql/http/SqlResource.java index fa89e790bc59..240d79628ea1 100644 --- a/sql/src/main/java/io/druid/sql/http/SqlResource.java +++ b/sql/src/main/java/org/apache/druid/sql/http/SqlResource.java @@ -17,22 +17,22 @@ * under the License. */ -package io.druid.sql.http; +package org.apache.druid.sql.http; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; import com.google.inject.Inject; -import io.druid.guice.annotations.Json; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.guava.Yielder; -import io.druid.java.util.common.guava.Yielders; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.QueryInterruptedException; -import io.druid.sql.calcite.planner.Calcites; -import io.druid.sql.calcite.planner.DruidPlanner; -import io.druid.sql.calcite.planner.PlannerFactory; -import io.druid.sql.calcite.planner.PlannerResult; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.guava.Yielder; +import org.apache.druid.java.util.common.guava.Yielders; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.QueryInterruptedException; +import org.apache.druid.sql.calcite.planner.Calcites; +import org.apache.druid.sql.calcite.planner.DruidPlanner; +import org.apache.druid.sql.calcite.planner.PlannerFactory; +import org.apache.druid.sql.calcite.planner.PlannerResult; import org.apache.calcite.plan.RelOptPlanner; import org.apache.calcite.rel.type.RelDataTypeField; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/sql/src/test/java/io/druid/sql/avatica/DruidAvaticaHandlerTest.java b/sql/src/test/java/org/apache/druid/sql/avatica/DruidAvaticaHandlerTest.java similarity index 95% rename from sql/src/test/java/io/druid/sql/avatica/DruidAvaticaHandlerTest.java rename to sql/src/test/java/org/apache/druid/sql/avatica/DruidAvaticaHandlerTest.java index 50ffd2c34f1f..8fa788c34b6f 100644 --- a/sql/src/test/java/io/druid/sql/avatica/DruidAvaticaHandlerTest.java +++ b/sql/src/test/java/org/apache/druid/sql/avatica/DruidAvaticaHandlerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.sql.avatica; +package org.apache.druid.sql.avatica; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; @@ -34,28 +34,28 @@ import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.name.Names; -import io.druid.guice.GuiceInjectors; -import io.druid.initialization.Initialization; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.io.Closer; -import io.druid.math.expr.ExprMacroTable; -import io.druid.query.QueryRunnerFactoryConglomerate; -import io.druid.server.DruidNode; -import io.druid.server.security.AuthTestUtils; -import io.druid.server.security.AuthenticatorMapper; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.Escalator; -import io.druid.sql.calcite.planner.Calcites; -import io.druid.sql.calcite.planner.DruidOperatorTable; -import io.druid.sql.calcite.planner.PlannerConfig; -import io.druid.sql.calcite.planner.PlannerFactory; -import io.druid.sql.calcite.schema.DruidSchema; -import io.druid.sql.calcite.util.CalciteTestBase; -import io.druid.sql.calcite.util.CalciteTests; -import io.druid.sql.calcite.util.QueryLogHook; -import io.druid.sql.calcite.util.SpecificSegmentsQuerySegmentWalker; +import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.initialization.Initialization; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.query.QueryRunnerFactoryConglomerate; +import org.apache.druid.server.DruidNode; +import org.apache.druid.server.security.AuthTestUtils; +import org.apache.druid.server.security.AuthenticatorMapper; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.Escalator; +import org.apache.druid.sql.calcite.planner.Calcites; +import org.apache.druid.sql.calcite.planner.DruidOperatorTable; +import org.apache.druid.sql.calcite.planner.PlannerConfig; +import org.apache.druid.sql.calcite.planner.PlannerFactory; +import org.apache.druid.sql.calcite.schema.DruidSchema; +import org.apache.druid.sql.calcite.util.CalciteTestBase; +import org.apache.druid.sql.calcite.util.CalciteTests; +import org.apache.druid.sql.calcite.util.QueryLogHook; +import org.apache.druid.sql.calcite.util.SpecificSegmentsQuerySegmentWalker; import org.apache.calcite.avatica.AvaticaClientRuntimeException; import org.apache.calcite.avatica.Meta; import org.apache.calcite.avatica.MissingResultsException; diff --git a/sql/src/test/java/io/druid/sql/avatica/DruidStatementTest.java b/sql/src/test/java/org/apache/druid/sql/avatica/DruidStatementTest.java similarity index 88% rename from sql/src/test/java/io/druid/sql/avatica/DruidStatementTest.java rename to sql/src/test/java/org/apache/druid/sql/avatica/DruidStatementTest.java index cb77e83f83a3..b19b27afa968 100644 --- a/sql/src/test/java/io/druid/sql/avatica/DruidStatementTest.java +++ b/sql/src/test/java/org/apache/druid/sql/avatica/DruidStatementTest.java @@ -17,26 +17,26 @@ * under the License. */ -package io.druid.sql.avatica; +package org.apache.druid.sql.avatica; import com.google.common.base.Function; import com.google.common.collect.Lists; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.io.Closer; -import io.druid.math.expr.ExprMacroTable; -import io.druid.query.QueryRunnerFactoryConglomerate; -import io.druid.server.security.AllowAllAuthenticator; -import io.druid.server.security.AuthTestUtils; -import io.druid.sql.calcite.planner.DruidOperatorTable; -import io.druid.sql.calcite.planner.PlannerConfig; -import io.druid.sql.calcite.planner.PlannerFactory; -import io.druid.sql.calcite.schema.DruidSchema; -import io.druid.sql.calcite.util.CalciteTestBase; -import io.druid.sql.calcite.util.CalciteTests; -import io.druid.sql.calcite.util.QueryLogHook; -import io.druid.sql.calcite.util.SpecificSegmentsQuerySegmentWalker; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.query.QueryRunnerFactoryConglomerate; +import org.apache.druid.server.security.AllowAllAuthenticator; +import org.apache.druid.server.security.AuthTestUtils; +import org.apache.druid.sql.calcite.planner.DruidOperatorTable; +import org.apache.druid.sql.calcite.planner.PlannerConfig; +import org.apache.druid.sql.calcite.planner.PlannerFactory; +import org.apache.druid.sql.calcite.schema.DruidSchema; +import org.apache.druid.sql.calcite.util.CalciteTestBase; +import org.apache.druid.sql.calcite.util.CalciteTests; +import org.apache.druid.sql.calcite.util.QueryLogHook; +import org.apache.druid.sql.calcite.util.SpecificSegmentsQuerySegmentWalker; import org.apache.calcite.avatica.ColumnMetaData; import org.apache.calcite.avatica.Meta; import org.junit.After; diff --git a/sql/src/test/java/io/druid/sql/calcite/CalciteQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java similarity index 98% rename from sql/src/test/java/io/druid/sql/calcite/CalciteQueryTest.java rename to sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java index 848e76d3ad5e..d7379ded006b 100644 --- a/sql/src/test/java/io/druid/sql/calcite/CalciteQueryTest.java +++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java @@ -17,97 +17,97 @@ * under the License. */ -package io.druid.sql.calcite; +package org.apache.druid.sql.calcite; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import io.druid.common.config.NullHandling; -import io.druid.hll.HLLCV1; -import io.druid.java.util.common.DateTimes; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.StringUtils; -import io.druid.java.util.common.granularity.Granularities; -import io.druid.java.util.common.granularity.PeriodGranularity; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.common.logger.Logger; -import io.druid.math.expr.ExprMacroTable; -import io.druid.query.Druids; -import io.druid.query.Query; -import io.druid.query.QueryContexts; -import io.druid.query.QueryDataSource; -import io.druid.query.QueryRunnerFactoryConglomerate; -import io.druid.query.ResourceLimitExceededException; -import io.druid.query.aggregation.AggregatorFactory; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.DoubleMaxAggregatorFactory; -import io.druid.query.aggregation.DoubleSumAggregatorFactory; -import io.druid.query.aggregation.FilteredAggregatorFactory; -import io.druid.query.aggregation.FloatMaxAggregatorFactory; -import io.druid.query.aggregation.FloatMinAggregatorFactory; -import io.druid.query.aggregation.LongMaxAggregatorFactory; -import io.druid.query.aggregation.LongMinAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.aggregation.cardinality.CardinalityAggregatorFactory; -import io.druid.query.aggregation.hyperloglog.HyperUniqueFinalizingPostAggregator; -import io.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; -import io.druid.query.aggregation.post.ArithmeticPostAggregator; -import io.druid.query.aggregation.post.ExpressionPostAggregator; -import io.druid.query.aggregation.post.FieldAccessPostAggregator; -import io.druid.query.dimension.DefaultDimensionSpec; -import io.druid.query.dimension.DimensionSpec; -import io.druid.query.dimension.ExtractionDimensionSpec; -import io.druid.query.extraction.CascadeExtractionFn; -import io.druid.query.extraction.ExtractionFn; -import io.druid.query.extraction.RegexDimExtractionFn; -import io.druid.query.extraction.SubstringDimExtractionFn; -import io.druid.query.filter.AndDimFilter; -import io.druid.query.filter.BoundDimFilter; -import io.druid.query.filter.DimFilter; -import io.druid.query.filter.ExpressionDimFilter; -import io.druid.query.filter.InDimFilter; -import io.druid.query.filter.LikeDimFilter; -import io.druid.query.filter.NotDimFilter; -import io.druid.query.filter.OrDimFilter; -import io.druid.query.filter.SelectorDimFilter; -import io.druid.query.groupby.GroupByQuery; -import io.druid.query.groupby.having.DimFilterHavingSpec; -import io.druid.query.groupby.orderby.DefaultLimitSpec; -import io.druid.query.groupby.orderby.OrderByColumnSpec; -import io.druid.query.groupby.orderby.OrderByColumnSpec.Direction; -import io.druid.query.lookup.RegisteredLookupExtractionFn; -import io.druid.query.ordering.StringComparator; -import io.druid.query.ordering.StringComparators; -import io.druid.query.scan.ScanQuery; -import io.druid.query.select.PagingSpec; -import io.druid.query.spec.MultipleIntervalSegmentSpec; -import io.druid.query.spec.QuerySegmentSpec; -import io.druid.query.topn.DimensionTopNMetricSpec; -import io.druid.query.topn.InvertedTopNMetricSpec; -import io.druid.query.topn.NumericTopNMetricSpec; -import io.druid.query.topn.TopNQueryBuilder; -import io.druid.segment.column.Column; -import io.druid.segment.column.ValueType; -import io.druid.segment.virtual.ExpressionVirtualColumn; -import io.druid.server.security.AuthenticationResult; -import io.druid.server.security.ForbiddenException; -import io.druid.sql.calcite.expression.DruidExpression; -import io.druid.sql.calcite.filtration.Filtration; -import io.druid.sql.calcite.planner.Calcites; -import io.druid.sql.calcite.planner.DruidOperatorTable; -import io.druid.sql.calcite.planner.DruidPlanner; -import io.druid.sql.calcite.planner.PlannerConfig; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.planner.PlannerFactory; -import io.druid.sql.calcite.planner.PlannerResult; -import io.druid.sql.calcite.schema.DruidSchema; -import io.druid.sql.calcite.util.CalciteTestBase; -import io.druid.sql.calcite.util.CalciteTests; -import io.druid.sql.calcite.util.QueryLogHook; -import io.druid.sql.calcite.util.SpecificSegmentsQuerySegmentWalker; -import io.druid.sql.calcite.view.InProcessViewManager; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.hll.HLLCV1; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.PeriodGranularity; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.query.Druids; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryContexts; +import org.apache.druid.query.QueryDataSource; +import org.apache.druid.query.QueryRunnerFactoryConglomerate; +import org.apache.druid.query.ResourceLimitExceededException; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleMaxAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; +import org.apache.druid.query.aggregation.FilteredAggregatorFactory; +import org.apache.druid.query.aggregation.FloatMaxAggregatorFactory; +import org.apache.druid.query.aggregation.FloatMinAggregatorFactory; +import org.apache.druid.query.aggregation.LongMaxAggregatorFactory; +import org.apache.druid.query.aggregation.LongMinAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.aggregation.cardinality.CardinalityAggregatorFactory; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniqueFinalizingPostAggregator; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; +import org.apache.druid.query.aggregation.post.ArithmeticPostAggregator; +import org.apache.druid.query.aggregation.post.ExpressionPostAggregator; +import org.apache.druid.query.aggregation.post.FieldAccessPostAggregator; +import org.apache.druid.query.dimension.DefaultDimensionSpec; +import org.apache.druid.query.dimension.DimensionSpec; +import org.apache.druid.query.dimension.ExtractionDimensionSpec; +import org.apache.druid.query.extraction.CascadeExtractionFn; +import org.apache.druid.query.extraction.ExtractionFn; +import org.apache.druid.query.extraction.RegexDimExtractionFn; +import org.apache.druid.query.extraction.SubstringDimExtractionFn; +import org.apache.druid.query.filter.AndDimFilter; +import org.apache.druid.query.filter.BoundDimFilter; +import org.apache.druid.query.filter.DimFilter; +import org.apache.druid.query.filter.ExpressionDimFilter; +import org.apache.druid.query.filter.InDimFilter; +import org.apache.druid.query.filter.LikeDimFilter; +import org.apache.druid.query.filter.NotDimFilter; +import org.apache.druid.query.filter.OrDimFilter; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.query.groupby.GroupByQuery; +import org.apache.druid.query.groupby.having.DimFilterHavingSpec; +import org.apache.druid.query.groupby.orderby.DefaultLimitSpec; +import org.apache.druid.query.groupby.orderby.OrderByColumnSpec; +import org.apache.druid.query.groupby.orderby.OrderByColumnSpec.Direction; +import org.apache.druid.query.lookup.RegisteredLookupExtractionFn; +import org.apache.druid.query.ordering.StringComparator; +import org.apache.druid.query.ordering.StringComparators; +import org.apache.druid.query.scan.ScanQuery; +import org.apache.druid.query.select.PagingSpec; +import org.apache.druid.query.spec.MultipleIntervalSegmentSpec; +import org.apache.druid.query.spec.QuerySegmentSpec; +import org.apache.druid.query.topn.DimensionTopNMetricSpec; +import org.apache.druid.query.topn.InvertedTopNMetricSpec; +import org.apache.druid.query.topn.NumericTopNMetricSpec; +import org.apache.druid.query.topn.TopNQueryBuilder; +import org.apache.druid.segment.column.Column; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.segment.virtual.ExpressionVirtualColumn; +import org.apache.druid.server.security.AuthenticationResult; +import org.apache.druid.server.security.ForbiddenException; +import org.apache.druid.sql.calcite.expression.DruidExpression; +import org.apache.druid.sql.calcite.filtration.Filtration; +import org.apache.druid.sql.calcite.planner.Calcites; +import org.apache.druid.sql.calcite.planner.DruidOperatorTable; +import org.apache.druid.sql.calcite.planner.DruidPlanner; +import org.apache.druid.sql.calcite.planner.PlannerConfig; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.planner.PlannerFactory; +import org.apache.druid.sql.calcite.planner.PlannerResult; +import org.apache.druid.sql.calcite.schema.DruidSchema; +import org.apache.druid.sql.calcite.util.CalciteTestBase; +import org.apache.druid.sql.calcite.util.CalciteTests; +import org.apache.druid.sql.calcite.util.QueryLogHook; +import org.apache.druid.sql.calcite.util.SpecificSegmentsQuerySegmentWalker; +import org.apache.druid.sql.calcite.view.InProcessViewManager; import org.apache.calcite.plan.RelOptPlanner; import org.hamcrest.CoreMatchers; import org.joda.time.DateTime; @@ -1420,7 +1420,7 @@ public void testColumnComparison() throws Exception @Test public void testHavingOnRatio() throws Exception { - // Test for https://github.com/druid-io/druid/issues/4264 + // Test for https://github.com/apache/incubator-druid/issues/4264 testQuery( "SELECT\n" @@ -3030,7 +3030,7 @@ public void testInFilter() throws Exception @Test public void testInFilterWith23Elements() throws Exception { - // Regression test for https://github.com/druid-io/druid/issues/4203. + // Regression test for https://github.com/apache/incubator-druid/issues/4203. final List elements = new ArrayList<>(); elements.add("abc"); @@ -4096,8 +4096,8 @@ public void testExactCountDistinctWithGroupingAndOtherAggregators() throws Excep .setInterval(QSS(Filtration.eternity())) .setGranularity(Granularities.ALL) .setDimensions(DIMS( - new DefaultDimensionSpec("dim1", "d0"), - new DefaultDimensionSpec("dim2", "d1") + new DefaultDimensionSpec("dim2", "d0"), + new DefaultDimensionSpec("dim1", "d1") )) .setAggregatorSpecs(AGGS(new LongSumAggregatorFactory("a0", "cnt"))) .setContext(QUERY_CONTEXT_DEFAULT) @@ -4106,12 +4106,12 @@ public void testExactCountDistinctWithGroupingAndOtherAggregators() throws Excep ) .setInterval(QSS(Filtration.eternity())) .setGranularity(Granularities.ALL) - .setDimensions(DIMS(new DefaultDimensionSpec("d1", "_d0"))) + .setDimensions(DIMS(new DefaultDimensionSpec("d0", "_d0"))) .setAggregatorSpecs(AGGS( new LongSumAggregatorFactory("_a0", "a0"), new FilteredAggregatorFactory( new CountAggregatorFactory("_a1"), - NOT(SELECTOR("d0", null, null)) + NOT(SELECTOR("d1", null, null)) ) )) .setContext(QUERY_CONTEXT_DEFAULT) @@ -4236,8 +4236,8 @@ public void testNestedGroupBy() throws Exception .setInterval(QSS(Filtration.eternity())) .setGranularity(Granularities.ALL) .setDimensions(DIMS( - new DefaultDimensionSpec("dim1", "d0"), - new DefaultDimensionSpec("m2", "d1", ValueType.DOUBLE) + new DefaultDimensionSpec("m2", "d0", ValueType.DOUBLE), + new DefaultDimensionSpec("dim1", "d1") )) .setDimFilter(new SelectorDimFilter("m1", "5.0", null)) .setAggregatorSpecs(AGGS(new LongMaxAggregatorFactory("a0", "__time"))) @@ -4255,7 +4255,7 @@ public void testNestedGroupBy() throws Exception ) .setDimensions(DIMS( new DefaultDimensionSpec("_d0:v", "_d0", ValueType.LONG), - new DefaultDimensionSpec("d0", "_d1", ValueType.STRING) + new DefaultDimensionSpec("d1", "_d1", ValueType.STRING) )) .setAggregatorSpecs(AGGS( new CountAggregatorFactory("_a0") @@ -6870,7 +6870,7 @@ public void testUsingSubqueryAsFilterWithInnerSort() throws Exception { String nullValue = NullHandling.replaceWithDefault() ? "" : null; - // Regression test for https://github.com/druid-io/druid/issues/4208 + // Regression test for https://github.com/apache/incubator-druid/issues/4208 testQuery( "SELECT dim1, dim2 FROM druid.foo\n" + " WHERE dim2 IN (\n" @@ -7154,8 +7154,8 @@ public void testSortProjectAfterNestedGroupBy() throws Exception .setGranularity(Granularities.ALL) .setDimensions(DIMS( new DefaultDimensionSpec("__time", "d0", ValueType.LONG), - new DefaultDimensionSpec("dim1", "d1"), - new DefaultDimensionSpec("m2", "d2", ValueType.DOUBLE) + new DefaultDimensionSpec("m2", "d1", ValueType.DOUBLE), + new DefaultDimensionSpec("dim1", "d2") )) .setContext(QUERY_CONTEXT_DEFAULT) .build() @@ -7164,7 +7164,7 @@ public void testSortProjectAfterNestedGroupBy() throws Exception .setGranularity(Granularities.ALL) .setDimensions(DIMS( new DefaultDimensionSpec("d0", "_d0", ValueType.LONG), - new DefaultDimensionSpec("d1", "_d1", ValueType.STRING) + new DefaultDimensionSpec("d2", "_d1", ValueType.STRING) )) .setAggregatorSpecs(AGGS( new CountAggregatorFactory("a0") diff --git a/sql/src/test/java/io/druid/sql/calcite/expression/ExpressionsTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/expression/ExpressionsTest.java similarity index 94% rename from sql/src/test/java/io/druid/sql/calcite/expression/ExpressionsTest.java rename to sql/src/test/java/org/apache/druid/sql/calcite/expression/ExpressionsTest.java index 546c967f69cc..f7db35d3fe5c 100644 --- a/sql/src/test/java/io/druid/sql/calcite/expression/ExpressionsTest.java +++ b/sql/src/test/java/org/apache/druid/sql/calcite/expression/ExpressionsTest.java @@ -17,31 +17,31 @@ * under the License. */ -package io.druid.sql.calcite.expression; +package org.apache.druid.sql.calcite.expression; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.druid.common.config.NullHandling; -import io.druid.java.util.common.DateTimes; -import io.druid.math.expr.ExprEval; -import io.druid.math.expr.Parser; -import io.druid.query.extraction.RegexDimExtractionFn; -import io.druid.segment.column.ValueType; -import io.druid.sql.calcite.expression.builtin.DateTruncOperatorConversion; -import io.druid.sql.calcite.expression.builtin.RegexpExtractOperatorConversion; -import io.druid.sql.calcite.expression.builtin.StrposOperatorConversion; -import io.druid.sql.calcite.expression.builtin.TimeExtractOperatorConversion; -import io.druid.sql.calcite.expression.builtin.TimeFloorOperatorConversion; -import io.druid.sql.calcite.expression.builtin.TimeFormatOperatorConversion; -import io.druid.sql.calcite.expression.builtin.TimeParseOperatorConversion; -import io.druid.sql.calcite.expression.builtin.TimeShiftOperatorConversion; -import io.druid.sql.calcite.expression.builtin.TruncateOperatorConversion; -import io.druid.sql.calcite.planner.Calcites; -import io.druid.sql.calcite.planner.PlannerConfig; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.table.RowSignature; -import io.druid.sql.calcite.util.CalciteTestBase; -import io.druid.sql.calcite.util.CalciteTests; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.math.expr.ExprEval; +import org.apache.druid.math.expr.Parser; +import org.apache.druid.query.extraction.RegexDimExtractionFn; +import org.apache.druid.segment.column.ValueType; +import org.apache.druid.sql.calcite.expression.builtin.DateTruncOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.RegexpExtractOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.StrposOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.TimeExtractOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.TimeFloorOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.TimeFormatOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.TimeParseOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.TimeShiftOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.TruncateOperatorConversion; +import org.apache.druid.sql.calcite.planner.Calcites; +import org.apache.druid.sql.calcite.planner.PlannerConfig; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.table.RowSignature; +import org.apache.druid.sql.calcite.util.CalciteTestBase; +import org.apache.druid.sql.calcite.util.CalciteTests; import org.apache.calcite.avatica.util.TimeUnit; import org.apache.calcite.avatica.util.TimeUnitRange; import org.apache.calcite.jdbc.JavaTypeFactoryImpl; diff --git a/sql/src/test/java/io/druid/sql/calcite/filtration/FiltrationTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/filtration/FiltrationTest.java similarity index 84% rename from sql/src/test/java/io/druid/sql/calcite/filtration/FiltrationTest.java rename to sql/src/test/java/org/apache/druid/sql/calcite/filtration/FiltrationTest.java index f7a6346cad5f..d83f886eb76b 100644 --- a/sql/src/test/java/io/druid/sql/calcite/filtration/FiltrationTest.java +++ b/sql/src/test/java/org/apache/druid/sql/calcite/filtration/FiltrationTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.sql.calcite.filtration; +package org.apache.druid.sql.calcite.filtration; import com.google.common.collect.ImmutableList; -import io.druid.java.util.common.Intervals; -import io.druid.query.filter.IntervalDimFilter; -import io.druid.query.filter.NotDimFilter; -import io.druid.segment.column.Column; -import io.druid.sql.calcite.util.CalciteTestBase; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.query.filter.IntervalDimFilter; +import org.apache.druid.query.filter.NotDimFilter; +import org.apache.druid.segment.column.Column; +import org.apache.druid.sql.calcite.util.CalciteTestBase; import org.junit.Assert; import org.junit.Test; diff --git a/sql/src/test/java/io/druid/sql/calcite/http/SqlQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/http/SqlQueryTest.java similarity index 85% rename from sql/src/test/java/io/druid/sql/calcite/http/SqlQueryTest.java rename to sql/src/test/java/org/apache/druid/sql/calcite/http/SqlQueryTest.java index fb8e876b4b4e..014f0394a326 100644 --- a/sql/src/test/java/io/druid/sql/calcite/http/SqlQueryTest.java +++ b/sql/src/test/java/org/apache/druid/sql/calcite/http/SqlQueryTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.druid.sql.calcite.http; +package org.apache.druid.sql.calcite.http; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import io.druid.segment.TestHelper; -import io.druid.sql.calcite.util.CalciteTestBase; -import io.druid.sql.http.ResultFormat; -import io.druid.sql.http.SqlQuery; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.sql.calcite.util.CalciteTestBase; +import org.apache.druid.sql.http.ResultFormat; +import org.apache.druid.sql.http.SqlQuery; import org.junit.Assert; import org.junit.Test; diff --git a/sql/src/test/java/io/druid/sql/calcite/http/SqlResourceTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/http/SqlResourceTest.java similarity index 89% rename from sql/src/test/java/io/druid/sql/calcite/http/SqlResourceTest.java rename to sql/src/test/java/org/apache/druid/sql/calcite/http/SqlResourceTest.java index b5e15a970482..70e275d63177 100644 --- a/sql/src/test/java/io/druid/sql/calcite/http/SqlResourceTest.java +++ b/sql/src/test/java/org/apache/druid/sql/calcite/http/SqlResourceTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.sql.calcite.http; +package org.apache.druid.sql.calcite.http; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -25,30 +25,30 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import io.druid.common.config.NullHandling; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.io.Closer; -import io.druid.math.expr.ExprMacroTable; -import io.druid.query.QueryInterruptedException; -import io.druid.query.QueryRunnerFactoryConglomerate; -import io.druid.query.ResourceLimitExceededException; -import io.druid.server.security.AllowAllAuthenticator; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthTestUtils; -import io.druid.sql.calcite.planner.DruidOperatorTable; -import io.druid.sql.calcite.planner.PlannerConfig; -import io.druid.sql.calcite.planner.PlannerContext; -import io.druid.sql.calcite.planner.PlannerFactory; -import io.druid.sql.calcite.schema.DruidSchema; -import io.druid.sql.calcite.util.CalciteTestBase; -import io.druid.sql.calcite.util.CalciteTests; -import io.druid.sql.calcite.util.QueryLogHook; -import io.druid.sql.calcite.util.SpecificSegmentsQuerySegmentWalker; -import io.druid.sql.http.ResultFormat; -import io.druid.sql.http.SqlQuery; -import io.druid.sql.http.SqlResource; +import org.apache.druid.common.config.NullHandling; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.query.QueryInterruptedException; +import org.apache.druid.query.QueryRunnerFactoryConglomerate; +import org.apache.druid.query.ResourceLimitExceededException; +import org.apache.druid.server.security.AllowAllAuthenticator; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthTestUtils; +import org.apache.druid.sql.calcite.planner.DruidOperatorTable; +import org.apache.druid.sql.calcite.planner.PlannerConfig; +import org.apache.druid.sql.calcite.planner.PlannerContext; +import org.apache.druid.sql.calcite.planner.PlannerFactory; +import org.apache.druid.sql.calcite.schema.DruidSchema; +import org.apache.druid.sql.calcite.util.CalciteTestBase; +import org.apache.druid.sql.calcite.util.CalciteTests; +import org.apache.druid.sql.calcite.util.QueryLogHook; +import org.apache.druid.sql.calcite.util.SpecificSegmentsQuerySegmentWalker; +import org.apache.druid.sql.http.ResultFormat; +import org.apache.druid.sql.http.SqlQuery; +import org.apache.druid.sql.http.SqlResource; import org.apache.calcite.tools.ValidationException; import org.easymock.EasyMock; import org.junit.After; @@ -275,8 +275,8 @@ public void testArrayResultFormat() throws Exception Assert.assertEquals( ImmutableList.of( - Arrays.asList("2000-01-01T00:00:00.000Z", 1, "", "a", 1.0, 1.0, "io.druid.hll.HLLCV1", nullStr), - Arrays.asList("2000-01-02T00:00:00.000Z", 1, "10.1", nullStr, 2.0, 2.0, "io.druid.hll.HLLCV1", nullStr) + Arrays.asList("2000-01-01T00:00:00.000Z", 1, "", "a", 1.0, 1.0, "org.apache.druid.hll.HLLCV1", nullStr), + Arrays.asList("2000-01-02T00:00:00.000Z", 1, "10.1", nullStr, 2.0, 2.0, "org.apache.druid.hll.HLLCV1", nullStr) ), doPost(new SqlQuery(query, ResultFormat.ARRAY, null), new TypeReference>>() {}).rhs ); @@ -292,11 +292,11 @@ public void testArrayLinesResultFormat() throws Exception Assert.assertEquals(4, lines.size()); Assert.assertEquals( - Arrays.asList("2000-01-01T00:00:00.000Z", 1, "", "a", 1.0, 1.0, "io.druid.hll.HLLCV1", nullStr), + Arrays.asList("2000-01-01T00:00:00.000Z", 1, "", "a", 1.0, 1.0, "org.apache.druid.hll.HLLCV1", nullStr), JSON_MAPPER.readValue(lines.get(0), List.class) ); Assert.assertEquals( - Arrays.asList("2000-01-02T00:00:00.000Z", 1, "10.1", nullStr, 2.0, 2.0, "io.druid.hll.HLLCV1", nullStr), + Arrays.asList("2000-01-02T00:00:00.000Z", 1, "10.1", nullStr, 2.0, 2.0, "org.apache.druid.hll.HLLCV1", nullStr), JSON_MAPPER.readValue(lines.get(1), List.class) ); Assert.assertEquals("", lines.get(2)); @@ -325,7 +325,7 @@ public void testObjectResultFormat() throws Exception .put("dim2", "a") .put("m1", 1.0) .put("m2", 1.0) - .put("unique_dim1", "io.druid.hll.HLLCV1") + .put("unique_dim1", "org.apache.druid.hll.HLLCV1") .put("EXPR$7", "") .build(), ImmutableMap @@ -336,7 +336,7 @@ public void testObjectResultFormat() throws Exception .put("dim2", "") .put("m1", 2.0) .put("m2", 2.0) - .put("unique_dim1", "io.druid.hll.HLLCV1") + .put("unique_dim1", "org.apache.druid.hll.HLLCV1") .put("EXPR$7", "") .build() ).stream().map(transformer).collect(Collectors.toList()), @@ -369,7 +369,7 @@ public void testObjectLinesResultFormat() throws Exception .put("dim2", "a") .put("m1", 1.0) .put("m2", 1.0) - .put("unique_dim1", "io.druid.hll.HLLCV1") + .put("unique_dim1", "org.apache.druid.hll.HLLCV1") .put("EXPR$7", "") .build() ), @@ -385,7 +385,7 @@ public void testObjectLinesResultFormat() throws Exception .put("dim2", "") .put("m1", 2.0) .put("m2", 2.0) - .put("unique_dim1", "io.druid.hll.HLLCV1") + .put("unique_dim1", "org.apache.druid.hll.HLLCV1") .put("EXPR$7", "") .build() ), @@ -404,8 +404,8 @@ public void testCsvResultFormat() throws Exception Assert.assertEquals( ImmutableList.of( - "2000-01-01T00:00:00.000Z,1,,a,1.0,1.0,io.druid.hll.HLLCV1,", - "2000-01-02T00:00:00.000Z,1,10.1,,2.0,2.0,io.druid.hll.HLLCV1,", + "2000-01-01T00:00:00.000Z,1,,a,1.0,1.0,org.apache.druid.hll.HLLCV1,", + "2000-01-02T00:00:00.000Z,1,10.1,,2.0,2.0,org.apache.druid.hll.HLLCV1,", "", "" ), diff --git a/sql/src/test/java/io/druid/sql/calcite/planner/CalcitesTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/planner/CalcitesTest.java similarity index 96% rename from sql/src/test/java/io/druid/sql/calcite/planner/CalcitesTest.java rename to sql/src/test/java/org/apache/druid/sql/calcite/planner/CalcitesTest.java index 9542b03062d8..763524eb58dc 100644 --- a/sql/src/test/java/io/druid/sql/calcite/planner/CalcitesTest.java +++ b/sql/src/test/java/org/apache/druid/sql/calcite/planner/CalcitesTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.druid.sql.calcite.planner; +package org.apache.druid.sql.calcite.planner; import com.google.common.collect.ImmutableSortedSet; -import io.druid.sql.calcite.util.CalciteTestBase; +import org.apache.druid.sql.calcite.util.CalciteTestBase; import org.junit.Assert; import org.junit.Test; diff --git a/sql/src/test/java/io/druid/sql/calcite/schema/DruidSchemaTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/schema/DruidSchemaTest.java similarity index 85% rename from sql/src/test/java/io/druid/sql/calcite/schema/DruidSchemaTest.java rename to sql/src/test/java/org/apache/druid/sql/calcite/schema/DruidSchemaTest.java index 76ef6ce2f34c..bf49eea7c347 100644 --- a/sql/src/test/java/io/druid/sql/calcite/schema/DruidSchemaTest.java +++ b/sql/src/test/java/org/apache/druid/sql/calcite/schema/DruidSchemaTest.java @@ -17,34 +17,34 @@ * under the License. */ -package io.druid.sql.calcite.schema; +package org.apache.druid.sql.calcite.schema; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.druid.data.input.InputRow; -import io.druid.java.util.common.Intervals; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.io.Closer; -import io.druid.query.QueryRunnerFactoryConglomerate; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.DoubleSumAggregatorFactory; -import io.druid.query.aggregation.LongSumAggregatorFactory; -import io.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; -import io.druid.segment.IndexBuilder; -import io.druid.segment.QueryableIndex; -import io.druid.segment.incremental.IncrementalIndexSchema; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; -import io.druid.server.security.NoopEscalator; -import io.druid.sql.calcite.planner.PlannerConfig; -import io.druid.sql.calcite.table.DruidTable; -import io.druid.sql.calcite.util.CalciteTestBase; -import io.druid.sql.calcite.util.CalciteTests; -import io.druid.sql.calcite.util.SpecificSegmentsQuerySegmentWalker; -import io.druid.sql.calcite.util.TestServerInventoryView; -import io.druid.sql.calcite.view.NoopViewManager; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.LinearShardSpec; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.query.QueryRunnerFactoryConglomerate; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; +import org.apache.druid.query.aggregation.LongSumAggregatorFactory; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; +import org.apache.druid.segment.IndexBuilder; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; +import org.apache.druid.server.security.NoopEscalator; +import org.apache.druid.sql.calcite.planner.PlannerConfig; +import org.apache.druid.sql.calcite.table.DruidTable; +import org.apache.druid.sql.calcite.util.CalciteTestBase; +import org.apache.druid.sql.calcite.util.CalciteTests; +import org.apache.druid.sql.calcite.util.SpecificSegmentsQuerySegmentWalker; +import org.apache.druid.sql.calcite.util.TestServerInventoryView; +import org.apache.druid.sql.calcite.view.NoopViewManager; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.LinearShardSpec; import org.apache.calcite.jdbc.JavaTypeFactoryImpl; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.rel.type.RelDataTypeField; diff --git a/sql/src/test/java/io/druid/sql/calcite/util/CalciteTestBase.java b/sql/src/test/java/org/apache/druid/sql/calcite/util/CalciteTestBase.java similarity index 91% rename from sql/src/test/java/io/druid/sql/calcite/util/CalciteTestBase.java rename to sql/src/test/java/org/apache/druid/sql/calcite/util/CalciteTestBase.java index 66657a535dc9..bb6225c3362a 100644 --- a/sql/src/test/java/io/druid/sql/calcite/util/CalciteTestBase.java +++ b/sql/src/test/java/org/apache/druid/sql/calcite/util/CalciteTestBase.java @@ -17,9 +17,9 @@ * under the License. */ -package io.druid.sql.calcite.util; +package org.apache.druid.sql.calcite.util; -import io.druid.sql.calcite.planner.Calcites; +import org.apache.druid.sql.calcite.planner.Calcites; import org.junit.BeforeClass; public abstract class CalciteTestBase diff --git a/sql/src/test/java/io/druid/sql/calcite/util/CalciteTests.java b/sql/src/test/java/org/apache/druid/sql/calcite/util/CalciteTests.java similarity index 75% rename from sql/src/test/java/io/druid/sql/calcite/util/CalciteTests.java rename to sql/src/test/java/org/apache/druid/sql/calcite/util/CalciteTests.java index 45fd20e23a0b..4716b0d505a0 100644 --- a/sql/src/test/java/io/druid/sql/calcite/util/CalciteTests.java +++ b/sql/src/test/java/org/apache/druid/sql/calcite/util/CalciteTests.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.sql.calcite.util; +package org.apache.druid.sql.calcite.util; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Supplier; @@ -32,93 +32,93 @@ import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Module; -import io.druid.collections.CloseableStupidPool; -import io.druid.data.input.InputRow; -import io.druid.data.input.impl.DimensionsSpec; -import io.druid.data.input.impl.InputRowParser; -import io.druid.data.input.impl.MapInputRowParser; -import io.druid.data.input.impl.TimeAndDimsParseSpec; -import io.druid.data.input.impl.TimestampSpec; -import io.druid.guice.ExpressionModule; -import io.druid.guice.annotations.Json; -import io.druid.java.util.common.Pair; -import io.druid.java.util.common.io.Closer; -import io.druid.java.util.emitter.core.NoopEmitter; -import io.druid.java.util.emitter.service.ServiceEmitter; -import io.druid.math.expr.ExprMacroTable; -import io.druid.query.DefaultGenericQueryMetricsFactory; -import io.druid.query.DefaultQueryRunnerFactoryConglomerate; -import io.druid.query.DruidProcessingConfig; -import io.druid.query.Query; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryRunnerFactoryConglomerate; -import io.druid.query.QueryRunnerTestHelper; -import io.druid.query.QuerySegmentWalker; -import io.druid.query.QueryToolChest; -import io.druid.query.QueryToolChestWarehouse; -import io.druid.query.aggregation.CountAggregatorFactory; -import io.druid.query.aggregation.DoubleSumAggregatorFactory; -import io.druid.query.aggregation.FloatSumAggregatorFactory; -import io.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; -import io.druid.query.expression.LookupEnabledTestExprMacroTable; -import io.druid.query.expression.LookupExprMacro; -import io.druid.query.groupby.GroupByQuery; -import io.druid.query.groupby.GroupByQueryConfig; -import io.druid.query.groupby.GroupByQueryRunnerFactory; -import io.druid.query.groupby.GroupByQueryRunnerTest; -import io.druid.query.groupby.strategy.GroupByStrategySelector; -import io.druid.query.lookup.LookupReferencesManager; -import io.druid.query.metadata.SegmentMetadataQueryConfig; -import io.druid.query.metadata.SegmentMetadataQueryQueryToolChest; -import io.druid.query.metadata.SegmentMetadataQueryRunnerFactory; -import io.druid.query.metadata.metadata.SegmentMetadataQuery; -import io.druid.query.scan.ScanQuery; -import io.druid.query.scan.ScanQueryConfig; -import io.druid.query.scan.ScanQueryEngine; -import io.druid.query.scan.ScanQueryQueryToolChest; -import io.druid.query.scan.ScanQueryRunnerFactory; -import io.druid.query.select.SelectQuery; -import io.druid.query.select.SelectQueryConfig; -import io.druid.query.select.SelectQueryEngine; -import io.druid.query.select.SelectQueryQueryToolChest; -import io.druid.query.select.SelectQueryRunnerFactory; -import io.druid.query.timeseries.TimeseriesQuery; -import io.druid.query.timeseries.TimeseriesQueryEngine; -import io.druid.query.timeseries.TimeseriesQueryQueryToolChest; -import io.druid.query.timeseries.TimeseriesQueryRunnerFactory; -import io.druid.query.topn.TopNQuery; -import io.druid.query.topn.TopNQueryConfig; -import io.druid.query.topn.TopNQueryQueryToolChest; -import io.druid.query.topn.TopNQueryRunnerFactory; -import io.druid.segment.IndexBuilder; -import io.druid.segment.QueryableIndex; -import io.druid.segment.TestHelper; -import io.druid.segment.incremental.IncrementalIndexSchema; -import io.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; -import io.druid.server.QueryLifecycleFactory; -import io.druid.server.log.NoopRequestLogger; -import io.druid.server.security.Access; -import io.druid.server.security.Action; -import io.druid.server.security.AllowAllAuthenticator; -import io.druid.server.security.AuthConfig; -import io.druid.server.security.AuthenticationResult; -import io.druid.server.security.Authenticator; -import io.druid.server.security.AuthenticatorMapper; -import io.druid.server.security.Authorizer; -import io.druid.server.security.AuthorizerMapper; -import io.druid.server.security.Escalator; -import io.druid.server.security.NoopEscalator; -import io.druid.server.security.Resource; -import io.druid.server.security.ResourceType; -import io.druid.sql.calcite.expression.SqlOperatorConversion; -import io.druid.sql.calcite.expression.builtin.LookupOperatorConversion; -import io.druid.sql.calcite.planner.DruidOperatorTable; -import io.druid.sql.calcite.planner.PlannerConfig; -import io.druid.sql.calcite.schema.DruidSchema; -import io.druid.sql.calcite.view.NoopViewManager; -import io.druid.sql.calcite.view.ViewManager; -import io.druid.timeline.DataSegment; -import io.druid.timeline.partition.LinearShardSpec; +import org.apache.druid.collections.CloseableStupidPool; +import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.data.input.impl.InputRowParser; +import org.apache.druid.data.input.impl.MapInputRowParser; +import org.apache.druid.data.input.impl.TimeAndDimsParseSpec; +import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.guice.ExpressionModule; +import org.apache.druid.guice.annotations.Json; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.java.util.common.io.Closer; +import org.apache.druid.java.util.emitter.core.NoopEmitter; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; +import org.apache.druid.math.expr.ExprMacroTable; +import org.apache.druid.query.DefaultGenericQueryMetricsFactory; +import org.apache.druid.query.DefaultQueryRunnerFactoryConglomerate; +import org.apache.druid.query.DruidProcessingConfig; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryRunnerFactoryConglomerate; +import org.apache.druid.query.QueryRunnerTestHelper; +import org.apache.druid.query.QuerySegmentWalker; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.QueryToolChestWarehouse; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; +import org.apache.druid.query.aggregation.FloatSumAggregatorFactory; +import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; +import org.apache.druid.query.expression.LookupEnabledTestExprMacroTable; +import org.apache.druid.query.expression.LookupExprMacro; +import org.apache.druid.query.groupby.GroupByQuery; +import org.apache.druid.query.groupby.GroupByQueryConfig; +import org.apache.druid.query.groupby.GroupByQueryRunnerFactory; +import org.apache.druid.query.groupby.GroupByQueryRunnerTest; +import org.apache.druid.query.groupby.strategy.GroupByStrategySelector; +import org.apache.druid.query.lookup.LookupReferencesManager; +import org.apache.druid.query.metadata.SegmentMetadataQueryConfig; +import org.apache.druid.query.metadata.SegmentMetadataQueryQueryToolChest; +import org.apache.druid.query.metadata.SegmentMetadataQueryRunnerFactory; +import org.apache.druid.query.metadata.metadata.SegmentMetadataQuery; +import org.apache.druid.query.scan.ScanQuery; +import org.apache.druid.query.scan.ScanQueryConfig; +import org.apache.druid.query.scan.ScanQueryEngine; +import org.apache.druid.query.scan.ScanQueryQueryToolChest; +import org.apache.druid.query.scan.ScanQueryRunnerFactory; +import org.apache.druid.query.select.SelectQuery; +import org.apache.druid.query.select.SelectQueryConfig; +import org.apache.druid.query.select.SelectQueryEngine; +import org.apache.druid.query.select.SelectQueryQueryToolChest; +import org.apache.druid.query.select.SelectQueryRunnerFactory; +import org.apache.druid.query.timeseries.TimeseriesQuery; +import org.apache.druid.query.timeseries.TimeseriesQueryEngine; +import org.apache.druid.query.timeseries.TimeseriesQueryQueryToolChest; +import org.apache.druid.query.timeseries.TimeseriesQueryRunnerFactory; +import org.apache.druid.query.topn.TopNQuery; +import org.apache.druid.query.topn.TopNQueryConfig; +import org.apache.druid.query.topn.TopNQueryQueryToolChest; +import org.apache.druid.query.topn.TopNQueryRunnerFactory; +import org.apache.druid.segment.IndexBuilder; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.TestHelper; +import org.apache.druid.segment.incremental.IncrementalIndexSchema; +import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; +import org.apache.druid.server.QueryLifecycleFactory; +import org.apache.druid.server.log.NoopRequestLogger; +import org.apache.druid.server.security.Access; +import org.apache.druid.server.security.Action; +import org.apache.druid.server.security.AllowAllAuthenticator; +import org.apache.druid.server.security.AuthConfig; +import org.apache.druid.server.security.AuthenticationResult; +import org.apache.druid.server.security.Authenticator; +import org.apache.druid.server.security.AuthenticatorMapper; +import org.apache.druid.server.security.Authorizer; +import org.apache.druid.server.security.AuthorizerMapper; +import org.apache.druid.server.security.Escalator; +import org.apache.druid.server.security.NoopEscalator; +import org.apache.druid.server.security.Resource; +import org.apache.druid.server.security.ResourceType; +import org.apache.druid.sql.calcite.expression.SqlOperatorConversion; +import org.apache.druid.sql.calcite.expression.builtin.LookupOperatorConversion; +import org.apache.druid.sql.calcite.planner.DruidOperatorTable; +import org.apache.druid.sql.calcite.planner.PlannerConfig; +import org.apache.druid.sql.calcite.schema.DruidSchema; +import org.apache.druid.sql.calcite.view.NoopViewManager; +import org.apache.druid.sql.calcite.view.ViewManager; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.partition.LinearShardSpec; import org.joda.time.DateTime; import org.joda.time.chrono.ISOChronology; diff --git a/sql/src/test/java/io/druid/sql/calcite/util/QueryLogHook.java b/sql/src/test/java/org/apache/druid/sql/calcite/util/QueryLogHook.java similarity index 93% rename from sql/src/test/java/io/druid/sql/calcite/util/QueryLogHook.java rename to sql/src/test/java/org/apache/druid/sql/calcite/util/QueryLogHook.java index 793fa7740ffe..0faddca7b19a 100644 --- a/sql/src/test/java/io/druid/sql/calcite/util/QueryLogHook.java +++ b/sql/src/test/java/org/apache/druid/sql/calcite/util/QueryLogHook.java @@ -17,15 +17,15 @@ * under the License. */ -package io.druid.sql.calcite.util; +package org.apache.druid.sql.calcite.util; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.druid.jackson.DefaultObjectMapper; -import io.druid.java.util.common.logger.Logger; -import io.druid.query.Query; +import org.apache.druid.jackson.DefaultObjectMapper; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.Query; import org.apache.calcite.runtime.Hook; import org.junit.rules.TestRule; import org.junit.runner.Description; diff --git a/sql/src/test/java/io/druid/sql/calcite/util/SpecificSegmentsQuerySegmentWalker.java b/sql/src/test/java/org/apache/druid/sql/calcite/util/SpecificSegmentsQuerySegmentWalker.java similarity index 87% rename from sql/src/test/java/io/druid/sql/calcite/util/SpecificSegmentsQuerySegmentWalker.java rename to sql/src/test/java/org/apache/druid/sql/calcite/util/SpecificSegmentsQuerySegmentWalker.java index 6c1675c34492..d5ac4ceac261 100644 --- a/sql/src/test/java/io/druid/sql/calcite/util/SpecificSegmentsQuerySegmentWalker.java +++ b/sql/src/test/java/org/apache/druid/sql/calcite/util/SpecificSegmentsQuerySegmentWalker.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.sql.calcite.util; +package org.apache.druid.sql.calcite.util; import com.google.common.base.Function; import com.google.common.collect.Iterables; @@ -26,31 +26,31 @@ import com.google.common.collect.Ordering; import com.google.common.io.Closeables; import com.google.common.util.concurrent.MoreExecutors; -import io.druid.java.util.common.ISE; -import io.druid.java.util.common.UOE; -import io.druid.java.util.common.guava.FunctionalIterable; -import io.druid.java.util.common.guava.Sequence; -import io.druid.query.FinalizeResultsQueryRunner; -import io.druid.query.NoopQueryRunner; -import io.druid.query.Query; -import io.druid.query.QueryPlus; -import io.druid.query.QueryRunner; -import io.druid.query.QueryRunnerFactory; -import io.druid.query.QueryRunnerFactoryConglomerate; -import io.druid.query.QuerySegmentWalker; -import io.druid.query.QueryToolChest; -import io.druid.query.SegmentDescriptor; -import io.druid.query.TableDataSource; -import io.druid.query.spec.SpecificSegmentQueryRunner; -import io.druid.query.spec.SpecificSegmentSpec; -import io.druid.segment.QueryableIndex; -import io.druid.segment.QueryableIndexSegment; -import io.druid.segment.Segment; -import io.druid.timeline.DataSegment; -import io.druid.timeline.TimelineObjectHolder; -import io.druid.timeline.VersionedIntervalTimeline; -import io.druid.timeline.partition.PartitionChunk; -import io.druid.timeline.partition.PartitionHolder; +import org.apache.druid.java.util.common.ISE; +import org.apache.druid.java.util.common.UOE; +import org.apache.druid.java.util.common.guava.FunctionalIterable; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.query.FinalizeResultsQueryRunner; +import org.apache.druid.query.NoopQueryRunner; +import org.apache.druid.query.Query; +import org.apache.druid.query.QueryPlus; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.query.QueryRunnerFactory; +import org.apache.druid.query.QueryRunnerFactoryConglomerate; +import org.apache.druid.query.QuerySegmentWalker; +import org.apache.druid.query.QueryToolChest; +import org.apache.druid.query.SegmentDescriptor; +import org.apache.druid.query.TableDataSource; +import org.apache.druid.query.spec.SpecificSegmentQueryRunner; +import org.apache.druid.query.spec.SpecificSegmentSpec; +import org.apache.druid.segment.QueryableIndex; +import org.apache.druid.segment.QueryableIndexSegment; +import org.apache.druid.segment.Segment; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.TimelineObjectHolder; +import org.apache.druid.timeline.VersionedIntervalTimeline; +import org.apache.druid.timeline.partition.PartitionChunk; +import org.apache.druid.timeline.partition.PartitionHolder; import org.joda.time.Interval; import java.io.Closeable; diff --git a/sql/src/test/java/io/druid/sql/calcite/util/TestServerInventoryView.java b/sql/src/test/java/org/apache/druid/sql/calcite/util/TestServerInventoryView.java similarity index 82% rename from sql/src/test/java/io/druid/sql/calcite/util/TestServerInventoryView.java rename to sql/src/test/java/org/apache/druid/sql/calcite/util/TestServerInventoryView.java index a00a77a418ce..e46f3cb6e9f7 100644 --- a/sql/src/test/java/io/druid/sql/calcite/util/TestServerInventoryView.java +++ b/sql/src/test/java/org/apache/druid/sql/calcite/util/TestServerInventoryView.java @@ -17,18 +17,18 @@ * under the License. */ -package io.druid.sql.calcite.util; +package org.apache.druid.sql.calcite.util; import com.google.common.collect.ImmutableList; -import io.druid.client.DruidServer; -import io.druid.client.TimelineServerView; -import io.druid.client.selector.ServerSelector; -import io.druid.query.DataSource; -import io.druid.query.QueryRunner; -import io.druid.server.coordination.DruidServerMetadata; -import io.druid.server.coordination.ServerType; -import io.druid.timeline.DataSegment; -import io.druid.timeline.TimelineLookup; +import org.apache.druid.client.DruidServer; +import org.apache.druid.client.TimelineServerView; +import org.apache.druid.client.selector.ServerSelector; +import org.apache.druid.query.DataSource; +import org.apache.druid.query.QueryRunner; +import org.apache.druid.server.coordination.DruidServerMetadata; +import org.apache.druid.server.coordination.ServerType; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.TimelineLookup; import java.util.List; import java.util.concurrent.Executor;