You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2014/12/23 01:00:21 UTC
[47/50] [abbrv] incubator-ignite git commit: GG-9141 - Fixed tests.
GG-9141 - Fixed tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f7118cea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f7118cea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f7118cea
Branch: refs/heads/master
Commit: f7118ceac46930b1c2cb24af7cce89ecb26a0d9d
Parents: 2f62dc6
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Sun Dec 21 15:03:25 2014 -0800
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Sun Dec 21 15:03:25 2014 -0800
----------------------------------------------------------------------
.../TransactionsConfiguration.java | 4 +-
.../tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java | 7 +-
.../transactions/IgniteTxMetricsAdapter.java | 107 -------------------
.../core/src/test/config/spring-multicache.xml | 16 ---
.../processors/cache/IgniteCacheTest.java | 4 +-
5 files changed, 7 insertions(+), 131 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7118cea/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
index 5aa700a..7c975af 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionsConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/TransactionsConfiguration.java
@@ -11,10 +11,12 @@ package org.apache.ignite.configuration;
import org.apache.ignite.transactions.*;
+import java.io.*;
+
/**
* Transactions configuration.
*/
-public class TransactionsConfiguration {
+public class TransactionsConfiguration implements Serializable {
/** Default value for 'txSerializableEnabled' flag. */
public static final boolean DFLT_TX_SERIALIZABLE_ENABLED = false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7118cea/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java
index 5763a88..29b7b1a 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java
@@ -12,7 +12,6 @@ package org.apache.ignite.spi.discovery.tcp.ipfinder.vm;
import org.apache.ignite.*;
import org.apache.ignite.resources.*;
import org.apache.ignite.spi.*;
-import org.gridgain.grid.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.gridgain.grid.util.tostring.*;
import org.gridgain.grid.util.typedef.*;
@@ -116,7 +115,7 @@ public class TcpDiscoveryVmIpFinder extends TcpDiscoveryIpFinderAdapter {
* </ul>
*
* @param addrs Known nodes addresses.
- * @throws org.apache.ignite.spi.IgniteSpiException If any error occurs.
+ * @throws IgniteSpiException If any error occurs.
*/
@IgniteSpiConfiguration(optional = true)
public synchronized void setAddresses(Collection<String> addrs) throws IgniteSpiException {
@@ -137,7 +136,7 @@ public class TcpDiscoveryVmIpFinder extends TcpDiscoveryIpFinderAdapter {
* @param ipStr Address string.
* @return Socket addresses (may contain 1 or more addresses if provided string
* includes port range).
- * @throws org.apache.ignite.spi.IgniteSpiException If failed.
+ * @throws IgniteSpiException If failed.
*/
private static Collection<InetSocketAddress> address(String ipStr) throws IgniteSpiException {
ipStr = ipStr.trim();
@@ -180,7 +179,7 @@ public class TcpDiscoveryVmIpFinder extends TcpDiscoveryIpFinderAdapter {
* @param errMsg Error message.
* @return Socket addresses (may contain 1 or more addresses if provided string
* includes port range).
- * @throws org.apache.ignite.spi.IgniteSpiException If failed.
+ * @throws IgniteSpiException If failed.
*/
private static Collection<InetSocketAddress> addresses(String ipStr, String regexDelim, String errMsg)
throws IgniteSpiException {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7118cea/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxMetricsAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxMetricsAdapter.java b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxMetricsAdapter.java
deleted file mode 100644
index 9bc084a..0000000
--- a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxMetricsAdapter.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.apache.ignite.transactions;
-
-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/f7118cea/modules/core/src/test/config/spring-multicache.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/spring-multicache.xml b/modules/core/src/test/config/spring-multicache.xml
index af55077..3111e34 100644
--- a/modules/core/src/test/config/spring-multicache.xml
+++ b/modules/core/src/test/config/spring-multicache.xml
@@ -73,8 +73,6 @@
</property>
<property name="backups" value="1"/>
-
- <property name="dgcFrequency" value="0"/>
</bean>
<bean class="org.gridgain.grid.cache.GridCacheConfiguration">
@@ -97,8 +95,6 @@
</property>
<property name="backups" value="1"/>
-
- <property name="dgcFrequency" value="0"/>
</bean>
<bean class="org.gridgain.grid.cache.GridCacheConfiguration">
@@ -121,8 +117,6 @@
</property>
<property name="backups" value="1"/>
-
- <property name="dgcFrequency" value="0"/>
</bean>
<bean class="org.gridgain.grid.cache.GridCacheConfiguration">
@@ -145,8 +139,6 @@
</property>
<property name="backups" value="1"/>
-
- <property name="dgcFrequency" value="0"/>
</bean>
<bean class="org.gridgain.grid.cache.GridCacheConfiguration">
@@ -170,8 +162,6 @@
</property>
<property name="backups" value="1"/>
-
- <property name="dgcFrequency" value="0"/>
</bean>
<bean class="org.gridgain.grid.cache.GridCacheConfiguration">
@@ -194,8 +184,6 @@
</property>
<property name="backups" value="1"/>
-
- <property name="dgcFrequency" value="0"/>
</bean>
<bean class="org.gridgain.grid.cache.GridCacheConfiguration">
@@ -218,8 +206,6 @@
</property>
<property name="backups" value="1"/>
-
- <property name="dgcFrequency" value="0"/>
</bean>
<bean class="org.gridgain.grid.cache.GridCacheConfiguration">
@@ -242,8 +228,6 @@
</property>
<property name="backups" value="1"/>
-
- <property name="dgcFrequency" value="0"/>
</bean>
</list>
</property>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7118cea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTest.java
index a390fad..414981c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTest.java
@@ -74,9 +74,7 @@ public class IgniteCacheTest extends GridCommonAbstractTest {
* @throws Exception In case of error.
*/
protected GridCacheConfiguration cacheConfiguration(String gridName) throws Exception {
- GridCacheConfiguration cfg = defaultCacheConfiguration();
-
- return cfg;
+ return defaultCacheConfiguration();
}
/**