Fix CommandLine failing tests

tsantalis · Jan 9, 2025 · 0ac6764 · 0ac6764
1 parent a7eeb09
commit 0ac6764
Show file tree

Hide file tree

Showing 2 changed files with 168 additions and 0 deletions.
diff --git a/src/test/resources/commandline/drill-1517a87eb1effb2aac0c75b5f5ea6abc25407ab0-expected.json b/src/test/resources/commandline/drill-1517a87eb1effb2aac0c75b5f5ea6abc25407ab0-expected.json
@@ -538,6 +538,90 @@
 		"codeElement": null
 }]
 },
+{
+	"type": "Rename Variable",
+	"description": "Rename Variable operatorMemory : null to entry : null in method private ensureOperatorMemoryWithinLimits(memoryPerOperator Map<DrillNode,List<Pair<PhysicalOperator,Long>>>, nodeResourceMap Map<DrillNode,NodeResources>, nodeLimit long) : Map<DrillNode,List<Pair<PhysicalOperator,Long>>> from class org.apache.drill.exec.planner.fragment.DistributedQueueParallelizer",
+	"leftSideLocations": [{
+		"filePath": "exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DistributedQueueParallelizer.java",
+		"startLine": 206,
+		"endLine": 206,
+		"startColumn": 7,
+		"endColumn": 21,
+		"codeElementType": "LAMBDA_EXPRESSION_PARAMETER",
+		"description": "original variable declaration",
+		"codeElement": "operatorMemory : null"
+}, {
+		"filePath": "exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DistributedQueueParallelizer.java",
+		"startLine": 207,
+		"endLine": 207,
+		"startColumn": 9,
+		"endColumn": 78,
+		"codeElementType": "EXPRESSION_STATEMENT",
+		"description": "statement referencing the original variable",
+		"codeElement": null
+}],
+	"rightSideLocations": [{
+		"filePath": "exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DistributedQueueParallelizer.java",
+		"startLine": 208,
+		"endLine": 208,
+		"startColumn": 47,
+		"endColumn": 52,
+		"codeElementType": "LAMBDA_EXPRESSION_PARAMETER",
+		"description": "renamed variable declaration",
+		"codeElement": "entry : null"
+}, {
+		"filePath": "exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DistributedQueueParallelizer.java",
+		"startLine": 224,
+		"endLine": 224,
+		"startColumn": 9,
+		"endColumn": 69,
+		"codeElementType": "EXPRESSION_STATEMENT",
+		"description": "statement referencing the renamed variable",
+		"codeElement": null
+}]
+},
+{
+	"type": "Rename Variable",
+	"description": "Rename Variable operatorMemory : null to operatorAndMemory : null in method private ensureOperatorMemoryWithinLimits(memoryPerOperator Map<DrillNode,List<Pair<PhysicalOperator,Long>>>, nodeResourceMap Map<DrillNode,NodeResources>, nodeLimit long) : Map<DrillNode,List<Pair<PhysicalOperator,Long>>> from class org.apache.drill.exec.planner.fragment.DistributedQueueParallelizer",
+	"leftSideLocations": [{
+		"filePath": "exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DistributedQueueParallelizer.java",
+		"startLine": 192,
+		"endLine": 192,
+		"startColumn": 91,
+		"endColumn": 105,
+		"codeElementType": "LAMBDA_EXPRESSION_PARAMETER",
+		"description": "original variable declaration",
+		"codeElement": "operatorMemory : null"
+}, {
+		"filePath": "exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DistributedQueueParallelizer.java",
+		"startLine": 194,
+		"endLine": 194,
+		"startColumn": 11,
+		"endColumn": 120,
+		"codeElementType": "RETURN_STATEMENT",
+		"description": "statement referencing the original variable",
+		"codeElement": null
+}],
+	"rightSideLocations": [{
+		"filePath": "exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DistributedQueueParallelizer.java",
+		"startLine": 218,
+		"endLine": 218,
+		"startColumn": 91,
+		"endColumn": 108,
+		"codeElementType": "LAMBDA_EXPRESSION_PARAMETER",
+		"description": "renamed variable declaration",
+		"codeElement": "operatorAndMemory : null"
+}, {
+		"filePath": "exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DistributedQueueParallelizer.java",
+		"startLine": 220,
+		"endLine": 222,
+		"startColumn": 11,
+		"endColumn": 147,
+		"codeElementType": "RETURN_STATEMENT",
+		"description": "statement referencing the renamed variable",
+		"codeElement": null
+}]
+},
 {
 	"type": "Rename Variable",
 	"description": "Rename Variable totalMemory : Long to totalBufferedOperatorsMemoryReq : Long in method private ensureOperatorMemoryWithinLimits(memoryPerOperator Map<DrillNode,List<Pair<PhysicalOperator,Long>>>, nodeResourceMap Map<DrillNode,NodeResources>, nodeLimit long) : Map<DrillNode,List<Pair<PhysicalOperator,Long>>> from class org.apache.drill.exec.planner.fragment.DistributedQueueParallelizer",

diff --git a/src/test/resources/commandline/drill-gp-expected.json b/src/test/resources/commandline/drill-gp-expected.json
@@ -13246,6 +13246,90 @@
 		"codeElement": null
 }]
 },
+{
+	"type": "Rename Variable",
+	"description": "Rename Variable operatorMemory : null to entry : null in method private ensureOperatorMemoryWithinLimits(memoryPerOperator Map<DrillNode,List<Pair<PhysicalOperator,Long>>>, nodeResourceMap Map<DrillNode,NodeResources>, nodeLimit long) : Map<DrillNode,List<Pair<PhysicalOperator,Long>>> from class org.apache.drill.exec.planner.fragment.DistributedQueueParallelizer",
+	"leftSideLocations": [{
+		"filePath": "exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DistributedQueueParallelizer.java",
+		"startLine": 206,
+		"endLine": 206,
+		"startColumn": 7,
+		"endColumn": 21,
+		"codeElementType": "LAMBDA_EXPRESSION_PARAMETER",
+		"description": "original variable declaration",
+		"codeElement": "operatorMemory : null"
+}, {
+		"filePath": "exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DistributedQueueParallelizer.java",
+		"startLine": 207,
+		"endLine": 207,
+		"startColumn": 9,
+		"endColumn": 78,
+		"codeElementType": "EXPRESSION_STATEMENT",
+		"description": "statement referencing the original variable",
+		"codeElement": null
+}],
+	"rightSideLocations": [{
+		"filePath": "exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DistributedQueueParallelizer.java",
+		"startLine": 208,
+		"endLine": 208,
+		"startColumn": 47,
+		"endColumn": 52,
+		"codeElementType": "LAMBDA_EXPRESSION_PARAMETER",
+		"description": "renamed variable declaration",
+		"codeElement": "entry : null"
+}, {
+		"filePath": "exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DistributedQueueParallelizer.java",
+		"startLine": 224,
+		"endLine": 224,
+		"startColumn": 9,
+		"endColumn": 69,
+		"codeElementType": "EXPRESSION_STATEMENT",
+		"description": "statement referencing the renamed variable",
+		"codeElement": null
+}]
+},
+{
+	"type": "Rename Variable",
+	"description": "Rename Variable operatorMemory : null to operatorAndMemory : null in method private ensureOperatorMemoryWithinLimits(memoryPerOperator Map<DrillNode,List<Pair<PhysicalOperator,Long>>>, nodeResourceMap Map<DrillNode,NodeResources>, nodeLimit long) : Map<DrillNode,List<Pair<PhysicalOperator,Long>>> from class org.apache.drill.exec.planner.fragment.DistributedQueueParallelizer",
+	"leftSideLocations": [{
+		"filePath": "exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DistributedQueueParallelizer.java",
+		"startLine": 192,
+		"endLine": 192,
+		"startColumn": 91,
+		"endColumn": 105,
+		"codeElementType": "LAMBDA_EXPRESSION_PARAMETER",
+		"description": "original variable declaration",
+		"codeElement": "operatorMemory : null"
+}, {
+		"filePath": "exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DistributedQueueParallelizer.java",
+		"startLine": 194,
+		"endLine": 194,
+		"startColumn": 11,
+		"endColumn": 120,
+		"codeElementType": "RETURN_STATEMENT",
+		"description": "statement referencing the original variable",
+		"codeElement": null
+}],
+	"rightSideLocations": [{
+		"filePath": "exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DistributedQueueParallelizer.java",
+		"startLine": 218,
+		"endLine": 218,
+		"startColumn": 91,
+		"endColumn": 108,
+		"codeElementType": "LAMBDA_EXPRESSION_PARAMETER",
+		"description": "renamed variable declaration",
+		"codeElement": "operatorAndMemory : null"
+}, {
+		"filePath": "exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DistributedQueueParallelizer.java",
+		"startLine": 220,
+		"endLine": 222,
+		"startColumn": 11,
+		"endColumn": 147,
+		"codeElementType": "RETURN_STATEMENT",
+		"description": "statement referencing the renamed variable",
+		"codeElement": null
+}]
+},
 {
 	"type": "Rename Variable",
 	"description": "Rename Variable totalMemory : Long to totalBufferedOperatorsMemoryReq : Long in method private ensureOperatorMemoryWithinLimits(memoryPerOperator Map<DrillNode,List<Pair<PhysicalOperator,Long>>>, nodeResourceMap Map<DrillNode,NodeResources>, nodeLimit long) : Map<DrillNode,List<Pair<PhysicalOperator,Long>>> from class org.apache.drill.exec.planner.fragment.DistributedQueueParallelizer",