Browse files

bug22191: Remove :wait-flush argument from solr-commit, solr-optimize.

The :wait-flush option to SOLR commit and optimize operations has
been deprecated and was removed in Solr 4.0, causing the solr client
to fail when interacting with newer servers.

Remove this keyword option.

Tests added for:     none
make test-suite run? lisp-prepush

releases notes: none needed, keyword not documented.

Change-Id: Ic1e692d83a53b4cb55efce12a542ea4f7ebd7268
  • Loading branch information...
1 parent 5a68fa0 commit 00eeb3ea5e8d004bd391a342e8d2e865758a2def Mikel Bancroft committed Jan 16, 2014
Showing with 4 additions and 12 deletions.
  1. +4 −12 solr.lisp
View
16 solr.lisp
@@ -130,38 +130,30 @@ On success, returns LXML representation of the Solr server response."
(post-request solr msg `((commit . ,(xbool commit))))))
;; API
-(defmethod solr-commit ((solr solr) &key (wait-flush t)
- (wait-searcher t)
+(defmethod solr-commit ((solr solr) &key (wait-searcher t)
(expunge-deletes nil))
"Send COMMIT command.
-WAIT-FLUSH controls whether the request waits after the data is written
-to the disk; default is T.
WAIT-SEARCHER controls whether the request watis until searcher objects
to be warmed for use; default is T.
EXPUNGE-DELETS controls whether sergments with deletes are merged away;
default is NIL.
On success, returns LXML representation of the Solr server response."
(let ((msg (xml->string
- ^((commit @waitFlush (xbool wait-flush)
- @waitSearcher (xbool wait-searcher)
+ ^((commit @waitSearcher (xbool wait-searcher)
@expungeDeletes (xbool expunge-deletes))))))
(post-request solr msg)))
;; API
-(defmethod solr-optimize ((solr solr) &key (wait-flush t)
- (wait-searcher t)
+(defmethod solr-optimize ((solr solr) &key (wait-searcher t)
(max-segments 1))
"Send OPTIMIZE command.
-WAIT-FLUSH controls whether the request waits after the data is written
-to the disk; default is T.
WAIT-SEARCHER controls whether the request waits until searcher objects
to be warmed for use; default is T.
MAX-SEGMENTS sets the maximum number of segments to optimize down;
default is 1.
On success, returns LXML representation of the Solr server response."
(let ((msg (xml->string
- ^((optimize @waitFlush (xbool wait-flush)
- @waitSearcher (xbool wait-searcher)
+ ^((optimize @waitSearcher (xbool wait-searcher)
@maxSegments max-segments)))))
(post-request solr msg)))

0 comments on commit 00eeb3e

Please sign in to comment.