Merge pull request #2 from acelyc111/master

change code structure for pypi

pypegasus/__init__.py

@@ -0,0 +1,4 @@
+#!/usr/bin/env python
+# coding: utf-8
+
+__version__ = '0.1.14'

operate/packet.py → pypegasus/operate/packet.py

@@ -1,17 +1,17 @@
 import struct
 import ctypes
-import base.ttypes
-import utils
 
 from thrift.Thrift import TMessageType
 
-from utils import tools
-from rrdb import (
+from pypegasus import utils
+from pypegasus.rrdb import (
         meta,
         rrdb)
-from base.ttypes import (
-        error_code,
-        gpid)
+from pypegasus.base.ttypes import (
+    rocksdb_error_types,
+    error_code,
+    gpid)
+from pypegasus.utils import tools
 
 
 class ThriftHeader(object):
@@ -127,8 +127,8 @@ def send_data(self, oprot, seqid):
     @staticmethod
     def parse_result(resp):
         data = {}
-        if resp.error == base.ttypes.rocksdb_error_types.kOk.value\
-           or resp.error == base.ttypes.rocksdb_error_types.kIncomplete.value:
+        if resp.error == rocksdb_error_types.kOk.value\
+           or resp.error == rocksdb_error_types.kIncomplete.value:
             for kv in resp.kvs:
                 data[kv.key.data] = kv.value.data
 

pgclient.py → pypegasus/pgclient.py

@@ -1,28 +1,33 @@
 from __future__ import print_function
 from __future__ import with_statement
 
+import os
 import logging.config
 
+from thrift.Thrift import TMessageType, TApplicationException
 from twisted.internet import defer
 from twisted.internet import reactor
 from twisted.internet.defer import inlineCallbacks, succeed, fail
 from twisted.internet.protocol import ClientCreator
 
-from base.ttypes import *
-from operate.packet import *
-from replication.ttypes import *
-from rrdb.ttypes import *
-from utils.tools import *
-from transport.protocol import TPegasusThriftClientProtocol
+from pypegasus import rrdb, replication
+from pypegasus.base.ttypes import *
+from pypegasus.operate.packet import *
+from pypegasus.replication.ttypes import query_cfg_request
+from pypegasus.rrdb import *
+from pypegasus.rrdb.ttypes import scan_request, get_scanner_request, update_request, key_value, multi_put_request, \
+    multi_get_request, multi_remove_request
+from pypegasus.transport.protocol import *
+from pypegasus.utils.tools import restore_key, get_ttl, bytes_cmp, ScanOptions
 
 try:
     from thrift.protocol import fastbinary
 except:
     fastbinary = None
 
 
-logging.config.fileConfig("logger.conf")
-logger = logging.getLogger("root")
+logging.config.fileConfig(os.path.dirname(__file__)+"/logger.conf")
+logger = logging.getLogger("pgclient")
 
 DEFAULT_TIMEOUT = 2000               # ms
 META_CHECK_INTERVAL = 2              # s
@@ -246,8 +251,8 @@ def query_one(self, session):
 
     def got_results(self, res):
         for (suc, result) in res:
-            if suc                                                              \
-               and isinstance(result, replication.ttypes.query_cfg_response)    \
+            if suc                                                    \
+               and result.__class__.__name__ == "query_cfg_response"  \
                and result.is_stateful:
                 logger.info('table: %s, partition result: %s',
                             self.name, result)
@@ -295,7 +300,7 @@ def got_results(self, res):
         return True
 
     def update_cfg(self, resp):
-        if not isinstance(resp, replication.ttypes.query_cfg_response):
+        if resp.__class__.__name__ != "query_cfg_response":
             logger.error('table: %s, query_cfg_response is error',
                          self.name)
             return None

pypegasus/replication/replication.py

@@ -0,0 +1,6 @@
+from ttypes import (
+    partition_configuration,
+    query_cfg_request,
+    query_cfg_response)
+
+