andreacavalli
/
CavalliumDBEngine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update rocksdb and lucene, add serialization errors details

This commit is contained in:
Andrea Cavalli 2023-12-21 02:02:38 +01:00
parent fa865a654d
commit a5502af24a
6 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -13,8 +13,8 @@
<revision>0-SNAPSHOT</revision> <revision>0-SNAPSHOT</revision>
<dbengine.ci>false</dbengine.ci> <dbengine.ci>false</dbengine.ci>
<micrometer.version>1.10.4</micrometer.version> <micrometer.version>1.10.4</micrometer.version>
<lucene.version>9.8.0</lucene.version> <lucene.version>9.9.1</lucene.version>
<rocksdb.version>8.8.1</rocksdb.version> <rocksdb.version>8.9.1</rocksdb.version>
<junit.jupiter.version>5.9.0</junit.jupiter.version> <junit.jupiter.version>5.9.0</junit.jupiter.version>
<data.generator.version>1.0.25</data.generator.version> <data.generator.version>1.0.25</data.generator.version>
</properties> </properties>

2
src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionary.java
View File

@ -147,7 +147,7 @@ public class DatabaseMapDictionary<T, U> extends DatabaseMapDictionaryDeep<T, U,
} catch (SerializationException ex) { } catch (SerializationException ex) {
throw ex; throw ex;
} catch (Exception ex) { } catch (Exception ex) {
throw new SerializationException("Failed to serialize value"); throw new SerializationException("Failed to serialize value", ex);
} }
return valBuf.asList(); return valBuf.asList();
} }

6
src/main/java/it/cavallium/dbengine/lucene/CheckIndexInput.java
View File

@ -82,6 +82,12 @@ public class CheckIndexInput extends IndexInput {
public RandomAccessInput randomAccessSlice(long offset, long length) throws IOException { public RandomAccessInput randomAccessSlice(long offset, long length) throws IOException {
var ras = input.randomAccessSlice(offset, length); var ras = input.randomAccessSlice(offset, length);
return new RandomAccessInput() { return new RandomAccessInput() {
@Override
public long length() {
checkThread();
return ras.length();
}
@Override @Override
public byte readByte(long pos) throws IOException { public byte readByte(long pos) throws IOException {
checkThread(); checkThread();

3
src/main/java/it/cavallium/dbengine/lucene/FullDocs.java
View File

@ -10,6 +10,7 @@ import it.cavallium.dbengine.utils.SimpleResource;
import java.util.Comparator; import java.util.Comparator;
import java.util.stream.Stream; import java.util.stream.Stream;
import org.apache.lucene.search.FieldComparator; import org.apache.lucene.search.FieldComparator;
import org.apache.lucene.search.Pruning;
import org.apache.lucene.search.Sort; import org.apache.lucene.search.Sort;
import org.apache.lucene.search.SortField; import org.apache.lucene.search.SortField;
import org.apache.lucene.search.TotalHits; import org.apache.lucene.search.TotalHits;
@ -115,7 +116,7 @@ public interface FullDocs<T extends LLDoc> extends ResourceIterable<T> {
for (int compIDX = 0; compIDX < sortFields.length; ++compIDX) { for (int compIDX = 0; compIDX < sortFields.length; ++compIDX) {
SortField sortField = sortFields[compIDX]; SortField sortField = sortFields[compIDX];
comparators[compIDX] = sortField.getComparator(1, compIDX == 0); comparators[compIDX] = sortField.getComparator(1, Pruning.NONE);
reverseMul[compIDX] = sortField.getReverse() ? -1 : 1; reverseMul[compIDX] = sortField.getReverse() ? -1 : 1;
} }

3
src/main/java/it/cavallium/dbengine/lucene/RandomFieldComparatorSource.java
View File

@ -4,6 +4,7 @@ import it.cavallium.dbengine.utils.LFSR;
import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.ThreadLocalRandom;
import org.apache.lucene.search.FieldComparator; import org.apache.lucene.search.FieldComparator;
import org.apache.lucene.search.FieldComparatorSource; import org.apache.lucene.search.FieldComparatorSource;
import org.apache.lucene.search.Pruning;
public class RandomFieldComparatorSource extends FieldComparatorSource { public class RandomFieldComparatorSource extends FieldComparatorSource {
@ -14,7 +15,7 @@ public class RandomFieldComparatorSource extends FieldComparatorSource {
} }
@Override @Override
public FieldComparator<?> newComparator(String fieldName, int numHits, boolean enableSkipping, boolean reversed) { public FieldComparator<?> newComparator(String fieldname, int numHits, Pruning pruning, boolean reversed) {
return new RandomFieldComparator(rand.iterator(), numHits); return new RandomFieldComparator(rand.iterator(), numHits);
} }
} }

2
src/main/java/it/cavallium/dbengine/lucene/searcher/ShardIndexSearcher.java
View File

@ -119,7 +119,7 @@ public class ShardIndexSearcher extends IndexSearcher {
throw new NoSuchElementException("node=" + nodeID); throw new NoSuchElementException("node=" + nodeID);
} }
for (Term term : terms) { for (Term term : terms) {
final TermStates ts = TermStates.build(s.getIndexReader().getContext(), term, true); final TermStates ts = TermStates.build(s, term, true);
if (ts.docFreq() > 0) { if (ts.docFreq() > 0) {
stats.put(term, s.termStatistics(term, ts.docFreq(), ts.totalTermFreq())); stats.put(term, s.termStatistics(term, ts.docFreq(), ts.totalTermFreq()));
} }