Skip to content

Commit 9d8eee8

Browse files
ideomaideoma
committed
renamings
1 parent 709fb84 commit 9d8eee8

File tree

2 files changed

+32
-33
lines changed

2 files changed

+32
-33
lines changed

‎core/src/main/java/io/questdb/DefaultServerConfiguration.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,17 @@
4242
public class DefaultServerConfiguration implements ServerConfiguration {
4343
private final DefaultCairoConfiguration cairoConfiguration;
4444
private final DefaultHttpServerConfiguration httpServerConfiguration;
45-
private final DefaultWorkerPoolConfiguration sharedPoolNetworkConfiguration;
4645
private final DefaultLineTcpReceiverConfiguration lineTcpReceiverConfiguration;
4746
private final DefaultLineUdpReceiverConfiguration lineUdpReceiverConfiguration = new DefaultLineUdpReceiverConfiguration();
48-
private final WorkerPoolConfiguration sharedPoolMatViewsConfiguration;
47+
private final WorkerPoolConfiguration matViewRefreshPoolConfiguration;
4948
private final DefaultMemoryConfiguration memoryConfiguration = new DefaultMemoryConfiguration();
5049
private final DefaultMetricsConfiguration metricsConfiguration = new DefaultMetricsConfiguration();
5150
private final DefaultPGConfiguration pgWireConfiguration = new DefaultPGConfiguration();
5251
private final PublicPassthroughConfiguration publicPassthroughConfiguration = new DefaultPublicPassthroughConfiguration();
52+
private final DefaultWorkerPoolConfiguration sharedPoolNetworkConfiguration;
5353
private final DefaultWorkerPoolConfiguration sharedPoolQueryConfiguration;
54-
private final WorkerPoolConfiguration walApplyPoolConfiguration;
5554
private final DefaultWorkerPoolConfiguration sharedPoolWriteConfiguration;
55+
private final WorkerPoolConfiguration walApplyPoolConfiguration;
5656

5757
public DefaultServerConfiguration(CharSequence dbRoot, CharSequence installRoot) {
5858
this.cairoConfiguration = new DefaultCairoConfiguration(dbRoot, installRoot);
@@ -61,7 +61,7 @@ public DefaultServerConfiguration(CharSequence dbRoot, CharSequence installRoot)
6161
this.sharedPoolNetworkConfiguration = new DefaultWorkerPoolConfiguration("shared_network");
6262
this.sharedPoolQueryConfiguration = new DefaultWorkerPoolConfiguration("shared_query");
6363
this.sharedPoolWriteConfiguration = new DefaultWorkerPoolConfiguration("shared_write");
64-
this.sharedPoolMatViewsConfiguration = new DefaultWorkerPoolConfiguration("shared_mat_views");
64+
this.matViewRefreshPoolConfiguration = new DefaultWorkerPoolConfiguration("mat_view_refresh");
6565
this.walApplyPoolConfiguration = new DefaultWorkerPoolConfiguration("wal_apply");
6666
}
6767

@@ -89,11 +89,6 @@ public HttpFullFatServerConfiguration getHttpServerConfiguration() {
8989
return httpServerConfiguration;
9090
}
9191

92-
@Override
93-
public WorkerPoolConfiguration getSharedWorkerPoolNetworkConfiguration() {
94-
return sharedPoolNetworkConfiguration;
95-
}
96-
9792
@Override
9893
public LineTcpReceiverConfiguration getLineTcpReceiverConfiguration() {
9994
return lineTcpReceiverConfiguration;
@@ -106,7 +101,7 @@ public LineUdpReceiverConfiguration getLineUdpReceiverConfiguration() {
106101

107102
@Override
108103
public WorkerPoolConfiguration getMatViewRefreshPoolConfiguration() {
109-
return sharedPoolMatViewsConfiguration;
104+
return matViewRefreshPoolConfiguration;
110105
}
111106

112107
@Override
@@ -135,20 +130,25 @@ public PublicPassthroughConfiguration getPublicPassthroughConfiguration() {
135130
}
136131

137132
@Override
138-
public WorkerPoolConfiguration getSharedWorkerPoolQueryConfiguration() {
139-
return sharedPoolQueryConfiguration;
133+
public WorkerPoolConfiguration getSharedWorkerPoolNetworkConfiguration() {
134+
return sharedPoolNetworkConfiguration;
140135
}
141136

142137
@Override
143-
public WorkerPoolConfiguration getWalApplyPoolConfiguration() {
144-
return walApplyPoolConfiguration;
138+
public WorkerPoolConfiguration getSharedWorkerPoolQueryConfiguration() {
139+
return sharedPoolQueryConfiguration;
145140
}
146141

147142
@Override
148143
public WorkerPoolConfiguration getSharedWorkerPoolWriteConfiguration() {
149144
return sharedPoolWriteConfiguration;
150145
}
151146

147+
@Override
148+
public WorkerPoolConfiguration getWalApplyPoolConfiguration() {
149+
return walApplyPoolConfiguration;
150+
}
151+
152152
private static class DefaultWorkerPoolConfiguration implements WorkerPoolConfiguration {
153153

154154

‎core/src/main/java/io/questdb/PropServerConfiguration.java‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ public class PropServerConfiguration implements ServerConfiguration {
305305
private final boolean matViewParallelExecutionEnabled;
306306
private final long matViewRefreshIntervalsUpdatePeriod;
307307
private final long matViewRefreshOomRetryTimeout;
308-
private final WorkerPoolConfiguration sharedWorkerPoolMatViewsConfiguration = new PropSharedWorkerPoolMatViewsConfiguration();
308+
private final WorkerPoolConfiguration matViewRefreshPoolConfiguration = new PropMatViewsRefreshPoolConfiguration();
309309
private final long matViewRefreshSleepTimeout;
310310
private final int[] matViewRefreshWorkerAffinity;
311311
private final int matViewRefreshWorkerCount;
@@ -329,7 +329,6 @@ public class PropServerConfiguration implements ServerConfiguration {
329329
private final boolean metricsEnabled;
330330
private final MicrosecondClock microsecondClock;
331331
private final int mkdirMode;
332-
private final PropWorkerPoolConfiguration networkSharedWorkerPoolConfiguration = new PropWorkerPoolConfiguration("shared-network");
333332
private final int o3CallbackQueueCapacity;
334333
private final int o3ColumnMemorySize;
335334
private final int o3CopyQueueCapacity;
@@ -362,7 +361,6 @@ public class PropServerConfiguration implements ServerConfiguration {
362361
private final String publicDirectory;
363362
private final PublicPassthroughConfiguration publicPassthroughConfiguration = new PropPublicPassthroughConfiguration();
364363
private final int queryCacheEventQueueCapacity;
365-
private final PropWorkerPoolConfiguration sharedWorkerPoolQueryConfiguration = new PropWorkerPoolConfiguration("shared-query");
366364
private final boolean queryWithinLatestByOptimisationEnabled;
367365
private final int readerPoolMaxSegments;
368366
private final Utf8SequenceObjHashMap<Utf8Sequence> redirectMap;
@@ -375,6 +373,9 @@ public class PropServerConfiguration implements ServerConfiguration {
375373
private final int rollBufferLimit;
376374
private final int rollBufferSize;
377375
private final long sequencerCheckInterval;
376+
private final PropWorkerPoolConfiguration sharedWorkerPoolNetworkConfiguration = new PropWorkerPoolConfiguration("shared-network");
377+
private final PropWorkerPoolConfiguration sharedWorkerPoolQueryConfiguration = new PropWorkerPoolConfiguration("shared-query");
378+
private final PropWorkerPoolConfiguration sharedWorkerPoolWriteConfiguration = new PropWorkerPoolConfiguration("shared-write");
378379
private final String snapshotInstanceId;
379380
private final long spinLockTimeout;
380381
private final int sqlAsOfJoinEvacuationThreshold;
@@ -513,7 +514,6 @@ public class PropServerConfiguration implements ServerConfiguration {
513514
private final long walWriterEventAppendPageSize;
514515
private final int walWriterPoolMaxSegments;
515516
private final long workStealTimeoutNanos;
516-
private final PropWorkerPoolConfiguration writeSharedWorkerPoolConfiguration = new PropWorkerPoolConfiguration("shared-write");
517517
private final long writerAsyncCommandBusyWaitTimeout;
518518
private final long writerAsyncCommandMaxWaitTimeout;
519519
private final int writerAsyncCommandQueueCapacity;
@@ -1300,8 +1300,7 @@ public PropServerConfiguration(
13001300
this.matViewEnabled = getBoolean(properties, env, PropertyKey.CAIRO_MAT_VIEW_ENABLED, true);
13011301
this.matViewMaxRefreshRetries = getInt(properties, env, PropertyKey.CAIRO_MAT_VIEW_MAX_REFRESH_RETRIES, 10);
13021302
this.matViewRefreshOomRetryTimeout = getMillis(properties, env, PropertyKey.CAIRO_MAT_VIEW_REFRESH_OOM_RETRY_TIMEOUT, 200);
1303-
this.matViewRefreshWorkerCount = getInt(properties, env, PropertyKey.MAT_VIEW_REFRESH_WORKER_COUNT, cpuMvRefreshWorkers); // Use shared write pool by default
1304-
1303+
this.matViewRefreshWorkerCount = getInt(properties, env, PropertyKey.MAT_VIEW_REFRESH_WORKER_COUNT, cpuMvRefreshWorkers);
13051304
this.matViewRefreshWorkerAffinity = getAffinity(properties, env, PropertyKey.MAT_VIEW_REFRESH_WORKER_AFFINITY, matViewRefreshWorkerCount);
13061305
this.matViewRefreshWorkerHaltOnError = getBoolean(properties, env, PropertyKey.MAT_VIEW_REFRESH_WORKER_HALT_ON_ERROR, false);
13071306
this.matViewRefreshWorkerNapThreshold = getLong(properties, env, PropertyKey.MAT_VIEW_REFRESH_WORKER_NAP_THRESHOLD, 7_000);
@@ -1661,7 +1660,7 @@ public PropServerConfiguration(
16611660
// IO will be slightly higher priority than query and write pools to make the server more responsive
16621661
int networkPoolWorkerCount = configureSharedThreadPool(
16631662
properties, env,
1664-
this.networkSharedWorkerPoolConfiguration,
1663+
this.sharedWorkerPoolNetworkConfiguration,
16651664
PropertyKey.SHARED_NETWORK_WORKER_COUNT,
16661665
PropertyKey.SHARED_NETWORK_WORKER_AFFINITY,
16671666
sharedWorkerCountSett,
@@ -1689,7 +1688,7 @@ public PropServerConfiguration(
16891688

16901689
int writeWorkers = configureSharedThreadPool(
16911690
properties, env,
1692-
this.writeSharedWorkerPoolConfiguration,
1691+
this.sharedWorkerPoolWriteConfiguration,
16931692
PropertyKey.SHARED_WRITE_WORKER_COUNT,
16941693
PropertyKey.SHARED_WRITE_WORKER_AFFINITY,
16951694
sharedWorkerCountSett,
@@ -1851,7 +1850,7 @@ public LineUdpReceiverConfiguration getLineUdpReceiverConfiguration() {
18511850

18521851
@Override
18531852
public WorkerPoolConfiguration getMatViewRefreshPoolConfiguration() {
1854-
return sharedWorkerPoolMatViewsConfiguration;
1853+
return matViewRefreshPoolConfiguration;
18551854
}
18561855

18571856
@Override
@@ -1869,11 +1868,6 @@ public MetricsConfiguration getMetricsConfiguration() {
18691868
return metricsConfiguration;
18701869
}
18711870

1872-
@Override
1873-
public WorkerPoolConfiguration getSharedWorkerPoolNetworkConfiguration() {
1874-
return networkSharedWorkerPoolConfiguration;
1875-
}
1876-
18771871
@Override
18781872
public PGConfiguration getPGWireConfiguration() {
18791873
return pgConfiguration;
@@ -1884,19 +1878,24 @@ public PublicPassthroughConfiguration getPublicPassthroughConfiguration() {
18841878
return publicPassthroughConfiguration;
18851879
}
18861880

1881+
@Override
1882+
public WorkerPoolConfiguration getSharedWorkerPoolNetworkConfiguration() {
1883+
return sharedWorkerPoolNetworkConfiguration;
1884+
}
1885+
18871886
@Override
18881887
public WorkerPoolConfiguration getSharedWorkerPoolQueryConfiguration() {
18891888
return sharedWorkerPoolQueryConfiguration;
18901889
}
18911890

18921891
@Override
1893-
public WorkerPoolConfiguration getWalApplyPoolConfiguration() {
1894-
return walApplyPoolConfiguration;
1892+
public WorkerPoolConfiguration getSharedWorkerPoolWriteConfiguration() {
1893+
return sharedWorkerPoolWriteConfiguration;
18951894
}
18961895

18971896
@Override
1898-
public WorkerPoolConfiguration getSharedWorkerPoolWriteConfiguration() {
1899-
return writeSharedWorkerPoolConfiguration;
1897+
public WorkerPoolConfiguration getWalApplyPoolConfiguration() {
1898+
return walApplyPoolConfiguration;
19001899
}
19011900

19021901
@Override
@@ -5181,7 +5180,7 @@ public int ownThreadAffinity() {
51815180
}
51825181
}
51835182

5184-
private class PropSharedWorkerPoolMatViewsConfiguration implements WorkerPoolConfiguration {
5183+
private class PropMatViewsRefreshPoolConfiguration implements WorkerPoolConfiguration {
51855184
@Override
51865185
public Metrics getMetrics() {
51875186
return metrics;

0 commit comments

Comments
 (0)