Skip to content

Commit

Permalink
sprint-1 - Renamed TransactionsConfiguration to TransactionConfigurat…
Browse files Browse the repository at this point in the history
…ion.
  • Loading branch information
Dmitiry Setrakyan committed Feb 6, 2015
1 parent d5c9d53 commit 2133af1
Show file tree
Hide file tree
Showing 21 changed files with 33 additions and 31 deletions.
Expand Up @@ -71,7 +71,8 @@ public IgniteCheckedException(String msg, @Nullable Throwable cause) {
* @return {@code True} if one of the causing exception is an instance of passed in classes, * @return {@code True} if one of the causing exception is an instance of passed in classes,
* {@code false} otherwise. * {@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); return X.hasCause(this, cls);
} }


Expand Down
Expand Up @@ -71,7 +71,8 @@ public IgniteException(String msg, @Nullable Throwable cause) {
* @return {@code True} if one of the causing exception is an instance of passed in classes, * @return {@code True} if one of the causing exception is an instance of passed in classes,
* {@code false} otherwise. * {@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); return X.hasCause(this, cls);
} }


Expand Down
Expand Up @@ -383,7 +383,7 @@ public class IgniteConfiguration {
private CacheConfiguration[] cacheCfg; private CacheConfiguration[] cacheCfg;


/** Transactions configuration. */ /** Transactions configuration. */
private TransactionsConfiguration txCfg = new TransactionsConfiguration(); private TransactionConfiguration txCfg = new TransactionConfiguration();


/** */ /** */
private Collection<? extends PluginConfiguration> pluginCfgs; private Collection<? extends PluginConfiguration> pluginCfgs;
Expand Down Expand Up @@ -3117,7 +3117,7 @@ public void setWarmupClosure(IgniteInClosure<IgniteConfiguration> warmupClos) {
* *
* @return Transactions configuration. * @return Transactions configuration.
*/ */
public TransactionsConfiguration getTransactionsConfiguration() { public TransactionConfiguration getTransactionsConfiguration() {
return txCfg; return txCfg;
} }


Expand All @@ -3126,7 +3126,7 @@ public TransactionsConfiguration getTransactionsConfiguration() {
* *
* @param txCfg Transactions configuration. * @param txCfg Transactions configuration.
*/ */
public void setTransactionsConfiguration(TransactionsConfiguration txCfg) { public void setTransactionsConfiguration(TransactionConfiguration txCfg) {
this.txCfg = txCfg; this.txCfg = txCfg;
} }


Expand Down
Expand Up @@ -24,7 +24,7 @@
/** /**
* Transactions configuration. * Transactions configuration.
*/ */
public class TransactionsConfiguration implements Serializable { public class TransactionConfiguration implements Serializable {
/** Default value for 'txSerializableEnabled' flag. */ /** Default value for 'txSerializableEnabled' flag. */
public static final boolean DFLT_TX_SERIALIZABLE_ENABLED = false; public static final boolean DFLT_TX_SERIALIZABLE_ENABLED = false;


Expand Down Expand Up @@ -61,14 +61,14 @@ public class TransactionsConfiguration implements Serializable {
/** /**
* Empty constructor. * Empty constructor.
*/ */
public TransactionsConfiguration() { public TransactionConfiguration() {
// No-op. // No-op.
} }


/** /**
* @param cfg Configuration to copy. * @param cfg Configuration to copy.
*/ */
public TransactionsConfiguration(TransactionsConfiguration cfg) { public TransactionConfiguration(TransactionConfiguration cfg) {
dfltConcurrency = cfg.getDefaultTxConcurrency(); dfltConcurrency = cfg.getDefaultTxConcurrency();
dfltIsolation = cfg.getDefaultTxIsolation(); dfltIsolation = cfg.getDefaultTxIsolation();
dfltTxTimeout = cfg.getDefaultTxTimeout(); dfltTxTimeout = cfg.getDefaultTxTimeout();
Expand Down
Expand Up @@ -1423,7 +1423,7 @@ private void start0(GridStartContext startCtx) throws IgniteCheckedException {
myCfg.setServiceConfiguration(cfg.getServiceConfiguration()); myCfg.setServiceConfiguration(cfg.getServiceConfiguration());
myCfg.setWarmupClosure(cfg.getWarmupClosure()); myCfg.setWarmupClosure(cfg.getWarmupClosure());
myCfg.setPluginConfigurations(cfg.getPluginConfigurations()); myCfg.setPluginConfigurations(cfg.getPluginConfigurations());
myCfg.setTransactionsConfiguration(new TransactionsConfiguration(cfg.getTransactionsConfiguration())); myCfg.setTransactionsConfiguration(new TransactionConfiguration(cfg.getTransactionsConfiguration()));
myCfg.setQueryConfiguration(cfg.getQueryConfiguration()); myCfg.setQueryConfiguration(cfg.getQueryConfiguration());
myCfg.setAtomicConfiguration(cfg.getAtomicConfiguration()); myCfg.setAtomicConfiguration(cfg.getAtomicConfiguration());


Expand Down
Expand Up @@ -3730,7 +3730,7 @@ public CacheMetricsImpl metrics0() {


/** {@inheritDoc} */ /** {@inheritDoc} */
@Override public IgniteTx txStart() throws IllegalStateException { @Override public IgniteTx txStart() throws IllegalStateException {
TransactionsConfiguration cfg = ctx.gridConfig().getTransactionsConfiguration(); TransactionConfiguration cfg = ctx.gridConfig().getTransactionsConfiguration();


return txStart(cfg.getDefaultTxConcurrency(), cfg.getDefaultTxIsolation()); return txStart(cfg.getDefaultTxConcurrency(), cfg.getDefaultTxIsolation());
} }
Expand All @@ -3740,7 +3740,7 @@ public CacheMetricsImpl metrics0() {
A.notNull(concurrency, "concurrency"); A.notNull(concurrency, "concurrency");
A.notNull(isolation, "isolation"); A.notNull(isolation, "isolation");


TransactionsConfiguration cfg = ctx.gridConfig().getTransactionsConfiguration(); TransactionConfiguration cfg = ctx.gridConfig().getTransactionsConfiguration();


return txStart( return txStart(
concurrency, concurrency,
Expand Down Expand Up @@ -4352,7 +4352,7 @@ private int globalSize(boolean primaryOnly) throws IgniteCheckedException {
IgniteTxLocalAdapter<K, V> tx = ctx.tm().threadLocalTx(); IgniteTxLocalAdapter<K, V> tx = ctx.tm().threadLocalTx();


if (tx == null || tx.implicit()) { if (tx == null || tx.implicit()) {
TransactionsConfiguration tCfg = ctx.gridConfig().getTransactionsConfiguration(); TransactionConfiguration tCfg = ctx.gridConfig().getTransactionsConfiguration();


tx = ctx.tm().newTx( tx = ctx.tm().newTx(
true, true,
Expand Down
Expand Up @@ -1226,10 +1226,10 @@ private void checkCache(ClusterNode rmt) throws IgniteCheckedException {
* @throws IgniteCheckedException If check failed. * @throws IgniteCheckedException If check failed.
*/ */
private void checkTransactionConfiguration(ClusterNode rmt) throws IgniteCheckedException { private void checkTransactionConfiguration(ClusterNode rmt) throws IgniteCheckedException {
TransactionsConfiguration txCfg = rmt.attribute(ATTR_TX_CONFIG); TransactionConfiguration txCfg = rmt.attribute(ATTR_TX_CONFIG);


if (txCfg != null) { if (txCfg != null) {
TransactionsConfiguration locTxCfg = ctx.config().getTransactionsConfiguration(); TransactionConfiguration locTxCfg = ctx.config().getTransactionsConfiguration();


if (locTxCfg.isTxSerializableEnabled() != txCfg.isTxSerializableEnabled()) if (locTxCfg.isTxSerializableEnabled() != txCfg.isTxSerializableEnabled())
throw new IgniteCheckedException("Serializable transactions enabled mismatch " + throw new IgniteCheckedException("Serializable transactions enabled mismatch " +
Expand Down
Expand Up @@ -157,7 +157,7 @@ public String gridName() {
* *
* @return Transactions configuration. * @return Transactions configuration.
*/ */
public TransactionsConfiguration txConfig() { public TransactionConfiguration txConfig() {
return kernalCtx.config().getTransactionsConfiguration(); return kernalCtx.config().getTransactionsConfiguration();
} }


Expand Down
Expand Up @@ -47,7 +47,7 @@ public IgniteTransactionsImpl(GridCacheSharedContext<K, V> cctx) {


/** {@inheritDoc} */ /** {@inheritDoc} */
@Override public IgniteTx txStart() throws IllegalStateException { @Override public IgniteTx txStart() throws IllegalStateException {
TransactionsConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration(); TransactionConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration();


return txStart0( return txStart0(
cfg.getDefaultTxConcurrency(), cfg.getDefaultTxConcurrency(),
Expand All @@ -63,7 +63,7 @@ public IgniteTransactionsImpl(GridCacheSharedContext<K, V> cctx) {
A.notNull(concurrency, "concurrency"); A.notNull(concurrency, "concurrency");
A.notNull(isolation, "isolation"); A.notNull(isolation, "isolation");


TransactionsConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration(); TransactionConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration();


return txStart0( return txStart0(
concurrency, concurrency,
Expand Down Expand Up @@ -120,7 +120,7 @@ public IgniteTransactionsImpl(GridCacheSharedContext<K, V> cctx) {
A.notNull(concurrency, "concurrency"); A.notNull(concurrency, "concurrency");
A.notNull(isolation, "isolation"); A.notNull(isolation, "isolation");


TransactionsConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration(); TransactionConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration();


return txStart0(concurrency, return txStart0(concurrency,
isolation, isolation,
Expand Down Expand Up @@ -196,7 +196,7 @@ public IgniteTransactionsImpl(GridCacheSharedContext<K, V> cctx) {
*/ */
private IgniteInternalTx txStart0(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, private IgniteInternalTx txStart0(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation,
long timeout, int txSize, boolean sys) { long timeout, int txSize, boolean sys) {
TransactionsConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration(); TransactionConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration();


if (!cfg.isTxSerializableEnabled() && isolation == SERIALIZABLE) if (!cfg.isTxSerializableEnabled() && isolation == SERIALIZABLE)
throw new IllegalArgumentException("SERIALIZABLE isolation level is disabled (to enable change " + throw new IllegalArgumentException("SERIALIZABLE isolation level is disabled (to enable change " +
Expand Down
Expand Up @@ -27,7 +27,7 @@
import java.util.*; 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. * method.
*/ */
public abstract class MessagingListenActor<T> implements IgniteBiPredicate<UUID, T> { public abstract class MessagingListenActor<T> implements IgniteBiPredicate<UUID, T> {
Expand Down
Expand Up @@ -828,7 +828,7 @@ public void testTx() throws Exception {


tx.commit(); tx.commit();


TransactionsConfiguration tCfg = grid(0).configuration().getTransactionsConfiguration(); TransactionConfiguration tCfg = grid(0).configuration().getTransactionsConfiguration();


tx = cache().txStart( tx = cache().txStart(
tCfg.getDefaultTxConcurrency(), tCfg.getDefaultTxConcurrency(),
Expand Down
Expand Up @@ -33,7 +33,7 @@ public abstract class GridCacheAbstractPartitionedByteArrayValuesSelfTest extend
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName); IgniteConfiguration cfg = super.getConfiguration(gridName);


TransactionsConfiguration tCfg = new TransactionsConfiguration(); TransactionConfiguration tCfg = new TransactionConfiguration();


tCfg.setTxSerializableEnabled(true); tCfg.setTxSerializableEnabled(true);


Expand Down
Expand Up @@ -104,7 +104,7 @@ public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest {


discoSpi.setIpFinder(IP_FINDER); discoSpi.setIpFinder(IP_FINDER);


TransactionsConfiguration tCfg = cfg.getTransactionsConfiguration(); TransactionConfiguration tCfg = cfg.getTransactionsConfiguration();


tCfg.setDefaultTxConcurrency(txConcurrency); tCfg.setDefaultTxConcurrency(txConcurrency);
tCfg.setDefaultTxIsolation(txIsolation); tCfg.setDefaultTxIsolation(txIsolation);
Expand Down
Expand Up @@ -40,7 +40,7 @@ public class GridCachePartitionedTxTimeoutSelfTest extends IgniteTxTimeoutAbstra
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration c = super.getConfiguration(gridName); IgniteConfiguration c = super.getConfiguration(gridName);


TransactionsConfiguration txCfg = c.getTransactionsConfiguration(); TransactionConfiguration txCfg = c.getTransactionsConfiguration();


txCfg.setTxSerializableEnabled(true); txCfg.setTxSerializableEnabled(true);
txCfg.setDefaultTxTimeout(TIMEOUT); txCfg.setDefaultTxTimeout(TIMEOUT);
Expand Down
Expand Up @@ -45,7 +45,7 @@ public class GridCacheReplicatedTxMultiThreadedSelfTest extends IgniteTxMultiThr
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration c = super.getConfiguration(gridName); IgniteConfiguration c = super.getConfiguration(gridName);


TransactionsConfiguration tCfg = new TransactionsConfiguration(); TransactionConfiguration tCfg = new TransactionConfiguration();


tCfg.setTxSerializableEnabled(true); tCfg.setTxSerializableEnabled(true);


Expand Down
Expand Up @@ -67,7 +67,7 @@ public class GridCacheDistributedEvictionsSelfTest extends GridCommonAbstractTes
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration c = super.getConfiguration(gridName); IgniteConfiguration c = super.getConfiguration(gridName);


TransactionsConfiguration tCfg = new TransactionsConfiguration(); TransactionConfiguration tCfg = new TransactionConfiguration();


tCfg.setDefaultTxConcurrency(PESSIMISTIC); tCfg.setDefaultTxConcurrency(PESSIMISTIC);
tCfg.setDefaultTxIsolation(READ_COMMITTED); tCfg.setDefaultTxIsolation(READ_COMMITTED);
Expand Down
Expand Up @@ -63,7 +63,7 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration c = super.getConfiguration(gridName); IgniteConfiguration c = super.getConfiguration(gridName);


TransactionsConfiguration txCfg = c.getTransactionsConfiguration(); TransactionConfiguration txCfg = c.getTransactionsConfiguration();


txCfg.setDefaultTxConcurrency(txConcurrency); txCfg.setDefaultTxConcurrency(txConcurrency);
txCfg.setDefaultTxIsolation(txIsolation); txCfg.setDefaultTxIsolation(txIsolation);
Expand Down
Expand Up @@ -55,7 +55,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration c = super.getConfiguration(gridName); IgniteConfiguration c = super.getConfiguration(gridName);


TransactionsConfiguration txCfg = c.getTransactionsConfiguration(); TransactionConfiguration txCfg = c.getTransactionsConfiguration();


txCfg.setDefaultTxConcurrency(PESSIMISTIC); txCfg.setDefaultTxConcurrency(PESSIMISTIC);
txCfg.setDefaultTxIsolation(REPEATABLE_READ); txCfg.setDefaultTxIsolation(REPEATABLE_READ);
Expand Down
Expand Up @@ -62,7 +62,7 @@ public class GridCachePartitionedHitsAndMissesSelfTest extends GridCommonAbstrac
// Cache. // Cache.
cfg.setCacheConfiguration(cacheConfiguration(gridName)); cfg.setCacheConfiguration(cacheConfiguration(gridName));


TransactionsConfiguration tCfg = new TransactionsConfiguration(); TransactionConfiguration tCfg = new TransactionConfiguration();


tCfg.setDefaultTxConcurrency(IgniteTxConcurrency.PESSIMISTIC); tCfg.setDefaultTxConcurrency(IgniteTxConcurrency.PESSIMISTIC);
tCfg.setDefaultTxIsolation(IgniteTxIsolation.REPEATABLE_READ); tCfg.setDefaultTxIsolation(IgniteTxIsolation.REPEATABLE_READ);
Expand Down
Expand Up @@ -74,7 +74,7 @@ public class CacheJtaManager<K, V> extends CacheJtaManagerAdapter<K, V> {
IgniteInternalTx tx = cctx.tm().userTx(); IgniteInternalTx tx = cctx.tm().userTx();


if (tx == null) { if (tx == null) {
TransactionsConfiguration tCfg = cctx.kernalContext().config() TransactionConfiguration tCfg = cctx.kernalContext().config()
.getTransactionsConfiguration(); .getTransactionsConfiguration();


tx = cctx.tm().newTx( tx = cctx.tm().newTx(
Expand Down
Expand Up @@ -107,7 +107,7 @@ public IgniteNode(boolean clientMode, Ignite ignite) {


} }


TransactionsConfiguration tc = c.getTransactionsConfiguration(); TransactionConfiguration tc = c.getTransactionsConfiguration();


tc.setDefaultTxConcurrency(args.txConcurrency()); tc.setDefaultTxConcurrency(args.txConcurrency());
tc.setDefaultTxIsolation(args.txIsolation()); tc.setDefaultTxIsolation(args.txIsolation());
Expand Down

0 comments on commit 2133af1

Please sign in to comment.