Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add tests to prove that the concistency checker can find fulltext ind…
…ex inconsistencies, and add relationship index checking to the consistency checker.
- Loading branch information
Showing
8 changed files
with
232 additions
and
23 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
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
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
47 changes: 47 additions & 0 deletions
47
...y-check/src/main/java/org/neo4j/consistency/checking/full/RelationshipIndexProcessor.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 | Original file line | Diff line number | Diff line change |
|---|---|---|---|
| @@ -0,0 +1,47 @@ | |||
| /* | |||
| * Copyright (c) 2002-2018 "Neo4j," | |||
| * Neo4j Sweden AB [http://neo4j.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.consistency.checking.full; | |||
|
|
|||
| import java.util.List; | |||
|
|
|||
| import org.neo4j.consistency.checking.cache.CacheAccess; | |||
| import org.neo4j.consistency.checking.index.IndexAccessors; | |||
| import org.neo4j.consistency.report.ConsistencyReporter; | |||
| import org.neo4j.kernel.impl.store.record.RelationshipRecord; | |||
| import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; | |||
|
|
|||
| public class RelationshipIndexProcessor extends RecordProcessor.Adapter<RelationshipRecord> | |||
| { | |||
| private final ConsistencyReporter reporter; | |||
| private final RelationshipToIndexCheck checker; | |||
|
|
|||
| RelationshipIndexProcessor( ConsistencyReporter reporter, IndexAccessors indexes, PropertyReader propertyReader, CacheAccess cacheAccess, | |||
| List<StoreIndexDescriptor> relationshipIndexes ) | |||
| { | |||
| this.reporter = reporter; | |||
| checker = new RelationshipToIndexCheck( relationshipIndexes, indexes, propertyReader, cacheAccess ); | |||
| } | |||
|
|
|||
| @Override | |||
| public void process( RelationshipRecord relationshipRecord ) | |||
| { | |||
| reporter.forRelationship( relationshipRecord, checker ); | |||
| } | |||
| } | |||
107 changes: 107 additions & 0 deletions
107
...ncy-check/src/main/java/org/neo4j/consistency/checking/full/RelationshipToIndexCheck.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 | Original file line | Diff line number | Diff line change |
|---|---|---|---|
| @@ -0,0 +1,107 @@ | |||
| /* | |||
| * Copyright (c) 2002-2018 "Neo4j," | |||
| * Neo4j Sweden AB [http://neo4j.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.consistency.checking.full; | |||
|
|
|||
| import org.apache.commons.lang3.ArrayUtils; | |||
| import org.eclipse.collections.api.map.primitive.IntObjectMap; | |||
|
|
|||
| import java.util.Arrays; | |||
| import java.util.Collection; | |||
| import java.util.List; | |||
|
|
|||
| import org.neo4j.consistency.checking.CheckerEngine; | |||
| import org.neo4j.consistency.checking.RecordCheck; | |||
| import org.neo4j.consistency.checking.cache.CacheAccess; | |||
| import org.neo4j.consistency.checking.index.IndexAccessors; | |||
| import org.neo4j.consistency.report.ConsistencyReport; | |||
| import org.neo4j.consistency.store.RecordAccess; | |||
| import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; | |||
| import org.neo4j.kernel.impl.store.record.PropertyBlock; | |||
| import org.neo4j.kernel.impl.store.record.PropertyRecord; | |||
| import org.neo4j.kernel.impl.store.record.RelationshipRecord; | |||
| import org.neo4j.storageengine.api.schema.IndexReader; | |||
| import org.neo4j.storageengine.api.schema.StoreIndexDescriptor; | |||
| import org.neo4j.values.storable.Value; | |||
| import org.neo4j.values.storable.Values; | |||
|
|
|||
| import static org.neo4j.consistency.checking.full.PropertyAndNodeIndexedCheck.getPropertyValues; | |||
| import static org.neo4j.consistency.checking.full.PropertyAndNodeIndexedCheck.hasAllProperties; | |||
| import static org.neo4j.consistency.checking.full.PropertyAndNodeIndexedCheck.hasAnyProperty; | |||
| import static org.neo4j.consistency.checking.full.PropertyAndNodeIndexedCheck.properties; | |||
|
|
|||
| public class RelationshipToIndexCheck implements RecordCheck<RelationshipRecord, ConsistencyReport.RelationshipConsistencyReport> | |||
| { | |||
| private final IndexAccessors indexes; | |||
| private final StoreIndexDescriptor[] relationshipIndexes; | |||
| private final PropertyReader propertyReader; | |||
|
|
|||
| RelationshipToIndexCheck( List<StoreIndexDescriptor> relationshipIndexes, IndexAccessors indexes, PropertyReader propertyReader, CacheAccess cacheAccess ) | |||
| { | |||
| this.relationshipIndexes = relationshipIndexes.toArray( new StoreIndexDescriptor[0] ); | |||
| this.indexes = indexes; | |||
| this.propertyReader = propertyReader; | |||
| } | |||
|
|
|||
| @Override | |||
| public void check( RelationshipRecord record, CheckerEngine<RelationshipRecord,ConsistencyReport.RelationshipConsistencyReport> engine, | |||
| RecordAccess records ) | |||
| { | |||
| IntObjectMap<PropertyBlock> nodePropertyMap = null; | |||
| for ( StoreIndexDescriptor index : relationshipIndexes ) | |||
| { | |||
| SchemaDescriptor schema = index.schema(); | |||
| if ( ArrayUtils.contains( schema.getEntityTokenIds(), record.getType() ) ) | |||
| { | |||
| if ( nodePropertyMap == null ) | |||
| { | |||
| Collection<PropertyRecord> propertyRecs = propertyReader.getPropertyRecordChain( record ); | |||
| nodePropertyMap = properties( propertyReader.propertyBlocks( propertyRecs ) ); | |||
| } | |||
|
|
|||
| int[] indexPropertyIds = schema.getPropertyIds(); | |||
| boolean requireAllProperties = schema.propertySchemaType() == SchemaDescriptor.PropertySchemaType.COMPLETE_ALL_TOKENS; | |||
| if ( requireAllProperties ? hasAllProperties( nodePropertyMap, indexPropertyIds ) : hasAnyProperty( nodePropertyMap, indexPropertyIds ) ) | |||
| { | |||
| Value[] values = getPropertyValues( propertyReader, nodePropertyMap, indexPropertyIds ); | |||
| try ( IndexReader reader = indexes.accessorFor( index ).newReader() ) | |||
| { | |||
| assert !index.canSupportUniqueConstraint(); | |||
| long entityId = record.getId(); | |||
| long count = reader.countIndexedNodes( entityId, indexPropertyIds, values ); | |||
| reportIncorrectIndexCount( values, engine, index, count ); | |||
| } | |||
| } | |||
| } | |||
| } | |||
| } | |||
|
|
|||
| private void reportIncorrectIndexCount( Value[] values, CheckerEngine<RelationshipRecord,ConsistencyReport.RelationshipConsistencyReport> engine, | |||
| StoreIndexDescriptor index, long count ) | |||
| { | |||
| if ( count == 0 ) | |||
| { | |||
| engine.report().notIndexed( index, Values.asObjects( values ) ); | |||
| } | |||
| else if ( count != 1 ) | |||
| { | |||
| engine.report().indexedMultipleTimes( index, Values.asObjects( values ), count ); | |||
| } | |||
| } | |||
| } | |||
Oops, something went wrong.