Fix test-bug that produced ordinals with gaps

This commit is contained in:
Simon Willnauer 2013-07-24 18:04:13 +02:00
parent 6da558f81f
commit 08697b2ba8
1 changed files with 4 additions and 3 deletions

View File

@ -83,6 +83,7 @@ public class MultiOrdinalsTests extends ElasticsearchTestCase {
lastOrd = ordAndId.ord; lastOrd = ordAndId.ord;
builder.nextOrdinal(); builder.nextOrdinal();
} }
ordAndId.ord = builder.currentOrdinal(); // remap the ordinals in case we have gaps?
builder.addDoc(ordAndId.id); builder.addDoc(ordAndId.id);
} }
@ -117,9 +118,9 @@ public class MultiOrdinalsTests extends ElasticsearchTestCase {
assertThat(docs.getOrd(docId), equalTo(docOrds.get(0))); assertThat(docs.getOrd(docId), equalTo(docOrds.get(0)));
LongsRef ref = docs.getOrds(docId); LongsRef ref = docs.getOrds(docId);
assertThat(ref.offset, equalTo(0)); assertThat(ref.offset, equalTo(0));
for (int i = ref.offset; i < ref.length; i++) { for (int i = ref.offset; i < ref.length; i++) {
assertThat(ref.longs[i], equalTo(docOrds.get(i))); assertThat("index: " + i + " offset: " + ref.offset + " len: " + ref.length, ref.longs[i], equalTo(docOrds.get(i)));
} }
final long[] array = new long[docOrds.size()]; final long[] array = new long[docOrds.size()];
for (int i = 0; i < array.length; i++) { for (int i = 0; i < array.length; i++) {
@ -140,7 +141,7 @@ public class MultiOrdinalsTests extends ElasticsearchTestCase {
} }
public static class OrdAndId { public static class OrdAndId {
final long ord; long ord;
final int id; final int id;
public OrdAndId(long ord, int id) { public OrdAndId(long ord, int id) {