Merge pull request #58 from Y-Wakuta/feature/#56

Feature/#56

Author: Y-Wakuta

lib/nose.rb

@@ -11,6 +11,8 @@ module NoSE
 require_relative 'nose/debug'
 require_relative 'nose/enumerator'
 require_relative 'nose/pruned_enumerator'
+require_relative 'nose/simple_enumerator'
+require_relative 'nose/migrator'
 require_relative 'nose/indexes'
 require_relative 'nose/loader'
 require_relative 'nose/model'
@@ -23,6 +25,7 @@ module NoSE
 require_relative 'nose/schema'
 require_relative 'nose/search'
 require_relative 'nose/iterative_search'
+require_relative 'nose/cached_search'
 require_relative 'nose/statements'
 require_relative 'nose/timing'
 require_relative 'nose/workload'

lib/nose/backend.rb

@@ -189,7 +189,7 @@ def result_conditions(conditions, results)
         end
 
         # Decide which fields should be selected
-        def expand_selected_fields(select)
+        def expand_selected_fields(select, later_indexlookup_steps)
           # We just pick whatever is contained in the index that is either
           # mentioned in the query or required for the next lookup
           # TODO: Potentially try query.all_fields for those not required
@@ -198,6 +198,14 @@ def expand_selected_fields(select)
           select += @next_step.index.hash_fields \
             unless @next_step.nil? ||
                    !@next_step.is_a?(Plans::IndexLookupPlanStep)
+
+          if !@next_step.is_a?(Plans::IndexLookupPlanStep) \
+              and !later_indexlookup_steps.nil?
+            later_indexlookup_steps.each do |later_indexlookup_step|
+              select += later_indexlookup_step.index.hash_fields
+            end
+          end
+
           select &= @step.index.all_fields
 
           select
@@ -254,8 +262,18 @@ def include_row?(row, eq_conditions, range)
           end
 
           if range
-            range_check = row[range.field.id].method(range.operator)
-            select &&= range_check.call range.value
+            if row[range.field.id].nil?
+              # if range condition field is null, remove the row from the result
+              select = false
+            else
+              range_check = row[range.field.id].method(range.operator)
+              begin
+                select &&= range_check.call range.value
+              rescue Exception => e
+                puts e
+                throw e
+              end
+            end
           end
 
           select
@@ -365,8 +383,16 @@ def prepare_query_steps(steps, fields, conditions)
           subclass_step_name = step_class.name.sub \
             'NoSE::Backend::Backend', self.class.name
           step_class = Object.const_get subclass_step_name
-          step_class.new client, fields, conditions,
-                         step, next_step, prev_step
+          if step_class == NoSE::Backend::CassandraBackend::IndexLookupStatementStep \
+              and steps.index(next_step) + 2 < steps.size
+            #and steps[steps.index(next_step) + 1].is_a?(NoSE::Backend::CassandraBackend::IndexLookupStatementStep)
+            later_indexlookup_steps = steps[(steps.index(next_step) + 1)..-1].select{|s| s.is_a? Plans::IndexLookupPlanStep}
+            step_class.new client, fields, conditions,
+                           step, next_step, prev_step, later_indexlookup_steps
+          else
+            step_class.new client, fields, conditions,
+                           step, next_step, prev_step
+          end
         end
       end