-
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 branch '3.3-gbptree-value-merger-fix' into 3.4
- Loading branch information
Showing
25 changed files
with
501 additions
and
258 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
120 changes: 120 additions & 0 deletions
120
...rc/main/java/org/neo4j/kernel/impl/index/schema/DeferredConflictCheckingIndexUpdater.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,120 @@ | ||
| /* | ||
| * 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.io.IOException; | ||
| import java.util.HashSet; | ||
| import java.util.Set; | ||
| import java.util.function.Supplier; | ||
|
|
||
| import org.neo4j.collection.primitive.PrimitiveLongIterator; | ||
| import org.neo4j.internal.kernel.api.IndexQuery; | ||
| import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; | ||
| import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException; | ||
| import org.neo4j.kernel.api.index.IndexEntryUpdate; | ||
| import org.neo4j.kernel.api.index.IndexUpdater; | ||
| import org.neo4j.kernel.api.schema.index.IndexDescriptor; | ||
| import org.neo4j.storageengine.api.schema.IndexReader; | ||
| import org.neo4j.values.storable.ValueTuple; | ||
|
|
||
| import static org.neo4j.internal.kernel.api.IndexQuery.exact; | ||
| import static org.neo4j.kernel.impl.api.index.UpdateMode.REMOVED; | ||
|
|
||
| /** | ||
| * This deferring conflict checker solves e.g. a problem of applying updates to an index that is aware of, | ||
| * and also prevents, duplicates while applying. Consider this scenario: | ||
| * | ||
| * <pre> | ||
| * GIVEN: | ||
| * Node A w/ property value P | ||
| * Node B w/ property value Q | ||
| * | ||
| * WHEN Applying a transaction that: | ||
| * Sets A property value to Q | ||
| * Deletes B | ||
| * </pre> | ||
| * | ||
| * Then an index that is conscious about conflicts when applying may see intermediary conflicts, | ||
| * depending on the order in which updates are applied. Remembering which value tuples have been altered and | ||
| * checking conflicts for those in {@link #close()} works around that problem. | ||
| * | ||
| * This updater wrapping should only be used in specific places to solve specific problems, not generally | ||
| * when applying updates to online indexes. | ||
| */ | ||
| public class DeferredConflictCheckingIndexUpdater implements IndexUpdater | ||
| { | ||
| private final IndexUpdater actual; | ||
| private final Supplier<IndexReader> readerSupplier; | ||
| private final IndexDescriptor indexDescriptor; | ||
| private final Set<ValueTuple> touchedTuples = new HashSet<>(); | ||
|
|
||
| public DeferredConflictCheckingIndexUpdater( IndexUpdater actual, Supplier<IndexReader> readerSupplier, IndexDescriptor indexDescriptor ) | ||
| { | ||
| this.actual = actual; | ||
| this.readerSupplier = readerSupplier; | ||
| this.indexDescriptor = indexDescriptor; | ||
| } | ||
|
|
||
| @Override | ||
| public void process( IndexEntryUpdate<?> update ) throws IOException, IndexEntryConflictException | ||
| { | ||
| actual.process( update ); | ||
| if ( update.updateMode() != REMOVED ) | ||
| { | ||
| touchedTuples.add( ValueTuple.of( update.values() ) ); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void close() throws IOException, IndexEntryConflictException | ||
| { | ||
| actual.close(); | ||
| try ( IndexReader reader = readerSupplier.get() ) | ||
| { | ||
| for ( ValueTuple tuple : touchedTuples ) | ||
| { | ||
| PrimitiveLongIterator results = reader.query( queryOf( tuple ) ); | ||
| if ( results.hasNext() ) | ||
| { | ||
| long firstEntityId = results.next(); | ||
| if ( results.hasNext() ) | ||
| { | ||
| long secondEntityId = results.next(); | ||
| throw new IndexEntryConflictException( firstEntityId, secondEntityId, tuple ); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| catch ( IndexNotApplicableKernelException e ) | ||
| { | ||
| throw new IllegalArgumentException( "Unexpectedly the index reader couldn't handle this query", e ); | ||
| } | ||
| } | ||
|
|
||
| private IndexQuery[] queryOf( ValueTuple tuple ) | ||
| { | ||
| IndexQuery[] predicates = new IndexQuery[tuple.size()]; | ||
| for ( int i = 0; i < predicates.length; i++ ) | ||
| { | ||
| predicates[i] = exact( indexDescriptor.schema().getPropertyIds()[i], tuple.valueAt( i ) ); | ||
| } | ||
| return predicates; | ||
| } | ||
| } |
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
37 changes: 0 additions & 37 deletions
37
...nity/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativePopulatingUpdater.java
This file was deleted.
Oops, something went wrong.
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
Oops, something went wrong.