aliyun-log 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0d96cc9d1e5e1a2bee7cdcbca04043f3a80e8b733b1be820aac363b31f8ec34
-  data.tar.gz: 2769ddbdd8d54f257e02d12813d207fbb920c50659977a42527d6f714b45b818
+  metadata.gz: 8c29e47df03c69ea213e48e43e272714f950887b5ab8efaa60321e4506b4d4bd
+  data.tar.gz: fd5dcd273e40f70f93bd69e1fc9dbc392171d90c9881650503c420b18cf0cd5d
 SHA512:
-  metadata.gz: 2a3c0526d83176a4b34e111744ebac7cd0543fc1396462f0299dcda7c43ce31b12fb7b8ebb08898a08edddaa684ea16e3288d1985add5f35eaf61cc8ca4222e8
-  data.tar.gz: d658a42dd7aff881cb7cc9b31374af83417533185cca1c3e4b8763ec4c52bd85bd22749f4b5130dede0b42fdca0ec84663db469c5a9893d126cd9b49972fb198
+  metadata.gz: 6a4a990ac42f07d0ce44fe018604a5af553f5d53a74cdb0b3abfd9a6b15f891f434bc3fada83afdae815c3bbf5477d72be9520f6926609ec356fe9aa8b6098d5
+  data.tar.gz: 0addf200ac1e5328fd5fbd4a459cf756a52f0b8ad1bc53f775676340147af385dc8758da2b7b0d63c8285b409820e4ab8778a822d0505172d554e12865ad7567

data/lib/aliyun/log.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative 'version'
 require_relative 'log/common'
 require_relative 'log/client'
 require_relative 'log/config'

data/lib/aliyun/log/record/persistence.rb

@@ -35,6 +35,7 @@ module Aliyun
           end
 
           def sync_index
+            return if field_indices.blank?
             has_index? ? update_index : create_index
           end
 

data/lib/aliyun/log/record/relation.rb

@@ -35,14 +35,28 @@ module Aliyun
         end
 
         def last(line = 1)
-          find_offset(0, line, true)
+          data = find_offset(0, line, true)
+          line > 1 ? data.reverse : data
         end
 
         def find_offset(nth, line = 1, reverse = false)
+          # @opts[:select] = '*'
           @opts[:line] = line
           @opts[:offset] = nth
-          @opts[:reverse] = reverse
-          line <= 1 ? load[0] : load
+          if @opts[:order].present? && reverse
+            conds = []
+            @opts[:order].split(',').each do |field|
+              field.gsub!(/\s+desc|asc.*/i, '')
+              conds << "#{field.strip} DESC"
+            end
+            @opts[:order] = conds.join(', ')
+          end
+          @opts[:order] ||= reverse ? '__time__ DESC' : '__time__ ASC'
+          if @opts[:select].blank?
+            line <= 1 ? load[0] : load
+          else
+            line <= 1 ? result[0] : result
+          end
         end
 
         def scoping
@@ -78,10 +92,16 @@ module Aliyun
 
         def page(val)
           @opts[:page] = val - 1 if val >= 1
+          singleton_class.send(:define_method, :total_count) do
+            @total_count ||= count
+          end
+          singleton_class.send(:define_method, :total_pages) do
+            (total_count.to_f / (@opts[:line] || 100)).ceil
+          end
           self
         end
 
-        def where(opts)
+        def api(opts)
           @opts.merge!(opts)
           self
         end
@@ -101,33 +121,76 @@ module Aliyun
           self
         end
 
+        def where(*statement)
+          if statement[0].is_a?(String)
+            ql = sanitize_array(*statement)
+            @opts[:where] = ql
+          else
+            ql = statement_ql(*statement)
+            @opts[:search] = ql
+          end
+          self
+        end
+
+        def select(*fields)
+          @opts[:select] = fields.join(', ')
+          self
+        end
+
+        def group(*fields)
+          @opts[:group] = fields.join(', ')
+          self
+        end
+
+        def order(*fields)
+          if fields[0].is_a?(Hash)
+            @opts[:order] = fields[0].map do |k, v|
+              unless %w[asc desc].include?(v.to_s)
+                raise ArgumentError, "Direction \"#{v}\" is invalid. Valid directions are: [:asc, :desc, :ASC, :DESC]" 
+              end
+              "#{k} #{v}"
+            end.join(', ')
+          else
+            @opts[:order] = fields.join(', ')
+          end
+          self
+        end
+
         def query(opts = {})
           @opts[:query] = opts
           self
         end
 
         def count
+          # @opts[:select] = 'COUNT(*) as count'
+          _sql = to_sql
+          sql = "SELECT COUNT(*) as count"
+          sql += " FROM(#{_sql})" if _sql.present?
           query = @opts.dup
-          if query[:query].blank?
-            where_cond = query[:sql].split(/where /i)[1] if query[:sql].present?
-            query[:query] = "#{query[:search]}|SELECT COUNT(*) as count"
-            query[:query] = "#{query[:query]} WHERE #{where_cond}" if where_cond.present?
-          end
-          res = Log.record_connection.get_logs(@klass.project_name, @klass.logstore_name, query)
-          res = JSON.parse(res.body)
-          res[0]['count'].to_i
+          query[:query] = "#{query[:search] || '*'}|#{sql}"
+          res = execute(query)
+          res.dig(0, 'count').to_i
+        end
+
+        def sum(field)
+          @opts[:select] = "SUM(#{field}) as sum"
+          query = @opts.dup
+          query[:query] = "#{query[:search] || '*'}|#{to_sql}"
+          res = execute(query)
+          res.dig(0, 'sum').to_f
         end
 
         def result
           query = @opts.dup
-          if query[:page]
-            query[:line] ||= 100
-            query[:offset] = query[:page] * query[:line]
-          end
           query[:query] = query[:search] || '*'
-          query[:query] = "#{query[:query]}|#{query[:sql]}" if query[:sql].present?
-          res = Log.record_connection.get_logs(@klass.project_name, @klass.logstore_name, query)
-          JSON.parse(res)
+          sql = to_sql
+          if sql.present?
+            query[:query] += "|#{sql}"
+            @opts[:line] = nil
+            @opts[:offset] = nil
+            @opts[:page] = nil
+          end
+          execute(query)
         end
 
         def load
@@ -140,8 +203,37 @@ module Aliyun
           end
         end
 
+        def to_sql
+          opts = @opts.dup
+          sql_query = []
+          sql_query << "WHERE #{opts[:where]}" if opts[:where].present?
+          sql_query << "GROUP BY #{opts[:group]}" if opts[:group].present?
+          sql_query << "ORDER BY #{opts[:order]}" if opts[:order].present?
+          if sql_query.present? || opts[:select].present?
+            sql_query.insert(0, "SELECT #{opts[:select] || '*'}")
+            sql_query.insert(1, 'FROM log')
+            if opts[:line] || opts[:page] || opts[:offset]
+              parse_page
+              sql_query << "LIMIT #{@opts[:offset]},#{@opts[:line]}"
+            end
+          end
+          "#{opts[:query]}#{sql_query.join(' ')}"
+        end
+
         private
 
+        def execute(query)
+          puts query.slice(:from, :to, :search, :query).to_json
+          res = Log.record_connection.get_logs(@klass.project_name, @klass.logstore_name, query)
+          JSON.parse(res)
+        end
+
+        def parse_page
+          @opts[:line] ||= 100
+          @opts[:page] ||= 0
+          @opts[:offset] = @opts[:page] * @opts[:line]
+        end
+
         def statement_ql(*statement)
           if statement.size == 1
             sanitize_hash(statement.first)
@@ -225,7 +317,7 @@ module Aliyun
         end
 
         def _quote(type, value)
-          v = TypeCasting.dump_field(value, cast_type: type || :string)
+          v = TypeCasting.cast_field(value, cast_type: type || :string)
           case type
           when :string, nil then "'#{v.to_s}'"
           when :bigdecimal  then v.to_s("F")
@@ -239,7 +331,7 @@ module Aliyun
         def _quote_type_value(value)
           case value.class.name
           when 'String'                   then "'#{value.to_s}'"
-          when 'BigDecimal'               then value.to_s("F")
+          when 'BigDecimal', 'Float'      then value.to_s("F")
           when 'Date', 'DateTime', 'Time' then "'#{value.iso8601}'"
           else
             value

data/lib/aliyun/log/record/scoping.rb

@@ -10,9 +10,10 @@ module Aliyun
         extend ActiveSupport::Concern
 
         module ClassMethods
-          delegate :load, :result, :count, to: :all
-          delegate :where, :query, :search, :sql, :from, :to,
-                   :page, :line, :limit, :offset, to: :all
+          delegate :load, :result, :count, :sum, to: :all
+          delegate :where, :query, :search, :sql, :from, :to, :api,
+                   :page, :line, :limit, :offset, :select, :group,
+                   :order, :to_sql, to: :all
           delegate :first, :last, :second, :third, :fourth, :fifth, :find_offset, to: :all
 
           def current_scope

data/lib/aliyun/log/record/type_casting.rb

@@ -9,7 +9,7 @@ module Aliyun
         TYPE_MAPPING = {
           text: :string,
           long: :integer,
-          double: :bigdecimal,
+          double: :float,
           json: :json
         }.freeze
 
@@ -148,6 +148,26 @@ module Aliyun
           end
         end
 
+        class FloatType < Value
+          def cast(value)
+            if value == true
+              1
+            elsif value == false
+              0
+            elsif value.is_a?(Symbol)
+              value.to_s.to_f
+            elsif value.is_a?(String) && value.blank?
+              nil
+            elsif value.is_a?(Float) && !value.finite?
+              nil
+            elsif !value.respond_to?(:to_f)
+              nil
+            else
+              value.to_f
+            end
+          end
+        end
+
         class JsonType < Value
           def cast(value)
             return value unless value.is_a?(String)
@@ -183,6 +203,7 @@ module Aliyun
           register(:datetime, DateTimeType)
           register(:bigdecimal, BigDecimalType)
           register(:integer, IntegerType)
+          register(:float, FloatType)
           register(:json, JsonType)
         end
       end

data/lib/aliyun/version.rb

@@ -2,6 +2,6 @@
 
 module Aliyun
   module Log
-    VERSION = '0.2.10'
+    VERSION = '0.2.11'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aliyun-log
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors:
 - Yingce Liu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-29 00:00:00.000000000 Z
+date: 2020-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel