You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/06/17 11:11:34 UTC
[1/5] incubator-ignite git commit: #IGNITE-GG-10429 Fixed client rest.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-1020 a75b86860 -> e507f0309
#IGNITE-GG-10429 Fixed client rest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/77855440
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/77855440
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/77855440
Branch: refs/heads/ignite-1020
Commit: 77855440af71299a29aef0b36627044b705724b8
Parents: d1a2150
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Wed Jun 17 09:48:03 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Wed Jun 17 09:48:03 2015 +0300
----------------------------------------------------------------------
.../GridClientOptimizedMarshaller.java | 20 ++++++++++++++++++++
.../rest/protocols/tcp/GridTcpRestProtocol.java | 3 ++-
2 files changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77855440/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java
index 7c2bd2f..28b129e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java
@@ -22,9 +22,11 @@ import org.apache.ignite.internal.*;
import org.apache.ignite.internal.client.marshaller.*;
import org.apache.ignite.internal.processors.rest.client.message.*;
import org.apache.ignite.marshaller.optimized.*;
+import org.apache.ignite.plugin.*;
import java.io.*;
import java.nio.*;
+import java.util.*;
/**
* Wrapper, that adapts {@link org.apache.ignite.marshaller.optimized.OptimizedMarshaller} to
@@ -47,6 +49,17 @@ public class GridClientOptimizedMarshaller implements GridClientMarshaller {
}
/**
+ * Constructor.
+ *
+ * @param plugins Plugins.
+ */
+ public GridClientOptimizedMarshaller(List<PluginProvider> plugins) {
+ opMarsh = new OptimizedMarshaller();
+
+ opMarsh.setContext(new ClientMarshallerContext(plugins));
+ }
+
+ /**
* Constructs optimized marshaller with specific parameters.
*
* @param requireSer Require serializable flag.
@@ -105,6 +118,13 @@ public class GridClientOptimizedMarshaller implements GridClientMarshaller {
super(null);
}
+ /**
+ * @param plugins Plugins.
+ */
+ public ClientMarshallerContext(List<PluginProvider> plugins) {
+ super(plugins);
+ }
+
/** {@inheritDoc} */
@Override protected boolean registerClassName(int id, String clsName) {
throw new UnsupportedOperationException(clsName);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77855440/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
index 5645cf5..9b6f353 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
@@ -149,7 +149,8 @@ public class GridTcpRestProtocol extends GridRestProtocolAdapter {
Map<Byte, GridClientMarshaller> marshMap = new HashMap<>();
- marshMap.put(GridClientOptimizedMarshaller.ID, new GridClientOptimizedMarshaller());
+ marshMap.put(GridClientOptimizedMarshaller.ID,
+ new GridClientOptimizedMarshaller(new ArrayList<>(ctx.plugins().allProviders())));
marshMap.put(GridClientJdkMarshaller.ID, new GridClientJdkMarshaller());
lsnr.marshallers(marshMap);
[2/5] incubator-ignite git commit: #IGNITE-GG-10429 Fixed client
marshaller.
Posted by sb...@apache.org.
#IGNITE-GG-10429 Fixed client marshaller.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/092bb91f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/092bb91f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/092bb91f
Branch: refs/heads/ignite-1020
Commit: 092bb91f1cf8b99b0f43903fd493d85cac89ee7e
Parents: 7785544
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Wed Jun 17 10:17:49 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Wed Jun 17 10:17:49 2015 +0300
----------------------------------------------------------------------
.../internal/client/GridClientConfiguration.java | 19 +++++++++++++++++--
.../optimized/GridClientOptimizedMarshaller.java | 5 +++--
2 files changed, 20 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/092bb91f/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
index ee16f94..4a909a3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
@@ -23,10 +23,12 @@ import org.apache.ignite.internal.client.marshaller.optimized.*;
import org.apache.ignite.internal.client.ssl.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.plugin.*;
import org.apache.ignite.plugin.security.*;
import org.jetbrains.annotations.*;
import java.net.*;
+import java.security.*;
import java.util.*;
import java.util.concurrent.*;
@@ -110,7 +112,7 @@ public class GridClientConfiguration {
private ExecutorService executor;
/** Marshaller. */
- private GridClientMarshaller marshaller = new GridClientOptimizedMarshaller();
+ private GridClientMarshaller marshaller;
/** Daemon flag. */
private boolean daemon;
@@ -119,7 +121,20 @@ public class GridClientConfiguration {
* Creates default configuration.
*/
public GridClientConfiguration() {
- // No-op.
+ List<PluginProvider> plugins = AccessController.doPrivileged(new PrivilegedAction<List<PluginProvider>>() {
+ @Override public List<PluginProvider> run() {
+ List<PluginProvider> providers = new ArrayList<>();
+
+ ServiceLoader<PluginProvider> ldr = ServiceLoader.load(PluginProvider.class);
+
+ for (PluginProvider provider : ldr)
+ providers.add(provider);
+
+ return providers;
+ }
+ });
+
+ marshaller = new GridClientOptimizedMarshaller(plugins);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/092bb91f/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java
index 28b129e..0d99d75 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java
@@ -23,6 +23,7 @@ import org.apache.ignite.internal.client.marshaller.*;
import org.apache.ignite.internal.processors.rest.client.message.*;
import org.apache.ignite.marshaller.optimized.*;
import org.apache.ignite.plugin.*;
+import org.jetbrains.annotations.*;
import java.io.*;
import java.nio.*;
@@ -53,7 +54,7 @@ public class GridClientOptimizedMarshaller implements GridClientMarshaller {
*
* @param plugins Plugins.
*/
- public GridClientOptimizedMarshaller(List<PluginProvider> plugins) {
+ public GridClientOptimizedMarshaller(@Nullable List<PluginProvider> plugins) {
opMarsh = new OptimizedMarshaller();
opMarsh.setContext(new ClientMarshallerContext(plugins));
@@ -121,7 +122,7 @@ public class GridClientOptimizedMarshaller implements GridClientMarshaller {
/**
* @param plugins Plugins.
*/
- public ClientMarshallerContext(List<PluginProvider> plugins) {
+ public ClientMarshallerContext(@Nullable List<PluginProvider> plugins) {
super(plugins);
}
[3/5] incubator-ignite git commit: #IGNITE-GG-10429 Fixed client
marshaller.
Posted by sb...@apache.org.
#IGNITE-GG-10429 Fixed client marshaller.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9142eb7c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9142eb7c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9142eb7c
Branch: refs/heads/ignite-1020
Commit: 9142eb7ce1cb0f665c129580a3a611a6ad5dce1e
Parents: 092bb91
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Wed Jun 17 10:30:04 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Wed Jun 17 10:30:04 2015 +0300
----------------------------------------------------------------------
.../impl/GridTcpRouterNioListenerAdapter.java | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9142eb7c/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java
index 0bf416c..e60f2aa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java
@@ -25,8 +25,10 @@ import org.apache.ignite.internal.client.marshaller.optimized.*;
import org.apache.ignite.internal.processors.rest.client.message.*;
import org.apache.ignite.internal.util.nio.*;
import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.plugin.*;
import org.jetbrains.annotations.*;
+import java.security.*;
import java.util.*;
import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.*;
@@ -65,7 +67,20 @@ public abstract class GridTcpRouterNioListenerAdapter implements GridNioServerLi
marshMap = new HashMap<>();
- marshMap.put(GridClientOptimizedMarshaller.ID, new GridClientOptimizedMarshaller());
+ List<PluginProvider> plugins = AccessController.doPrivileged(new PrivilegedAction<List<PluginProvider>>() {
+ @Override public List<PluginProvider> run() {
+ List<PluginProvider> providers = new ArrayList<>();
+
+ ServiceLoader<PluginProvider> ldr = ServiceLoader.load(PluginProvider.class);
+
+ for (PluginProvider provider : ldr)
+ providers.add(provider);
+
+ return providers;
+ }
+ });
+
+ marshMap.put(GridClientOptimizedMarshaller.ID, new GridClientOptimizedMarshaller(plugins));
marshMap.put(GridClientJdkMarshaller.ID, new GridClientJdkMarshaller());
init();
[4/5] incubator-ignite git commit: #IGNITE-GG-10429 Extract utility
method.
Posted by sb...@apache.org.
#IGNITE-GG-10429 Extract utility method.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/01eee2da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/01eee2da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/01eee2da
Branch: refs/heads/ignite-1020
Commit: 01eee2da37961d8f6c8ae477f4a6b3cb8a6a6372
Parents: 9142eb7
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Wed Jun 17 10:48:19 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Wed Jun 17 10:48:19 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/IgniteKernal.java | 13 +-----------
.../client/GridClientConfiguration.java | 17 +---------------
.../impl/GridTcpRouterNioListenerAdapter.java | 17 +---------------
.../ignite/internal/util/IgniteUtils.java | 21 ++++++++++++++++++++
4 files changed, 24 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01eee2da/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 9e0dcbf..e19d3d3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -630,18 +630,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
// Ack configuration.
ackSpis();
- List<PluginProvider> plugins = AccessController.doPrivileged(new PrivilegedAction<List<PluginProvider>>() {
- @Override public List<PluginProvider> run() {
- List<PluginProvider> providers = new ArrayList<>();
-
- ServiceLoader<PluginProvider> ldr = ServiceLoader.load(PluginProvider.class);
-
- for (PluginProvider provider : ldr)
- providers.add(provider);
-
- return providers;
- }
- });
+ List<PluginProvider> plugins = U.allPluginProviders();
// Spin out SPIs & managers.
try {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01eee2da/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
index 4a909a3..f06d779 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
@@ -23,12 +23,10 @@ import org.apache.ignite.internal.client.marshaller.optimized.*;
import org.apache.ignite.internal.client.ssl.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.*;
import org.apache.ignite.plugin.security.*;
import org.jetbrains.annotations.*;
import java.net.*;
-import java.security.*;
import java.util.*;
import java.util.concurrent.*;
@@ -121,20 +119,7 @@ public class GridClientConfiguration {
* Creates default configuration.
*/
public GridClientConfiguration() {
- List<PluginProvider> plugins = AccessController.doPrivileged(new PrivilegedAction<List<PluginProvider>>() {
- @Override public List<PluginProvider> run() {
- List<PluginProvider> providers = new ArrayList<>();
-
- ServiceLoader<PluginProvider> ldr = ServiceLoader.load(PluginProvider.class);
-
- for (PluginProvider provider : ldr)
- providers.add(provider);
-
- return providers;
- }
- });
-
- marshaller = new GridClientOptimizedMarshaller(plugins);
+ marshaller = new GridClientOptimizedMarshaller(U.allPluginProviders());
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01eee2da/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java
index e60f2aa..1775b21 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java
@@ -25,10 +25,8 @@ import org.apache.ignite.internal.client.marshaller.optimized.*;
import org.apache.ignite.internal.processors.rest.client.message.*;
import org.apache.ignite.internal.util.nio.*;
import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.*;
import org.jetbrains.annotations.*;
-import java.security.*;
import java.util.*;
import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.*;
@@ -67,20 +65,7 @@ public abstract class GridTcpRouterNioListenerAdapter implements GridNioServerLi
marshMap = new HashMap<>();
- List<PluginProvider> plugins = AccessController.doPrivileged(new PrivilegedAction<List<PluginProvider>>() {
- @Override public List<PluginProvider> run() {
- List<PluginProvider> providers = new ArrayList<>();
-
- ServiceLoader<PluginProvider> ldr = ServiceLoader.load(PluginProvider.class);
-
- for (PluginProvider provider : ldr)
- providers.add(provider);
-
- return providers;
- }
- });
-
- marshMap.put(GridClientOptimizedMarshaller.ID, new GridClientOptimizedMarshaller(plugins));
+ marshMap.put(GridClientOptimizedMarshaller.ID, new GridClientOptimizedMarshaller(U.allPluginProviders()));
marshMap.put(GridClientJdkMarshaller.ID, new GridClientJdkMarshaller());
init();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01eee2da/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index a303abc..6623e85 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -39,6 +39,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.internal.util.worker.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.lifecycle.*;
+import org.apache.ignite.plugin.*;
import org.apache.ignite.plugin.extensions.communication.*;
import org.apache.ignite.spi.*;
import org.apache.ignite.spi.discovery.*;
@@ -629,6 +630,26 @@ public abstract class IgniteUtils {
}
/**
+ * Gets all plugin providers.
+ *
+ * @return Plugins.
+ */
+ public static List<PluginProvider> allPluginProviders() {
+ return AccessController.doPrivileged(new PrivilegedAction<List<PluginProvider>>() {
+ @Override public List<PluginProvider> run() {
+ List<PluginProvider> providers = new ArrayList<>();
+
+ ServiceLoader<PluginProvider> ldr = ServiceLoader.load(PluginProvider.class);
+
+ for (PluginProvider provider : ldr)
+ providers.add(provider);
+
+ return providers;
+ }
+ });
+ }
+
+ /**
* Converts exception, but unlike {@link #convertException(IgniteCheckedException)}
* does not wrap passed in exception if none suitable converter found.
*
[5/5] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-7' into ignite-1020
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-7' into ignite-1020
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e507f030
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e507f030
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e507f030
Branch: refs/heads/ignite-1020
Commit: e507f030998c98851f97affa14667b64ebdb236e
Parents: a75b868 01eee2d
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jun 17 12:10:41 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jun 17 12:10:41 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/IgniteKernal.java | 13 +-----------
.../client/GridClientConfiguration.java | 4 ++--
.../GridClientOptimizedMarshaller.java | 21 ++++++++++++++++++++
.../impl/GridTcpRouterNioListenerAdapter.java | 2 +-
.../rest/protocols/tcp/GridTcpRestProtocol.java | 3 ++-
.../ignite/internal/util/IgniteUtils.java | 21 ++++++++++++++++++++
6 files changed, 48 insertions(+), 16 deletions(-)
----------------------------------------------------------------------