Skip to content

Commit 470e8d0

Browse files
tsantalistsantalis
committed
Improvement for whitespace changes
1 parent 3b0ceec commit 470e8d0

File tree

5 files changed

+15
-12
lines changed

5 files changed

+15
-12
lines changed

‎src/main/java/org/codetracker/BlockTrackerChangeHistory.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1389,6 +1389,9 @@ public void processChange(Block blockBefore, Block blockAfter) {
13891389
subListFound = true;
13901390
for (int j=0; j<affectedLines.size(); j++) {
13911391
int actualLine = startBlock.signatureStartLine() + index + j;
1392+
if(equalOrStripEqual(original, revised, affectedLines.get(j))) {
1393+
continue;
1394+
}
13921395
if (lineChangeMap.containsKey(pair)) {
13931396
lineChangeMap.get(pair).add(actualLine);
13941397
}

‎src/test/resources/blame/blameTestWithLocalRepo17.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -514,12 +514,12 @@ dbecbe5df hadoop-mapreduce/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-res
514514
514)
515515
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 515) for (SchedulerRequestKey schedulerKey :
516516
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 516) application.getSchedulerKeys()) {
517-
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 517) int maxContainers =
517+
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 517) int maxContainers =
518518
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 518) getMaxAllocatableContainers(application, schedulerKey, node,
519-
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 519) NodeType.OFF_SWITCH);
519+
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 519) NodeType.OFF_SWITCH);
520520
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 520) // Ensure the application needs containers of this priority
521521
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 521) if (maxContainers > 0) {
522-
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 =
522+
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 =
523523
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);
524524
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
525525
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
590590
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
591591
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) ) {
592592
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
593-
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 =
593+
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 =
594594
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);
595595
595)
596596
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
597-
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 =
597+
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 =
598598
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);
599599
599)
600600
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
647647
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;
648648
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) }
649649
649)
650-
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 =
650+
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 =
651651
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,
652652
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());
653653
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-
969969
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
970970
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 &&
971971
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(),
972-
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)) {
972+
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)) {
973973
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() +
974974
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());
975975
975)

‎src/test/resources/blame/blameTestWithLocalRepo4.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -555,8 +555,8 @@ f8d5e2fda javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpre
555555
555)
556556
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<DifferenceElement> diffElements, int diffIndex) {
557557
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()
558-
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()
559-
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;
558+
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()
559+
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;
560560
7f177dcaa javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Difference.java (Thomas Leu 2018-05-18 21:48:21 +0000 560) }
561561
561)
562562
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<Integer> findIndexOfCorrespondingNodeTextElement(List<CsmElement> elements, NodeText nodeText, int startIndex, Node node) {

‎src/test/resources/blame/blameTestWithLocalRepo6.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ b915e42c3 spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method
278278
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)) {
279279
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,
280280
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<? extends HttpMessageConverter<?>>) converter.getClass(),
281-
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);
281+
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);
282282
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) {
283283
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()) {
284284
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) + "]");

0 commit comments

Comments
 (0)