http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxIsolation.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxIsolation.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxIsolation.java deleted file mode 100644 index c5712cf..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxIsolation.java +++ /dev/null @@ -1,41 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.cache; - -import org.jetbrains.annotations.*; - -/** - * Defines different cache transaction isolation levels. See {@link GridCacheTx} - * documentation for more information about cache transaction isolation levels. - */ -public enum GridCacheTxIsolation { - /** Read committed isolation level. */ - READ_COMMITTED, - - /** Repeatable read isolation level. */ - REPEATABLE_READ, - - /** Serializable isolation level. */ - SERIALIZABLE; - - /** Enum values. */ - private static final GridCacheTxIsolation[] VALS = values(); - - /** - * Efficiently gets enumerated value from its ordinal. - * - * @param ord Ordinal value. - * @return Enumerated value or {@code null} if ordinal out of range. - */ - @Nullable - public static GridCacheTxIsolation fromOrdinal(int ord) { - return ord >= 0 && ord < VALS.length ? VALS[ord] : null; - } -}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxOptimisticException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxOptimisticException.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxOptimisticException.java deleted file mode 100644 index 992f9c7..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxOptimisticException.java +++ /dev/null @@ -1,39 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.cache; - -import org.apache.ignite.*; - -/** - * Exception thrown whenever grid transactions fail optimistically. - */ -public class GridCacheTxOptimisticException extends IgniteCheckedException { - /** */ - private static final long serialVersionUID = 0L; - - /** - * Creates new optimistic exception with given error message. - * - * @param msg Error message. - */ - public GridCacheTxOptimisticException(String msg) { - super(msg); - } - - /** - * Creates new optimistic exception with given error message and optional nested exception. - * - * @param msg Error message. - * @param cause Optional nested exception (can be <tt>null</tt>). - */ - public GridCacheTxOptimisticException(String msg, Throwable cause) { - super(msg, cause); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxRollbackException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxRollbackException.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxRollbackException.java deleted file mode 100644 index 0516575..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxRollbackException.java +++ /dev/null @@ -1,39 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.cache; - -import org.apache.ignite.*; - -/** - * Exception thrown whenever grid transactions has been automatically rolled back. - */ -public class GridCacheTxRollbackException extends IgniteCheckedException { - /** */ - private static final long serialVersionUID = 0L; - - /** - * Creates new rollback exception with given error message. - * - * @param msg Error message. - */ - public GridCacheTxRollbackException(String msg) { - super(msg); - } - - /** - * Creates new rollback exception with given error message and optional nested exception. - * - * @param msg Error message. - * @param cause Optional nested exception (can be <tt>null</tt>). - */ - public GridCacheTxRollbackException(String msg, Throwable cause) { - super(msg, cause); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxState.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxState.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxState.java deleted file mode 100644 index 468c94c..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxState.java +++ /dev/null @@ -1,57 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.cache; - -import org.jetbrains.annotations.*; - -/** - * Cache transaction state. - */ -public enum GridCacheTxState { - /** Transaction started. */ - ACTIVE, - - /** Transaction validating. */ - PREPARING, - - /** Transaction validation succeeded. */ - PREPARED, - - /** Transaction is marked for rollback. */ - MARKED_ROLLBACK, - - /** Transaction commit started (validating finished). */ - COMMITTING, - - /** Transaction commit succeeded. */ - COMMITTED, - - /** Transaction rollback started (validation failed). */ - ROLLING_BACK, - - /** Transaction rollback succeeded. */ - ROLLED_BACK, - - /** Transaction rollback failed or is otherwise unknown state. */ - UNKNOWN; - - /** Enumerated values. */ - private static final GridCacheTxState[] VALS = values(); - - /** - * Efficiently gets enumerated value from its ordinal. - * - * @param ord Ordinal value. - * @return Enumerated value or {@code null} if ordinal out of range. - */ - @Nullable public static GridCacheTxState fromOrdinal(int ord) { - return ord >= 0 && ord < VALS.length ? VALS[ord] : null; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxSynchronization.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxSynchronization.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxSynchronization.java deleted file mode 100644 index 2f6faf1..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxSynchronization.java +++ /dev/null @@ -1,37 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.cache; - -import org.jetbrains.annotations.*; - -/** - * Synchronization callback for transaction. You can subscribe to receive transaction - * state change callbacks by registering transaction synchronization via - * {@link GridCache#txSynchronize(GridCacheTxSynchronization)} method. - */ -public interface GridCacheTxSynchronization { - /** - * State change callback for transaction. Note that unless transaction has been - * completed, it is possible to mark it for <tt>rollbackOnly</tt> by calling - * {@link GridCacheTx#setRollbackOnly()} on the passed in transaction. - * You can check the return value of {@link GridCacheTx#setRollbackOnly() setRollbackOnly()} - * method to see if transaction was indeed marked for rollback or not. - * - * @param prevState Previous state of the transaction. If transaction has just been - * started, then previous state is {@code null}. - * @param newState New state of the transaction. In majority of the cases this will be the - * same as {@link GridCacheTx#state() tx.state()}, but it is also possible - * that transaction may be marked for rollback concurrently with this method - * invocation, and in that case <tt>newState</tt> reflects the actual state of the - * transition this callback is associated with. - * @param tx Transaction whose state has changed. - */ - public void onStateChanged(@Nullable GridCacheTxState prevState, GridCacheTxState newState, GridCacheTx tx); -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxTimeoutException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxTimeoutException.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxTimeoutException.java deleted file mode 100644 index 3f4c44a..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxTimeoutException.java +++ /dev/null @@ -1,39 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.cache; - -import org.apache.ignite.*; - -/** - * Exception thrown whenever grid transactions time out. - */ -public class GridCacheTxTimeoutException extends IgniteCheckedException { - /** */ - private static final long serialVersionUID = 0L; - - /** - * Creates new timeout exception with given error message. - * - * @param msg Error message. - */ - public GridCacheTxTimeoutException(String msg) { - super(msg); - } - - /** - * Creates new timeout exception with given error message and optional nested exception. - * - * @param msg Error message. - * @param cause Optional nested exception (can be <tt>null</tt>). - */ - public GridCacheTxTimeoutException(String msg, Throwable cause) { - super(msg, cause); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheWriteSynchronizationMode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheWriteSynchronizationMode.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheWriteSynchronizationMode.java index 4bff7d0..8ba72f6 100644 --- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheWriteSynchronizationMode.java +++ b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheWriteSynchronizationMode.java @@ -9,6 +9,7 @@ package org.gridgain.grid.cache; +import org.apache.ignite.transactions.*; import org.jetbrains.annotations.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/cache/GridTransactionsConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridTransactionsConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridTransactionsConfiguration.java deleted file mode 100644 index 9073025..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/cache/GridTransactionsConfiguration.java +++ /dev/null @@ -1,190 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.cache; - -/** - * Transactions configuration. - */ -public class GridTransactionsConfiguration { - /** Default value for 'txSerializableEnabled' flag. */ - public static final boolean DFLT_TX_SERIALIZABLE_ENABLED = false; - - /** Default concurrency mode. */ - public static final GridCacheTxConcurrency DFLT_TX_CONCURRENCY = GridCacheTxConcurrency.PESSIMISTIC; - - /** Default transaction isolation level. */ - public static final GridCacheTxIsolation DFLT_TX_ISOLATION = GridCacheTxIsolation.REPEATABLE_READ; - - /** Default transaction timeout. */ - public static final long DFLT_TRANSACTION_TIMEOUT = 0; - - /** Default size of pessimistic transactions log. */ - public static final int DFLT_PESSIMISTIC_TX_LOG_LINGER = 10_000; - - /** Default transaction serializable flag. */ - private boolean txSerEnabled = DFLT_TX_SERIALIZABLE_ENABLED; - - /** Transaction isolation. */ - private GridCacheTxIsolation dfltIsolation = DFLT_TX_ISOLATION; - - /** Cache concurrency. */ - private GridCacheTxConcurrency dfltConcurrency = DFLT_TX_CONCURRENCY; - - /** Default transaction timeout. */ - private long dfltTxTimeout = DFLT_TRANSACTION_TIMEOUT; - - /** Pessimistic tx log size. */ - private int pessimisticTxLogSize; - - /** Pessimistic tx log linger. */ - private int pessimisticTxLogLinger = DFLT_PESSIMISTIC_TX_LOG_LINGER; - - /** - * Empty constructor. - */ - public GridTransactionsConfiguration() { - // No-op. - } - - /** - * @param cfg Configuration to copy. - */ - public GridTransactionsConfiguration(GridTransactionsConfiguration cfg) { - dfltConcurrency = cfg.getDefaultTxConcurrency(); - dfltIsolation = cfg.getDefaultTxIsolation(); - dfltTxTimeout = cfg.getDefaultTxTimeout(); - pessimisticTxLogLinger = cfg.getPessimisticTxLogLinger(); - pessimisticTxLogSize = cfg.getPessimisticTxLogSize(); - txSerEnabled = cfg.isTxSerializableEnabled(); - } - - /** - * Gets flag to enable/disable {@link GridCacheTxIsolation#SERIALIZABLE} isolation - * level for cache transactions. Serializable level does carry certain overhead and - * if not used, should be disabled. Default value is {@code false}. - * - * @return {@code True} if serializable transactions are enabled, {@code false} otherwise. - */ - public boolean isTxSerializableEnabled() { - return txSerEnabled; - } - - /** - * Enables/disables serializable cache transactions. See {@link #isTxSerializableEnabled()} for more information. - * - * @param txSerEnabled Flag to enable/disable serializable cache transactions. - */ - public void setTxSerializableEnabled(boolean txSerEnabled) { - this.txSerEnabled = txSerEnabled; - } - - /** - * Default cache transaction concurrency to use when one is not explicitly - * specified. Default value is defined by {@link #DFLT_TX_CONCURRENCY}. - * - * @return Default cache transaction concurrency. - * @see GridCacheTx - */ - public GridCacheTxConcurrency getDefaultTxConcurrency() { - return dfltConcurrency; - } - - /** - * Sets default transaction concurrency. - * - * @param dfltConcurrency Default cache transaction concurrency. - */ - public void setDefaultTxConcurrency(GridCacheTxConcurrency dfltConcurrency) { - this.dfltConcurrency = dfltConcurrency; - } - - /** - * Default cache transaction isolation to use when one is not explicitly - * specified. Default value is defined by {@link #DFLT_TX_ISOLATION}. - * - * @return Default cache transaction isolation. - * @see GridCacheTx - */ - public GridCacheTxIsolation getDefaultTxIsolation() { - return dfltIsolation; - } - - /** - * Sets default transaction isolation. - * - * @param dfltIsolation Default cache transaction isolation. - */ - public void setDefaultTxIsolation(GridCacheTxIsolation dfltIsolation) { - this.dfltIsolation = dfltIsolation; - } - - /** - * Gets default transaction timeout. Default value is defined by {@link #DFLT_TRANSACTION_TIMEOUT} - * which is {@code 0} and means that transactions will never time out. - * - * @return Default transaction timeout. - */ - public long getDefaultTxTimeout() { - return dfltTxTimeout; - } - - /** - * Sets default transaction timeout in milliseconds. By default this value is defined by {@link - * #DFLT_TRANSACTION_TIMEOUT}. - * - * @param dfltTxTimeout Default transaction timeout. - */ - public void setDefaultTxTimeout(long dfltTxTimeout) { - this.dfltTxTimeout = dfltTxTimeout; - } - - /** - * Gets size of pessimistic transactions log stored on node in order to recover transaction commit if originating - * node has left grid before it has sent all messages to transaction nodes. - * <p> - * If not set, default value is {@code 0} which means unlimited log size. - * - * @return Pessimistic transaction log size. - */ - public int getPessimisticTxLogSize() { - return pessimisticTxLogSize; - } - - /** - * Sets pessimistic transactions log size. - * - * @param pessimisticTxLogSize Pessimistic transactions log size. - * @see #getPessimisticTxLogSize() - */ - public void setPessimisticTxLogSize(int pessimisticTxLogSize) { - this.pessimisticTxLogSize = pessimisticTxLogSize; - } - - /** - * Gets delay, in milliseconds, after which pessimistic recovery entries will be cleaned up for failed node. - * <p> - * If not set, default value is {@link #DFLT_PESSIMISTIC_TX_LOG_LINGER}. - * - * @return Pessimistic log cleanup delay in milliseconds. - */ - public int getPessimisticTxLogLinger() { - return pessimisticTxLogLinger; - } - - /** - * Sets cleanup delay for pessimistic transaction recovery log for failed node, in milliseconds. - * - * @param pessimisticTxLogLinger Pessimistic log cleanup delay. - * @see #getPessimisticTxLogLinger() - */ - public void setPessimisticTxLogLinger(int pessimisticTxLogLinger) { - this.pessimisticTxLogLinger = pessimisticTxLogLinger; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/cache/IgniteTxMetrics.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/IgniteTxMetrics.java b/modules/core/src/main/java/org/gridgain/grid/cache/IgniteTxMetrics.java deleted file mode 100644 index 1c36cfd..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/cache/IgniteTxMetrics.java +++ /dev/null @@ -1,45 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.cache; - -import java.io.*; - -/** - * Transaction metrics, shared across all caches. - */ -public interface IgniteTxMetrics extends Serializable { - /** - * Gets last time transaction was committed. - * - * @return Last commit time. - */ - public long commitTime(); - - /** - * Gets last time transaction was rollback. - * - * @return Last rollback time. - */ - public long rollbackTime(); - - /** - * Gets total number of transaction commits. - * - * @return Number of transaction commits. - */ - public int txCommits(); - - /** - * Gets total number of transaction rollbacks. - * - * @return Number of transaction rollbacks. - */ - public int txRollbacks(); -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/cache/IgniteTxMetricsAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/IgniteTxMetricsAdapter.java b/modules/core/src/main/java/org/gridgain/grid/cache/IgniteTxMetricsAdapter.java deleted file mode 100644 index f9214d4..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/cache/IgniteTxMetricsAdapter.java +++ /dev/null @@ -1,107 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.cache; - -import org.gridgain.grid.util.typedef.internal.*; - -import java.io.*; - -/** - * Tx metrics adapter. - */ -public class IgniteTxMetricsAdapter implements IgniteTxMetrics, Externalizable { - /** Number of transaction commits. */ - private volatile int txCommits; - - /** Number of transaction rollbacks. */ - private volatile int txRollbacks; - - /** Last commit time. */ - private volatile long commitTime; - - /** Last rollback time. */ - private volatile long rollbackTime; - - /** - * - */ - public IgniteTxMetricsAdapter() { - - } - - /** - * @param m Transaction metrics to copy. - */ - public IgniteTxMetricsAdapter(IgniteTxMetrics m) { - commitTime = m.commitTime(); - rollbackTime = m.rollbackTime(); - txCommits = m.txCommits(); - txRollbacks = m.txRollbacks(); - } - - /** {@inheritDoc} */ - @Override public long commitTime() { - return commitTime; - } - - /** {@inheritDoc} */ - @Override public long rollbackTime() { - return rollbackTime; - } - - /** {@inheritDoc} */ - @Override public int txCommits() { - return txCommits; - } - - /** {@inheritDoc} */ - @Override public int txRollbacks() { - return txRollbacks; - } - - /** - * Transaction commit callback. - */ - public void onTxCommit() { - commitTime = U.currentTimeMillis(); - - txCommits++; - } - - /** - * Transaction rollback callback. - */ - public void onTxRollback() { - rollbackTime = U.currentTimeMillis(); - - txRollbacks++; - } - - /** {@inheritDoc} */ - @Override public void writeExternal(ObjectOutput out) throws IOException { - out.writeLong(commitTime); - out.writeLong(rollbackTime); - out.writeInt(txCommits); - out.writeInt(txRollbacks); - } - - /** {@inheritDoc} */ - @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { - commitTime = in.readLong(); - rollbackTime = in.readLong(); - txCommits = in.readInt(); - txRollbacks = in.readInt(); - } - - /** {@inheritDoc} */ - @Override public String toString() { - return S.toString(IgniteTxMetricsAdapter.class, this); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheLoadOnlyStoreAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheLoadOnlyStoreAdapter.java b/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheLoadOnlyStoreAdapter.java index 5b45feb..c3eceb6 100644 --- a/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheLoadOnlyStoreAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheLoadOnlyStoreAdapter.java @@ -12,7 +12,7 @@ package org.gridgain.grid.cache.store; import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java b/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java index 4bf2fc0..51ce99a 100644 --- a/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java +++ b/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java @@ -12,6 +12,7 @@ package org.gridgain.grid.cache.store; import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.apache.ignite.portables.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.store.jdbc.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStoreAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStoreAdapter.java b/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStoreAdapter.java index 7aa19ab..c12b3e7 100644 --- a/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStoreAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStoreAdapter.java @@ -11,6 +11,7 @@ package org.gridgain.grid.cache.store; import org.apache.ignite.*; import org.apache.ignite.lang.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStoreBalancingWrapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStoreBalancingWrapper.java b/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStoreBalancingWrapper.java index 81bd4ac..aeba9c8 100644 --- a/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStoreBalancingWrapper.java +++ b/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStoreBalancingWrapper.java @@ -11,7 +11,7 @@ package org.gridgain.grid.cache.store; import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.util.future.*; import org.gridgain.grid.util.typedef.*; import org.jdk8.backport.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java b/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java index ffd324d..2624cb3 100644 --- a/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java +++ b/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java @@ -12,8 +12,7 @@ package org.gridgain.grid.cache.store.jdbc; import org.apache.ignite.*; import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.store.*; import org.gridgain.grid.util.tostring.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java index 5215654..555ab55 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java @@ -1381,7 +1381,7 @@ public class GridGainEx { myCfg.setWarmupClosure(cfg.getWarmupClosure()); myCfg.setDotNetConfiguration(cfg.getDotNetConfiguration()); myCfg.setPluginConfigurations(cfg.getPluginConfigurations()); - myCfg.setTransactionsConfiguration(new GridTransactionsConfiguration(cfg.getTransactionsConfiguration())); + myCfg.setTransactionsConfiguration(new TransactionsConfiguration(cfg.getTransactionsConfiguration())); myCfg.setQueryConfiguration(cfg.getQueryConfiguration()); ClientConnectionConfiguration clientCfg = cfg.getClientConnectionConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/GridNodeAttributes.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridNodeAttributes.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridNodeAttributes.java index 974df08..1053ecf 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridNodeAttributes.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridNodeAttributes.java @@ -53,6 +53,9 @@ public final class GridNodeAttributes { public static final String ATTR_CACHE = ATTR_PREFIX + ".cache"; /** Internal attribute name constant. */ + public static final String ATTR_TX_CONFIG = ATTR_PREFIX + ".tx"; + + /** Internal attribute name constant. */ @Deprecated public static final String ATTR_CACHE_PORTABLE = ATTR_PREFIX + ".cache.portable"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteTransactionsEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteTransactionsEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteTransactionsEx.java index 8666e66..286acd5 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteTransactionsEx.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteTransactionsEx.java @@ -10,6 +10,7 @@ package org.gridgain.grid.kernal; import org.apache.ignite.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java index 92b5e62..c3a871a 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java @@ -18,6 +18,7 @@ import org.apache.ignite.lang.*; import org.apache.ignite.plugin.security.*; import org.apache.ignite.portables.*; import org.apache.ignite.resources.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; @@ -50,8 +51,8 @@ import static org.apache.ignite.IgniteSystemProperties.*; import static org.apache.ignite.events.IgniteEventType.*; import static org.gridgain.grid.cache.GridCacheFlag.*; import static org.gridgain.grid.cache.GridCachePeekMode.*; -import static org.gridgain.grid.cache.GridCacheTxConcurrency.*; -import static org.gridgain.grid.cache.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; +import static org.apache.ignite.transactions.GridCacheTxIsolation.*; import static org.gridgain.grid.kernal.GridClosureCallMode.*; import static org.gridgain.grid.kernal.processors.dr.GridDrType.*; import static org.gridgain.grid.kernal.processors.task.GridTaskThreadContextKey.*; @@ -3113,7 +3114,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im /** {@inheritDoc} */ @Override public GridCacheTx txStart() throws IllegalStateException { - GridTransactionsConfiguration cfg = ctx.gridConfig().getTransactionsConfiguration(); + TransactionsConfiguration cfg = ctx.gridConfig().getTransactionsConfiguration(); return txStart(cfg.getDefaultTxConcurrency(), cfg.getDefaultTxIsolation()); } @@ -3123,7 +3124,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im A.notNull(concurrency, "concurrency"); A.notNull(isolation, "isolation"); - GridTransactionsConfiguration cfg = ctx.gridConfig().getTransactionsConfiguration(); + TransactionsConfiguration cfg = ctx.gridConfig().getTransactionsConfiguration(); return txStart( concurrency, @@ -3602,7 +3603,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im GridCacheTxLocalAdapter<K, V> tx = ctx.tm().threadLocalTx(); if (tx == null || tx.implicit()) { - GridTransactionsConfiguration tCfg = ctx.gridConfig().getTransactionsConfiguration(); + TransactionsConfiguration tCfg = ctx.gridConfig().getTransactionsConfiguration(); tx = ctx.tm().newTx( true, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEventManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEventManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEventManager.java index 08c2b58..9218c8c 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEventManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEventManager.java @@ -12,7 +12,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.kernal.managers.eventstorage.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java index bc6e120..aad2447 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java @@ -34,7 +34,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.gridgain.grid.cache.GridCacheFlag.*; -import static org.gridgain.grid.cache.GridCacheTxState.*; +import static org.apache.ignite.transactions.GridCacheTxState.*; import static org.apache.ignite.events.IgniteEventType.*; import static org.gridgain.grid.kernal.processors.cache.GridCacheOperation.*; import static org.gridgain.grid.kernal.processors.dr.GridDrType.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiTxFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiTxFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiTxFuture.java index 44e9711..36ee08b 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiTxFuture.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiTxFuture.java @@ -11,7 +11,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java index c38d853..b8a5c92 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java @@ -53,7 +53,7 @@ import static org.gridgain.grid.cache.GridCacheConfiguration.*; import static org.gridgain.grid.cache.GridCacheDistributionMode.*; import static org.gridgain.grid.cache.GridCacheMode.*; import static org.gridgain.grid.cache.GridCachePreloadMode.*; -import static org.gridgain.grid.cache.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.GridCacheTxIsolation.*; import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; import static org.gridgain.grid.kernal.GridComponentType.*; import static org.gridgain.grid.kernal.GridNodeAttributes.*; @@ -899,6 +899,8 @@ public class GridCacheProcessor extends GridProcessorAdapter { attrs.put(ATTR_CACHE_PORTABLE, attrPortable); + attrs.put(ATTR_TX_CONFIG, ctx.config().getTransactionsConfiguration()); + if (!interceptors.isEmpty()) attrs.put(ATTR_CACHE_INTERCEPTORS, interceptors); } @@ -1001,6 +1003,8 @@ public class GridCacheProcessor extends GridProcessorAdapter { * @throws IgniteCheckedException If check failed. */ private void checkCache(ClusterNode rmt) throws IgniteCheckedException { + checkTransactionConfiguration(rmt); + GridCacheAttributes[] rmtAttrs = U.cacheAttributes(rmt); GridCacheAttributes[] locAttrs = U.cacheAttributes(ctx.discovery().localNode()); @@ -1011,8 +1015,6 @@ public class GridCacheProcessor extends GridProcessorAdapter { IgniteDeploymentMode locDepMode = ctx.config().getDeploymentMode(); IgniteDeploymentMode rmtDepMode = rmt.attribute(GridNodeAttributes.ATTR_DEPLOYMENT_MODE); - // TODO GG-9141 Check tx configuration consistency. - for (GridCacheAttributes rmtAttr : rmtAttrs) { for (GridCacheAttributes locAttr : locAttrs) { if (F.eq(rmtAttr.cacheName(), locAttr.cacheName())) { @@ -1168,6 +1170,25 @@ public class GridCacheProcessor extends GridProcessorAdapter { } /** + * @param rmt Remote node to check. + * @throws IgniteCheckedException If check failed. + */ + private void checkTransactionConfiguration(ClusterNode rmt) throws IgniteCheckedException { + TransactionsConfiguration txCfg = rmt.attribute(ATTR_TX_CONFIG); + + if (txCfg != null) { + TransactionsConfiguration locTxCfg = ctx.config().getTransactionsConfiguration(); + + if (locTxCfg.isTxSerializableEnabled() != txCfg.isTxSerializableEnabled()) + throw new IgniteCheckedException("Serializable transactions enabled mismatch " + + "(fix txSerializableEnabled property or set -D" + GG_SKIP_CONFIGURATION_CONSISTENCY_CHECK + "=true " + + "system property) [rmtNodeId=" + rmt.id() + + ", locTxSerializableEnabled=" + locTxCfg.isTxSerializableEnabled() + + ", rmtTxSerializableEnabled=" + txCfg.isTxSerializableEnabled() + ']'); + } + } + + /** * Checks if store check should be skipped for given nodes. * * @param locAttr Local node attributes. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionEx.java index d8fbdfe..eb4cc44 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionEx.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionEx.java @@ -11,6 +11,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.lang.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.store.*; import org.gridgain.grid.kernal.processors.cache.dr.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java index 0e7c21c..a835382 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java @@ -13,6 +13,7 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; import org.apache.ignite.portables.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.query.*; import org.gridgain.grid.kernal.processors.cache.dr.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java index 8b6ade8..3c1e1d3 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java @@ -12,6 +12,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.cache.datastructures.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java index ba2bfe1..40a094a 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java @@ -14,6 +14,7 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.communication.*; @@ -149,7 +150,7 @@ public class GridCacheSharedContext<K, V> { * * @return Transactions configuration. */ - public GridTransactionsConfiguration txConfig() { + public TransactionsConfiguration txConfig() { return kernalCtx.config().getTransactionsConfiguration(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java index e80f8b7..5438cd2 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java @@ -12,7 +12,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.apache.ignite.lifecycle.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.store.*; import org.gridgain.grid.kernal.processors.interop.*; import org.gridgain.grid.util.lang.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAdapter.java index ebd862b..df77427 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAdapter.java @@ -12,7 +12,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.kernal.processors.cache.distributed.near.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.typedef.*; @@ -30,9 +30,9 @@ import java.util.concurrent.locks.*; import static org.apache.ignite.events.IgniteEventType.*; import static org.gridgain.grid.kernal.processors.cache.GridCacheTxEx.FinalizationStatus.*; import static org.gridgain.grid.kernal.processors.cache.GridCacheUtils.*; -import static org.gridgain.grid.cache.GridCacheTxConcurrency.*; -import static org.gridgain.grid.cache.GridCacheTxIsolation.*; -import static org.gridgain.grid.cache.GridCacheTxState.*; +import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; +import static org.apache.ignite.transactions.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.GridCacheTxState.*; import static org.gridgain.grid.kernal.processors.cache.GridCacheOperation.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEx.java index 0dda62b..636f4e0 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEx.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEx.java @@ -11,6 +11,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.lang.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.timeout.*; import org.gridgain.grid.util.lang.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java index c3ff36c..c16b103 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java @@ -12,7 +12,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; import org.gridgain.grid.kernal.processors.cache.distributed.near.*; @@ -24,9 +24,9 @@ import org.jetbrains.annotations.*; import java.util.*; -import static org.gridgain.grid.cache.GridCacheTxConcurrency.*; -import static org.gridgain.grid.cache.GridCacheTxIsolation.*; -import static org.gridgain.grid.cache.GridCacheTxState.*; +import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; +import static org.apache.ignite.transactions.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.GridCacheTxState.*; import static org.gridgain.grid.kernal.managers.communication.GridIoPolicy.*; import static org.gridgain.grid.kernal.processors.cache.GridCacheTxEx.FinalizationStatus.*; import static org.gridgain.grid.kernal.processors.cache.GridCacheUtils.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java index b1872be..85702a7 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java @@ -13,6 +13,7 @@ import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.apache.ignite.plugin.security.*; import org.apache.ignite.portables.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.near.*; import org.gridgain.grid.kernal.processors.cache.dr.*; @@ -30,7 +31,7 @@ import java.util.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.events.IgniteEventType.*; -import static org.gridgain.grid.cache.GridCacheTxState.*; +import static org.apache.ignite.transactions.GridCacheTxState.*; import static org.gridgain.grid.kernal.processors.cache.GridCacheOperation.*; import static org.gridgain.grid.kernal.processors.dr.GridDrType.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java index cad83e5..bf31af4 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java @@ -12,7 +12,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.kernal.managers.eventstorage.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; @@ -33,8 +33,8 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.IgniteSystemProperties.*; import static org.apache.ignite.events.IgniteEventType.*; -import static org.gridgain.grid.cache.GridCacheTxConcurrency.*; -import static org.gridgain.grid.cache.GridCacheTxState.*; +import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; +import static org.apache.ignite.transactions.GridCacheTxState.*; import static org.gridgain.grid.kernal.processors.cache.GridCacheTxEx.FinalizationStatus.*; import static org.gridgain.grid.kernal.processors.cache.GridCacheUtils.*; import static org.gridgain.grid.util.GridConcurrentFactory.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxProxy.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxProxy.java index 29c7ac6..fe7c15b 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxProxy.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxProxy.java @@ -9,7 +9,7 @@ package org.gridgain.grid.kernal.processors.cache; -import org.gridgain.grid.cache.*; +import org.apache.ignite.transactions.*; /** * Marker interface for transaction proxy. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxProxyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxProxyImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxProxyImpl.java index 4e61db6..07ce436 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxProxyImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxProxyImpl.java @@ -11,8 +11,8 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.lang.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.util.tostring.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java index acd81ef..e081126 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java @@ -14,6 +14,7 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStore.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStore.java index e9f6828..043f702 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStore.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStore.java @@ -13,6 +13,7 @@ import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.apache.ignite.lifecycle.*; import org.apache.ignite.thread.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.store.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicLongImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicLongImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicLongImpl.java index 18f31b0..d42ba00 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicLongImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicLongImpl.java @@ -11,6 +11,7 @@ package org.gridgain.grid.kernal.processors.cache.datastructures; import org.apache.ignite.*; import org.apache.ignite.lang.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.datastructures.*; import org.gridgain.grid.kernal.processors.cache.*; @@ -21,8 +22,8 @@ import org.jetbrains.annotations.*; import java.io.*; import java.util.concurrent.*; -import static org.gridgain.grid.cache.GridCacheTxConcurrency.*; -import static org.gridgain.grid.cache.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; +import static org.apache.ignite.transactions.GridCacheTxIsolation.*; /** * Cache atomic long implementation. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceImpl.java index 492c6df..908e28c 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceImpl.java @@ -11,7 +11,7 @@ package org.gridgain.grid.kernal.processors.cache.datastructures; import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.datastructures.*; import org.gridgain.grid.kernal.processors.cache.*; @@ -22,8 +22,8 @@ import org.jetbrains.annotations.*; import java.io.*; import java.util.concurrent.*; -import static org.gridgain.grid.cache.GridCacheTxConcurrency.*; -import static org.gridgain.grid.cache.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; +import static org.apache.ignite.transactions.GridCacheTxIsolation.*; /** * Cache atomic reference implementation. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java index 8785b2a..80f7e09 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java @@ -11,7 +11,7 @@ package org.gridgain.grid.kernal.processors.cache.datastructures; import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.datastructures.*; import org.gridgain.grid.kernal.processors.cache.*; @@ -26,8 +26,8 @@ import java.util.concurrent.atomic.*; import java.util.concurrent.locks.*; import static java.util.concurrent.TimeUnit.*; -import static org.gridgain.grid.cache.GridCacheTxConcurrency.*; -import static org.gridgain.grid.cache.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; +import static org.apache.ignite.transactions.GridCacheTxIsolation.*; /** * Cache sequence implementation. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicStampedImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicStampedImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicStampedImpl.java index 2f6aaf0..e4a0b55 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicStampedImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicStampedImpl.java @@ -11,7 +11,7 @@ package org.gridgain.grid.kernal.processors.cache.datastructures; import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.datastructures.*; import org.gridgain.grid.kernal.processors.cache.*; @@ -24,8 +24,8 @@ import org.jetbrains.annotations.*; import java.io.*; import java.util.concurrent.*; -import static org.gridgain.grid.cache.GridCacheTxConcurrency.*; -import static org.gridgain.grid.cache.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; +import static org.apache.ignite.transactions.GridCacheTxIsolation.*; /** * Cache atomic stamped implementation. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheCountDownLatchImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheCountDownLatchImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheCountDownLatchImpl.java index 039a286..559bdbe 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheCountDownLatchImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheCountDownLatchImpl.java @@ -11,7 +11,7 @@ package org.gridgain.grid.kernal.processors.cache.datastructures; import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.util.typedef.*; @@ -22,8 +22,8 @@ import java.io.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.gridgain.grid.cache.GridCacheTxConcurrency.*; -import static org.gridgain.grid.cache.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; +import static org.apache.ignite.transactions.GridCacheTxIsolation.*; /** * Cache count down latch implementation. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheDataStructuresManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheDataStructuresManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheDataStructuresManager.java index 3b768d9..3066811 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheDataStructuresManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheDataStructuresManager.java @@ -13,7 +13,7 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.datastructures.*; import org.gridgain.grid.kernal.*; @@ -34,8 +34,8 @@ import java.util.concurrent.atomic.*; import static org.gridgain.grid.cache.GridCacheAtomicWriteOrderMode.*; import static org.gridgain.grid.cache.GridCacheFlag.*; import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCacheTxConcurrency.*; -import static org.gridgain.grid.cache.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; +import static org.apache.ignite.transactions.GridCacheTxIsolation.*; import static org.gridgain.grid.kernal.GridClosureCallMode.*; import static org.gridgain.grid.kernal.processors.cache.GridCacheOperation.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridTransactionalCacheQueueImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridTransactionalCacheQueueImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridTransactionalCacheQueueImpl.java index 6eb2a17..ef64d31 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridTransactionalCacheQueueImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridTransactionalCacheQueueImpl.java @@ -11,7 +11,7 @@ package org.gridgain.grid.kernal.processors.cache.datastructures; import org.apache.ignite.*; import org.apache.ignite.cluster.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.datastructures.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.util.typedef.internal.*; @@ -19,8 +19,8 @@ import org.jetbrains.annotations.*; import java.util.*; -import static org.gridgain.grid.cache.GridCacheTxConcurrency.*; -import static org.gridgain.grid.cache.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; +import static org.apache.ignite.transactions.GridCacheTxIsolation.*; /** * {@link GridCacheQueue} implementation using transactional cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedCacheAdapter.java index 21e0b8b..9a5fc79 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedCacheAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedCacheAdapter.java @@ -10,6 +10,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed; import org.apache.ignite.lang.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedLockRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedLockRequest.java index 519c3b7..49cd2d5 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedLockRequest.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedLockRequest.java @@ -11,7 +11,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed; import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.util.direct.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxPrepareRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxPrepareRequest.java index 6c48627..8f92460 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxPrepareRequest.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxPrepareRequest.java @@ -10,7 +10,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed; import org.apache.ignite.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.util.direct.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java index f38d483..248b4a0 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java @@ -11,6 +11,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed; import org.apache.ignite.*; import org.apache.ignite.lang.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.near.*; @@ -25,7 +26,7 @@ import java.io.*; import java.util.*; import java.util.concurrent.atomic.*; -import static org.gridgain.grid.cache.GridCacheTxState.*; +import static org.apache.ignite.transactions.GridCacheTxState.*; import static org.gridgain.grid.kernal.processors.cache.GridCacheOperation.*; import static org.gridgain.grid.kernal.processors.dr.GridDrType.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockFuture.java index 0187e5f..2b351d2 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockFuture.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockFuture.java @@ -12,6 +12,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed.dht; import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockRequest.java index 0f115c1..340e242 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockRequest.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockRequest.java @@ -11,7 +11,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed.dht; import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java index 2113a68..fee6d0a 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java @@ -12,6 +12,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed.dht; import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; @@ -27,8 +28,8 @@ import org.jetbrains.annotations.*; import java.io.*; import java.util.*; -import static org.gridgain.grid.cache.GridCacheTxConcurrency.*; -import static org.gridgain.grid.cache.GridCacheTxState.*; +import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; +import static org.apache.ignite.transactions.GridCacheTxState.*; import static org.gridgain.grid.kernal.managers.communication.GridIoPolicy.*; import static org.gridgain.grid.kernal.processors.cache.GridCacheOperation.*; import static org.gridgain.grid.kernal.processors.cache.GridCacheUtils.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java index d65de8c..2f1c971 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java @@ -12,7 +12,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed.dht; import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; import org.gridgain.grid.util.typedef.*; @@ -25,7 +25,7 @@ import java.io.*; import java.util.*; import java.util.concurrent.atomic.*; -import static org.gridgain.grid.cache.GridCacheTxState.*; +import static org.apache.ignite.transactions.GridCacheTxState.*; import static org.gridgain.grid.kernal.managers.communication.GridIoPolicy.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java index 21cccf0..865100d 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java @@ -11,7 +11,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed.dht; import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java index 8147878..1a0d840 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java @@ -12,7 +12,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed.dht; import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; import org.gridgain.grid.kernal.processors.cache.distributed.near.*; @@ -25,7 +25,7 @@ import java.io.*; import java.util.*; import java.util.concurrent.atomic.*; -import static org.gridgain.grid.cache.GridCacheTxState.*; +import static org.apache.ignite.transactions.GridCacheTxState.*; import static org.gridgain.grid.kernal.managers.communication.GridIoPolicy.*; import static org.gridgain.grid.kernal.processors.cache.GridCacheUtils.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java index 0d84353..f6cc67d 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java @@ -12,6 +12,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed.dht; import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; @@ -27,7 +28,7 @@ import java.io.*; import java.util.*; import java.util.concurrent.atomic.*; -import static org.gridgain.grid.cache.GridCacheTxState.*; +import static org.apache.ignite.transactions.GridCacheTxState.*; import static org.gridgain.grid.kernal.processors.cache.GridCacheOperation.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java index 21339b9..6228228 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java @@ -28,7 +28,7 @@ import java.io.*; import java.util.*; import java.util.concurrent.atomic.*; -import static org.gridgain.grid.cache.GridCacheTxState.*; +import static org.apache.ignite.transactions.GridCacheTxState.*; import static org.apache.ignite.events.IgniteEventType.*; import static org.gridgain.grid.kernal.managers.communication.GridIoPolicy.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxRemote.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxRemote.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxRemote.java index e71b0fb..d5c43a8 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxRemote.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxRemote.java @@ -11,7 +11,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed.dht; import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; import org.gridgain.grid.util.tostring.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12b08c99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index b8998e2..77796fc 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@ -13,6 +13,7 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; import org.apache.ignite.plugin.security.*; +import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.managers.communication.*; import org.gridgain.grid.kernal.processors.cache.*;
