drill 90f43bff7a01eaaee6c8861137759b05367dfcf3

90f43bff7a01eaaee6c8861137759b05367dfcf3

Files Diff

Added: 20
Removed: 3
Renamed: 0
Modified: 28

Link to commit

Dependency Action

Refactorings reported:

Refactoring Name	Occurences
Move And Rename Method	1
Move And Rename Method public closeCopier() : void from class org.apache.drill.exec.physical.impl.xsort.managed.OperatorCodeGenerator to public closeAll(groups Collection<? extends BatchGroup>) : void from class org.apache.drill.exec.physical.impl.xsort.managed.BatchGroup	From	To
Change Parameter Type	8
Change Parameter Type context : OperatorContext to allocator : BufferAllocator in method public BatchGroup(container VectorContainer, allocator BufferAllocator) in class org.apache.drill.exec.physical.impl.xsort.managed.BatchGroup	From	To
Change Parameter Type context : FragmentContext to context : FragmentExecContext in method public setup(context FragmentExecContext, allocator BufferAllocator, vector4 SelectionVector4, hyperBatch VectorContainer, outputBatchSize int) : void in class org.apache.drill.exec.physical.impl.xsort.managed.MSorter	From	To
Change Parameter Type holder : CopierHolder to holder : PriorityQueueCopierWrapper in method private BatchMerger(holder PriorityQueueCopierWrapper, schema BatchSchema, batchGroupList List<? extends BatchGroup>, outputContainer VectorContainer, targetRecordCount int) in class org.apache.drill.exec.physical.impl.xsort.managed.PriorityQueueCopierWrapper.BatchMerger	From	To
Change Parameter Type batchGroups : LinkedList<BatchGroup.InputBatch> to batchGroups : List<BatchGroup.InputBatch> in method public merge(batchGroups List<BatchGroup.InputBatch>) : void in class org.apache.drill.exec.physical.impl.xsort.managed.MergeSortWrapper	From	To
Change Parameter Type context : OperatorContext to allocator : BufferAllocator in method public InputBatch(container VectorContainer, sv2 SelectionVector2, allocator BufferAllocator, dataSize int) in class org.apache.drill.exec.physical.impl.xsort.managed.BatchGroup.InputBatch	From	To
Change Parameter Type holder : CopierHolder to holder : PriorityQueueCopierWrapper in method private BatchMerger(holder PriorityQueueCopierWrapper, schema BatchSchema, batchGroupList List<? extends BatchGroup>, targetRecordCount int) in class org.apache.drill.exec.physical.impl.xsort.managed.PriorityQueueCopierWrapper.BatchMerger	From	To
Change Parameter Type context : OperatorContext to allocator : BufferAllocator in method public SpilledRun(spillSet SpillSet, path String, allocator BufferAllocator) in class org.apache.drill.exec.physical.impl.xsort.managed.BatchGroup.SpilledRun	From	To
Change Parameter Type context : FragmentContext to context : FragmentExecContext in method public setup(context FragmentExecContext, allocator BufferAllocator, vector4 SelectionVector4, hyperBatch VectorContainer, outputBatchSize int) : void in class org.apache.drill.exec.physical.impl.xsort.managed.MSortTemplate	From	To
Move Method	8
Move Method private canUseMemoryMerge() : boolean from class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch to private canUseMemoryMerge() : boolean from class org.apache.drill.exec.physical.impl.xsort.managed.SortImpl	From	To
Move Method private analyzeIncomingBatch() : RecordBatchSizer from class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch to private analyzeIncomingBatch(incoming VectorAccessible) : RecordBatchSizer from class org.apache.drill.exec.physical.impl.xsort.managed.SortImpl	From	To
Move Method private mergeRuns(targetCount int) : void from class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch to private mergeRuns(targetCount int) : void from class org.apache.drill.exec.physical.impl.xsort.managed.SortImpl	From	To
Move Method private spillFromMemory() : void from class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch to private spillFromMemory() : void from class org.apache.drill.exec.physical.impl.xsort.managed.SortImpl	From	To
Move Method private isSpillNeeded(incomingSize int) : boolean from class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch to private isSpillNeeded(incomingSize int) : boolean from class org.apache.drill.exec.physical.impl.xsort.managed.SortImpl	From	To
Move Method private convertBatch() : VectorContainer from class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch to private convertBatch(incoming VectorAccessible) : VectorContainer from class org.apache.drill.exec.physical.impl.xsort.managed.BufferedBatches	From	To
Move Method private newSV2() : SelectionVector2 from class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch to private newSV2(incoming VectorAccessible) : SelectionVector2 from class org.apache.drill.exec.physical.impl.xsort.managed.BufferedBatches	From	To
Move Method private makeSelectionVector() : SelectionVector2 from class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch to private makeSelectionVector(incoming VectorAccessible) : SelectionVector2 from class org.apache.drill.exec.physical.impl.xsort.managed.BufferedBatches	From	To
Move Attribute	16
Move Attribute private inputRecordCount : int from class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch to private inputRecordCount : int from class org.apache.drill.exec.physical.impl.xsort.managed.SortMetrics	From	To
Move Attribute private totalInputBytes : long from class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch to private totalInputBytes : long from class org.apache.drill.exec.physical.impl.xsort.managed.SortMetrics	From	To
Move Attribute private spillSet : SpillSet from class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch to private spillSet : SpillSet from class org.apache.drill.exec.physical.impl.xsort.managed.SpilledRuns	From	To
Move Attribute private memoryLimit : long from class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch to private memoryLimit : long from class org.apache.drill.exec.physical.impl.xsort.managed.SortMemoryManager	From	To
Move Attribute private MIN_MERGED_BATCH_SIZE : int from class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch to public MIN_MERGED_BATCH_SIZE : int from class org.apache.drill.exec.physical.impl.xsort.managed.SortConfig	From	To
Move Attribute private spillFileSize : long from class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch to private spillFileSize : long from class org.apache.drill.exec.physical.impl.xsort.managed.SortConfig	From	To
Move Attribute private spillBatchRowCount : int from class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch to private spillBatchRowCount : int from class org.apache.drill.exec.physical.impl.xsort.managed.SortMemoryManager	From	To
Move Attribute private mergeLimit : int from class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch to private mergeLimit : int from class org.apache.drill.exec.physical.impl.xsort.managed.SortConfig	From	To
Move Attribute private MIN_SPILL_FILE_SIZE : long from class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch to public MIN_SPILL_FILE_SIZE : long from class org.apache.drill.exec.physical.impl.xsort.managed.SortConfig	From	To
Move Attribute private allocator : BufferAllocator from class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch to private allocator : BufferAllocator from class org.apache.drill.exec.physical.impl.xsort.managed.SortImpl	From	To
Move Attribute private spilledRuns : LinkedList<BatchGroup.SpilledRun> from class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch to private spilledRuns : LinkedList<BatchGroup.SpilledRun> from class org.apache.drill.exec.physical.impl.xsort.managed.SpilledRuns	From	To
Move Attribute private bufferedBatches : LinkedList<BatchGroup.InputBatch> from class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch to private bufferedBatches : LinkedList<BatchGroup.InputBatch> from class org.apache.drill.exec.physical.impl.xsort.managed.BufferedBatches	From	To
Move Attribute private minimumBufferSpace : long from class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch to private minimumBufferSpace : long from class org.apache.drill.exec.physical.impl.xsort.managed.SortMetrics	From	To
Move Attribute private inputBatchCount : int from class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch to private inputBatchCount : int from class org.apache.drill.exec.physical.impl.xsort.managed.SortMetrics	From	To
Move Attribute private mergeBatchRowCount : int from class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch to private mergeBatchRowCount : int from class org.apache.drill.exec.physical.impl.xsort.managed.SortMemoryManager	From	To
Move Attribute private estimatedRowWidth : int from class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch to private estimatedRowWidth : int from class org.apache.drill.exec.physical.impl.xsort.managed.SortMemoryManager	From	To
Extract Class	5
Extract Class org.apache.drill.exec.physical.impl.xsort.managed.SortConfig from class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch	From	To
Extract Class org.apache.drill.exec.physical.impl.xsort.managed.SortImpl from class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch	From	To
Extract Class org.apache.drill.exec.physical.impl.xsort.managed.SpilledRuns from class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch	From	To
Extract Class org.apache.drill.exec.physical.impl.xsort.managed.SortMetrics from class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch	From	To
Extract Class org.apache.drill.exec.physical.impl.xsort.managed.SortMemoryManager from class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch	From	To
Extract Attribute	1
Extract Attribute public DEFAULT_SORT_ALLOCATION : long in class org.apache.drill.exec.physical.config.ExternalSort	From	To
Rename Class	2
Rename Class org.apache.drill.exec.physical.impl.xsort.managed.CopierHolder renamed to org.apache.drill.exec.physical.impl.xsort.managed.PriorityQueueCopierWrapper	From	To
Rename Class org.apache.drill.exec.physical.impl.xsort.managed.MergeSort renamed to org.apache.drill.exec.physical.impl.xsort.managed.MergeSortWrapper	From	To
Move Class	1
Move Class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch.SortResults moved to org.apache.drill.exec.physical.impl.xsort.managed.SortImpl.SortResults	From	To
Change Variable Type	3
Change Variable Type b : BatchGroup to sortImpl : SortImpl in method private setupSchema() : void in class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch	From	To
Change Variable Type w : VectorWrapper to w : VectorWrapper<?> in method private getBatch() : VectorContainer in class org.apache.drill.exec.physical.impl.xsort.BatchGroup	From	To
Change Variable Type w : VectorWrapper to w : VectorWrapper<?> in method private getBatch() : VectorContainer in class org.apache.drill.exec.physical.impl.xsort.managed.BatchGroup.SpilledRun	From	To
Inline Variable	1
Inline Variable recordCount : int in method public addBatch(newContainer VectorContainer) : void from class org.apache.drill.exec.physical.impl.xsort.managed.BatchGroup.SpilledRun	From	To
Extract Method	4
Extract Method public getSv4() : SelectionVector4 extracted from public merge(batchGroups LinkedList<BatchGroup.InputBatch>, batch VectorAccessible, destContainer VectorContainer) : SelectionVector4 in class org.apache.drill.exec.physical.impl.xsort.managed.MergeSortWrapper	From	To
Extract Method public build(outputContainer VectorContainer) : void extracted from public build(context FragmentContext, outputContainer VectorContainer) : void in class org.apache.drill.exec.physical.impl.sort.SortRecordBatchBuilder	From	To
Extract Method public getCopier(batch VectorAccessible) : PriorityQueueCopier extracted from private createCopier(batch VectorAccessible, batchGroupList List<? extends BatchGroup>, outputContainer VectorContainer) : void in class org.apache.drill.exec.physical.impl.xsort.managed.PriorityQueueCopierWrapper	From	To
Extract Method public getContainer() : VectorContainer extracted from public merge(batchGroups LinkedList<BatchGroup.InputBatch>, batch VectorAccessible, destContainer VectorContainer) : SelectionVector4 in class org.apache.drill.exec.physical.impl.xsort.managed.MergeSortWrapper	From	To
Rename Method	2
Rename Method public testSpilLeak() : void renamed to public testSpillLeakLegacy() : void in class org.apache.drill.exec.physical.impl.xsort.TestSortSpillWithException	From	To
Rename Method public getOutput() : VectorContainer renamed to public getContainer() : VectorContainer in class org.apache.drill.exec.physical.impl.xsort.managed.PriorityQueueCopierWrapper.BatchMerger	From	To
Inline Method	1
Inline Method private sortInMemory() : IterOutcome inlined to private load() : IterOutcome in class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch	From	To
Change Return Type	2
Change Return Type SelectionVector4 to void in method public merge(batchGroups List<BatchGroup.InputBatch>) : void in class org.apache.drill.exec.physical.impl.xsort.managed.MergeSortWrapper	From	To
Change Return Type CopierHolder.BatchMerger to BatchMerger in method public startMerge(schema BatchSchema, batchGroupList List<? extends BatchGroup>, outputContainer VectorContainer, targetRecordCount int) : BatchMerger in class org.apache.drill.exec.physical.impl.xsort.managed.PriorityQueueCopierWrapper	From	To
Replace Variable With Attribute	1
Replace Variable With Attribute b : BatchGroup to sortImpl : SortImpl in method private setupSchema() : void in class org.apache.drill.exec.physical.impl.xsort.managed.ExternalSortBatch	From	To
Extract Superclass	1
Extract Superclass org.apache.drill.exec.physical.impl.xsort.managed.BaseSortWrapper from classes [org.apache.drill.exec.physical.impl.xsort.managed.MergeSortWrapper, org.apache.drill.exec.physical.impl.xsort.managed.PriorityQueueCopierWrapper]	From	To
Rename Attribute	1
Rename Attribute context : OperatorContext to allocator : BufferAllocator in class org.apache.drill.exec.physical.impl.xsort.managed.BatchGroup	From	To
Change Attribute Type	3
Change Attribute Type context : OperatorContext to allocator : BufferAllocator in class org.apache.drill.exec.physical.impl.xsort.managed.BatchGroup	From	To
Change Attribute Type context : FragmentContext to context : FragmentExecContext in class org.apache.drill.exec.physical.impl.xsort.managed.MSortTemplate	From	To
Change Attribute Type holder : CopierHolder to holder : PriorityQueueCopierWrapper in class org.apache.drill.exec.physical.impl.xsort.managed.PriorityQueueCopierWrapper.BatchMerger	From	To
Rename Parameter	3
Rename Parameter context : OperatorContext to allocator : BufferAllocator in method public InputBatch(container VectorContainer, sv2 SelectionVector2, allocator BufferAllocator, dataSize int) in class org.apache.drill.exec.physical.impl.xsort.managed.BatchGroup.InputBatch	From	To
Rename Parameter context : OperatorContext to allocator : BufferAllocator in method public SpilledRun(spillSet SpillSet, path String, allocator BufferAllocator) in class org.apache.drill.exec.physical.impl.xsort.managed.BatchGroup.SpilledRun	From	To
Rename Parameter context : OperatorContext to allocator : BufferAllocator in method public BatchGroup(container VectorContainer, allocator BufferAllocator) in class org.apache.drill.exec.physical.impl.xsort.managed.BatchGroup	From	To

90f43bff7a01eaaee6c8861137759b05367dfcf3

Files Diff

Link to commit

Third party dependencies:

Refactorings reported: