introduce index clustering (part 1)
In order to prevent files from getting too big and make it easier to implement retention policies, we are splitting all files into chunks. Each chunk contains the data for a time interval (1 month per default). This first changeset introduces the ClusteredPersistentMap that implements this for PersistentMap. It is used for a couple (not all) of indices.
This commit is contained in:
@@ -15,6 +15,8 @@ import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.locks.ReentrantLock;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.lucares.pdb.api.DateTimeRange;
|
||||
import org.lucares.pdb.api.Query;
|
||||
import org.lucares.pdb.datastore.Proposal;
|
||||
import org.lucares.pdb.plot.api.AxisScale;
|
||||
import org.lucares.pdb.plot.api.Limit;
|
||||
@@ -228,7 +230,10 @@ public class PdbController implements HardcodedValues, PropertyKeys {
|
||||
)
|
||||
@ResponseBody
|
||||
List<String> fields() {
|
||||
final List<String> fields = db.getFields();
|
||||
// TODO get date range from UI
|
||||
// TODO time range must not be static
|
||||
final DateTimeRange dateTimeRange = DateTimeRange.relativeYears(5);
|
||||
final List<String> fields = db.getFields(dateTimeRange);
|
||||
|
||||
fields.sort(Collator.getInstance(Locale.ENGLISH));
|
||||
|
||||
@@ -244,7 +249,11 @@ public class PdbController implements HardcodedValues, PropertyKeys {
|
||||
SortedSet<String> fields(@PathVariable(name = "fieldName") final String fieldName,
|
||||
@RequestParam(name = "query") final String query) {
|
||||
|
||||
final SortedSet<String> fields = db.getFieldsValues(query, fieldName);
|
||||
// TODO get date range from UI
|
||||
// TODO time range must not be static
|
||||
final DateTimeRange dateRange = DateTimeRange.relativeYears(5);
|
||||
final Query q = new Query(query, dateRange);
|
||||
final SortedSet<String> fields = db.getFieldsValues(q, fieldName);
|
||||
|
||||
return fields;
|
||||
}
|
||||
|
||||
76
pdb-ui/src/main/java/org/lucares/pdbui/domain/DateRange.java
Normal file
76
pdb-ui/src/main/java/org/lucares/pdbui/domain/DateRange.java
Normal file
@@ -0,0 +1,76 @@
|
||||
package org.lucares.pdbui.domain;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.time.ZoneOffset;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
|
||||
import org.lucares.pdb.api.DateTimeRange;
|
||||
|
||||
public class DateRange {
|
||||
|
||||
private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
||||
|
||||
private String startDate;
|
||||
private String endDate;
|
||||
|
||||
DateRange() {
|
||||
super();
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param startDate date in format 'yyyy-MM-dd HH:mm:ss'
|
||||
* @param endDate date in format 'yyyy-MM-dd HH:mm:ss'
|
||||
*/
|
||||
public DateRange(final String startDate, final String endDate) {
|
||||
this.startDate = startDate;
|
||||
this.endDate = endDate;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @return date in format 'yyyy-MM-dd HH:mm:ss'
|
||||
*/
|
||||
public String getStartDate() {
|
||||
return startDate;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param startDate date in format 'yyyy-MM-dd HH:mm:ss'
|
||||
*/
|
||||
public void setStartDate(final String startDate) {
|
||||
this.startDate = startDate;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @return date in format 'yyyy-MM-dd HH:mm:ss'
|
||||
*/
|
||||
public String getEndDate() {
|
||||
return endDate;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param endDate date in format 'yyyy-MM-dd HH:mm:ss'
|
||||
*/
|
||||
public void setEndDate(final String endDate) {
|
||||
this.endDate = endDate;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return startDate + " - " + endDate;
|
||||
}
|
||||
|
||||
public DateTimeRange toDateTimeRange() {
|
||||
|
||||
final OffsetDateTime start = LocalDateTime.parse(startDate, DATE_FORMAT).atOffset(ZoneOffset.UTC);
|
||||
final OffsetDateTime end = LocalDateTime.parse(endDate, DATE_FORMAT).atOffset(ZoneOffset.UTC);
|
||||
|
||||
return new DateTimeRange(start, end);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user