poliqarpr 0.1.7 → 0.1.8

data/changelog.txt

@@ -1,3 +1,7 @@
+0.1.8
+- fix subsequent single result queries
+- always cancel previous job before starting a new one
+
 0.1.7
 - speed up querying of specific results
 

data/lib/poliqarpr/client.rb

@@ -28,7 +28,8 @@ module Poliqarp
       @connector = Connector.new(self)
       @config = Config.new(self,500000)
       @answer_queue = Queue.new
-      @waiting_mutext = Mutex.new
+      @waiting_mutex = Mutex.new
+      @query_mutex = Mutex.new
       new_session
       config.left_context_size = 5
       config.right_context_size = 5
@@ -380,24 +381,34 @@ protected
 
     # *Asynchronous* Sends the query to the server
     # * +query+ query to send
+    # * +should_wait+ flag indicating that before sending the
+    #   query to the server, the receiver should start wating
+    #   (i.e. the call is async).
     # * +handler+ if given, the method returns immediately,
     #   and the answer is sent to the handler. In this case
     #   the result returned by make_query should be IGNORED!
-    def make_query(query, &handler)
+    def make_query(query, should_wait=false,&handler)
       if @last_query != query
-        @last_query = query
-        begin
-          talk("MAKE-QUERY #{query}")
-        rescue JobInProgress
-          talk("CANCEL") rescue nil
-          talk("MAKE-QUERY #{query}")
+        if @last_query != nil
+          begin
+            talk("CANCEL")
+            stop_waiting
+            finish_query
+          rescue InvalidJobId
+            # this is ok - there might be no job running
+          end
         end
+        @last_query = query
+        talk("MAKE-QUERY #{query}")
+        start_waiting if should_wait
+        run_query
         result = talk("RUN-QUERY #{config.buffer_size}", :async, &handler)
         if handler.nil?
           @last_result = result
         end
       else
-        stop_waiting
+        start_waiting if should_wait
+        stop_waiting if query_done?
       end
       @last_result
     end
@@ -416,7 +427,7 @@ protected
 
     # Stop waiting for the ansynchonous answer.
     def stop_waiting
-      @waiting_mutext.synchronize {
+      @waiting_mutex.synchronize {
         @should_wait = false
       }
       debug("WAITING stopped")
@@ -425,7 +436,7 @@ protected
     # Check if the thread should still wait for the answer.
     def should_wait?
       should_wait = nil
-      @waiting_mutext.synchronize {
+      @waiting_mutex.synchronize {
         should_wait = @should_wait
       }
       should_wait
@@ -433,23 +444,49 @@ protected
 
     # Start waiting for the answer.
     def start_waiting
-      @waiting_mutext.synchronize {
+      @waiting_mutex.synchronize {
         @should_wait = true
       }
       debug("WAITING started")
     end
 
+    def run_query
+      @query_mutex.synchronize {
+        @query_done = false
+      }
+      debug("QUERY started")
+    end
+
+    def query_done?
+      done = nil
+      @query_mutex.synchronize {
+        done = @query_done
+      }
+      done
+    end
+
+    def finish_query
+      @query_mutex.synchronize {
+        @query_done = true
+      }
+      debug("QUERY finished")
+    end
+
     def make_async_query(query,answer_offset)
-      raise IndexOutOfBounds.new(answer_offset) if answer_offset > config.buffer_size
-      start_waiting
+      raise IndexOutOfBounds.new(answer_offset) if answer_offset >= config.buffer_size
       # we access the result count through BUFFER-STATE call
-      make_query(query){|msg| stop_waiting}
+      make_query(query,true) do |msg|
+        if msg =~ /QUERY-DONE/
+          stop_waiting
+          finish_query
+        end
+      end
       result_count = 0
       begin
         # the result count might be not exact!
         result_count = talk("BUFFER-STATE").split(" ")[2].to_i
         break unless should_wait?
-      end while result_count < answer_offset
+      end while result_count <= answer_offset
       # force stop waiting if the result offset is reached before the query has finished
       stop_waiting
       @last_result = "OK #{result_count}"

data/lib/poliqarpr/connector.rb

@@ -85,6 +85,8 @@ module Poliqarp
       if message =~ /^ERR/
         code = message.match(/\d+/)[0].to_i
         case code
+        when 14
+          raise InvalidJobId.new()
         when 15
           raise JobInProgress.new()
         else

data/lib/poliqarpr/exceptions.rb

@@ -1,7 +1,7 @@
 module Poliqarp
   # Author:: Aleksander Pohl (mailto:apohllo@o2.pl)
   # License:: MIT License
-  
+
   # Base for all poliqarp exceptions.
   class PoliqarpException < Exception; end
 
@@ -10,6 +10,9 @@ module Poliqarp
   # asynchronous call.
   class JobInProgress < PoliqarpException; end
 
+  # The InvalidJobId exceptions is raised when there is no job to be cancelled.
+  class InvalidJobId < PoliqarpException; end
+
   # The IndexOutOfBounds exception is raised if the index of given excerpt
   # is larger than the size of query buffer.
   class IndexOutOfBounds < PoliqarpException

data/poliqarpr.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "poliqarpr"
-  s.version = "0.1.7"
+  s.version = "0.1.8"
   s.date = Time.now.strftime("%Y-%m-%d")
   s.summary = "Ruby client for Poliqarp"
   s.email = "apohllo@o2.pl"

data/spec/client.rb

@@ -30,7 +30,7 @@ describe Poliqarp::Client do
 
     it "should work with debug turned on" do
       @client.debug = true
-      (proc do 
+      (proc do
         @client.ping
       end).should_not raise_error(Exception)
     end
@@ -49,7 +49,7 @@ describe Poliqarp::Client do
     end
 
     it "should raise error if failed to open corpus" do
-      (proc do 
+      (proc do
         @client.open_corpus("")
       end).should raise_error(Poliqarp::PoliqarpException)
     end
@@ -186,6 +186,18 @@ describe Poliqarp::Client do
           @client.find("nachalny",:index => 2)
         end).should raise_error(Poliqarp::IndexOutOfBounds)
       end
+
+      it "should work for examples with distant index" do
+        @client.config.buffer_size = 10000
+        @client.find("i",:index => 100)
+      end
+
+      it "should work for subseqent examples with distant indices" do
+        @client.config.buffer_size = 10001
+        @client.find("a",:index => 1)
+        @client.find("a",:index => 10000)
+      end
+
     end
 
     describe("(with lemmata flags set to true)") do

metadata

@@ -2,7 +2,7 @@
 name: poliqarpr
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - Aleksander Pohl
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 +01:00
+date: 2011-03-08 00:00:00 +01:00
 default_executable: 
 dependencies: []