add UnsafeByteArrayGraphInput and UnsafeByteArrayGraphOutput #13

houzhizhen · 2021-02-02T11:11:07Z

No description provided.

javeme · 2021-02-02T11:40:57Z

computer-core/src/main/java/com/baidu/hugegraph/computer/core/io/UnsafeByteArrayGraphInput.java

+
+ private static final sun.misc.Unsafe UNSAFE;
+
+ private byte[] buffer;


javeme · 2021-02-02T11:41:00Z

computer-core/src/main/java/com/baidu/hugegraph/computer/core/io/UnsafeByteArrayGraphInput.java

+ private static final sun.misc.Unsafe UNSAFE;
+
+ private byte[] buffer;
+ private int limit;


javeme · 2021-02-02T12:04:10Z

...uter-core/src/main/java/com/baidu/hugegraph/computer/core/io/UnsafeByteArrayGraphOutput.java

+ char c;
+ int count = 0;
+
+ /* use charAt instead of copying String to char array */


...uter-core/src/main/java/com/baidu/hugegraph/computer/core/io/UnsafeByteArrayGraphOutput.java

javeme · 2021-02-02T12:06:43Z

...uter-core/src/main/java/com/baidu/hugegraph/computer/core/io/UnsafeByteArrayGraphOutput.java

+ }
+ }
+ this.writeShort(utfLen);
+ this.require(utfLen);


assert utfLen == bytes.length

javeme · 2021-02-02T12:12:58Z

...uter-core/src/main/java/com/baidu/hugegraph/computer/core/io/UnsafeByteArrayGraphOutput.java

+
+ public void skipBytes(int bytesToSkip) {
+ this.require(bytesToSkip);
+ this.position += bytesToSkip;


comments used in what scenes

javeme · 2021-02-02T12:13:26Z

...uter-core/src/main/java/com/baidu/hugegraph/computer/core/io/UnsafeByteArrayGraphOutput.java

+ /**
+ * @return the internal byte array, can't modify the returned byte array
+ */
+ public byte[] getByteArray() {


javeme · 2021-02-02T12:14:26Z

computer-test/src/main/java/com/baidu/hugegraph/computer/core/io/UnsafeByteArrayTest.java

+ @Test
+ public void testShort() throws IOException {
+ UnsafeByteArrayGraphOutput output = new UnsafeByteArrayGraphOutput();
+ for (short i = -128; i <= 127; i++) {


add more cases

javeme · 2021-02-02T12:15:18Z

computer-test/src/main/java/com/baidu/hugegraph/computer/core/io/UnsafeByteArrayTest.java

+ @Test
+ public void testShortWithPosition() throws IOException {
+ UnsafeByteArrayGraphOutput output = new UnsafeByteArrayGraphOutput();
+ output.skipBytes(Constants.SHORT_LEN);


return position

javeme · 2021-02-02T12:15:45Z

computer-test/src/main/java/com/baidu/hugegraph/computer/core/io/UnsafeByteArrayTest.java

+ }
+
+ @Test
+ public void testGetByteArray() throws IOException {


javeme · 2021-02-03T04:09:28Z

...uter-core/src/main/java/com/baidu/hugegraph/computer/core/io/UnsafeByteArrayGraphOutput.java

+ public int skipBytes(int bytesToSkip) {
 this.require(bytesToSkip);
+ int positionBeforeSkip = this.position;
 this.position += bytesToSkip;


javeme · 2021-02-03T05:50:33Z

computer-test/src/main/java/com/baidu/hugegraph/computer/core/io/UnsafeByteArrayTest.java

 output.writeInt(Integer.MAX_VALUE);
 UnsafeByteArrayGraphInput input = new UnsafeByteArrayGraphInput(
- output.getByteArray(),
+ output.buffer(),


also update testGetByteArray

javeme · 2021-02-03T07:29:22Z

computer-core/src/main/java/com/baidu/hugegraph/computer/core/io/UnsafeByteArrayGraphInput.java

+
+import sun.misc.Unsafe;
+
+public class UnsafeByteArrayGraphInput implements GraphInput {


just implements DataInput

javeme · 2021-02-03T07:30:14Z

...uter-core/src/main/java/com/baidu/hugegraph/computer/core/io/UnsafeByteArrayGraphOutput.java

+ private static final int DEFAULT_SIZE = 32;
+
+ private byte[] buffer;
+ private int capacity;


javeme · 2021-02-03T07:30:26Z

...uter-core/src/main/java/com/baidu/hugegraph/computer/core/io/UnsafeByteArrayGraphOutput.java

+
+import sun.misc.Unsafe;
+
+public class UnsafeByteArrayGraphOutput implements GraphOutput {


javeme · 2021-02-03T07:30:48Z

computer-core/src/main/java/com/baidu/hugegraph/computer/core/io/UnsafeByteArrayGraphInput.java

+ private static final sun.misc.Unsafe UNSAFE;
+
+ private final byte[] buffer;
+ private final int limit;


already set final

javeme · 2021-02-03T07:31:05Z

...uter-core/src/main/java/com/baidu/hugegraph/computer/core/io/UnsafeByteArrayGraphOutput.java

+ public void writeShort(int v) {
+ this.require(Constants.SHORT_LEN);
+ UNSAFE.putShort(buffer,
+ Unsafe.ARRAY_BYTE_BASE_OFFSET + this.position,


javeme · 2021-02-03T07:33:43Z

computer-core/src/main/java/com/baidu/hugegraph/computer/core/util/CoderUtil.java

- return encoder.encode(CharBuffer.wrap(str.toCharArray()));
- } catch (CharacterCodingException e) {
- throw new ComputerException("Can't encode %s with UTF-8", e, str);
+ for (;i < strLen; i++) {


javeme · 2021-02-03T07:35:02Z

computer-test/src/main/java/com/baidu/hugegraph/computer/core/io/UnsafeByteArrayTest.java

+ output.write(i);
+ }
+ UnsafeByteArrayGraphInput input = new UnsafeByteArrayGraphInput(
+ output.toByteArray());


align with UnsafeByteArrayGraphInput

javeme · 2021-02-03T07:36:31Z

computer-test/src/main/java/com/baidu/hugegraph/computer/core/io/UnsafeByteArrayTest.java

+ values[i] = ValueFactory.createValue(types[i].code());
+ output.writeValue(values[i]);
+ } else {
+ // Omit ValueType.UNKNOWN


assert i == 0

testWriteValue is removed

javeme · 2021-02-03T07:37:06Z

computer-test/src/main/java/com/baidu/hugegraph/computer/core/io/UnsafeByteArrayTest.java

+ Value value = input.readValue();
+ Assert.assertEquals(values[i], value);
+ } else {
+ // Omitted ValueType.UNKNOWN


testWriteValue is removed

javeme · 2021-02-03T07:37:24Z

computer-core/src/main/java/com/baidu/hugegraph/computer/core/io/UnsafeByteArrayGraphInput.java

+
+ @Override
+ public Value readValue() throws IOException {
+ byte typeCode = this.readByte();


typeCode => type

method readValue is removed

javeme · 2021-02-03T13:28:51Z

computer-core/src/main/java/com/baidu/hugegraph/computer/core/util/CoderUtil.java

 }

- for (;i < strLen; i++) {
+ for ( ;i < strLen; i++) {


javeme · 2021-02-03T13:29:19Z

computer-test/src/main/java/com/baidu/hugegraph/computer/core/io/UnsafeByteArrayTest.java

+ UnsafeByteArrayOutput output = new UnsafeByteArrayOutput();
 output.writeChars(chars);
- UnsafeByteArrayGraphInput input = new UnsafeByteArrayGraphInput(
+ UnsafeByteArrayInput input = new UnsafeByteArrayInput(


update align

Linary · 2021-02-04T03:10:18Z

computer-core/src/main/java/com/baidu/hugegraph/computer/core/io/UnsafeByteArrayInput.java

+
+ @Override
+ public int skipBytes(int n) {
+ int remaining = remaining();


this.remaining()

Linary · 2021-02-04T03:19:45Z

computer-core/src/main/java/com/baidu/hugegraph/computer/core/io/UnsafeByteArrayOutput.java

+ * byte size and calls writeInt(int position, int v) to write the int at
+ * skipped position. The serialized byte size can be get by
+ * the difference of {@link #position()} before and after write the content.
+ * @returns the position before skip.


@returns ? seems => @return

Linary · 2021-02-04T03:24:46Z

computer-core/src/main/java/com/baidu/hugegraph/computer/core/io/UnsafeByteArrayOutput.java

+ @Override
+ public void writeBoolean(boolean v) {
+ this.require(Constants.BOOLEAN_LEN);
+ UNSAFE.putBoolean(buffer, this.offset(), v);


buffer => this.buffer, ditto as followers

Linary · 2021-02-04T03:25:13Z

computer-core/src/main/java/com/baidu/hugegraph/computer/core/io/UnsafeByteArrayOutput.java

+ }
+
+ public void writeShort(int position, int v) {
+ UNSAFE.putShort(buffer, this.offset(position), (short) v);


need require firstly?

no, because it write at specified position

javeme · 2021-02-04T07:50:07Z

computer-core/src/main/java/com/baidu/hugegraph/computer/core/io/UnsafeByteArrayOutput.java

+ }
+
+ public void writeInt(int position, int v) {
+ this.require(Constants.INT_LEN);


check position + Constants.INT_LEN < capacity

javeme · 2021-02-04T07:50:29Z

computer-core/src/main/java/com/baidu/hugegraph/computer/core/io/UnsafeByteArrayOutput.java

+ this.position += Constants.SHORT_LEN;
+ }
+
+ public void writeShort(int position, int v) {


check position + Constants.SHORT_LEN < capacity

javeme requested changes Feb 2, 2021

View reviewed changes

houzhizhen force-pushed the unsafe branch 2 times, most recently from 6c0b9ba to 18da03a Compare February 3, 2021 04:07

javeme reviewed Feb 3, 2021

View reviewed changes

javeme approved these changes Feb 3, 2021

View reviewed changes

javeme requested changes Feb 3, 2021

View reviewed changes

javeme reviewed Feb 3, 2021

View reviewed changes

houzhizhen added 5 commits February 4, 2021 09:03

add UnsafeByteArrayGraphInput and UnsafeByteArrayGraphOutput

75b926d

move the mutual covert from byte array and string to CodeUtil

7bd0820

tiny improve

c42284d

tiny improve

3475afd

tiny improve

1e6720e

houzhizhen force-pushed the unsafe branch from c28e5b0 to 1e6720e Compare February 4, 2021 01:29

javeme previously approved these changes Feb 4, 2021

View reviewed changes

Linary requested changes Feb 4, 2021

View reviewed changes

tiny improve

e20247c

houzhizhen dismissed javeme’s stale review via e20247c February 4, 2021 07:28

javeme reviewed Feb 4, 2021

View reviewed changes

tiny improve

0da7366

houzhizhen force-pushed the unsafe branch from b20f0d8 to 0da7366 Compare February 4, 2021 08:17

javeme approved these changes Feb 4, 2021

View reviewed changes

Linary approved these changes Feb 4, 2021

View reviewed changes

Merge branch 'master' into unsafe

3fb349c

houzhizhen merged commit 90a9656 into master Feb 4, 2021

houzhizhen deleted the unsafe branch February 4, 2021 09:30


		private static final sun.misc.Unsafe UNSAFE;

		private byte[] buffer;


		import sun.misc.Unsafe;

		public class UnsafeByteArrayGraphInput implements GraphInput {


		import sun.misc.Unsafe;

		public class UnsafeByteArrayGraphOutput implements GraphOutput {

add UnsafeByteArrayGraphInput and UnsafeByteArrayGraphOutput #13

add UnsafeByteArrayGraphInput and UnsafeByteArrayGraphOutput #13

Uh oh!

Conversation

houzhizhen commented Feb 2, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Labels

3 participants