Make DeephavenSessionTestBase use NoLanguageDeephavenSession (#2811)

deephaven · Sep 7, 2022 · 424f20a · 424f20a
1 parent d0cba48
commit 424f20a
Show file tree

Hide file tree

Showing 21 changed files with 145 additions and 16 deletions.
diff --git a/engine/context/src/main/java/io/deephaven/engine/context/QueryLibrary.java b/engine/context/src/main/java/io/deephaven/engine/context/QueryLibrary.java
@@ -108,4 +108,8 @@ public Collection<String> getImportStrings() {
     public void updateVersionString() {
         versionString = UuidCreator.toString(UuidCreator.getRandomBased());
     }
+
+    public void updateVersionString(String version) {
+        versionString = version;
+    }
 }
diff --git a/py/embedded-server/java-runtime/src/main/java/io/deephaven/python/server/EmbeddedServer.java b/py/embedded-server/java-runtime/src/main/java/io/deephaven/python/server/EmbeddedServer.java
@@ -11,6 +11,7 @@
 import io.deephaven.io.log.LogLevel;
 import io.deephaven.io.logger.LogBuffer;
 import io.deephaven.io.logger.LogBufferOutputStream;
+import io.deephaven.server.console.SessionToExecutionStateModule;
 import io.deephaven.server.console.groovy.GroovyConsoleSessionModule;
 import io.deephaven.server.console.python.PythonConsoleSessionModule;
 import io.deephaven.server.console.python.PythonGlobalScopeModule;
@@ -48,6 +49,7 @@ public class EmbeddedServer {
             JettyServerModule.class,
             PythonConsoleSessionModule.class,
             GroovyConsoleSessionModule.class,
+            SessionToExecutionStateModule.class,
     })
     public interface PythonServerComponent extends DeephavenApiServerComponent {
         @Component.Builder

diff --git a/server/jetty/build.gradle b/server/jetty/build.gradle
@@ -36,6 +36,7 @@ dependencies {
     implementation project(':grpc-java:grpc-mtls')
 
     testImplementation project(':server-test')
+    testImplementation TestTools.projectDependency(project, ':server')
 
     testRuntimeOnly project(':log-to-slf4j')
     Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')

diff --git a/server/jetty/src/main/java/io/deephaven/server/jetty/JettyServerComponent.java b/server/jetty/src/main/java/io/deephaven/server/jetty/JettyServerComponent.java
@@ -5,6 +5,7 @@
 
 import dagger.BindsInstance;
 import dagger.Component;
+import io.deephaven.server.console.SessionToExecutionStateModule;
 import io.deephaven.server.console.groovy.GroovyConsoleSessionModule;
 import io.deephaven.server.console.python.PythonConsoleSessionModule;
 import io.deephaven.server.console.python.PythonGlobalScopeCopyModule;
@@ -28,6 +29,7 @@
         JettyServerModule.class,
         PythonConsoleSessionModule.class,
         GroovyConsoleSessionModule.class,
+        SessionToExecutionStateModule.class,
 })
 public interface JettyServerComponent extends DeephavenApiServerComponent {
     @Component.Builder

diff --git a/server/jetty/src/test/java/io/deephaven/server/jetty/JettyFlightRoundTripTest.java b/server/jetty/src/test/java/io/deephaven/server/jetty/JettyFlightRoundTripTest.java
@@ -7,6 +7,7 @@
 import dagger.Module;
 import dagger.Provides;
 import io.deephaven.server.arrow.ArrowModule;
+import io.deephaven.server.runner.ExecutionContextUnitTestModule;
 import io.deephaven.server.session.SessionModule;
 import io.deephaven.server.test.AuthTestModule;
 import io.deephaven.server.test.FlightMessageRoundTripTest;
@@ -30,7 +31,8 @@ static JettyConfig providesJettyConfig() {
             SessionModule.class,
             AuthTestModule.class,
             JettyServerModule.class,
-            JettyTestConfig.class
+            JettyTestConfig.class,
+            ExecutionContextUnitTestModule.class,
     })
     public interface JettyTestComponent extends TestComponent {
     }

diff --git a/server/netty/build.gradle b/server/netty/build.gradle
@@ -23,6 +23,7 @@ dependencies {
     implementation project(':grpc-java:grpc-mtls')
 
     testImplementation project(':server-test')
+    testImplementation TestTools.projectDependency(project, ':server')
 
     testRuntimeOnly project(':log-to-slf4j')
     Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')

diff --git a/server/netty/src/main/java/io/deephaven/server/netty/NettyServerComponent.java b/server/netty/src/main/java/io/deephaven/server/netty/NettyServerComponent.java
@@ -5,6 +5,7 @@
 
 import dagger.BindsInstance;
 import dagger.Component;
+import io.deephaven.server.console.SessionToExecutionStateModule;
 import io.deephaven.server.console.groovy.GroovyConsoleSessionModule;
 import io.deephaven.server.console.python.PythonConsoleSessionModule;
 import io.deephaven.server.console.python.PythonGlobalScopeCopyModule;
@@ -28,6 +29,7 @@
         NettyServerModule.class,
         PythonConsoleSessionModule.class,
         GroovyConsoleSessionModule.class,
+        SessionToExecutionStateModule.class,
 })
 public interface NettyServerComponent extends DeephavenApiServerComponent {
     @Component.Builder

diff --git a/server/netty/src/test/java/io/deephaven/server/netty/NettyFlightRoundTripTest.java b/server/netty/src/test/java/io/deephaven/server/netty/NettyFlightRoundTripTest.java
@@ -7,6 +7,7 @@
 import dagger.Module;
 import dagger.Provides;
 import io.deephaven.server.arrow.ArrowModule;
+import io.deephaven.server.runner.ExecutionContextUnitTestModule;
 import io.deephaven.server.session.SessionModule;
 import io.deephaven.server.test.AuthTestModule;
 import io.deephaven.server.test.FlightMessageRoundTripTest;
@@ -30,7 +31,8 @@ static NettyConfig providesNettyConfig() {
             SessionModule.class,
             AuthTestModule.class,
             NettyServerModule.class,
-            NettyTestConfig.class
+            NettyTestConfig.class,
+            ExecutionContextUnitTestModule.class,
     })
     public interface NettyTestComponent extends TestComponent {
     }

diff --git a/server/src/main/java/io/deephaven/server/console/NoConsoleSessionModule.java b/server/src/main/java/io/deephaven/server/console/NoConsoleSessionModule.java
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2016-2022 Deephaven Data Labs and Patent Pending
+ */
+package io.deephaven.server.console;
+
+import dagger.Module;
+import dagger.Provides;
+import dagger.multibindings.IntoMap;
+import dagger.multibindings.StringKey;
+import io.deephaven.engine.util.NoLanguageDeephavenSession;
+import io.deephaven.engine.util.ScriptSession;
+import io.deephaven.server.console.groovy.InitScriptsModule;
+
+@Module(includes = InitScriptsModule.ServiceLoader.class)
+public class NoConsoleSessionModule {
+    @Provides
+    @IntoMap
+    @StringKey("none")
+    ScriptSession bindScriptSession(NoLanguageDeephavenSession noLanguageSession) {
+        return noLanguageSession;
+    }
+
+    @Provides
+    NoLanguageDeephavenSession bindNoLanguageSession() {
+        return new NoLanguageDeephavenSession();
+    }
+}
diff --git a/server/src/main/java/io/deephaven/server/console/SessionToExecutionStateModule.java b/server/src/main/java/io/deephaven/server/console/SessionToExecutionStateModule.java
@@ -0,0 +1,14 @@
+package io.deephaven.server.console;
+
+import dagger.Module;
+import dagger.Provides;
+import io.deephaven.engine.context.ExecutionContext;
+import io.deephaven.engine.util.ScriptSession;
+
+@Module
+public class SessionToExecutionStateModule {
+    @Provides
+    ExecutionContext bindExecutionContext(ScriptSession session) {
+        return session.getExecutionContext();
+    }
+}
diff --git a/server/src/main/java/io/deephaven/server/runner/DeephavenApiServer.java b/server/src/main/java/io/deephaven/server/runner/DeephavenApiServer.java
@@ -5,6 +5,7 @@
 
 import io.deephaven.auth.AuthenticationRequestHandler;
 import io.deephaven.configuration.Configuration;
+import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.table.impl.perf.QueryPerformanceRecorder;
 import io.deephaven.engine.table.impl.perf.UpdatePerformanceTracker;
 import io.deephaven.engine.table.impl.util.MemoryTableLoggers;
@@ -51,6 +52,7 @@ public class DeephavenApiServer {
     private final UriResolvers uriResolvers;
     private final SessionService sessionService;
     private final Map<String, AuthenticationRequestHandler> authenticationHandlers;
+    private final Provider<ExecutionContext> executionContextProvider;
 
     @Inject
     public DeephavenApiServer(
@@ -62,7 +64,8 @@ public DeephavenApiServer(
             final ApplicationInjector applicationInjector,
             final UriResolvers uriResolvers,
             final SessionService sessionService,
-            final Map<String, AuthenticationRequestHandler> authenticationHandlers) {
+            final Map<String, AuthenticationRequestHandler> authenticationHandlers,
+            final Provider<ExecutionContext> executionContextProvider) {
         this.server = server;
         this.ugp = ugp;
         this.logInit = logInit;
@@ -72,6 +75,7 @@ public DeephavenApiServer(
         this.uriResolvers = uriResolvers;
         this.sessionService = sessionService;
         this.authenticationHandlers = authenticationHandlers;
+        this.executionContextProvider = executionContextProvider;
     }
 
     @VisibleForTesting
@@ -162,6 +166,8 @@ public void join() throws InterruptedException {
     void startForUnitTests() throws Exception {
         pluginRegistration.registerAll();
         applicationInjector.run();
+        executionContextProvider.get().getQueryLibrary().updateVersionString("DEFAULT");
+
         log.info().append("Starting server...").endl();
         server.start();
     }

diff --git a/.../src/main/java/io/deephaven/server/runner/DeephavenApiServerInProcessGroovyComponent.java b/.../src/main/java/io/deephaven/server/runner/DeephavenApiServerInProcessGroovyComponent.java
@@ -5,6 +5,7 @@
 
 import dagger.BindsInstance;
 import dagger.Component;
+import io.deephaven.server.console.SessionToExecutionStateModule;
 import io.deephaven.server.console.groovy.GroovyConsoleSessionModule;
 import io.deephaven.server.log.LogModule;
 import io.grpc.ManagedChannelBuilder;
@@ -18,7 +19,8 @@
         DeephavenApiServerModule.class,
         LogModule.class,
         GroovyConsoleSessionModule.class,
-        ServerBuilderInProcessModule.class
+        ServerBuilderInProcessModule.class,
+        SessionToExecutionStateModule.class,
 })
 public interface DeephavenApiServerInProcessGroovyComponent {
 

diff --git a/.../src/main/java/io/deephaven/server/runner/DeephavenApiServerInProcessPythonComponent.java b/.../src/main/java/io/deephaven/server/runner/DeephavenApiServerInProcessPythonComponent.java
@@ -5,6 +5,7 @@
 
 import dagger.BindsInstance;
 import dagger.Component;
+import io.deephaven.server.console.SessionToExecutionStateModule;
 import io.deephaven.server.console.python.PythonConsoleSessionModule;
 import io.deephaven.server.console.python.PythonGlobalScopeCopyModule;
 import io.deephaven.server.log.LogModule;
@@ -20,7 +21,8 @@
         LogModule.class,
         PythonConsoleSessionModule.class,
         PythonGlobalScopeCopyModule.class,
-        ServerBuilderInProcessModule.class
+        ServerBuilderInProcessModule.class,
+        SessionToExecutionStateModule.class,
 })
 public interface DeephavenApiServerInProcessPythonComponent {
 

diff --git a/server/src/main/java/io/deephaven/server/session/SessionState.java b/server/src/main/java/io/deephaven/server/session/SessionState.java
@@ -136,13 +136,13 @@ public static <T> ExportObject<T> wrapAsExport(final T export) {
 
     @AssistedInject
     public SessionState(final Scheduler scheduler,
-            final Provider<ScriptSession> scriptSessionProvider,
+            final Provider<ExecutionContext> executionContextProvider,
             @Assisted final AuthContext authContext) {
         this.sessionId = UuidCreator.toString(UuidCreator.getRandomBased());
         this.logPrefix = "SessionState{" + sessionId + "}: ";
         this.scheduler = scheduler;
         this.authContext = authContext;
-        this.executionContext = scriptSessionProvider.get().getExecutionContext();
+        this.executionContext = executionContextProvider.get();
         log.info().append(logPrefix).append("session initialized").endl();
     }
 

diff --git a/server/src/test/java/io/deephaven/server/appmode/ApplicationServiceGrpcImplTest.java b/server/src/test/java/io/deephaven/server/appmode/ApplicationServiceGrpcImplTest.java
@@ -3,6 +3,7 @@
  */
 package io.deephaven.server.appmode;
 
+import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.liveness.LivenessScopeStack;
 import io.deephaven.engine.util.NoLanguageDeephavenSession;
 import io.deephaven.engine.util.ScriptSession;
@@ -42,7 +43,7 @@ public void setup() {
         livenessScope = LivenessScopeStack.open();
         scheduler = new TestControlledScheduler();
         sessionService = new SessionService(scheduler,
-                authContext -> new SessionState(scheduler, NoLanguageDeephavenSession::new, authContext),
+                authContext -> new SessionState(scheduler, ExecutionContext::createForUnitTests, authContext),
                 TOKEN_EXPIRE_MS, Optional.empty(), Collections.emptyMap());
         applicationServiceGrpcImpl = new ApplicationServiceGrpcImpl(scheduler, sessionService,
                 new TypeLookup(ObjectTypeLookup.NoOp.INSTANCE));

diff --git a/server/src/test/java/io/deephaven/server/runner/DeephavenApiServerTestBase.java b/server/src/test/java/io/deephaven/server/runner/DeephavenApiServerTestBase.java
@@ -3,12 +3,17 @@
  */
 package io.deephaven.server.runner;
 
+import dagger.BindsInstance;
+import dagger.Component;
+import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.updategraph.UpdateGraphProcessor;
 import io.deephaven.engine.liveness.LivenessScope;
 import io.deephaven.engine.liveness.LivenessScopeStack;
 import io.deephaven.io.logger.LogBuffer;
 import io.deephaven.io.logger.LogBufferGlobal;
 import io.deephaven.proto.DeephavenChannel;
+import io.deephaven.server.console.NoConsoleSessionModule;
+import io.deephaven.server.log.LogModule;
 import io.deephaven.util.SafeCloseable;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
@@ -17,17 +22,52 @@
 import org.junit.Before;
 import org.junit.Rule;
 
+import javax.inject.Named;
+import javax.inject.Singleton;
+import java.io.PrintStream;
 import java.util.concurrent.TimeUnit;
 
 /**
  * Manages a single instance of {@link DeephavenApiServer}.
  */
 public abstract class DeephavenApiServerTestBase {
+    @Singleton
+    @Component(modules = {
+            DeephavenApiServerModule.class,
+            LogModule.class,
+            NoConsoleSessionModule.class,
+            ServerBuilderInProcessModule.class,
+            ExecutionContextUnitTestModule.class,
+    })
+    public interface TestComponent {
+
+        DeephavenApiServer getServer();
+
+        ManagedChannelBuilder<?> channelBuilder();
+
+        @Component.Builder
+        interface Builder {
+
+            @BindsInstance
+            Builder withSchedulerPoolSize(@Named("scheduler.poolSize") int numThreads);
+
+            @BindsInstance
+            Builder withSessionTokenExpireTmMs(@Named("session.tokenExpireMs") long tokenExpireMs);
+
+            @BindsInstance
+            Builder withOut(@Named("out") PrintStream out);
+
+            @BindsInstance
+            Builder withErr(@Named("err") PrintStream err);
+
+            TestComponent build();
+        }
+    }
 
     @Rule
     public final GrpcCleanupRule grpcCleanup = new GrpcCleanupRule();
 
-    private DeephavenApiServerInProcessGroovyComponent serverComponent;
+    private TestComponent serverComponent;
     private LogBuffer logBuffer;
     private DeephavenApiServer server;
     private SafeCloseable scopeCloseable;
@@ -40,8 +80,7 @@ public void setUp() throws Exception {
         logBuffer = new LogBuffer(128);
         LogBufferGlobal.setInstance(logBuffer);
 
-        serverComponent = DaggerDeephavenApiServerInProcessGroovyComponent
-                .builder()
+        serverComponent = DaggerDeephavenApiServerTestBase_TestComponent.builder()
                 .withSchedulerPoolSize(4)
                 .withSessionTokenExpireTmMs(sessionTokenExpireTmMs())
                 .withOut(System.out)

diff --git a/server/src/test/java/io/deephaven/server/runner/ExecutionContextUnitTestModule.java b/server/src/test/java/io/deephaven/server/runner/ExecutionContextUnitTestModule.java
@@ -0,0 +1,16 @@
+package io.deephaven.server.runner;
+
+import dagger.Module;
+import dagger.Provides;
+import io.deephaven.engine.context.ExecutionContext;
+
+import javax.inject.Singleton;
+
+@Module
+public class ExecutionContextUnitTestModule {
+    @Provides
+    @Singleton
+    public ExecutionContext provideExecutionContext() {
+        return ExecutionContext.createForUnitTests();
+    }
+}
diff --git a/server/src/test/java/io/deephaven/server/session/SessionServiceTest.java b/server/src/test/java/io/deephaven/server/session/SessionServiceTest.java
@@ -4,6 +4,7 @@
 package io.deephaven.server.session;
 
 import io.deephaven.base.verify.Assert;
+import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.liveness.LivenessScopeStack;
 import io.deephaven.engine.util.NoLanguageDeephavenSession;
 import io.deephaven.server.util.TestControlledScheduler;
@@ -30,7 +31,7 @@ public void setup() {
         livenessScope = LivenessScopeStack.open();
         scheduler = new TestControlledScheduler();
         sessionService = new SessionService(scheduler,
-                authContext -> new SessionState(scheduler, NoLanguageDeephavenSession::new, authContext),
+                authContext -> new SessionState(scheduler, ExecutionContext::createForUnitTests, authContext),
                 TOKEN_EXPIRE_MS, Optional.empty(), Collections.emptyMap());
     }