fixed bugs caused by --table-name flag and the version of the dependency

Author: xweichu

setup.py

@@ -2,17 +2,17 @@
 setup(
   name = 'skyhookdmpy',         # How you named your package folder (MyLib)
   packages = ['skyhookdmpy'],   # Chose the same as "name"
-  version = '0.2.9',      # Start with a small number and increase it with every change you make
+  version = '0.3.1',      # Start with a small number and increase it with every change you make
   license='MIT',        # Chose a license from here: https://help.github.com/articles/licensing-a-repository
   description = 'Python client of Skyhook for Ceph',   # Give a short description about your library
   author = 'Xiaowei Chu',                   # Type in your name
   author_email = 'xweichu@hotmail.com',      # Type in your E-Mail
   url = 'https://github.com/uccross/skyhookdm-pythonclient',   # Provide either the link to your github or to your website
-  download_url = 'https://github.com/uccross/skyhookdm-pythonclient/archive/v0.2.7.tar.gz',    # I explain this later on
+  download_url = 'https://github.com/uccross/skyhookdm-pythonclient/archive/v0.3.1.tar.gz',    # I explain this later on
   keywords = ['SkyhookDM', 'Skyhook', 'Skyhook-pythonclient'],   # Keywords that define your package best
   install_requires=[            # I get to this in a second
           'pyarrow',
-          'msgpack==0.6.2'
+          'msgpack==0.6.2',
           'uproot',
           'bokeh',
           'wget',

skyhookdmpy/skyhook.py

@@ -80,7 +80,7 @@ def getDataset(self, name):
 
     def runQuery(self, obj, querystr):
         #limit just to 1 obj
-        command_template = '--wthreads 1 --qdepth 120 --query hep --pool {} --start-obj #startobj --output-format \"SFT_PYARROW_BINARY\" --data-schema \"#dataschema\" --project \"#colname\" --num-objs #objnum --oid-prefix \"#prefix\" --subpartitions 10'.format(self.ceph_pool)
+        command_template = '--wthreads 1 --qdepth 120 --query hep --pool {} --start-obj #startobj --output-format \"SFT_PYARROW_BINARY\" --data-schema \"#dataschema\" --project \"#colname\" --num-objs #objnum --oid-prefix \"#prefix\" --table-name \"#tablename\" --subpartitions 10'.format(self.ceph_pool)
 
 
         def generateQueryCommand(file, querystr):
@@ -92,7 +92,7 @@ def generateQueryCommand(file, querystr):
             for br in brs:
                 br = br.strip()
                 elems = br.split('.')
-                br_name = elems[-1]
+                br_name = elems[-1]  
                 elems.remove(br_name)
                 local_prefix = ''
                 for elem in elems:
@@ -129,6 +129,7 @@ def generateQueryCommand(file, querystr):
                     cmd = cmd.replace('#dataschema', data_schema)
                     cmd = cmd.replace('#colname', 'event_id,'+ br_name.strip())
                     cmd = cmd.replace('#prefix', obj_prefix)
+                    cmd = cmd.replace('#tablename', br_name.strip())
                     #limit the obj num to 1
                     cmd = cmd.replace('#objnum', str(1))
                     cmd = cmd.replace('#startobj', str(obj_num))

skyhookdmpy/skyhook_driver.py

@@ -48,7 +48,7 @@ def buildObj(dst_name, branch, subnode, obj_id):
         from collections import OrderedDict
         # change the name here to object_id which is the node_id
         # objname = branch.name.decode("utf-8")
-        objname = '.' + str(obj_id)
+        objname = '.' + str(branch.name) + '.' + str(obj_id)
         parent = subnode.parent
         while parent is not None:
             objname = parent.name + '#' + objname
@@ -160,7 +160,7 @@ def buildObj(dst_name, branch, subnode, obj_id):
                     writer.write_batch(batch)
                     buff = sink.getvalue()
                     buff_bytes = buff.to_pybytes()
-                    ioctx.aio_write_full(objname + '.' + str(i), buff_bytes)
+                    ioctx.aio_write_full(x + '.' + str(i), buff_bytes)
                     ioctx.set_xattr(objname + '.' + str(i), 'size', str(len(buff_bytes)))
                     i += 1
                 ioctx.close()