groovy 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2569117dfa3663d6c60ed950be2972c58116e7eaf6d21f5c6640cb91642fee4f
-  data.tar.gz: 33e1651825dd626dab979e9c504d5de1b7d8162363d42cbeca43873e370cad04
+  metadata.gz: 43812d3bd8ef9579ceed22b3d19e78378ceb3a924bfc8d6c0983e49199c26c88
+  data.tar.gz: 5960ca73a253d62f31301995c8f643bcaa084a99140b5f59eee0161c816d20e2
 SHA512:
-  metadata.gz: 66b311fe79a3f9c8467ddbe9f863a2fd731b9c7dd9df2dbeb49fc1b8d62f4b7b506b2e0ca1f05c6ad7766ede89df0a26cb4a8eae8f96097ff613ab17cadde593
-  data.tar.gz: c1dbb4f84dfdb79d870a0e498acbc63d7e1268f5cfd1f0951fd16cc7d890b68a6d3679e903eb703b8de4a44b6765070594df0eb53b8cfbeb7ac9fb1499f5dd3f
+  metadata.gz: 22cc09a73d9804f5d5e1cb432d3948ff24ef9a28dbd84b5a403b3709477d013089617ebf19b23f4d3450c3c7dc8e15c01ab527698c5efa5821c9d351056777ad
+  data.tar.gz: 809b9fa8e3158df7afeb6e80967d7156772094b21b69f6fe7d9f5e6db03626fe8a9b2ee123f89c7bf791ef6e195415524b1e967291d836becdc6173fbd0bfbfc

data/example/basic.rb

@@ -28,4 +28,18 @@ populate if Product.count == 0
 
 # 50_000 products: 50M
 # 100_000 products: 50M
-# 500_000 products: 62M
+# 500_000 products: 62M
+
+module MemInfo
+  KERNEL_PAGE_SIZE = `getconf PAGESIZE`.chomp.to_i rescue 4096
+  STATM_PATH       = "/proc/#{Process.pid}/statm"
+  STATM_FOUND      = File.exist?(STATM_PATH)
+  def self.rss
+    STATM_FOUND ? (File.read(STATM_PATH).split(' ')[1].to_i * KERNEL_PAGE_SIZE) / 1024 : 0
+  end
+end
+
+puts MemInfo.rss
+prices = Product.all.map { |x| x.price }
+puts prices.inspect
+puts MemInfo.rss

data/lib/groovy/model.rb

@@ -150,7 +150,6 @@ module Groovy
       #   Groonga["#{table_name}.#{name}"] # .search, .similar_search, etc
       # end
 
-
       def index_search(column, query, options = {}, &block)
         results = table.select { |rec| rec[column].match(query) }
         render_results(results, &block)
@@ -283,13 +282,13 @@ module Groovy
       end
     end
 
-    attr_reader :id, :attributes, :record, :changes
+    attr_reader :id, :record, :changes
 
     def initialize(attrs = nil, record = nil, key = nil)
       @attributes, @vectors, @_key = {}, {}, key # key is used on creation only
 
       if set_record(record)
-        set_attributes_from_record(record)
+        # load_attributes_from_record(record)
       else
         attrs ||= {}
         unless attrs.is_a?(Hash)
@@ -307,8 +306,13 @@ module Groovy
 
     # get reference to the actual record in the Groonga table,
     # not the temporary one we get as part of a search result.
-    def load_record
-      self.class.table[id]
+    # def load_record
+    #   self.class.table[id]
+    # end
+
+    def attributes
+      load_attributes_from_record # populate missing
+      @attributes
     end
 
     def inspect
@@ -321,7 +325,9 @@ module Groovy
     end
 
     def [](key)
-      attributes[key.to_sym]
+      k = key.to_sym
+      @attributes[k] = get_record_attribute(k) unless @attributes.key?(k)
+      @attributes[k]
     end
 
     def []=(key, val)
@@ -382,11 +388,15 @@ module Groovy
     end
 
     def reload
-      raise RecordNotPersisted if id.nil?
-      ensure_persisted!
-      rec = self.class.table[id] # _key
-      # set_record(rec)
-      set_attributes_from_record(rec)
+      unless new_record?
+        # raise RecordNotPersisted if id.nil?
+        # ensure_persisted!
+        rec = self.class.table[id] # _key
+        set_record(rec)
+        # load_attributes_from_record
+      end
+
+      @attributes = {}
       @changes = {}
       self
     end
@@ -406,6 +416,7 @@ module Groovy
     private
 
     def get_record_attribute(key)
+      return if record.nil?
       val = record[key]
       if self.class.schema.time_columns.include?(key)
         fix_time_value(val)
@@ -423,15 +434,15 @@ module Groovy
     #   record.respond_to?(:_key) ? record._key : id
     # end
 
-    def set_attributes_from_record(rec)
+    def load_attributes_from_record
       self.class.attribute_names.each do |col|
-        public_send("#{col}=", get_record_attribute(col))
+        public_send("#{col}=", get_record_attribute(col)) unless @attributes.key?(col)
       end
     end
 
     def set_attribute(key, val)
-      changes[key.to_sym] = [self[key], val] if changes # nil when initializing
-      attributes[key.to_sym] = val
+      changes[key.to_sym] = [self[key], val] if changes # nil before initializing
+      @attributes[key.to_sym] = val
     end
 
     def get_ref(name)
@@ -456,7 +467,7 @@ module Groovy
 
     def create
       fire_callbacks(:before_create)
-      set_record(self.class.insert(attributes, @_key))
+      set_record(self.class.insert(@attributes, @_key))
       fire_callbacks(:after_create)
       self
     end

data/lib/groovy/query.rb

@@ -192,11 +192,16 @@ module Groovy
     end
 
     def [](index)
-      records[index]
+      if r = results[index]
+        model.new_from_record(r)
+      end
     end
 
     def each(&block)
-      records.each { |r| block.call(r) }
+      # records.each { |r| block.call(r) }
+      results.each_with_index do |r, index|
+        yield model.new_from_record(r)
+      end
     end
 
     def update_all(attrs)
@@ -236,15 +241,15 @@ module Groovy
       end
     end
 
+    private
+    attr_reader :model, :table, :options, :select_block
+
     def records
       @records ||= results.map do |r|
         model.new_from_record(r)
       end
     end
 
-    private
-    attr_reader :model, :table, :options, :select_block
-
     def get_last(count = 1)
       if count > 1
         records[(size-count)..-1]

data/lib/groovy/schema.rb

@@ -26,6 +26,7 @@ module Groovy
     def initialize(context, table_name, opts = {})
       @context, @table_name, @opts = context, table_name, opts || {}
       @spec, @index_columns = {}, []
+      @cache = {}
     end
 
     def table
@@ -33,47 +34,44 @@ module Groovy
     end
 
     def search_table
-      @search_table ||= context[SEARCH_TABLE_NAME]
+      @cache[:search_table] ||= context[SEARCH_TABLE_NAME]
     end
 
     def column_names
-      get_names table.columns
+      @cache[:column_names] ||= get_names(table.columns)
     end
 
     def singular_references
-      # @singular_references ||=
-      get_names(table.columns.select(&:reference_column?).reject(&:vector?))
+      @cache[:singular_references] ||= get_names(table.columns.select(&:reference_column?).reject(&:vector?))
     end
 
     def plural_references
-      # @plural_references ||=
-      get_names(table.columns.select(&:vector?))
+      @cache[:plural_references] ||= get_names(table.columns.select(&:vector?))
     end
 
     def attribute_columns
-      # @attribute_columns ||=
-      get_names(table.columns.select { |c| c.column? && !c.reference_column? && !c.vector? })
+      @cache[:attribute_columns] ||= get_names(table.columns.select { |c| c.column? && !c.reference_column? && !c.vector? })
     end
 
     def time_columns
-      columns_by_type('Time')
+      @cache[:time_columns] ||= columns_by_type('Time')
     end
 
     def integer_columns
-      columns_by_type('Int32')
+      @cache[:integer_columns] ||= columns_by_type('Int32')
     end
 
     def boolean_columns
-      columns_by_type('Bool')
+      @cache[:boolean_columns] ||= columns_by_type('Bool')
     end
 
     def columns_by_type(type)
       get_names(table.columns.select { |c| c.column? && c.range.name == type })
     end
 
-    # def time_column?(name)
-    #   time_columns.include?(name)
-    # end
+    def reload
+      @cache = {}
+    end
 
     def rebuild!
       log("Rebuilding!")
@@ -116,6 +114,8 @@ module Groovy
       @index_columns.each do |col|
         add_index_on(col)
       end
+
+      reload
       self
     end
 

data/lib/groovy/version.rb

@@ -1,3 +1,3 @@
 module Groovy
-  VERSION = '0.4.6'.freeze
+  VERSION = '0.4.7'.freeze
 end

data/spec/model_spec.rb

@@ -86,6 +86,28 @@ describe Groovy::Model do
   end
 
   describe '#[]' do
+    it 'reads value from record' do
+      prod = TestProduct.create!(name: 'A product', price: 100)
+      expect(prod.name).to eq('A product')
+      expect(prod['name']).to eq('A product')
+      expect(prod[:name]).to eq('A product')
+
+      prod = TestProduct.find(prod.id)
+      expect(prod.name).to eq('A product')
+      expect(prod['name']).to eq('A product')
+      expect(prod[:name]).to eq('A product')
+
+      prod = TestProduct.new
+      expect(prod.name).to eq(nil)
+      prod.name = 'Another product'
+      expect(prod.name).to eq('Another product')
+      prod.reload
+      expect(prod.name).to eq(nil)
+      prod.name = 'Another product'
+      prod.save
+      prod.reload
+      expect(prod.name).to eq('Another product')
+    end
   end
 
   describe '#[]=' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groovy
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Tomás Pollak