Skip to content

Business intelligence made simple

Better Elasticsearch adapter

Andrew Kane87423bbd3607
diff --git a/app/controllers/blazer/base_controller.rb b/app/controllers/blazer/base_controller.rb
index 5f823ff8..2483df13 100644
--- a/app/controllers/blazer/base_controller.rb
+++ b/app/controllers/blazer/base_controller.rb
@@ -54,7 +54,7 @@ module Blazer
def extract_vars(statement)
# strip commented out lines
# and regex {1} or {1,2}
- statement.gsub(/\-\-.+/, "").gsub(/\/\*.+\*\//m, "").scan(/\{\w*?\}/i).map { |v| v[1...-1] }.reject { |v| /\A\d+(\,\d+)?\z/.match(v) }.uniq
+ statement.gsub(/\-\-.+/, "").gsub(/\/\*.+\*\//m, "").scan(/\{\w*?\}/i).map { |v| v[1...-1] }.reject { |v| /\A\d+(\,\d+)?\z/.match(v) || v.empty? }.uniq
end
helper_method :extract_vars
diff --git a/lib/blazer/adapters/elasticsearch_adapter.rb b/lib/blazer/adapters/elasticsearch_adapter.rb
index 84b6c9e4..c43c9091 100644
--- a/lib/blazer/adapters/elasticsearch_adapter.rb
+++ b/lib/blazer/adapters/elasticsearch_adapter.rb
@@ -8,8 +8,9 @@ module Blazer
begin
response = client.search(body: JSON.parse(statement))
- columns = ["response"]
- rows = [[response]]
+ hits = response["hits"]["hits"]
+ columns = hits.first.try(:keys) || []
+ rows = hits.map { |r| r.values }
rescue => e
error = e.message
end
@@ -18,7 +19,7 @@ module Blazer
end
def tables
- client.indices.get_aliases.map { |k, v| [k, v["aliases"].keys] }.flatten.uniq
+ client.indices.get_aliases.map { |k, v| [k, v["aliases"].keys] }.flatten.uniq.sort
end
protected