blazer 2.4.7 → 2.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 001d5a72253bcf62b525854064c1242e7569cc139b8263f54fade4536772de0a
-  data.tar.gz: 9bf14d133dec31e413fa37390cadcd24bf9e0ae965dee208fc7fe7acca0f9111
+  metadata.gz: af432d074376958f2b9f7efdeaae05a0f0c0a1fe34cc38ce537a0511985edfd1
+  data.tar.gz: dd0fab9ec30db7b870ae6a8afd352093cccf3be75d2c1a0e320ba7106df11f00
 SHA512:
-  metadata.gz: d0406c619b9f6ab242d7dd8d6dcca2341876ee9b5326638a57c590a5a95ecffccc9082b6323dca929487c8d55d5961b93e53788d323866c3d97d06aa846de21a
-  data.tar.gz: 8841aaf8abbedd623b355fac0dd455a1c437abf297748ca847df15c895ba8ff59bda8c536e48da0c1e3fd882e10dbe449f6ba9c7916f0ac3caa882d822339b00
+  metadata.gz: 7a78f82ce3d5544598ad363c4d31f2c676bf4be76844d81b0b02bc778072f8557c1da458cd1040fb1c9464b61fd677c4fbece3e310068acb6c09f769bf032aa7
+  data.tar.gz: ca0eb25f4e9a5826116d4f2a76d5fe55f71772633b557accea0aa85678e3ff4895623e0832a85de4894f18c3620180d2b04e5f9f03db51730684198e8f914a8f

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.4.8 (2021-12-07)
+
+- Added support for OpenSearch
+- Removed `elasticsearch-xpack` dependency for Elasticsearch
+
 ## 2.4.7 (2021-09-25)
 
 - Made Action Mailer optional

data/README.md

@@ -592,6 +592,7 @@ data_sources:
 - [MongoDB](#mongodb-1)
 - [MySQL](#mysql-1)
 - [Neo4j](#neo4j)
+- [OpenSearch](#opensearch)
 - [Oracle](#oracle)
 - [PostgreSQL](#postgresql-1)
 - [Presto](#presto)
@@ -743,7 +744,7 @@ data_sources:
 
 ### Elasticsearch
 
-Add [elasticsearch](https://github.com/elastic/elasticsearch-ruby) and [elasticsearch-xpack](https://github.com/elastic/elasticsearch-ruby/tree/master/elasticsearch-xpack) to your Gemfile and set:
+Add [elasticsearch](https://github.com/elastic/elasticsearch-ruby) to your Gemfile and set:
 
 ```yml
 data_sources:
@@ -820,6 +821,17 @@ data_sources:
     url: http://user:password@hostname:7474
 ```
 
+### OpenSearch
+
+Add [opensearch-ruby](https://github.com/opensearch-project/opensearch-ruby) to your Gemfile and set:
+
+```yml
+data_sources:
+  my_source:
+    adapter: opensearch
+    url: http://user:password@hostname:9200
+```
+
 ### Oracle
 
 Add [activerecord-oracle_enhanced-adapter](https://github.com/rsim/oracle-enhanced) and [ruby-oci8](https://github.com/kubo/ruby-oci8) to your Gemfile and set:

data/lib/blazer/adapters/elasticsearch_adapter.rb

@@ -7,15 +7,15 @@ module Blazer
         error = nil
 
         begin
-          response = client.xpack.sql.query(body: {query: "#{statement} /*#{comment}*/"})
+          response = client.transport.perform_request("POST", endpoint, {}, {query: "#{statement} /*#{comment}*/"}).body
           columns = response["columns"].map { |v| v["name"] }
           # Elasticsearch does not differentiate between dates and times
-          date_indexes = response["columns"].each_index.select { |i| response["columns"][i]["type"] == "date" }
+          date_indexes = response["columns"].each_index.select { |i| ["date", "datetime"].include?(response["columns"][i]["type"]) }
           if columns.any?
             rows = response["rows"]
             date_indexes.each do |i|
               rows.each do |row|
-                row[i] = Time.parse(row[i])
+                row[i] &&= Time.parse(row[i])
               end
             end
           end
@@ -38,6 +38,10 @@ module Blazer
 
       protected
 
+      def endpoint
+        @endpoint ||= client.info["version"]["number"].to_i >= 7 ? "_sql" : "_xpack/sql"
+      end
+
       def client
         @client ||= Elasticsearch::Client.new(url: settings["url"])
       end

data/lib/blazer/adapters/opensearch_adapter.rb

@@ -0,0 +1,48 @@
+module Blazer
+  module Adapters
+    class OpensearchAdapter < BaseAdapter
+      def run_statement(statement, comment)
+        columns = []
+        rows = []
+        error = nil
+
+        begin
+          response = client.transport.perform_request("POST", "_plugins/_sql", {}, {query: "#{statement} /*#{comment}*/"}).body
+          columns = response["schema"].map { |v| v["name"] }
+          # TODO typecast more types
+          # https://github.com/opensearch-project/sql/blob/main/docs/user/general/datatypes.rst
+          date_indexes = response["schema"].each_index.select { |i| response["schema"][i]["type"] == "timestamp" }
+          if columns.any?
+            rows = response["datarows"]
+            utc = ActiveSupport::TimeZone["Etc/UTC"]
+            date_indexes.each do |i|
+              rows.each do |row|
+                row[i] &&= utc.parse(row[i])
+              end
+            end
+          end
+        rescue => e
+          error = e.message
+        end
+
+        [columns, rows, error]
+      end
+
+      def tables
+        indices = client.cat.indices(format: "json").map { |v| v["index"] }
+        aliases = client.cat.aliases(format: "json").map { |v| v["alias"] }
+        (indices + aliases).uniq.sort
+      end
+
+      def preview_statement
+        "SELECT * FROM `{table}` LIMIT 10"
+      end
+
+      protected
+
+      def client
+        @client ||= OpenSearch::Client.new(url: settings["url"])
+      end
+    end
+  end
+end

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "2.4.7"
+  VERSION = "2.4.8"
 end

data/lib/blazer.rb

@@ -23,6 +23,7 @@ require "blazer/adapters/ignite_adapter"
 require "blazer/adapters/influxdb_adapter"
 require "blazer/adapters/mongodb_adapter"
 require "blazer/adapters/neo4j_adapter"
+require "blazer/adapters/opensearch_adapter"
 require "blazer/adapters/presto_adapter"
 require "blazer/adapters/salesforce_adapter"
 require "blazer/adapters/soda_adapter"
@@ -250,9 +251,10 @@ Blazer.register_adapter "elasticsearch", Blazer::Adapters::ElasticsearchAdapter
 Blazer.register_adapter "hive", Blazer::Adapters::HiveAdapter
 Blazer.register_adapter "ignite", Blazer::Adapters::IgniteAdapter
 Blazer.register_adapter "influxdb", Blazer::Adapters::InfluxdbAdapter
+Blazer.register_adapter "mongodb", Blazer::Adapters::MongodbAdapter
 Blazer.register_adapter "neo4j", Blazer::Adapters::Neo4jAdapter
+Blazer.register_adapter "opensearch", Blazer::Adapters::OpensearchAdapter
 Blazer.register_adapter "presto", Blazer::Adapters::PrestoAdapter
-Blazer.register_adapter "mongodb", Blazer::Adapters::MongodbAdapter
 Blazer.register_adapter "salesforce", Blazer::Adapters::SalesforceAdapter
 Blazer.register_adapter "soda", Blazer::Adapters::SodaAdapter
 Blazer.register_adapter "spark", Blazer::Adapters::SparkAdapter

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 2.4.7
+  version: 2.4.8
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-25 00:00:00.000000000 Z
+date: 2021-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -169,6 +169,7 @@ files:
 - lib/blazer/adapters/influxdb_adapter.rb
 - lib/blazer/adapters/mongodb_adapter.rb
 - lib/blazer/adapters/neo4j_adapter.rb
+- lib/blazer/adapters/opensearch_adapter.rb
 - lib/blazer/adapters/presto_adapter.rb
 - lib/blazer/adapters/salesforce_adapter.rb
 - lib/blazer/adapters/snowflake_adapter.rb
@@ -225,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Explore your data with SQL. Easily create charts and dashboards, and share