From 1212b3a762c6f68994226b6f934036b8ac49961e Mon Sep 17 00:00:00 2001 From: MishaDemianenko Date: Mon, 11 Jun 2018 18:48:32 +0200 Subject: [PATCH] Small unused declaration cleanup Remove unused classes, parameters in kernel and ha modules --- .../api/schema/index/IndexDescriptor.java | 34 -------- .../impl/coreapi/ExplicitIndexProxy.java | 5 -- .../recordstorage/RecordStorageEngine.java | 2 +- .../neo4j/kernel/impl/store/NodeStore.java | 12 +-- .../internal/EmbeddedGraphDatabase.java | 10 --- .../java/org/neo4j/test/rule/TimeRule.java | 85 ------------------- .../impl/batchimport/CapturingSender.java | 43 ---------- .../ha/cluster/DefaultMasterImplSPI.java | 4 - .../factory/HighlyAvailableEditionModule.java | 1 - .../ha/cluster/DefaultMasterImplSPITest.java | 3 +- 10 files changed, 5 insertions(+), 194 deletions(-) delete mode 100644 community/kernel/src/test/java/org/neo4j/test/rule/TimeRule.java delete mode 100644 community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/CapturingSender.java diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptor.java b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptor.java index 95af5c5e6aa5d..08e207bc46306 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptor.java @@ -20,7 +20,6 @@ package org.neo4j.kernel.api.schema.index; import java.util.Optional; -import java.util.function.Predicate; import org.neo4j.internal.kernel.api.IndexOrder; import org.neo4j.internal.kernel.api.IndexReference; @@ -202,37 +201,4 @@ public enum Type GENERAL, UNIQUE } - - public enum Filter implements Predicate - { - GENERAL - { - @Override - public boolean test( IndexDescriptor index ) - { - return index.type == Type.GENERAL; - } - }, - UNIQUE - { - @Override - public boolean test( IndexDescriptor index ) - { - return index.type == Type.UNIQUE; - } - }, - ANY - { - @Override - public boolean test( IndexDescriptor index ) - { - return true; - } - } - } - - public interface Supplier - { - IndexDescriptor getIndexDescriptor(); - } } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/ExplicitIndexProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/ExplicitIndexProxy.java index 97d8699243fe2..df9edf2670cff 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/ExplicitIndexProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/ExplicitIndexProxy.java @@ -247,11 +247,6 @@ void remove( ExplicitIndexWrite operations, String name, long id, String key ) long id( PropertyContainer entity ); } - public interface Lookup - { - GraphDatabaseService getGraphDatabaseService(); - } - protected final String name; protected final Type type; protected final Supplier txBridge; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageEngine.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageEngine.java index 9f34d4bb7485e..4bd101bb72553 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageEngine.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageEngine.java @@ -199,7 +199,7 @@ public RecordStorageEngine( schemaStorage = new SchemaStorage( neoStores.getSchemaStore() ); NeoStoreIndexStoreView neoStoreIndexStoreView = new NeoStoreIndexStoreView( lockService, neoStores ); - Boolean readOnly = config.get( GraphDatabaseSettings.read_only ) && operationalMode == OperationalMode.single; + boolean readOnly = config.get( GraphDatabaseSettings.read_only ) && operationalMode == OperationalMode.single; monitors.addMonitorListener( new LoggingMonitor( logProvider.getLog( NativeLabelScanStore.class ) ) ); labelScanStore = new NativeLabelScanStore( pageCache, storeDir, fs, new FullLabelStream( neoStoreIndexStoreView ), readOnly, monitors, recoveryCleanupWorkCollector ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/NodeStore.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/NodeStore.java index 325998453599d..48700b38f57a2 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/NodeStore.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/NodeStore.java @@ -42,6 +42,9 @@ */ public class NodeStore extends CommonAbstractStore { + public static final String TYPE_DESCRIPTOR = "NodeStore"; + private final DynamicArrayStore dynamicLabelStore; + public static Long readOwnerFromDynamicLabelsRecord( DynamicRecord record ) { byte[] data = record.getData(); @@ -63,15 +66,6 @@ public RecordCursor newLabelCursor() RecordLoad.NORMAL ); } - public abstract static class Configuration - extends CommonAbstractStore.Configuration - { - } - - public static final String TYPE_DESCRIPTOR = "NodeStore"; - - private final DynamicArrayStore dynamicLabelStore; - public NodeStore( File fileName, Config config, diff --git a/community/kernel/src/main/java/org/neo4j/kernel/internal/EmbeddedGraphDatabase.java b/community/kernel/src/main/java/org/neo4j/kernel/internal/EmbeddedGraphDatabase.java index 2cd94639b60cc..5883338ee86fa 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/internal/EmbeddedGraphDatabase.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/internal/EmbeddedGraphDatabase.java @@ -53,16 +53,6 @@ */ public class EmbeddedGraphDatabase extends GraphDatabaseFacade { - /** - * Internal constructor used by {@link org.neo4j.graphdb.factory.GraphDatabaseFactory} - */ - public EmbeddedGraphDatabase( String storeDir, - Map params, - GraphDatabaseFacadeFactory.Dependencies dependencies ) - { - this( new File( storeDir ), params, dependencies ); - } - /** * Internal constructor used by {@link org.neo4j.graphdb.factory.GraphDatabaseFactory} */ diff --git a/community/kernel/src/test/java/org/neo4j/test/rule/TimeRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/TimeRule.java deleted file mode 100644 index 07d84d87a8af5..0000000000000 --- a/community/kernel/src/test/java/org/neo4j/test/rule/TimeRule.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * 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 . - */ -package org.neo4j.test.rule; - -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - -import static java.lang.System.currentTimeMillis; - -/** - * Simple rule for quickly measure which part of a test is the most time consuming. Just insert - * call to {@link #time()} and any number of points in the test and time since start or last call - * will be displayed along with line number. - */ -public class TimeRule implements TestRule -{ - private long time; - private String name; - - @Override - public Statement apply( Statement base, Description description ) - { - return new Statement() - { - @Override - public void evaluate() throws Throwable - { - time( "start" ); - try - { - base.evaluate(); - } - finally - { - time( "end" ); - } - } - }; - } - - public void time( String name ) - { - this.name = name; - if ( time == 0 ) - { - time = currentTimeMillis(); - } - else - { - long now = currentTimeMillis(); - long diff = now - time; - System.out.println( (name != null ? name + " " : "" ) + diff ); - time = now; - } - } - - public void time() - { - time( grabFromStackTrace() ); - } - - private String grabFromStackTrace() - { - StackTraceElement[] stack = Thread.currentThread().getStackTrace(); - return stack[3].getMethodName() + ":" + stack[3].getLineNumber(); - } -} diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/CapturingSender.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/CapturingSender.java deleted file mode 100644 index 800438dbb2094..0000000000000 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/CapturingSender.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * 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 . - */ -package org.neo4j.unsafe.impl.batchimport; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; - -import org.neo4j.unsafe.impl.batchimport.staging.BatchSender; - -public class CapturingSender implements BatchSender, Iterable -{ - private final Collection sent = new ArrayList<>(); - - @Override - public void send( Object batch ) - { - sent.add( batch ); - } - - @Override - public Iterator iterator() - { - return sent.iterator(); - } -} diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/DefaultMasterImplSPI.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/DefaultMasterImplSPI.java index c214db01e3290..c2dd72fadc98c 100644 --- a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/DefaultMasterImplSPI.java +++ b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/DefaultMasterImplSPI.java @@ -32,7 +32,6 @@ import org.neo4j.com.storecopy.StoreWriter; import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.io.fs.FileSystemAbstraction; -import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.NeoStoreDataSource; import org.neo4j.kernel.ha.TransactionChecksumLookup; import org.neo4j.kernel.ha.com.master.MasterImpl; @@ -74,7 +73,6 @@ public class DefaultMasterImplSPI implements MasterImpl.SPI private final File storeDir; private final ResponsePacker responsePacker; private final Monitors monitors; - private final PageCache pageCache; private final TransactionCommitProcess transactionCommitProcess; private final CheckPointer checkPointer; @@ -91,7 +89,6 @@ public DefaultMasterImplSPI( final GraphDatabaseAPI graphDb, TransactionIdStore transactionIdStore, LogicalTransactionStore logicalTransactionStore, NeoStoreDataSource neoStoreDataSource, - PageCache pageCache, StoreCopyCheckPointMutex mutex, LogProvider logProvider ) { @@ -109,7 +106,6 @@ public DefaultMasterImplSPI( final GraphDatabaseAPI graphDb, this.txChecksumLookup = new TransactionChecksumLookup( transactionIdStore, logicalTransactionStore ); this.responsePacker = new ResponsePacker( logicalTransactionStore, transactionIdStore, graphDb::storeId ); this.monitors = monitors; - this.pageCache = pageCache; monitors.addMonitorListener( new LoggingStoreCopyServerMonitor( logProvider.getLog( StoreCopyServer.class ) ), StoreCopyServer.class.getName() ); } diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/factory/HighlyAvailableEditionModule.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/factory/HighlyAvailableEditionModule.java index df9f9c1a29753..15478144f10c4 100644 --- a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/factory/HighlyAvailableEditionModule.java +++ b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/factory/HighlyAvailableEditionModule.java @@ -432,7 +432,6 @@ public void elected( String role, InstanceId instanceId, URI electedMember ) platformModule.dependencies.resolveDependency( TransactionIdStore.class ), platformModule.dependencies.resolveDependency( LogicalTransactionStore.class ), platformModule.dependencies.resolveDependency( NeoStoreDataSource.class ), - platformModule.dependencies.resolveDependency( PageCache.class ), platformModule.storeCopyCheckPointMutex, logging.getInternalLogProvider() ); diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/DefaultMasterImplSPITest.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/DefaultMasterImplSPITest.java index e6035a608917f..f42fc465213e9 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/DefaultMasterImplSPITest.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/DefaultMasterImplSPITest.java @@ -29,7 +29,6 @@ import org.neo4j.com.storecopy.StoreWriter; import org.neo4j.helpers.collection.Iterators; import org.neo4j.io.fs.FileSystemAbstraction; -import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.NeoStoreDataSource; import org.neo4j.kernel.impl.api.TransactionCommitProcess; import org.neo4j.kernel.impl.core.LabelTokenHolder; @@ -67,7 +66,7 @@ public void flushStoreFilesWithCorrectCheckpointTriggerName() throws IOException mock( PropertyKeyTokenHolder.class ), mock( RelationshipTypeTokenHolder.class ), mock( IdGeneratorFactory.class ), mock( TransactionCommitProcess.class ), checkPointer, mock( TransactionIdStore.class ), mock( LogicalTransactionStore.class ), - dataSource, mock( PageCache.class ), new StoreCopyCheckPointMutex(), NullLogProvider.getInstance() ); + dataSource, new StoreCopyCheckPointMutex(), NullLogProvider.getInstance() ); master.flushStoresAndStreamStoreFiles( mock( StoreWriter.class ) );