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

fix bad merge

This commit is contained in:
fjy 2014-06-13 11:36:36 -07:00
parent 4cc0353be2
commit 332ba3ef20
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
processing/src/test/java/io/druid/query/ChainedExecutionQueryRunnerTest.java
View File

@ -108,7 +108,7 @@ public class ChainedExecutionQueryRunnerTest
.build() .build()
); );
Future resultFuture = Executors.newSingleThreadExecutor().submit( Future resultFuture = Executors.newFixedThreadPool(1).submit(
new Runnable() new Runnable()
{ {
@Override @Override

1
server/src/main/java/io/druid/server/QueryResource.java
View File

@ -24,6 +24,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectWriter; import com.fasterxml.jackson.databind.ObjectWriter;
import com.google.common.base.Charsets; import com.google.common.base.Charsets;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.io.ByteStreams; import com.google.common.io.ByteStreams;
import com.google.inject.Inject; import com.google.inject.Inject;