Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* removed unused parameters from CommitProcessFactory#create() * extracted HA implementation of CommitProcessFactory to a top level class HighlyAvailableCommitProcessFactory and added test * extracted community implementation of CommitProcessFactory to a top level class CommunityCommitProcessFactory and added test Co-authored-by: @MishaDemianenko
- Loading branch information
Showing
9 changed files
with
302 additions
and
113 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
46 changes: 46 additions & 0 deletions
46
...ity/kernel/src/main/java/org/neo4j/kernel/impl/factory/CommunityCommitProcessFactory.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,46 @@ | ||
| /* | ||
| * Copyright (c) 2002-2015 "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.factory; | ||
|
|
||
| import org.neo4j.graphdb.factory.GraphDatabaseSettings; | ||
| import org.neo4j.kernel.configuration.Config; | ||
| import org.neo4j.kernel.impl.api.CommitProcessFactory; | ||
| import org.neo4j.kernel.impl.api.ReadOnlyTransactionCommitProcess; | ||
| import org.neo4j.kernel.impl.api.TransactionCommitProcess; | ||
| import org.neo4j.kernel.impl.api.TransactionRepresentationCommitProcess; | ||
| import org.neo4j.kernel.impl.api.TransactionRepresentationStoreApplier; | ||
| import org.neo4j.kernel.impl.api.index.IndexUpdatesValidator; | ||
| import org.neo4j.kernel.impl.transaction.log.TransactionAppender; | ||
| import org.neo4j.kernel.impl.transaction.state.NeoStoreInjectedTransactionValidator; | ||
|
|
||
| public class CommunityCommitProcessFactory implements CommitProcessFactory | ||
| { | ||
| @Override | ||
| public TransactionCommitProcess create( TransactionAppender appender, | ||
| TransactionRepresentationStoreApplier storeApplier, NeoStoreInjectedTransactionValidator txValidator, | ||
| IndexUpdatesValidator indexUpdatesValidator, Config config ) | ||
| { | ||
| if ( config.get( GraphDatabaseSettings.read_only ) ) | ||
| { | ||
| return new ReadOnlyTransactionCommitProcess(); | ||
| } | ||
| return new TransactionRepresentationCommitProcess( appender, storeApplier, indexUpdatesValidator ); | ||
| } | ||
| } |
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
66 changes: 66 additions & 0 deletions
66
...kernel/src/test/java/org/neo4j/kernel/impl/factory/CommunityCommitProcessFactoryTest.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,66 @@ | ||
| /* | ||
| * Copyright (c) 2002-2015 "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.factory; | ||
|
|
||
| import org.junit.Test; | ||
|
|
||
| import org.neo4j.graphdb.factory.GraphDatabaseSettings; | ||
| import org.neo4j.kernel.configuration.Config; | ||
| import org.neo4j.kernel.impl.api.ReadOnlyTransactionCommitProcess; | ||
| import org.neo4j.kernel.impl.api.TransactionCommitProcess; | ||
| import org.neo4j.kernel.impl.api.TransactionRepresentationCommitProcess; | ||
| import org.neo4j.kernel.impl.api.TransactionRepresentationStoreApplier; | ||
| import org.neo4j.kernel.impl.api.index.IndexUpdatesValidator; | ||
| import org.neo4j.kernel.impl.transaction.log.TransactionAppender; | ||
| import org.neo4j.kernel.impl.transaction.state.NeoStoreInjectedTransactionValidator; | ||
|
|
||
| import static org.hamcrest.Matchers.instanceOf; | ||
| import static org.junit.Assert.assertThat; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.neo4j.helpers.collection.MapUtil.stringMap; | ||
|
|
||
| public class CommunityCommitProcessFactoryTest | ||
| { | ||
| @Test | ||
| public void createReadOnlyCommitProcess() | ||
| { | ||
| CommunityCommitProcessFactory factory = new CommunityCommitProcessFactory(); | ||
|
|
||
| Config config = new Config( stringMap( GraphDatabaseSettings.read_only.name(), "true" ) ); | ||
|
|
||
| TransactionCommitProcess commitProcess = factory.create( mock( TransactionAppender.class ), | ||
| mock( TransactionRepresentationStoreApplier.class ), mock( NeoStoreInjectedTransactionValidator.class ), | ||
| mock( IndexUpdatesValidator.class ), config ); | ||
|
|
||
| assertThat( commitProcess, instanceOf( ReadOnlyTransactionCommitProcess.class ) ); | ||
| } | ||
|
|
||
| @Test | ||
| public void createRegularCommitProcess() | ||
| { | ||
| CommunityCommitProcessFactory factory = new CommunityCommitProcessFactory(); | ||
|
|
||
| TransactionCommitProcess commitProcess = factory.create( mock( TransactionAppender.class ), | ||
| mock( TransactionRepresentationStoreApplier.class ), mock( NeoStoreInjectedTransactionValidator.class ), | ||
| mock( IndexUpdatesValidator.class ), new Config() ); | ||
|
|
||
| assertThat( commitProcess, instanceOf( TransactionRepresentationCommitProcess.class ) ); | ||
| } | ||
| } |
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
81 changes: 81 additions & 0 deletions
81
...ise/ha/src/main/java/org/neo4j/kernel/ha/factory/HighlyAvailableCommitProcessFactory.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,81 @@ | ||
| /* | ||
| * Copyright (c) 2002-2015 "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 Affero 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 Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| package org.neo4j.kernel.ha.factory; | ||
|
|
||
| import org.neo4j.graphdb.factory.GraphDatabaseSettings; | ||
| import org.neo4j.kernel.configuration.Config; | ||
| import org.neo4j.kernel.ha.DelegateInvocationHandler; | ||
| import org.neo4j.kernel.ha.cluster.modeswitch.CommitProcessSwitcher; | ||
| import org.neo4j.kernel.ha.cluster.modeswitch.ComponentSwitcherContainer; | ||
| import org.neo4j.kernel.ha.com.RequestContextFactory; | ||
| import org.neo4j.kernel.ha.com.master.Master; | ||
| import org.neo4j.kernel.ha.transaction.TransactionPropagator; | ||
| import org.neo4j.kernel.impl.api.CommitProcessFactory; | ||
| import org.neo4j.kernel.impl.api.ReadOnlyTransactionCommitProcess; | ||
| import org.neo4j.kernel.impl.api.TransactionCommitProcess; | ||
| import org.neo4j.kernel.impl.api.TransactionRepresentationCommitProcess; | ||
| import org.neo4j.kernel.impl.api.TransactionRepresentationStoreApplier; | ||
| import org.neo4j.kernel.impl.api.index.IndexUpdatesValidator; | ||
| import org.neo4j.kernel.impl.transaction.log.TransactionAppender; | ||
| import org.neo4j.kernel.impl.transaction.state.NeoStoreInjectedTransactionValidator; | ||
|
|
||
| import static java.lang.reflect.Proxy.newProxyInstance; | ||
|
|
||
| class HighlyAvailableCommitProcessFactory implements CommitProcessFactory | ||
| { | ||
| private final ComponentSwitcherContainer componentSwitcherContainer; | ||
| private final Master master; | ||
| private final TransactionPropagator transactionPropagator; | ||
| private final RequestContextFactory requestContextFactory; | ||
|
|
||
| private final DelegateInvocationHandler<TransactionCommitProcess> commitProcessDelegate = | ||
| new DelegateInvocationHandler<>( TransactionCommitProcess.class ); | ||
|
|
||
| HighlyAvailableCommitProcessFactory( ComponentSwitcherContainer componentSwitcherContainer, Master master, | ||
| TransactionPropagator transactionPropagator, RequestContextFactory requestContextFactory ) | ||
| { | ||
| this.componentSwitcherContainer = componentSwitcherContainer; | ||
| this.master = master; | ||
| this.transactionPropagator = transactionPropagator; | ||
| this.requestContextFactory = requestContextFactory; | ||
| } | ||
|
|
||
| @Override | ||
| public TransactionCommitProcess create( TransactionAppender appender, | ||
| TransactionRepresentationStoreApplier storeApplier, NeoStoreInjectedTransactionValidator txValidator, | ||
| IndexUpdatesValidator indexUpdatesValidator, Config config ) | ||
| { | ||
| if ( config.get( GraphDatabaseSettings.read_only ) ) | ||
| { | ||
| return new ReadOnlyTransactionCommitProcess(); | ||
| } | ||
|
|
||
| TransactionCommitProcess commitProcess = new TransactionRepresentationCommitProcess( appender, storeApplier, | ||
| indexUpdatesValidator ); | ||
|
|
||
| CommitProcessSwitcher commitProcessSwitcher = new CommitProcessSwitcher( transactionPropagator, | ||
| master, commitProcessDelegate, requestContextFactory, txValidator, commitProcess ); | ||
|
|
||
| componentSwitcherContainer.add( commitProcessSwitcher ); | ||
|
|
||
| return (TransactionCommitProcess) newProxyInstance( TransactionCommitProcess.class.getClassLoader(), | ||
| new Class[]{TransactionCommitProcess.class}, commitProcessDelegate ); | ||
| } | ||
| } |
Oops, something went wrong.