Skip to content

Commit d94e8d0

Browse files
mtopolnikmtopolnik
authored
Merge branch 'master' into mt_arr-slice-from-back
2 parents 7e1567a + 4f95560 commit d94e8d0

File tree

12 files changed

+285
-273
lines changed

12 files changed

+285
-273
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ public class DynamicPropServerConfiguration implements ServerConfiguration, Conf
8585
PropertyKey.QUERY_TRACING_ENABLED,
8686
PropertyKey.CAIRO_MAT_VIEW_INSERT_AS_SELECT_BATCH_SIZE,
8787
PropertyKey.CAIRO_MAT_VIEW_ROWS_PER_QUERY_ESTIMATE,
88-
PropertyKey.CAIRO_MAT_VIEW_MIN_REFRESH_INTERVAL,
8988
PropertyKey.CAIRO_MAT_VIEW_MAX_REFRESH_RETRIES,
9089
PropertyKey.CAIRO_MAT_VIEW_MAX_REFRESH_INTERVALS,
9190
PropertyKey.CAIRO_SQL_ASOF_JOIN_EVACUATION_THRESHOLD,

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

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,6 @@ public class PropServerConfiguration implements ServerConfiguration {
300300
private final long matViewInsertAsSelectBatchSize;
301301
private final int matViewMaxRefreshIntervals;
302302
private final int matViewMaxRefreshRetries;
303-
private final long matViewMinRefreshInterval;
304303
private final boolean matViewParallelExecutionEnabled;
305304
private final long matViewRefreshIntervalsUpdatePeriod;
306305
private final long matViewRefreshOomRetryTimeout;
@@ -1307,7 +1306,6 @@ public PropServerConfiguration(
13071306
this.matViewEnabled = getBoolean(properties, env, PropertyKey.CAIRO_MAT_VIEW_ENABLED, true);
13081307
this.matViewMaxRefreshRetries = getInt(properties, env, PropertyKey.CAIRO_MAT_VIEW_MAX_REFRESH_RETRIES, 10);
13091308
this.matViewRefreshOomRetryTimeout = getMillis(properties, env, PropertyKey.CAIRO_MAT_VIEW_REFRESH_OOM_RETRY_TIMEOUT, 200);
1310-
this.matViewMinRefreshInterval = getMicros(properties, env, PropertyKey.CAIRO_MAT_VIEW_MIN_REFRESH_INTERVAL, Timestamps.MINUTE_MICROS);
13111309
this.matViewRefreshWorkerCount = getInt(properties, env, PropertyKey.MAT_VIEW_REFRESH_WORKER_COUNT, cpuWalApplyWorkers);
13121310
this.matViewRefreshWorkerAffinity = getAffinity(properties, env, PropertyKey.MAT_VIEW_REFRESH_WORKER_AFFINITY, matViewRefreshWorkerCount);
13131311
this.matViewRefreshWorkerHaltOnError = getBoolean(properties, env, PropertyKey.MAT_VIEW_REFRESH_WORKER_HALT_ON_ERROR, false);
@@ -2426,12 +2424,6 @@ public PropertyValidator() {
24262424
PropertyKey.CAIRO_SQL_MAP_KEY_CAPACITY,
24272425
PropertyKey.CAIRO_SQL_SMALL_MAP_KEY_CAPACITY
24282426
);
2429-
registerDeprecated(PropertyKey.PG_INSERT_POOL_CAPACITY);
2430-
registerDeprecated(PropertyKey.LINE_UDP_TIMESTAMP);
2431-
registerDeprecated(PropertyKey.LINE_TCP_TIMESTAMP);
2432-
registerDeprecated(PropertyKey.CAIRO_SQL_JIT_ROWS_THRESHOLD);
2433-
registerDeprecated(PropertyKey.CAIRO_COMPACT_MAP_LOAD_FACTOR);
2434-
registerDeprecated(PropertyKey.CAIRO_DEFAULT_MAP_TYPE);
24352427
registerDeprecated(
24362428
PropertyKey.CAIRO_SQL_ANALYTIC_COLUMN_POOL_CAPACITY,
24372429
PropertyKey.CAIRO_SQL_WINDOW_COLUMN_POOL_CAPACITY
@@ -2464,18 +2456,17 @@ public PropertyValidator() {
24642456
PropertyKey.CAIRO_SQL_COLUMN_CAST_MODEL_POOL_CAPACITY,
24652457
PropertyKey.CAIRO_SQL_CREATE_TABLE_COLUMN_MODEL_POOL_CAPACITY
24662458
);
2467-
registerDeprecated(
2468-
PropertyKey.HTTP_JSON_QUERY_DOUBLE_SCALE
2469-
);
2470-
registerDeprecated(
2471-
PropertyKey.HTTP_JSON_QUERY_FLOAT_SCALE
2472-
);
2473-
registerDeprecated(
2474-
PropertyKey.CAIRO_SQL_DOUBLE_CAST_SCALE
2475-
);
2476-
registerDeprecated(
2477-
PropertyKey.CAIRO_SQL_FLOAT_CAST_SCALE
2478-
);
2459+
registerDeprecated(PropertyKey.PG_INSERT_POOL_CAPACITY);
2460+
registerDeprecated(PropertyKey.LINE_UDP_TIMESTAMP);
2461+
registerDeprecated(PropertyKey.LINE_TCP_TIMESTAMP);
2462+
registerDeprecated(PropertyKey.CAIRO_SQL_JIT_ROWS_THRESHOLD);
2463+
registerDeprecated(PropertyKey.CAIRO_COMPACT_MAP_LOAD_FACTOR);
2464+
registerDeprecated(PropertyKey.CAIRO_DEFAULT_MAP_TYPE);
2465+
registerDeprecated(PropertyKey.HTTP_JSON_QUERY_DOUBLE_SCALE);
2466+
registerDeprecated(PropertyKey.HTTP_JSON_QUERY_FLOAT_SCALE);
2467+
registerDeprecated(PropertyKey.CAIRO_SQL_DOUBLE_CAST_SCALE);
2468+
registerDeprecated(PropertyKey.CAIRO_SQL_FLOAT_CAST_SCALE);
2469+
registerDeprecated(PropertyKey.CAIRO_MAT_VIEW_MIN_REFRESH_INTERVAL);
24792470
}
24802471

24812472
public ValidationResult validate(Properties properties) {
@@ -3044,11 +3035,6 @@ public int getMatViewMaxRefreshRetries() {
30443035
return matViewMaxRefreshRetries;
30453036
}
30463037

3047-
@Override
3048-
public long getMatViewMinRefreshInterval() {
3049-
return matViewMinRefreshInterval;
3050-
}
3051-
30523038
@Override
30533039
public long getMatViewRefreshIntervalsUpdatePeriod() {
30543040
return matViewRefreshIntervalsUpdatePeriod;

‎core/src/main/java/io/questdb/cairo/CairoConfiguration.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,8 +283,6 @@ default IOURingFacade getIOURingFacade() {
283283

284284
int getMatViewMaxRefreshRetries();
285285

286-
long getMatViewMinRefreshInterval();
287-
288286
long getMatViewRefreshIntervalsUpdatePeriod();
289287

290288
long getMatViewRefreshOomRetryTimeout();

‎core/src/main/java/io/questdb/cairo/CairoConfigurationWrapper.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -456,11 +456,6 @@ public int getMatViewMaxRefreshRetries() {
456456
return getDelegate().getMatViewMaxRefreshRetries();
457457
}
458458

459-
@Override
460-
public long getMatViewMinRefreshInterval() {
461-
return getDelegate().getMatViewMinRefreshInterval();
462-
}
463-
464459
@Override
465460
public long getMatViewRefreshIntervalsUpdatePeriod() {
466461
return getDelegate().getMatViewRefreshIntervalsUpdatePeriod();

‎core/src/main/java/io/questdb/cairo/DefaultCairoConfiguration.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
import io.questdb.std.datetime.DateLocale;
5252
import io.questdb.std.datetime.TimeZoneRules;
5353
import io.questdb.std.datetime.microtime.MicrosecondClockImpl;
54-
import io.questdb.std.datetime.microtime.Timestamps;
5554
import io.questdb.std.datetime.millitime.DateFormatUtils;
5655
import org.jetbrains.annotations.NotNull;
5756
import org.jetbrains.annotations.Nullable;
@@ -488,11 +487,6 @@ public int getMatViewMaxRefreshRetries() {
488487
return 10;
489488
}
490489

491-
@Override
492-
public long getMatViewMinRefreshInterval() {
493-
return Timestamps.MINUTE_MICROS;
494-
}
495-
496490
@Override
497491
public long getMatViewRefreshIntervalsUpdatePeriod() {
498492
return 15_000;

‎core/src/main/java/io/questdb/cairo/mv/MatViewRefreshJob.java‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -430,25 +430,7 @@ private RefreshContext findRefreshIntervals(
430430
}
431431

432432
if (minTs <= maxTs) {
433-
TimestampSampler timestampSampler = viewDefinition.getTimestampSampler();
434-
// For small sampling intervals such as '10T' or '2s' the actual sampler is
435-
// chosen as a 10x multiple of the original interval. That's to speed up
436-
// iteration done by the interval iterator.
437-
final long minIntervalMicros = configuration.getMatViewMinRefreshInterval();
438-
long approxBucketSize = timestampSampler.getApproxBucketSize();
439-
long actualInterval = viewDefinition.getSamplingInterval();
440-
if (approxBucketSize < minIntervalMicros) {
441-
while (approxBucketSize < minIntervalMicros) {
442-
approxBucketSize *= 10;
443-
actualInterval *= 10;
444-
}
445-
timestampSampler = TimestampSamplerFactory.getInstance(
446-
actualInterval,
447-
viewDefinition.getSamplingIntervalUnit(),
448-
0
449-
);
450-
}
451-
433+
final TimestampSampler timestampSampler = viewDefinition.getTimestampSampler();
452434
final long rowsPerBucket = estimateRowsPerBucket(baseTableReader, timestampSampler.getApproxBucketSize());
453435
final int rowsPerQuery = configuration.getMatViewRowsPerQueryEstimate();
454436
final int step = Math.max(1, (int) (rowsPerQuery / rowsPerBucket));

‎core/src/main/resources/io/questdb/site/conf/server.conf‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -850,9 +850,6 @@ cairo.sql.copy.root=import
850850
# Desired number of base table rows to be scanned by one query during materialized view refresh.
851851
#cairo.mat.view.rows.per.query.estimate=1000000
852852

853-
# Minimum wait time between two materialized view refreshes.
854-
#cairo.mat.view.min.refresh.interval=1m
855-
856853
# Maximum number of times QuestDB will retry a materialized view refresh after a recoverable error.
857854
#cairo.mat.view.max.refresh.retries=10
858855

‎core/src/test/java/io/questdb/test/PropServerConfigurationTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,6 @@ public void testAllDefaults() throws Exception {
209209
Assert.assertEquals(32, configuration.getCairoConfiguration().getCopyPoolCapacity());
210210
Assert.assertEquals(5, configuration.getCairoConfiguration().getCreateAsSelectRetryCount());
211211
Assert.assertTrue(configuration.getCairoConfiguration().isMatViewEnabled());
212-
Assert.assertEquals(60_000_000, configuration.getCairoConfiguration().getMatViewMinRefreshInterval());
213212
Assert.assertEquals(10, configuration.getCairoConfiguration().getMatViewMaxRefreshRetries());
214213
Assert.assertEquals(200, configuration.getCairoConfiguration().getMatViewRefreshOomRetryTimeout());
215214
Assert.assertEquals(1_000_000, configuration.getCairoConfiguration().getMatViewInsertAsSelectBatchSize());
@@ -1332,7 +1331,6 @@ public void testSetAllFromFile() throws Exception {
13321331
Assert.assertTrue(configuration.getMetricsConfiguration().isEnabled());
13331332

13341333
Assert.assertFalse(configuration.getCairoConfiguration().isMatViewEnabled());
1335-
Assert.assertEquals(1000, configuration.getCairoConfiguration().getMatViewMinRefreshInterval());
13361334
Assert.assertEquals(100, configuration.getCairoConfiguration().getMatViewMaxRefreshRetries());
13371335
Assert.assertEquals(10, configuration.getCairoConfiguration().getMatViewRefreshOomRetryTimeout());
13381336
Assert.assertEquals(1000, configuration.getCairoConfiguration().getMatViewInsertAsSelectBatchSize());

‎core/src/test/java/io/questdb/test/ServerMainTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,6 @@ public void testShowParameters() throws Exception {
547547
"line.udp.unicast\tQDB_LINE_UDP_UNICAST\tfalse\tdefault\tfalse\tfalse\n" +
548548
"metrics.enabled\tQDB_METRICS_ENABLED\tfalse\tconf\tfalse\tfalse\n" +
549549
"cairo.mat.view.enabled\tQDB_CAIRO_MAT_VIEW_ENABLED\ttrue\tdefault\tfalse\tfalse\n" +
550-
"cairo.mat.view.min.refresh.interval\tQDB_CAIRO_MAT_VIEW_MIN_REFRESH_INTERVAL\t60000000\tdefault\tfalse\ttrue\n" +
551550
"cairo.mat.view.max.refresh.retries\tQDB_CAIRO_MAT_VIEW_MAX_REFRESH_RETRIES\t10\tdefault\tfalse\ttrue\n" +
552551
"cairo.mat.view.refresh.oom.retry.timeout\tQDB_CAIRO_MAT_VIEW_REFRESH_OOM_RETRY_TIMEOUT\t200\tdefault\tfalse\tfalse\n" +
553552
"cairo.mat.view.insert.as.select.batch.size\tQDB_CAIRO_MAT_VIEW_INSERT_AS_SELECT_BATCH_SIZE\t1000000\tdefault\tfalse\ttrue\n" +

0 commit comments

Comments
 (0)