Rename MetaDataOperations to QueryRegistrationOperations

community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java

@@ -60,14 +60,14 @@
 import org.neo4j.kernel.impl.api.LockingStatementOperations;
 import org.neo4j.kernel.impl.api.SchemaStateConcern;
 import org.neo4j.kernel.impl.api.SchemaWriteGuard;
-import org.neo4j.kernel.impl.api.StackingMetaDataOperations;
+import org.neo4j.kernel.impl.api.StackingQueryRegistrationOperations;
 import org.neo4j.kernel.impl.api.StateHandlingStatementOperations;
 import org.neo4j.kernel.impl.api.StatementOperationParts;
 import org.neo4j.kernel.impl.api.TransactionCommitProcess;
 import org.neo4j.kernel.impl.api.TransactionHooks;
 import org.neo4j.kernel.impl.api.UpdateableSchemaState;
 import org.neo4j.kernel.impl.api.index.IndexingService;
-import org.neo4j.kernel.impl.api.operations.MetaDataOperations;
+import org.neo4j.kernel.impl.api.operations.QueryRegistrationOperations;
 import org.neo4j.kernel.impl.api.scan.LabelScanStoreProvider;
 import org.neo4j.kernel.impl.api.state.ConstraintIndexCreator;
 import org.neo4j.kernel.impl.constraints.ConstraintSemantics;
@@ -978,13 +978,13 @@ private StatementOperationParts buildStatementOperations(
         StateHandlingStatementOperations stateHandlingContext = new StateHandlingStatementOperations( storeReadLayer,
                 autoIndexing, constraintIndexCreator,
                 legacyIndexStore );
-        MetaDataOperations metaDataOperations =
-                new StackingMetaDataOperations( StackingMetaDataOperations.LAST_QUERY_ID );
+        QueryRegistrationOperations queryRegistrationOperations =
+                new StackingQueryRegistrationOperations( StackingQueryRegistrationOperations.LAST_QUERY_ID );
 
         StatementOperationParts parts = new StatementOperationParts( stateHandlingContext, stateHandlingContext,
                 stateHandlingContext, stateHandlingContext, stateHandlingContext, stateHandlingContext,
                 new SchemaStateConcern( updateableSchemaState ), null, stateHandlingContext, stateHandlingContext,
-                stateHandlingContext, metaDataOperations );
+                stateHandlingContext, queryRegistrationOperations );
         // + Constraints
         ConstraintEnforcingEntityOperations constraintEnforcingEntityOperations =
                 new ConstraintEnforcingEntityOperations( constraintSemantics, parts.entityWriteOperations(), parts.entityReadOperations(),

community/kernel/src/main/java/org/neo4j/kernel/api/MetaDataOperations.java → community/kernel/src/main/java/org/neo4j/kernel/api/QueryRegistryOperations.java

@@ -22,7 +22,7 @@
 import java.util.Map;
 import java.util.stream.Stream;
 
-public interface MetaDataOperations
+public interface QueryRegistryOperations
 {
     Stream<ExecutingQuery> executingQueries();
 

community/kernel/src/main/java/org/neo4j/kernel/api/Statement.java

@@ -62,5 +62,5 @@ public interface Statement extends Resource
     /**
      * @return interface exposing operations for associating metadata with this statement
      */
-    MetaDataOperations metaOperations();
+    QueryRegistryOperations queryRegistration();
 }

community/kernel/src/main/java/org/neo4j/kernel/impl/api/DataOperationsFacade.java

@@ -36,6 +36,7 @@
 import org.neo4j.kernel.api.ExecutingQuery;
 import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.api.LegacyIndexHits;
+import org.neo4j.kernel.api.QueryRegistryOperations;
 import org.neo4j.kernel.api.ReadOperations;
 import org.neo4j.kernel.api.SchemaWriteOperations;
 import org.neo4j.kernel.api.StatementConstants;
@@ -83,7 +84,7 @@
 import org.neo4j.kernel.impl.api.operations.LegacyIndexReadOperations;
 import org.neo4j.kernel.impl.api.operations.LegacyIndexWriteOperations;
 import org.neo4j.kernel.impl.api.operations.LockOperations;
-import org.neo4j.kernel.impl.api.operations.MetaDataOperations;
+import org.neo4j.kernel.impl.api.operations.QueryRegistrationOperations;
 import org.neo4j.kernel.impl.api.operations.SchemaReadOperations;
 import org.neo4j.kernel.impl.api.operations.SchemaStateOperations;
 import org.neo4j.kernel.impl.api.store.RelationshipIterator;
@@ -96,7 +97,7 @@
 import org.neo4j.storageengine.api.schema.PopulationProgress;
 
 public class DataOperationsFacade
-        implements ReadOperations, DataWriteOperations, SchemaWriteOperations, org.neo4j.kernel.api.MetaDataOperations
+        implements ReadOperations, DataWriteOperations, SchemaWriteOperations, QueryRegistryOperations
 {
     private final KernelTransaction tx;
     private final KernelStatement statement;
@@ -152,9 +153,9 @@ final org.neo4j.kernel.impl.api.operations.SchemaWriteOperations schemaWrite()
         return operations.schemaWriteOperations();
     }
 
-    final MetaDataOperations metaStatementOperations()
+    final QueryRegistrationOperations queryRegistrationOperations()
     {
-        return operations.metaStatementOperations();
+        return operations.queryRegistrationOperations();
     }
 
     final SchemaStateOperations schemaState()
@@ -1444,29 +1445,29 @@ public DoubleLongRegister indexSample( IndexDescriptor index, DoubleLongRegister
     public Stream<ExecutingQuery> executingQueries()
     {
         statement.assertOpen();
-        return metaStatementOperations().executingQueries( statement );
+        return queryRegistrationOperations().executingQueries( statement );
     }
 
     @Override
     public ExecutingQuery startQueryExecution( String queryText, Map<String,Object> queryParameters )
     {
         statement.assertOpen();
-        return metaStatementOperations().startQueryExecution( statement, queryText, queryParameters );
+        return queryRegistrationOperations().startQueryExecution( statement, queryText, queryParameters );
     }
 
     @Override
     public void registerExecutingQuery( ExecutingQuery executingQuery )
     {
         statement.assertOpen();
-        metaStatementOperations().registerExecutingQuery( statement, executingQuery );
+        queryRegistrationOperations().registerExecutingQuery( statement, executingQuery );
     }
 
 
     @Override
     public void unregisterExecutingQuery( ExecutingQuery executingQuery )
     {
         statement.assertOpen();
-        metaStatementOperations().unregisterExecutingQuery( statement, executingQuery );
+        queryRegistrationOperations().unregisterExecutingQuery( statement, executingQuery );
     }
 
     // </Meta>

community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelStatement.java

@@ -25,7 +25,7 @@
 import org.neo4j.graphdb.TransactionTerminatedException;
 import org.neo4j.kernel.api.DataWriteOperations;
 import org.neo4j.kernel.api.ExecutingQuery;
-import org.neo4j.kernel.api.MetaDataOperations;
+import org.neo4j.kernel.api.QueryRegistryOperations;
 import org.neo4j.kernel.api.ReadOperations;
 import org.neo4j.kernel.api.SchemaWriteOperations;
 import org.neo4j.kernel.api.Statement;
@@ -127,7 +127,7 @@ public SchemaWriteOperations schemaWriteOperations()
     }
 
     @Override
-    public MetaDataOperations metaOperations()
+    public QueryRegistryOperations queryRegistration()
     {
         return facade;
     }

community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementationHandle.java

@@ -107,7 +107,7 @@ public boolean isUnderlyingTransaction( KernelTransaction tx )
     public Stream<ExecutingQuery> executingQueries()
     {
         KernelStatement statement = tx.tryAcquireStatement();
-        return statement == null ? Stream.empty() : statement.metaOperations().executingQueries();
+        return statement == null ? Stream.empty() : statement.queryRegistration().executingQueries();
     }
 
     @Override

community/kernel/src/main/java/org/neo4j/kernel/impl/api/StackingMetaDataOperations.java → community/kernel/src/main/java/org/neo4j/kernel/impl/api/StackingQueryRegistrationOperations.java

@@ -23,16 +23,16 @@
 import java.util.stream.Stream;
 
 import org.neo4j.kernel.api.ExecutingQuery;
-import org.neo4j.kernel.impl.api.operations.MetaDataOperations;
+import org.neo4j.kernel.impl.api.operations.QueryRegistrationOperations;
 import org.neo4j.kernel.impl.util.MonotonicCounter;
 
-public class StackingMetaDataOperations implements MetaDataOperations
+public class StackingQueryRegistrationOperations implements QueryRegistrationOperations
 {
     public static final MonotonicCounter LAST_QUERY_ID = MonotonicCounter.newAtomicMonotonicCounter();
 
     private final MonotonicCounter lastQueryId;
 
-    public StackingMetaDataOperations( MonotonicCounter lastQueryId )
+    public StackingQueryRegistrationOperations( MonotonicCounter lastQueryId )
     {
         this.lastQueryId = lastQueryId;
     }

community/kernel/src/main/java/org/neo4j/kernel/impl/api/StatementOperationParts.java

@@ -19,7 +19,7 @@
  */
 package org.neo4j.kernel.impl.api;
 
-import org.neo4j.kernel.impl.api.operations.MetaDataOperations;
+import org.neo4j.kernel.impl.api.operations.QueryRegistrationOperations;
 import org.neo4j.kernel.impl.api.operations.CountsOperations;
 import org.neo4j.kernel.impl.api.operations.EntityReadOperations;
 import org.neo4j.kernel.impl.api.operations.EntityWriteOperations;
@@ -45,7 +45,7 @@ public class StatementOperationParts
     private final CountsOperations countsStatementOperations;
     private final LegacyIndexReadOperations legacyIndexReadOperations;
     private final LegacyIndexWriteOperations legacyIndexWriteOperations;
-    private final MetaDataOperations metaDataOperations;
+    private final QueryRegistrationOperations queryRegistrationOperations;
 
     public StatementOperationParts(
             KeyReadOperations keyReadOperations,
@@ -59,7 +59,7 @@ public StatementOperationParts(
             CountsOperations countsStatementOperations,
             LegacyIndexReadOperations legacyIndexReadOperations,
             LegacyIndexWriteOperations legacyIndexWriteOperations,
-            MetaDataOperations metaDataOperations )
+            QueryRegistrationOperations queryRegistrationOperations )
     {
         this.keyReadOperations = keyReadOperations;
         this.keyWriteOperations = keyWriteOperations;
@@ -72,7 +72,7 @@ public StatementOperationParts(
         this.countsStatementOperations = countsStatementOperations;
         this.legacyIndexReadOperations = legacyIndexReadOperations;
         this.legacyIndexWriteOperations = legacyIndexWriteOperations;
-        this.metaDataOperations = metaDataOperations;
+        this.queryRegistrationOperations = queryRegistrationOperations;
     }
 
     public KeyReadOperations keyReadOperations()
@@ -130,9 +130,9 @@ public CountsOperations counting()
         return checkNotNull( countsStatementOperations, CountsOperations.class );
     }
 
-    public MetaDataOperations metaStatementOperations()
+    public QueryRegistrationOperations queryRegistrationOperations()
     {
-        return checkNotNull( metaDataOperations, MetaDataOperations.class );
+        return checkNotNull( queryRegistrationOperations, QueryRegistrationOperations.class );
     }
 
     public StatementOperationParts override(
@@ -147,7 +147,7 @@ public StatementOperationParts override(
             CountsOperations countsStatementOperations,
             LegacyIndexReadOperations legacyIndexReadOperations,
             LegacyIndexWriteOperations legacyIndexWriteOperations,
-            MetaDataOperations metaDataOperations )
+            QueryRegistrationOperations queryRegistrationOperations )
     {
         return new StatementOperationParts(
             eitherOr( keyReadOperations, this.keyReadOperations, KeyReadOperations.class ),
@@ -161,7 +161,7 @@ public StatementOperationParts override(
             eitherOr( countsStatementOperations, this.countsStatementOperations, CountsOperations.class ),
             eitherOr( legacyIndexReadOperations, this.legacyIndexReadOperations, LegacyIndexReadOperations.class ),
             eitherOr( legacyIndexWriteOperations, this.legacyIndexWriteOperations, LegacyIndexWriteOperations.class ),
-            eitherOr( metaDataOperations, this.metaDataOperations, MetaDataOperations.class ) );
+            eitherOr( queryRegistrationOperations, this.queryRegistrationOperations, QueryRegistrationOperations.class ) );
     }
 
     private <T> T checkNotNull( T object, Class<T> cls )

community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/MetaDataOperations.java → community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/QueryRegistrationOperations.java

@@ -25,7 +25,7 @@
 import org.neo4j.kernel.api.ExecutingQuery;
 import org.neo4j.kernel.impl.api.KernelStatement;
 
-public interface MetaDataOperations
+public interface QueryRegistrationOperations
 {
     Stream<ExecutingQuery> executingQueries( KernelStatement statement );
 

community/kernel/src/main/java/org/neo4j/kernel/impl/query/Neo4jTransactionalContext.java

@@ -26,7 +26,7 @@
 import org.neo4j.kernel.GraphDatabaseQueryService;
 import org.neo4j.kernel.api.ExecutingQuery;
 import org.neo4j.kernel.api.KernelTransaction;
-import org.neo4j.kernel.api.MetaDataOperations;
+import org.neo4j.kernel.api.QueryRegistryOperations;
 import org.neo4j.kernel.api.ReadOperations;
 import org.neo4j.kernel.api.Statement;
 import org.neo4j.kernel.api.dbms.DbmsOperations;
@@ -66,7 +66,7 @@ public Neo4jTransactionalContext(
             initialTransaction.transactionType(),
             initialTransaction.mode(),
             initialStatement,
-            initialStatement.metaOperations().startQueryExecution( queryText, queryParameters ),
+            initialStatement.queryRegistration().startQueryExecution( queryText, queryParameters ),
             locker,
             graph.getDependencyResolver().resolveDependency( ThreadToStatementContextBridge.class ),
             graph.getDependencyResolver().resolveDependency( DbmsOperations.Factory.class )
@@ -114,7 +114,7 @@ public void close( boolean success )
         {
             try
             {
-                statement.metaOperations().unregisterExecutingQuery( executingQuery );
+                statement.queryRegistration().unregisterExecutingQuery( executingQuery );
                 statement.close();
 
                 if ( success )
@@ -139,19 +139,19 @@ public void close( boolean success )
     @Override
     public void commitAndRestartTx()
     {
-        MetaDataOperations oldMetaDataOperations = statement.metaOperations();
+        QueryRegistryOperations oldQueryRegistryOperations = statement.queryRegistration();
         InternalTransaction oldTransaction = transaction;
         KernelTransaction oldKernelTx = txBridge.getKernelTransactionBoundToThisThread( true );
         txBridge.unbindTransactionFromCurrentThread();
 
         transaction = graph.beginTransaction( transactionType, mode );
         statement = txBridge.get();
-        statement.metaOperations().registerExecutingQuery( executingQuery );
+        statement.queryRegistration().registerExecutingQuery( executingQuery );
         KernelTransaction kernelTx = txBridge.getKernelTransactionBoundToThisThread( true );
         txBridge.unbindTransactionFromCurrentThread();
 
         txBridge.bindTransactionToCurrentThread( oldKernelTx );
-        oldMetaDataOperations.unregisterExecutingQuery( executingQuery );
+        oldQueryRegistryOperations.unregisterExecutingQuery( executingQuery );
         oldTransaction.success();
         oldTransaction.close();
 
@@ -163,10 +163,10 @@ public void cleanForReuse()
     {
         // close the old statement reference after the statement has been "upgraded"
         // to either a schema data or a schema statement, so that the locks are "handed over".
-        statement.metaOperations().unregisterExecutingQuery( executingQuery );
+        statement.queryRegistration().unregisterExecutingQuery( executingQuery );
         statement.close();
         statement = txBridge.get();
-        statement.metaOperations().registerExecutingQuery( executingQuery );
+        statement.queryRegistration().registerExecutingQuery( executingQuery );
     }
 
     @Override

community/kernel/src/test/java/org/neo4j/kernel/builtinprocs/AwaitIndexProcedureTest.java

@@ -30,7 +30,7 @@
 
 import org.neo4j.kernel.api.DataWriteOperations;
 import org.neo4j.kernel.api.KernelTransaction;
-import org.neo4j.kernel.api.MetaDataOperations;
+import org.neo4j.kernel.api.QueryRegistryOperations;
 import org.neo4j.kernel.api.ReadOperations;
 import org.neo4j.kernel.api.SchemaWriteOperations;
 import org.neo4j.kernel.api.Statement;
@@ -387,7 +387,7 @@ public SchemaWriteOperations schemaWriteOperations() throws InvalidTransactionTy
         }
 
         @Override
-        public MetaDataOperations metaOperations()
+        public QueryRegistryOperations queryRegistration()
         {
             throw new UnsupportedOperationException( "not implemented" );
         }

community/kernel/src/test/java/org/neo4j/kernel/impl/api/StatementOperationsTestHelper.java

@@ -35,7 +35,7 @@
 import org.neo4j.kernel.impl.api.operations.LegacyIndexReadOperations;
 import org.neo4j.kernel.impl.api.operations.LegacyIndexWriteOperations;
 import org.neo4j.kernel.impl.api.operations.LockOperations;
-import org.neo4j.kernel.impl.api.operations.MetaDataOperations;
+import org.neo4j.kernel.impl.api.operations.QueryRegistrationOperations;
 import org.neo4j.kernel.impl.api.operations.SchemaReadOperations;
 import org.neo4j.kernel.impl.api.operations.SchemaStateOperations;
 import org.neo4j.kernel.impl.api.operations.SchemaWriteOperations;
@@ -63,7 +63,7 @@ public static StatementOperationParts mockedParts()
             mock( CountsOperations.class ),
             mock( LegacyIndexReadOperations.class ),
             mock( LegacyIndexWriteOperations.class ),
-            mock( MetaDataOperations.class ) );
+            mock( QueryRegistrationOperations.class ) );
     }
 
     public static KernelStatement mockedState()