This is an automated email from the ASF dual-hosted git repository.
pan3793 pushed a commit to branch branch-3.5
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.5 by this push:
new 7387479222c Revert "YARN-11964: Resource.castToIntSafely() should
clamp negative values to 0 (#8506)"
7387479222c is described below
commit 7387479222ce8da3c624d32705e6f639cb1e9eb5
Author: Cheng Pan <[email protected]>
AuthorDate: Mon Jun 1 15:30:40 2026 +0800
Revert "YARN-11964: Resource.castToIntSafely() should clamp negative values
to 0 (#8506)"
This reverts commit adad3de73364ac758087e25fb34209b507b92032.
---
.../main/java/org/apache/hadoop/yarn/api/records/Resource.java | 8 ++------
.../java/org/apache/hadoop/yarn/api/records/TestResource.java | 5 -----
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/Resource.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/Resource.java
index 9f73f96bece..80e569d5a9e 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/Resource.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/Resource.java
@@ -513,17 +513,13 @@ public int hashCode() {
}
/**
- * Convert long to int for a resource value safely. Negative values are
- * clamped to 0; values exceeding Integer.MAX_VALUE are clamped to
- * Integer.MAX_VALUE.
+ * Convert long to int for a resource value safely. This method assumes
+ * resource value is positive.
*
* @param value long resource value
* @return int resource value
*/
protected static int castToIntSafely(long value) {
- if (value < 0) {
- return 0;
- }
if (value > Integer.MAX_VALUE) {
return Integer.MAX_VALUE;
}
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/test/java/org/apache/hadoop/yarn/api/records/TestResource.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/test/java/org/apache/hadoop/yarn/api/records/TestResource.java
index 1d8f6ad8c32..060ca39c697 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/test/java/org/apache/hadoop/yarn/api/records/TestResource.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/test/java/org/apache/hadoop/yarn/api/records/TestResource.java
@@ -43,11 +43,6 @@ void testCastToIntSafely() {
Resource.castToIntSafely(Long.MAX_VALUE),
"Cast to Integer.MAX_VALUE if the long is greater than "
+ "Integer.MAX_VALUE");
-
- assertEquals(0, Resource.castToIntSafely(-1),
- "Cast to 0 if the long is negative");
- assertEquals(0, Resource.castToIntSafely(Long.MIN_VALUE),
- "Cast to 0 if the long is negative");
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
