Skip to content

Commit 708245a

Browse files
xternxtern
committed
cleanup
1 parent a90d1a5 commit 708245a

17 files changed

Lines changed: 25 additions & 208 deletions

File tree

‎modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/pagemem/JmhBatchUpdatesBenchmark.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@ private <K, V> CacheConfiguration<K, V> ccfg(boolean batch) {
191191
.setDataRegionName(batch ? REG_BATCH : REG_SINGLE);
192192
}
193193

194-
195194
/**
196195
* Test single updates.
197196
*

‎modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import org.apache.ignite.internal.processors.cluster.ClusterProcessor;
4444
import org.apache.ignite.internal.processors.cluster.GridClusterStateProcessor;
4545
import org.apache.ignite.internal.processors.compress.CompressionProcessor;
46-
import org.apache.ignite.internal.processors.configuration.distributed.DistributedConfigurationProcessor;
4746
import org.apache.ignite.internal.processors.continuous.GridContinuousProcessor;
4847
import org.apache.ignite.internal.processors.datastreamer.DataStreamProcessor;
4948
import org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor;
@@ -55,6 +54,7 @@
5554
import org.apache.ignite.internal.processors.job.GridJobProcessor;
5655
import org.apache.ignite.internal.processors.jobmetrics.GridJobMetricsProcessor;
5756
import org.apache.ignite.internal.processors.marshaller.GridMarshallerMappingProcessor;
57+
import org.apache.ignite.internal.processors.configuration.distributed.DistributedConfigurationProcessor;
5858
import org.apache.ignite.internal.processors.metastorage.DistributedMetaStorage;
5959
import org.apache.ignite.internal.processors.odbc.ClientListenerProcessor;
6060
import org.apache.ignite.internal.processors.platform.PlatformProcessor;

‎modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import org.apache.ignite.internal.managers.failover.GridFailoverManager;
4949
import org.apache.ignite.internal.managers.indexing.GridIndexingManager;
5050
import org.apache.ignite.internal.managers.loadbalancer.GridLoadBalancerManager;
51+
import org.apache.ignite.internal.processors.service.ServiceProcessorAdapter;
5152
import org.apache.ignite.internal.processors.affinity.GridAffinityProcessor;
5253
import org.apache.ignite.internal.processors.authentication.IgniteAuthenticationProcessor;
5354
import org.apache.ignite.internal.processors.cache.CacheConflictResolutionManager;
@@ -60,7 +61,6 @@
6061
import org.apache.ignite.internal.processors.cluster.ClusterProcessor;
6162
import org.apache.ignite.internal.processors.cluster.GridClusterStateProcessor;
6263
import org.apache.ignite.internal.processors.compress.CompressionProcessor;
63-
import org.apache.ignite.internal.processors.configuration.distributed.DistributedConfigurationProcessor;
6464
import org.apache.ignite.internal.processors.continuous.GridContinuousProcessor;
6565
import org.apache.ignite.internal.processors.datastreamer.DataStreamProcessor;
6666
import org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor;
@@ -72,6 +72,7 @@
7272
import org.apache.ignite.internal.processors.job.GridJobProcessor;
7373
import org.apache.ignite.internal.processors.jobmetrics.GridJobMetricsProcessor;
7474
import org.apache.ignite.internal.processors.marshaller.GridMarshallerMappingProcessor;
75+
import org.apache.ignite.internal.processors.configuration.distributed.DistributedConfigurationProcessor;
7576
import org.apache.ignite.internal.processors.metastorage.DistributedMetaStorage;
7677
import org.apache.ignite.internal.processors.nodevalidation.DiscoveryNodeValidationProcessor;
7778
import org.apache.ignite.internal.processors.odbc.ClientListenerProcessor;
@@ -86,7 +87,6 @@
8687
import org.apache.ignite.internal.processors.schedule.IgniteScheduleProcessorAdapter;
8788
import org.apache.ignite.internal.processors.security.GridSecurityProcessor;
8889
import org.apache.ignite.internal.processors.segmentation.GridSegmentationProcessor;
89-
import org.apache.ignite.internal.processors.service.ServiceProcessorAdapter;
9090
import org.apache.ignite.internal.processors.session.GridTaskSessionProcessor;
9191
import org.apache.ignite.internal.processors.subscription.GridInternalSubscriptionProcessor;
9292
import org.apache.ignite.internal.processors.task.GridTaskProcessor;

‎modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1614,7 +1614,7 @@ private boolean canUpdateOldRow(GridCacheContext cctx, @Nullable CacheDataRow ol
16141614
return false;
16151615

16161616
// Use grp.sharedGroup() flag since it is possible cacheId is not yet set here.
1617-
// boolean sizeWithCacheId = grp.sharedGroup();
1617+
boolean sizeWithCacheId = grp.sharedGroup();
16181618

16191619
int oldLen = oldRow.size();
16201620

@@ -1709,12 +1709,8 @@ private void invokeAll0(GridCacheContext cctx, List<CacheSearchRow> rows, Offhea
17091709
try {
17101710
assert cctx.shared().database().checkpointLockIsHeldByThread();
17111711

1712-
// ctx.kernalContext().diagnostic().beginTrack(PRELOAD_TREE_INVOKE);
1713-
17141712
dataTree.invokeAll(rows, CacheDataRowAdapter.RowData.NO_KEY, c);
17151713

1716-
// ctx.kernalContext().diagnostic().endTrack(PRELOAD_TREE_INVOKE);
1717-
17181714
for (T3<IgniteTree.OperationType, CacheDataRow, CacheDataRow> tuple : c.result()) {
17191715
IgniteTree.OperationType opType = tuple.get1();
17201716

@@ -1727,6 +1723,7 @@ private void invokeAll0(GridCacheContext cctx, List<CacheSearchRow> rows, Offhea
17271723
assert newRow != null : tuple;
17281724

17291725
finishUpdate(cctx, newRow, oldRow);
1726+
17301727
break;
17311728
}
17321729

@@ -1790,7 +1787,7 @@ private void invokeAll0(GridCacheContext cctx, List<CacheSearchRow> rows, Offhea
17901787
* @param cacheId Cache id.
17911788
* @return Made data row.
17921789
*/
1793-
@NotNull public DataRow makeDataRow(KeyCacheObject key, CacheObject val, GridCacheVersion ver, long expireTime,
1790+
@NotNull private DataRow makeDataRow(KeyCacheObject key, CacheObject val, GridCacheVersion ver, long expireTime,
17941791
int cacheId) {
17951792
if (key.partition() == -1)
17961793
key.partition(partId);
@@ -2618,17 +2615,13 @@ private void updatePendingEntries(GridCacheContext cctx, CacheDataRow newRow, @N
26182615
if (oldRow != null) {
26192616
assert oldRow.link() != 0 : oldRow;
26202617

2621-
if (pendingTree() != null && oldRow.expireTime() != 0) {
2622-
// cctx.kernalContext().diagnostic().beginTrack(PRELOAD_PENDING_TREE_REMOVE);
2618+
if (pendingTree() != null && oldRow.expireTime() != 0)
26232619
pendingTree().removex(new PendingRow(cacheId, oldRow.expireTime(), oldRow.link()));
2624-
// cctx.kernalContext().diagnostic().endTrack(PRELOAD_PENDING_TREE_REMOVE);
2625-
}
26262620
}
26272621

26282622
if (pendingTree() != null && expireTime != 0) {
2629-
// cctx.kernalContext().diagnostic().beginTrack(PRELOAD_PENDING_TREE_PUT);
26302623
pendingTree().putx(new PendingRow(cacheId, expireTime, newRow.link()));
2631-
// cctx.kernalContext().diagnostic().endTrack(PRELOAD_PENDING_TREE_PUT);
2624+
26322625
hasPendingEntries = true;
26332626
}
26342627
}
@@ -2899,7 +2892,6 @@ private void afterRowFound(@Nullable CacheDataRow row, KeyCacheObject key) throw
28992892
dataTree.destroy(new IgniteInClosure<CacheSearchRow>() {
29002893
@Override public void apply(CacheSearchRow row) {
29012894
try {
2902-
// log.info("Remove row: " + row.key().hashCode() + " link " + row.link());
29032895
rowStore.removeRow(row.link(), grp.statisticsHolderData());
29042896
}
29052897
catch (IgniteCheckedException e) {

‎modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1171,8 +1171,6 @@ private boolean preloadEntry(
11711171
) throws IgniteCheckedException {
11721172
assert ctx.database().checkpointLockIsHeldByThread();
11731173

1174-
// ctx.kernalContext().diagnostic().beginTrack(PRELOAD_ENTRY);
1175-
11761174
try {
11771175
GridCacheEntryEx cached = null;
11781176

@@ -1549,11 +1547,11 @@ private void partitionDone(UUID nodeId, int p, boolean updateState) {
15491547
int remainingRoutines = remaining.size() - 1;
15501548

15511549
U.log(log, "Completed " + ((remainingRoutines == 0 ? "(final) " : "") +
1552-
"rebalancing [grp=" + grp.cacheOrGroupName() +
1553-
", supplier=" + nodeId +
1554-
", topVer=" + topologyVersion() +
1555-
", progress=" + (routines - remainingRoutines) + "/" + routines + "," +
1556-
", batch=" + batchPageWriteEnabled + "]"));
1550+
"rebalancing [grp=" + grp.cacheOrGroupName() +
1551+
", supplier=" + nodeId +
1552+
", topVer=" + topologyVersion() +
1553+
", progress=" + (routines - remainingRoutines) + "/" + routines + "," +
1554+
", batch=" + batchPageWriteEnabled + "]"));
15571555

15581556
remaining.remove(nodeId);
15591557
}
@@ -1657,4 +1655,3 @@ private void sendRebalanceFinishedEvent() {
16571655
}
16581656
}
16591657
}
1660-

‎modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,6 @@ public void handleDemandMessage(int topicId, UUID nodeId, GridDhtPartitionDemand
255255
long maxBatchesCnt = grp.config().getRebalanceBatchesPrefetchCount();
256256

257257
if (sctx == null) {
258-
259258
if (log.isDebugEnabled())
260259
log.debug("Starting supplying rebalancing [" + supplyRoutineInfo(topicId, nodeId, demandMsg) +
261260
", fullPartitions=" + S.compact(demandMsg.partitions().fullSet()) +

‎modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
import org.apache.ignite.internal.processors.cache.GridCachePreloaderAdapter;
3939
import org.apache.ignite.internal.processors.cache.KeyCacheObject;
4040
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtFuture;
41+
import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionTopology;
4142
import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicAbstractUpdateRequest;
4243
import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtLocalPartition;
43-
import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionTopology;
4444
import org.apache.ignite.internal.util.future.GridCompoundFuture;
4545
import org.apache.ignite.internal.util.future.GridFinishedFuture;
4646
import org.apache.ignite.internal.util.future.GridFutureAdapter;

‎modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import java.util.concurrent.Executor;
3131
import java.util.concurrent.atomic.AtomicBoolean;
3232
import javax.cache.processor.EntryProcessor;
33-
import javax.naming.OperationNotSupportedException;
3433
import org.apache.ignite.IgniteCheckedException;
3534
import org.apache.ignite.IgniteException;
3635
import org.apache.ignite.failure.FailureContext;
@@ -52,14 +51,12 @@
5251
import org.apache.ignite.internal.pagemem.wal.record.delta.MetaPageUpdatePartitionDataRecord;
5352
import org.apache.ignite.internal.pagemem.wal.record.delta.PartitionDestroyRecord;
5453
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
55-
import org.apache.ignite.internal.processors.cache.BatchedCacheEntries;
5654
import org.apache.ignite.internal.processors.cache.CacheEntryPredicate;
5755
import org.apache.ignite.internal.processors.cache.CacheGroupContext;
5856
import org.apache.ignite.internal.processors.cache.CacheObject;
5957
import org.apache.ignite.internal.processors.cache.GridCacheContext;
6058
import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
6159
import org.apache.ignite.internal.processors.cache.GridCacheMvccEntryInfo;
62-
import org.apache.ignite.internal.processors.cache.GridCacheEntryInfo;
6360
import org.apache.ignite.internal.processors.cache.GridCacheTtlManager;
6461
import org.apache.ignite.internal.processors.cache.IgniteCacheOffheapManagerImpl;
6562
import org.apache.ignite.internal.processors.cache.KeyCacheObject;
@@ -87,7 +84,6 @@
8784
import org.apache.ignite.internal.processors.cache.persistence.wal.FileWALPointer;
8885
import org.apache.ignite.internal.processors.cache.tree.CacheDataRowStore;
8986
import org.apache.ignite.internal.processors.cache.tree.CacheDataTree;
90-
import org.apache.ignite.internal.processors.cache.tree.DataRow;
9187
import org.apache.ignite.internal.processors.cache.tree.PendingEntriesTree;
9288
import org.apache.ignite.internal.processors.cache.tree.PendingRow;
9389
import org.apache.ignite.internal.processors.cache.tree.mvcc.data.MvccUpdateResult;
@@ -102,7 +98,6 @@
10298
import org.apache.ignite.internal.util.typedef.internal.S;
10399
import org.apache.ignite.internal.util.typedef.internal.U;
104100
import org.apache.ignite.lang.IgniteBiTuple;
105-
import org.jetbrains.annotations.NotNull;
106101
import org.jetbrains.annotations.Nullable;
107102

108103
import static org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionState.MOVING;
@@ -1490,8 +1485,7 @@ private CacheDataStore init0(boolean checkExists) throws IgniteCheckedException
14901485
null,
14911486
ctx.wal(),
14921487
reuseRoot.pageId().pageId(),
1493-
reuseRoot.isAllocated(),
1494-
ctx.kernalContext()) {
1488+
reuseRoot.isAllocated()) {
14951489
/** {@inheritDoc} */
14961490
@Override protected long allocatePageNoReuse() throws IgniteCheckedException {
14971491
assert grp.shared().database().checkpointLockIsHeldByThread();

‎modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,7 @@ protected void initPageMemoryDataStructures(DataStorageConfiguration dbCfg) thro
254254
null,
255255
persistenceEnabled ? cctx.wal() : null,
256256
0L,
257-
true,
258-
cctx.kernalContext());
257+
true);
259258

260259
freeListMap.put(memPlcCfg.getName(), freeList);
261260
}

‎modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/RowStore.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828
import org.apache.ignite.internal.processors.query.GridQueryRowCacheCleaner;
2929
import org.apache.ignite.internal.stat.IoStatisticsHolder;
3030

31-
//import static org.apache.ignite.internal.processors.diag.DiagnosticTopics.PRELOAD_OFFHEAP_INVOKE_INSERT_FREELIST;
32-
33-
//import static org.apache.ignite.internal.processors.diag.DiagnosticTopics.PRELOAD_FREELIST_REMOVE;
34-
3531
/**
3632
* Data store for H2 rows.
3733
*/
@@ -85,12 +81,11 @@ public void removeRow(long link, IoStatisticsHolder statHolder) throws IgniteChe
8581
freeList.removeDataRowByLink(link, statHolder);
8682
else {
8783
ctx.database().checkpointReadLock();
88-
// ctx.kernalContext().diagnostic().beginTrack(PRELOAD_FREELIST_REMOVE);
84+
8985
try {
9086
freeList.removeDataRowByLink(link, statHolder);
9187
}
9288
finally {
93-
// ctx.kernalContext().diagnostic().endTrack(PRELOAD_FREELIST_REMOVE);
9489
ctx.database().checkpointReadUnlock();
9590
}
9691
}

0 commit comments

Comments
 (0)