Skip to content

Commit

Permalink
Programming Challenge redislabs-training#2 and redislabs-training#3 r…
Browse files Browse the repository at this point in the history 
…efactoring
  • Loading branch information
@ThiernoAmirouDiallo
ThiernoAmirouDiallo committed Nov 14, 2022
1 parent cf0b231 commit 00d1b01
Show file tree
Hide file tree
Showing 2 changed files with 168 additions and 182 deletions.
329 changes: 158 additions & 171 deletions src/main/java/com/redislabs/university/RU102J/dao/MetricDaoRedisZsetImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,18 @@
import com.redislabs.university.RU102J.api.Measurement;
import com.redislabs.university.RU102J.api.MeterReading;
import com.redislabs.university.RU102J.api.MetricUnit;
import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisPool;
import redis.clients.jedis.Pipeline;
import redis.clients.jedis.Tuple;

import java.text.DecimalFormat;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.util.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;

import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisPool;
import redis.clients.jedis.Tuple;

/**
* Retain metrics using Redis sorted sets.
Expand All @@ -22,170 +25,154 @@
*
*/
public class MetricDaoRedisZsetImpl implements MetricDao {
static private final Integer MAX_METRIC_RETENTION_DAYS = 30;
static private final Integer MAX_DAYS_TO_RETURN = 7;
static private final Integer METRICS_PER_DAY = 60 * 24;
static private final Integer METRIC_EXPIRATION_SECONDS =
60 * 60 * 24 * MAX_METRIC_RETENTION_DAYS + 1;
private final JedisPool jedisPool;

public MetricDaoRedisZsetImpl(JedisPool jedisPool) {
this.jedisPool = jedisPool;
}

@Override
public void insert(MeterReading reading) {
try (Jedis jedis = jedisPool.getResource()) {
insertMetric(jedis, reading.getSiteId(), reading.getWhGenerated(),
MetricUnit.WHGenerated, reading.getDateTime());
insertMetric(jedis, reading.getSiteId(), reading.getWhUsed(),
MetricUnit.WHUsed, reading.getDateTime());
insertMetric(jedis, reading.getSiteId(), reading.getTempC(),
MetricUnit.TemperatureCelsius, reading.getDateTime());
}
}

// Challenge #2
private void insertMetric(Jedis jedis, long siteId, double value, MetricUnit unit,
ZonedDateTime dateTime) {
String metricKey = RedisSchema.getDayMetricKey(siteId, unit, dateTime);
Integer minuteOfDay = getMinuteOfDay(dateTime);

jedis.zadd( metricKey, minuteOfDay, String.format( "%s:%s", value, minuteOfDay ) );
}

/**
* Return the N most-recent minute-level measurements starting at the
* provided day.
* TODO: Watch out for large data structures when sharding
* TODO: Or implement your own expiry with zremrange
*/
@Override
public List<Measurement> getRecent(Long siteId, MetricUnit unit,
ZonedDateTime time, Integer limit) {
if (limit > METRICS_PER_DAY * MAX_METRIC_RETENTION_DAYS) {
throw new IllegalArgumentException("Cannot request more than two weeks" +
"of minute-level data");
}

List<Measurement> measurements = new ArrayList<>();
ZonedDateTime currentDate = time;
Integer count = limit;
Integer iterations = 0;

// This loop extracts the elements of successive
// sorted sets until it reaches the requested limit.
do {
List<Measurement> ms = getMeasurementsForDate(siteId, currentDate,
unit, count);
measurements.addAll(0, ms);
count -= ms.size();
currentDate = currentDate.minusDays(1);
iterations += 1;
} while (count > 0 && iterations < MAX_DAYS_TO_RETURN);

return measurements;
}

/**
* Return up to `count` elements from the sorted set corresponding to
* the siteId, date, and metric unit specified here.
*/
private List<Measurement> getMeasurementsForDate(Long siteId,
ZonedDateTime date,
MetricUnit unit,
Integer count) {
// A list of Measurement objects to return.
List<Measurement> measurements = new ArrayList<>();

try (Jedis jedis = jedisPool.getResource()) {
// Get the metric key for the day implied by the date.
// metric:[unit-name]:[year-month-day]:[site-id]
// e.g.: metrics:whU:2020-01-01:1
String metricKey = RedisSchema.getDayMetricKey(siteId, unit, date);

// Return a reverse range so that we're always consuming from the end
// of the sorted set.
Set<Tuple> metrics = jedis.zrevrangeWithScores(metricKey, 0, count - 1);
for (Tuple minuteValue : metrics) {
// Elements of the set are of the form [measurement]:[minute]
// The MeasurementMinute class abstracts this for us.
MeasurementMinute mm = MeasurementMinute.fromZSetValue(
minuteValue.getElement());

// Derive the dateTime for the measurement using the date and
// the minute of the day.
ZonedDateTime dateTime = getDateFromDayMinute(date,
mm.getMinuteOfDay());

// Add a new measurement to the list of measurements.
measurements.add(new Measurement(siteId, unit, dateTime,
mm.getMeasurement()));
}
}

Collections.reverse(measurements);
return measurements;
}

private ZonedDateTime getDateFromDayMinute(ZonedDateTime dateTime,
Integer dayMinute) {
int minute = dayMinute % 60;
int hour = dayMinute / 60;
return dateTime.withHour(hour).withMinute(minute).
withZoneSameInstant(ZoneOffset.UTC);
}

// Return the minute of the day. For example:
// 01:12 is the 72nd minute of the day
// 5:00 is the 300th minute of the day
public Integer getMinuteOfDay(ZonedDateTime dateTime) {
int hour = dateTime.getHour();
int minute = dateTime.getMinute();
return hour * 60 + minute;
}

/**
* Utility class to convert between our sorted set members and their
* constituent measurement and minute values.
*
* Also rounds decimals before storing them.
*/
public static class MeasurementMinute {
private final Double measurement;
private final Integer minuteOfDay;
private final DecimalFormat decimalFormat;

// For a sorted set value of "22.0:1", this classes provides
// the measurement value of 22.0 and the minuteOfDay value of 1.
public static MeasurementMinute fromZSetValue(String zSetValue) {
String[] parts = zSetValue.split(":");
if (parts.length == 2) {
return new MeasurementMinute(Double.valueOf(parts[0]),
Integer.valueOf(parts[1]));
} else {
throw new IllegalArgumentException("Cannot convert zSetValue " +
zSetValue + " into MeasurementMinute");
}
}

public MeasurementMinute(Double measurement, Integer minuteOfDay) {
this.measurement = measurement;
this.minuteOfDay = minuteOfDay;
this.decimalFormat = new DecimalFormat("#.##");
}

public Integer getMinuteOfDay() {
return minuteOfDay;
}

public Double getMeasurement() {
return measurement;
}

public String toString() {
return decimalFormat.format(measurement) + ':' +
String.valueOf(minuteOfDay);
}
}

static private final Integer MAX_METRIC_RETENTION_DAYS = 30;
static private final Integer MAX_DAYS_TO_RETURN = 7;
static private final Integer METRICS_PER_DAY = 60 * 24;
static private final Integer METRIC_EXPIRATION_SECONDS = 60 * 60 * 24 * MAX_METRIC_RETENTION_DAYS + 1;
private final JedisPool jedisPool;

public MetricDaoRedisZsetImpl( JedisPool jedisPool ) {
this.jedisPool = jedisPool;
}

@Override
public void insert( MeterReading reading ) {
try ( Jedis jedis = jedisPool.getResource() ) {
insertMetric( jedis, reading.getSiteId(), reading.getWhGenerated(), MetricUnit.WHGenerated, reading.getDateTime() );
insertMetric( jedis, reading.getSiteId(), reading.getWhUsed(), MetricUnit.WHUsed, reading.getDateTime() );
insertMetric( jedis, reading.getSiteId(), reading.getTempC(), MetricUnit.TemperatureCelsius, reading.getDateTime() );
}
}

// Challenge #2
private void insertMetric( Jedis jedis, long siteId, double value, MetricUnit unit, ZonedDateTime dateTime ) {
String metricKey = RedisSchema.getDayMetricKey( siteId, unit, dateTime );
Integer minuteOfDay = getMinuteOfDay( dateTime );

jedis.zadd( metricKey, minuteOfDay, new MeasurementMinute( value, minuteOfDay ).toString() );
jedis.expire( metricKey, METRIC_EXPIRATION_SECONDS );
}

/**
* Return the N most-recent minute-level measurements starting at the
* provided day.
* TODO: Watch out for large data structures when sharding
* TODO: Or implement your own expiry with zremrange
*/
@Override
public List<Measurement> getRecent( Long siteId, MetricUnit unit, ZonedDateTime time, Integer limit ) {
if ( limit > METRICS_PER_DAY * MAX_METRIC_RETENTION_DAYS ) {
throw new IllegalArgumentException( "Cannot request more than two weeks" + "of minute-level data" );
}

List<Measurement> measurements = new ArrayList<>();
ZonedDateTime currentDate = time;
Integer count = limit;
Integer iterations = 0;

// This loop extracts the elements of successive
// sorted sets until it reaches the requested limit.
do {
List<Measurement> ms = getMeasurementsForDate( siteId, currentDate, unit, count );
measurements.addAll( 0, ms );
count -= ms.size();
currentDate = currentDate.minusDays( 1 );
iterations += 1;
} while ( count > 0 && iterations < MAX_DAYS_TO_RETURN );

return measurements;
}

/**
* Return up to `count` elements from the sorted set corresponding to
* the siteId, date, and metric unit specified here.
*/
private List<Measurement> getMeasurementsForDate( Long siteId, ZonedDateTime date, MetricUnit unit, Integer count ) {
// A list of Measurement objects to return.
List<Measurement> measurements = new ArrayList<>();

try ( Jedis jedis = jedisPool.getResource() ) {
// Get the metric key for the day implied by the date.
// metric:[unit-name]:[year-month-day]:[site-id]
// e.g.: metrics:whU:2020-01-01:1
String metricKey = RedisSchema.getDayMetricKey( siteId, unit, date );

// Return a reverse range so that we're always consuming from the end
// of the sorted set.
Set<Tuple> metrics = jedis.zrevrangeWithScores( metricKey, 0, count - 1 );
for ( Tuple minuteValue : metrics ) {
// Elements of the set are of the form [measurement]:[minute]
// The MeasurementMinute class abstracts this for us.
MeasurementMinute mm = MeasurementMinute.fromZSetValue( minuteValue.getElement() );

// Derive the dateTime for the measurement using the date and
// the minute of the day.
ZonedDateTime dateTime = getDateFromDayMinute( date, mm.getMinuteOfDay() );

// Add a new measurement to the list of measurements.
measurements.add( new Measurement( siteId, unit, dateTime, mm.getMeasurement() ) );
}
}

Collections.reverse( measurements );
return measurements;
}

private ZonedDateTime getDateFromDayMinute( ZonedDateTime dateTime, Integer dayMinute ) {
int minute = dayMinute % 60;
int hour = dayMinute / 60;
return dateTime.withHour( hour ).withMinute( minute ).withZoneSameInstant( ZoneOffset.UTC );
}

// Return the minute of the day. For example:
// 01:12 is the 72nd minute of the day
// 5:00 is the 300th minute of the day
public Integer getMinuteOfDay( ZonedDateTime dateTime ) {
int hour = dateTime.getHour();
int minute = dateTime.getMinute();
return hour * 60 + minute;
}

/**
* Utility class to convert between our sorted set members and their
* constituent measurement and minute values.
*
* Also rounds decimals before storing them.
*/
public static class MeasurementMinute {

private final Double measurement;
private final Integer minuteOfDay;
private final DecimalFormat decimalFormat;

// For a sorted set value of "22.0:1", this classes provides
// the measurement value of 22.0 and the minuteOfDay value of 1.
public static MeasurementMinute fromZSetValue( String zSetValue ) {
String[] parts = zSetValue.split( ":" );
if ( parts.length == 2 ) {
return new MeasurementMinute( Double.valueOf( parts[0] ), Integer.valueOf( parts[1] ) );
} else {
throw new IllegalArgumentException( "Cannot convert zSetValue " + zSetValue + " into MeasurementMinute" );
}
}

public MeasurementMinute( Double measurement, Integer minuteOfDay ) {
this.measurement = measurement;
this.minuteOfDay = minuteOfDay;
this.decimalFormat = new DecimalFormat( "#.##" );
}

public Integer getMinuteOfDay() {
return minuteOfDay;
}

public Double getMeasurement() {
return measurement;
}

public String toString() {
return decimalFormat.format( measurement ) + ':' + String.valueOf( minuteOfDay );
}
}
}
21 changes: 10 additions & 11 deletions src/main/java/com/redislabs/university/RU102J/dao/SiteStatsDaoRedisImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,20 +78,19 @@ private void updateBasic( Jedis jedis, String key, MeterReading reading ) {

// Challenge #3
private void updateOptimized( Jedis jedis, String key, MeterReading reading ) {
String reportingTime = ZonedDateTime.now( ZoneOffset.UTC ).toString();

jedis.hset( key, SiteStats.reportingTimeField, reportingTime );
jedis.hincrBy( key, SiteStats.countField, 1 );
jedis.expire( key, weekSeconds );
try ( Transaction t = jedis.multi() ) {
String reportingTime = ZonedDateTime.now( ZoneOffset.UTC ).toString();

Transaction transaction = jedis.multi();
t.hset( key, SiteStats.reportingTimeField, reportingTime );
t.hincrBy( key, SiteStats.countField, 1 );
t.expire( key, weekSeconds );

compareAndUpdateScript.updateIfGreater( transaction, key, SiteStats.maxWhField, reading.getWhGenerated() );
compareAndUpdateScript.updateIfLess( transaction, key, SiteStats.minWhField, reading.getWhGenerated() );
compareAndUpdateScript.updateIfGreater( transaction, key, SiteStats.maxCapacityField, getCurrentCapacity( reading ) );
compareAndUpdateScript.updateIfGreater( t, key, SiteStats.maxWhField, reading.getWhGenerated() );
compareAndUpdateScript.updateIfLess( t, key, SiteStats.minWhField, reading.getWhGenerated() );
compareAndUpdateScript.updateIfGreater( t, key, SiteStats.maxCapacityField, getCurrentCapacity( reading ) );

transaction.exec();
transaction.close();
t.exec();
}
}

private Double getCurrentCapacity( MeterReading reading ) {
Expand Down

0 comments on commit 00d1b01

Please sign in to comment.