You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/11/09 17:24:51 UTC

svn commit: r1199830 - in /lucene/dev/trunk/lucene/src: java/org/apache/lucene/index/codecs/simpletext/SimpleTextStoredFieldsReader.java test-framework/java/org/apache/lucene/util/LuceneTestCase.java

Author: rmuir
Date: Wed Nov  9 16:24:51 2011
New Revision: 1199830

URL: http://svn.apache.org/viewvc?rev=1199830&view=rev
Log:
LUCENE-2621: i should be ashamed of myself...

Modified:
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextStoredFieldsReader.java
    lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java

Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextStoredFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextStoredFieldsReader.java?rev=1199830&r1=1199829&r2=1199830&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextStoredFieldsReader.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextStoredFieldsReader.java Wed Nov  9 16:24:51 2011
@@ -138,7 +138,7 @@ public class SimpleTextStoredFieldsReade
     readLine();
     assert scratch.startsWith(VALUE);
     if (type == TYPE_STRING) {
-      visitor.stringField(fieldInfo, new String(scratch.bytes, scratch.offset+VALUE.length, scratch.length-VALUE.length));
+      visitor.stringField(fieldInfo, new String(scratch.bytes, scratch.offset+VALUE.length, scratch.length-VALUE.length, "UTF-8"));
     } else if (type == TYPE_BINARY) {
       // TODO: who owns the bytes?
       byte[] copy = new byte[scratch.length-VALUE.length];

Modified: lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java?rev=1199830&r1=1199829&r2=1199830&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java Wed Nov  9 16:24:51 2011
@@ -292,7 +292,7 @@ public abstract class LuceneTestCase ext
     if ("Lucene3x".equals(TEST_CODEC) || ("random".equals(TEST_CODEC) && randomVal <= 3)) { // preflex-only setup
       codec = new PreFlexRWCodec();
       PREFLEX_IMPERSONATION_IS_ACTIVE = true;
-    } else if ("SimpleText".equals(TEST_CODEC) || (false && "random".equals(TEST_CODEC) && randomVal == 9)) {
+    } else if ("SimpleText".equals(TEST_CODEC) || ("random".equals(TEST_CODEC) && randomVal == 9)) {
       codec = new SimpleTextCodec();
     } else if (!"random".equals(TEST_CODEC)) {
       codec = Codec.forName(TEST_CODEC);



RE: svn commit: r1199830 - in /lucene/dev/trunk/lucene/src: java/org/apache/lucene/index/codecs/simpletext/SimpleTextStoredFieldsReader.java test-framework/java/org/apache/lucene/util/LuceneTestCase.java

Posted by Uwe Schindler <uw...@thetaphi.de>.
> On Wed, Nov 9, 2011 at 8:37 AM, Uwe Schindler <uw...@thetaphi.de> wrote:
> > Robert, Robert, tststs. Stand in the corner and shame on you! :-)
> Dude! :)

All is well and good.

> >
> > -----
> > Uwe Schindler
> > H.-H.-Meier-Allee 63, D-28213 Bremen
> > http://www.thetaphi.de
> > eMail: uwe@thetaphi.de
> >
> >
> >> -----Original Message-----
> >> From: rmuir@apache.org [mailto:rmuir@apache.org]
> >> Sent: Wednesday, November 09, 2011 5:25 PM
> >> To: commits@lucene.apache.org
> >> Subject: svn commit: r1199830 - in /lucene/dev/trunk/lucene/src:
> >> java/org/apache/lucene/index/codecs/simpletext/SimpleTextStoredFields
> >> Read er.java
> >> test-framework/java/org/apache/lucene/util/LuceneTestCase.java
> >>
> >> Author: rmuir
> >> Date: Wed Nov  9 16:24:51 2011
> >> New Revision: 1199830
> >>
> >> URL: http://svn.apache.org/viewvc?rev=1199830&view=rev
> >> Log:
> >> LUCENE-2621: i should be ashamed of myself...
> >>
> >> Modified:
> >>
> >> lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpl
> >> etext
> >> /SimpleTextStoredFieldsReader.java
> >>     lucene/dev/trunk/lucene/src/test-
> >> framework/java/org/apache/lucene/util/LuceneTestCase.java
> >>
> >> Modified:
> >> lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpl
> >> etext
> >> /SimpleTextStoredFieldsReader.java
> >> URL:
> >> http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apa
> >> che/lu
> >> cene/index/codecs/simpletext/SimpleTextStoredFieldsReader.java?rev=11
> >> 9983
> >> 0&r1=1199829&r2=1199830&view=diff
> >>
> ================================================================
> >> ==============
> >> ---
> >> lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpl
> >> etext /SimpleTextStoredFieldsReader.java (original)
> >> +++
> >> lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpl
> >> etext /SimpleTextStoredFieldsReader.java Wed Nov  9 16:24:51 2011 @@
> >> -138,7 +138,7 @@ public class SimpleTextStoredFieldsReade
> >>      readLine();
> >>      assert scratch.startsWith(VALUE);
> >>      if (type == TYPE_STRING) {
> >> -      visitor.stringField(fieldInfo, new String(scratch.bytes,
> >> scratch.offset+VALUE.length, scratch.length-VALUE.length));
> >> +      visitor.stringField(fieldInfo, new String(scratch.bytes,
> >> scratch.offset+VALUE.length, scratch.length-VALUE.length, "UTF-8"));
> >>      } else if (type == TYPE_BINARY) {
> >>        // TODO: who owns the bytes?
> >>        byte[] copy = new byte[scratch.length-VALUE.length];
> >>
> >> Modified: lucene/dev/trunk/lucene/src/test-
> >> framework/java/org/apache/lucene/util/LuceneTestCase.java
> >> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-
> >> framework/java/org/apache/lucene/util/LuceneTestCase.java?rev=1199830
> >> &r
> >> 1=1199829&r2=1199830&view=diff
> >>
> ================================================================
> >> ==============
> >> --- lucene/dev/trunk/lucene/src/test-
> >> framework/java/org/apache/lucene/util/LuceneTestCase.java (original)
> >> +++ lucene/dev/trunk/lucene/src/test-
> >> framework/java/org/apache/lucene/util/LuceneTestCase.java Wed Nov  9
> >> 16:24:51 2011
> >> @@ -292,7 +292,7 @@ public abstract class LuceneTestCase ext
> >>      if ("Lucene3x".equals(TEST_CODEC) ||
> >> ("random".equals(TEST_CODEC) && randomVal <= 3)) { // preflex-only
> >> setup
> >>        codec = new PreFlexRWCodec();
> >>        PREFLEX_IMPERSONATION_IS_ACTIVE = true;
> >> -    } else if ("SimpleText".equals(TEST_CODEC) || (false &&
> >> "random".equals(TEST_CODEC) && randomVal == 9)) {
> >> +    } else if ("SimpleText".equals(TEST_CODEC) ||
> >> ("random".equals(TEST_CODEC) && randomVal == 9)) {
> >>        codec = new SimpleTextCodec();
> >>      } else if (!"random".equals(TEST_CODEC)) {
> >>        codec = Codec.forName(TEST_CODEC);
> >
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org For
> > additional commands, e-mail: dev-help@lucene.apache.org
> >
> >
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org For additional
> commands, e-mail: dev-help@lucene.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org


Re: svn commit: r1199830 - in /lucene/dev/trunk/lucene/src: java/org/apache/lucene/index/codecs/simpletext/SimpleTextStoredFieldsReader.java test-framework/java/org/apache/lucene/util/LuceneTestCase.java

Posted by Simon Willnauer <si...@googlemail.com>.
On Wed, Nov 9, 2011 at 8:37 AM, Uwe Schindler <uw...@thetaphi.de> wrote:
> Robert, Robert, tststs. Stand in the corner and shame on you! :-)
Dude! :)


>
> -----
> Uwe Schindler
> H.-H.-Meier-Allee 63, D-28213 Bremen
> http://www.thetaphi.de
> eMail: uwe@thetaphi.de
>
>
>> -----Original Message-----
>> From: rmuir@apache.org [mailto:rmuir@apache.org]
>> Sent: Wednesday, November 09, 2011 5:25 PM
>> To: commits@lucene.apache.org
>> Subject: svn commit: r1199830 - in /lucene/dev/trunk/lucene/src:
>> java/org/apache/lucene/index/codecs/simpletext/SimpleTextStoredFieldsRead
>> er.java test-framework/java/org/apache/lucene/util/LuceneTestCase.java
>>
>> Author: rmuir
>> Date: Wed Nov  9 16:24:51 2011
>> New Revision: 1199830
>>
>> URL: http://svn.apache.org/viewvc?rev=1199830&view=rev
>> Log:
>> LUCENE-2621: i should be ashamed of myself...
>>
>> Modified:
>>
>> lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpletext
>> /SimpleTextStoredFieldsReader.java
>>     lucene/dev/trunk/lucene/src/test-
>> framework/java/org/apache/lucene/util/LuceneTestCase.java
>>
>> Modified:
>> lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpletext
>> /SimpleTextStoredFieldsReader.java
>> URL:
>> http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lu
>> cene/index/codecs/simpletext/SimpleTextStoredFieldsReader.java?rev=119983
>> 0&r1=1199829&r2=1199830&view=diff
>> ================================================================
>> ==============
>> ---
>> lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpletext
>> /SimpleTextStoredFieldsReader.java (original)
>> +++
>> lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpletext
>> /SimpleTextStoredFieldsReader.java Wed Nov  9 16:24:51 2011
>> @@ -138,7 +138,7 @@ public class SimpleTextStoredFieldsReade
>>      readLine();
>>      assert scratch.startsWith(VALUE);
>>      if (type == TYPE_STRING) {
>> -      visitor.stringField(fieldInfo, new String(scratch.bytes,
>> scratch.offset+VALUE.length, scratch.length-VALUE.length));
>> +      visitor.stringField(fieldInfo, new String(scratch.bytes,
>> scratch.offset+VALUE.length, scratch.length-VALUE.length, "UTF-8"));
>>      } else if (type == TYPE_BINARY) {
>>        // TODO: who owns the bytes?
>>        byte[] copy = new byte[scratch.length-VALUE.length];
>>
>> Modified: lucene/dev/trunk/lucene/src/test-
>> framework/java/org/apache/lucene/util/LuceneTestCase.java
>> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-
>> framework/java/org/apache/lucene/util/LuceneTestCase.java?rev=1199830&r
>> 1=1199829&r2=1199830&view=diff
>> ================================================================
>> ==============
>> --- lucene/dev/trunk/lucene/src/test-
>> framework/java/org/apache/lucene/util/LuceneTestCase.java (original)
>> +++ lucene/dev/trunk/lucene/src/test-
>> framework/java/org/apache/lucene/util/LuceneTestCase.java Wed Nov  9
>> 16:24:51 2011
>> @@ -292,7 +292,7 @@ public abstract class LuceneTestCase ext
>>      if ("Lucene3x".equals(TEST_CODEC) || ("random".equals(TEST_CODEC) &&
>> randomVal <= 3)) { // preflex-only setup
>>        codec = new PreFlexRWCodec();
>>        PREFLEX_IMPERSONATION_IS_ACTIVE = true;
>> -    } else if ("SimpleText".equals(TEST_CODEC) || (false &&
>> "random".equals(TEST_CODEC) && randomVal == 9)) {
>> +    } else if ("SimpleText".equals(TEST_CODEC) ||
>> ("random".equals(TEST_CODEC) && randomVal == 9)) {
>>        codec = new SimpleTextCodec();
>>      } else if (!"random".equals(TEST_CODEC)) {
>>        codec = Codec.forName(TEST_CODEC);
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
> For additional commands, e-mail: dev-help@lucene.apache.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org


RE: svn commit: r1199830 - in /lucene/dev/trunk/lucene/src: java/org/apache/lucene/index/codecs/simpletext/SimpleTextStoredFieldsReader.java test-framework/java/org/apache/lucene/util/LuceneTestCase.java

Posted by Uwe Schindler <uw...@thetaphi.de>.
Robert, Robert, tststs. Stand in the corner and shame on you! :-)

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


> -----Original Message-----
> From: rmuir@apache.org [mailto:rmuir@apache.org]
> Sent: Wednesday, November 09, 2011 5:25 PM
> To: commits@lucene.apache.org
> Subject: svn commit: r1199830 - in /lucene/dev/trunk/lucene/src:
> java/org/apache/lucene/index/codecs/simpletext/SimpleTextStoredFieldsRead
> er.java test-framework/java/org/apache/lucene/util/LuceneTestCase.java
> 
> Author: rmuir
> Date: Wed Nov  9 16:24:51 2011
> New Revision: 1199830
> 
> URL: http://svn.apache.org/viewvc?rev=1199830&view=rev
> Log:
> LUCENE-2621: i should be ashamed of myself...
> 
> Modified:
> 
> lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpletext
> /SimpleTextStoredFieldsReader.java
>     lucene/dev/trunk/lucene/src/test-
> framework/java/org/apache/lucene/util/LuceneTestCase.java
> 
> Modified:
> lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpletext
> /SimpleTextStoredFieldsReader.java
> URL:
> http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lu
> cene/index/codecs/simpletext/SimpleTextStoredFieldsReader.java?rev=119983
> 0&r1=1199829&r2=1199830&view=diff
> ================================================================
> ==============
> ---
> lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpletext
> /SimpleTextStoredFieldsReader.java (original)
> +++
> lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpletext
> /SimpleTextStoredFieldsReader.java Wed Nov  9 16:24:51 2011
> @@ -138,7 +138,7 @@ public class SimpleTextStoredFieldsReade
>      readLine();
>      assert scratch.startsWith(VALUE);
>      if (type == TYPE_STRING) {
> -      visitor.stringField(fieldInfo, new String(scratch.bytes,
> scratch.offset+VALUE.length, scratch.length-VALUE.length));
> +      visitor.stringField(fieldInfo, new String(scratch.bytes,
> scratch.offset+VALUE.length, scratch.length-VALUE.length, "UTF-8"));
>      } else if (type == TYPE_BINARY) {
>        // TODO: who owns the bytes?
>        byte[] copy = new byte[scratch.length-VALUE.length];
> 
> Modified: lucene/dev/trunk/lucene/src/test-
> framework/java/org/apache/lucene/util/LuceneTestCase.java
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-
> framework/java/org/apache/lucene/util/LuceneTestCase.java?rev=1199830&r
> 1=1199829&r2=1199830&view=diff
> ================================================================
> ==============
> --- lucene/dev/trunk/lucene/src/test-
> framework/java/org/apache/lucene/util/LuceneTestCase.java (original)
> +++ lucene/dev/trunk/lucene/src/test-
> framework/java/org/apache/lucene/util/LuceneTestCase.java Wed Nov  9
> 16:24:51 2011
> @@ -292,7 +292,7 @@ public abstract class LuceneTestCase ext
>      if ("Lucene3x".equals(TEST_CODEC) || ("random".equals(TEST_CODEC) &&
> randomVal <= 3)) { // preflex-only setup
>        codec = new PreFlexRWCodec();
>        PREFLEX_IMPERSONATION_IS_ACTIVE = true;
> -    } else if ("SimpleText".equals(TEST_CODEC) || (false &&
> "random".equals(TEST_CODEC) && randomVal == 9)) {
> +    } else if ("SimpleText".equals(TEST_CODEC) ||
> ("random".equals(TEST_CODEC) && randomVal == 9)) {
>        codec = new SimpleTextCodec();
>      } else if (!"random".equals(TEST_CODEC)) {
>        codec = Codec.forName(TEST_CODEC);



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org