解决与superset对接存在若干冲突

.gitignore

@@ -0,0 +1,2 @@
+# remove python bytecode files
+*.pyc

pykylin/connection.py

@@ -3,17 +3,19 @@
 from .cursor import Cursor
 from .proxy import Proxy
 from .log import logger
+#import sys
+#import importlib,sys
+#reload(sys)
+#sys.setdefaultencoding('utf-8')
 
 class Connection(object):
-
     def __init__(self, username, password, endpoint, project, **kwargs):
         self.endpoint = endpoint
         self.username = username
         self.password = password
         self.project = project
         self.proxy = Proxy(self.endpoint)
         self.limit = kwargs['limit'] if 'limit' in kwargs else 50000
-
         self.proxy.login(self.username, self.password)
 
     def close(self):
@@ -29,7 +31,8 @@ def list_tables(self):
         route = 'tables_and_columns'
         params = {'project': self.project}
         tables = self.proxy.get(route, params=params)
-        return [t['table_NAME'] for t in tables]
+        tableNames = [t['table_NAME'] for t in tables]
+        return tableNames
 
     def list_columns(self, table_name):
         table_NAME = str(table_name).upper()
@@ -39,9 +42,16 @@ def list_columns(self, table_name):
         table = [t for t in tables if t['table_NAME'] == table_NAME][0]
         return table['columns']
 
+    def list_schemas(self):   
+        route = 'tables_and_columns'
+        params = {'project': self.project}
+        tables = self.proxy.get(route, params=params)
+        schema_names = [t['table_SCHEM'] for t in tables]
+        logger.info("schema_names is : "+str(schema_names))
+        return schema_names
+
     def cursor(self):
         return Cursor(self)
 
-
 def connect(username='', password='', endpoint='', project='', **kwargs):
     return Connection(username, password, endpoint, project, **kwargs)

pykylin/cursor.py

@@ -35,6 +35,11 @@ def execute(self, operation, parameters={}, acceptPartial=True, limit=None, offs
         resp = self.connection.proxy.post('query', json=data)
 
         column_metas = resp['columnMetas']
+
+        for c in column_metas:
+            c['label']=str(c['label']).lower()
+            c['name']=str(c['name']).lower()
+
         self.description = [
             [c['label'], c['columnTypeName'],
              c['displaySize'], 0,
@@ -54,6 +59,9 @@ def _type_mapped(self, result):
             column = meta[i]
             tpe = column[1]
             val = result[i]
+            #skip null value
+            if val is None:
+                pass
             if tpe == 'DATE':
                 val = parser.parse(val)
             elif tpe == 'BIGINT' or tpe == 'INT' or tpe == 'TINYINT':

pykylin/dialect.py

@@ -136,15 +136,17 @@ def initialize(self, connection):
 
     def create_connect_args(self, url):
         opts = url.translate_connect_args()
+        api_prefix="kylin/api"
         args = {
             'username': opts['username'],
             'password': opts['password'],
-            'endpoint': 'http://%s:%s/%s' % (opts['host'], opts['port'], opts['database'])
+            'endpoint': 'http://%s:%s/%s' % (opts['host'], opts['port'],api_prefix)
         }
         args.update(url.query)
         return [], args
 
-    def get_table_names(self, connection, schema=None, **kw):
+    def get_table_names(self, engine, schema=None, **kw):
+        connection = engine.contextual_connect()
         return connection.connection.list_tables()
 
     def has_table(self, connection, table_name, schema=None):
@@ -153,7 +155,8 @@ def has_table(self, connection, table_name, schema=None):
     def has_sequence(self, connection, sequence_name, schema=None):
         return False
 
-    def get_columns(self, connection, table_name, schema=None, **kw):
+    def get_columns(self, engine, table_name, schema=None, **kw):
+        connection = engine.contextual_connect()
         cols = connection.connection.list_columns(table_name)
         return [self._map_column_type(c) for c in cols]
 
@@ -191,4 +194,6 @@ def get_pk_constraint(self, conn, table_name, schema=None, **kw):
     def get_unique_constraints(
             self, connection, table_name, schema=None, **kw):
         return []
-
+    def get_schema_names(self, engine, schema=None, **kw):
+        connection = engine.contextual_connect()
+        return connection.connection.list_schemas() 

pykylin/proxy.py

@@ -21,7 +21,7 @@ def login(self, user, password):
         route = 'user/authentication'
         url = '%s/%s' % (self.base_url, route)
         self.user = user
-        self.password = user
+        self.password = password
         self.auth = HTTPBasicAuth(user, password)
         resp = requests.post(url, auth=self.auth, headers=self.headers)
 
@@ -48,7 +48,9 @@ def request(self, method, route, **kwargs):
             finally:
                 raise Error('Error when requesting: "%s", exception: "%s"' % (route, exception))
 
-        return decode(resp.text)
+        responseText= decode(resp.text)
+        #logger.info('response text is: '+str(responseText))
+        return responseText
 
     def post(self, route, **kwargs):
         return self.request('post', route, **kwargs)

pykylin/types.py

@@ -2,7 +2,7 @@
 
 from sqlalchemy import types as sqltypes
 from sqlalchemy.types import INTEGER, BIGINT, SMALLINT, VARCHAR, CHAR, \
-    FLOAT, DATE, BOOLEAN
+    FLOAT, DATE, BOOLEAN, TIMESTAMP
 
 class DOUBLE(sqltypes.Float):
     __visit_name__ = 'DOUBLE'
@@ -24,4 +24,5 @@ class TINYINT(sqltypes.Integer):
     'FLOAT': FLOAT,
     'SMALLINT': SMALLINT,
     'VARCHAR': VARCHAR,
+    'TIMESTAMP(0)': TIMESTAMP
 }

requirements.txt

@@ -1,2 +1,3 @@
-requests==2.8.1
-python-dateutil==2.4.2
+requests==2.14.2
+#解决版本冲突问题
+python-dateutil==2.6.0