RE: svn commit: r1570793 - in /lucene/dev/trunk/solr/solrj/src: java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java test-files/solrj/updateReq_4_5.bin test/org/apache/solr/client/

2014-02-22 Thread Uwe Schindler 
Hi,

your commit is likely to fail when we start to restructure directory layouts. 
Tests should (whenever possible) always use the classpath to find the files in 
test-files (which is part of the classpath).
Attached is a patch with the recommended way. I suggest to fix this. 
ExternalPaths.SOURCE_HOME is unused in Solr test, the constant is just a relict 
and only used internally on setup of test infrastructure. Real tests should not 
use it.

There are more usages of this constant in test with absolute paths (including 
contrib/foobar/src/test-files to the contrib modules, I will open issue to 
fix those.

Uwe

-
Uwe Schindler
H.-H.-Meier-Allee 63, D-28213 Bremen
http://www.thetaphi.de
eMail: u...@thetaphi.de


 -Original Message-
 From: no...@apache.org [mailto:no...@apache.org]
 Sent: Saturday, February 22, 2014 7:19 AM
 To: comm...@lucene.apache.org
 Subject: svn commit: r1570793 - in /lucene/dev/trunk/solr/solrj/src:
 java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java
 test-files/solrj/updateReq_4_5.bin
 test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java
 
 Author: noble
 Date: Sat Feb 22 06:19:16 2014
 New Revision: 1570793
 
 URL: http://svn.apache.org/r1570793
 Log:
 SOLR-5762 broke backward compatibility of Javabin format
 
 Added:
 lucene/dev/trunk/solr/solrj/src/test-files/solrj/updateReq_4_5.bin   (with
 props)
 Modified:
 
 lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/Ja
 vaBinUpdateRequestCodec.java
 
 lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/T
 estUpdateRequestCodec.java
 
 Modified:
 lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/Ja
 vaBinUpdateRequestCodec.java
 URL:
 http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apa
 che/solr/client/solrj/request/JavaBinUpdateRequestCodec.java?rev=157079
 3r1=1570792r2=1570793view=diff
 ==
 
 ---
 lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/Ja
 vaBinUpdateRequestCodec.java (original)
 +++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/re
 +++ quest/JavaBinUpdateRequestCodec.java Sat Feb 22 06:19:16 2014
 @@ -184,7 +184,13 @@ public class JavaBinUpdateRequestCodec {
  delByIdMap = (MapString,MapString,Object)
 namedList[0].get(delByIdMap);
  delByQ = (ListString) namedList[0].get(delByQ);
  doclist = (List) namedList[0].get(docs);
 -docMap =  (ListEntrySolrInputDocument,MapObject,Object)
 namedList[0].get(docsMap);
 +Object docsMapObj = namedList[0].get(docsMap);
 +
 +if (docsMapObj instanceof Map) {//SOLR-5762
 +  docMap =  new ArrayList(((Map)docsMapObj).entrySet());
 +} else {
 +  docMap = (ListEntrySolrInputDocument, MapObject, Object)
 docsMapObj;
 +}
 
 
  // we don't add any docs, because they were already processed
 
 Added: lucene/dev/trunk/solr/solrj/src/test-files/solrj/updateReq_4_5.bin
 URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test-
 files/solrj/updateReq_4_5.bin?rev=1570793view=auto
 ==
 
 Binary file - no diff available.
 
 Modified:
 lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/T
 estUpdateRequestCodec.java
 URL:
 http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apa
 che/solr/client/solrj/request/TestUpdateRequestCodec.java?rev=1570793r
 1=1570792r2=1570793view=diff
 ==
 
 ---
 lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/T
 estUpdateRequestCodec.java (original)
 +++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/re
 +++ quest/TestUpdateRequestCodec.java Sat Feb 22 06:19:16 2014
 @@ -18,6 +18,9 @@ package org.apache.solr.client.solrj.req
 
  import java.io.ByteArrayInputStream;
  import java.io.ByteArrayOutputStream;
 +import java.io.File;
 +import java.io.FileInputStream;
 +import java.io.FileOutputStream;
  import java.io.IOException;
  import java.util.ArrayList;
  import java.util.Collection;
 @@ -31,6 +34,7 @@ import junit.framework.Assert;  import
 org.apache.lucene.util.LuceneTestCase;
  import org.apache.solr.common.SolrInputDocument;
  import org.apache.solr.common.SolrInputField;
 +import org.apache.solr.util.ExternalPaths;
  import org.junit.Test;
 
  /**
 @@ -160,6 +164,75 @@ public class TestUpdateRequestCodec exte
 
 
 
 +  public void testBackCompat4_5() throws IOException {
 +
 +UpdateRequest updateRequest = new UpdateRequest();
 +updateRequest.deleteById(*:*);
 +updateRequest.deleteById(id:5);
 +updateRequest.deleteByQuery(2*);
 +updateRequest.deleteByQuery(1*);
 +updateRequest.setParam(a, b);
 +SolrInputDocument doc = new SolrInputDocument();
 +doc.addField(id, 1);
 +

RE: svn commit: r1570793 - in /lucene/dev/trunk/solr/solrj/src: java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java test-files/solrj/updateReq_4_5.bin test/org/apache/solr/client/

2014-02-22 Thread Uwe Schindler 
Alternatively you can use SolrTestCaseJ4.getFile() if you really need a file. 
In that case, an input stream was enough, so this is the simplier variant.

-
Uwe Schindler
H.-H.-Meier-Allee 63, D-28213 Bremen
http://www.thetaphi.de
eMail: u...@thetaphi.de


 -Original Message-
 From: Uwe Schindler [mailto:u...@thetaphi.de]
 Sent: Saturday, February 22, 2014 10:02 AM
 To: dev@lucene.apache.org
 Subject: RE: svn commit: r1570793 - in /lucene/dev/trunk/solr/solrj/src:
 java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java
 test-files/solrj/updateReq_4_5.bin
 test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java
 
 Hi,
 
 your commit is likely to fail when we start to restructure directory layouts.
 Tests should (whenever possible) always use the classpath to find the files in
 test-files (which is part of the classpath).
 Attached is a patch with the recommended way. I suggest to fix this.
 ExternalPaths.SOURCE_HOME is unused in Solr test, the constant is just a
 relict and only used internally on setup of test infrastructure. Real tests
 should not use it.
 
 There are more usages of this constant in test with absolute paths
 (including contrib/foobar/src/test-files to the contrib modules, I will open
 issue to fix those.
 
 Uwe
 
 -
 Uwe Schindler
 H.-H.-Meier-Allee 63, D-28213 Bremen
 http://www.thetaphi.de
 eMail: u...@thetaphi.de
 
 
  -Original Message-
  From: no...@apache.org [mailto:no...@apache.org]
  Sent: Saturday, February 22, 2014 7:19 AM
  To: comm...@lucene.apache.org
  Subject: svn commit: r1570793 - in /lucene/dev/trunk/solr/solrj/src:
  java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.ja
  va
  test-files/solrj/updateReq_4_5.bin
  test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java
 
  Author: noble
  Date: Sat Feb 22 06:19:16 2014
  New Revision: 1570793
 
  URL: http://svn.apache.org/r1570793
  Log:
  SOLR-5762 broke backward compatibility of Javabin format
 
  Added:
  lucene/dev/trunk/solr/solrj/src/test-files/solrj/updateReq_4_5.bin
 (with
  props)
  Modified:
 
  lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/requ
  est/Ja
  vaBinUpdateRequestCodec.java
 
  lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/requ
  est/T
  estUpdateRequestCodec.java
 
  Modified:
  lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/requ
  est/Ja
  vaBinUpdateRequestCodec.java
  URL:
  http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/
  apa
 
 che/solr/client/solrj/request/JavaBinUpdateRequestCodec.java?rev=15707
  9
  3r1=1570792r2=1570793view=diff
 
 ==
  
  ---
  lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/requ
  est/Ja vaBinUpdateRequestCodec.java (original)
  +++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/
  +++ re quest/JavaBinUpdateRequestCodec.java Sat Feb 22 06:19:16 2014
  @@ -184,7 +184,13 @@ public class JavaBinUpdateRequestCodec {
   delByIdMap = (MapString,MapString,Object)
  namedList[0].get(delByIdMap);
   delByQ = (ListString) namedList[0].get(delByQ);
   doclist = (List) namedList[0].get(docs);
  -docMap =  (ListEntrySolrInputDocument,MapObject,Object)
  namedList[0].get(docsMap);
  +Object docsMapObj = namedList[0].get(docsMap);
  +
  +if (docsMapObj instanceof Map) {//SOLR-5762
  +  docMap =  new ArrayList(((Map)docsMapObj).entrySet());
  +} else {
  +  docMap = (ListEntrySolrInputDocument, MapObject, Object)
  docsMapObj;
  +}
 
 
   // we don't add any docs, because they were already processed
 
  Added:
  lucene/dev/trunk/solr/solrj/src/test-files/solrj/updateReq_4_5.bin
  URL:
  http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test-
  files/solrj/updateReq_4_5.bin?rev=1570793view=auto
 
 ==
  
  Binary file - no diff available.
 
  Modified:
  lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/requ
  est/T
  estUpdateRequestCodec.java
  URL:
  http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/
  apa
 
 che/solr/client/solrj/request/TestUpdateRequestCodec.java?rev=1570793
  r
  1=1570792r2=1570793view=diff
 
 ==
  
  ---
  lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/requ
  est/T
  estUpdateRequestCodec.java (original)
  +++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/
  +++ re quest/TestUpdateRequestCodec.java Sat Feb 22 06:19:16 2014
  @@ -18,6 +18,9 @@ package org.apache.solr.client.solrj.req
 
   import java.io.ByteArrayInputStream;
   import java.io.ByteArrayOutputStream;
  +import java.io.File;
  +import java.io.FileInputStream;
  +import java.io.FileOutputStream;
   import java.io.IOException;
   import

RE: svn commit: r1570793 - in /lucene/dev/trunk/solr/solrj/src: java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java test-files/solrj/updateReq_4_5.bin test/org/apache/solr/client/

2014-02-22 Thread Noble Paul നോബിള്‍ नोब्ळ् 
Sure.
let's change the location one we identify the right place.
I hope we don't need to block 4.7 for this
On 22 Feb 2014 14:32, Uwe Schindler u...@thetaphi.de wrote:

 Hi,

 your commit is likely to fail when we start to restructure directory
 layouts. Tests should (whenever possible) always use the classpath to find
 the files in test-files (which is part of the classpath).
 Attached is a patch with the recommended way. I suggest to fix this.
 ExternalPaths.SOURCE_HOME is unused in Solr test, the constant is just a
 relict and only used internally on setup of test infrastructure. Real tests
 should not use it.

 There are more usages of this constant in test with absolute paths
 (including contrib/foobar/src/test-files to the contrib modules, I will
 open issue to fix those.

 Uwe

 -
 Uwe Schindler
 H.-H.-Meier-Allee 63, D-28213 Bremen
 http://www.thetaphi.de
 eMail: u...@thetaphi.de


  -Original Message-
  From: no...@apache.org [mailto:no...@apache.org]
  Sent: Saturday, February 22, 2014 7:19 AM
  To: comm...@lucene.apache.org
  Subject: svn commit: r1570793 - in /lucene/dev/trunk/solr/solrj/src:
  java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java
  test-files/solrj/updateReq_4_5.bin
  test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java
 
  Author: noble
  Date: Sat Feb 22 06:19:16 2014
  New Revision: 1570793
 
  URL: http://svn.apache.org/r1570793
  Log:
  SOLR-5762 broke backward compatibility of Javabin format
 
  Added:
  lucene/dev/trunk/solr/solrj/src/test-files/solrj/updateReq_4_5.bin
 (with
  props)
  Modified:
 
 
 lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/Ja
  vaBinUpdateRequestCodec.java
 
 
 lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/T
  estUpdateRequestCodec.java
 
  Modified:
 
 lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/Ja
  vaBinUpdateRequestCodec.java
  URL:
 
 http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apa
  che/solr/client/solrj/request/JavaBinUpdateRequestCodec.java?rev=157079
  3r1=1570792r2=1570793view=diff
  ==
  
  ---
 
 lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/Ja
  vaBinUpdateRequestCodec.java (original)
  +++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/re
  +++ quest/JavaBinUpdateRequestCodec.java Sat Feb 22 06:19:16 2014
  @@ -184,7 +184,13 @@ public class JavaBinUpdateRequestCodec {
   delByIdMap = (MapString,MapString,Object)
  namedList[0].get(delByIdMap);
   delByQ = (ListString) namedList[0].get(delByQ);
   doclist = (List) namedList[0].get(docs);
  -docMap =  (ListEntrySolrInputDocument,MapObject,Object)
  namedList[0].get(docsMap);
  +Object docsMapObj = namedList[0].get(docsMap);
  +
  +if (docsMapObj instanceof Map) {//SOLR-5762
  +  docMap =  new ArrayList(((Map)docsMapObj).entrySet());
  +} else {
  +  docMap = (ListEntrySolrInputDocument, MapObject, Object)
  docsMapObj;
  +}
 
 
   // we don't add any docs, because they were already processed
 
  Added: lucene/dev/trunk/solr/solrj/src/test-files/solrj/updateReq_4_5.bin
  URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test-
  files/solrj/updateReq_4_5.bin?rev=1570793view=auto
  ==
  
  Binary file - no diff available.
 
  Modified:
 
 lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/T
  estUpdateRequestCodec.java
  URL:
 
 http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apa
  che/solr/client/solrj/request/TestUpdateRequestCodec.java?rev=1570793r
  1=1570792r2=1570793view=diff
  ==
  
  ---
 
 lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/T
  estUpdateRequestCodec.java (original)
  +++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/re
  +++ quest/TestUpdateRequestCodec.java Sat Feb 22 06:19:16 2014
  @@ -18,6 +18,9 @@ package org.apache.solr.client.solrj.req
 
   import java.io.ByteArrayInputStream;
   import java.io.ByteArrayOutputStream;
  +import java.io.File;
  +import java.io.FileInputStream;
  +import java.io.FileOutputStream;
   import java.io.IOException;
   import java.util.ArrayList;
   import java.util.Collection;
  @@ -31,6 +34,7 @@ import junit.framework.Assert;  import
  org.apache.lucene.util.LuceneTestCase;
   import org.apache.solr.common.SolrInputDocument;
   import org.apache.solr.common.SolrInputField;
  +import org.apache.solr.util.ExternalPaths;
   import org.junit.Test;
 
   /**
  @@ -160,6 +164,75 @@ public class TestUpdateRequestCodec exte
 
 
 
  +  public void testBackCompat4_5() throws IOException {
  +
  +UpdateRequest updateRequest = new UpdateRequest();
  +

RE: svn commit: r1570793 - in /lucene/dev/trunk/solr/solrj/src: java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java test-files/solrj/updateReq_4_5.bin test/org/apache/solr/client/

2014-02-22 Thread Uwe Schindler 
Hi,

 

No thats fine, does not block 4.7. I am currently fixing the remaining stuff in 
code recently donated that also violated this (especially the analytics module 
+ mapreduce)

 

I will open issue and fix your’s, too.

 

Uwe

 

-

Uwe Schindler

H.-H.-Meier-Allee 63, D-28213 Bremen

 http://www.thetaphi.de/ http://www.thetaphi.de

eMail: u...@thetaphi.de

 

From: Noble Paul നോബിള്‍ नोब्ळ् [mailto:noble.p...@gmail.com] 
Sent: Saturday, February 22, 2014 10:53 AM
To: Lucene Dev
Subject: RE: svn commit: r1570793 - in /lucene/dev/trunk/solr/solrj/src: 
java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java 
test-files/solrj/updateReq_4_5.bin 
test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java

 

Sure.
let's change the location one we identify the right place.
I hope we don't need to block 4.7 for this

On 22 Feb 2014 14:32, Uwe Schindler u...@thetaphi.de wrote:

Hi,

your commit is likely to fail when we start to restructure directory layouts. 
Tests should (whenever possible) always use the classpath to find the files in 
test-files (which is part of the classpath).
Attached is a patch with the recommended way. I suggest to fix this. 
ExternalPaths.SOURCE_HOME is unused in Solr test, the constant is just a relict 
and only used internally on setup of test infrastructure. Real tests should not 
use it.

There are more usages of this constant in test with absolute paths (including 
contrib/foobar/src/test-files to the contrib modules, I will open issue to 
fix those.

Uwe

-
Uwe Schindler
H.-H.-Meier-Allee 63, D-28213 Bremen
http://www.thetaphi.de
eMail: u...@thetaphi.de


 -Original Message-
 From: no...@apache.org [mailto:no...@apache.org]
 Sent: Saturday, February 22, 2014 7:19 AM
 To: comm...@lucene.apache.org
 Subject: svn commit: r1570793 - in /lucene/dev/trunk/solr/solrj/src:
 java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java
 test-files/solrj/updateReq_4_5.bin
 test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java

 Author: noble
 Date: Sat Feb 22 06:19:16 2014
 New Revision: 1570793

 URL: http://svn.apache.org/r1570793
 Log:
 SOLR-5762 broke backward compatibility of Javabin format

 Added:
 lucene/dev/trunk/solr/solrj/src/test-files/solrj/updateReq_4_5.bin   (with
 props)
 Modified:

 lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/Ja
 vaBinUpdateRequestCodec.java

 lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/T
 estUpdateRequestCodec.java

 Modified:
 lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/Ja
 vaBinUpdateRequestCodec.java
 URL:
 http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apa
 che/solr/client/solrj/request/JavaBinUpdateRequestCodec.java?rev=157079
 3r1=1570792r2=1570793view=diff
 ==
 
 ---
 lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/Ja
 vaBinUpdateRequestCodec.java (original)
 +++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/re
 +++ quest/JavaBinUpdateRequestCodec.java Sat Feb 22 06:19:16 2014
 @@ -184,7 +184,13 @@ public class JavaBinUpdateRequestCodec {
  delByIdMap = (MapString,MapString,Object)
 namedList[0].get(delByIdMap);
  delByQ = (ListString) namedList[0].get(delByQ);
  doclist = (List) namedList[0].get(docs);
 -docMap =  (ListEntrySolrInputDocument,MapObject,Object)
 namedList[0].get(docsMap);
 +Object docsMapObj = namedList[0].get(docsMap);
 +
 +if (docsMapObj instanceof Map) {//SOLR-5762
 +  docMap =  new ArrayList(((Map)docsMapObj).entrySet());
 +} else {
 +  docMap = (ListEntrySolrInputDocument, MapObject, Object)
 docsMapObj;
 +}


  // we don't add any docs, because they were already processed

 Added: lucene/dev/trunk/solr/solrj/src/test-files/solrj/updateReq_4_5.bin
 URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test-
 files/solrj/updateReq_4_5.bin?rev=1570793view=auto
 ==
 
 Binary file - no diff available.

 Modified:
 lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/T
 estUpdateRequestCodec.java
 URL:
 http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apa
 che/solr/client/solrj/request/TestUpdateRequestCodec.java?rev=1570793r
 1=1570792r2=1570793view=diff
 ==
 
 ---
 lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/T
 estUpdateRequestCodec.java (original)
 +++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/re
 +++ quest/TestUpdateRequestCodec.java Sat Feb 22 06:19:16 2014
 @@ -18,6 +18,9 @@ package org.apache.solr.client.solrj.req

  import java.io.ByteArrayInputStream;
  import java.io.ByteArrayOutputStream;
 +import java.io.File

RE: svn commit: r1570793 - in /lucene/dev/trunk/solr/solrj/src: java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java test-files/solrj/updateReq_4_5.bin test/org/apache/solr/client/

2014-02-22 Thread Uwe Schindler 
You might not have seen it, I attached a patch to my original mail fixing the 
issue. I may commit this together with my remaining fixes at other places using 
“absolute” paths.

 

Uwe

 

-

Uwe Schindler

H.-H.-Meier-Allee 63, D-28213 Bremen

 http://www.thetaphi.de/ http://www.thetaphi.de

eMail: u...@thetaphi.de

 

From: Noble Paul നോബിള്‍ नोब्ळ् [mailto:noble.p...@gmail.com] 
Sent: Saturday, February 22, 2014 10:53 AM
To: Lucene Dev
Subject: RE: svn commit: r1570793 - in /lucene/dev/trunk/solr/solrj/src: 
java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java 
test-files/solrj/updateReq_4_5.bin 
test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java

 

Sure.
let's change the location one we identify the right place.
I hope we don't need to block 4.7 for this

On 22 Feb 2014 14:32, Uwe Schindler u...@thetaphi.de wrote:

Hi,

your commit is likely to fail when we start to restructure directory layouts. 
Tests should (whenever possible) always use the classpath to find the files in 
test-files (which is part of the classpath).
Attached is a patch with the recommended way. I suggest to fix this. 
ExternalPaths.SOURCE_HOME is unused in Solr test, the constant is just a relict 
and only used internally on setup of test infrastructure. Real tests should not 
use it.

There are more usages of this constant in test with absolute paths (including 
contrib/foobar/src/test-files to the contrib modules, I will open issue to 
fix those.

Uwe

-
Uwe Schindler
H.-H.-Meier-Allee 63, D-28213 Bremen
http://www.thetaphi.de
eMail: u...@thetaphi.de


 -Original Message-
 From: no...@apache.org [mailto:no...@apache.org]
 Sent: Saturday, February 22, 2014 7:19 AM
 To: comm...@lucene.apache.org
 Subject: svn commit: r1570793 - in /lucene/dev/trunk/solr/solrj/src:
 java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java
 test-files/solrj/updateReq_4_5.bin
 test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java

 Author: noble
 Date: Sat Feb 22 06:19:16 2014
 New Revision: 1570793

 URL: http://svn.apache.org/r1570793
 Log:
 SOLR-5762 broke backward compatibility of Javabin format

 Added:
 lucene/dev/trunk/solr/solrj/src/test-files/solrj/updateReq_4_5.bin   (with
 props)
 Modified:

 lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/Ja
 vaBinUpdateRequestCodec.java

 lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/T
 estUpdateRequestCodec.java

 Modified:
 lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/Ja
 vaBinUpdateRequestCodec.java
 URL:
 http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apa
 che/solr/client/solrj/request/JavaBinUpdateRequestCodec.java?rev=157079
 3r1=1570792r2=1570793view=diff
 ==
 
 ---
 lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/Ja
 vaBinUpdateRequestCodec.java (original)
 +++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/re
 +++ quest/JavaBinUpdateRequestCodec.java Sat Feb 22 06:19:16 2014
 @@ -184,7 +184,13 @@ public class JavaBinUpdateRequestCodec {
  delByIdMap = (MapString,MapString,Object)
 namedList[0].get(delByIdMap);
  delByQ = (ListString) namedList[0].get(delByQ);
  doclist = (List) namedList[0].get(docs);
 -docMap =  (ListEntrySolrInputDocument,MapObject,Object)
 namedList[0].get(docsMap);
 +Object docsMapObj = namedList[0].get(docsMap);
 +
 +if (docsMapObj instanceof Map) {//SOLR-5762
 +  docMap =  new ArrayList(((Map)docsMapObj).entrySet());
 +} else {
 +  docMap = (ListEntrySolrInputDocument, MapObject, Object)
 docsMapObj;
 +}


  // we don't add any docs, because they were already processed

 Added: lucene/dev/trunk/solr/solrj/src/test-files/solrj/updateReq_4_5.bin
 URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test-
 files/solrj/updateReq_4_5.bin?rev=1570793view=auto
 ==
 
 Binary file - no diff available.

 Modified:
 lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/T
 estUpdateRequestCodec.java
 URL:
 http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apa
 che/solr/client/solrj/request/TestUpdateRequestCodec.java?rev=1570793r
 1=1570792r2=1570793view=diff
 ==
 
 ---
 lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/T
 estUpdateRequestCodec.java (original)
 +++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/re
 +++ quest/TestUpdateRequestCodec.java Sat Feb 22 06:19:16 2014
 @@ -18,6 +18,9 @@ package org.apache.solr.client.solrj.req

  import java.io.ByteArrayInputStream;
  import java.io.ByteArrayOutputStream;
 +import java.io.File;
 +import java.io.FileInputStream;
 +import