Explicit intervals and datasource

.pre-commit-config.yaml

@@ -1,5 +1,5 @@
 repos:
--   repo: https://github.com/ambv/black
+-   repo: https://github.com/psf/black
     rev: 19.10b0
     hooks:
     -   id: black
@@ -21,7 +21,13 @@ repos:
     -   id: check-yaml
     -   id: debug-statements
 
--   repo: https://gitlab.com/pycqa/flake8
+-   repo: https://github.com/pycqa/flake8
     rev: 3.8.2
     hooks:
     -   id: flake8
+        exclude:
+            docs
+            env
+            tests
+            .eggs
+            build

pydruid/query.py

@@ -247,7 +247,7 @@ def parse_datasource(datasource, query_type):
                 "dict or list of strings"
             )
         if isinstance(datasource, str):
-            return datasource
+            return {"type": "table", "name": datasource}
         else:
             return {"type": "union", "dataSources": datasource}
 
@@ -310,6 +310,8 @@ def build_query(self, query_type, args):
                 query_dict[key] = build_dimension(val)
             elif key == "dimensions":
                 query_dict[key] = [build_dimension(v) for v in val]
+            elif key == "intervals":
+                query_dict[key] = {"type": "intervals", key: val}
             else:
                 query_dict[key] = val
 

tests/test_client.py

@@ -89,8 +89,8 @@ def test_druid_returns_html_error(self, mock_urlopen):
             str(e.value)
             == textwrap.dedent(
                 """
-            HTTP Error 500: Internal Server Error 
-             Druid Error: javax.servlet.ServletException: java.lang.OutOfMemoryError: GC overhead limit exceeded 
+            HTTP Error 500: Internal Server Error
+             Druid Error: javax.servlet.ServletException: java.lang.OutOfMemoryError: GC overhead limit exceeded
              Query is: {
                 "aggregations": [
                     {
@@ -102,15 +102,21 @@ def test_druid_returns_html_error(self, mock_urlopen):
                 "context": {
                     "timeout": 1000
                 },
-                "dataSource": "testdatasource",
+                "dataSource": {
+                    "name": "testdatasource",
+                    "type": "table"
+                },
                 "dimension": "user_name",
                 "filter": {
                     "dimension": "user_lang",
                     "type": "selector",
                     "value": "en"
                 },
                 "granularity": "all",
-                "intervals": "2015-12-29/pt1h",
+                "intervals": {
+                    "intervals": "2015-12-29/pt1h",
+                    "type": "intervals"
+                },
                 "metric": "count",
                 "queryType": "topN",
                 "threshold": 1

tests/test_query.py

@@ -16,7 +16,6 @@
 #
 
 import csv
-import os
 
 import pandas
 import pytest
@@ -62,7 +61,7 @@ def test_build_query(self):
         # given
         expected_query_dict = {
             "queryType": None,
-            "dataSource": "things",
+            "dataSource": {"name": "things", "type": "table"},
             "aggregations": [{"fieldName": "thing", "name": "count", "type": "count"}],
             "postAggregations": [
                 {
@@ -106,7 +105,7 @@ def test_build_query_none_type(self):
         # given
         expected_query_dict = {
             "queryType": None,
-            "dataSource": "things",
+            "dataSource": {"name": "things", "type": "table"},
             "aggregations": [{"fieldName": "thing", "name": "count", "type": "count"}],
             "filter": {"dimension": "one", "type": "selector", "value": 1},
             "having": {"aggregation": "sum", "type": "greaterThan", "value": 1},
@@ -153,7 +152,10 @@ def test_validate_query(self):
 
     def test_union_datasource(self):
         # Given
-        expected_query_dict = {"queryType": None, "dataSource": "things"}
+        expected_query_dict = {
+            "queryType": None,
+            "dataSource": {"name": "things", "type": "table"},
+        }
         builder = QueryBuilder()
         # when
         builder_dict = {"datasource": "things"}
@@ -187,7 +189,7 @@ def test_build_subquery(self):
         expected_query_dict = {
             "query": {
                 "queryType": "groupBy",
-                "dataSource": "things",
+                "dataSource": {"name": "things", "type": "table"},
                 "aggregations": [
                     {"fieldName": "thing", "name": "count", "type": "count"}
                 ],