Skip to content

[close #606]: change the default prefix for API v2 #607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iosmanthus merged 5 commits into from
Jun 6, 2022
Merged

[close #606]: change the default prefix for API v2 #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d9b0d56
draft: change the default prefix for API v2
iosmanthus Jun 5, 2022
3bb2fa1
./dev/javafmt
iosmanthus Jun 5, 2022
fa85250
fix wrong end key for default keyspace
iosmanthus Jun 5, 2022
ec63ba5
reserve 3 bytes for keyspace id
iosmanthus Jun 6, 2022
53d8678
fix unit tests for v2 codec
iosmanthus Jun 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/main/java/org/tikv/common/apiversion/RequestKeyV2Codec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
import org.tikv.kvproto.Metapb.Region;

public class RequestKeyV2Codec implements RequestKeyCodec {
protected static final ByteString RAW_KEY_PREFIX = ByteString.copyFromUtf8("r");
protected static final ByteString RAW_END_KEY =
ByteString.copyFrom(new byte[] {(byte) (RAW_KEY_PREFIX.toByteArray()[0] + 1)});

protected static final ByteString TXN_KEY_PREFIX = ByteString.copyFromUtf8("x");
protected static final ByteString TXN_END_KEY =
ByteString.copyFrom(new byte[] {(byte) (TXN_KEY_PREFIX.toByteArray()[0] + 1)});
protected static final ByteString RAW_DEFAULT_PREFIX =
ByteString.copyFrom(new byte[] {'r', 0, 0, 0});
protected static final ByteString RAW_DEFAULT_END =
ByteString.copyFrom(new byte[] {'r', 0, 0, 1});
protected static final ByteString TXN_DEFAULT_PREFIX =
ByteString.copyFrom(new byte[] {'x', 0, 0, 0});
protected static final ByteString TXN_DEFAULT_END =
ByteString.copyFrom(new byte[] {'x', 0, 0, 1});
protected ByteString keyPrefix;

protected ByteString infiniteEndKey;

@Override
Expand All @@ -49,7 +49,7 @@ public ByteString decodeKey(ByteString key) {
throw new IllegalArgumentException("key corrupted, wrong prefix");
}

return key.substring(1);
return key.substring(keyPrefix.size());
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/tikv/common/apiversion/RequestKeyV2RawCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class RequestKeyV2RawCodec extends RequestKeyV2Codec {
public RequestKeyV2RawCodec() {
super();

this.keyPrefix = RAW_KEY_PREFIX;
this.infiniteEndKey = RAW_END_KEY;
this.keyPrefix = RAW_DEFAULT_PREFIX;
this.infiniteEndKey = RAW_DEFAULT_END;
}
}
4 changes: 2 additions & 2 deletions src/main/java/org/tikv/common/apiversion/RequestKeyV2TxnCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class RequestKeyV2TxnCodec extends RequestKeyV2Codec {
public RequestKeyV2TxnCodec() {
super();

this.keyPrefix = TXN_KEY_PREFIX;
this.infiniteEndKey = TXN_END_KEY;
this.keyPrefix = TXN_DEFAULT_PREFIX;
this.infiniteEndKey = TXN_DEFAULT_END;
}
}
7 changes: 4 additions & 3 deletions src/test/java/org/tikv/common/apiversion/RequestKeyCodecTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,10 @@ void testV2Codec(RequestKeyV2Codec v2) {
end = ByteString.EMPTY;
range = v2.encodeRange(start, end);
assertEquals(v2.encodeKey(start), range.first);
assertArrayEquals(
new byte[] {(byte) (v2.encodeKey(ByteString.EMPTY).byteAt(0) + 1)},
range.second.toByteArray());

byte[] max = v2.encodeKey(ByteString.EMPTY).toByteArray();
max[max.length - 1] += 1;
assertArrayEquals(max, range.second.toByteArray());

region =
Region.newBuilder()
Expand Down