Skip to content

Commit 47b5e74

Browse files
committed
Defunct task.statistics-cpu-timer-enabled flag
CPU time tracking for statistics collection on write has been on by default for a long time and there is no reason why we would want to disable it
1 parent ed1b468 commit 47b5e74

File tree

5 files changed

+3
-31
lines changed

5 files changed

+3
-31
lines changed

core/trino-main/src/main/java/io/trino/SystemSessionProperties.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ public final class SystemSessionProperties
127127
public static final String PREFER_PARTIAL_AGGREGATION = "prefer_partial_aggregation";
128128
public static final String OPTIMIZE_TOP_N_RANKING = "optimize_top_n_ranking";
129129
public static final String MAX_GROUPING_SETS = "max_grouping_sets";
130-
public static final String STATISTICS_CPU_TIMER_ENABLED = "statistics_cpu_timer_enabled";
131130
public static final String ENABLE_STATS_CALCULATOR = "enable_stats_calculator";
132131
public static final String STATISTICS_PRECALCULATION_FOR_PUSHDOWN_ENABLED = "statistics_precalculation_for_pushdown_enabled";
133132
public static final String COLLECT_PLAN_STATISTICS_FOR_ALL_QUERIES = "collect_plan_statistics_for_all_queries";
@@ -609,11 +608,6 @@ public SystemSessionProperties(
609608
"Maximum number of grouping sets in a GROUP BY",
610609
featuresConfig.getMaxGroupingSets(),
611610
true),
612-
booleanProperty(
613-
STATISTICS_CPU_TIMER_ENABLED,
614-
"Experimental: Enable cpu time tracking for automatic column statistics collection on write",
615-
taskManagerConfig.isStatisticsCpuTimerEnabled(),
616-
false),
617611
booleanProperty(
618612
ENABLE_STATS_CALCULATOR,
619613
"Enable statistics calculator",
@@ -1589,11 +1583,6 @@ private static double validateDoubleRange(Object value, String property, double
15891583
return doubleValue;
15901584
}
15911585

1592-
public static boolean isStatisticsCpuTimerEnabled(Session session)
1593-
{
1594-
return session.getSystemProperty(STATISTICS_CPU_TIMER_ENABLED, Boolean.class);
1595-
}
1596-
15971586
public static boolean isEnableStatsCalculator(Session session)
15981587
{
15991588
return session.getSystemProperty(ENABLE_STATS_CALCULATOR, Boolean.class);

core/trino-main/src/main/java/io/trino/execution/TaskManagerConfig.java

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
"task.operator-pre-allocated-memory",
4646
"task.shard.max-threads",
4747
"task.verbose-stats",
48+
"task.statistics-cpu-timer-enabled",
4849
})
4950
public class TaskManagerConfig
5051
{
@@ -53,7 +54,6 @@ public class TaskManagerConfig
5354
private boolean threadPerDriverSchedulerEnabled = true;
5455
private boolean perOperatorCpuTimerEnabled = true;
5556
private boolean taskCpuTimerEnabled = true;
56-
private boolean statisticsCpuTimerEnabled = true;
5757
private DataSize maxPartialAggregationMemoryUsage = DataSize.of(16, Unit.MEGABYTE);
5858
private DataSize maxPartialTopNMemory = DataSize.of(16, Unit.MEGABYTE);
5959
private DataSize maxLocalExchangeBufferSize = DataSize.of(128, Unit.MEGABYTE);
@@ -191,18 +191,6 @@ public TaskManagerConfig setTaskCpuTimerEnabled(boolean taskCpuTimerEnabled)
191191
return this;
192192
}
193193

194-
public boolean isStatisticsCpuTimerEnabled()
195-
{
196-
return statisticsCpuTimerEnabled;
197-
}
198-
199-
@Config("task.statistics-cpu-timer-enabled")
200-
public TaskManagerConfig setStatisticsCpuTimerEnabled(boolean statisticsCpuTimerEnabled)
201-
{
202-
this.statisticsCpuTimerEnabled = statisticsCpuTimerEnabled;
203-
return this;
204-
}
205-
206194
@NotNull
207195
public DataSize getMaxPartialAggregationMemoryUsage()
208196
{

core/trino-main/src/main/java/io/trino/operator/TableFinishOperator.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040

4141
import static com.google.common.base.Preconditions.checkState;
4242
import static com.google.common.base.Verify.verify;
43-
import static io.trino.SystemSessionProperties.isStatisticsCpuTimerEnabled;
4443
import static io.trino.operator.TableWriterOperator.FRAGMENT_CHANNEL;
4544
import static io.trino.operator.TableWriterOperator.ROW_COUNT_CHANNEL;
4645
import static io.trino.spi.type.BigintType.BIGINT;
@@ -92,7 +91,7 @@ public Operator createOperator(DriverContext driverContext)
9291
checkState(!closed, "Factory is already closed");
9392
OperatorContext context = driverContext.addOperatorContext(operatorId, planNodeId, TableFinishOperator.class.getSimpleName());
9493
Operator statisticsAggregationOperator = statisticsAggregationOperatorFactory.createOperator(driverContext);
95-
boolean statisticsCpuTimerEnabled = !(statisticsAggregationOperator instanceof DevNullOperator) && isStatisticsCpuTimerEnabled(session);
94+
boolean statisticsCpuTimerEnabled = !(statisticsAggregationOperator instanceof DevNullOperator);
9695
QueryId queryId = driverContext.getPipelineContext().getTaskContext().getQueryContext().getQueryId();
9796
TableExecuteContext tableExecuteContext = tableExecuteContextManager.getTableExecuteContextForQuery(queryId);
9897
return new TableFinishOperator(context, tableFinisher, statisticsAggregationOperator, descriptor, statisticsCpuTimerEnabled, tableExecuteContext, outputRowCount);

core/trino-main/src/main/java/io/trino/operator/TableWriterOperator.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
import static io.airlift.concurrent.MoreFutures.toListenableFuture;
5858
import static io.trino.SystemSessionProperties.getCloseIdleWritersTriggerDuration;
5959
import static io.trino.SystemSessionProperties.getIdleWriterMinDataSizeThreshold;
60-
import static io.trino.SystemSessionProperties.isStatisticsCpuTimerEnabled;
6160
import static io.trino.spi.type.BigintType.BIGINT;
6261
import static io.trino.spi.type.VarbinaryType.VARBINARY;
6362
import static io.trino.sql.planner.plan.TableWriterNode.CreateTarget;
@@ -122,7 +121,7 @@ public Operator createOperator(DriverContext driverContext)
122121
}
123122
OperatorContext context = driverContext.addOperatorContext(operatorId, planNodeId, TableWriterOperator.class.getSimpleName());
124123
Operator statisticsAggregationOperator = statisticsAggregationOperatorFactory.createOperator(driverContext);
125-
boolean statisticsCpuTimerEnabled = !(statisticsAggregationOperator instanceof DevNullOperator) && isStatisticsCpuTimerEnabled(session);
124+
boolean statisticsCpuTimerEnabled = !(statisticsAggregationOperator instanceof DevNullOperator);
126125
return new TableWriterOperator(
127126
context,
128127
createPageSink(driverContext),

core/trino-main/src/test/java/io/trino/execution/TestTaskManagerConfig.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ public void testDefaults()
7272
.setTaskYieldThreads("3")
7373
.setDriverTimeoutThreads("5")
7474
.setLevelTimeMultiplier(new BigDecimal("2"))
75-
.setStatisticsCpuTimerEnabled(true)
7675
.setInterruptStuckSplitTasksEnabled(true)
7776
.setInterruptStuckSplitTasksWarningThreshold(new Duration(10, TimeUnit.MINUTES))
7877
.setInterruptStuckSplitTasksTimeout(new Duration(15, TimeUnit.MINUTES))
@@ -118,7 +117,6 @@ public void testExplicitPropertyMappings()
118117
.put("task.task-yield-threads", "8")
119118
.put("task.driver-timeout-threads", "10")
120119
.put("task.level-time-multiplier", "2.1")
121-
.put("task.statistics-cpu-timer-enabled", "false")
122120
.put("task.interrupt-stuck-split-tasks-enabled", "false")
123121
.put("task.interrupt-stuck-split-tasks-warning-threshold", "3m")
124122
.put("task.interrupt-stuck-split-tasks-timeout", "4m")
@@ -159,7 +157,6 @@ public void testExplicitPropertyMappings()
159157
.setTaskYieldThreads("8")
160158
.setDriverTimeoutThreads("10")
161159
.setLevelTimeMultiplier(new BigDecimal("2.1"))
162-
.setStatisticsCpuTimerEnabled(false)
163160
.setInterruptStuckSplitTasksEnabled(false)
164161
.setInterruptStuckSplitTasksWarningThreshold(new Duration(3, TimeUnit.MINUTES))
165162
.setInterruptStuckSplitTasksTimeout(new Duration(4, TimeUnit.MINUTES))

0 commit comments

Comments
 (0)