lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jd...@apache.org
Subject svn commit: r1387694 - in /lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler: ./ src/java/org/apache/solr/handler/dataimport/ src/test-files/dih/solr/conf/ src/test/org/apache/solr/handler/dataimport/
Date Wed, 19 Sep 2012 17:47:54 GMT
Author: jdyer
Date: Wed Sep 19 17:47:54 2012
New Revision: 1387694

URL: http://svn.apache.org/viewvc?rev=1387694&view=rev
Log:
SOLR-3850: rename "cachePk" back to "cacheKey" 

Modified:
    lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/CHANGES.txt
    lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHCacheSupport.java
    lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/data-config-end-to-end.xml
    lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestEphemeralCache.java

Modified: lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/CHANGES.txt?rev=1387694&r1=1387693&r2=1387694&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/CHANGES.txt Wed Sep
19 17:47:54 2012
@@ -17,6 +17,9 @@ Bug Fixes
   
 * SOLR-3791: CachedSqlEntityProcessor would throw a NullPointerException when 
   a query returns a row with a NULL key.  (Steffen Moelter via James Dyer)
+  
+* SOLR-3850: DataImportHandler "cacheKey" parameter was incorrectly renamed "cachePk"
+  (James Dyer)
 
 ==================  3.6.1 ==================
 

Modified: lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHCacheSupport.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHCacheSupport.java?rev=1387694&r1=1387693&r2=1387694&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHCacheSupport.java
(original)
+++ lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHCacheSupport.java
Wed Sep 19 17:47:54 2012
@@ -237,15 +237,13 @@ public class DIHCacheSupport {
    */
   public static final String CACHE_FOREIGN_KEY = "cacheLookup";
 
-
-
   /**
    * <p>
    * Specify the Primary Key field from this Entity to map the input records
    * with
    * </p>
    */
-  public static final String CACHE_PRIMARY_KEY = "cachePk";
+  public static final String CACHE_PRIMARY_KEY = "cacheKey";
   /**
    * <p>
    * If true, a pre-existing cache is re-opened for read-only access.

Modified: lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/data-config-end-to-end.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/data-config-end-to-end.xml?rev=1387694&r1=1387693&r2=1387694&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/data-config-end-to-end.xml
(original)
+++ lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/data-config-end-to-end.xml
Wed Sep 19 17:47:54 2012
@@ -12,7 +12,7 @@
       <field column="COUNTRY_CODE" sourceColName="COUNTRY_CODES" splitBy="," />
  
 <!-- 
- Instead of using 'cachePk'/'cacheLookup' as done below, we could have done:
+ Instead of using 'cacheKey'/'cacheLookup' as done below, we could have done:
   where="CODE=People.COUNTRY_CODE"
 --> 
       <entity 
@@ -20,7 +20,7 @@
         processor="SqlEntityProcessor"
         dataSource="hsqldb" 
         cacheImpl="SortedMapBackedCache"
-        cachePk="CODE"
+        cacheKey="CODE"
         cacheLookup="People.COUNTRY_CODE"
         
         query="SELECT CODE, COUNTRY_NAME FROM COUNTRIES"

Modified: lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestEphemeralCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestEphemeralCache.java?rev=1387694&r1=1387693&r2=1387694&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestEphemeralCache.java
(original)
+++ lucene/dev/branches/lucene_solr_3_6/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestEphemeralCache.java
Wed Sep 19 17:47:54 2012
@@ -113,7 +113,7 @@ public class TestEphemeralCache extends 
       "       processor=\"SqlEntityProcessor\"" +
       "       cacheImpl=\"org.apache.solr.handler.dataimport.DestroyCountCache\"" +
       "       cacheName=\"CHILD\"" +
-      "       cachePk=\"id\"" +
+      "       cacheKey=\"id\"" +
       "       cacheLookup=\"PARENT.id\"" +
       "       fieldNames=\"id,         child1a_mult_s, child1b_s\"" +
       "       fieldTypes=\"BIGDECIMAL, STRING,         STRING\"" +
@@ -123,7 +123,7 @@ public class TestEphemeralCache extends 
       "       name=\"CHILD_2\"" +
       "       processor=\"SqlEntityProcessor\"" +
       "       cacheImpl=\"org.apache.solr.handler.dataimport.DestroyCountCache\"" +
-      "       cachePk=\"id\"" +
+      "       cacheKey=\"id\"" +
       "       cacheLookup=\"PARENT.id\"" +
       "       query=\"SELECT * FROM CHILD_2\"       " +
       "     />" +



Mime
View raw message