ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [28/51] [abbrv] incubator-ignite git commit: # ignite-103
Date Thu, 05 Feb 2015 15:03:59 GMT
# ignite-103


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

Branch: refs/heads/ignite-57
Commit: 4299661358bbe1a221a1ee22ec04a96f1cc77882
Parents: bfe40df
Author: sboikov <sboikov@gridgain.com>
Authored: Thu Feb 5 11:59:10 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Thu Feb 5 11:59:10 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/internal/GridComponent.java   |  4 ++--
 .../ignite/internal/GridPluginComponent.java    |  2 +-
 .../internal/managers/GridManagerAdapter.java   |  2 +-
 .../managers/GridNoopManagerAdapter.java        |  2 +-
 .../processors/GridProcessorAdapter.java        |  2 +-
 .../continuous/GridContinuousProcessor.java     |  4 ++--
 .../dataload/IgniteDataLoaderImpl.java          | 21 ++------------------
 .../plugin/IgnitePluginProcessor.java           |  4 ++--
 8 files changed, 12 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/42996613/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java b/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java
index da1c63d..0891eb8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java
@@ -31,7 +31,7 @@ public interface GridComponent {
     /**
      * Unique component type for discovery data exchange.
      */
-    enum DiscoveryDataType {
+    enum DiscoveryDataExchangeType {
         /** */
         CONTINUOUS_PROC,
 
@@ -111,5 +111,5 @@ public interface GridComponent {
      *
      * @return Unique component type for discovery data exchange.
      */
-    @Nullable public DiscoveryDataType discoveryDataType();
+    @Nullable public DiscoveryDataExchangeType discoveryDataType();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/42996613/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
index d3c02d1..d8995d1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
@@ -68,7 +68,7 @@ public class GridPluginComponent implements GridComponent {
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public DiscoveryDataType discoveryDataType() {
+    @Nullable @Override public DiscoveryDataExchangeType discoveryDataType() {
         return null;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/42996613/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
index f0123da..5a2fb15 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
@@ -581,7 +581,7 @@ public abstract class GridManagerAdapter<T extends IgniteSpi> implements
GridMan
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public DiscoveryDataType discoveryDataType() {
+    @Nullable @Override public DiscoveryDataExchangeType discoveryDataType() {
         return null;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/42996613/modules/core/src/main/java/org/apache/ignite/internal/managers/GridNoopManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridNoopManagerAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridNoopManagerAdapter.java
index 79f74e6..c933c60 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridNoopManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridNoopManagerAdapter.java
@@ -67,7 +67,7 @@ public class GridNoopManagerAdapter implements GridManager {
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public DiscoveryDataType discoveryDataType() {
+    @Nullable @Override public DiscoveryDataExchangeType discoveryDataType() {
         return null;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/42996613/modules/core/src/main/java/org/apache/ignite/internal/processors/GridProcessorAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/GridProcessorAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/GridProcessorAdapter.java
index ebc7e0b..d91802a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/GridProcessorAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/GridProcessorAdapter.java
@@ -61,7 +61,7 @@ public abstract class GridProcessorAdapter implements GridProcessor {
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public DiscoveryDataType discoveryDataType() {
+    @Nullable @Override public DiscoveryDataExchangeType discoveryDataType() {
         return null;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/42996613/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
index 662ce11..93df61f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
@@ -311,8 +311,8 @@ public class GridContinuousProcessor extends GridProcessorAdapter {
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public DiscoveryDataType discoveryDataType() {
-        return DiscoveryDataType.CONTINUOUS_PROC;
+    @Nullable @Override public DiscoveryDataExchangeType discoveryDataType() {
+        return DiscoveryDataExchangeType.CONTINUOUS_PROC;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/42996613/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
index 6253f2c..6dff3ae 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
@@ -46,7 +46,6 @@ import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.events.IgniteEventType.*;
-import static org.apache.ignite.internal.GridNodeAttributes.*;
 import static org.apache.ignite.internal.GridTopic.*;
 import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
 
@@ -54,9 +53,6 @@ import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
  * Data loader implementation.
  */
 public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delayed
{
-    /** */
-    public static final IgniteProductVersion COMPACT_MAP_ENTRIES_SINCE = IgniteProductVersion.fromString("1.0.0");
-
     /** Cache updater. */
     private IgniteDataLoadCacheUpdater<K, V> updater = GridDataLoadCacheUpdaters.individual();
 
@@ -984,21 +980,8 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K,
V>, Delay
 
                 try {
                     if (compact) {
-                        if (node.version().compareTo(COMPACT_MAP_ENTRIES_SINCE) < 0) {
-                            Collection<Map.Entry<K, V>> entries0 = new ArrayList<>(entries.size());
-
-                            GridPortableProcessor portable = ctx.portable();
-
-                            for (Map.Entry<K, V> entry : entries)
-                                entries0.add(new Entry0<>(
-                                    portableEnabled ? (K)portable.marshalToPortable(entry.getKey())
: entry.getKey(),
-                                    portableEnabled ? (V)portable.marshalToPortable(entry.getValue())
: entry.getValue()));
-
-                            entriesBytes = ctx.config().getMarshaller().marshal(entries0);
-                        }
-                        else
-                            entriesBytes = ctx.config().getMarshaller()
-                                .marshal(new Entries0<>(entries, portableEnabled ?
ctx.portable() : null));
+                        entriesBytes = ctx.config().getMarshaller()
+                            .marshal(new Entries0<>(entries, portableEnabled ? ctx.portable()
: null));
                     }
                     else
                         entriesBytes = ctx.config().getMarshaller().marshal(entries);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/42996613/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
index bcd5bed..9c6dc0e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
@@ -171,8 +171,8 @@ public class IgnitePluginProcessor extends GridProcessorAdapter {
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public DiscoveryDataType discoveryDataType() {
-        return DiscoveryDataType.PLUGIN;
+    @Nullable @Override public DiscoveryDataExchangeType discoveryDataType() {
+        return DiscoveryDataExchangeType.PLUGIN;
     }
 
     /** {@inheritDoc} */


Mime
View raw message