geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adon...@apache.org
Subject geode git commit: GEODE-2866: Removing the unused files and the corresponding test. This closes #497
Date Wed, 10 May 2017 09:23:14 GMT
Repository: geode
Updated Branches:
  refs/heads/develop 7b2f904f6 -> 49c0551b5


GEODE-2866: Removing the unused files and the corresponding test.
This closes #497

Signed-off-by: adongre <adongre@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/49c0551b
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/49c0551b
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/49c0551b

Branch: refs/heads/develop
Commit: 49c0551b55206f91c8bd688343b40ae5a51c4f29
Parents: 7b2f904
Author: prasind <prasad@ampool.io>
Authored: Mon May 8 14:53:59 2017 +0530
Committer: adongre <adongre@apache.org>
Committed: Wed May 10 14:42:35 2017 +0530

----------------------------------------------------------------------
 .../org/apache/geode/internal/util/Bytes.java   | 320 -------------------
 .../geode/internal/util/BytesJUnitTest.java     | 127 --------
 2 files changed, 447 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/49c0551b/geode-core/src/main/java/org/apache/geode/internal/util/Bytes.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/Bytes.java b/geode-core/src/main/java/org/apache/geode/internal/util/Bytes.java
deleted file mode 100644
index 7a2349f..0000000
--- a/geode-core/src/main/java/org/apache/geode/internal/util/Bytes.java
+++ /dev/null
@@ -1,320 +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.geode.internal.util;
-
-import java.nio.ByteBuffer;
-
-/**
- * Provides utilities for converting from byte[] to primitive values.
- * 
- */
-public class Bytes {
-  /**
-   * Inserts the integer value into the array at the requested offset.
-   * 
-   * @param val the value
-   * @param buf the array
-   * @param off the offset
-   */
-  public static void putInt(int val, byte[] buf, int off) {
-    assert off + 4 <= buf.length;
-
-    buf[off] = int0(val);
-    buf[off + 1] = int1(val);
-    buf[off + 2] = int2(val);
-    buf[off + 3] = int3(val);
-  }
-
-  /**
-   * Inserts the long value into the array at the requested offset.
-   * 
-   * @param val the value
-   * @param buf the array
-   * @param off the offset
-   */
-  public static void putLong(long val, byte[] buf, int off) {
-    assert off + 4 <= buf.length;
-
-    buf[off] = long0(val);
-    buf[off + 1] = long1(val);
-    buf[off + 2] = long2(val);
-    buf[off + 3] = long3(val);
-    buf[off + 4] = long4(val);
-    buf[off + 5] = long5(val);
-    buf[off + 6] = long6(val);
-    buf[off + 7] = long7(val);
-  }
-
-  /**
-   * Extracts the protobuf varint from the buffer.
-   * 
-   * @param buf the buffer
-   * @return the varint
-   */
-  public static int getVarInt(ByteBuffer buf) {
-    byte b;
-    int val;
-
-    // unrolled! :-)
-    b = buf.get();
-    val = (b & 0x7f);
-    if ((b & 0x80) == 0)
-      return val;
-    b = buf.get();
-    val |= (b & 0x7f) << 7;
-    if ((b & 0x80) == 0)
-      return val;
-    b = buf.get();
-    val |= (b & 0x7f) << 14;
-    if ((b & 0x80) == 0)
-      return val;
-    b = buf.get();
-    val |= (b & 0x7f) << 21;
-    if ((b & 0x80) == 0)
-      return val;
-    b = buf.get();
-    val |= (b & 0x7f) << 28;
-
-    return val;
-  }
-
-  /**
-   * Extracts the protbuf varint from the array.
-   * 
-   * @param buf the array
-   * @param off the offset
-   * @return the varint
-   */
-  public static int getVarInt(byte[] buf, int off) {
-    byte b;
-    int val;
-
-    // unrolled! :-)
-    b = buf[off++];
-    val = (b & 0x7f);
-    if ((b & 0x80) == 0)
-      return val;
-    b = buf[off++];
-    val |= (b & 0x7f) << 7;
-    if ((b & 0x80) == 0)
-      return val;
-    b = buf[off++];
-    val |= (b & 0x7f) << 14;
-    if ((b & 0x80) == 0)
-      return val;
-    b = buf[off++];
-    val |= (b & 0x7f) << 21;
-    if ((b & 0x80) == 0)
-      return val;
-    b = buf[off++];
-    val |= (b & 0x7f) << 28;
-
-    return val;
-  }
-
-  /**
-   * Inserts the protobuf varint into the buffer at the current position.
-   * 
-   * @param val the value
-   * @param buf the buffer
-   * @return the buffer
-   */
-  public static ByteBuffer putVarInt(int val, ByteBuffer buf) {
-    assert val >= 0;
-
-    // protobuf-style varint encoding
-    // set the MSB as continuation bit for each byte except the last byte
-    // pack the bytes in reverse order
-    // packed size is (bits / 7) + 1
-    while ((val & ~0x7f) != 0) {
-      buf.put((byte) ((val & 0x7f) | 0x80));
-      val >>= 7;
-    }
-    return buf.put((byte) val);
-  }
-
-  /**
-   * Inserts the protobuf varint into the array at the requested offset.
-   * 
-   * @param val the value
-   * @param buf the array
-   * @param off the offset
-   * @return the updated offset
-   */
-  public static int putVarInt(int val, byte[] buf, int off) {
-    assert val >= 0;
-
-    // protobuf-style varint encoding
-    // set the MSB as continuation bit for each byte except the last byte
-    // TODO see if unrolling is faster
-    while (val > 0x7f) {
-      buf[off++] = (byte) ((val & 0x7f) | 0x80);
-      val >>= 7;
-    }
-    buf[off++] = (byte) val;
-    return off;
-  }
-
-  /**
-   * Returns the bytes required to store a protobuf varint.
-   * 
-   * @param val the value
-   * @return the varint size
-   */
-  public static int sizeofVarInt(int val) {
-    assert val >= 0;
-
-    if (val < (1 << 7)) {
-      return 1;
-    } else if (val < (1 << 14)) {
-      return 2;
-    } else if (val < (1 << 21)) {
-      return 3;
-    } else if (val < (1 << 28)) {
-      return 4;
-    }
-    return 5;
-  }
-
-  /**
-   * Creates a short value from two bytes.
-   * 
-   * @param b0 the first byte
-   * @param b1 the second byte
-   * @return the value
-   */
-  public static short toShort(byte b0, byte b1) {
-    return (short) ((b0 << 8) | (b1 & 0xff));
-  }
-
-  /**
-   * Creates a char value from two bytes.
-   * 
-   * @param b0 the first byte
-   * @param b1 the second byte
-   * @return the value
-   */
-  public static char toChar(byte b0, byte b1) {
-    return (char) ((b0 << 8) | (b1 & 0xff));
-  }
-
-  /**
-   * Creates an unsigned short from two bytes.
-   * 
-   * @param b0 the first byte
-   * @param b1 the second byte
-   * @return the value
-   */
-  public static int toUnsignedShort(byte b0, byte b1) {
-    return ((b0 & 0xff) << 8) | (b1 & 0xff);
-  }
-
-  /**
-   * Creates an integer from four bytes.
-   * 
-   * @param b0 the first byte
-   * @param b1 the second byte
-   * @param b2 the third byte
-   * @param b3 the fourth byte
-   * @return the value
-   */
-  public static int toInt(byte b0, byte b1, byte b2, byte b3) {
-    return (b0 << 24) | ((b1 & 0xff) << 16) | ((b2 & 0xff) << 8)
| (b3 & 0xff);
-  }
-
-  /**
-   * Creates a long from eight bytes.
-   * 
-   * @param b0 the first byte
-   * @param b1 the second byte
-   * @param b2 the third byte
-   * @param b3 the fourth byte
-   * @param b4 the fifth byte
-   * @param b5 the sixth byte
-   * @param b6 the seventh byte
-   * @param b7 the eighth byte
-   * @return the value
-   */
-  public static long toLong(byte b0, byte b1, byte b2, byte b3, byte b4, byte b5, byte b6,
-      byte b7) {
-    return ((long) b0 << 56) | (((long) b1 & 0xff) << 48) | (((long) b2 &
0xff) << 40)
-        | (((long) b3 & 0xff) << 32) | (((long) b4 & 0xff) << 24) | (((long)
b5 & 0xff) << 16)
-        | (((long) b6 & 0xff) << 8) | ((long) b7 & 0xff);
-  }
-
-  public static byte char0(char value) {
-    return (byte) (value >> 8);
-  }
-
-  public static byte char1(char value) {
-    return (byte) value;
-  }
-
-  public static byte short0(short value) {
-    return (byte) (value >> 8);
-  }
-
-  public static byte short1(short value) {
-    return (byte) value;
-  }
-
-  public static byte int0(int value) {
-    return (byte) (value >> 24);
-  }
-
-  public static byte int1(int value) {
-    return (byte) (value >> 16);
-  }
-
-  public static byte int2(int value) {
-    return (byte) (value >> 8);
-  }
-
-  public static byte int3(int value) {
-    return (byte) value;
-  }
-
-  public static byte long0(long value) {
-    return (byte) (value >> 56);
-  }
-
-  public static byte long1(long value) {
-    return (byte) (value >> 48);
-  }
-
-  public static byte long2(long value) {
-    return (byte) (value >> 40);
-  }
-
-  public static byte long3(long value) {
-    return (byte) (value >> 32);
-  }
-
-  public static byte long4(long value) {
-    return (byte) (value >> 24);
-  }
-
-  public static byte long5(long value) {
-    return (byte) (value >> 16);
-  }
-
-  public static byte long6(long value) {
-    return (byte) (value >> 8);
-  }
-
-  public static byte long7(long value) {
-    return (byte) value;
-  }
-}

http://git-wip-us.apache.org/repos/asf/geode/blob/49c0551b/geode-core/src/test/java/org/apache/geode/internal/util/BytesJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/BytesJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/BytesJUnitTest.java
deleted file mode 100644
index b417c8e..0000000
--- a/geode-core/src/test/java/org/apache/geode/internal/util/BytesJUnitTest.java
+++ /dev/null
@@ -1,127 +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.geode.internal.util;
-
-import static org.junit.Assert.*;
-
-import java.nio.ByteBuffer;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import org.apache.geode.test.junit.categories.UnitTest;
-
-@Category(UnitTest.class)
-public class BytesJUnitTest {
-
-  private ByteBuffer buf;
-
-  @Before
-  public void setUp() throws Exception {
-    buf = ByteBuffer.allocate(8);
-  }
-
-  @Test
-  public void testShort() {
-    short[] val = {666, -1, Short.MIN_VALUE, 0, 12, Short.MAX_VALUE};
-    for (int i = 0; i < val.length; i++) {
-      buf.putShort(val[i]).flip();
-      assertEquals(val[i], Bytes.toShort(buf.get(), buf.get()));
-
-      buf.rewind();
-    }
-  }
-
-  @Test
-  public void testChar() {
-    char[] val = {'a', 'b', 'c'};
-    for (int i = 0; i < val.length; i++) {
-      buf.putChar(val[i]).flip();
-      assertEquals(val[i], Bytes.toChar(buf.get(), buf.get()));
-
-      buf.rewind();
-    }
-  }
-
-  @Test
-  public void testUnsignedShort() {
-    int[] val = {0, 1, Short.MAX_VALUE + 1, 2 * Short.MAX_VALUE};
-    for (int i = 0; i < val.length; i++) {
-      buf.put(Bytes.int2(val[i])).put(Bytes.int3(val[i])).flip();
-      assertEquals(val[i], Bytes.toUnsignedShort(buf.get(), buf.get()));
-
-      buf.rewind();
-    }
-  }
-
-  @Test
-  public void testInt() {
-    int[] val = {666, -1, Integer.MIN_VALUE, 0, 1, Integer.MAX_VALUE};
-    for (int i = 0; i < val.length; i++) {
-      buf.putInt(val[i]).flip();
-      assertEquals(val[i], Bytes.toInt(buf.get(), buf.get(), buf.get(), buf.get()));
-
-      buf.rewind();
-
-      byte[] bytes = new byte[4];
-      Bytes.putInt(val[i], bytes, 0);
-      assertEquals(val[i], Bytes.toInt(bytes[0], bytes[1], bytes[2], bytes[3]));
-    }
-  }
-
-  @Test
-  public void testLong() {
-    long[] val = {666, -1, Long.MIN_VALUE, 0, 1, Long.MAX_VALUE};
-    for (int i = 0; i < val.length; i++) {
-      buf.putLong(val[i]).flip();
-      assertEquals(val[i], Bytes.toLong(buf.get(), buf.get(), buf.get(), buf.get(), buf.get(),
-          buf.get(), buf.get(), buf.get()));
-
-      buf.rewind();
-    }
-  }
-
-  @Test
-  public void testVarint() {
-    ByteBuffer buf = ByteBuffer.allocate(5);
-    checkVarint(0, buf);
-
-    // 1 byte
-    checkVarint(1, buf);
-    checkVarint(0x7f, buf);
-
-    // 2 byte
-    checkVarint(0x80, buf);
-    checkVarint(0x7fff, buf);
-
-    // 3 byte
-    checkVarint(0x8000, buf);
-    checkVarint(0x7fffff, buf);
-
-    // 4 byte
-    checkVarint(0x800000, buf);
-    checkVarint(0x7fffffff, buf);
-  }
-
-  private void checkVarint(int v, ByteBuffer buf) {
-    Bytes.putVarInt(v, buf);
-    buf.rewind();
-
-    int v2 = Bytes.getVarInt(buf);
-    assertEquals(v, v2);
-    buf.clear();
-  }
-}


Mime
View raw message