sprint-1 - Renamed TransactionsConfiguration to TransactionConfiguration.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2133af16 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2133af16 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2133af16 Branch: refs/heads/ignite-188 Commit: 2133af1607424b24c3907dcf1efcdf7fefd935d2 Parents: d5c9d53 Author: Dmitiry Setrakyan <dsetrak...@gridgain.com> Authored: Thu Feb 5 19:16:10 2015 -0800 Committer: Dmitiry Setrakyan <dsetrak...@gridgain.com> Committed: Thu Feb 5 19:16:10 2015 -0800 ---------------------------------------------------------------------- .../apache/ignite/IgniteCheckedException.java | 3 +- .../java/org/apache/ignite/IgniteException.java | 3 +- .../configuration/IgniteConfiguration.java | 6 +- .../configuration/TransactionConfiguration.java | 202 +++++++++++++++++++ .../TransactionsConfiguration.java | 202 ------------------- .../org/apache/ignite/internal/IgnitionEx.java | 2 +- .../processors/cache/GridCacheAdapter.java | 6 +- .../processors/cache/GridCacheProcessor.java | 4 +- .../cache/GridCacheSharedContext.java | 2 +- .../transactions/IgniteTransactionsImpl.java | 8 +- .../ignite/messaging/MessagingListenActor.java | 2 +- .../GridCacheAbstractProjectionSelfTest.java | 2 +- ...tractPartitionedByteArrayValuesSelfTest.java | 2 +- .../GridCacheTransformEventSelfTest.java | 2 +- .../GridCachePartitionedTxTimeoutSelfTest.java | 2 +- ...dCacheReplicatedTxMultiThreadedSelfTest.java | 2 +- .../GridCacheDistributedEvictionsSelfTest.java | 2 +- .../GridCacheEmptyEntriesAbstractSelfTest.java | 2 +- .../GridCacheEvictionTouchSelfTest.java | 2 +- ...idCachePartitionedHitsAndMissesSelfTest.java | 2 +- .../processors/cache/jta/CacheJtaManager.java | 2 +- .../org/apache/ignite/yardstick/IgniteNode.java | 2 +- 22 files changed, 232 insertions(+), 230 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2133af16/modules/core/src/main/java/org/apache/ignite/IgniteCheckedException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCheckedException.java b/modules/core/src/main/java/org/apache/ignite/IgniteCheckedException.java index 79c116f..2f0696c 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteCheckedException.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteCheckedException.java @@ -71,7 +71,8 @@ public class IgniteCheckedException extends Exception { * @return {@code True} if one of the causing exception is an instance of passed in classes, * {@code false} otherwise. */ - public boolean hasCause(@Nullable Class<? extends Throwable>... cls) { + @SafeVarargs + public final boolean hasCause(@Nullable Class<? extends Throwable>... cls) { return X.hasCause(this, cls); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2133af16/modules/core/src/main/java/org/apache/ignite/IgniteException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteException.java b/modules/core/src/main/java/org/apache/ignite/IgniteException.java index 5c82f8e..a8ec279 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteException.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteException.java @@ -71,7 +71,8 @@ public class IgniteException extends RuntimeException { * @return {@code True} if one of the causing exception is an instance of passed in classes, * {@code false} otherwise. */ - public boolean hasCause(@Nullable Class<? extends Throwable>... cls) { + @SafeVarargs + public final boolean hasCause(@Nullable Class<? extends Throwable>... cls) { return X.hasCause(this, cls); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2133af16/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java index 2198710..253d4f5 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java @@ -383,7 +383,7 @@ public class IgniteConfiguration { private CacheConfiguration[] cacheCfg; /** Transactions configuration. */ - private TransactionsConfiguration txCfg = new TransactionsConfiguration(); + private TransactionConfiguration txCfg = new TransactionConfiguration(); /** */ private Collection<? extends PluginConfiguration> pluginCfgs; @@ -3117,7 +3117,7 @@ public class IgniteConfiguration { * * @return Transactions configuration. */ - public TransactionsConfiguration getTransactionsConfiguration() { + public TransactionConfiguration getTransactionsConfiguration() { return txCfg; } @@ -3126,7 +3126,7 @@ public class IgniteConfiguration { * * @param txCfg Transactions configuration. */ - public void setTransactionsConfiguration(TransactionsConfiguration txCfg) { + public void setTransactionsConfiguration(TransactionConfiguration txCfg) { this.txCfg = txCfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2133af16/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java new file mode 100644 index 0000000..ee01f3c --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java @@ -0,0 +1,202 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.configuration; + +import org.apache.ignite.transactions.*; + +import java.io.*; + +/** + * Transactions configuration. + */ +public class TransactionConfiguration implements Serializable { + /** Default value for 'txSerializableEnabled' flag. */ + public static final boolean DFLT_TX_SERIALIZABLE_ENABLED = false; + + /** Default concurrency mode. */ + public static final IgniteTxConcurrency DFLT_TX_CONCURRENCY = IgniteTxConcurrency.PESSIMISTIC; + + /** Default transaction isolation level. */ + public static final IgniteTxIsolation DFLT_TX_ISOLATION = IgniteTxIsolation.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 IgniteTxIsolation dfltIsolation = DFLT_TX_ISOLATION; + + /** Cache concurrency. */ + private IgniteTxConcurrency 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 TransactionConfiguration() { + // No-op. + } + + /** + * @param cfg Configuration to copy. + */ + public TransactionConfiguration(TransactionConfiguration 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 IgniteTxIsolation#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 IgniteTx + */ + public IgniteTxConcurrency getDefaultTxConcurrency() { + return dfltConcurrency; + } + + /** + * Sets default transaction concurrency. + * + * @param dfltConcurrency Default cache transaction concurrency. + */ + public void setDefaultTxConcurrency(IgniteTxConcurrency 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 IgniteTx + */ + public IgniteTxIsolation getDefaultTxIsolation() { + return dfltIsolation; + } + + /** + * Sets default transaction isolation. + * + * @param dfltIsolation Default cache transaction isolation. + */ + public void setDefaultTxIsolation(IgniteTxIsolation 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/2133af16/modules/core/src/main/java/org/apache/ignite/configuration/TransactionsConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionsConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/TransactionsConfiguration.java deleted file mode 100644 index f393fe3..0000000 --- a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionsConfiguration.java +++ /dev/null @@ -1,202 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.configuration; - -import org.apache.ignite.transactions.*; - -import java.io.*; - -/** - * Transactions configuration. - */ -public class TransactionsConfiguration implements Serializable { - /** Default value for 'txSerializableEnabled' flag. */ - public static final boolean DFLT_TX_SERIALIZABLE_ENABLED = false; - - /** Default concurrency mode. */ - public static final IgniteTxConcurrency DFLT_TX_CONCURRENCY = IgniteTxConcurrency.PESSIMISTIC; - - /** Default transaction isolation level. */ - public static final IgniteTxIsolation DFLT_TX_ISOLATION = IgniteTxIsolation.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 IgniteTxIsolation dfltIsolation = DFLT_TX_ISOLATION; - - /** Cache concurrency. */ - private IgniteTxConcurrency 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 TransactionsConfiguration() { - // No-op. - } - - /** - * @param cfg Configuration to copy. - */ - public TransactionsConfiguration(TransactionsConfiguration 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 IgniteTxIsolation#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 IgniteTx - */ - public IgniteTxConcurrency getDefaultTxConcurrency() { - return dfltConcurrency; - } - - /** - * Sets default transaction concurrency. - * - * @param dfltConcurrency Default cache transaction concurrency. - */ - public void setDefaultTxConcurrency(IgniteTxConcurrency 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 IgniteTx - */ - public IgniteTxIsolation getDefaultTxIsolation() { - return dfltIsolation; - } - - /** - * Sets default transaction isolation. - * - * @param dfltIsolation Default cache transaction isolation. - */ - public void setDefaultTxIsolation(IgniteTxIsolation 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/2133af16/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java index 366ea9b..05999ee 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java @@ -1423,7 +1423,7 @@ public class IgnitionEx { myCfg.setServiceConfiguration(cfg.getServiceConfiguration()); myCfg.setWarmupClosure(cfg.getWarmupClosure()); myCfg.setPluginConfigurations(cfg.getPluginConfigurations()); - myCfg.setTransactionsConfiguration(new TransactionsConfiguration(cfg.getTransactionsConfiguration())); + myCfg.setTransactionsConfiguration(new TransactionConfiguration(cfg.getTransactionsConfiguration())); myCfg.setQueryConfiguration(cfg.getQueryConfiguration()); myCfg.setAtomicConfiguration(cfg.getAtomicConfiguration()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2133af16/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 3b4a440..c637bca 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -3730,7 +3730,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Override public IgniteTx txStart() throws IllegalStateException { - TransactionsConfiguration cfg = ctx.gridConfig().getTransactionsConfiguration(); + TransactionConfiguration cfg = ctx.gridConfig().getTransactionsConfiguration(); return txStart(cfg.getDefaultTxConcurrency(), cfg.getDefaultTxIsolation()); } @@ -3740,7 +3740,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, A.notNull(concurrency, "concurrency"); A.notNull(isolation, "isolation"); - TransactionsConfiguration cfg = ctx.gridConfig().getTransactionsConfiguration(); + TransactionConfiguration cfg = ctx.gridConfig().getTransactionsConfiguration(); return txStart( concurrency, @@ -4352,7 +4352,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, IgniteTxLocalAdapter<K, V> tx = ctx.tm().threadLocalTx(); if (tx == null || tx.implicit()) { - TransactionsConfiguration tCfg = ctx.gridConfig().getTransactionsConfiguration(); + TransactionConfiguration tCfg = ctx.gridConfig().getTransactionsConfiguration(); tx = ctx.tm().newTx( true, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2133af16/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 8dc1ca7..e49f6bb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -1226,10 +1226,10 @@ public class GridCacheProcessor extends GridProcessorAdapter { * @throws IgniteCheckedException If check failed. */ private void checkTransactionConfiguration(ClusterNode rmt) throws IgniteCheckedException { - TransactionsConfiguration txCfg = rmt.attribute(ATTR_TX_CONFIG); + TransactionConfiguration txCfg = rmt.attribute(ATTR_TX_CONFIG); if (txCfg != null) { - TransactionsConfiguration locTxCfg = ctx.config().getTransactionsConfiguration(); + TransactionConfiguration locTxCfg = ctx.config().getTransactionsConfiguration(); if (locTxCfg.isTxSerializableEnabled() != txCfg.isTxSerializableEnabled()) throw new IgniteCheckedException("Serializable transactions enabled mismatch " + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2133af16/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java index db09bce..4ea44b1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java @@ -157,7 +157,7 @@ public class GridCacheSharedContext<K, V> { * * @return Transactions configuration. */ - public TransactionsConfiguration txConfig() { + public TransactionConfiguration txConfig() { return kernalCtx.config().getTransactionsConfiguration(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2133af16/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java index 4df963e..f46a59d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java @@ -47,7 +47,7 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx { /** {@inheritDoc} */ @Override public IgniteTx txStart() throws IllegalStateException { - TransactionsConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration(); + TransactionConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration(); return txStart0( cfg.getDefaultTxConcurrency(), @@ -63,7 +63,7 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx { A.notNull(concurrency, "concurrency"); A.notNull(isolation, "isolation"); - TransactionsConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration(); + TransactionConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration(); return txStart0( concurrency, @@ -120,7 +120,7 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx { A.notNull(concurrency, "concurrency"); A.notNull(isolation, "isolation"); - TransactionsConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration(); + TransactionConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration(); return txStart0(concurrency, isolation, @@ -196,7 +196,7 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx { */ private IgniteInternalTx txStart0(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, long timeout, int txSize, boolean sys) { - TransactionsConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration(); + TransactionConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration(); if (!cfg.isTxSerializableEnabled() && isolation == SERIALIZABLE) throw new IllegalArgumentException("SERIALIZABLE isolation level is disabled (to enable change " + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2133af16/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java b/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java index 0c3083a..db5cbb6 100644 --- a/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java +++ b/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.*; import java.util.*; /** - * Convenience actor-base adapter for {@link IgniteMessaging#localListen(Object, org.apache.ignite.lang.IgniteBiPredicate)} + * Convenience actor-base adapter for {@link IgniteMessaging#localListen(Object, IgniteBiPredicate)} * method. */ public abstract class MessagingListenActor<T> implements IgniteBiPredicate<UUID, T> { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2133af16/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java index 62bb650..ffa967d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java @@ -828,7 +828,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr tx.commit(); - TransactionsConfiguration tCfg = grid(0).configuration().getTransactionsConfiguration(); + TransactionConfiguration tCfg = grid(0).configuration().getTransactionsConfiguration(); tx = cache().txStart( tCfg.getDefaultTxConcurrency(), http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2133af16/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java index 5748f5e..180c808 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java @@ -33,7 +33,7 @@ public abstract class GridCacheAbstractPartitionedByteArrayValuesSelfTest extend @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TransactionsConfiguration tCfg = new TransactionsConfiguration(); + TransactionConfiguration tCfg = new TransactionConfiguration(); tCfg.setTxSerializableEnabled(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2133af16/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java index fe38c41..eff6fad 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java @@ -104,7 +104,7 @@ public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest { discoSpi.setIpFinder(IP_FINDER); - TransactionsConfiguration tCfg = cfg.getTransactionsConfiguration(); + TransactionConfiguration tCfg = cfg.getTransactionsConfiguration(); tCfg.setDefaultTxConcurrency(txConcurrency); tCfg.setDefaultTxIsolation(txIsolation); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2133af16/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxTimeoutSelfTest.java index 9a04887..5a072ab 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxTimeoutSelfTest.java @@ -40,7 +40,7 @@ public class GridCachePartitionedTxTimeoutSelfTest extends IgniteTxTimeoutAbstra @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TransactionsConfiguration txCfg = c.getTransactionsConfiguration(); + TransactionConfiguration txCfg = c.getTransactionsConfiguration(); txCfg.setTxSerializableEnabled(true); txCfg.setDefaultTxTimeout(TIMEOUT); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2133af16/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java index a2136f4..9951bee 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java @@ -45,7 +45,7 @@ public class GridCacheReplicatedTxMultiThreadedSelfTest extends IgniteTxMultiThr @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TransactionsConfiguration tCfg = new TransactionsConfiguration(); + TransactionConfiguration tCfg = new TransactionConfiguration(); tCfg.setTxSerializableEnabled(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2133af16/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java index a5fc5b4..67bfb32 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java @@ -67,7 +67,7 @@ public class GridCacheDistributedEvictionsSelfTest extends GridCommonAbstractTes @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TransactionsConfiguration tCfg = new TransactionsConfiguration(); + TransactionConfiguration tCfg = new TransactionConfiguration(); tCfg.setDefaultTxConcurrency(PESSIMISTIC); tCfg.setDefaultTxIsolation(READ_COMMITTED); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2133af16/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java index 60f5182..1126375 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java @@ -63,7 +63,7 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TransactionsConfiguration txCfg = c.getTransactionsConfiguration(); + TransactionConfiguration txCfg = c.getTransactionsConfiguration(); txCfg.setDefaultTxConcurrency(txConcurrency); txCfg.setDefaultTxIsolation(txIsolation); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2133af16/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java index c6a7823..79bb450 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java @@ -55,7 +55,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TransactionsConfiguration txCfg = c.getTransactionsConfiguration(); + TransactionConfiguration txCfg = c.getTransactionsConfiguration(); txCfg.setDefaultTxConcurrency(PESSIMISTIC); txCfg.setDefaultTxIsolation(REPEATABLE_READ); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2133af16/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java index 1af7e4b..d53526b 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java @@ -62,7 +62,7 @@ public class GridCachePartitionedHitsAndMissesSelfTest extends GridCommonAbstrac // Cache. cfg.setCacheConfiguration(cacheConfiguration(gridName)); - TransactionsConfiguration tCfg = new TransactionsConfiguration(); + TransactionConfiguration tCfg = new TransactionConfiguration(); tCfg.setDefaultTxConcurrency(IgniteTxConcurrency.PESSIMISTIC); tCfg.setDefaultTxIsolation(IgniteTxIsolation.REPEATABLE_READ); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2133af16/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java index 5e30836..5223045 100644 --- a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java +++ b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java @@ -74,7 +74,7 @@ public class CacheJtaManager<K, V> extends CacheJtaManagerAdapter<K, V> { IgniteInternalTx tx = cctx.tm().userTx(); if (tx == null) { - TransactionsConfiguration tCfg = cctx.kernalContext().config() + TransactionConfiguration tCfg = cctx.kernalContext().config() .getTransactionsConfiguration(); tx = cctx.tm().newTx( http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2133af16/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java index b07d1f0..f03ff66 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java @@ -107,7 +107,7 @@ public class IgniteNode implements BenchmarkServer { } - TransactionsConfiguration tc = c.getTransactionsConfiguration(); + TransactionConfiguration tc = c.getTransactionsConfiguration(); tc.setDefaultTxConcurrency(args.txConcurrency()); tc.setDefaultTxIsolation(args.txIsolation());
