-
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 #8906 from fickludd/3.2-composite-index-conflict-e…
…xception Make IndexEntryConflictException handle composite indexes
- Loading branch information
Showing
12 changed files
with
264 additions
and
68 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
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
136 changes: 136 additions & 0 deletions
136
community/kernel/src/main/java/org/neo4j/kernel/api/schema_new/OrderedPropertyValues.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,136 @@ | ||
| /* | ||
| * Copyright (c) 2002-2017 "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.api.schema_new; | ||
|
|
||
| import java.util.Arrays; | ||
|
|
||
| import static java.lang.String.format; | ||
| import static java.lang.String.valueOf; | ||
|
|
||
| /** | ||
| * Holder for n property values, ordered according to a schema descriptor property id order | ||
| */ | ||
| public class OrderedPropertyValues | ||
| { | ||
| private final Object[] values; | ||
|
|
||
| public static OrderedPropertyValues of( Object... values ) | ||
| { | ||
| return new OrderedPropertyValues( values ); | ||
| } | ||
|
|
||
| private OrderedPropertyValues( Object[] values ) | ||
| { | ||
| this.values = values; | ||
| } | ||
|
|
||
| public Object[] values() | ||
| { | ||
| return values; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals( Object o ) | ||
| { | ||
| if ( this == o ) | ||
| { | ||
| return true; | ||
| } | ||
| if ( o == null || getClass() != o.getClass() ) | ||
| { | ||
| return false; | ||
| } | ||
|
|
||
| OrderedPropertyValues that = (OrderedPropertyValues) o; | ||
|
|
||
| return Arrays.deepEquals( values, that.values ); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() | ||
| { | ||
| return Arrays.deepHashCode( values ); | ||
| } | ||
|
|
||
| public int size() | ||
| { | ||
| return values.length; | ||
| } | ||
|
|
||
| public Object getSinglePropertyValue() | ||
| { | ||
| assert values.length == 1 : "Assumed single property but had " + values.length; | ||
| return values[0]; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() | ||
| { | ||
| StringBuilder sb = new StringBuilder(); | ||
| String sep = "( "; | ||
| for ( Object value : values ) | ||
| { | ||
| sb.append( sep ); | ||
| sep = ", "; | ||
| sb.append( quote( value ) ); | ||
| } | ||
| sb.append( " )" ); | ||
| return sb.toString(); | ||
| } | ||
|
|
||
| public static String quote( Object propertyValue ) | ||
| { | ||
| if ( propertyValue instanceof String ) | ||
| { | ||
| return format( "'%s'", propertyValue ); | ||
| } | ||
| else if ( propertyValue.getClass().isArray() ) | ||
| { | ||
| Class<?> type = propertyValue.getClass().getComponentType(); | ||
| if ( type == Boolean.TYPE ) | ||
| { | ||
| return Arrays.toString( (boolean[]) propertyValue ); | ||
| } else if ( type == Byte.TYPE ) | ||
| { | ||
| return Arrays.toString( (byte[]) propertyValue ); | ||
| } else if ( type == Short.TYPE ) | ||
| { | ||
| return Arrays.toString( (short[]) propertyValue ); | ||
| } else if ( type == Character.TYPE ) | ||
| { | ||
| return Arrays.toString( (char[]) propertyValue ); | ||
| } else if ( type == Integer.TYPE ) | ||
| { | ||
| return Arrays.toString( (int[]) propertyValue ); | ||
| } else if ( type == Long.TYPE ) | ||
| { | ||
| return Arrays.toString( (long[]) propertyValue ); | ||
| } else if ( type == Float.TYPE ) | ||
| { | ||
| return Arrays.toString( (float[]) propertyValue ); | ||
| } else if ( type == Double.TYPE ) | ||
| { | ||
| return Arrays.toString( (double[]) propertyValue ); | ||
| } | ||
| return Arrays.toString( (Object[]) propertyValue ); | ||
| } | ||
| return valueOf( propertyValue ); | ||
| } | ||
| } |
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
68 changes: 68 additions & 0 deletions
68
.../src/test/java/org/neo4j/kernel/api/exceptions/index/IndexEntryConflictExceptionTest.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,68 @@ | ||
| /* | ||
| * Copyright (c) 2002-2017 "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.api.exceptions.index; | ||
|
|
||
| import org.junit.Test; | ||
|
|
||
| import org.neo4j.kernel.api.StatementConstants; | ||
| import org.neo4j.kernel.api.schema_new.LabelSchemaDescriptor; | ||
| import org.neo4j.kernel.api.schema_new.OrderedPropertyValues; | ||
| import org.neo4j.kernel.api.schema_new.SchemaDescriptorFactory; | ||
| import org.neo4j.kernel.api.schema_new.SchemaUtil; | ||
|
|
||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
| import static org.hamcrest.Matchers.equalTo; | ||
|
|
||
| public class IndexEntryConflictExceptionTest | ||
| { | ||
| public static final int labelId = 1; | ||
|
|
||
| @Test | ||
| public void shouldMakeEntryConflicts() | ||
| { | ||
| LabelSchemaDescriptor schema = SchemaDescriptorFactory.forLabel( labelId, 2 ); | ||
| IndexEntryConflictException e = new IndexEntryConflictException( 0L, 1L, "hi" ); | ||
|
|
||
| assertThat( e.evidenceMessage( SchemaUtil.idTokenNameLookup, schema ), | ||
| equalTo( "Both Node(0) and Node(1) have the label `label[1]` and property `property[2]` = 'hi'" ) ); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldMakeEntryConflictsForOneNode() | ||
| { | ||
| LabelSchemaDescriptor schema = SchemaDescriptorFactory.forLabel( labelId, 2 ); | ||
| IndexEntryConflictException e = new IndexEntryConflictException( 0L, StatementConstants.NO_SUCH_NODE, "hi" ); | ||
|
|
||
| assertThat( e.evidenceMessage( SchemaUtil.idTokenNameLookup, schema ), | ||
| equalTo( "Node(0) already exists with label `label[1]` and property `property[2]` = 'hi'" ) ); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldMakeCompositeEntryConflicts() | ||
| { | ||
| LabelSchemaDescriptor schema = SchemaDescriptorFactory.forLabel( labelId, 2, 3, 4 ); | ||
| OrderedPropertyValues values = OrderedPropertyValues.of( true, "hi", new long[]{6L, 4L} ); | ||
| IndexEntryConflictException e = new IndexEntryConflictException( 0L, 1L, values ); | ||
|
|
||
| assertThat( e.evidenceMessage( SchemaUtil.idTokenNameLookup, schema ), | ||
| equalTo( "Both Node(0) and Node(1) have the label `label[1]` " + | ||
| "and properties `property[2]` = true, `property[3]` = 'hi', `property[4]` = [6, 4]" ) ); | ||
| } | ||
| } |
Oops, something went wrong.