Merge pull request #1 from msprunck/topN-dimension-spec

Use dimensionSpec for topN query

project.clj

@@ -1,4 +1,4 @@
-(defproject y42/clj-druid "0.2.4"
+(defproject y42/clj-druid "0.2.5"
   :description "Clojure library for Druid.io"
   :url "http://github.com/y42/clj-druid"
   :license {:name "Eclipse Public License"

src/clj_druid/schemas/extraction.clj

@@ -38,8 +38,7 @@
             javascriptExtractionFunction))
 
 (s/defschema extraction
-  {:type (s/enum :regex)
+  {:type (s/enum :extraction)
    :dimension s/Str
    :outputName s/Str
    :extractionFn extractionFn})
-

src/clj_druid/schemas/query.clj

@@ -52,7 +52,7 @@ TopNs are much faster and resource efficient than GroupBys for this use case."
   {:queryType (s/enum :topN)
    :dataSource s/Str
    :granularity granularity
-   :dimension s/Str
+   :dimension dimensionSpec
    :metric topNMetricSpec
    :threshold Long
    :aggregations aggregations