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

Jump to bottom

Renaming Classes related to Druid #129

Merged
merged 2 commits into from
Feb 10, 2016
Merged

Renaming Classes related to Druid #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b18d117
Renaming Classes related to Druid
mistercrunch Feb 10, 2016
32442aa
Adding Metric class as well
mistercrunch Feb 10, 2016
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: 14 additions & 14 deletions panoramix/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class Slice(Model, AuditMixinNullable):
table = relationship(
'SqlaTable', foreign_keys=[table_id], backref='slices')
druid_datasource = relationship(
'Datasource', foreign_keys=[druid_datasource_id], backref='slices')
'DruidDatasource', foreign_keys=[druid_datasource_id], backref='slices')

def __repr__(self):
return self.slice_name
Expand Down Expand Up @@ -742,7 +742,7 @@ def isnum(self):
return self.type in ('LONG', 'DOUBLE', 'FLOAT')


class Cluster(Model, AuditMixinNullable):
class DruidCluster(Model, AuditMixinNullable):
__tablename__ = 'clusters'
id = Column(Integer, primary_key=True)
cluster_name = Column(String(250), unique=True)
Expand Down Expand Up @@ -772,10 +772,10 @@ def refresh_datasources(self):

datasources = json.loads(requests.get(endpoint).text)
for datasource in datasources:
Datasource.sync_to_db(datasource, self)
DruidDatasource.sync_to_db(datasource, self)


class Datasource(Model, AuditMixinNullable, Queryable):
class DruidDatasource(Model, AuditMixinNullable, Queryable):
type = "druid"

baselink = "datasourcemodelview"
Expand All @@ -792,7 +792,7 @@ class Datasource(Model, AuditMixinNullable, Queryable):
cluster_name = Column(
String(250), ForeignKey('clusters.cluster_name'))
cluster = relationship(
'Cluster', backref='datasources', foreign_keys=[cluster_name])
'DruidCluster', backref='datasources', foreign_keys=[cluster_name])
offset = Column(Integer, default=0)

@property
Expand Down Expand Up @@ -1050,7 +1050,7 @@ class Log(Model):
dttm = Column(DateTime, default=func.now())


class Metric(Model):
class DruidMetric(Model):
__tablename__ = 'metrics'
id = Column(Integer, primary_key=True)
metric_name = Column(String(512))
Expand All @@ -1059,7 +1059,7 @@ class Metric(Model):
datasource_name = Column(
String(250),
ForeignKey('datasources.datasource_name'))
datasource = relationship('Datasource', backref='metrics')
datasource = relationship('DruidDatasource', backref='metrics')
json = Column(Text)
description = Column(Text)

Expand All @@ -1072,13 +1072,13 @@ def json_obj(self):
return obj


class Column(Model, AuditMixinNullable):
class DruidColumn(Model, AuditMixinNullable):
__tablename__ = 'columns'
id = Column(Integer, primary_key=True)
datasource_name = Column(
String(250),
ForeignKey('datasources.datasource_name'))
datasource = relationship('Datasource', backref='columns')
datasource = relationship('DruidDatasource', backref='columns')
column_name = Column(String(256))
is_active = Column(Boolean, default=True)
type = Column(String(32))
Expand All @@ -1098,9 +1098,9 @@ def isnum(self):
return self.type in ('LONG', 'DOUBLE', 'FLOAT')

def generate_metrics(self):
M = Metric
M = DruidMetric
metrics = []
metrics.append(Metric(
metrics.append(DruidMetric(
metric_name='count',
verbose_name='COUNT(*)',
metric_type='count',
Expand All @@ -1125,7 +1125,7 @@ def generate_metrics(self):
if self.min and self.isnum:
mt = corrected_type.lower() + 'Min'
name = 'min__' + self.column_name
metrics.append(Metric(
metrics.append(DruidMetric(
metric_name=name,
metric_type='min',
verbose_name='MIN({})'.format(self.column_name),
Expand All @@ -1135,7 +1135,7 @@ def generate_metrics(self):
if self.max and self.isnum:
mt = corrected_type.lower() + 'Max'
name = 'max__' + self.column_name
metrics.append(Metric(
metrics.append(DruidMetric(
metric_name=name,
metric_type='max',
verbose_name='MAX({})'.format(self.column_name),
Expand All @@ -1145,7 +1145,7 @@ def generate_metrics(self):
if self.count_distinct:
mt = 'count_distinct'
name = 'count_distinct__' + self.column_name
metrics.append(Metric(
metrics.append(DruidMetric(
metric_name=name,
verbose_name='COUNT(DISTINCT {})'.format(self.column_name),
metric_type='count_distinct',
Expand Down
2 changes: 1 addition & 1 deletion panoramix/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ def init():
table_perms = [
table.perm for table in session.query(models.SqlaTable).all()]
table_perms += [
table.perm for table in session.query(models.Datasource).all()]
table.perm for table in session.query(models.DruidDatasource).all()]
for table_perm in table_perms:
merge_perm(sm, 'datasource_access', table.perm)

Expand Down
36 changes: 18 additions & 18 deletions panoramix/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ class TableColumnInlineView(CompactCRUDMixin, PanoramixModelView):

appbuilder.add_separator("Sources")

class ColumnInlineView(CompactCRUDMixin, PanoramixModelView):
datamodel = SQLAInterface(models.Column)
class DruidColumnInlineView(CompactCRUDMixin, PanoramixModelView):
datamodel = SQLAInterface(models.DruidColumn)
edit_columns = [
'column_name', 'description', 'datasource', 'groupby',
'count_distinct', 'sum', 'min', 'max']
Expand All @@ -85,7 +85,7 @@ class ColumnInlineView(CompactCRUDMixin, PanoramixModelView):
def post_update(self, col):
col.generate_metrics()

appbuilder.add_view_no_menu(ColumnInlineView)
appbuilder.add_view_no_menu(DruidColumnInlineView)


class SqlMetricInlineView(CompactCRUDMixin, PanoramixModelView):
Expand All @@ -99,8 +99,8 @@ class SqlMetricInlineView(CompactCRUDMixin, PanoramixModelView):
appbuilder.add_view_no_menu(SqlMetricInlineView)


class MetricInlineView(CompactCRUDMixin, PanoramixModelView):
datamodel = SQLAInterface(models.Metric)
class DruidMetricInlineView(CompactCRUDMixin, PanoramixModelView):
datamodel = SQLAInterface(models.DruidMetric)
list_columns = ['metric_name', 'verbose_name', 'metric_type']
edit_columns = [
'metric_name', 'description', 'verbose_name', 'metric_type',
Expand All @@ -111,7 +111,7 @@ class MetricInlineView(CompactCRUDMixin, PanoramixModelView):
validators_columns = {
'json': [validate_json],
}
appbuilder.add_view_no_menu(MetricInlineView)
appbuilder.add_view_no_menu(DruidMetricInlineView)


class DatabaseView(PanoramixModelView, DeleteMixin):
Expand Down Expand Up @@ -185,8 +185,8 @@ def post_update(self, table):
appbuilder.add_separator("Sources")


class ClusterModelView(PanoramixModelView, DeleteMixin):
datamodel = SQLAInterface(models.Cluster)
class DruidClusterModelView(PanoramixModelView, DeleteMixin):
datamodel = SQLAInterface(models.DruidCluster)
add_columns = [
'cluster_name',
'coordinator_host', 'coordinator_port', 'coordinator_endpoint',
Expand All @@ -196,7 +196,7 @@ class ClusterModelView(PanoramixModelView, DeleteMixin):
list_columns = ['cluster_name', 'metadata_last_refreshed']

appbuilder.add_view(
ClusterModelView,
DruidClusterModelView,
"Druid Clusters",
icon="fa-cubes",
category="Sources",
Expand Down Expand Up @@ -277,14 +277,14 @@ class LogModelView(PanoramixModelView):
icon="fa-list-ol")


class DatasourceModelView(PanoramixModelView, DeleteMixin):
datamodel = SQLAInterface(models.Datasource)
class DruidDatasourceModelView(PanoramixModelView, DeleteMixin):
datamodel = SQLAInterface(models.DruidDatasource)
list_columns = [
'datasource_link', 'cluster', 'owner',
'created_by', 'created_on',
'changed_by_', 'changed_on',
'offset']
related_views = [ColumnInlineView, MetricInlineView]
related_views = [DruidColumnInlineView, DruidMetricInlineView]
edit_columns = [
'datasource_name', 'cluster', 'description', 'owner',
'is_featured', 'is_hidden', 'default_endpoint', 'offset']
Expand All @@ -303,7 +303,7 @@ def post_update(self, datasource):
self.post_add(datasource)

appbuilder.add_view(
DatasourceModelView,
DruidDatasourceModelView,
"Druid Datasources",
category="Sources",
icon="fa-cube")
Expand Down Expand Up @@ -362,7 +362,7 @@ def explore(self, datasource_type, datasource_id):
else:
datasource = (
db.session
.query(models.Datasource)
.query(models.DruidDatasource)
.filter_by(id=datasource_id)
.first()
)
Expand Down Expand Up @@ -489,8 +489,8 @@ def checkbox(self, model_view, id_, attr, value):
model = None
if model_view == 'TableColumnInlineView':
model = models.TableColumn
elif model_view == 'ColumnInlineView':
model = models.Column
elif model_view == 'DruidColumnInlineView':
model = models.DruidColumn

obj = db.session.query(model).filter_by(id=id_).first()
if obj:
Expand Down Expand Up @@ -647,7 +647,7 @@ def runsql(self):
@expose("/refresh_datasources/")
def refresh_datasources(self):
session = db.session()
for cluster in session.query(models.Cluster).all():
for cluster in session.query(models.DruidCluster).all():
try:
cluster.refresh_datasources()
except Exception as e:
Expand Down Expand Up @@ -699,7 +699,7 @@ def featured_datasets(self):
session = db.session()
datasets_sqla = (session.query(models.SqlaTable)
.filter_by(is_featured=True).all())
datasets_druid = (session.query(models.Datasource)
datasets_druid = (session.query(models.DruidDatasource)
.filter_by(is_featured=True).all())
featured_datasets = datasets_sqla + datasets_druid
return self.render_template(
Expand Down
1 change: 1 addition & 0 deletions tests/core_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ def test_load_examples(self):
cli.load_examples(sample=True)

def test_slices(self):
# Testing by running all the examples
Slc = models.Slice
for slc in db.session.query(Slc).all():
print(slc)
Expand Down