From 12eb3f8483b542a18c3066efd25dfd3ea7e0ac7d Mon Sep 17 00:00:00 2001 From: Mattias Persson Date: Fri, 15 Jan 2016 21:58:13 +0100 Subject: [PATCH] Moved Storage Engine API back into kernel Since kernel API and storage engine API are too interrelated to be separated. Either both move or none do, they can always be broken out later. Having it separately wasn't in vain though since it got the API cleaner and less leaky. This also collapses the super tiny "neo4j-resource" component, which was really a part of the graphdb-api back into kernel again. It was weird as a component, but was temporarily necessary for having the storage engine API living outside kernel. Even neo4j-proc (a tiny 4 class componentl) was moved into the kernel API because it's a part of that API to begin with and could only really live on its own due to the storage engine API was outside kernel. This may seem like a step backwards, but things get a bit more coherent for the time being and, again, this can be broken out later. --- .../CallProcedureAcceptanceTest.scala | 6 +- .../v3_0/TransactionBoundPlanContext.scala | 4 +- .../v3_0/TransactionBoundQueryContext.scala | 2 +- .../TransactionBoundQueryContextTest.scala | 2 +- community/kernel/pom.xml | 5 -- .../org/neo4j/kernel/NeoStoreDataSource.java | 37 +++++----- .../java/org/neo4j/kernel/api/KernelAPI.java | 2 +- .../org/neo4j/kernel/api/ReadOperations.java | 4 +- .../org/neo4j/kernel/api/TokenNameLookup.java | 0 .../constraints/NodePropertyConstraint.java | 0 .../NodePropertyExistenceConstraint.java | 0 .../api/constraints/PropertyConstraint.java | 0 .../RelationshipPropertyConstraint.java | 0 ...lationshipPropertyExistenceConstraint.java | 0 .../api/constraints/UniquenessConstraint.java | 0 ...tViolationTransactionFailureException.java | 0 .../exceptions/EntityNotFoundException.java | 0 ...InvalidTransactionTypeKernelException.java | 0 .../api/exceptions/KernelException.java | 0 .../LabelNotFoundKernelException.java | 0 .../api/exceptions/ProcedureException.java | 0 .../PropertyKeyIdNotFoundKernelException.java | 0 .../PropertyKeyNotFoundException.java | 0 .../exceptions/PropertyNotFoundException.java | 0 .../api/exceptions/ReadOnlyDbException.java | 0 ...tionshipTypeIdNotFoundKernelException.java | 0 .../RelationshipTypeNotFoundException.java | 0 .../neo4j/kernel/api/exceptions/Status.java | 0 .../TransactionFailureException.java | 0 .../exceptions/TransactionHookException.java | 0 .../ExceptionDuringFlipKernelException.java | 0 .../index/FlipFailedKernelException.java | 0 .../IndexActivationFailedKernelException.java | 0 .../index/IndexEntryConflictException.java | 0 .../index/IndexNotFoundKernelException.java | 0 .../IndexPopulationFailedKernelException.java | 0 ...ndexProxyAlreadyClosedKernelException.java | 0 .../LegacyIndexNotFoundKernelException.java | 0 .../schema/AlreadyConstrainedException.java | 0 .../schema/AlreadyIndexedException.java | 0 .../ConstraintValidationKernelException.java | 0 ...aintVerificationFailedKernelException.java | 0 .../ConstraintViolationKernelException.java | 0 .../CreateConstraintFailureException.java | 0 .../DropConstraintFailureException.java | 0 .../schema/DropIndexFailureException.java | 0 .../DuplicateEntitySchemaRuleException.java | 0 .../DuplicateIndexSchemaRuleException.java | 0 .../schema/DuplicateSchemaRuleException.java | 0 .../EntitySchemaRuleNotFoundException.java | 0 .../schema/IllegalTokenNameException.java | 0 .../IndexBelongsToConstraintException.java | 0 .../schema/IndexBrokenKernelException.java | 0 .../IndexSchemaRuleNotFoundException.java | 0 .../schema/MalformedSchemaRuleException.java | 0 .../schema/NoSuchConstraintException.java | 0 .../schema/NoSuchIndexException.java | 0 ...aintVerificationFailedKernelException.java | 0 ...nceConstraintViolationKernelException.java | 0 .../schema/ProcedureConstraintViolation.java | 0 ...aintVerificationFailedKernelException.java | 0 ...nceConstraintViolationKernelException.java | 0 .../schema/SchemaKernelException.java | 0 .../schema/SchemaRuleException.java | 0 .../schema/SchemaRuleNotFoundException.java | 0 .../schema/TooManyLabelsException.java | 0 ...leToValidateConstraintKernelException.java | 0 ...rtyConstraintViolationKernelException.java | 0 ...aintVerificationFailedKernelException.java | 0 .../kernel/api/index/IndexDescriptor.java | 0 .../kernel/api/index/InternalIndexState.java | 0 .../neo4j/kernel/api}/proc/Neo4jTypes.java | 2 +- .../org/neo4j/kernel/api}/proc/Procedure.java | 2 +- .../kernel/api}/proc/ProcedureSignature.java | 4 +- .../neo4j/kernel/api}/proc/Procedures.java | 2 +- .../builtinprocs/BuiltInProcedures.java | 2 +- .../builtinprocs/ListLabelsProcedure.java | 8 +-- .../ListPropertyKeysProcedure.java | 8 +-- .../ListRelationshipTypesProcedure.java | 8 +-- .../org/neo4j/kernel/impl/api/Kernel.java | 4 +- .../kernel/impl/api/KernelStatement.java | 2 +- .../api/KernelTransactionImplementation.java | 2 +- .../kernel/impl/api/KernelTransactions.java | 2 +- .../kernel/impl/api/OperationsFacade.java | 8 +-- .../kernel/impl/api/RelationshipVisitor.java | 0 .../impl/api/store/RelationshipIterator.java | 0 .../recordstorage/RecordStorageEngine.java | 2 +- .../TransactionRangeDiagnostics.java | 64 +++++++++++++++++ .../neo4j/kernel/impl/store/NeoStores.java | 1 + .../storageengine/api/CommandReader.java | 0 .../api/CommandReaderFactory.java | 0 .../storageengine/api/CommandStream.java | 0 .../storageengine/api/CommandsToApply.java | 0 .../neo4j/storageengine/api/DegreeItem.java | 0 .../neo4j/storageengine/api/Direction.java | 0 .../neo4j/storageengine/api/EntityItem.java | 0 .../neo4j/storageengine/api/EntityType.java | 0 .../neo4j/storageengine/api/LabelItem.java | 0 .../org/neo4j/storageengine/api/NodeItem.java | 0 .../neo4j/storageengine/api/PropertyItem.java | 0 .../api/ReadPastEndException.java | 0 .../storageengine/api/ReadableChannel.java | 0 .../storageengine/api/RelationshipItem.java | 0 .../storageengine/api/StorageCommand.java | 0 .../storageengine/api/StorageEngine.java | 36 ++++++---- .../storageengine/api/StorageProperty.java | 0 .../storageengine/api/StorageStatement.java | 0 .../storageengine/api/StoreReadLayer.java | 0 .../org/neo4j/storageengine/api/Token.java | 0 .../neo4j/storageengine/api/TokenFactory.java | 0 .../api/TransactionApplicationMode.java | 0 .../storageengine/api/WritableChannel.java | 0 .../api/legacyindex/package-info.java | 0 .../api/lock/AcquireLockTimeoutException.java | 0 .../api/lock/ResourceLocker.java | 0 .../storageengine/api/lock/ResourceType.java | 0 .../storageengine/api/lock/WaitStrategy.java | 0 .../storageengine/api/schema/IndexReader.java | 0 .../api/schema/IndexSchemaRule.java | 0 .../api/schema/LabelScanReader.java | 0 .../api/schema/PopulationProgress.java | 0 .../storageengine/api/schema/SchemaRule.java | 0 .../api/txstate/DiffSetsVisitor.java | 0 .../storageengine/api/txstate/NodeState.java | 0 .../api/txstate/PropertyContainerState.java | 0 .../api/txstate/ReadableDiffSets.java | 0 .../txstate/ReadableRelationshipDiffSets.java | 0 .../api/txstate/ReadableTransactionState.java | 0 .../api/txstate/RelationshipState.java | 0 .../api/txstate/SuperReadableDiffSets.java | 0 .../api/txstate/TxStateVisitor.java | 0 .../api/txstate/UpdateTriState.java | 0 .../neo4j/kernel/NeoStoreDataSourceTest.java | 7 +- .../kernel/api/KernelTransactionFactory.java | 2 +- .../kernel/api}/proc/ProceduresTest.java | 12 ++-- ...DataStatementArgumentVerificationTest.java | 2 +- .../kernel/impl/api/KernelStatementTest.java | 2 +- .../impl/api/KernelTransactionsTest.java | 3 +- .../api/LockingStatementOperationsTest.java | 2 +- .../impl/api/StatementLifecycleTest.java | 2 +- .../ConstraintIndexCreatorTest.java | 2 +- .../integrationtest/BuiltinProceduresIT.java | 4 +- .../integrationtest/ProceduresKernelIT.java | 10 +-- .../kernel/impl/api/store/DiskLayerTest.java | 2 +- community/pom.xml | 1 - community/proc/pom.xml | 8 --- community/storage-engine-api/LICENSES.txt | 4 -- community/storage-engine-api/NOTICE.txt | 27 ------- community/storage-engine-api/pom.xml | 72 ------------------- 149 files changed, 173 insertions(+), 208 deletions(-) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/TokenNameLookup.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/constraints/NodePropertyConstraint.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/constraints/NodePropertyExistenceConstraint.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/constraints/PropertyConstraint.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/constraints/RelationshipPropertyConstraint.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/constraints/RelationshipPropertyExistenceConstraint.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/constraints/UniquenessConstraint.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/ConstraintViolationTransactionFailureException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/EntityNotFoundException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/InvalidTransactionTypeKernelException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/KernelException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/LabelNotFoundKernelException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/ProcedureException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/PropertyKeyIdNotFoundKernelException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/PropertyKeyNotFoundException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/PropertyNotFoundException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/ReadOnlyDbException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/RelationshipTypeIdNotFoundKernelException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/RelationshipTypeNotFoundException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/Status.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/TransactionFailureException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/TransactionHookException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/index/ExceptionDuringFlipKernelException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/index/FlipFailedKernelException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexActivationFailedKernelException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexEntryConflictException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexNotFoundKernelException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexPopulationFailedKernelException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexProxyAlreadyClosedKernelException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/legacyindex/LegacyIndexNotFoundKernelException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/AlreadyConstrainedException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/AlreadyIndexedException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/ConstraintValidationKernelException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/ConstraintVerificationFailedKernelException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/ConstraintViolationKernelException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/CreateConstraintFailureException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/DropConstraintFailureException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/DropIndexFailureException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/DuplicateEntitySchemaRuleException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/DuplicateIndexSchemaRuleException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/DuplicateSchemaRuleException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/EntitySchemaRuleNotFoundException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/IllegalTokenNameException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/IndexBelongsToConstraintException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/IndexBrokenKernelException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/IndexSchemaRuleNotFoundException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/MalformedSchemaRuleException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/NoSuchConstraintException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/NoSuchIndexException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/NodePropertyExistenceConstraintVerificationFailedKernelException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/NodePropertyExistenceConstraintViolationKernelException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/ProcedureConstraintViolation.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/RelationshipPropertyExistenceConstraintVerificationFailedKernelException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/RelationshipPropertyExistenceConstraintViolationKernelException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaKernelException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaRuleException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaRuleNotFoundException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/TooManyLabelsException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/UnableToValidateConstraintKernelException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/UniquePropertyConstraintViolationKernelException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/exceptions/schema/UniquenessConstraintVerificationFailedKernelException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/index/IndexDescriptor.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/api/index/InternalIndexState.java (100%) rename community/{proc/src/main/java/org/neo4j => kernel/src/main/java/org/neo4j/kernel/api}/proc/Neo4jTypes.java (99%) rename community/{proc/src/main/java/org/neo4j => kernel/src/main/java/org/neo4j/kernel/api}/proc/Procedure.java (99%) rename community/{proc/src/main/java/org/neo4j => kernel/src/main/java/org/neo4j/kernel/api}/proc/ProcedureSignature.java (98%) rename community/{proc/src/main/java/org/neo4j => kernel/src/main/java/org/neo4j/kernel/api}/proc/Procedures.java (98%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/impl/api/RelationshipVisitor.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/kernel/impl/api/store/RelationshipIterator.java (100%) create mode 100644 community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/TransactionRangeDiagnostics.java rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/CommandReader.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/CommandReaderFactory.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/CommandStream.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/CommandsToApply.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/DegreeItem.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/Direction.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/EntityItem.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/EntityType.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/LabelItem.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/NodeItem.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/PropertyItem.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/ReadPastEndException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/ReadableChannel.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/RelationshipItem.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/StorageCommand.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/StorageEngine.java (80%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/StorageProperty.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/StorageStatement.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/Token.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/TokenFactory.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/TransactionApplicationMode.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/WritableChannel.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/legacyindex/package-info.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/lock/AcquireLockTimeoutException.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/lock/ResourceLocker.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/lock/ResourceType.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/lock/WaitStrategy.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/schema/IndexReader.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/schema/IndexSchemaRule.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/schema/LabelScanReader.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/schema/PopulationProgress.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/schema/SchemaRule.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/txstate/DiffSetsVisitor.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/txstate/NodeState.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/txstate/PropertyContainerState.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/txstate/ReadableDiffSets.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/txstate/ReadableRelationshipDiffSets.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/txstate/ReadableTransactionState.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/txstate/RelationshipState.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/txstate/SuperReadableDiffSets.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/txstate/TxStateVisitor.java (100%) rename community/{storage-engine-api => kernel}/src/main/java/org/neo4j/storageengine/api/txstate/UpdateTriState.java (100%) rename community/{proc/src/test/java/org/neo4j => kernel/src/test/java/org/neo4j/kernel/api}/proc/ProceduresTest.java (96%) delete mode 100644 community/storage-engine-api/LICENSES.txt delete mode 100644 community/storage-engine-api/NOTICE.txt delete mode 100644 community/storage-engine-api/pom.xml diff --git a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/CallProcedureAcceptanceTest.scala b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/CallProcedureAcceptanceTest.scala index 78094d7a5a983..e023d5cb5fd0d 100644 --- a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/CallProcedureAcceptanceTest.scala +++ b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/CallProcedureAcceptanceTest.scala @@ -24,9 +24,9 @@ import java.util.stream.Stream import org.neo4j.cypher.{CypherTypeException, ExecutionEngineFunSuite, InvalidArgumentException} import org.neo4j.kernel.api.KernelAPI import org.neo4j.kernel.api.exceptions.ProcedureException -import org.neo4j.proc.Procedure.{BasicProcedure, Context} -import org.neo4j.proc.ProcedureSignature.procedureSignature -import org.neo4j.proc.{Neo4jTypes, ProcedureSignature => KernelSignature} +import org.neo4j.kernel.api.proc.Procedure.Context; +import org.neo4j.kernel.api.proc.ProcedureSignature.procedureSignature; +import org.neo4j.kernel.api.proc.{Neo4jTypes, ProcedureSignature => KernelSignature} class CallProcedureAcceptanceTest extends ExecutionEngineFunSuite { diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundPlanContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundPlanContext.scala index ed073eccb1640..f8204203f3862 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundPlanContext.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundPlanContext.scala @@ -32,8 +32,8 @@ import org.neo4j.kernel.api.constraints.UniquenessConstraint import org.neo4j.kernel.api.exceptions.KernelException import org.neo4j.kernel.api.exceptions.schema.SchemaKernelException import org.neo4j.kernel.api.index.{IndexDescriptor, InternalIndexState} -import org.neo4j.proc.Neo4jTypes.AnyType -import org.neo4j.proc.{Neo4jTypes, ProcedureSignature => KernelProcedureSignature} +import org.neo4j.kernel.api.proc.Neo4jTypes.AnyType +import org.neo4j.kernel.api.proc.{Neo4jTypes, ProcedureSignature => KernelProcedureSignature} import scala.collection.JavaConverters._ diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundQueryContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundQueryContext.scala index 490bf79f316a9..5a59a134f746c 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundQueryContext.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundQueryContext.scala @@ -49,7 +49,7 @@ import org.neo4j.kernel.api.index.{IndexDescriptor, InternalIndexState} import org.neo4j.kernel.impl.api.{KernelStatement => InternalKernelStatement} import org.neo4j.kernel.impl.core.{NodeManager, RelationshipProxy, ThreadToStatementContextBridge} import org.neo4j.kernel.impl.locking.ResourceTypes -import org.neo4j.proc +import org.neo4j.kernel.api.proc import org.neo4j.graphdb.security.URLAccessValidationError import scala.collection.Iterator diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundQueryContextTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundQueryContextTest.scala index b29e2216e1c4d..4560821c32697 100644 --- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundQueryContextTest.scala +++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundQueryContextTest.scala @@ -31,9 +31,9 @@ import org.neo4j.graphdb.config.Setting import org.neo4j.graphdb.factory.GraphDatabaseSettings import org.neo4j.kernel.GraphDatabaseAPI import org.neo4j.kernel.api._ +import org.neo4j.kernel.api.proc.Procedures import org.neo4j.kernel.impl.api.{KernelStatement, KernelTransactionImplementation} import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge -import org.neo4j.proc.Procedures import org.neo4j.test.TestGraphDatabaseFactory import scala.collection.JavaConverters._ diff --git a/community/kernel/pom.xml b/community/kernel/pom.xml index 0003a8cdc62f5..1c79b85217db1 100644 --- a/community/kernel/pom.xml +++ b/community/kernel/pom.xml @@ -235,11 +235,6 @@ the relevant Commercial Agreement. neo4j-lucene-upgrade ${project.version} - - org.neo4j - neo4j-storage-engine-api - ${project.version} - org.neo4j neo4j-procedure diff --git a/community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java b/community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java index 695d6c18cf577..0e4903b277a44 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java @@ -44,6 +44,7 @@ import org.neo4j.kernel.api.exceptions.ProcedureException; import org.neo4j.kernel.api.index.SchemaIndexProvider; import org.neo4j.kernel.api.labelscan.LabelScanStore; +import org.neo4j.kernel.api.proc.Procedures; import org.neo4j.kernel.builtinprocs.BuiltInProcedures; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.extension.dependency.HighestSelectionStrategy; @@ -97,7 +98,6 @@ import org.neo4j.kernel.impl.transaction.log.LogFileInformation; import org.neo4j.kernel.impl.transaction.log.LogFileRecoverer; import org.neo4j.kernel.impl.transaction.log.LogPosition; -import org.neo4j.kernel.impl.transaction.log.LogVersionRepository; import org.neo4j.kernel.impl.transaction.log.LogVersionedStoreChannel; import org.neo4j.kernel.impl.transaction.log.LoggingLogFileMonitor; import org.neo4j.kernel.impl.transaction.log.LogicalTransactionStore; @@ -153,7 +153,6 @@ import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; import org.neo4j.logging.Logger; -import org.neo4j.proc.Procedures; import org.neo4j.storageengine.api.StorageEngine; import org.neo4j.storageengine.api.StoreReadLayer; @@ -258,7 +257,7 @@ void dump( NeoStoreDataSource source, Logger log ) protected NeoStores neoStores( StorageEngine storageEngine ) { - return (NeoStores) storageEngine.neoStores(); + return storageEngine.neoStores(); } @Override @@ -468,16 +467,16 @@ public void start() throws IOException indexProviders.values(), storageEngine, logEntryReader ); buildRecovery( fs, - (NeoStores) storageEngine.neoStores(), + storageEngine.neoStores(), monitors.newMonitor( RecoveryVisitor.Monitor.class ), monitors.newMonitor( Recovery.Monitor.class ), transactionLogModule.logFiles(), transactionLogModule.storeFlusher(), startupStatistics, storageEngine, logEntryReader ); KernelModule kernelModule = buildKernel( transactionLogModule.transactionAppender(), - (IndexingService) storageEngine.indexingService(), + storageEngine.indexingService(), storageEngine.storeReadLayer(), - updateableSchemaState, (LabelScanStore) storageEngine.labelScanStore(), + updateableSchemaState, storageEngine.labelScanStore(), storageEngine ); @@ -511,7 +510,7 @@ public void start() throws IOException // Close the neostore, so that locks are released properly if ( storageEngine != null ) { - ((NeoStores)storageEngine.neoStores()).close(); + storageEngine.neoStores().close(); } } catch ( Exception closeException ) @@ -534,7 +533,7 @@ public void start() throws IOException { life.shutdown(); // Close the neostore, so that locks are released properly - ((NeoStores)storageEngine.neoStores()).close(); + storageEngine.neoStores().close(); } catch ( Exception closeException ) { @@ -600,12 +599,12 @@ private TransactionLogModule buildTransactionLogs( fileSystemAbstraction ); final IdOrderingQueue legacyIndexTransactionOrdering = - (IdOrderingQueue) storageEngine.legacyIndexTransactionOrdering(); + storageEngine.legacyIndexTransactionOrdering(); - TransactionIdStore transactionIdStore = (TransactionIdStore) storageEngine.transactionIdStore(); + TransactionIdStore transactionIdStore = storageEngine.transactionIdStore(); final PhysicalLogFile logFile = life.add( new PhysicalLogFile( fileSystemAbstraction, logFiles, config.get( GraphDatabaseSettings.logical_log_rotation_threshold ), transactionIdStore, - (LogVersionRepository) storageEngine.logVersionRepository(), physicalLogMonitor, transactionMetadataCache ) ); + storageEngine.logVersionRepository(), physicalLogMonitor, transactionMetadataCache ) ); final PhysicalLogFileInformation.LogVersionToTimestamp logInformation = new PhysicalLogFileInformation.LogVersionToTimestamp() @@ -793,7 +792,7 @@ public KernelAPI get() new ConstraintIndexCreator( kernelProvider, indexingService ); LegacyIndexStore legacyIndexStore = new LegacyIndexStore( config, - (IndexConfigStore) storageEngine.indexConfigStore(), kernelProvider, legacyIndexProviderLookup ); + storageEngine.indexConfigStore(), kernelProvider, legacyIndexProviderLookup ); LegacyPropertyTrackers legacyPropertyTrackers = new LegacyPropertyTrackers( propertyKeyTokenHolder, nodeManager.getNodePropertyTrackers(), nodeManager.getRelationshipPropertyTrackers(), nodeManager ); @@ -807,7 +806,7 @@ public KernelAPI get() TransactionHooks hooks = new TransactionHooks(); KernelTransactions kernelTransactions = life.add( new KernelTransactions( locks, constraintIndexCreator, statementOperations, schemaWriteGuard, transactionHeaderInformationFactory, - transactionCommitProcess, (IndexConfigStore) storageEngine.indexConfigStore(), + transactionCommitProcess, storageEngine.indexConfigStore(), legacyIndexProviderLookup, hooks, transactionMonitor, life, tracers, storageEngine, procedures ) ); final Kernel kernel = new Kernel( kernelTransactions, hooks, databaseHealth, transactionMonitor, procedures ); @@ -872,17 +871,17 @@ private void satisfyDependencies( Object... modules ) // Only public for testing purpose public NeoStores getNeoStores() { - return (NeoStores) storageEngine.neoStores(); + return storageEngine.neoStores(); } public IndexingService getIndexService() { - return (IndexingService) storageEngine.indexingService(); + return storageEngine.indexingService(); } public LabelScanStore getLabelScanStore() { - return (LabelScanStore) storageEngine.labelScanStore(); + return storageEngine.labelScanStore(); } @Override @@ -936,7 +935,7 @@ public synchronized void stop() life.shutdown(); // Close the NeoStores - ((NeoStores)storageEngine.neoStores()).close(); + storageEngine.neoStores().close(); msgLog.info( "NeoStores closed" ); } // After we've released the logFile monitor there might be transactions that wants to commit, but had @@ -948,7 +947,7 @@ private void awaitAllTransactionsClosed() { // Only wait for committed transactions to be applied if the kernel is healthy (i.e. no panic) // otherwise if there has been a panic transactions will not be applied properly anyway. - TransactionIdStore txIdStore = ((NeoStores) storageEngine.neoStores()).getMetaDataStore(); + TransactionIdStore txIdStore = storageEngine.neoStores().getMetaDataStore(); while ( databaseHealth.isHealthy() && !txIdStore.closedTransactionIdIsOnParWithOpenedTransactionId() ) { @@ -1016,7 +1015,7 @@ public void registerDiagnosticsWith( DiagnosticsManager manager ) @Override public NeoStores get() { - return (NeoStores) storageEngine.neoStores(); + return storageEngine.neoStores(); } public StoreReadLayer getStoreLayer() diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/KernelAPI.java b/community/kernel/src/main/java/org/neo4j/kernel/api/KernelAPI.java index 496a462467794..96372fe83dd54 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/KernelAPI.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/KernelAPI.java @@ -21,7 +21,7 @@ import org.neo4j.kernel.api.exceptions.ProcedureException; import org.neo4j.kernel.api.exceptions.TransactionFailureException; -import org.neo4j.proc.Procedure; +import org.neo4j.kernel.api.proc.Procedure; /** * The main API through which access to the Neo4j kernel is made, both read diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/ReadOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/api/ReadOperations.java index fb9a34c257e9c..c7889a405006b 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/ReadOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/ReadOperations.java @@ -43,10 +43,10 @@ import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; import org.neo4j.kernel.api.index.IndexDescriptor; import org.neo4j.kernel.api.index.InternalIndexState; +import org.neo4j.kernel.api.proc.Procedure; +import org.neo4j.kernel.api.proc.ProcedureSignature; import org.neo4j.kernel.impl.api.RelationshipVisitor; import org.neo4j.kernel.impl.api.store.RelationshipIterator; -import org.neo4j.proc.Procedure; -import org.neo4j.proc.ProcedureSignature; import org.neo4j.storageengine.api.NodeItem; import org.neo4j.storageengine.api.RelationshipItem; import org.neo4j.storageengine.api.Token; diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/TokenNameLookup.java b/community/kernel/src/main/java/org/neo4j/kernel/api/TokenNameLookup.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/TokenNameLookup.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/TokenNameLookup.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/constraints/NodePropertyConstraint.java b/community/kernel/src/main/java/org/neo4j/kernel/api/constraints/NodePropertyConstraint.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/constraints/NodePropertyConstraint.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/constraints/NodePropertyConstraint.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/constraints/NodePropertyExistenceConstraint.java b/community/kernel/src/main/java/org/neo4j/kernel/api/constraints/NodePropertyExistenceConstraint.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/constraints/NodePropertyExistenceConstraint.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/constraints/NodePropertyExistenceConstraint.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/constraints/PropertyConstraint.java b/community/kernel/src/main/java/org/neo4j/kernel/api/constraints/PropertyConstraint.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/constraints/PropertyConstraint.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/constraints/PropertyConstraint.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/constraints/RelationshipPropertyConstraint.java b/community/kernel/src/main/java/org/neo4j/kernel/api/constraints/RelationshipPropertyConstraint.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/constraints/RelationshipPropertyConstraint.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/constraints/RelationshipPropertyConstraint.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/constraints/RelationshipPropertyExistenceConstraint.java b/community/kernel/src/main/java/org/neo4j/kernel/api/constraints/RelationshipPropertyExistenceConstraint.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/constraints/RelationshipPropertyExistenceConstraint.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/constraints/RelationshipPropertyExistenceConstraint.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/constraints/UniquenessConstraint.java b/community/kernel/src/main/java/org/neo4j/kernel/api/constraints/UniquenessConstraint.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/constraints/UniquenessConstraint.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/constraints/UniquenessConstraint.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/ConstraintViolationTransactionFailureException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/ConstraintViolationTransactionFailureException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/ConstraintViolationTransactionFailureException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/ConstraintViolationTransactionFailureException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/EntityNotFoundException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/EntityNotFoundException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/EntityNotFoundException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/EntityNotFoundException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/InvalidTransactionTypeKernelException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/InvalidTransactionTypeKernelException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/InvalidTransactionTypeKernelException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/InvalidTransactionTypeKernelException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/KernelException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/KernelException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/KernelException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/KernelException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/LabelNotFoundKernelException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/LabelNotFoundKernelException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/LabelNotFoundKernelException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/LabelNotFoundKernelException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/ProcedureException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/ProcedureException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/ProcedureException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/ProcedureException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/PropertyKeyIdNotFoundKernelException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/PropertyKeyIdNotFoundKernelException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/PropertyKeyIdNotFoundKernelException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/PropertyKeyIdNotFoundKernelException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/PropertyKeyNotFoundException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/PropertyKeyNotFoundException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/PropertyKeyNotFoundException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/PropertyKeyNotFoundException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/PropertyNotFoundException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/PropertyNotFoundException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/PropertyNotFoundException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/PropertyNotFoundException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/ReadOnlyDbException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/ReadOnlyDbException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/ReadOnlyDbException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/ReadOnlyDbException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/RelationshipTypeIdNotFoundKernelException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/RelationshipTypeIdNotFoundKernelException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/RelationshipTypeIdNotFoundKernelException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/RelationshipTypeIdNotFoundKernelException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/RelationshipTypeNotFoundException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/RelationshipTypeNotFoundException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/RelationshipTypeNotFoundException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/RelationshipTypeNotFoundException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/Status.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/Status.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/Status.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/Status.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/TransactionFailureException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/TransactionFailureException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/TransactionFailureException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/TransactionFailureException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/TransactionHookException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/TransactionHookException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/TransactionHookException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/TransactionHookException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/index/ExceptionDuringFlipKernelException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/index/ExceptionDuringFlipKernelException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/index/ExceptionDuringFlipKernelException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/index/ExceptionDuringFlipKernelException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/index/FlipFailedKernelException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/index/FlipFailedKernelException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/index/FlipFailedKernelException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/index/FlipFailedKernelException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexActivationFailedKernelException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexActivationFailedKernelException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexActivationFailedKernelException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexActivationFailedKernelException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexEntryConflictException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexEntryConflictException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexEntryConflictException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexEntryConflictException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexNotFoundKernelException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexNotFoundKernelException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexNotFoundKernelException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexNotFoundKernelException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexPopulationFailedKernelException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexPopulationFailedKernelException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexPopulationFailedKernelException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexPopulationFailedKernelException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexProxyAlreadyClosedKernelException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexProxyAlreadyClosedKernelException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexProxyAlreadyClosedKernelException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexProxyAlreadyClosedKernelException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/legacyindex/LegacyIndexNotFoundKernelException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/legacyindex/LegacyIndexNotFoundKernelException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/legacyindex/LegacyIndexNotFoundKernelException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/legacyindex/LegacyIndexNotFoundKernelException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/AlreadyConstrainedException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/AlreadyConstrainedException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/AlreadyConstrainedException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/AlreadyConstrainedException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/AlreadyIndexedException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/AlreadyIndexedException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/AlreadyIndexedException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/AlreadyIndexedException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/ConstraintValidationKernelException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/ConstraintValidationKernelException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/ConstraintValidationKernelException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/ConstraintValidationKernelException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/ConstraintVerificationFailedKernelException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/ConstraintVerificationFailedKernelException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/ConstraintVerificationFailedKernelException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/ConstraintVerificationFailedKernelException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/ConstraintViolationKernelException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/ConstraintViolationKernelException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/ConstraintViolationKernelException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/ConstraintViolationKernelException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/CreateConstraintFailureException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/CreateConstraintFailureException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/CreateConstraintFailureException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/CreateConstraintFailureException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/DropConstraintFailureException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/DropConstraintFailureException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/DropConstraintFailureException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/DropConstraintFailureException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/DropIndexFailureException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/DropIndexFailureException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/DropIndexFailureException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/DropIndexFailureException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/DuplicateEntitySchemaRuleException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/DuplicateEntitySchemaRuleException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/DuplicateEntitySchemaRuleException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/DuplicateEntitySchemaRuleException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/DuplicateIndexSchemaRuleException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/DuplicateIndexSchemaRuleException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/DuplicateIndexSchemaRuleException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/DuplicateIndexSchemaRuleException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/DuplicateSchemaRuleException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/DuplicateSchemaRuleException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/DuplicateSchemaRuleException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/DuplicateSchemaRuleException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/EntitySchemaRuleNotFoundException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/EntitySchemaRuleNotFoundException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/EntitySchemaRuleNotFoundException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/EntitySchemaRuleNotFoundException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/IllegalTokenNameException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/IllegalTokenNameException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/IllegalTokenNameException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/IllegalTokenNameException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/IndexBelongsToConstraintException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/IndexBelongsToConstraintException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/IndexBelongsToConstraintException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/IndexBelongsToConstraintException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/IndexBrokenKernelException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/IndexBrokenKernelException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/IndexBrokenKernelException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/IndexBrokenKernelException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/IndexSchemaRuleNotFoundException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/IndexSchemaRuleNotFoundException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/IndexSchemaRuleNotFoundException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/IndexSchemaRuleNotFoundException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/MalformedSchemaRuleException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/MalformedSchemaRuleException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/MalformedSchemaRuleException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/MalformedSchemaRuleException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/NoSuchConstraintException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/NoSuchConstraintException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/NoSuchConstraintException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/NoSuchConstraintException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/NoSuchIndexException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/NoSuchIndexException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/NoSuchIndexException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/NoSuchIndexException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/NodePropertyExistenceConstraintVerificationFailedKernelException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/NodePropertyExistenceConstraintVerificationFailedKernelException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/NodePropertyExistenceConstraintVerificationFailedKernelException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/NodePropertyExistenceConstraintVerificationFailedKernelException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/NodePropertyExistenceConstraintViolationKernelException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/NodePropertyExistenceConstraintViolationKernelException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/NodePropertyExistenceConstraintViolationKernelException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/NodePropertyExistenceConstraintViolationKernelException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/ProcedureConstraintViolation.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/ProcedureConstraintViolation.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/ProcedureConstraintViolation.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/ProcedureConstraintViolation.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/RelationshipPropertyExistenceConstraintVerificationFailedKernelException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/RelationshipPropertyExistenceConstraintVerificationFailedKernelException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/RelationshipPropertyExistenceConstraintVerificationFailedKernelException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/RelationshipPropertyExistenceConstraintVerificationFailedKernelException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/RelationshipPropertyExistenceConstraintViolationKernelException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/RelationshipPropertyExistenceConstraintViolationKernelException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/RelationshipPropertyExistenceConstraintViolationKernelException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/RelationshipPropertyExistenceConstraintViolationKernelException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaKernelException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaKernelException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaKernelException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaKernelException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaRuleException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaRuleException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaRuleException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaRuleException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaRuleNotFoundException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaRuleNotFoundException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaRuleNotFoundException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaRuleNotFoundException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/TooManyLabelsException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/TooManyLabelsException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/TooManyLabelsException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/TooManyLabelsException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/UnableToValidateConstraintKernelException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/UnableToValidateConstraintKernelException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/UnableToValidateConstraintKernelException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/UnableToValidateConstraintKernelException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/UniquePropertyConstraintViolationKernelException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/UniquePropertyConstraintViolationKernelException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/UniquePropertyConstraintViolationKernelException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/UniquePropertyConstraintViolationKernelException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/UniquenessConstraintVerificationFailedKernelException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/UniquenessConstraintVerificationFailedKernelException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/exceptions/schema/UniquenessConstraintVerificationFailedKernelException.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/UniquenessConstraintVerificationFailedKernelException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/index/IndexDescriptor.java b/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexDescriptor.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/index/IndexDescriptor.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexDescriptor.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/api/index/InternalIndexState.java b/community/kernel/src/main/java/org/neo4j/kernel/api/index/InternalIndexState.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/api/index/InternalIndexState.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/index/InternalIndexState.java diff --git a/community/proc/src/main/java/org/neo4j/proc/Neo4jTypes.java b/community/kernel/src/main/java/org/neo4j/kernel/api/proc/Neo4jTypes.java similarity index 99% rename from community/proc/src/main/java/org/neo4j/proc/Neo4jTypes.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/proc/Neo4jTypes.java index 590c4787a6cdb..79ee0f87bdb75 100644 --- a/community/proc/src/main/java/org/neo4j/proc/Neo4jTypes.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/proc/Neo4jTypes.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.proc; +package org.neo4j.kernel.api.proc; /** * See also type_system.txt in the cypher code base, this is a mapping of that type system definition diff --git a/community/proc/src/main/java/org/neo4j/proc/Procedure.java b/community/kernel/src/main/java/org/neo4j/kernel/api/proc/Procedure.java similarity index 99% rename from community/proc/src/main/java/org/neo4j/proc/Procedure.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/proc/Procedure.java index 5fade745be93a..1704073587999 100644 --- a/community/proc/src/main/java/org/neo4j/proc/Procedure.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/proc/Procedure.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.proc; +package org.neo4j.kernel.api.proc; import java.util.HashMap; import java.util.Iterator; diff --git a/community/proc/src/main/java/org/neo4j/proc/ProcedureSignature.java b/community/kernel/src/main/java/org/neo4j/kernel/api/proc/ProcedureSignature.java similarity index 98% rename from community/proc/src/main/java/org/neo4j/proc/ProcedureSignature.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/proc/ProcedureSignature.java index 841c79aee645f..822ea33d847de 100644 --- a/community/proc/src/main/java/org/neo4j/proc/ProcedureSignature.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/proc/ProcedureSignature.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.proc; +package org.neo4j.kernel.api.proc; import java.util.Arrays; import java.util.Collections; @@ -25,7 +25,7 @@ import java.util.LinkedList; import java.util.List; -import org.neo4j.proc.Neo4jTypes.AnyType; +import org.neo4j.kernel.api.proc.Neo4jTypes.AnyType; import static java.util.Arrays.asList; diff --git a/community/proc/src/main/java/org/neo4j/proc/Procedures.java b/community/kernel/src/main/java/org/neo4j/kernel/api/proc/Procedures.java similarity index 98% rename from community/proc/src/main/java/org/neo4j/proc/Procedures.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/proc/Procedures.java index 23e3f63450aba..5f2650989648c 100644 --- a/community/proc/src/main/java/org/neo4j/proc/Procedures.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/proc/Procedures.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.proc; +package org.neo4j.kernel.api.proc; import java.util.HashMap; import java.util.Map; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/BuiltInProcedures.java b/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/BuiltInProcedures.java index 6f10d5f5c2ac2..bd5b91f87fbee 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/BuiltInProcedures.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/BuiltInProcedures.java @@ -22,7 +22,7 @@ import org.neo4j.kernel.api.KernelAPI; import org.neo4j.kernel.api.exceptions.ProcedureException; -import static org.neo4j.proc.ProcedureSignature.procedureName; +import static org.neo4j.kernel.api.proc.ProcedureSignature.procedureName; /** * This registers procedures that are expected to be available by default in Neo4j. diff --git a/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/ListLabelsProcedure.java b/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/ListLabelsProcedure.java index 27af5b545f1b3..e1508d192fc7b 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/ListLabelsProcedure.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/ListLabelsProcedure.java @@ -22,12 +22,12 @@ import java.util.stream.Stream; import org.neo4j.kernel.api.exceptions.ProcedureException; -import org.neo4j.proc.Neo4jTypes; -import org.neo4j.proc.Procedure; -import org.neo4j.proc.ProcedureSignature.ProcedureName; +import org.neo4j.kernel.api.proc.Neo4jTypes; +import org.neo4j.kernel.api.proc.Procedure; +import org.neo4j.kernel.api.proc.ProcedureSignature.ProcedureName; -import static org.neo4j.proc.ProcedureSignature.procedureSignature; import static org.neo4j.kernel.api.ReadOperations.readStatement; +import static org.neo4j.kernel.api.proc.ProcedureSignature.procedureSignature; public class ListLabelsProcedure extends Procedure.BasicProcedure { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/ListPropertyKeysProcedure.java b/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/ListPropertyKeysProcedure.java index 2206a34d2db13..67b52e2247a50 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/ListPropertyKeysProcedure.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/ListPropertyKeysProcedure.java @@ -22,12 +22,12 @@ import java.util.stream.Stream; import org.neo4j.kernel.api.exceptions.ProcedureException; -import org.neo4j.proc.Neo4jTypes; -import org.neo4j.proc.Procedure; -import org.neo4j.proc.ProcedureSignature; +import org.neo4j.kernel.api.proc.Neo4jTypes; +import org.neo4j.kernel.api.proc.Procedure; +import org.neo4j.kernel.api.proc.ProcedureSignature; -import static org.neo4j.proc.ProcedureSignature.procedureSignature; import static org.neo4j.kernel.api.ReadOperations.readStatement; +import static org.neo4j.kernel.api.proc.ProcedureSignature.procedureSignature; public class ListPropertyKeysProcedure extends Procedure.BasicProcedure { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/ListRelationshipTypesProcedure.java b/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/ListRelationshipTypesProcedure.java index b82fd14276cc0..dd5aba68134f8 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/ListRelationshipTypesProcedure.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/ListRelationshipTypesProcedure.java @@ -22,12 +22,12 @@ import java.util.stream.Stream; import org.neo4j.kernel.api.exceptions.ProcedureException; -import org.neo4j.proc.Neo4jTypes; -import org.neo4j.proc.Procedure; -import org.neo4j.proc.ProcedureSignature; +import org.neo4j.kernel.api.proc.Neo4jTypes; +import org.neo4j.kernel.api.proc.Procedure; +import org.neo4j.kernel.api.proc.ProcedureSignature; -import static org.neo4j.proc.ProcedureSignature.procedureSignature; import static org.neo4j.kernel.api.ReadOperations.readStatement; +import static org.neo4j.kernel.api.proc.ProcedureSignature.procedureSignature; public class ListRelationshipTypesProcedure extends Procedure.BasicProcedure { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/Kernel.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/Kernel.java index 799fa13e33701..8d083d2dab1ca 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/Kernel.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/Kernel.java @@ -24,8 +24,8 @@ import org.neo4j.kernel.api.TransactionHook; import org.neo4j.kernel.api.exceptions.ProcedureException; import org.neo4j.kernel.api.exceptions.TransactionFailureException; -import org.neo4j.proc.Procedure; -import org.neo4j.proc.Procedures; +import org.neo4j.kernel.api.proc.Procedure; +import org.neo4j.kernel.api.proc.Procedures; import org.neo4j.kernel.impl.transaction.TransactionMonitor; import org.neo4j.kernel.internal.DatabaseHealth; import org.neo4j.kernel.lifecycle.LifecycleAdapter; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelStatement.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelStatement.java index ab05d5a3361cd..aff1013dd4add 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelStatement.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelStatement.java @@ -27,11 +27,11 @@ import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.TokenWriteOperations; import org.neo4j.kernel.api.exceptions.InvalidTransactionTypeKernelException; +import org.neo4j.kernel.api.proc.Procedures; import org.neo4j.kernel.api.txstate.LegacyIndexTransactionState; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.kernel.api.txstate.TxStateHolder; import org.neo4j.kernel.impl.locking.Locks; -import org.neo4j.proc.Procedures; import org.neo4j.storageengine.api.StorageStatement; import org.neo4j.storageengine.api.schema.LabelScanReader; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java index abf2795885bdb..7c5261b77314d 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java @@ -35,13 +35,13 @@ import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; import org.neo4j.kernel.api.exceptions.schema.DropIndexFailureException; import org.neo4j.kernel.api.index.IndexDescriptor; +import org.neo4j.kernel.api.proc.Procedures; import org.neo4j.kernel.api.txstate.LegacyIndexTransactionState; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.kernel.api.txstate.TxStateHolder; import org.neo4j.kernel.impl.api.state.ConstraintIndexCreator; import org.neo4j.kernel.impl.api.state.TxState; import org.neo4j.kernel.impl.locking.Locks; -import org.neo4j.proc.Procedures; import org.neo4j.kernel.impl.transaction.TransactionHeaderInformationFactory; import org.neo4j.kernel.impl.transaction.TransactionMonitor; import org.neo4j.kernel.impl.transaction.log.PhysicalTransactionRepresentation; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactions.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactions.java index 0e64036dcf225..d892a8da1c5cd 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactions.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactions.java @@ -28,12 +28,12 @@ import org.neo4j.graphdb.DatabaseShutdownException; import org.neo4j.helpers.Clock; import org.neo4j.kernel.api.KernelTransaction; +import org.neo4j.kernel.api.proc.Procedures; import org.neo4j.kernel.api.txstate.LegacyIndexTransactionState; import org.neo4j.kernel.impl.api.state.ConstraintIndexCreator; import org.neo4j.kernel.impl.api.state.LegacyIndexTransactionStateImpl; import org.neo4j.kernel.impl.index.IndexConfigStore; import org.neo4j.kernel.impl.locking.Locks; -import org.neo4j.proc.Procedures; import org.neo4j.kernel.impl.store.MetaDataStore; import org.neo4j.kernel.impl.transaction.TransactionHeaderInformationFactory; import org.neo4j.kernel.impl.transaction.TransactionMonitor; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java index bdb476619b805..e2b64d3b78e5c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java @@ -61,6 +61,10 @@ import org.neo4j.kernel.api.exceptions.schema.TooManyLabelsException; import org.neo4j.kernel.api.index.IndexDescriptor; import org.neo4j.kernel.api.index.InternalIndexState; +import org.neo4j.kernel.api.proc.Procedure; +import org.neo4j.kernel.api.proc.ProcedureSignature; +import org.neo4j.kernel.api.proc.Procedures; +import org.neo4j.kernel.api.proc.ProcedureSignature.ProcedureName; import org.neo4j.kernel.api.properties.DefinedProperty; import org.neo4j.kernel.api.properties.Property; import org.neo4j.kernel.impl.api.operations.CountsOperations; @@ -74,10 +78,6 @@ import org.neo4j.kernel.impl.api.operations.SchemaReadOperations; import org.neo4j.kernel.impl.api.operations.SchemaStateOperations; import org.neo4j.kernel.impl.api.store.RelationshipIterator; -import org.neo4j.proc.Procedure; -import org.neo4j.proc.Procedures; -import org.neo4j.proc.ProcedureSignature; -import org.neo4j.proc.ProcedureSignature.ProcedureName; import org.neo4j.storageengine.api.NodeItem; import org.neo4j.storageengine.api.RelationshipItem; import org.neo4j.storageengine.api.Token; diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/impl/api/RelationshipVisitor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/RelationshipVisitor.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/impl/api/RelationshipVisitor.java rename to community/kernel/src/main/java/org/neo4j/kernel/impl/api/RelationshipVisitor.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/kernel/impl/api/store/RelationshipIterator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/RelationshipIterator.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/kernel/impl/api/store/RelationshipIterator.java rename to community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/RelationshipIterator.java 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 badd47488f11f..b22b20d9c9912 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 @@ -204,7 +204,7 @@ public RecordStorageEngine( labelScanStoreSync = new WorkSync<>( labelScanStore::newWriter ); - this.commandReaderFactory = new RecordStorageCommandReaderFactory(); + commandReaderFactory = new RecordStorageCommandReaderFactory(); indexUpdatesSync = new WorkSync<>( indexingService ); } catch ( Throwable failure ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/TransactionRangeDiagnostics.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/TransactionRangeDiagnostics.java new file mode 100644 index 0000000000000..18295584b806b --- /dev/null +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/TransactionRangeDiagnostics.java @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2002-2016 "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 . + */ +package org.neo4j.kernel.impl.storageengine.impl.recordstorage; + +import java.io.IOException; + +import org.neo4j.kernel.impl.store.NeoStores; +import org.neo4j.kernel.impl.transaction.log.PhysicalLogFiles; +import org.neo4j.kernel.impl.transaction.log.entry.LogHeader; +import org.neo4j.kernel.info.DiagnosticsExtractor; +import org.neo4j.kernel.info.DiagnosticsPhase; +import org.neo4j.logging.Logger; + +public class TransactionRangeDiagnostics implements DiagnosticsExtractor +{ + private final PhysicalLogFiles logFiles; + + public TransactionRangeDiagnostics( PhysicalLogFiles logFiles ) + { + this.logFiles = logFiles; + } + + @Override + public void dumpDiagnostics( NeoStores source, DiagnosticsPhase phase, Logger logger ) + { + try + { + for ( long logVersion = logFiles.getLowestLogVersion(); + logFiles.versionExists( logVersion ); logVersion++ ) + { + if ( logFiles.hasAnyTransaction( logVersion ) ) + { + LogHeader header = logFiles.extractHeader( logVersion ); + long firstTransactionIdInThisLog = header.lastCommittedTxId + 1; + logger.log( "Oldest transaction " + firstTransactionIdInThisLog + + " found in log with version " + logVersion ); + return; + } + } + logger.log( "No transactions found in any log" ); + } + catch ( IOException e ) + { // It's fine, we just tried to be nice and log this. Failing is OK + logger.log( "Error trying to figure out oldest transaction in log" ); + } + } +} diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/NeoStores.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/NeoStores.java index 7374bb057aba3..6c5ac3d3e93cf 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/NeoStores.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/NeoStores.java @@ -40,6 +40,7 @@ import org.neo4j.kernel.impl.store.counts.CountsTracker; import org.neo4j.kernel.impl.store.counts.ReadOnlyCountsTracker; import org.neo4j.kernel.impl.store.kvstore.DataInitializer; +import org.neo4j.kernel.info.DiagnosticsManager; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; import org.neo4j.logging.Logger; diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/CommandReader.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/CommandReader.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/CommandReader.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/CommandReader.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/CommandReaderFactory.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/CommandReaderFactory.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/CommandReaderFactory.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/CommandReaderFactory.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/CommandStream.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/CommandStream.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/CommandStream.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/CommandStream.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/CommandsToApply.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/CommandsToApply.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/CommandsToApply.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/CommandsToApply.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/DegreeItem.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/DegreeItem.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/DegreeItem.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/DegreeItem.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/Direction.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/Direction.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/Direction.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/Direction.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/EntityItem.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/EntityItem.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/EntityItem.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/EntityItem.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/EntityType.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/EntityType.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/EntityType.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/EntityType.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/LabelItem.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/LabelItem.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/LabelItem.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/LabelItem.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/NodeItem.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/NodeItem.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/NodeItem.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/NodeItem.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/PropertyItem.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/PropertyItem.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/PropertyItem.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/PropertyItem.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/ReadPastEndException.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/ReadPastEndException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/ReadPastEndException.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/ReadPastEndException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/ReadableChannel.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/ReadableChannel.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/ReadableChannel.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/ReadableChannel.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/RelationshipItem.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/RelationshipItem.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/RelationshipItem.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/RelationshipItem.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/StorageCommand.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/StorageCommand.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/StorageCommand.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/StorageCommand.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/StorageEngine.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/StorageEngine.java similarity index 80% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/StorageEngine.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/StorageEngine.java index 126f5557c5b96..139c531f34d31 100644 --- a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/StorageEngine.java +++ b/community/kernel/src/main/java/org/neo4j/storageengine/api/StorageEngine.java @@ -25,6 +25,18 @@ import org.neo4j.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.exceptions.schema.ConstraintValidationKernelException; import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; +import org.neo4j.kernel.api.labelscan.LabelScanStore; +import org.neo4j.kernel.impl.api.LegacyIndexApplierLookup; +import org.neo4j.kernel.impl.api.index.IndexingService; +import org.neo4j.kernel.impl.api.index.SchemaIndexProviderMap; +import org.neo4j.kernel.impl.core.CacheAccessBackDoor; +import org.neo4j.kernel.impl.index.IndexConfigStore; +import org.neo4j.kernel.impl.store.MetaDataStore; +import org.neo4j.kernel.impl.store.NeoStores; +import org.neo4j.kernel.impl.transaction.log.LogVersionRepository; +import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; +import org.neo4j.kernel.impl.transaction.state.IntegrityValidator; +import org.neo4j.kernel.impl.util.IdOrderingQueue; import org.neo4j.storageengine.api.lock.ResourceLocker; import org.neo4j.storageengine.api.txstate.ReadableTransactionState; @@ -91,40 +103,40 @@ void createCommands( // creating this API, take little notice to them, as they will go away // ==================================================================== @Deprecated - Object transactionIdStore(); + TransactionIdStore transactionIdStore(); @Deprecated - Object logVersionRepository(); + LogVersionRepository logVersionRepository(); @Deprecated - Object neoStores(); + NeoStores neoStores(); @Deprecated - Object metaDataStore(); + MetaDataStore metaDataStore(); @Deprecated - Object indexingService(); + IndexingService indexingService(); @Deprecated - Object labelScanStore(); + LabelScanStore labelScanStore(); @Deprecated - Object integrityValidator(); + IntegrityValidator integrityValidator(); @Deprecated - Object schemaIndexProviderMap(); + SchemaIndexProviderMap schemaIndexProviderMap(); @Deprecated - Object cacheAccess(); + CacheAccessBackDoor cacheAccess(); @Deprecated - Object legacyIndexApplierLookup(); + LegacyIndexApplierLookup legacyIndexApplierLookup(); @Deprecated - Object indexConfigStore(); + IndexConfigStore indexConfigStore(); @Deprecated - Object legacyIndexTransactionOrdering(); + IdOrderingQueue legacyIndexTransactionOrdering(); @Deprecated void loadSchemaCache(); diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/StorageProperty.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/StorageProperty.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/StorageProperty.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/StorageProperty.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/StorageStatement.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/StorageStatement.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/StorageStatement.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/StorageStatement.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/Token.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/Token.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/Token.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/Token.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/TokenFactory.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/TokenFactory.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/TokenFactory.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/TokenFactory.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/TransactionApplicationMode.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/TransactionApplicationMode.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/TransactionApplicationMode.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/TransactionApplicationMode.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/WritableChannel.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/WritableChannel.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/WritableChannel.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/WritableChannel.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/legacyindex/package-info.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/legacyindex/package-info.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/legacyindex/package-info.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/legacyindex/package-info.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/lock/AcquireLockTimeoutException.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/lock/AcquireLockTimeoutException.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/lock/AcquireLockTimeoutException.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/lock/AcquireLockTimeoutException.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/lock/ResourceLocker.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/lock/ResourceLocker.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/lock/ResourceLocker.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/lock/ResourceLocker.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/lock/ResourceType.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/lock/ResourceType.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/lock/ResourceType.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/lock/ResourceType.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/lock/WaitStrategy.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/lock/WaitStrategy.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/lock/WaitStrategy.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/lock/WaitStrategy.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/schema/IndexReader.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/schema/IndexReader.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/schema/IndexReader.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/schema/IndexReader.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/schema/IndexSchemaRule.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/schema/IndexSchemaRule.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/schema/IndexSchemaRule.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/schema/IndexSchemaRule.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/schema/LabelScanReader.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/schema/LabelScanReader.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/schema/LabelScanReader.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/schema/LabelScanReader.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/schema/PopulationProgress.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/schema/PopulationProgress.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/schema/PopulationProgress.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/schema/PopulationProgress.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/schema/SchemaRule.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/schema/SchemaRule.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/schema/SchemaRule.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/schema/SchemaRule.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/txstate/DiffSetsVisitor.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/DiffSetsVisitor.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/txstate/DiffSetsVisitor.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/DiffSetsVisitor.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/txstate/NodeState.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/NodeState.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/txstate/NodeState.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/NodeState.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/txstate/PropertyContainerState.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/PropertyContainerState.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/txstate/PropertyContainerState.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/PropertyContainerState.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/txstate/ReadableDiffSets.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/ReadableDiffSets.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/txstate/ReadableDiffSets.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/ReadableDiffSets.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/txstate/ReadableRelationshipDiffSets.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/ReadableRelationshipDiffSets.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/txstate/ReadableRelationshipDiffSets.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/ReadableRelationshipDiffSets.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/txstate/ReadableTransactionState.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/ReadableTransactionState.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/txstate/ReadableTransactionState.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/ReadableTransactionState.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/txstate/RelationshipState.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/RelationshipState.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/txstate/RelationshipState.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/RelationshipState.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/txstate/SuperReadableDiffSets.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/SuperReadableDiffSets.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/txstate/SuperReadableDiffSets.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/SuperReadableDiffSets.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/txstate/TxStateVisitor.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/TxStateVisitor.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/txstate/TxStateVisitor.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/TxStateVisitor.java diff --git a/community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/txstate/UpdateTriState.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/UpdateTriState.java similarity index 100% rename from community/storage-engine-api/src/main/java/org/neo4j/storageengine/api/txstate/UpdateTriState.java rename to community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/UpdateTriState.java diff --git a/community/kernel/src/test/java/org/neo4j/kernel/NeoStoreDataSourceTest.java b/community/kernel/src/test/java/org/neo4j/kernel/NeoStoreDataSourceTest.java index e569e48a381dd..bd0c688b3869a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/NeoStoreDataSourceTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/NeoStoreDataSourceTest.java @@ -26,6 +26,7 @@ import org.neo4j.graphdb.DependencyResolver; import org.neo4j.io.pagecache.PageCache; +import org.neo4j.kernel.NeoStoreDataSource.Diagnostics; import org.neo4j.kernel.impl.core.DatabasePanicEventGenerator; import org.neo4j.kernel.impl.transaction.log.PhysicalLogFiles; import org.neo4j.kernel.impl.transaction.log.entry.LogEntryVersion; @@ -150,7 +151,7 @@ public void shouldLogCorrectTransactionLogDiagnosticsForNoTransactionLogs() thro Logger logger = logProvider.getLog( getClass() ).infoLogger(); // WHEN - NeoStoreDataSource.Diagnostics.TRANSACTION_RANGE.dump( dataSource, logger ); + Diagnostics.TRANSACTION_RANGE.dump( dataSource, logger ); // THEN logProvider.assertContainsMessageContaining( "No transactions" ); @@ -167,7 +168,7 @@ public void shouldLogCorrectTransactionLogDiagnosticsForTransactionsInOldestLog( Logger logger = logProvider.getLog( getClass() ).infoLogger(); // WHEN - NeoStoreDataSource.Diagnostics.TRANSACTION_RANGE.dump( dataSource, logger ); + Diagnostics.TRANSACTION_RANGE.dump( dataSource, logger ); // THEN logProvider.assertContainsMessageContaining( "transaction " + (prevLogLastTxId + 1) ); @@ -185,7 +186,7 @@ public void shouldLogCorrectTransactionLogDiagnosticsForTransactionsInSecondOlde Logger logger = logProvider.getLog( getClass() ).infoLogger(); // WHEN - NeoStoreDataSource.Diagnostics.TRANSACTION_RANGE.dump( dataSource, logger ); + Diagnostics.TRANSACTION_RANGE.dump( dataSource, logger ); // THEN logProvider.assertContainsMessageContaining( "transaction " + (prevLogLastTxId + 1) ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/KernelTransactionFactory.java b/community/kernel/src/test/java/org/neo4j/kernel/api/KernelTransactionFactory.java index 8c926b828f603..0d2fbd146292d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/KernelTransactionFactory.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/KernelTransactionFactory.java @@ -20,6 +20,7 @@ package org.neo4j.kernel.api; import org.neo4j.helpers.Clock; +import org.neo4j.kernel.api.proc.Procedures; import org.neo4j.kernel.api.txstate.LegacyIndexTransactionState; import org.neo4j.kernel.impl.api.KernelTransactionImplementation; import org.neo4j.kernel.impl.api.KernelTransactions; @@ -29,7 +30,6 @@ import org.neo4j.kernel.impl.api.TransactionHooks; import org.neo4j.kernel.impl.api.TransactionRepresentationCommitProcess; import org.neo4j.kernel.impl.api.state.ConstraintIndexCreator; -import org.neo4j.proc.Procedures; import org.neo4j.kernel.impl.store.NeoStores; import org.neo4j.kernel.impl.transaction.TransactionHeaderInformationFactory; import org.neo4j.kernel.impl.transaction.TransactionMonitor; diff --git a/community/proc/src/test/java/org/neo4j/proc/ProceduresTest.java b/community/kernel/src/test/java/org/neo4j/kernel/api/proc/ProceduresTest.java similarity index 96% rename from community/proc/src/test/java/org/neo4j/proc/ProceduresTest.java rename to community/kernel/src/test/java/org/neo4j/kernel/api/proc/ProceduresTest.java index 06a990ca02a82..f55114d7c2afb 100644 --- a/community/proc/src/test/java/org/neo4j/proc/ProceduresTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/proc/ProceduresTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.proc; +package org.neo4j.kernel.api.proc; import org.junit.Rule; import org.junit.Test; @@ -27,12 +27,14 @@ import org.neo4j.kernel.api.exceptions.ProcedureException; -import static java.util.stream.Collectors.toList; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.contains; import static org.junit.Assert.assertThat; -import static org.neo4j.proc.Procedure.Key.key; -import static org.neo4j.proc.ProcedureSignature.procedureSignature; + +import static java.util.stream.Collectors.toList; + +import static org.neo4j.kernel.api.proc.Procedure.Key.key; +import static org.neo4j.kernel.api.proc.ProcedureSignature.procedureSignature; public class ProceduresTest { @@ -138,4 +140,4 @@ public Stream apply( Context ctx, Object[] input ) throws ProcedureExc // Then assertThat( result.collect( toList() ), contains( equalTo( new Object[]{ "hello, world" } ) ) ); } -} \ No newline at end of file +} diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/DataStatementArgumentVerificationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/DataStatementArgumentVerificationTest.java index 94e0594e7c4ae..70383e3527811 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/DataStatementArgumentVerificationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/DataStatementArgumentVerificationTest.java @@ -24,7 +24,7 @@ import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.kernel.api.DataWriteOperations; import org.neo4j.kernel.api.StatementConstants; -import org.neo4j.proc.Procedures; +import org.neo4j.kernel.api.proc.Procedures; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelStatementTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelStatementTest.java index de67361fe5708..e3f41596b3b9a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelStatementTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelStatementTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.neo4j.graphdb.TransactionTerminatedException; -import org.neo4j.proc.Procedures; +import org.neo4j.kernel.api.proc.Procedures; import org.neo4j.storageengine.api.StorageStatement; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionsTest.java index c4d119208620c..ac3d3bdff0282 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionsTest.java @@ -27,10 +27,10 @@ import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.kernel.api.proc.Procedures; import org.neo4j.kernel.impl.api.store.StoreStatement; import org.neo4j.kernel.impl.locking.Locks; import org.neo4j.kernel.impl.locking.ReentrantLockService; -import org.neo4j.proc.Procedures; import org.neo4j.kernel.impl.store.MetaDataStore; import org.neo4j.kernel.impl.store.NeoStores; import org.neo4j.kernel.impl.transaction.TransactionHeaderInformationFactory; @@ -217,7 +217,6 @@ private static KernelTransactions newKernelTransactions( TransactionCommitProces StorageEngine storageEngine = mock( StorageEngine.class ); when( storageEngine.storeReadLayer() ).thenReturn( readLayer ); - when( storageEngine.neoStores() ).thenReturn( neoStores ); when( storageEngine.metaDataStore() ).thenReturn( metaDataStore ); when( storageEngine.integrityValidator() ).thenReturn( integrityValidator ); doAnswer( new Answer() diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LockingStatementOperationsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LockingStatementOperationsTest.java index 0cf3fd3379551..58aec1692dfb2 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LockingStatementOperationsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LockingStatementOperationsTest.java @@ -31,6 +31,7 @@ import org.neo4j.kernel.api.constraints.UniquenessConstraint; import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.index.IndexDescriptor; +import org.neo4j.kernel.api.proc.Procedures; import org.neo4j.kernel.api.properties.DefinedProperty; import org.neo4j.kernel.api.properties.Property; import org.neo4j.kernel.impl.api.operations.EntityReadOperations; @@ -40,7 +41,6 @@ import org.neo4j.kernel.impl.api.operations.SchemaWriteOperations; import org.neo4j.kernel.impl.locking.Locks; import org.neo4j.kernel.impl.locking.ResourceTypes; -import org.neo4j.proc.Procedures; import static org.junit.Assert.assertSame; import static org.mockito.Mockito.inOrder; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/StatementLifecycleTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/StatementLifecycleTest.java index 9e5790d58d9a7..bc7507756ef4f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/StatementLifecycleTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/StatementLifecycleTest.java @@ -21,7 +21,7 @@ import org.junit.Test; -import org.neo4j.proc.Procedures; +import org.neo4j.kernel.api.proc.Procedures; import org.neo4j.storageengine.api.StorageStatement; import static org.mockito.Mockito.mock; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintIndexCreatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintIndexCreatorTest.java index b67ea9ba38463..b8158db510335 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintIndexCreatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintIndexCreatorTest.java @@ -33,13 +33,13 @@ import org.neo4j.kernel.api.exceptions.schema.ConstraintVerificationFailedKernelException; import org.neo4j.kernel.api.index.IndexDescriptor; import org.neo4j.kernel.api.index.PreexistingIndexEntryConflictException; +import org.neo4j.kernel.api.proc.Procedure; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.kernel.impl.api.KernelStatement; import org.neo4j.kernel.impl.api.StatementOperationParts; import org.neo4j.kernel.impl.api.index.IndexProxy; import org.neo4j.kernel.impl.api.index.IndexingService; import org.neo4j.kernel.impl.api.state.ConstraintIndexCreator; -import org.neo4j.proc.Procedure; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/BuiltinProceduresIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/BuiltinProceduresIT.java index 037921a0fadc0..6d865a5a90757 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/BuiltinProceduresIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/BuiltinProceduresIT.java @@ -28,10 +28,12 @@ import org.neo4j.kernel.api.DataWriteOperations; import static java.util.stream.Collectors.toList; + +import static org.neo4j.kernel.api.proc.ProcedureSignature.procedureName; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; import static org.hamcrest.core.IsEqual.equalTo; -import static org.neo4j.proc.ProcedureSignature.procedureName; public class BuiltinProceduresIT extends KernelIntegrationTest { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/ProceduresKernelIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/ProceduresKernelIT.java index 0b5b8a9c2b943..bcf3b4839bb60 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/ProceduresKernelIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/ProceduresKernelIT.java @@ -27,16 +27,18 @@ import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.exceptions.ProcedureException; -import org.neo4j.proc.Procedure; -import org.neo4j.proc.ProcedureSignature; +import org.neo4j.kernel.api.proc.Procedure; +import org.neo4j.kernel.api.proc.ProcedureSignature; import static java.util.stream.Collectors.toList; + +import static org.neo4j.kernel.api.proc.Neo4jTypes.NTString; +import static org.neo4j.kernel.api.proc.ProcedureSignature.procedureSignature; + import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; import static org.junit.Assert.assertNotNull; -import static org.neo4j.proc.Neo4jTypes.NTString; -import static org.neo4j.proc.ProcedureSignature.procedureSignature; public class ProceduresKernelIT extends KernelIntegrationTest { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/DiskLayerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/DiskLayerTest.java index 89341689040be..0d26e773c5ce7 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/DiskLayerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/DiskLayerTest.java @@ -37,6 +37,7 @@ import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.index.IndexDescriptor; import org.neo4j.kernel.api.labelscan.LabelScanStore; +import org.neo4j.kernel.api.proc.Procedures; import org.neo4j.kernel.impl.api.IndexReaderFactory; import org.neo4j.kernel.impl.api.KernelStatement; import org.neo4j.kernel.impl.api.index.IndexingService; @@ -45,7 +46,6 @@ import org.neo4j.kernel.impl.core.RelationshipTypeTokenHolder; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.impl.locking.LockService; -import org.neo4j.proc.Procedures; import org.neo4j.kernel.impl.store.NeoStores; import org.neo4j.kernel.impl.store.SchemaStorage; import org.neo4j.kernel.impl.transaction.state.NeoStoresSupplier; diff --git a/community/pom.xml b/community/pom.xml index f8ebb4fb1f6c5..462f243cdc600 100644 --- a/community/pom.xml +++ b/community/pom.xml @@ -42,7 +42,6 @@ logging neo4j-slf4j codegen - storage-engine-api proc kernel jmx diff --git a/community/proc/pom.xml b/community/proc/pom.xml index 44859d361296d..0dc87f989d778 100644 --- a/community/proc/pom.xml +++ b/community/proc/pom.xml @@ -50,14 +50,6 @@ the relevant Commercial Agreement. - - - org.neo4j - neo4j-storage-engine-api - 3.0.0-SNAPSHOT - - junit junit diff --git a/community/storage-engine-api/LICENSES.txt b/community/storage-engine-api/LICENSES.txt deleted file mode 100644 index e62824d7096a5..0000000000000 --- a/community/storage-engine-api/LICENSES.txt +++ /dev/null @@ -1,4 +0,0 @@ -This file contains the full license text of the included third party -libraries. For an overview of the licenses see the NOTICE.txt file. - - diff --git a/community/storage-engine-api/NOTICE.txt b/community/storage-engine-api/NOTICE.txt deleted file mode 100644 index b7383b9874625..0000000000000 --- a/community/storage-engine-api/NOTICE.txt +++ /dev/null @@ -1,27 +0,0 @@ -Neo4j -Copyright © 2002-2015 Network Engine for Objects in Lund AB (referred to -in this notice as "Neo Technology") - [http://neotechnology.com] - -This product includes software ("Software") developed by Neo Technology. - -The copyright in the bundled Neo4j graph database (including the -Software) is owned by Neo Technology. The Software developed and owned -by Neo Technology is licensed under the GNU GENERAL PUBLIC LICENSE -Version 3 (http://www.fsf.org/licensing/licenses/gpl-3.0.html) ("GPL") -to all third parties and that license, as required by the GPL, is -included in the LICENSE.txt file. - -However, if you have executed an End User Software License and Services -Agreement or an OEM Software License and Support Services Agreement, or -another commercial license agreement with Neo Technology or one of its -affiliates (each, a "Commercial Agreement"), the terms of the license in -such Commercial Agreement will supersede the GPL and you may use the -software solely pursuant to the terms of the relevant Commercial -Agreement. - -Full license texts are found in LICENSES.txt. - -Third-party licenses --------------------- - diff --git a/community/storage-engine-api/pom.xml b/community/storage-engine-api/pom.xml deleted file mode 100644 index f164cf973b210..0000000000000 --- a/community/storage-engine-api/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - org.neo4j - parent - 3.0.0-SNAPSHOT - ../.. - - - - storage-engine-api - storage.impl - org.neo4j.storage - GPL-3-header.txt - notice-gpl-prefix.txt - - - 4.0.0 - neo4j-storage-engine-api - org.neo4j - 3.0.0-SNAPSHOT - - jar - Neo4j - Storage Engine API - Storage Engine API for Neo4j Kernel. - http://components.neo4j.org/${project.artifactId}/${project.version} - - - scm:git:git://github.com/neo4j/neo4j.git - scm:git:git@github.com:neo4j/neo4j.git - https://github.com/neo4j/neo4j - - - - - GNU General Public License, Version 3 - http://www.gnu.org/licenses/gpl-3.0-standalone.html - The software ("Software") developed and owned by Network Engine for -Objects in Lund AB (referred to in this notice as "Neo Technology") is -licensed under the GNU GENERAL PUBLIC LICENSE Version 3 to all third -parties and that license is included below. - -However, if you have executed an End User Software License and Services -Agreement or an OEM Software License and Support Services Agreement, or -another commercial license agreement with Neo Technology or one of its -affiliates (each, a "Commercial Agreement"), the terms of the license in -such Commercial Agreement will supersede the GNU GENERAL PUBLIC LICENSE -Version 3 and you may use the Software solely pursuant to the terms of -the relevant Commercial Agreement. - - - - - - - org.neo4j - neo4j-primitive-collections - ${project.version} - - - org.neo4j - neo4j-collections - ${project.version} - - - - junit - junit - test - - -