tem_mr_search 0.2 → 0.2.1

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.2.1. Check for cluster configuration on each query.
+
 v0.2. Implemented remote queries.
 
 v0.1. Initial release.

data/lib/tem_mr_search/client.rb

@@ -9,7 +9,7 @@ class Client
   def self.search(server_addr, client_query)
     output = issue_request server_addr, :type => :search, :root_tem => 0,
                                         :map_reduce => client_query.to_hash
-    client_query.unpack_output output
+    output ? client_query.unpack_output(output) : nil
   end
   
   # Asks for an item in the server's database.
@@ -26,9 +26,17 @@ class Client
     issue_request server_addr, :type => :shutdown
   end
   
+  # Dumps the server database.
+  #
+  # In production, normal clients wouldn't have access to this.
+  def self.dump_database(server_addr)
+    issue_request server_addr, :type => :db_dump
+  end
+  
   # Issues a request against a Map-Reduce server and returns the response.
   def self.issue_request(server_addr, request)
-    socket = Zerg::Support::SocketFactory.socket :out_addr => server_addr
+    socket = Zerg::Support::SocketFactory.socket :out_addr => server_addr,
+        :out_port => Server::DEFAULT_PORT
     socket.extend OPAdapter
     begin
       socket.send_object request

data/lib/tem_mr_search/server.rb

@@ -5,6 +5,8 @@ require 'yaml'
 module Tem::Mr::Search
 
 class Server
+  DEFAULT_PORT = 9052
+  
   OP = Zerg::Support::Protocols::ObjectProtocol
   OPAdapter  = Zerg::Support::Sockets::ProtocolAdapter.adapter_module OP
   
@@ -12,8 +14,19 @@ class Server
   def initialize(db_file, cluster_file, port)
     @logger = Logger.new STDERR
     @db = Db.new db_file
-    @tems = Server.tems_from_cluster_file cluster_file
-    @port = port
+    @cluster_file = cluster_file
+    @tems = []
+    refresh_tems!
+    @port = port || DEFAULT_PORT
+  end
+  
+  # Reinitializes the TEM cluster connections.
+  #
+  # This should be called reasonably often to be able to respond to cluster
+  # configuration changes.
+  def refresh_tems!
+    @tems.each { |tem| tem.disconnect }
+    @tems = Server.tems_from_cluster_file @cluster_file
   end
 
   # This server's loop.
@@ -37,7 +50,7 @@ class Server
       rescue Exception => e
         @logger.error e
       end
-      client_socket.close rescue nil
+      client_socket.close
     end
     listen_socket.close
   end
@@ -46,6 +59,7 @@ class Server
   def process_request(request)    
     case request[:type]
     when :search
+      refresh_tems!
       job = MapReduceJob.new request[:map_reduce]
       root_tem = request[:root_tem]
       executor = MapReduceExecutor.new job, @db, @tems, root_tem
@@ -54,6 +68,8 @@ class Server
       return @db.item_by_id(request[:id]) || :not_found
     when :shutdown
       return :shutdown
+    when :db_dump
+      return (0...@db.length).map { |i| @db.item(i) }
     else
       return :unknown
     end

data/tem_mr_search.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tem_mr_search}
-  s.version = "0.2"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]

data/test/test_client_server.rb

@@ -8,7 +8,7 @@ class ClientServerTest < MrTestCase
     
   def setup
     super
-    @server_port = 29552
+    @server_port = 29550
   end
     
   def _test_request
@@ -27,11 +27,24 @@ class ClientServerTest < MrTestCase
     end
   end
   
+  def test_dump_database
+    @server_port = 29557
+    _test_request do |server_addr|
+      items = Client.dump_database server_addr
+      assert_equal @db.length, items.length, 'Wrong number of items'
+      items.each_with_index do |item, i|
+        assert_equal @db.item(i), item, "Discrepancy in item #{i}"
+      end
+    end    
+  end
+  
   def test_query
-    Tem.auto_conf
-    @server_port = 29553
+    @server_port = 29551
     flexmock(Server).should_receive(:tems_from_cluster_file).
-                     with(@empty_cluster_file).and_return [$tem]
+                     with(@empty_cluster_file).and_return do |file|
+      Tem.auto_conf
+      [$tem]
+    end
     _test_request do |server_addr|
       result = Client.search server_addr, @client_query
       gold_item = @db.item 5

data/test/test_map_reduce_executor.rb

@@ -9,6 +9,10 @@ class MapReduceExecutorTest < MrTestCase
     $tem.activate
     $tem.emit
   end
+  
+  def teardown
+    $tem.disconnect
+  end
     
   def _test_executor(tems, root_tem)
     executor = MRExecutor.new @client_query, @db, tems, root_tem

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tem_mr_search
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: 0.2.1
 platform: ruby
 authors: 
 - Victor Costan