opendev/gerrit
Code Issues Proposed changes

Make @IndexExecutor a non-scheduled executor

Browse Source 
The scheduling functionality is not required and prevents us from
substituting in a sameThreadExecutor for tests.

Change-Id: I9fb7c93320199e92a193131057f376b03af03d26
This commit is contained in:
Dave Borowitz
2013-10-08 16:03:31 -07:00
parent 398cf16244
commit bb5a30f8a5
6 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gerrit-server/src/main/java/com/google/gerrit/server/index/IndexModule.java
View File

@@ -14,7 +14,7 @@
package com.google.gerrit.server.index;
import com.google.common.util.concurrent.ListeningScheduledExecutorService;
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.gerrit.lifecycle.LifecycleModule;
import com.google.gerrit.server.config.GerritServerConfig;
@@ -49,14 +49,14 @@ public class IndexModule extends LifecycleModule {
}
private final int threads;
private final ListeningScheduledExecutorService indexExecutor;
private final ListeningExecutorService indexExecutor;
public IndexModule(int threads) {
this.threads = threads;
this.indexExecutor = null;
}
public IndexModule(ListeningScheduledExecutorService indexExecutor) {
public IndexModule(ListeningExecutorService indexExecutor) {
this.threads = -1;
this.indexExecutor = indexExecutor;
}
@@ -72,7 +72,7 @@ public class IndexModule extends LifecycleModule {
.build(ChangeIndexer.Factory.class));
if (indexExecutor != null) {
bind(ListeningScheduledExecutorService.class)
bind(ListeningExecutorService.class)
.annotatedWith(IndexExecutor.class)
.toInstance(indexExecutor);
} else {
@@ -101,7 +101,7 @@ public class IndexModule extends LifecycleModule {
@Provides
@Singleton
@IndexExecutor
ListeningScheduledExecutorService getIndexExecutor(
ListeningExecutorService getIndexExecutor(
@GerritServerConfig Config config,
WorkQueue workQueue) {
int threads = this.threads;