output tsv format + better command line

client/pom.xml

@@ -195,6 +195,10 @@
             <groupId>org.antlr</groupId>
             <artifactId>antlr4-runtime</artifactId>
         </dependency>
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

client/src/main/java/com/metamx/druid/sql/SQLRunner.java

@@ -1,12 +1,22 @@
 package com.metamx.druid.sql;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
+import com.google.common.base.Function;
+import com.google.common.base.Joiner;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+import com.google.common.io.Closeables;
 import com.metamx.druid.Druids;
 import com.metamx.druid.Query;
 import com.metamx.druid.aggregation.AggregatorFactory;
+import com.metamx.druid.input.Row;
 import com.metamx.druid.jackson.DefaultObjectMapper;
 import com.metamx.druid.query.dimension.DimensionSpec;
 import com.metamx.druid.query.group.GroupByQuery;
+import com.metamx.druid.result.Result;
+import com.metamx.druid.result.TimeseriesResultValue;
 import com.metamx.druid.sql.antlr4.DruidSQLLexer;
 import com.metamx.druid.sql.antlr4.DruidSQLParser;
 import org.antlr.v4.runtime.ANTLRInputStream;
@@ -14,13 +24,20 @@ import org.antlr.v4.runtime.BailErrorStrategy;
 import org.antlr.v4.runtime.CharStream;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.TokenStream;
+import org.antlr.v4.runtime.misc.ParseCancellationException;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.GnuParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Options;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.methods.StringRequestEntity;
 
+import javax.annotation.Nullable;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
+import java.util.List;
 
 public class SQLRunner
 {
@@ -33,10 +50,25 @@ public class SQLRunner
 
   public static void main(String[] args) throws Exception
   {
-    String hostname = args.length > 0 ? args[0] : "localhost";
-    String sql = args.length > 1 ? args[1] : STATEMENT;
 
-    ObjectWriter json = new DefaultObjectMapper().writerWithDefaultPrettyPrinter();
+    Options options = new Options();
+    options.addOption("h", "help", false, "help");
+    options.addOption("v", false, "verbose");
+    options.addOption("e", "host", true, "endpoint [hostname:port]");
+
+    CommandLine cmd = new GnuParser().parse(options, args);
+
+    if(cmd.hasOption("h")) {
+      HelpFormatter formatter = new HelpFormatter();
+      formatter.printHelp("SQLRunner", options);
+      System.exit(2);
+    }
+
+    String hostname = cmd.getOptionValue("e", "localhost:8080");
+    String sql = cmd.getArgs().length > 0 ? cmd.getArgs()[0] : STATEMENT;
+
+    ObjectMapper objectMapper = new DefaultObjectMapper();
+    ObjectWriter jsonWriter = objectMapper.writerWithDefaultPrettyPrinter();
 
     CharStream stream = new ANTLRInputStream(sql);
     DruidSQLLexer lexer = new DruidSQLLexer(stream);
@@ -44,13 +76,18 @@ public class SQLRunner
     DruidSQLParser parser = new DruidSQLParser(tokenStream);
     parser.setErrorHandler(new BailErrorStrategy());
 
+    try {
+      DruidSQLParser.QueryContext queryContext = parser.query();
+//      parser.setBuildParseTree(true);
+//      System.err.println(q.toStringTree(parser));
+    } catch(ParseCancellationException e) {
+      System.out.println(e.getCause().getMessage());
+      System.exit(1);
+    }
 
-    DruidSQLParser.QueryContext queryContext = parser.query();
-//    parser.setBuildParseTree(true);
-//    System.err.println(q.toStringTree(parser));
-
-    Query query;
-
+    final Query query;
+    final TypeReference typeRef;
+    boolean groupBy = false;
     if(parser.groupByDimensions.isEmpty()) {
       query = Druids.newTimeseriesQueryBuilder()
                   .dataSource(parser.getDataSource())
@@ -60,6 +97,8 @@ public class SQLRunner
                   .granularity(parser.granularity)
                   .filters(parser.filter)
                   .build();
+
+      typeRef = new TypeReference<List<Result<TimeseriesResultValue>>>(){};
     } else {
       query = GroupByQuery.builder()
               .setDataSource(parser.getDataSource())
@@ -70,10 +109,13 @@ public class SQLRunner
               .setDimFilter(parser.filter)
               .setDimensions(new ArrayList<DimensionSpec>(parser.groupByDimensions.values()))
               .build();
+
+      typeRef = new TypeReference<List<Row>>(){};
+      groupBy = true;
     }
 
-    String queryStr = json.writeValueAsString(query);
-    System.err.println(queryStr);
+    String queryStr = jsonWriter.writeValueAsString(query);
+    if(cmd.hasOption("v")) System.err.println(queryStr);
 
     PostMethod req = new PostMethod("http://" + hostname + "/druid/v2/?pretty");
     req.setRequestEntity(new StringRequestEntity(queryStr, "application/json", "utf-8"));
@@ -82,8 +124,81 @@ public class SQLRunner
     BufferedReader stdInput = new BufferedReader(new
                      InputStreamReader(req.getResponseBodyAsStream()));
 
-    String s; while ((s = stdInput.readLine()) != null) System.out.println(s);
+    Object res = objectMapper.readValue(stdInput, typeRef);
 
-    stdInput.close();
+    Joiner tabJoiner = Joiner.on("\t");
+
+    if(groupBy) {
+      List<Row> rows = (List<Row>)res;
+      Iterable<String> dimensions = Iterables.transform(parser.groupByDimensions.values(), new Function<DimensionSpec, String>()
+                        {
+                          @Override
+                          public String apply(@Nullable DimensionSpec input)
+                          {
+                            return input.getOutputName();
+                          }
+                        });
+
+      System.out.println(tabJoiner.join(Iterables.concat(
+                Lists.newArrayList("timestamp"),
+                dimensions,
+                parser.fields
+            )));
+      for(final Row r : rows) {
+        System.out.println(
+            tabJoiner.join(
+              Iterables.concat(
+                  Lists.newArrayList(parser.granularity.toDateTime(r.getTimestampFromEpoch())),
+                  Iterables.transform(
+                      parser.groupByDimensions.values(), new Function<DimensionSpec, String>()
+                  {
+                    @Override
+                    public String apply(@Nullable DimensionSpec input)
+                    {
+                      return Joiner.on(",").join(r.getDimension(input.getOutputName()));
+                    }
+                  }),
+                  Iterables.transform(parser.fields, new Function<String, Object>()
+                  {
+                    @Override
+                    public Object apply(@Nullable String input)
+                    {
+                      return r.getFloatMetric(input);
+                    }
+                  })
+              )
+          )
+        );
+      }
+    }
+    else {
+      List<Result<TimeseriesResultValue>> rows = (List<Result<TimeseriesResultValue>>)res;
+      System.out.println(tabJoiner.join(Iterables.concat(
+          Lists.newArrayList("timestamp"),
+          parser.fields
+      )));
+      for(final Result<TimeseriesResultValue> r : rows) {
+        System.out.println(
+            tabJoiner.join(
+              Iterables.concat(
+                Lists.newArrayList(r.getTimestamp()),
+                Lists.transform(
+                  parser.fields,
+                  new Function<String, Object>()
+                  {
+                    @Override
+                    public Object apply(@Nullable String input)
+                    {
+                      return r.getValue().getMetric(input);
+                    }
+                  }
+                )
+              )
+          )
+        );
+      }
+    }
+
+    Closeables.closeQuietly(stdInput);
   }
 }

pom.xml

@@ -298,6 +298,11 @@
                 <artifactId>antlr4-master</artifactId>
                 <version>4.0</version>
             </dependency>
+            <dependency>
+                <groupId>commons-cli</groupId>
+                <artifactId>commons-cli</artifactId>
+                <version>1.2</version>
+            </dependency>
             <!-- Test Scope -->
             <dependency>
                 <groupId>com.metamx</groupId>