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/05/12 15:46:56 UTC
[01/28] incubator-ignite git commit: # IGNITE-478 Refactoring Get rid
GridResourceIoc.fieldCache, GridResourceIoc.mtdCache,
GridResourceIoc.skipCache.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-709_2 a001312d3 -> 406e29709
# IGNITE-478 Refactoring Get rid GridResourceIoc.fieldCache, GridResourceIoc.mtdCache, GridResourceIoc.skipCache.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/830a1025
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/830a1025
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/830a1025
Branch: refs/heads/ignite-709_2
Commit: 830a10252a712e2774762c9dd1be1d5df5eabe36
Parents: b210159
Author: sevdokimov <se...@gridgain.com>
Authored: Thu Mar 26 17:35:25 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Thu Mar 26 17:35:25 2015 +0300
----------------------------------------------------------------------
.../processors/resource/GridResourceField.java | 11 +
.../processors/resource/GridResourceIoc.java | 387 +++++++------------
.../processors/resource/GridResourceMethod.java | 13 +
.../resource/GridResourceProcessor.java | 2 -
.../ignite/internal/util/IgniteUtils.java | 15 +
5 files changed, 168 insertions(+), 260 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/830a1025/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceField.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceField.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceField.java
index 6b921f4..162de1c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceField.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceField.java
@@ -22,6 +22,7 @@ import org.jetbrains.annotations.*;
import java.lang.annotation.*;
import java.lang.reflect.*;
+import java.util.*;
/**
* Wrapper for data where resource should be injected.
@@ -78,6 +79,16 @@ class GridResourceField {
return ann == null;
}
+ /**
+ * @param c Closure.
+ */
+ public static GridResourceField[] toArray(Collection<GridResourceField> c) {
+ if (c.isEmpty())
+ return EMPTY_ARRAY;
+
+ return c.toArray(new GridResourceField[c.size()]);
+ }
+
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(GridResourceField.class, this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/830a1025/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java
index 8410e71..301e5e5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java
@@ -38,20 +38,8 @@ class GridResourceIoc {
private final ConcurrentMap<ClassLoader, Set<Class<?>>> taskMap =
new ConcurrentHashMap8<>();
- /** Field cache. */
- private final ConcurrentMap<Class<?>, ConcurrentMap<Class<? extends Annotation>, GridResourceField[]>> fieldCache =
- new ConcurrentHashMap8<>();
-
- /** Method cache. */
- private final ConcurrentMap<Class<?>, ConcurrentMap<Class<? extends Annotation>, GridResourceMethod[]>> mtdCache =
- new ConcurrentHashMap8<>();
-
- /**
- * Cache for classes that do not require injection with some annotation.
- * Maps annotation classes to set a set of target classes to skip.
- */
- private final ConcurrentMap<Class<? extends Annotation>, Set<Class<?>>> skipCache =
- new ConcurrentHashMap8<>();
+ /** Class descriptors cache. */
+ private final ConcurrentMap<Class<?>, ClassDescriptor> clsDescs = new ConcurrentHashMap8<>();
/** */
private final ConcurrentMap<Class<?>, Class<? extends Annotation>[]> annCache =
@@ -64,18 +52,8 @@ class GridResourceIoc {
Set<Class<?>> clss = taskMap.remove(ldr);
if (clss != null) {
- fieldCache.keySet().removeAll(clss);
- mtdCache.keySet().removeAll(clss);
-
- for (Map.Entry<Class<? extends Annotation>, Set<Class<?>>> e : skipCache.entrySet()) {
- Set<Class<?>> skipClss = e.getValue();
-
- if (skipClss != null)
- e.getValue().removeAll(clss);
- }
-
- for (Class<?> cls : clss)
- annCache.remove(cls);
+ clsDescs.keySet().removeAll(clss);
+ annCache.keySet().removeAll(clss);
}
}
@@ -84,8 +62,8 @@ class GridResourceIoc {
*/
void undeployAll() {
taskMap.clear();
- mtdCache.clear();
- fieldCache.clear();
+ clsDescs.clear();
+ annCache.clear();
}
/**
@@ -107,15 +85,27 @@ class GridResourceIoc {
@Nullable Class<?> depCls)
throws IgniteCheckedException
{
- assert target != null;
- assert annCls != null;
- assert injector != null;
+ return injectInternal(target, annCls, injector, dep, depCls, null);
+ }
- if (isAnnotationPresent(target, annCls, dep))
- // Use identity hash set to compare via referential equality.
- return injectInternal(target, annCls, injector, dep, depCls, new GridLeanIdentitySet<>());
+ /**
+ * @param cls Class.
+ */
+ @NotNull
+ private ClassDescriptor descriptor(@Nullable GridDeployment dep, Class<?> cls) {
+ ClassDescriptor res = clsDescs.get(cls);
- return false;
+ if (res == null) {
+ if (dep != null) {
+ Set<Class<?>> classes = F.addIfAbsent(taskMap, dep.classLoader(), F.<Class<?>>newCSet());
+
+ classes.add(cls);
+ }
+
+ res = F.addIfAbsent(clsDescs, cls, new ClassDescriptor(cls));
+ }
+
+ return res;
}
/**
@@ -133,73 +123,54 @@ class GridResourceIoc {
GridResourceInjector injector,
@Nullable GridDeployment dep,
@Nullable Class<?> depCls,
- Set<Object> checkedObjs)
+ @Nullable Set<Object> checkedObjs)
throws IgniteCheckedException
{
- assert target != null;
- assert annCls != null;
- assert injector != null;
- assert checkedObjs != null;
-
Class<?> targetCls = target.getClass();
- Set<Class<?>> skipClss = skipCache.get(annCls);
+ ClassDescriptor descr = descriptor(dep, targetCls);
- // Skip this class if it does not need to be injected.
- if (skipClss != null && skipClss.contains(targetCls))
- return false;
+ T2<GridResourceField[], GridResourceMethod[]> annotatedMembers = descr.annotatedMembers(annCls);
- // Check if already inspected to avoid indefinite recursion.
- if (!checkedObjs.add(target))
+ if (descr.recursiveFields().length == 0 && annotatedMembers == null)
return false;
- int annCnt = 0;
+ if (checkedObjs == null && descr.recursiveFields().length > 0)
+ checkedObjs = new GridLeanIdentitySet<>();
- boolean injected = false;
+ if (checkedObjs != null && !checkedObjs.add(target))
+ return false;
- for (GridResourceField field : getFieldsWithAnnotation(dep, targetCls, annCls)) {
- if (field.processFieldValue()) {
- Field f = field.getField();
+ boolean injected = false;
- try {
- Object obj = f.get(target);
+ for (GridResourceField field : descr.recursiveFields()) {
+ try {
+ Object obj = field.getField().get(target);
- if (obj != null) {
- // Recursion.
- boolean injected0 = injectInternal(obj, annCls, injector, dep, depCls, checkedObjs);
+ if (obj != null) {
+ assert checkedObjs != null;
- injected |= injected0;
- }
- }
- catch (IllegalAccessException e) {
- throw new IgniteCheckedException("Failed to inject resource [field=" + f.getName() +
- ", target=" + target + ']', e);
+ injected |= injectInternal(obj, annCls, injector, dep, depCls, checkedObjs);
}
}
- else {
- injector.inject(field, target, depCls, dep);
-
- injected = true;
+ catch (IllegalAccessException e) {
+ throw new IgniteCheckedException("Failed to inject resource [field=" + field.getField().getName() +
+ ", target=" + target + ']', e);
}
-
- annCnt++;
}
- for (GridResourceMethod mtd : getMethodsWithAnnotation(dep, targetCls, annCls)) {
- injector.inject(mtd, target, depCls, dep);
-
- injected = true;
-
- annCnt++;
- }
+ if (annotatedMembers != null) {
+ for (GridResourceField field : annotatedMembers.get1()) {
+ injector.inject(field, target, depCls, dep);
- if (annCnt == 0) {
- if (skipClss == null)
- skipClss = F.addIfAbsent(skipCache, annCls, F.<Class<?>>newCSet());
+ injected = true;
+ }
- assert skipClss != null;
+ for (GridResourceMethod mtd : annotatedMembers.get2()) {
+ injector.inject(mtd, target, depCls, dep);
- skipClss.add(targetCls);
+ injected = true;
+ }
}
return injected;
@@ -217,29 +188,9 @@ class GridResourceIoc {
assert target != null;
assert annCls != null;
- Class<?> targetCls = target.getClass();
-
- Set<Class<?>> skipClss = skipCache.get(annCls);
-
- if (skipClss != null && skipClss.contains(targetCls))
- return false;
-
- GridResourceField[] fields = getFieldsWithAnnotation(dep, targetCls, annCls);
-
- if (fields.length > 0)
- return true;
+ ClassDescriptor desc = descriptor(dep, target.getClass());
- GridResourceMethod[] mtds = getMethodsWithAnnotation(dep, targetCls, annCls);
-
- if (mtds.length > 0)
- return true;
-
- if (skipClss == null)
- skipClss = F.addIfAbsent(skipCache, annCls, F.<Class<?>>newCSet());
-
- skipClss.add(targetCls);
-
- return false;
+ return desc.recursiveFields().length > 0 || desc.annotatedMembers(annCls) != null;
}
/**
@@ -260,17 +211,14 @@ class GridResourceIoc {
Class<? extends Annotation>[] res = annCache.get(cls);
if (res == null) {
- Collection<Class<? extends Annotation>> res0 =
- new HashSet<>(annClss.size(), 1.0f);
+ Collection<Class<? extends Annotation>> res0 = new ArrayList<>();
for (Class<? extends Annotation> annCls : annClss) {
if (isAnnotationPresent(target, annCls, dep))
res0.add(annCls);
}
- res = new Class[res0.size()];
-
- res0.toArray(res);
+ res = res0.toArray(new Class[res0.size()]);
annCache.putIfAbsent(cls, res);
}
@@ -279,36 +227,6 @@ class GridResourceIoc {
}
/**
- * For tests only.
- *
- * @param cls Class for test.
- * @return {@code true} if cached, {@code false} otherwise.
- */
- boolean isCached(Class<?> cls) {
- return isCached(cls.getName());
- }
-
- /**
- * For tests only.
- *
- * @param clsName Class for test.
- * @return {@code true} if cached, {@code false} otherwise.
- */
- boolean isCached(String clsName) {
- for (Class<?> aClass : fieldCache.keySet()) {
- if (aClass.getName().equals(clsName))
- return true;
- }
-
- for (Class<?> aClass : mtdCache.keySet()) {
- if (aClass.getName().equals(clsName))
- return true;
- }
-
- return false;
- }
-
- /**
* Gets set of methods with given annotation.
*
* @param dep Deployment.
@@ -318,156 +236,109 @@ class GridResourceIoc {
*/
GridResourceMethod[] getMethodsWithAnnotation(@Nullable GridDeployment dep, Class<?> cls,
Class<? extends Annotation> annCls) {
- GridResourceMethod[] mtds = getMethodsFromCache(cls, annCls);
+ ClassDescriptor desc = descriptor(dep, cls);
- if (mtds == null) {
- List<GridResourceMethod> mtdsList = new ArrayList<>();
-
- for (Class cls0 = cls; !cls0.equals(Object.class); cls0 = cls0.getSuperclass()) {
- for (Method mtd : cls0.getDeclaredMethods()) {
- Annotation ann = mtd.getAnnotation(annCls);
-
- if (ann != null)
- mtdsList.add(new GridResourceMethod(mtd, ann));
- }
- }
+ T2<GridResourceField[], GridResourceMethod[]> t2 = desc.annotatedMembers(annCls);
- if (mtdsList.isEmpty())
- mtds = GridResourceMethod.EMPTY_ARRAY;
- else
- mtds = mtdsList.toArray(new GridResourceMethod[mtdsList.size()]);
-
- cacheMethods(dep, cls, annCls, mtds);
- }
+ return t2 == null ? GridResourceMethod.EMPTY_ARRAY : t2.get2();
+ }
- return mtds;
+ /** {@inheritDoc} */
+ public void printMemoryStats() {
+ X.println(">>> taskMapSize: " + taskMap.size());
+ X.println(">>> classDescriptorsCacheSize: " + clsDescs.size());
}
/**
- * Gets all entries from the specified class or its super-classes that have
- * been annotated with annotation provided.
*
- * @param cls Class in which search for methods.
- * @param dep Deployment.
- * @param annCls Annotation.
- * @return Set of entries with given annotations.
*/
- private GridResourceField[] getFieldsWithAnnotation(@Nullable GridDeployment dep, Class<?> cls,
- Class<? extends Annotation> annCls) {
- GridResourceField[] fields = getFieldsFromCache(cls, annCls);
+ private static class ClassDescriptor {
+ /** */
+ private final GridResourceField[] recursiveFields;
+
+ /** */
+ private final Map<Class<? extends Annotation>, T2<GridResourceField[], GridResourceMethod[]>> annMap;
+
+ /**
+ * @param cls Class.
+ */
+ ClassDescriptor(Class<?> cls) {
+ Map<Class<? extends Annotation>, T2<List<GridResourceField>, List<GridResourceMethod>>> annMap
+ = new HashMap<>();
- if (fields == null) {
- List<GridResourceField> fieldsList = new ArrayList<>();
+ Collection<GridResourceField> recursiveFieldsList = new ArrayList<>();
boolean allowImplicitInjection = !GridNoImplicitInjection.class.isAssignableFrom(cls);
for (Class cls0 = cls; !cls0.equals(Object.class); cls0 = cls0.getSuperclass()) {
for (Field field : cls0.getDeclaredFields()) {
- Annotation ann = field.getAnnotation(annCls);
-
- if (ann != null)
- fieldsList.add(new GridResourceField(field, ann));
- else if (allowImplicitInjection && GridResourceUtils.mayRequireResources(field)) {
- // Account for anonymous inner classes.
- fieldsList.add(new GridResourceField(field, null));
- }
- }
- }
-
- if (fieldsList.isEmpty())
- fields = GridResourceField.EMPTY_ARRAY;
- else
- fields = fieldsList.toArray(new GridResourceField[fieldsList.size()]);
+ Annotation[] fieldAnns = field.getAnnotations();
- cacheFields(dep, cls, annCls, fields);
- }
+ for (Annotation ann : fieldAnns) {
+ T2<List<GridResourceField>, List<GridResourceMethod>> t2 = annMap.get(ann.annotationType());
- return fields;
- }
+ if (t2 == null) {
+ t2 = new T2<List<GridResourceField>, List<GridResourceMethod>>(
+ new ArrayList<GridResourceField>(),
+ new ArrayList<GridResourceMethod>());
- /**
- * Gets all fields for a given class with given annotation from cache.
- *
- * @param cls Class to get fields from.
- * @param annCls Annotation class for fields.
- * @return List of fields with given annotation, possibly {@code null}.
- */
- @Nullable private GridResourceField[] getFieldsFromCache(Class<?> cls, Class<? extends Annotation> annCls) {
- Map<Class<? extends Annotation>, GridResourceField[]> annCache = fieldCache.get(cls);
+ annMap.put(ann.annotationType(), t2);
+ }
- return annCache != null ? annCache.get(annCls) : null;
- }
-
- /**
- * Caches list of fields with given annotation from given class.
- *
- * @param cls Class the fields belong to.
- * @param dep Deployment.
- * @param annCls Annotation class for the fields.
- * @param fields Fields to cache.
- */
- private void cacheFields(@Nullable GridDeployment dep, Class<?> cls, Class<? extends Annotation> annCls,
- GridResourceField[] fields) {
- if (dep != null) {
- Set<Class<?>> classes = F.addIfAbsent(taskMap, dep.classLoader(), F.<Class<?>>newCSet());
+ t2.get1().add(new GridResourceField(field, ann));
+ }
- assert classes != null;
+ if (allowImplicitInjection
+ && fieldAnns.length == 0
+ && GridResourceUtils.mayRequireResources(field)) {
+ // Account for anonymous inner classes.
+ recursiveFieldsList.add(new GridResourceField(field, null));
+ }
+ }
- classes.add(cls);
- }
+ for (Method mtd : cls0.getDeclaredMethods()) {
+ for (Annotation ann : mtd.getAnnotations()) {
+ T2<List<GridResourceField>, List<GridResourceMethod>> t2 = annMap.get(ann.annotationType());
- Map<Class<? extends Annotation>, GridResourceField[]> rsrcFields =
- F.addIfAbsent(fieldCache, cls, F.<Class<? extends Annotation>, GridResourceField[]>newCMap());
+ if (t2 == null) {
+ t2 = new T2<List<GridResourceField>, List<GridResourceMethod>>(
+ new ArrayList<GridResourceField>(),
+ new ArrayList<GridResourceMethod>());
- assert rsrcFields != null;
+ annMap.put(ann.annotationType(), t2);
+ }
- rsrcFields.put(annCls, fields);
- }
+ t2.get2().add(new GridResourceMethod(mtd, ann));
+ }
+ }
+ }
- /**
- * Gets all methods for a given class with given annotation from cache.
- *
- * @param cls Class to get methods from.
- * @param annCls Annotation class for fields.
- * @return List of methods with given annotation, possibly {@code null}.
- */
- @Nullable private GridResourceMethod[] getMethodsFromCache(Class<?> cls, Class<? extends Annotation> annCls) {
- Map<Class<? extends Annotation>, GridResourceMethod[]> annCache = mtdCache.get(cls);
+ recursiveFields = GridResourceField.toArray(recursiveFieldsList);
- return annCache != null ? annCache.get(annCls) : null;
- }
+ this.annMap = IgniteUtils.limitedMap(annMap.size());
- /**
- * Caches list of methods with given annotation from given class.
- *
- * @param rsrcCls Class the fields belong to.
- * @param dep Deployment.
- * @param annCls Annotation class for the fields.
- * @param mtds Methods to cache.
- */
- private void cacheMethods(@Nullable GridDeployment dep, Class<?> rsrcCls, Class<? extends Annotation> annCls,
- GridResourceMethod[] mtds) {
- if (dep != null) {
- Set<Class<?>> classes = F.addIfAbsent(taskMap, dep.classLoader(), F.<Class<?>>newCSet());
+ for (Map.Entry<Class<? extends Annotation>, T2<List<GridResourceField>, List<GridResourceMethod>>> entry
+ : annMap.entrySet()) {
- assert classes != null;
+ GridResourceField[] fields = GridResourceField.toArray(entry.getValue().get1());
+ GridResourceMethod[] mtds = GridResourceMethod.toArray(entry.getValue().get2());
- classes.add(rsrcCls);
+ this.annMap.put(entry.getKey(), new T2<>(fields, mtds));
+ }
}
- Map<Class<? extends Annotation>, GridResourceMethod[]> rsrcMtds = F.addIfAbsent(mtdCache,
- rsrcCls, F.<Class<? extends Annotation>, GridResourceMethod[]>newCMap());
-
- assert rsrcMtds != null;
-
- rsrcMtds.put(annCls, mtds);
- }
+ /**
+ * @return Recursive fields.
+ */
+ public GridResourceField[] recursiveFields() {
+ return recursiveFields;
+ }
- /** {@inheritDoc} */
- public void printMemoryStats() {
- X.println(">>> taskMapSize: " + taskMap.size());
- X.println(">>> fieldCacheSize: " + fieldCache.size());
- X.println(">>> mtdCacheSize: " + mtdCache.size());
- X.println(">>> skipCacheSize: " + skipCache.size());
+ /**
+ * @return Fields.
+ */
+ @Nullable public T2<GridResourceField[], GridResourceMethod[]> annotatedMembers(Class<? extends Annotation> annCls) {
+ return annMap.get(annCls);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/830a1025/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceMethod.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceMethod.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceMethod.java
index aba9405..ad08a40 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceMethod.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceMethod.java
@@ -21,6 +21,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
import java.lang.annotation.*;
import java.lang.reflect.*;
+import java.util.*;
/**
* Wrapper for data where resource should be injected.
@@ -48,6 +49,8 @@ class GridResourceMethod {
this.mtd = mtd;
this.ann = ann;
+
+ mtd.setAccessible(true);
}
/**
@@ -68,6 +71,16 @@ class GridResourceMethod {
return ann;
}
+ /**
+ * @param c Closure.
+ */
+ public static GridResourceMethod[] toArray(Collection<GridResourceMethod> c) {
+ if (c.isEmpty())
+ return EMPTY_ARRAY;
+
+ return c.toArray(new GridResourceMethod[c.size()]);
+ }
+
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(GridResourceMethod.class, this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/830a1025/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java
index f08a287..eae5c4b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java
@@ -147,8 +147,6 @@ public class GridResourceProcessor extends GridProcessorAdapter {
Method mtd = rsrcMtd.getMethod();
try {
- mtd.setAccessible(true);
-
mtd.invoke(target);
}
catch (IllegalArgumentException | InvocationTargetException | IllegalAccessException e) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/830a1025/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 5f6da0f..6b04fac 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
@@ -8757,6 +8757,21 @@ public abstract class IgniteUtils {
}
/**
+ * Creates new map that limited by size.
+ *
+ * @param limit Limit for size.
+ */
+ public static <K, V> Map<K, V> limitedMap(int limit) {
+ if (limit == 0)
+ return Collections.emptyMap();
+
+ if (limit < 5)
+ return new GridLeanMap<>(limit);
+
+ return new HashMap<>(capacity(limit), 0.75f);
+ }
+
+ /**
* Returns comparator that sorts remote node addresses. If remote node resides on the same host, then put
* loopback addresses first, last otherwise.
*
[23/28] incubator-ignite git commit: devlibs should be cleared each
time. even if profile is off
Posted by sb...@apache.org.
devlibs should be cleared each time. even if profile is off
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a4c96535
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a4c96535
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a4c96535
Branch: refs/heads/ignite-709_2
Commit: a4c96535d61b1473ea6967be60bdabc6fec2cd5c
Parents: 7da0df9
Author: avinogradov <av...@gridgain.com>
Authored: Tue May 12 14:03:17 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Tue May 12 14:03:17 2015 +0300
----------------------------------------------------------------------
pom.xml | 44 ++++++++++++++++++++++++--------------------
1 file changed, 24 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4c96535/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1b44d5e..451812a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,26 +122,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <executions>
- <execution>
- <phase>clean</phase>
- <goals>
- <goal>clean</goal>
- </goals>
- <configuration>
- <filesets>
- <fileset>
- <directory>libs</directory>
- </fileset>
- </filesets>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<inherited>false</inherited>
@@ -740,4 +720,28 @@
</build>
</profile>
</profiles>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>clean</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>libs</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
[16/28] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-4' into ignite-sprint-5
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-sprint-5
Conflicts:
DEVNOTES.txt
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c9cd92ef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c9cd92ef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c9cd92ef
Branch: refs/heads/ignite-709_2
Commit: c9cd92ef29e2387e3290310a04809347808419d4
Parents: 2361640 ecc7a50
Author: avinogradov <av...@gridgain.com>
Authored: Fri May 8 17:50:26 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Fri May 8 17:50:26 2015 +0300
----------------------------------------------------------------------
parent/pom.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
[12/28] incubator-ignite git commit: devnotes security fix
Posted by sb...@apache.org.
devnotes security 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/2d4a3fb7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2d4a3fb7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2d4a3fb7
Branch: refs/heads/ignite-709_2
Commit: 2d4a3fb790e64df897247820013d80cb4fefbbae
Parents: e9f2e6d
Author: avinogradov <av...@gridgain.com>
Authored: Fri May 8 12:49:06 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Fri May 8 12:49:06 2015 +0300
----------------------------------------------------------------------
DEVNOTES.txt | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d4a3fb7/DEVNOTES.txt
----------------------------------------------------------------------
diff --git a/DEVNOTES.txt b/DEVNOTES.txt
index 7618e6c..dfba3a9 100644
--- a/DEVNOTES.txt
+++ b/DEVNOTES.txt
@@ -58,12 +58,6 @@ Deploy Ignite release to maven repository and site:
mvn deploy -P apache-release,gpg,release,scala,lgpl,deploy-ignite-site -Dignite.edition=fabric -DskipTests -Dignite.site=scp://people.apache.org:/home/<username>/public_html -B
-You might need to allow connection to people.apache.org. Just do following at console:
-
-ssh people.apache.org
-
-and type "yes" + enter.
-
In case you want to release both fabric and hadoop editions you have to build hadoop first, save /target/bin/*.zip, make "mvn clean" and
restore them before deploy step.
[20/28] incubator-ignite git commit: ignite-877
Posted by sb...@apache.org.
ignite-877
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e6ca7570
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e6ca7570
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e6ca7570
Branch: refs/heads/ignite-709_2
Commit: e6ca75701e6acf7e4fb857530744d5263bc2f962
Parents: c9cd92e
Author: avinogradov <av...@gridgain.com>
Authored: Fri May 8 18:54:33 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Fri May 8 18:54:33 2015 +0300
----------------------------------------------------------------------
pom.xml | 33 ---------------------------------
1 file changed, 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e6ca7570/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c5a9e5d..e303480 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,8 +36,6 @@
<packaging>pom</packaging>
<properties>
- <ignite.site>scp://localhost:/home</ignite.site>
- <ignite.site.folder>${project.artifactId}-${project.version}</ignite.site.folder>
<!--fix <attachartifact>...< /> at apache-release profile if changed-->
<ignite.zip.pattern>ignite-${ignite.edition}-${project.version}</ignite.zip.pattern>
</properties>
@@ -49,13 +47,6 @@
<tag>HEAD</tag>
</scm>
- <distributionManagement>
- <site>
- <id>ignite-site</id>
- <url>${ignite.site}/${ignite.site.folder}</url>
- </site>
- </distributionManagement>
-
<modules>
<module>modules/tools</module>
<module>modules/core</module>
@@ -599,30 +590,6 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.4</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh</artifactId>
- <version>2.8</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <goals>
- <goal>deploy</goal>
- </goals>
- <phase>deploy</phase>
- <configuration>
- <inputDirectory>${basedir}/target/site</inputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</profile>
[02/28] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-4' into ignite-478
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-478
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/eae6f5e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/eae6f5e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/eae6f5e6
Branch: refs/heads/ignite-709_2
Commit: eae6f5e6636a2548518fc012331ab90b6186b111
Parents: 830a102 dc455be
Author: sevdokimov <se...@gridgain.com>
Authored: Tue Apr 21 19:13:44 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Tue Apr 21 19:13:44 2015 +0300
----------------------------------------------------------------------
.gitignore | 2 +-
DEVNOTES.txt | 87 +-
RELEASE_NOTES.txt | 33 +-
assembly/dependencies-fabric.xml | 50 +
assembly/dependencies-hadoop.xml | 1 -
assembly/dependencies-optional-fabric.xml | 82 -
assembly/dependencies-optional-hadoop.xml | 83 -
assembly/libs/README.txt | 1 -
assembly/release-base.xml | 5 -
assembly/release-fabric.xml | 10 +-
assembly/release-hadoop.xml | 4 -
bin/ignite.bat | 2 +-
bin/ignite.sh | 2 +-
bin/ignitevisorcmd.bat | 39 +-
bin/include/service.sh | 8 +-
config/hadoop/default-config.xml | 15 +-
examples/README.txt | 11 +-
examples/config/example-ignite.xml | 2 +-
examples/pom-standalone.xml | 17 +-
examples/pom.xml | 105 +-
examples/schema-import/bin/db-init.sql | 17 +
examples/schema-import/pom.xml | 11 +-
.../examples/datagrid/CacheAffinityExample.java | 9 +-
.../examples/datagrid/CacheApiExample.java | 9 +-
.../examples/datagrid/CacheAsyncApiExample.java | 9 +-
.../datagrid/CacheContinuousQueryExample.java | 8 +-
.../datagrid/CacheDataStreamerExample.java | 9 +-
.../examples/datagrid/CacheEventsExample.java | 9 +-
.../examples/datagrid/CachePutGetExample.java | 10 +-
.../examples/datagrid/CacheQueryExample.java | 12 +-
.../datagrid/CacheTransactionExample.java | 8 +-
.../hibernate/HibernateL2CacheExample.java | 5 +-
.../starschema/CacheStarSchemaExample.java | 10 +-
.../store/auto/CacheAutoStoreExample.java | 8 +-
.../auto/CacheAutoStoreLoadDataExample.java | 5 +-
.../datagrid/store/auto/CacheConfig.java | 4 +-
.../store/dummy/CacheDummyStoreExample.java | 5 +-
.../hibernate/CacheHibernateStoreExample.java | 8 +-
.../store/jdbc/CacheJdbcStoreExample.java | 8 +-
.../datastructures/IgniteQueueExample.java | 28 +-
.../datastructures/IgniteSetExample.java | 30 +-
.../streaming/StreamTransformerExample.java | 100 +
.../streaming/StreamVisitorExample.java | 168 +
.../streaming/marketdata/CacheConfig.java | 44 -
.../streaming/marketdata/Instrument.java | 106 -
.../marketdata/QueryTopInstruments.java | 73 -
.../streaming/marketdata/StreamMarketData.java | 103 -
.../examples/streaming/numbers/CacheConfig.java | 46 -
.../streaming/numbers/QueryPopularNumbers.java | 74 -
.../streaming/numbers/StreamRandomNumbers.java | 78 -
.../streaming/wordcount/CacheConfig.java | 53 +
.../streaming/wordcount/QueryWords.java | 79 +
.../streaming/wordcount/StreamWords.java | 68 +
.../streaming/wordcount/alice-in-wonderland.txt | 3735 ++++++++++++++++++
.../streaming/wordcount/package-info.java | 22 +
.../streaming/StreamTransformerExample.java | 97 +
.../java8/streaming/StreamVisitorExample.java | 168 +
.../java8/streaming/marketdata/CacheConfig.java | 44 -
.../java8/streaming/marketdata/Instrument.java | 106 -
.../marketdata/QueryTopInstruments.java | 73 -
.../streaming/marketdata/StreamMarketData.java | 101 -
.../java8/streaming/numbers/CacheConfig.java | 46 -
.../streaming/numbers/QueryPopularNumbers.java | 74 -
.../streaming/numbers/StreamRandomNumbers.java | 74 -
.../examples/ScalarContinuationExample.scala | 10 +-
.../examples/MessagingExamplesSelfTest.java | 2 +-
.../java8/examples/BasicExamplesSelfTest.java | 3 +
.../java8/examples/CacheExamplesSelfTest.java | 4 +
.../examples/CheckpointExamplesSelfTest.java | 3 +
.../examples/ClusterGroupExampleSelfTest.java | 3 +-
.../examples/ContinuationExamplesSelfTest.java | 3 +
.../ContinuousMapperExamplesSelfTest.java | 4 +-
.../DeploymentExamplesMultiNodeSelfTest.java | 2 +
.../examples/DeploymentExamplesSelfTest.java | 2 +
.../HibernateL2CacheExampleSelfTest.java | 3 +
.../java8/examples/IgfsExamplesSelfTest.java | 3 +
.../examples/LifecycleExamplesSelfTest.java | 3 +
.../MemcacheRestExamplesMultiNodeSelfTest.java | 2 +
.../examples/MemcacheRestExamplesSelfTest.java | 2 +
.../examples/MessagingExamplesSelfTest.java | 4 +-
.../examples/MonteCarloExamplesSelfTest.java | 3 +
.../examples/SpringBeanExamplesSelfTest.java | 3 +
.../java8/examples/TaskExamplesSelfTest.java | 2 +
ipc/shmem/README.txt | 2 +-
modules/aop/pom.xml | 25 +-
modules/aws/pom.xml | 43 +-
.../s3/S3CheckpointManagerSelfTest.java | 2 +-
.../checkpoint/s3/S3CheckpointSpiSelfTest.java | 14 +-
.../s3/S3SessionCheckpointSelfTest.java | 2 +-
modules/clients/pom.xml | 43 +-
modules/clients/readme.md | 2 -
.../client/ClientReconnectionSelfTest.java | 69 +-
.../client/impl/ClientCacheFlagsCodecTest.java | 18 +-
.../rest/AbstractRestProcessorSelfTest.java | 11 +-
.../JettyRestProcessorAbstractSelfTest.java | 5 -
modules/codegen/pom.xml | 27 +-
.../ignite/codegen/MessageCodeGenerator.java | 1 -
modules/core/pom.xml | 90 +-
.../src/main/java/org/apache/ignite/Ignite.java | 26 +
.../java/org/apache/ignite/IgniteCache.java | 30 +-
.../java/org/apache/ignite/IgniteCluster.java | 11 +-
.../java/org/apache/ignite/IgniteState.java | 2 +-
.../apache/ignite/IgniteSystemProperties.java | 13 +-
.../apache/ignite/cache/CacheTypeMetadata.java | 4 +-
.../apache/ignite/cache/CachingProvider.java | 2 +-
.../ignite/cache/affinity/AffinityUuid.java | 50 +
.../cache/eviction/fifo/FifoEvictionPolicy.java | 57 +-
.../eviction/fifo/FifoEvictionPolicyMBean.java | 16 +
.../igfs/IgfsPerBlockLruEvictionPolicy.java | 3 +-
.../cache/eviction/lru/LruEvictionPolicy.java | 5 +-
.../eviction/sorted/SortedEvictionPolicy.java | 431 ++
.../sorted/SortedEvictionPolicyMBean.java | 66 +
.../cache/eviction/sorted/package-info.java | 21 +
.../apache/ignite/cache/query/QueryMetrics.java | 4 +-
.../apache/ignite/cache/query/ScanQuery.java | 2 +-
.../ignite/cache/query/SqlFieldsQuery.java | 55 +-
.../store/jdbc/CacheAbstractJdbcStore.java | 106 +-
.../cache/store/jdbc/CacheJdbcBlobStore.java | 9 +-
.../ignite/cluster/ClusterStartNodeResult.java | 46 +
.../ignite/compute/ComputeJobContinuation.java | 2 +
.../configuration/CacheConfiguration.java | 128 +-
.../configuration/CollectionConfiguration.java | 114 +-
.../configuration/FileSystemConfiguration.java | 6 +
.../configuration/IgniteConfiguration.java | 35 +-
.../org/apache/ignite/events/CacheEvent.java | 25 +-
.../ignite/events/CacheQueryExecutedEvent.java | 11 +-
.../ignite/events/CacheQueryReadEvent.java | 11 +-
.../ignite/events/CacheRebalancingEvent.java | 27 +-
.../org/apache/ignite/events/EventType.java | 129 +-
.../ignite/internal/ClusterMetricsSnapshot.java | 385 +-
.../internal/ComputeTaskInternalFuture.java | 2 +-
.../ignite/internal/GridCachePluginContext.java | 78 +
.../apache/ignite/internal/GridComponent.java | 7 +-
.../ignite/internal/GridJobContextImpl.java | 100 +-
.../ignite/internal/GridJobExecuteRequest.java | 10 +-
.../ignite/internal/GridJobExecuteResponse.java | 4 +-
.../ignite/internal/GridKernalContextImpl.java | 20 +-
.../ignite/internal/GridPluginComponent.java | 9 +-
.../ignite/internal/GridPluginContext.java | 15 +-
.../apache/ignite/internal/GridTaskMessage.java | 30 -
.../ignite/internal/GridTaskSessionRequest.java | 6 +-
.../org/apache/ignite/internal/IgniteEx.java | 19 +-
.../apache/ignite/internal/IgniteKernal.java | 120 +-
.../ignite/internal/IgniteNodeAttributes.java | 3 -
.../org/apache/ignite/internal/IgnitionEx.java | 181 +-
.../internal/MarshallerContextAdapter.java | 11 +-
.../ignite/internal/MarshallerContextImpl.java | 154 +-
.../internal/client/GridClientCacheFlag.java | 13 -
.../client/GridClientConfiguration.java | 14 +-
.../impl/connection/GridClientConnection.java | 9 -
.../GridClientConnectionManagerAdapter.java | 2 +-
.../router/GridTcpRouterConfiguration.java | 6 +-
.../internal/cluster/ClusterGroupAdapter.java | 147 +-
.../cluster/ClusterStartNodeResultImpl.java | 87 +
.../cluster/IgniteClusterAsyncImpl.java | 5 +-
.../internal/cluster/IgniteClusterImpl.java | 37 +-
.../internal/managers/GridManagerAdapter.java | 60 +-
.../discovery/GridDiscoveryManager.java | 109 +-
.../eventstorage/GridEventStorageManager.java | 4 +-
.../swapspace/GridSwapSpaceManager.java | 6 +-
.../processors/GridProcessorAdapter.java | 7 +-
.../affinity/GridAffinityAssignmentCache.java | 7 +-
.../affinity/GridAffinityProcessor.java | 5 +-
.../cache/CacheConflictResolutionManager.java | 30 +
.../processors/cache/CacheDistributionMode.java | 67 -
.../processors/cache/CacheEntryImpl.java | 29 +-
.../cache/CacheEvictableEntryImpl.java | 11 +-
.../internal/processors/cache/CacheFlag.java | 108 -
.../processors/cache/CacheFlagException.java | 67 -
.../processors/cache/CacheLazyEntry.java | 10 +-
.../processors/cache/CacheLockImpl.java | 20 +-
.../processors/cache/CacheMetricsImpl.java | 8 +-
.../processors/cache/CacheMetricsSnapshot.java | 223 +-
.../cache/CacheObjectByteArrayImpl.java | 2 +-
.../processors/cache/CacheObjectContext.java | 14 +-
.../processors/cache/CacheObjectImpl.java | 10 +-
.../processors/cache/CacheOperationContext.java | 170 +
.../cache/CacheOsConflictResolutionManager.java | 58 +
.../processors/cache/CacheProjection.java | 1859 ---------
.../cache/CacheStorePartialUpdateException.java | 2 +-
.../internal/processors/cache/CacheType.java | 77 +
.../cache/CacheVersionedEntryImpl.java | 29 +-
.../cache/DynamicCacheChangeRequest.java | 36 +-
.../cache/DynamicCacheDescriptor.java | 32 +-
.../internal/processors/cache/GridCache.java | 227 --
.../processors/cache/GridCacheAdapter.java | 1361 ++-----
.../processors/cache/GridCacheAtomicFuture.java | 7 -
.../processors/cache/GridCacheAttributes.java | 8 -
.../cache/GridCacheConcurrentMap.java | 100 +-
.../processors/cache/GridCacheContext.java | 415 +-
.../cache/GridCacheDeploymentManager.java | 9 +-
.../processors/cache/GridCacheEntryEx.java | 58 +-
.../processors/cache/GridCacheEventManager.java | 4 +-
.../cache/GridCacheEvictionManager.java | 17 +-
.../cache/GridCacheExplicitLockSpan.java | 2 +-
.../processors/cache/GridCacheGateway.java | 119 +-
.../processors/cache/GridCacheIoManager.java | 89 +-
.../processors/cache/GridCacheMapAdapter.java | 238 --
.../processors/cache/GridCacheMapEntry.java | 345 +-
.../cache/GridCacheMapEntryFactory.java | 2 -
.../processors/cache/GridCacheMessage.java | 7 +
.../processors/cache/GridCacheMvcc.java | 2 +-
.../cache/GridCacheMvccCandidate.java | 50 +-
.../processors/cache/GridCacheMvccManager.java | 44 +-
.../GridCachePartitionExchangeManager.java | 136 +-
.../processors/cache/GridCachePeekMode.java | 81 -
.../processors/cache/GridCacheProcessor.java | 785 +++-
.../processors/cache/GridCacheProjectionEx.java | 509 ---
.../cache/GridCacheProjectionImpl.java | 1198 ------
.../processors/cache/GridCacheProxy.java | 27 -
.../processors/cache/GridCacheProxyImpl.java | 900 +----
.../cache/GridCacheSharedContext.java | 25 +-
.../processors/cache/GridCacheStoreManager.java | 1202 ------
.../processors/cache/GridCacheSwapManager.java | 4 +-
.../processors/cache/GridCacheUtils.java | 89 +-
.../cache/GridCacheWriteBehindStore.java | 1015 -----
.../cache/GridLoadCacheCloseablePredicate.java | 30 +
.../processors/cache/IgniteCacheProxy.java | 518 +--
.../processors/cache/IgniteInternalCache.java | 1816 +++++++++
.../processors/cache/KeyCacheObjectImpl.java | 13 +-
.../cache/affinity/GridCacheAffinityProxy.java | 30 +-
.../CacheDataStructuresManager.java | 14 +-
.../GridDistributedCacheAdapter.java | 15 +-
.../distributed/GridDistributedCacheEntry.java | 16 +-
.../GridDistributedTxRemoteAdapter.java | 2 +-
.../dht/GridClientPartitionTopology.java | 6 +-
.../dht/GridDhtAffinityAssignmentRequest.java | 5 +
.../dht/GridDhtAffinityAssignmentResponse.java | 26 +-
.../distributed/dht/GridDhtCacheAdapter.java | 82 +-
.../distributed/dht/GridDhtCacheEntry.java | 44 +-
.../distributed/dht/GridDhtLocalPartition.java | 105 +-
.../distributed/dht/GridDhtLockFuture.java | 30 +-
.../dht/GridDhtPartitionTopologyImpl.java | 11 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 23 +-
.../distributed/dht/GridDhtTxFinishFuture.java | 24 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 2 +
.../distributed/dht/GridDhtTxLocalAdapter.java | 81 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 36 +-
.../distributed/dht/GridNoStorageCacheMap.java | 11 +-
.../dht/GridPartitionedGetFuture.java | 23 +-
.../dht/atomic/GridDhtAtomicCache.java | 256 +-
.../dht/atomic/GridDhtAtomicCacheEntry.java | 4 +-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 21 -
.../dht/atomic/GridNearAtomicUpdateFuture.java | 17 -
.../dht/atomic/GridNearAtomicUpdateRequest.java | 78 +-
.../dht/colocated/GridDhtColocatedCache.java | 86 +-
.../colocated/GridDhtColocatedCacheEntry.java | 4 +-
.../colocated/GridDhtColocatedLockFuture.java | 46 +-
.../colocated/GridDhtDetachedCacheEntry.java | 7 +-
.../preloader/GridDhtPartitionDemandPool.java | 15 +-
.../GridDhtPartitionsAbstractMessage.java | 15 +-
.../GridDhtPartitionsExchangeFuture.java | 48 +-
.../distributed/near/GridNearAtomicCache.java | 143 +-
.../distributed/near/GridNearCacheAdapter.java | 142 +-
.../distributed/near/GridNearCacheEntry.java | 30 +-
.../distributed/near/GridNearGetFuture.java | 23 +-
.../distributed/near/GridNearLockFuture.java | 13 +-
.../near/GridNearTransactionalCache.java | 21 +-
.../near/GridNearTxFinishFuture.java | 8 +-
.../cache/distributed/near/GridNearTxLocal.java | 11 +-
.../near/GridNearTxPrepareFuture.java | 124 +-
.../near/GridNearTxPrepareRequest.java | 64 +-
.../distributed/near/GridNearTxRemote.java | 11 +-
.../processors/cache/dr/GridCacheDrManager.java | 5 -
.../cache/dr/GridOsCacheDrManager.java | 106 +
.../cache/dr/os/GridOsCacheDrManager.java | 111 -
.../processors/cache/local/GridLocalCache.java | 19 +-
.../cache/local/GridLocalCacheEntry.java | 4 +-
.../cache/local/GridLocalLockFuture.java | 2 +
.../local/atomic/GridLocalAtomicCache.java | 228 +-
.../processors/cache/query/CacheQueries.java | 143 -
.../processors/cache/query/CacheQuery.java | 12 +-
.../CacheQueryCloseableScanBiPredicate.java | 30 +
.../cache/query/GridCacheQueriesEx.java | 68 -
.../cache/query/GridCacheQueriesImpl.java | 238 --
.../cache/query/GridCacheQueriesProxy.java | 285 --
.../cache/query/GridCacheQueryAdapter.java | 2 +-
.../cache/query/GridCacheQueryManager.java | 156 +-
.../continuous/CacheContinuousQueryHandler.java | 9 +-
.../CacheContinuousQueryListener.java | 3 +
.../continuous/CacheContinuousQueryManager.java | 4 +-
.../jdbc/GridCacheQueryJdbcMetadataTask.java | 4 +-
.../cache/store/CacheOsStoreManager.java | 59 +
.../cache/store/CacheStoreManager.java | 182 +
.../store/GridCacheStoreManagerAdapter.java | 1111 ++++++
.../cache/store/GridCacheWriteBehindStore.java | 1015 +++++
.../transactions/IgniteTransactionsImpl.java | 18 +-
.../cache/transactions/IgniteTxAdapter.java | 10 +-
.../cache/transactions/IgniteTxHandler.java | 120 +-
.../transactions/IgniteTxLocalAdapter.java | 170 +-
.../cache/transactions/IgniteTxManager.java | 71 +-
.../version/CacheVersionConflictResolver.java | 40 +
...ridCacheVersionAbstractConflictResolver.java | 56 -
.../GridCacheVersionConflictResolver.java | 59 -
.../cache/version/GridCacheVersionEx.java | 2 +-
.../cacheobject/IgniteCacheObjectProcessor.java | 22 +-
.../IgniteCacheObjectProcessorImpl.java | 225 +-
.../continuous/GridContinuousProcessor.java | 4 +-
.../datastreamer/DataStreamerCacheUpdaters.java | 15 +-
.../datastreamer/DataStreamerImpl.java | 80 +-
.../datastreamer/DataStreamerUpdateJob.java | 16 +-
.../CacheDataStructuresCacheKey.java | 62 +
.../CacheDataStructuresConfigurationKey.java | 2 +-
.../datastructures/DataStructuresProcessor.java | 271 +-
.../GridAtomicCacheQueueImpl.java | 12 +-
.../datastructures/GridCacheAtomicLongImpl.java | 6 +-
.../GridCacheAtomicReferenceImpl.java | 6 +-
.../GridCacheAtomicReferenceValue.java | 15 +-
.../GridCacheAtomicSequenceImpl.java | 4 +-
.../GridCacheAtomicStampedImpl.java | 6 +-
.../GridCacheAtomicStampedValue.java | 15 +-
.../GridCacheCountDownLatchImpl.java | 4 +-
.../datastructures/GridCacheQueueAdapter.java | 2 +-
.../datastructures/GridCacheSetImpl.java | 6 +-
.../GridTransactionalCacheQueueImpl.java | 8 +-
.../dr/IgniteDrDataStreamerCacheUpdater.java | 2 -
.../internal/processors/igfs/IgfsAsyncImpl.java | 4 +-
.../processors/igfs/IgfsDataManager.java | 23 +-
.../ignite/internal/processors/igfs/IgfsEx.java | 4 +-
.../processors/igfs/IgfsFileAffinityRange.java | 23 +-
.../processors/igfs/IgfsFileWorker.java | 180 -
.../processors/igfs/IgfsFileWorkerBatch.java | 225 +-
.../processors/igfs/IgfsFileWorkerTask.java | 32 -
.../processors/igfs/IgfsHelperImpl.java | 3 +-
.../internal/processors/igfs/IgfsImpl.java | 150 +-
.../processors/igfs/IgfsInputStreamImpl.java | 2 +-
.../processors/igfs/IgfsMetaManager.java | 47 +-
.../processors/igfs/IgfsOutputStreamImpl.java | 6 +-
.../internal/processors/igfs/IgfsProcessor.java | 2 +-
.../processors/job/GridJobHoldListener.java | 6 +-
.../processors/job/GridJobProcessor.java | 22 +-
.../internal/processors/job/GridJobWorker.java | 23 +-
.../DiscoveryNodeValidationProcessor.java | 27 +
.../OsDiscoveryNodeValidationProcessor.java | 72 +
.../processors/plugin/CachePluginManager.java | 142 +
.../plugin/IgnitePluginProcessor.java | 71 +-
.../query/GridQueryFieldMetadata.java | 2 +-
.../processors/query/GridQueryIndexing.java | 3 +-
.../processors/query/GridQueryProcessor.java | 224 +-
.../messages/GridQueryNextPageResponse.java | 34 +-
.../processors/rest/GridRestCommand.java | 11 +-
.../processors/rest/GridRestProcessor.java | 40 +-
.../message/GridClientCacheQueryRequest.java | 366 --
.../cache/GridCacheClientQueryResult.java | 97 -
.../handlers/cache/GridCacheCommandHandler.java | 140 +-
.../cache/GridCacheQueryCommandHandler.java | 480 ---
.../protocols/tcp/GridTcpRestNioListener.java | 24 -
.../rest/request/GridRestCacheQueryRequest.java | 143 -
.../security/GridSecurityProcessor.java | 13 +-
.../processors/security/SecurityContext.java | 8 +-
.../security/os/GridOsSecurityProcessor.java | 11 +-
.../service/GridServiceProcessor.java | 15 +-
.../processors/task/GridTaskProcessor.java | 40 +-
.../ignite/internal/util/GridJavaProcess.java | 38 +-
.../ignite/internal/util/IgniteUtils.java | 48 +-
.../util/future/GridCompoundFuture.java | 9 +-
.../internal/util/future/GridFutureAdapter.java | 20 +-
.../ipc/shmem/IpcSharedMemoryNativeLoader.java | 48 +-
.../ignite/internal/util/lang/GridFunc.java | 47 +
.../util/lang/GridMetadataAwareAdapter.java | 2 +-
.../util/nodestart/IgniteNodeCallable.java | 30 -
.../util/nodestart/IgniteSshHelper.java | 2 +-
.../util/nodestart/StartNodeCallable.java | 30 +
.../ignite/internal/util/worker/GridWorker.java | 6 +-
.../ignite/internal/visor/cache/VisorCache.java | 23 +-
.../cache/VisorCacheAggregatedMetrics.java | 38 +-
.../visor/cache/VisorCacheClearTask.java | 3 +
.../visor/cache/VisorCacheConfiguration.java | 94 +-
.../VisorCacheConfigurationCollectorJob.java | 76 +
.../VisorCacheConfigurationCollectorTask.java | 39 +
.../cache/VisorCacheDefaultConfiguration.java | 21 -
.../visor/cache/VisorCacheMetadataTask.java | 9 +-
.../internal/visor/cache/VisorCacheMetrics.java | 55 +-
.../cache/VisorCacheMetricsCollectorTask.java | 59 +-
.../cache/VisorCacheNearConfiguration.java | 11 +-
.../cache/VisorCacheQueryConfiguration.java | 9 -
.../visor/cache/VisorCacheRebalanceTask.java | 4 +-
.../visor/cache/VisorCacheResetMetricsTask.java | 2 +-
.../visor/cache/VisorCacheStopTask.java | 69 +
.../cache/VisorCacheStoreConfiguration.java | 18 +-
.../visor/cache/VisorCacheSwapBackupsTask.java | 2 +-
.../visor/event/VisorGridEventsLost.java | 7 +-
.../event/VisorGridSecuritySessionEvent.java | 91 -
.../VisorIgfsProfilerUniformityCounters.java | 6 +-
.../internal/visor/log/VisorLogSearchTask.java | 15 +-
.../visor/node/VisorGridConfiguration.java | 12 -
.../visor/node/VisorIgfsConfiguration.java | 2 +-
.../visor/node/VisorNodeDataCollectorTask.java | 1 +
.../node/VisorNodeEventsCollectorTask.java | 3 +
.../visor/node/VisorRestConfiguration.java | 1 +
.../node/VisorSegmentationConfiguration.java | 4 +-
.../internal/visor/query/VisorQueryArg.java | 82 +
.../visor/query/VisorQueryCleanupTask.java | 10 +-
.../internal/visor/query/VisorQueryCursor.java | 96 +
.../internal/visor/query/VisorQueryField.java | 66 +-
.../internal/visor/query/VisorQueryJob.java | 174 +
.../visor/query/VisorQueryNextPageTask.java | 80 +-
.../internal/visor/query/VisorQueryResult.java | 6 +-
.../visor/query/VisorQueryResultEx.java | 16 +-
.../internal/visor/query/VisorQueryTask.java | 283 +-
.../internal/visor/query/VisorQueryUtils.java | 55 +-
.../internal/visor/util/VisorMimeTypes.java | 4 +-
.../internal/visor/util/VisorTaskUtils.java | 24 +-
.../org/apache/ignite/lang/IgniteImmutable.java | 49 -
.../ignite/lang/IgniteProductVersion.java | 2 +-
.../ignite/marshaller/MarshallerContext.java | 8 +-
.../optimized/OptimizedMarshallerUtils.java | 11 +-
.../ignite/plugin/CachePluginConfiguration.java | 36 +
.../ignite/plugin/CachePluginContext.java | 65 +
.../ignite/plugin/CachePluginProvider.java | 84 +
.../org/apache/ignite/plugin/IgnitePlugin.java | 3 -
.../ignite/plugin/PluginConfiguration.java | 10 +-
.../org/apache/ignite/plugin/PluginContext.java | 16 +-
.../apache/ignite/plugin/PluginProvider.java | 9 +-
.../plugin/security/AuthenticationContext.java | 12 +-
.../security/GridSecurityCredentials.java | 184 -
.../GridSecurityCredentialsBasicProvider.java | 44 -
.../GridSecurityCredentialsProvider.java | 44 -
.../plugin/security/GridSecurityException.java | 58 -
.../plugin/security/GridSecurityPermission.java | 69 -
.../security/GridSecurityPermissionSet.java | 66 -
.../plugin/security/GridSecuritySubject.java | 62 -
.../security/GridSecuritySubjectType.java | 48 -
.../plugin/security/SecurityCredentials.java | 191 +
.../SecurityCredentialsBasicProvider.java | 44 +
.../security/SecurityCredentialsProvider.java | 44 +
.../plugin/security/SecurityException.java | 61 +
.../plugin/security/SecurityPermission.java | 69 +
.../plugin/security/SecurityPermissionSet.java | 66 +
.../ignite/plugin/security/SecuritySubject.java | 62 +
.../plugin/security/SecuritySubjectType.java | 48 +
.../segmentation/GridSegmentationPolicy.java | 47 -
.../segmentation/GridSegmentationResolver.java | 64 -
.../plugin/segmentation/SegmentationPolicy.java | 49 +
.../segmentation/SegmentationResolver.java | 65 +
.../ignite/spi/IgniteNodeValidationResult.java | 66 +
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 58 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 17 +-
.../spi/IgniteSpiNodeValidationResult.java | 66 -
.../communication/tcp/TcpCommunicationSpi.java | 99 +-
.../tcp/TcpCommunicationSpiMBean.java | 9 -
.../spi/discovery/DiscoveryMetricsProvider.java | 10 +
.../ignite/spi/discovery/DiscoverySpi.java | 7 +
.../spi/discovery/DiscoverySpiDataExchange.java | 5 +-
.../DiscoverySpiNodeAuthenticator.java | 2 +-
.../discovery/tcp/TcpClientDiscoverySpi.java | 102 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 375 +-
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 37 +-
.../tcp/internal/TcpDiscoveryNode.java | 82 +-
.../messages/TcpDiscoveryAbstractMessage.java | 24 +-
.../messages/TcpDiscoveryAuthFailedMessage.java | 25 +-
.../TcpDiscoveryCheckFailedMessage.java | 24 +-
.../TcpDiscoveryClientReconnectMessage.java | 30 +-
.../TcpDiscoveryCustomEventMessage.java | 32 +-
.../messages/TcpDiscoveryDiscardMessage.java | 24 +-
.../TcpDiscoveryDuplicateIdMessage.java | 24 +-
.../messages/TcpDiscoveryHandshakeRequest.java | 8 -
.../messages/TcpDiscoveryHandshakeResponse.java | 22 -
.../messages/TcpDiscoveryHeartbeatMessage.java | 95 +-
.../TcpDiscoveryJoinRequestMessage.java | 32 +-
.../TcpDiscoveryLoopbackProblemMessage.java | 28 +-
.../TcpDiscoveryNodeAddFinishedMessage.java | 24 +-
.../messages/TcpDiscoveryNodeAddedMessage.java | 76 +-
.../messages/TcpDiscoveryNodeFailedMessage.java | 28 +-
.../messages/TcpDiscoveryNodeLeftMessage.java | 8 -
.../tcp/messages/TcpDiscoveryPingRequest.java | 25 +-
.../tcp/messages/TcpDiscoveryPingResponse.java | 14 -
.../TcpDiscoveryStatusCheckMessage.java | 30 +-
.../spi/swapspace/SwapSpaceSpiListener.java | 3 +-
.../spi/swapspace/file/FileSwapSpaceSpi.java | 6 +-
.../ignite/startup/BasicWarmupClosure.java | 39 +-
.../startup/cmdline/CommandLineStartup.java | 7 +-
.../org/apache/ignite/stream/StreamVisitor.java | 2 +-
.../TransactionSynchronization.java | 45 -
.../org/jsr166/ConcurrentLinkedHashMap.java | 9 +
.../resources/META-INF/classnames.properties | 133 +-
.../GridCacheAffinityBackupsSelfTest.java | 15 +-
.../ignite/IgniteCacheAffinitySelfTest.java | 52 +-
.../cache/IgniteWarmupClosureSelfTest.java | 82 +
.../fair/GridFairAffinityFunctionSelfTest.java | 2 -
.../IgniteFairAffinityDynamicCacheSelfTest.java | 97 +
...eJdbcStoreAbstractMultithreadedSelfTest.java | 11 +-
.../ignite/igfs/IgfsFragmentizerSelfTest.java | 3 +-
.../internal/GridCacheProjectionRemoveTest.java | 41 -
.../internal/GridContinuousTaskSelfTest.java | 114 +
...ridFailFastNodeFailureDetectionSelfTest.java | 117 +
.../internal/GridLifecycleAwareSelfTest.java | 2 +-
.../internal/GridLifecycleBeanSelfTest.java | 36 +
.../GridProjectionForCachesSelfTest.java | 14 +-
.../ignite/internal/GridProjectionSelfTest.java | 82 +
.../ignite/internal/GridStartStopSelfTest.java | 8 +-
.../internal/IgniteInternalCacheRemoveTest.java | 41 +
.../managers/GridNoopManagerSelfTest.java | 2 +-
.../communication/GridIoManagerSelfTest.java | 9 +-
.../GridDiscoveryManagerAliveCacheSelfTest.java | 6 +-
.../CacheMetricsForClusterGroupSelfTest.java | 252 ++
.../GridCacheAbstractFailoverSelfTest.java | 178 +-
.../GridCacheAbstractFailoverTxSelfTest.java | 110 +
.../cache/GridCacheAbstractFlagsTest.java | 97 -
.../cache/GridCacheAbstractFullApiSelfTest.java | 217 +-
.../GridCacheAbstractIteratorsSelfTest.java | 3 +-
.../cache/GridCacheAbstractMetricsSelfTest.java | 4 +
.../cache/GridCacheAbstractSelfTest.java | 111 +-
.../cache/GridCacheBasicApiAbstractTest.java | 4 +-
.../cache/GridCacheClearAllSelfTest.java | 2 +-
.../cache/GridCacheClearLocallySelfTest.java | 81 +-
.../GridCacheConcurrentTxMultiNodeTest.java | 30 +-
...idCacheConfigurationConsistencySelfTest.java | 3 -
.../cache/GridCacheDeploymentSelfTest.java | 9 +-
.../cache/GridCacheEntryVersionSelfTest.java | 4 +-
.../GridCacheExAbstractFullApiSelfTest.java | 10 +-
...CacheFullTextQueryMultithreadedSelfTest.java | 8 +-
.../GridCacheInterceptorAbstractSelfTest.java | 2 +
.../cache/GridCacheLuceneQueryIndexTest.java | 20 +-
.../cache/GridCacheMemoryModeSelfTest.java | 40 +-
...CacheOffHeapMultiThreadedUpdateSelfTest.java | 47 +-
.../cache/GridCacheOffHeapSelfTest.java | 662 ----
.../processors/cache/GridCacheOffHeapTest.java | 8 +-
.../GridCacheOffHeapTieredAbstractSelfTest.java | 8 +-
.../GridCacheOnCopyFlagAbstractSelfTest.java | 130 +-
.../cache/GridCachePartitionedWritesTest.java | 3 +-
.../GridCachePreloadingEvictionsSelfTest.java | 31 +-
.../cache/GridCachePutAllFailoverSelfTest.java | 40 +-
.../processors/cache/GridCachePutAllTask.java | 56 +-
.../GridCacheQueryIndexingDisabledSelfTest.java | 19 +-
.../GridCacheQueryInternalKeysSelfTest.java | 4 +-
.../cache/GridCacheReloadSelfTest.java | 3 +-
.../GridCacheReturnValueTransferSelfTest.java | 46 +-
.../cache/GridCacheSwapPreloadSelfTest.java | 19 +-
.../processors/cache/GridCacheTestEntryEx.java | 42 +-
...idCacheValueConsistencyAbstractSelfTest.java | 104 +-
...heValueConsistencyTransactionalSelfTest.java | 2 +-
...idCacheWriteBehindStoreAbstractSelfTest.java | 189 -
.../GridCacheWriteBehindStoreAbstractTest.java | 349 --
.../GridCacheWriteBehindStoreLocalTest.java | 30 -
...heWriteBehindStoreMultithreadedSelfTest.java | 163 -
...BehindStorePartitionedMultiNodeSelfTest.java | 215 -
...ridCacheWriteBehindStorePartitionedTest.java | 30 -
...GridCacheWriteBehindStoreReplicatedTest.java | 30 -
.../GridCacheWriteBehindStoreSelfTest.java | 267 --
.../IgniteCacheAtomicLocalStoreValueTest.java | 49 +
...iteCacheAtomicNearEnabledStoreValueTest.java | 30 +
...maryWriteOrderNearEnabledStoreValueTest.java | 31 +
...heAtomicPrimaryWriteOrderStoreValueTest.java | 32 +
...IgniteCacheAtomicPutAllFailoverSelfTest.java | 32 +
.../cache/IgniteCacheAtomicStoreValueTest.java | 55 +
...teCacheConfigurationDefaultTemplateTest.java | 111 +
.../IgniteCacheConfigurationTemplateTest.java | 448 +++
.../IgniteCacheContainsKeyAbstractSelfTest.java | 15 +-
.../cache/IgniteCacheDynamicStopSelfTest.java | 19 +-
.../cache/IgniteCacheInvokeAbstractTest.java | 11 -
.../cache/IgniteCachePeekModesAbstractTest.java | 40 +-
.../IgniteCacheStoreValueAbstractTest.java | 495 +++
.../cache/IgniteCacheTxLocalStoreValueTest.java | 49 +
.../IgniteCacheTxNearEnabledStoreValueTest.java | 30 +
.../cache/IgniteCacheTxStoreValueTest.java | 49 +
.../IgniteClientAffinityAssignmentSelfTest.java | 103 +-
.../cache/IgniteDynamicCacheStartSelfTest.java | 74 +-
.../cache/IgniteInternalCacheTypesTest.java | 159 +
.../cache/IgnitePutAllLargeBatchSelfTest.java | 16 +-
...tAllUpdateNonPreloadedPartitionSelfTest.java | 5 +-
.../cache/IgniteTxMultiNodeAbstractTest.java | 53 +-
.../IgniteTxMultiThreadedAbstractTest.java | 5 +-
...actQueueFailoverDataConsistencySelfTest.java | 4 +-
.../GridCacheQueueApiSelfAbstractTest.java | 80 +
.../GridCacheQueueCleanupSelfTest.java | 11 +-
...GridCacheQueueMultiNodeAbstractSelfTest.java | 5 +-
...dCacheQueueMultiNodeConsistencySelfTest.java | 11 +-
.../GridCacheSequenceApiSelfAbstractTest.java | 2 +-
.../GridCacheSetAbstractSelfTest.java | 15 +-
.../GridCacheSetFailoverAbstractSelfTest.java | 8 +-
.../IgniteCollectionAbstractTest.java | 181 +-
.../IgniteDataStructureUniqueNameTest.java | 47 +-
.../GridCacheLocalAtomicOffheapSetSelfTest.java | 32 +
.../GridCacheLocalAtomicQueueApiSelfTest.java | 6 +
.../local/GridCacheLocalAtomicSetSelfTest.java | 6 +
.../GridCacheLocalOffheapQueueApiSelfTest.java | 31 +
.../local/GridCacheLocalQueueApiSelfTest.java | 6 +
.../local/GridCacheLocalSetSelfTest.java | 6 +
...artitionedAtomicOffheapQueueApiSelfTest.java | 32 +
...omicOffheapQueueCreateMultiNodeSelfTest.java | 32 +
...onedAtomicOffheapQueueMultiNodeSelfTest.java | 32 +
...dCachePartitionedAtomicQueueApiSelfTest.java | 6 +
...ionedAtomicQueueCreateMultiNodeSelfTest.java | 6 +
...micQueueFailoverDataConsistencySelfTest.java | 6 +
...PartitionedAtomicQueueMultiNodeSelfTest.java | 6 +
...itionedAtomicQueueRotativeMultiNodeTest.java | 6 +
...chePartitionedAtomicSetFailoverSelfTest.java | 6 +
...rtitionedDataStructuresFailoverSelfTest.java | 6 +
...GridCachePartitionedNodeRestartSelfTest.java | 67 -
...artitionedOffHeapValuesQueueApiSelfTest.java | 31 +
...achePartitionedOffHeapValuesSetSelfTest.java | 32 +
...edOffheapDataStructuresFailoverSelfTest.java | 34 +
...hePartitionedOffheapSetFailoverSelfTest.java | 32 +
.../GridCachePartitionedQueueApiSelfTest.java | 6 +
...PartitionedQueueCreateMultiNodeSelfTest.java | 12 +-
...dCachePartitionedQueueEntryMoveSelfTest.java | 10 +-
...nedQueueFailoverDataConsistencySelfTest.java | 6 +
...CachePartitionedQueueJoinedNodeSelfTest.java | 6 +
...dCachePartitionedQueueMultiNodeSelfTest.java | 6 +
...hePartitionedQueueRotativeMultiNodeTest.java | 6 +
...GridCachePartitionedSetFailoverSelfTest.java | 6 +
.../GridCachePartitionedSetSelfTest.java | 6 +
.../IgnitePartitionedSetNoBackupsSelfTest.java | 5 +-
...eplicatedDataStructuresFailoverSelfTest.java | 6 +
.../GridCacheReplicatedQueueApiSelfTest.java | 11 +
...idCacheReplicatedQueueMultiNodeSelfTest.java | 6 +
...cheReplicatedQueueRotativeMultiNodeTest.java | 6 +
.../GridCacheReplicatedSetSelfTest.java | 6 +
.../GridCacheAbstractNodeRestartSelfTest.java | 23 +-
.../GridCacheAtomicTimeoutSelfTest.java | 314 --
.../GridCacheClientModesAbstractSelfTest.java | 6 +-
.../distributed/GridCacheEventAbstractTest.java | 295 +-
.../GridCacheMultiNodeAbstractTest.java | 13 +-
.../GridCacheMultiNodeLockAbstractTest.java | 14 +-
.../GridCacheNodeFailureAbstractTest.java | 23 +-
...ridCachePartitionNotLoadedEventSelfTest.java | 30 +-
...GridCachePreloadRestartAbstractSelfTest.java | 9 -
.../IgniteCacheAtomicMessageRecoveryTest.java | 32 +
.../IgniteCacheAtomicNodeJoinTest.java | 44 +
.../IgniteCacheAtomicNodeRestartTest.java | 33 +
.../IgniteCacheMessageRecoveryAbstractTest.java | 175 +
.../IgniteCacheNodeJoinAbstractTest.java | 109 +
.../IgniteCachePutGetRestartAbstractTest.java | 234 ++
.../IgniteCacheSystemTransactionsSelfTest.java | 41 +-
.../IgniteCacheTxFairAffinityNodeJoinTest.java | 35 +
.../IgniteCacheTxMessageRecoveryTest.java | 32 +
...iteCacheTxNearDisabledPutGetRestartTest.java | 30 +
.../distributed/IgniteCacheTxNodeJoinTest.java | 38 +
...xOriginatingNodeFailureAbstractSelfTest.java | 4 +-
...cOriginatingNodeFailureAbstractSelfTest.java | 4 +-
.../IgniteTxTimeoutAbstractTest.java | 8 -
...heAbstractTransformWriteThroughSelfTest.java | 2 +-
.../dht/GridCacheColocatedFailoverSelfTest.java | 2 +-
.../dht/GridCacheDhtEntrySelfTest.java | 12 +-
...GridCacheDhtEvictionNearReadersSelfTest.java | 18 +-
.../dht/GridCacheDhtEvictionSelfTest.java | 28 +-
.../GridCacheDhtEvictionsDisabledSelfTest.java | 14 +-
.../dht/GridCacheDhtMappingSelfTest.java | 2 +-
.../dht/GridCacheDhtPreloadPutGetSelfTest.java | 8 +-
.../dht/GridCacheDhtPreloadSelfTest.java | 12 +-
.../dht/GridCacheDhtPreloadUnloadSelfTest.java | 2 +-
.../distributed/dht/GridCacheDhtTestUtils.java | 12 +-
...ledFairAffinityMultiNodeFullApiSelfTest.java | 36 +
...itionedTxOriginatingNodeFailureSelfTest.java | 17 +-
.../dht/IgniteCacheLockFailoverSelfTest.java | 156 +
.../dht/IgniteCacheMultiTxLockSelfTest.java | 219 +
.../atomic/GridCacheAtomicFailoverSelfTest.java | 52 +
...eAtomicInvalidPartitionHandlingSelfTest.java | 19 +-
...AtomicPrimaryWriteOrderFailoverSelfTest.java | 36 +
...idCacheAtomicReplicatedFailoverSelfTest.java | 32 +
...sistencyAtomicPrimaryWriteOrderSelfTest.java | 32 +
...GridCacheValueConsistencyAtomicSelfTest.java | 103 +-
...nlyFairAffinityMultiNodeFullApiSelfTest.java | 36 +
...micFairAffinityMultiNodeFullApiSelfTest.java | 35 +
...ledFairAffinityMultiNodeFullApiSelfTest.java | 36 +
...derFairAffinityMultiNodeFullApiSelfTest.java | 36 +
.../near/GridCacheNearEvictionSelfTest.java | 4 +-
.../near/GridCacheNearMetricsSelfTest.java | 2 +-
.../near/GridCacheNearMultiNodeSelfTest.java | 131 +-
.../near/GridCacheNearOneNodeSelfTest.java | 35 +-
...nlyFairAffinityMultiNodeFullApiSelfTest.java | 35 +
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 29 +-
.../near/GridCacheNearReadersSelfTest.java | 154 +-
...ePartitionedBasicStoreMultiNodeSelfTest.java | 118 +-
.../GridCachePartitionedFailoverSelfTest.java | 2 +-
...GridCachePartitionedFilteredPutSelfTest.java | 5 +-
.../near/GridCachePartitionedFlagsTest.java | 41 -
.../GridCachePartitionedFullApiSelfTest.java | 2 +-
.../GridCachePartitionedLoadCacheSelfTest.java | 2 +-
...achePartitionedMultiNodeCounterSelfTest.java | 8 -
...achePartitionedMultiNodeFullApiSelfTest.java | 70 +-
...ePartitionedMultiThreadedPutGetSelfTest.java | 4 +-
...NearDisabledBasicStoreMultiNodeSelfTest.java | 8 +-
.../GridCachePartitionedNodeRestartTest.java | 1 +
...achePartitionedPreloadLifecycleSelfTest.java | 4 +-
.../GridCachePartitionedTxSalvageSelfTest.java | 4 +
.../near/GridPartitionedBackupLoadSelfTest.java | 2 +-
.../near/IgniteCacheNearReadCommittedTest.java | 4 +-
...nedFairAffinityMultiNodeFullApiSelfTest.java | 37 +
.../GridCacheReplicatedEvictionSelfTest.java | 8 +-
.../GridCacheReplicatedFailoverSelfTest.java | 2 +-
.../GridCacheReplicatedFlagsTest.java | 28 -
.../GridCacheReplicatedInvalidateSelfTest.java | 13 +-
...licatedNearOnlyMultiNodeFullApiSelfTest.java | 2 +-
.../GridCacheReplicatedNodeRestartSelfTest.java | 2 +
...dezvousAffinityMultiNodeFullApiSelfTest.java | 35 -
...acheAtomicReplicatedNodeRestartSelfTest.java | 32 +
...CacheReplicatedPreloadLifecycleSelfTest.java | 9 +-
.../GridCacheReplicatedPreloadSelfTest.java | 38 +-
.../eviction/GridCacheEvictionAbstractTest.java | 11 +-
...ridCacheFifoBatchEvictionPolicySelfTest.java | 384 ++
...dCacheSortedBatchEvictionPolicySelfTest.java | 385 ++
...acheSortedEvictionPolicyPerformanceTest.java | 136 +
.../GridCacheSortedEvictionPolicySelfTest.java | 373 ++
.../IgniteCacheExpiryPolicyAbstractTest.java | 10 +-
...eCacheExpiryPolicyWithStoreAbstractTest.java | 4 +-
...IgniteCacheJdbcBlobStoreNodeRestartTest.java | 52 +
...IgniteCacheStoreNodeRestartAbstractTest.java | 116 +
.../GridCacheSwapScanQueryAbstractSelfTest.java | 58 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 26 +-
...idCacheWriteBehindStoreAbstractSelfTest.java | 191 +
.../GridCacheWriteBehindStoreAbstractTest.java | 350 ++
.../GridCacheWriteBehindStoreLocalTest.java | 30 +
...heWriteBehindStoreMultithreadedSelfTest.java | 163 +
...BehindStorePartitionedMultiNodeSelfTest.java | 216 +
...ridCacheWriteBehindStorePartitionedTest.java | 30 +
...GridCacheWriteBehindStoreReplicatedTest.java | 30 +
.../GridCacheWriteBehindStoreSelfTest.java | 268 ++
.../continuous/GridEventConsumeSelfTest.java | 10 +-
.../DataStreamProcessorSelfTest.java | 8 +-
.../processors/igfs/IgfsAbstractSelfTest.java | 26 +-
.../igfs/IgfsDataManagerSelfTest.java | 6 +-
.../igfs/IgfsDualAbstractSelfTest.java | 2 +-
.../processors/igfs/IgfsProcessorSelfTest.java | 11 +-
.../processors/igfs/IgfsSizeSelfTest.java | 56 +-
.../processors/igfs/IgfsStartCacheTest.java | 158 +
.../processors/igfs/IgfsStreamsSelfTest.java | 7 +-
.../cache/GridCacheCommandHandlerSelfTest.java | 12 +-
.../GridServiceReassignmentSelfTest.java | 5 +-
.../internal/util/IgniteUtilsSelfTest.java | 2 +-
.../tostring/GridToStringBuilderSelfTest.java | 5 +-
.../GridConcurrentLinkedHashMapSelfTest.java | 17 +
.../GridContinuousOperationsLoadTest.java | 3 +-
.../loadtests/hashmap/GridCacheTestContext.java | 17 +-
.../loadtests/hashmap/GridHashMapLoadTest.java | 2 +-
.../OptimizedMarshallerNodeFailoverTest.java | 71 +-
.../OptimizedObjectStreamSelfTest.java | 4 -
.../ignite/messaging/GridMessagingSelfTest.java | 50 +
.../GridP2PMissedResourceCacheSizeSelfTest.java | 2 +-
.../spi/GridSpiLocalHostInjectionTest.java | 2 +-
.../GridPriorityQueueCollisionSpiSelfTest.java | 2 +-
.../GridAbstractCommunicationSelfTest.java | 3 +-
.../GridTcpCommunicationSpiAbstractTest.java | 5 +-
...mmunicationSpiConcurrentConnectSelfTest.java | 3 +-
.../GridTcpCommunicationSpiConfigSelfTest.java | 1 -
...cpCommunicationSpiMultithreadedSelfTest.java | 3 +-
...dTcpCommunicationSpiRecoveryAckSelfTest.java | 3 +-
...GridTcpCommunicationSpiRecoverySelfTest.java | 2 +-
.../discovery/AbstractDiscoverySelfTest.java | 4 +-
...ClusterMetricsSnapshotSerializeSelfTest.java | 28 +
.../tcp/TcpClientDiscoverySelfTest.java | 5 +-
.../tcp/TcpDiscoverySpiStartStopSelfTest.java | 5 +-
...RobinLoadBalancingSpiNotPerTaskSelfTest.java | 2 +-
.../GridSwapSpaceSpiAbstractSelfTest.java | 9 +-
.../inmemory/GridTestSwapSpaceSpi.java | 2 +-
.../testframework/GridSpiTestContext.java | 29 +-
.../ignite/testframework/GridTestUtils.java | 14 +-
.../testframework/junits/GridAbstractTest.java | 34 +-
.../junits/GridTestKernalContext.java | 2 +-
.../ignite/testframework/junits/IgniteMock.java | 15 +
.../junits/IgniteTestResources.java | 8 +-
.../junits/common/GridCommonAbstractTest.java | 176 +-
.../junits/spi/GridSpiAbstractTest.java | 89 +-
.../ignite/testsuites/IgniteBasicTestSuite.java | 1 +
.../IgniteCacheDataStructuresSelfTestSuite.java | 10 +
.../IgniteCacheEvictionSelfTestSuite.java | 4 +
.../IgniteCacheFailoverTestSuite.java | 26 +-
.../IgniteCacheFullApiSelfTestSuite.java | 9 +-
.../IgniteCacheMetricsSelfTestSuite.java | 4 +
.../testsuites/IgniteCacheRestartTestSuite.java | 20 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 33 +-
.../IgniteCacheWriteBehindTestSuite.java | 3 +-
.../ignite/testsuites/IgniteIgfsTestSuite.java | 2 +
.../IgniteSpiDiscoverySelfTestSuite.java | 2 +
...rrentLinkedHashMapMultiThreadedSelfTest.java | 4 +-
.../ignite/util/TestTcpCommunicationSpi.java | 54 +
modules/extdata/p2p/pom.xml | 23 +-
.../p2p/startcache/CacheAllNodesFilter.java | 31 +
.../CacheConfigurationP2PTestClient.java | 118 +
.../tests/p2p/startcache/Organization1.java | 52 +
.../tests/p2p/startcache/Organization2.java | 52 +
modules/extdata/uri/pom.xml | 25 +-
modules/geospatial/README.txt | 15 +
modules/geospatial/pom.xml | 43 +-
.../query/h2/GridH2IndexingGeoSelfTest.java | 70 +-
modules/hadoop/docs/hadoop_readme.pdf | Bin 82297 -> 82219 bytes
modules/hadoop/pom.xml | 38 +-
.../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 3 +
.../processors/hadoop/HadoopClassLoader.java | 21 +-
.../processors/hadoop/HadoopDefaultJobInfo.java | 2 +-
.../hadoop/jobtracker/HadoopJobTracker.java | 27 +-
.../processors/hadoop/v2/HadoopDaemon.java | 125 +
.../processors/hadoop/v2/HadoopV2Job.java | 58 +-
.../igfs/HadoopIgfsDualAbstractSelfTest.java | 3 +-
.../apache/ignite/igfs/IgfsEventsTestSuite.java | 4 +-
.../hadoop/HadoopClassLoaderTest.java | 2 +-
.../HadoopDefaultMapReducePlannerSelfTest.java | 16 +-
.../testsuites/IgniteHadoopTestSuite.java | 2 +-
.../IgniteIgfsLinuxAndMacOSTestSuite.java | 2 +-
modules/hibernate/README.txt | 15 +
modules/hibernate/pom.xml | 32 +-
.../HibernateAccessStrategyAdapter.java | 14 +-
.../hibernate/HibernateCollectionRegion.java | 2 +-
.../cache/hibernate/HibernateEntityRegion.java | 2 +-
.../hibernate/HibernateGeneralDataRegion.java | 4 +-
.../hibernate/HibernateNaturalIdRegion.java | 2 +-
.../HibernateNonStrictAccessStrategy.java | 6 +-
.../hibernate/HibernateQueryResultsRegion.java | 2 +-
.../HibernateReadOnlyAccessStrategy.java | 4 +-
.../HibernateReadWriteAccessStrategy.java | 10 +-
.../ignite/cache/hibernate/HibernateRegion.java | 6 +-
.../cache/hibernate/HibernateRegionFactory.java | 10 +-
.../hibernate/HibernateTimestampsRegion.java | 2 +-
.../HibernateTransactionalAccessStrategy.java | 12 +-
.../HibernateTransactionalDataRegion.java | 2 +-
.../hibernate/CacheHibernateBlobStore.java | 9 +-
.../HibernateL2CacheConfigurationSelfTest.java | 2 +-
.../hibernate/HibernateL2CacheSelfTest.java | 2 +-
.../CacheHibernateBlobStoreNodeRestartTest.java | 52 +
.../testsuites/IgniteHibernateTestSuite.java | 2 +
modules/indexing/pom.xml | 43 +-
.../processors/query/h2/IgniteH2Indexing.java | 80 +-
.../query/h2/opt/GridH2AbstractKeyValueRow.java | 95 +-
.../query/h2/opt/GridH2KeyValueRowOffheap.java | 64 +-
.../query/h2/opt/GridH2RowDescriptor.java | 2 +-
.../processors/query/h2/opt/GridH2Table.java | 31 +-
.../query/h2/opt/GridH2TreeIndex.java | 4 +-
.../processors/query/h2/sql/GridSqlElement.java | 8 -
.../query/h2/sql/GridSqlFunction.java | 6 +-
.../query/h2/sql/GridSqlPlaceholder.java | 51 +
.../processors/query/h2/sql/GridSqlQuery.java | 183 +
.../query/h2/sql/GridSqlQueryParser.java | 121 +-
.../query/h2/sql/GridSqlQuerySplitter.java | 149 +-
.../processors/query/h2/sql/GridSqlSelect.java | 209 +-
.../query/h2/sql/GridSqlSubquery.java | 8 +-
.../processors/query/h2/sql/GridSqlUnion.java | 134 +
.../query/h2/twostep/GridMapQueryExecutor.java | 88 +-
.../query/h2/twostep/GridMergeIndex.java | 17 +-
.../h2/twostep/GridReduceQueryExecutor.java | 13 +-
.../query/h2/twostep/GridResultPage.java | 9 +-
.../cache/CacheConfigurationP2PTest.java | 179 +
.../cache/CacheConfigurationP2PTestServer.java | 49 +
.../GridCacheAbstractFieldsQuerySelfTest.java | 120 +-
.../cache/GridCacheCrossCacheQuerySelfTest.java | 122 +-
.../cache/GridCacheOffHeapAndSwapSelfTest.java | 129 +-
.../cache/GridCacheOffHeapSelfTest.java | 624 +++
.../cache/GridCacheQueryMetricsSelfTest.java | 32 +-
.../GridCacheQuerySerializationSelfTest.java | 144 +
...idCacheReduceQueryMultithreadedSelfTest.java | 15 +-
.../processors/cache/GridCacheSwapSelfTest.java | 143 +-
.../cache/GridIndexingWithNoopSwapSelfTest.java | 19 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 30 +-
.../IgniteCacheCollocatedQuerySelfTest.java | 209 +
.../cache/IgniteCacheLargeResultSelfTest.java | 104 +
...CacheOffheapTieredMultithreadedSelfTest.java | 319 ++
...hePartitionedQueryMultiThreadedSelfTest.java | 2 +-
.../cache/IgniteCacheQueryIndexSelfTest.java | 3 +-
.../cache/IgniteCacheQueryLoadSelfTest.java | 26 +-
.../IgniteCacheQueryMultiThreadedSelfTest.java | 81 +-
...GridCachePartitionedFieldsQuerySelfTest.java | 9 +-
...niteCacheAtomicNearEnabledQuerySelfTest.java | 7 +-
.../near/IgniteCacheAtomicQuerySelfTest.java | 7 +-
.../IgniteCachePartitionedQuerySelfTest.java | 5 +-
.../GridCacheReplicatedFieldsQuerySelfTest.java | 12 +-
.../IgniteCacheReplicatedQuerySelfTest.java | 18 +-
...dCacheAbstractReduceFieldsQuerySelfTest.java | 27 +-
...cheReduceFieldsQueryPartitionedSelfTest.java | 5 +-
.../cache/ttl/CacheTtlAbstractSelfTest.java | 368 ++
.../ttl/CacheTtlOffheapAbstractSelfTest.java | 29 +
.../CacheTtlOffheapAtomicAbstractSelfTest.java | 29 +
.../ttl/CacheTtlOffheapAtomicLocalSelfTest.java | 34 +
...acheTtlOffheapAtomicPartitionedSelfTest.java | 34 +
...TtlOffheapTransactionalAbstractSelfTest.java | 29 +
...cheTtlOffheapTransactionalLocalSelfTest.java | 34 +
...OffheapTransactionalPartitionedSelfTest.java | 34 +
.../ttl/CacheTtlOnheapAbstractSelfTest.java | 29 +
.../CacheTtlOnheapAtomicAbstractSelfTest.java | 29 +
.../ttl/CacheTtlOnheapAtomicLocalSelfTest.java | 34 +
...CacheTtlOnheapAtomicPartitionedSelfTest.java | 34 +
...eTtlOnheapTransactionalAbstractSelfTest.java | 29 +
...acheTtlOnheapTransactionalLocalSelfTest.java | 34 +
...lOnheapTransactionalPartitionedSelfTest.java | 34 +
.../query/h2/GridH2IndexRebuildTest.java | 74 +-
.../h2/GridIndexingSpiAbstractSelfTest.java | 8 +-
.../h2/sql/AbstractH2CompareQueryTest.java | 375 ++
.../query/h2/sql/BaseH2CompareQueryTest.java | 856 ++++
.../query/h2/sql/GridQueryParsingTest.java | 36 +-
.../query/h2/sql/H2CompareBigQueryTest.java | 677 ++++
.../IgniteCacheQuerySelfTestSuite.java | 13 +-
.../IgniteCacheWithIndexingTestSuite.java | 53 +
.../IgniteH2IndexingSpiTestSuite.java | 7 -
.../processors/query/h2/sql/bigQuery.sql | 55 +
modules/jcl/pom.xml | 16 +-
modules/jta/pom.xml | 30 +-
.../processors/cache/jta/CacheJtaManager.java | 1 -
.../processors/cache/GridCacheJtaSelfTest.java | 6 +-
modules/log4j/pom.xml | 16 +-
modules/rest-http/pom.xml | 14 +-
.../http/jetty/GridJettyRestHandler.java | 8 +-
modules/scalar/pom.xml | 51 +-
.../ignite/scalar/pimps/ScalarCachePimp.scala | 36 -
modules/schedule/README.txt | 15 +
modules/schedule/pom.xml | 36 +-
modules/schema-import/pom.xml | 14 +-
modules/slf4j/pom.xml | 14 +-
modules/spring/pom.xml | 20 +-
.../org/apache/ignite/IgniteSpringBean.java | 21 +
.../p2p/GridP2PUserVersionChangeSelfTest.java | 8 +-
modules/ssh/pom.xml | 20 +-
.../util/nodestart/IgniteNodeCallableImpl.java | 308 --
.../util/nodestart/IgniteSshHelperImpl.java | 4 +-
.../util/nodestart/StartNodeCallableImpl.java | 309 ++
...gniteProjectionStartStopRestartSelfTest.java | 261 +-
.../IgniteStartStopRestartTestSuite.java | 1 +
modules/tools/pom.xml | 11 +-
.../ant/beautifier/GridJavadocAntTask.java | 10 +-
.../ignite/tools/classgen/ClassesGenerator.java | 2 +-
.../ignite/tools/javadoc/IgniteLinkTaglet.java | 20 +-
modules/urideploy/README.txt | 2 +-
modules/urideploy/licenses/edtftp-license.pdf | Bin 58355 -> 0 bytes
modules/urideploy/licenses/jtidy-license.txt | 50 -
.../urideploy/licenses/jtidy-mit-license.txt | 50 +
modules/urideploy/pom.xml | 58 +-
.../GridUriDeploymentFileResourceLoader.java | 2 +-
.../spi/deployment/uri/UriDeploymentSpi.java | 182 +-
.../uri/scanners/GridUriDeploymentScanner.java | 286 --
.../GridUriDeploymentScannerListener.java | 2 +-
.../uri/scanners/UriDeploymentScanner.java | 47 +
.../scanners/UriDeploymentScannerContext.java | 92 +
.../scanners/UriDeploymentScannerManager.java | 221 ++
.../file/GridUriDeploymentFileScanner.java | 311 --
.../scanners/file/UriDeploymentFileScanner.java | 327 ++
.../ftp/GridUriDeploymentFtpClient.java | 199 -
.../ftp/GridUriDeploymentFtpConfiguration.java | 115 -
.../ftp/GridUriDeploymentFtpException.java | 43 -
.../scanners/ftp/GridUriDeploymentFtpFile.java | 119 -
.../ftp/GridUriDeploymentFtpScanner.java | 234 --
.../uri/scanners/ftp/package-info.java | 22 -
.../http/GridUriDeploymentHttpScanner.java | 423 --
.../scanners/http/UriDeploymentHttpScanner.java | 478 +++
...loymentMultiScannersErrorThrottlingTest.java | 3 -
.../GridUriDeploymentMultiScannersSelfTest.java | 3 +-
.../GridFileDeploymentUndeploySelfTest.java | 4 +-
.../uri/scanners/ftp/GridFtpDeploymentTest.java | 46 -
.../uri/scanners/ftp/package-info.java | 22 -
modules/visor-console/pom.xml | 28 +-
.../ignite/visor/commands/VisorConsole.scala | 43 +-
.../commands/cache/VisorCacheClearCommand.scala | 3 +-
.../commands/cache/VisorCacheCommand.scala | 433 +-
.../commands/cache/VisorCacheScanCommand.scala | 13 +-
.../commands/cache/VisorCacheStopCommand.scala | 145 +
.../config/VisorConfigurationCommand.scala | 15 +-
.../commands/disco/VisorDiscoveryCommand.scala | 8 +-
.../commands/events/VisorEventsCommand.scala | 24 +-
.../visor/commands/gc/VisorGcCommand.scala | 15 +-
.../commands/start/VisorStartCommand.scala | 21 +-
.../commands/tasks/VisorTasksCommand.scala | 6 +-
.../scala/org/apache/ignite/visor/visor.scala | 47 +-
modules/visor-plugins/pom.xml | 14 +-
modules/web/pom.xml | 26 +-
modules/yardstick/README.md | 3 +-
.../yardstick/config/benchmark-store.properties | 5 +-
modules/yardstick/pom.xml | 22 +-
.../yardstick/IgniteAbstractBenchmark.java | 5 +-
.../yardstick/IgniteBenchmarkArguments.java | 22 +-
.../org/apache/ignite/yardstick/IgniteNode.java | 11 +-
.../cache/IgniteCacheAbstractBenchmark.java | 2 +-
.../jdbc/IgniteJdbcStoreAbstractBenchmark.java | 4 +-
parent/pom.xml | 709 ++++
pom.xml | 1325 ++-----
scripts/git-apply-patch.sh | 94 +
scripts/git-format-patch.sh | 87 +
scripts/git-patch-functions.sh | 171 +
scripts/git-patch-prop.sh | 24 +
965 files changed, 40114 insertions(+), 29032 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eae6f5e6/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
[19/28] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-478' into ignite-sprint-5
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-478' into ignite-sprint-5
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f4a3591b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f4a3591b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f4a3591b
Branch: refs/heads/ignite-709_2
Commit: f4a3591b35b707aa1cf2643d4d9db99a5bd0afc8
Parents: f059be6 995b608
Author: sevdokimov <se...@gridgain.com>
Authored: Fri May 8 18:01:46 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Fri May 8 18:01:46 2015 +0300
----------------------------------------------------------------------
.../processors/resource/GridResourceField.java | 11 +
.../processors/resource/GridResourceIoc.java | 387 ++++++-------------
.../processors/resource/GridResourceMethod.java | 13 +
.../resource/GridResourceProcessor.java | 4 +-
.../ignite/internal/util/IgniteUtils.java | 15 +
5 files changed, 169 insertions(+), 261 deletions(-)
----------------------------------------------------------------------
[08/28] incubator-ignite git commit: ignite-853
Posted by sb...@apache.org.
ignite-853
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dfeceafa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dfeceafa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dfeceafa
Branch: refs/heads/ignite-709_2
Commit: dfeceafa9c82be6639de4e2fb86510b63a4f01e0
Parents: 5166142
Author: avinogradov <av...@gridgain.com>
Authored: Thu May 7 13:05:54 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Thu May 7 13:05:54 2015 +0300
----------------------------------------------------------------------
pom.xml | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfeceafa/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3dafeed..7614422 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
POM file.
-->
<project xmlns="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">
-<modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ignite</groupId>
@@ -37,8 +37,9 @@
<properties>
<ignite.site>scp://localhost:/home</ignite.site>
+ <ignite.site.folder>${project.artifactId}-${project.version}</ignite.site.folder>
<!--fix <attachartifact>...< /> at apache-release profile if changed-->
- <ignite.zip.pattern>ignite-${ignite.edition}-${project.version}-incubating</ignite.zip.pattern>
+ <ignite.zip.pattern>ignite-${ignite.edition}-${project.version}</ignite.zip.pattern>
</properties>
<scm>
@@ -51,7 +52,7 @@
<distributionManagement>
<site>
<id>ignite-site</id>
- <url>${ignite.site}/${project.artifactId}-${project.version}</url>
+ <url>${ignite.site}/${ignite.site.folder}</url>
</site>
</distributionManagement>
@@ -116,7 +117,6 @@
<id>dev-libs</id>
<activation>
<activeByDefault>true</activeByDefault>
- <jdk>[1.7,)</jdk>
</activation>
<build>
<plugins>
@@ -488,7 +488,7 @@
<descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
</descriptorRefs>
<tarLongFileMode>gnu</tarLongFileMode>
- <finalName>incubator-ignite-${project.version}-src</finalName>
+ <finalName>ignite-${project.version}-src</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
@@ -508,8 +508,8 @@
<configuration>
<failOnError>false</failOnError>
<target>
- <attachartifact file="${basedir}/target/bin/ignite-fabric-${project.version}-incubating.zip" classifier="fabric" type="zip" />
- <attachartifact file="${basedir}/target/bin/ignite-hadoop-${project.version}-incubating.zip" classifier="hadoop" type="zip" />
+ <attachartifact file="${basedir}/target/bin/ignite-fabric-${project.version}.zip" classifier="fabric" type="zip" />
+ <attachartifact file="${basedir}/target/bin/ignite-hadoop-${project.version}.zip" classifier="hadoop" type="zip" />
</target>
</configuration>
</execution>
@@ -556,7 +556,7 @@
<fileSet>
<directory>${basedir}/target</directory>
<includes>
- <include>incubator-ignite-${project.version}-src.zip</include>
+ <include>ignite-${project.version}-src.zip</include>
<include>bin/*.zip</include>
</includes>
</fileSet>
@@ -584,10 +584,10 @@
<failOnError>false</failOnError>
<target>
<mkdir dir="${basedir}/target/site" />
- <copy file="${basedir}/target/incubator-ignite-${project.version}-src.zip" tofile="${basedir}/target/site/incubator-ignite-${project.version}-src.zip" failonerror="false" />
- <copy file="${basedir}/target/incubator-ignite-${project.version}-src.zip.asc" tofile="${basedir}/target/site/incubator-ignite-${project.version}-src.zip.asc" failonerror="false" />
- <copy file="${basedir}/target/incubator-ignite-${project.version}-src.zip.md5" tofile="${basedir}/target/site/incubator-ignite-${project.version}-src.zip.md5" failonerror="false" />
- <copy file="${basedir}/target/incubator-ignite-${project.version}-src.zip.sha1" tofile="${basedir}/target/site/incubator-ignite-${project.version}-src.zip.sha1" failonerror="false" />
+ <copy file="${basedir}/target/ignite-${project.version}-src.zip" tofile="${basedir}/target/site/ignite-${project.version}-src.zip" failonerror="false" />
+ <copy file="${basedir}/target/ignite-${project.version}-src.zip.asc" tofile="${basedir}/target/site/ignite-${project.version}-src.zip.asc" failonerror="false" />
+ <copy file="${basedir}/target/ignite-${project.version}-src.zip.md5" tofile="${basedir}/target/site/ignite-${project.version}-src.zip.md5" failonerror="false" />
+ <copy file="${basedir}/target/ignite-${project.version}-src.zip.sha1" tofile="${basedir}/target/site/ignite-${project.version}-src.zip.sha1" failonerror="false" />
<copy todir="${basedir}/target/site">
<fileset dir="${basedir}/target/bin">
<include name="**/*" />
[11/28] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-4-incubating' into ignite-sprint-4
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-4-incubating' into ignite-sprint-4
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e9f2e6dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e9f2e6dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e9f2e6dd
Branch: refs/heads/ignite-709_2
Commit: e9f2e6dd4a9d553504904d018947fbbb95b12cdb
Parents: dea6118 dabcf1d
Author: avinogradov <av...@gridgain.com>
Authored: Fri May 8 12:42:55 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Fri May 8 12:42:55 2015 +0300
----------------------------------------------------------------------
pom.xml | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
[15/28] incubator-ignite git commit: i-478 review
Posted by sb...@apache.org.
i-478 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/995b6089
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/995b6089
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/995b6089
Branch: refs/heads/ignite-709_2
Commit: 995b60898067b7dd95f33f598fadd579917473d0
Parents: d081046
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Fri May 8 16:40:31 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Fri May 8 16:40:31 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/resource/GridResourceIoc.java | 2 --
.../ignite/internal/processors/resource/GridResourceProcessor.java | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/995b6089/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java
index 301e5e5..c2ef116 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java
@@ -91,7 +91,6 @@ class GridResourceIoc {
/**
* @param cls Class.
*/
- @NotNull
private ClassDescriptor descriptor(@Nullable GridDeployment dep, Class<?> cls) {
ClassDescriptor res = clsDescs.get(cls);
@@ -319,7 +318,6 @@ class GridResourceIoc {
for (Map.Entry<Class<? extends Annotation>, T2<List<GridResourceField>, List<GridResourceMethod>>> entry
: annMap.entrySet()) {
-
GridResourceField[] fields = GridResourceField.toArray(entry.getValue().get1());
GridResourceMethod[] mtds = GridResourceMethod.toArray(entry.getValue().get2());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/995b6089/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java
index eae5c4b..cb4149b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java
@@ -147,6 +147,8 @@ public class GridResourceProcessor extends GridProcessorAdapter {
Method mtd = rsrcMtd.getMethod();
try {
+ // No need to call mtd.setAccessible(true);
+ // It has been called in GridResourceMethod constructor.
mtd.invoke(target);
}
catch (IllegalArgumentException | InvocationTargetException | IllegalAccessException e) {
[17/28] incubator-ignite git commit: # IGNITE-777 Review: Replace
log.error() with U.error()
Posted by sb...@apache.org.
# IGNITE-777 Review: Replace log.error() with U.error()
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f059be62
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f059be62
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f059be62
Branch: refs/heads/ignite-709_2
Commit: f059be626b0a66e81b5ce3961d53a20d89526bc8
Parents: 0dc908b
Author: sevdokimov <se...@gridgain.com>
Authored: Fri May 8 17:57:00 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Fri May 8 17:58:11 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f059be62/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 3afcd0f..0ebb6cd 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -2705,7 +2705,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
clientMsgWorker.addMessage(msgClone);
}
catch (IgniteCheckedException e) {
- log.error("Failed to marshal message: " + msg, e);
+ U.error(log, "Failed to marshal message: " + msg, e);
msgClone = msg;
}
[27/28] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-5' into ignite-sprint-5
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-sprint-5
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/08360c99
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/08360c99
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/08360c99
Branch: refs/heads/ignite-709_2
Commit: 08360c999a73173aceef8eb7500d656ea5b386c0
Parents: 6395b43 c235711
Author: sboikov <sb...@gridgain.com>
Authored: Tue May 12 16:03:05 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue May 12 16:03:05 2015 +0300
----------------------------------------------------------------------
assembly/release-base.xml | 4 +-
bin/ignite-schema-import.bat | 2 +-
bin/ignite-schema-import.sh | 2 +-
bin/ignite.bat | 2 +-
bin/ignite.sh | 2 +-
bin/ignitevisorcmd.bat | 2 +-
bin/ignitevisorcmd.sh | 2 +-
bin/include/build-classpath.bat | 46 +++++++++++++++++++++++
bin/include/build-classpath.sh | 71 +++++++++++++++++++++++++++++++++++
bin/include/target-classpath.bat | 46 -----------------------
bin/include/target-classpath.sh | 71 -----------------------------------
pom.xml | 50 ++++++++++++------------
12 files changed, 152 insertions(+), 148 deletions(-)
----------------------------------------------------------------------
[18/28] incubator-ignite git commit: # IGNITE-777
(ConcurrentModificationException in TcpDiscoverySpi): Clone message before
send to client.
Posted by sb...@apache.org.
# IGNITE-777 (ConcurrentModificationException in TcpDiscoverySpi): Clone message before send to client.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0dc908bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0dc908bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0dc908bd
Branch: refs/heads/ignite-709_2
Commit: 0dc908bd3d781c30b809d3ba525208d583d8c35d
Parents: c9cd92e
Author: sevdokimov <se...@gridgain.com>
Authored: Wed Apr 22 13:29:40 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Fri May 8 17:58:11 2015 +0300
----------------------------------------------------------------------
.../spi/discovery/tcp/TcpDiscoverySpi.java | 24 ++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0dc908bd/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 46d90b5..3afcd0f 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -2690,8 +2690,28 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
msgLsnr.apply(msg);
if (redirectToClients(msg)) {
- for (ClientMessageWorker clientMsgWorker : clientMsgWorkers.values())
- clientMsgWorker.addMessage(msg);
+ byte[] marshalledMsg = null;
+
+ for (ClientMessageWorker clientMsgWorker : clientMsgWorkers.values()) {
+ // Send a clone to client to avoid ConcurrentModificationException
+ TcpDiscoveryAbstractMessage msgClone;
+
+ try {
+ if (marshalledMsg == null)
+ marshalledMsg = marsh.marshal(msg);
+
+ msgClone = marsh.unmarshal(marshalledMsg, null);
+
+ clientMsgWorker.addMessage(msgClone);
+ }
+ catch (IgniteCheckedException e) {
+ log.error("Failed to marshal message: " + msg, e);
+
+ msgClone = msg;
+ }
+
+ clientMsgWorker.addMessage(msgClone);
+ }
}
Collection<TcpDiscoveryNode> failedNodes;
[07/28] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-4' into ignite-sprint-4-incubating
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-sprint-4-incubating
Conflicts:
examples/pom.xml
modules/aop/pom.xml
modules/aws/pom.xml
modules/clients/pom.xml
modules/cloud/pom.xml
modules/codegen/pom.xml
modules/core/pom.xml
modules/extdata/p2p/pom.xml
modules/extdata/uri/pom.xml
modules/gce/pom.xml
modules/geospatial/pom.xml
modules/hadoop/pom.xml
modules/hibernate/pom.xml
modules/indexing/pom.xml
modules/jcl/pom.xml
modules/jta/pom.xml
modules/log4j/pom.xml
modules/rest-http/pom.xml
modules/scalar/pom.xml
modules/schedule/pom.xml
modules/schema-import/pom.xml
modules/slf4j/pom.xml
modules/spring/pom.xml
modules/ssh/pom.xml
modules/tools/pom.xml
modules/urideploy/pom.xml
modules/visor-console/pom.xml
modules/visor-plugins/pom.xml
modules/web/pom.xml
modules/yardstick/pom.xml
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5166142c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5166142c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5166142c
Branch: refs/heads/ignite-709_2
Commit: 5166142ccb692f084463176ac32a3ca8efb7e607
Parents: 6bfb1d8 0c13a08
Author: avinogradov <av...@gridgain.com>
Authored: Thu May 7 12:15:20 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Thu May 7 12:15:20 2015 +0300
----------------------------------------------------------------------
examples/pom.xml | 2 +-
modules/aop/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
modules/clients/pom.xml | 2 +-
modules/cloud/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
.../processors/cache/GridCacheAdapter.java | 7 +++++-
modules/extdata/p2p/pom.xml | 2 +-
modules/extdata/uri/pom.xml | 2 +-
modules/gce/pom.xml | 2 +-
modules/geospatial/pom.xml | 2 +-
modules/hadoop/pom.xml | 2 +-
modules/hibernate/pom.xml | 2 +-
modules/indexing/pom.xml | 2 +-
modules/jcl/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
modules/log4j/pom.xml | 2 +-
modules/rest-http/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
modules/schedule/pom.xml | 2 +-
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
modules/urideploy/pom.xml | 2 +-
modules/visor-console/pom.xml | 2 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
modules/yardstick/pom.xml | 2 +-
pom.xml | 24 ++++++++++----------
32 files changed, 48 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
[05/28] incubator-ignite git commit: ignite-853
Posted by sb...@apache.org.
ignite-853
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/823f8a37
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/823f8a37
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/823f8a37
Branch: refs/heads/ignite-709_2
Commit: 823f8a373bd0f290c8781eeec24fcaf0862419dc
Parents: 5cefca0
Author: avinogradov <av...@gridgain.com>
Authored: Wed May 6 20:46:21 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Wed May 6 20:46:21 2015 +0300
----------------------------------------------------------------------
pom.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/823f8a37/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fc9ca04..205d286 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,6 @@
<id>dev-libs</id>
<activation>
<activeByDefault>true</activeByDefault>
- <jdk>[1.7,)</jdk>
</activation>
<build>
<plugins>
[22/28] incubator-ignite git commit: ignite source-pack fix
Posted by sb...@apache.org.
ignite source-pack 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/7da0df9d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7da0df9d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7da0df9d
Branch: refs/heads/ignite-709_2
Commit: 7da0df9dffca55e4153bbdcfc02bb0c2fb417989
Parents: ecc7a50
Author: avinogradov <av...@gridgain.com>
Authored: Tue May 12 13:56:02 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Tue May 12 13:56:02 2015 +0300
----------------------------------------------------------------------
assembly/release-base.xml | 4 +-
bin/ignite-schema-import.bat | 2 +-
bin/ignite-schema-import.sh | 2 +-
bin/ignite.bat | 2 +-
bin/ignite.sh | 2 +-
bin/ignitevisorcmd.bat | 2 +-
bin/ignitevisorcmd.sh | 2 +-
bin/include/build-classpath.bat | 46 +++++++++++++++++++++++
bin/include/build-classpath.sh | 71 +++++++++++++++++++++++++++++++++++
bin/include/target-classpath.bat | 46 -----------------------
bin/include/target-classpath.sh | 71 -----------------------------------
pom.xml | 4 +-
12 files changed, 127 insertions(+), 127 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7da0df9d/assembly/release-base.xml
----------------------------------------------------------------------
diff --git a/assembly/release-base.xml b/assembly/release-base.xml
index 6d6465e..88f1d10 100644
--- a/assembly/release-base.xml
+++ b/assembly/release-base.xml
@@ -71,7 +71,7 @@
<excludes>
<exclude>**/*hadoop*.bat</exclude>
<exclude>igniterouter.bat</exclude>
- <exclude>**/target-classpath.bat</exclude>
+ <exclude>**/build-classpath.bat</exclude>
<exclude>ignitevisorcmd.bat</exclude>
<exclude>ignite-schema-import.bat</exclude>
</excludes>
@@ -87,7 +87,7 @@
<excludes>
<exclude>**/*hadoop*.sh</exclude>
<exclude>igniterouter.sh</exclude>
- <exclude>**/target-classpath.sh</exclude>
+ <exclude>**/build-classpath.sh</exclude>
<exclude>**/service.sh</exclude>
<exclude>ignitevisorcmd.sh</exclude>
<exclude>ignite-schema-import.sh</exclude>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7da0df9d/bin/ignite-schema-import.bat
----------------------------------------------------------------------
diff --git a/bin/ignite-schema-import.bat b/bin/ignite-schema-import.bat
index 4731105..d48234c 100644
--- a/bin/ignite-schema-import.bat
+++ b/bin/ignite-schema-import.bat
@@ -91,7 +91,7 @@ if /i "%SCRIPTS_HOME%\" == "%~dp0" goto run
:: Set IGNITE_LIBS
::
call "%SCRIPTS_HOME%\include\setenv.bat"
-call "%SCRIPTS_HOME%\include\target-classpath.bat" &:: Will be removed in release.
+call "%SCRIPTS_HOME%\include\build-classpath.bat" &:: Will be removed in release.
set CP=%JAVA_HOME%\jre\lib\jfxrt.jar;%IGNITE_HOME%\bin\include\schema-import\*;%IGNITE_LIBS%
::
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7da0df9d/bin/ignite-schema-import.sh
----------------------------------------------------------------------
diff --git a/bin/ignite-schema-import.sh b/bin/ignite-schema-import.sh
index 0a70d54..8f2a8d5 100755
--- a/bin/ignite-schema-import.sh
+++ b/bin/ignite-schema-import.sh
@@ -57,7 +57,7 @@ setIgniteHome
# Set IGNITE_LIBS.
#
. "${SCRIPTS_HOME}"/include/setenv.sh
-. "${SCRIPTS_HOME}"/include/target-classpath.sh # Will be removed in release.
+. "${SCRIPTS_HOME}"/include/build-classpath.sh # Will be removed in release.
CP="${JAVA_HOME}/jre/lib/jfxrt.jar${SEP}${IGNITE_HOME}/bin/include/schema-import/*${SEP}${IGNITE_LIBS}"
#
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7da0df9d/bin/ignite.bat
----------------------------------------------------------------------
diff --git a/bin/ignite.bat b/bin/ignite.bat
index 687db60..20836c0 100644
--- a/bin/ignite.bat
+++ b/bin/ignite.bat
@@ -102,7 +102,7 @@ if "%OS%" == "Windows_NT" set PROG_NAME=%~nx0%
:: Set IGNITE_LIBS
::
call "%SCRIPTS_HOME%\include\setenv.bat"
-call "%SCRIPTS_HOME%\include\target-classpath.bat" &:: Will be removed in release.
+call "%SCRIPTS_HOME%\include\build-classpath.bat" &:: Will be removed in release.
set CP=%IGNITE_LIBS%
::
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7da0df9d/bin/ignite.sh
----------------------------------------------------------------------
diff --git a/bin/ignite.sh b/bin/ignite.sh
index a246613..ee92d27 100755
--- a/bin/ignite.sh
+++ b/bin/ignite.sh
@@ -58,7 +58,7 @@ fi
# Set IGNITE_LIBS.
#
. "${SCRIPTS_HOME}"/include/setenv.sh
-. "${SCRIPTS_HOME}"/include/target-classpath.sh # Will be removed in release.
+. "${SCRIPTS_HOME}"/include/build-classpath.sh # Will be removed in release.
CP="${IGNITE_LIBS}"
RANDOM_NUMBER=$("$JAVA" -cp "${CP}" org.apache.ignite.startup.cmdline.CommandLineRandomNumberGenerator)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7da0df9d/bin/ignitevisorcmd.bat
----------------------------------------------------------------------
diff --git a/bin/ignitevisorcmd.bat b/bin/ignitevisorcmd.bat
index 1cf2b26..fe06530 100644
--- a/bin/ignitevisorcmd.bat
+++ b/bin/ignitevisorcmd.bat
@@ -100,7 +100,7 @@ if "%OS%" == "Windows_NT" set PROG_NAME=%~nx0%
:: Set IGNITE_LIBS
::
call "%SCRIPTS_HOME%\include\setenv.bat"
-call "%SCRIPTS_HOME%\include\target-classpath.bat" &:: Will be removed in release.
+call "%SCRIPTS_HOME%\include\build-classpath.bat" &:: Will be removed in release.
set CP=%IGNITE_HOME%\bin\include\visor-common\*;%IGNITE_HOME%\bin\include\visorcmd\*;%IGNITE_LIBS%
::
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7da0df9d/bin/ignitevisorcmd.sh
----------------------------------------------------------------------
diff --git a/bin/ignitevisorcmd.sh b/bin/ignitevisorcmd.sh
index 6118560..91d6c5a 100755
--- a/bin/ignitevisorcmd.sh
+++ b/bin/ignitevisorcmd.sh
@@ -53,7 +53,7 @@ setIgniteHome
# Set IGNITE_LIBS.
#
. "${SCRIPTS_HOME}"/include/setenv.sh
-. "${SCRIPTS_HOME}"/include/target-classpath.sh # Will be removed in release.
+. "${SCRIPTS_HOME}"/include/build-classpath.sh # Will be removed in release.
CP="${IGNITE_HOME}/bin/include/visor-common/*${SEP}${IGNITE_HOME}/bin/include/visorcmd/*${SEP}${IGNITE_LIBS}"
#
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7da0df9d/bin/include/build-classpath.bat
----------------------------------------------------------------------
diff --git a/bin/include/build-classpath.bat b/bin/include/build-classpath.bat
new file mode 100644
index 0000000..5f932d3
--- /dev/null
+++ b/bin/include/build-classpath.bat
@@ -0,0 +1,46 @@
+::
+:: 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.
+::
+
+:: Target class path resolver.
+::
+:: Can be used like:
+:: call "%IGNITE_HOME%\bin\include\build-classpath.bat"
+:: in other scripts to set classpath using libs from target folder.
+::
+:: Will be excluded in release.
+
+@echo off
+
+for /D %%F in (modules\*) do if not %%F == "modules" call :includeToClassPath %%F
+
+for /D %%F in (%IGNITE_HOME%\modules\*) do if not %%F == "%IGNITE_HOME%\modules" call :includeToClassPath %%F
+
+goto :eof
+
+:includeToClassPath
+if exist "%1\target\" (
+ if exist "%1\target\classes\" call :concat %1\target\classes
+
+ if exist "%1\target\test-classes\" call :concat %1\target\test-classes
+
+ if exist "%1\target\libs\" call :concat %1\target\libs\*
+)
+goto :eof
+
+:concat
+set IGNITE_LIBS=%IGNITE_LIBS%;%1
+goto :eof
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7da0df9d/bin/include/build-classpath.sh
----------------------------------------------------------------------
diff --git a/bin/include/build-classpath.sh b/bin/include/build-classpath.sh
new file mode 100644
index 0000000..9f0c878
--- /dev/null
+++ b/bin/include/build-classpath.sh
@@ -0,0 +1,71 @@
+#!/bin/sh
+#
+# 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.
+#
+
+# Target class path resolver.
+#
+# Can be used like:
+# . "${IGNITE_HOME}"/bin/include/build-classpath.sh
+# in other scripts to set classpath using libs from target folder.
+#
+# Will be excluded in release.
+
+
+#
+# OS specific support.
+#
+SEP=":";
+
+case "`uname`" in
+ MINGW*)
+ SEP=";";
+ export IGNITE_HOME=`echo $IGNITE_HOME | sed -e 's/^\/\([a-zA-Z]\)/\1:/'`
+ ;;
+ CYGWIN*)
+ SEP=";";
+ export IGNITE_HOME=`echo $IGNITE_HOME | sed -e 's/^\/\([a-zA-Z]\)/\1:/'`
+ ;;
+esac
+
+includeToClassPath() {
+ for file in $1/*
+ do
+ if [ -d ${file} ] && [ -d "${file}/target" ]; then
+ if [ -d "${file}/target/classes" ]; then
+ IGNITE_LIBS=${IGNITE_LIBS}${SEP}${file}/target/classes
+ fi
+
+ if [ -d "${file}/target/test-classes" ]; then
+ IGNITE_LIBS=${IGNITE_LIBS}${SEP}${file}/target/test-classes
+ fi
+
+ if [ -d "${file}/target/libs" ]; then
+ IGNITE_LIBS=${IGNITE_LIBS}${SEP}${file}/target/libs/*
+ fi
+ fi
+ done
+}
+
+#
+# Include target libraries for enterprise modules to classpath.
+#
+includeToClassPath modules
+
+#
+# Include target libraries for opensourse modules to classpath.
+#
+includeToClassPath ${IGNITE_HOME}/modules
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7da0df9d/bin/include/target-classpath.bat
----------------------------------------------------------------------
diff --git a/bin/include/target-classpath.bat b/bin/include/target-classpath.bat
deleted file mode 100644
index 4416557..0000000
--- a/bin/include/target-classpath.bat
+++ /dev/null
@@ -1,46 +0,0 @@
-::
-:: 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.
-::
-
-:: Target class path resolver.
-::
-:: Can be used like:
-:: call "%IGNITE_HOME%\bin\include\target-classpath.bat"
-:: in other scripts to set classpath using libs from target folder.
-::
-:: Will be excluded in release.
-
-@echo off
-
-for /D %%F in (modules\*) do if not %%F == "modules" call :includeToClassPath %%F
-
-for /D %%F in (%IGNITE_HOME%\modules\*) do if not %%F == "%IGNITE_HOME%\modules" call :includeToClassPath %%F
-
-goto :eof
-
-:includeToClassPath
-if exist "%1\target\" (
- if exist "%1\target\classes\" call :concat %1\target\classes
-
- if exist "%1\target\test-classes\" call :concat %1\target\test-classes
-
- if exist "%1\target\libs\" call :concat %1\target\libs\*
-)
-goto :eof
-
-:concat
-set IGNITE_LIBS=%IGNITE_LIBS%;%1
-goto :eof
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7da0df9d/bin/include/target-classpath.sh
----------------------------------------------------------------------
diff --git a/bin/include/target-classpath.sh b/bin/include/target-classpath.sh
deleted file mode 100644
index 871d517..0000000
--- a/bin/include/target-classpath.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-
-# Target class path resolver.
-#
-# Can be used like:
-# . "${IGNITE_HOME}"/bin/include/target-classpath.sh
-# in other scripts to set classpath using libs from target folder.
-#
-# Will be excluded in release.
-
-
-#
-# OS specific support.
-#
-SEP=":";
-
-case "`uname`" in
- MINGW*)
- SEP=";";
- export IGNITE_HOME=`echo $IGNITE_HOME | sed -e 's/^\/\([a-zA-Z]\)/\1:/'`
- ;;
- CYGWIN*)
- SEP=";";
- export IGNITE_HOME=`echo $IGNITE_HOME | sed -e 's/^\/\([a-zA-Z]\)/\1:/'`
- ;;
-esac
-
-includeToClassPath() {
- for file in $1/*
- do
- if [ -d ${file} ] && [ -d "${file}/target" ]; then
- if [ -d "${file}/target/classes" ]; then
- IGNITE_LIBS=${IGNITE_LIBS}${SEP}${file}/target/classes
- fi
-
- if [ -d "${file}/target/test-classes" ]; then
- IGNITE_LIBS=${IGNITE_LIBS}${SEP}${file}/target/test-classes
- fi
-
- if [ -d "${file}/target/libs" ]; then
- IGNITE_LIBS=${IGNITE_LIBS}${SEP}${file}/target/libs/*
- fi
- fi
- done
-}
-
-#
-# Include target libraries for enterprise modules to classpath.
-#
-includeToClassPath modules
-
-#
-# Include target libraries for opensourse modules to classpath.
-#
-includeToClassPath ${IGNITE_HOME}/modules
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7da0df9d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c445fd3..1b44d5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -275,7 +275,7 @@
</replaceregexp>
<replaceregexp byline="true">
- <regexp pattern="\. "\$\{SCRIPTS_HOME\}"/include/target-classpath.sh(\s*#.*)?" />
+ <regexp pattern="\. "\$\{SCRIPTS_HOME\}"/include/build-classpath.sh(\s*#.*)?" />
<substitution expression="" />
<fileset dir="${basedir}/target/release-package/bin">
<include name="**/*.sh" />
@@ -283,7 +283,7 @@
</replaceregexp>
<replaceregexp byline="true">
- <regexp pattern="call "%SCRIPTS_HOME%\\include\\target-classpath.bat"(\s*&::.*)?" />
+ <regexp pattern="call "%SCRIPTS_HOME%\\include\\build-classpath.bat"(\s*&::.*)?" />
<substitution expression="" />
<fileset dir="${basedir}/target/release-package/bin">
<include name="**/*.bat" />
[28/28] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-5' into ignite-709_2
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-709_2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/406e2970
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/406e2970
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/406e2970
Branch: refs/heads/ignite-709_2
Commit: 406e29709065a934a6fde9f9f4043259e65f1503
Parents: a001312 08360c9
Author: sevdokimov <se...@gridgain.com>
Authored: Tue May 12 16:45:48 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Tue May 12 16:45:48 2015 +0300
----------------------------------------------------------------------
assembly/release-base.xml | 4 +-
bin/ignite-schema-import.bat | 2 +-
bin/ignite-schema-import.sh | 2 +-
bin/ignite.bat | 2 +-
bin/ignite.sh | 2 +-
bin/ignitevisorcmd.bat | 2 +-
bin/ignitevisorcmd.sh | 2 +-
bin/include/build-classpath.bat | 46 +++
bin/include/build-classpath.sh | 71 ++++
bin/include/target-classpath.bat | 46 ---
bin/include/target-classpath.sh | 71 ----
.../processors/resource/GridResourceField.java | 11 +
.../processors/resource/GridResourceIoc.java | 387 ++++++-------------
.../processors/resource/GridResourceMethod.java | 13 +
.../resource/GridResourceProcessor.java | 4 +-
.../ignite/internal/util/IgniteUtils.java | 15 +
.../spi/discovery/tcp/TcpDiscoverySpi.java | 24 +-
.../cache/GridCacheOffheapIndexGetSelfTest.java | 111 ++++++
.../IgniteCacheWithIndexingTestSuite.java | 2 +
parent/pom.xml | 2 +
pom.xml | 83 ++--
21 files changed, 458 insertions(+), 444 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/406e2970/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
[06/28] incubator-ignite git commit: "Version changed
Posted by sb...@apache.org.
"Version changed
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6bfb1d86
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6bfb1d86
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6bfb1d86
Branch: refs/heads/ignite-709_2
Commit: 6bfb1d86e59f03eff62c799d5e6838bdd58ea1bb
Parents: 823f8a3
Author: Ignite Teamcity <ig...@apache.org>
Authored: Wed May 6 23:40:35 2015 +0300
Committer: Ignite Teamcity <ig...@apache.org>
Committed: Wed May 6 23:40:35 2015 +0300
----------------------------------------------------------------------
examples/pom.xml | 2 +-
modules/aop/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
modules/clients/pom.xml | 2 +-
modules/cloud/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
modules/extdata/p2p/pom.xml | 2 +-
modules/extdata/uri/pom.xml | 2 +-
modules/gce/pom.xml | 2 +-
modules/geospatial/pom.xml | 2 +-
modules/hadoop/pom.xml | 2 +-
modules/hibernate/pom.xml | 2 +-
modules/indexing/pom.xml | 2 +-
modules/jcl/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
modules/log4j/pom.xml | 2 +-
modules/rest-http/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
modules/schedule/pom.xml | 2 +-
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
modules/urideploy/pom.xml | 2 +-
modules/visor-console/pom.xml | 2 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
modules/yardstick/pom.xml | 2 +-
pom.xml | 14 ++++----------
31 files changed, 34 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 9dda753..fa6e3b1 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>ignite-examples</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/modules/aop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml
index ef44603..f09d120 100644
--- a/modules/aop/pom.xml
+++ b/modules/aop/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-aop</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/modules/aws/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml
index 43f24bc..57347b1 100644
--- a/modules/aws/pom.xml
+++ b/modules/aws/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-aws</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/modules/clients/pom.xml
----------------------------------------------------------------------
diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml
index ca93673..cc6aa23 100644
--- a/modules/clients/pom.xml
+++ b/modules/clients/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-clients</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/modules/cloud/pom.xml
----------------------------------------------------------------------
diff --git a/modules/cloud/pom.xml b/modules/cloud/pom.xml
index 8cb97d0..3bd9102 100644
--- a/modules/cloud/pom.xml
+++ b/modules/cloud/pom.xml
@@ -29,7 +29,7 @@
</parent>
<artifactId>ignite-cloud</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<properties>
<jcloud.version>1.9.0</jcloud.version>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/modules/codegen/pom.xml
----------------------------------------------------------------------
diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml
index 9e03dab..58d5c79 100644
--- a/modules/codegen/pom.xml
+++ b/modules/codegen/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-codegen</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 62612f8..26e42aa 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-core</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/modules/extdata/p2p/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/pom.xml b/modules/extdata/p2p/pom.xml
index 0f8fdc0..3834c6e 100644
--- a/modules/extdata/p2p/pom.xml
+++ b/modules/extdata/p2p/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-extdata-p2p</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/modules/extdata/uri/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/pom.xml b/modules/extdata/uri/pom.xml
index df69c93..d82c224 100644
--- a/modules/extdata/uri/pom.xml
+++ b/modules/extdata/uri/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-extdata-uri</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/modules/gce/pom.xml
----------------------------------------------------------------------
diff --git a/modules/gce/pom.xml b/modules/gce/pom.xml
index 8b2a019..ec14da5 100644
--- a/modules/gce/pom.xml
+++ b/modules/gce/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-gce</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/modules/geospatial/pom.xml
----------------------------------------------------------------------
diff --git a/modules/geospatial/pom.xml b/modules/geospatial/pom.xml
index 1ce3370..18b2dad 100644
--- a/modules/geospatial/pom.xml
+++ b/modules/geospatial/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-geospatial</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/modules/hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml
index 231808f..7acf7b1 100644
--- a/modules/hadoop/pom.xml
+++ b/modules/hadoop/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-hadoop</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/modules/hibernate/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hibernate/pom.xml b/modules/hibernate/pom.xml
index ed4dc07..d04b30b 100644
--- a/modules/hibernate/pom.xml
+++ b/modules/hibernate/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-hibernate</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/modules/indexing/pom.xml
----------------------------------------------------------------------
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index 6ff6039..289e2fd 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-indexing</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/modules/jcl/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jcl/pom.xml b/modules/jcl/pom.xml
index 8a3cec3..e7719b5 100644
--- a/modules/jcl/pom.xml
+++ b/modules/jcl/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-jcl</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/modules/jta/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jta/pom.xml b/modules/jta/pom.xml
index 9287f12..f6aa3dc 100644
--- a/modules/jta/pom.xml
+++ b/modules/jta/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-jta</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/modules/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/log4j/pom.xml b/modules/log4j/pom.xml
index dff0a7e..f4ca6b1 100644
--- a/modules/log4j/pom.xml
+++ b/modules/log4j/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-log4j</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/modules/rest-http/pom.xml
----------------------------------------------------------------------
diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml
index 9097614..e95411c 100644
--- a/modules/rest-http/pom.xml
+++ b/modules/rest-http/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-rest-http</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/modules/scalar/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml
index 590d3f7..91b16e7 100644
--- a/modules/scalar/pom.xml
+++ b/modules/scalar/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-scalar</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/modules/schedule/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schedule/pom.xml b/modules/schedule/pom.xml
index 2c09ed9..d89430a 100644
--- a/modules/schedule/pom.xml
+++ b/modules/schedule/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-schedule</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/modules/schema-import/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schema-import/pom.xml b/modules/schema-import/pom.xml
index 0684d11..d8da0da 100644
--- a/modules/schema-import/pom.xml
+++ b/modules/schema-import/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-schema-import</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/modules/slf4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/slf4j/pom.xml b/modules/slf4j/pom.xml
index 1f78f42..6425f8c 100644
--- a/modules/slf4j/pom.xml
+++ b/modules/slf4j/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-slf4j</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/modules/spring/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml
index 1390a39..3e7cbe7 100644
--- a/modules/spring/pom.xml
+++ b/modules/spring/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-spring</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/modules/ssh/pom.xml
----------------------------------------------------------------------
diff --git a/modules/ssh/pom.xml b/modules/ssh/pom.xml
index 867e9be..3b6a8ef 100644
--- a/modules/ssh/pom.xml
+++ b/modules/ssh/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-ssh</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/modules/tools/pom.xml
----------------------------------------------------------------------
diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml
index 625eeaa..c4c80ab 100644
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-tools</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/modules/urideploy/pom.xml
----------------------------------------------------------------------
diff --git a/modules/urideploy/pom.xml b/modules/urideploy/pom.xml
index 231a576..2538b9c 100644
--- a/modules/urideploy/pom.xml
+++ b/modules/urideploy/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-urideploy</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/modules/visor-console/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-console/pom.xml b/modules/visor-console/pom.xml
index 07e27a0..2af6442 100644
--- a/modules/visor-console/pom.xml
+++ b/modules/visor-console/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-visor-console</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/modules/visor-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-plugins/pom.xml b/modules/visor-plugins/pom.xml
index 4e58ab8..634ac5d 100644
--- a/modules/visor-plugins/pom.xml
+++ b/modules/visor-plugins/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-visor-plugins</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<dependencies>
<!-- Ignite dependencies -->
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/modules/web/pom.xml
----------------------------------------------------------------------
diff --git a/modules/web/pom.xml b/modules/web/pom.xml
index de50712..674fc2a 100644
--- a/modules/web/pom.xml
+++ b/modules/web/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-web</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/modules/yardstick/pom.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml
index 6bd65cc..a149db3 100644
--- a/modules/yardstick/pom.xml
+++ b/modules/yardstick/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-yardstick</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<properties>
<yardstick.version>0.7.0</yardstick.version>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bfb1d86/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 205d286..aa3be2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,13 +32,13 @@
<groupId>org.apache.ignite</groupId>
<artifactId>ignite</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<ignite.site>scp://localhost:/home</ignite.site>
<ignite.site.folder>${project.artifactId}-${project.version}</ignite.site.folder>
- <!--fix <attachartifact>...</> at apache-release profile if changed-->
+ <!--fix <attachartifact>...< /> at apache-release profile if changed-->
<ignite.zip.pattern>ignite-${ignite.edition}-${project.version}</ignite.zip.pattern>
</properties>
@@ -508,14 +508,8 @@
<configuration>
<failOnError>false</failOnError>
<target>
- <attachartifact
- file="${basedir}/target/bin/ignite-fabric-${project.version}.zip"
- classifier="fabric"
- type="zip"/>
- <attachartifact
- file="${basedir}/target/bin/ignite-hadoop-${project.version}.zip"
- classifier="hadoop"
- type="zip"/>
+ <attachartifact file="${basedir}/target/bin/ignite-fabric-${project.version}.zip" classifier="fabric" type="zip" />
+ <attachartifact file="${basedir}/target/bin/ignite-hadoop-${project.version}.zip" classifier="hadoop" type="zip" />
</target>
</configuration>
</execution>
[26/28] incubator-ignite git commit: # ignite-sprint-5 added test
Posted by sb...@apache.org.
# ignite-sprint-5 added test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6395b434
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6395b434
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6395b434
Branch: refs/heads/ignite-709_2
Commit: 6395b434e37b93f025c7b81802a77aa4f1aebf4c
Parents: f6012f1
Author: sboikov <sb...@gridgain.com>
Authored: Tue May 12 16:02:45 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue May 12 16:02:45 2015 +0300
----------------------------------------------------------------------
.../cache/GridCacheOffheapIndexGetSelfTest.java | 111 +++++++++++++++++++
.../IgniteCacheWithIndexingTestSuite.java | 2 +
2 files changed, 113 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6395b434/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java
new file mode 100644
index 0000000..4e40040
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java
@@ -0,0 +1,111 @@
+/*
+ * 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;
+
+import org.apache.ignite.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.spi.swapspace.file.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import static org.apache.ignite.configuration.DeploymentMode.*;
+
+/**
+ * Tests off heap storage when both offheaped and swapped entries exists.
+ */
+public class GridCacheOffheapIndexGetSelfTest extends GridCommonAbstractTest {
+ /** */
+ private static final long OFFHEAP_MEM = 10L * 1024L;
+
+ /** */
+ private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ TcpDiscoverySpi disco = new TcpDiscoverySpi();
+
+ disco.setIpFinder(ipFinder);
+
+ cfg.setDiscoverySpi(disco);
+
+ cfg.setNetworkTimeout(2000);
+
+ cfg.setSwapSpaceSpi(new FileSwapSpaceSpi());
+
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
+
+ cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
+ cacheCfg.setSwapEnabled(true);
+ cacheCfg.setCacheMode(PARTITIONED);
+ cacheCfg.setBackups(1);
+ cacheCfg.setOffHeapMaxMemory(OFFHEAP_MEM);
+ cacheCfg.setEvictSynchronized(true);
+ cacheCfg.setEvictSynchronizedKeyBufferSize(1);
+ cacheCfg.setAtomicityMode(TRANSACTIONAL);
+ cacheCfg.setMemoryMode(OFFHEAP_TIERED);
+ cacheCfg.setEvictionPolicy(null);
+ cacheCfg.setOffHeapMaxMemory(OFFHEAP_MEM);
+ cacheCfg.setIndexedTypes(Long.class, Long.class);
+
+ cfg.setCacheConfiguration(cacheCfg);
+
+ cfg.setDeploymentMode(SHARED);
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ startGrids(2);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ stopAllGrids();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ grid(0).cache(null).clear();
+ }
+
+ /**
+ * Tests behavior on offheaped entries.
+ *
+ * @throws Exception If failed.
+ */
+ public void testGet() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-873");
+
+ IgniteCache<Long, Long> cache = grid(0).cache(null);
+
+ for (long i = 0; i < 100; i++)
+ cache.put(i, i);
+
+ for (long i = 0; i < 100; i++)
+ assertEquals((Long)i, cache.get(i));
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6395b434/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java
index a2ccc82..ae45120 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java
@@ -46,6 +46,8 @@ public class IgniteCacheWithIndexingTestSuite extends TestSuite {
suite.addTestSuite(CacheTtlOnheapAtomicLocalSelfTest.class);
suite.addTestSuite(CacheTtlOnheapAtomicPartitionedSelfTest.class);
+ suite.addTestSuite(GridCacheOffheapIndexGetSelfTest.class);
+
suite.addTestSuite(CacheConfigurationP2PTest.class);
return suite;
[24/28] incubator-ignite git commit: KEYS file is optional since this
moment
Posted by sb...@apache.org.
KEYS file is optional since this moment
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b95d2ae6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b95d2ae6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b95d2ae6
Branch: refs/heads/ignite-709_2
Commit: b95d2ae6c40faa45a68f2566df8e4ebb8b25d4fe
Parents: a4c9653
Author: avinogradov <av...@gridgain.com>
Authored: Tue May 12 15:32:51 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Tue May 12 15:32:51 2015 +0300
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b95d2ae6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 451812a..0643227 100644
--- a/pom.xml
+++ b/pom.xml
@@ -573,7 +573,7 @@
<include name="**/*" />
</fileset>
</copy>
- <copy file="${basedir}/KEYS" todir="${basedir}/target/site" />
+ <copy file="${basedir}/KEYS" todir="${basedir}/target/site" failonerror="false"/>
</target>
</configuration>
</execution>
[09/28] incubator-ignite git commit: ignite-853
Posted by sb...@apache.org.
ignite-853
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dabcf1d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dabcf1d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dabcf1d6
Branch: refs/heads/ignite-709_2
Commit: dabcf1d6638ff056c005b26f60827ad977921749
Parents: dfeceaf
Author: avinogradov <av...@gridgain.com>
Authored: Thu May 7 15:18:19 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Thu May 7 15:18:19 2015 +0300
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dabcf1d6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7614422..c445fd3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
<scm>
<url>https://git-wip-us.apache.org/repos/asf/incubator-ignite</url>
- <connection>scm:git:git://git-wip-us.apache.org/repos/asf/incubator-ignite</connection>
+ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-ignite</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-ignite</developerConnection>
<tag>HEAD</tag>
</scm>
[03/28] incubator-ignite git commit: ignite-853
Posted by sb...@apache.org.
ignite-853
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2d0a6e80
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2d0a6e80
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2d0a6e80
Branch: refs/heads/ignite-709_2
Commit: 2d0a6e80e75ab0e7bb5417fb8815716936736bf6
Parents: a33d3d4
Author: avinogradov <av...@gridgain.com>
Authored: Wed May 6 19:05:04 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Wed May 6 19:05:04 2015 +0300
----------------------------------------------------------------------
pom.xml | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d0a6e80/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c859021..1a9fc9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
<properties>
<ignite.site>scp://localhost:/home</ignite.site>
<!--fix <attachartifact>...</> at apache-release profile if changed-->
- <ignite.zip.pattern>ignite-${ignite.edition}-${project.version}-incubating</ignite.zip.pattern>
+ <ignite.zip.pattern>ignite-${ignite.edition}-${project.version}</ignite.zip.pattern>
</properties>
<scm>
@@ -488,7 +488,7 @@
<descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
</descriptorRefs>
<tarLongFileMode>gnu</tarLongFileMode>
- <finalName>incubator-ignite-${project.version}-src</finalName>
+ <finalName>ignite-${project.version}-src</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
@@ -509,11 +509,11 @@
<failOnError>false</failOnError>
<target>
<attachartifact
- file="${basedir}/target/bin/ignite-fabric-${project.version}-incubating.zip"
+ file="${basedir}/target/bin/ignite-fabric-${project.version}.zip"
classifier="fabric"
type="zip"/>
<attachartifact
- file="${basedir}/target/bin/ignite-hadoop-${project.version}-incubating.zip"
+ file="${basedir}/target/bin/ignite-hadoop-${project.version}.zip"
classifier="hadoop"
type="zip"/>
</target>
@@ -562,7 +562,7 @@
<fileSet>
<directory>${basedir}/target</directory>
<includes>
- <include>incubator-ignite-${project.version}-src.zip</include>
+ <include>ignite-${project.version}-src.zip</include>
<include>bin/*.zip</include>
</includes>
</fileSet>
@@ -590,10 +590,10 @@
<failOnError>false</failOnError>
<target>
<mkdir dir="${basedir}/target/site" />
- <copy file="${basedir}/target/incubator-ignite-${project.version}-src.zip" tofile="${basedir}/target/site/incubator-ignite-${project.version}-src.zip" failonerror="false" />
- <copy file="${basedir}/target/incubator-ignite-${project.version}-src.zip.asc" tofile="${basedir}/target/site/incubator-ignite-${project.version}-src.zip.asc" failonerror="false" />
- <copy file="${basedir}/target/incubator-ignite-${project.version}-src.zip.md5" tofile="${basedir}/target/site/incubator-ignite-${project.version}-src.zip.md5" failonerror="false" />
- <copy file="${basedir}/target/incubator-ignite-${project.version}-src.zip.sha1" tofile="${basedir}/target/site/incubator-ignite-${project.version}-src.zip.sha1" failonerror="false" />
+ <copy file="${basedir}/target/ignite-${project.version}-src.zip" tofile="${basedir}/target/site/ignite-${project.version}-src.zip" failonerror="false" />
+ <copy file="${basedir}/target/ignite-${project.version}-src.zip.asc" tofile="${basedir}/target/site/ignite-${project.version}-src.zip.asc" failonerror="false" />
+ <copy file="${basedir}/target/ignite-${project.version}-src.zip.md5" tofile="${basedir}/target/site/ignite-${project.version}-src.zip.md5" failonerror="false" />
+ <copy file="${basedir}/target/ignite-${project.version}-src.zip.sha1" tofile="${basedir}/target/site/ignite-${project.version}-src.zip.sha1" failonerror="false" />
<copy todir="${basedir}/target/site">
<fileset dir="${basedir}/target/bin">
<include name="**/*" />
[25/28] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-4' into ignite-sprint-5
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-sprint-5
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c2357116
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c2357116
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c2357116
Branch: refs/heads/ignite-709_2
Commit: c235711673fcfaf1cb01bbee82e124d08544d875
Parents: f6012f1 b95d2ae
Author: avinogradov <av...@gridgain.com>
Authored: Tue May 12 15:35:58 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Tue May 12 15:35:58 2015 +0300
----------------------------------------------------------------------
assembly/release-base.xml | 4 +-
bin/ignite-schema-import.bat | 2 +-
bin/ignite-schema-import.sh | 2 +-
bin/ignite.bat | 2 +-
bin/ignite.sh | 2 +-
bin/ignitevisorcmd.bat | 2 +-
bin/ignitevisorcmd.sh | 2 +-
bin/include/build-classpath.bat | 46 +++++++++++++++++++++++
bin/include/build-classpath.sh | 71 +++++++++++++++++++++++++++++++++++
bin/include/target-classpath.bat | 46 -----------------------
bin/include/target-classpath.sh | 71 -----------------------------------
pom.xml | 50 ++++++++++++------------
12 files changed, 152 insertions(+), 148 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c2357116/pom.xml
----------------------------------------------------------------------
[21/28] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-5' into ignite-sprint-5
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-sprint-5
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f6012f1e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f6012f1e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f6012f1e
Branch: refs/heads/ignite-709_2
Commit: f6012f1e802be3ade9efd53d79ec6b85df5a4c8c
Parents: e6ca757 f4a3591
Author: avinogradov <av...@gridgain.com>
Authored: Fri May 8 18:54:49 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Fri May 8 18:54:49 2015 +0300
----------------------------------------------------------------------
.../processors/resource/GridResourceField.java | 11 +
.../processors/resource/GridResourceIoc.java | 387 ++++++-------------
.../processors/resource/GridResourceMethod.java | 13 +
.../resource/GridResourceProcessor.java | 4 +-
.../ignite/internal/util/IgniteUtils.java | 15 +
.../spi/discovery/tcp/TcpDiscoverySpi.java | 24 +-
6 files changed, 191 insertions(+), 263 deletions(-)
----------------------------------------------------------------------
[13/28] incubator-ignite git commit: rat fix
Posted by sb...@apache.org.
rat 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/ecc7a50a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ecc7a50a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ecc7a50a
Branch: refs/heads/ignite-709_2
Commit: ecc7a50a0e45102ba9e5025435bb33e2cd5d0a96
Parents: 2d4a3fb
Author: avinogradov <av...@gridgain.com>
Authored: Fri May 8 16:13:34 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Fri May 8 16:13:34 2015 +0300
----------------------------------------------------------------------
parent/pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ecc7a50a/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index e3f70b4..cd098d9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -619,6 +619,7 @@
<exclude>**/keystore/*.pfx</exclude><!--bin-files-->
<!--special excludes-->
<exclude>DEVNOTES.txt</exclude>
+ <exclude>DEPENDENCIES</exclude><!--automatically generated file. presents at source pack-->
<exclude>src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSnapTreeMap.java</exclude><!--BSD license-->
<exclude>src/main/java/org/apache/ignite/internal/util/snaptree/*.java</exclude><!--BSD license-->
<exclude>src/main/java/org/jsr166/*.java</exclude>
[04/28] incubator-ignite git commit: ignite-853
Posted by sb...@apache.org.
ignite-853
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5cefca0f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5cefca0f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5cefca0f
Branch: refs/heads/ignite-709_2
Commit: 5cefca0f1473faab4aeb2f149de36c4fdef19460
Parents: 2d0a6e8
Author: avinogradov <av...@gridgain.com>
Authored: Wed May 6 19:18:44 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Wed May 6 19:18:44 2015 +0300
----------------------------------------------------------------------
pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5cefca0f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1a9fc9c..fc9ca04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,7 @@
<properties>
<ignite.site>scp://localhost:/home</ignite.site>
+ <ignite.site.folder>${project.artifactId}-${project.version}</ignite.site.folder>
<!--fix <attachartifact>...</> at apache-release profile if changed-->
<ignite.zip.pattern>ignite-${ignite.edition}-${project.version}</ignite.zip.pattern>
</properties>
@@ -51,7 +52,7 @@
<distributionManagement>
<site>
<id>ignite-site</id>
- <url>${ignite.site}/${project.artifactId}-${project.version}</url>
+ <url>${ignite.site}/${ignite.site.folder}</url>
</site>
</distributionManagement>
[14/28] incubator-ignite git commit: Merge branches 'ignite-478' and
'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-478
Posted by sb...@apache.org.
Merge branches 'ignite-478' and 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-478
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d0810461
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d0810461
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d0810461
Branch: refs/heads/ignite-709_2
Commit: d0810461d61f35cc855998515beb467b49b74246
Parents: eae6f5e 2361640
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Fri May 8 16:30:30 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Fri May 8 16:30:30 2015 +0300
----------------------------------------------------------------------
DEVNOTES.txt | 34 +-
RELEASE_NOTES.txt | 13 +-
assembly/release-base.xml | 2 +
assembly/release-schema-import.xml | 50 +
dev-tools/.gitignore | 2 +
dev-tools/build.gradle | 45 +
dev-tools/src/main/groovy/jiraslurp.groovy | 146 +
examples/pom.xml | 2 +-
.../streaming/wordcount/CacheConfig.java | 5 -
modules/aop/pom.xml | 2 +-
.../aop/aspectj/GridifyAspectJAspect.java | 2 +-
.../aspectj/GridifySetToSetAspectJAspect.java | 2 +-
.../aspectj/GridifySetToValueAspectJAspect.java | 2 +-
.../aop/spring/GridifySetToSetSpringAspect.java | 2 +-
.../spring/GridifySetToValueSpringAspect.java | 2 +-
.../gridify/aop/spring/GridifySpringAspect.java | 2 +-
modules/aws/pom.xml | 2 +-
.../spi/checkpoint/s3/S3CheckpointSpi.java | 2 +-
.../config/grid-client-config.properties | 50 +-
modules/clients/pom.xml | 2 +-
.../ClientPropertiesConfigurationSelfTest.java | 12 +-
.../clients/src/test/resources/spring-cache.xml | 4 +-
.../src/test/resources/spring-server-node.xml | 4 +-
.../test/resources/spring-server-ssl-node.xml | 4 +-
modules/cloud/README.txt | 32 +
modules/cloud/licenses/apache-2.0.txt | 202 +
modules/cloud/pom.xml | 106 +
.../cloud/TcpDiscoveryCloudIpFinder.java | 433 ++
.../tcp/ipfinder/cloud/package-info.java | 21 +
.../TcpDiscoveryCloudIpFinderSelfTest.java | 122 +
.../tcp/ipfinder/cloud/package-info.java | 22 +
.../ignite/testsuites/IgniteCloudTestSuite.java | 112 +
modules/codegen/pom.xml | 2 +-
.../ignite/codegen/MessageCodeGenerator.java | 30 +-
modules/core/pom.xml | 2 +-
.../java/org/apache/ignite/IgniteCache.java | 5 +
.../org/apache/ignite/IgniteJdbcDriver.java | 81 +-
.../java/org/apache/ignite/IgniteLogger.java | 8 +-
.../java/org/apache/ignite/IgniteServices.java | 2 +-
.../main/java/org/apache/ignite/Ignition.java | 46 +-
.../apache/ignite/cache/CacheInterceptor.java | 9 +-
.../cache/CacheServerNotFoundException.java | 12 +-
.../apache/ignite/cache/CachingProvider.java | 3 +
.../eviction/sorted/SortedEvictionPolicy.java | 2 +-
.../configuration/CacheConfiguration.java | 277 +-
.../configuration/ConnectorConfiguration.java | 2 +-
.../configuration/IgniteConfiguration.java | 445 +-
.../ignite/configuration/TopologyValidator.java | 35 +
.../ignite/events/CacheQueryExecutedEvent.java | 3 +-
.../ignite/events/CacheQueryReadEvent.java | 3 +-
.../ignite/internal/GridDirectCollection.java | 3 +
.../ignite/internal/GridJobContextImpl.java | 7 +-
.../ignite/internal/GridUpdateNotifier.java | 66 +-
.../ignite/internal/IgniteComponentType.java | 36 +-
.../apache/ignite/internal/IgniteKernal.java | 98 +-
.../org/apache/ignite/internal/IgnitionEx.java | 196 +-
.../ignite/internal/MarshallerContextImpl.java | 2 +-
.../client/GridClientConfiguration.java | 2 +-
.../connection/GridClientNioTcpConnection.java | 9 +-
.../internal/cluster/ClusterGroupAdapter.java | 16 +
.../ClusterTopologyServerNotFoundException.java | 12 +-
.../managers/communication/GridIoManager.java | 69 +-
.../communication/GridIoMessageFactory.java | 12 +-
.../GridLifecycleAwareMessageFilter.java | 35 +
.../deployment/GridDeploymentClassLoader.java | 2 +-
.../deployment/GridDeploymentManager.java | 2 +-
.../GridDeploymentPerVersionStore.java | 3 +-
.../discovery/GridDiscoveryManager.java | 21 +-
.../eventstorage/GridEventStorageManager.java | 6 +
.../managers/indexing/GridIndexingManager.java | 14 +-
.../affinity/GridAffinityAssignmentCache.java | 4 +-
.../processors/cache/CacheInvokeResult.java | 24 +-
.../processors/cache/CacheObjectImpl.java | 2 +-
.../cache/CacheStoreBalancingWrapper.java | 6 +
.../cache/DynamicCacheDescriptor.java | 16 +-
.../processors/cache/GridCacheAdapter.java | 555 +-
.../cache/GridCacheAffinityManager.java | 12 -
.../processors/cache/GridCacheEntryEx.java | 4 +
.../cache/GridCacheEvictionManager.java | 2 +-
.../processors/cache/GridCacheIoManager.java | 320 +-
.../processors/cache/GridCacheMapEntry.java | 51 +-
.../processors/cache/GridCacheMessage.java | 8 +-
.../processors/cache/GridCacheMvccManager.java | 2 +-
.../GridCachePartitionExchangeManager.java | 10 +-
.../processors/cache/GridCacheProcessor.java | 192 +-
.../processors/cache/GridCacheProxyImpl.java | 24 -
.../processors/cache/GridCacheReturn.java | 5 +-
.../cache/GridCacheSharedContext.java | 2 +-
.../processors/cache/GridCacheSwapManager.java | 250 +-
.../processors/cache/GridCacheTtlManager.java | 156 +-
.../processors/cache/GridCacheUtils.java | 59 +-
.../processors/cache/IgniteCacheProxy.java | 25 +-
.../processors/cache/IgniteInternalCache.java | 27 -
.../cache/affinity/GridCacheAffinityImpl.java | 2 +-
...ridCacheOptimisticCheckPreparedTxFuture.java | 383 -
...idCacheOptimisticCheckPreparedTxRequest.java | 232 -
...dCacheOptimisticCheckPreparedTxResponse.java | 179 -
.../distributed/GridCacheTxRecoveryFuture.java | 506 ++
.../distributed/GridCacheTxRecoveryRequest.java | 261 +
.../GridCacheTxRecoveryResponse.java | 182 +
.../GridDistributedCacheAdapter.java | 20 +-
.../distributed/GridDistributedLockRequest.java | 99 +-
.../GridDistributedTxRemoteAdapter.java | 5 +-
.../distributed/dht/GridDhtCacheAdapter.java | 4 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 9 +-
.../distributed/dht/GridDhtLocalPartition.java | 2 +-
.../distributed/dht/GridDhtLockFuture.java | 38 +-
.../distributed/dht/GridDhtLockRequest.java | 45 +-
.../distributed/dht/GridDhtTopologyFuture.java | 8 +
.../dht/GridDhtTransactionalCacheAdapter.java | 21 +-
.../distributed/dht/GridDhtTxFinishFuture.java | 102 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 9 +
.../distributed/dht/GridDhtTxLocalAdapter.java | 49 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 16 +-
.../cache/distributed/dht/GridDhtTxRemote.java | 14 +-
.../dht/GridPartitionedGetFuture.java | 9 +-
.../dht/atomic/GridDhtAtomicCache.java | 44 +-
.../dht/atomic/GridDhtAtomicUpdateResponse.java | 8 +
.../dht/atomic/GridNearAtomicUpdateFuture.java | 47 +-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 49 +-
.../atomic/GridNearAtomicUpdateResponse.java | 18 +-
.../dht/colocated/GridDhtColocatedCache.java | 56 +-
.../colocated/GridDhtColocatedLockFuture.java | 44 +-
.../dht/preloader/GridDhtForceKeysFuture.java | 6 +
.../dht/preloader/GridDhtForceKeysResponse.java | 54 +-
.../preloader/GridDhtPartitionSupplyPool.java | 2 +-
.../GridDhtPartitionsExchangeFuture.java | 20 +
.../dht/preloader/GridDhtPreloader.java | 2 +-
.../distributed/near/GridNearAtomicCache.java | 7 +-
.../distributed/near/GridNearCacheAdapter.java | 20 +-
.../distributed/near/GridNearCacheEntry.java | 10 +-
.../distributed/near/GridNearGetFuture.java | 17 +-
.../distributed/near/GridNearGetResponse.java | 8 +-
.../distributed/near/GridNearLockFuture.java | 41 +-
.../distributed/near/GridNearLockRequest.java | 61 +-
.../near/GridNearTransactionalCache.java | 45 +-
.../near/GridNearTxFinishFuture.java | 3 +
.../cache/distributed/near/GridNearTxLocal.java | 13 +-
.../near/GridNearTxPrepareFuture.java | 20 +
.../distributed/near/GridNearTxRemote.java | 7 +-
.../processors/cache/local/GridLocalCache.java | 8 +-
.../local/atomic/GridLocalAtomicCache.java | 92 +-
.../query/GridCacheDistributedQueryManager.java | 3 +
.../cache/query/GridCacheLocalQueryFuture.java | 3 +
.../query/GridCacheQueryFutureAdapter.java | 3 +
.../cache/query/GridCacheQueryManager.java | 63 +-
.../cache/query/GridCacheSqlQuery.java | 137 +-
.../cache/query/GridCacheTwoStepQuery.java | 25 +-
.../jdbc/GridCacheQueryJdbcMetadataTask.java | 3 +
.../cache/transactions/IgniteInternalTx.java | 10 +-
.../cache/transactions/IgniteTxAdapter.java | 19 +-
.../cache/transactions/IgniteTxEntry.java | 74 +-
.../cache/transactions/IgniteTxHandler.java | 116 +-
.../transactions/IgniteTxLocalAdapter.java | 122 +-
.../cache/transactions/IgniteTxLocalEx.java | 4 +-
.../cache/transactions/IgniteTxManager.java | 286 +-
.../IgniteCacheObjectProcessorImpl.java | 2 +-
.../closure/GridClosureProcessor.java | 16 +-
.../datastreamer/DataStreamProcessor.java | 28 +-
.../datastreamer/DataStreamerImpl.java | 5 +-
.../datastreamer/DataStreamerRequest.java | 38 +-
.../processors/igfs/IgfsDataManager.java | 3 +
.../processors/igfs/IgfsDeleteWorker.java | 4 +
.../processors/igfs/IgfsFileWorkerBatch.java | 3 +
.../processors/igfs/IgfsMetaManager.java | 2 +-
.../internal/processors/igfs/IgfsThread.java | 8 +-
.../internal/processors/igfs/IgfsUtils.java | 11 +-
.../processors/job/GridJobProcessor.java | 6 +
.../internal/processors/job/GridJobWorker.java | 9 +
.../offheap/GridOffHeapProcessor.java | 17 +
.../portable/GridPortableInputStream.java | 26 -
.../processors/query/GridQueryIndexing.java | 23 +-
.../processors/query/GridQueryProcessor.java | 83 +-
.../messages/GridQueryNextPageResponse.java | 68 +-
.../h2/twostep/messages/GridQueryRequest.java | 21 +-
.../processors/rest/GridRestProcessor.java | 3 +
.../top/GridTopologyCommandHandler.java | 3 +-
.../service/GridServiceProcessor.java | 9 +
.../processors/task/GridTaskWorker.java | 12 +
.../timeout/GridTimeoutProcessor.java | 3 +
.../ignite/internal/util/GridJavaProcess.java | 4 +
.../ignite/internal/util/IgniteUtils.java | 22 +-
.../util/ipc/loopback/IpcServerTcpEndpoint.java | 2 +-
.../shmem/IpcSharedMemoryServerEndpoint.java | 2 +-
.../util/lang/GridFilteredIterator.java | 2 +-
.../ignite/internal/util/lang/GridFunc.java | 7218 +++++-------------
.../ignite/internal/util/nio/GridNioServer.java | 6 +
.../util/offheap/GridOffHeapPartitionedMap.java | 9 +
.../unsafe/GridUnsafePartitionedMap.java | 155 +-
.../util/spring/IgniteSpringHelper.java | 56 +-
.../util/tostring/GridToStringBuilder.java | 2 +-
.../apache/ignite/internal/util/typedef/X.java | 2 +-
.../ignite/internal/util/worker/GridWorker.java | 3 +
.../ignite/internal/visor/cache/VisorCache.java | 92 +-
.../visor/cache/VisorCacheConfiguration.java | 7 -
.../internal/visor/cache/VisorCacheMetrics.java | 53 +-
.../cache/VisorCacheNearConfiguration.java | 4 +-
.../visor/cache/VisorCacheNodesTask.java | 74 +
.../visor/cache/VisorCacheStartTask.java | 155 +
.../cache/VisorCacheStoreConfiguration.java | 35 -
.../cache/VisorCacheTypeFieldMetadata.java | 36 +-
.../visor/cache/VisorCacheTypeMetadata.java | 99 +-
.../internal/visor/igfs/VisorIgfsMetrics.java | 128 +-
.../visor/misc/VisorResolveHostNameTask.java | 2 +-
.../visor/node/VisorBasicConfiguration.java | 11 +
.../visor/node/VisorNodeDataCollectorJob.java | 8 +-
.../node/VisorNodeEventsCollectorTask.java | 58 +-
.../internal/visor/query/VisorQueryArg.java | 31 +-
.../internal/visor/query/VisorQueryCursor.java | 1 -
.../internal/visor/query/VisorQueryJob.java | 11 +-
.../internal/visor/query/VisorQueryTask.java | 41 -
.../internal/visor/util/VisorEventMapper.java | 13 +
.../internal/visor/util/VisorTaskUtils.java | 12 +-
.../apache/ignite/lang/IgniteAsyncSupport.java | 4 +-
.../apache/ignite/logger/java/JavaLogger.java | 12 +-
.../apache/ignite/marshaller/Marshaller.java | 14 +-
.../ignite/marshaller/jdk/JdkMarshaller.java | 10 +-
.../optimized/OptimizedMarshaller.java | 8 +-
.../ignite/messaging/MessagingListenActor.java | 3 +
.../apache/ignite/resources/LoggerResource.java | 2 +-
.../apache/ignite/resources/SpringResource.java | 2 +-
.../org/apache/ignite/services/Service.java | 2 +-
.../ignite/services/ServiceConfiguration.java | 2 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 19 +-
.../org/apache/ignite/spi/IgniteSpiThread.java | 3 +
.../checkpoint/cache/CacheCheckpointSpi.java | 2 +-
.../spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 2 +-
.../sharedfs/SharedFsCheckpointSpi.java | 4 +-
.../fifoqueue/FifoQueueCollisionSpi.java | 10 +-
.../jobstealing/JobStealingCollisionSpi.java | 14 +-
.../PriorityQueueCollisionSpi.java | 6 +-
.../communication/tcp/TcpCommunicationSpi.java | 12 +-
.../discovery/tcp/TcpClientDiscoverySpi.java | 4 -
.../spi/discovery/tcp/TcpDiscoverySpi.java | 39 +-
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 18 +-
.../memory/MemoryEventStorageSpi.java | 10 +-
.../spi/failover/always/AlwaysFailoverSpi.java | 10 +-
.../jobstealing/JobStealingFailoverSpi.java | 6 +-
.../spi/failover/never/NeverFailoverSpi.java | 8 +-
.../apache/ignite/spi/indexing/IndexingSpi.java | 4 +-
.../adaptive/AdaptiveLoadBalancingSpi.java | 12 +-
.../roundrobin/RoundRobinLoadBalancingSpi.java | 10 +-
.../WeightedRandomLoadBalancingSpi.java | 10 +-
.../spi/swapspace/file/FileSwapSpaceSpi.java | 10 +-
.../startup/cmdline/CommandLineStartup.java | 5 +-
.../startup/cmdline/CommandLineTransformer.java | 3 +
.../resources/META-INF/classnames.properties | 64 +-
.../core/src/main/resources/ignite.properties | 2 +-
.../src/test/config/load/merge-sort-base.xml | 2 +-
.../internal/GridDiscoveryEventSelfTest.java | 30 +-
.../internal/GridUpdateNotifierSelfTest.java | 30 +-
.../processors/cache/CacheGetFromJobTest.java | 110 +
.../GridCacheAbstractFailoverSelfTest.java | 4 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 731 +-
.../cache/GridCacheAbstractSelfTest.java | 4 +-
.../cache/GridCacheSwapReloadSelfTest.java | 20 +-
.../processors/cache/GridCacheTestEntryEx.java | 2 +
...ProjectionForCachesOnDaemonNodeSelfTest.java | 147 +
.../IgniteCacheEntryListenerAbstractTest.java | 4 +-
.../IgniteCacheP2pUnmarshallingErrorTest.java | 189 +
...gniteCacheP2pUnmarshallingNearErrorTest.java | 56 +
...CacheP2pUnmarshallingRebalanceErrorTest.java | 80 +
.../IgniteCacheP2pUnmarshallingTxErrorTest.java | 109 +
.../cache/IgniteCachePeekModesAbstractTest.java | 15 +-
.../cache/IgniteCachePutAllRestartTest.java | 203 +
.../cache/IgniteCacheTxPreloadNoWriteTest.java | 29 +-
.../cache/IgniteExchangeFutureHistoryTest.java | 77 +
...gniteTopologyValidatorAbstractCacheTest.java | 183 +
...iteTopologyValidatorAbstractTxCacheTest.java | 125 +
...ValidatorNearPartitionedAtomicCacheTest.java | 30 +
...logyValidatorNearPartitionedTxCacheTest.java | 30 +
...logyValidatorPartitionedAtomicCacheTest.java | 49 +
...TopologyValidatorPartitionedTxCacheTest.java | 30 +
...ologyValidatorReplicatedAtomicCacheTest.java | 49 +
...eTopologyValidatorReplicatedTxCacheTest.java | 30 +
.../cache/OffHeapTieredTransactionSelfTest.java | 127 +
...CacheLoadingConcurrentGridStartSelfTest.java | 163 +
.../CacheNoValueClassOnServerNodeTest.java | 129 +
.../GridCacheAbstractNodeRestartSelfTest.java | 94 +-
...GridCacheLoadingConcurrentGridStartTest.java | 154 -
.../distributed/GridCacheLockAbstractTest.java | 75 +
.../IgniteCachePutGetRestartAbstractTest.java | 2 +-
...arDisabledFairAffinityPutGetRestartTest.java | 35 +
...xOriginatingNodeFailureAbstractSelfTest.java | 8 +-
...cOriginatingNodeFailureAbstractSelfTest.java | 7 +-
.../dht/GridCacheDhtPreloadSelfTest.java | 2 +-
...icOffHeapTieredMultiNodeFullApiSelfTest.java | 43 +
...ionedNearDisabledOffHeapFullApiSelfTest.java | 8 +-
...DisabledOffHeapMultiNodeFullApiSelfTest.java | 8 +-
...abledOffHeapTieredAtomicFullApiSelfTest.java | 56 +
...earDisabledOffHeapTieredFullApiSelfTest.java | 33 +
...edOffHeapTieredMultiNodeFullApiSelfTest.java | 33 +
...itionedTxOriginatingNodeFailureSelfTest.java | 2 -
...rDisabledPrimaryNodeFailureRecoveryTest.java | 31 +
...rtitionedPrimaryNodeFailureRecoveryTest.java | 31 +
...woBackupsPrimaryNodeFailureRecoveryTest.java | 37 +
...ePrimaryNodeFailureRecoveryAbstractTest.java | 533 ++
...CacheAtomicOffHeapTieredFullApiSelfTest.java | 32 +
...icOffHeapTieredMultiNodeFullApiSelfTest.java | 33 +
...yWriteOrderOffHeapTieredFullApiSelfTest.java | 33 +
...erOffHeapTieredMultiNodeFullApiSelfTest.java | 33 +
...achePartitionedMultiNodeFullApiSelfTest.java | 15 +-
.../GridCachePartitionedNodeRestartTest.java | 4 +-
...dCachePartitionedOffHeapFullApiSelfTest.java | 8 +-
...titionedOffHeapMultiNodeFullApiSelfTest.java | 8 +-
...PartitionedOffHeapTieredFullApiSelfTest.java | 32 +
...edOffHeapTieredMultiNodeFullApiSelfTest.java | 72 +
...ePartitionedOptimisticTxNodeRestartTest.java | 4 +-
.../near/IgniteCacheNearTxRollbackTest.java | 133 +
.../GridCacheReplicatedNodeRestartSelfTest.java | 2 +
...idCacheReplicatedOffHeapFullApiSelfTest.java | 8 +-
...plicatedOffHeapMultiNodeFullApiSelfTest.java | 8 +-
...eReplicatedOffHeapTieredFullApiSelfTest.java | 33 +
...edOffHeapTieredMultiNodeFullApiSelfTest.java | 33 +
...acheSortedEvictionPolicyPerformanceTest.java | 13 +-
.../IgniteCacheExpiryPolicyAbstractTest.java | 2 +-
.../IgniteCacheExpiryPolicyTestSuite.java | 2 +
.../expiry/IgniteCacheTtlCleanupSelfTest.java | 85 +
...LocalAtomicOffHeapTieredFullApiSelfTest.java | 32 +
.../GridCacheLocalIsolatedNodesSelfTest.java | 102 +
.../GridCacheLocalOffHeapFullApiSelfTest.java | 6 +-
...dCacheLocalOffHeapTieredFullApiSelfTest.java | 32 +
.../DataStreamerMultiThreadedSelfTest.java | 112 +
.../igfs/IgfsClientCacheSelfTest.java | 132 +
.../processors/igfs/IgfsOneClientNodeTest.java | 133 +
.../processors/igfs/IgfsStreamsSelfTest.java | 2 +-
...idFileSwapSpaceSpiMultithreadedLoadTest.java | 4 +-
.../logger/java/IgniteJavaLoggerTest.java | 65 -
.../ignite/logger/java/JavaLoggerTest.java | 65 +
.../tcp/TcpClientDiscoverySelfTest.java | 8 +
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 70 +-
.../GridSwapSpaceSpiAbstractSelfTest.java | 2 +-
.../testframework/junits/GridAbstractTest.java | 15 +
.../junits/logger/GridTestLog4jLogger.java | 10 +-
.../ignite/testsuites/IgniteBasicTestSuite.java | 4 +
.../IgniteCacheFailoverTestSuite.java | 11 +-
.../IgniteCacheFullApiSelfTestSuite.java | 18 +
...gniteCacheP2pUnmarshallingErrorTestSuit.java | 41 +
.../testsuites/IgniteCacheRestartTestSuite.java | 8 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 291 +-
.../testsuites/IgniteCacheTestSuite2.java | 141 +
.../testsuites/IgniteCacheTestSuite3.java | 140 +
.../testsuites/IgniteCacheTestSuite4.java | 131 +
.../IgniteCacheTxRecoverySelfTestSuite.java | 4 +
.../ignite/testsuites/IgniteIgfsTestSuite.java | 3 +
.../testsuites/IgniteLoggingSelfTestSuite.java | 2 +-
.../IgniteTopologyValidatorTestSuit.java | 43 +
modules/extdata/p2p/pom.xml | 2 +-
.../CacheNoValueClassOnServerTestClient.java | 88 +
.../apache/ignite/tests/p2p/cache/Person.java | 42 +
.../CacheConfigurationP2PTestClient.java | 1 -
modules/extdata/uri/pom.xml | 2 +-
modules/gce/README.txt | 32 +
modules/gce/licenses/apache-2.0.txt | 202 +
modules/gce/pom.xml | 92 +
.../gce/TcpDiscoveryGoogleStorageIpFinder.java | 380 +
.../tcp/ipfinder/gce/package-info.java | 22 +
...pDiscoveryGoogleStorageIpFinderSelfTest.java | 73 +
.../tcp/ipfinder/gce/package-info.java | 22 +
.../ignite/testsuites/IgniteGCETestSuite.java | 71 +
modules/geospatial/pom.xml | 2 +-
modules/hadoop/pom.xml | 2 +-
.../processors/hadoop/HadoopDefaultJobInfo.java | 3 +
.../processors/hadoop/HadoopProcessor.java | 2 +-
.../processors/hadoop/igfs/HadoopIgfsIpcIo.java | 3 +
.../hadoop/jobtracker/HadoopJobTracker.java | 5 +-
.../hadoop/taskexecutor/HadoopRunnableTask.java | 3 +
.../external/HadoopExternalTaskExecutor.java | 3 +
.../processors/hadoop/v2/HadoopV2Job.java | 11 +-
.../hadoop/v2/HadoopV2TaskContext.java | 9 +
modules/hibernate/pom.xml | 2 +-
modules/indexing/pom.xml | 2 +-
.../processors/query/h2/IgniteH2Indexing.java | 179 +-
.../query/h2/opt/GridH2AbstractKeyValueRow.java | 92 +-
.../query/h2/opt/GridH2KeyValueRowOffheap.java | 7 +-
.../query/h2/opt/GridH2KeyValueRowOnheap.java | 6 +-
.../query/h2/opt/GridH2RowDescriptor.java | 14 +-
.../processors/query/h2/opt/GridH2Table.java | 10 +-
.../query/h2/opt/GridH2ValueCacheObject.java | 191 +
.../query/h2/opt/GridLuceneIndex.java | 84 +-
.../processors/query/h2/sql/GridSqlQuery.java | 20 +
.../query/h2/sql/GridSqlQueryParser.java | 10 +-
.../query/h2/sql/GridSqlQuerySplitter.java | 11 +-
.../processors/query/h2/sql/GridSqlSelect.java | 2 +-
.../processors/query/h2/sql/GridSqlUnion.java | 2 +-
.../query/h2/twostep/GridMapQueryExecutor.java | 61 +-
.../query/h2/twostep/GridMergeIndex.java | 6 +-
.../h2/twostep/GridMergeIndexUnsorted.java | 4 +-
.../h2/twostep/GridReduceQueryExecutor.java | 162 +-
.../query/h2/twostep/GridResultPage.java | 80 +-
.../query/h2/twostep/msg/GridH2Array.java | 124 +
.../query/h2/twostep/msg/GridH2Boolean.java | 112 +
.../query/h2/twostep/msg/GridH2Byte.java | 113 +
.../query/h2/twostep/msg/GridH2Bytes.java | 113 +
.../query/h2/twostep/msg/GridH2CacheObject.java | 148 +
.../query/h2/twostep/msg/GridH2Date.java | 115 +
.../query/h2/twostep/msg/GridH2Decimal.java | 134 +
.../query/h2/twostep/msg/GridH2Double.java | 113 +
.../query/h2/twostep/msg/GridH2Float.java | 113 +
.../query/h2/twostep/msg/GridH2Geometry.java | 134 +
.../query/h2/twostep/msg/GridH2Integer.java | 113 +
.../query/h2/twostep/msg/GridH2JavaObject.java | 113 +
.../query/h2/twostep/msg/GridH2Long.java | 113 +
.../query/h2/twostep/msg/GridH2Null.java | 78 +
.../query/h2/twostep/msg/GridH2Short.java | 113 +
.../query/h2/twostep/msg/GridH2String.java | 115 +
.../query/h2/twostep/msg/GridH2Time.java | 116 +
.../query/h2/twostep/msg/GridH2Timestamp.java | 133 +
.../query/h2/twostep/msg/GridH2Uuid.java | 133 +
.../h2/twostep/msg/GridH2ValueMessage.java | 49 +
.../twostep/msg/GridH2ValueMessageFactory.java | 201 +
.../GridCacheAbstractFieldsQuerySelfTest.java | 1284 ----
.../cache/GridCacheOffHeapAndSwapSelfTest.java | 11 +-
.../cache/GridCacheOffHeapSelfTest.java | 11 +-
.../IgniteCacheAbstractFieldsQuerySelfTest.java | 256 +-
...niteCacheP2pUnmarshallingQueryErrorTest.java | 56 +
...eQueryMultiThreadedOffHeapTiredSelfTest.java | 37 +
.../IgniteCacheQueryMultiThreadedSelfTest.java | 35 +-
...artitionedFieldsQueryP2PEnabledSelfTest.java | 34 -
...GridCachePartitionedFieldsQuerySelfTest.java | 115 -
...rtitionedFieldsQueryP2PDisabledSelfTest.java | 34 -
...artitionedFieldsQueryP2PEnabledSelfTest.java | 34 +
...eReplicatedFieldsQueryP2PEnableSelfTest.java | 34 -
.../GridCacheReplicatedFieldsQuerySelfTest.java | 157 -
...eplicatedFieldsQueryP2PDisabledSelfTest.java | 34 -
...ReplicatedFieldsQueryP2PEnabledSelfTest.java | 34 +
.../h2/GridIndexingSpiAbstractSelfTest.java | 132 +-
.../query/h2/sql/BaseH2CompareQueryTest.java | 32 +-
.../IgniteCacheQuerySelfTestSuite.java | 8 +-
modules/jcl/pom.xml | 2 +-
.../ignite/logger/jcl/IgniteJclLogger.java | 167 -
.../org/apache/ignite/logger/jcl/JclLogger.java | 167 +
.../ignite/logger/jcl/IgniteJclLoggerTest.java | 48 -
.../apache/ignite/logger/jcl/JclLoggerTest.java | 48 +
.../ignite/testsuites/IgniteJclTestSuite.java | 2 +-
modules/jta/pom.xml | 2 +-
modules/log4j/pom.xml | 2 +-
.../apache/ignite/logger/log4j/Log4JLogger.java | 8 +-
modules/rest-http/pom.xml | 2 +-
.../http/jetty/GridJettyRestHandler.java | 3 +
modules/scalar/pom.xml | 2 +-
.../ignite/scalar/ScalarConversions.scala | 8 -
modules/schedule/pom.xml | 2 +-
modules/schema-import/pom.xml | 8 +-
.../ignite/schema/generator/CodeGenerator.java | 105 +-
.../ignite/schema/ui/SchemaImportApp.java | 8 +-
modules/slf4j/pom.xml | 2 +-
.../ignite/logger/slf4j/GridSlf4jLogger.java | 138 -
.../apache/ignite/logger/slf4j/Slf4jLogger.java | 138 +
modules/spring/pom.xml | 2 +-
.../util/spring/IgniteSpringHelperImpl.java | 217 +-
.../ignite/internal/GridFactorySelfTest.java | 3 +-
.../IgniteStartFromStreamConfigurationTest.java | 50 +
.../testsuites/IgniteSpringTestSuite.java | 2 +
modules/ssh/pom.xml | 2 +-
...gniteProjectionStartStopRestartSelfTest.java | 26 +-
modules/tools/pom.xml | 2 +-
modules/urideploy/pom.xml | 2 +-
.../uri/GridUriDeploymentClassLoader.java | 4 +-
.../spi/deployment/uri/UriDeploymentSpi.java | 2 +-
modules/visor-console/pom.xml | 2 +-
.../ignite/visor/commands/VisorConsole.scala | 314 +-
.../visor/commands/VisorConsoleCommand.scala | 77 -
.../ignite/visor/commands/VisorTextTable.scala | 539 --
.../visor/commands/ack/VisorAckCommand.scala | 42 +-
.../commands/alert/VisorAlertCommand.scala | 35 +-
.../commands/cache/VisorCacheClearCommand.scala | 51 +-
.../commands/cache/VisorCacheCommand.scala | 36 +-
.../commands/cache/VisorCacheScanCommand.scala | 60 +-
.../commands/cache/VisorCacheStopCommand.scala | 30 +-
.../commands/cache/VisorCacheSwapCommand.scala | 66 +-
.../commands/common/VisorConsoleCommand.scala | 90 +
.../visor/commands/common/VisorTextTable.scala | 543 ++
.../config/VisorConfigurationCommand.scala | 438 +-
.../commands/deploy/VisorDeployCommand.scala | 47 +-
.../commands/disco/VisorDiscoveryCommand.scala | 58 +-
.../commands/events/VisorEventsCommand.scala | 338 +-
.../visor/commands/gc/VisorGcCommand.scala | 130 +-
.../visor/commands/kill/VisorKillCommand.scala | 53 +-
.../visor/commands/node/VisorNodeCommand.scala | 47 +-
.../visor/commands/ping/VisorPingCommand.scala | 41 +-
.../commands/start/VisorStartCommand.scala | 34 +-
.../commands/tasks/VisorTasksCommand.scala | 76 +-
.../commands/top/VisorTopologyCommand.scala | 36 +-
.../visor/commands/vvm/VisorVvmCommand.scala | 32 +-
.../scala/org/apache/ignite/visor/visor.scala | 286 +-
.../ignite/visor/VisorTextTableSpec.scala | 3 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
modules/yardstick/pom.xml | 2 +-
pom.xml | 237 +-
491 files changed, 21924 insertions(+), 13692 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0810461/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
[10/28] incubator-ignite git commit: rat fix
Posted by sb...@apache.org.
rat 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/dea61181
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dea61181
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dea61181
Branch: refs/heads/ignite-709_2
Commit: dea6118127da7426c2ba212bbbe2bec1e5e1f3b8
Parents: 0c13a08
Author: avinogradov <av...@gridgain.com>
Authored: Fri May 8 12:35:43 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Fri May 8 12:35:43 2015 +0300
----------------------------------------------------------------------
parent/pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dea61181/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 661b310..e3f70b4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -628,6 +628,7 @@
<exclude>src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/ignite.empty</exclude><!--should be empty-->
<exclude>src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/ignite.brokenxml</exclude><!--test resource-->
<exclude>src/test/java/org/apache/ignite/internal/processors/hadoop/books/*.txt</exclude><!--books examples-->
+ <exclude>src/main/java/org/apache/ignite/examples/streaming/wordcount/*.txt</exclude><!--books examples-->
<exclude>examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/*.txt</exclude><!--books examples-->
<exclude>src/main/java/META-INF/services/javax.cache.spi.CachingProvider</exclude><!--cannot be changed-->
<exclude>src/main/java/org/jetbrains/annotations/*.java</exclude><!--copyright-->