elastic-esql 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee4efdbcbcfd0ced3cc7d373b9fe58719f3434c995a75112ce5c2740509b8840
-  data.tar.gz: 4c11d6fd4dfd95b27e34bd189904c83abf469ac06c06a3672d170bac1ae1e30f
+  metadata.gz: f7837c640aa915808d6c720d4cd53bdcfe3210fbff0a5e9b900a0c0adcc3ed7a
+  data.tar.gz: 6f3cc673984d2968b098a36137a44780e279be68c3ec04d37737044e29cf1af5
 SHA512:
-  metadata.gz: 3fa05ddee1fceb1f300e3c16ca6b8ab32fead629bf20e50d6f406694cdc97400d8bef450e0ef050dd86a95bbd9c1bf69b2384ca641b0605e2048eb86e66b549d
-  data.tar.gz: cb732b90ceb859d05872705bf777886d9b8a844bd82d7cbf5351203516b78e304f427ed727d1a8576966f87f999447fae9a880b6d7a5ea6d4b7efe3d60cd0cc5
+  metadata.gz: 90fbc7b576d768c0d2282d87e2ae0bcbd7c8f82ba19a910edfd084fa15cb5ef1b86423fe4eae5ddd07c0910ab0dcde4a6e67516147b54f5102a093c018d26237
+  data.tar.gz: a535a2fa6d19d8a5bb41ac4c70e27f66559699fe07073383ee7a3af295416d0df8a1f47e7a7ff0a1fbe20d0c6dbb315e6842e4fbf111351de2ee54d4bd774a56

data/lib/elastic/esql.rb

@@ -15,6 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
+require_relative 'branch'
 require_relative 'change_point'
 require_relative 'custom'
 require_relative 'dissect'
@@ -22,42 +23,29 @@ require_relative 'drop'
 require_relative 'enrich'
 require_relative 'eval'
 require_relative 'functions'
+require_relative 'fork'
+require_relative 'fuse'
 require_relative 'grok'
 require_relative 'keep'
-require_relative 'limit'
 require_relative 'lookup_join'
 require_relative 'metadata'
+require_relative 'queryable'
 require_relative 'rename'
 require_relative 'row'
 require_relative 'show'
-require_relative 'sort'
 require_relative 'stats'
 require_relative 'ts'
-require_relative 'where'
+require_relative 'util'
 
 module Elastic
   # @example
   #    Elastic::ESQL.from('sample_data').sort_descending('@timestamp').limit(3).to_s
   #    # => FROM 'sample_data' | SORT @timestamp desc | LIMIT 3
-  # rubocop:disable Metrics/ClassLength
   class ESQL
-    include ChangePoint
-    include Custom
-    include Dissect
-    include Drop
-    include Eval
-    include Grok
-    include Keep
-    include Limit
-    include LookupJoin
-    include Metadata
-    include Rename
-    include Row
-    include Show
-    include Sort
-    include Stats
-    include TS
-    include Where
+    [
+      ChangePoint, Custom, Dissect, Drop, Eval, Fork, Fuse, Grok, Keep, LookupJoin, Metadata,
+      Queryable, Rename, Row, Show, Stats, TS, Util
+    ].each { |m| include m }
 
     SOURCE_COMMANDS = [:from, :row, :show, :ts].freeze
 
@@ -65,7 +53,6 @@ module Elastic
       @query = {}
       @custom = []
       @metadata = []
-      @lookup_joins = []
     end
 
     # Function to build the ES|QL formatted query and return it as a String.
@@ -74,9 +61,8 @@ module Elastic
     def query
       raise ArgumentError, 'No source command found' unless source_command_present?
 
-      @query[:enrich] = @enriches.join('| ') if @enriches
+      @query[:enrich] = @enriches.map(&:to_query).join('| ') if @enriches
       string_query = build_string_query
-      string_query.concat(build_lookup_joins) unless @lookup_joins.empty?
       string_query.concat(" #{@custom.join(' ')}") unless @custom.empty?
       string_query
     end
@@ -149,6 +135,10 @@ module Elastic
     end
     # rubocop:enable Naming/MethodName, Naming/BinaryOperatorParameterName
 
+    def self.branch
+      Branch.new
+    end
+
     private
 
     # Function for eval, row, and other functions that have one or more columns with values specified
@@ -179,35 +169,5 @@ module Elastic
 
       false
     end
-
-    # Helper method to return a copy of the object when functions are called without `!`, so the
-    # object is not mutated.
-    def method_copy(name, *params)
-      esql = clone
-      esql.instance_variable_set('@query', esql.instance_variable_get('@query').clone)
-      esql.send("#{name}!", *params)
-      esql
-    end
-
-    # Helper to build the LOOKUP JOIN part of the query.
-    def build_lookup_joins
-      joins = @lookup_joins.map { |a| a.map { |k, v| "LOOKUP JOIN #{k} ON #{v}" } }.flatten.join(' | ')
-      " | #{joins}"
-    end
-
-    # Helper to build the String for the simpler functions.
-    # These are of the form 'key.upcase value' like 'DROP value'
-    # If metadata has been set, it needs to be added to FROM. There's a possibility there'll be more
-    # special cases like this in the future, they can be added here.
-    def build_string_query
-      @query.map do |k, v|
-        if k == :from && !@metadata.empty?
-          "#{k.upcase} #{v} METADATA #{@metadata.join(', ')}"
-        else
-          "#{k.upcase} #{v}"
-        end
-      end.join(' | ')
-    end
   end
-  # rubocop:enable Metrics/ClassLength
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic-esql
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Fernando Briano