Skip to content
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

update thrift & modify the scan interface #386

Merged
merged 4 commits into from
Nov 26, 2021
Merged

update thrift & modify the scan interface #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ac6a3e
update thrift
Nicole00 Nov 15, 2021
dc5f1cd
update storage scan implementation according to lastest server
Nicole00 Nov 18, 2021
04a0cb1
update and add test
Nicole00 Nov 18, 2021
7a31224
fix conflict
Nicole00 Nov 18, 2021
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
2 changes: 1 addition & 1 deletion .../com/vesoft/nebula/meta/PropertyType.java → ...rated/com/vesoft/nebula/PropertyType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
*/
package com.vesoft.nebula.meta;
package com.vesoft.nebula;


import com.facebook.thrift.IntRangeSet;
Expand Down
24 changes: 12 additions & 12 deletions client/src/main/generated/com/vesoft/nebula/meta/ColumnTypeDef.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ public class ColumnTypeDef implements TBase, java.io.Serializable, Cloneable, Co

/**
*
* @see PropertyType
* @see com.vesoft.nebula.PropertyType
*/
public PropertyType type;
public com.vesoft.nebula.PropertyType type;
public short type_length;
/**
*
Expand Down Expand Up @@ -72,13 +72,13 @@ public ColumnTypeDef() {
}

public ColumnTypeDef(
PropertyType type) {
com.vesoft.nebula.PropertyType type) {
this();
this.type = type;
}

public ColumnTypeDef(
PropertyType type,
com.vesoft.nebula.PropertyType type,
short type_length,
GeoShape geo_shape) {
this();
Expand All @@ -89,7 +89,7 @@ public ColumnTypeDef(
}

public static class Builder {
private PropertyType type;
private com.vesoft.nebula.PropertyType type;
private short type_length;
private GeoShape geo_shape;

Expand All @@ -98,7 +98,7 @@ public static class Builder {
public Builder() {
}

public Builder setType(final PropertyType type) {
public Builder setType(final com.vesoft.nebula.PropertyType type) {
this.type = type;
return this;
}
Expand Down Expand Up @@ -150,17 +150,17 @@ public ColumnTypeDef deepCopy() {

/**
*
* @see PropertyType
* @see com.vesoft.nebula.PropertyType
*/
public PropertyType getType() {
public com.vesoft.nebula.PropertyType getType() {
return this.type;
}

/**
*
* @see PropertyType
* @see com.vesoft.nebula.PropertyType
*/
public ColumnTypeDef setType(PropertyType type) {
public ColumnTypeDef setType(com.vesoft.nebula.PropertyType type) {
this.type = type;
return this;
}
Expand Down Expand Up @@ -241,7 +241,7 @@ public void setFieldValue(int fieldID, Object __value) {
if (__value == null) {
unsetType();
} else {
setType((PropertyType)__value);
setType((com.vesoft.nebula.PropertyType)__value);
}
break;

Expand Down Expand Up @@ -358,7 +358,7 @@ public void read(TProtocol iprot) throws TException {
{
case TYPE:
if (__field.type == TType.I32) {
this.type = PropertyType.findByValue(iprot.readI32());
this.type = com.vesoft.nebula.PropertyType.findByValue(iprot.readI32());
} else {
TProtocolUtil.skip(iprot, __field.type);
}
Expand Down
2 changes: 1 addition & 1 deletion client/src/main/generated/com/vesoft/nebula/meta/SpaceDesc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public SpaceDesc() {
this.replica_factor = 0;

this.vid_type = new ColumnTypeDef();
this.vid_type.setType(com.vesoft.nebula.meta.PropertyType.FIXED_STRING);
this.vid_type.setType(com.vesoft.nebula.PropertyType.FIXED_STRING);
this.vid_type.setType_length((short)8);

}
Expand Down
22 changes: 11 additions & 11 deletions client/src/main/generated/com/vesoft/nebula/storage/AddPartReq.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,16 +419,16 @@ public void read(TProtocol iprot) throws TException {
case PEERS:
if (__field.type == TType.LIST) {
{
TList _list197 = iprot.readListBegin();
this.peers = new ArrayList<com.vesoft.nebula.HostAddr>(Math.max(0, _list197.size));
for (int _i198 = 0;
(_list197.size < 0) ? iprot.peekList() : (_i198 < _list197.size);
++_i198)
TList _list221 = iprot.readListBegin();
this.peers = new ArrayList<com.vesoft.nebula.HostAddr>(Math.max(0, _list221.size));
for (int _i222 = 0;
(_list221.size < 0) ? iprot.peekList() : (_i222 < _list221.size);
++_i222)
{
com.vesoft.nebula.HostAddr _elem199;
_elem199 = new com.vesoft.nebula.HostAddr();
_elem199.read(iprot);
this.peers.add(_elem199);
com.vesoft.nebula.HostAddr _elem223;
_elem223 = new com.vesoft.nebula.HostAddr();
_elem223.read(iprot);
this.peers.add(_elem223);
}
iprot.readListEnd();
}
Expand Down Expand Up @@ -466,8 +466,8 @@ public void write(TProtocol oprot) throws TException {
oprot.writeFieldBegin(PEERS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRUCT, this.peers.size()));
for (com.vesoft.nebula.HostAddr _iter200 : this.peers) {
_iter200.write(oprot);
for (com.vesoft.nebula.HostAddr _iter224 : this.peers) {
_iter224.write(oprot);
}
oprot.writeListEnd();
}
Expand Down
66 changes: 33 additions & 33 deletions client/src/main/generated/com/vesoft/nebula/storage/ChainAddEdgesRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,30 +486,30 @@ public void read(TProtocol iprot) throws TException {
case PARTS:
if (__field.type == TType.MAP) {
{
TMap _map268 = iprot.readMapBegin();
this.parts = new HashMap<Integer,List<NewEdge>>(Math.max(0, 2*_map268.size));
for (int _i269 = 0;
(_map268.size < 0) ? iprot.peekMap() : (_i269 < _map268.size);
++_i269)
TMap _map292 = iprot.readMapBegin();
this.parts = new HashMap<Integer,List<NewEdge>>(Math.max(0, 2*_map292.size));
for (int _i293 = 0;
(_map292.size < 0) ? iprot.peekMap() : (_i293 < _map292.size);
++_i293)
{
int _key270;
List<NewEdge> _val271;
_key270 = iprot.readI32();
int _key294;
List<NewEdge> _val295;
_key294 = iprot.readI32();
{
TList _list272 = iprot.readListBegin();
_val271 = new ArrayList<NewEdge>(Math.max(0, _list272.size));
for (int _i273 = 0;
(_list272.size < 0) ? iprot.peekList() : (_i273 < _list272.size);
++_i273)
TList _list296 = iprot.readListBegin();
_val295 = new ArrayList<NewEdge>(Math.max(0, _list296.size));
for (int _i297 = 0;
(_list296.size < 0) ? iprot.peekList() : (_i297 < _list296.size);
++_i297)
{
NewEdge _elem274;
_elem274 = new NewEdge();
_elem274.read(iprot);
_val271.add(_elem274);
NewEdge _elem298;
_elem298 = new NewEdge();
_elem298.read(iprot);
_val295.add(_elem298);
}
iprot.readListEnd();
}
this.parts.put(_key270, _val271);
this.parts.put(_key294, _val295);
}
iprot.readMapEnd();
}
Expand All @@ -520,15 +520,15 @@ public void read(TProtocol iprot) throws TException {
case PROP_NAMES:
if (__field.type == TType.LIST) {
{
TList _list275 = iprot.readListBegin();
this.prop_names = new ArrayList<byte[]>(Math.max(0, _list275.size));
for (int _i276 = 0;
(_list275.size < 0) ? iprot.peekList() : (_i276 < _list275.size);
++_i276)
TList _list299 = iprot.readListBegin();
this.prop_names = new ArrayList<byte[]>(Math.max(0, _list299.size));
for (int _i300 = 0;
(_list299.size < 0) ? iprot.peekList() : (_i300 < _list299.size);
++_i300)
{
byte[] _elem277;
_elem277 = iprot.readBinary();
this.prop_names.add(_elem277);
byte[] _elem301;
_elem301 = iprot.readBinary();
this.prop_names.add(_elem301);
}
iprot.readListEnd();
}
Expand Down Expand Up @@ -584,12 +584,12 @@ public void write(TProtocol oprot) throws TException {
oprot.writeFieldBegin(PARTS_FIELD_DESC);
{
oprot.writeMapBegin(new TMap(TType.I32, TType.LIST, this.parts.size()));
for (Map.Entry<Integer, List<NewEdge>> _iter278 : this.parts.entrySet()) {
oprot.writeI32(_iter278.getKey());
for (Map.Entry<Integer, List<NewEdge>> _iter302 : this.parts.entrySet()) {
oprot.writeI32(_iter302.getKey());
{
oprot.writeListBegin(new TList(TType.STRUCT, _iter278.getValue().size()));
for (NewEdge _iter279 : _iter278.getValue()) {
_iter279.write(oprot);
oprot.writeListBegin(new TList(TType.STRUCT, _iter302.getValue().size()));
for (NewEdge _iter303 : _iter302.getValue()) {
_iter303.write(oprot);
}
oprot.writeListEnd();
}
Expand All @@ -602,8 +602,8 @@ public void write(TProtocol oprot) throws TException {
oprot.writeFieldBegin(PROP_NAMES_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRING, this.prop_names.size()));
for (byte[] _iter280 : this.prop_names) {
oprot.writeBinary(_iter280);
for (byte[] _iter304 : this.prop_names) {
oprot.writeBinary(_iter304);
}
oprot.writeListEnd();
}
Expand Down
20 changes: 10 additions & 10 deletions client/src/main/generated/com/vesoft/nebula/storage/ChainUpdateEdgeRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,15 +454,15 @@ public void read(TProtocol iprot) throws TException {
case PARTS:
if (__field.type == TType.LIST) {
{
TList _list281 = iprot.readListBegin();
this.parts = new ArrayList<Integer>(Math.max(0, _list281.size));
for (int _i282 = 0;
(_list281.size < 0) ? iprot.peekList() : (_i282 < _list281.size);
++_i282)
TList _list305 = iprot.readListBegin();
this.parts = new ArrayList<Integer>(Math.max(0, _list305.size));
for (int _i306 = 0;
(_list305.size < 0) ? iprot.peekList() : (_i306 < _list305.size);
++_i306)
{
int _elem283;
_elem283 = iprot.readI32();
this.parts.add(_elem283);
int _elem307;
_elem307 = iprot.readI32();
this.parts.add(_elem307);
}
iprot.readListEnd();
}
Expand Down Expand Up @@ -507,8 +507,8 @@ public void write(TProtocol oprot) throws TException {
oprot.writeFieldBegin(PARTS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.I32, this.parts.size()));
for (int _iter284 : this.parts) {
oprot.writeI32(_iter284);
for (int _iter308 : this.parts) {
oprot.writeI32(_iter308);
}
oprot.writeListEnd();
}
Expand Down
22 changes: 11 additions & 11 deletions client/src/main/generated/com/vesoft/nebula/storage/CheckPeersReq.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,16 +347,16 @@ public void read(TProtocol iprot) throws TException {
case PEERS:
if (__field.type == TType.LIST) {
{
TList _list210 = iprot.readListBegin();
this.peers = new ArrayList<com.vesoft.nebula.HostAddr>(Math.max(0, _list210.size));
for (int _i211 = 0;
(_list210.size < 0) ? iprot.peekList() : (_i211 < _list210.size);
++_i211)
TList _list234 = iprot.readListBegin();
this.peers = new ArrayList<com.vesoft.nebula.HostAddr>(Math.max(0, _list234.size));
for (int _i235 = 0;
(_list234.size < 0) ? iprot.peekList() : (_i235 < _list234.size);
++_i235)
{
com.vesoft.nebula.HostAddr _elem212;
_elem212 = new com.vesoft.nebula.HostAddr();
_elem212.read(iprot);
this.peers.add(_elem212);
com.vesoft.nebula.HostAddr _elem236;
_elem236 = new com.vesoft.nebula.HostAddr();
_elem236.read(iprot);
this.peers.add(_elem236);
}
iprot.readListEnd();
}
Expand Down Expand Up @@ -391,8 +391,8 @@ public void write(TProtocol oprot) throws TException {
oprot.writeFieldBegin(PEERS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRUCT, this.peers.size()));
for (com.vesoft.nebula.HostAddr _iter213 : this.peers) {
_iter213.write(oprot);
for (com.vesoft.nebula.HostAddr _iter237 : this.peers) {
_iter237.write(oprot);
}
oprot.writeListEnd();
}
Expand Down
22 changes: 11 additions & 11 deletions client/src/main/generated/com/vesoft/nebula/storage/CreateCPResp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,16 +274,16 @@ public void read(TProtocol iprot) throws TException {
case INFO:
if (__field.type == TType.LIST) {
{
TList _list218 = iprot.readListBegin();
this.info = new ArrayList<com.vesoft.nebula.CheckpointInfo>(Math.max(0, _list218.size));
for (int _i219 = 0;
(_list218.size < 0) ? iprot.peekList() : (_i219 < _list218.size);
++_i219)
TList _list242 = iprot.readListBegin();
this.info = new ArrayList<com.vesoft.nebula.CheckpointInfo>(Math.max(0, _list242.size));
for (int _i243 = 0;
(_list242.size < 0) ? iprot.peekList() : (_i243 < _list242.size);
++_i243)
{
com.vesoft.nebula.CheckpointInfo _elem220;
_elem220 = new com.vesoft.nebula.CheckpointInfo();
_elem220.read(iprot);
this.info.add(_elem220);
com.vesoft.nebula.CheckpointInfo _elem244;
_elem244 = new com.vesoft.nebula.CheckpointInfo();
_elem244.read(iprot);
this.info.add(_elem244);
}
iprot.readListEnd();
}
Expand Down Expand Up @@ -317,8 +317,8 @@ public void write(TProtocol oprot) throws TException {
oprot.writeFieldBegin(INFO_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRUCT, this.info.size()));
for (com.vesoft.nebula.CheckpointInfo _iter221 : this.info) {
_iter221.write(oprot);
for (com.vesoft.nebula.CheckpointInfo _iter245 : this.info) {
_iter245.write(oprot);
}
oprot.writeListEnd();
}
Expand Down
Loading