introduce indexes

This commit is contained in:
2021-05-09 10:33:28 +02:00
parent ae545e602c
commit 36ccc57db6
34 changed files with 721 additions and 758 deletions

View File

@@ -4,45 +4,48 @@ import java.util.ArrayList;
import java.util.List;
public class Query {
private final String index;
private final String query;
private final DateTimeRange dateRange;
public Query(final String query, final DateTimeRange dateRange) {
public Query(final String query, final DateTimeRange dateRange, final String index) {
super();
this.query = query;
this.dateRange = dateRange;
this.index = index;
}
public Query relativeMillis(final String query, final long amount) {
return new Query(query, DateTimeRange.relativeMillis(amount));
return new Query(query, DateTimeRange.relativeMillis(amount), index);
}
public Query relativeSeconds(final String query, final long amount) {
return new Query(query, DateTimeRange.relativeSeconds(amount));
return new Query(query, DateTimeRange.relativeSeconds(amount), index);
}
public Query relativeMinutes(final String query, final long amount) {
return new Query(query, DateTimeRange.relativeMinutes(amount));
return new Query(query, DateTimeRange.relativeMinutes(amount), index);
}
public Query relativeHours(final String query, final long amount) {
return new Query(query, DateTimeRange.relativeHours(amount));
return new Query(query, DateTimeRange.relativeHours(amount), index);
}
public Query relativeDays(final String query, final long amount) {
return new Query(query, DateTimeRange.relativeDays(amount));
return new Query(query, DateTimeRange.relativeDays(amount), index);
}
public Query relativeMonths(final String query, final long amount) {
return new Query(query, DateTimeRange.relativeMonths(amount));
return new Query(query, DateTimeRange.relativeMonths(amount), index);
}
public static Query createQuery(final String query, final DateTimeRange dateRange) {
return new Query(query, dateRange);
public static Query createQuery(final String query, final DateTimeRange dateRange, final String index) {
return new Query(query, dateRange, index);
}
public static Query createQuery(final Tags tags, final DateTimeRange dateRange) {
public static Query createQuery(final Tags tags, final DateTimeRange dateRange, final String index) {
final List<String> terms = new ArrayList<>();
@@ -58,7 +61,11 @@ public class Query {
terms.add(term.toString());
}
return new Query(String.join(" and ", terms), dateRange);
return new Query(String.join(" and ", terms), dateRange, index);
}
public String getIndex() {
return index;
}
public String getQuery() {
@@ -71,7 +78,7 @@ public class Query {
@Override
public String toString() {
return "'" + query + "' [" + dateRange + "]";
return "'" + query + "' [" + dateRange + "] in index " + index;
}
}

View File

@@ -10,8 +10,8 @@ public class QueryWithCaretMarker extends Query implements QueryConstants {
private final ResultMode resultMode;
public QueryWithCaretMarker(final String query, final DateTimeRange dateRange, final int caretIndex,
final ResultMode resultMode) {
super(query, dateRange);
final ResultMode resultMode, final String index) {
super(query, dateRange, index);
this.caretIndex = caretIndex;
this.resultMode = resultMode;
}