feat(loki-buffer): varint complete

Author: wq1818528

packages/loki-buffer/src/ByteArray.ts

@@ -116,25 +116,25 @@ export class ByteArray {
 
   readUInt(): number {
     const uInt = this._data_.getUint32(this._pos_);
-    this._pos_ += 2;
+    this._pos_ += 4;
     return Math.floor(uInt);
   }
 
   readInt(): number {
     const tInt = this._data_.getInt32(this._pos_);
-    this._pos_ += 2;
+    this._pos_ += 4;
     return tInt;
   }
 
   readShort(): number {
     const short = this._data_.getInt16(this._pos_);
-    this._pos_ += 1;
+    this._pos_ += 2;
     return short;
   }
 
   readUShort(): number {
     const value = this._data_.getUint16(this._pos_);
-    this._pos_ += 1;
+    this._pos_ += 2;
     return value;
   }
 
@@ -308,9 +308,13 @@ export class ByteArray {
     for (let i = 0, sz: number = value.length; i < sz; i++) {
       const c: number = value.charCodeAt(i);
       if (c <= 0x7f) {
+        count += 1;
       } else if (c <= 0x7ff) {
+        count += 2;
       } else if (c <= 0xffff) {
+        count += 3;
       } else {
+        count += 4;
       }
     }
     return count;

packages/loki-buffer/src/VarNumberUtils.ts

@@ -12,10 +12,7 @@ export class VarNumberUtils {
   }
   //写入int
   static writeInt(value: number, buffer: ByteArray) {
-    VarNumberUtils.writeRawVarint64(
-      buffer,
-      VarNumberUtils.encodeZigZag32(value)
-    );
+    VarNumberUtils.writeRawVarint(buffer, VarNumberUtils.encodeZigZag32(value));
   }
 
   //读取long
@@ -26,10 +23,7 @@ export class VarNumberUtils {
   }
   //写入long
   static writeLong(value: number, buffer: ByteArray): void {
-    VarNumberUtils.writeRawVarint64(
-      buffer,
-      VarNumberUtils.encodeZigZag64(value)
-    );
+    VarNumberUtils.writeRawVarint(buffer, VarNumberUtils.encodeZigZag64(value));
   }
 
   //内部编码方法
@@ -45,15 +39,15 @@ export class VarNumberUtils {
     let result = 0;
     for (let shift = 0; shift < 64; shift += 7) {
       const b = VarNumberUtils.readRawByte(buffer);
-      result != (b & 127) << shift;
+      result |= (b & 127) << shift;
       if ((b & 0x80) == 0) {
         return result;
       }
     }
     throw new Error('readRawVarint64SlowPath');
   }
 
-  private static writeRawVarint64(buffer: ByteArray, value: number): void {
+  private static writeRawVarint(buffer: ByteArray, value: number): void {
     while (true) {
       if ((value & ~127) == 0) {
         VarNumberUtils.writeRawByte(buffer, value);

packages/loki-buffer/src/compress.ts

@@ -67,38 +67,26 @@ export class Compress {
   }
 
   readUnsignedInt(): number {
-    const uInt = this._data_.getUint16(this._pos_);
-    this._pos_ += 16;
+    const uInt = this._data_.getUint32(this._pos_);
+    this._pos_ += 32;
     return Math.floor(uInt);
   }
 
   readInt(): number {
-    const tInt = this._data_.getInt16(this._pos_);
-    this._pos_ += 16;
+    const tInt = this._data_.getInt32(this._pos_);
+    this._pos_ += 32;
     return tInt;
   }
 
   readShort(): number {
-    const short = this._data_.getInt8(this._pos_);
-    this._pos_ += 8;
+    const short = this._data_.getInt16(this._pos_);
+    this._pos_ += 16;
     return short;
   }
 
   readUnsignedShort(): number {
-    const value = this._data_.getUint8(this._pos_);
-    this._pos_ += 8;
-    return value;
-  }
-
-  readLong(): number {
-    const value = this._data_.getInt32(this._pos_);
-    this._pos_ += 32;
-    return value;
-  }
-
-  readUnsignedLong(): number {
-    const value = this._data_.getUint32(this._pos_);
-    this._pos_ += 32;
+    const value = this._data_.getUint16(this._pos_);
+    this._pos_ += 16;
     return value;
   }
 
@@ -127,39 +115,27 @@ export class Compress {
   }
 
   writeInt(value: number): void {
-    this.ensureWrite(this._pos_ + 16);
-    this._data_.setInt16(this._pos_, value);
-    this._pos_ += 16;
+    this.ensureWrite(this._pos_ + 32);
+    this._data_.setInt32(this._pos_, value);
+    this._pos_ += 32;
   }
 
   writeUnsignedInt(value: number): void {
-    this.ensureWrite(this._pos_ + 2);
-    this._data_.setUint16(this._pos_, value);
-    this._pos_ += 16;
+    this.ensureWrite(this._pos_ + 32);
+    this._data_.setUint32(this._pos_, value);
+    this._pos_ += 32;
   }
 
   writeShort(value: number): void {
-    this.ensureWrite(this._pos_ + 8);
-    this._data_.setInt8(this._pos_, value);
-    this._pos_ += 8;
+    this.ensureWrite(this._pos_ + 16);
+    this._data_.setInt16(this._pos_, value);
+    this._pos_ += 16;
   }
 
   writeUnsignedShort(value: number): void {
-    this.ensureWrite(this._pos_ + 8);
-    this._data_.setUint8(this._pos_, value);
-    this._pos_ += 8;
-  }
-
-  writeLong(value: number): void {
-    this.ensureWrite(this._pos_ + 32);
-    this._data_.setInt32(this._pos_, value);
-    this._pos_ += 32;
-  }
-
-  writeUnsignedLong(value: number): void {
-    this.ensureWrite(this._pos_ + 32);
-    this._data_.setUint32(this._pos_, value);
-    this._pos_ += 32;
+    this.ensureWrite(this._pos_ + 16);
+    this._data_.setUint16(this._pos_, value);
+    this._pos_ += 16;
   }
 
   writeFloat(value: number): void {

packages/loki-buffer/src/varint.ts

@@ -10,6 +10,9 @@ test('blah', () => {
   writer.writeInt(4);
   writer.writeShort(5);
   writer.writeBoolean(true);
+  writer.writeVarInt(1);
+  writer.writeVarLong(123);
+  writer.writeString('hhh');
 
   const readerBuf = writerBuf;
   const reader = new ByteArray(readerBuf);
@@ -20,6 +23,9 @@ test('blah', () => {
   expect(reader.readInt()).toBe(4);
   expect(reader.readShort()).toBe(5);
   expect(reader.readBoolean()).toBe(true);
+  expect(reader.readVarInt()).toBe(1);
+  expect(reader.readVarLong()).toBe(123);
+  expect(reader.readString()).toBe('hhh');
 });
 
 test.todo('support float!');