change compressed param to enum

Author: burivuh

snippets/c_api/iterate_events.cc

@@ -39,6 +39,12 @@
 const size_t kCompressedUidLength = 32;
 const size_t kUidLength = 38;
 
+
+enum UidFormat
+{
+  RAW, PYLONG
+};
+
 // Public struct used in Python.
 struct UserInfo
 {
@@ -95,13 +101,23 @@ struct UserInfo
 
 
   // Throw away useless characters and convert to char array (fixed size - no null-termination needed).
-  void setUid(std::string const & uid, bool compress) noexcept(false)
+  void setUid(std::string const & uid, uint8_t format) noexcept(false)
   {
-      std::string cUid = uid;
-      if(compress)
+      std::string cUid;
+      switch (format)
       {
-        cUid = this->compressUid(uid);
-      }
+        case RAW: 
+        {
+          cUid = uid;
+          break;
+        }
+        case PYLONG:
+        {
+          cUid = this->compressUid(uid);
+          break;
+        }
+      };
+
       std::memcpy(this->raw_uid, cUid.c_str(), sizeof(char) * cUid.size());
   }
 
@@ -155,12 +171,12 @@ NOTE: We need a C interface, so prepare yourself for C-style structures in the p
 this function (called from a Python code with a ctypes wrapper) and
 callback function (actual Python function - also a ctypes wrapper).
 */
-EXPORT void Iterate(TCallback callback, char const ** eventNames, int numEventNames, int eventsLimit, bool compress_uid)
+EXPORT void Iterate(TCallback callback, char const ** eventNames, int numEventNames, int eventsLimit, uint8_t uid_format)
 {
   std::set<std::string> processKeys(eventNames, eventNames + numEventNames);
 
   alohalytics::Processor(
-      [&callback, &processKeys, &compress_uid](AlohalyticsIdServerEvent const * idEvent, AlohalyticsKeyEvent const * event)
+      [&callback, &processKeys, &uid_format](AlohalyticsIdServerEvent const * idEvent, AlohalyticsKeyEvent const * event)
       {
         if (!processKeys.empty() && !processKeys.count(event->key))
           return;
@@ -174,7 +190,7 @@ EXPORT void Iterate(TCallback callback, char const ** eventNames, int numEventNa
 
         try
         {
-          userInfo.setUid(idEvent->id, compress_uid);
+          userInfo.setUid(idEvent->id, uid_format);
         }
         catch (std::logic_error const & e)
         {

snippets/pyaloha/__init__.py

@@ -1 +1 @@
-__version__="0.1.1"
+__version__="0.1.2"

snippets/pyaloha/ccode.py

@@ -166,7 +166,13 @@ def __dumpdict__(self):
 )  # key, event_time, user_info, data, data_len
 
 
-def iterate_events(stream_processor, events_limit, compress_uid=True):
+class UidFormat(object):
+    RAW = 0
+    PYLONG = 1
+
+
+def iterate_events(stream_processor, events_limit,
+                   uid_format=UidFormat.PYLONG):
     base_path = os.path.dirname(os.path.abspath(__file__))
     c_module = ctypes.cdll.LoadLibrary(
         os.path.join(base_path, 'iterate_events.so')
@@ -177,11 +183,11 @@ def iterate_events(stream_processor, events_limit, compress_uid=True):
     keylist_type = ctypes.c_char_p * len(use_keys)
 
     callback = CCALLBACK
-    if compress_uid is True:
+    if uid_format is UidFormat.PYLONG:
         callback = COMPRESSED_UID_CCALLBACK
 
     c_module.Iterate.argtypes = [
-        callback, keylist_type, ctypes.c_int, ctypes.c_int, ctypes.c_bool
+        callback, keylist_type, ctypes.c_int, ctypes.c_int, ctypes.c_byte
     ]
     c_module.Iterate(
         callback(
@@ -190,5 +196,5 @@ def iterate_events(stream_processor, events_limit, compress_uid=True):
         keylist_type(*use_keys),
         len(use_keys),
         events_limit,
-        compress_uid
+        uid_format
     )