diff --git a/docs/layouts/shortcodes/generated/rest_v1_dispatcher.html b/docs/layouts/shortcodes/generated/rest_v1_dispatcher.html index 26749b00f691b..882838a4288b5 100644 --- a/docs/layouts/shortcodes/generated/rest_v1_dispatcher.html +++ b/docs/layouts/shortcodes/generated/rest_v1_dispatcher.html @@ -4563,29 +4563,6 @@ } } } - }, - "properties" : { - "jobVertexResourceRequirements" : { - "type" : "object", - "additionalProperties" : { - "type" : "object", - "id" : "urn:jsonschema:org:apache:flink:runtime:jobgraph:JobVertexResourceRequirements", - "properties" : { - "parallelism" : { - "type" : "object", - "id" : "urn:jsonschema:org:apache:flink:runtime:jobgraph:JobVertexResourceRequirements:Parallelism", - "properties" : { - "lowerBound" : { - "type" : "integer" - }, - "upperBound" : { - "type" : "integer" - } - } - } - } - } - } } } @@ -4640,29 +4617,6 @@ } } } - }, - "properties" : { - "jobVertexResourceRequirements" : { - "type" : "object", - "additionalProperties" : { - "type" : "object", - "id" : "urn:jsonschema:org:apache:flink:runtime:jobgraph:JobVertexResourceRequirements", - "properties" : { - "parallelism" : { - "type" : "object", - "id" : "urn:jsonschema:org:apache:flink:runtime:jobgraph:JobVertexResourceRequirements:Parallelism", - "properties" : { - "lowerBound" : { - "type" : "integer" - }, - "upperBound" : { - "type" : "integer" - } - } - } - } - } - } } } diff --git a/docs/static/generated/rest_v1_dispatcher.yml b/docs/static/generated/rest_v1_dispatcher.yml index 0c94fafc052e5..1f2d4ff5a3ef0 100644 --- a/docs/static/generated/rest_v1_dispatcher.yml +++ b/docs/static/generated/rest_v1_dispatcher.yml @@ -2105,6 +2105,7 @@ components: checkpointId: type: integer format: int64 + nullable: true failureCause: $ref: "#/components/schemas/SerializedThrowable" CheckpointStatistics: @@ -2147,6 +2148,7 @@ components: format: int64 savepointFormat: type: string + nullable: true state_size: type: integer format: int64 @@ -2156,6 +2158,7 @@ components: type: object additionalProperties: $ref: "#/components/schemas/TaskCheckpointStatistics" + nullable: true trigger_timestamp: type: integer format: int64 @@ -2195,6 +2198,7 @@ components: $ref: "#/components/schemas/TriggerId" CheckpointType: type: string + nullable: true enum: - CONFIGURED - FULL @@ -2251,6 +2255,7 @@ components: slots-free-and-blocked: type: integer format: int32 + nullable: true slots-total: type: integer format: int32 @@ -2260,6 +2265,7 @@ components: taskmanagers-blocked: type: integer format: int32 + nullable: true CompletedCheckpointStatistics: type: object allOf: @@ -2268,6 +2274,7 @@ components: properties: external_path: type: string + nullable: true discarded: type: boolean CompletedSubtaskCheckpointStatistics: @@ -2359,6 +2366,7 @@ components: properties: endpoint: type: string + nullable: true exceptionName: type: string failureLabels: @@ -2369,8 +2377,10 @@ components: type: string taskManagerId: type: string + nullable: true taskName: type: string + nullable: true timestamp: type: integer format: int64 @@ -2419,6 +2429,7 @@ components: format: int64 failure_message: type: string + nullable: true FailureLabel: type: object properties: @@ -2505,17 +2516,20 @@ components: properties: caching: type: string + nullable: true exchange: type: string id: type: string local_strategy: type: string + nullable: true num: type: integer format: int64 ship_strategy: type: string + nullable: true IntermediateDataSetID: pattern: "[0-9a-f]{32}" type: string @@ -2535,6 +2549,7 @@ components: properties: description: type: string + nullable: true name: type: string JarFileInfo: @@ -2565,17 +2580,21 @@ components: properties: entryClass: type: string + nullable: true flinkConfiguration: type: object additionalProperties: type: string + nullable: true jobId: $ref: "#/components/schemas/JobID" parallelism: type: integer format: int32 + nullable: true programArgsList: type: array + nullable: true items: type: string JarRunApplicationRequestBody: @@ -2583,27 +2602,33 @@ components: properties: allowNonRestoredState: type: boolean + nullable: true applicationId: $ref: "#/components/schemas/ApplicationID" claimMode: $ref: "#/components/schemas/RecoveryClaimMode" entryClass: type: string + nullable: true flinkConfiguration: type: object additionalProperties: type: string + nullable: true jobId: $ref: "#/components/schemas/JobID" parallelism: type: integer format: int32 + nullable: true programArgsList: type: array + nullable: true items: type: string savepointPath: type: string + nullable: true JarRunApplicationResponseBody: type: object properties: @@ -2614,27 +2639,33 @@ components: properties: allowNonRestoredState: type: boolean + nullable: true claimMode: $ref: "#/components/schemas/RecoveryClaimMode" entryClass: type: string + nullable: true flinkConfiguration: type: object additionalProperties: type: string + nullable: true jobId: $ref: "#/components/schemas/JobID" parallelism: type: integer format: int32 + nullable: true programArgsList: type: array + nullable: true items: type: string restoreMode: $ref: "#/components/schemas/RecoveryClaimMode" savepointPath: type: string + nullable: true JarRunResponseBody: type: object properties: @@ -2880,6 +2911,7 @@ components: endTimestampInMillis: type: integer format: int64 + nullable: true rescaleAttemptId: type: integer format: int64 @@ -2966,6 +2998,7 @@ components: type: boolean JobStatus: type: string + nullable: true enum: - INITIALIZING - CREATED @@ -2985,6 +3018,7 @@ components: $ref: "#/components/schemas/JobStatus" JobType: type: string + nullable: true enum: - BATCH - STREAMING @@ -3005,10 +3039,12 @@ components: end-timestamp: type: integer format: int64 + nullable: true status: $ref: "#/components/schemas/VertexBackPressureStatus" subtasks: type: array + nullable: true items: $ref: "#/components/schemas/SubtaskBackPressureInfo" JobVertexDetailsInfo: @@ -3134,6 +3170,7 @@ components: type: string value: type: string + nullable: true MetricCollectionResponseBody: type: object properties: @@ -3206,6 +3243,7 @@ components: type: string inputs: type: array + nullable: true items: $ref: "#/components/schemas/Input" operator: @@ -3231,8 +3269,10 @@ components: $ref: "#/components/schemas/Id" RawJson: type: object + nullable: true RecoveryClaimMode: type: string + nullable: true enum: - CLAIM - NO_CLAIM @@ -3302,6 +3342,7 @@ components: properties: external_path: type: string + nullable: true id: type: integer format: int64 @@ -3319,6 +3360,7 @@ components: $ref: "#/components/schemas/ExceptionInfo" endpoint: type: string + nullable: true exceptionName: type: string failureLabels: @@ -3329,8 +3371,10 @@ components: type: string taskManagerId: type: string + nullable: true taskName: type: string + nullable: true timestamp: type: integer format: int64 @@ -3339,8 +3383,10 @@ components: properties: savepoint-path: type: string + nullable: true SavepointFormatType: type: string + nullable: true enum: - CANONICAL - NATIVE @@ -3351,15 +3397,18 @@ components: $ref: "#/components/schemas/SerializedThrowable" location: type: string + nullable: true SavepointTriggerRequestBody: type: object properties: cancel-job: type: boolean + nullable: true formatType: $ref: "#/components/schemas/SavepointFormatType" target-directory: type: string + nullable: true triggerId: $ref: "#/components/schemas/TriggerId" SchedulerExecutionMode: @@ -3372,18 +3421,23 @@ components: durationInMillis: type: integer format: int64 + nullable: true enterTimestampInMillis: type: integer format: int64 + nullable: true leaveTimestampInMillis: type: integer format: int64 + nullable: true state: type: string stringifiedException: type: string + nullable: true SchedulerType: type: string + nullable: true enum: - Default - Adaptive @@ -3477,10 +3531,12 @@ components: properties: drain: type: boolean + nullable: true formatType: $ref: "#/components/schemas/SavepointFormatType" targetDirectory: type: string + nullable: true triggerId: $ref: "#/components/schemas/TriggerId" SubtaskAccumulatorsInfo: @@ -3504,6 +3560,7 @@ components: attempt-number: type: integer format: int32 + nullable: true backpressureLevel: $ref: "#/components/schemas/VertexBackPressureLevel" busyRatio: @@ -3514,6 +3571,7 @@ components: format: double other-concurrent-attempts: type: array + nullable: true items: $ref: "#/components/schemas/SubtaskBackPressureInfo" ratio: @@ -3572,6 +3630,7 @@ components: $ref: "#/components/schemas/IOMetricsInfo" other-concurrent-attempts: type: array + nullable: true items: $ref: "#/components/schemas/SubtaskExecutionAttemptDetailsInfo" start-time: @@ -3767,6 +3826,7 @@ components: format: int32 blocked: type: boolean + nullable: true dataPort: type: integer format: int32 @@ -3804,6 +3864,7 @@ components: format: int32 blocked: type: boolean + nullable: true dataPort: type: integer format: int32 @@ -4027,9 +4088,11 @@ components: postRescaleParallelism: type: integer format: int32 + nullable: true preRescaleParallelism: type: integer format: int32 + nullable: true requiredParallelisms: $ref: "#/components/schemas/VertexParallelismInformation" slotSharingGroupId: diff --git a/docs/static/generated/rest_v1_sql_gateway.yml b/docs/static/generated/rest_v1_sql_gateway.yml index 8a7d16887477a..2d751a9711218 100644 --- a/docs/static/generated/rest_v1_sql_gateway.yml +++ b/docs/static/generated/rest_v1_sql_gateway.yml @@ -237,6 +237,7 @@ components: properties: comment: type: string + nullable: true dataType: $ref: "#/components/schemas/DataType" name: @@ -250,6 +251,7 @@ components: properties: comment: type: string + nullable: true logicalType: $ref: "#/components/schemas/LogicalType" name: @@ -276,9 +278,11 @@ components: type: object additionalProperties: type: string + nullable: true executionTimeout: type: integer format: int64 + nullable: true statement: type: string ExecuteStatementResponseBody: @@ -295,6 +299,7 @@ components: $ref: "#/components/schemas/JobID" nextResultUri: type: string + nullable: true queryResult: type: boolean resultKind: @@ -411,8 +416,10 @@ components: type: object additionalProperties: type: string + nullable: true sessionName: type: string + nullable: true OpenSessionResponseBody: type: object properties: diff --git a/docs/static/generated/rest_v2_sql_gateway.yml b/docs/static/generated/rest_v2_sql_gateway.yml index 51faa9c28ae71..5ca66181293fa 100644 --- a/docs/static/generated/rest_v2_sql_gateway.yml +++ b/docs/static/generated/rest_v2_sql_gateway.yml @@ -288,6 +288,7 @@ components: properties: comment: type: string + nullable: true dataType: $ref: "#/components/schemas/DataType" name: @@ -301,6 +302,7 @@ components: properties: comment: type: string + nullable: true logicalType: $ref: "#/components/schemas/LogicalType" name: @@ -326,6 +328,7 @@ components: executionTimeout: type: integer format: int64 + nullable: true statement: type: string ConstraintType: @@ -350,9 +353,11 @@ components: type: object additionalProperties: type: string + nullable: true executionTimeout: type: integer format: int64 + nullable: true statement: type: string ExecuteStatementResponseBody: @@ -369,6 +374,7 @@ components: $ref: "#/components/schemas/JobID" nextResultUri: type: string + nullable: true queryResult: type: boolean resultKind: @@ -485,8 +491,10 @@ components: type: object additionalProperties: type: string + nullable: true sessionName: type: string + nullable: true OpenSessionResponseBody: type: object properties: diff --git a/docs/static/generated/rest_v3_sql_gateway.yml b/docs/static/generated/rest_v3_sql_gateway.yml index dd6a5ca1a5fdb..bef8b793a6480 100644 --- a/docs/static/generated/rest_v3_sql_gateway.yml +++ b/docs/static/generated/rest_v3_sql_gateway.yml @@ -317,6 +317,7 @@ components: properties: comment: type: string + nullable: true dataType: $ref: "#/components/schemas/DataType" name: @@ -330,6 +331,7 @@ components: properties: comment: type: string + nullable: true logicalType: $ref: "#/components/schemas/LogicalType" name: @@ -355,6 +357,7 @@ components: executionTimeout: type: integer format: int64 + nullable: true statement: type: string ConstraintType: @@ -379,9 +382,11 @@ components: type: object additionalProperties: type: string + nullable: true executionTimeout: type: integer format: int64 + nullable: true statement: type: string ExecuteStatementResponseBody: @@ -398,6 +403,7 @@ components: $ref: "#/components/schemas/JobID" nextResultUri: type: string + nullable: true queryResult: type: boolean resultKind: @@ -514,8 +520,10 @@ components: type: object additionalProperties: type: string + nullable: true sessionName: type: string + nullable: true OpenSessionResponseBody: type: object properties: @@ -539,20 +547,24 @@ components: type: object additionalProperties: type: string + nullable: true executionConfig: type: object additionalProperties: type: string + nullable: true isPeriodic: type: boolean periodic: type: boolean scheduleTime: type: string + nullable: true staticPartitions: type: object additionalProperties: type: string + nullable: true RefreshMaterializedTableResponseBody: type: object properties: diff --git a/docs/static/generated/rest_v4_sql_gateway.yml b/docs/static/generated/rest_v4_sql_gateway.yml index cd7061c1b3ce7..0312a8e962dd8 100644 --- a/docs/static/generated/rest_v4_sql_gateway.yml +++ b/docs/static/generated/rest_v4_sql_gateway.yml @@ -311,6 +311,7 @@ components: properties: comment: type: string + nullable: true dataType: $ref: "#/components/schemas/DataType" name: @@ -324,6 +325,7 @@ components: properties: comment: type: string + nullable: true logicalType: $ref: "#/components/schemas/LogicalType" name: @@ -349,6 +351,7 @@ components: executionTimeout: type: integer format: int64 + nullable: true statement: type: string ConstraintType: @@ -373,10 +376,13 @@ components: type: object additionalProperties: type: string + nullable: true script: type: string + nullable: true scriptUri: type: string + nullable: true DeployScriptResponseBody: type: object properties: @@ -389,9 +395,11 @@ components: type: object additionalProperties: type: string + nullable: true executionTimeout: type: integer format: int64 + nullable: true statement: type: string ExecuteStatementResponseBody: @@ -408,6 +416,7 @@ components: $ref: "#/components/schemas/JobID" nextResultUri: type: string + nullable: true queryResult: type: boolean resultKind: @@ -524,8 +533,10 @@ components: type: object additionalProperties: type: string + nullable: true sessionName: type: string + nullable: true OpenSessionResponseBody: type: object properties: @@ -549,20 +560,24 @@ components: type: object additionalProperties: type: string + nullable: true executionConfig: type: object additionalProperties: type: string + nullable: true isPeriodic: type: boolean periodic: type: boolean scheduleTime: type: string + nullable: true staticPartitions: type: object additionalProperties: type: string + nullable: true RefreshMaterializedTableResponseBody: type: object properties: diff --git a/flink-runtime-web/src/test/resources/rest_api_v1.snapshot b/flink-runtime-web/src/test/resources/rest_api_v1.snapshot index a1dd691a7d29d..0d76cc9360958 100644 --- a/flink-runtime-web/src/test/resources/rest_api_v1.snapshot +++ b/flink-runtime-web/src/test/resources/rest_api_v1.snapshot @@ -3600,30 +3600,7 @@ }, "response" : { "type" : "object", - "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:job:JobResourceRequirementsBody", - "properties" : { - "jobVertexResourceRequirements" : { - "type" : "object", - "additionalProperties" : { - "type" : "object", - "id" : "urn:jsonschema:org:apache:flink:runtime:jobgraph:JobVertexResourceRequirements", - "properties" : { - "parallelism" : { - "type" : "object", - "id" : "urn:jsonschema:org:apache:flink:runtime:jobgraph:JobVertexResourceRequirements:Parallelism", - "properties" : { - "lowerBound" : { - "type" : "integer" - }, - "upperBound" : { - "type" : "integer" - } - } - } - } - } - } - } + "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:job:JobResourceRequirementsBody" } }, { "url" : "/jobs/:jobid/resource-requirements", @@ -3640,30 +3617,7 @@ }, "request" : { "type" : "object", - "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:job:JobResourceRequirementsBody", - "properties" : { - "jobVertexResourceRequirements" : { - "type" : "object", - "additionalProperties" : { - "type" : "object", - "id" : "urn:jsonschema:org:apache:flink:runtime:jobgraph:JobVertexResourceRequirements", - "properties" : { - "parallelism" : { - "type" : "object", - "id" : "urn:jsonschema:org:apache:flink:runtime:jobgraph:JobVertexResourceRequirements:Parallelism", - "properties" : { - "lowerBound" : { - "type" : "integer" - }, - "upperBound" : { - "type" : "integer" - } - } - } - } - } - } - } + "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:job:JobResourceRequirementsBody" }, "response" : { "type" : "object", diff --git a/pom.xml b/pom.xml index 980cdd2cc6611..7c7175496a5dd 100644 --- a/pom.xml +++ b/pom.xml @@ -127,8 +127,8 @@ under the License. 4 true -XX:+UseG1GC -Xms256m -XX:+IgnoreUnrecognizedVMOptions ${surefire.module.config} - 21.0 - 2.20.1 + 22.0 + 2.22.2 2.10.0 true 11 @@ -359,13 +359,13 @@ under the License. org.apache.flink flink-shaded-asm-9 - 9.9.1-${flink.shaded.version} + 9.10.1-${flink.shaded.version} org.apache.flink flink-shaded-guava - 33.5.0-jre-${flink.shaded.version} + 33.7.1-jre-${flink.shaded.version} @@ -383,13 +383,13 @@ under the License. org.apache.flink flink-shaded-netty - 4.2.6.Final-${flink.shaded.version} + 4.2.17.Final-${flink.shaded.version} org.apache.flink flink-shaded-netty-tcnative-dynamic - 2.0.74.Final-${flink.shaded.version} + 2.0.81.Final-${flink.shaded.version} test