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

Jump to bottom

update thrift & add config for scan cursor #398

Merged
merged 10 commits into from
Dec 13, 2021
Merged

update thrift & add config for scan cursor #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c2a576b
update thrift
Nicole00 Nov 23, 2021
9a7f9f6
add config for scan cursor
Nicole00 Dec 7, 2021
9282f07
large the sleep time waiting nebula server
Nicole00 Dec 7, 2021
d17ad32
update thrift
Nicole00 Dec 9, 2021
bbe8fb2
sync scan with server
Nicole00 Dec 9, 2021
2f49be8
large sleep time makesure graph get the latest schema
Nicole00 Dec 10, 2021
57e1baf
update result process for scan
Nicole00 Dec 10, 2021
93eccab
update example
Nicole00 Dec 10, 2021
70abb0e
update sleep time
Nicole00 Dec 13, 2021
9fe6115
update ut
Nicole00 Dec 13, 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 .github/workflows/deploy_release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
pushd nebula-docker-compose/
cp ../../client/src/test/resources/docker-compose.yaml .
docker-compose up -d
sleep 10
sleep 30
docker-compose ps
popd
popd
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_snapshot.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
pushd nebula-docker-compose/
cp ../../client/src/test/resources/docker-compose.yaml .
docker-compose up -d
sleep 10
sleep 30
docker-compose ps
popd
popd
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
pushd nebula-docker-compose/
cp ../../client/src/test/resources/docker-compose.yaml .
docker-compose up -d
sleep 10
sleep 30
docker-compose ps
popd
popd
Expand Down
112 changes: 15 additions & 97 deletions client/src/main/generated/AppendLogRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ public class AppendLogRequest implements TBase, java.io.Serializable, Cloneable,
private static final TField LAST_LOG_ID_SENT_FIELD_DESC = new TField("last_log_id_sent", TType.I64, (short)9);
private static final TField LOG_TERM_FIELD_DESC = new TField("log_term", TType.I64, (short)10);
private static final TField LOG_STR_LIST_FIELD_DESC = new TField("log_str_list", TType.LIST, (short)11);
private static final TField SENDING_SNAPSHOT_FIELD_DESC = new TField("sending_snapshot", TType.BOOL, (short)12);

public int space;
public int part;
Expand All @@ -47,8 +46,7 @@ public class AppendLogRequest implements TBase, java.io.Serializable, Cloneable,
public long last_log_term_sent;
public long last_log_id_sent;
public long log_term;
public List<LogEntry> log_str_list;
public boolean sending_snapshot;
public List<com.vesoft.nebula.LogEntry> log_str_list;
public static final int SPACE = 1;
public static final int PART = 2;
public static final int CURRENT_TERM = 3;
Expand All @@ -60,7 +58,6 @@ public class AppendLogRequest implements TBase, java.io.Serializable, Cloneable,
public static final int LAST_LOG_ID_SENT = 9;
public static final int LOG_TERM = 10;
public static final int LOG_STR_LIST = 11;
public static final int SENDING_SNAPSHOT = 12;

// isset id assignments
private static final int __SPACE_ISSET_ID = 0;
Expand All @@ -72,8 +69,7 @@ public class AppendLogRequest implements TBase, java.io.Serializable, Cloneable,
private static final int __LAST_LOG_TERM_SENT_ISSET_ID = 6;
private static final int __LAST_LOG_ID_SENT_ISSET_ID = 7;
private static final int __LOG_TERM_ISSET_ID = 8;
private static final int __SENDING_SNAPSHOT_ISSET_ID = 9;
private BitSet __isset_bit_vector = new BitSet(10);
private BitSet __isset_bit_vector = new BitSet(9);

public static final Map<Integer, FieldMetaData> metaDataMap;

Expand Down Expand Up @@ -101,9 +97,7 @@ public class AppendLogRequest implements TBase, java.io.Serializable, Cloneable,
new FieldValueMetaData(TType.I64)));
tmpMetaDataMap.put(LOG_STR_LIST, new FieldMetaData("log_str_list", TFieldRequirementType.DEFAULT,
new ListMetaData(TType.LIST,
new StructMetaData(TType.STRUCT, LogEntry.class))));
tmpMetaDataMap.put(SENDING_SNAPSHOT, new FieldMetaData("sending_snapshot", TFieldRequirementType.DEFAULT,
new FieldValueMetaData(TType.BOOL)));
new StructMetaData(TType.STRUCT, com.vesoft.nebula.LogEntry.class))));
metaDataMap = Collections.unmodifiableMap(tmpMetaDataMap);
}

Expand All @@ -125,8 +119,7 @@ public AppendLogRequest(
long last_log_term_sent,
long last_log_id_sent,
long log_term,
List<LogEntry> log_str_list,
boolean sending_snapshot) {
List<com.vesoft.nebula.LogEntry> log_str_list) {
this();
this.space = space;
setSpaceIsSet(true);
Expand All @@ -148,8 +141,6 @@ public AppendLogRequest(
this.log_term = log_term;
setLog_termIsSet(true);
this.log_str_list = log_str_list;
this.sending_snapshot = sending_snapshot;
setSending_snapshotIsSet(true);
}

public static class Builder {
Expand All @@ -163,10 +154,9 @@ public static class Builder {
private long last_log_term_sent;
private long last_log_id_sent;
private long log_term;
private List<LogEntry> log_str_list;
private boolean sending_snapshot;
private List<com.vesoft.nebula.LogEntry> log_str_list;

BitSet __optional_isset = new BitSet(10);
BitSet __optional_isset = new BitSet(9);

public Builder() {
}
Expand Down Expand Up @@ -230,17 +220,11 @@ public Builder setLog_term(final long log_term) {
return this;
}

public Builder setLog_str_list(final List<LogEntry> log_str_list) {
public Builder setLog_str_list(final List<com.vesoft.nebula.LogEntry> log_str_list) {
this.log_str_list = log_str_list;
return this;
}

public Builder setSending_snapshot(final boolean sending_snapshot) {
this.sending_snapshot = sending_snapshot;
__optional_isset.set(__SENDING_SNAPSHOT_ISSET_ID, true);
return this;
}

public AppendLogRequest build() {
AppendLogRequest result = new AppendLogRequest();
if (__optional_isset.get(__SPACE_ISSET_ID)) {
Expand Down Expand Up @@ -272,9 +256,6 @@ public AppendLogRequest build() {
result.setLog_term(this.log_term);
}
result.setLog_str_list(this.log_str_list);
if (__optional_isset.get(__SENDING_SNAPSHOT_ISSET_ID)) {
result.setSending_snapshot(this.sending_snapshot);
}
return result;
}
}
Expand Down Expand Up @@ -304,7 +285,6 @@ public AppendLogRequest(AppendLogRequest other) {
if (other.isSetLog_str_list()) {
this.log_str_list = TBaseHelper.deepCopy(other.log_str_list);
}
this.sending_snapshot = TBaseHelper.deepCopy(other.sending_snapshot);
}

public AppendLogRequest deepCopy() {
Expand Down Expand Up @@ -542,11 +522,11 @@ public void setLog_termIsSet(boolean __value) {
__isset_bit_vector.set(__LOG_TERM_ISSET_ID, __value);
}

public List<LogEntry> getLog_str_list() {
public List<com.vesoft.nebula.LogEntry> getLog_str_list() {
return this.log_str_list;
}

public AppendLogRequest setLog_str_list(List<LogEntry> log_str_list) {
public AppendLogRequest setLog_str_list(List<com.vesoft.nebula.LogEntry> log_str_list) {
this.log_str_list = log_str_list;
return this;
}
Expand All @@ -566,29 +546,6 @@ public void setLog_str_listIsSet(boolean __value) {
}
}

public boolean isSending_snapshot() {
return this.sending_snapshot;
}

public AppendLogRequest setSending_snapshot(boolean sending_snapshot) {
this.sending_snapshot = sending_snapshot;
setSending_snapshotIsSet(true);
return this;
}

public void unsetSending_snapshot() {
__isset_bit_vector.clear(__SENDING_SNAPSHOT_ISSET_ID);
}

// Returns true if field sending_snapshot is set (has been assigned a value) and false otherwise
public boolean isSetSending_snapshot() {
return __isset_bit_vector.get(__SENDING_SNAPSHOT_ISSET_ID);
}

public void setSending_snapshotIsSet(boolean __value) {
__isset_bit_vector.set(__SENDING_SNAPSHOT_ISSET_ID, __value);
}

@SuppressWarnings("unchecked")
public void setFieldValue(int fieldID, Object __value) {
switch (fieldID) {
Expand Down Expand Up @@ -676,15 +633,7 @@ public void setFieldValue(int fieldID, Object __value) {
if (__value == null) {
unsetLog_str_list();
} else {
setLog_str_list((List<LogEntry>)__value);
}
break;

case SENDING_SNAPSHOT:
if (__value == null) {
unsetSending_snapshot();
} else {
setSending_snapshot((Boolean)__value);
setLog_str_list((List<com.vesoft.nebula.LogEntry>)__value);
}
break;

Expand Down Expand Up @@ -728,9 +677,6 @@ public Object getFieldValue(int fieldID) {
case LOG_STR_LIST:
return getLog_str_list();

case SENDING_SNAPSHOT:
return new Boolean(isSending_snapshot());

default:
throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
}
Expand Down Expand Up @@ -768,14 +714,12 @@ public boolean equals(Object _that) {

if (!TBaseHelper.equalsNobinary(this.isSetLog_str_list(), that.isSetLog_str_list(), this.log_str_list, that.log_str_list)) { return false; }

if (!TBaseHelper.equalsNobinary(this.sending_snapshot, that.sending_snapshot)) { return false; }

return true;
}

@Override
public int hashCode() {
return Arrays.deepHashCode(new Object[] {space, part, current_term, last_log_id, committed_log_id, leader_addr, leader_port, last_log_term_sent, last_log_id_sent, log_term, log_str_list, sending_snapshot});
return Arrays.deepHashCode(new Object[] {space, part, current_term, last_log_id, committed_log_id, leader_addr, leader_port, last_log_term_sent, last_log_id_sent, log_term, log_str_list});
}

@Override
Expand Down Expand Up @@ -878,14 +822,6 @@ public int compareTo(AppendLogRequest other) {
if (lastComparison != 0) {
return lastComparison;
}
lastComparison = Boolean.valueOf(isSetSending_snapshot()).compareTo(other.isSetSending_snapshot());
if (lastComparison != 0) {
return lastComparison;
}
lastComparison = TBaseHelper.compareTo(sending_snapshot, other.sending_snapshot);
if (lastComparison != 0) {
return lastComparison;
}
return 0;
}

Expand Down Expand Up @@ -983,13 +919,13 @@ public void read(TProtocol iprot) throws TException {
if (__field.type == TType.LIST) {
{
TList _list0 = iprot.readListBegin();
this.log_str_list = new ArrayList<LogEntry>(Math.max(0, _list0.size));
this.log_str_list = new ArrayList<com.vesoft.nebula.LogEntry>(Math.max(0, _list0.size));
for (int _i1 = 0;
(_list0.size < 0) ? iprot.peekList() : (_i1 < _list0.size);
++_i1)
{
LogEntry _elem2;
_elem2 = new LogEntry();
com.vesoft.nebula.LogEntry _elem2;
_elem2 = new com.vesoft.nebula.LogEntry();
_elem2.read(iprot);
this.log_str_list.add(_elem2);
}
Expand All @@ -999,14 +935,6 @@ public void read(TProtocol iprot) throws TException {
TProtocolUtil.skip(iprot, __field.type);
}
break;
case SENDING_SNAPSHOT:
if (__field.type == TType.BOOL) {
this.sending_snapshot = iprot.readBool();
setSending_snapshotIsSet(true);
} else {
TProtocolUtil.skip(iprot, __field.type);
}
break;
default:
TProtocolUtil.skip(iprot, __field.type);
break;
Expand Down Expand Up @@ -1060,16 +988,13 @@ public void write(TProtocol oprot) throws TException {
oprot.writeFieldBegin(LOG_STR_LIST_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRUCT, this.log_str_list.size()));
for (LogEntry _iter3 : this.log_str_list) {
for (com.vesoft.nebula.LogEntry _iter3 : this.log_str_list) {
_iter3.write(oprot);
}
oprot.writeListEnd();
}
oprot.writeFieldEnd();
}
oprot.writeFieldBegin(SENDING_SNAPSHOT_FIELD_DESC);
oprot.writeBool(this.sending_snapshot);
oprot.writeFieldEnd();
oprot.writeFieldStop();
oprot.writeStructEnd();
}
Expand Down Expand Up @@ -1174,13 +1099,6 @@ public String toString(int indent, boolean prettyPrint) {
sb.append(TBaseHelper.toString(this.getLog_str_list(), indent + 1, prettyPrint));
}
first = false;
if (!first) sb.append("," + newLine);
sb.append(indentStr);
sb.append("sending_snapshot");
sb.append(space);
sb.append(":").append(space);
sb.append(TBaseHelper.toString(this.isSending_snapshot(), indent + 1, prettyPrint));
first = false;
sb.append(newLine + TBaseHelper.reduceIndent(indentStr));
sb.append(")");
return sb.toString();
Expand Down
Loading