Skip to content

Commit

Permalink
Implement ArrayEncoder for temporal values.
Browse files Browse the repository at this point in the history
  • Loading branch information
@sherfert
sherfert committed Feb 7, 2018
1 parent 4a9d56e commit e4bd864
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 18 deletions.
35 changes: 28 additions & 7 deletions community/kernel/src/main/java/org/neo4j/kernel/api/index/ArrayEncoder.java
View file
Expand Up @@ -19,9 +19,17 @@
*/
package org.neo4j.kernel.api.index;

import java.time.ZoneId;
import java.time.ZoneOffset;
import java.util.Base64;

import org.neo4j.string.UTF8;
import org.neo4j.values.storable.DateTimeValue;
import org.neo4j.values.storable.DateValue;
import org.neo4j.values.storable.DurationValue;
import org.neo4j.values.storable.LocalDateTimeValue;
import org.neo4j.values.storable.LocalTimeValue;
import org.neo4j.values.storable.TimeValue;
import org.neo4j.values.storable.Value;
import org.neo4j.values.storable.ValueWriter;
import org.neo4j.values.storable.Values;
Expand Down Expand Up @@ -153,43 +161,50 @@ public void writePoint( CoordinateReferenceSystem crs, double[] coordinate ) thr
@Override
public void writeDuration( long months, long days, long seconds, int nanos ) throws RuntimeException
{
throw new UnsupportedOperationException( "not implemented" );
builder.append( DurationValue.duration( months, days, seconds, nanos ).prettyPrint() );
builder.append( '|' );
}

@Override
public void writeDate( long epochDay ) throws RuntimeException
{
throw new UnsupportedOperationException( "not implemented" );
builder.append( DateValue.epochDate( epochDay ).prettyPrint() );
builder.append( '|' );
}

@Override
public void writeLocalTime( long nanoOfDay ) throws RuntimeException
{
throw new UnsupportedOperationException( "not implemented" );
builder.append( LocalTimeValue.localTime( nanoOfDay ).prettyPrint() );
builder.append( '|' );
}

@Override
public void writeTime( long nanosOfDayUTC, int offsetSeconds ) throws RuntimeException
{
throw new UnsupportedOperationException( "not implemented" );
builder.append( TimeValue.time( nanosOfDayUTC, ZoneOffset.ofTotalSeconds( offsetSeconds ) ).prettyPrint() );
builder.append( '|' );
}

@Override
public void writeLocalDateTime( long epochSecond, int nano ) throws RuntimeException
{
throw new UnsupportedOperationException( "not implemented" );
builder.append( LocalDateTimeValue.localDateTime( epochSecond, nano ).prettyPrint() );
builder.append( '|' );
}

@Override
public void writeDateTime( long epochSecondUTC, int nano, int offsetSeconds ) throws RuntimeException
{
throw new UnsupportedOperationException( "not implemented" );
builder.append( DateTimeValue.datetime( epochSecondUTC, nano, ZoneOffset.ofTotalSeconds( offsetSeconds ) ).prettyPrint() );
builder.append( '|' );
}

@Override
public void writeDateTime( long epochSecondUTC, int nano, String zoneId ) throws RuntimeException
{
throw new UnsupportedOperationException( "not implemented" );
builder.append( DateTimeValue.datetime( epochSecondUTC, nano, ZoneId.of( zoneId ) ).prettyPrint() );
builder.append( '|' );
}

@Override
Expand Down Expand Up @@ -231,6 +246,12 @@ private char typeChar( ArrayType arrayType )
case CHAR: return 'L';
case STRING: return 'L';
case POINT: return 'P';
case ZONED_DATE_TIME: return 'T';
case LOCAL_DATE_TIME: return 'T';
case DATE: return 'T';
case ZONED_TIME: return 'T';
case LOCAL_TIME: return 'T';
case DURATION: return 'A';
default: throw new UnsupportedOperationException( "Not supported array type: " + arrayType );
}
}
Expand Down
6 changes: 0 additions & 6 deletions community/kernel/src/main/java/org/neo4j/kernel/impl/store/TemporalType.java
View file
Expand Up @@ -668,12 +668,6 @@ public static ArrayValue decodeTemporalArray( TemporalHeader header, byte[] data

public abstract ArrayValue decodeArray( Value dataValue );

// TODO use that ting man
public int getTemporalType()
{
return temporalType;
}

public String getName()
{
return name;
Expand Down
40 changes: 35 additions & 5 deletions community/kernel/src/test/java/org/neo4j/kernel/api/index/ArrayEncoderTest.java
View file
Expand Up @@ -22,17 +22,31 @@
import org.junit.Rule;
import org.junit.Test;

import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.OffsetTime;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.temporal.TemporalAmount;
import java.util.function.Function;

import org.neo4j.graphdb.spatial.Point;
import org.neo4j.helpers.ArrayUtil;
import org.neo4j.test.Race;
import org.neo4j.test.rule.concurrent.ThreadingRule;
import org.neo4j.values.storable.CoordinateReferenceSystem;
import org.neo4j.values.storable.PointValue;
import org.neo4j.values.storable.DateTimeValue;
import org.neo4j.values.storable.DateValue;
import org.neo4j.values.storable.DurationValue;
import org.neo4j.values.storable.LocalDateTimeValue;
import org.neo4j.values.storable.LocalTimeValue;
import org.neo4j.values.storable.TimeValue;
import org.neo4j.values.storable.Value;
import org.neo4j.values.storable.Values;

import static java.time.ZoneOffset.UTC;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

Expand Down Expand Up @@ -94,10 +108,26 @@ public void shouldEncodeArrays() throws Exception
assertEncoding( "Ztrue|false|", new boolean[]{true, false} );
assertEncoding( "LYWxp|YXJl|eW91|b2s=|", new String[]{"ali", "are", "you", "ok"} );
assertEncoding( "", new String[]{} );
PointValue a = Values.pointValue( CoordinateReferenceSystem.WGS84, 1.234, 2.567 );
PointValue b = Values.pointValue( CoordinateReferenceSystem.WGS84, 2.345, 5.678 );
PointValue c = Values.pointValue( CoordinateReferenceSystem.Cartesian, 3, 4, 5 );
assertEncoding( "P1:4326:1.234;2.567|1:4326:2.345;5.678|2:7203:3.0;4.0;5.0|", new Point[]{a, b, c} );
assertEncoding( "P1:4326:1.234;2.567|1:4326:2.345;5.678|2:7203:3.0;4.0;5.0|",
new Point[]{Values.pointValue( CoordinateReferenceSystem.WGS84, 1.234, 2.567 ),
Values.pointValue( CoordinateReferenceSystem.WGS84, 2.345, 5.678 ),
Values.pointValue( CoordinateReferenceSystem.Cartesian, 3, 4, 5 )} );
assertEncoding( "T1991-03-05|1992-04-06|", new LocalDate[]{DateValue.date( 1991, 3, 5 ).asObjectCopy(), DateValue.date( 1992, 4, 6 ).asObjectCopy()} );
assertEncoding( "T12:45:13.000008676|05:04:50.000000076|",
new LocalTime[]{LocalTimeValue.localTime( 12, 45, 13, 8676 ).asObjectCopy(), LocalTimeValue.localTime( 5, 4, 50, 76 ).asObjectCopy()} );
assertEncoding( "T1991-03-05T12:45:13.000008676|1992-04-06T05:04:50.000000076|",
new LocalDateTime[]{LocalDateTimeValue.localDateTime( 1991, 3, 5, 12, 45, 13, 8676 ).asObjectCopy(),
LocalDateTimeValue.localDateTime( 1992, 4, 6, 5, 4, 50, 76 ).asObjectCopy()} );
assertEncoding( "T02:45:13.000008676Z|01:05:00.0000003+01:00|05:04:50.000000076+05:00|",
new OffsetTime[]{TimeValue.time( 2, 45, 13, 8676, UTC ).asObjectCopy(),
TimeValue.time( OffsetTime.ofInstant( Instant.ofEpochSecond( 300, 300 ), ZoneId.of( "Europe/Stockholm" ) ) ).asObjectCopy(),
TimeValue.time( 5, 4, 50, 76, "+05:00" ).asObjectCopy()} );
assertEncoding( "T1991-03-05T02:45:13.000008676Z|1991-03-05T02:45:13.000008676+01:00[Europe/Stockholm]|1992-04-06T05:04:50.000000076+05:00|",
new ZonedDateTime[]{DateTimeValue.datetime( 1991, 3, 5, 2, 45, 13, 8676, UTC ).asObjectCopy(),
DateTimeValue.datetime( 1991, 3, 5, 2, 45, 13, 8676, ZoneId.of( "Europe/Stockholm" ) ).asObjectCopy(),
DateTimeValue.datetime( 1992, 4, 6, 5, 4, 50, 76, "+05:00" ).asObjectCopy()} );
assertEncoding( "AP165Y11M3DT5.000000012S|P166Y4DT6.000000005S|",
new TemporalAmount[]{DurationValue.duration( 1991, 3, 5, 12 ).asObjectCopy(), DurationValue.duration( 1992, 4, 6, 5 ).asObjectCopy()} );
}

@Test
Expand Down

0 comments on commit e4bd864

Please sign in to comment.