nose 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdab6ac0cd36aff76527e1581daa256c7078b99aca5221d0744b9c0d8ab0fd7e
-  data.tar.gz: 3972ad33202958c29b58fd26863f485a25526fe5369c82e47f8555b89d638cc6
+  metadata.gz: 4104b913e3d80c2b02480929ab4689cf58fa16801214e064c8e6fb5562507997
+  data.tar.gz: 65da94fc536524e82c9d0b6c5f0b21dbb09ec9ce54a8735b8368c1afde0e2df3
 SHA512:
-  metadata.gz: 9d21c1fbf046dfc271d232213b1d870b714182ccbd251976587d54f6024da5e88aba65ef7a891d6ab0b6e01af33d82f0e30da0d41fdae9ee3c126da4c54d5824
-  data.tar.gz: 416fdc8224f4446a14491806a8907c8a8381009b4315f615d994d87dd4b1f28bd8e9f60d1b04e5c6b72e53518b9c217d8c9596be99337e4082b05d5a142c24c8
+  metadata.gz: b763ec409386c46522e090e8e9466dbb5e32b9b01f5bea23e20b6c6a739dd0a89ff91fa5b2cbae1d3719a5a90eba1b7975517e5851106eb1891ec8a722d5dce9
+  data.tar.gz: 39a4647647c7df4cd5db4f58a74e3aa1ba5691ae069d1788844b419d20c6c7276448408c89902203ebaf2c0ddb4ca73303153c3c041dd4375f58b0d8c63b26fb

data/lib/nose/cost.rb

@@ -13,7 +13,7 @@ module NoSE
       end
 
       # The cost of filtering intermediate results
-      # @return [Fixnum]
+      # @return [Integer]
       def filter_cost(_step)
         # Assume this has no cost and the cost is captured in the fact that we
         # have to retrieve more data earlier. All this does is skip records.
@@ -21,14 +21,14 @@ module NoSE
       end
 
       # The cost of limiting a result set
-      # @return [Fixnum]
+      # @return [Integer]
       def limit_cost(_step)
         # This is basically free since we just discard data
         0
       end
 
       # The cost of sorting a set of results
-      # @return [Fixnum]
+      # @return [Integer]
       def sort_cost(_step)
         # TODO: Find some estimate of sort cost
         #       This could be partially captured by the fact that sort + limit
@@ -37,25 +37,25 @@ module NoSE
       end
 
       # The cost of performing a lookup via an index
-      # @return [Fixnum]
+      # @return [Integer]
       def index_lookup_cost(_step)
         fail NotImplementedError, 'Must be implemented in a subclass'
       end
 
       # The cost of performing a deletion from an index
-      # @return [Fixnum]
+      # @return [Integer]
       def delete_cost(_step)
         fail NotImplementedError, 'Must be implemented in a subclass'
       end
 
       # The cost of performing an insert into an index
-      # @return [Fixnum]
+      # @return [Integer]
       def insert_cost(_step)
         fail NotImplementedError, 'Must be implemented in a subclass'
       end
 
       # This is here for debugging purposes because we need a cost
-      # @return [Fixnum]
+      # @return [Integer]
       def pruned_cost(_step)
         0
       end

data/lib/nose/model/entity.rb

@@ -35,7 +35,7 @@ module NoSE
     alias eql? ==
 
     # The hash is based on the name of the entity and its fields
-    # @return [Fixnum]
+    # @return [Integer]
     def hash
       @hash ||= @name.hash
     end

data/lib/nose/model/fields.rb

@@ -34,7 +34,7 @@ module NoSE
       alias eql? ==
 
       # Hash by entity and name
-      # @return [Fixnum]
+      # @return [Integer]
       def hash
         @hash ||= id.hash
       end
@@ -104,8 +104,20 @@ module NoSE
         method_name = child_class.name.sub(method_regex, '\1')
         EntityDSL.send :define_method, method_name,
                        (proc do |*args|
-                         send(:instance_variable_get, :@entity).send \
-                           :<<, child_class.new(*args)
+                         entity = send :instance_variable_get, :@entity
+
+                         # XXX This is necessary since passing a hash of
+                         #     keyword arguments as the last argument is
+                         #     now deprecated
+                         if args.last.is_a? Hash
+                           hash_args = args.last
+                           args.pop
+                         else
+                           hash_args = {}
+                         end
+
+                         field = child_class.new(*args, **hash_args)
+                         entity.send :<<, field
                        end)
       end
       private_class_method :add_field_method
@@ -122,13 +134,13 @@ module NoSE
       end
 
       # Parse an Integer from the provided parameter
-      # @return [Fixnum]
+      # @return [Integer]
       def self.value_from_string(string)
         string.to_i
       end
 
       # Random numbers up to the given size
-      # @return [Fixnum]
+      # @return [Integer]
       def random_value
         rand(@cardinality)
       end
@@ -167,8 +179,7 @@ module NoSE
 
     # Field holding a float
     class FloatField < Field
-      # Any Fixnum is a valid float
-      TYPE = Fixnum
+      TYPE = Float
 
       def initialize(name, **options)
         super(name, 8, **options)
@@ -284,7 +295,7 @@ module NoSE
 
       # The number of entities associated with the foreign key,
       # or a manually set cardinality
-      # @return [Fixnum]
+      # @return [Integer]
       def cardinality
         @entity.count || super
       end

data/lib/nose/plans.rb

@@ -72,7 +72,7 @@ module NoSE
       end
 
       # Calculate the cost of executing this step in the plan
-      # @return [Fixnum]
+      # @return [Integer]
       def calculate_cost(cost_model)
         @cost = cost_model.method((subtype_name + '_cost').to_sym).call self
       end

data/lib/nose/plans/execution_plan.rb

@@ -173,7 +173,7 @@ module NoSE
       end
 
       # The estimated cost of executing this plan
-      # @return [Fixnum]
+      # @return [Integer]
       def cost
         costs = @steps.map(&:cost) + @update_steps.map(&:cost)
         costs += @query_plans.map(&:steps).flatten.map(&:cost)

data/lib/nose/plans/query_planner.rb

@@ -171,7 +171,7 @@ module NoSE
       end
 
       # The weight of this query for a given workload
-      # @return [Fixnum]
+      # @return [Integer]
       def weight
         return 1 if @workload.nil?
 

data/lib/nose/plans/update_planner.rb

@@ -50,7 +50,7 @@ module NoSE
       end
 
       # The weight of this query for a given workload
-      # @return [Fixnum]
+      # @return [Integer]
       def weight
         return 1 if @workload.nil?
 
@@ -145,13 +145,13 @@ module NoSE
       end
 
       # The cost of performing the update on this index
-      # @return [Fixnum]
+      # @return [Integer]
       def update_cost
         @update_steps.sum_by(&:cost)
       end
 
       # The cost is the sum of all the query costs plus the update costs
-      # @return [Fixnum]
+      # @return [Integer]
       def cost
         @query_plans.sum_by(&:cost) + update_cost
       end

data/lib/nose/random.rb

@@ -353,7 +353,7 @@ module NoSE
     end
 
     # Return the next valid random number
-    # @return [Fixnum]
+    # @return [Integer]
     def rand
       if @valid
         @valid = false
@@ -367,7 +367,7 @@ module NoSE
     end
 
     # Return a random number for the given distribution
-    # @return [Array<Fixnum>]
+    # @return [Array<Integer>]
     def self.gaussian(mean, stddev)
       theta = 2 * Math::PI * rand
       rho = Math.sqrt(-2 * Math.log(1 - rand))

data/lib/nose/serialize.rb

@@ -251,7 +251,7 @@ module NoSE
       property :cardinality, exec_context: :decorator
 
       # The estimated hash cardinality at this step in the plan
-      # @return [Fixnum]
+      # @return [Integer]
       def hash_cardinality
         state = represented.instance_variable_get(:@state)
         state.hash_cardinality if state.is_a?(Plans::QueryState)
@@ -326,7 +326,7 @@ module NoSE
       property :type, exec_context: :decorator
 
       # The estimated cardinality of entities being updated
-      # @return [Fixnum]
+      # @return [Integer]
       def cardinality
         state = represented.instance_variable_get(:@state)
         state.cardinality unless state.nil?

data/lib/nose/util.rb

@@ -166,7 +166,7 @@ end
 # Simple helper class to facilitate cardinality estimates
 class Cardinality
   # Update the cardinality based on filtering implicit to the index
-  # @return [Fixnum]
+  # @return [Integer]
   def self.filter(cardinality, eq_filter, range_filter)
     filtered = (range_filter.nil? ? 1.0 : 0.1) * cardinality
     filtered *= eq_filter.map do |field|

data/models/eac.rb

@@ -34,11 +34,11 @@ NoSE::Model.new do
   end) * 5_000
 
   HasOne 'player',    'sessions',
-         'Session' => 'Player'
+         {'Session' => 'Player'}
 
   HasOne 'server',    'sessions',
-         'Session' => 'Server'
+         {'Session' => 'Server'}
 
   HasOne 'session',       'states',
-         'PlayerState' => 'Session'
+         {'PlayerState' => 'Session'}
 end

data/models/ebay.rb

@@ -26,7 +26,7 @@ NoSE::Model.new do
   end) * 10_000
 
   HasOne 'user',    'likes',
-         'likes' => 'users'
+         {'likes' => 'users'}
   HasOne 'item',    'likes',
-         'likes' => 'items'
+         {'likes' => 'items'}
 end

data/models/rubis.rb

@@ -64,34 +64,34 @@ NoSE::Model.new do
   end) * 40_000
 
   HasOne 'region',       'users',
-         'users'      => 'regions'
+         {'users'      => 'regions'}
 
   HasOne 'seller',       'items_sold',
-         'items'      => 'users'
+         {'items'      => 'users'}
 
   HasOne 'category',     'items',
-         'items'      => 'categories'
+         {'items'      => 'categories'}
 
   HasOne 'user',         'bids',
-         'bids'       => 'users'
+         {'bids'       => 'users'}
 
   HasOne 'item',         'bids',
-         'bids'       => 'items'
+         {'bids'       => 'items'}
 
   HasOne 'from_user',    'comments_sent',
-         'comments'   => 'users'
+         {'comments'   => 'users'}
 
   HasOne 'to_user',      'comments_received',
-         'comments'   => 'users'
+         {'comments'   => 'users'}
 
   HasOne 'item',         'comments',
-         'comments'   => 'items'
+         {'comments'   => 'items'}
 
   HasOne 'buyer',        'bought_now',
-         'buynow'     => 'users'
+         {'buynow'     => 'users'}
 
   HasOne 'item',         'bought_now',
-         'buynow'     => 'items'
+         {'buynow'     => 'items'}
 end
 
 # rubocop:enable all

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nose
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Michael Mior