-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #11168 from OliviaYtterbrink/3.4-temporal-layouts
Temporal indexing 3 - all the parts
- Loading branch information
Showing
38 changed files
with
1,617 additions
and
272 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/BaseLayout.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /* | ||
| * Copyright (c) 2002-2018 "Neo Technology," | ||
| * Network Engine for Objects in Lund AB [http://neotechnology.com] | ||
| * | ||
| * This file is part of Neo4j. | ||
| * | ||
| * Neo4j is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| package org.neo4j.kernel.impl.index.schema; | ||
|
|
||
| import org.neo4j.index.internal.gbptree.Layout; | ||
|
|
||
| /** | ||
| * Simple GBPTree Layout with no values. | ||
| * | ||
| * @param <KEY> the key type | ||
| */ | ||
| abstract class BaseLayout<KEY extends ComparableNativeSchemaKey<KEY>> extends SchemaLayout<KEY> | ||
| { | ||
| BaseLayout( String layoutName, int majorVersion, int minorVersion ) | ||
| { | ||
| super( Layout.namedIdentifier( layoutName, NativeSchemaValue.SIZE ), majorVersion, minorVersion ); | ||
| } | ||
|
|
||
| @Override | ||
| int compareValue( KEY o1, KEY o2 ) | ||
| { | ||
| return o1.compareValueTo( o2 ); | ||
| } | ||
| } |
65 changes: 65 additions & 0 deletions
65
...ty/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/ComparableNativeSchemaKey.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /* | ||
| * Copyright (c) 2002-2018 "Neo Technology," | ||
| * Network Engine for Objects in Lund AB [http://neotechnology.com] | ||
| * | ||
| * This file is part of Neo4j. | ||
| * | ||
| * Neo4j is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| package org.neo4j.kernel.impl.index.schema; | ||
|
|
||
| import java.util.Comparator; | ||
|
|
||
| /** | ||
| * Adds comparability to NativeSchemaKey. Note that comparability of keys is required for the GBPTree, so | ||
| * this has to be implemented even if the values in the key are not comparable. | ||
| * | ||
| * @param <SELF> the type of the concrete implementing subclass | ||
| */ | ||
| abstract class ComparableNativeSchemaKey<SELF extends ComparableNativeSchemaKey> extends NativeSchemaKey | ||
| { | ||
|
|
||
| /** | ||
| * Compares the value of this key to that of another key. | ||
| * This method is expected to be called in scenarios where inconsistent reads may happen (and later retried). | ||
| * | ||
| * @param other the key to compare to. | ||
| * @return comparison against the {@code other} key. | ||
| */ | ||
| abstract int compareValueTo( SELF other ); | ||
|
|
||
| static <T extends ComparableNativeSchemaKey<T>> Comparator<T> UNIQUE() | ||
| { | ||
| return ( o1, o2 ) -> { | ||
| int comparison = o1.compareValueTo( o2 ); | ||
| if ( comparison == 0 ) | ||
| { | ||
| // This is a special case where we need also compare entityId to support inclusive/exclusive | ||
| if ( o1.getCompareId() || o2.getCompareId() ) | ||
| { | ||
| return Long.compare( o1.getEntityId(), o2.getEntityId() ); | ||
| } | ||
| } | ||
| return comparison; | ||
| }; | ||
| } | ||
|
|
||
| static <T extends ComparableNativeSchemaKey<T>> Comparator<T> NON_UNIQUE() | ||
| { | ||
| return ( o1, o2 ) -> { | ||
| int comparison = o1.compareValueTo( o2 ); | ||
| return comparison != 0 ? comparison : Long.compare( o1.getEntityId(), o2.getEntityId() ); | ||
| }; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
87 changes: 87 additions & 0 deletions
87
community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DurationLayout.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| /* | ||
| * Copyright (c) 2002-2018 "Neo Technology," | ||
| * Network Engine for Objects in Lund AB [http://neotechnology.com] | ||
| * | ||
| * This file is part of Neo4j. | ||
| * | ||
| * Neo4j is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| package org.neo4j.kernel.impl.index.schema; | ||
|
|
||
| import org.neo4j.index.internal.gbptree.Layout; | ||
| import org.neo4j.io.pagecache.PageCursor; | ||
| import org.neo4j.kernel.api.schema.index.IndexDescriptor; | ||
|
|
||
| /** | ||
| * {@link Layout} for durations. | ||
| */ | ||
| class DurationLayout extends BaseLayout<DurationSchemaKey> | ||
| { | ||
| public static Layout<DurationSchemaKey,NativeSchemaValue> of( IndexDescriptor descriptor ) | ||
| { | ||
| return descriptor.type() == IndexDescriptor.Type.UNIQUE ? DurationLayout.UNIQUE : DurationLayout.NON_UNIQUE; | ||
| } | ||
|
|
||
| private static DurationLayout UNIQUE = new DurationLayout( "UTdu", 0, 1 ); | ||
| private static DurationLayout NON_UNIQUE = new DurationLayout( "NTdu", 0, 1 ); | ||
|
|
||
| private DurationLayout( String layoutName, int majorVersion, int minorVersion ) | ||
| { | ||
| super( layoutName, majorVersion, minorVersion ); | ||
| } | ||
|
|
||
| @Override | ||
| public DurationSchemaKey newKey() | ||
| { | ||
| return new DurationSchemaKey(); | ||
| } | ||
|
|
||
| @Override | ||
| public DurationSchemaKey copyKey( DurationSchemaKey key, DurationSchemaKey into ) | ||
| { | ||
| into.totalAvgSeconds = key.totalAvgSeconds; | ||
| into.nanosOfSecond = key.nanosOfSecond; | ||
| into.months = key.months; | ||
| into.days = key.days; | ||
| into.setEntityId( key.getEntityId() ); | ||
| into.setCompareId( key.getCompareId() ); | ||
| return into; | ||
| } | ||
|
|
||
| @Override | ||
| public int keySize( DurationSchemaKey key ) | ||
| { | ||
| return DurationSchemaKey.SIZE; | ||
| } | ||
|
|
||
| @Override | ||
| public void writeKey( PageCursor cursor, DurationSchemaKey key ) | ||
| { | ||
| cursor.putLong( key.totalAvgSeconds ); | ||
| cursor.putInt( key.nanosOfSecond ); | ||
| cursor.putLong( key.months ); | ||
| cursor.putLong( key.days ); | ||
| cursor.putLong( key.getEntityId() ); | ||
| } | ||
|
|
||
| @Override | ||
| public void readKey( PageCursor cursor, DurationSchemaKey into, int keySize ) | ||
| { | ||
| into.totalAvgSeconds = cursor.getLong(); | ||
| into.nanosOfSecond = cursor.getInt(); | ||
| into.months = cursor.getLong(); | ||
| into.days = cursor.getLong(); | ||
| into.setEntityId( cursor.getLong() ); | ||
| } | ||
| } |
Oops, something went wrong.