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 2012/09/29 18:36:00 UTC
svn commit: r1391836 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/codecs/ lucene/codecs/src/test/org/apache/lucene/codecs/appending/
lucene/codecs/src/test/org/apache/lucene/codecs/block/
lucene/codecs/src/test/org/apache/lucene/codecs/blockt...
Author: rmuir
Date: Sat Sep 29 16:35:59 2012
New Revision: 1391836
URL: http://svn.apache.org/viewvc?rev=1391836&view=rev
Log:
LUCENE-4449: commit current state to calm jenkins
Added:
lucene/dev/branches/branch_4x/lucene/codecs/src/test/org/apache/lucene/codecs/appending/TestAppendingPostingsFormat.java
- copied unchanged from r1391835, lucene/dev/trunk/lucene/codecs/src/test/org/apache/lucene/codecs/appending/TestAppendingPostingsFormat.java
lucene/dev/branches/branch_4x/lucene/codecs/src/test/org/apache/lucene/codecs/block/TestBlockPostingsFormat.java
- copied unchanged from r1391835, lucene/dev/trunk/lucene/codecs/src/test/org/apache/lucene/codecs/block/TestBlockPostingsFormat.java
lucene/dev/branches/branch_4x/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/
- copied from r1391835, lucene/dev/trunk/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/
lucene/dev/branches/branch_4x/lucene/codecs/src/test/org/apache/lucene/codecs/bloom/
- copied from r1391835, lucene/dev/trunk/lucene/codecs/src/test/org/apache/lucene/codecs/bloom/
lucene/dev/branches/branch_4x/lucene/codecs/src/test/org/apache/lucene/codecs/intblock/TestFixedIntBlockPostingsFormat.java
- copied unchanged from r1391835, lucene/dev/trunk/lucene/codecs/src/test/org/apache/lucene/codecs/intblock/TestFixedIntBlockPostingsFormat.java
lucene/dev/branches/branch_4x/lucene/codecs/src/test/org/apache/lucene/codecs/intblock/TestVariableIntBlockPostingsFormat.java
- copied unchanged from r1391835, lucene/dev/trunk/lucene/codecs/src/test/org/apache/lucene/codecs/intblock/TestVariableIntBlockPostingsFormat.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat.java
- copied unchanged from r1391835, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat.java
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/codecs/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java
lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java?rev=1391836&r1=1391835&r2=1391836&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java Sat Sep 29 16:35:59 2012
@@ -135,10 +135,10 @@ public abstract class BasePostingsFormat
}
// Holds all postings:
- private static Map<String,Map<BytesRef,List<Posting>>> fields = new TreeMap<String,Map<BytesRef,List<Posting>>>();
+ private static Map<String,Map<BytesRef,List<Posting>>> fields;
// Holds only live doc postings:
- private static Map<String,Map<BytesRef,List<Posting>>> fieldsLive = new TreeMap<String,Map<BytesRef,List<Posting>>>();
+ private static Map<String,Map<BytesRef,List<Posting>>> fieldsLive;
private static FieldInfos fieldInfos;
@@ -153,6 +153,8 @@ public abstract class BasePostingsFormat
@BeforeClass
public static void createPostings() throws IOException {
+ fields = new TreeMap<String,Map<BytesRef,List<Posting>>>();
+ fieldsLive = new TreeMap<String,Map<BytesRef,List<Posting>>>();
final int numFields = _TestUtil.nextInt(random(), 1, 5);
if (VERBOSE) {
@@ -368,7 +370,7 @@ public abstract class BasePostingsFormat
for(int fieldUpto=0;fieldUpto<fields.size();fieldUpto++) {
FieldInfo oldFieldInfo = fieldInfos.fieldInfo(fieldUpto);
- String pf = _TestUtil.getPostingsFormat(oldFieldInfo.name);
+ String pf = _TestUtil.getPostingsFormat(codec, oldFieldInfo.name);
int fieldMaxIndexOption;
if (doesntSupportOffsets.contains(pf)) {
fieldMaxIndexOption = Math.min(maxIndexOptionNoOffsets, maxIndexOption);
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java?rev=1391836&r1=1391835&r2=1391836&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java Sat Sep 29 16:35:59 2012
@@ -662,7 +662,11 @@ public class _TestUtil {
// TODO: generalize all 'test-checks-for-crazy-codecs' to
// annotations (LUCENE-3489)
public static String getPostingsFormat(String field) {
- PostingsFormat p = Codec.getDefault().postingsFormat();
+ return getPostingsFormat(Codec.getDefault(), field);
+ }
+
+ public static String getPostingsFormat(Codec codec, String field) {
+ PostingsFormat p = codec.postingsFormat();
if (p instanceof PerFieldPostingsFormat) {
return ((PerFieldPostingsFormat)p).getPostingsFormatForField(field).getName();
} else {