Skip to content

Commit

Permalink
Ignite-9655-merge - Fixed compilation.
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexey Goncharuk committed Feb 12, 2015
1 parent c131bf0 commit df55ba9
Show file tree
Hide file tree
Showing 15 changed files with 19 additions and 191 deletions.
10 changes: 0 additions & 10 deletions ...src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
View file
Expand Up @@ -173,16 +173,6 @@ public GridIoMessageFactory(MessageFormatter formatter, MessageFactory[] ext) {


break; break;


case 18:
msg = new GridCachePessimisticCheckCommittedTxRequest();

break;

case 19:
msg = new GridCachePessimisticCheckCommittedTxResponse();

break;

case 20: case 20:
msg = new GridCacheTtlUpdateRequest(); msg = new GridCacheTtlUpdateRequest();


Expand Down
7 changes: 0 additions & 7 deletions ...n/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
View file
Expand Up @@ -280,13 +280,6 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
cctx.time().removeTimeoutObject(resendTimeoutObj); cctx.time().removeTimeoutObject(resendTimeoutObj);
} }


/** {@inheritDoc} */
@Override protected void stop0(boolean cancel) {
super.stop0(cancel);

exchFuts = null;
}

/** {@inheritDoc} */ /** {@inheritDoc} */
@SuppressWarnings("LockAcquiredButNotSafelyReleased") @SuppressWarnings("LockAcquiredButNotSafelyReleased")
@Override protected void stop0(boolean cancel) { @Override protected void stop0(boolean cancel) {
Expand Down
30 changes: 0 additions & 30 deletions ...a/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
View file
Expand Up @@ -397,12 +397,6 @@ public long timeout() {
} }


switch (state) { switch (state) {
case 8:
if (!writer.writeObjectArray("drVersByIdx", drVersByIdx, GridCacheVersion.class))
return false;

state++;

case 9: case 9:
if (!writer.writeIgniteUuid("futId", futId)) if (!writer.writeIgniteUuid("futId", futId))
return false; return false;
Expand Down Expand Up @@ -486,13 +480,6 @@ public long timeout() {
return false; return false;


state++; state++;

case 23:
if (!writer.writeByteArray("writeEntriesBytes", writeEntriesBytes))
return false;

state++;

} }


return true; return true;
Expand All @@ -507,14 +494,6 @@ public long timeout() {
return false; return false;


switch (state) { switch (state) {
case 8:
drVersByIdx = reader.readObjectArray("drVersByIdx", GridCacheVersion.class);

if (!reader.isLastRead())
return false;

state++;

case 9: case 9:
futId = reader.readIgniteUuid("futId"); futId = reader.readIgniteUuid("futId");


Expand Down Expand Up @@ -626,15 +605,6 @@ public long timeout() {
return false; return false;


state++; state++;

case 23:
writeEntriesBytes = reader.readByteArray("writeEntriesBytes");

if (!reader.isLastRead())
return false;

state++;

} }


return true; return true;
Expand Down
30 changes: 0 additions & 30 deletions ...g/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
View file
Expand Up @@ -328,12 +328,6 @@ public boolean groupLock() {


state++; state++;


case 14:
if (!writer.writeCollection("recoveryWritesBytes", recoveryWritesBytes, byte[].class))
return false;

state++;

case 15: case 15:
if (!writer.writeBoolean("syncCommit", syncCommit)) if (!writer.writeBoolean("syncCommit", syncCommit))
return false; return false;
Expand Down Expand Up @@ -363,13 +357,6 @@ public boolean groupLock() {
return false; return false;


state++; state++;

case 20:
if (!writer.writeCollection("writeEntriesBytes", writeEntriesBytes, byte[].class))
return false;

state++;

} }


return true; return true;
Expand Down Expand Up @@ -432,14 +419,6 @@ public boolean groupLock() {


state++; state++;


case 14:
recoveryWritesBytes = reader.readCollection("recoveryWritesBytes", byte[].class);

if (!reader.isLastRead())
return false;

state++;

case 15: case 15:
syncCommit = reader.readBoolean("syncCommit"); syncCommit = reader.readBoolean("syncCommit");


Expand Down Expand Up @@ -481,15 +460,6 @@ public boolean groupLock() {
return false; return false;


state++; state++;

case 20:
writeEntriesBytes = reader.readCollection("writeEntriesBytes", byte[].class);

if (!reader.isLastRead())
return false;

state++;

} }


return true; return true;
Expand Down
14 changes: 0 additions & 14 deletions .../apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
View file
Expand Up @@ -469,12 +469,6 @@ private void writeCollection(ObjectOutput out, Collection<IgniteTxEntry<K, V>> c
} }


switch (state) { switch (state) {
case 8:
if (!writer.writeMessage("commitVer", commitVer))
return false;

state++;

case 9: case 9:
if (!writer.writeEnum("concurrency", concurrency)) if (!writer.writeEnum("concurrency", concurrency))
return false; return false;
Expand Down Expand Up @@ -567,14 +561,6 @@ private void writeCollection(ObjectOutput out, Collection<IgniteTxEntry<K, V>> c
return false; return false;


switch (state) { switch (state) {
case 8:
commitVer = reader.readMessage("commitVer");

if (!reader.isLastRead())
return false;

state++;

case 9: case 9:
concurrency = reader.readEnum("concurrency", IgniteTxConcurrency.class); concurrency = reader.readEnum("concurrency", IgniteTxConcurrency.class);


Expand Down
2 changes: 1 addition & 1 deletion ...n/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
View file
Expand Up @@ -1045,7 +1045,7 @@ void onResult(GridDhtLockResponse<K, V> res) {
// Fail the whole compound future. // Fail the whole compound future.
onError(res.error()); onError(res.error());
else { else {
Set<Integer> invalidParts = res.invalidPartitions(); Collection<Integer> invalidParts = res.invalidPartitions();


// Removing mappings for invalid partitions. // Removing mappings for invalid partitions.
if (!F.isEmpty(invalidParts)) { if (!F.isEmpty(invalidParts)) {
Expand Down
60 changes: 0 additions & 60 deletions ...a/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
View file
Expand Up @@ -23,7 +23,6 @@
import org.apache.ignite.internal.processors.cache.version.*; import org.apache.ignite.internal.processors.cache.version.*;
import org.apache.ignite.lang.*; import org.apache.ignite.lang.*;
import org.apache.ignite.transactions.*; import org.apache.ignite.transactions.*;
import org.apache.ignite.internal.util.*;
import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.tostring.*;
import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.plugin.extensions.communication.*; import org.apache.ignite.plugin.extensions.communication.*;
Expand Down Expand Up @@ -246,13 +245,10 @@ public Collection<GridCacheVersion> pendingVersions() {
_clone.sysInvalidate = sysInvalidate; _clone.sysInvalidate = sysInvalidate;
_clone.topVer = topVer; _clone.topVer = topVer;
_clone.pendingVers = pendingVers; _clone.pendingVers = pendingVers;
_clone.onePhaseCommit = onePhaseCommit;
_clone.writeVer = writeVer != null ? (GridCacheVersion)writeVer.clone() : null; _clone.writeVer = writeVer != null ? (GridCacheVersion)writeVer.clone() : null;
_clone.writeVer = writeVer; _clone.writeVer = writeVer;
_clone.subjId = subjId; _clone.subjId = subjId;
_clone.taskNameHash = taskNameHash; _clone.taskNameHash = taskNameHash;
_clone.ttls = ttls != null ? (GridLongList)ttls.clone() : null;
_clone.nearTtls = nearTtls != null ? (GridLongList)nearTtls.clone() : null;
} }


/** {@inheritDoc} */ /** {@inheritDoc} */
Expand Down Expand Up @@ -289,24 +285,6 @@ public Collection<GridCacheVersion> pendingVersions() {


state++; state++;


case 24:
if (!writer.writeMessage("nearTtls", nearTtls))
return false;

state++;

case 25:
if (!writer.writeCollection("nearWritesBytes", nearWritesBytes, byte[].class))
return false;

state++;

case 26:
if (!writer.writeBoolean("onePhaseCommit", onePhaseCommit))
return false;

state++;

case 27: case 27:
if (!writer.writeCollection("pendingVers", pendingVers, GridCacheVersion.class)) if (!writer.writeCollection("pendingVers", pendingVers, GridCacheVersion.class))
return false; return false;
Expand Down Expand Up @@ -337,12 +315,6 @@ public Collection<GridCacheVersion> pendingVersions() {


state++; state++;


case 32:
if (!writer.writeMessage("ttls", ttls))
return false;

state++;

case 33: case 33:
if (!writer.writeMessage("writeVer", writeVer)) if (!writer.writeMessage("writeVer", writeVer))
return false; return false;
Expand Down Expand Up @@ -387,30 +359,6 @@ public Collection<GridCacheVersion> pendingVersions() {


state++; state++;


case 24:
nearTtls = reader.readMessage("nearTtls");

if (!reader.isLastRead())
return false;

state++;

case 25:
nearWritesBytes = reader.readCollection("nearWritesBytes", byte[].class);

if (!reader.isLastRead())
return false;

state++;

case 26:
onePhaseCommit = reader.readBoolean("onePhaseCommit");

if (!reader.isLastRead())
return false;

state++;

case 27: case 27:
pendingVers = reader.readCollection("pendingVers", GridCacheVersion.class); pendingVers = reader.readCollection("pendingVers", GridCacheVersion.class);


Expand Down Expand Up @@ -451,14 +399,6 @@ public Collection<GridCacheVersion> pendingVersions() {


state++; state++;


case 32:
ttls = reader.readMessage("ttls");

if (!reader.isLastRead())
return false;

state++;

case 33: case 33:
writeVer = reader.readMessage("writeVer"); writeVer = reader.readMessage("writeVer");


Expand Down
12 changes: 5 additions & 7 deletions ...a/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
View file
Expand Up @@ -30,7 +30,6 @@
import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.*;
import org.apache.ignite.internal.util.future.*; import org.apache.ignite.internal.util.future.*;
import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.tostring.*;
import org.apache.ignite.transactions.*;
import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*; import org.apache.ignite.lang.*;
Expand All @@ -46,7 +45,6 @@
import static org.apache.ignite.transactions.IgniteTxState.*; import static org.apache.ignite.transactions.IgniteTxState.*;
import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.events.EventType.*;
import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
import static org.apache.ignite.transactions.IgniteTxState.*;


/** /**
* *
Expand Down Expand Up @@ -326,7 +324,7 @@ private void onEntriesLocked() {


for (T2<EntryProcessor<K, V, ?>, Object[]> t : txEntry.entryProcessors()) { for (T2<EntryProcessor<K, V, ?>, Object[]> t : txEntry.entryProcessors()) {
try { try {
CacheInvokeEntry<K, V> invokeEntry = new CacheInvokeEntry<>(key, val); CacheInvokeEntry<K, V> invokeEntry = new CacheInvokeEntry<>(txEntry.context(), key, val);


EntryProcessor<K, V, ?> processor = t.get1(); EntryProcessor<K, V, ?> processor = t.get1();


Expand Down Expand Up @@ -530,11 +528,11 @@ private boolean mapIfLocked() {
onComplete(); onComplete();


if (!tx.near()) { if (!tx.near()) {
if (tx.markFinalizing(IgniteTxEx.FinalizationStatus.USER_FINISH)) { if (tx.markFinalizing(IgniteInternalTx.FinalizationStatus.USER_FINISH)) {
IgniteInternalFuture<IgniteTx> fut = this.err.get() == null ? tx.commitAsync() : tx.rollbackAsync(); IgniteInternalFuture<IgniteInternalTx> fut = this.err.get() == null ? tx.commitAsync() : tx.rollbackAsync();


fut.listenAsync(new CIX1<IgniteInternalFuture<IgniteTx>>() { fut.listenAsync(new CIX1<IgniteInternalFuture<IgniteInternalTx>>() {
@Override public void applyx(IgniteInternalFuture<IgniteTx> gridCacheTxGridFuture) { @Override public void applyx(IgniteInternalFuture<IgniteInternalTx> gridCacheTxGridFuture) {
try { try {
if (replied.compareAndSet(false, true)) if (replied.compareAndSet(false, true))
sendPrepareResponse(res); sendPrepareResponse(res);
Expand Down
6 changes: 0 additions & 6 deletions ...ava/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
View file
Expand Up @@ -404,12 +404,6 @@ public long accessTtl() {


state++; state++;


case 29:
if (!commState.putBoolean(syncCommit))
return false;

commState.idx++;

case 30: case 30:
if (!writer.writeIgniteUuid("miniId", miniId)) if (!writer.writeIgniteUuid("miniId", miniId))
return false; return false;
Expand Down
7 changes: 2 additions & 5 deletions ...org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
View file
Expand Up @@ -26,19 +26,17 @@
import org.apache.ignite.internal.processors.cache.distributed.*; import org.apache.ignite.internal.processors.cache.distributed.*;
import org.apache.ignite.internal.processors.cache.distributed.dht.colocated.*; import org.apache.ignite.internal.processors.cache.distributed.dht.colocated.*;
import org.apache.ignite.internal.processors.cache.version.*; import org.apache.ignite.internal.processors.cache.version.*;
import org.apache.ignite.internal.util.*;
import org.apache.ignite.lang.*; import org.apache.ignite.lang.*;
import org.apache.ignite.transactions.*; import org.apache.ignite.transactions.*;
import org.apache.ignite.internal.managers.discovery.*;
import org.apache.ignite.internal.processors.cache.distributed.dht.*; import org.apache.ignite.internal.processors.cache.distributed.dht.*;
import org.apache.ignite.internal.processors.cache.transactions.*; import org.apache.ignite.internal.processors.cache.transactions.*;
import org.apache.ignite.internal.processors.cache.version.*;
import org.apache.ignite.internal.transactions.*; import org.apache.ignite.internal.transactions.*;
import org.apache.ignite.internal.util.future.*; import org.apache.ignite.internal.util.future.*;
import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.internal.util.lang.*;
import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.tostring.*;
import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
import org.jdk8.backport.*; import org.jdk8.backport.*;
import org.jetbrains.annotations.*; import org.jetbrains.annotations.*;


Expand All @@ -47,7 +45,6 @@
import java.util.*; import java.util.*;
import java.util.concurrent.atomic.*; import java.util.concurrent.atomic.*;


import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*; import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*;
import static org.apache.ignite.transactions.IgniteTxState.*; import static org.apache.ignite.transactions.IgniteTxState.*;


Expand Down Expand Up @@ -626,7 +623,7 @@ private void preparePessimistic() {
} }
else { else {
try { try {
cctx.io().send(node, req); cctx.io().send(node, req, tx.ioPolicy());
} }
catch (IgniteCheckedException e) { catch (IgniteCheckedException e) {
// Fail the whole thing. // Fail the whole thing.
Expand Down
5 changes: 0 additions & 5 deletions ...c/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
View file
Expand Up @@ -1832,11 +1832,6 @@ private static class TxShadow implements IgniteInternalTx {
return null; return null;
} }


/** {@inheritDoc} */
@Override public Collection<IgniteTxEntry> recoveryWrites() {
return null;
}

/** {@inheritDoc} */ /** {@inheritDoc} */
@Override public Collection<IgniteTxEntry> optimisticLockEntries() { @Override public Collection<IgniteTxEntry> optimisticLockEntries() {
return null; return null;
Expand Down

0 comments on commit df55ba9

Please sign in to comment.