ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [05/14] ignite git commit: ignite-1273: refactoring
Date Tue, 01 Sep 2015 13:40:52 GMT
ignite-1273: refactoring


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

Branch: refs/heads/ignite-1273
Commit: 9ddbe17325847c407c400064a79615593bce3a75
Parents: df0aa2f
Author: Denis Magda <dmagda@gridgain.com>
Authored: Mon Aug 31 14:45:14 2015 +0300
Committer: Denis Magda <dmagda@gridgain.com>
Committed: Mon Aug 31 14:45:14 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/portable/PortableUtils.java |  1 +
 .../portable/builder/PortableBuilderReader.java |  4 +-
 .../builder/PortableModifiableLazeValue.java    | 52 --------------------
 .../builder/PortableModifiableLazyValue.java    | 52 ++++++++++++++++++++
 4 files changed, 55 insertions(+), 54 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/9ddbe173/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
index fd2ab17..d4fbb1d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
@@ -329,6 +329,7 @@ public class PortableUtils {
     public static boolean isPlainArrayType(int type) {
         return type >= BYTE_ARR && type <= DATE_ARR;
     }
+
     /**
      * @param cls Class.
      * @return Portable field type.

http://git-wip-us.apache.org/repos/asf/ignite/blob/9ddbe173/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderReader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderReader.java
b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderReader.java
index 7ced259..ac76460 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderReader.java
@@ -648,7 +648,7 @@ class PortableBuilderReader {
                         assert flag == GridPortableMarshaller.NULL;
                 }
 
-                return new PortableModifiableLazeValue(this, valPos, pos - valPos);
+                return new PortableModifiableLazyValue(this, valPos, pos - valPos);
             }
 
             case GridPortableMarshaller.COL: {
@@ -706,7 +706,7 @@ class PortableBuilderReader {
         PortableAbstractLazyValue res;
 
         if (modifiableLazyVal)
-            res = new PortableModifiableLazeValue(this, valPos, 1 + plainLazyValLen);
+            res = new PortableModifiableLazyValue(this, valPos, 1 + plainLazyValLen);
         else
             res = new PortablePlainLazyValue(this, valPos, 1 + plainLazyValLen);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/9ddbe173/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableModifiableLazeValue.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableModifiableLazeValue.java
b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableModifiableLazeValue.java
deleted file mode 100644
index 083a300..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableModifiableLazeValue.java
+++ /dev/null
@@ -1,52 +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.internal.portable.builder;
-
-import org.apache.ignite.internal.portable.*;
-
-/**
- *
- */
-public class PortableModifiableLazeValue extends PortableAbstractLazyValue {
-    /** */
-    protected final int len;
-
-    /**
-     * @param reader
-     * @param valOff
-     * @param len
-     */
-    public PortableModifiableLazeValue(PortableBuilderReader reader, int valOff, int len)
{
-        super(reader, valOff);
-
-        this.len = len;
-    }
-
-    /** {@inheritDoc} */
-    @Override protected Object init() {
-        return reader.reader().unmarshal(valOff);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeTo(PortableWriterExImpl writer, PortableBuilderSerializer
ctx) {
-        if (val == null)
-            writer.write(reader.array(), valOff, len);
-        else
-            writer.writeObject(val);
-    }
-}

http://git-wip-us.apache.org/repos/asf/ignite/blob/9ddbe173/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableModifiableLazyValue.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableModifiableLazyValue.java
b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableModifiableLazyValue.java
new file mode 100644
index 0000000..09fb844
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableModifiableLazyValue.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.portable.builder;
+
+import org.apache.ignite.internal.portable.*;
+
+/**
+ *
+ */
+public class PortableModifiableLazyValue extends PortableAbstractLazyValue {
+    /** */
+    protected final int len;
+
+    /**
+     * @param reader
+     * @param valOff
+     * @param len
+     */
+    public PortableModifiableLazyValue(PortableBuilderReader reader, int valOff, int len)
{
+        super(reader, valOff);
+
+        this.len = len;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected Object init() {
+        return reader.reader().unmarshal(valOff);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeTo(PortableWriterExImpl writer, PortableBuilderSerializer
ctx) {
+        if (val == null)
+            writer.write(reader.array(), valOff, len);
+        else
+            writer.writeObject(val);
+    }
+}


Mime
View raw message