Skip to content

Commit be4bbfe

Browse files
committed
fix(tso): Fix formatting issues in the TSO service configuration descriptions to ensure clarity of the descriptive information.
1 parent 6755fa1 commit be4bbfe

File tree

2 files changed

+8
-14
lines changed

2 files changed

+8
-14
lines changed

fe/fe-common/src/main/java/org/apache/doris/common/Config.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3394,17 +3394,17 @@ public static int metaServiceRpcRetryTimes() {
33943394
public static int tso_service_update_interval_ms = 50;
33953395

33963396
@ConfField(mutable = true, masterOnly = true, description = {
3397-
"TSO service max retry count. Default is 3, which means the TSO service will retry 3 times"
3397+
"TSO service max retry count. Default is 3, which means the TSO service will retry 3 times "
33983398
+ "to update the global timestamp."})
33993399
public static int tso_max_update_retry_count = 3;
34003400

34013401
@ConfField(mutable = true, masterOnly = true, description = {
3402-
"TSO get max retry count. Default is 10, which means the TSO service will retry 10 times"
3402+
"TSO get max retry count. Default is 10, which means the TSO service will retry 10 times "
34033403
+ "to generate TSO."})
34043404
public static int tso_max_get_retry_count = 10;
34053405

34063406
@ConfField(mutable = true, masterOnly = true, description = {
3407-
"TSO service time window in milliseconds. Default is 5000, which means the TSO service"
3407+
"TSO service time window in milliseconds. Default is 5000, which means the TSO service "
34083408
+ "will apply for a TSO time window of 5000ms from BDBJE once."})
34093409
public static int tso_service_window_duration_ms = 5000;
34103410

@@ -3414,18 +3414,18 @@ public static int metaServiceRpcRetryTimes() {
34143414
public static long tso_clock_backward_startup_threshold_ms = 30L * 60 * 1000;
34153415

34163416
@ConfField(mutable = true, description = {
3417-
"TSO service time offset in milliseconds. Only for test. Default is 0, which means the TSO service"
3417+
"TSO service time offset in milliseconds. Only for test. Default is 0, which means the TSO service "
34183418
+ "timestamp offset is 0 milliseconds."})
34193419
public static int tso_time_offset_debug_mode = 0;
34203420

34213421
@ConfField(mutable = true, masterOnly = true, description = {
3422-
"Whether to enable persisting TSO window end into edit log. Enabling emits new op code,"
3423-
+ " which may break rollback to older versions."})
3422+
"Whether to enable persisting TSO window end into edit log. Enabling emits new op code, "
3423+
+ "which may break rollback to older versions."})
34243424
public static boolean enable_tso_persist_journal = false;
34253425

34263426
@ConfField(mutable = true, masterOnly = true, description = {
3427-
"Whether to include TSO info as an image module in checkpoint. Older versions may need to ignore"
3428-
+ " unknown modules when reading new images."})
3427+
"Whether to include TSO info as an image module in checkpoint. Older versions may need to ignore "
3428+
+ "unknown modules when reading new images."})
34293429
public static boolean enable_tso_checkpoint_module = false;
34303430

34313431
@ConfField(mutable = true, masterOnly = true)

fe/fe-core/src/main/java/org/apache/doris/tso/TSOService.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -353,12 +353,6 @@ private void updateTimestamp() {
353353
if (timeLag > UPDATE_TIME_WINDOW_GUARD) {
354354
// Align physical time to current time
355355
nextPhysicalTime = currentTime;
356-
} else if (prevLogicalCounter > TSOTimestamp.MAX_LOGICAL_COUNTER / 2) {
357-
// Logical counter nearly full → advance to next millisecond
358-
nextPhysicalTime = prevPhysicalTime + 1;
359-
} else {
360-
// Logical counter not nearly full → just increment logical counter
361-
// do nothing
362356
}
363357

364358
// 4. Check if time window right boundary needs renewal

0 commit comments

Comments
 (0)