You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/08/26 12:32:29 UTC
[1/3] ignite git commit: # GG-1223 Fixed metadata serialization to
json.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 90dbd9ca9 -> 3ba81456e
# GG-1223 Fixed metadata serialization to json.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3cbe58ce
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3cbe58ce
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3cbe58ce
Branch: refs/heads/ignite-843
Commit: 3cbe58ce1d9a153fc63f78f9aaea6a9d0cab96bf
Parents: 6b4f5d8
Author: Andrey <an...@gridgain.com>
Authored: Wed Aug 26 17:22:03 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Aug 26 17:22:03 2015 +0700
----------------------------------------------------------------------
.../src/main/js/routes/agent.js | 15 +++++++++++++
.../cache/query/GridCacheQueryManager.java | 22 ++++++++++----------
.../cache/query/GridCacheSqlIndexMetadata.java | 8 +++----
.../cache/query/GridCacheSqlMetadata.java | 16 +++++++-------
.../jdbc/GridCacheQueryJdbcMetadataTask.java | 10 ++++-----
.../IgniteCacheAbstractFieldsQuerySelfTest.java | 14 ++++++-------
6 files changed, 50 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3cbe58ce/modules/control-center-web/src/main/js/routes/agent.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/agent.js b/modules/control-center-web/src/main/js/routes/agent.js
index c2469c9..0c5fa4a 100644
--- a/modules/control-center-web/src/main/js/routes/agent.js
+++ b/modules/control-center-web/src/main/js/routes/agent.js
@@ -116,6 +116,21 @@ router.post('/query/fetch', function (req, res) {
}
});
+/* Get metadata for cache. */
+router.post('/cache/metadata', function (req, res) {
+ var client = _client(req, res);
+
+ if (client) {
+ var cache = client.ignite().cache(req.body.cacheName);
+
+ cache.metadata().then(function (metadata) {
+ res.json(metadata);
+ }, function (err) {
+ res.status(500).send(err);
+ });
+ }
+});
+
/* Get JDBC drivers list. */
router.post('/drivers', function (req, res) {
var client = _client(req, res);
http://git-wip-us.apache.org/repos/asf/ignite/blob/3cbe58ce/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 2ea41e3..305da0b 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
@@ -1869,7 +1869,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
for (Collection<CacheSqlMetadata> col : res) {
for (CacheSqlMetadata meta : col) {
- String name = meta.getCacheName();
+ String name = meta.cacheName();
Collection<CacheSqlMetadata> cacheMetas = map.get(name);
@@ -2123,12 +2123,12 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
}
/** {@inheritDoc} */
- @Override public String getCacheName() {
+ @Override public String cacheName() {
return cacheName;
}
/** {@inheritDoc} */
- @Override public Collection<String> getTypes() {
+ @Override public Collection<String> types() {
return types;
}
@@ -2148,22 +2148,22 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
}
/** {@inheritDoc} */
- @Override public Map<String, String> getKeyClasses() {
+ @Override public Map<String, String> keyClasses() {
return keyClasses;
}
/** {@inheritDoc} */
- @Override public Map<String, String> getValClasses() {
+ @Override public Map<String, String> valClasses() {
return valClasses;
}
/** {@inheritDoc} */
- @Override public Map<String, Map<String, String>> getFields() {
+ @Override public Map<String, Map<String, String>> fields() {
return fields;
}
/** {@inheritDoc} */
- @Override public Map<String, Collection<GridCacheSqlIndexMetadata>> getIndexes() {
+ @Override public Map<String, Collection<GridCacheSqlIndexMetadata>> indexes() {
return indexes;
}
@@ -2243,12 +2243,12 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
}
/** {@inheritDoc} */
- @Override public String getName() {
+ @Override public String name() {
return name;
}
/** {@inheritDoc} */
- @Override public Collection<String> getFields() {
+ @Override public Collection<String> fields() {
return fields;
}
@@ -2258,12 +2258,12 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
}
/** {@inheritDoc} */
- @Override public Collection<String> getDescendings() {
+ @Override public Collection<String> descendings() {
return descendings;
}
/** {@inheritDoc} */
- @Override public boolean isUnique() {
+ @Override public boolean unique() {
return unique;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/3cbe58ce/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlIndexMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlIndexMetadata.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlIndexMetadata.java
index 996e4b6..81b9f22 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlIndexMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlIndexMetadata.java
@@ -33,14 +33,14 @@ public interface GridCacheSqlIndexMetadata extends Externalizable {
*
* @return Index name.
*/
- public String getName();
+ public String name();
/**
* Gets names of fields indexed by this index.
*
* @return Indexed fields names.
*/
- public Collection<String> getFields();
+ public Collection<String> fields();
/**
* Gets order of the index for each indexed field.
@@ -53,12 +53,12 @@ public interface GridCacheSqlIndexMetadata extends Externalizable {
/**
* @return Descendings.
*/
- public Collection<String> getDescendings();
+ public Collection<String> descendings();
/**
* Gets whether this is a unique index.
*
* @return {@code True} if index is unique, {@code false} otherwise.
*/
- public boolean isUnique();
+ public boolean unique();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/3cbe58ce/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlMetadata.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlMetadata.java
index 3a55ccf..8f10613 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlMetadata.java
@@ -36,7 +36,7 @@ public interface GridCacheSqlMetadata extends Externalizable {
*
* @return Cache name.
*/
- public String getCacheName();
+ public String cacheName();
/**
* Gets the collection of types stored in cache.
@@ -47,12 +47,12 @@ public interface GridCacheSqlMetadata extends Externalizable {
*
* @return Collection of available types.
*/
- public Collection<String> getTypes();
+ public Collection<String> types();
/**
* Gets key class name for provided type.
* <p>
- * Use {@link #getTypes()} method to get available types.
+ * Use {@link #types()} method to get available types.
*
* @param type Type name.
* @return Key class name or {@code null} if type name is unknown.
@@ -62,7 +62,7 @@ public interface GridCacheSqlMetadata extends Externalizable {
/**
* Gets value class name for provided type.
* <p>
- * Use {@link #getTypes()} method to get available types.
+ * Use {@link #types()} method to get available types.
*
* @param type Type name.
* @return Value class name or {@code null} if type name is unknown.
@@ -80,22 +80,22 @@ public interface GridCacheSqlMetadata extends Externalizable {
/**
* @return Key classes.
*/
- public Map<String, String> getKeyClasses();
+ public Map<String, String> keyClasses();
/**
* @return Value classes.
*/
- public Map<String, String> getValClasses();
+ public Map<String, String> valClasses();
/**
* @return Fields.
*/
- public Map<String, Map<String, String>> getFields();
+ public Map<String, Map<String, String>> fields();
/**
* @return Indexes.
*/
- public Map<String, Collection<GridCacheSqlIndexMetadata>> getIndexes();
+ public Map<String, Collection<GridCacheSqlIndexMetadata>> indexes();
/**
* Gets descriptors of indexes created for provided type.
http://git-wip-us.apache.org/repos/asf/ignite/blob/3cbe58ce/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
index 90cd8c0..6111acd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
@@ -114,12 +114,12 @@ public class GridCacheQueryJdbcMetadataTask extends ComputeTaskAdapter<String, b
Collection<List<Object>> indexesInfo = new LinkedList<>();
for (GridCacheSqlMetadata meta : metas) {
- String name = meta.getCacheName();
+ String name = meta.cacheName();
if (name == null)
name = "PUBLIC";
- Collection<String> types = meta.getTypes();
+ Collection<String> types = meta.types();
Map<String, Map<String, String>> typesMap = U.newHashMap(types.size());
@@ -129,9 +129,9 @@ public class GridCacheQueryJdbcMetadataTask extends ComputeTaskAdapter<String, b
for (GridCacheSqlIndexMetadata idx : meta.indexes(type)) {
int cnt = 0;
- for (String field : idx.getFields()) {
- indexesInfo.add(F.<Object>asList(name, type.toUpperCase(), !idx.isUnique(),
- idx.getName().toUpperCase(), ++cnt, field, idx.descending(field)));
+ for (String field : idx.fields()) {
+ indexesInfo.add(F.<Object>asList(name, type.toUpperCase(), !idx.unique(),
+ idx.name().toUpperCase(), ++cnt, field, idx.descending(field)));
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/3cbe58ce/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
index 71ce60a..18bfd57 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
@@ -221,8 +221,8 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
boolean wasComplexKeys = false;
for (GridCacheSqlMetadata meta : metas) {
- if (meta.getCacheName() == null) {
- Collection<String> types = meta.getTypes();
+ if (meta.cacheName() == null) {
+ Collection<String> types = meta.types();
assert types != null;
assert types.size() == 4;
@@ -278,16 +278,16 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
wasNull = true;
}
- else if (CACHE.equals(meta.getCacheName()))
+ else if (CACHE.equals(meta.cacheName()))
wasNamed = true;
- else if (EMPTY_CACHE.equals(meta.getCacheName())) {
- assert meta.getTypes().isEmpty();
+ else if (EMPTY_CACHE.equals(meta.cacheName())) {
+ assert meta.types().isEmpty();
wasEmpty = true;
}
- else if (CACHE_NO_PRIMITIVES.equals(meta.getCacheName()))
+ else if (CACHE_NO_PRIMITIVES.equals(meta.cacheName()))
wasNoPrimitives = true;
- else if (CACHE_COMPLEX_KEYS.equals(meta.getCacheName()))
+ else if (CACHE_COMPLEX_KEYS.equals(meta.cacheName()))
wasComplexKeys = true;
}
[2/3] ignite git commit: # GG-1223 Fix serialization
GridCacheSqlMetadata, GridCacheSqlIndexMetadata for metadata.
Posted by an...@apache.org.
# GG-1223 Fix serialization GridCacheSqlMetadata, GridCacheSqlIndexMetadata for metadata.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bd067772
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bd067772
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bd067772
Branch: refs/heads/ignite-843
Commit: bd06777237a50f0d41758cfd8a129f9b10727841
Parents: 3cbe58c
Author: Andrey <an...@gridgain.com>
Authored: Wed Aug 26 17:24:01 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Aug 26 17:24:01 2015 +0700
----------------------------------------------------------------------
.../http/jetty/GridJettyJsonConfig.java | 142 +++++++++++++++----
1 file changed, 118 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bd067772/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyJsonConfig.java
----------------------------------------------------------------------
diff --git a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyJsonConfig.java b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyJsonConfig.java
index 8d00249..8cd9cb4 100644
--- a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyJsonConfig.java
+++ b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyJsonConfig.java
@@ -19,7 +19,9 @@ package org.apache.ignite.internal.processors.rest.protocols.http.jetty;
import net.sf.json.*;
import net.sf.json.processors.*;
+import org.apache.ignite.internal.processors.cache.query.*;
+import java.text.*;
import java.util.*;
/**
@@ -33,63 +35,155 @@ public class GridJettyJsonConfig extends JsonConfig {
registerJsonValueProcessor(UUID.class, new UUIDToStringJsonProcessor());
registerJsonValueProcessor(Date.class, new DateToStringJsonProcessor());
registerJsonValueProcessor(java.sql.Date.class, new DateToStringJsonProcessor());
+
+ registerJsonBeanProcessor(GridCacheSqlMetadata.class, new GridCacheSqlMetadataBeanProcessor());
+ registerJsonValueProcessor(GridCacheSqlIndexMetadata.class, new GridCacheSqlIndexMetadataToJson());
+
+ setJsonBeanProcessorMatcher(new GridJettyJsonBeanProcessorMatcher());
+ setJsonValueProcessorMatcher(new GridJettyJsonValueProcessorMatcher());
}
/**
- * Helper class for simple to-string conversion for the beans.
+ * Helper class for simple to-string conversion for {@link UUID}.
*/
private static class UUIDToStringJsonProcessor implements JsonValueProcessor {
/** {@inheritDoc} */
@Override public Object processArrayValue(Object val, JsonConfig jsonCfg) {
+ if (val == null)
+ return new JSONObject(true);
+
if (val instanceof UUID)
return val.toString();
- if (val instanceof UUID[]) {
- UUID[] uuids = (UUID[])val;
+ throw new UnsupportedOperationException("Serialize value to json is not supported: " + val);
+ }
- String[] result = new String[uuids.length];
+ /** {@inheritDoc} */
+ @Override public Object processObjectValue(String key, Object val, JsonConfig jsonCfg) {
+ return processArrayValue(val, jsonCfg);
+ }
+ }
- for (int i = 0; i < uuids.length; i++)
- result[i] = uuids[i] == null ? null : uuids[i].toString();
+ /**
+ * Helper class for simple to-string conversion for {@link Date}.
+ */
+ private static class DateToStringJsonProcessor implements JsonValueProcessor {
+ private final DateFormat enUsFormat
+ = DateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT, Locale.US);
- return result;
- }
+ /** {@inheritDoc} */
+ @Override public synchronized Object processArrayValue(Object val, JsonConfig jsonCfg) {
+ if (val == null)
+ return new JSONObject(true);
+
+ if (val instanceof Date)
+ return enUsFormat.format(val);
- throw new UnsupportedOperationException("Serialize array to string is not supported: " + val);
+ throw new UnsupportedOperationException("Serialize value to json is not supported: " + val);
}
/** {@inheritDoc} */
- @Override public Object processObjectValue(String key, Object val, JsonConfig jsonCfg) {
- return val == null ? null : val.toString();
+ @Override public synchronized Object processObjectValue(String key, Object val, JsonConfig jsonCfg) {
+ return processArrayValue(val, jsonCfg);
}
}
/**
- * Helper class for simple to-string conversion for the beans.
+ * Helper class for simple to-json conversion for {@link GridCacheSqlMetadata}.
*/
- private static class DateToStringJsonProcessor implements JsonValueProcessor {
+ private static class GridCacheSqlMetadataBeanProcessor implements JsonBeanProcessor {
/** {@inheritDoc} */
- @Override public Object processArrayValue(Object val, JsonConfig jsonCfg) {
- if (val instanceof Date)
- return val.toString();
+ @Override public JSONObject processBean(Object bean, JsonConfig jsonCfg) {
+ if (bean == null)
+ return new JSONObject(true);
+
+ if (bean instanceof GridCacheSqlMetadata) {
+ GridCacheSqlMetadata r = (GridCacheSqlMetadata) bean;
+
+ return new JSONObject()
+ .element("cacheName", r.cacheName(), jsonCfg)
+ .element("types", r.types(), jsonCfg)
+ .element("keyClasses", r.keyClasses(), jsonCfg)
+ .element("valClasses", r.valClasses(), jsonCfg)
+ .element("fields", r.fields(), jsonCfg)
+ .element("indexes", r.indexes(), jsonCfg);
+ }
- if (val instanceof Date[]) {
- Date[] dates = (Date[])val;
+ throw new UnsupportedOperationException("Serialize bean to json is not supported: " + bean);
+ }
+ }
- String[] result = new String[dates.length];
+ /**
+ * Helper class for simple to-json conversion for {@link GridCacheSqlIndexMetadata}.
+ */
+ private static class GridCacheSqlIndexMetadataToJson implements JsonValueProcessor {
+ /** {@inheritDoc} */
+ @Override public Object processArrayValue(Object val, JsonConfig jsonCfg) {
+ if (val == null)
+ return new JSONObject(true);
- for (int i = 0; i < dates.length; i++)
- result[i] = dates[i] == null ? null : dates[i].toString();
+ if (val instanceof GridCacheSqlIndexMetadata) {
+ GridCacheSqlIndexMetadata r = (GridCacheSqlIndexMetadata) val;
- return result;
+ return new JSONObject()
+ .element("name", r.name())
+ .element("fields", r.fields())
+ .element("descendings", r.descendings())
+ .element("unique", r.unique());
}
throw new UnsupportedOperationException("Serialize array to string is not supported: " + val);
}
/** {@inheritDoc} */
- @Override public Object processObjectValue(String key, Object val, JsonConfig jsonConfig) {
- return val == null ? null : val.toString();
+ @Override public Object processObjectValue(String key, Object value, JsonConfig jsonCfg) {
+ return processArrayValue(value, jsonCfg);
+ }
+ }
+
+ /**
+ * Class for finding a matching JsonBeanProcessor. Matches the target class with instanceOf.
+ */
+ private static final class GridJettyJsonBeanProcessorMatcher extends JsonBeanProcessorMatcher {
+ /** {@inheritDoc} */
+ @Override public Object getMatch(Class target, Set keys) {
+ if (target == null || keys == null)
+ return null;
+
+ if (keys.contains(target))
+ return target;
+
+ for (Object key : keys) {
+ Class<?> clazz = (Class<?>) key;
+
+ if (clazz.isAssignableFrom(target))
+ return key;
+ }
+
+ return null;
+ }
+ }
+
+ /**
+ * Class for finding a matching JsonValueProcessor. Matches the target class with instanceOf.
+ */
+ private static final class GridJettyJsonValueProcessorMatcher extends JsonValueProcessorMatcher {
+ /** {@inheritDoc} */
+ @Override public Object getMatch(Class target, Set keys) {
+ if (target == null || keys == null)
+ return null;
+
+ if (keys.contains(target))
+ return target;
+
+ for (Object key : keys) {
+ Class<?> clazz = (Class<?>) key;
+
+ if (clazz.isAssignableFrom(target))
+ return key;
+ }
+
+ return null;
}
}
}
[3/3] ignite git commit: Merge remote-tracking branch
'origin/ignite-843' into ignite-843
Posted by an...@apache.org.
Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3ba81456
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3ba81456
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3ba81456
Branch: refs/heads/ignite-843
Commit: 3ba81456ebff59cd6bf9813faa5ba0952cc2784a
Parents: bd06777 90dbd9c
Author: Andrey <an...@gridgain.com>
Authored: Wed Aug 26 17:24:16 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Aug 26 17:24:16 2015 +0700
----------------------------------------------------------------------
.../examples/igfs/IgfsMapReduceExample.java | 3 +
.../examples/servicegrid/ServicesExample.java | 13 +-
.../ignite/codegen/MessageCodeGenerator.java | 30 +-
.../main/js/controllers/caches-controller.js | 43 +-
.../main/js/controllers/clusters-controller.js | 42 +-
.../src/main/js/controllers/common-module.js | 19 +-
.../main/js/controllers/metadata-controller.js | 15 +-
modules/control-center-web/src/main/js/db.js | 8 +
.../src/main/js/public/stylesheets/style.scss | 12 +
.../src/main/js/routes/caches.js | 6 +-
.../src/main/js/routes/clusters.js | 2 +-
.../js/routes/generator/generator-docker.js | 8 +-
.../main/js/routes/generator/generator-java.js | 623 +--
.../js/routes/generator/generator-properties.js | 216 +-
.../main/js/routes/generator/generator-xml.js | 449 ++-
.../src/main/js/routes/summary.js | 16 +-
.../src/main/js/views/configuration/caches.jade | 2 +-
.../main/js/views/configuration/clusters.jade | 2 +-
.../main/js/views/configuration/metadata.jade | 2 +-
.../main/js/views/configuration/sidebar.jade | 1 +
.../src/main/js/views/includes/controls.jade | 11 +-
modules/core/pom.xml | 21 +
.../src/main/java/org/apache/ignite/Ignite.java | 7 +
.../java/org/apache/ignite/IgniteCache.java | 41 +
.../java/org/apache/ignite/IgnitePortables.java | 362 ++
.../configuration/CacheConfiguration.java | 40 +
.../configuration/IgniteConfiguration.java | 22 +
.../configuration/PlatformConfiguration.java | 25 +
.../internal/GridEventConsumeHandler.java | 14 +-
.../ignite/internal/GridJobCancelRequest.java | 2 +-
.../ignite/internal/GridJobExecuteRequest.java | 2 +-
.../ignite/internal/GridJobExecuteResponse.java | 2 +-
.../ignite/internal/GridJobSiblingsRequest.java | 2 +-
.../internal/GridJobSiblingsResponse.java | 2 +-
.../ignite/internal/GridKernalContext.java | 6 +
.../ignite/internal/GridKernalContextImpl.java | 15 +-
.../ignite/internal/GridTaskCancelRequest.java | 2 +-
.../ignite/internal/GridTaskSessionRequest.java | 2 +-
.../org/apache/ignite/internal/IgniteEx.java | 1 +
.../apache/ignite/internal/IgniteKernal.java | 13 +-
.../internal/direct/DirectByteBufferStream.java | 2 +-
.../internal/direct/DirectMessageReader.java | 6 +
.../interop/InteropAwareEventFilter.java | 37 -
.../internal/interop/InteropBootstrap.java | 35 -
.../interop/InteropBootstrapFactory.java | 39 -
.../internal/interop/InteropException.java | 71 -
.../internal/interop/InteropIgnition.java | 186 -
.../interop/InteropLocalEventListener.java | 28 -
.../interop/InteropNoCallbackException.java | 50 -
.../internal/interop/InteropProcessor.java | 39 -
.../checkpoint/GridCheckpointRequest.java | 2 +-
.../managers/communication/GridIoManager.java | 2 +-
.../managers/communication/GridIoMessage.java | 8 +-
.../communication/GridIoMessageFactory.java | 6 +
.../communication/GridIoUserMessage.java | 2 +-
.../deployment/GridDeploymentInfoBean.java | 2 +-
.../deployment/GridDeploymentRequest.java | 2 +-
.../deployment/GridDeploymentResponse.java | 2 +-
.../eventstorage/GridEventStorageManager.java | 10 +-
.../eventstorage/GridEventStorageMessage.java | 2 +-
.../platform/PlatformAwareEventFilter.java | 37 +
.../platform/PlatformLocalEventListener.java | 28 +
.../portable/GridPortableMarshaller.java | 304 ++
.../portable/PortableAbstractLazyValue.java | 57 +
.../internal/portable/PortableBuilderEnum.java | 114 +
.../internal/portable/PortableBuilderImpl.java | 519 +++
.../portable/PortableBuilderReader.java | 775 ++++
.../PortableBuilderSerializationAware.java | 29 +
.../portable/PortableBuilderSerializer.java | 210 +
.../portable/PortableClassDescriptor.java | 1344 +++++++
.../internal/portable/PortableContext.java | 1089 ++++++
.../portable/PortableEnumArrayLazyValue.java | 111 +
.../portable/PortableLazyArrayList.java | 156 +
.../portable/PortableLazyLinkedList.java | 210 +
.../internal/portable/PortableLazyMap.java | 214 +
.../internal/portable/PortableLazyMapEntry.java | 66 +
.../internal/portable/PortableLazySet.java | 89 +
.../internal/portable/PortableLazyValue.java | 28 +
.../portable/PortableMetaDataCollector.java | 253 ++
.../portable/PortableMetaDataHandler.java | 43 +
.../internal/portable/PortableMetaDataImpl.java | 140 +
.../portable/PortableObjectArrayLazyValue.java | 89 +
.../internal/portable/PortableObjectEx.java | 213 +
.../internal/portable/PortableObjectImpl.java | 383 ++
.../portable/PortableObjectOffheapImpl.java | 238 ++
.../portable/PortablePlainLazyValue.java | 47 +
.../portable/PortablePlainPortableObject.java | 50 +
.../internal/portable/PortablePrimitives.java | 773 ++++
.../internal/portable/PortableRawReaderEx.java | 33 +
.../internal/portable/PortableRawWriterEx.java | 60 +
.../portable/PortableReaderContext.java | 83 +
.../internal/portable/PortableReaderExImpl.java | 2949 ++++++++++++++
.../PortableThreadLocalMemoryAllocator.java | 163 +
.../ignite/internal/portable/PortableUtils.java | 419 ++
.../portable/PortableValueWithType.java | 74 +
.../internal/portable/PortableWriterExImpl.java | 1759 +++++++++
.../ignite/internal/portable/package-info.java | 22 +
.../streams/PortableAbstractInputStream.java | 343 ++
.../streams/PortableAbstractOutputStream.java | 323 ++
.../streams/PortableAbstractStream.java | 82 +
.../streams/PortableHeapInputStream.java | 134 +
.../streams/PortableHeapOutputStream.java | 155 +
.../portable/streams/PortableInputStream.java | 168 +
.../streams/PortableMemoryAllocator.java | 76 +
.../streams/PortableOffheapInputStream.java | 129 +
.../streams/PortableOffheapOutputStream.java | 169 +
.../portable/streams/PortableOutputStream.java | 165 +
.../streams/PortableSimpleMemoryAllocator.java | 67 +
.../portable/streams/PortableStream.java | 53 +
.../internal/portable/streams/package-info.java | 22 +
.../affinity/AffinityTopologyVersion.java | 2 +-
.../cache/CacheEntryInfoCollection.java | 2 +-
.../cache/CacheEntryPredicateAdapter.java | 2 +-
.../cache/CacheEntryPredicateContainsValue.java | 2 +-
.../cache/CacheEntrySerializablePredicate.java | 2 +-
.../processors/cache/CacheEvictionEntry.java | 2 +-
.../cache/CacheInvokeDirectResult.java | 2 +-
.../processors/cache/CacheObjectAdapter.java | 2 +-
.../cache/CacheObjectByteArrayImpl.java | 2 +-
.../processors/cache/GridCacheEntryInfo.java | 2 +-
.../cache/GridCacheEvictionRequest.java | 2 +-
.../cache/GridCacheEvictionResponse.java | 2 +-
.../processors/cache/GridCacheMessage.java | 2 +-
.../processors/cache/GridCacheProcessor.java | 70 +-
.../processors/cache/GridCacheReturn.java | 2 +-
.../processors/cache/IgniteCacheProxy.java | 5 +
.../distributed/GridCacheTtlUpdateRequest.java | 3 +-
.../distributed/GridCacheTxRecoveryRequest.java | 2 +-
.../GridCacheTxRecoveryResponse.java | 2 +-
.../distributed/GridDistributedBaseMessage.java | 2 +-
.../distributed/GridDistributedLockRequest.java | 2 +-
.../GridDistributedLockResponse.java | 2 +-
.../GridDistributedTxFinishRequest.java | 8 +-
.../GridDistributedTxFinishResponse.java | 2 +-
.../GridDistributedTxPrepareRequest.java | 8 +-
.../GridDistributedTxPrepareResponse.java | 2 +-
.../GridDistributedUnlockRequest.java | 2 +-
.../dht/GridDhtAffinityAssignmentRequest.java | 2 +-
.../dht/GridDhtAffinityAssignmentResponse.java | 2 +-
.../distributed/dht/GridDhtLockRequest.java | 6 +-
.../distributed/dht/GridDhtLockResponse.java | 2 +-
.../distributed/dht/GridDhtTxFinishRequest.java | 2 +-
.../dht/GridDhtTxFinishResponse.java | 2 +-
.../dht/GridDhtTxPrepareRequest.java | 2 +-
.../dht/GridDhtTxPrepareResponse.java | 2 +-
.../distributed/dht/GridDhtUnlockRequest.java | 2 +-
.../GridDhtAtomicDeferredUpdateResponse.java | 2 +-
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 2 +-
.../dht/atomic/GridDhtAtomicUpdateResponse.java | 2 +-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 2 +-
.../atomic/GridNearAtomicUpdateResponse.java | 2 +-
.../dht/preloader/GridDhtForceKeysRequest.java | 3 +-
.../dht/preloader/GridDhtForceKeysResponse.java | 4 +-
.../GridDhtPartitionDemandMessage.java | 2 +-
.../preloader/GridDhtPartitionExchangeId.java | 2 +-
.../GridDhtPartitionSupplyMessage.java | 2 +-
.../GridDhtPartitionsAbstractMessage.java | 2 +-
.../preloader/GridDhtPartitionsFullMessage.java | 2 +-
.../GridDhtPartitionsSingleMessage.java | 2 +-
.../GridDhtPartitionsSingleRequest.java | 2 +-
.../distributed/near/CacheVersionedValue.java | 2 +-
.../distributed/near/GridNearGetRequest.java | 2 +-
.../distributed/near/GridNearGetResponse.java | 2 +-
.../distributed/near/GridNearLockRequest.java | 2 +-
.../distributed/near/GridNearLockResponse.java | 2 +-
.../near/GridNearTxFinishRequest.java | 2 +-
.../near/GridNearTxFinishResponse.java | 2 +-
.../near/GridNearTxPrepareRequest.java | 2 +-
.../near/GridNearTxPrepareResponse.java | 2 +-
.../distributed/near/GridNearUnlockRequest.java | 2 +-
.../CacheDefaultPortableAffinityKeyMapper.java | 51 +
.../portable/CacheObjectPortableContext.java | 187 +
.../portable/CacheObjectPortableProcessor.java | 101 +
.../CacheObjectPortableProcessorImpl.java | 956 +++++
.../cache/portable/IgnitePortablesImpl.java | 176 +
.../cache/portable/PortableMetaDataKey.java | 80 +
.../processors/cache/portable/package-info.java | 22 +
.../cache/query/GridCacheQueryRequest.java | 2 +-
.../cache/query/GridCacheQueryResponse.java | 2 +-
.../cache/query/GridCacheSqlQuery.java | 9 +-
.../continuous/CacheContinuousQueryEntry.java | 2 +-
.../cache/store/CacheOsStoreManager.java | 3 +-
.../cache/transactions/IgniteTxEntry.java | 2 +-
.../cache/transactions/IgniteTxKey.java | 2 +-
.../cache/transactions/TxEntryValueHolder.java | 2 +-
.../version/GridCacheRawVersionedEntry.java | 2 +-
.../cache/version/GridCacheVersion.java | 2 +-
.../cache/version/GridCacheVersionEx.java | 2 +-
.../clock/GridClockDeltaSnapshotMessage.java | 2 +-
.../processors/clock/GridClockDeltaVersion.java | 2 +-
.../continuous/GridContinuousMessage.java | 2 +-
.../datastreamer/DataStreamerEntry.java | 2 +-
.../datastreamer/DataStreamerRequest.java | 2 +-
.../datastreamer/DataStreamerResponse.java | 2 +-
.../processors/igfs/IgfsAckMessage.java | 2 +-
.../internal/processors/igfs/IgfsBlockKey.java | 2 +-
.../processors/igfs/IgfsBlocksMessage.java | 2 +-
.../igfs/IgfsCommunicationMessage.java | 2 +-
.../processors/igfs/IgfsDeleteMessage.java | 2 +-
.../processors/igfs/IgfsFileAffinityRange.java | 9 +-
.../igfs/IgfsFragmentizerRequest.java | 2 +-
.../igfs/IgfsFragmentizerResponse.java | 2 +-
.../processors/igfs/IgfsSyncMessage.java | 2 +-
.../platform/PlatformNoopProcessor.java | 41 +
.../processors/platform/PlatformProcessor.java | 40 +
.../portable/GridPortableInputStream.java | 168 -
.../portable/GridPortableOutputStream.java | 165 -
.../processors/portable/GridPortableStream.java | 53 -
.../processors/portable/package-info.java | 22 -
.../messages/GridQueryCancelRequest.java | 2 +-
.../twostep/messages/GridQueryFailResponse.java | 2 +-
.../messages/GridQueryNextPageRequest.java | 2 +-
.../messages/GridQueryNextPageResponse.java | 3 +-
.../h2/twostep/messages/GridQueryRequest.java | 5 +-
.../handlers/task/GridTaskResultRequest.java | 2 +-
.../handlers/task/GridTaskResultResponse.java | 2 +-
.../ignite/internal/util/GridByteArrayList.java | 2 +-
.../ignite/internal/util/GridLongList.java | 2 +-
.../internal/util/nio/GridDirectParser.java | 2 +-
.../visor/cache/VisorCacheClearTask.java | 11 +-
.../marshaller/portable/PortableMarshaller.java | 347 ++
.../marshaller/portable/package-info.java | 22 +
.../communication/MessageFormatter.java | 3 +-
.../extensions/communication/MessageReader.java | 13 +
.../apache/ignite/portable/PortableBuilder.java | 138 +
.../ignite/portable/PortableException.java | 58 +
.../ignite/portable/PortableIdMapper.java | 56 +
.../portable/PortableInvalidClassException.java | 58 +
.../ignite/portable/PortableMarshalAware.java | 48 +
.../ignite/portable/PortableMetadata.java | 63 +
.../apache/ignite/portable/PortableObject.java | 153 +
.../portable/PortableProtocolVersion.java | 41 +
.../ignite/portable/PortableRawReader.java | 233 ++
.../ignite/portable/PortableRawWriter.java | 218 ++
.../apache/ignite/portable/PortableReader.java | 283 ++
.../ignite/portable/PortableSerializer.java | 49 +
.../portable/PortableTypeConfiguration.java | 197 +
.../apache/ignite/portable/PortableWriter.java | 265 ++
.../apache/ignite/portable/package-info.java | 22 +
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 2 +-
.../jobstealing/JobStealingRequest.java | 2 +-
.../communication/tcp/TcpCommunicationSpi.java | 8 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 9 +-
.../resources/META-INF/classnames.properties | 287 +-
.../GridPortableAffinityKeySelfTest.java | 215 +
.../GridPortableBuilderAdditionalSelfTest.java | 1001 +++++
.../portable/GridPortableBuilderSelfTest.java | 1007 +++++
...eBuilderStringAsCharsAdditionalSelfTest.java | 28 +
...ridPortableBuilderStringAsCharsSelfTest.java | 28 +
...idPortableMarshallerCtxDisabledSelfTest.java | 128 +
.../GridPortableMarshallerSelfTest.java | 3691 ++++++++++++++++++
.../GridPortableMetaDataDisabledSelfTest.java | 218 ++
.../portable/GridPortableMetaDataSelfTest.java | 343 ++
.../portable/GridPortableWildcardsSelfTest.java | 480 +++
.../GridPortableMarshalerAwareTestClass.java | 62 +
.../mutabletest/GridPortableTestClasses.java | 425 ++
.../portable/mutabletest/package-info.java | 22 +
.../ignite/internal/portable/package-info.java | 22 +
.../portable/test/GridPortableTestClass1.java | 28 +
.../portable/test/GridPortableTestClass2.java | 24 +
.../internal/portable/test/package-info.java | 22 +
.../test/subpackage/GridPortableTestClass3.java | 24 +
.../portable/test/subpackage/package-info.java | 22 +
.../GridCacheDaemonNodeAbstractSelfTest.java | 9 +-
.../near/IgniteCacheNearOnlyTxTest.java | 82 +-
.../local/GridCacheDaemonNodeLocalSelfTest.java | 30 -
...ClientNodePortableMetadataMultinodeTest.java | 277 ++
...GridCacheClientNodePortableMetadataTest.java | 280 ++
...ableObjectsAbstractDataStreamerSelfTest.java | 183 +
...bleObjectsAbstractMultiThreadedSelfTest.java | 222 ++
...ridCachePortableObjectsAbstractSelfTest.java | 958 +++++
.../GridCachePortableStoreAbstractSelfTest.java | 294 ++
.../GridCachePortableStoreObjectsSelfTest.java | 55 +
...GridCachePortableStorePortablesSelfTest.java | 67 +
...ridPortableCacheEntryMemorySizeSelfTest.java | 52 +
...leDuplicateIndexObjectsAbstractSelfTest.java | 153 +
.../DataStreamProcessorPortableSelfTest.java | 67 +
.../GridDataStreamerImplSelfTest.java | 338 ++
...ridCacheAffinityRoutingPortableSelfTest.java | 48 +
...lyPortableDataStreamerMultiNodeSelfTest.java | 29 +
...rtableDataStreamerMultithreadedSelfTest.java | 46 +
...artitionedOnlyPortableMultiNodeSelfTest.java | 28 +
...tionedOnlyPortableMultithreadedSelfTest.java | 46 +
.../GridCacheMemoryModePortableSelfTest.java | 36 +
...acheOffHeapTieredAtomicPortableSelfTest.java | 48 +
...eapTieredEvictionAtomicPortableSelfTest.java | 96 +
...heOffHeapTieredEvictionPortableSelfTest.java | 96 +
.../GridCacheOffHeapTieredPortableSelfTest.java | 48 +
...ateIndexObjectPartitionedAtomicSelfTest.java | 37 +
...xObjectPartitionedTransactionalSelfTest.java | 40 +
...AtomicNearDisabledOffheapTieredSelfTest.java | 29 +
...rtableObjectsAtomicNearDisabledSelfTest.java | 50 +
...tableObjectsAtomicOffheapTieredSelfTest.java | 29 +
.../GridCachePortableObjectsAtomicSelfTest.java | 50 +
...tionedNearDisabledOffheapTieredSelfTest.java | 30 +
...eObjectsPartitionedNearDisabledSelfTest.java | 50 +
...ObjectsPartitionedOffheapTieredSelfTest.java | 30 +
...CachePortableObjectsPartitionedSelfTest.java | 50 +
...sNearPartitionedByteArrayValuesSelfTest.java | 41 +
...sPartitionedOnlyByteArrayValuesSelfTest.java | 42 +
...dCachePortableObjectsReplicatedSelfTest.java | 50 +
...CachePortableObjectsAtomicLocalSelfTest.java | 32 +
...rtableObjectsLocalOffheapTieredSelfTest.java | 29 +
.../GridCachePortableObjectsLocalSelfTest.java | 50 +
.../tcp/TcpDiscoverySpiStartStopSelfTest.java | 2 +-
.../testframework/GridSpiTestContext.java | 2 +-
.../ignite/testframework/junits/IgniteMock.java | 5 +
.../multijvm/IgniteCacheProcessProxy.java | 5 +
.../junits/multijvm/IgniteProcessProxy.java | 5 +
.../IgnitePortableCacheFullApiTestSuite.java | 38 +
.../IgnitePortableCacheTestSuite.java | 86 +
.../IgnitePortableObjectsTestSuite.java | 74 +
.../ignite/portable/test1/1.1/test1-1.1.jar | Bin 0 -> 2548 bytes
.../ignite/portable/test1/1.1/test1-1.1.pom | 9 +
.../portable/test1/maven-metadata-local.xml | 12 +
.../ignite/portable/test2/1.1/test2-1.1.jar | Bin 0 -> 1361 bytes
.../ignite/portable/test2/1.1/test2-1.1.pom | 9 +
.../portable/test2/maven-metadata-local.xml | 12 +
.../IgnitePortableCacheQueryTestSuite.java | 95 +
modules/platform/pom.xml | 65 +
.../Apache.Ignite.Core.csproj | 72 +
.../main/dotnet/Apache.Ignite.Core/Ignition.cs | 23 +
.../Impl/Memory/IPlatformMemory.cs | 62 +
.../Memory/PlatformBigEndianMemoryStream.cs | 483 +++
.../Impl/Memory/PlatformMemory.cs | 77 +
.../Impl/Memory/PlatformMemoryManager.cs | 106 +
.../Impl/Memory/PlatformMemoryPool.cs | 105 +
.../Impl/Memory/PlatformMemoryStream.cs | 676 ++++
.../Impl/Memory/PlatformMemoryUtils.cs | 462 +++
.../Impl/Memory/PlatformPooledMemory.cs | 70 +
.../Impl/Memory/PlatformRawMemory.cs | 88 +
.../Impl/Memory/PlatformUnpooledMemory.cs | 52 +
.../Impl/Portable/Io/IPortableStream.cs | 320 ++
.../Properties/AssemblyInfo.cs | 45 +
.../platform/src/main/dotnet/Apache.Ignite.sln | 35 +
.../main/dotnet/Apache.Ignite.sln.DotSettings | 4 +
.../internal/platform/PlatformBootstrap.java | 36 +
.../platform/PlatformBootstrapFactory.java | 37 +
.../internal/platform/PlatformException.java | 71 +
.../internal/platform/PlatformIgnition.java | 187 +
.../platform/PlatformNoCallbackException.java | 50 +
.../callback/PlatformCallbackGateway.java | 869 +++++
.../callback/PlatformCallbackUtils.java | 468 +++
.../platform/memory/PlatformAbstractMemory.java | 121 +
.../PlatformBigEndianInputStreamImpl.java | 126 +
.../PlatformBigEndianOutputStreamImpl.java | 162 +
.../platform/memory/PlatformExternalMemory.java | 55 +
.../platform/memory/PlatformInputStream.java | 30 +
.../memory/PlatformInputStreamImpl.java | 323 ++
.../platform/memory/PlatformMemory.java | 77 +
.../platform/memory/PlatformMemoryManager.java | 46 +
.../memory/PlatformMemoryManagerImpl.java | 83 +
.../platform/memory/PlatformMemoryPool.java | 133 +
.../platform/memory/PlatformMemoryUtils.java | 468 +++
.../platform/memory/PlatformOutputStream.java | 30 +
.../memory/PlatformOutputStreamImpl.java | 259 ++
.../platform/memory/PlatformPooledMemory.java | 63 +
.../platform/memory/PlatformUnpooledMemory.java | 51 +
.../Apache.Ignite.Core.Tests.csproj | 65 +
.../Apache.Ignite.Core.Tests/IgnitionTest.cs | 30 +
.../Memory/InteropMemoryTest.cs | 213 +
.../Properties/AssemblyInfo.cs | 35 +
.../Apache.Ignite.Core.Tests/TestRunner.cs | 70 +
.../parser/dialect/OracleMetadataDialect.java | 4 +-
.../org/apache/ignite/IgniteSpringBean.java | 7 +
parent/pom.xml | 12 +
pom.xml | 7 +-
scripts/apply-pull-request.sh | 141 +
368 files changed, 40058 insertions(+), 2029 deletions(-)
----------------------------------------------------------------------