added experimental select query schemas

This commit is contained in:
Guillaume Buisson 2014-09-23 17:57:10 +02:00
parent 6e5957e5d6
commit 15d1be6145
2 changed files with 27 additions and 5 deletions

View file

@ -119,6 +119,17 @@
(s/optional-key :searchDimensions) [String]
(s/optional-key :filter) filterSchema})
(s/defschema select
"Select query schema"
{:queryType (s/enum :select)
:dataSource String
:intervals intervalSchema
(s/optional-key :metrics) [String]
(s/optional-key :granularity) granularity
(s/optional-key :dimensions) [String]
(s/optional-key :pagingSpec) s/Any
(s/optional-key :filter) filterSchema})
(s/defschema segmentMetadata
"Segment Metadata query schema"
@ -168,4 +179,5 @@
:segmentMetadata segmentMetadata
:timeBoundary timeBoundary
:timeseries timeseries
:topN topN})
:topN topN
:select select})

View file

@ -90,16 +90,22 @@
:intervals ["2012-01-01T00:00:00.000/2012-01-03T00:00:00.000"]})
(def valid-select-query
{:queryType :select
:dataSource "wikipedia"
:dimensions []
:metrics []
:granularity :all
:intervals ["2013-01-01/2013-01-02"]
:pagingSpec {:pagingIdentifiers {} :threshold 5}})
(def valid-topN-query
(into valid-timeseries-query {:queryType :topN
:dimension "dim1"
:threshold 5
:metric "count"}))
(deftest test-valid-groupby-query
(is (= (validate-groupby valid-groupby-query)
valid-groupby-query)))
@ -125,4 +131,8 @@
(is (= (validate-topN valid-topN-query)
valid-topN-query)))
(deftest test-valid-select-query
(is (= (validate valid-select-query :select)
valid-select-query)))