Skip to content

Commit

Permalink
Merge pull request getredash#1479 from someones/es_schema
Browse files Browse the repository at this point in the history
[ElasticSearch] Add: enable schema browser
  • Loading branch information
arikfr authored Dec 23, 2016
2 parents 655e03a + 108e440 commit 892c7d4
Showing 1 changed file with 56 additions and 18 deletions.
74 changes: 56 additions & 18 deletions query_runner/elasticsearch.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,26 +102,11 @@ def __init__(self, configuration):
def _get_mappings(self, url):
mappings = {}
error = None

try:
r = requests.get(url, auth=self.auth)
r.raise_for_status()

mappings_data = r.json()

for index_name in mappings_data:
index_mappings = mappings_data[index_name]
for m in index_mappings.get("mappings", {}):
for property_name in index_mappings["mappings"][m]["properties"]:
property_data = index_mappings["mappings"][m]["properties"][property_name]
if property_name not in mappings:
property_type = property_data.get("type", None)
if property_type:
if property_type in ELASTICSEARCH_TYPES_MAPPING:
mappings[property_name] = ELASTICSEARCH_TYPES_MAPPING[property_type]
else:
mappings[property_name] = TYPE_STRING
#raise Exception("Unknown property type: {0}".format(property_type))
mappings = r.json()
except requests.HTTPError as e:
logger.exception(e)
error = "Failed to execute query. Return Code: {0} Reason: {1}".format(r.status_code, r.text)
Expand All @@ -133,6 +118,59 @@ def _get_mappings(self, url):

return mappings, error

def _get_query_mappings(self, url):
mappings, error = self._get_mappings(url)
if error:
return mappings, error

for index_name in mappings_data:
index_mappings = mappings_data[index_name]
for m in index_mappings.get("mappings", {}):
for property_name in index_mappings["mappings"][m]["properties"]:
property_data = index_mappings["mappings"][m]["properties"][property_name]
if property_name not in mappings:
property_type = property_data.get("type", None)
if property_type:
if property_type in ELASTICSEARCH_TYPES_MAPPING:
mappings[property_name] = ELASTICSEARCH_TYPES_MAPPING[property_type]
else:
mappings[property_name] = TYPE_STRING
#raise Exception("Unknown property type: {0}".format(property_type))

return mappings, error

def get_schema(self, *args, **kwargs):
def parse_doc(doc, path=None):
'''Recursively parse a doc type dictionary
'''
path = path or []
result = []
for field, description in doc['properties'].items():
if 'properties' in description:
result.extend(parse_doc(description, path + [field]))
else:
result.append('.'.join(path + [field]))
return result

schema = {}
url = "{0}/_mappings".format(self.server_url)
mappings, error = self._get_mappings(url)

if mappings:
# make a schema for each index
# the index contains a mappings dict with documents
# in a hierarchical format
for name, index in mappings.items():
columns = []
schema[name] = {'name': name}
for doc, items in index['mappings'].items():
columns.extend(parse_doc(items))

# remove duplicates
# sort alphabetically
schema[name]['columns'] = sorted(set(columns))
return schema.values()

def _parse_results(self, mappings, result_fields, raw_result, result_columns, result_rows):
def add_column_if_needed(mappings, column_name, friendly_name, result_columns, result_columns_index):
if friendly_name not in result_columns_index:
Expand Down Expand Up @@ -290,7 +328,7 @@ def run_query(self, query, user):
url = "{0}/{1}/_search?".format(self.server_url, index_name)
mapping_url = "{0}/{1}/_mapping".format(self.server_url, index_name)

mappings, error = self._get_mappings(mapping_url)
mappings, error = self._get_query_mappings(mapping_url)
if error:
return None, error
#logger.debug(json.dumps(mappings, indent=4))
Expand Down Expand Up @@ -369,7 +407,7 @@ def run_query(self, query, user):
url = "{0}/{1}/_search".format(self.server_url, index_name)
mapping_url = "{0}/{1}/_mapping".format(self.server_url, index_name)

mappings, error = self._get_mappings(mapping_url)
mappings, error = self._get_query_mappings(mapping_url)
if error:
return None, error

Expand Down

0 comments on commit 892c7d4

Please sign in to comment.