From d5993c7b478b35d50a399b7add3ee1f64e205a34 Mon Sep 17 00:00:00 2001
From: Matthieu Sprunck <matthieu@vigiglobe.com>
Date: Thu, 28 May 2015 09:02:57 +0200
Subject: [PATCH] Use dimensionSpec for topN query

---
 project.clj                          | 2 +-
 src/clj_druid/schemas/extraction.clj | 3 +--
 src/clj_druid/schemas/query.clj      | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/project.clj b/project.clj
index 906c832..68c7da9 100644
--- a/project.clj
+++ b/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"
diff --git a/src/clj_druid/schemas/extraction.clj b/src/clj_druid/schemas/extraction.clj
index 3fd762f..ac421bf 100644
--- a/src/clj_druid/schemas/extraction.clj
+++ b/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})
-
diff --git a/src/clj_druid/schemas/query.clj b/src/clj_druid/schemas/query.clj
index 51b9a66..e85e3ef 100644
--- a/src/clj_druid/schemas/query.clj
+++ b/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