added the ability to supply comparator aliases when creating column f…

…amilies
mstump · Dec 22, 2011 · 3130161 · 3130161
1 parent d9a1ae5
commit 3130161
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/clj_hector/ddl.clj b/src/clj_hector/ddl.clj
@@ -57,14 +57,19 @@
 
 (defn- make-keyspace-definition
   ([keyspace strategy-class replication-factor column-families]
-     (let [column-families (map (fn [{:keys [name comparator type validator]}]
+     (let [column-families (map (fn [{:keys [name comparator type validator comparator-alias]}]
                                   (let [cf-def (if (nil? comparator)
                                                  (make-column-family keyspace name)
                                                  (make-column-family keyspace name comparator))]
                                     (doto ^ThriftCfDef cf-def
                                           (.setColumnType (column-type type))
-                                          (.setDefaultValidationClass (default-validation-class validator)))))
+                                          (.setDefaultValidationClass (default-validation-class validator)))
+                                    (if (not (nil? comparator-alias))
+                                      (.setComparatorTypeAlias cf-def comparator-alias))
+                                    cf-def
+                                    ))
                                 column-families)]
+
        (HFactory/createKeyspaceDefinition keyspace
                                           strategy-class
                                           replication-factor

diff --git a/test/clj_hector/test/core.clj b/test/clj_hector/test/core.clj
@@ -8,7 +8,9 @@
 
 (deftest-pending composite-serializer
   (let [column-family "A"]
-    (with-test-keyspace keyspace [{:name column-family}]
+    (with-test-keyspace keyspace [{:name column-family
+                                   :comparator :composite
+                                   :comparator-alias "(AsciiType, AsciiType)"}]
       (testing ":composite serializer"
         (let [opts [:v-serializer :string
                     :n-serializer :composite]