20987c70673ff8cfd1d1148bff8bc432b4a09b02
Files Diff
- Added: 7
- Removed: 2
- Renamed: 0
- Modified: 79
Refactorings reported:
| Refactoring Name | Occurences | ||
|---|---|---|---|
| Move And Rename Method | 1 | ||
| Move And Rename Method private indexOn(label Label, propertyKey String) : IndexDefinition from class org.neo4j.kernel.impl.api.index.IndexSamplingCancellationTest to private createIndex(gds GraphDatabaseService, label Label, propKey String) : void from class org.neo4j.consistency.ConsistencyCheckServiceIntegrationTest | From | To | |
| Move And Inline Method | 2 | ||
| Move And Inline Method public add(update IndexEntryUpdate<?>) : void moved from class org.neo4j.kernel.impl.index.schema.fusion.FusionIndexPopulator to class org.neo4j.kernel.impl.api.index.MultipleIndexPopulator.IndexPopulation & inlined to private onUpdate(update IndexEntryUpdate) : void | From | To | |
| Move And Inline Method public add(update IndexEntryUpdate<?>) : void moved from class org.neo4j.kernel.impl.index.schema.fusion.FusionIndexPopulator to class org.neo4j.unsafe.batchinsert.internal.BatchInserterImpl.IndexPopulatorWithSchema & inlined to public add(update IndexEntryUpdate<?>) : void | From | To | |
| Change Parameter Type | 5 | ||
| Change Parameter Type schemaIndexProvider : SchemaIndexProvider to schemaIndexProviderMap : SchemaIndexProviderMap in method public DatabaseMigrator(progressMonitor MigrationProgressMonitor, fs FileSystemAbstraction, config Config, logService LogService, schemaIndexProviderMap SchemaIndexProviderMap, indexProviders Map<String,IndexImplementation>, pageCache PageCache, format RecordFormats) in class org.neo4j.kernel.impl.storemigration.DatabaseMigrator | From | To | |
| Change Parameter Type indexProvider : SchemaIndexProvider to indexProviderMap : SchemaIndexProviderMap in method public RecordStorageEngine(storeDir File, config Config, pageCache PageCache, fs FileSystemAbstraction, logProvider LogProvider, propertyKeyTokenHolder PropertyKeyTokenHolder, labelTokens LabelTokenHolder, relationshipTypeTokens RelationshipTypeTokenHolder, schemaState SchemaState, constraintSemantics ConstraintSemantics, scheduler JobScheduler, tokenNameLookup TokenNameLookup, lockService LockService, indexProviderMap SchemaIndexProviderMap, indexingServiceMonitor IndexingService.Monitor, databaseHealth DatabaseHealth, legacyIndexProviderLookup LegacyIndexProviderLookup, indexConfigStore IndexConfigStore, legacyIndexTransactionOrdering IdOrderingQueue, idGeneratorFactory IdGeneratorFactory, idController IdController, monitors Monitors, recoveryCleanupWorkCollector RecoveryCleanupWorkCollector, operationalMode OperationalMode) in class org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine | From | To | |
| Change Parameter Type indexes : SchemaIndexProvider to indexes : SchemaIndexProviderMap in method public DirectStoreAccess(nativeStores StoreAccess, labelScanStore LabelScanStore, indexes SchemaIndexProviderMap) in class org.neo4j.kernel.api.direct.DirectStoreAccess | From | To | |
| Change Parameter Type update : IndexEntryUpdate to update : IndexEntryUpdate<?> in method public batch(update IndexEntryUpdate<?>) : boolean in class org.neo4j.kernel.impl.api.index.MultipleIndexPopulator.IndexPopulation | From | To | |
| Change Parameter Type provider : SchemaIndexProvider to providers : SchemaIndexProviderMap in method public IndexAccessors(providers SchemaIndexProviderMap, schemaStore RecordStore<DynamicRecord>, samplingConfig IndexSamplingConfig) in class org.neo4j.consistency.checking.index.IndexAccessors | From | To | |
| Pull Up Attribute | 2 | ||
| Pull Up Attribute private BATCH_SIZE : int from class org.neo4j.kernel.impl.api.index.BatchingMultipleIndexPopulator to private BATCH_SIZE : int from class org.neo4j.kernel.impl.api.index.MultipleIndexPopulator | From | To | |
| Pull Up Attribute package BATCH_SIZE_NAME : String from class org.neo4j.kernel.impl.api.index.BatchingMultipleIndexPopulator to package BATCH_SIZE_NAME : String from class org.neo4j.kernel.impl.api.index.MultipleIndexPopulator | From | To | |
| Move Attribute | 1 | ||
| Move Attribute private life : LifeSupport from class org.neo4j.kernel.api.direct.DirectStoreAccess to private life : LifeSupport from class org.neo4j.consistency.checking.GraphStoreFixture | From | To | |
| Extract Attribute | 2 | ||
| Extract Attribute private INJECTED_FAILURE : String in class org.neo4j.index.lucene.ConstraintIndexFailureIT | From | To | |
| Extract Attribute package PRIORITY : int in class org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProvider | From | To | |
| Change Variable Type | 2 | ||
| Change Variable Type update : IndexEntryUpdate to update : IndexEntryUpdate<?> in method private addUpdate(populator UniqueLuceneIndexPopulator, nodeId long, value Object) : void in class org.neo4j.kernel.api.impl.schema.populator.UniqueDatabaseIndexPopulatorTest | From | To | |
| Change Variable Type update : IndexEntryUpdate<LabelSchemaDescriptor> to update : Collection<IndexEntryUpdate<LabelSchemaDescriptor>> in method private verifyAddWithCorrectPopulator(correctPopulator IndexPopulator, wrongPopulator IndexPopulator, numberValues Value...) : void in class org.neo4j.kernel.impl.index.schema.fusion.FusionIndexPopulatorTest | From | To | |
| Extract Variable | 2 | ||
| Extract Variable currentPageId : long in method private cursorIsAtExpectedLocation(cursor PageCursor) : boolean from class org.neo4j.index.internal.gbptree.InternalTreeLogic | From | To | |
| Extract Variable logging : LogService in method public newInstance(context KernelContext, dependencies Dependencies) : LuceneSchemaIndexProvider from class org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProviderFactory | From | To | |
| Extract Method | 12 | ||
| Extract Method private initFromForRange(rangePredicate NumberRangePredicate) : void extracted from public query(predicates IndexQuery...) : PrimitiveLongIterator in class org.neo4j.kernel.impl.index.schema.NativeSchemaNumberIndexReader | From | To | |
| Extract Method package itemsMatches(expected Iterable<T>, actual Iterable<T>) : boolean extracted from protected matchesSafely(objects Iterable<T>) : boolean in class org.neo4j.test.mockito.matcher.IterableMatcher | From | To | |
| Extract Method private immediateExecutor() : ExecutorService extracted from private sameThreadExecutor() : ExecutorService in class org.neo4j.kernel.impl.api.index.BatchingMultipleIndexPopulatorTest | From | To | |
| Extract Method private getGraphDatabaseService(storeDir File, settings String...) : GraphDatabaseService extracted from private getGraphDatabaseService(storeDir File) : GraphDatabaseService in class org.neo4j.consistency.ConsistencyCheckServiceIntegrationTest | From | To | |
| Extract Method private immediateExecutor() : ExecutorService extracted from public executorForcefullyShutdownIfStoreScanFails() : void in class org.neo4j.kernel.impl.api.index.BatchingMultipleIndexPopulatorTest | From | To | |
| Extract Method public create(fileSystemAbstraction FileSystemAbstraction, storeDir File, logProvider LogProvider, config Config, operationalMode OperationalMode) : LuceneSchemaIndexProvider extracted from public newInstance(context KernelContext, dependencies Dependencies) : LuceneSchemaIndexProvider in class org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProviderFactory | From | To | |
| Extract Method package processUpdate(treeKey KEY, treeValue VALUE, update IndexEntryUpdate, writer Writer<KEY,VALUE>, conflictDetectingValueMerger ConflictDetectingValueMerger<KEY,VALUE>) : void extracted from public process(update IndexEntryUpdate) : void in class org.neo4j.kernel.impl.index.schema.NativeSchemaNumberIndexUpdater | From | To | |
| Extract Method private immediateExecutor() : ExecutorService extracted from public executorShutdownAfterStoreScanCompletes() : void in class org.neo4j.kernel.impl.api.index.BatchingMultipleIndexPopulatorTest | From | To | |
| Extract Method private applyInterleaved(updates IndexEntryUpdate<IndexDescriptor>[], populator NativeSchemaNumberIndexPopulator<KEY,VALUE>) : void extracted from public shouldApplyInterleavedUpdatesFromAddAndUpdater() : void in class org.neo4j.kernel.impl.index.schema.NativeSchemaNumberIndexPopulatorTest | From | To | |
| Extract Method public getSchemaIndexStoreDirectory(storeDir File, descriptor Descriptor) : File extracted from public getSchemaIndexStoreDirectory(storeDir File) : File in class org.neo4j.kernel.api.index.SchemaIndexProvider | From | To | |
| Extract Method private initToForRange(rangePredicate NumberRangePredicate) : void extracted from public query(predicates IndexQuery...) : PrimitiveLongIterator in class org.neo4j.kernel.impl.index.schema.NativeSchemaNumberIndexReader | From | To | |
| Extract Method private createIndex(gds GraphDatabaseService, label Label, propKey String) : void extracted from public shouldReportMissingSchemaIndex() : void in class org.neo4j.consistency.ConsistencyCheckServiceIntegrationTest | From | To | |
| Rename Method | 1 | ||
| Rename Method package add(update IndexEntryUpdate) : void renamed to public batch(update IndexEntryUpdate<?>) : boolean in class org.neo4j.kernel.impl.api.index.MultipleIndexPopulator.IndexPopulation | From | To | |
| Rename Variable | 4 | ||
| Rename Variable executor : ExecutorService to result : ExecutorService in method private immediateExecutor() : ExecutorService in class org.neo4j.kernel.impl.api.index.BatchingMultipleIndexPopulatorTest | From | To | |
| Rename Variable fileSystem : FileSystemAbstraction to fileSystemAbstraction : FileSystemAbstraction in method public newInstance(context KernelContext, dependencies Dependencies) : LuceneSchemaIndexProvider in class org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProviderFactory | From | To | |
| Inline Method | 1 | ||
| Inline Method public add(update IndexEntryUpdate<?>) : void inlined to public add(updates Collection<? extends IndexEntryUpdate<?>>) : void in class org.neo4j.kernel.impl.index.schema.fusion.FusionIndexPopulator | From | To | |
| Change Return Type | 3 | ||
| Change Return Type SchemaIndexProvider to SchemaIndexProviderMap in method public indexes() : SchemaIndexProviderMap in class org.neo4j.kernel.api.direct.DirectStoreAccess | From | To | |
| Change Return Type IndexDefinition to void in method private createIndex(gds GraphDatabaseService, label Label, propKey String) : void in class org.neo4j.consistency.ConsistencyCheckServiceIntegrationTest | From | To | |
| Change Return Type void to boolean in method public batch(update IndexEntryUpdate<?>) : boolean in class org.neo4j.kernel.impl.api.index.MultipleIndexPopulator.IndexPopulation | From | To | |
| Parameterize Variable | 1 | ||
| Parameterize Variable fileSystem : FileSystemAbstraction to fileSystemAbstraction : FileSystemAbstraction in method public create(fileSystemAbstraction FileSystemAbstraction, storeDir File, logProvider LogProvider, config Config, operationalMode OperationalMode) : LuceneSchemaIndexProvider in class org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProviderFactory | From | To | |
| Rename Attribute | 2 | ||
| Rename Attribute schemaIndexProvider : SchemaIndexProvider to schemaIndexProviderMap : SchemaIndexProviderMap in class org.neo4j.kernel.impl.storemigration.DatabaseMigrator | From | To | |
| Rename Attribute schemaIndexProvider : SchemaIndexProvider to schemaIndexProviderMap : SchemaIndexProviderMap in class org.neo4j.kernel.NeoStoreDataSource | From | To | |
| Change Attribute Type | 5 | ||
| Change Attribute Type schemaIndexProvider : SchemaIndexProvider to schemaIndexProviderMap : SchemaIndexProviderMap in class org.neo4j.kernel.NeoStoreDataSource | From | To | |
| Change Attribute Type schemaIndexProviderMap : DefaultSchemaIndexProviderMap to schemaIndexProviderMap : SchemaIndexProviderMap in class org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine | From | To | |
| Change Attribute Type schemaIndexProvider : SchemaIndexProvider to schemaIndexProviderMap : SchemaIndexProviderMap in class org.neo4j.kernel.impl.storemigration.DatabaseMigrator | From | To | |
| Change Attribute Type indexes : SchemaIndexProvider to indexes : SchemaIndexProviderMap in class org.neo4j.tools.rebuild.RebuildFromLogs.ConsistencyChecker | From | To | |
| Change Attribute Type indexes : SchemaIndexProvider to indexes : SchemaIndexProviderMap in class org.neo4j.kernel.api.direct.DirectStoreAccess | From | To | |
| Extract And Move Method | 5 | ||
| Extract And Move Method protected withPopulator(populator IndexPopulator, runWithPopulator ThrowingConsumer<IndexPopulator,Exception>) : void extracted from public shouldProvidePopulatorThatAcceptsDuplicateEntries() : void in class org.neo4j.kernel.api.index.SimpleIndexPopulatorCompatibility.General & moved to class org.neo4j.kernel.api.index.IndexProviderCompatibilityTestSuite.Compatibility | From | To | |
| Extract And Move Method public create(fileSystemAbstraction FileSystemAbstraction, storeDir File, logProvider LogProvider, config Config, operationalMode OperationalMode) : LuceneSchemaIndexProvider extracted from protected createIndexProvider(fs FileSystemAbstraction, graphDbDir File) : LuceneSchemaIndexProvider in class org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProviderCompatibilitySuiteTest & moved to class org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProviderFactory | From | To | |
| Extract And Move Method protected withPopulator(populator IndexPopulator, runWithPopulator ThrowingConsumer<IndexPopulator,Exception>) : void extracted from public shouldBeAbleToDropAClosedIndexPopulator() : void in class org.neo4j.kernel.api.index.SimpleIndexPopulatorCompatibility & moved to class org.neo4j.kernel.api.index.IndexProviderCompatibilityTestSuite.Compatibility | From | To | |
| Extract And Move Method protected withPopulator(populator IndexPopulator, runWithPopulator ThrowingConsumer<IndexPopulator,Exception>) : void extracted from public shouldProvidePopulatorThatAcceptsDuplicateEntries() : void in class org.neo4j.kernel.api.index.CompositeIndexPopulatorCompatibility.General & moved to class org.neo4j.kernel.api.index.IndexProviderCompatibilityTestSuite.Compatibility | From | To | |
| Extract And Move Method protected withPopulator(populator IndexPopulator, runWithPopulator ThrowingConsumer<IndexPopulator,Exception>) : void extracted from public shouldApplyUpdatesIdempotently() : void in class org.neo4j.kernel.api.index.SimpleIndexPopulatorCompatibility & moved to class org.neo4j.kernel.api.index.IndexProviderCompatibilityTestSuite.Compatibility | From | To | |
| Rename Parameter | 7 | ||
| Rename Parameter nativeSchemaIndexBaseDir : File to storeDir : File in method public NativeSchemaNumberIndexProvider(pageCache PageCache, storeDir File, logging LogProvider, recoveryCleanupWorkCollector RecoveryCleanupWorkCollector, readOnly boolean) in class org.neo4j.kernel.impl.index.schema.NativeSchemaNumberIndexProvider | From | To | |
| Rename Parameter provider : SchemaIndexProvider to providers : SchemaIndexProviderMap in method public IndexAccessors(providers SchemaIndexProviderMap, schemaStore RecordStore<DynamicRecord>, samplingConfig IndexSamplingConfig) in class org.neo4j.consistency.checking.index.IndexAccessors | From | To | |
| Rename Parameter schemaIndexProvider : SchemaIndexProvider to schemaIndexProviderMap : SchemaIndexProviderMap in method public DatabaseMigrator(progressMonitor MigrationProgressMonitor, fs FileSystemAbstraction, config Config, logService LogService, schemaIndexProviderMap SchemaIndexProviderMap, indexProviders Map<String,IndexImplementation>, pageCache PageCache, format RecordFormats) in class org.neo4j.kernel.impl.storemigration.DatabaseMigrator | From | To | |
| Rename Parameter indexProvider : SchemaIndexProvider to defaultIndexProvider : SchemaIndexProvider in method public DefaultSchemaIndexProviderMap(defaultIndexProvider SchemaIndexProvider) in class org.neo4j.kernel.impl.transaction.state.DefaultSchemaIndexProviderMap | From | To | |
| Rename Parameter indexProvider : SchemaIndexProvider to indexProviderMap : SchemaIndexProviderMap in method public RecordStorageEngine(storeDir File, config Config, pageCache PageCache, fs FileSystemAbstraction, logProvider LogProvider, propertyKeyTokenHolder PropertyKeyTokenHolder, labelTokens LabelTokenHolder, relationshipTypeTokens RelationshipTypeTokenHolder, schemaState SchemaState, constraintSemantics ConstraintSemantics, scheduler JobScheduler, tokenNameLookup TokenNameLookup, lockService LockService, indexProviderMap SchemaIndexProviderMap, indexingServiceMonitor IndexingService.Monitor, databaseHealth DatabaseHealth, legacyIndexProviderLookup LegacyIndexProviderLookup, indexConfigStore IndexConfigStore, legacyIndexTransactionOrdering IdOrderingQueue, idGeneratorFactory IdGeneratorFactory, idController IdController, monitors Monitors, recoveryCleanupWorkCollector RecoveryCleanupWorkCollector, operationalMode OperationalMode) in class org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine | From | To | |
| Rename Parameter objects : Iterable<T> to actual : Iterable<T> in method package itemsMatches(expected Iterable<T>, actual Iterable<T>) : boolean in class org.neo4j.test.mockito.matcher.IterableMatcher | From | To | |
| Rename Parameter propertyKey : String to propKey : String in method private createIndex(gds GraphDatabaseService, label Label, propKey String) : void in class org.neo4j.consistency.ConsistencyCheckServiceIntegrationTest | From | To |