lib/active_rdf/federation/federation_manager.rb in activerdf-1.0 vs lib/active_rdf/federation/federation_manager.rb in activerdf-1.1

- old
+ new

@@ -1,18 +1,14 @@ -# Manages the federation of datasources -# distributes queries to right datasources and merges their results -# -# Author:: Eyal Oren -# Copyright:: (c) 2005-2006 -# License:: LGPL require 'federation/connection_pool' +# Manages the federation of datasources: distributes queries to right +# datasources and merges their results + class FederationManager # add triple s,p,o to the currently selected write-adapter def FederationManager.add(s,p,o) # TODO: allow addition of full graphs - $log.debug "FederationManager: add: triple is #{s} #{p} #{o}" ConnectionPool.write_adapter.add(s,p,o) end # executes read-only queries # by distributing query over complete read-pool @@ -20,11 +16,10 @@ def FederationManager.query(q, options={:flatten => true}) if ConnectionPool.read_adapters.empty? raise ActiveRdfError, "cannot execute query without data sources" end - $log.debug "FederationManager: query called with: #{q}" # ask each adapter for query results # and yield them consequtively if block_given? ConnectionPool.read_adapters.each do |source| source.query(q) do |*clauses| @@ -70,11 +65,8 @@ else final_results = results end end - $log.debug_pp("FederationManager: query results are %s", final_results) - - - return final_results + final_results end end