From 21e17b1b216995c13ed1622b1374e1b9d053ec50 Mon Sep 17 00:00:00 2001 From: Pouryafard75 Date: Thu, 7 Mar 2024 20:43:23 -0500 Subject: [PATCH 1/3] ASTDiff: Update oracle for the String literals --- ...addthis.hydra.job.spawn.SpawnBalancer.json | 363 ++++++++++++++++++ ...tructures.timing.DataStructuresTiming.json | 11 + ..._fasterxml_jackson_core_JsonGenerator.json | 11 + .../resources/astDiff/defects4j/cases.json | 2 +- 4 files changed, 386 insertions(+), 1 deletion(-) diff --git a/src/test/resources/astDiff/commits/addthis_hydra/7fea4c9d5ee97d4a61ad985cadc9c5c0ab2db780/hydra-main.src.main.com.addthis.hydra.job.spawn.SpawnBalancer.json b/src/test/resources/astDiff/commits/addthis_hydra/7fea4c9d5ee97d4a61ad985cadc9c5c0ab2db780/hydra-main.src.main.com.addthis.hydra.job.spawn.SpawnBalancer.json index 1c97eeeb9d..49eace8c2b 100644 --- a/src/test/resources/astDiff/commits/addthis_hydra/7fea4c9d5ee97d4a61ad985cadc9c5c0ab2db780/hydra-main.src.main.com.addthis.hydra.job.spawn.SpawnBalancer.json +++ b/src/test/resources/astDiff/commits/addthis_hydra/7fea4c9d5ee97d4a61ad985cadc9c5c0ab2db780/hydra-main.src.main.com.addthis.hydra.job.spawn.SpawnBalancer.json @@ -13715,6 +13715,17 @@ "secondPos" : 17006, "firstEndPos" : 12251, "secondEndPos" : 17091 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\"[spawn.balancer] invalid call to pairTasksAndHosts: tasks=\"", + "secondLabel" : "\"[spawn.balancer] invalid call to pairTasksAndHosts: tasks={} hosts={}\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 12163, + "secondPos" : 17006, + "firstEndPos" : 12223, + "secondEndPos" : 17077 }, { "firstType" : "SimpleName", "secondType" : "SimpleName", @@ -13726,6 +13737,17 @@ "secondPos" : 17079, "firstEndPos" : 12231, "secondEndPos" : 17084 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\" hosts=\"", + "secondLabel" : "\"[spawn.balancer] invalid call to pairTasksAndHosts: tasks={} hosts={}\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 12234, + "secondPos" : 17006, + "firstEndPos" : 12243, + "secondEndPos" : 17077 }, { "firstType" : "SimpleName", "secondType" : "SimpleName", @@ -18302,6 +18324,17 @@ "secondPos" : 43955, "firstEndPos" : 15936, "secondEndPos" : 44049 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\"Rebalancing job: \"", + "secondLabel" : "\"Rebalancing job: {} maxTasksToMove={} maxPerHost={}\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 15835, + "secondPos" : 43955, + "firstEndPos" : 15854, + "secondEndPos" : 44008 }, { "firstType" : "MethodInvocation", "secondType" : "MethodInvocation", @@ -18346,6 +18379,17 @@ "secondPos" : 44014, "firstEndPos" : 15866, "secondEndPos" : 44019 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\" maxTasksToMove=\"", + "secondLabel" : "\"Rebalancing job: {} maxTasksToMove={} maxPerHost={}\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 15871, + "secondPos" : 43955, + "firstEndPos" : 15889, + "secondEndPos" : 44008 }, { "firstType" : "SimpleName", "secondType" : "SimpleName", @@ -18357,6 +18401,17 @@ "secondPos" : 44023, "firstEndPos" : 15906, "secondEndPos" : 44037 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\" maxPerHost=\"", + "secondLabel" : "\"Rebalancing job: {} maxTasksToMove={} maxPerHost={}\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 15909, + "secondPos" : 43955, + "firstEndPos" : 15923, + "secondEndPos" : 44008 }, { "firstType" : "SimpleName", "secondType" : "SimpleName", @@ -19391,6 +19446,17 @@ "secondPos" : 44682, "firstEndPos" : 16790, "secondEndPos" : 44885 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\"hostsSorted.size=\"", + "secondLabel" : "\"hostsSorted.size={} hostWithMost:{} hostWithLeast:{} mostTasksOnHost: {} leastTasksOnHost: {}\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 16544, + "secondPos" : 44682, + "firstEndPos" : 16563, + "secondEndPos" : 44777 }, { "firstType" : "MethodInvocation", "secondType" : "MethodInvocation", @@ -19435,6 +19501,17 @@ "secondPos" : 44815, "firstEndPos" : 16582, "secondEndPos" : 44819 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\" hostWithMost:\"", + "secondLabel" : "\"hostsSorted.size={} hostWithMost:{} hostWithLeast:{} mostTasksOnHost: {} leastTasksOnHost: {}\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 16613, + "secondPos" : 44682, + "firstEndPos" : 16629, + "secondEndPos" : 44777 }, { "firstType" : "SimpleName", "secondType" : "SimpleName", @@ -19446,6 +19523,17 @@ "secondPos" : 44823, "firstEndPos" : 16644, "secondEndPos" : 44835 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\" hostWithLeast:\"", + "secondLabel" : "\"hostsSorted.size={} hostWithMost:{} hostWithLeast:{} mostTasksOnHost: {} leastTasksOnHost: {}\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 16647, + "secondPos" : 44682, + "firstEndPos" : 16664, + "secondEndPos" : 44777 }, { "firstType" : "SimpleName", "secondType" : "SimpleName", @@ -19457,6 +19545,17 @@ "secondPos" : 44837, "firstEndPos" : 16680, "secondEndPos" : 44850 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\" mostTasksOnHost: \"", + "secondLabel" : "\"hostsSorted.size={} hostWithMost:{} hostWithLeast:{} mostTasksOnHost: {} leastTasksOnHost: {}\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 16709, + "secondPos" : 44682, + "firstEndPos" : 16729, + "secondEndPos" : 44777 }, { "firstType" : "SimpleName", "secondType" : "SimpleName", @@ -19468,6 +19567,17 @@ "secondPos" : 44852, "firstEndPos" : 16747, "secondEndPos" : 44867 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\" leastTasksOnHost: \"", + "secondLabel" : "\"hostsSorted.size={} hostWithMost:{} hostWithLeast:{} mostTasksOnHost: {} leastTasksOnHost: {}\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 16750, + "secondPos" : 44682, + "firstEndPos" : 16771, + "secondEndPos" : 44777 }, { "firstType" : "SimpleName", "secondType" : "SimpleName", @@ -22020,6 +22130,17 @@ "secondPos" : 58675, "firstEndPos" : 18924, "secondEndPos" : 58795 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\"received move assignment maxPerHost:\"", + "secondLabel" : "\"received move assignment maxPerHost:{} numToMove:{} pushHost:{}\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 18819, + "secondPos" : 58675, + "firstEndPos" : 18857, + "secondEndPos" : 58740 }, { "firstType" : "SimpleName", "secondType" : "SimpleName", @@ -22031,6 +22152,17 @@ "secondPos" : 58742, "firstEndPos" : 18870, "secondEndPos" : 58752 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\" numToMove:\"", + "secondLabel" : "\"received move assignment maxPerHost:{} numToMove:{} pushHost:{}\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 18873, + "secondPos" : 58675, + "firstEndPos" : 18886, + "secondEndPos" : 58740 }, { "firstType" : "SimpleName", "secondType" : "SimpleName", @@ -22042,6 +22174,17 @@ "secondPos" : 58754, "firstEndPos" : 18898, "secondEndPos" : 58763 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\" pushHost:\"", + "secondLabel" : "\"received move assignment maxPerHost:{} numToMove:{} pushHost:{}\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 18901, + "secondPos" : 58675, + "firstEndPos" : 18913, + "secondEndPos" : 58740 }, { "firstType" : "SimpleName", "secondType" : "SimpleName", @@ -40269,6 +40412,17 @@ "secondPos" : 46774, "firstEndPos" : 30395, "secondEndPos" : 46840 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\"[spawn.balancer] \"", + "secondLabel" : "\"[spawn.balancer] {} reallocation failed: host list empty\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 30325, + "secondPos" : 46774, + "firstEndPos" : 30344, + "secondEndPos" : 46832 }, { "firstType" : "SimpleName", "secondType" : "SimpleName", @@ -40280,6 +40434,17 @@ "secondPos" : 46834, "firstEndPos" : 30353, "secondEndPos" : 46840 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\" reallocation failed: host list empty\"", + "secondLabel" : "\"[spawn.balancer] {} reallocation failed: host list empty\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 30356, + "secondPos" : 46774, + "firstEndPos" : 30395, + "secondEndPos" : 46832 }, { "firstType" : "ReturnStatement", "secondType" : "ReturnStatement", @@ -41182,6 +41347,17 @@ "secondPos" : 47413, "firstEndPos" : 31051, "secondEndPos" : 47510 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\"[spawn.balancer] \"", + "secondLabel" : "\"[spawn.balancer] {} categorized as overloaded host; looking for tasks to push off of it\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 30950, + "secondPos" : 47413, + "firstEndPos" : 30969, + "secondEndPos" : 47502 }, { "firstType" : "SimpleName", "secondType" : "SimpleName", @@ -41193,6 +41369,17 @@ "secondPos" : 47504, "firstEndPos" : 30978, "secondEndPos" : 47510 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\" categorized as overloaded host; looking for tasks to push off of it\"", + "secondLabel" : "\"[spawn.balancer] {} categorized as overloaded host; looking for tasks to push off of it\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 30981, + "secondPos" : 47413, + "firstEndPos" : 31051, + "secondEndPos" : 47502 }, { "firstType" : "VariableDeclarationStatement", "secondType" : "VariableDeclarationStatement", @@ -41710,6 +41897,17 @@ "secondPos" : 47826, "firstEndPos" : 31467, "secondEndPos" : 47922 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\"[spawn.balancer] \"", + "secondLabel" : "\"[spawn.balancer] {} categorized as underloaded host; looking for tasks to pull onto it\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 31367, + "secondPos" : 47826, + "firstEndPos" : 31386, + "secondEndPos" : 47914 }, { "firstType" : "SimpleName", "secondType" : "SimpleName", @@ -41721,6 +41919,17 @@ "secondPos" : 47916, "firstEndPos" : 31395, "secondEndPos" : 47922 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\" categorized as underloaded host; looking for tasks to pull onto it\"", + "secondLabel" : "\"[spawn.balancer] {} categorized as underloaded host; looking for tasks to pull onto it\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 31398, + "secondPos" : 47826, + "firstEndPos" : 31467, + "secondEndPos" : 47914 }, { "firstType" : "VariableDeclarationStatement", "secondType" : "VariableDeclarationStatement", @@ -42260,6 +42469,17 @@ "secondPos" : 48243, "firstEndPos" : 31865, "secondEndPos" : 48336 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\"[spawn.balance] \"", + "secondLabel" : "\"[spawn.balance] {} categorized as overworked host; looking for tasks to push off it\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 31768, + "secondPos" : 48243, + "firstEndPos" : 31786, + "secondEndPos" : 48328 }, { "firstType" : "SimpleName", "secondType" : "SimpleName", @@ -42271,6 +42491,17 @@ "secondPos" : 48330, "firstEndPos" : 31795, "secondEndPos" : 48336 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\" categorized as overworked host; looking for tasks to push off it\"", + "secondLabel" : "\"[spawn.balance] {} categorized as overworked host; looking for tasks to push off it\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 31798, + "secondPos" : 48243, + "firstEndPos" : 31865, + "secondEndPos" : 48328 }, { "firstType" : "ExpressionStatement", "secondType" : "ExpressionStatement", @@ -75414,6 +75645,17 @@ "secondPos" : 54177, "firstEndPos" : 56853, "secondEndPos" : 54333 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\"[spawn.balancer] Host \"", + "secondLabel" : "\"[spawn.balancer] Host {} with uuid {} is nearly full, with used disk {}\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 56711, + "secondPos" : 54177, + "firstEndPos" : 56735, + "secondEndPos" : 54250 }, { "firstType" : "MethodInvocation", "secondType" : "MethodInvocation", @@ -75458,6 +75700,17 @@ "secondPos" : 54257, "firstEndPos" : 56750, "secondEndPos" : 54264 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\" with uuid \"", + "secondLabel" : "\"[spawn.balancer] Host {} with uuid {} is nearly full, with used disk {}\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 56755, + "secondPos" : 54177, + "firstEndPos" : 56768, + "secondEndPos" : 54250 }, { "firstType" : "MethodInvocation", "secondType" : "MethodInvocation", @@ -75502,6 +75755,17 @@ "secondPos" : 54294, "firstEndPos" : 56787, "secondEndPos" : 54305 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\" is nearly full, with used disk \"", + "secondLabel" : "\"[spawn.balancer] Host {} with uuid {} is nearly full, with used disk {}\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 56792, + "secondPos" : 54177, + "firstEndPos" : 56826, + "secondEndPos" : 54250 }, { "firstType" : "MethodInvocation", "secondType" : "MethodInvocation", @@ -93146,6 +93410,17 @@ "secondPos" : 36504, "firstEndPos" : 70040, "secondEndPos" : 36562 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\"Warning: failed to recover task \"", + "secondLabel" : "\"Warning: failed to recover task {}\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 69971, + "secondPos" : 36504, + "firstEndPos" : 70005, + "secondEndPos" : 36540 }, { "firstType" : "MethodInvocation", "secondType" : "MethodInvocation", @@ -93190,6 +93465,17 @@ "secondPos" : 36547, "firstEndPos" : 70022, "secondEndPos" : 36556 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\": \"", + "secondLabel" : "\"Warning: failed to recover task {}\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 70027, + "secondPos" : 36504, + "firstEndPos" : 70031, + "secondEndPos" : 36540 }, { "firstType" : "SimpleName", "secondType" : "SimpleName", @@ -93564,6 +93850,17 @@ "secondPos" : 36768, "firstEndPos" : 70304, "secondEndPos" : 36813 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\"Warning: failed to update job \"", + "secondLabel" : "\"Warning: failed to update job: {}\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 70250, + "secondPos" : 36768, + "firstEndPos" : 70282, + "secondEndPos" : 36803 }, { "firstType" : "SimpleName", "secondType" : "SimpleName", @@ -93575,6 +93872,17 @@ "secondPos" : 36805, "firstEndPos" : 70290, "secondEndPos" : 36810 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\": \"", + "secondLabel" : "\"Warning: failed to update job: {}\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 70293, + "secondPos" : 36768, + "firstEndPos" : 70297, + "secondEndPos" : 36803 }, { "firstType" : "SimpleName", "secondType" : "SimpleName", @@ -95621,6 +95929,17 @@ "secondPos" : 38175, "firstEndPos" : 71683, "secondEndPos" : 38237 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\"Skipping nonexistent job for task \"", + "secondLabel" : "\"Skipping nonexistent job for task {} during host fail.\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 71617, + "secondPos" : 38175, + "firstEndPos" : 71653, + "secondEndPos" : 38231 }, { "firstType" : "SimpleName", "secondType" : "SimpleName", @@ -95632,6 +95951,17 @@ "secondPos" : 38233, "firstEndPos" : 71660, "secondEndPos" : 38237 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\" during host fail.\"", + "secondLabel" : "\"Skipping nonexistent job for task {} during host fail.\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 71663, + "secondPos" : 38175, + "firstEndPos" : 71683, + "secondEndPos" : 38231 }, { "firstType" : "ReturnStatement", "secondType" : "ReturnStatement", @@ -96292,6 +96622,17 @@ "secondPos" : 38611, "firstEndPos" : 72102, "secondEndPos" : 38659 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\"Found no replica for task \"", + "secondLabel" : "\"Found no replica for task {}\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 72055, + "secondPos" : 38611, + "firstEndPos" : 72083, + "secondEndPos" : 38641 }, { "firstType" : "MethodInvocation", "secondType" : "MethodInvocation", @@ -97161,6 +97502,17 @@ "secondPos" : 39333, "firstEndPos" : 72859, "secondEndPos" : 39412 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\"Failed to find a host that could hold \"", + "secondLabel" : "\"Failed to find a host that could hold {} after host failure\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 72776, + "secondPos" : 39333, + "firstEndPos" : 72816, + "secondEndPos" : 39394 }, { "firstType" : "MethodInvocation", "secondType" : "MethodInvocation", @@ -97205,6 +97557,17 @@ "secondPos" : 39401, "firstEndPos" : 72833, "secondEndPos" : 39410 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\" after host failure\"", + "secondLabel" : "\"Failed to find a host that could hold {} after host failure\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 72838, + "secondPos" : 39333, + "firstEndPos" : 72859, + "secondEndPos" : 39394 }, { "firstType" : "ExpressionStatement", "secondType" : "ExpressionStatement", diff --git a/src/test/resources/astDiff/commits/phishman3579_java-algorithms-implementation/ab98bcacf6e5bf1c3a06f6bcca68f178f880ffc9/src.com.jwetherell.algorithms.data_structures.timing.DataStructuresTiming.json b/src/test/resources/astDiff/commits/phishman3579_java-algorithms-implementation/ab98bcacf6e5bf1c3a06f6bcca68f178f880ffc9/src.com.jwetherell.algorithms.data_structures.timing.DataStructuresTiming.json index a74e1cd928..8ae25a1ef0 100644 --- a/src/test/resources/astDiff/commits/phishman3579_java-algorithms-implementation/ab98bcacf6e5bf1c3a06f6bcca68f178f880ffc9/src.com.jwetherell.algorithms.data_structures.timing.DataStructuresTiming.json +++ b/src/test/resources/astDiff/commits/phishman3579_java-algorithms-implementation/ab98bcacf6e5bf1c3a06f6bcca68f178f880ffc9/src.com.jwetherell.algorithms.data_structures.timing.DataStructuresTiming.json @@ -115905,6 +115905,17 @@ "secondPos" : 67349, "firstEndPos" : 80395, "secondEndPos" : 67355 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\"Data Structure\"", + "secondLabel" : "\"Data Structure (\"", + "firstParentType" : "METHOD_INVOCATION_ARGUMENTS", + "secondParentType" : "InfixExpression", + "firstPos" : 80397, + "secondPos" : 67357, + "firstEndPos" : 80413, + "secondEndPos" : 67375 }, { "firstType" : "StringLiteral", "secondType" : "StringLiteral", diff --git a/src/test/resources/astDiff/defects4j/JacksonCore/20/src_main_java_com_fasterxml_jackson_core_JsonGenerator.json b/src/test/resources/astDiff/defects4j/JacksonCore/20/src_main_java_com_fasterxml_jackson_core_JsonGenerator.json index 27c6b26cbc..41e0fba09e 100644 --- a/src/test/resources/astDiff/defects4j/JacksonCore/20/src_main_java_com_fasterxml_jackson_core_JsonGenerator.json +++ b/src/test/resources/astDiff/defects4j/JacksonCore/20/src_main_java_com_fasterxml_jackson_core_JsonGenerator.json @@ -29775,6 +29775,17 @@ "secondPos" : 52755, "firstEndPos" : 52581, "secondEndPos" : 52778 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\"No native support for writing embedded objects\"", + "secondLabel" : "\"No native support for writing embedded objects of type \"", + "firstParentType" : "ClassInstanceCreation", + "secondParentType" : "InfixExpression", + "firstPos" : 52582, + "secondPos" : 52779, + "firstEndPos" : 52630, + "secondEndPos" : 52836 }, { "firstType" : "ThisExpression", "secondType" : "ThisExpression", diff --git a/src/test/resources/astDiff/defects4j/cases.json b/src/test/resources/astDiff/defects4j/cases.json index 6d4e9781df..5defd63f38 100644 --- a/src/test/resources/astDiff/defects4j/cases.json +++ b/src/test/resources/astDiff/defects4j/cases.json @@ -2044,7 +2044,7 @@ }, { "repo" : "Mockito", "commit" : "10" -},{ +}, { "repo" : "Jsoup", "commit" : "16" }, { From 134e93f7621a299a1ac9defab425d12645ebf411 Mon Sep 17 00:00:00 2001 From: Pouryafard75 Date: Thu, 7 Mar 2024 20:43:46 -0500 Subject: [PATCH 2/3] ASTDiff: Update logs --- .../refactoringminer/astDiff/matchers/ProjectASTDiffer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/refactoringminer/astDiff/matchers/ProjectASTDiffer.java b/src/main/java/org/refactoringminer/astDiff/matchers/ProjectASTDiffer.java index d5d54a1550..12d3f0eb1a 100644 --- a/src/main/java/org/refactoringminer/astDiff/matchers/ProjectASTDiffer.java +++ b/src/main/java/org/refactoringminer/astDiff/matchers/ProjectASTDiffer.java @@ -61,14 +61,14 @@ private void diff() throws RefactoringMinerTimedOutException { makeASTDiff(withCorrectOrder(modelDiff.getClassMoveDiffList()),false); makeASTDiff(modelDiff.getInnerClassMoveDiffList(),true); makeASTDiff(getExtraDiffs(),true); - long diff_execution_finished = System.currentTimeMillis(); - logger.info("Diff execution: " + (diff_execution_finished - diff_execution_started)/ 1000 + " seconds"); for (ASTDiff diff : projectASTDiff.getDiffSet()) { processOptimization(diff, optimizationDataMap.get(diff.getSrcPath())); } for (ASTDiff diff : projectASTDiff.getDiffSet()) { new MissingIdenticalSubtree().match(diff.src.getRoot(), diff.dst.getRoot(), diff.getAllMappings()); } + long diff_execution_finished = System.currentTimeMillis(); + logger.info("Diff execution: " + (diff_execution_finished - diff_execution_started)/ 1000 + " seconds"); computeAllEditScripts(); } From e91fa667c048c87ffdda91dcf35839b70b38f45a Mon Sep 17 00:00:00 2001 From: Pouryafard75 Date: Thu, 7 Mar 2024 21:22:57 -0500 Subject: [PATCH 3/3] ASTDiff: Update the snapshots --- ...tructures.timing.DataStructuresTiming.json | 11 ++ ...l.algorithms.sorts.timing.SortsTiming.json | 132 ++++++++++++++++++ 2 files changed, 143 insertions(+) diff --git a/src/test/resources/astDiff/PREV-SNAPSHOT/commits/phishman3579_java-algorithms-implementation/ab98bcacf6e5bf1c3a06f6bcca68f178f880ffc9/src.com.jwetherell.algorithms.data_structures.timing.DataStructuresTiming.json b/src/test/resources/astDiff/PREV-SNAPSHOT/commits/phishman3579_java-algorithms-implementation/ab98bcacf6e5bf1c3a06f6bcca68f178f880ffc9/src.com.jwetherell.algorithms.data_structures.timing.DataStructuresTiming.json index 5cf5f8808a..61589434a8 100644 --- a/src/test/resources/astDiff/PREV-SNAPSHOT/commits/phishman3579_java-algorithms-implementation/ab98bcacf6e5bf1c3a06f6bcca68f178f880ffc9/src.com.jwetherell.algorithms.data_structures.timing.DataStructuresTiming.json +++ b/src/test/resources/astDiff/PREV-SNAPSHOT/commits/phishman3579_java-algorithms-implementation/ab98bcacf6e5bf1c3a06f6bcca68f178f880ffc9/src.com.jwetherell.algorithms.data_structures.timing.DataStructuresTiming.json @@ -115806,6 +115806,17 @@ "secondPos" : 67349, "firstEndPos" : 80395, "secondEndPos" : 67355 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\"Data Structure\"", + "secondLabel" : "\"Data Structure (\"", + "firstParentType" : "METHOD_INVOCATION_ARGUMENTS", + "secondParentType" : "InfixExpression", + "firstPos" : 80397, + "secondPos" : 67357, + "firstEndPos" : 80413, + "secondEndPos" : 67375 }, { "firstType" : "StringLiteral", "secondType" : "StringLiteral", diff --git a/src/test/resources/astDiff/PREV-SNAPSHOT/commits/phishman3579_java-algorithms-implementation/f2385a56e6aa040ea4ff18a23ce5b63a4eeacf29/src.com.jwetherell.algorithms.sorts.timing.SortsTiming.json b/src/test/resources/astDiff/PREV-SNAPSHOT/commits/phishman3579_java-algorithms-implementation/f2385a56e6aa040ea4ff18a23ce5b63a4eeacf29/src.com.jwetherell.algorithms.sorts.timing.SortsTiming.json index 1f8872b279..405d9eca97 100644 --- a/src/test/resources/astDiff/PREV-SNAPSHOT/commits/phishman3579_java-algorithms-implementation/f2385a56e6aa040ea4ff18a23ce5b63a4eeacf29/src.com.jwetherell.algorithms.sorts.timing.SortsTiming.json +++ b/src/test/resources/astDiff/PREV-SNAPSHOT/commits/phishman3579_java-algorithms-implementation/f2385a56e6aa040ea4ff18a23ce5b63a4eeacf29/src.com.jwetherell.algorithms.sorts.timing.SortsTiming.json @@ -47980,6 +47980,17 @@ "secondPos" : 27759, "firstEndPos" : 27601, "secondEndPos" : 27897 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\"Insertion sort\\t\\t\\t\"", + "secondLabel" : "\"Insertion sort\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 27448, + "secondPos" : 27767, + "firstEndPos" : 27470, + "secondEndPos" : 27783 }, { "firstType" : "MethodInvocation", "secondType" : "MethodInvocation", @@ -48453,6 +48464,17 @@ "secondPos" : 27988, "firstEndPos" : 27835, "secondEndPos" : 28114 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\"Bubble sort\\t\\t\\t\"", + "secondLabel" : "\"Bubble sort\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 27694, + "secondPos" : 27996, + "firstEndPos" : 27713, + "secondEndPos" : 28009 }, { "firstType" : "MethodInvocation", "secondType" : "MethodInvocation", @@ -48926,6 +48948,17 @@ "secondPos" : 28204, "firstEndPos" : 28064, "secondEndPos" : 28326 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\"Shell sort\\t\\t\\t\"", + "secondLabel" : "\"Shell sort\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 27927, + "secondPos" : 28212, + "firstEndPos" : 27945, + "secondEndPos" : 28224 }, { "firstType" : "MethodInvocation", "secondType" : "MethodInvocation", @@ -49399,6 +49432,17 @@ "secondPos" : 28423, "firstEndPos" : 28330, "secondEndPos" : 28577 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\"Merge (in-place) sort\\t\\t\"", + "secondLabel" : "\"Merge (in-place) sort\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 28163, + "secondPos" : 28431, + "firstEndPos" : 28190, + "secondEndPos" : 28454 }, { "firstType" : "MethodInvocation", "secondType" : "MethodInvocation", @@ -49872,6 +49916,17 @@ "secondPos" : 28677, "firstEndPos" : 28610, "secondEndPos" : 28844 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\"Merge (not-in-place) sort\\t\"", + "secondLabel" : "\"Merge (not-in-place) sort\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 28432, + "secondPos" : 28685, + "firstEndPos" : 28461, + "secondEndPos" : 28712 }, { "firstType" : "MethodInvocation", "secondType" : "MethodInvocation", @@ -50345,6 +50400,17 @@ "secondPos" : 28934, "firstEndPos" : 28854, "secondEndPos" : 29075 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\"Quicksort with first as pivot\\t\"", + "secondLabel" : "\"Quicksort with first as pivot\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 28702, + "secondPos" : 28942, + "firstEndPos" : 28735, + "secondEndPos" : 28973 }, { "firstType" : "MethodInvocation", "secondType" : "MethodInvocation", @@ -50730,6 +50796,17 @@ "secondPos" : 29107, "firstEndPos" : 29041, "secondEndPos" : 29249 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\"Quicksort with middle as pivot\\t\"", + "secondLabel" : "\"Quicksort with middle as pivot\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 28888, + "secondPos" : 29115, + "firstEndPos" : 28922, + "secondEndPos" : 29147 }, { "firstType" : "MethodInvocation", "secondType" : "MethodInvocation", @@ -51115,6 +51192,17 @@ "secondPos" : 29281, "firstEndPos" : 29228, "secondEndPos" : 29423 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\"Quicksort with random as pivot\\t\"", + "secondLabel" : "\"Quicksort with random as pivot\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 29075, + "secondPos" : 29289, + "firstEndPos" : 29109, + "secondEndPos" : 29321 }, { "firstType" : "MethodInvocation", "secondType" : "MethodInvocation", @@ -51588,6 +51676,17 @@ "secondPos" : 29512, "firstEndPos" : 29452, "secondEndPos" : 29630 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\"Heap sort\\t\\t\\t\"", + "secondLabel" : "\"Heap sort\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 29319, + "secondPos" : 29520, + "firstEndPos" : 29336, + "secondEndPos" : 29531 }, { "firstType" : "MethodInvocation", "secondType" : "MethodInvocation", @@ -52061,6 +52160,17 @@ "secondPos" : 29723, "firstEndPos" : 29696, "secondEndPos" : 29857 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\"Counting sort\\t\\t\\t\"", + "secondLabel" : "\"Counting sort\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 29547, + "secondPos" : 29731, + "firstEndPos" : 29568, + "secondEndPos" : 29746 }, { "firstType" : "MethodInvocation", "secondType" : "MethodInvocation", @@ -52534,6 +52644,17 @@ "secondPos" : 29947, "firstEndPos" : 29925, "secondEndPos" : 30069 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\"Radix sort\\t\\t\\t\"", + "secondLabel" : "\"Radix sort\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 29788, + "secondPos" : 29955, + "firstEndPos" : 29806, + "secondEndPos" : 29967 }, { "firstType" : "MethodInvocation", "secondType" : "MethodInvocation", @@ -53007,6 +53128,17 @@ "secondPos" : 30166, "firstEndPos" : 30188, "secondEndPos" : 30317 +}, { + "firstType" : "StringLiteral", + "secondType" : "StringLiteral", + "firstLabel" : "\"American Flag sort\\t\\t\"", + "secondLabel" : "\"American Flag sort\"", + "firstParentType" : "InfixExpression", + "secondParentType" : "METHOD_INVOCATION_ARGUMENTS", + "firstPos" : 30024, + "secondPos" : 30174, + "firstEndPos" : 30048, + "secondEndPos" : 30194 }, { "firstType" : "MethodInvocation", "secondType" : "MethodInvocation",