Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Cassandra] Add: schema browser support & explicit protocol version #1482

Merged
merged 4 commits into from
Jan 3, 2017
Merged

[Cassandra] Add: schema browser support & explicit protocol version #1482

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
420973c
Added get tables query for cassandra and expilicit protocol version t…
Dec 22, 2016
045c921
Fixed get_tables for execute 1 query instead of N queries
Dec 23, 2016
f54e7b3
[Cassandra]: Changed test qurey due to error with parsing uuid as a r…
Dec 31, 2016
ca4db61
Fixed from BaseSQLQueryRunner to BaseQueryRunner and get_schema inste…
Jan 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions redash/query_runner/cass.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import json
import logging

from redash.query_runner import BaseQueryRunner, register
from redash.query_runner import BaseSQLQueryRunner, register
from redash.utils import JSONEncoder

logger = logging.getLogger(__name__)
Expand All @@ -14,7 +14,7 @@
enabled = False


class Cassandra(BaseQueryRunner):
class Cassandra(BaseSQLQueryRunner):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because when I use BaseQueryRunner i'm getting empty list [] for get_tables

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct, because you need to implement get_schema instead (get_tables is a method BaseSQLQueryRunner uses for get_schema).

noop_query = "SELECT * FROM system.compactions_in_progress"

@classmethod
Expand Down Expand Up @@ -54,22 +54,36 @@ def type(cls):
return "Cassandra"

def _get_tables(self, schema):
query = """
CF_query = """
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cf_query

select columnfamily_name from system.schema_columnfamilies where keyspace_name = '{}';
""".format(self.configuration['keyspace'])

results, error = self.run_query(query, None)
return results, error
results, error = self.run_query(CF_query, None)
results = json.loads(results)
for row in results['rows']:
table_name = row['columnfamily_name']
if table_name not in schema:
schema[table_name] = {'name': table_name, 'columns': []}
CN_query = """
SELECT column_name FROM system.schema_columns where keyspace_name ='{}' and columnfamily_name ='{}';
""".format(self.configuration['keyspace'], table_name)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not run: SELECT columnfamily_name, column_name FROM system.schema_columns where keyspace_name ='{}' and split them to column families in the code? This way you need to run only a single query instead of N queries.

columns, error = self.run_query(CN_query, None)
columns = json.loads(columns)
for col in columns['rows']:
column_name = col['column_name']
schema[table_name]['columns'].append(col['column_name'])

return schema.values()

def run_query(self, query, user):
connection = None
try:
if self.configuration.get('username', '') and self.configuration.get('password', ''):
auth_provider = PlainTextAuthProvider(username='{}'.format(self.configuration.get('username', '')),
password='{}'.format(self.configuration.get('password', '')))
connection = Cluster([self.configuration.get('host', '')], auth_provider=auth_provider)
connection = Cluster([self.configuration.get('host', '')], auth_provider=auth_provider, protocol_version=3)
else:
connection = Cluster([self.configuration.get('host', '')])
connection = Cluster([self.configuration.get('host', '')], protocol_version=3)

session = connection.connect()
session.set_keyspace(self.configuration['keyspace'])
Expand Down