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

cleanup

This commit is contained in:
fjy 2014-04-01 17:56:25 -07:00
parent f88df4a7b0
commit eaec0e3ab2
5 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/src/main/java/io/druid/client/selector/HostSelector.java
View File

@ -1,3 +1,22 @@
/*
* Druid - a distributed column store.
* Copyright (C) 2012, 2013 Metamarkets Group Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package io.druid.client.selector;
import com.metamx.common.Pair;

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

@ -180,7 +180,6 @@ public class AsyncQueryForwardingServlet extends HttpServlet
.build("request/time", requestTime)
);
final OutputStream obj = clientResponse.getObj();
try {
resp.flushBuffer();

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

@ -111,14 +111,6 @@ public class QueryResource
query = query.withId(queryId);
}
if ((boolean) query.getContextValue("block", false)) {
log.info("BEGIN WAITING");
while (true) {
log.info("Still sleeping...");
Thread.sleep(10000);
}
}
requestLogger.log(
new RequestLogLine(new DateTime(), req.getRemoteAddr(), query)
);

8
server/src/main/java/io/druid/server/initialization/JettyServerModule.java
View File

@ -156,11 +156,11 @@ public class JettyServerModule extends JerseyServletModule
final Server server = new Server(threadPool);
ServerConnector CONNECTOR = new ServerConnector(server);
CONNECTOR.setPort(node.getPort());
CONNECTOR.setIdleTimeout(Ints.checkedCast(config.getMaxIdleTime().toStandardDuration().getMillis()));
ServerConnector connector = new ServerConnector(server);
connector.setPort(node.getPort());
connector.setIdleTimeout(Ints.checkedCast(config.getMaxIdleTime().toStandardDuration().getMillis()));
server.setConnectors(new Connector[]{CONNECTOR});
server.setConnectors(new Connector[]{connector});
return server;
}

19
services/src/main/java/io/druid/cli/RouterJettyServerInitializer.java
View File

@ -1,3 +1,22 @@
/*
* Druid - a distributed column store.
* Copyright (C) 2012, 2013 Metamarkets Group Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package io.druid.cli;
import com.fasterxml.jackson.databind.ObjectMapper;