Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

IGNITE-19875 GridDhtTxLocalAdapter initial cleanup #10815

Merged
merged 1 commit into from
Jun 30, 2023
Merged

IGNITE-19875 GridDhtTxLocalAdapter initial cleanup #10815

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 2 additions & 21 deletions ...va/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter;
import org.apache.ignite.internal.processors.cache.transactions.TxCounters;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.apache.ignite.internal.processors.tracing.NoopSpan;
import org.apache.ignite.internal.processors.tracing.Span;
import org.apache.ignite.internal.util.F0;
import org.apache.ignite.internal.util.GridLeanMap;
import org.apache.ignite.internal.util.GridLeanSet;
Expand Down Expand Up @@ -85,10 +83,10 @@ public abstract class GridDhtTxLocalAdapter extends IgniteTxLocalAdapter {
AtomicReferenceFieldUpdater.newUpdater(GridDhtTxLocalAdapter.class, IgniteInternalFuture.class, "lockFut");

/** Near mappings. */
protected Map<UUID, GridDistributedTxMapping> nearMap = new ConcurrentHashMap<>();
protected final Map<UUID, GridDistributedTxMapping> nearMap = new ConcurrentHashMap<>();

/** DHT mappings. */
protected Map<UUID, GridDistributedTxMapping> dhtMap = new ConcurrentHashMap<>();
protected final Map<UUID, GridDistributedTxMapping> dhtMap = new ConcurrentHashMap<>();

/** Mapped flag. */
protected volatile boolean mapped;
Expand All @@ -109,9 +107,6 @@ public abstract class GridDhtTxLocalAdapter extends IgniteTxLocalAdapter {
@GridToStringExclude
protected volatile IgniteInternalFuture<?> lockFut;

/** Tracing span. */
private Span span = NoopSpan.INSTANCE;

/**
* @param xidVer Transaction version.
* @param implicit Implicit flag.
Expand Down Expand Up @@ -932,20 +927,6 @@ protected final IgniteInternalFuture<GridNearTxPrepareResponse> chainOnePhasePre
return prepFut;
}

/**
* @return Tracing span.
*/
public Span span() {
return span;
}

/**
* @param span New tracing span.
*/
public void span(Span span) {
this.span = span;
}

/** {@inheritDoc} */
@Override public String toString() {
return GridToStringBuilder.toString(GridDhtTxLocalAdapter.class, this, "nearNodes", nearMap.keySet(),
Expand Down