Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-3850: rename "cachePk" back to "cacheKey" 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1387681 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
James Dyer 2012-09-19 17:12:39 +00:00
parent dc84d8b49f
commit 4130617f69
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -248,6 +248,9 @@ Bug Fixes
* SOLR-3777: Dataimport-UI does not send unchecked checkboxes (Glenn MacStravic * SOLR-3777: Dataimport-UI does not send unchecked checkboxes (Glenn MacStravic
via steffkes) via steffkes)
* SOLR-3850: DataImportHandler "cacheKey" parameter was incorrectly renamed "cachePk"
(James Dyer)
Other Changes Other Changes
---------------------- ----------------------

4
solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHCacheSupport.java
View File

@ -238,15 +238,13 @@ public class DIHCacheSupport {
*/ */
public static final String CACHE_FOREIGN_KEY = "cacheLookup"; public static final String CACHE_FOREIGN_KEY = "cacheLookup";
/** /**
* <p> * <p>
* Specify the Primary Key field from this Entity to map the input records * Specify the Primary Key field from this Entity to map the input records
* with * with
* </p> * </p>
*/ */
public static final String CACHE_PRIMARY_KEY = "cachePk"; public static final String CACHE_PRIMARY_KEY = "cacheKey";
/** /**
* <p> * <p>
* If true, a pre-existing cache is re-opened for read-only access. * If true, a pre-existing cache is re-opened for read-only access.

2
solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/data-config-end-to-end.xml
View File

@ -20,7 +20,7 @@
processor="SqlEntityProcessor" processor="SqlEntityProcessor"
dataSource="hsqldb" dataSource="hsqldb"
cacheImpl="SortedMapBackedCache" cacheImpl="SortedMapBackedCache"
cachePk="CODE" cacheKey="CODE"
cacheLookup="People.COUNTRY_CODE" cacheLookup="People.COUNTRY_CODE"
query="SELECT CODE, COUNTRY_NAME FROM COUNTRIES" query="SELECT CODE, COUNTRY_NAME FROM COUNTRIES"

4
solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestEphemeralCache.java
View File

@ -101,7 +101,7 @@ public class TestEphemeralCache extends AbstractDataImportHandlerTestCase {
" processor=\"SqlEntityProcessor\"" + " processor=\"SqlEntityProcessor\"" +
" cacheImpl=\"org.apache.solr.handler.dataimport.DestroyCountCache\"" + " cacheImpl=\"org.apache.solr.handler.dataimport.DestroyCountCache\"" +
" cacheName=\"CHILD\"" + " cacheName=\"CHILD\"" +
" cachePk=\"id\"" + " cacheKey=\"id\"" +
" cacheLookup=\"PARENT.id\"" + " cacheLookup=\"PARENT.id\"" +
" fieldNames=\"id, child1a_mult_s, child1b_s\"" + " fieldNames=\"id, child1a_mult_s, child1b_s\"" +
" fieldTypes=\"BIGDECIMAL, STRING, STRING\"" + " fieldTypes=\"BIGDECIMAL, STRING, STRING\"" +
@ -111,7 +111,7 @@ public class TestEphemeralCache extends AbstractDataImportHandlerTestCase {
" name=\"CHILD_2\"" + " name=\"CHILD_2\"" +
" processor=\"SqlEntityProcessor\"" + " processor=\"SqlEntityProcessor\"" +
" cacheImpl=\"org.apache.solr.handler.dataimport.DestroyCountCache\"" + " cacheImpl=\"org.apache.solr.handler.dataimport.DestroyCountCache\"" +
" cachePk=\"id\"" + " cacheKey=\"id\"" +
" cacheLookup=\"PARENT.id\"" + " cacheLookup=\"PARENT.id\"" +
" query=\"SELECT * FROM CHILD_2\" " + " query=\"SELECT * FROM CHILD_2\" " +
" />" + " />" +