documentation updates

ing-bankGH-90
anskarl · May 8, 2020 · dcc1f98 · dcc1f98
1 parent 958fb56
commit dcc1f98
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -218,7 +218,7 @@ via [SQL](https://druid.apache.org/docs/latest/querying/sql.html).
 ```scala
 import ing.wbaa.druid.SQL._
 
-val query = sql"""SELECT SELECT COUNT(*) as "count" FROM wikipedia WHERE "__time" >= TIMESTAMP '2015-09-12 00:00:00'"""
+val query = sql"""SELECT COUNT(*) as "count" FROM wikipedia WHERE "__time" >= TIMESTAMP '2015-09-12 00:00:00'"""
 
 val response = query.execute()
 ```

diff --git a/docs/sql.md b/docs/sql.md
@@ -8,7 +8,7 @@ import scala.concurrent.Future
 import ing.wbaa.druid.SQL._
 import ing.wbaa.druid.DruidSQLResults
 
-val query = sql"""SELECT SELECT COUNT(*) as "count" FROM wikipedia WHERE "__time" >= TIMESTAMP '2015-09-12 00:00:00'"""
+val query = sql"""SELECT COUNT(*) as "count" FROM wikipedia WHERE "__time" >= TIMESTAMP '2015-09-12 00:00:00'"""
 
 val response: Future[DruidSQLResults] = query.execute()
 
@@ -24,7 +24,7 @@ Function `sql`, allows multiline queries:
 import ing.wbaa.druid.SQL._
 
 val query = sql"""
-    |SELECT SELECT COUNT(*) as "count" 
+    |SELECT COUNT(*) as "count" 
     |FROM wikipedia 
     |WHERE "__time" >= TIMESTAMP '2015-09-12 00:00:00'
     """.stripMargin
@@ -40,7 +40,7 @@ val dataSourceName = "wikipedia"
 val dateTime = "2015-09-12 00:00:00"
 
 val query = sql"""
-    |SELECT SELECT COUNT(*) as "${countColumnName}" 
+    |SELECT COUNT(*) as "${countColumnName}" 
     |FROM ${dataSourceName} 
     |WHERE "__time" >= TIMESTAMP '${dateTime}'
     """.stripMargin
@@ -86,7 +86,7 @@ val contextParameters = Map(
   QueryContext.SqlTimeZone -> "America/Los_Angeles"
 )
 val query =
-  sql"""SELECT SELECT COUNT(*) as "count" FROM wikipedia WHERE "__time" >= TIMESTAMP '2015-09-12 00:00:00'"""
+  sql"""SELECT COUNT(*) as "count" FROM wikipedia WHERE "__time" >= TIMESTAMP '2015-09-12 00:00:00'"""
       .setContext(contextParameters)
 ```
 
@@ -100,7 +100,7 @@ import akka.stream.scaladsl.Source
 import ing.wbaa.druid.SQL._
 import ing.wbaa.druid.{DruidSQLResult, DruidSQLResults}
 
-val query = sql"""SELECT SELECT COUNT(*) as "count" FROM wikipedia WHERE "__time" >= TIMESTAMP '2015-09-12 00:00:00'"""
+val query = sql"""SELECT COUNT(*) as "count" FROM wikipedia WHERE "__time" >= TIMESTAMP '2015-09-12 00:00:00'"""
 
 val source: Source[DruidSQLResult, NotUsed] = query.stream()
 

diff --git a/src/main/scala/ing/wbaa/druid/DruidQuery.scala b/src/main/scala/ing/wbaa/druid/DruidQuery.scala
@@ -125,7 +125,6 @@ sealed trait DruidQueryFunctions[R <: DruidResponse] {
           result => result.as[List[T]].flatMap(entry => result.timestamp.map(ts => (ts, entry)))
         )
       case _ =>
-        //source.map(result => (result.timestamp, result.as[T]))
         source.mapConcat(result => result.timestamp.map(ts => (ts, result.as[T])).toList)
 
     }