b03a9705b144196bfde631328562008eb9fa48a6
Files Diff
- Added: 7
- Removed: 1
- Renamed: 0
- Modified: 16
Refactorings reported:
Refactoring Name | Occurences | ||
---|---|---|---|
Rename Method | 1 | ||
Rename Method public merge(qrys List<GridCacheSqlQuery>) : PartitionResult renamed to public mergeMapQueries(qrys List<GridCacheSqlQuery>) : PartitionResult in class org.apache.ignite.internal.processors.query.h2.affinity.PartitionExtractor | From | To | |
Move And Inline Method | 1 | ||
Move And Inline Method public merge(node1 PartitionSingleNode, node2 PartitionSingleNode) : PartitionGroupNode moved from class org.apache.ignite.internal.processors.query.h2.affinity.PartitionGroupNode to class org.apache.ignite.internal.processors.query.h2.affinity.PartitionCompositeNode & inlined to private optimizeSimpleOr(left PartitionSingleNode, right PartitionSingleNode) : PartitionNode | From | To | |
Change Parameter Type | 5 | ||
Change Parameter Type leftCol : Column to leftCol : GridSqlColumn in method private extractSingle(leftCol GridSqlColumn, rightConst GridSqlConst, rightParam GridSqlParameter, tblModel PartitionTableModel) : PartitionSingleNode in class org.apache.ignite.internal.processors.query.h2.affinity.PartitionExtractor | From | To | |
Change Parameter Type tbl : PartitionTableDescriptor to tbl : PartitionTable in method public PartitionParameterNode(tbl PartitionTable, indexing IgniteH2Indexing, idx int, dataType int) in class org.apache.ignite.internal.processors.query.h2.affinity.PartitionParameterNode | From | To | |
Change Parameter Type tblName : String to parts : int in method public PartitionTableAffinityDescriptor(affFunc PartitionAffinityFunctionType, parts int, hasNodeFilter boolean, dataRegion String) in class org.apache.ignite.internal.processors.query.h2.affinity.PartitionTableAffinityDescriptor | From | To | |
Change Parameter Type tbl : PartitionTableDescriptor to tbl : PartitionTable in method protected PartitionSingleNode(tbl PartitionTable) in class org.apache.ignite.internal.processors.query.h2.affinity.PartitionSingleNode | From | To | |
Change Parameter Type resolver : PartitionTableDescriptor to tbl : PartitionTable in method public PartitionConstantNode(tbl PartitionTable, part int) in class org.apache.ignite.internal.processors.query.h2.affinity.PartitionConstantNode | From | To | |
Inline Method | 4 | ||
Inline Method private descriptor(tbl GridH2Table) : PartitionTableDescriptor inlined to private extractSingle(leftCol GridSqlColumn, rightConst GridSqlConst, rightParam GridSqlParameter, tblModel PartitionTableModel) : PartitionSingleNode in class org.apache.ignite.internal.processors.query.h2.affinity.PartitionExtractor | From | To | |
Inline Method private descriptor(tbl GridH2Table) : PartitionTableDescriptor inlined to private tryExtractBetween(op GridSqlOperation, tblModel PartitionTableModel) : PartitionNode in class org.apache.ignite.internal.processors.query.h2.affinity.PartitionExtractor | From | To | |
Rename Variable | 6 | ||
Rename Variable desc : PartitionTableDescriptor to aff : PartitionTableAffinityDescriptor in method public mergeMapQueries(qrys List<GridCacheSqlQuery>) : PartitionResult in class org.apache.ignite.internal.processors.query.h2.affinity.PartitionExtractor | From | To | |
Rename Variable partitions : int[] to realParts0 : int[] in method private calculatePartitions(explicitParts int[], derivedParts PartitionResult, args Object[]) : int[] in class org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing | From | To | |
Rename Variable tblDesc : PartitionTableDescriptor to tbl0 : PartitionTable in method private extractSingle(leftCol GridSqlColumn, rightConst GridSqlConst, rightParam GridSqlParameter, tblModel PartitionTableModel) : PartitionSingleNode in class org.apache.ignite.internal.processors.query.h2.affinity.PartitionExtractor | From | To | |
Rename Variable partTree : PartitionNode to derivedParts : PartitionResult in method private doRunDistributedQuery(schemaName String, qry SqlFieldsQuery, twoStepQry GridCacheTwoStepQuery, meta List<GridQueryFieldMetadata>, keepBinary boolean, startTx boolean, mvccTracker MvccQueryTracker, cancel GridQueryCancel, registerAsNewQry boolean) : FieldsQueryCursor<List<?>> in class org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing | From | To | |
Rename Variable part : Integer to realPart : Integer in method private calculatePartitions(explicitParts int[], derivedParts PartitionResult, args Object[]) : int[] in class org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing | From | To | |
Rename Variable partitions0 : Collection<Integer> to realParts : Collection<Integer> in method private calculatePartitions(explicitParts int[], derivedParts PartitionResult, args Object[]) : int[] in class org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing | From | To | |
Rename Class | 2 | ||
Rename Class org.apache.ignite.internal.processors.query.h2.affinity.PartitionTableDescriptor renamed to org.apache.ignite.internal.processors.query.h2.affinity.PartitionTableAffinityDescriptor | From | To | |
Rename Class org.apache.ignite.internal.processors.query.h2.affinity.PartitionTableDescriptor renamed to org.apache.ignite.internal.processors.query.h2.affinity.PartitionTable | From | To | |
Replace Variable With Attribute | 1 | ||
Replace Variable With Attribute leftCol : GridSqlColumn to left : PartitionNode in method public unwrapColumn(ast GridSqlAst) : GridSqlColumn in class org.apache.ignite.internal.processors.query.h2.affinity.PartitionExtractor | From | To | |
Parameterize Variable | 2 | ||
Parameterize Variable left : GridSqlElement to ast : GridSqlAst in method public unwrapColumn(ast GridSqlAst) : GridSqlColumn in class org.apache.ignite.internal.processors.query.h2.affinity.PartitionExtractor | From | To | |
Parameterize Variable left : GridSqlAst to ast : GridSqlAst in method public unwrapColumn(ast GridSqlAst) : GridSqlColumn in class org.apache.ignite.internal.processors.query.h2.affinity.PartitionExtractor | From | To | |
Rename Attribute | 3 | ||
Rename Attribute desc : PartitionTableDescriptor to aff : PartitionTableAffinityDescriptor in class org.apache.ignite.internal.processors.query.h2.affinity.PartitionResult | From | To | |
Rename Attribute cacheName : String to dataRegion : String in class org.apache.ignite.internal.processors.query.h2.affinity.PartitionTableAffinityDescriptor | From | To | |
Rename Attribute tblName : String to parts : int in class org.apache.ignite.internal.processors.query.h2.affinity.PartitionTableAffinityDescriptor | From | To | |
Change Variable Type | 4 | ||
Change Variable Type left : GridSqlElement to ast : GridSqlAst in method public unwrapColumn(ast GridSqlAst) : GridSqlColumn in class org.apache.ignite.internal.processors.query.h2.affinity.PartitionExtractor | From | To | |
Change Variable Type desc : PartitionTableDescriptor to aff : PartitionTableAffinityDescriptor in method public mergeMapQueries(qrys List<GridCacheSqlQuery>) : PartitionResult in class org.apache.ignite.internal.processors.query.h2.affinity.PartitionExtractor | From | To | |
Change Variable Type tblDesc : PartitionTableDescriptor to tbl0 : PartitionTable in method private extractSingle(leftCol GridSqlColumn, rightConst GridSqlConst, rightParam GridSqlParameter, tblModel PartitionTableModel) : PartitionSingleNode in class org.apache.ignite.internal.processors.query.h2.affinity.PartitionExtractor | From | To | |
Change Variable Type partTree : PartitionNode to derivedParts : PartitionResult in method private doRunDistributedQuery(schemaName String, qry SqlFieldsQuery, twoStepQry GridCacheTwoStepQuery, meta List<GridQueryFieldMetadata>, keepBinary boolean, startTx boolean, mvccTracker MvccQueryTracker, cancel GridQueryCancel, registerAsNewQry boolean) : FieldsQueryCursor<List<?>> in class org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing | From | To | |
Change Attribute Type | 3 | ||
Change Attribute Type tblName : String to parts : int in class org.apache.ignite.internal.processors.query.h2.affinity.PartitionTableAffinityDescriptor | From | To | |
Change Attribute Type tbl : PartitionTableDescriptor to tbl : PartitionTable in class org.apache.ignite.internal.processors.query.h2.affinity.PartitionSingleNode | From | To | |
Change Attribute Type desc : PartitionTableDescriptor to aff : PartitionTableAffinityDescriptor in class org.apache.ignite.internal.processors.query.h2.affinity.PartitionResult | From | To | |
Extract Method | 5 | ||
Extract Method private calculatePartitions(explicitParts int[], derivedParts PartitionResult, args Object[]) : int[] extracted from private doRunDistributedQuery(schemaName String, qry SqlFieldsQuery, twoStepQry GridCacheTwoStepQuery, meta List<GridQueryFieldMetadata>, keepBinary boolean, startTx boolean, mvccTracker MvccQueryTracker, cancel GridQueryCancel, registerAsNewQry boolean) : FieldsQueryCursor<List<?>> in class org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing | From | To | |
Extract Method private isColumnForPartitionPruning0(col Column, strict boolean) : boolean extracted from public isColumnForPartitionPruning(col Column) : boolean in class org.apache.ignite.internal.processors.query.h2.opt.GridH2Table | From | To | |
Extract Method private calculateAffinityKeyColumn() : IndexColumn extracted from public GridH2Table(createTblData CreateTableData, desc GridH2RowDescriptor, rowFactory H2RowFactory, idxsFactory GridH2SystemIndexFactory, cacheInfo GridCacheContextInfo) in class org.apache.ignite.internal.processors.query.h2.opt.GridH2Table | From | To | |
Extract Method public unwrapColumn(ast GridSqlAst) : GridSqlColumn extracted from private extractFromIn(op GridSqlOperation) : PartitionNode in class org.apache.ignite.internal.processors.query.h2.affinity.PartitionExtractor | From | To | |
Extract Method public unwrapColumn(ast GridSqlAst) : GridSqlColumn extracted from private extractFromEqual(op GridSqlOperation) : PartitionNode in class org.apache.ignite.internal.processors.query.h2.affinity.PartitionExtractor | From | To | |
Rename Parameter | 3 | ||
Rename Parameter resolver : PartitionTableDescriptor to tbl : PartitionTable in method public PartitionConstantNode(tbl PartitionTable, part int) in class org.apache.ignite.internal.processors.query.h2.affinity.PartitionConstantNode | From | To | |
Rename Parameter cacheName : String to dataRegion : String in method public PartitionTableAffinityDescriptor(affFunc PartitionAffinityFunctionType, parts int, hasNodeFilter boolean, dataRegion String) in class org.apache.ignite.internal.processors.query.h2.affinity.PartitionTableAffinityDescriptor | From | To | |
Rename Parameter tblName : String to parts : int in method public PartitionTableAffinityDescriptor(affFunc PartitionAffinityFunctionType, parts int, hasNodeFilter boolean, dataRegion String) in class org.apache.ignite.internal.processors.query.h2.affinity.PartitionTableAffinityDescriptor | From | To |