You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2014/01/13 20:13:00 UTC

svn commit: r1557814 - /lucene/dev/branches/lucene_solr_4_6/solr/CHANGES.txt

Author: markrmiller
Date: Mon Jan 13 19:13:00 2014
New Revision: 1557814

URL: http://svn.apache.org/r1557814
Log:
SOLR-5615: Fix CHANGES mismerge

Modified:
    lucene/dev/branches/lucene_solr_4_6/solr/CHANGES.txt

Modified: lucene/dev/branches/lucene_solr_4_6/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_6/solr/CHANGES.txt?rev=1557814&r1=1557813&r2=1557814&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_6/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_6/solr/CHANGES.txt Mon Jan 13 19:13:00 2014
@@ -20,217 +20,6 @@ See the tutorial at http://lucene.apache
 
 $Id$
 
-==================  4.7.0 ==================
-
-Versions of Major Components
----------------------
-Apache Tika 1.4
-Carrot2 3.8.0
-Velocity 1.7 and Velocity Tools 2.0
-Apache UIMA 2.3.1
-Apache ZooKeeper 3.4.5
-
-Upgrading from Solr 4.6.0
-----------------------
-
-* CloudSolrServer and LBHttpSolrServer no longer declare MalformedURLException
-  as thrown from their constructors.  
-                      
-Detailed Change List
-----------------------
-
-New Features
-----------------------
-
-* SOLR-5308: SOLR-5601: A new 'migrate' collection API to split all documents with a
-  route key into another collection (shalin)
-
-* SOLR-5441: Expose number of transaction log files and their size via JMX.
-  (Rafał Kuć via shalin)
-
-* SOLR-5320: Added support for tri-level compositeId routing.
-  (Anshum Gupta via shalin)
-  
-* SOLR-5287: You can edit files in the conf directory from the admin UI 
-  (Erick Erickson, Stefan Matheis)
-
-* SOLR-5447, SOLR-5490: Add a QParserPlugin for Lucene's SimpleQueryParser.
-  (Jack Conradson via shalin)
-
-* SOLR-5446: Admin UI - Allow changing Schema and Config (steffkes)
-
-* SOLR-5456: Admin UI - Allow creating new Files (steffkes)
-
-* SOLR-5208: Support for the setting of core.properties key/values at create-time on 
-  Collections API (Erick Erickson)
-
-* SOLR-5428: New 'stats.calcdistinct' parameter in StatsComponent returns
-  set of distinct values and their count. This can also be specified per field
-  e.g. 'f.field.stats.calcdistinct'. (Elran Dvir via shalin)
-
-* SOLR-5378, SOLR-5528: A new SuggestComponent that fully utilizes the Lucene suggester
-  module and adds pluggable dictionaries, payloads and better distributed support.
-  This is intended to eventually replace the Suggester support through the
-  SpellCheckComponent. (Areek Zillur, Varun Thacker via shalin)
-
-* SOLR-5492: Return the replica that actually served the query in shards.info
-  response. (shalin)
-
-* SOLR-5506: Support docValues in CollationField and ICUCollationField.
-  (Robert Muir)
-  
- * SOLR-5518: Added EditFileRequestHandler to deal with security issues around modifying
-   solr configuration files.
-
-* SOLR-5023: Add support for deleteInstanceDir to be passed from SolrJ for Core
-  Unload action. (Lyubov Romanchuk, shalin)
-
-* SOLR-1871: The 'map' function query accepts a ValueSource as target and
-  default value. (Chris Harris, shalin)
-
-* SOLR-5518: Make the EditFileRequestHandler it's own handler to allow
-  some security (Erick Erickson)
-
-* SOLR-5522: Remove EditFileRequestHandler from 4x (Erick Erickson)
-
-* SOLR-5556: Allow class of CollectionsHandler and InfoHandler to be specified
-  in solr.xml. (Gregory Chanan, Alan Woodward)
-
-* SOLR-5581: Give ZkCLI the ability to get files. (Gregory Chanan via Mark Miller)
-
-* SOLR-5536: Add ValueSource collapse criteria to CollapsingQParsingPlugin (Joel Bernstein)
-
-Bug Fixes
-----------------------
-
-* SOLR-5438: DebugComponent throws NPE when used with grouping.
-  (Tomás Fernández Löbbe via shalin)
-
-* SOLR-4612: Admin UI - Analysis Screen contains empty table-columns (steffkes)
-
-* SOLR-5451: SyncStrategy closes it's http connection manager before the
-  executor that uses it in it's close method. (Mark Miller)
-
-* SOLR-5460: SolrDispatchFilter#sendError can get a SolrCore that it does not 
-  close. (Mark Miller)
-
-* SOLR-5461: Request proxying should only set con.setDoOutput(true) if the
-  request is a post. (Mark Miller)
-
-* SOLR-5481: SolrCmdDistributor should not let the http client do it's own 
-  retries. (Mark Miller)
-
-* LUCENE-5347: Fixed Solr's Zookeeper Client to copy files to Zookeeper using
-  binary transfer. Previously data was read with default encoding and stored
-  in zookeeper as UTF-8. This bug was found after upgrading to forbidden-apis
-  1.4.  (Uwe Schindler)
-
-* SOLR-4376: DataImportHandler uses wrong date format for last_index_time if
-  a delta-import is run first before any full-imports.
-  (Sebastien Lorber, Arcadius Ahouansou via shalin)
-
-* SOLR-5494: CoreContainer#remove throws NPE rather than returning null when
-  a SolrCore does not exist in core discovery mode. (Mark Miller)
-  
-* SOLR-5354: Distributed sort is broken with CUSTOM FieldType. 
-  (Steve Rowe, hossman, Robert Muir, Jessica Cheng)
-
-* SOLR-5515: NPE when getting stats on date field with empty result on
-  SolrCloud. (Alexander Sagen, shalin)
-
-* SOLR-5204: StatsComponent and SpellCheckComponent do not support the
-  shards.tolerant=true parameter. (Anca Kopetz, shalin)
-
-* SOLR-5527: DIH logs spurious warning for special commands. (shalin)
-
-* SOLR-5524: Exception when using Query Function inside Scale Function.
-  (Trey Grainger, yonik)
-
-* SOLR-5540: HdfsLockFactory should explicitly create the lock parent directory 
-  if necessary. (Mark Miller)
-
-* SOLR-5615: Deadlock while trying to recover after a ZK session expiration.
-  (Ramkumar Aiyengar, Mark Miller)
-
-* SOLR-5543: Core swaps resulted in duplicate core entries in solr.xml when 
-  using solr.xml persistence. (Bill Bell, Alan Woodward)
-
-* SOLR-5562: ConcurrentUpdateSolrServer constructor ignores supplied httpclient.
-  (Kyle Halliday via Mark Miller)
-
-* SOLR-5567: ZkController getHostAddress duplicates url prefix.
-  (Kyle Halliday, Alexey Serba, shalin)
-
-* SOLR-5577: Likely ZooKeeper expiration should not slow down updates a given
-  amount, but instead cut off updates after a given time. 
-  (Mark Miller, Christine Poerschke, Ramkumar Aiyengar)
-
-Optimizations
-----------------------
-
-* SOLR-5458: Admin UI - Remove separated Pages for Config & Schema (steffkes)
-
-* SOLR-5436: Eliminate the 1500ms wait in overseer loop as well as
-  polling the ZK distributed queue. (Noble Paul, Mark Miller)
-
-* SOLR-5189: Solr 4.x Web UI Log Viewer does not display 'date' column from 
-  logs (steffkes)
-
-* SOLR-5512: Optimize DocValuesFacets. (Robert Muir)
-
-* SOLR-2960: fix DIH XPathEntityProcessor to add the correct number of "null"
-  placeholders for multi-valued fields (Michael Watts via James Dyer)
-
-* SOLR-5214: Reduce memory usage for shard splitting by merging segments one
-  at a time. (Christine Poerschke via shalin)
-
-Other Changes
----------------------
-
-* SOLR-5399: Add distributed request tracking information to DebugComponent
-  (Tomás Fernández Löbbe via Ryan Ernst)
-
-* SOLR-5421: Remove double set of distrib.from param in processAdd method of
-  DistributedUpdateProcessor. (Anshum Gupta via shalin)
-
-* SOLR-5404: The example config references deprecated classes.
-  (Uwe Schindler, Rafał Kuć  via Mark Miller)
-
-* SOLR-5487: Replication factor error message doesn't match constraint.
-  (Patrick Hunt via shalin)
-
-* SOLR-5499: Log a warning if /get is not registered when using SolrCloud.
-  (Daniel Collins via shalin)
-
-* SOLR-5517: Return HTTP error on POST requests with no Content-Type.
-  (Ryan Ernst, Uwe Schindler)
-
-* SOLR-5502: Added a test for tri-level compositeId routing with documents
-  having a "/" in a document id. (Anshum Gupta via Mark Miller)
-
-* SOLR-5539: Admin UI - Remove ability to create/modify files (steffkes)
-
-* SOLR-5533: Improve out of the box support for running Solr on hdfs with 
-  SolrCloud. (Mark Miller)
-
-* SOLR-5548: Give DistributedSearchTestCase / JettySolrRunner the ability to 
-  specify extra filters. (Greg Chanan via Mark Miller)
-
-* SOLR-5555: LBHttpSolrServer and CloudSolrServer constructors don't need to
-  declare MalformedURLExceptions (Sushil Bajracharya, Alan Woodward)
-
-* SOLR-5565: Raise default ZooKeeper session timeout to 30 seconds from 15
-  seconds. (Mark Miller)
-
-* SOLR-5574: CoreContainer shutdown publishes all nodes as down and waits to
-  see that and then again publishes all nodes as down. (Mark Miller)
-
-* SOLR-5590: Upgrade HttpClient/HttpComponents to 4.3.x.
-  (Karl Wright via Shawn Heisey)
-
-* SOLR-2794: change the default of hl.phraseLimit to 5000.
-  (Michael Della Bitta via Robert Muir, Koji, zarni - pull request #11)
-
 ==================  4.6.1  ==================
 
 Versions of Major Components
@@ -269,6 +58,10 @@ Bug Fixes
   sets the alias name and the collections to alias to the same value.
   (Aaron Schram, Mark Miller)
 
+* SOLR-5577: Likely ZooKeeper expiration should not slow down updates a given
+  amount, but instead cut off updates after a given time. 
+  (Mark Miller, Christine Poerschke, Ramkumar Aiyengar)
+  
 * SOLR-5580: NPE when creating a core with both explicit shard and coreNodeName.
   (YouPeng Yang, Mark Miller)
 
@@ -295,7 +88,7 @@ Bug Fixes
 * SOLR-5587: ElectionContext implementations should use 
   ZkCmdExecutor#ensureExists to ensure their election paths are properly
   created. (Mark Miller)
-
+  
 * SOLR-4709: The core reload after replication if config files have changed
   can fail due to a race condition. (Mark Miller, Hossman))
 
@@ -304,7 +97,7 @@ Bug Fixes
 
 * SOLR-5588: PeerSync doesn't count all connect failures as success.
   (Mark Miller)
-    
+
 * SOLR-5564: hl.maxAlternateFieldLength should apply to original field when
   fallback is attempted (janhoy)
 
@@ -313,14 +106,19 @@ Bug Fixes
 
 * SOLR-5615: Deadlock while trying to recover after a ZK session expiration.
   (Ramkumar Aiyengar, Mark Miller)
-  
+
+* SOLR-5543: Core swaps resulted in duplicate core entries in solr.xml when
+  using solr.xml persistence. (Bill Bell, Alan Woodward)
+
+* SOLR-5618: Fix false cache hits in queryResultCache when hashCodes are equal 
+  and duplicate filter queries exist in one of the requests (hossman)
 
 Optimizations
-----------------------
+----------------------  
 
 * SOLR-5576: Improve concurrency when registering and waiting for all 
   SolrCore's to register a DOWN state. (Christine Poerschke via Mark Miller)
-  
+
 ==================  4.6.0 ==================
 
 Versions of Major Components
@@ -395,7 +193,7 @@ New Features
 
 * SOLR-5464: Add option to ConcurrentSolrServer to stream pure delete 
    requests. (Mark Miller)
-
+  
 Bug Fixes
 ----------------------
   
@@ -439,7 +237,7 @@ Bug Fixes
 * SOLR-5465: SolrCmdDistributor retry logic has a concurrency race bug. 
   (Mark Miller)
   
-* SOLR-5452: Do not attempt to proxy internal update requests. (Mark Miller)  
+* SOLR-5452: Do not attempt to proxy internal update requests. (Mark Miller)
 
 Optimizations
 ----------------------