ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [49/50] [abbrv] incubator-ignite git commit: # ignite-6
Date Tue, 03 Feb 2015 12:33:08 GMT
# ignite-6


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/64645f61
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/64645f61
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/64645f61

Branch: refs/heads/ignite-6
Commit: 64645f61bbcbe673f8c854198091e5992b2e5ad8
Parents: c6ca063
Author: sboikov <sboikov@gridgain.com>
Authored: Tue Feb 3 14:59:27 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Tue Feb 3 15:27:23 2015 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/IgniteQueue.java     |  22 +-
 .../main/java/org/apache/ignite/IgniteSet.java  |  55 ++-
 .../DataStructureRemovedException.java          |  61 ----
 .../ignite/cache/datastructures/package.html    |  24 --
 .../IgniteCollectionConfiguration.java          | 124 +------
 .../DataStructureRemovedException.java          |  61 ++++
 .../ignite/internal/GridKernalContext.java      |   8 +-
 .../ignite/internal/GridKernalContextImpl.java  |   8 +-
 .../apache/ignite/internal/IgniteKernal.java    |  16 +-
 .../processors/cache/GridCacheAdapter.java      | 123 ++++---
 .../processors/cache/GridCacheContext.java      |   9 +-
 .../CacheDataStructuresManager.java             |   4 +-
 .../CacheDataStructuresProcessor.java           | 358 ++++---------------
 .../GridAtomicCacheQueueImpl.java               |   2 +-
 .../datastructures/GridCacheAtomicLongImpl.java |   2 +-
 .../GridCacheAtomicReferenceImpl.java           |   2 +-
 .../GridCacheAtomicSequenceImpl.java            |   2 +-
 .../GridCacheAtomicStampedImpl.java             |   2 +-
 .../datastructures/GridCacheQueueAdapter.java   |  61 ++--
 .../datastructures/GridCacheQueueProxy.java     |  60 ++--
 .../datastructures/GridCacheSetImpl.java        |  16 +-
 .../datastructures/GridCacheSetProxy.java       |  32 +-
 .../GridTransactionalCacheQueueImpl.java        |   2 +-
 .../DataStructuresCommandHandler.java           |   8 +-
 ...eAbstractDataStructuresFailoverSelfTest.java |   6 +-
 ...actQueueFailoverDataConsistencySelfTest.java |  12 +-
 ...CacheAtomicReferenceApiSelfAbstractTest.java |   2 +-
 ...idCacheAtomicStampedApiSelfAbstractTest.java |   2 +-
 .../GridCacheQueueApiSelfAbstractTest.java      |  26 +-
 .../GridCacheQueueCleanupSelfTest.java          |  10 +-
 ...ridCacheQueueJoinedNodeSelfAbstractTest.java |   2 +-
 ...GridCacheQueueMultiNodeAbstractSelfTest.java |  36 +-
 ...dCacheQueueMultiNodeConsistencySelfTest.java |   8 +-
 ...CacheQueueRotativeMultiNodeAbstractTest.java |  16 +-
 .../GridCacheSequenceApiSelfAbstractTest.java   |   9 +-
 .../GridCacheSetAbstractSelfTest.java           |  40 +--
 .../GridCacheSetFailoverAbstractSelfTest.java   |   4 +-
 .../IgniteAtomicLongApiAbstractSelfTest.java    |   2 +-
 .../IgniteCollectionAbstractTest.java           | 164 ++++++++-
 .../IgniteCountDownLatchAbstractSelfTest.java   |   4 +-
 .../IgniteDataStructureUniqueNameTest.java      |   7 +-
 .../IgniteLocalCountDownLatchSelfTest.java      |   4 +-
 ...PartitionedQueueCreateMultiNodeSelfTest.java |   2 +-
 ...dCachePartitionedQueueEntryMoveSelfTest.java |   8 +-
 .../IgnitePartitionedSetNoBackupsSelfTest.java  |   9 +-
 .../cache/GridCacheDataStructuresLoadTest.java  |   6 +-
 .../GridCacheAbstractFieldsQuerySelfTest.java   |   1 +
 47 files changed, 606 insertions(+), 836 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64645f61/modules/core/src/main/java/org/apache/ignite/IgniteQueue.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteQueue.java b/modules/core/src/main/java/org/apache/ignite/IgniteQueue.java
index 6e0f109..82eae91 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteQueue.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteQueue.java
@@ -18,6 +18,7 @@
 package org.apache.ignite;
 
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.*;
 import org.jetbrains.annotations.*;
 
 import java.io.*;
@@ -148,29 +149,33 @@ public interface IgniteQueue<T> extends BlockingQueue<T>, Closeable {
     public void clear(int batchSize) throws IgniteException;
 
     /**
+     * Removes this queue.
+     *
+     * @throws IgniteException if operation failed.
+     */
+    @Override public void close() throws IgniteException;
+
+    /**
      * Gets maximum number of elements of the queue.
      *
      * @return Maximum number of elements. If queue is unbounded {@code Integer.MAX_SIZE} will return.
-     * @throws IgniteCheckedException If operation failed.
      */
-    public int capacity() throws IgniteCheckedException;
+    public int capacity();
 
     /**
      * Returns {@code true} if this queue is bounded.
      *
      * @return {@code true} if this queue is bounded.
-     * @throws IgniteCheckedException If operation failed.
      */
-    public boolean bounded() throws IgniteCheckedException;
+    public boolean bounded();
 
     /**
      * Returns {@code true} if this queue can be kept on the one node only.
      * Returns {@code false} if this queue can be kept on the many nodes.
      *
      * @return {@code true} if this queue is in {@code collocated} mode {@code false} otherwise.
-     * @throws IgniteCheckedException If operation failed.
      */
-    public boolean collocated() throws IgniteCheckedException;
+    public boolean collocated();
 
     /**
      * Gets status of queue.
@@ -178,9 +183,4 @@ public interface IgniteQueue<T> extends BlockingQueue<T>, Closeable {
      * @return {@code true} if queue was removed from cache {@code false} otherwise.
      */
     public boolean removed();
-
-    /**
-     * Removes this queue.
-     */
-    @Override public void close();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64645f61/modules/core/src/main/java/org/apache/ignite/IgniteSet.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteSet.java b/modules/core/src/main/java/org/apache/ignite/IgniteSet.java
index 0584a16..096bae8 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSet.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSet.java
@@ -18,6 +18,7 @@
 package org.apache.ignite;
 
 import org.apache.ignite.configuration.*;
+import org.jetbrains.annotations.*;
 
 import java.io.*;
 import java.util.*;
@@ -36,6 +37,52 @@ import java.util.*;
  * @see Ignite#set(String, IgniteCollectionConfiguration, boolean)
  */
 public interface IgniteSet<T> extends Set<T>, Closeable {
+    /** {@inheritDoc} */
+    @Override boolean add(T t) throws IgniteException;
+
+    /** {@inheritDoc} */
+    @Override boolean addAll(Collection<? extends T> c) throws IgniteException;
+
+    /** {@inheritDoc} */
+    @Override void clear() throws IgniteException;
+
+    /** {@inheritDoc} */
+    @Override boolean contains(Object o) throws IgniteException;
+
+    /** {@inheritDoc} */
+    @Override boolean containsAll(Collection<?> c) throws IgniteException;
+
+    /** {@inheritDoc} */
+    @Override boolean isEmpty() throws IgniteException;
+
+    /** {@inheritDoc} */
+    @Override Iterator<T> iterator() throws IgniteException;
+
+    /** {@inheritDoc} */
+    @Override boolean remove(Object o) throws IgniteException;
+
+    /** {@inheritDoc} */
+    @Override boolean removeAll(Collection<?> c) throws IgniteException;
+
+    /** {@inheritDoc} */
+    @Override boolean retainAll(Collection<?> c) throws IgniteException;
+
+    /** {@inheritDoc} */
+    @Override int size() throws IgniteException;
+
+    /** {@inheritDoc} */
+    @Override Object[] toArray() throws IgniteException;
+
+    /** {@inheritDoc} */
+    @Override <T1> T1[] toArray(T1[] a) throws IgniteException;
+
+    /**
+     * Removes this set.
+     *
+     * @throws IgniteException If operation failed.
+     */
+    @Override public void close() throws IgniteException;
+
     /**
      * Gets set name.
      *
@@ -48,9 +95,8 @@ public interface IgniteSet<T> extends Set<T>, Closeable {
      * Returns {@code false} if this set can be kept on the many nodes.
      *
      * @return {@code True} if this set is in {@code collocated} mode {@code false} otherwise.
-     * @throws IgniteCheckedException If operation failed.
      */
-    public boolean collocated() throws IgniteCheckedException;
+    public boolean collocated();
 
     /**
      * Gets status of set.
@@ -58,9 +104,4 @@ public interface IgniteSet<T> extends Set<T>, Closeable {
      * @return {@code True} if set was removed from cache {@code false} otherwise.
      */
     public boolean removed();
-
-    /**
-     * Removes this set.
-     */
-    @Override public void close();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64645f61/modules/core/src/main/java/org/apache/ignite/cache/datastructures/DataStructureRemovedException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/datastructures/DataStructureRemovedException.java b/modules/core/src/main/java/org/apache/ignite/cache/datastructures/DataStructureRemovedException.java
deleted file mode 100644
index b122a89..0000000
--- a/modules/core/src/main/java/org/apache/ignite/cache/datastructures/DataStructureRemovedException.java
+++ /dev/null
@@ -1,61 +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.
- */
-
-package org.apache.ignite.cache.datastructures;
-
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
-
-/**
- * This runtime exception gets thrown if attempt to access a removed data structure has been made.
- * <p>
- * Note that data structures throw runtime exceptions out of methods that don't have
- * checked exceptions in the signature.
- */
-public class DataStructureRemovedException extends IgniteException {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /**
-     * Creates new exception with given error message.
-     *
-     * @param msg Error message.
-     */
-    public DataStructureRemovedException(String msg) {
-        super(msg);
-    }
-
-    /**
-     * Creates new exception with given throwable as a nested cause and
-     * source of error message.
-     *
-     * @param cause Non-null throwable cause.
-     */
-    public DataStructureRemovedException(Throwable cause) {
-        this(cause.getMessage(), cause);
-    }
-
-    /**
-     * Creates a new exception with given error message and optional nested cause exception.
-     *
-     * @param msg Error message.
-     * @param cause Optional nested exception (can be {@code null}).
-     */
-    public DataStructureRemovedException(String msg, @Nullable Throwable cause) {
-        super(msg, cause);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64645f61/modules/core/src/main/java/org/apache/ignite/cache/datastructures/package.html
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/datastructures/package.html b/modules/core/src/main/java/org/apache/ignite/cache/datastructures/package.html
deleted file mode 100644
index af7bc37..0000000
--- a/modules/core/src/main/java/org/apache/ignite/cache/datastructures/package.html
+++ /dev/null
@@ -1,24 +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.
-  -->
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<body>
-    <!-- Package description. -->
-    Contains distributed data structures that work on top of in-memory data grid.
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64645f61/modules/core/src/main/java/org/apache/ignite/configuration/IgniteCollectionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteCollectionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteCollectionConfiguration.java
index 04bf5c0..dbdfc7f 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteCollectionConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteCollectionConfiguration.java
@@ -19,50 +19,12 @@ package org.apache.ignite.configuration;
 
 import org.apache.ignite.cache.*;
 
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheDistributionMode.*;
-import static org.apache.ignite.cache.CacheMemoryMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-
 /**
  *
  */
 public class IgniteCollectionConfiguration {
-    /** Default backups number. */
-    public static final int DFLT_BACKUPS = 0;
-
-    /** Default cache mode. */
-    public static final CacheMode DFLT_CACHE_MODE = PARTITIONED;
-
-    /** Default atomicity mode. */
-    public static final CacheAtomicityMode DFLT_ATOMICITY_MODE = ATOMIC;
-
-    /** Default memory mode. */
-    public static final CacheMemoryMode DFLT_MEMORY_MODE = ONHEAP_TIERED;
-
-    /** Default distribution mode. */
-    public static final CacheDistributionMode DFLT_DISTRIBUTION_MODE = PARTITIONED_ONLY;
-
-    /** Default off-heap storage size is {@code -1} which means that off-heap storage is disabled. */
-    public static final long DFLT_OFFHEAP_MEMORY = -1;
-
-    /** Off-heap memory size. */
-    private long offHeapMaxMem = DFLT_OFFHEAP_MEMORY;
-
-    /** Cache mode. */
-    private CacheMode cacheMode = DFLT_CACHE_MODE;
-
-    /** Cache distribution mode. */
-    private CacheDistributionMode distro = DFLT_DISTRIBUTION_MODE;
-
-    /** Number of backups. */
-    private int backups = DFLT_BACKUPS;
-
-    /** Atomicity mode. */
-    private CacheAtomicityMode atomicityMode = DFLT_ATOMICITY_MODE;
-
-    /** Memory mode. */
-    private CacheMemoryMode memMode = DFLT_MEMORY_MODE;
+    /** Cache name. */
+    private String cacheName;
 
     /** */
     private boolean collocated;
@@ -84,86 +46,16 @@ public class IgniteCollectionConfiguration {
     }
 
     /**
-     * @return Number of cache backups.
-     */
-    public int getBackups() {
-        return backups;
-    }
-
-    /**
-     * @param backups Number of cache backups.
-     */
-    public void setBackups(int backups) {
-        this.backups = backups;
-    }
-
-    /**
-     * @return Cache mode.
-     */
-    public CacheMode getCacheMode() {
-        return cacheMode;
-    }
-
-    /**
-     * @param cacheMode Cache mode.
-     */
-    public void setCacheMode(CacheMode cacheMode) {
-        this.cacheMode = cacheMode;
-    }
-
-    /**
-     * @return Cache atomicity mode.
-     */
-    public CacheAtomicityMode getAtomicityMode() {
-        return atomicityMode;
-    }
-
-    /**
-     * @param atomicityMode Cache atomicity mode.
-     */
-    public void setAtomicityMode(CacheAtomicityMode atomicityMode) {
-        this.atomicityMode = atomicityMode;
-    }
-
-    /**
-     * @return Cache memory mode.
-     */
-    public CacheMemoryMode getMemoryMode() {
-        return memMode;
-    }
-
-    /**
-     * @param memMode Cache memory mode.
-     */
-    public void setMemoryMode(CacheMemoryMode memMode) {
-        this.memMode = memMode;
-    }
-
-    /**
-     * @return Cache distribution mode.
-     */
-    public CacheDistributionMode getDistributionMode() {
-        return distro;
-    }
-
-    /**
-     * @param distro Cache distribution mode.
-     */
-    public void setDistributionMode(CacheDistributionMode distro) {
-        this.distro = distro;
-    }
-
-    /**
-     * @param offHeapMaxMem Maximum memory in bytes available to off-heap memory space.
+     * @return Cache name.
      */
-    public void setOffHeapMaxMemory(long offHeapMaxMem) {
-        this.offHeapMaxMem = offHeapMaxMem;
+    public String getCacheName() {
+        return cacheName;
     }
 
     /**
-     * @return Maximum memory in bytes available to off-heap memory space.
+     * @param cacheName Cache name.
      */
-    public long getOffHeapMaxMemory() {
-        return offHeapMaxMem;
+    public void setCacheName(String cacheName) {
+        this.cacheName = cacheName;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64645f61/modules/core/src/main/java/org/apache/ignite/datastructures/DataStructureRemovedException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/datastructures/DataStructureRemovedException.java b/modules/core/src/main/java/org/apache/ignite/datastructures/DataStructureRemovedException.java
new file mode 100644
index 0000000..c91fb5a
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/datastructures/DataStructureRemovedException.java
@@ -0,0 +1,61 @@
+/*
+ * 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.datastructures;
+
+import org.apache.ignite.*;
+import org.jetbrains.annotations.*;
+
+/**
+ * This runtime exception gets thrown if attempt to access a removed data structure has been made.
+ * <p>
+ * Note that data structures throw runtime exceptions out of methods that don't have
+ * checked exceptions in the signature.
+ */
+public class DataStructureRemovedException extends IgniteException {
+    /** */
+    private static final long serialVersionUID = 0L;
+
+    /**
+     * Creates new exception with given error message.
+     *
+     * @param msg Error message.
+     */
+    public DataStructureRemovedException(String msg) {
+        super(msg);
+    }
+
+    /**
+     * Creates new exception with given throwable as a nested cause and
+     * source of error message.
+     *
+     * @param cause Non-null throwable cause.
+     */
+    public DataStructureRemovedException(Throwable cause) {
+        this(cause.getMessage(), cause);
+    }
+
+    /**
+     * Creates a new exception with given error message and optional nested cause exception.
+     *
+     * @param msg Error message.
+     * @param cause Optional nested exception (can be {@code null}).
+     */
+    public DataStructureRemovedException(String msg, @Nullable Throwable cause) {
+        super(msg, cause);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64645f61/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
index 941db34..4b74f9c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
@@ -19,13 +19,6 @@ package org.apache.ignite.internal;
 
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.datastructures.*;
-import org.apache.ignite.internal.processors.fs.*;
-import org.apache.ignite.internal.processors.portable.*;
-import org.apache.ignite.plugin.*;
-import org.apache.ignite.internal.product.*;
-import org.apache.ignite.internal.managers.security.*;
 import org.apache.ignite.internal.managers.checkpoint.*;
 import org.apache.ignite.internal.managers.collision.*;
 import org.apache.ignite.internal.managers.communication.*;
@@ -44,6 +37,7 @@ import org.apache.ignite.internal.processors.clock.*;
 import org.apache.ignite.internal.processors.closure.*;
 import org.apache.ignite.internal.processors.continuous.*;
 import org.apache.ignite.internal.processors.dataload.*;
+import org.apache.ignite.internal.processors.datastructures.*;
 import org.apache.ignite.internal.processors.email.*;
 import org.apache.ignite.internal.processors.fs.*;
 import org.apache.ignite.internal.processors.hadoop.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64645f61/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index ebd60b7..72d71d5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@ -19,13 +19,6 @@ package org.apache.ignite.internal;
 
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.datastructures.*;
-import org.apache.ignite.internal.processors.fs.*;
-import org.apache.ignite.internal.processors.portable.*;
-import org.apache.ignite.internal.processors.streamer.*;
-import org.apache.ignite.plugin.*;
-import org.apache.ignite.internal.product.*;
 import org.apache.ignite.internal.managers.checkpoint.*;
 import org.apache.ignite.internal.managers.collision.*;
 import org.apache.ignite.internal.managers.communication.*;
@@ -46,6 +39,7 @@ import org.apache.ignite.internal.processors.clock.*;
 import org.apache.ignite.internal.processors.closure.*;
 import org.apache.ignite.internal.processors.continuous.*;
 import org.apache.ignite.internal.processors.dataload.*;
+import org.apache.ignite.internal.processors.datastructures.*;
 import org.apache.ignite.internal.processors.email.*;
 import org.apache.ignite.internal.processors.fs.*;
 import org.apache.ignite.internal.processors.hadoop.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64645f61/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 0bd8a27..4240cb1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -22,21 +22,6 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.affinity.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.datastructures.*;
-import org.apache.ignite.internal.processors.portable.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.lifecycle.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.plugin.*;
-import org.apache.ignite.internal.product.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.authentication.*;
-import org.apache.ignite.spi.authentication.noop.*;
 import org.apache.ignite.hadoop.*;
 import org.apache.ignite.internal.managers.*;
 import org.apache.ignite.internal.managers.checkpoint.*;
@@ -58,6 +43,7 @@ import org.apache.ignite.internal.processors.clock.*;
 import org.apache.ignite.internal.processors.closure.*;
 import org.apache.ignite.internal.processors.continuous.*;
 import org.apache.ignite.internal.processors.dataload.*;
+import org.apache.ignite.internal.processors.datastructures.*;
 import org.apache.ignite.internal.processors.email.*;
 import org.apache.ignite.internal.processors.job.*;
 import org.apache.ignite.internal.processors.jobmetrics.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64645f61/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 0edaffe..12b7f33 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -20,21 +20,11 @@ package org.apache.ignite.internal.processors.cache;
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.datastructures.*;
 import org.apache.ignite.cache.query.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.fs.*;
 import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.datastructures.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.plugin.security.*;
-import org.apache.ignite.portables.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.transactions.*;
 import org.apache.ignite.internal.cluster.*;
 import org.apache.ignite.internal.compute.*;
 import org.apache.ignite.internal.processors.cache.affinity.*;
@@ -826,7 +816,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
     @Nullable protected GridTuple<V> peek0(boolean failFast, K key, @Nullable Collection<GridCachePeekMode> modes,
         IgniteInternalTx<K, V> tx) throws IgniteCheckedException, GridCacheFilterFailedException {
         if (F.isEmpty(modes))
-            return F.t(peek(key, (IgnitePredicate<CacheEntry<K, V>>)null));
+            return F.t(peek(key, (IgnitePredicate<CacheEntry<K, V>>) null));
 
         assert modes != null;
 
@@ -1090,7 +1080,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
 
     /** {@inheritDoc} */
     @Override public Set<CacheEntry<K, V>> entrySet() {
-        return entrySet((IgnitePredicate<CacheEntry<K, V>>[])null);
+        return entrySet((IgnitePredicate<CacheEntry<K, V>>[]) null);
     }
 
 
@@ -1111,22 +1101,22 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
 
     /** {@inheritDoc} */
     @Override public Set<CacheEntry<K, V>> primaryEntrySet() {
-        return primaryEntrySet((IgnitePredicate<CacheEntry<K, V>>[])null);
+        return primaryEntrySet((IgnitePredicate<CacheEntry<K, V>>[]) null);
     }
 
     /** {@inheritDoc} */
     @Override public Set<K> keySet() {
-        return keySet((IgnitePredicate<CacheEntry<K, V>>[])null);
+        return keySet((IgnitePredicate<CacheEntry<K, V>>[]) null);
     }
 
     /** {@inheritDoc} */
     @Override public Set<K> primaryKeySet() {
-        return primaryKeySet((IgnitePredicate<CacheEntry<K, V>>[])null);
+        return primaryKeySet((IgnitePredicate<CacheEntry<K, V>>[]) null);
     }
 
     /** {@inheritDoc} */
     @Override public Collection<V> values() {
-        return values((IgnitePredicate<CacheEntry<K, V>>[])null);
+        return values((IgnitePredicate<CacheEntry<K, V>>[]) null);
     }
 
     /** {@inheritDoc} */
@@ -1400,7 +1390,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
 
         return getAllAsync(Collections.singletonList(key), /*force primary*/true, /*skip tx*/false, null, null,
             taskName, true).chain(new CX1<IgniteInternalFuture<Map<K, V>>, V>() {
-            @Override public V applyx(IgniteInternalFuture<Map<K, V>> e) throws IgniteCheckedException {
+            @Override
+            public V applyx(IgniteInternalFuture<Map<K, V>> e) throws IgniteCheckedException {
                 return e.get().get(key);
             }
         });
@@ -1427,7 +1418,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<V> reloadAsync(K key) {
-        return reloadAsync(key, (IgnitePredicate<CacheEntry<K, V>>[])null);
+        return reloadAsync(key, (IgnitePredicate<CacheEntry<K, V>>[]) null);
     }
 
     /** {@inheritDoc} */
@@ -1451,7 +1442,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
     @Override public IgniteInternalFuture<?> reloadAllAsync() {
         ctx.denyOnFlags(F.asList(LOCAL, READ));
 
-        return reloadAllAsync(keySet(), (IgnitePredicate<CacheEntry<K, V>>[])null);
+        return reloadAllAsync(keySet(), (IgnitePredicate<CacheEntry<K, V>>[]) null);
     }
 
     /**
@@ -2146,11 +2137,13 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
         ctx.denyOnLocalRead();
 
         V prevValue = ctx.cloneOnFlag(syncOp(new SyncOp<V>(true) {
-            @Override public V op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
+            @Override
+            public V op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
                 return tx.putAllAsync(ctx, F.t(key, val), true, cached, ttl, filter).get().value();
             }
 
-            @Override public String toString() {
+            @Override
+            public String toString() {
                 return "put [key=" + key + ", val=" + val + ", filter=" + Arrays.toString(filter) + ']';
             }
         }));
@@ -2290,11 +2283,13 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
         ctx.denyOnLocalRead();
 
         return asyncOp(new AsyncInOp(drMap.keySet()) {
-            @Override public IgniteInternalFuture<?> inOp(IgniteTxLocalAdapter<K, V> tx) {
+            @Override
+            public IgniteInternalFuture<?> inOp(IgniteTxLocalAdapter<K, V> tx) {
                 return tx.putAllDrAsync(ctx, drMap);
             }
 
-            @Override public String toString() {
+            @Override
+            public String toString() {
                 return "putAllDrAsync [drMap=" + drMap + ']';
             }
         });
@@ -2313,10 +2308,12 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
         ctx.denyOnLocalRead();
 
         return syncOp(new SyncOp<EntryProcessorResult<T>>(true) {
-            @Nullable @Override public EntryProcessorResult<T> op(IgniteTxLocalAdapter<K, V> tx)
+            @Nullable
+            @Override
+            public EntryProcessorResult<T> op(IgniteTxLocalAdapter<K, V> tx)
                 throws IgniteCheckedException {
                 Map<? extends K, EntryProcessor<K, V, Object>> invokeMap =
-                    Collections.singletonMap(key, (EntryProcessor<K, V, Object>)entryProcessor);
+                    Collections.singletonMap(key, (EntryProcessor<K, V, Object>) entryProcessor);
 
                 IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut =
                     tx.invokeAsync(ctx, invokeMap, args);
@@ -2331,7 +2328,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
                     res = resMap.isEmpty() ? null : resMap.values().iterator().next();
                 }
 
-                return res != null ? res : new CacheInvokeResult<T>((T)null);
+                return res != null ? res : new CacheInvokeResult<T>((T) null);
             }
         });
     }
@@ -2348,10 +2345,13 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
         ctx.denyOnLocalRead();
 
         return syncOp(new SyncOp<Map<K, EntryProcessorResult<T>>>(keys.size() == 1) {
-            @Nullable @Override public Map<K, EntryProcessorResult<T>> op(IgniteTxLocalAdapter tx)
+            @Nullable
+            @Override
+            public Map<K, EntryProcessorResult<T>> op(IgniteTxLocalAdapter tx)
                 throws IgniteCheckedException {
                 Map<? extends K, EntryProcessor<K, V, Object>> invokeMap = F.viewAsMap(keys, new C1<K, EntryProcessor<K, V, Object>>() {
-                    @Override public EntryProcessor apply(K k) {
+                    @Override
+                    public EntryProcessor apply(K k) {
                         return entryProcessor;
                     }
                 });
@@ -2445,7 +2445,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
             (IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>>)fut;
 
         return fut0.chain(new CX1<IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>>, Map<K, EntryProcessorResult<T>>>() {
-            @Override public Map<K, EntryProcessorResult<T>> applyx(IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut)
+            @Override
+            public Map<K, EntryProcessorResult<T>> applyx(IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut)
                 throws IgniteCheckedException {
                 GridCacheReturn<Map<K, EntryProcessorResult<T>>> ret = fut.get();
 
@@ -2505,7 +2506,9 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
         ctx.denyOnLocalRead();
 
         return syncOp(new SyncOp<Map<K, EntryProcessorResult<T>>>(map.size() == 1) {
-            @Nullable @Override public Map<K, EntryProcessorResult<T>> op(IgniteTxLocalAdapter tx)
+            @Nullable
+            @Override
+            public Map<K, EntryProcessorResult<T>> op(IgniteTxLocalAdapter tx)
                 throws IgniteCheckedException {
                 IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut = tx.invokeAsync(ctx, map, args);
 
@@ -2592,12 +2595,14 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
         ctx.denyOnLocalRead();
 
         IgniteInternalFuture<V> fut = ctx.wrapClone(asyncOp(new AsyncOp<V>(key) {
-            @Override public IgniteInternalFuture<V> op(IgniteTxLocalAdapter<K, V> tx) {
+            @Override
+            public IgniteInternalFuture<V> op(IgniteTxLocalAdapter<K, V> tx) {
                 return tx.putAllAsync(ctx, F.t(key, val), true, null, -1, ctx.noPeekArray())
-                    .chain((IgniteClosure<IgniteInternalFuture<GridCacheReturn<V>>, V>)RET2VAL);
+                    .chain((IgniteClosure<IgniteInternalFuture<GridCacheReturn<V>>, V>) RET2VAL);
             }
 
-            @Override public String toString() {
+            @Override
+            public String toString() {
                 return "putIfAbsentAsync [key=" + key + ", val=" + val + ']';
             }
         }));
@@ -2655,12 +2660,14 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
         ctx.denyOnLocalRead();
 
         IgniteInternalFuture<Boolean> fut = asyncOp(new AsyncOp<Boolean>(key) {
-            @Override public IgniteInternalFuture<Boolean> op(IgniteTxLocalAdapter<K, V> tx) {
+            @Override
+            public IgniteInternalFuture<Boolean> op(IgniteTxLocalAdapter<K, V> tx) {
                 return tx.putAllAsync(ctx, F.t(key, val), false, null, -1, ctx.noPeekArray()).chain(
-                    (IgniteClosure<IgniteInternalFuture<GridCacheReturn<V>>, Boolean>)RET2FLAG);
+                    (IgniteClosure<IgniteInternalFuture<GridCacheReturn<V>>, Boolean>) RET2FLAG);
             }
 
-            @Override public String toString() {
+            @Override
+            public String toString() {
                 return "putxIfAbsentAsync [key=" + key + ", val=" + val + ']';
             }
         });
@@ -2683,11 +2690,13 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
         ctx.denyOnLocalRead();
 
         return ctx.cloneOnFlag(syncOp(new SyncOp<V>(true) {
-            @Override public V op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
+            @Override
+            public V op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
                 return tx.putAllAsync(ctx, F.t(key, val), true, null, -1, ctx.hasPeekArray()).get().value();
             }
 
-            @Override public String toString() {
+            @Override
+            public String toString() {
                 return "replace [key=" + key + ", val=" + val + ']';
             }
         }));
@@ -2919,16 +2928,18 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
             validateCacheKey(key);
 
         V prevVal = ctx.cloneOnFlag(syncOp(new SyncOp<V>(true) {
-            @Override public V op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
+            @Override
+            public V op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
                 V ret = tx.removeAllAsync(ctx, Collections.singletonList(key), entry, true, filter).get().value();
 
                 if (ctx.config().getInterceptor() != null)
-                    return (V)ctx.config().getInterceptor().onBeforeRemove(key, ret).get2();
+                    return (V) ctx.config().getInterceptor().onBeforeRemove(key, ret).get2();
 
                 return ret;
             }
 
-            @Override public String toString() {
+            @Override
+            public String toString() {
                 return "remove [key=" + key + ", filter=" + Arrays.toString(filter) + ']';
             }
         }));
@@ -2968,13 +2979,15 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
             validateCacheKey(key);
 
         IgniteInternalFuture<V> fut = ctx.wrapClone(asyncOp(new AsyncOp<V>(key) {
-            @Override public IgniteInternalFuture<V> op(IgniteTxLocalAdapter<K, V> tx) {
+            @Override
+            public IgniteInternalFuture<V> op(IgniteTxLocalAdapter<K, V> tx) {
                 // TODO should we invoke interceptor here?
                 return tx.removeAllAsync(ctx, Collections.singletonList(key), null, true, filter)
                     .chain((IgniteClosure<IgniteInternalFuture<GridCacheReturn<V>>, V>) RET2VAL);
             }
 
-            @Override public String toString() {
+            @Override
+            public String toString() {
                 return "removeAsync [key=" + key + ", filter=" + Arrays.toString(filter) + ']';
             }
         }));
@@ -3043,11 +3056,13 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
         ctx.denyOnLocalRead();
 
         IgniteInternalFuture<Object> fut = asyncOp(new AsyncInOp(keys) {
-            @Override public IgniteInternalFuture<?> inOp(IgniteTxLocalAdapter<K, V> tx) {
+            @Override
+            public IgniteInternalFuture<?> inOp(IgniteTxLocalAdapter<K, V> tx) {
                 return tx.removeAllAsync(ctx, keys, null, false, filter);
             }
 
-            @Override public String toString() {
+            @Override
+            public String toString() {
                 return "removeAllAsync [keys=" + keys + ", filter=" + Arrays.toString(filter) + ']';
             }
         });
@@ -3088,11 +3103,13 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
             validateCacheKey(key);
 
         boolean removed = syncOp(new SyncOp<Boolean>(true) {
-            @Override public Boolean op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
+            @Override
+            public Boolean op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
                 return tx.removeAllAsync(ctx, Collections.singletonList(key), entry, false, filter).get().success();
             }
 
-            @Override public String toString() {
+            @Override
+            public String toString() {
                 return "removex [key=" + key + ", filter=" + Arrays.toString(filter) + ']';
             }
         });
@@ -3151,7 +3168,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
             validateCacheKey(key);
 
         return syncOp(new SyncOp<GridCacheReturn<V>>(true) {
-            @Override public GridCacheReturn<V> op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
+            @Override
+            public GridCacheReturn<V> op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
                 // Register before hiding in the filter.
                 if (ctx.deploymentEnabled())
                     ctx.deploy().registerClass(val);
@@ -3160,7 +3178,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
                     ctx.vararg(F.<K, V>cacheContainsPeek(val))).get();
             }
 
-            @Override public String toString() {
+            @Override
+            public String toString() {
                 return "remove [key=" + key + ", val=" + val + ']';
             }
         });
@@ -3217,7 +3236,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
         ctx.denyOnLocalRead();
 
         return syncOp(new SyncOp<GridCacheReturn<V>>(true) {
-            @Override public GridCacheReturn<V> op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
+            @Override
+            public GridCacheReturn<V> op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
                 // Register before hiding in the filter.
                 if (ctx.deploymentEnabled())
                     ctx.deploy().registerClass(oldVal);
@@ -3225,7 +3245,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
                 return tx.putAllAsync(ctx, F.t(key, newVal), true, null, -1, ctx.equalsPeekArray(oldVal)).get();
             }
 
-            @Override public String toString() {
+            @Override
+            public String toString() {
                 return "replace [key=" + key + ", oldVal=" + oldVal + ", newVal=" + newVal + ']';
             }
         });

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64645f61/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 74ffad0..9563327 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -23,19 +23,12 @@ import org.apache.ignite.cache.cloner.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.datastructures.*;
-import org.apache.ignite.internal.processors.datastructures.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.portable.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.portables.*;
 import org.apache.ignite.internal.managers.communication.*;
 import org.apache.ignite.internal.managers.deployment.*;
 import org.apache.ignite.internal.managers.discovery.*;
 import org.apache.ignite.internal.managers.eventstorage.*;
 import org.apache.ignite.internal.managers.swapspace.*;
+import org.apache.ignite.internal.processors.cache.datastructures.*;
 import org.apache.ignite.internal.processors.cache.distributed.dht.*;
 import org.apache.ignite.internal.processors.cache.distributed.dht.colocated.*;
 import org.apache.ignite.internal.processors.cache.distributed.near.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64645f61/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
index 4073d00..4133a0b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
@@ -642,7 +642,7 @@ public class CacheDataStructuresManager<K, V> extends GridCacheManagerAdapter<K,
         @Override public Void call() throws IgniteCheckedException {
             assert ignite != null;
 
-            GridCacheAdapter cache = ((GridKernal)ignite).context().cache().internalCache(cacheName);
+            GridCacheAdapter cache = ((IgniteKernal)ignite).context().cache().internalCache(cacheName);
 
             assert cache != null : cacheName;
 
@@ -712,7 +712,7 @@ public class CacheDataStructuresManager<K, V> extends GridCacheManagerAdapter<K,
         @Override public Void call() throws IgniteCheckedException {
             assert ignite != null;
 
-            GridCacheAdapter cache = ((GridKernal)ignite).context().cache().internalCache(cacheName);
+            GridCacheAdapter cache = ((IgniteKernal)ignite).context().cache().internalCache(cacheName);
 
             assert cache != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64645f61/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/CacheDataStructuresProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/CacheDataStructuresProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/CacheDataStructuresProcessor.java
index b52036f..bcf195a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/CacheDataStructuresProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/CacheDataStructuresProcessor.java
@@ -31,8 +31,6 @@ import org.apache.ignite.internal.util.typedef.internal.*;
 import org.jdk8.backport.*;
 import org.jetbrains.annotations.*;
 
-import javax.cache.processor.*;
-import java.io.*;
 import java.util.*;
 import java.util.concurrent.*;
 
@@ -79,15 +77,12 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
     /** Cache contains only entry {@code GridCacheSequenceValue}.  */
     private CacheProjection<GridCacheInternalKey, GridCacheAtomicSequenceValue> seqView;
 
-    /** */
-    private GridCacheContext atomicsCacheCtx;
+    /** Cache context for atomic data structures. */
+    private GridCacheContext dsCacheCtx;
 
-    /** */
+    /** Atomic data structures configuration. */
     private final IgniteAtomicConfiguration atomicCfg;
 
-    /** */
-    private IgniteCache<CacheDataStructuresConfigurationKey, Map<String, DataStructureInfo>> utilityCache;
-
     /**
      * @param ctx Context.
      */
@@ -105,10 +100,6 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
         if (ctx.config().isDaemon())
             return;
 
-        utilityCache = ctx.cache().jcache(CU.UTILITY_CACHE_NAME);
-
-        assert utilityCache != null;
-
         if (atomicCfg != null) {
             GridCache atomicsCache = ctx.cache().atomicsCache();
 
@@ -131,7 +122,7 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
             seqView = atomicsCache.projection
                 (GridCacheInternalKey.class, GridCacheAtomicSequenceValue.class).flagsOn(CLONE);
 
-            atomicsCacheCtx = ctx.cache().internalCache(CU.ATOMICS_CACHE_NAME).context();
+            dsCacheCtx = ctx.cache().internalCache(CU.ATOMICS_CACHE_NAME).context();
         }
     }
 
@@ -153,7 +144,7 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
 
         checkAtomicsConfiguration();
 
-        atomicsCacheCtx.gate().enter();
+        dsCacheCtx.gate().enter();
 
         try {
             final GridCacheInternalKey key = new GridCacheInternalKeyImpl(name);
@@ -166,7 +157,7 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
 
             return CU.outTx(new Callable<IgniteAtomicSequence>() {
                 @Override public IgniteAtomicSequence call() throws Exception {
-                    try (IgniteTx tx = CU.txStartInternal(atomicsCacheCtx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
+                    try (IgniteInternalTx tx = CU.txStartInternal(dsCacheCtx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
                         GridCacheAtomicSequenceValue seqVal = cast(dsView.get(key), GridCacheAtomicSequenceValue.class);
 
                         // Check that sequence hasn't been created in other thread yet.
@@ -212,7 +203,7 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
                         seq = new GridCacheAtomicSequenceImpl(name,
                             key,
                             seqView,
-                            atomicsCacheCtx,
+                            dsCacheCtx,
                             atomicCfg.getAtomicSequenceReserveSize(),
                             locCntr,
                             upBound);
@@ -231,13 +222,13 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
                         throw e;
                     }
                 }
-            }, atomicsCacheCtx);
+            }, dsCacheCtx);
         }
         catch (Exception e) {
             throw new IgniteCheckedException("Failed to get sequence by name: " + name, e);
         }
         finally {
-            atomicsCacheCtx.gate().leave();
+            dsCacheCtx.gate().leave();
         }
     }
 
@@ -253,7 +244,7 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
 
         checkAtomicsConfiguration();
 
-        atomicsCacheCtx.gate().enter();
+        dsCacheCtx.gate().enter();
 
         try {
             GridCacheInternal key = new GridCacheInternalKeyImpl(name);
@@ -264,7 +255,7 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
             throw new IgniteCheckedException("Failed to remove sequence by name: " + name, e);
         }
         finally {
-            atomicsCacheCtx.gate().leave();
+            dsCacheCtx.gate().leave();
         }
     }
 
@@ -284,7 +275,7 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
 
         checkAtomicsConfiguration();
 
-        atomicsCacheCtx.gate().enter();
+        dsCacheCtx.gate().enter();
 
         try {
             final GridCacheInternalKey key = new GridCacheInternalKeyImpl(name);
@@ -297,7 +288,7 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
 
             return CU.outTx(new Callable<IgniteAtomicLong>() {
                 @Override public IgniteAtomicLong call() throws Exception {
-                    try (IgniteTx tx = CU.txStartInternal(atomicsCacheCtx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
+                    try (IgniteInternalTx tx = CU.txStartInternal(dsCacheCtx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
                         GridCacheAtomicLongValue val = cast(dsView.get(key), GridCacheAtomicLongValue.class);
 
                         // Check that atomic long hasn't been created in other thread yet.
@@ -318,7 +309,7 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
                             dsView.putx(key, val);
                         }
 
-                        a = new GridCacheAtomicLongImpl(name, key, atomicLongView, atomicsCacheCtx);
+                        a = new GridCacheAtomicLongImpl(name, key, atomicLongView, dsCacheCtx);
 
                         dsMap.put(key, a);
 
@@ -334,13 +325,13 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
                         throw e;
                     }
                 }
-            }, atomicsCacheCtx);
+            }, dsCacheCtx);
         }
         catch (Exception e) {
             throw new IgniteCheckedException("Failed to get atomic long by name: " + name, e);
         }
         finally {
-            atomicsCacheCtx.gate().leave();
+            dsCacheCtx.gate().leave();
         }
     }
 
@@ -352,9 +343,9 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
      */
     public final void removeAtomicLong(String name) throws IgniteCheckedException {
         assert name != null;
-        assert atomicsCacheCtx != null;
+        assert dsCacheCtx != null;
 
-        atomicsCacheCtx.gate().enter();
+        dsCacheCtx.gate().enter();
 
         try {
             GridCacheInternal key = new GridCacheInternalKeyImpl(name);
@@ -365,7 +356,7 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
             throw new IgniteCheckedException("Failed to remove atomic long by name: " + name, e);
         }
         finally {
-            atomicsCacheCtx.gate().leave();
+            dsCacheCtx.gate().leave();
         }
     }
 
@@ -389,7 +380,7 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
 
         checkAtomicsConfiguration();
 
-        atomicsCacheCtx.gate().enter();
+        dsCacheCtx.gate().enter();
 
         try {
             final GridCacheInternalKey key = new GridCacheInternalKeyImpl(name);
@@ -402,7 +393,7 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
 
             return CU.outTx(new Callable<IgniteAtomicReference<T>>() {
                 @Override public IgniteAtomicReference<T> call() throws Exception {
-                    try (IgniteTx tx = CU.txStartInternal(atomicsCacheCtx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
+                    try (IgniteInternalTx tx = CU.txStartInternal(dsCacheCtx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
                         GridCacheAtomicReferenceValue val = cast(dsView.get(key),
                             GridCacheAtomicReferenceValue.class);
 
@@ -425,7 +416,7 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
                             dsView.putx(key, val);
                         }
 
-                        ref = new GridCacheAtomicReferenceImpl(name, key, atomicRefView, atomicsCacheCtx);
+                        ref = new GridCacheAtomicReferenceImpl(name, key, atomicRefView, dsCacheCtx);
 
                         dsMap.put(key, ref);
 
@@ -441,13 +432,13 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
                         throw e;
                     }
                 }
-            }, atomicsCacheCtx);
+            }, dsCacheCtx);
         }
         catch (Exception e) {
             throw new IgniteCheckedException("Failed to get atomic reference by name: " + name, e);
         }
         finally {
-            atomicsCacheCtx.gate().leave();
+            dsCacheCtx.gate().leave();
         }
     }
 
@@ -459,9 +450,9 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
      */
     public final void removeAtomicReference(String name) throws IgniteCheckedException {
         assert name != null;
-        assert atomicsCacheCtx != null;
+        assert dsCacheCtx != null;
 
-        atomicsCacheCtx.gate().enter();
+        dsCacheCtx.gate().enter();
 
         try {
             GridCacheInternal key = new GridCacheInternalKeyImpl(name);
@@ -472,7 +463,7 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
             throw new IgniteCheckedException("Failed to remove atomic reference by name: " + name, e);
         }
         finally {
-            atomicsCacheCtx.gate().leave();
+            dsCacheCtx.gate().leave();
         }
     }
 
@@ -495,7 +486,7 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
 
         checkAtomicsConfiguration();
 
-        atomicsCacheCtx.gate().enter();
+        dsCacheCtx.gate().enter();
 
         try {
             final GridCacheInternalKeyImpl key = new GridCacheInternalKeyImpl(name);
@@ -508,7 +499,7 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
 
             return CU.outTx(new Callable<IgniteAtomicStamped<T, S>>() {
                 @Override public IgniteAtomicStamped<T, S> call() throws Exception {
-                    try (IgniteTx tx = CU.txStartInternal(atomicsCacheCtx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
+                    try (IgniteInternalTx tx = CU.txStartInternal(dsCacheCtx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
                         GridCacheAtomicStampedValue val = cast(dsView.get(key),
                             GridCacheAtomicStampedValue.class);
 
@@ -531,7 +522,7 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
                             dsView.putx(key, val);
                         }
 
-                        stmp = new GridCacheAtomicStampedImpl(name, key, atomicStampedView, atomicsCacheCtx);
+                        stmp = new GridCacheAtomicStampedImpl(name, key, atomicStampedView, dsCacheCtx);
 
                         dsMap.put(key, stmp);
 
@@ -547,13 +538,13 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
                         throw e;
                     }
                 }
-            }, atomicsCacheCtx);
+            }, dsCacheCtx);
         }
         catch (Exception e) {
             throw new IgniteCheckedException("Failed to get atomic stamped by name: " + name, e);
         }
         finally {
-            atomicsCacheCtx.gate().leave();
+            dsCacheCtx.gate().leave();
         }
     }
 
@@ -565,9 +556,9 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
      */
     public final void removeAtomicStamped(String name) throws IgniteCheckedException {
         assert name != null;
-        assert atomicsCacheCtx != null;
+        assert dsCacheCtx != null;
 
-        atomicsCacheCtx.gate().enter();
+        dsCacheCtx.gate().enter();
 
         try {
             GridCacheInternal key = new GridCacheInternalKeyImpl(name);
@@ -578,7 +569,7 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
             throw new IgniteCheckedException("Failed to remove atomic stamped by name: " + name, e);
         }
         finally {
-            atomicsCacheCtx.gate().leave();
+            dsCacheCtx.gate().leave();
         }
     }
 
@@ -638,7 +629,7 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
 
         checkAtomicsConfiguration();
 
-        atomicsCacheCtx.gate().enter();
+        dsCacheCtx.gate().enter();
 
         try {
             final GridCacheInternalKey key = new GridCacheInternalKeyImpl(name);
@@ -651,7 +642,7 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
 
             return CU.outTx(new Callable<IgniteCountDownLatch>() {
                 @Override public IgniteCountDownLatch call() throws Exception {
-                    try (IgniteTx tx = CU.txStartInternal(atomicsCacheCtx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
+                    try (IgniteInternalTx tx = CU.txStartInternal(dsCacheCtx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
                         GridCacheCountDownLatchValue val = cast(dsView.get(key),
                             GridCacheCountDownLatchValue.class);
 
@@ -674,7 +665,7 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
                         }
 
                         latch = new GridCacheCountDownLatchImpl(name, val.get(), val.initialCount(),
-                            val.autoDelete(), key, cntDownLatchView, atomicsCacheCtx);
+                            val.autoDelete(), key, cntDownLatchView, dsCacheCtx);
 
                         dsMap.put(key, latch);
 
@@ -690,13 +681,13 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
                         throw e;
                     }
                 }
-            }, atomicsCacheCtx);
+            }, dsCacheCtx);
         }
         catch (Exception e) {
             throw new IgniteCheckedException("Failed to get count down latch by name: " + name, e);
         }
         finally {
-            atomicsCacheCtx.gate().leave();
+            dsCacheCtx.gate().leave();
         }
     }
 
@@ -708,16 +699,16 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
      */
     public void removeCountDownLatch(final String name) throws IgniteCheckedException {
         assert name != null;
-        assert atomicsCacheCtx != null;
+        assert dsCacheCtx != null;
 
-        atomicsCacheCtx.gate().enter();
+        dsCacheCtx.gate().enter();
 
         try {
             CU.outTx(new Callable<Boolean>() {
                 @Override public Boolean call() throws Exception {
                     GridCacheInternal key = new GridCacheInternalKeyImpl(name);
 
-                    try (IgniteTx tx = CU.txStartInternal(atomicsCacheCtx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
+                    try (IgniteInternalTx tx = CU.txStartInternal(dsCacheCtx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
                         // Check correctness type of removable object.
                         GridCacheCountDownLatchValue val =
                             cast(dsView.get(key), GridCacheCountDownLatchValue.class);
@@ -743,13 +734,13 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
                         throw e;
                     }
                 }
-            }, atomicsCacheCtx);
+            }, dsCacheCtx);
         }
         catch (Exception e) {
             throw new IgniteCheckedException("Failed to remove count down latch by name: " + name, e);
         }
         finally {
-            atomicsCacheCtx.gate().leave();
+            dsCacheCtx.gate().leave();
         }
     }
 
@@ -765,7 +756,7 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
         return CU.outTx(
             new Callable<Boolean>() {
                 @Override public Boolean call() throws Exception {
-                    try (IgniteTx tx = CU.txStartInternal(atomicsCacheCtx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
+                    try (IgniteInternalTx tx = CU.txStartInternal(dsCacheCtx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
                         // Check correctness type of removable object.
                         R val = cast(dsView.get(key), cls);
 
@@ -786,7 +777,7 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
                     }
                 }
             },
-            atomicsCacheCtx
+            dsCacheCtx
         );
     }
 
@@ -795,11 +786,11 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
      *
      * @param tx Committed transaction.
      */
-    public <K, V> void onTxCommitted(IgniteTxEx<K, V> tx) {
-        if (atomicsCacheCtx == null)
+    public <K, V> void onTxCommitted(IgniteInternalTx<K, V> tx) {
+        if (dsCacheCtx == null)
             return;
 
-        if (!atomicsCacheCtx.isDht() && tx.internal() && (!atomicsCacheCtx.isColocated() || atomicsCacheCtx.isReplicated())) {
+        if (!dsCacheCtx.isDht() && tx.internal() && (!dsCacheCtx.isColocated() || dsCacheCtx.isReplicated())) {
             Collection<IgniteTxEntry<K, V>> entries = tx.writeEntries();
 
             if (log.isDebugEnabled())
@@ -822,7 +813,7 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
                             latch0.onUpdate(val.get());
 
                             if (val.get() == 0 && val.autoDelete()) {
-                                entry.cached().markObsolete(atomicsCacheCtx.versions().next());
+                                entry.cached().markObsolete(dsCacheCtx.versions().next());
 
                                 dsMap.remove(key);
 
@@ -928,54 +919,35 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
         if (cls.isInstance(obj))
             return (R)obj;
         else
-            throw new IgniteCheckedException("Failed to cast object [expected=" + cls + ", actual=" + obj.getClass() + ']');
+            throw new IgniteCheckedException("Failed to cast object [expected=" + cls +
+                ", actual=" + obj.getClass() + ']');
     }
 
     /** {@inheritDoc} */
     @Override public void printMemoryStats() {
         X.println(">>> ");
         X.println(">>> Data structure processor memory stats [grid=" + ctx.gridName() +
-            ", cache=" + (atomicsCacheCtx != null ? atomicsCacheCtx.name() : null) + ']');
+            ", cache=" + (dsCacheCtx != null ? dsCacheCtx.name() : null) + ']');
         X.println(">>>   dsMapSize: " + dsMap.size());
     }
 
     /**
      * @param cfg Collection configuration.
      * @return Cache to use for collection.
+     * @throws IgniteCheckedException If cache is not configured.
      */
-    private GridCacheAdapter cacheForCollection(IgniteCollectionConfiguration cfg) {
-        // TODO IGNITE-29: start collection internal cache with required configuration or use existing cache.
-        GridCacheAdapter cache = ctx.cache().internalCache("TEST_COLLECTION_CACHE");
+    private GridCacheAdapter cacheForCollection(IgniteCollectionConfiguration cfg) throws IgniteCheckedException {
+        if (ctx.cache().publicCache(cfg.getCacheName()) == null)
+            throw new IgniteCheckedException("Cache for collection is not configured: " + cfg.getCacheName());
 
-        if (cache == null)
-            throw new IgniteException("TEST_COLLECTION_CACHE is not configured.");
+        GridCacheAdapter cache = ctx.cache().internalCache(cfg.getCacheName());
 
-        if (cfg != null) {
-            CacheConfiguration ccfg = cache.configuration();
-
-            assert ccfg.getCacheMode() == cfg.getCacheMode();
-            assert ccfg.getAtomicityMode() == cfg.getAtomicityMode();
-            assert ccfg.getMemoryMode() == cfg.getMemoryMode();
-            assert ccfg.getDistributionMode() == cfg.getDistributionMode();
-        }
+        assert cache != null : cfg.getCacheName();
 
         return cache;
     }
 
     /**
-     * @param info Data structure information.
-     * @throws IgniteException If validation failed.
-     */
-    private void updateUtilityCache(DataStructureInfo info) throws IgniteException {
-        validateDataStructure(info);
-
-        IgniteException err = utilityCache.invoke(DATA_STRUCTURES_KEY, new AddAtomicProcessor(info));
-
-        if (err != null)
-            throw err;
-    }
-
-    /**
      * @throws IgniteException If atomics configuration is not provided.
      */
     private void checkAtomicsConfiguration() throws IgniteException {
@@ -983,214 +955,4 @@ public final class CacheDataStructuresProcessor extends GridProcessorAdapter {
             throw new IgniteException("Atomic data structure can not be created, " +
                 "need to provide IgniteAtomicConfiguration.");
     }
-
-    /**
-     *
-     */
-    static enum DataStructureType {
-        /** */
-        ATOMIC_LONG(IgniteAtomicLong.class.getSimpleName()),
-
-        /** */
-        ATOMIC_REF(IgniteAtomicReference.class.getSimpleName()),
-
-        /** */
-        ATOMIC_SEQ(IgniteAtomicSequence.class.getSimpleName()),
-
-        /** */
-        ATOMIC_STAMPED(IgniteAtomicStamped.class.getSimpleName()),
-
-        /** */
-        QUEUE(IgniteQueue.class.getSimpleName()),
-
-        /** */
-        SET(IgniteSet.class.getSimpleName());
-
-        /** */
-        private static final DataStructureType[] VALS = values();
-
-        /** */
-        private String name;
-
-        /**
-         * @param name Name.
-         */
-        DataStructureType(String name) {
-            this.name = name;
-        }
-
-        /**
-         * @return Data structure public class name.
-         */
-        public String className() {
-            return name;
-        }
-
-        /**
-         * @param ord Ordinal value.
-         * @return Enumerated value or {@code null} if ordinal out of range.
-         */
-        @Nullable public static DataStructureType fromOrdinal(int ord) {
-            return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
-        }
-    }
-
-    /**
-     *
-     */
-    static class DataStructureInfo implements Externalizable {
-        /** */
-        private static final long serialVersionUID = 0L;
-
-        /** */
-        private String name;
-
-        /** */
-        private DataStructureType type;
-
-        /** */
-        private Object info;
-
-        /**
-         * Required by {@link Externalizable}.
-         */
-        public DataStructureInfo() {
-            // No-op.
-        }
-
-        /**
-         * @param name Data structure name.
-         * @param type Data structure type.
-         * @param info Data structure information.
-         */
-        DataStructureInfo(String name, DataStructureType type, Externalizable info) {
-            this.name = name;
-            this.type = type;
-            this.info = info;
-        }
-
-        /** {@inheritDoc} */
-        @Override public void writeExternal(ObjectOutput out) throws IOException {
-            U.writeString(out, name);
-
-            U.writeEnum(out, type);
-
-            out.writeObject(info);
-        }
-
-        /** {@inheritDoc} */
-        @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-            name = U.readString(in);
-
-            type = DataStructureType.fromOrdinal(in.readByte());
-
-            info = in.readObject();
-        }
-    }
-
-    /**
-     * @param info New data structure information.
-     */
-    private void validateDataStructure(DataStructureInfo info) {
-        Map<String, DataStructureInfo> map = utilityCache.get(DATA_STRUCTURES_KEY);
-
-        if (map != null) {
-            DataStructureInfo oldInfo = map.get(info.name);
-
-            if (oldInfo != null) {
-                IgniteException err = validateDataStructure(oldInfo, info);
-
-                if (err != null)
-                    throw err;
-            }
-        }
-    }
-
-    /**
-     * @param oldInfo Existing data structure information.
-     * @param info New data structure information.
-     * @return {@link IgniteException} if validation failed.
-     */
-    @Nullable private static IgniteException validateDataStructure(DataStructureInfo oldInfo, DataStructureInfo info) {
-        if (oldInfo.type != info.type) {
-            return new IgniteException("Another data structure with the same name already created " +
-                "[name= " + info.name +
-                ", new= " + info.type.className() +
-                ", existing=" + oldInfo.type.className() + ']');
-        }
-
-        return null;
-    }
-
-    /**
-     *
-     */
-    static class AddAtomicProcessor implements
-        EntryProcessor<CacheDataStructuresConfigurationKey, Map<String, DataStructureInfo>, IgniteException>,
-        Externalizable {
-        /** */
-        private static final long serialVersionUID = 0L;
-
-        /** */
-        private DataStructureInfo info;
-
-        /**
-         * @param info Data structure information.
-         */
-        AddAtomicProcessor(DataStructureInfo info) {
-            this.info = info;
-        }
-
-        /**
-         * Required by {@link Externalizable}.
-         */
-        public AddAtomicProcessor() {
-            // No-op.
-        }
-
-        /** {@inheritDoc} */
-        @Override public IgniteException process(
-            MutableEntry<CacheDataStructuresConfigurationKey, Map<String, DataStructureInfo>> entry,
-            Object... args)
-            throws EntryProcessorException
-        {
-            Map<String, DataStructureInfo> map = entry.getValue();
-
-            if (map == null) {
-                map = new HashMap<>();
-
-                map.put(info.name, info);
-
-                entry.setValue(map);
-
-                return null;
-            }
-
-            DataStructureInfo oldInfo = map.get(info.name);
-
-            if (oldInfo == null) {
-                map = new HashMap<>(map);
-
-                map.put(info.name, info);
-
-                entry.setValue(map);
-
-                return null;
-            }
-
-            return validateDataStructure(oldInfo, info);
-        }
-
-        /** {@inheritDoc} */
-        @Override public void writeExternal(ObjectOutput out) throws IOException {
-            info.writeExternal(out);
-        }
-
-        /** {@inheritDoc} */
-        @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-            info = new DataStructureInfo();
-
-            info.readExternal(in);
-        }
-    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64645f61/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridAtomicCacheQueueImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridAtomicCacheQueueImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridAtomicCacheQueueImpl.java
index 131fa3c..a48d7b4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridAtomicCacheQueueImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridAtomicCacheQueueImpl.java
@@ -76,7 +76,7 @@ public class GridAtomicCacheQueueImpl<T> extends GridCacheQueueAdapter<T> {
             return true;
         }
         catch (IgniteCheckedException e) {
-            throw new IgniteException(e);
+            throw U.convertException(e);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64645f61/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java
index 10e8e6b..6670e77 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.datastructures;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.datastructures.*;
+import org.apache.ignite.datastructures.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.processors.cache.transactions.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64645f61/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
index efdaac2..7d1a151 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.datastructures;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.datastructures.*;
+import org.apache.ignite.datastructures.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.processors.cache.transactions.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64645f61/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
index c66a890..4001c21 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.datastructures;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.datastructures.*;
+import org.apache.ignite.datastructures.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.processors.cache.transactions.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64645f61/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
index db73ebb..a8e4967 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.datastructures;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.datastructures.*;
+import org.apache.ignite.datastructures.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.processors.cache.transactions.*;


Mime
View raw message