Update thread group nameFormat to %s

presto-cli/src/main/java/com/facebook/presto/cli/TableNameCompleter.java

@@ -42,7 +42,7 @@ public class TableNameCompleter
 {
  private static final long RELOAD_TIME_MINUTES = 2;
 
- private final ExecutorService executor = newCachedThreadPool(daemonThreadsNamed("completer-%d"));
+ private final ExecutorService executor = newCachedThreadPool(daemonThreadsNamed("completer-%s"));
  private final QueryRunner queryRunner;
  private final LoadingCache<String, List<String>> tableCache;
  private final LoadingCache<String, List<String>> functionCache;

presto-main/src/main/java/com/facebook/presto/execution/SqlQueryManager.java

@@ -111,7 +111,7 @@ public SqlQueryManager(
 
  this.executionFactories = checkNotNull(executionFactories, "executionFactories is null");
 
- this.queryExecutor = newCachedThreadPool(threadsNamed("query-scheduler-%d"));
+ this.queryExecutor = newCachedThreadPool(threadsNamed("query-scheduler-%s"));
  this.queryExecutorMBean = new ThreadPoolExecutorMBean((ThreadPoolExecutor) queryExecutor);
 
  checkNotNull(config, "config is null");
@@ -125,7 +125,7 @@ public SqlQueryManager(
  this.maxQueryHistory = config.getMaxQueryHistory();
  this.clientTimeout = config.getClientTimeout();
 
- queryManagementExecutor = Executors.newScheduledThreadPool(config.getQueryManagerExecutorPoolSize(), threadsNamed("query-management-%d"));
+ queryManagementExecutor = Executors.newScheduledThreadPool(config.getQueryManagerExecutorPoolSize(), threadsNamed("query-management-%s"));
  queryManagementExecutorMBean = new ThreadPoolExecutorMBean((ThreadPoolExecutor) queryManagementExecutor);
  queryManagementExecutor.scheduleWithFixedDelay(new Runnable()
  {

presto-main/src/main/java/com/facebook/presto/execution/SqlTaskManager.java

@@ -86,10 +86,10 @@ public SqlTaskManager(
 
  final DataSize maxBufferSize = config.getSinkMaxBufferSize();
 
- taskNotificationExecutor = newCachedThreadPool(threadsNamed("task-notification-%d"));
+ taskNotificationExecutor = newCachedThreadPool(threadsNamed("task-notification-%s"));
  taskNotificationExecutorMBean = new ThreadPoolExecutorMBean((ThreadPoolExecutor) taskNotificationExecutor);
 
- taskManagementExecutor = newScheduledThreadPool(5, threadsNamed("task-management-%d"));
+ taskManagementExecutor = newScheduledThreadPool(5, threadsNamed("task-management-%s"));
  taskManagementExecutorMBean = new ThreadPoolExecutorMBean((ThreadPoolExecutor) taskManagementExecutor);
 
  final SqlTaskExecutionFactory sqlTaskExecutionFactory = new SqlTaskExecutionFactory(taskNotificationExecutor, taskExecutor, planner, queryMonitor, config);

presto-main/src/main/java/com/facebook/presto/execution/TaskExecutor.java

@@ -117,7 +117,7 @@ public TaskExecutor(int runnerThreads, Ticker ticker)
  checkArgument(runnerThreads > 0, "runnerThreads must be at least 1");
 
  // we manages thread pool size directly, so create an unlimited pool
- this.executor = newCachedThreadPool(threadsNamed("task-processor-%d"));
+ this.executor = newCachedThreadPool(threadsNamed("task-processor-%s"));
  this.executorMBean = new ThreadPoolExecutorMBean((ThreadPoolExecutor) executor);
  this.runnerThreads = runnerThreads;
 

presto-main/src/main/java/com/facebook/presto/server/CoordinatorModule.java

@@ -114,7 +114,7 @@ public void configure(Binder binder)
 
  // query execution
  binder.bind(ExecutorService.class).annotatedWith(ForQueryExecution.class)
- .toInstance(newCachedThreadPool(threadsNamed("query-execution-%d")));
+ .toInstance(newCachedThreadPool(threadsNamed("query-execution-%s")));
  binder.bind(QueryExecutionMBean.class).in(Scopes.SINGLETON);
  newExporter(binder).export(QueryExecutionMBean.class).as(generatedNameOf(QueryExecution.class));
 

presto-main/src/main/java/com/facebook/presto/server/HttpRemoteTaskFactory.java

@@ -69,7 +69,7 @@ public HttpRemoteTaskFactory(QueryManagerConfig config,
  this.taskUpdateRequestCodec = taskUpdateRequestCodec;
  this.maxConsecutiveErrorCount = config.getRemoteTaskMaxConsecutiveErrorCount();
  this.minErrorDuration = config.getRemoteTaskMinErrorDuration();
- ExecutorService coreExecutor = newCachedThreadPool(daemonThreadsNamed("remote-task-callback-%d"));
+ ExecutorService coreExecutor = newCachedThreadPool(daemonThreadsNamed("remote-task-callback-%s"));
  this.executor = ExecutorServiceAdapter.from(new BoundedExecutor(coreExecutor, config.getRemoteTaskMaxCallbackThreads()));
  this.executorMBean = new ThreadPoolExecutorMBean((ThreadPoolExecutor) coreExecutor);
  }

presto-main/src/test/java/com/facebook/presto/execution/TaskExecutorSimulator.java

@@ -68,7 +68,7 @@ public static void main(String[] args)
 
  public TaskExecutorSimulator()
  {
- executor = listeningDecorator(newCachedThreadPool(threadsNamed(getClass().getSimpleName() + "-%d")));
+ executor = listeningDecorator(newCachedThreadPool(threadsNamed(getClass().getSimpleName() + "-%s")));
 
  taskExecutor = new TaskExecutor(24, new Ticker()
  {

presto-main/src/test/java/com/facebook/presto/execution/TestNodeScheduler.java

@@ -75,7 +75,7 @@ public void setUp()
  // contents of taskMap indicate the node-task map for the current stage
  taskMap = new HashMap<>();
  nodeSelector = nodeScheduler.createNodeSelector("foo");
- remoteTaskExecutor = Executors.newCachedThreadPool(daemonThreadsNamed("remoteTaskExecutor"));
+ remoteTaskExecutor = Executors.newCachedThreadPool(daemonThreadsNamed("remoteTaskExecutor-%s"));
  }
 
  @AfterMethod

presto-main/src/test/java/com/facebook/presto/execution/TestSqlStageExecution.java

@@ -197,9 +197,9 @@ public void testSplitAssignmentBatchSizeGreaterThanMaxPending()
 
  private SqlStageExecution createSqlStageExecution(NodeScheduler nodeScheduler, int splitBatchSize, StageExecutionPlan tableScanPlan)
  {
- ExecutorService remoteTaskExecutor = newCachedThreadPool(daemonThreadsNamed("remoteTaskExecutor"));
+ ExecutorService remoteTaskExecutor = newCachedThreadPool(daemonThreadsNamed("remoteTaskExecutor-%s"));
  MockRemoteTaskFactory remoteTaskFactory = new MockRemoteTaskFactory(remoteTaskExecutor);
- ExecutorService executor = newCachedThreadPool(daemonThreadsNamed("stageExecutor"));
+ ExecutorService executor = newCachedThreadPool(daemonThreadsNamed("stageExecutor-%s"));
 
  OutputBuffers outputBuffers = INITIAL_EMPTY_OUTPUT_BUFFERS
  .withBuffer(OUT, new UnpartitionedPagePartitionFunction())
@@ -222,7 +222,7 @@ private SqlStageExecution createSqlStageExecution(NodeScheduler nodeScheduler, i
  public void testYieldCausesFullSchedule()
  throws Exception
  {
- ExecutorService executor = newCachedThreadPool(daemonThreadsNamed("test"));
+ ExecutorService executor = newCachedThreadPool(daemonThreadsNamed("test-%s"));
  SqlStageExecution stageExecution = null;
  try {
  StageExecutionPlan joinPlan = createJoinPlan("A");

presto-main/src/test/java/com/facebook/presto/execution/TestSqlTask.java

@@ -73,7 +73,7 @@ public TestSqlTask()
  taskExecutor = new TaskExecutor(8);
  taskExecutor.start();
 
- taskNotificationExecutor = newScheduledThreadPool(5, threadsNamed("task-notification-%d"));
+ taskNotificationExecutor = newScheduledThreadPool(5, threadsNamed("task-notification-%s"));
 
  LocalExecutionPlanner planner = createTestingPlanner();
 

presto-main/src/test/java/com/facebook/presto/operator/TestAggregationOperator.java

@@ -56,7 +56,7 @@ public class TestAggregationOperator
  @BeforeMethod
  public void setUp()
  {
- executor = newCachedThreadPool(daemonThreadsNamed("test"));
+ executor = newCachedThreadPool(daemonThreadsNamed("test-%s"));
 
  driverContext = new TaskContext(new TaskId("query", "stage", "task"), executor, TEST_SESSION)
  .addPipelineContext(true, true)

presto-main/src/test/java/com/facebook/presto/operator/TestDistinctLimitOperator.java

@@ -43,7 +43,7 @@ public class TestDistinctLimitOperator
  @BeforeMethod
  public void setUp()
  {
- executor = newCachedThreadPool(daemonThreadsNamed("test"));
+ executor = newCachedThreadPool(daemonThreadsNamed("test-%s"));
  driverContext = new TaskContext(new TaskId("query", "stage", "task"), executor, TEST_SESSION)
  .addPipelineContext(true, true)
  .addDriverContext();

presto-main/src/test/java/com/facebook/presto/operator/TestDriver.java

@@ -69,7 +69,7 @@ public class TestDriver
  public void setUp()
  throws Exception
  {
- executor = newCachedThreadPool(daemonThreadsNamed("test"));
+ executor = newCachedThreadPool(daemonThreadsNamed("test-%s"));
 
  driverContext = new TaskContext(new TaskId("query", "stage", "task"), executor, TEST_SESSION)
  .addPipelineContext(true, true)

presto-main/src/test/java/com/facebook/presto/operator/TestFilterAndProjectOperator.java

@@ -46,7 +46,7 @@ public class TestFilterAndProjectOperator
  @BeforeMethod
  public void setUp()
  {
- executor = newCachedThreadPool(daemonThreadsNamed("test"));
+ executor = newCachedThreadPool(daemonThreadsNamed("test-%s"));
 
  driverContext = new TaskContext(new TaskId("query", "stage", "task"), executor, TEST_SESSION)
  .addPipelineContext(true, true)

presto-main/src/test/java/com/facebook/presto/operator/TestHashAggregationOperator.java

@@ -79,7 +79,7 @@ public class TestHashAggregationOperator
  @BeforeMethod
  public void setUp()
  {
- executor = newCachedThreadPool(daemonThreadsNamed("test"));
+ executor = newCachedThreadPool(daemonThreadsNamed("test-%s"));
 
  driverContext = new TaskContext(new TaskId("query", "stage", "task"), executor, TEST_SESSION)
  .addPipelineContext(true, true)

presto-main/src/test/java/com/facebook/presto/operator/TestHashJoinOperator.java

@@ -50,7 +50,7 @@ public class TestHashJoinOperator
  @BeforeMethod
  public void setUp()
  {
- executor = newCachedThreadPool(daemonThreadsNamed("test"));
+ executor = newCachedThreadPool(daemonThreadsNamed("test-%s"));
  taskContext = new TaskContext(new TaskId("query", "stage", "task"), executor, TEST_SESSION);
  }
 

presto-main/src/test/java/com/facebook/presto/operator/TestHashSemiJoinOperator.java

@@ -51,7 +51,7 @@ public class TestHashSemiJoinOperator
  @BeforeMethod
  public void setUp()
  {
- executor = newCachedThreadPool(daemonThreadsNamed("test"));
+ executor = newCachedThreadPool(daemonThreadsNamed("test-%s"));
  taskContext = new TaskContext(new TaskId("query", "stage", "task"), executor, TEST_SESSION);
  }
 

presto-main/src/test/java/com/facebook/presto/operator/TestLimitOperator.java

@@ -39,7 +39,7 @@ public class TestLimitOperator
  @BeforeMethod
  public void setUp()
  {
- executor = newCachedThreadPool(daemonThreadsNamed("test"));
+ executor = newCachedThreadPool(daemonThreadsNamed("test-%s"));
  driverContext = new TaskContext(new TaskId("query", "stage", "task"), executor, TEST_SESSION)
  .addPipelineContext(true, true)
  .addDriverContext();

presto-main/src/test/java/com/facebook/presto/operator/TestMarkDistinctOperator.java

@@ -46,7 +46,7 @@ public class TestMarkDistinctOperator
  @BeforeMethod
  public void setUp()
  {
- executor = newCachedThreadPool(daemonThreadsNamed("test"));
+ executor = newCachedThreadPool(daemonThreadsNamed("test-%s"));
  driverContext = new TaskContext(new TaskId("query", "stage", "task"), executor, TEST_SESSION)
  .addPipelineContext(true, true)
  .addDriverContext();

presto-main/src/test/java/com/facebook/presto/operator/TestOrderByOperator.java

@@ -50,7 +50,7 @@ public class TestOrderByOperator
  @BeforeMethod
  public void setUp()
  {
- executor = newCachedThreadPool(daemonThreadsNamed("test"));
+ executor = newCachedThreadPool(daemonThreadsNamed("test-%s"));
  driverContext = new TaskContext(new TaskId("query", "stage", "task"), executor, TEST_SESSION)
  .addPipelineContext(true, true)
  .addDriverContext();

presto-main/src/test/java/com/facebook/presto/operator/TestRecordProjectOperator.java

@@ -46,7 +46,7 @@ public class TestRecordProjectOperator
  @BeforeMethod
  public void setUp()
  {
- executor = newCachedThreadPool(daemonThreadsNamed("test"));
+ executor = newCachedThreadPool(daemonThreadsNamed("test-%s"));
  driverContext = new TaskContext(new TaskId("query", "stage", "task"), executor, TEST_SESSION)
  .addPipelineContext(true, true)
  .addDriverContext();

presto-main/src/test/java/com/facebook/presto/operator/TestRowNumberOperator.java

@@ -57,7 +57,7 @@ public class TestRowNumberOperator
  @BeforeClass
  public void setUp()
  {
- executor = newCachedThreadPool(daemonThreadsNamed("test"));
+ executor = newCachedThreadPool(daemonThreadsNamed("test-%s"));
  }
 
  @AfterClass

presto-main/src/test/java/com/facebook/presto/operator/TestScanFilterAndProjectOperator.java

@@ -48,7 +48,7 @@ public class TestScanFilterAndProjectOperator
 
  public TestScanFilterAndProjectOperator()
  {
- executor = newCachedThreadPool(daemonThreadsNamed("test"));
+ executor = newCachedThreadPool(daemonThreadsNamed("test-%s"));
  }
 
  @Test

presto-main/src/test/java/com/facebook/presto/operator/TestTopNOperator.java

@@ -47,7 +47,7 @@ public class TestTopNOperator
  @BeforeMethod
  public void setUp()
  {
- executor = newCachedThreadPool(daemonThreadsNamed("test"));
+ executor = newCachedThreadPool(daemonThreadsNamed("test-%s"));
  driverContext = new TaskContext(new TaskId("query", "stage", "task"), executor, TEST_SESSION)
  .addPipelineContext(true, true)
  .addDriverContext();

presto-main/src/test/java/com/facebook/presto/operator/TestTopNRowNumberOperator.java

@@ -49,7 +49,7 @@ public class TestTopNRowNumberOperator
  @BeforeMethod
  public void setUp()
  {
- executor = newCachedThreadPool(daemonThreadsNamed("test"));
+ executor = newCachedThreadPool(daemonThreadsNamed("test-%s"));
  driverContext = new TaskContext(new TaskId("query", "stage", "task"), executor, TEST_SESSION)
  .addPipelineContext(true, true)
  .addDriverContext();

presto-main/src/test/java/com/facebook/presto/operator/TestUnnestOperator.java

@@ -48,7 +48,7 @@ public class TestUnnestOperator
  @BeforeMethod
  public void setUp()
  {
- executor = newCachedThreadPool(daemonThreadsNamed("test"));
+ executor = newCachedThreadPool(daemonThreadsNamed("test-%s"));
 
  driverContext = new TaskContext(new TaskId("query", "stage", "task"), executor, TEST_SESSION)
  .addPipelineContext(true, true)

presto-main/src/test/java/com/facebook/presto/operator/TestWindowOperator.java

@@ -87,7 +87,7 @@ public class TestWindowOperator
  @BeforeMethod
  public void setUp()
  {
- executor = newCachedThreadPool(daemonThreadsNamed("test"));
+ executor = newCachedThreadPool(daemonThreadsNamed("test-%s"));
  driverContext = new TaskContext(new TaskId("query", "stage", "task"), executor, TEST_SESSION)
  .addPipelineContext(true, true)
  .addDriverContext();

presto-main/src/test/java/com/facebook/presto/server/MockTaskManager.java

@@ -61,7 +61,7 @@
 public class MockTaskManager
  implements TaskManager
 {
- private final ScheduledExecutorService stateNotificationExecutor = newScheduledThreadPool(5, daemonThreadsNamed("test-%d"));
+ private final ScheduledExecutorService stateNotificationExecutor = newScheduledThreadPool(5, daemonThreadsNamed("test-%s"));
 
  private final HttpServerInfo httpServerInfo;
  private final DataSize maxBufferSize;

presto-main/src/test/java/com/facebook/presto/sql/gen/TestExpressionCompiler.java

@@ -121,7 +121,7 @@ public void setupClass()
  {
  Logging.initialize();
  if (PARALLEL) {
- executor = listeningDecorator(newFixedThreadPool(getRuntime().availableProcessors() * 2, daemonThreadsNamed("completer-%d")));
+ executor = listeningDecorator(newFixedThreadPool(getRuntime().availableProcessors() * 2, daemonThreadsNamed("completer-%s")));
  }
  else {
  executor = listeningDecorator(sameThreadExecutor());

presto-main/src/test/java/com/facebook/presto/sql/gen/TestJoinProbeCompiler.java

@@ -61,7 +61,7 @@ public class TestJoinProbeCompiler
  @BeforeMethod
  public void setUp()
  {
- executor = newCachedThreadPool(daemonThreadsNamed("test"));
+ executor = newCachedThreadPool(daemonThreadsNamed("test-%s"));
  taskContext = new TaskContext(new TaskId("query", "stage", "task"), executor, TEST_SESSION);
  }
 

presto-ml/src/main/java/com/facebook/presto/ml/AbstractSvmModel.java

@@ -79,7 +79,7 @@ public void train(Dataset dataset)
 
  svm_problem problem = toSvmProblem(dataset);
 
- ExecutorService service = newCachedThreadPool(threadsNamed("libsvm-trainer-" + System.identityHashCode(this) + "-%d"));
+ ExecutorService service = newCachedThreadPool(threadsNamed("libsvm-trainer-" + System.identityHashCode(this) + "-%s"));
  try {
  TimeLimiter limiter = new SimpleTimeLimiter(service);
  //TODO: this time limit should be configurable