incubator-ignite git commit: IGNITE-843: Fixed code generation.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 136be5506 -> 7cf713cb1
IGNITE-843: Fixed code generation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7cf713cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7cf713cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7cf713cb
Branch: refs/heads/ignite-843
Commit: 7cf713cb1bf35ceb755e821b965575bf9d3c9d78
Parents: 136be55
Author: AKuznetsov
Authored: Mon Aug 17 10:48:27 2015 +0700
Committer: AKuznetsov
Committed: Mon Aug 17 10:48:27 2015 +0700
--
.../src/main/js/controllers/models/clusters.json| 2 +-
modules/control-center-web/src/main/js/db.js| 1 +
modules/control-center-web/src/main/js/routes/generator/java.js | 5 +++--
modules/control-center-web/src/main/js/routes/generator/xml.js | 3 ++-
4 files changed, 7 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cf713cb/modules/control-center-web/src/main/js/controllers/models/clusters.json
--
diff --git
a/modules/control-center-web/src/main/js/controllers/models/clusters.json
b/modules/control-center-web/src/main/js/controllers/models/clusters.json
index 8ff582a..1233f91 100644
--- a/modules/control-center-web/src/main/js/controllers/models/clusters.json
+++ b/modules/control-center-web/src/main/js/controllers/models/clusters.json
@@ -286,7 +286,7 @@
"type": "text",
"required": true,
"path": "discovery.GoogleStorage",
- "model": "accountId",
+ "model": "serviceAccountId",
"tip": [
"Service account ID (typically an e-mail address)."
]
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cf713cb/modules/control-center-web/src/main/js/db.js
--
diff --git a/modules/control-center-web/src/main/js/db.js
b/modules/control-center-web/src/main/js/db.js
index 0d53028..431eccc 100644
--- a/modules/control-center-web/src/main/js/db.js
+++ b/modules/control-center-web/src/main/js/db.js
@@ -237,6 +237,7 @@ var ClusterSchema = new Schema({
projectName: String,
bucketName: String,
serviceAccountP12FilePath: String,
+serviceAccountId: String,
addrReqAttempts: String
},
Jdbc: {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cf713cb/modules/control-center-web/src/main/js/routes/generator/java.js
--
diff --git a/modules/control-center-web/src/main/js/routes/generator/java.js
b/modules/control-center-web/src/main/js/routes/generator/java.js
index 06b8a2a..4186573 100644
--- a/modules/control-center-web/src/main/js/routes/generator/java.js
+++ b/modules/control-center-web/src/main/js/routes/generator/java.js
@@ -124,7 +124,8 @@ exports.generateClusterConfiguration = function (cluster,
javaClass, clientNearC
'TcpDiscoveryGoogleStorageIpFinder', {
projectName: null,
bucketName: null,
-serviceAccountP12FilePath: null
+serviceAccountP12FilePath: null,
+serviceAccountId: null
}, true);
//if (d.GoogleStorage.addrReqAttempts) todo
@@ -137,7 +138,7 @@ exports.generateClusterConfiguration = function (cluster,
javaClass, clientNearC
declareVariable(res, true, 'ipFinder',
'org.apache.ignite.spi.discovery.tcp.ipfinder.jdbc.TcpDiscoveryJdbcIpFinder');
-res.line('ipFinder.setInitSchema(' + (d.Jdbc.initSchema !=
null || d.Jdbc.initSchema) + ');');
+res.line('ipFinder.setInitSchema(' +
(generatorCommon.isDefined(d.Jdbc.initSchema) && d.Jdbc.initSchema) + ');');
res.line('discovery.setIpFinder(ipFinder);');
res.needEmptyLine = true;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cf713cb/modules/control-center-web/src/main/js/routes/generator/xml.js
--
diff --git a/modules/control-center-web/src/main/js/routes/generator/xml.js
b/modules/control-center-web/src/main/js/routes/generator/xml.js
index 7c5d045..34f964d 100644
--- a/modules/control-center-web/src/main/js/routes/generator/xml.js
+++ b/modules/control-center-web/src/main/js/routes/generator/xml.js
@@ -115,6 +115,7 @@ exports.generateClusterConfiguration = function (cluster,
clientNearConfiguratio
addProperty(
incubator-ignite git commit: IGNITE-843: Fixed code generation.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 7cf713cb1 -> 0ceea1e40
IGNITE-843: Fixed code generation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0ceea1e4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0ceea1e4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0ceea1e4
Branch: refs/heads/ignite-843
Commit: 0ceea1e4040405c3e3e789cb854a1f9c97a9c32f
Parents: 7cf713c
Author: AKuznetsov
Authored: Mon Aug 17 13:09:25 2015 +0700
Committer: AKuznetsov
Committed: Mon Aug 17 13:09:25 2015 +0700
--
.../src/main/js/controllers/clusters-controller.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ceea1e4/modules/control-center-web/src/main/js/controllers/clusters-controller.js
--
diff --git
a/modules/control-center-web/src/main/js/controllers/clusters-controller.js
b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
index 98f8c90..6de032d 100644
--- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
@@ -279,7 +279,7 @@ controlCenterModule.controller('clustersController',
['$scope', '$http', '$popov
return showPopoverMessage(0, 'serviceAccountP12FilePath',
'Private key path should not be empty');
if
($common.isEmptyString(item.discovery.GoogleStorage.accountId))
-return showPopoverMessage(0, 'accountId', 'Account ID
should not be empty');
+return showPopoverMessage(0, 'serviceAccountId', 'Account
ID should not be empty');
}
if (!item.swapSpaceSpi || !item.swapSpaceSpi.kind && item.caches) {
incubator-ignite git commit: IGNITE-843: Fixed code generation.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 0ceea1e40 -> 78df3dd80
IGNITE-843: Fixed code generation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/78df3dd8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/78df3dd8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/78df3dd8
Branch: refs/heads/ignite-843
Commit: 78df3dd805d0c619364c673c53afd7051ba18720
Parents: 0ceea1e
Author: AKuznetsov
Authored: Mon Aug 17 13:12:37 2015 +0700
Committer: AKuznetsov
Committed: Mon Aug 17 13:12:37 2015 +0700
--
.../src/main/js/controllers/clusters-controller.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78df3dd8/modules/control-center-web/src/main/js/controllers/clusters-controller.js
--
diff --git
a/modules/control-center-web/src/main/js/controllers/clusters-controller.js
b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
index 6de032d..ecfa699 100644
--- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
@@ -278,7 +278,7 @@ controlCenterModule.controller('clustersController',
['$scope', '$http', '$popov
if
($common.isEmptyString(item.discovery.GoogleStorage.serviceAccountP12FilePath))
return showPopoverMessage(0, 'serviceAccountP12FilePath',
'Private key path should not be empty');
-if
($common.isEmptyString(item.discovery.GoogleStorage.accountId))
+if
($common.isEmptyString(item.discovery.GoogleStorage.serviceAccountId))
return showPopoverMessage(0, 'serviceAccountId', 'Account
ID should not be empty');
}
incubator-ignite git commit: # IGNITE-843 Smtp settings. Agent build fix.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 78df3dd80 -> 1ecc6d61b
# IGNITE-843 Smtp settings. Agent build fix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1ecc6d61
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1ecc6d61
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1ecc6d61
Branch: refs/heads/ignite-843
Commit: 1ecc6d61b7638d160bd338357b773a33c91a0874
Parents: 78df3dd
Author: Andrey
Authored: Mon Aug 17 13:25:01 2015 +0700
Committer: Andrey
Committed: Mon Aug 17 13:25:01 2015 +0700
--
assembly/release-schema-import.xml | 2 +-
modules/control-center-agent/README.txt | 2 +-
.../assembly/release-control-center-agent.xml | 64
.../bin/ignite-control-center-agent.bat | 18 ++
.../bin/ignite-control-center-agent.sh | 19 ++
modules/control-center-agent/pom.xml| 20 +++---
.../control-center-agent/src/assembly/build.xml | 34 ---
modules/control-center-agent/src/bin/agent.bat | 18 --
modules/control-center-agent/src/bin/agent.sh | 19 --
.../src/main/js/config/default.json | 5 ++
.../src/main/js/routes/public.js| 32 ++
11 files changed, 138 insertions(+), 95 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ecc6d61/assembly/release-schema-import.xml
--
diff --git a/assembly/release-schema-import.xml
b/assembly/release-schema-import.xml
index b746c83..38457b9 100644
--- a/assembly/release-schema-import.xml
+++ b/assembly/release-schema-import.xml
@@ -21,7 +21,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd";>
-scala
+release-schema-import
false
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ecc6d61/modules/control-center-agent/README.txt
--
diff --git a/modules/control-center-agent/README.txt
b/modules/control-center-agent/README.txt
index 3712cbd..694fa89 100644
--- a/modules/control-center-agent/README.txt
+++ b/modules/control-center-agent/README.txt
@@ -11,7 +11,7 @@ Two main functions of Ignite Control Center Agent:
You may need to copy JDBC driver into "./jdbc-drivers" subfolder or
specify path via "-drv" option.
Usage example:
-agent.sh -l john.sm...@gmail.com -p qwerty -s
wss://control-center.example.com
+ignite-control-center-agent.sh -l john.sm...@gmail.com -p qwerty -s
wss://control-center.example.com
Configuration file:
Should be a file with simple line-oriented format as described here:
http://docs.oracle.com/javase/7/docs/api/java/util/Properties.html#load(java.io.Reader)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ecc6d61/modules/control-center-agent/assembly/release-control-center-agent.xml
--
diff --git
a/modules/control-center-agent/assembly/release-control-center-agent.xml
b/modules/control-center-agent/assembly/release-control-center-agent.xml
new file mode 100644
index 000..d0a527c
--- /dev/null
+++ b/modules/control-center-agent/assembly/release-control-center-agent.xml
@@ -0,0 +1,64 @@
+
+
+
+
+http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3
http://maven.apache.org/xsd/assembly-1.1.3.xsd";>
+dependencies-control-center-agent
+
+
+zip
+
+
+
+
+${basedir}
+/
+
+jdbc-drivers/README*
+README*
+LICENSE*
+NOTICE*
+
+
+
+${basedir}/bin
+/
+
+**/*.bat
+**/*.exe
+
+
+
+${basedir}/bin
+/
+0755
+
+**/*.sh
+
+
+
+${project.build.directory}
+/
+
+agent-${project.version}.jar
+
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ecc6d61/modules/control-center-agent/bin/ignite-control-center-agent.bat
--
diff --git a/modules/control-center-agent/bin/ignite-control-center-agent.ba
incubator-ignite git commit: # IGNITE-843 Cleanup.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 1ecc6d61b -> 83e0457f1
# IGNITE-843 Cleanup.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/83e0457f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/83e0457f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/83e0457f
Branch: refs/heads/ignite-843
Commit: 83e0457f1c03425b80daba297e1da85bc80736bd
Parents: 1ecc6d6
Author: Andrey
Authored: Mon Aug 17 13:27:57 2015 +0700
Committer: Andrey
Committed: Mon Aug 17 13:27:57 2015 +0700
--
.../src/main/js/routes/public.js| 51
1 file changed, 51 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83e0457f/modules/control-center-web/src/main/js/routes/public.js
--
diff --git a/modules/control-center-web/src/main/js/routes/public.js
b/modules/control-center-web/src/main/js/routes/public.js
index dcc5f71..ef00f56 100644
--- a/modules/control-center-web/src/main/js/routes/public.js
+++ b/modules/control-center-web/src/main/js/routes/public.js
@@ -186,57 +186,6 @@ router.get('/reset/:token', function (req, res) {
});
});
-/**
- * Reset password with given token.
- */
-router.post('/reset_password', function(req, res) {
-db.Account.findOne({ resetPasswordToken: req.body.token }, function(err,
user) {
-if (!user)
-return res.status(500).send('Invalid token for password reset!');
-
-if (err)
-return res.status(500).send(err);
-
-user.setPassword(req.body.password, function (err, updatedUser) {
-if (err)
-return res.status(500).send(err.message);
-
-updatedUser.resetPasswordToken = undefined;
-
-updatedUser.save(function (err) {
-if (err)
-return res.status(500).send(err.message);
-
-var transporter = nodemailer.createTransport({
-service: 'gmail',
-auth: {
-user: _mailUser,
-pass: _mailPass
-}
-});
-
-var mailOptions = {
-from: _mailUser,
-to: user.email,
-subject: 'Your password has been changed',
-text: 'Hello,\n\n' +
-'This is a confirmation that the password for your account
' + user.email + ' has just been changed.\n\n' +
-'Now you can login: http://' + req.headers.host + '\n\n' +
-'--\n' +
-'Apache Ignite Web Control Center\n'
-};
-
-transporter.sendMail(mailOptions, function(err){
-if (err)
-return res.status(503).send('Password was changed, but
failed to send confirmation e-mail!' + err);
-
-return res.status(200).send(user.email);
-});
-});
-});
-});
-});
-
/* GET home page. */
router.get('/', function (req, res) {
if (req.isAuthenticated())
[14/38] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-946' into ignite-946
Merge remote-tracking branch 'origin/ignite-946' into ignite-946 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9f16eb16 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9f16eb16 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9f16eb16 Branch: refs/heads/ignite-426 Commit: 9f16eb165f2aad48f05cef17f608eb2898c078a3 Parents: 92e81dc 53557e3 Author: Denis Magda Authored: Mon Aug 10 09:58:27 2015 +0300 Committer: Denis Magda Committed: Mon Aug 10 09:58:27 2015 +0300 -- .../apache/ignite/cache/version/package-info.java | 4 ++-- .../processors/cache/CacheInvokeEntry.java| 5 +++-- .../cache/transactions/IgniteTxEntry.java | 4 +++- .../cache/transactions/IgniteTxLocalAdapter.java | 18 +- 4 files changed, 17 insertions(+), 14 deletions(-) --
[07/38] incubator-ignite git commit: IGNITE-946 Added test to Suite.
IGNITE-946 Added test to Suite.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f0fe0769
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f0fe0769
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f0fe0769
Branch: refs/heads/ignite-426
Commit: f0fe0769751b7957a64fc5dd56989e54f1223ab1
Parents: 26144dc
Author: nikolay_tikhonov
Authored: Fri Jul 31 13:00:09 2015 +0300
Committer: nikolay_tikhonov
Committed: Fri Jul 31 15:49:13 2015 +0300
--
.../java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f0fe0769/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
index 3ac7879..228be92 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
@@ -164,7 +164,7 @@ public class IgniteCacheTestSuite4 extends TestSuite {
suite.addTestSuite(CacheVersionedEntryReplicatedAtomicSelfTest.class);
suite.addTestSuite(CacheVersionedEntryReplicatedTransactionalSelfTest.class);
suite.addTestSuite(CacheVersionedEntryReplicatedAtomicOffHeapSelfTest.class);
-
suite.addTestSuite(CacheVersionedEntryPartitionedTransactionalOffHeapSelfTest.class);
+
suite.addTestSuite(CacheVersionedEntryReplicatedTransactionalOffHeapSelfTest.class);
return suite;
}
[09/38] incubator-ignite git commit: ignite-946: fixing version retrieval for transactions
ignite-946: fixing version retrieval for transactions
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2e7799d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2e7799d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2e7799d4
Branch: refs/heads/ignite-426
Commit: 2e7799d446653bba379cc231628ba2b02c993e5e
Parents: f0fe076
Author: Denis Magda
Authored: Fri Jul 31 15:32:45 2015 +0300
Committer: nikolay_tikhonov
Committed: Fri Jul 31 15:49:14 2015 +0300
--
.../processors/cache/CacheInvokeEntry.java | 2 +-
.../processors/cache/GridCacheMapEntry.java | 4 +-
.../cache/transactions/IgniteTxAdapter.java | 14 ++-
.../cache/transactions/IgniteTxEntry.java | 11 ++-
.../transactions/IgniteTxLocalAdapter.java | 90
5 files changed, 98 insertions(+), 23 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2e7799d4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java
index e6f8d4e..2d8f738 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java
@@ -121,7 +121,7 @@ public class CacheInvokeEntry extends
CacheLazyEntry implements Muta
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Override public T unwrap(Class cls) {
-if (cls.isAssignableFrom(VersionedEntry.class))
+if (cls.isAssignableFrom(VersionedEntry.class) && ver != null)
return (T)new CacheVersionedEntryImpl<>(getKey(), getValue(), ver);
return super.unwrap(cls);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2e7799d4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index ebcb908..43cf2fe 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -1653,7 +1653,7 @@ public abstract class GridCacheMapEntry extends
GridMetadataAwareAdapter impleme
oldVal = rawGetOrUnmarshalUnlocked(true);
-CacheInvokeEntry entry = new
CacheInvokeEntry(cctx, key, oldVal, this.ver);
+CacheInvokeEntry entry = new
CacheInvokeEntry(cctx, key, oldVal, version());
try {
Object computed = entryProcessor.process(entry,
invokeArgs);
@@ -1878,7 +1878,7 @@ public abstract class GridCacheMapEntry extends
GridMetadataAwareAdapter impleme
EntryProcessor entryProcessor =
(EntryProcessor)writeObj;
-CacheInvokeEntry entry = new
CacheInvokeEntry(cctx, key, oldVal, this.ver);
+CacheInvokeEntry entry = new
CacheInvokeEntry(cctx, key, oldVal, version());
try {
Object computed = entryProcessor.process(entry,
invokeArgs);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2e7799d4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
index 0d14012..797f75e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
@@ -1228,9 +1228,21 @@ public abstract class IgniteTxAdapter extends
GridMetadataAwareAdapter
Object key = null;
+GridCacheVersion ver;
+
+try {
+ver = txEntry.cached().version();
+}
+catch (GridCacheEntryRemovedException e) {
+if (log.isDebugEnabled())
+log.
[15/38] incubator-ignite git commit: ignite-946: fixed review notes
ignite-946: fixed review notes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/911ffbb5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/911ffbb5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/911ffbb5
Branch: refs/heads/ignite-426
Commit: 911ffbb5de261d662a915677b99cae4a160407eb
Parents: 9f16eb1
Author: Denis Magda
Authored: Mon Aug 10 11:39:44 2015 +0300
Committer: Denis Magda
Committed: Mon Aug 10 11:39:44 2015 +0300
--
.../ignite/cache/version/VersionedEntry.java| 2 +-
.../processors/cache/CacheEntryImpl0.java | 4 +-
.../processors/cache/GridCacheMapEntry.java | 2 +-
.../processors/cache/GridCacheSwapManager.java | 88
.../cache/transactions/IgniteTxAdapter.java | 2 +
.../cache/transactions/IgniteTxEntry.java | 2 +-
.../transactions/IgniteTxLocalAdapter.java | 8 ++
.../cache/version/GridCacheVersionAware.java| 30 +++
.../cache/version/GridVersionedMapEntry.java| 33
.../CacheVersionedEntryAbstractTest.java| 2 +-
10 files changed, 99 insertions(+), 74 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/911ffbb5/modules/core/src/main/java/org/apache/ignite/cache/version/VersionedEntry.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/version/VersionedEntry.java
b/modules/core/src/main/java/org/apache/ignite/cache/version/VersionedEntry.java
index e669f15..2c0879b 100644
---
a/modules/core/src/main/java/org/apache/ignite/cache/version/VersionedEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/cache/version/VersionedEntry.java
@@ -56,7 +56,7 @@ public interface VersionedEntry extends Cache.Entry {
/**
* Versions comparator.
*/
-public static final Comparator VERSIONS_COMPARATOR = new
Comparator() {
+public static final Comparator VER_COMP = new
Comparator() {
@Override public int compare(VersionedEntry o1, VersionedEntry o2) {
int res = Integer.compare(o1.topologyVersion(),
o2.topologyVersion());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/911ffbb5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl0.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl0.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl0.java
index a5e27d6..987fbd3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl0.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl0.java
@@ -52,8 +52,8 @@ public class CacheEntryImpl0 implements Cache.Entry {
@Override public T unwrap(Class cls) {
if(cls.isAssignableFrom(getClass()))
return cls.cast(this);
-else if (cls.isAssignableFrom(VersionedEntry.class) && e instanceof
GridVersionedMapEntry)
-return (T)new CacheVersionedEntryImpl<>(e.getKey(), e.getValue(),
((GridVersionedMapEntry)e).version());
+else if (cls.isAssignableFrom(VersionedEntry.class) && e instanceof
GridCacheVersionAware)
+return (T)new CacheVersionedEntryImpl<>(e.getKey(), e.getValue(),
((GridCacheVersionAware)e).version());
throw new IllegalArgumentException("Unwrapping to class is not
supported: " + cls);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/911ffbb5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 43cf2fe..298f7a6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -1385,7 +1385,7 @@ public abstract class GridCacheMapEntry extends
GridMetadataAwareAdapter impleme
assert entryProcessor != null;
-CacheInvokeEntry entry = new
CacheInvokeEntry<>(cctx, key, old, this.ver);
+CacheInvokeEntry entry = new
CacheInvokeEntry<>(cctx, key, old, version());
try {
Object computed = entryProcessor.process(entry,
invokeArgs);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/911ffbb5/modules/core/s
[02/38] incubator-ignite git commit: ignite-946: introduced VersionedEntry, supported versioned entry for Cache.invoke/randomEntry/localEntries methods
ignite-946: introduced VersionedEntry, supported versioned entry for
Cache.invoke/randomEntry/localEntries methods
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/01c02465
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/01c02465
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/01c02465
Branch: refs/heads/ignite-426
Commit: 01c02465ff6924842644bf5b3447d324966cc5f9
Parents: 7ed4d15
Author: Denis Magda
Authored: Thu Jul 30 13:50:40 2015 +0300
Committer: nikolay_tikhonov
Committed: Fri Jul 31 15:49:10 2015 +0300
--
.../ignite/cache/version/VersionedEntry.java| 73 +
.../ignite/cache/version/package-info.java | 21
.../processors/cache/CacheEntryImpl.java| 20
.../processors/cache/CacheInvokeEntry.java | 24 -
.../cache/CacheVersionedEntryImpl.java | 80 ---
.../processors/cache/GridCacheAdapter.java | 13 ++-
.../processors/cache/GridCacheMapEntry.java | 42 +---
.../distributed/dht/GridDhtTxPrepareFuture.java | 2 +-
.../dht/atomic/GridDhtAtomicCache.java | 3 +-
.../local/atomic/GridLocalAtomicCache.java | 3 +-
.../cache/transactions/IgniteTxAdapter.java | 2 +-
.../cache/transactions/IgniteTxEntry.java | 3 +-
.../transactions/IgniteTxLocalAdapter.java | 3 +-
.../cache/version/CacheVersionedEntryImpl.java | 102 +++
.../resources/META-INF/classnames.properties| 2 +-
15 files changed, 287 insertions(+), 106 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01c02465/modules/core/src/main/java/org/apache/ignite/cache/version/VersionedEntry.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/version/VersionedEntry.java
b/modules/core/src/main/java/org/apache/ignite/cache/version/VersionedEntry.java
new file mode 100644
index 000..6f9d8f6
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/cache/version/VersionedEntry.java
@@ -0,0 +1,73 @@
+/*
+ * 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.cache.version;
+
+import javax.cache.*;
+import java.util.*;
+
+/**
+ * Cache entry along with version information.
+ */
+public interface VersionedEntry extends Cache.Entry {
+/**
+ * Versions comparator.
+ */
+public static final Comparator VERSIONS_COMPARATOR = new
Comparator() {
+@Override public int compare(VersionedEntry o1, VersionedEntry o2) {
+int res = Integer.compare(o1.topologyVersion(),
o2.topologyVersion());
+
+if (res != 0)
+return res;
+
+res = Long.compare(o1.order(), o2.order());
+
+if (res != 0)
+return res;
+
+return Integer.compare(o1.nodeOrder(), o2.nodeOrder());
+}
+};
+
+/**
+ * Gets entry's topology version.
+ *
+ * @return Topology version plus number of seconds from the start time of
the first grid node.
+ */
+public int topologyVersion();
+
+/**
+ * Gets entry's order.
+ *
+ * @return Version order.
+ */
+public long order();
+
+/**
+ * Gets entry's node order.
+ *
+ * @return Node order on which this version was assigned.
+ */
+public int nodeOrder();
+
+/**
+ * Gets entry's global time.
+ *
+ * @return Adjusted time.
+ */
+public long globalTime();
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01c02465/modules/core/src/main/java/org/apache/ignite/cache/version/package-info.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/version/package-info.java
b/modules/core/src/main/java/org/apache/ignite/cache/version/package-info.java
new file mode 100644
index 000..9aeaba2
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/i
[19/38] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-946
Merge remote-tracking branch 'remotes/origin/master' into ignite-946 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/801d6df1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/801d6df1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/801d6df1 Branch: refs/heads/ignite-426 Commit: 801d6df1acd2615c1a85e9e3829983011b5fd0a3 Parents: b6bef13 ae11e9b Author: Denis Magda Authored: Tue Aug 11 10:19:21 2015 +0300 Committer: Denis Magda Committed: Tue Aug 11 10:19:21 2015 +0300 -- .../configuration/IgniteConfiguration.java | 1 - .../GridCachePartitionExchangeManager.java | 48 +++ .../dht/atomic/GridDhtAtomicCache.java | 36 +--- .../cache/CacheStopAndDestroySelfTest.java | 87 4 files changed, 56 insertions(+), 116 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/801d6df1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java --
[12/38] incubator-ignite git commit: review
review
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/53557e32
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/53557e32
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/53557e32
Branch: refs/heads/ignite-426
Commit: 53557e327721fee683b9b37217d530db44166aec
Parents: fe2be79
Author: Yakov Zhdanov
Authored: Wed Aug 5 10:15:52 2015 +0300
Committer: Yakov Zhdanov
Committed: Wed Aug 5 10:15:52 2015 +0300
--
.../processors/cache/transactions/IgniteTxLocalAdapter.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/53557e32/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
index e03f34d..a209780 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
@@ -1937,7 +1937,7 @@ public abstract class IgniteTxLocalAdapter extends
IgniteTxAdapter
GridCacheContext cacheCtx,
Map drMap
) {
-return putAllAsync0(cacheCtx,
+return this.putAllAsync0(cacheCtx,
null,
null,
null,
[27/38] incubator-ignite git commit: # ignite-426 add tests
# ignite-426 add 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/ebd576c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ebd576c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ebd576c0
Branch: refs/heads/ignite-426
Commit: ebd576c081ebfec82089a4489990994d423876e6
Parents: daa9098
Author: sboikov
Authored: Thu Aug 13 16:45:27 2015 +0300
Committer: sboikov
Committed: Thu Aug 13 16:45:27 2015 +0300
--
...acheContinuousQueryFailoverAbstractTest.java | 29 ++--
1 file changed, 26 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ebd576c0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractTest.java
index e3ad025..e6f3bd7 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractTest.java
@@ -26,6 +26,7 @@ import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.managers.communication.*;
import org.apache.ignite.internal.processors.continuous.*;
+import org.apache.ignite.internal.util.*;
import org.apache.ignite.internal.util.lang.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.plugin.extensions.communication.*;
@@ -213,8 +214,15 @@ public abstract class
CacheContinuousQueryFailoverAbstractTest extends GridCommo
stopGrid(i);
-if (!latch.await(5, SECONDS))
+if (!latch.await(5, SECONDS)) {
+Set keys0 = new HashSet<>(keys);
+
+keys0.removeAll(lsnr.keys);
+
+log.info("Missed events for keys: " + keys0);
+
fail("Failed to wait for notifications [exp=" + keys.size() +
", left=" + lsnr.latch.getCount() + ']');
+}
}
for (int i = 0; i < SRV_NODES - 1; i++) {
@@ -236,8 +244,15 @@ public abstract class
CacheContinuousQueryFailoverAbstractTest extends GridCommo
cache.put(key, key);
}
-if (!latch.await(5, SECONDS))
+if (!latch.await(5, SECONDS)) {
+Set keys0 = new HashSet<>(keys);
+
+keys0.removeAll(lsnr.keys);
+
+log.info("Missed events for keys: " + keys0);
+
fail("Failed to wait for notifications [exp=" + keys.size() +
", left=" + lsnr.latch.getCount() + ']');
+}
}
cur.close();
@@ -628,6 +643,9 @@ public abstract class
CacheContinuousQueryFailoverAbstractTest extends GridCommo
private volatile CountDownLatch latch;
/** */
+private GridConcurrentHashSet keys = new
GridConcurrentHashSet<>();
+
+/** */
@LoggerResource
private IgniteLogger log;
@@ -639,13 +657,18 @@ public abstract class
CacheContinuousQueryFailoverAbstractTest extends GridCommo
log.info("Received cache event: " + evt + " " + (latch !=
null ? latch.getCount() : null));
+keys.add((Integer) evt.getKey());
+
assertTrue(latch != null);
assertTrue(latch.getCount() > 0);
latch.countDown();
-if (latch.getCount() == 0)
+if (latch.getCount() == 0) {
this.latch = null;
+
+keys.clear();
+}
}
}
catch (Throwable e) {
[08/38] incubator-ignite git commit: ignite-946: formatting fixes
ignite-946: formatting fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/26144dc4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/26144dc4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/26144dc4
Branch: refs/heads/ignite-426
Commit: 26144dc4f845af7533cc645d898202b80c0a29f6
Parents: 4928d99
Author: Denis Magda
Authored: Fri Jul 31 12:18:58 2015 +0300
Committer: nikolay_tikhonov
Committed: Fri Jul 31 15:49:13 2015 +0300
--
.../processors/cache/GridCacheMapEntry.java | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26144dc4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 45ff619..ebcb908 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -609,16 +609,16 @@ public abstract class GridCacheMapEntry extends
GridMetadataAwareAdapter impleme
@Nullable IgniteCacheExpiryPolicy expirePlc)
throws IgniteCheckedException, GridCacheEntryRemovedException {
return innerGet0(tx,
- readSwap,
- readThrough,
- evt,
- unmarshal,
- updateMetrics,
- tmp,
- subjId,
- transformClo,
- taskName,
- expirePlc);
+readSwap,
+readThrough,
+evt,
+unmarshal,
+updateMetrics,
+tmp,
+subjId,
+transformClo,
+taskName,
+expirePlc);
}
/** {@inheritDoc} */
[33/38] incubator-ignite git commit: Fixed threads cleanup in continuous processor
Fixed threads cleanup in continuous processor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8ecddcc2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8ecddcc2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8ecddcc2
Branch: refs/heads/ignite-426
Commit: 8ecddcc2dcb064b759486d43a4f09173f268b3cf
Parents: 260238e
Author: Valentin Kulichenko
Authored: Thu Aug 13 16:25:09 2015 -0700
Committer: Valentin Kulichenko
Committed: Thu Aug 13 16:25:09 2015 -0700
--
.../internal/processors/continuous/GridEventConsumeSelfTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8ecddcc2/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java
index 5ce2efd..7ab858b 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java
@@ -26,7 +26,6 @@ import org.apache.ignite.internal.util.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.optimized.*;
import org.apache.ignite.resources.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
@@ -125,6 +124,7 @@ public class GridEventConsumeSelfTest extends
GridCommonAbstractTest {
assertEquals(0, U.field(proc, "rmtInfos").size());
assertEquals(0, U.field(proc, "startFuts").size());
assertEquals(0, U.field(proc, "stopFuts").size());
+assertEquals(0, U.field(proc, "bufCheckThreads").size());
}
}
finally {
@@ -754,7 +754,7 @@ public class GridEventConsumeSelfTest extends
GridCommonAbstractTest {
*/
public void testNodeJoinWithP2P() throws Exception {
fail("https://issues.apache.org/jira/browse/IGNITE-585";);
-
+
final Collection nodeIds = new HashSet<>();
final AtomicInteger cnt = new AtomicInteger();
final CountDownLatch latch = new CountDownLatch(GRID_CNT + 1);
[38/38] incubator-ignite git commit: # Merge remote-tracking branch 'remotes/origin/master' into ignite-426
# Merge remote-tracking branch 'remotes/origin/master' into ignite-426 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4c634ed2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4c634ed2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4c634ed2 Branch: refs/heads/ignite-426 Commit: 4c634ed2a08695d53e10b3e6c823f3f47a8f1fc2 Parents: ebd576c 0d70112 Author: sboikov Authored: Mon Aug 17 09:35:46 2015 +0300 Committer: sboikov Committed: Mon Aug 17 09:35:46 2015 +0300 -- .../org/apache/ignite/cache/CacheEntry.java | 94 .../org/apache/ignite/internal/IgnitionEx.java | 10 +- .../processors/cache/CacheEntryImpl.java| 20 + .../processors/cache/CacheEntryImpl0.java | 5 + .../processors/cache/CacheEntryImplEx.java | 83 +++ .../processors/cache/CacheInvokeEntry.java | 27 +- .../cache/CacheVersionedEntryImpl.java | 80 --- .../processors/cache/GridCacheAdapter.java | 13 +- .../processors/cache/GridCacheEntryEx.java | 2 +- .../processors/cache/GridCacheGateway.java | 5 +- .../processors/cache/GridCacheMapEntry.java | 28 +- .../processors/cache/GridCacheSwapManager.java | 82 ++- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../dht/atomic/GridDhtAtomicCache.java | 3 +- .../local/atomic/GridLocalAtomicCache.java | 3 +- .../cache/transactions/IgniteTxAdapter.java | 16 +- .../cache/transactions/IgniteTxEntry.java | 16 +- .../transactions/IgniteTxLocalAdapter.java | 83 ++- .../cache/version/GridCacheVersion.java | 2 +- .../cache/version/GridCacheVersionAware.java| 30 + .../cache/version/GridCacheVersionManager.java | 5 +- .../clock/GridClockSyncProcessor.java | 2 +- .../continuous/GridContinuousProcessor.java | 60 +- .../ignite/internal/util/GridArgumentCheck.java | 17 + .../ignite/internal/util/nio/GridNioServer.java | 4 +- .../ignite/spi/discovery/tcp/ServerImpl.java| 91 +-- .../resources/META-INF/classnames.properties| 3 +- .../processors/cache/GridCacheTestEntryEx.java | 2 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 2 +- .../IgniteCacheContinuousQueryClientTest.java | 137 + .../CacheVersionedEntryAbstractTest.java| 170 ++ ...nedEntryLocalAtomicSwapDisabledSelfTest.java | 45 ++ ...ersionedEntryLocalTransactionalSelfTest.java | 40 ++ ...edEntryPartitionedAtomicOffHeapSelfTest.java | 35 ++ ...VersionedEntryPartitionedAtomicSelfTest.java | 35 ++ ...PartitionedTransactionalOffHeapSelfTest.java | 36 ++ ...edEntryPartitionedTransactionalSelfTest.java | 35 ++ ...nedEntryReplicatedAtomicOffHeapSelfTest.java | 35 ++ ...eVersionedEntryReplicatedAtomicSelfTest.java | 35 ++ ...yReplicatedTransactionalOffHeapSelfTest.java | 36 ++ ...nedEntryReplicatedTransactionalSelfTest.java | 35 ++ .../continuous/GridEventConsumeSelfTest.java| 4 +- .../testsuites/IgniteCacheTestSuite4.java | 13 + .../IgniteCacheQuerySelfTestSuite.java | 1 + modules/jms11/pom.xml | 98 .../apache/ignite/stream/jms11/JmsStreamer.java | 524 ++ .../ignite/stream/jms11/MessageTransformer.java | 43 ++ .../stream/jms11/IgniteJmsStreamerTest.java | 551 +++ .../jms11/IgniteJmsStreamerTestSuite.java | 34 ++ .../ignite/stream/jms11/TestTransformers.java | 123 + .../apache/ignite/logger/log4j/Log4JLogger.java | 4 + .../java/org/apache/ignite/IgniteSpring.java| 8 +- pom.xml | 1 + scripts/git-format-patch.sh | 2 +- 54 files changed, 2663 insertions(+), 207 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c634ed2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c634ed2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c634ed2/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c634ed2/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite
[06/38] incubator-ignite git commit: ignite-946: supported VersionedEntry for IgniteCache.localEntries() when OFF_HEAP mode is used
ignite-946: supported VersionedEntry for IgniteCache.localEntries() when
OFF_HEAP mode is used
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2d200a31
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2d200a31
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2d200a31
Branch: refs/heads/ignite-426
Commit: 2d200a31b9903a165c9d70ec84b687e7bcc55c44
Parents: 719161f
Author: Denis Magda
Authored: Fri Jul 31 11:39:47 2015 +0300
Committer: nikolay_tikhonov
Committed: Fri Jul 31 15:49:12 2015 +0300
--
.../processors/cache/CacheEntryImpl0.java | 5 +++
.../processors/cache/GridCacheSwapManager.java | 8 -
.../cache/version/GridVersionedMapEntry.java| 33 +++
.../CacheVersionedEntryAbstractTest.java| 34 ++--
4 files changed, 55 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d200a31/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl0.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl0.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl0.java
index d2b1923..a5e27d6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl0.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl0.java
@@ -17,6 +17,9 @@
package org.apache.ignite.internal.processors.cache;
+import org.apache.ignite.cache.version.*;
+import org.apache.ignite.internal.processors.cache.version.*;
+
import javax.cache.*;
import java.util.*;
@@ -49,6 +52,8 @@ public class CacheEntryImpl0 implements Cache.Entry {
@Override public T unwrap(Class cls) {
if(cls.isAssignableFrom(getClass()))
return cls.cast(this);
+else if (cls.isAssignableFrom(VersionedEntry.class) && e instanceof
GridVersionedMapEntry)
+return (T)new CacheVersionedEntryImpl<>(e.getKey(), e.getValue(),
((GridVersionedMapEntry)e).version());
throw new IllegalArgumentException("Unwrapping to class is not
supported: " + cls);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d200a31/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
index 9e9c958..0530c19 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
@@ -1513,7 +1513,7 @@ public class GridCacheSwapManager extends
GridCacheManagerAdapter {
@Override protected Map.Entry onNext() {
final Map.Entry cur0 = it.next();
-cur = new Map.Entry() {
+cur = new GridVersionedMapEntry() {
@Override public K getKey() {
try {
KeyCacheObject key =
cctx.toCacheKeyObject(cur0.getKey());
@@ -1538,6 +1538,12 @@ public class GridCacheSwapManager extends
GridCacheManagerAdapter {
}
}
+@Override public GridCacheVersion version() {
+GridCacheSwapEntry e =
unmarshalSwapEntry(cur0.getValue());
+
+return e.version();
+}
+
@Override public V setValue(V val) {
throw new UnsupportedOperationException();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d200a31/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridVersionedMapEntry.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridVersionedMapEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridVersionedMapEntry.java
new file mode 100644
index 000..f653fac
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridVersionedMapEntry.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * t
[11/38] incubator-ignite git commit: review
review
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fe2be79c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fe2be79c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fe2be79c
Branch: refs/heads/ignite-426
Commit: fe2be79c8e4eccf8f823abeb32521f0fca8ddf42
Parents: b2e6734
Author: Yakov Zhdanov
Authored: Tue Aug 4 17:49:48 2015 +0300
Committer: Yakov Zhdanov
Committed: Tue Aug 4 17:49:48 2015 +0300
--
.../ignite/cache/version/package-info.java | 4 ++--
.../processors/cache/CacheInvokeEntry.java | 5 +++--
.../cache/transactions/IgniteTxEntry.java | 4 +++-
.../transactions/IgniteTxLocalAdapter.java | 20 ++--
4 files changed, 18 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe2be79c/modules/core/src/main/java/org/apache/ignite/cache/version/package-info.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/version/package-info.java
b/modules/core/src/main/java/org/apache/ignite/cache/version/package-info.java
index 9aeaba2..50ceb13 100644
---
a/modules/core/src/main/java/org/apache/ignite/cache/version/package-info.java
+++
b/modules/core/src/main/java/org/apache/ignite/cache/version/package-info.java
@@ -16,6 +16,6 @@
*/
/**
- * Contains cache version based implementations.
+ * Contains cache versioned entry interface.
*/
-package org.apache.ignite.cache.version;
\ No newline at end of file
+package org.apache.ignite.cache.version;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe2be79c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java
index 2d8f738..515a4c5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java
@@ -49,14 +49,15 @@ public class CacheInvokeEntry extends
CacheLazyEntry implements Muta
public CacheInvokeEntry(GridCacheContext cctx,
KeyCacheObject keyObj,
@Nullable CacheObject valObj,
-GridCacheVersion ver) {
+GridCacheVersion ver
+) {
super(cctx, keyObj, valObj);
this.hadVal = valObj != null;
this.ver = ver;
}
-/**
+/**
* @param ctx Cache context.
* @param keyObj Key cache object.
* @param key Key value.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe2be79c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
index ed57bf2..73b9975 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
@@ -577,6 +577,8 @@ public class IgniteTxEntry implements GridPeerDeployAware,
Message {
ver = entry.version();
}
catch (GridCacheEntryRemovedException e) {
+assert tx.optimistic() : tx;
+
ver = null;
}
@@ -924,7 +926,7 @@ public class IgniteTxEntry implements GridPeerDeployAware,
Message {
return false;
reader.incrementState();
-
+
case 6:
flags = reader.readByte("flags");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe2be79c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
index 7f171c2..e03f34d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLo
[10/38] incubator-ignite git commit: Merge branches 'ignite-946' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-946
Merge branches 'ignite-946' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-946 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b2e6734c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b2e6734c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b2e6734c Branch: refs/heads/ignite-426 Commit: b2e6734c76f17247a2801e63547e5edcc33f770c Parents: 2e7799d b056a73 Author: Yakov Zhdanov Authored: Tue Aug 4 16:34:17 2015 +0300 Committer: Yakov Zhdanov Committed: Tue Aug 4 16:34:17 2015 +0300 -- .../ClientAbstractMultiNodeSelfTest.java| 4 +- .../JettyRestProcessorAbstractSelfTest.java | 14 +- .../apache/ignite/IgniteSystemProperties.java | 2 +- .../store/jdbc/CacheAbstractJdbcStore.java | 21 +- .../apache/ignite/internal/IgniteKernal.java| 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 43 +- .../managers/communication/GridIoManager.java | 188 +++- .../processors/cache/GridCacheMvccManager.java | 73 +-- .../processors/cache/GridCacheProcessor.java| 2 +- .../processors/cache/GridCacheProxyImpl.java| 42 +- .../processors/cache/GridCacheSwapManager.java | 2 +- .../GridDhtPartitionsExchangeFuture.java| 20 +- .../distributed/near/GridNearGetFuture.java | 20 +- .../handlers/query/QueryCommandHandler.java | 6 +- .../ignite/internal/util/IgniteUtils.java | 16 + .../util/nio/GridCommunicationClient.java | 5 +- .../util/nio/GridNioFinishedFuture.java | 12 + .../ignite/internal/util/nio/GridNioFuture.java | 14 + .../internal/util/nio/GridNioFutureImpl.java| 15 + .../util/nio/GridNioRecoveryDescriptor.java | 13 +- .../ignite/internal/util/nio/GridNioServer.java | 5 + .../util/nio/GridNioSessionMetaKey.java | 5 +- .../util/nio/GridShmemCommunicationClient.java | 7 +- .../util/nio/GridTcpNioCommunicationClient.java | 14 +- .../communication/tcp/TcpCommunicationSpi.java | 84 +++- .../ignite/spi/discovery/tcp/ClientImpl.java| 2 +- .../ignite/spi/discovery/tcp/ServerImpl.java| 45 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../src/test/config/io-manager-benchmark.xml| 3 +- .../GridJobMasterLeaveAwareSelfTest.java| 10 +- .../IgniteClientReconnectAbstractTest.java | 5 +- .../IgniteClientReconnectCacheTest.java | 5 +- .../GridDeploymentMessageCountSelfTest.java | 5 +- .../cache/CacheStopAndDestroySelfTest.java | 8 +- .../GridCacheAtomicMessageCountSelfTest.java| 6 +- .../processors/cache/GridCacheMvccSelfTest.java | 1 - ...ridCacheReplicatedSynchronousCommitTest.java | 5 +- .../IgniteCacheAbstractStopBusySelfTest.java| 6 +- .../cache/IgniteCacheNearLockValueSelfTest.java | 6 +- ...eDynamicCacheStartNoExchangeTimeoutTest.java | 4 +- .../cache/IgniteTxReentryAbstractSelfTest.java | 5 +- ...niteCacheClientNodeChangingTopologyTest.java | 6 +- ...teCacheClientNodePartitionsExchangeTest.java | 4 +- .../IgniteCacheNearOffheapGetSelfTest.java | 131 ++ ...xOriginatingNodeFailureAbstractSelfTest.java | 6 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 6 +- .../GridCacheDhtPreloadMessageCountTest.java| 5 +- ...ePrimaryNodeFailureRecoveryAbstractTest.java | 6 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +- .../near/IgniteCacheNearTxRollbackTest.java | 6 +- .../GridCacheReplicatedInvalidateSelfTest.java | 6 +- ...CommunicationRecoveryAckClosureSelfTest.java | 464 +++ .../tcp/TcpDiscoveryMultiThreadedTest.java | 8 +- .../testsuites/IgniteCacheTestSuite2.java | 1 + .../IgniteSpiCommunicationSelfTestSuite.java| 1 + .../ignite/util/TestTcpCommunicationSpi.java| 6 +- ...CacheScanPartitionQueryFallbackSelfTest.java | 15 +- .../http/jetty/GridJettyRestHandler.java| 12 +- .../parser/dialect/OracleMetadataDialect.java | 4 +- .../src/test/java/config/ignite-test-config.xml | 43 ++ .../ignite/internal/GridFactorySelfTest.java| 9 + .../visor/commands/kill/VisorKillCommand.scala | 2 +- 62 files changed, 1241 insertions(+), 252 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b2e6734c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java --
[23/38] incubator-ignite git commit: Fixed error message
Fixed error message
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/36f7ba66
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/36f7ba66
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/36f7ba66
Branch: refs/heads/ignite-426
Commit: 36f7ba669fd5b706fd9b01c06ce20dbb7610d50f
Parents: 653c0b2
Author: Valentin Kulichenko
Authored: Wed Aug 12 16:56:18 2015 -0700
Committer: Valentin Kulichenko
Committed: Wed Aug 12 16:56:18 2015 -0700
--
.../apache/ignite/internal/processors/cache/GridCacheGateway.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/36f7ba66/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
index 93c5858..58c9035 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
@@ -156,7 +156,7 @@ public class GridCacheGateway {
GridCachePreloader preldr = cache != null ? cache.preloader() :
null;
if (preldr == null)
-throw new IllegalStateException("Cache has been closed: " +
ctx.name());
+throw new IllegalStateException("Cache has been closed or
destroyed: " + ctx.name());
preldr.startFuture().get();
}
[21/38] incubator-ignite git commit: # ignite-1229: stop ping process when node left topology
# ignite-1229: stop ping process when node left topology
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d5986c26
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d5986c26
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d5986c26
Branch: refs/heads/ignite-426
Commit: d5986c265c9f68c2a98c48d4ba75444fad9e6725
Parents: ae11e9b
Author: sboikov
Authored: Wed Aug 12 11:42:22 2015 +0300
Committer: sboikov
Committed: Wed Aug 12 11:42:22 2015 +0300
--
.../ignite/spi/discovery/tcp/ServerImpl.java| 91 +---
1 file changed, 60 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5986c26/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 92c21ed..76144e3 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -388,12 +388,15 @@ class ServerImpl extends TcpDiscoveryImpl {
TcpDiscoveryNode node = ring.node(nodeId);
-if (node == null || !node.visible())
+if (node == null)
+return false;
+
+if (!nodeAlive(nodeId))
return false;
boolean res = pingNode(node);
-if (!res && !node.isClient()) {
+if (!res && !node.isClient() && nodeAlive(nodeId)) {
LT.warn(log, null, "Failed to ping node (status check will be
initiated): " + nodeId);
msgWorker.addMessage(new TcpDiscoveryStatusCheckMessage(locNode,
node.id()));
@@ -421,14 +424,18 @@ class ServerImpl extends TcpDiscoveryImpl {
node = ring.node(node.clientRouterNodeId());
-if (node == null || !node.visible())
+if (node == null || !nodeAlive(node.id()))
return false;
}
for (InetSocketAddress addr : spi.getNodeAddresses(node,
U.sameMacs(locNode, node))) {
try {
// ID returned by the node should be the same as ID of the
parameter for ping to succeed.
-IgniteBiTuple t = pingNode(addr, clientNodeId);
+IgniteBiTuple t = pingNode(addr, node.id(),
clientNodeId);
+
+if (t == null)
+// Remote node left topology.
+return false;
boolean res = node.id().equals(t.get1()) && (clientNodeId ==
null || t.get2());
@@ -453,12 +460,14 @@ class ServerImpl extends TcpDiscoveryImpl {
* Pings the node by its address to see if it's alive.
*
* @param addr Address of the node.
+ * @param nodeId Node ID to ping. In case when client node ID is not null
this node ID is an ID of the router node.
* @param clientNodeId Client node ID.
- * @return ID of the remote node and "client exists" flag if node alive.
+ * @return ID of the remote node and "client exists" flag if node alive or
{@code null} if the remote node has
+ * left a topology during the ping process.
* @throws IgniteCheckedException If an error occurs.
*/
-private IgniteBiTuple pingNode(InetSocketAddress addr,
@Nullable UUID clientNodeId)
-throws IgniteCheckedException {
+private @Nullable IgniteBiTuple pingNode(InetSocketAddress
addr, @Nullable UUID nodeId,
+@Nullable UUID clientNodeId) throws IgniteCheckedException {
assert addr != null;
UUID locNodeId = getLocalNodeId();
@@ -537,6 +546,16 @@ class ServerImpl extends TcpDiscoveryImpl {
return t;
}
catch (IOException | IgniteCheckedException e) {
+if (nodeId != null && !nodeAlive(nodeId)) {
+if (log.isDebugEnabled())
+log.debug("Failed to ping the node (has left
or leaving topology): [nodeId=" + nodeId +
+']');
+
+fut.onDone((IgniteBiTuple)null);
+
+return null;
+}
+
if (errs == null)
errs = new ArrayList<>();
@@ -615,6 +634,28 @@ class ServerImpl extends TcpDiscoveryImpl {
}
/**
+ * Checks whether a node is alive or not.
+ *
+ * @param nodeId Node ID.
+ * @return {@code True} if node is in the ring and is not being removed
from.
+ */
+private boolean nodeAlive(UUID nodeId) {
+
[18/38] incubator-ignite git commit: ignite-946: simplified VersionedEntry interface
ignite-946: simplified VersionedEntry interface
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b6bef13e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b6bef13e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b6bef13e
Branch: refs/heads/ignite-426
Commit: b6bef13eef82d9a2e040c01881d07c186ade372e
Parents: dd3cecf
Author: Denis Magda
Authored: Tue Aug 11 10:17:24 2015 +0300
Committer: Denis Magda
Committed: Tue Aug 11 10:17:24 2015 +0300
--
.../ignite/cache/version/VersionedEntry.java| 83 +---
.../cache/version/CacheVersionedEntryImpl.java | 23 +-
.../cache/version/GridCacheVersionManager.java | 4 +-
.../CacheVersionedEntryAbstractTest.java| 9 +--
4 files changed, 45 insertions(+), 74 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b6bef13e/modules/core/src/main/java/org/apache/ignite/cache/version/VersionedEntry.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/version/VersionedEntry.java
b/modules/core/src/main/java/org/apache/ignite/cache/version/VersionedEntry.java
index 1aac68a..135d681 100644
---
a/modules/core/src/main/java/org/apache/ignite/cache/version/VersionedEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/cache/version/VersionedEntry.java
@@ -24,7 +24,7 @@ import javax.cache.processor.*;
import java.util.*;
/**
- * Cache entry that stores entry's version related information.
+ * Cache entry that stores entry's version related information along with its
data.
*
* To get a {@code VersionedEntry} of an {@link Cache.Entry} use {@link
Cache.Entry#unwrap(Class)} by passing
* {@code VersionedEntry} class to it as the argument.
@@ -42,62 +42,51 @@ import java.util.*;
* is excluded from responses.
* Java Example
*
- * Cache cache = grid(0).cache(null);
+ * IgniteCache cache = grid(0).cache(null);
*
- * cache.invoke(100, new EntryProcessor() {
- * public Object process(MutableEntry entry, Object...
arguments) throws EntryProcessorException {
- * VersionedEntry verEntry =
entry.unwrap(VersionedEntry.class);
- * return entry;
- * }
- * });
+ * VersionedEntry entry1 = cache.invoke(100,
+ * new EntryProcessor>() {
+ * public VersionedEntry
process(MutableEntry entry,
+ * Object... arguments) throws EntryProcessorException {
+ * return entry.unwrap(VersionedEntry.class);
+ * }
+ * });
+ *
+ * // Cache entry for the given key may be updated at some point later.
+ *
+ * VersionedEntry entry2 = cache.invoke(100,
+ * new EntryProcessor>() {
+ * public VersionedEntry
process(MutableEntry entry,
+ * Object... arguments) throws EntryProcessorException {
+ * return entry.unwrap(VersionedEntry.class);
+ * }
+ * });
+ *
+ * if (entry1.version().compareTo(entry2.version()) < 0) {
+ * // the entry has been updated
+ * }
*
*/
public interface VersionedEntry extends Cache.Entry {
/**
- * Versions comparator.
- */
-public static final Comparator VER_COMP = new
Comparator() {
-@Override public int compare(VersionedEntry o1, VersionedEntry o2) {
-int res = Integer.compare(o1.topologyVersion(),
o2.topologyVersion());
-
-if (res != 0)
-return res;
-
-res = Long.compare(o1.order(), o2.order());
-
-if (res != 0)
-return res;
-
-return Integer.compare(o1.nodeOrder(), o2.nodeOrder());
-}
-};
-
-/**
- * Gets the topology version at the time when the entry with a given pair
of key and value has been created.
- *
- * @return Topology version plus number of seconds from the start time of
the first grid node.
- */
-public int topologyVersion();
-
-/**
- * Gets versioned entry unique order.
- * Each time a cache entry for a given key is updated a new {@code
VersionedEntry} with increased order is created.
- *
- * @return Versioned entry unique order.
- */
-public long order();
-
-/**
- * Gets local node order at the time when the entry with a given pair of
key and value has been created.
+ * Returns a comparable object representing the version of this cache
entry.
+ *
+ * It is valid to compare cache entries' versions for the same key. In
this case the latter update will be
+ * represented by a higher version. The result of versions comparison of
cache entries of different keys is
+ * undefined.
*
- * @return Local node order on which this version has been assigned.
+ * @return Version of
[04/38] incubator-ignite git commit: ignite-946: improving tests
ignite-946: improving 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/4b9f4bad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4b9f4bad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4b9f4bad
Branch: refs/heads/ignite-426
Commit: 4b9f4bad4191c357418996abc88748208461f18a
Parents: 325d06d
Author: Denis Magda
Authored: Fri Jul 31 10:19:46 2015 +0300
Committer: nikolay_tikhonov
Committed: Fri Jul 31 15:49:11 2015 +0300
--
.../cache/query/GridCacheQueryManager.java | 1 +
.../CacheVersionedEntryAbstractTest.java| 24 ++-
.../CacheVersionedEntryLocalAtomicSelfTest.java | 40 -
...nedEntryLocalAtomicSwapDisabledSelfTest.java | 45
.../testsuites/IgniteCacheTestSuite4.java | 2 +-
5 files changed, 60 insertions(+), 52 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4b9f4bad/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
index 5d3f6a3..400d997 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
@@ -845,6 +845,7 @@ public abstract class GridCacheQueryManager extends
GridCacheManagerAdapte
try {
val = prj.localPeek(key,
CachePeekModes.ONHEAP_ONLY, expiryPlc);
+
}
catch (IgniteCheckedException e) {
if (log.isDebugEnabled())
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4b9f4bad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java
index 951d05a..4cfacb7 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java
@@ -55,23 +55,25 @@ public abstract class CacheVersionedEntryAbstractTest
extends GridCacheAbstractS
public void testInvoke() throws Exception {
Cache cache = grid(0).cache(null);
-final AtomicBoolean invoked = new AtomicBoolean(false);
+final AtomicInteger invoked = new AtomicInteger();
-cache.invoke(100, new EntryProcessor() {
-@Override public Object process(MutableEntry
entry, Object... arguments)
-throws EntryProcessorException {
+for (int i = 0; i < ENTRIES_NUM; i++) {
+cache.invoke(i, new EntryProcessor() {
+@Override public Object process(MutableEntry
entry, Object... arguments)
+throws EntryProcessorException {
-invoked.set(true);
+invoked.incrementAndGet();
-VersionedEntry verEntry =
entry.unwrap(VersionedEntry.class);
+VersionedEntry verEntry =
entry.unwrap(VersionedEntry.class);
-checkVersionedEntry(verEntry);
+checkVersionedEntry(verEntry);
-return entry;
-}
-});
+return entry;
+}
+});
+}
-assertTrue(invoked.get());
+assert invoked.get() > 0;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4b9f4bad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryLocalAtomicSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryLocalAtomicSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryLocalAtomicSelfTest.java
deleted file mode 100644
index a340413..000
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryLocalAtomicS
[26/38] incubator-ignite git commit: # Test for ignite-1245.
# Test for ignite-1245.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/aed83af5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/aed83af5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/aed83af5
Branch: refs/heads/ignite-426
Commit: aed83af5f76c47bc9e4d0e8f60955fc6c6b42aac
Parents: 36f7ba6
Author: sboikov
Authored: Thu Aug 13 13:05:43 2015 +0300
Committer: sboikov
Committed: Thu Aug 13 13:05:43 2015 +0300
--
.../IgniteCacheContinuousQueryClientTest.java | 114 +++
1 file changed, 114 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aed83af5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientTest.java
new file mode 100644
index 000..bb413a0
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientTest.java
@@ -0,0 +1,114 @@
+/*
+ * 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.internal.processors.cache.query.continuous;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.query.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.resources.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import javax.cache.event.*;
+import java.util.concurrent.*;
+
+import static java.util.concurrent.TimeUnit.*;
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+
+/**
+ *
+ */
+public class IgniteCacheContinuousQueryClientTest extends
GridCommonAbstractTest {
+/** */
+protected static TcpDiscoveryIpFinder ipFinder = new
TcpDiscoveryVmIpFinder(true);
+
+/** */
+private boolean client;
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+CacheConfiguration ccfg = new CacheConfiguration();
+
+ccfg.setCacheMode(PARTITIONED);
+ccfg.setAtomicityMode(ATOMIC);
+ccfg.setWriteSynchronizationMode(FULL_SYNC);
+
+cfg.setCacheConfiguration(ccfg);
+
+cfg.setClientMode(client);
+
+return cfg;
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testNodeJoins() throws Exception {
+startGrids(2);
+
+client = true;
+
+Ignite clientNode = startGrid(3);
+
+client = false;
+
+CacheEventListener lsnr = new CacheEventListener();
+
+ContinuousQuery qry = new ContinuousQuery<>();
+
+qry.setLocalListener(lsnr);
+
+QueryCursor cur = clientNode.cache(null).query(qry);
+
+Ignite joined = startGrid(4);
+
+IgniteCache joinedCache = joined.cache(null);
+
+joinedCache.put(primaryKey(joinedCache), 1);
+
+assertTrue("Failed to wait for event.", lsnr.latch.await(5, SECONDS));
+
+cur.close();
+}
+
+/**
+ *
+ */
+private static class CacheEventListener implements
CacheEntryUpdatedListener {
+/** */
+private final CountDownLatch latch = new CountDownLatch(1);
+
+/** */
+@LoggerResource
+private IgniteLogger log;
+
+/** {@inheritDoc} */
+@Override public void onUpdated(Iterable> evts) {
+for (CacheEntryEvent evt : evts) {
+log.info("Rece
[25/38] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-946
Merge remote-tracking branch 'remotes/origin/master' into ignite-946 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/51a9bd85 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/51a9bd85 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/51a9bd85 Branch: refs/heads/ignite-426 Commit: 51a9bd85e5cb7cb38fcc60b7adf808fe0545e7df Parents: 4f8f32a 36f7ba6 Author: Denis Magda Authored: Thu Aug 13 09:12:26 2015 +0300 Committer: Denis Magda Committed: Thu Aug 13 09:12:26 2015 +0300 -- .../processors/cache/GridCacheGateway.java | 5 +- .../ignite/spi/discovery/tcp/ServerImpl.java| 91 +--- 2 files changed, 62 insertions(+), 34 deletions(-) --
[03/38] incubator-ignite git commit: ignite-946: improving tests
ignite-946: improving 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/719161f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/719161f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/719161f2
Branch: refs/heads/ignite-426
Commit: 719161f2d02dd1c589155800f60e02f86c469de4
Parents: 4b9f4ba
Author: Denis Magda
Authored: Fri Jul 31 10:20:22 2015 +0300
Committer: nikolay_tikhonov
Committed: Fri Jul 31 15:49:11 2015 +0300
--
.../internal/processors/cache/query/GridCacheQueryManager.java | 1 -
1 file changed, 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/719161f2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
index 400d997..5d3f6a3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
@@ -845,7 +845,6 @@ public abstract class GridCacheQueryManager extends
GridCacheManagerAdapte
try {
val = prj.localPeek(key,
CachePeekModes.ONHEAP_ONLY, expiryPlc);
-
}
catch (IgniteCheckedException e) {
if (log.isDebugEnabled())
[16/38] incubator-ignite git commit: ignite-946: fixed comments and bugs
ignite-946: fixed comments and bugs
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c1582fc3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c1582fc3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c1582fc3
Branch: refs/heads/ignite-426
Commit: c1582fc32884cdf9494df32fb33207d64ed1230f
Parents: 911ffbb
Author: Denis Magda
Authored: Mon Aug 10 12:44:31 2015 +0300
Committer: Denis Magda
Committed: Mon Aug 10 12:44:31 2015 +0300
--
.../ignite/cache/version/VersionedEntry.java | 17 +
.../cache/version/CacheVersionedEntryImpl.java | 4 ++--
.../processors/clock/GridClockSyncProcessor.java | 2 +-
.../version/CacheVersionedEntryAbstractTest.java | 2 +-
4 files changed, 13 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1582fc3/modules/core/src/main/java/org/apache/ignite/cache/version/VersionedEntry.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/version/VersionedEntry.java
b/modules/core/src/main/java/org/apache/ignite/cache/version/VersionedEntry.java
index 2c0879b..1aac68a 100644
---
a/modules/core/src/main/java/org/apache/ignite/cache/version/VersionedEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/cache/version/VersionedEntry.java
@@ -73,30 +73,31 @@ public interface VersionedEntry extends
Cache.Entry {
};
/**
- * Gets entry's topology version.
+ * Gets the topology version at the time when the entry with a given pair
of key and value has been created.
*
* @return Topology version plus number of seconds from the start time of
the first grid node.
*/
public int topologyVersion();
/**
- * Gets entry's order.
+ * Gets versioned entry unique order.
+ * Each time a cache entry for a given key is updated a new {@code
VersionedEntry} with increased order is created.
*
- * @return Version order.
+ * @return Versioned entry unique order.
*/
public long order();
/**
- * Gets entry's node order.
+ * Gets local node order at the time when the entry with a given pair of
key and value has been created.
*
- * @return Node order on which this version was assigned.
+ * @return Local node order on which this version has been assigned.
*/
public int nodeOrder();
/**
- * Gets entry's global time.
+ * Gets the time when the entry with a given pair of key and value has
been created.
*
- * @return Adjusted time.
+ * @return Time in milliseconds.
*/
-public long globalTime();
+public long creationTime();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1582fc3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryImpl.java
index 924eff9..74e4a9a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryImpl.java
@@ -74,7 +74,7 @@ public class CacheVersionedEntryImpl extends
CacheEntryImpl implemen
}
/** {@inheritDoc} */
-@Override public long globalTime() {
+@Override public long creationTime() {
return ver.globalTime();
}
@@ -95,6 +95,6 @@ public class CacheVersionedEntryImpl extends
CacheEntryImpl implemen
/** {@inheritDoc} */
public String toString() {
return "VersionedEntry [key=" + getKey() + ", val=" + getValue() + ",
topVer=" + ver.topologyVersion() +
-", nodeOrder=" + ver.nodeOrder() + ", order=" + ver.order() + ",
globalTime=" + ver.globalTime() + ']';
+", nodeOrder=" + ver.nodeOrder() + ", order=" + ver.order() + ",
creationTime=" + ver.globalTime() + ']';
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1582fc3/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java
index 3ac44f2..69b07b3 100644
---
a/modules/core/src/main/java/org/
[24/38] incubator-ignite git commit: ignite-946: renamed VersionedEntry to CacheEntry
ignite-946: renamed VersionedEntry to CacheEntry
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4f8f32af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4f8f32af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4f8f32af
Branch: refs/heads/ignite-426
Commit: 4f8f32af80d2c13df3fd8d3c5b302c0fd04906c5
Parents: 954c459
Author: Denis Magda
Authored: Thu Aug 13 09:10:45 2015 +0300
Committer: Denis Magda
Committed: Thu Aug 13 09:10:45 2015 +0300
--
.../org/apache/ignite/cache/CacheEntry.java | 94
.../ignite/cache/version/VersionedEntry.java| 92 ---
.../ignite/cache/version/package-info.java | 21 -
.../processors/cache/CacheEntryImpl.java| 6 +-
.../processors/cache/CacheEntryImpl0.java | 6 +-
.../processors/cache/CacheEntryImplEx.java | 83 +
.../processors/cache/CacheInvokeEntry.java | 6 +-
.../processors/cache/GridCacheEntryEx.java | 2 +-
.../processors/cache/GridCacheMapEntry.java | 12 +--
.../cache/version/CacheVersionedEntryImpl.java | 83 -
.../resources/META-INF/classnames.properties| 3 +-
.../processors/cache/GridCacheTestEntryEx.java | 2 +-
.../CacheVersionedEntryAbstractTest.java| 27 +++---
13 files changed, 209 insertions(+), 228 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f8f32af/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
b/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
new file mode 100644
index 000..a6a2aa3
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
@@ -0,0 +1,94 @@
+/*
+ * 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.cache;
+
+import org.apache.ignite.*;
+
+import javax.cache.*;
+import javax.cache.processor.*;
+import java.util.*;
+
+/**
+ * Cache entry that extends {@link javax.cache.Cache.Entry} by providing
additional entry related information.
+ *
+ * To get an instance of {@code CacheEntry} use {@link
javax.cache.Cache.Entry#unwrap(Class)} method by passing
+ * {@code CacheEntry} class to it as the argument.
+ *
+ * {@code CacheEntry} is supported only for {@link javax.cache.Cache.Entry}
returned by one of the following methods:
+ *
+ * {@link javax.cache.Cache#invoke(Object, EntryProcessor, Object...)}
+ * {@link javax.cache.Cache#invokeAll(Set, EntryProcessor, Object...)}
+ * invoke and invokeAll methods of {@link IgniteCache}
+ * {@link IgniteCache#randomEntry()}
+ *
+ *
+ * {@code CacheEntry} is not supported for {@link
javax.cache.Cache#iterator()} because of performance reasons.
+ * {@link javax.cache.Cache#iterator()} loads entries from all the cluster
nodes and to speed up the load additional
+ * information, like entry's version, is ignored.
+ *
+ * Java Example
+ *
+ * IgniteCache cache = grid(0).cache(null);
+ *
+ * CacheEntry entry1 = cache.invoke(100,
+ * new EntryProcessor>() {
+ * public CacheEntry process(MutableEntry entry,
+ * Object... arguments) throws EntryProcessorException {
+ * return entry.unwrap(CacheEntry.class);
+ * }
+ * });
+ *
+ * // Cache entry for the given key may be updated at some point later.
+ *
+ * CacheEntry entry2 = cache.invoke(100,
+ * new EntryProcessor>() {
+ * public CacheEntry process(MutableEntry entry,
+ * Object... arguments) throws EntryProcessorException {
+ * return entry.unwrap(CacheEntry.class);
+ * }
+ * });
+ *
+ * // Comparing entries' versions.
+ * if (entry1.version().compareTo(entry2.version()) < 0) {
+ * // the entry has been updated
+ * }
+ *
+ */
+public interface CacheEntry extends Cache.Entry {
+/**
+ * Returns a comparable obj
[22/38] incubator-ignite git commit: Fixed error message
Fixed error message
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/653c0b28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/653c0b28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/653c0b28
Branch: refs/heads/ignite-426
Commit: 653c0b28d340a37893741b0d381a63330732fd10
Parents: d5986c2
Author: Valentin Kulichenko
Authored: Wed Aug 12 16:54:47 2015 -0700
Committer: Valentin Kulichenko
Committed: Wed Aug 12 16:54:47 2015 -0700
--
.../ignite/internal/processors/cache/GridCacheGateway.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/653c0b28/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
index a3c8da6..93c5858 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
@@ -156,8 +156,7 @@ public class GridCacheGateway {
GridCachePreloader preldr = cache != null ? cache.preloader() :
null;
if (preldr == null)
-throw new IllegalStateException("Grid is in invalid state to
perform this operation. " +
-"It either not started yet or has already being or have
stopped [gridName=" + ctx.gridName() + ']');
+throw new IllegalStateException("Cache has been closed: " +
ctx.name());
preldr.startFuture().get();
}
@@ -177,7 +176,7 @@ public class GridCacheGateway {
try {
return setOperationContextPerCall(opCtx);
}
-catch (RuntimeException e) {
+catch (Throwable e) {
rwLock.readUnlock();
throw e;
[28/38] incubator-ignite git commit: # Register client continuous listeners on node join
# Register client continuous listeners on node join
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/35e3e4e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/35e3e4e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/35e3e4e0
Branch: refs/heads/ignite-426
Commit: 35e3e4e048fa34b5b23ebd0ae235424f3e3492d9
Parents: aed83af
Author: sboikov
Authored: Thu Aug 13 17:37:00 2015 +0300
Committer: sboikov
Committed: Thu Aug 13 17:37:00 2015 +0300
--
.../continuous/GridContinuousProcessor.java | 44
.../IgniteCacheContinuousQueryClientTest.java | 33 ---
.../IgniteCacheQuerySelfTestSuite.java | 1 +
scripts/git-format-patch.sh | 2 +-
4 files changed, 66 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/35e3e4e0/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
index daa9494..5f1c4bb 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
@@ -193,10 +193,10 @@ public class GridContinuousProcessor extends
GridProcessorAdapter {
unregisterRemote(routineId);
if (snd.isClient()) {
-Map infoMap =
clientInfos.get(snd.id());
+Map clientRoutineMap =
clientInfos.get(snd.id());
-if (infoMap != null)
-infoMap.remove(msg.routineId());
+if (clientRoutineMap != null)
+clientRoutineMap.remove(msg.routineId());
}
}
}
@@ -370,6 +370,34 @@ public class GridContinuousProcessor extends
GridProcessorAdapter {
}
for (Map.Entry> entry :
data.clientInfos.entrySet()) {
+UUID clientNodeId = entry.getKey();
+
+Map clientRoutineMap =
entry.getValue();
+
+for (Map.Entry e :
clientRoutineMap.entrySet()) {
+UUID routineId = e.getKey();
+LocalRoutineInfo info = e.getValue();
+
+try {
+if (info.prjPred != null)
+ctx.resource().injectGeneric(info.prjPred);
+
+if (info.prjPred == null ||
info.prjPred.apply(ctx.discovery().localNode())) {
+if (registerHandler(clientNodeId,
+routineId,
+info.hnd,
+info.bufSize,
+info.interval,
+info.autoUnsubscribe,
+false))
+info.hnd.onListenerRegistered(routineId, ctx);
+}
+}
+catch (IgniteCheckedException err) {
+U.error(log, "Failed to register continuous handler.",
err);
+}
+}
+
Map map =
clientInfos.get(entry.getKey());
if (map == null) {
@@ -723,17 +751,17 @@ public class GridContinuousProcessor extends
GridProcessorAdapter {
}
if (node.isClient()) {
-Map clientRouteMap =
clientInfos.get(node.id());
+Map clientRoutineMap =
clientInfos.get(node.id());
-if (clientRouteMap == null) {
-clientRouteMap = new HashMap<>();
+if (clientRoutineMap == null) {
+clientRoutineMap = new HashMap<>();
-Map old = clientInfos.put(node.id(),
clientRouteMap);
+Map old = clientInfos.put(node.id(),
clientRoutineMap);
assert old == null;
}
-clientRouteMap.put(routineId, new
LocalRoutineInfo(data.projectionPredicate(),
+clientRoutineMap.put(routineId, new
LocalRoutineInfo(data.projectionPredicate(),
hnd,
data.bufferSize(),
data.interval(),
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/35e3e4e0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/quer
[29/38] incubator-ignite git commit: When NIO server port is set to -1, we do not need to check address for null.
When NIO server port is set to -1, we do not need to check address for null.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7290d065
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7290d065
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7290d065
Branch: refs/heads/ignite-426
Commit: 7290d0658aa10675095f1a0379f5c21b9bb09bc4
Parents: aed83af
Author: vozerov-gridgain
Authored: Thu Aug 13 18:09:54 2015 +0300
Committer: vozerov-gridgain
Committed: Thu Aug 13 18:09:54 2015 +0300
--
.../java/org/apache/ignite/internal/util/nio/GridNioServer.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7290d065/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
index c180837..2d60f98 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
@@ -209,7 +209,9 @@ public class GridNioServer {
IgniteBiInClosure msgQueueLsnr,
GridNioFilter... filters
) throws IgniteCheckedException {
-A.notNull(addr, "addr");
+if (port != -1)
+A.notNull(addr, "addr");
+
A.notNull(lsnr, "lsnr");
A.notNull(log, "log");
A.notNull(order, "order");
[13/38] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-946
Merge remote-tracking branch 'remotes/origin/master' into ignite-946 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/92e81dca Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/92e81dca Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/92e81dca Branch: refs/heads/ignite-426 Commit: 92e81dca00800b1b74f0ade328121aaf0ab1d4df Parents: 2e7799d d9acbd1 Author: Denis Magda Authored: Mon Aug 10 09:57:31 2015 +0300 Committer: Denis Magda Committed: Mon Aug 10 09:57:31 2015 +0300 -- assembly/release-hadoop.xml | 5 + .../ClientAbstractMultiNodeSelfTest.java| 4 +- .../JettyRestProcessorAbstractSelfTest.java | 14 +- .../apache/ignite/IgniteSystemProperties.java | 2 +- .../store/jdbc/CacheAbstractJdbcStore.java | 21 +- .../apache/ignite/internal/IgniteKernal.java| 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 43 +- .../managers/communication/GridIoManager.java | 188 +++- .../processors/cache/GridCacheMvccManager.java | 73 +-- .../processors/cache/GridCacheProcessor.java| 12 +- .../processors/cache/GridCacheProxyImpl.java| 42 +- .../processors/cache/GridCacheSwapManager.java | 2 +- .../processors/cache/GridCacheUtils.java| 1 - .../GridDhtPartitionsExchangeFuture.java| 20 +- .../distributed/near/GridNearGetFuture.java | 20 +- .../cache/query/GridCacheSqlQuery.java | 33 +- .../cache/query/GridCacheTwoStepQuery.java | 34 +- .../handlers/query/QueryCommandHandler.java | 6 +- .../ignite/internal/util/GridLogThrottle.java | 63 ++- .../ignite/internal/util/IgniteUtils.java | 16 + .../util/nio/GridCommunicationClient.java | 5 +- .../util/nio/GridNioFinishedFuture.java | 12 + .../ignite/internal/util/nio/GridNioFuture.java | 14 + .../internal/util/nio/GridNioFutureImpl.java| 15 + .../util/nio/GridNioRecoveryDescriptor.java | 13 +- .../ignite/internal/util/nio/GridNioServer.java | 5 + .../util/nio/GridNioSessionMetaKey.java | 5 +- .../util/nio/GridShmemCommunicationClient.java | 7 +- .../util/nio/GridTcpNioCommunicationClient.java | 14 +- .../communication/tcp/TcpCommunicationSpi.java | 84 +++- .../ignite/spi/discovery/tcp/ClientImpl.java| 29 +- .../ignite/spi/discovery/tcp/ServerImpl.java| 50 +- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 15 + .../spi/discovery/tcp/TcpDiscoverySpi.java | 7 +- .../TcpDiscoveryMulticastIpFinder.java | 7 +- .../src/test/config/io-manager-benchmark.xml| 3 +- .../GridJobMasterLeaveAwareSelfTest.java| 10 +- .../IgniteClientReconnectAbstractTest.java | 5 +- .../IgniteClientReconnectCacheTest.java | 5 +- .../GridDeploymentMessageCountSelfTest.java | 5 +- .../cache/CacheStopAndDestroySelfTest.java | 8 +- .../GridCacheAtomicMessageCountSelfTest.java| 6 +- .../processors/cache/GridCacheMvccSelfTest.java | 1 - ...ridCacheReplicatedSynchronousCommitTest.java | 5 +- .../cache/GridCacheSwapPreloadSelfTest.java | 2 + .../IgniteCacheAbstractStopBusySelfTest.java| 6 +- .../cache/IgniteCacheNearLockValueSelfTest.java | 6 +- ...eDynamicCacheStartNoExchangeTimeoutTest.java | 4 +- .../cache/IgniteTxReentryAbstractSelfTest.java | 5 +- ...niteCacheClientNodeChangingTopologyTest.java | 6 +- ...teCacheClientNodePartitionsExchangeTest.java | 4 +- .../IgniteCacheNearOffheapGetSelfTest.java | 131 ++ ...xOriginatingNodeFailureAbstractSelfTest.java | 6 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 6 +- .../GridCacheDhtPreloadMessageCountTest.java| 5 +- ...ePrimaryNodeFailureRecoveryAbstractTest.java | 6 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +- .../near/IgniteCacheNearTxRollbackTest.java | 6 +- .../GridCacheReplicatedInvalidateSelfTest.java | 6 +- ...CommunicationRecoveryAckClosureSelfTest.java | 464 +++ .../tcp/TcpDiscoveryMultiThreadedTest.java | 8 +- .../testsuites/IgniteCacheTestSuite2.java | 1 + .../IgniteSpiCommunicationSelfTestSuite.java| 1 + .../ignite/util/TestTcpCommunicationSpi.java| 6 +- .../processors/query/h2/IgniteH2Indexing.java | 27 +- .../processors/query/h2/sql/GridSqlElement.java | 18 +- .../query/h2/sql/GridSqlFunction.java | 17 +- .../processors/query/h2/sql/GridSqlQuery.java | 4 +- .../query/h2/sql/GridSqlQueryParser.java| 94 ++-- .../query/h2/sql/GridSqlQuerySplitter.java | 117 +++-- .../processors/query/h2/sql/GridSqlSelect.java | 76 +-- .../processors/query/h2/sql/GridSqlType.java| 24 +- .../processors/query/h2/sql/GridSqlUnion.java | 2 +- .../query/h2/twostep/GridMapQueryExecutor.java | 7 +- ...
[36/38] incubator-ignite git commit: ignite-1228 - Closed #18
ignite-1228 - Closed #18 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d0536dce Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d0536dce Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d0536dce Branch: refs/heads/ignite-426 Commit: d0536dcec02e46cc1e68a13676e87a140d511db2 Parents: 7760847 e5eef50 Author: Valentin Kulichenko Authored: Fri Aug 14 15:31:34 2015 -0700 Committer: Valentin Kulichenko Committed: Fri Aug 14 15:31:34 2015 -0700 -- .../main/java/org/apache/ignite/logger/log4j/Log4JLogger.java| 4 1 file changed, 4 insertions(+) --
[01/38] incubator-ignite git commit: ignite-946: added tests
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-426 daa90987f -> 4c634ed2a
ignite-946: added 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/325d06d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/325d06d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/325d06d3
Branch: refs/heads/ignite-426
Commit: 325d06d3127e73554cfcf40a549d2ae9343dca50
Parents: 01c0246
Author: Denis Magda
Authored: Thu Jul 30 16:03:18 2015 +0300
Committer: nikolay_tikhonov
Committed: Fri Jul 31 15:49:10 2015 +0300
--
.../cache/version/CacheVersionedEntryImpl.java | 2 -
.../CacheVersionedEntryAbstractTest.java| 184 +++
.../CacheVersionedEntryLocalAtomicSelfTest.java | 40
...ersionedEntryLocalTransactionalSelfTest.java | 40
...edEntryPartitionedAtomicOffHeapSelfTest.java | 35
...VersionedEntryPartitionedAtomicSelfTest.java | 35
...PartitionedTransactionalOffHeapSelfTest.java | 36
...edEntryPartitionedTransactionalSelfTest.java | 35
...nedEntryReplicatedAtomicOffHeapSelfTest.java | 35
...eVersionedEntryReplicatedAtomicSelfTest.java | 35
...yReplicatedTransactionalOffHeapSelfTest.java | 36
...nedEntryReplicatedTransactionalSelfTest.java | 35
.../testsuites/IgniteCacheTestSuite4.java | 13 ++
13 files changed, 559 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/325d06d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryImpl.java
index 6d1e0c9..924eff9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryImpl.java
@@ -48,8 +48,6 @@ public class CacheVersionedEntryImpl extends
CacheEntryImpl implemen
public CacheVersionedEntryImpl(K key, V val, GridCacheVersion ver) {
super(key, val);
-assert val == null;
-
this.ver = ver;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/325d06d3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java
new file mode 100644
index 000..951d05a
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java
@@ -0,0 +1,184 @@
+/*
+ * 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.internal.processors.cache.version;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.version.*;
+import org.apache.ignite.internal.processors.cache.*;
+
+import javax.cache.*;
+import javax.cache.processor.*;
+import java.util.*;
+import java.util.concurrent.atomic.*;
+
+/**
+ * Versioned entry abstract test.
+ */
+public abstract class CacheVersionedEntryAbstractTest extends
GridCacheAbstractSelfTest {
+/** Entries number to store in a cache. */
+private static final int ENTRIES_NUM = 1000;
+
+/** {@inheritDoc} */
+@Override protected int gridCount() {
+return 2;
+}
+
+/** {@inheritDoc} */
+@Override protected void beforeTest() throws Exception {
+super.beforeTest();
+
+Cache cache = grid(0).c
[20/38] incubator-ignite git commit: ignite-946: reverted renaming topVer to avoid breaking compatibility
ignite-946: reverted renaming topVer to avoid breaking compatibility
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/954c4591
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/954c4591
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/954c4591
Branch: refs/heads/ignite-426
Commit: 954c4591c95b7625042657f7a7311f4ea0f17c19
Parents: 801d6df
Author: Denis Magda
Authored: Tue Aug 11 15:00:47 2015 +0300
Committer: Denis Magda
Committed: Tue Aug 11 15:00:47 2015 +0300
--
.../cache/GridCacheAtomicVersionComparator.java | 4 +--
.../processors/cache/GridCacheMapEntry.java | 2 +-
.../processors/cache/GridCacheUtils.java| 2 +-
.../cache/transactions/IgniteTxManager.java | 2 +-
.../cache/version/CacheVersionedEntryImpl.java | 4 +--
.../version/GridCachePlainVersionedEntry.java | 2 +-
.../version/GridCacheRawVersionedEntry.java | 2 +-
.../cache/version/GridCacheVersion.java | 26 ++--
.../cache/version/GridCacheVersionManager.java | 4 +--
.../ignite/internal/util/IgniteUtils.java | 4 +--
.../cache/GridCacheEntryVersionSelfTest.java| 4 +--
11 files changed, 28 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/954c4591/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicVersionComparator.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicVersionComparator.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicVersionComparator.java
index 45288d9..3a06100 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicVersionComparator.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicVersionComparator.java
@@ -32,8 +32,8 @@ public class GridCacheAtomicVersionComparator {
* @return Comparison value.
*/
public int compare(GridCacheVersion one, GridCacheVersion other, boolean
ignoreTime) {
-int topVer = one.topologyOrder();
-int otherTopVer = other.topologyOrder();
+int topVer = one.topologyVersion();
+int otherTopVer = other.topologyVersion();
if (topVer == otherTopVer) {
long globalTime = one.globalTime();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/954c4591/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 33c42c4..298f7a6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -1927,7 +1927,7 @@ public abstract class GridCacheMapEntry extends
GridMetadataAwareAdapter impleme
// Incorporate conflict version into new version if needed.
if (conflictVer != null && conflictVer != newVer)
-newVer = new GridCacheVersionEx(newVer.topologyOrder(),
+newVer = new GridCacheVersionEx(newVer.topologyVersion(),
newVer.globalTime(),
newVer.order(),
newVer.nodeOrder(),
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/954c4591/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index 75f1dee..a313e3d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -1060,7 +1060,7 @@ public class GridCacheUtils {
byte[] bytes = new byte[28];
-U.intToBytes(ver.topologyOrder(), bytes, 0);
+U.intToBytes(ver.topologyVersion(), bytes, 0);
U.longToBytes(ver.globalTime(), bytes, 4);
U.longToBytes(ver.order(), bytes, 12);
U.intToBytes(ver.nodeOrderAndDrIdRaw(), bytes, 20);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/954c4591/modules/core/src/main/java/org/apache/ignite/
[05/38] incubator-ignite git commit: ignite-946: added documentation
ignite-946: added documentation
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4928d99d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4928d99d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4928d99d
Branch: refs/heads/ignite-426
Commit: 4928d99d80a837843ce733eab546a3ea6aa3c2d3
Parents: 2d200a3
Author: Denis Magda
Authored: Fri Jul 31 12:14:54 2015 +0300
Committer: nikolay_tikhonov
Committed: Fri Jul 31 15:49:12 2015 +0300
--
.../ignite/cache/version/VersionedEntry.java| 31 +++-
1 file changed, 30 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4928d99d/modules/core/src/main/java/org/apache/ignite/cache/version/VersionedEntry.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/version/VersionedEntry.java
b/modules/core/src/main/java/org/apache/ignite/cache/version/VersionedEntry.java
index 6f9d8f6..e669f15 100644
---
a/modules/core/src/main/java/org/apache/ignite/cache/version/VersionedEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/cache/version/VersionedEntry.java
@@ -17,11 +17,40 @@
package org.apache.ignite.cache.version;
+import org.apache.ignite.*;
+
import javax.cache.*;
+import javax.cache.processor.*;
import java.util.*;
/**
- * Cache entry along with version information.
+ * Cache entry that stores entry's version related information.
+ *
+ * To get a {@code VersionedEntry} of an {@link Cache.Entry} use {@link
Cache.Entry#unwrap(Class)} by passing
+ * {@code VersionedEntry} class to it as the argument.
+ *
+ * {@code VersionedEntry} is supported only for {@link Cache.Entry} returned
by one of the following methods:
+ *
+ * {@link Cache#invoke(Object, EntryProcessor, Object...)}
+ * {@link Cache#invokeAll(Set, EntryProcessor, Object...)}
+ * invoke and invokeAll methods of {@link IgniteCache}
+ * {@link IgniteCache#randomEntry()}
+ *
+ *
+ * {@code VersionedEntry} is not supported for {@link Cache#iterator()}
because of performance reasons.
+ * {@link Cache#iterator()} loads entries from all the cluster nodes and to
speed up the load version information
+ * is excluded from responses.
+ * Java Example
+ *
+ * Cache cache = grid(0).cache(null);
+ *
+ * cache.invoke(100, new EntryProcessor() {
+ * public Object process(MutableEntry entry, Object...
arguments) throws EntryProcessorException {
+ * VersionedEntry verEntry =
entry.unwrap(VersionedEntry.class);
+ * return entry;
+ * }
+ * });
+ *
*/
public interface VersionedEntry extends Cache.Entry {
/**
[17/38] incubator-ignite git commit: ignite-946: renamed topologyVersion to topologyOrder for GridCacheVersion
ignite-946: renamed topologyVersion to topologyOrder for GridCacheVersion
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dd3cecf6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dd3cecf6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dd3cecf6
Branch: refs/heads/ignite-426
Commit: dd3cecf6a68deec93c084af2f7d7e1be9de9f877
Parents: c1582fc
Author: Denis Magda
Authored: Tue Aug 11 09:02:00 2015 +0300
Committer: Denis Magda
Committed: Tue Aug 11 09:02:00 2015 +0300
--
.../cache/GridCacheAtomicVersionComparator.java | 4 +--
.../processors/cache/GridCacheMapEntry.java | 2 +-
.../processors/cache/GridCacheUtils.java| 2 +-
.../cache/transactions/IgniteTxManager.java | 2 +-
.../cache/version/CacheVersionedEntryImpl.java | 4 +--
.../version/GridCachePlainVersionedEntry.java | 2 +-
.../version/GridCacheRawVersionedEntry.java | 2 +-
.../cache/version/GridCacheVersion.java | 28 ++--
.../cache/version/GridCacheVersionManager.java | 5 ++--
.../ignite/internal/util/IgniteUtils.java | 4 +--
.../cache/GridCacheEntryVersionSelfTest.java| 4 +--
11 files changed, 29 insertions(+), 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd3cecf6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicVersionComparator.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicVersionComparator.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicVersionComparator.java
index 3a06100..45288d9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicVersionComparator.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicVersionComparator.java
@@ -32,8 +32,8 @@ public class GridCacheAtomicVersionComparator {
* @return Comparison value.
*/
public int compare(GridCacheVersion one, GridCacheVersion other, boolean
ignoreTime) {
-int topVer = one.topologyVersion();
-int otherTopVer = other.topologyVersion();
+int topVer = one.topologyOrder();
+int otherTopVer = other.topologyOrder();
if (topVer == otherTopVer) {
long globalTime = one.globalTime();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd3cecf6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 298f7a6..33c42c4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -1927,7 +1927,7 @@ public abstract class GridCacheMapEntry extends
GridMetadataAwareAdapter impleme
// Incorporate conflict version into new version if needed.
if (conflictVer != null && conflictVer != newVer)
-newVer = new GridCacheVersionEx(newVer.topologyVersion(),
+newVer = new GridCacheVersionEx(newVer.topologyOrder(),
newVer.globalTime(),
newVer.order(),
newVer.nodeOrder(),
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd3cecf6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index a313e3d..75f1dee 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -1060,7 +1060,7 @@ public class GridCacheUtils {
byte[] bytes = new byte[28];
-U.intToBytes(ver.topologyVersion(), bytes, 0);
+U.intToBytes(ver.topologyOrder(), bytes, 0);
U.longToBytes(ver.globalTime(), bytes, 4);
U.longToBytes(ver.order(), bytes, 12);
U.intToBytes(ver.nodeOrderAndDrIdRaw(), bytes, 20);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd3cecf6/modules/core/src/main/java/org/apache/i
[30/38] incubator-ignite git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6697b0c9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6697b0c9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6697b0c9 Branch: refs/heads/ignite-426 Commit: 6697b0c98c098a96ce572048b0c82cbfdfd41dca Parents: 7290d06 35e3e4e Author: vozerov-gridgain Authored: Thu Aug 13 18:10:25 2015 +0300 Committer: vozerov-gridgain Committed: Thu Aug 13 18:10:25 2015 +0300 -- .../continuous/GridContinuousProcessor.java | 44 .../IgniteCacheContinuousQueryClientTest.java | 33 --- .../IgniteCacheQuerySelfTestSuite.java | 1 + scripts/git-format-patch.sh | 2 +- 4 files changed, 66 insertions(+), 14 deletions(-) --
[32/38] incubator-ignite git commit: JavaDoc fix
JavaDoc fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/260238e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/260238e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/260238e0
Branch: refs/heads/ignite-426
Commit: 260238e041c66a02f2552692bab2f44a923f7d41
Parents: ba3abce
Author: Valentin Kulichenko
Authored: Thu Aug 13 15:50:48 2015 -0700
Committer: Valentin Kulichenko
Committed: Thu Aug 13 15:50:48 2015 -0700
--
.../main/java/org/apache/ignite/internal/IgnitionEx.java | 10 +-
.../src/main/java/org/apache/ignite/IgniteSpring.java | 8
2 files changed, 9 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/260238e0/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 3790703..fd74745 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
@@ -429,7 +429,7 @@ public class IgnitionEx {
* @param springCtx Optional Spring application context, possibly {@code
null}.
* Spring bean definitions for bean injection are taken from this
context.
* If provided, this context can be injected into grid tasks and grid
jobs using
- * {@link SpringApplicationContextResource
@IgniteSpringApplicationContextResource} annotation.
+ * {@link SpringApplicationContextResource
@SpringApplicationContextResource} annotation.
* @return Started grid.
* @throws IgniteCheckedException If default grid could not be started.
This exception will be thrown
* also if default grid has already been started.
@@ -466,7 +466,7 @@ public class IgnitionEx {
* @param springCtx Optional Spring application context, possibly {@code
null}.
* Spring bean definitions for bean injection are taken from this
context.
* If provided, this context can be injected into grid tasks and grid
jobs using
- * {@link SpringApplicationContextResource
@IgniteSpringApplicationContextResource} annotation.
+ * {@link SpringApplicationContextResource
@SpringApplicationContextResource} annotation.
* @return Started grid.
* @throws IgniteCheckedException If grid could not be started. This
exception will be thrown
* also if named grid has already been started.
@@ -642,7 +642,7 @@ public class IgnitionEx {
* @param springCtx Optional Spring application context, possibly {@code
null}.
* Spring bean definitions for bean injection are taken from this
context.
* If provided, this context can be injected into grid tasks and grid
jobs using
- * {@link SpringApplicationContextResource
@IgniteSpringApplicationContextResource} annotation.
+ * {@link SpringApplicationContextResource
@SpringApplicationContextResource} annotation.
* @return Started grid. If Spring configuration contains multiple grid
instances,
* then the 1st found instance is returned.
* @throws IgniteCheckedException If grid could not be started or
configuration
@@ -690,7 +690,7 @@ public class IgnitionEx {
* @param springCtx Optional Spring application context, possibly {@code
null}.
* Spring bean definitions for bean injection are taken from this
context.
* If provided, this context can be injected into grid tasks and grid
jobs using
- * {@link SpringApplicationContextResource
@IgniteSpringApplicationContextResource} annotation.
+ * {@link SpringApplicationContextResource
@SpringApplicationContextResource} annotation.
* @return Started grid. If Spring configuration contains multiple grid
instances,
* then the 1st found instance is returned.
* @throws IgniteCheckedException If grid could not be started or
configuration
@@ -769,7 +769,7 @@ public class IgnitionEx {
* @param springCtx Optional Spring application context, possibly {@code
null}.
* Spring bean definitions for bean injection are taken from this
context.
* If provided, this context can be injected into grid tasks and grid
jobs using
- * {@link SpringApplicationContextResource
@IgniteSpringApplicationContextResource} annotation.
+ * {@link SpringApplicationContextResource
@SpringApplicationContextResource} annotation.
* @return Started grid. If Spring configuration contains multiple grid
instances,
* then the 1st
[34/38] incubator-ignite git commit: # ignite-1228
# ignite-1228 Signed-off-by: Valentin Kulichenko Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e5eef508 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e5eef508 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e5eef508 Branch: refs/heads/ignite-426 Commit: e5eef50844580bd9ef2dba6bdfc1efca8992e78a Parents: 8ecddcc Author: Valentin Kulichenko Authored: Tue Aug 11 18:34:58 2015 -0700 Committer: Valentin Kulichenko Committed: Thu Aug 13 18:57:20 2015 -0700 -- .../main/java/org/apache/ignite/logger/log4j/Log4JLogger.java| 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e5eef508/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/Log4JLogger.java -- diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/Log4JLogger.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/Log4JLogger.java index e3828ab..bc843fb 100644 --- a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/Log4JLogger.java +++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/Log4JLogger.java @@ -342,6 +342,10 @@ public class Log4JLogger implements IgniteLogger, LoggerNodeIdAware, Log4jFileAw impl.setLevel(logLevel); } +// If still don't have appenders, disable logging. +if (!isConfigured()) +impl.setLevel(Level.OFF); + quiet0 = quiet; inited = true; }
[31/38] incubator-ignite git commit: Fixed threads cleanup in continuous processor
Fixed threads cleanup in continuous processor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ba3abcec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ba3abcec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ba3abcec
Branch: refs/heads/ignite-426
Commit: ba3abceca10a1745253a3c28e7a6fe6f5833d266
Parents: 6697b0c
Author: Valentin Kulichenko
Authored: Thu Aug 13 15:50:39 2015 -0700
Committer: Valentin Kulichenko
Committed: Thu Aug 13 15:50:39 2015 -0700
--
.../continuous/GridContinuousProcessor.java | 16 +++-
.../GridCacheContinuousQueryAbstractSelfTest.java | 2 +-
2 files changed, 12 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba3abcec/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
index 5f1c4bb..a360e35 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
@@ -29,7 +29,6 @@ import org.apache.ignite.internal.managers.eventstorage.*;
import org.apache.ignite.internal.processors.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.timeout.*;
-import org.apache.ignite.internal.util.*;
import org.apache.ignite.internal.util.future.*;
import org.apache.ignite.internal.util.tostring.*;
import org.apache.ignite.internal.util.typedef.*;
@@ -72,7 +71,7 @@ public class GridContinuousProcessor extends
GridProcessorAdapter {
private final ConcurrentMap stopFuts = new
ConcurrentHashMap8<>();
/** Threads started by this processor. */
-private final Collection threads = new
GridConcurrentHashSet<>();
+private final Map bufCheckThreads = new
ConcurrentHashMap8<>();
/** */
private final ConcurrentMap syncMsgFuts
= new ConcurrentHashMap8<>();
@@ -311,8 +310,10 @@ public class GridContinuousProcessor extends
GridProcessorAdapter {
ctx.io().removeMessageListener(TOPIC_CONTINUOUS);
-U.interrupt(threads);
-U.joinThreads(threads, log);
+for (IgniteThread thread : bufCheckThreads.values()) {
+U.interrupt(thread);
+U.join(thread);
+}
if (log.isDebugEnabled())
log.debug("Continuous processor stopped.");
@@ -915,7 +916,7 @@ public class GridContinuousProcessor extends
GridProcessorAdapter {
}
});
-threads.add(checker);
+bufCheckThreads.put(routineId, checker);
checker.start();
}
@@ -947,6 +948,11 @@ public class GridContinuousProcessor extends
GridProcessorAdapter {
ctx.io().removeMessageListener(hnd.orderedTopic());
hnd.unregister(routineId, ctx);
+
+IgniteThread checker = bufCheckThreads.remove(routineId);
+
+if (checker != null)
+checker.interrupt();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba3abcec/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
index 4681071..7b628b4 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
@@ -29,7 +29,6 @@ import org.apache.ignite.internal.processors.datastructures.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.optimized.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
@@ -177,6 +176,7 @@ public abstract class
GridCacheContinuousQueryAbstra
[37/38] incubator-ignite git commit: ignite-534 - IgniteJmsStreamer implemented. Closes #14.
ignite-534 - IgniteJmsStreamer implemented. Closes #14.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0d701127
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0d701127
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0d701127
Branch: refs/heads/ignite-426
Commit: 0d701127c8a95a30f4c484247e84ab1f10f95e3a
Parents: d0536dc
Author: Raul Kripalani
Authored: Fri Aug 14 16:11:19 2015 -0700
Committer: Valentin Kulichenko
Committed: Fri Aug 14 16:11:19 2015 -0700
--
.../ignite/internal/util/GridArgumentCheck.java | 17 +
modules/jms11/pom.xml | 98
.../apache/ignite/stream/jms11/JmsStreamer.java | 524 ++
.../ignite/stream/jms11/MessageTransformer.java | 43 ++
.../stream/jms11/IgniteJmsStreamerTest.java | 551 +++
.../jms11/IgniteJmsStreamerTestSuite.java | 34 ++
.../ignite/stream/jms11/TestTransformers.java | 123 +
pom.xml | 1 +
8 files changed, 1391 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0d701127/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java
index b94bae6..8289f90 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java
@@ -35,6 +35,9 @@ public class GridArgumentCheck {
/** Not empty argument error message suffix. */
private static final String NOT_EMPTY_SUFFIX = " must not be empty.";
+/** Not null or empty error message suffix. */
+private static final String NOT_NULL_OR_EMPTY_SUFFIX = " must not be null
or empty.";
+
/**
* Checks if given argument value is not {@code null}. Otherwise - throws
{@link NullPointerException}.
*
@@ -145,4 +148,18 @@ public class GridArgumentCheck {
if (arr.length == 0)
throw new IllegalArgumentException(INVALID_ARG_MSG_PREFIX + name +
NOT_EMPTY_SUFFIX);
}
+
+/**
+ * Checks that a String is not null or empty.
+ *
+ * @param value Value to check.
+ * @param name Argument name.
+ */
+public static void notNullOrEmpty(String value, String name) {
+notNull(value, name);
+
+if (value.trim().length() == 0) {
+throw new IllegalArgumentException(INVALID_ARG_MSG_PREFIX + name +
NOT_NULL_OR_EMPTY_SUFFIX);
+}
+}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0d701127/modules/jms11/pom.xml
--
diff --git a/modules/jms11/pom.xml b/modules/jms11/pom.xml
new file mode 100644
index 000..c93ea9a
--- /dev/null
+++ b/modules/jms11/pom.xml
@@ -0,0 +1,98 @@
+
+
+
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+4.0.0
+
+
+org.apache.ignite
+ignite-parent
+1
+../../parent
+
+
+ignite-jms11
+1.4.1-SNAPSHOT
+
+
+5.11.1
+
+
+
+
+org.apache.ignite
+ignite-core
+${project.version}
+
+
+
+javax.jms
+jms-api
+1.1-rev-1
+
+
+
+org.apache.activemq
+activemq-client
+${activemq.version}
+test
+
+
+
+org.apache.activemq
+activemq-broker
+${activemq.version}
+test
+
+
+
+org.apache.activemq
+activemq-kahadb-store
+${activemq.version}
+test
+
+
+
+org.apache.ignite
+ignite-log4j
+${project.version}
+test
+
+
+
+org.apache.ignite
+ignite-spring
+${project.version}
+test
+
+
+
+org.apache.ignite
+ignite-core
+${project.version}
+test-jar
+test
+
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0d701127/modules/jms11/src/main/java/org/apache/ignite/stream/jms11/JmsStreamer.java
--
diff --git
a/modules/jms11/src/main/java/org/apache/ignite/stream/
[35/38] incubator-ignite git commit: Merge branch 'ignite-946'
Merge branch 'ignite-946' Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/77608477 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/77608477 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/77608477 Branch: refs/heads/ignite-426 Commit: 776084772c06f6149d09726b2f6c3c7a08cef7bc Parents: 8ecddcc 51a9bd8 Author: nikolay_tikhonov Authored: Fri Aug 14 12:54:34 2015 +0300 Committer: nikolay_tikhonov Committed: Fri Aug 14 12:54:34 2015 +0300 -- .../org/apache/ignite/cache/CacheEntry.java | 94 ++ .../processors/cache/CacheEntryImpl.java| 20 +++ .../processors/cache/CacheEntryImpl0.java | 5 + .../processors/cache/CacheEntryImplEx.java | 83 + .../processors/cache/CacheInvokeEntry.java | 27 ++- .../cache/CacheVersionedEntryImpl.java | 80 - .../processors/cache/GridCacheAdapter.java | 13 +- .../processors/cache/GridCacheEntryEx.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 28 ++- .../processors/cache/GridCacheSwapManager.java | 82 + .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../dht/atomic/GridDhtAtomicCache.java | 3 +- .../local/atomic/GridLocalAtomicCache.java | 3 +- .../cache/transactions/IgniteTxAdapter.java | 16 +- .../cache/transactions/IgniteTxEntry.java | 16 +- .../transactions/IgniteTxLocalAdapter.java | 83 +++-- .../cache/version/GridCacheVersion.java | 2 +- .../cache/version/GridCacheVersionAware.java| 30 .../cache/version/GridCacheVersionManager.java | 5 +- .../clock/GridClockSyncProcessor.java | 2 +- .../resources/META-INF/classnames.properties| 3 +- .../processors/cache/GridCacheTestEntryEx.java | 2 +- .../CacheVersionedEntryAbstractTest.java| 170 +++ ...nedEntryLocalAtomicSwapDisabledSelfTest.java | 45 + ...ersionedEntryLocalTransactionalSelfTest.java | 40 + ...edEntryPartitionedAtomicOffHeapSelfTest.java | 35 ...VersionedEntryPartitionedAtomicSelfTest.java | 35 ...PartitionedTransactionalOffHeapSelfTest.java | 36 ...edEntryPartitionedTransactionalSelfTest.java | 35 ...nedEntryReplicatedAtomicOffHeapSelfTest.java | 35 ...eVersionedEntryReplicatedAtomicSelfTest.java | 35 ...yReplicatedTransactionalOffHeapSelfTest.java | 36 ...nedEntryReplicatedTransactionalSelfTest.java | 35 .../testsuites/IgniteCacheTestSuite4.java | 13 ++ 34 files changed, 1005 insertions(+), 146 deletions(-) --
