Skip to content

Commit ffa5245

Browse files
ryanvanhuukslootryanvanhuuksloot
committed
[FLINK-37008] Swap to 'incremental'
1 parent 1494ec2 commit ffa5245

File tree

8 files changed

+35
-33
lines changed

8 files changed

+35
-33
lines changed

Diff for: ‎flink-runtime-web/web-dashboard/angular.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@
147147
"cli": {
148148
"schematicCollections": [
149149
"@angular-eslint/schematics"
150-
]
150+
],
151+
"analytics": false
151152
}
152153
}

Diff for: ‎flink-runtime-web/web-dashboard/src/app/interfaces/job-checkpoint.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ export interface Checkpoint {
3939
id: number;
4040
status: string;
4141
is_savepoint: boolean;
42+
is_incremental_checkpoint: boolean;
4243
trigger_timestamp: number;
4344
latest_ack_timestamp: number;
4445
state_size: number;
@@ -55,6 +56,7 @@ export interface Checkpoint {
5556
id: number;
5657
restore_timestamp: number;
5758
is_savepoint: boolean;
59+
is_incremental_checkpoint: boolean;
5860
external_path: string;
5961
};
6062
history: CheckpointHistory;
@@ -65,6 +67,7 @@ export interface CheckpointHistory {
6567
id: number;
6668
status: string;
6769
is_savepoint: boolean;
70+
is_incremental_checkpoint: boolean;
6871
trigger_timestamp: number;
6972
latest_ack_timestamp: number;
7073
state_size: number;
@@ -91,6 +94,7 @@ export interface CheckpointCompletedStatistics {
9194
id: number;
9295
status: string;
9396
is_savepoint: boolean;
97+
is_incremental_checkpoint: boolean;
9498
trigger_timestamp: number;
9599
latest_ack_timestamp: number;
96100
state_size: number;
@@ -142,7 +146,7 @@ export interface CheckpointDetail {
142146
id: number;
143147
status: string;
144148
is_savepoint: boolean;
145-
is_full_checkpoint: boolean;
149+
is_incremental_checkpoint: boolean;
146150
savepointFormat: string;
147151
trigger_timestamp: number;
148152
latest_ack_timestamp: number;

Diff for: ‎flink-runtime-web/web-dashboard/src/app/pages/job/checkpoints/detail/job-checkpoints-detail.component.html

+1-4
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@
2424
{{ checkPointDetail?.discarded || '-' }}
2525
<nz-divider nzType="vertical"></nz-divider>
2626
<strong>Checkpoint Type:</strong>
27-
{{ checkPointType }}
28-
<nz-divider nzType="vertical"></nz-divider>
29-
<strong>Full Checkpoint:</strong>
30-
{{ checkPointDetail?.is_full_checkpoint }}
27+
{{ checkPointType }} ({{ checkPointDetail?.is_incremental_checkpoint ? 'incremental' : 'full' }})
3128
<ng-container *ngIf="checkPointDetail?.savepointFormat">
3229
<nz-divider nzType="vertical"></nz-divider>
3330
<strong>Savepoint Format:</strong>

Diff for: ‎flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointProperties.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -183,13 +183,13 @@ public boolean isSavepoint() {
183183
}
184184

185185
/**
186-
* Returns whether the checkpoint properties describe a full checkpoint.
186+
* Returns whether the checkpoint properties describe an incremental checkpoint.
187187
*
188-
* @return <code>true</code> if the properties describe a full checkpoint, <code>false</code>
189-
* otherwise.
188+
* @return <code>true</code> if the properties describes an incremental checkpoint, <code>false
189+
* </code> otherwise.
190190
*/
191-
public boolean isFullCheckpoint() {
192-
return checkpointType.isFullCheckpoint();
191+
public boolean isIncrementalCheckpoint() {
192+
return checkpointType.isIncrementalCheckpoint();
193193
}
194194

195195
/**

Diff for: ‎flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointType.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ public boolean isSavepoint() {
4646
return false;
4747
}
4848

49-
public boolean isFullCheckpoint() {
50-
return this == FULL_CHECKPOINT;
49+
public boolean isIncrementalCheckpoint() {
50+
return this != FULL_CHECKPOINT;
5151
}
5252

5353
public String getName() {

Diff for: ‎flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/SavepointType.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public boolean isSavepoint() {
5454
return true;
5555
}
5656

57-
public boolean isFullCheckpoint() {
57+
public boolean isIncrementalCheckpoint() {
5858
return false;
5959
}
6060

Diff for: ‎flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/SnapshotType.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public interface SnapshotType extends Serializable {
2525

2626
boolean isSavepoint();
2727

28-
boolean isFullCheckpoint();
28+
boolean isIncrementalCheckpoint();
2929

3030
String getName();
3131

Diff for: ‎flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/checkpoints/CheckpointStatistics.java

+18-18
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public class CheckpointStatistics implements ResponseBody {
8888

8989
public static final String FIELD_NAME_IS_SAVEPOINT = "is_savepoint";
9090

91-
public static final String FIELD_NAME_IS_FULL_CHECKPOINT = "is_full_checkpoint";
91+
public static final String FIELD_NAME_IS_INCREMENTAL_CHECKPOINT = "is_incremental_checkpoint";
9292

9393
public static final String FIELD_NAME_SAVEPOINT_FORMAT = "savepointFormat";
9494

@@ -131,8 +131,8 @@ public class CheckpointStatistics implements ResponseBody {
131131
@JsonProperty(FIELD_NAME_IS_SAVEPOINT)
132132
private final boolean savepoint;
133133

134-
@JsonProperty(FIELD_NAME_IS_FULL_CHECKPOINT)
135-
private final boolean fullCheckpoint;
134+
@JsonProperty(FIELD_NAME_IS_INCREMENTAL_CHECKPOINT)
135+
private final boolean incrementalCheckpoint;
136136

137137
@JsonProperty(FIELD_NAME_SAVEPOINT_FORMAT)
138138
@Nullable
@@ -180,7 +180,7 @@ private CheckpointStatistics(
180180
@JsonProperty(FIELD_NAME_ID) long id,
181181
@JsonProperty(FIELD_NAME_STATUS) CheckpointStatsStatus status,
182182
@JsonProperty(FIELD_NAME_IS_SAVEPOINT) boolean savepoint,
183-
@JsonProperty(FIELD_NAME_IS_FULL_CHECKPOINT) boolean fullCheckpoint,
183+
@JsonProperty(FIELD_NAME_IS_INCREMENTAL_CHECKPOINT) boolean incrementalCheckpoint,
184184
@JsonProperty(FIELD_NAME_SAVEPOINT_FORMAT) String savepointFormat,
185185
@JsonProperty(FIELD_NAME_TRIGGER_TIMESTAMP) long triggerTimestamp,
186186
@JsonProperty(FIELD_NAME_LATEST_ACK_TIMESTAMP) long latestAckTimestamp,
@@ -199,7 +199,7 @@ private CheckpointStatistics(
199199
this.id = id;
200200
this.status = Preconditions.checkNotNull(status);
201201
this.savepoint = savepoint;
202-
this.fullCheckpoint = fullCheckpoint;
202+
this.incrementalCheckpoint = incrementalCheckpoint;
203203
this.savepointFormat = savepointFormat;
204204
this.triggerTimestamp = triggerTimestamp;
205205
this.latestAckTimestamp = latestAckTimestamp;
@@ -227,8 +227,8 @@ public boolean isSavepoint() {
227227
return savepoint;
228228
}
229229

230-
public boolean isFullCheckpoint() {
231-
return fullCheckpoint;
230+
public boolean isIncrementalCheckpoint() {
231+
return incrementalCheckpoint;
232232
}
233233

234234
public long getTriggerTimestamp() {
@@ -279,7 +279,7 @@ public boolean equals(Object o) {
279279
CheckpointStatistics that = (CheckpointStatistics) o;
280280
return id == that.id
281281
&& savepoint == that.savepoint
282-
&& fullCheckpoint == that.fullCheckpoint
282+
&& incrementalCheckpoint == that.incrementalCheckpoint
283283
&& Objects.equals(savepointFormat, that.savepointFormat)
284284
&& triggerTimestamp == that.triggerTimestamp
285285
&& latestAckTimestamp == that.latestAckTimestamp
@@ -301,7 +301,7 @@ public int hashCode() {
301301
id,
302302
status,
303303
savepoint,
304-
fullCheckpoint,
304+
incrementalCheckpoint,
305305
savepointFormat,
306306
triggerTimestamp,
307307
latestAckTimestamp,
@@ -365,7 +365,7 @@ public static CheckpointStatistics generateCheckpointStatistics(
365365
completedCheckpointStats.getCheckpointId(),
366366
completedCheckpointStats.getStatus(),
367367
snapshotType.isSavepoint(),
368-
snapshotType.isFullCheckpoint(),
368+
snapshotType.isIncrementalCheckpoint(),
369369
savepointFormat,
370370
completedCheckpointStats.getTriggerTimestamp(),
371371
completedCheckpointStats.getLatestAckTimestamp(),
@@ -391,7 +391,7 @@ public static CheckpointStatistics generateCheckpointStatistics(
391391
failedCheckpointStats.getCheckpointId(),
392392
failedCheckpointStats.getStatus(),
393393
failedCheckpointStats.getProperties().isSavepoint(),
394-
failedCheckpointStats.getProperties().isFullCheckpoint(),
394+
failedCheckpointStats.getProperties().isIncrementalCheckpoint(),
395395
savepointFormat,
396396
failedCheckpointStats.getTriggerTimestamp(),
397397
failedCheckpointStats.getLatestAckTimestamp(),
@@ -417,7 +417,7 @@ public static CheckpointStatistics generateCheckpointStatistics(
417417
pendingCheckpointStats.getCheckpointId(),
418418
pendingCheckpointStats.getStatus(),
419419
pendingCheckpointStats.getProperties().isSavepoint(),
420-
pendingCheckpointStats.getProperties().isFullCheckpoint(),
420+
pendingCheckpointStats.getProperties().isIncrementalCheckpoint(),
421421
savepointFormat,
422422
pendingCheckpointStats.getTriggerTimestamp(),
423423
pendingCheckpointStats.getLatestAckTimestamp(),
@@ -490,7 +490,7 @@ public CompletedCheckpointStatistics(
490490
@JsonProperty(FIELD_NAME_ID) long id,
491491
@JsonProperty(FIELD_NAME_STATUS) CheckpointStatsStatus status,
492492
@JsonProperty(FIELD_NAME_IS_SAVEPOINT) boolean savepoint,
493-
@JsonProperty(FIELD_NAME_IS_FULL_CHECKPOINT) boolean fullCheckpoint,
493+
@JsonProperty(FIELD_NAME_IS_INCREMENTAL_CHECKPOINT) boolean incrementalCheckpoint,
494494
@JsonProperty(FIELD_NAME_SAVEPOINT_FORMAT) String savepointFormat,
495495
@JsonProperty(FIELD_NAME_TRIGGER_TIMESTAMP) long triggerTimestamp,
496496
@JsonProperty(FIELD_NAME_LATEST_ACK_TIMESTAMP) long latestAckTimestamp,
@@ -512,7 +512,7 @@ public CompletedCheckpointStatistics(
512512
id,
513513
status,
514514
savepoint,
515-
fullCheckpoint,
515+
incrementalCheckpoint,
516516
savepointFormat,
517517
triggerTimestamp,
518518
latestAckTimestamp,
@@ -580,7 +580,7 @@ public FailedCheckpointStatistics(
580580
@JsonProperty(FIELD_NAME_ID) long id,
581581
@JsonProperty(FIELD_NAME_STATUS) CheckpointStatsStatus status,
582582
@JsonProperty(FIELD_NAME_IS_SAVEPOINT) boolean savepoint,
583-
@JsonProperty(FIELD_NAME_IS_FULL_CHECKPOINT) boolean fullCheckpoint,
583+
@JsonProperty(FIELD_NAME_IS_INCREMENTAL_CHECKPOINT) boolean incrementalCheckpoint,
584584
@JsonProperty(FIELD_NAME_SAVEPOINT_FORMAT) String savepointFormat,
585585
@JsonProperty(FIELD_NAME_TRIGGER_TIMESTAMP) long triggerTimestamp,
586586
@JsonProperty(FIELD_NAME_LATEST_ACK_TIMESTAMP) long latestAckTimestamp,
@@ -602,7 +602,7 @@ public FailedCheckpointStatistics(
602602
id,
603603
status,
604604
savepoint,
605-
fullCheckpoint,
605+
incrementalCheckpoint,
606606
savepointFormat,
607607
triggerTimestamp,
608608
latestAckTimestamp,
@@ -660,7 +660,7 @@ public PendingCheckpointStatistics(
660660
@JsonProperty(FIELD_NAME_ID) long id,
661661
@JsonProperty(FIELD_NAME_STATUS) CheckpointStatsStatus status,
662662
@JsonProperty(FIELD_NAME_IS_SAVEPOINT) boolean savepoint,
663-
@JsonProperty(FIELD_NAME_IS_FULL_CHECKPOINT) boolean fullCheckpoint,
663+
@JsonProperty(FIELD_NAME_IS_INCREMENTAL_CHECKPOINT) boolean incrementalCheckpoint,
664664
@JsonProperty(FIELD_NAME_SAVEPOINT_FORMAT) String savepointFormat,
665665
@JsonProperty(FIELD_NAME_TRIGGER_TIMESTAMP) long triggerTimestamp,
666666
@JsonProperty(FIELD_NAME_LATEST_ACK_TIMESTAMP) long latestAckTimestamp,
@@ -680,7 +680,7 @@ public PendingCheckpointStatistics(
680680
id,
681681
status,
682682
savepoint,
683-
fullCheckpoint,
683+
incrementalCheckpoint,
684684
savepointFormat,
685685
triggerTimestamp,
686686
latestAckTimestamp,

0 commit comments

Comments
 (0)