Support RediSearch field types

Author: gavrie

Diff for: examples/hello_redisearch.rs

@@ -1,7 +1,7 @@
 #[macro_use]
 extern crate redismodule;
 
-use redisearch_api::{self, init, Document, Index};
+use redisearch_api::{self, init, Document, FieldType, Index};
 use redismodule::{Context, NextArg, RedisError, RedisResult};
 
 fn hello_redisearch(_: &Context, args: Vec<String>) -> RedisResult {
@@ -24,11 +24,11 @@ fn hello_redisearch(_: &Context, args: Vec<String>) -> RedisResult {
     index.create_field(field_name);
 
     let doc = Document::create("doc1", score);
-    doc.add_field(field_name, "bar");
+    doc.add_field(field_name, "bar", FieldType::FULLTEXT);
     index.add_document(&doc)?;
 
     let doc2 = Document::create("doc2", score);
-    doc2.add_field(field_name, "quux");
+    doc2.add_field(field_name, "quux", FieldType::FULLTEXT);
     index.add_document(&doc2)?;
 
     let keys: Vec<_> = index.search(search_term.as_str())?.collect();

Diff for: src/document.rs

@@ -2,7 +2,7 @@ use std::ffi::CString;
 use std::os::raw::c_void;
 use std::ptr;
 
-use crate::raw;
+use crate::{raw, FieldType};
 
 pub struct Document {
     pub(crate) inner: *mut raw::RSDoc,
@@ -20,7 +20,7 @@ impl Document {
         Self { inner: doc }
     }
 
-    pub fn add_field(&self, name: &str, value: &str) {
+    pub fn add_field(&self, name: &str, value: &str, field_type: FieldType) {
         let name = CString::new(name).unwrap();
         let c_value = CString::new(value).unwrap();
         unsafe {
@@ -29,7 +29,7 @@ impl Document {
                 name.as_ptr(),
                 c_value.as_ptr(),
                 value.len(),
-                raw::RSFLDTYPE_FULLTEXT,
+                field_type.bits,
             );
         }
     }

Diff for: src/index.rs

@@ -4,7 +4,7 @@ use std::ptr;
 use num_traits::ToPrimitive;
 
 use crate::raw::{self, RSFieldID, RSResultsIterator, GC_POLICY_FORK, GC_POLICY_NONE};
-use crate::Document;
+use crate::{Document, FieldType};
 use redismodule::RedisError;
 use std::os::raw::c_char;
 
@@ -51,11 +51,12 @@ impl Index {
         debug!("Creating index field '{}'", name);
         let name = CString::new(name).unwrap();
 
-        let ftype = raw::RSFLDTYPE_FULLTEXT;
+        // We want to let the document decide the type, so we support all types.
+        let ftype = FieldType::FULLTEXT | FieldType::NUMERIC | FieldType::TAG;
         let fopt = raw::RSFLDOPT_NONE;
 
         let field_id =
-            unsafe { raw::RediSearch_CreateField(self.inner, name.as_ptr(), ftype, fopt) };
+            unsafe { raw::RediSearch_CreateField(self.inner, name.as_ptr(), ftype.bits, fopt) };
 
         Field {
             index: self,

Diff for: src/lib.rs

@@ -1,5 +1,8 @@
 use std::os::raw::c_int;
 
+#[macro_use]
+extern crate bitflags;
+
 #[macro_use]
 extern crate enum_primitive_derive;
 
@@ -12,6 +15,15 @@ pub mod raw;
 pub use document::Document;
 pub use index::Index;
 
+bitflags! {
+    pub struct FieldType: u32 {
+        const FULLTEXT = raw::RSFLDTYPE_FULLTEXT;
+        const NUMERIC = raw::RSFLDTYPE_NUMERIC;
+        const GEO = raw::RSFLDTYPE_GEO;
+        const TAG = raw::RSFLDTYPE_TAG;
+    }
+}
+
 pub fn get_c_api_version() -> i32 {
     unsafe { raw::RediSearch_GetCApiVersion() }
 }