You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@lucene.apache.org by mi...@apache.org on 2010/01/17 19:36:24 UTC
svn commit: r900185 - in
/lucene/java/branches/flex_1458_3_0_back_compat_tests/src:
java/org/apache/lucene/index/TermRef.java
test/org/apache/lucene/search/TestSort.java
Author: mikemccand
Date: Sun Jan 17 18:36:24 2010
New Revision: 900185
URL: http://svn.apache.org/viewvc?rev=900185&view=rev
Log:
LUCENE-2111 (flex backwards branch) cutover to BytesRef for terms
Modified:
lucene/java/branches/flex_1458_3_0_back_compat_tests/src/java/org/apache/lucene/index/TermRef.java
lucene/java/branches/flex_1458_3_0_back_compat_tests/src/test/org/apache/lucene/search/TestSort.java
Modified: lucene/java/branches/flex_1458_3_0_back_compat_tests/src/java/org/apache/lucene/index/TermRef.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458_3_0_back_compat_tests/src/java/org/apache/lucene/index/TermRef.java?rev=900185&r1=900184&r2=900185&view=diff
==============================================================================
--- lucene/java/branches/flex_1458_3_0_back_compat_tests/src/java/org/apache/lucene/index/TermRef.java (original)
+++ lucene/java/branches/flex_1458_3_0_back_compat_tests/src/java/org/apache/lucene/index/TermRef.java Sun Jan 17 18:36:24 2010
@@ -1,7 +0,0 @@
-package org.apache.lucene.index;
-
-public class TermRef {
- public byte[] bytes;
- public int offset;
- public int length;
-};
Modified: lucene/java/branches/flex_1458_3_0_back_compat_tests/src/test/org/apache/lucene/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458_3_0_back_compat_tests/src/test/org/apache/lucene/search/TestSort.java?rev=900185&r1=900184&r2=900185&view=diff
==============================================================================
--- lucene/java/branches/flex_1458_3_0_back_compat_tests/src/test/org/apache/lucene/search/TestSort.java (original)
+++ lucene/java/branches/flex_1458_3_0_back_compat_tests/src/test/org/apache/lucene/search/TestSort.java Sun Jan 17 18:36:24 2010
@@ -35,7 +35,7 @@
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Term;
-import org.apache.lucene.index.TermRef;
+import org.apache.lucene.util.BytesRef;
import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.store.LockObtainFailedException;
@@ -338,7 +338,7 @@
// dummy
return 0;
}
- public final int parseInt(final TermRef term) {
+ public final int parseInt(final BytesRef term) {
return (term.bytes[term.offset]-'A') * 123456;
}
}), SortField.FIELD_DOC);
@@ -351,7 +351,7 @@
// dummy
return 0;
}
- public final float parseFloat(final TermRef term) {
+ public final float parseFloat(final BytesRef term) {
return (float) Math.sqrt( term.bytes[term.offset] );
}
}), SortField.FIELD_DOC });
@@ -363,7 +363,7 @@
public final long parseLong(final String val) {
return (val.charAt(0)-'A') * 1234567890L;
}
- public final long parseLong(final TermRef term) {
+ public final long parseLong(final BytesRef term) {
return (term.bytes[term.offset]-'A') * 1234567890L;
}
}), SortField.FIELD_DOC);
@@ -376,7 +376,7 @@
// dummy
return 0;
}
- public final double parseDouble(final TermRef term) {
+ public final double parseDouble(final BytesRef term) {
return Math.pow( term.bytes[term.offset], (term.bytes[term.offset]-'A') );
}
}), SortField.FIELD_DOC });
@@ -389,7 +389,7 @@
// dummy
return 0;
}
- public final byte parseByte(final TermRef term) {
+ public final byte parseByte(final BytesRef term) {
return (byte) (term.bytes[term.offset]-'A');
}
}), SortField.FIELD_DOC });
@@ -402,7 +402,7 @@
// dummy
return 0;
}
- public final short parseShort(final TermRef term) {
+ public final short parseShort(final BytesRef term) {
return (short) (term.bytes[term.offset]-'A');
}
}), SortField.FIELD_DOC });
@@ -467,7 +467,7 @@
// dummy
return 0;
}
- public final int parseInt(final TermRef term) {
+ public final int parseInt(final BytesRef term) {
return (term.bytes[term.offset]-'A') * 123456;
}
});