Some cleanup around BoltWorker and a couple of test fixes

neo4j · Mar 2, 2018 · 405e81b · 405e81b
1 parent 77b2ee9
commit 405e81b
Show file tree

Hide file tree

Showing 21 changed files with 47 additions and 1,238 deletions.
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/BoltKernelExtension.java b/community/bolt/src/main/java/org/neo4j/bolt/BoltKernelExtension.java
@@ -45,9 +45,6 @@
 import org.neo4j.bolt.transport.TransportThrottleGroup;
 import org.neo4j.bolt.v1.runtime.BoltFactory;
 import org.neo4j.bolt.v1.runtime.BoltFactoryImpl;
-import org.neo4j.bolt.v1.runtime.MonitoredWorkerFactory;
-import org.neo4j.bolt.v1.runtime.WorkerFactory;
-import org.neo4j.bolt.v1.runtime.concurrent.ThreadedWorkerFactory;
 import org.neo4j.configuration.Description;
 import org.neo4j.configuration.LoadableConfig;
 import org.neo4j.graphdb.GraphDatabaseService;
@@ -138,7 +135,8 @@ public Lifecycle newInstance( KernelContext context, Dependencies dependencies )
         LogService logService = dependencies.logService();
         Clock clock = dependencies.clock();
         SslPolicyLoader sslPolicyFactory = dependencies.sslPolicyFactory();
-        Log log = logService.getInternalLog( WorkerFactory.class );
+        Log log = logService.getInternalLog( BoltKernelExtension.class );
+        Log userLog = logService.getUserLog( BoltKernelExtension.class );
 
         LifeSupport life = new LifeSupport();
 
@@ -163,21 +161,14 @@ public Lifecycle newInstance( KernelContext context, Dependencies dependencies )
         {
             NettyServer server = new NettyServer( scheduler.threadFactory( boltNetworkIO ),
                     createConnectors( config, sslPolicyFactory, logService, log, boltLogging, throttleGroup, handlerFactory ), connectionRegister,
-                    logService.getUserLog( WorkerFactory.class ) );
+                    userLog );
             life.add( server );
             log.info( "Bolt Server extension loaded." );
         }
 
         return life;
     }
 
-    protected WorkerFactory createWorkerFactory( BoltFactory boltFactory, JobScheduler scheduler,
-            Dependencies dependencies, LogService logService, Clock clock )
-    {
-        WorkerFactory threadedWorkerFactory = new ThreadedWorkerFactory( boltFactory, scheduler, logService, clock );
-        return new MonitoredWorkerFactory( dependencies.monitors(), threadedWorkerFactory, clock );
-    }
-
     private BoltConnectionFactory createConnectionFactory( BoltFactory boltFactory, BoltSchedulerProvider schedulerProvider,
             Dependencies dependencies, LogService logService, Clock clock )
     {
@@ -223,8 +214,6 @@ private Map<BoltConnector,ProtocolInitializer> createConnectors( Config config,
                         break;
                     }
 
-                    logService.getUserLog( WorkerFactory.class ).info( "Bolt enabled on %s.", listenAddress );
-
                     return new SocketTransport( connConfig.key(), listenAddress, sslCtx, requireEncryption, logService.getInternalLogProvider(), boltLogging,
                             throttleGroup, handlerFactory );
                 } ) );

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltMessageRouter.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltMessageRouter.java
@@ -24,7 +24,6 @@
 
 import org.neo4j.bolt.logging.BoltMessageLogger;
 import org.neo4j.bolt.runtime.BoltConnection;
-import org.neo4j.bolt.v1.runtime.BoltWorker;
 import org.neo4j.bolt.v1.runtime.Neo4jError;
 import org.neo4j.bolt.v1.runtime.spi.BoltResult;
 import org.neo4j.cypher.result.QueryResult;

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/MessageProcessingHandler.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/MessageProcessingHandler.java
@@ -26,7 +26,6 @@
 import org.neo4j.bolt.runtime.BoltConnection;
 import org.neo4j.bolt.v1.packstream.PackOutputClosedException;
 import org.neo4j.bolt.v1.runtime.BoltResponseHandler;
-import org.neo4j.bolt.v1.runtime.BoltWorker;
 import org.neo4j.bolt.v1.runtime.Neo4jError;
 import org.neo4j.bolt.v1.runtime.spi.BoltResult;
 import org.neo4j.logging.Log;

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/BoltWorker.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/BoltWorker.java
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/BoltWorkerQueueMonitor.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/BoltWorkerQueueMonitor.java
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/MonitoredWorkerFactory.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/MonitoredWorkerFactory.java
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/WorkerFactory.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/WorkerFactory.java