From 470e8d01db58a26c0c410c5fd1354ff29da31fd1 Mon Sep 17 00:00:00 2001 From: tsantalis Date: Wed, 13 Nov 2024 16:34:32 -0500 Subject: [PATCH] Improvement for whitespace changes --- .../org/codetracker/BlockTrackerChangeHistory.java | 3 +++ .../resources/blame/blameTestWithLocalRepo17.txt | 14 +++++++------- .../resources/blame/blameTestWithLocalRepo4.txt | 4 ++-- .../resources/blame/blameTestWithLocalRepo6.txt | 2 +- .../resources/blame/blameTestWithLocalRepo8.txt | 4 ++-- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/codetracker/BlockTrackerChangeHistory.java b/src/main/java/org/codetracker/BlockTrackerChangeHistory.java index e5f9e31e40b..2ce9aa4586e 100644 --- a/src/main/java/org/codetracker/BlockTrackerChangeHistory.java +++ b/src/main/java/org/codetracker/BlockTrackerChangeHistory.java @@ -1389,6 +1389,9 @@ public void processChange(Block blockBefore, Block blockAfter) { subListFound = true; for (int j=0; j 0) { -5aace38b7 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java (Arun Suresh 2016-07-26 21:54:03 +0000 522) int assignedContainers = +dbecbe5df hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java (Vinod Kumar Vavilapalli 2011-08-18 11:07:10 +0000 522) int assignedContainers = 5aace38b7 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java (Arun Suresh 2016-07-26 21:54:03 +0000 523) assignContainersOnNode(node, application, schedulerKey); dbecbe5df hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java (Vinod Kumar Vavilapalli 2011-08-18 11:07:10 +0000 524) // Do not assign out of order w.r.t priorities dbecbe5df hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java (Vinod Kumar Vavilapalli 2011-08-18 11:07:10 +0000 525) if (assignedContainers == 0) { @@ -590,11 +590,11 @@ dbecbe5df hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-res de3b4aac5 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java (Jian He 2016-11-07 18:14:39 +0000 590) FifoAppAttempt application, SchedulerRequestKey schedulerKey dbecbe5df hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java (Vinod Kumar Vavilapalli 2011-08-18 11:07:10 +0000 591) ) { dbecbe5df hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java (Vinod Kumar Vavilapalli 2011-08-18 11:07:10 +0000 592) // Data-local -5aace38b7 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java (Arun Suresh 2016-07-26 21:54:03 +0000 593) int nodeLocalContainers = +dbecbe5df hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java (Vinod Kumar Vavilapalli 2011-08-18 11:07:10 +0000 593) int nodeLocalContainers = 5aace38b7 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java (Arun Suresh 2016-07-26 21:54:03 +0000 594) assignNodeLocalContainers(node, application, schedulerKey); 595) dbecbe5df hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java (Vinod Kumar Vavilapalli 2011-08-18 11:07:10 +0000 596) // Rack-local -5aace38b7 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java (Arun Suresh 2016-07-26 21:54:03 +0000 597) int rackLocalContainers = +dbecbe5df hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java (Vinod Kumar Vavilapalli 2011-08-18 11:07:10 +0000 597) int rackLocalContainers = 5aace38b7 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java (Arun Suresh 2016-07-26 21:54:03 +0000 598) assignRackLocalContainers(node, application, schedulerKey); 599) dbecbe5df hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java (Vinod Kumar Vavilapalli 2011-08-18 11:07:10 +0000 600) // Off-switch @@ -647,7 +647,7 @@ dbecbe5df hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-res 5183e8810 hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java (Arun Murthy 2011-09-14 22:46:57 +0000 647) return 0; 5183e8810 hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java (Arun Murthy 2011-09-14 22:46:57 +0000 648) } 649) -2977bc6a1 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java (Arun Suresh 2017-01-06 17:59:57 +0000 650) int assignableContainers = +dbecbe5df hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java (Vinod Kumar Vavilapalli 2011-08-18 11:07:10 +0000 650) int assignableContainers = 2977bc6a1 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java (Arun Suresh 2017-01-06 17:59:57 +0000 651) Math.min(getMaxAllocatableContainers(application, schedulerKey, node, 2977bc6a1 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java (Arun Suresh 2017-01-06 17:59:57 +0000 652) NodeType.RACK_LOCAL), rackAsk.getCount()); dbecbe5df hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java (Vinod Kumar Vavilapalli 2011-08-18 11:07:10 +0000 653) assignedContainers = @@ -969,7 +969,7 @@ e1d3670f4 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server- 0cd145a44 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java (Robert Kanter 2018-06-04 22:32:03 +0000 969) // A decommissioned node might be removed before we get here 0cd145a44 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java (Robert Kanter 2018-06-04 22:32:03 +0000 970) if (node != null && 0cd145a44 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java (Robert Kanter 2018-06-04 22:32:03 +0000 971) Resources.greaterThanOrEqual(resourceCalculator, getClusterResource(), -0cd145a44 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java (Robert Kanter 2018-06-04 22:32:03 +0000 972) node.getUnallocatedResource(), minimumAllocation)) { +f9692770a hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java (Karthik Kambatla 2016-02-28 17:35:59 +0000 972) node.getUnallocatedResource(), minimumAllocation)) { 754cb4e30 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java (Karthik Kambatla 2016-10-21 04:17:48 +0000 973) LOG.debug("Node heartbeat " + nm.getNodeID() + f9692770a hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java (Karthik Kambatla 2016-02-28 17:35:59 +0000 974) " available resource = " + node.getUnallocatedResource()); 975) diff --git a/src/test/resources/blame/blameTestWithLocalRepo4.txt b/src/test/resources/blame/blameTestWithLocalRepo4.txt index 65b5fd5e765..f6e21967aa5 100644 --- a/src/test/resources/blame/blameTestWithLocalRepo4.txt +++ b/src/test/resources/blame/blameTestWithLocalRepo4.txt @@ -555,8 +555,8 @@ f8d5e2fda javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpre 555) a25f53f88 javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Difference.java (Thomas Leu 2018-05-19 01:15:57 +0000 556) private boolean isFollowedByUnindent(List diffElements, int diffIndex) { 7f177dcaa javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Difference.java (Thomas Leu 2018-05-18 21:48:21 +0000 557) return (diffIndex + 1) < diffElements.size() -7f177dcaa javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Difference.java (Thomas Leu 2018-05-18 21:48:21 +0000 558) && diffElements.get(diffIndex + 1).isAdded() -7f177dcaa javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Difference.java (Thomas Leu 2018-05-18 21:48:21 +0000 559) && diffElements.get(diffIndex + 1).getElement() instanceof CsmUnindent; +fb8daf167 javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Difference.java (Thomas Leu 2018-05-17 21:24:24 +0000 558) && diffElements.get(diffIndex + 1).isAdded() +fb8daf167 javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Difference.java (Thomas Leu 2018-05-17 21:24:24 +0000 559) && diffElements.get(diffIndex + 1).getElement() instanceof CsmUnindent; 7f177dcaa javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Difference.java (Thomas Leu 2018-05-18 21:48:21 +0000 560) } 561) 5123e075b javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Difference.java (Thomas Leu 2018-05-11 01:47:00 +0000 562) private List findIndexOfCorrespondingNodeTextElement(List elements, NodeText nodeText, int startIndex, Node node) { diff --git a/src/test/resources/blame/blameTestWithLocalRepo6.txt b/src/test/resources/blame/blameTestWithLocalRepo6.txt index 3c272fba782..002fdae5f2b 100644 --- a/src/test/resources/blame/blameTestWithLocalRepo6.txt +++ b/src/test/resources/blame/blameTestWithLocalRepo6.txt @@ -278,7 +278,7 @@ b915e42c3 spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method 7dd8dc62a spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java (Juergen Hoeller 2017-06-13 09:37:58 +0000 278) converter.canWrite(valueType, selectedMediaType)) { 28a5c3009 spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java (Rossen Stoyanchev 2018-06-18 22:33:11 +0000 279) body = getAdvice().beforeBodyWrite(body, returnType, selectedMediaType, 7dd8dc62a spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java (Juergen Hoeller 2017-06-13 09:37:58 +0000 280) (Class>) converter.getClass(), -7dd8dc62a spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java (Juergen Hoeller 2017-06-13 09:37:58 +0000 281) inputMessage, outputMessage); +0556ed4f1 spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java (Rossen Stoyanchev 2015-03-30 01:42:14 +0000 281) inputMessage, outputMessage); 28a5c3009 spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java (Rossen Stoyanchev 2018-06-18 22:33:11 +0000 282) if (body != null) { acc75aa4b org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/AbstractMessageConverterMethodProcessor.java (Rossen Stoyanchev 2011-04-06 11:30:59 +0000 283) if (logger.isDebugEnabled()) { 29ce6685c spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java (Rossen Stoyanchev 2018-08-01 21:49:28 +0000 284) logger.debug("Writing [" + formatValue(body) + "]"); diff --git a/src/test/resources/blame/blameTestWithLocalRepo8.txt b/src/test/resources/blame/blameTestWithLocalRepo8.txt index 7629fb605e5..ed361b75596 100644 --- a/src/test/resources/blame/blameTestWithLocalRepo8.txt +++ b/src/test/resources/blame/blameTestWithLocalRepo8.txt @@ -2370,7 +2370,7 @@ e14f58de2 core/src/main/java/org/hibernate/cfg/AnnotationBinder.java ( 7337743c9 annotations/src/java/org/hibernate/cfg/AnnotationBinder.java (Steve Ebersole 2008-10-28 18:41:10 +0000 2370) throw new AnnotationException( 174a568f8 annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java (Emmanuel Bernard 2010-01-21 13:16:05 +0000 2371) "@IdClass class should not have @Id nor @EmbeddedId properties: " 174a568f8 annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java (Emmanuel Bernard 2010-01-21 13:16:05 +0000 2372) + BinderHelper.getPath( propertyHolder, inferredData ) -174a568f8 annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java (Emmanuel Bernard 2010-01-21 13:16:05 +0000 2373) ); +7337743c9 annotations/src/java/org/hibernate/cfg/AnnotationBinder.java (Steve Ebersole 2008-10-28 18:41:10 +0000 2373) ); 7337743c9 annotations/src/java/org/hibernate/cfg/AnnotationBinder.java (Steve Ebersole 2008-10-28 18:41:10 +0000 2374) } 9a75fa8d9 hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java (Steve Ebersole 2017-12-13 12:19:31 +0000 2375) XClass entityXClass = inferredData.getClassOrElement(); 9a75fa8d9 hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java (Steve Ebersole 2017-12-13 12:19:31 +0000 2376) XProperty idXProperty = inferredData.getProperty(); @@ -2576,7 +2576,7 @@ d9a1022f3 annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java ( 8577a68e6 annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java (Emmanuel Bernard 2010-01-21 17:51:09 +0000 2576) if ( propertyHolder.getPersistentClass().getIdentifier() != null ) { 8577a68e6 annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java (Emmanuel Bernard 2010-01-21 17:51:09 +0000 2577) throw new AnnotationException( 8577a68e6 annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java (Emmanuel Bernard 2010-01-21 17:51:09 +0000 2578) comp.getComponentClassName() -153ad753e annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java (Hardy Ferentschik 2010-03-04 21:55:10 +0000 2579) + " must not have @Id properties when used as an @EmbeddedId: " +8577a68e6 annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java (Emmanuel Bernard 2010-01-21 17:51:09 +0000 2579) + " must not have @Id properties when used as an @EmbeddedId: " 153ad753e annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java (Hardy Ferentschik 2010-03-04 21:55:10 +0000 2580) + BinderHelper.getPath( propertyHolder, inferredData ) 153ad753e annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java (Hardy Ferentschik 2010-03-04 21:55:10 +0000 2581) ); 8577a68e6 annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java (Emmanuel Bernard 2010-01-21 17:51:09 +0000 2582) }