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

Merge pull request #17 from ianbrandt/codecleanup 

Minor code cleanup and other miscellanea.
This commit is contained in:
cheddar 2012-11-01 16:14:17 -07:00
parent d7f85cfbc4 e7ec073d75
commit 4928978870
400 changed files with 3320 additions and 2905 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -9,10 +9,6 @@ target
.classpath
.idea
.project
.settings/org.eclipse.jdt.core.prefs
.settings/org.maven.ide.eclipse.prefs
client/.settings/org.eclipse.jdt.core.prefs
common/.settings/org.eclipse.jdt.core.prefs
server/.settings/org.eclipse.jdt.core.prefs
.settings/
examples/rand/RealtimeNode.out
examples/twitter/RealtimeNode.out

226
client/pom.xml
View File

@ -18,22 +18,13 @@
~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.metamx.druid</groupId>
<artifactId>druid-client</artifactId>
<version>0.1.0-SNAPSHOT</version>
<name>druid-client</name>
<description>druid-client</description>
<scm>
<connection>scm:git:ssh://git@github.com/metamx/druid.git</connection>
<developerConnection>scm:git:ssh://git@github.com/metamx/druid.git</developerConnection>
<url>http://www.github.com/metamx/druid</url>
</scm>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<parent>
<groupId>com.metamx</groupId>
@ -55,112 +46,141 @@
<dependency>
<groupId>com.metamx</groupId>
<artifactId>http-client</artifactId>
<version>0.6.1</version>
<artifactId>emitter</artifactId>
</dependency>
<dependency>
<groupId>com.metamx</groupId>
<artifactId>emitter</artifactId>
<version>0.0.7</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>6.1.26</version>
<artifactId>http-client</artifactId>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>3.0</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>11.0.1</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
<version>1.9.1</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
<version>1.9.1</version>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-guice</artifactId>
<version>1.9.1</version>
</dependency>
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-servlet</artifactId>
<version>3.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
<version>1.9.9</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-smile</artifactId>
<version>1.9.9</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.6.2</version>
</dependency>
<dependency>
<groupId>com.github.sgroschupf</groupId>
<artifactId>zkclient</artifactId>
<version>0.1</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.3</version>
</dependency>
<dependency>
<groupId>org.skife.config</groupId>
<artifactId>config-magic</artifactId>
<version>0.9</version>
<groupId>com.metamx</groupId>
<artifactId>java-util</artifactId>
</dependency>
<dependency>
<groupId>com.metamx</groupId>
<artifactId>server-metrics</artifactId>
<version>0.0.2</version>
</dependency>
<dependency>
<groupId>com.davekoelle</groupId>
<artifactId>alphanum</artifactId>
<version>1.0.3</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
<dependency>
<groupId>org.skife.config</groupId>
<artifactId>config-magic</artifactId>
</dependency>
<dependency>
<groupId>com.netflix.curator</groupId>
<artifactId>curator-client</artifactId>
</dependency>
<dependency>
<groupId>com.netflix.curator</groupId>
<artifactId>curator-framework</artifactId>
</dependency>
<dependency>
<groupId>com.netflix.curator</groupId>
<artifactId>curator-x-discovery</artifactId>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>6.1.26</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</dependency>
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
<version>4.8.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-smile</artifactId>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-guice</artifactId>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</dependency>
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-servlet</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
<version>3.2.4.Final</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
<groupId>com.github.sgroschupf</groupId>
<artifactId>zkclient</artifactId>
</dependency>
<!-- Tests -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>3.0</version>
<scope>test</scope>
</dependency>
</dependencies>
@ -168,18 +188,7 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<phase>package</phase>
@ -195,24 +204,7 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-help-plugin</artifactId>
<version>2.1.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.7.2</version>
<configuration>
<systemPropertyVariables>
<user.timezone>UTC</user.timezone>
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<goals>

13
client/src/main/java/com/metamx/druid/BaseQuery.java
View File

@ -19,17 +19,18 @@
package com.metamx.druid;
import java.util.List;
import java.util.Map;
import org.codehaus.jackson.annotate.JsonProperty;
import org.joda.time.Duration;
import org.joda.time.Interval;
import com.google.common.base.Preconditions;
import com.google.common.collect.Maps;
import com.metamx.common.guava.Sequence;
import com.metamx.druid.query.segment.QuerySegmentSpec;
import com.metamx.druid.query.segment.QuerySegmentWalker;
import org.codehaus.jackson.annotate.JsonProperty;
import org.joda.time.Duration;
import org.joda.time.Interval;
import java.util.List;
import java.util.Map;
/**
*/

11
client/src/main/java/com/metamx/druid/Druids.java
View File

@ -19,6 +19,12 @@
package com.metamx.druid;
import java.util.List;
import java.util.Map;
import org.joda.time.DateTime;
import org.joda.time.Interval;
import com.google.common.collect.Lists;
import com.metamx.druid.query.filter.AndDimFilter;
import com.metamx.druid.query.filter.DimFilter;
@ -35,11 +41,6 @@ import com.metamx.druid.query.timeboundary.TimeBoundaryQuery;
import com.metamx.druid.result.Result;
import com.metamx.druid.result.SearchResultValue;
import com.metamx.druid.result.TimeBoundaryResultValue;
import org.joda.time.DateTime;
import org.joda.time.Interval;
import java.util.List;
import java.util.Map;
/**
*/

15
client/src/main/java/com/metamx/druid/Query.java
View File

@ -19,19 +19,20 @@
package com.metamx.druid;
import java.util.List;
import java.util.Map;
import org.codehaus.jackson.annotate.JsonSubTypes;
import org.codehaus.jackson.annotate.JsonTypeInfo;
import org.joda.time.Duration;
import org.joda.time.Interval;
import com.metamx.common.guava.Sequence;
import com.metamx.druid.query.group.GroupByQuery;
import com.metamx.druid.query.search.SearchQuery;
import com.metamx.druid.query.segment.QuerySegmentSpec;
import com.metamx.druid.query.segment.QuerySegmentWalker;
import com.metamx.druid.query.timeboundary.TimeBoundaryQuery;
import org.codehaus.jackson.annotate.JsonSubTypes;
import org.codehaus.jackson.annotate.JsonTypeInfo;
import org.joda.time.Duration;
import org.joda.time.Interval;
import java.util.List;
import java.util.Map;
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "queryType")
@JsonSubTypes(value = {

4
client/src/main/java/com/metamx/druid/ResultGranularTimestampComparator.java
View File

@ -19,11 +19,11 @@
package com.metamx.druid;
import java.util.Comparator;
import com.google.common.primitives.Longs;
import com.metamx.druid.result.Result;
import java.util.Comparator;
/**
*/
public class ResultGranularTimestampComparator<T> implements Comparator<Result<T>>

5
client/src/main/java/com/metamx/druid/SearchBinaryFn.java
View File

@ -19,6 +19,8 @@
package com.metamx.druid;
import java.util.TreeSet;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.metamx.common.guava.nary.BinaryFn;
@ -26,9 +28,6 @@ import com.metamx.druid.query.search.SearchHit;
import com.metamx.druid.query.search.SearchSortSpec;
import com.metamx.druid.result.Result;
import com.metamx.druid.result.SearchResultValue;
import org.joda.time.DateTime;
import java.util.TreeSet;
/**
*/

25
client/src/main/java/com/metamx/druid/client/CachingClusteredClient.java
View File

@ -19,6 +19,19 @@
package com.metamx.druid.client;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executors;
import org.codehaus.jackson.map.ObjectMapper;
import org.joda.time.DateTime;
import org.joda.time.Interval;
import com.google.common.base.Function;
import com.google.common.base.Supplier;
import com.google.common.base.Throwables;
@ -52,18 +65,6 @@ import com.metamx.druid.query.segment.MultipleSpecificSegmentSpec;
import com.metamx.druid.query.segment.SegmentDescriptor;
import com.metamx.druid.result.BySegmentResultValueClass;
import com.metamx.druid.result.Result;
import org.codehaus.jackson.map.ObjectMapper;
import org.joda.time.DateTime;
import org.joda.time.Interval;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executors;
/**
*/

8
client/src/main/java/com/metamx/druid/client/ClientInventoryManager.java
View File

@ -19,16 +19,16 @@
package com.metamx.druid.client;
import java.util.Map;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.metamx.common.Pair;
import com.metamx.common.logger.Logger;
import com.metamx.phonebook.PhoneBook;
import com.metamx.phonebook.PhoneBookPeon;
import java.util.Map;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
/**
*/
public class ClientInventoryManager extends InventoryManager<DruidServer>

16
client/src/main/java/com/metamx/druid/client/ClientSideServerView.java
View File

@ -19,6 +19,15 @@
package com.metamx.druid.client;
import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.Executor;
import javax.annotation.Nullable;
import org.codehaus.jackson.map.ObjectMapper;
import com.google.common.base.Function;
import com.google.common.collect.Maps;
import com.google.common.collect.Ordering;
@ -28,13 +37,6 @@ import com.metamx.druid.client.selector.ServerSelector;
import com.metamx.druid.query.QueryRunner;
import com.metamx.druid.query.QueryToolChestWarehouse;
import com.metamx.http.client.HttpClient;
import org.codehaus.jackson.map.ObjectMapper;
import javax.annotation.Nullable;
import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.Executor;
/**
*/

33
client/src/main/java/com/metamx/druid/client/DataSegment.java
View File

@ -19,18 +19,12 @@
package com.metamx.druid.client;
import com.google.common.base.Preconditions;
import com.google.common.base.Predicate;
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.metamx.common.Granularity;
import com.metamx.druid.jackson.CommaListJoinDeserializer;
import com.metamx.druid.jackson.CommaListJoinSerializer;
import com.metamx.druid.query.segment.SegmentDescriptor;
import com.metamx.druid.shard.NoneShardSpec;
import com.metamx.druid.shard.ShardSpec;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import javax.annotation.Nullable;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.map.annotate.JsonDeserialize;
@ -38,10 +32,17 @@ import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.joda.time.DateTime;
import org.joda.time.Interval;
import javax.annotation.Nullable;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import com.google.common.base.Preconditions;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
import com.metamx.common.Granularity;
import com.metamx.druid.jackson.CommaListJoinDeserializer;
import com.metamx.druid.jackson.CommaListJoinSerializer;
import com.metamx.druid.query.segment.SegmentDescriptor;
import com.metamx.druid.shard.NoneShardSpec;
import com.metamx.druid.shard.ShardSpec;
/**
*/

39
client/src/main/java/com/metamx/druid/client/DirectDruidClient.java
View File

@ -19,6 +19,26 @@
package com.metamx.druid.client;
import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import org.codehaus.jackson.JsonParser;
import org.codehaus.jackson.JsonToken;
import org.codehaus.jackson.ObjectCodec;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.type.TypeFactory;
import org.codehaus.jackson.smile.SmileFactory;
import org.codehaus.jackson.type.JavaType;
import org.jboss.netty.handler.codec.http.HttpChunk;
import org.jboss.netty.handler.codec.http.HttpHeaders;
import org.jboss.netty.handler.codec.http.HttpResponse;
import com.google.common.base.Throwables;
import com.google.common.collect.Maps;
import com.google.common.io.Closeables;
@ -40,25 +60,6 @@ import com.metamx.http.client.HttpClient;
import com.metamx.http.client.io.AppendableByteArrayInputStream;
import com.metamx.http.client.response.ClientResponse;
import com.metamx.http.client.response.InputStreamResponseHandler;
import org.codehaus.jackson.JsonParser;
import org.codehaus.jackson.JsonToken;
import org.codehaus.jackson.ObjectCodec;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.type.TypeFactory;
import org.codehaus.jackson.smile.SmileFactory;
import org.codehaus.jackson.type.JavaType;
import org.jboss.netty.handler.codec.http.HttpChunk;
import org.jboss.netty.handler.codec.http.HttpHeaders;
import org.jboss.netty.handler.codec.http.HttpResponse;
import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
/**
*/

7
client/src/main/java/com/metamx/druid/client/DruidDataSource.java
View File

@ -19,14 +19,15 @@
package com.metamx.druid.client;
import com.google.common.collect.Maps;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Collections;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentSkipListSet;
import org.codehaus.jackson.annotate.JsonProperty;
import com.google.common.collect.Maps;
/**
*/
public class DruidDataSource

11
client/src/main/java/com/metamx/druid/client/DruidServer.java
View File

@ -19,16 +19,17 @@
package com.metamx.druid.client;
import com.google.common.collect.ImmutableMap;
import com.metamx.common.logger.Logger;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import com.google.common.collect.ImmutableMap;
import com.metamx.common.logger.Logger;
/**
*/
public class DruidServer implements Comparable

4
client/src/main/java/com/metamx/druid/client/InventoryManagementStrategy.java
View File

@ -19,11 +19,11 @@
package com.metamx.druid.client;
import java.util.Map;
import com.metamx.common.Pair;
import com.metamx.phonebook.PhoneBookPeon;
import java.util.Map;
/**
*/
public interface InventoryManagementStrategy<T>

12
client/src/main/java/com/metamx/druid/client/InventoryManager.java
View File

@ -19,6 +19,12 @@
package com.metamx.druid.client;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import com.metamx.common.ISE;
import com.metamx.common.Pair;
import com.metamx.common.lifecycle.LifecycleStart;
@ -27,12 +33,6 @@ import com.metamx.common.logger.Logger;
import com.metamx.phonebook.PhoneBook;
import com.metamx.phonebook.PhoneBookPeon;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
*/
public abstract class InventoryManager<T>

10
client/src/main/java/com/metamx/druid/client/OnlyNewSegmentWatcherServerView.java
View File

@ -19,17 +19,17 @@
package com.metamx.druid.client;
import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.Executor;
import com.google.common.collect.Maps;
import com.metamx.common.logger.Logger;
import com.metamx.druid.VersionedIntervalTimeline;
import com.metamx.druid.client.selector.ServerSelector;
import com.metamx.druid.query.QueryRunner;
import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.Executor;
/**
*/
public class OnlyNewSegmentWatcherServerView implements MutableServerView

4
client/src/main/java/com/metamx/druid/client/SegmentInventoryManager.java
View File

@ -19,13 +19,13 @@
package com.metamx.druid.client;
import java.util.Map;
import com.metamx.common.Pair;
import com.metamx.common.logger.Logger;
import com.metamx.phonebook.PhoneBook;
import com.metamx.phonebook.PhoneBookPeon;
import java.util.Map;
/**
*/
public class SegmentInventoryManager extends InventoryManager<DruidDataSource>

6
client/src/main/java/com/metamx/druid/client/ServerInventoryManager.java
View File

@ -19,15 +19,15 @@
package com.metamx.druid.client;
import java.util.Iterator;
import java.util.Map;
import com.google.common.collect.Maps;
import com.metamx.common.Pair;
import com.metamx.common.logger.Logger;
import com.metamx.phonebook.PhoneBook;
import com.metamx.phonebook.PhoneBookPeon;
import java.util.Iterator;
import java.util.Map;
/**
*/
public class ServerInventoryManager extends InventoryManager<DruidServer>

4
client/src/main/java/com/metamx/druid/client/ServerView.java
View File

@ -19,12 +19,12 @@
package com.metamx.druid.client;
import java.util.concurrent.Executor;
import com.metamx.druid.VersionedIntervalTimeline;
import com.metamx.druid.client.selector.ServerSelector;
import com.metamx.druid.query.QueryRunner;
import java.util.concurrent.Executor;
/**
*/
public interface ServerView

29
client/src/main/java/com/metamx/druid/client/ZKPhoneBook.java
View File

@ -19,6 +19,21 @@
package com.metamx.druid.client;
import java.io.IOException;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Executor;
import org.I0Itec.zkclient.DataUpdater;
import org.I0Itec.zkclient.IZkChildListener;
import org.I0Itec.zkclient.ZkClient;
import org.I0Itec.zkclient.exception.ZkNoNodeException;
import org.I0Itec.zkclient.exception.ZkNodeExistsException;
import org.codehaus.jackson.map.ObjectMapper;
import com.google.common.base.Joiner;
import com.google.common.collect.HashBasedTable;
import com.google.common.collect.Maps;
@ -28,20 +43,6 @@ import com.metamx.common.logger.Logger;
import com.metamx.phonebook.BasePhoneBook;
import com.metamx.phonebook.PhoneBook;
import com.metamx.phonebook.PhoneBookPeon;
import org.I0Itec.zkclient.DataUpdater;
import org.I0Itec.zkclient.IZkChildListener;
import org.I0Itec.zkclient.ZkClient;
import org.I0Itec.zkclient.exception.ZkNoNodeException;
import org.I0Itec.zkclient.exception.ZkNodeExistsException;
import org.codehaus.jackson.map.ObjectMapper;
import java.io.IOException;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Executor;
/**
*/

4
client/src/main/java/com/metamx/druid/client/cache/ByteCountingLRUMap.java vendored
View File

@ -19,12 +19,12 @@
package com.metamx.druid.client.cache;
import com.metamx.common.logger.Logger;
import java.nio.ByteBuffer;
import java.util.LinkedHashMap;
import java.util.Map;
import com.metamx.common.logger.Logger;
/**
*/
class ByteCountingLRUMap extends LinkedHashMap<ByteBuffer, byte[]>

8
client/src/main/java/com/metamx/druid/client/cache/MapCacheBroker.java vendored
View File

@ -19,10 +19,6 @@
package com.metamx.druid.client.cache;
import com.google.common.collect.Maps;
import com.google.common.primitives.Ints;
import com.metamx.common.ISE;
import java.nio.ByteBuffer;
import java.util.Collections;
import java.util.Iterator;
@ -30,6 +26,10 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import com.google.common.collect.Maps;
import com.google.common.primitives.Ints;
import com.metamx.common.ISE;
/**
*/
public class MapCacheBroker implements CacheBroker

6
client/src/main/java/com/metamx/druid/client/selector/ServerSelector.java
View File

@ -19,14 +19,14 @@
package com.metamx.druid.client.selector;
import java.util.LinkedHashSet;
import java.util.Random;
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
import com.metamx.druid.client.DataSegment;
import com.metamx.druid.client.DruidServer;
import java.util.LinkedHashSet;
import java.util.Random;
/**
*/
public class ServerSelector

21
client/src/main/java/com/metamx/druid/http/BrokerMain.java
View File

@ -19,6 +19,17 @@
package com.metamx.druid.http;
import java.util.Properties;
import java.util.concurrent.ScheduledExecutorService;
import org.I0Itec.zkclient.ZkClient;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.smile.SmileFactory;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.servlet.Context;
import org.mortbay.jetty.servlet.ServletHolder;
import org.skife.config.ConfigurationObjectFactory;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.inject.Guice;
@ -58,16 +69,6 @@ import com.metamx.metrics.SysMonitor;
import com.metamx.phonebook.PhoneBook;
import com.netflix.curator.framework.CuratorFramework;
import com.netflix.curator.x.discovery.ServiceDiscovery;
import org.I0Itec.zkclient.ZkClient;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.smile.SmileFactory;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.servlet.Context;
import org.mortbay.jetty.servlet.ServletHolder;
import org.skife.config.ConfigurationObjectFactory;
import java.util.Properties;
import java.util.concurrent.ScheduledExecutorService;
/**
*/

22
client/src/main/java/com/metamx/druid/http/ClientInfoResource.java
View File

@ -19,6 +19,18 @@
package com.metamx.druid.http;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import org.joda.time.Interval;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@ -29,16 +41,6 @@ import com.metamx.druid.client.ClientInventoryManager;
import com.metamx.druid.client.DataSegment;
import com.metamx.druid.client.DruidDataSource;
import com.metamx.druid.client.DruidServer;
import org.joda.time.Interval;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
/**
*/

7
client/src/main/java/com/metamx/druid/http/ClientQuerySegmentWalker.java
View File

@ -19,6 +19,10 @@
package com.metamx.druid.http;
import javax.annotation.Nullable;
import org.joda.time.Interval;
import com.google.common.base.Function;
import com.metamx.druid.Query;
import com.metamx.druid.client.CachingClusteredClient;
@ -31,9 +35,6 @@ import com.metamx.druid.query.segment.QuerySegmentWalker;
import com.metamx.druid.query.segment.SegmentDescriptor;
import com.metamx.emitter.service.ServiceEmitter;
import com.metamx.emitter.service.ServiceMetricEvent;
import org.joda.time.Interval;
import javax.annotation.Nullable;
/**
*/

9
client/src/main/java/com/metamx/druid/http/ClientServletModule.java
View File

@ -19,15 +19,16 @@
package com.metamx.druid.http;
import javax.inject.Singleton;
import org.codehaus.jackson.jaxrs.JacksonJsonProvider;
import org.codehaus.jackson.map.ObjectMapper;
import com.google.inject.Provides;
import com.metamx.druid.client.ClientInventoryManager;
import com.metamx.druid.query.segment.QuerySegmentWalker;
import com.sun.jersey.guice.JerseyServletModule;
import com.sun.jersey.guice.spi.container.servlet.GuiceContainer;
import org.codehaus.jackson.jaxrs.JacksonJsonProvider;
import org.codehaus.jackson.map.ObjectMapper;
import javax.inject.Singleton;
/**
*/

19
client/src/main/java/com/metamx/druid/http/FileRequestLogger.java
View File

@ -19,21 +19,22 @@
package com.metamx.druid.http;
import com.google.common.base.Throwables;
import com.google.common.io.Closeables;
import com.metamx.common.concurrent.ScheduledExecutors;
import com.metamx.common.lifecycle.LifecycleStart;
import com.metamx.common.lifecycle.LifecycleStop;
import org.joda.time.DateTime;
import org.joda.time.Duration;
import org.joda.time.MutableDateTime;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.util.concurrent.Callable;
import java.util.concurrent.ScheduledExecutorService;
import org.joda.time.DateTime;
import org.joda.time.Duration;
import org.joda.time.MutableDateTime;
import com.google.common.base.Throwables;
import com.google.common.io.Closeables;
import com.metamx.common.concurrent.ScheduledExecutors;
import com.metamx.common.lifecycle.LifecycleStart;
import com.metamx.common.lifecycle.LifecycleStop;
/**
*/
public class FileRequestLogger implements RequestLogger

26
client/src/main/java/com/metamx/druid/http/QueryServlet.java
View File

@ -19,6 +19,20 @@
package com.metamx.druid.http;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.charset.Charset;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.ObjectWriter;
import org.joda.time.DateTime;
import org.mortbay.jetty.Request;
import com.google.common.base.Charsets;
import com.google.common.collect.ImmutableMap;
import com.google.common.io.ByteStreams;
@ -31,18 +45,6 @@ import com.metamx.druid.query.segment.QuerySegmentWalker;
import com.metamx.emitter.service.AlertEvent;
import com.metamx.emitter.service.ServiceEmitter;
import com.metamx.emitter.service.ServiceMetricEvent;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.ObjectWriter;
import org.joda.time.DateTime;
import org.mortbay.jetty.Request;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.charset.Charset;
/**
*/

7
client/src/main/java/com/metamx/druid/http/RequestLogLine.java
View File

@ -19,11 +19,12 @@
package com.metamx.druid.http;
import com.google.common.base.Joiner;
import com.metamx.druid.Query;
import java.util.Arrays;
import org.joda.time.DateTime;
import java.util.Arrays;
import com.google.common.base.Joiner;
import com.metamx.druid.Query;
public class RequestLogLine
{

9
client/src/main/java/com/metamx/druid/http/StatusServlet.java
View File

@ -19,15 +19,16 @@
package com.metamx.druid.http;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
*/
public class StatusServlet extends HttpServlet

29
client/src/main/java/com/metamx/druid/initialization/Initialization.java
View File

@ -19,6 +19,21 @@
package com.metamx.druid.initialization;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import org.I0Itec.zkclient.ZkClient;
import org.I0Itec.zkclient.ZkConnection;
import org.codehaus.jackson.map.ObjectMapper;
import org.mortbay.jetty.Connector;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.nio.SelectChannelConnector;
import org.mortbay.thread.QueuedThreadPool;
import com.google.common.base.Throwables;
import com.google.common.io.Closeables;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
@ -36,20 +51,6 @@ import com.netflix.curator.x.discovery.ServiceDiscovery;
import com.netflix.curator.x.discovery.ServiceDiscoveryBuilder;
import com.netflix.curator.x.discovery.ServiceInstance;
import com.netflix.curator.x.discovery.ServiceProvider;
import org.I0Itec.zkclient.ZkClient;
import org.I0Itec.zkclient.ZkConnection;
import org.codehaus.jackson.map.ObjectMapper;
import org.mortbay.jetty.Connector;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.nio.SelectChannelConnector;
import org.mortbay.thread.QueuedThreadPool;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
/**
*/

5
client/src/main/java/com/metamx/druid/merge/ClientAppendQuery.java
View File

@ -19,11 +19,12 @@
package com.metamx.druid.merge;
import com.metamx.druid.client.DataSegment;
import java.util.List;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.List;
import com.metamx.druid.client.DataSegment;
/**
*/

7
client/src/main/java/com/metamx/druid/merge/ClientDefaultMergeQuery.java
View File

@ -19,12 +19,13 @@
package com.metamx.druid.merge;
import com.metamx.druid.aggregation.AggregatorFactory;
import com.metamx.druid.client.DataSegment;
import java.util.List;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.List;
import com.metamx.druid.aggregation.AggregatorFactory;
import com.metamx.druid.client.DataSegment;
/**
*/

5
client/src/main/java/com/metamx/druid/merge/ClientMergeQuery.java
View File

@ -19,11 +19,12 @@
package com.metamx.druid.merge;
import com.metamx.druid.client.DataSegment;
import java.util.List;
import org.codehaus.jackson.annotate.JsonSubTypes;
import org.codehaus.jackson.annotate.JsonTypeInfo;
import java.util.List;
import com.metamx.druid.client.DataSegment;
/**
*/

7
client/src/main/java/com/metamx/druid/query/BySegmentQueryRunner.java
View File

@ -19,6 +19,10 @@
package com.metamx.druid.query;
import java.util.List;
import org.joda.time.DateTime;
import com.google.common.collect.Lists;
import com.metamx.common.guava.Accumulator;
import com.metamx.common.guava.Sequence;
@ -29,9 +33,6 @@ import com.metamx.common.guava.YieldingAccumulator;
import com.metamx.druid.Query;
import com.metamx.druid.result.BySegmentResultValueClass;
import com.metamx.druid.result.Result;
import org.joda.time.DateTime;
import java.util.List;
/**
*/

44
client/src/main/java/com/metamx/druid/query/ChainedExecutionQueryRunner.java
View File

@ -19,6 +19,14 @@
package com.metamx.druid.query;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import com.google.common.base.Function;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
@ -29,14 +37,6 @@ import com.metamx.common.guava.Sequence;
import com.metamx.common.guava.Sequences;
import com.metamx.druid.Query;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
/**
* A QueryRunner that combines a list of other QueryRunners and executes them in parallel on an executor.
* <p/>
@ -141,32 +141,4 @@ public class ChainedExecutionQueryRunner<T> implements QueryRunner<T>
}
);
}
private static class ThreadNamingCallable<T> implements Callable<T>
{
private final Callable<T> baseCallable;
private final String name;
ThreadNamingCallable(
Callable<T> baseCallable,
String name
)
{
this.baseCallable = baseCallable;
this.name = name;
}
@Override
public T call() throws Exception
{
String oldName = Thread.currentThread().getName();
try {
Thread.currentThread().setName(name);
return baseCallable.call();
}
finally {
Thread.currentThread().setName(oldName);
}
}
}
}

4
client/src/main/java/com/metamx/druid/query/FinalizeResultsQueryRunner.java
View File

@ -19,6 +19,8 @@
package com.metamx.druid.query;
import javax.annotation.Nullable;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
@ -29,8 +31,6 @@ import com.metamx.druid.aggregation.AggregatorFactory;
import com.metamx.druid.result.BySegmentResultValueClass;
import com.metamx.druid.result.Result;
import javax.annotation.Nullable;
/**
*/
public class FinalizeResultsQueryRunner<T> implements QueryRunner<T>

16
client/src/main/java/com/metamx/druid/query/IntervalChunkingQueryRunner.java
View File

@ -19,6 +19,15 @@
package com.metamx.druid.query;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import javax.annotation.Nullable;
import org.joda.time.Interval;
import org.joda.time.Period;
import com.google.common.base.Function;
import com.google.common.collect.Lists;
import com.metamx.common.guava.FunctionalIterable;
@ -27,13 +36,6 @@ import com.metamx.common.guava.Sequences;
import com.metamx.druid.PeriodGranularity;
import com.metamx.druid.Query;
import com.metamx.druid.query.segment.MultipleIntervalSegmentSpec;
import org.joda.time.Interval;
import org.joda.time.Period;
import javax.annotation.Nullable;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
/**
*/

4
client/src/main/java/com/metamx/druid/query/MetricsEmittingQueryRunner.java
View File

@ -19,6 +19,8 @@
package com.metamx.druid.query;
import java.io.IOException;
import com.google.common.base.Function;
import com.metamx.common.guava.Accumulator;
import com.metamx.common.guava.Sequence;
@ -28,8 +30,6 @@ import com.metamx.druid.Query;
import com.metamx.emitter.service.ServiceEmitter;
import com.metamx.emitter.service.ServiceMetricEvent;
import java.io.IOException;
/**
*/
public class MetricsEmittingQueryRunner<T> implements QueryRunner<T>

6
client/src/main/java/com/metamx/druid/query/QueryCacheHelper.java
View File

@ -19,12 +19,12 @@
package com.metamx.druid.query;
import com.google.common.collect.Lists;
import com.metamx.druid.aggregation.AggregatorFactory;
import java.nio.ByteBuffer;
import java.util.List;
import com.google.common.collect.Lists;
import com.metamx.druid.aggregation.AggregatorFactory;
/**
*/
public class QueryCacheHelper

3
client/src/main/java/com/metamx/druid/query/QueryToolChest.java
View File

@ -19,11 +19,12 @@
package com.metamx.druid.query;
import org.codehaus.jackson.type.TypeReference;
import com.google.common.base.Function;
import com.metamx.common.guava.Sequence;
import com.metamx.druid.Query;
import com.metamx.emitter.service.ServiceMetricEvent;
import org.codehaus.jackson.type.TypeReference;
/**
* The broker-side (also used by server in some cases) API for a specific Query type. This API is still undergoing

6
client/src/main/java/com/metamx/druid/query/ReflectionLoaderThingy.java
View File

@ -19,12 +19,12 @@
package com.metamx.druid.query;
import com.google.common.collect.Maps;
import com.metamx.common.logger.Logger;
import java.util.Map;
import java.util.concurrent.atomic.AtomicReference;
import com.google.common.collect.Maps;
import com.metamx.common.logger.Logger;
/**
*/
public class ReflectionLoaderThingy<T>

5
client/src/main/java/com/metamx/druid/query/dimension/DefaultDimensionSpec.java
View File

@ -19,11 +19,12 @@
package com.metamx.druid.query.dimension;
import com.metamx.druid.query.extraction.DimExtractionFn;
import java.nio.ByteBuffer;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import java.nio.ByteBuffer;
import com.metamx.druid.query.extraction.DimExtractionFn;
/**
*/

3
client/src/main/java/com/metamx/druid/query/dimension/DimensionSpec.java
View File

@ -19,10 +19,11 @@
package com.metamx.druid.query.dimension;
import com.metamx.druid.query.extraction.DimExtractionFn;
import org.codehaus.jackson.annotate.JsonSubTypes;
import org.codehaus.jackson.annotate.JsonTypeInfo;
import com.metamx.druid.query.extraction.DimExtractionFn;
/**
*/
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type", defaultImpl = LegacyDimensionSpec.class)

5
client/src/main/java/com/metamx/druid/query/dimension/ExtractionDimensionSpec.java
View File

@ -19,11 +19,12 @@
package com.metamx.druid.query.dimension;
import com.metamx.druid.query.extraction.DimExtractionFn;
import java.nio.ByteBuffer;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import java.nio.ByteBuffer;
import com.metamx.druid.query.extraction.DimExtractionFn;
/**
*/

5
client/src/main/java/com/metamx/druid/query/dimension/LegacyDimensionSpec.java
View File

@ -19,10 +19,11 @@
package com.metamx.druid.query.dimension;
import com.metamx.common.IAE;
import java.util.Map;
import org.codehaus.jackson.annotate.JsonCreator;
import java.util.Map;
import com.metamx.common.IAE;
/**
*/

6
client/src/main/java/com/metamx/druid/query/extraction/PartialDimExtractionFn.java
View File

@ -19,13 +19,13 @@
package com.metamx.druid.query.extraction;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import java.nio.ByteBuffer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
/**
*/
public class PartialDimExtractionFn implements DimExtractionFn

6
client/src/main/java/com/metamx/druid/query/extraction/RegexDimExtractionFn.java
View File

@ -19,13 +19,13 @@
package com.metamx.druid.query.extraction;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import java.nio.ByteBuffer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
/**
*/
public class RegexDimExtractionFn implements DimExtractionFn

5
client/src/main/java/com/metamx/druid/query/extraction/SearchQuerySpecDimExtractionFn.java
View File

@ -19,11 +19,12 @@
package com.metamx.druid.query.extraction;
import com.metamx.druid.query.search.SearchQuerySpec;
import java.nio.ByteBuffer;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import java.nio.ByteBuffer;
import com.metamx.druid.query.search.SearchQuerySpec;
/**
*/

9
client/src/main/java/com/metamx/druid/query/extraction/TimeDimExtractionFn.java
View File

@ -19,14 +19,15 @@
package com.metamx.druid.query.extraction;
import com.ibm.icu.text.SimpleDateFormat;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import java.nio.ByteBuffer;
import java.text.ParseException;
import java.util.Date;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import com.ibm.icu.text.SimpleDateFormat;
/**
*/
public class TimeDimExtractionFn implements DimExtractionFn

5
client/src/main/java/com/metamx/druid/query/filter/AndDimFilter.java
View File

@ -19,11 +19,12 @@
package com.metamx.druid.query.filter;
import com.google.common.base.Joiner;
import java.util.List;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.List;
import com.google.common.base.Joiner;
/**
*/

5
client/src/main/java/com/metamx/druid/query/filter/ExtractionDimFilter.java
View File

@ -19,11 +19,12 @@
package com.metamx.druid.query.filter;
import com.metamx.druid.query.extraction.DimExtractionFn;
import java.nio.ByteBuffer;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import java.nio.ByteBuffer;
import com.metamx.druid.query.extraction.DimExtractionFn;
/**
*/

4
client/src/main/java/com/metamx/druid/query/filter/NotDimFilter.java
View File

@ -19,11 +19,11 @@
package com.metamx.druid.query.filter;
import java.nio.ByteBuffer;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import java.nio.ByteBuffer;
/**
*/
public class NotDimFilter implements DimFilter

5
client/src/main/java/com/metamx/druid/query/filter/OrDimFilter.java
View File

@ -19,11 +19,12 @@
package com.metamx.druid.query.filter;
import com.google.common.base.Joiner;
import java.util.List;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.List;
import com.google.common.base.Joiner;
/**
*/

5
client/src/main/java/com/metamx/druid/query/filter/RegexDimFilter.java
View File

@ -19,11 +19,12 @@
package com.metamx.druid.query.filter;
import com.google.common.base.Charsets;
import java.nio.ByteBuffer;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import java.nio.ByteBuffer;
import com.google.common.base.Charsets;
/**
*/

4
client/src/main/java/com/metamx/druid/query/filter/SelectorDimFilter.java
View File

@ -19,11 +19,11 @@
package com.metamx.druid.query.filter;
import java.nio.ByteBuffer;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import java.nio.ByteBuffer;
/**
*/
public class SelectorDimFilter implements DimFilter

11
client/src/main/java/com/metamx/druid/query/group/GroupByQuery.java
View File

@ -19,6 +19,12 @@
package com.metamx.druid.query.group;
import java.util.List;
import java.util.Map;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
@ -33,11 +39,6 @@ import com.metamx.druid.query.dimension.DimensionSpec;
import com.metamx.druid.query.filter.DimFilter;
import com.metamx.druid.query.segment.LegacySegmentSpec;
import com.metamx.druid.query.segment.QuerySegmentSpec;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.List;
import java.util.Map;
/**
*/

16
client/src/main/java/com/metamx/druid/query/group/GroupByQueryQueryToolChest.java
View File

@ -19,6 +19,15 @@
package com.metamx.druid.query.group;
import java.util.List;
import java.util.Properties;
import javax.annotation.Nullable;
import org.codehaus.jackson.type.TypeReference;
import org.joda.time.Interval;
import org.joda.time.Minutes;
import com.google.common.base.Function;
import com.google.common.base.Functions;
import com.google.common.base.Joiner;
@ -41,13 +50,6 @@ import com.metamx.druid.query.QueryToolChest;
import com.metamx.druid.query.dimension.DimensionSpec;
import com.metamx.druid.utils.PropUtils;
import com.metamx.emitter.service.ServiceMetricEvent;
import org.codehaus.jackson.type.TypeReference;
import org.joda.time.Interval;
import org.joda.time.Minutes;
import javax.annotation.Nullable;
import java.util.List;
import java.util.Properties;
/**
*/

9
client/src/main/java/com/metamx/druid/query/search/FragmentSearchQuerySpec.java
View File

@ -19,13 +19,14 @@
package com.metamx.druid.query.search;
import com.google.common.base.Function;
import com.google.common.collect.Lists;
import java.nio.ByteBuffer;
import java.util.List;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import java.nio.ByteBuffer;
import java.util.List;
import com.google.common.base.Function;
import com.google.common.collect.Lists;
/**
*/

4
client/src/main/java/com/metamx/druid/query/search/InsensitiveContainsSearchQuerySpec.java
View File

@ -19,11 +19,11 @@
package com.metamx.druid.query.search;
import java.nio.ByteBuffer;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import java.nio.ByteBuffer;
/**
*/
public class InsensitiveContainsSearchQuerySpec implements SearchQuerySpec

5
client/src/main/java/com/metamx/druid/query/search/LexicographicSearchSortSpec.java
View File

@ -19,10 +19,9 @@
package com.metamx.druid.query.search;
import org.codehaus.jackson.annotate.JsonCreator;
import java.util.Comparator;
import java.util.Map;
import org.codehaus.jackson.annotate.JsonCreator;
/**
*/

4
client/src/main/java/com/metamx/druid/query/search/SearchHit.java
View File

@ -19,11 +19,11 @@
package com.metamx.druid.query.search;
import static com.google.common.base.Preconditions.checkNotNull;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import static com.google.common.base.Preconditions.checkNotNull;
/**
*/
public class SearchHit implements Comparable<SearchHit>

14
client/src/main/java/com/metamx/druid/query/search/SearchQuery.java
View File

@ -19,6 +19,14 @@
package com.metamx.druid.query.search;
import java.util.List;
import java.util.Map;
import javax.annotation.Nullable;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import com.google.common.base.Function;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
@ -29,12 +37,6 @@ import com.metamx.druid.query.filter.DimFilter;
import com.metamx.druid.query.segment.QuerySegmentSpec;
import com.metamx.druid.result.Result;
import com.metamx.druid.result.SearchResultValue;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import javax.annotation.Nullable;
import java.util.List;
import java.util.Map;
/**
*/

26
client/src/main/java/com/metamx/druid/query/search/SearchQueryQueryToolChest.java
View File

@ -19,6 +19,20 @@
package com.metamx.druid.query.search;
import java.nio.ByteBuffer;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import javax.annotation.Nullable;
import org.codehaus.jackson.type.TypeReference;
import org.joda.time.DateTime;
import org.joda.time.Interval;
import org.joda.time.Minutes;
import org.joda.time.Period;
import com.google.common.base.Function;
import com.google.common.base.Functions;
import com.google.common.base.Joiner;
@ -49,18 +63,6 @@ import com.metamx.druid.result.Result;
import com.metamx.druid.result.SearchResultValue;
import com.metamx.druid.utils.PropUtils;
import com.metamx.emitter.service.ServiceMetricEvent;
import org.codehaus.jackson.type.TypeReference;
import org.joda.time.DateTime;
import org.joda.time.Interval;
import org.joda.time.Minutes;
import org.joda.time.Period;
import javax.annotation.Nullable;
import java.nio.ByteBuffer;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
/**
*/

3
client/src/main/java/com/metamx/druid/query/search/SearchQuerySpec.java
View File

@ -19,12 +19,9 @@
package com.metamx.druid.query.search;
import com.google.common.base.Predicate;
import org.codehaus.jackson.annotate.JsonSubTypes;
import org.codehaus.jackson.annotate.JsonTypeInfo;
import java.util.List;
/**
*/
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type")

4
client/src/main/java/com/metamx/druid/query/search/SearchSortSpec.java
View File

@ -19,11 +19,11 @@
package com.metamx.druid.query.search;
import java.util.Comparator;
import org.codehaus.jackson.annotate.JsonSubTypes;
import org.codehaus.jackson.annotate.JsonTypeInfo;
import java.util.Comparator;
/**
*/
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type", defaultImpl = LexicographicSearchSortSpec.class)

1
client/src/main/java/com/metamx/druid/query/search/StrlenSearchSortSpec.java
View File

@ -20,7 +20,6 @@
package com.metamx.druid.query.search;
import java.util.Comparator;
import java.util.Map;
/**
*/

13
client/src/main/java/com/metamx/druid/query/segment/LegacySegmentSpec.java
View File

@ -19,16 +19,17 @@
package com.metamx.druid.query.segment;
import com.google.common.base.Function;
import com.google.common.collect.Lists;
import com.metamx.common.IAE;
import org.codehaus.jackson.annotate.JsonCreator;
import org.joda.time.Interval;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import org.codehaus.jackson.annotate.JsonCreator;
import org.joda.time.Interval;
import com.google.common.base.Function;
import com.google.common.collect.Lists;
import com.metamx.common.IAE;
/**
*/
public class LegacySegmentSpec extends MultipleIntervalSegmentSpec

11
client/src/main/java/com/metamx/druid/query/segment/MultipleIntervalSegmentSpec.java
View File

@ -19,15 +19,16 @@
package com.metamx.druid.query.segment;
import com.metamx.druid.Query;
import com.metamx.druid.query.QueryRunner;
import com.metamx.druid.utils.JodaUtils;
import java.util.Collections;
import java.util.List;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import org.joda.time.Interval;
import java.util.Collections;
import java.util.List;
import com.metamx.druid.Query;
import com.metamx.druid.query.QueryRunner;
import com.metamx.druid.utils.JodaUtils;
/**
*/

11
client/src/main/java/com/metamx/druid/query/segment/MultipleSpecificSegmentSpec.java
View File

@ -19,16 +19,17 @@
package com.metamx.druid.query.segment;
import java.util.List;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import org.joda.time.Interval;
import com.google.common.base.Function;
import com.google.common.collect.Iterables;
import com.metamx.druid.Query;
import com.metamx.druid.query.QueryRunner;
import com.metamx.druid.utils.JodaUtils;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import org.joda.time.Interval;
import java.util.List;
/**
*/

7
client/src/main/java/com/metamx/druid/query/segment/QuerySegmentSpec.java
View File

@ -19,13 +19,14 @@
package com.metamx.druid.query.segment;
import com.metamx.druid.Query;
import com.metamx.druid.query.QueryRunner;
import java.util.List;
import org.codehaus.jackson.annotate.JsonSubTypes;
import org.codehaus.jackson.annotate.JsonTypeInfo;
import org.joda.time.Interval;
import java.util.List;
import com.metamx.druid.Query;
import com.metamx.druid.query.QueryRunner;
/**
*/

3
client/src/main/java/com/metamx/druid/query/segment/QuerySegmentWalker.java
View File

@ -19,9 +19,10 @@
package com.metamx.druid.query.segment;
import org.joda.time.Interval;
import com.metamx.druid.Query;
import com.metamx.druid.query.QueryRunner;
import org.joda.time.Interval;
/**
*/

6
client/src/main/java/com/metamx/druid/query/segment/SpecificSegmentQueryRunner.java
View File

@ -19,6 +19,9 @@
package com.metamx.druid.query.segment;
import java.io.IOException;
import java.util.concurrent.Callable;
import com.google.common.base.Throwables;
import com.metamx.common.guava.Accumulator;
import com.metamx.common.guava.Sequence;
@ -27,9 +30,6 @@ import com.metamx.common.guava.YieldingAccumulator;
import com.metamx.druid.Query;
import com.metamx.druid.query.QueryRunner;
import java.io.IOException;
import java.util.concurrent.Callable;
/**
*/
public class SpecificSegmentQueryRunner<T> implements QueryRunner<T>

9
client/src/main/java/com/metamx/druid/query/segment/SpecificSegmentSpec.java
View File

@ -19,13 +19,14 @@
package com.metamx.druid.query.segment;
import com.metamx.druid.Query;
import com.metamx.druid.query.QueryRunner;
import org.joda.time.Interval;
import java.util.Arrays;
import java.util.List;
import org.joda.time.Interval;
import com.metamx.druid.Query;
import com.metamx.druid.query.QueryRunner;
/**
*/
public class SpecificSegmentSpec implements QuerySegmentSpec

19
client/src/main/java/com/metamx/druid/query/timeboundary/TimeBoundaryQuery.java
View File

@ -19,6 +19,16 @@
package com.metamx.druid.query.timeboundary;
import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import org.joda.time.DateTime;
import org.joda.time.Interval;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@ -28,15 +38,6 @@ import com.metamx.druid.query.segment.MultipleIntervalSegmentSpec;
import com.metamx.druid.query.segment.QuerySegmentSpec;
import com.metamx.druid.result.Result;
import com.metamx.druid.result.TimeBoundaryResultValue;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import org.joda.time.DateTime;
import org.joda.time.Interval;
import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
*/

14
client/src/main/java/com/metamx/druid/query/timeboundary/TimeBoundaryQueryQueryToolChest.java
View File

@ -19,6 +19,14 @@
package com.metamx.druid.query.timeboundary;
import java.nio.ByteBuffer;
import java.util.List;
import javax.annotation.Nullable;
import org.codehaus.jackson.type.TypeReference;
import org.joda.time.DateTime;
import com.google.common.base.Function;
import com.google.common.base.Functions;
import com.google.common.collect.Lists;
@ -36,12 +44,6 @@ import com.metamx.druid.query.QueryToolChest;
import com.metamx.druid.result.Result;
import com.metamx.druid.result.TimeBoundaryResultValue;
import com.metamx.emitter.service.ServiceMetricEvent;
import org.codehaus.jackson.type.TypeReference;
import org.joda.time.DateTime;
import javax.annotation.Nullable;
import java.nio.ByteBuffer;
import java.util.List;
/**
*/

4
client/src/main/java/com/metamx/druid/result/BySegmentResultValueClass.java
View File

@ -19,10 +19,10 @@
package com.metamx.druid.result;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.List;
import org.codehaus.jackson.annotate.JsonProperty;
/**
*/
public class BySegmentResultValueClass<T>

5
client/src/main/java/com/metamx/druid/result/BySegmentSearchResultValue.java
View File

@ -19,11 +19,12 @@
package com.metamx.druid.result;
import com.metamx.druid.query.search.SearchHit;
import java.util.List;
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.annotate.JsonValue;
import java.util.List;
import com.metamx.druid.query.search.SearchHit;
/**
*/

1
client/src/main/java/com/metamx/druid/result/Result.java
View File

@ -21,7 +21,6 @@ package com.metamx.druid.result;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.annotate.JsonUnwrapped;
import org.joda.time.DateTime;
/**

7
client/src/main/java/com/metamx/druid/result/SearchResultValue.java
View File

@ -19,12 +19,13 @@
package com.metamx.druid.result;
import com.metamx.druid.query.search.SearchHit;
import java.util.Iterator;
import java.util.List;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonValue;
import java.util.Iterator;
import java.util.List;
import com.metamx.druid.query.search.SearchHit;
/**
*/

7
client/src/main/java/com/metamx/druid/result/TimeBoundaryResultValue.java
View File

@ -19,13 +19,14 @@
package com.metamx.druid.result;
import com.metamx.common.IAE;
import com.metamx.druid.query.timeboundary.TimeBoundaryQuery;
import java.util.Map;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonValue;
import org.joda.time.DateTime;
import java.util.Map;
import com.metamx.common.IAE;
import com.metamx.druid.query.timeboundary.TimeBoundaryQuery;
/**
*/

5
client/src/main/java/com/metamx/druid/shard/NoneShardSpec.java
View File

@ -19,12 +19,11 @@
package com.metamx.druid.shard;
import java.util.Map;
import com.metamx.druid.input.InputRow;
import com.metamx.druid.partition.PartitionChunk;
import com.metamx.druid.partition.SingleElementPartitionChunk;
import org.codehaus.jackson.annotate.JsonTypeName;
import java.util.Map;
/**
*/

7
client/src/main/java/com/metamx/druid/shard/ShardSpec.java
View File

@ -19,12 +19,13 @@
package com.metamx.druid.shard;
import com.metamx.druid.input.InputRow;
import com.metamx.druid.partition.PartitionChunk;
import java.util.Map;
import org.codehaus.jackson.annotate.JsonSubTypes;
import org.codehaus.jackson.annotate.JsonTypeInfo;
import java.util.Map;
import com.metamx.druid.input.InputRow;
import com.metamx.druid.partition.PartitionChunk;
/**
* A Marker interface that exists to combine ShardSpec objects together for Jackson

10
client/src/main/java/com/metamx/druid/shard/SingleDimensionShardSpec.java
View File

@ -19,14 +19,14 @@
package com.metamx.druid.shard;
import java.util.List;
import java.util.Map;
import org.codehaus.jackson.annotate.JsonProperty;
import com.metamx.druid.input.InputRow;
import com.metamx.druid.partition.PartitionChunk;
import com.metamx.druid.partition.StringPartitionChunk;
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.annotate.JsonTypeName;
import java.util.List;
import java.util.Map;
/**
* Class uses getters/setters to work around http://jira.codehaus.org/browse/MSHADE-92

5
client/src/main/java/com/metamx/druid/zk/StringZkSerializer.java
View File

@ -19,11 +19,12 @@
package com.metamx.druid.zk;
import com.metamx.common.IAE;
import java.nio.charset.Charset;
import org.I0Itec.zkclient.exception.ZkMarshallingError;
import org.I0Itec.zkclient.serialize.ZkSerializer;
import java.nio.charset.Charset;
import com.metamx.common.IAE;
/**
*/

6
client/src/main/java/com/metamx/phonebook/BasePhoneBook.java
View File

@ -19,13 +19,13 @@
package com.metamx.phonebook;
import java.util.List;
import java.util.Map;
import com.metamx.common.ISE;
import com.metamx.common.lifecycle.LifecycleStart;
import com.metamx.common.lifecycle.LifecycleStop;
import java.util.List;
import java.util.Map;
/**
*/
public class BasePhoneBook implements PhoneBook

4
client/src/main/java/com/metamx/phonebook/ConsistentHashLookup.java
View File

@ -19,12 +19,12 @@
package com.metamx.phonebook;
import org.apache.commons.codec.digest.DigestUtils;
import java.math.BigInteger;
import java.util.Map;
import java.util.TreeMap;
import org.apache.commons.codec.digest.DigestUtils;
/**
*/
public class ConsistentHashLookup implements ServiceLookup

12
client/src/main/java/com/metamx/phonebook/StoppedPhoneBook.java
View File

@ -19,6 +19,12 @@
package com.metamx.phonebook;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import com.google.common.base.Supplier;
import com.google.common.collect.Constraint;
import com.google.common.collect.Constraints;
@ -29,12 +35,6 @@ import com.google.common.collect.Sets;
import com.metamx.common.IAE;
import com.metamx.common.logger.Logger;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* A class that collects announcements for you. Can be used to simplify start/stop logic
*

13
client/src/test/java/com/metamx/druid/CombiningIterableTest.java
View File

@ -19,17 +19,18 @@
package com.metamx.druid;
import com.metamx.common.guava.nary.BinaryFn;
import com.metamx.druid.result.Result;
import org.joda.time.DateTime;
import org.junit.Assert;
import org.junit.Test;
import java.util.Arrays;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import org.joda.time.DateTime;
import org.junit.Assert;
import org.junit.Test;
import com.metamx.common.guava.nary.BinaryFn;
import com.metamx.druid.result.Result;
/**
*/
public class CombiningIterableTest

3
client/src/test/java/com/metamx/druid/ResultGranularTimestampComparatorTest.java
View File

@ -19,11 +19,12 @@
package com.metamx.druid;
import com.metamx.druid.result.Result;
import org.joda.time.DateTime;
import org.junit.Assert;
import org.junit.Test;
import com.metamx.druid.result.Result;
/**
*/
public class ResultGranularTimestampComparatorTest

12
client/src/test/java/com/metamx/druid/SearchBinaryFnTest.java
View File

@ -19,17 +19,19 @@
package com.metamx.druid;
import java.util.Iterator;
import junit.framework.Assert;
import org.joda.time.DateTime;
import org.junit.Test;
import com.google.common.collect.ImmutableList;
import com.metamx.druid.query.search.LexicographicSearchSortSpec;
import com.metamx.druid.query.search.SearchHit;
import com.metamx.druid.query.search.StrlenSearchSortSpec;
import com.metamx.druid.result.Result;
import com.metamx.druid.result.SearchResultValue;
import junit.framework.Assert;
import org.joda.time.DateTime;
import org.junit.Test;
import java.util.Iterator;
/**
*/

7
client/src/test/java/com/metamx/druid/TestHelper.java
View File

@ -19,13 +19,14 @@
package com.metamx.druid;
import java.util.Iterator;
import org.junit.Assert;
import com.google.common.collect.Lists;
import com.metamx.common.guava.Sequence;
import com.metamx.common.guava.Sequences;
import com.metamx.druid.result.Result;
import org.junit.Assert;
import java.util.Iterator;
/**
*/

25
client/src/test/java/com/metamx/druid/client/DataSegmentTest.java
View File

@ -19,13 +19,12 @@
package com.metamx.druid.client;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.metamx.druid.jackson.DefaultObjectMapper;
import com.metamx.druid.shard.NoneShardSpec;
import com.metamx.druid.shard.SingleDimensionShardSpec;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.type.TypeReference;
import org.joda.time.DateTime;
@ -33,11 +32,13 @@ import org.joda.time.Interval;
import org.junit.Assert;
import org.junit.Test;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.metamx.druid.jackson.DefaultObjectMapper;
import com.metamx.druid.shard.NoneShardSpec;
import com.metamx.druid.shard.SingleDimensionShardSpec;
/**
*/

4
client/src/test/java/com/metamx/druid/client/cache/ByteCountingLRUMapTest.java vendored
View File

@ -19,12 +19,12 @@
package com.metamx.druid.client.cache;
import java.nio.ByteBuffer;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import java.nio.ByteBuffer;
/**
*/
public class ByteCountingLRUMapTest

3
client/src/test/java/com/metamx/druid/client/cache/MapCacheBrokerTest.java vendored
View File

@ -19,11 +19,12 @@
package com.metamx.druid.client.cache;
import com.google.common.primitives.Ints;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import com.google.common.primitives.Ints;
/**
*/
public class MapCacheBrokerTest

13
client/src/test/java/com/metamx/druid/query/QuerySegmentSpecTest.java
View File

@ -19,6 +19,13 @@
package com.metamx.druid.query;
import java.util.Map;
import org.codehaus.jackson.map.ObjectMapper;
import org.joda.time.Interval;
import org.junit.Assert;
import org.junit.Test;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.metamx.druid.jackson.DefaultObjectMapper;
@ -27,12 +34,6 @@ import com.metamx.druid.query.segment.MultipleIntervalSegmentSpec;
import com.metamx.druid.query.segment.MultipleSpecificSegmentSpec;
import com.metamx.druid.query.segment.QuerySegmentSpec;
import com.metamx.druid.query.segment.SegmentDescriptor;
import org.codehaus.jackson.map.ObjectMapper;
import org.joda.time.Interval;
import org.junit.Assert;
import org.junit.Test;
import java.util.Map;
/**
*/

9
client/src/test/java/com/metamx/druid/query/extraction/PartialDimExtractionFnTest.java
View File

@ -19,14 +19,15 @@
package com.metamx.druid.query.extraction;
import com.google.common.collect.Sets;
import org.junit.Assert;
import org.junit.Test;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
import org.junit.Assert;
import org.junit.Test;
import com.google.common.collect.Sets;
/**
*/
public class PartialDimExtractionFnTest

5
client/src/test/java/com/metamx/druid/query/extraction/RegexDimExtractionFnTest.java
View File

@ -19,11 +19,12 @@
package com.metamx.druid.query.extraction;
import com.google.common.collect.Sets;
import java.util.Set;
import org.junit.Assert;
import org.junit.Test;
import java.util.Set;
import com.google.common.collect.Sets;
/**
*/

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