YARN-11290. Fix CheckStyle.

Author: slfan1989

hadoop-yarn-project/hadoop-yarn/bin/FederationStateStore/SQLServer/FederationStateStoreStoreProcs.sql

@@ -117,21 +117,31 @@ AS BEGIN
     DECLARE @errorMessage nvarchar(4000)
 
     BEGIN TRY
-        SELECT
-            [applicationId],
-            [homeSubCluster],
-            [createTime]
-        FROM
-        (SELECT
-            [applicationId],
-            [homeSubCluster],
-            [createTime],
-            row_number() over(partition by [homeSubCluster] order by [createTime] desc) AS row_num
-        FROM [dbo].[applicationsHomeSubCluster]) AS t
-        WHERE row_num <= @limit
-          AND (CASE WHEN @homeSubCluster IS NULL THEN 1
-                    WHEN @homeSubCluster IS NOT NULL AND [homeSubCluster] = @homeSubCluster THEN 1
-               ELSE 0 END) = 1
+        IF @homeSubCluster = ''
+            SELECT
+                [applicationId],
+                [homeSubCluster],
+                [createTime]
+            FROM(SELECT
+                     [applicationId],
+                     [homeSubCluster],
+                     [createTime],
+                     row_number() over(order by [createTime] desc) AS app_rank
+                 FROM [dbo].[applicationsHomeSubCluster]) AS t
+            WHERE app_rank <= @limit;
+        ELSE
+            SELECT
+                [applicationId],
+                [homeSubCluster],
+                [createTime]
+            FROM(SELECT
+                     [applicationId],
+                     [homeSubCluster],
+                     [createTime],
+                     row_number() over(partition by [homeSubCluster] order by [createTime] desc) AS app_rank
+                 FROM [dbo].[applicationsHomeSubCluster]
+                 WHERE [homeSubCluster] = @homeSubCluster) AS t
+            WHERE app_rank <= @limit;
     END TRY
 
     BEGIN CATCH

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/ApplicationHomeSubCluster.java

@@ -55,8 +55,7 @@ public static ApplicationHomeSubCluster newInstance(ApplicationId appId,
   @Unstable
   public static ApplicationHomeSubCluster newInstance(ApplicationId appId, long createTime,
       SubClusterId homeSubCluster) {
-    ApplicationHomeSubCluster appMapping =
-        Records.newRecord(ApplicationHomeSubCluster.class);
+    ApplicationHomeSubCluster appMapping = Records.newRecord(ApplicationHomeSubCluster.class);
     appMapping.setApplicationId(appId);
     appMapping.setHomeSubCluster(homeSubCluster);
     appMapping.setCreateTime(createTime);

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/store/impl/FederationStateStoreBaseTest.java

@@ -83,8 +83,8 @@ public abstract class FederationStateStoreBaseTest {
 
   private static final MonotonicClock CLOCK = new MonotonicClock();
   private FederationStateStore stateStore;
-  private static final int TEN_ROUNDS = 10;
-  private static final int TWENTY_ROUNDS = 20;
+  private static final int NUM_APPS_10 = 10;
+  private static final int NUM_APPS_20 = 20;
 
   protected abstract FederationStateStore createStateStore();
 
@@ -428,7 +428,7 @@ public void testGetApplicationsHomeSubClusterFilter() throws Exception {
 
     Set<ApplicationHomeSubCluster> appHomeSubClusters = new HashSet<>();
 
-    for (int i = 0; i < TEN_ROUNDS; i++) {
+    for (int i = 0; i < NUM_APPS_10; i++) {
       ApplicationId appId = ApplicationId.newInstance(now, i);
       SubClusterId subClusterId = SubClusterId.newInstance("SC1");
       addApplicationHomeSC(appId, subClusterId);
@@ -438,7 +438,7 @@ public void testGetApplicationsHomeSubClusterFilter() throws Exception {
     }
 
     // Add ApplicationHomeSC - SC2
-    for (int i = TEN_ROUNDS; i < TWENTY_ROUNDS; i++) {
+    for (int i = 10; i < NUM_APPS_20; i++) {
       ApplicationId appId = ApplicationId.newInstance(now, i);
       SubClusterId subClusterId = SubClusterId.newInstance("SC2");
       addApplicationHomeSC(appId, subClusterId);