Refactoring

src/main/java/it/cavallium/dbengine/database/DatabaseMemoryMode.java

@@ -1,4 +1,4 @@
-package it.cavallium.dbengine.database.indicizer;
+package it.cavallium.dbengine.database;
 
 public enum DatabaseMemoryMode {
 	LOW, NORMAL, HIGH

src/main/java/it/cavallium/dbengine/database/LLKeyValueDatabase.java

@@ -2,11 +2,11 @@ package it.cavallium.dbengine.database;
 
 import com.google.common.primitives.Ints;
 import com.google.common.primitives.Longs;
+import it.cavallium.dbengine.database.collections.LLInt;
+import it.cavallium.dbengine.database.collections.LLLong;
 import java.io.Closeable;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import it.cavallium.dbengine.database.structures.LLInt;
-import it.cavallium.dbengine.database.structures.LLLong;
 
 public interface LLKeyValueDatabase extends Closeable, LLSnapshottable, LLKeyValueDatabaseStructure {
 

src/main/java/it/cavallium/dbengine/database/LLUtils.java

@@ -3,7 +3,7 @@ package it.cavallium.dbengine.database;
 import com.google.common.primitives.Ints;
 import com.google.common.primitives.Longs;
 import com.google.protobuf.ByteString;
-import it.cavallium.dbengine.database.utils.RandomSortField;
+import it.cavallium.dbengine.lucene.RandomSortField;
 import it.cavallium.dbengine.proto.LLKeyScore;
 import it.cavallium.dbengine.proto.LLType;
 import java.nio.ByteBuffer;

src/main/java/it/cavallium/dbengine/database/collections/LLInt.java

@@ -1,4 +1,4 @@
-package it.cavallium.dbengine.database.structures;
+package it.cavallium.dbengine.database.collections;
 
 import com.google.common.primitives.Ints;
 import it.cavallium.dbengine.database.LLKeyValueDatabaseStructure;

src/main/java/it/cavallium/dbengine/database/collections/LLLong.java

@@ -1,4 +1,4 @@
-package it.cavallium.dbengine.database.structures;
+package it.cavallium.dbengine.database.collections;
 
 import com.google.common.primitives.Ints;
 import com.google.common.primitives.Longs;

src/main/java/it/cavallium/dbengine/database/disk/LLLocalLuceneIndex.java

@@ -11,10 +11,10 @@ import it.cavallium.dbengine.database.LLTerm;
 import it.cavallium.dbengine.database.LLUtils;
 import it.cavallium.dbengine.database.LuceneUtils;
 import it.cavallium.dbengine.database.analyzer.TextFieldsAnalyzer;
-import it.cavallium.dbengine.database.luceneutil.AdaptiveStreamSearcher;
-import it.cavallium.dbengine.database.luceneutil.LuceneStreamSearcher;
-import it.cavallium.dbengine.database.luceneutil.PagedStreamSearcher;
-import it.cavallium.luceneserializer.luceneserializer.QueryParser;
+import it.cavallium.dbengine.lucene.searcher.AdaptiveStreamSearcher;
+import it.cavallium.dbengine.lucene.searcher.LuceneStreamSearcher;
+import it.cavallium.dbengine.lucene.searcher.PagedStreamSearcher;
+import it.cavallium.dbengine.lucene.serializer.QueryParser;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.time.Duration;

src/main/java/it/cavallium/dbengine/database/indicizer/JoinedIndicizerWriter.java

@@ -1,5 +1,6 @@
 package it.cavallium.dbengine.database.indicizer;
 
+import it.cavallium.dbengine.database.DatabaseMemoryMode;
 import it.cavallium.dbengine.database.LLScoreMode;
 import it.cavallium.dbengine.database.LLSearchResult;
 import it.cavallium.dbengine.database.LLSort;

src/main/java/it/cavallium/dbengine/database/indicizer/LuceneIndicizerWriter.java

@@ -1,6 +1,7 @@
 package it.cavallium.dbengine.database.indicizer;
 
 import it.cavallium.dbengine.client.CompositeSnapshot;
+import it.cavallium.dbengine.database.DatabaseMemoryMode;
 import it.cavallium.dbengine.database.LLScoreMode;
 import it.cavallium.dbengine.database.LLSearchResult;
 import it.cavallium.dbengine.database.LLSort;

src/main/java/it/cavallium/dbengine/database/indicizer/StandardLuceneIndicizerWriter.java

@@ -1,5 +1,6 @@
 package it.cavallium.dbengine.database.indicizer;
 
+import it.cavallium.dbengine.database.DatabaseMemoryMode;
 import it.cavallium.dbengine.database.LLLuceneIndex;
 import it.cavallium.dbengine.database.LLScoreMode;
 import it.cavallium.dbengine.database.LLSearchResult;

src/main/java/it/cavallium/dbengine/lucene/LuceneParallelStreamCollector.java

@@ -1,4 +1,4 @@
-package it.cavallium.dbengine.database.utils;
+package it.cavallium.dbengine.lucene;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicBoolean;

src/main/java/it/cavallium/dbengine/lucene/LuceneParallelStreamCollectorManager.java

@@ -1,4 +1,4 @@
-package it.cavallium.dbengine.database.utils;
+package it.cavallium.dbengine.lucene;
 
 import java.util.Collection;
 import java.util.concurrent.atomic.AtomicBoolean;

src/main/java/it/cavallium/dbengine/lucene/LuceneParallelStreamCollectorResult.java

@@ -1,4 +1,4 @@
-package it.cavallium.dbengine.database.utils;
+package it.cavallium.dbengine.lucene;
 
 public class LuceneParallelStreamCollectorResult {
 

src/main/java/it/cavallium/dbengine/lucene/LuceneParallelStreamConsumer.java

@@ -1,4 +1,4 @@
-package it.cavallium.dbengine.database.utils;
+package it.cavallium.dbengine.lucene;
 
 public interface LuceneParallelStreamConsumer {
 

src/main/java/it/cavallium/dbengine/lucene/RandomFieldComparator.java

@@ -1,4 +1,4 @@
-package it.cavallium.dbengine.database.utils;
+package it.cavallium.dbengine.lucene;
 
 import java.io.IOException;
 import java.math.BigInteger;

src/main/java/it/cavallium/dbengine/lucene/RandomFieldComparatorSource.java

@@ -1,4 +1,4 @@
-package it.cavallium.dbengine.database.utils;
+package it.cavallium.dbengine.lucene;
 
 import java.util.concurrent.ThreadLocalRandom;
 import org.apache.lucene.search.FieldComparator;

src/main/java/it/cavallium/dbengine/lucene/RandomSortField.java

@@ -1,4 +1,4 @@
-package it.cavallium.dbengine.database.utils;
+package it.cavallium.dbengine.lucene;
 
 import org.apache.lucene.search.SortField;
 

src/main/java/it/cavallium/dbengine/lucene/searcher/AdaptiveStreamSearcher.java

@@ -1,4 +1,4 @@
-package it.cavallium.dbengine.database.luceneutil;
+package it.cavallium.dbengine.lucene.searcher;
 
 import it.cavallium.dbengine.database.LLKeyScore;
 import java.io.IOException;

src/main/java/it/cavallium/dbengine/lucene/searcher/CountStreamSearcher.java

@@ -1,4 +1,4 @@
-package it.cavallium.dbengine.database.luceneutil;
+package it.cavallium.dbengine.lucene.searcher;
 
 import it.cavallium.dbengine.database.LLKeyScore;
 import java.io.IOException;

src/main/java/it/cavallium/dbengine/lucene/searcher/LuceneStreamSearcher.java

@@ -1,4 +1,4 @@
-package it.cavallium.dbengine.database.luceneutil;
+package it.cavallium.dbengine.lucene.searcher;
 
 import it.cavallium.dbengine.database.LLKeyScore;
 import java.io.IOException;

src/main/java/it/cavallium/dbengine/lucene/searcher/PagedStreamSearcher.java

@@ -1,4 +1,4 @@
-package it.cavallium.dbengine.database.luceneutil;
+package it.cavallium.dbengine.lucene.searcher;
 
 import it.cavallium.dbengine.database.LLKeyScore;
 import java.io.IOException;

src/main/java/it/cavallium/dbengine/lucene/searcher/ParallelCollectorStreamSearcher.java

@@ -1,7 +1,7 @@
-package it.cavallium.dbengine.database.luceneutil;
+package it.cavallium.dbengine.lucene.searcher;
 
 import it.cavallium.dbengine.database.LLKeyScore;
-import it.cavallium.dbengine.database.utils.LuceneParallelStreamCollectorManager;
+import it.cavallium.dbengine.lucene.LuceneParallelStreamCollectorManager;
 import java.io.IOException;
 import java.util.Set;
 import java.util.concurrent.CompletionException;

src/main/java/it/cavallium/dbengine/lucene/searcher/SimpleStreamSearcher.java

@@ -1,4 +1,4 @@
-package it.cavallium.dbengine.database.luceneutil;
+package it.cavallium.dbengine.lucene.searcher;
 
 import it.cavallium.dbengine.database.LLKeyScore;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;

src/main/java/it/cavallium/dbengine/lucene/serializer/BooleanQuery.java

@@ -1,4 +1,4 @@
-package it.cavallium.luceneserializer.luceneserializer;
+package it.cavallium.dbengine.lucene.serializer;
 
 import java.util.Collection;
 

src/main/java/it/cavallium/dbengine/lucene/serializer/BooleanQueryInfo.java

@@ -1,4 +1,4 @@
-package it.cavallium.luceneserializer.luceneserializer;
+package it.cavallium.dbengine.lucene.serializer;
 
 import java.util.Objects;
 import org.apache.lucene.search.BooleanClause;

src/main/java/it/cavallium/dbengine/lucene/serializer/BooleanQueryPart.java

@@ -1,4 +1,4 @@
-package it.cavallium.luceneserializer.luceneserializer;
+package it.cavallium.dbengine.lucene.serializer;
 
 public class BooleanQueryPart implements SerializedQueryObject {
 

src/main/java/it/cavallium/dbengine/lucene/serializer/BoostQuery.java

@@ -1,4 +1,4 @@
-package it.cavallium.luceneserializer.luceneserializer;
+package it.cavallium.dbengine.lucene.serializer;
 
 public class BoostQuery implements Query {
 

src/main/java/it/cavallium/dbengine/lucene/serializer/FuzzyQuery.java

@@ -1,4 +1,4 @@
-package it.cavallium.luceneserializer.luceneserializer;
+package it.cavallium.dbengine.lucene.serializer;
 
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.BooleanQuery;

src/main/java/it/cavallium/dbengine/lucene/serializer/IntPointExactQuery.java

@@ -1,4 +1,4 @@
-package it.cavallium.luceneserializer.luceneserializer;
+package it.cavallium.dbengine.lucene.serializer;
 
 public class IntPointExactQuery implements Query {
 

src/main/java/it/cavallium/dbengine/lucene/serializer/IntPointRangeQuery.java

@@ -1,4 +1,4 @@
-package it.cavallium.luceneserializer.luceneserializer;
+package it.cavallium.dbengine.lucene.serializer;
 
 public class IntPointRangeQuery implements Query {
 

src/main/java/it/cavallium/dbengine/lucene/serializer/LongPointExactQuery.java

@@ -1,4 +1,4 @@
-package it.cavallium.luceneserializer.luceneserializer;
+package it.cavallium.dbengine.lucene.serializer;
 
 public class LongPointExactQuery implements Query {
 

src/main/java/it/cavallium/dbengine/lucene/serializer/LongPointRangeQuery.java

@@ -1,4 +1,4 @@
-package it.cavallium.luceneserializer.luceneserializer;
+package it.cavallium.dbengine.lucene.serializer;
 
 public class LongPointRangeQuery implements Query {
 

src/main/java/it/cavallium/dbengine/lucene/serializer/MatchAllDocsQuery.java

@@ -1,4 +1,4 @@
-package it.cavallium.luceneserializer.luceneserializer;
+package it.cavallium.dbengine.lucene.serializer;
 
 public class MatchAllDocsQuery implements Query {
 

src/main/java/it/cavallium/dbengine/lucene/serializer/Occur.java

@@ -1,4 +1,4 @@
-package it.cavallium.luceneserializer.luceneserializer;
+package it.cavallium.dbengine.lucene.serializer;
 
 import org.apache.lucene.search.BooleanClause;
 

src/main/java/it/cavallium/dbengine/lucene/serializer/ParseException.java

@@ -1,4 +1,4 @@
-package it.cavallium.luceneserializer.luceneserializer;
+package it.cavallium.dbengine.lucene.serializer;
 
 public class ParseException extends Exception {
 

src/main/java/it/cavallium/dbengine/lucene/serializer/PhraseQuery.java

@@ -1,4 +1,4 @@
-package it.cavallium.luceneserializer.luceneserializer;
+package it.cavallium.dbengine.lucene.serializer;
 
 public class PhraseQuery implements Query {
 

src/main/java/it/cavallium/dbengine/lucene/serializer/Query.java

@@ -1,4 +1,4 @@
-package it.cavallium.luceneserializer.luceneserializer;
+package it.cavallium.dbengine.lucene.serializer;
 
 public interface Query extends SerializedQueryObject {
 

src/main/java/it/cavallium/dbengine/lucene/serializer/QueryConstructorType.java

@@ -1,4 +1,4 @@
-package it.cavallium.luceneserializer.luceneserializer;
+package it.cavallium.dbengine.lucene.serializer;
 
 public enum QueryConstructorType {
 	BOOLEAN_QUERY,

src/main/java/it/cavallium/dbengine/lucene/serializer/QueryParser.java

@@ -1,4 +1,4 @@
-package it.cavallium.luceneserializer.luceneserializer;
+package it.cavallium.dbengine.lucene.serializer;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;

src/main/java/it/cavallium/dbengine/lucene/serializer/SerializedQueryObject.java

@@ -1,4 +1,4 @@
-package it.cavallium.luceneserializer.luceneserializer;
+package it.cavallium.dbengine.lucene.serializer;
 
 public interface SerializedQueryObject {
 

src/main/java/it/cavallium/dbengine/lucene/serializer/SortedNumericDocValuesFieldSlowRangeQuery.java

@@ -1,4 +1,4 @@
-package it.cavallium.luceneserializer.luceneserializer;
+package it.cavallium.dbengine.lucene.serializer;
 
 public class SortedNumericDocValuesFieldSlowRangeQuery implements Query {
 

src/main/java/it/cavallium/dbengine/lucene/serializer/StringifyUtils.java

@@ -1,4 +1,4 @@
-package it.cavallium.luceneserializer.luceneserializer;
+package it.cavallium.dbengine.lucene.serializer;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;

src/main/java/it/cavallium/dbengine/lucene/serializer/TermPosition.java

@@ -1,4 +1,4 @@
-package it.cavallium.luceneserializer.luceneserializer;
+package it.cavallium.dbengine.lucene.serializer;
 
 import org.apache.lucene.index.Term;
 

src/main/java/it/cavallium/dbengine/lucene/serializer/TermQuery.java

@@ -1,4 +1,4 @@
-package it.cavallium.luceneserializer.luceneserializer;
+package it.cavallium.dbengine.lucene.serializer;
 
 import org.apache.lucene.index.Term;